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

8 files changed, 4 insertions, 4 deletions

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