Author: rfeng
Date: Tue Jul 8 16:48:13 2008
New Revision: 675059
URL: http://svn.apache.org/viewvc?rev=675059&view=rev
Log:
Use maven dependency:copy to copy eclipse bundles over
Removed:
tuscany/java/sca/modules/extensibility-eclipse/src/test/resources/dependency/
Modified:
tuscany/java/sca/modules/extensibility-eclipse/pom.xml
tuscany/java/sca/modules/extensibility-eclipse/src/test/java/org/apache/tuscany/sca/extensibility/equinox/EquinoxServiceDiscovererTestCase.java
Modified: tuscany/java/sca/modules/extensibility-eclipse/pom.xml
URL:
http://svn.apache.org/viewvc/tuscany/java/sca/modules/extensibility-eclipse/pom.xml?rev=675059&r1=675058&r2=675059&view=diff
==============================================================================
--- tuscany/java/sca/modules/extensibility-eclipse/pom.xml (original)
+++ tuscany/java/sca/modules/extensibility-eclipse/pom.xml Tue Jul 8 16:48:13
2008
@@ -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
Modified:
tuscany/java/sca/modules/extensibility-eclipse/src/test/java/org/apache/tuscany/sca/extensibility/equinox/EquinoxServiceDiscovererTestCase.java
URL:
http://svn.apache.org/viewvc/tuscany/java/sca/modules/extensibility-eclipse/src/test/java/org/apache/tuscany/sca/extensibility/equinox/EquinoxServiceDiscovererTestCase.java?rev=675059&r1=675058&r2=675059&view=diff
==============================================================================
---
tuscany/java/sca/modules/extensibility-eclipse/src/test/java/org/apache/tuscany/sca/extensibility/equinox/EquinoxServiceDiscovererTestCase.java
(original)
+++
tuscany/java/sca/modules/extensibility-eclipse/src/test/java/org/apache/tuscany/sca/extensibility/equinox/EquinoxServiceDiscovererTestCase.java
Tue Jul 8 16:48:13 2008
@@ -88,22 +88,22 @@
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();
