You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@servicemix.apache.org by gn...@apache.org on 2008/06/19 11:21:31 UTC
svn commit: r669434 - in /servicemix/components/common/trunk: ./
servicemix-common/ servicemix-soap/ servicemix-soap2/
servicemix-soap2/src/test/java/org/apache/servicemix/tck/
servicemix-soap2/src/test/java/org/apache/servicemix/tck/mock/
Author: gnodet
Date: Thu Jun 19 02:21:31 2008
New Revision: 669434
URL: http://svn.apache.org/viewvc?rev=669434&view=rev
Log:
Put back the mock stuff until 3.3 is released, make commons stuff osgi bundles
Added:
servicemix/components/common/trunk/servicemix-soap2/src/test/java/org/apache/servicemix/tck/
servicemix/components/common/trunk/servicemix-soap2/src/test/java/org/apache/servicemix/tck/mock/
servicemix/components/common/trunk/servicemix-soap2/src/test/java/org/apache/servicemix/tck/mock/MockExchangeFactory.java
- copied unchanged from r669289, servicemix/smx3/trunk/core/servicemix-core/src/main/java/org/apache/servicemix/tck/mock/MockExchangeFactory.java
servicemix/components/common/trunk/servicemix-soap2/src/test/java/org/apache/servicemix/tck/mock/MockMessageExchange.java
- copied unchanged from r669289, servicemix/smx3/trunk/core/servicemix-core/src/main/java/org/apache/servicemix/tck/mock/MockMessageExchange.java
servicemix/components/common/trunk/servicemix-soap2/src/test/java/org/apache/servicemix/tck/mock/MockNormalizedMessage.java
- copied unchanged from r669289, servicemix/smx3/trunk/core/servicemix-core/src/main/java/org/apache/servicemix/tck/mock/MockNormalizedMessage.java
Modified:
servicemix/components/common/trunk/pom.xml
servicemix/components/common/trunk/servicemix-common/pom.xml
servicemix/components/common/trunk/servicemix-soap/pom.xml
servicemix/components/common/trunk/servicemix-soap2/pom.xml
Modified: servicemix/components/common/trunk/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/components/common/trunk/pom.xml?rev=669434&r1=669433&r2=669434&view=diff
==============================================================================
--- servicemix/components/common/trunk/pom.xml (original)
+++ servicemix/components/common/trunk/pom.xml Thu Jun 19 02:21:31 2008
@@ -40,6 +40,10 @@
<properties>
<servicemix-version>3.2.1</servicemix-version>
<activemq-version>5.1.0</activemq-version>
+ <servicemix.osgi.export>${servicemix.osgi.export.pkg}*;version=${project.version}</servicemix.osgi.export>
+ <servicemix.osgi.export.pkg />
+ <servicemix.osgi.import />
+ <servicemix.osgi.private />
</properties>
<modules>
@@ -51,17 +55,39 @@
<build>
<plugins>
<plugin>
- <groupId>org.apache.servicemix</groupId>
- <artifactId>servicemix-build</artifactId>
- <version>1.0</version>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>maven-bundle-plugin</artifactId>
+ <version>1.4.0</version>
+ <configuration>
+ <instructions>
+ <Bundle-Name>${project.name}</Bundle-Name>
+ <Bundle-SymbolicName>${pom.artifactId}</Bundle-SymbolicName>
+ <Export-Package>${servicemix.osgi.export}</Export-Package>
+ <Import-Package>${servicemix.osgi.import}</Import-Package>
+ <Private-Package>${servicemix.osgi.private}</Private-Package>
+ </instructions>
+ <unpackBundle>true</unpackBundle>
+ </configuration>
<executions>
<execution>
+ <id>bundle-manifest</id>
+ <phase>process-classes</phase>
<goals>
- <goal>copy</goal>
+ <goal>manifest</goal>
</goals>
</execution>
</executions>
</plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-jar-plugin</artifactId>
+ <version>2.1</version>
+ <configuration>
+ <archive>
+ <manifestFile>${project.build.outputDirectory}/META-INF/MANIFEST.MF</manifestFile>
+ </archive>
+ </configuration>
+ </plugin>
</plugins>
</build>
</project>
Modified: servicemix/components/common/trunk/servicemix-common/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/components/common/trunk/servicemix-common/pom.xml?rev=669434&r1=669433&r2=669434&view=diff
==============================================================================
--- servicemix/components/common/trunk/servicemix-common/pom.xml (original)
+++ servicemix/components/common/trunk/servicemix-common/pom.xml Thu Jun 19 02:21:31 2008
@@ -32,6 +32,20 @@
<name>ServiceMix :: Common</name>
<description>Common library for binding component and service engines</description>
+ <properties>
+ <servicemix.osgi.import>
+ com.ibm.wsdl*;resolution:=optional,
+ javax.resource.spi.work;resolution:=optional,
+ org.apache.servicemix;resolution:=optional,
+ org.apache.servicemix.jbi*;resolution:=optional,
+ org.apache.servicemix.components*;resolution:=optional,
+ *
+ </servicemix.osgi.import>
+ <servicemix.osgi.export.pkg>
+ org.apache.servicemix
+ </servicemix.osgi.export.pkg>
+ </properties>
+
<dependencies>
<dependency>
<groupId>org.apache.servicemix</groupId>
@@ -127,45 +141,6 @@
</excludes>
</configuration>
</plugin>
- <plugin>
- <groupId>org.apache.felix</groupId>
- <artifactId>maven-bundle-plugin</artifactId>
- <version>1.4.0</version>
- <configuration>
- <instructions>
- <Bundle-Name>${project.name}</Bundle-Name>
- <Bundle-SymbolicName>${artifactId}</Bundle-SymbolicName>
- <Export-Package>org.apache.servicemix*</Export-Package>
- <Import-Package>
- com.ibm.wsdl*;resolution:=optional,
- javax.resource.spi.work;resolution:=optional,
- org.apache.servicemix;resolution:=optional,
- org.apache.servicemix.jbi*;resolution:=optional,
- org.apache.servicemix.components*;resolution:=optional,
- *
- </Import-Package>
- </instructions>
- </configuration>
- <executions>
- <execution>
- <id>bundle-manifest</id>
- <phase>process-classes</phase>
- <goals>
- <goal>manifest</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-jar-plugin</artifactId>
- <version>2.1</version>
- <configuration>
- <archive>
- <manifestFile>${project.build.outputDirectory}/META-INF/MANIFEST.MF</manifestFile>
- </archive>
- </configuration>
- </plugin>
</plugins>
</build>
</project>
Modified: servicemix/components/common/trunk/servicemix-soap/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/components/common/trunk/servicemix-soap/pom.xml?rev=669434&r1=669433&r2=669434&view=diff
==============================================================================
--- servicemix/components/common/trunk/servicemix-soap/pom.xml (original)
+++ servicemix/components/common/trunk/servicemix-soap/pom.xml Thu Jun 19 02:21:31 2008
@@ -32,6 +32,20 @@
<name>ServiceMix :: SOAP</name>
<description>SOAP Stack</description>
+ <properties>
+ <servicemix.osgi.import>
+ com.ibm.wsdl*;resolution:=optional,
+ javax.resource.spi.work;resolution:=optional,
+ org.apache.servicemix;resolution:=optional,
+ org.apache.servicemix.jbi*;resolution:=optional,
+ org.apache.servicemix.components*;resolution:=optional,
+ *
+ </servicemix.osgi.import>
+ <servicemix.osgi.export.pkg>
+ org.apache.servicemix
+ </servicemix.osgi.export.pkg>
+ </properties>
+
<dependencies>
<dependency>
<groupId>org.apache.servicemix</groupId>
Modified: servicemix/components/common/trunk/servicemix-soap2/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/components/common/trunk/servicemix-soap2/pom.xml?rev=669434&r1=669433&r2=669434&view=diff
==============================================================================
--- servicemix/components/common/trunk/servicemix-soap2/pom.xml (original)
+++ servicemix/components/common/trunk/servicemix-soap2/pom.xml Thu Jun 19 02:21:31 2008
@@ -32,6 +32,20 @@
<name>ServiceMix :: SOAP2</name>
<description>SOAP Stack v2</description>
+ <properties>
+ <servicemix.osgi.import>
+ com.ibm.wsdl*;resolution:=optional,
+ javax.resource.spi.work;resolution:=optional,
+ org.apache.servicemix;resolution:=optional,
+ org.apache.servicemix.jbi*;resolution:=optional,
+ org.apache.servicemix.components*;resolution:=optional,
+ *
+ </servicemix.osgi.import>
+ <servicemix.osgi.export.pkg>
+ org.apache.servicemix
+ </servicemix.osgi.export.pkg>
+ </properties>
+
<dependencies>
<dependency>
<groupId>org.apache.servicemix</groupId>
@@ -109,7 +123,7 @@
<include>**/*Test.*</include>
</includes>
<excludes>
-<!-- exclude abstract test cases -->
+ <!-- exclude abstract test cases -->
<exclude>**/Abstract*.*</exclude>
</excludes>
</configuration>