Use maven dependency:copy to copy eclipse bundles over

git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@675059 13f79535-47bb-0310-9956-ffa450edef68

9 files changed, 68 insertions, 53 deletions

diff --git a/java/sca/modules/extensibility-eclipse/pom.xml b/java/sca/modules/extensibility-eclipse/pom.xml
index 9c12119fcc..3f7f5a1e4c 100644
--- a/java/sca/modules/extensibility-eclipse/pom.xml
+++ b/java/sca/modules/extensibility-eclipse/pom.xml
@@ -18,53 +18,68 @@
  * under the License.    
 -->
 <project>
-	<modelVersion>4.0.0</modelVersion>
-	<parent>
-		<groupId>org.apache.tuscany.sca</groupId>
-		<artifactId>tuscany-modules</artifactId>
-		<version>1.4-SNAPSHOT</version>
-		<relativePath>../pom.xml</relativePath>
-	</parent>
-	<artifactId>tuscany-extensibility-eclipse</artifactId>
-	<name>Apache Tuscany SCA Extensibility for Eclipse Equinox</name>
-	<dependencies>
-		<dependency>
-			<groupId>org.apache.tuscany.sca</groupId>
-			<artifactId>tuscany-extensibility</artifactId>
-			<version>1.4-SNAPSHOT</version>
-		</dependency>
-
-		<dependency>
-			<groupId>org.eclipse</groupId>
-			<artifactId>osgi</artifactId>
-			<version>3.3.0-v20070530</version>
-			<scope>compile</scope>
-		</dependency>
-		
-		<!-- 
-		<dependency>
-			<groupId>org.eclipse.core</groupId>
-			<artifactId>runtime</artifactId>
-			<version>3.3.100-v20070530</version>
-			<scope>compile</scope>
-		</dependency>
-		 -->
-	</dependencies>
-	<build>
-		<plugins>
-			<plugin>
-				<groupId>org.apache.felix</groupId>
-				<artifactId>maven-bundle-plugin</artifactId>
-				<configuration>
-					<instructions>
-						<Bundle-Version>${tuscany.version}
-						</Bundle-Version>
-						<Bundle-SymbolicName>org.apache.tuscany.sca.extensibility.equinox</Bundle-SymbolicName>
-						<Bundle-Description>${pom.name}</Bundle-Description>
-						<Export-Package>org.apache.tuscany.sca.extensibility.equinox*</Export-Package>
-					</instructions>
-				</configuration>
-			</plugin>
-		</plugins>
-	</build>
+    <modelVersion>4.0.0</modelVersion>
+    <parent>
+        <groupId>org.apache.tuscany.sca</groupId>
+        <artifactId>tuscany-modules</artifactId>
+        <version>1.4-SNAPSHOT</version>
+        <relativePath>../pom.xml</relativePath>
+    </parent>
+    <artifactId>tuscany-extensibility-eclipse</artifactId>
+    <name>Apache Tuscany SCA Extensibility for Eclipse Equinox</name>
+    <dependencies>
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-extensibility</artifactId>
+            <version>1.4-SNAPSHOT</version>
+        </dependency>
+        <dependency>
+            <groupId>org.eclipse</groupId>
+            <artifactId>osgi</artifactId>
+            <version>3.3.0-v20070530</version>
+            <scope>compile</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.eclipse.core</groupId>
+            <artifactId>runtime</artifactId>
+            <version>3.3.100-v20070530</version>
+            <scope>test</scope>
+        </dependency>
+    </dependencies>
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-dependency-plugin</artifactId>
+                <version>2.0</version>
+                <executions>
+                    <execution>
+                        <id>copy-dependencies</id>
+                        <phase>process-test-resources</phase>
+                        <goals>
+                            <goal>copy-dependencies</goal>
+                        </goals>
+                        <configuration>
+                            <outputDirectory>${project.build.directory}/bundles</outputDirectory>
+                            <excludeArtifactIds>osgi,junit,easymock,tuscany-extensibility</excludeArtifactIds>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.felix</groupId>
+                <artifactId>maven-bundle-plugin</artifactId>
+                <configuration>
+                    <instructions>
+                        <Bundle-Version>${tuscany.version}</Bundle-Version>
+                        <Bundle-SymbolicName>org.apache.tuscany.sca.extensibility.equinox
+                        </Bundle-SymbolicName>
+                        <Bundle-Description>${pom.name}</Bundle-Description>
+                        <Export-Package>org.apache.tuscany.sca.extensibility.equinox*
+                        </Export-Package>
+                    </instructions>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
 </project>
\ No newline at end of file
diff --git a/java/sca/modules/extensibility-eclipse/src/test/java/org/apache/tuscany/sca/extensibility/equinox/EquinoxServiceDiscovererTestCase.java b/java/sca/modules/extensibility-eclipse/src/test/java/org/apache/tuscany/sca/extensibility/equinox/EquinoxServiceDiscovererTestCase.java
index 8ebe733450..917720937a 100644
--- a/java/sca/modules/extensibility-eclipse/src/test/java/org/apache/tuscany/sca/extensibility/equinox/EquinoxServiceDiscovererTestCase.java
+++ b/java/sca/modules/extensibility-eclipse/src/test/java/org/apache/tuscany/sca/extensibility/equinox/EquinoxServiceDiscovererTestCase.java
@@ -88,22 +88,22 @@ public class EquinoxServiceDiscovererTestCase {
         testBundle = context.installBundle("test-bundle", is);
         is.close();
         discoverer = new EquinoxServiceDiscoverer(context);
-        File dep = new File("target/test-classes/dependency");
+        File dep = new File("target/bundles");
         List<Bundle> bundles = new ArrayList<Bundle>();
         for (File f : dep.listFiles()) {
             BufferedInputStream bis = new BufferedInputStream(new FileInputStream(f));
-            bis.mark(8192);
             JarInputStream jis = new JarInputStream(bis);
             Manifest manifest = jis.getManifest();
             if (manifest == null || manifest.getMainAttributes().getValue("Bundle-Name") == null) {
                 bis.close();
                 continue;
             }
-            bis.reset();
+            bis.close();
+            bis = new BufferedInputStream(new FileInputStream(f));
             Bundle b = context.installBundle(f.getName(), bis);
             System.out.println("Installed "+b.getSymbolicName() + " [" + getState(b) + "]");
             bundles.add(b);
-            is.close();
+            bis.close();
         }
         for (Bundle b : bundles) {
             b.start();
diff --git a/java/sca/modules/extensibility-eclipse/src/test/resources/dependency/app-1.0.0-v20070423.jar b/java/sca/modules/extensibility-eclipse/src/test/resources/dependency/app-1.0.0-v20070423.jar
deleted file mode 100644
index 41ed3dace0..0000000000
--- a/java/sca/modules/extensibility-eclipse/src/test/resources/dependency/app-1.0.0-v20070423.jar
+++ /dev/null
diff --git a/java/sca/modules/extensibility-eclipse/src/test/resources/dependency/common-3.3.0-v20070426.jar b/java/sca/modules/extensibility-eclipse/src/test/resources/dependency/common-3.3.0-v20070426.jar
deleted file mode 100644
index aca3f73bb3..0000000000
--- a/java/sca/modules/extensibility-eclipse/src/test/resources/dependency/common-3.3.0-v20070426.jar
+++ /dev/null
diff --git a/java/sca/modules/extensibility-eclipse/src/test/resources/dependency/contenttype-3.2.100-v20070319.jar b/java/sca/modules/extensibility-eclipse/src/test/resources/dependency/contenttype-3.2.100-v20070319.jar
deleted file mode 100644
index 0f9e7cbd23..0000000000
--- a/java/sca/modules/extensibility-eclipse/src/test/resources/dependency/contenttype-3.2.100-v20070319.jar
+++ /dev/null
diff --git a/java/sca/modules/extensibility-eclipse/src/test/resources/dependency/jobs-3.3.0-v20070423.jar b/java/sca/modules/extensibility-eclipse/src/test/resources/dependency/jobs-3.3.0-v20070423.jar
deleted file mode 100644
index 6183e2b8b0..0000000000
--- a/java/sca/modules/extensibility-eclipse/src/test/resources/dependency/jobs-3.3.0-v20070423.jar
+++ /dev/null
diff --git a/java/sca/modules/extensibility-eclipse/src/test/resources/dependency/preferences-3.2.100-v20070522.jar b/java/sca/modules/extensibility-eclipse/src/test/resources/dependency/preferences-3.2.100-v20070522.jar
deleted file mode 100644
index 8ca9b2f63a..0000000000
--- a/java/sca/modules/extensibility-eclipse/src/test/resources/dependency/preferences-3.2.100-v20070522.jar
+++ /dev/null
diff --git a/java/sca/modules/extensibility-eclipse/src/test/resources/dependency/registry-3.3.0-v20070522.jar b/java/sca/modules/extensibility-eclipse/src/test/resources/dependency/registry-3.3.0-v20070522.jar
deleted file mode 100644
index 18bd4f831f..0000000000
--- a/java/sca/modules/extensibility-eclipse/src/test/resources/dependency/registry-3.3.0-v20070522.jar
+++ /dev/null
diff --git a/java/sca/modules/extensibility-eclipse/src/test/resources/dependency/runtime-3.3.100-v20070530.jar b/java/sca/modules/extensibility-eclipse/src/test/resources/dependency/runtime-3.3.100-v20070530.jar
deleted file mode 100644
index aede6bbc3e..0000000000
--- a/java/sca/modules/extensibility-eclipse/src/test/resources/dependency/runtime-3.3.100-v20070530.jar
+++ /dev/null