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/08/26 10:16:27 UTC
svn commit: r688991 - in /servicemix/smx4/nmr/trunk: ./ assembly/ bundle/
jbi/ jbi/api/ jbi/deployer/ jbi/itests/
jbi/itests/src/test/java/org/apache/servicemix/jbi/ jbi/osgi/ jbi/runtime/
Author: gnodet
Date: Tue Aug 26 01:16:26 2008
New Revision: 688991
URL: http://svn.apache.org/viewvc?rev=688991&view=rev
Log:
SM-1455: Update NMR with the new JBI spec
Removed:
servicemix/smx4/nmr/trunk/jbi/api/
Modified:
servicemix/smx4/nmr/trunk/assembly/pom.xml
servicemix/smx4/nmr/trunk/bundle/pom.xml
servicemix/smx4/nmr/trunk/jbi/deployer/pom.xml
servicemix/smx4/nmr/trunk/jbi/itests/pom.xml
servicemix/smx4/nmr/trunk/jbi/itests/src/test/java/org/apache/servicemix/jbi/IntegrationTest.java
servicemix/smx4/nmr/trunk/jbi/osgi/pom.xml
servicemix/smx4/nmr/trunk/jbi/pom.xml
servicemix/smx4/nmr/trunk/jbi/runtime/pom.xml
servicemix/smx4/nmr/trunk/pom.xml
Modified: servicemix/smx4/nmr/trunk/assembly/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/nmr/trunk/assembly/pom.xml?rev=688991&r1=688990&r2=688991&view=diff
==============================================================================
--- servicemix/smx4/nmr/trunk/assembly/pom.xml (original)
+++ servicemix/smx4/nmr/trunk/assembly/pom.xml Tue Aug 26 01:16:26 2008
@@ -70,9 +70,9 @@
<version>${pom.version}</version>
</dependency>
<dependency>
- <groupId>org.apache.servicemix.jbi</groupId>
- <artifactId>org.apache.servicemix.jbi.api</artifactId>
- <version>${pom.version}</version>
+ <groupId>org.apache.servicemix.specs</groupId>
+ <artifactId>org.apache.servicemix.specs.jbi-api-1.0</artifactId>
+ <version>${jbi.api.version}</version>
</dependency>
<dependency>
<groupId>org.apache.servicemix.jbi</groupId>
Modified: servicemix/smx4/nmr/trunk/bundle/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/nmr/trunk/bundle/pom.xml?rev=688991&r1=688990&r2=688991&view=diff
==============================================================================
--- servicemix/smx4/nmr/trunk/bundle/pom.xml (original)
+++ servicemix/smx4/nmr/trunk/bundle/pom.xml Tue Aug 26 01:16:26 2008
@@ -70,9 +70,9 @@
<version>${pom.version}</version>
</dependency>
<dependency>
- <groupId>org.apache.servicemix.jbi</groupId>
- <artifactId>org.apache.servicemix.jbi.api</artifactId>
- <version>${pom.version}</version>
+ <groupId>org.apache.servicemix.specs</groupId>
+ <artifactId>org.apache.servicemix.specs.jbi-api-1.0</artifactId>
+ <version>${jbi.api.version}</version>
</dependency>
<dependency>
<groupId>org.apache.servicemix.jbi</groupId>
@@ -131,7 +131,7 @@
<include>org.apache.servicemix.nmr:org.apache.servicemix.nmr.osgi</include>
<include>org.apache.servicemix.nmr:org.apache.servicemix.nmr.commands</include>
<include>org.apache.servicemix.nmr:org.apache.servicemix.nmr.management</include>
- <include>org.apache.servicemix.jbi:org.apache.servicemix.jbi.api</include>
+ <include>org.apache.servicemix.specs:org.apache.servicemix.specs.jbi-api-1.0</include>
<include>org.apache.servicemix.jbi:org.apache.servicemix.jbi.runtime</include>
<include>org.apache.servicemix.jbi:org.apache.servicemix.jbi.osgi</include>
<include>org.apache.servicemix.jbi:org.apache.servicemix.jbi.deployer</include>
Modified: servicemix/smx4/nmr/trunk/jbi/deployer/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/nmr/trunk/jbi/deployer/pom.xml?rev=688991&r1=688990&r2=688991&view=diff
==============================================================================
--- servicemix/smx4/nmr/trunk/jbi/deployer/pom.xml (original)
+++ servicemix/smx4/nmr/trunk/jbi/deployer/pom.xml Tue Aug 26 01:16:26 2008
@@ -34,14 +34,14 @@
<dependencies>
<dependency>
- <groupId>org.apache.servicemix.jbi</groupId>
- <artifactId>org.apache.servicemix.jbi.api</artifactId>
- <version>1.0-m2-SNAPSHOT</version>
+ <groupId>org.apache.servicemix.specs</groupId>
+ <artifactId>org.apache.servicemix.specs.jbi-api-1.0</artifactId>
+ <version>${jbi.api.version}</version>
</dependency>
<dependency>
<groupId>org.apache.servicemix.jbi</groupId>
<artifactId>org.apache.servicemix.jbi.runtime</artifactId>
- <version>1.0-m2-SNAPSHOT</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.servicemix.kernel</groupId>
Modified: servicemix/smx4/nmr/trunk/jbi/itests/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/nmr/trunk/jbi/itests/pom.xml?rev=688991&r1=688990&r2=688991&view=diff
==============================================================================
--- servicemix/smx4/nmr/trunk/jbi/itests/pom.xml (original)
+++ servicemix/smx4/nmr/trunk/jbi/itests/pom.xml Tue Aug 26 01:16:26 2008
@@ -104,9 +104,9 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>org.apache.servicemix.jbi</groupId>
- <artifactId>org.apache.servicemix.jbi.api</artifactId>
- <version>${project.version}</version>
+ <groupId>org.apache.servicemix.specs</groupId>
+ <artifactId>org.apache.servicemix.specs.jbi-api-1.0</artifactId>
+ <version>${jbi.api.version}</version>
<scope>test</scope>
</dependency>
<dependency>
Modified: servicemix/smx4/nmr/trunk/jbi/itests/src/test/java/org/apache/servicemix/jbi/IntegrationTest.java
URL: http://svn.apache.org/viewvc/servicemix/smx4/nmr/trunk/jbi/itests/src/test/java/org/apache/servicemix/jbi/IntegrationTest.java?rev=688991&r1=688990&r2=688991&view=diff
==============================================================================
--- servicemix/smx4/nmr/trunk/jbi/itests/src/test/java/org/apache/servicemix/jbi/IntegrationTest.java (original)
+++ servicemix/smx4/nmr/trunk/jbi/itests/src/test/java/org/apache/servicemix/jbi/IntegrationTest.java Tue Aug 26 01:16:26 2008
@@ -57,6 +57,7 @@
protected String[] getTestBundlesNames() {
return new String[] {
getBundle("org.apache.servicemix.specs", "org.apache.servicemix.specs.stax-api-1.0"),
+ getBundle("org.apache.servicemix.specs", "org.apache.servicemix.specs.jbi-api-1.0"),
getBundle("org.apache.geronimo.specs", "geronimo-activation_1.1_spec"),
getBundle("org.apache.geronimo.specs", "geronimo-jta_1.1_spec"),
getBundle("org.apache.felix", "org.apache.felix.prefs"),
@@ -66,7 +67,6 @@
getBundle("org.apache.servicemix.nmr", "org.apache.servicemix.nmr.spring"),
getBundle("org.apache.servicemix.nmr", "org.apache.servicemix.nmr.osgi"),
getBundle("org.apache.servicemix.document", "org.apache.servicemix.document"),
- getBundle("org.apache.servicemix.jbi", "org.apache.servicemix.jbi.api"),
getBundle("org.apache.servicemix.jbi", "org.apache.servicemix.jbi.runtime"),
getBundle("org.apache.servicemix.jbi", "org.apache.servicemix.jbi.deployer"),
getBundle("org.apache.servicemix.jbi", "org.apache.servicemix.jbi.osgi"),
Modified: servicemix/smx4/nmr/trunk/jbi/osgi/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/nmr/trunk/jbi/osgi/pom.xml?rev=688991&r1=688990&r2=688991&view=diff
==============================================================================
--- servicemix/smx4/nmr/trunk/jbi/osgi/pom.xml (original)
+++ servicemix/smx4/nmr/trunk/jbi/osgi/pom.xml Tue Aug 26 01:16:26 2008
@@ -33,9 +33,9 @@
<dependencies>
<dependency>
- <groupId>org.apache.servicemix.jbi</groupId>
- <artifactId>org.apache.servicemix.jbi.api</artifactId>
- <version>${pom.version}</version>
+ <groupId>org.apache.servicemix.specs</groupId>
+ <artifactId>org.apache.servicemix.specs.jbi-api-1.0</artifactId>
+ <version>${jbi.api.version}</version>
</dependency>
<dependency>
<groupId>org.apache.servicemix.jbi</groupId>
Modified: servicemix/smx4/nmr/trunk/jbi/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/nmr/trunk/jbi/pom.xml?rev=688991&r1=688990&r2=688991&view=diff
==============================================================================
--- servicemix/smx4/nmr/trunk/jbi/pom.xml (original)
+++ servicemix/smx4/nmr/trunk/jbi/pom.xml Tue Aug 26 01:16:26 2008
@@ -33,7 +33,6 @@
<name>Apache ServiceMix JBI</name>
<modules>
- <module>api</module>
<module>runtime</module>
<module>deployer</module>
<module>osgi</module>
Modified: servicemix/smx4/nmr/trunk/jbi/runtime/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/nmr/trunk/jbi/runtime/pom.xml?rev=688991&r1=688990&r2=688991&view=diff
==============================================================================
--- servicemix/smx4/nmr/trunk/jbi/runtime/pom.xml (original)
+++ servicemix/smx4/nmr/trunk/jbi/runtime/pom.xml Tue Aug 26 01:16:26 2008
@@ -38,9 +38,9 @@
<version>${project.version}</version>
</dependency>
<dependency>
- <groupId>org.apache.servicemix.jbi</groupId>
- <artifactId>org.apache.servicemix.jbi.api</artifactId>
- <version>${project.version}</version>
+ <groupId>org.apache.servicemix.specs</groupId>
+ <artifactId>org.apache.servicemix.specs.jbi-api-1.0</artifactId>
+ <version>1.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.servicemix.document</groupId>
Modified: servicemix/smx4/nmr/trunk/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/nmr/trunk/pom.xml?rev=688991&r1=688990&r2=688991&view=diff
==============================================================================
--- servicemix/smx4/nmr/trunk/pom.xml (original)
+++ servicemix/smx4/nmr/trunk/pom.xml Tue Aug 26 01:16:26 2008
@@ -76,6 +76,7 @@
<geronimo.javamail.version>1.2</geronimo.javamail.version>
<geronimo.jta.version>1.1.1</geronimo.jta.version>
<geronimo.servlet.version>1.1.2</geronimo.servlet.version>
+ <jbi.api.version>1.1-SNAPSHOT</jbi.api.version>
<jline.version>0.9.94</jline.version>
<junit.version>4.4_1</junit.version>
<log4j.version>1.2.14</log4j.version>