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/04/23 13:48:39 UTC
svn commit: r650836 - in /servicemix/smx4/nmr/trunk: ./ assembly/
assembly/src/main/descriptors/ bundle/ bundles/ bundles/woodstox/ jbi/
jbi/api/ jbi/commands/ jbi/deployer/ jbi/itests/
jbi/itests/src/test/java/org/apache/servicemix/jbi/ jbi/itests/src...
Author: gnodet
Date: Wed Apr 23 04:48:30 2008
New Revision: 650836
URL: http://svn.apache.org/viewvc?rev=650836&view=rev
Log:
Use 'Apache ServiceMix' in the project name, use the new spec jars, update the legal stuff, upgrade spring and kernel to latest version, clean the integration tests
Removed:
servicemix/smx4/nmr/trunk/jbi/itests/src/test/java/org/apache/servicemix/jbi/FrameworkUtil.java
Modified:
servicemix/smx4/nmr/trunk/assembly/pom.xml
servicemix/smx4/nmr/trunk/assembly/src/main/descriptors/unix-bin.xml
servicemix/smx4/nmr/trunk/assembly/src/main/descriptors/windows-bin.xml
servicemix/smx4/nmr/trunk/bundle/pom.xml
servicemix/smx4/nmr/trunk/bundles/pom.xml
servicemix/smx4/nmr/trunk/bundles/woodstox/pom.xml
servicemix/smx4/nmr/trunk/jbi/api/pom.xml
servicemix/smx4/nmr/trunk/jbi/commands/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/itests/src/test/resources/log4j.properties
servicemix/smx4/nmr/trunk/jbi/management/pom.xml
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/nmr/api/pom.xml
servicemix/smx4/nmr/trunk/nmr/commands/pom.xml
servicemix/smx4/nmr/trunk/nmr/core/pom.xml
servicemix/smx4/nmr/trunk/nmr/management/pom.xml
servicemix/smx4/nmr/trunk/nmr/osgi/pom.xml
servicemix/smx4/nmr/trunk/nmr/pom.xml
servicemix/smx4/nmr/trunk/nmr/spring/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=650836&r1=650835&r2=650836&view=diff
==============================================================================
--- servicemix/smx4/nmr/trunk/assembly/pom.xml (original)
+++ servicemix/smx4/nmr/trunk/assembly/pom.xml Wed Apr 23 04:48:30 2008
@@ -31,7 +31,7 @@
<artifactId>apache-servicemix-nmr</artifactId>
<packaging>pom</packaging>
<version>1.0-m2-SNAPSHOT</version>
- <name>ServiceMix NMR :: Assembly</name>
+ <name>Apache ServiceMix NMR :: Assembly</name>
<dependencies>
<dependency>
@@ -93,6 +93,11 @@
<groupId>org.apache.servicemix.jbi</groupId>
<artifactId>org.apache.servicemix.jbi.runtime</artifactId>
<version>${pom.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.servicemix.specs</groupId>
+ <artifactId>org.apache.servicemix.specs.stax-api-1.0</artifactId>
+ <version>${servicemix.specs.version}</version>
</dependency>
<dependency>
<groupId>org.apache.servicemix.bundles</groupId>
Modified: servicemix/smx4/nmr/trunk/assembly/src/main/descriptors/unix-bin.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/nmr/trunk/assembly/src/main/descriptors/unix-bin.xml?rev=650836&r1=650835&r2=650836&view=diff
==============================================================================
--- servicemix/smx4/nmr/trunk/assembly/src/main/descriptors/unix-bin.xml (original)
+++ servicemix/smx4/nmr/trunk/assembly/src/main/descriptors/unix-bin.xml Wed Apr 23 04:48:30 2008
@@ -104,11 +104,11 @@
<unpack>false</unpack>
<scope>runtime</scope>
<includes>
+ <include>org.apache.servicemix.specs:org.apache.servicemix.specs.stax-api-1.0</include>
<include>org.apache.geronimo.specs:geronimo-activation_1.1_spec</include>
<include>org.apache.geronimo.specs:geronimo-javamail_1.4_spec</include>
<include>org.apache.geronimo.specs:geronimo-jta_1.1_spec</include>
<include>org.apache.servicemix.bundles:org.apache.servicemix.bundles.woodstox-3.2.3</include>
- <include>org.apache.felix:org.apache.felix.prefs</include>
<include>org.apache.xbean:xbean-classloader</include>
<include>org.apache.servicemix.nmr:org.apache.servicemix.nmr.api</include>
<include>org.apache.servicemix.nmr:org.apache.servicemix.nmr.core</include>
Modified: servicemix/smx4/nmr/trunk/assembly/src/main/descriptors/windows-bin.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/nmr/trunk/assembly/src/main/descriptors/windows-bin.xml?rev=650836&r1=650835&r2=650836&view=diff
==============================================================================
--- servicemix/smx4/nmr/trunk/assembly/src/main/descriptors/windows-bin.xml (original)
+++ servicemix/smx4/nmr/trunk/assembly/src/main/descriptors/windows-bin.xml Wed Apr 23 04:48:30 2008
@@ -96,11 +96,11 @@
<unpack>false</unpack>
<scope>runtime</scope>
<includes>
+ <include>org.apache.servicemix.specs:org.apache.servicemix.specs.stax-api-1.0</include>
<include>org.apache.geronimo.specs:geronimo-activation_1.1_spec</include>
<include>org.apache.geronimo.specs:geronimo-javamail_1.4_spec</include>
<include>org.apache.geronimo.specs:geronimo-jta_1.1_spec</include>
<include>org.apache.servicemix.bundles:org.apache.servicemix.bundles.woodstox-3.2.3</include>
- <include>org.apache.felix:org.apache.felix.prefs</include>
<include>org.apache.xbean:xbean-classloader</include>
<include>org.apache.servicemix.nmr:org.apache.servicemix.nmr.api</include>
<include>org.apache.servicemix.nmr:org.apache.servicemix.nmr.core</include>
Modified: servicemix/smx4/nmr/trunk/bundle/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/nmr/trunk/bundle/pom.xml?rev=650836&r1=650835&r2=650836&view=diff
==============================================================================
--- servicemix/smx4/nmr/trunk/bundle/pom.xml (original)
+++ servicemix/smx4/nmr/trunk/bundle/pom.xml Wed Apr 23 04:48:30 2008
@@ -31,7 +31,7 @@
<artifactId>org.apache.servicemix.nmr.bundle</artifactId>
<packaging>jar</packaging>
<version>1.0-m2-SNAPSHOT</version>
- <name>ServiceMix NMR :: Bundle</name>
+ <name>Apache ServiceMix NMR :: Bundle</name>
<properties>
<maven.test.skip>true</maven.test.skip>
Modified: servicemix/smx4/nmr/trunk/bundles/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/nmr/trunk/bundles/pom.xml?rev=650836&r1=650835&r2=650836&view=diff
==============================================================================
--- servicemix/smx4/nmr/trunk/bundles/pom.xml (original)
+++ servicemix/smx4/nmr/trunk/bundles/pom.xml Wed Apr 23 04:48:30 2008
@@ -30,7 +30,7 @@
<artifactId>bundles</artifactId>
<packaging>pom</packaging>
<version>1.0-m2-SNAPSHOT</version>
- <name>ServiceMix OSGI Common Bundles</name>
+ <name>Apache ServiceMix OSGI Common Bundles</name>
<modules>
<module>woodstox</module>
Modified: servicemix/smx4/nmr/trunk/bundles/woodstox/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/nmr/trunk/bundles/woodstox/pom.xml?rev=650836&r1=650835&r2=650836&view=diff
==============================================================================
--- servicemix/smx4/nmr/trunk/bundles/woodstox/pom.xml (original)
+++ servicemix/smx4/nmr/trunk/bundles/woodstox/pom.xml Wed Apr 23 04:48:30 2008
@@ -31,7 +31,7 @@
<artifactId>${pom.groupId}.${pkgArtifactId}-${pkgVersion}</artifactId>
<packaging>bundle</packaging>
<version>1.0-m2-SNAPSHOT</version>
- <name>ServiceMix OSGI Common Bundles: ${pkgArtifactId}-${pkgVersion}</name>
+ <name>Apache ServiceMix OSGI Common Bundles: ${pkgArtifactId}-${pkgVersion}</name>
<description>
This bundle simply wraps ${pkgArtifactId}-${pkgVersion}.jar.
</description>
@@ -48,6 +48,9 @@
com.ctc.wstx*;version=${pkgVersion};-split-package:=merge-first,
org.codehaus.stax2*;version=${pkgVersion};-split-package:=merge-first,
</servicemix.osgi.export>
+ <servicemix.osgi.private.pkg>
+ META-INF*
+ </servicemix.osgi.private.pkg>
</properties>
<dependencies>
@@ -64,9 +67,9 @@
</exclusions>
</dependency>
<dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-stax-api_1.0_spec</artifactId>
- <version>${geronimo.stax.version}</version>
+ <groupId>org.apache.servicemix.specs</groupId>
+ <artifactId>org.apache.servicemix.specs.stax-api-1.0</artifactId>
+ <version>${servicemix.specs.version}</version>
<optional>true</optional>
</dependency>
</dependencies>
Modified: servicemix/smx4/nmr/trunk/jbi/api/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/nmr/trunk/jbi/api/pom.xml?rev=650836&r1=650835&r2=650836&view=diff
==============================================================================
--- servicemix/smx4/nmr/trunk/jbi/api/pom.xml (original)
+++ servicemix/smx4/nmr/trunk/jbi/api/pom.xml Wed Apr 23 04:48:30 2008
@@ -31,7 +31,7 @@
<artifactId>org.apache.servicemix.jbi.api</artifactId>
<packaging>bundle</packaging>
<version>1.0-m2-SNAPSHOT</version>
- <name>ServiceMix JBI API</name>
+ <name>Apache ServiceMix JBI API</name>
<dependencies>
<dependency>
Modified: servicemix/smx4/nmr/trunk/jbi/commands/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/nmr/trunk/jbi/commands/pom.xml?rev=650836&r1=650835&r2=650836&view=diff
==============================================================================
--- servicemix/smx4/nmr/trunk/jbi/commands/pom.xml (original)
+++ servicemix/smx4/nmr/trunk/jbi/commands/pom.xml Wed Apr 23 04:48:30 2008
@@ -29,7 +29,7 @@
<groupId>org.apache.servicemix.jbi</groupId>
<artifactId>org.apache.servicemix.jbi.commands</artifactId>
<packaging>bundle</packaging>
- <name>ServiceMix JBI Commands</name>
+ <name>Apache ServiceMix JBI Commands</name>
<dependencies>
<dependency>
@@ -40,7 +40,7 @@
<dependency>
<groupId>org.apache.servicemix.kernel.gshell</groupId>
<artifactId>org.apache.servicemix.kernel.gshell.core</artifactId>
- <version>${smx.kernel.version}</version>
+ <version>${servicemix.kernel.version}</version>
</dependency>
</dependencies>
Modified: servicemix/smx4/nmr/trunk/jbi/deployer/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/nmr/trunk/jbi/deployer/pom.xml?rev=650836&r1=650835&r2=650836&view=diff
==============================================================================
--- servicemix/smx4/nmr/trunk/jbi/deployer/pom.xml (original)
+++ servicemix/smx4/nmr/trunk/jbi/deployer/pom.xml Wed Apr 23 04:48:30 2008
@@ -30,7 +30,7 @@
<artifactId>org.apache.servicemix.jbi.deployer</artifactId>
<packaging>bundle</packaging>
<version>1.0-m2-SNAPSHOT</version>
- <name>ServiceMix JBI Deployer</name>
+ <name>Apache ServiceMix JBI Deployer</name>
<dependencies>
<dependency>
@@ -41,7 +41,7 @@
<dependency>
<groupId>org.apache.servicemix.kernel</groupId>
<artifactId>org.apache.servicemix.kernel.filemonitor</artifactId>
- <version>${smx.kernel.version}</version>
+ <version>${servicemix.kernel.version}</version>
<exclusions>
<exclusion>
<groupId>org.apache.felix</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=650836&r1=650835&r2=650836&view=diff
==============================================================================
--- servicemix/smx4/nmr/trunk/jbi/itests/pom.xml (original)
+++ servicemix/smx4/nmr/trunk/jbi/itests/pom.xml Wed Apr 23 04:48:30 2008
@@ -29,17 +29,13 @@
<groupId>org.apache.servicemix.jbi</groupId>
<artifactId>org.apache.servicemix.jbi.itests</artifactId>
<packaging>jar</packaging>
- <name>ServiceMix JBI Integration Tests</name>
-
- <properties>
- <osgi.test.platform>org.springframework.osgi.test.platform.FelixPlatform</osgi.test.platform>
- </properties>
+ <name>Apache ServiceMix JBI Integration Tests</name>
<dependencies>
<dependency>
<groupId>org.apache.servicemix.kernel</groupId>
<artifactId>org.apache.servicemix.kernel.main</artifactId>
- <version>${smx.kernel.version}</version>
+ <version>${servicemix.kernel.version}</version>
<scope>test</scope>
<exclusions>
<exclusion>
@@ -51,7 +47,7 @@
<dependency>
<groupId>org.apache.servicemix.kernel.testing</groupId>
<artifactId>org.apache.servicemix.kernel.testing.support</artifactId>
- <version>${smx.kernel.version}</version>
+ <version>${servicemix.kernel.version}</version>
<scope>test</scope>
<exclusions>
<exclusion>
@@ -63,7 +59,7 @@
<dependency>
<groupId>org.apache.servicemix.kernel</groupId>
<artifactId>org.apache.servicemix.kernel.filemonitor</artifactId>
- <version>${smx.kernel.version}</version>
+ <version>${servicemix.kernel.version}</version>
<scope>test</scope>
<exclusions>
<exclusion>
@@ -75,7 +71,7 @@
<dependency>
<groupId>org.apache.servicemix.bundles</groupId>
<artifactId>org.apache.servicemix.bundles.ant-${ant.version}</artifactId>
- <version>${smx.kernel.version}</version>
+ <version>${servicemix.kernel.version}</version>
</dependency>
<dependency>
<groupId>org.apache.servicemix.nmr</groupId>
@@ -140,21 +136,21 @@
<dependency>
<groupId>org.apache.servicemix</groupId>
<artifactId>servicemix-shared-compat</artifactId>
- <version>${smx3.version}</version>
+ <version>${servicemix3.version}</version>
<classifier>installer</classifier>
<type>zip</type>
</dependency>
<dependency>
<groupId>org.apache.servicemix</groupId>
<artifactId>servicemix-eip</artifactId>
- <version>${smx3.version}</version>
+ <version>${servicemix3.version}</version>
<classifier>installer</classifier>
<type>zip</type>
</dependency>
<dependency>
<groupId>org.apache.servicemix</groupId>
<artifactId>servicemix-jsr181</artifactId>
- <version>${smx3.version}</version>
+ <version>${servicemix3.version}</version>
<classifier>installer</classifier>
<type>zip</type>
<exclusions>
@@ -171,14 +167,14 @@
<dependency>
<groupId>org.apache.servicemix</groupId>
<artifactId>servicemix-http</artifactId>
- <version>${smx3.version}</version>
+ <version>${servicemix3.version}</version>
<classifier>installer</classifier>
<type>zip</type>
</dependency>
<dependency>
<groupId>org.apache.servicemix.samples.wsdl-first</groupId>
<artifactId>wsdl-first-sa</artifactId>
- <version>${smx3.version}</version>
+ <version>${servicemix3.version}</version>
<type>zip</type>
<exclusions>
<exclusion>
@@ -191,6 +187,17 @@
</exclusion>
</exclusions>
</dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-jta_1.1_spec</artifactId>
+ <version>${geronimo.jta.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.servicemix.specs</groupId>
+ <artifactId>org.apache.servicemix.specs.stax-api-1.0</artifactId>
+ <version>${servicemix.specs.version}</version>
+ <scope>test</scope>
+ </dependency>
</dependencies>
<build>
@@ -199,7 +206,7 @@
<plugin>
<groupId>org.apache.servicemix.kernel.testing</groupId>
<artifactId>depends-maven-plugin</artifactId>
- <version>${smx.kernel.version}</version>
+ <version>${servicemix.kernel.version}</version>
<executions>
<execution>
<id>generate-depends-file</id>
@@ -226,35 +233,35 @@
<artifactItem>
<groupId>org.apache.servicemix</groupId>
<artifactId>servicemix-shared-compat</artifactId>
- <version>${smx3.version}</version>
+ <version>${servicemix3.version}</version>
<classifier>installer</classifier>
<type>zip</type>
</artifactItem>
<artifactItem>
<groupId>org.apache.servicemix</groupId>
<artifactId>servicemix-eip</artifactId>
- <version>${smx3.version}</version>
+ <version>${servicemix3.version}</version>
<classifier>installer</classifier>
<type>zip</type>
</artifactItem>
<artifactItem>
<groupId>org.apache.servicemix</groupId>
<artifactId>servicemix-jsr181</artifactId>
- <version>${smx3.version}</version>
+ <version>${servicemix3.version}</version>
<classifier>installer</classifier>
<type>zip</type>
</artifactItem>
<artifactItem>
<groupId>org.apache.servicemix</groupId>
<artifactId>servicemix-http</artifactId>
- <version>${smx3.version}</version>
+ <version>${servicemix3.version}</version>
<classifier>installer</classifier>
<type>zip</type>
</artifactItem>
<artifactItem>
<groupId>org.apache.servicemix.samples.wsdl-first</groupId>
<artifactId>wsdl-first-sa</artifactId>
- <version>${smx3.version}</version>
+ <version>${servicemix3.version}</version>
<type>zip</type>
</artifactItem>
</artifactItems>
@@ -267,12 +274,6 @@
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
<forkMode>pertest</forkMode>
- <systemProperties>
- <property>
- <name>org.springframework.osgi.test.framework</name>
- <value>${osgi.test.platform}</value>
- </property>
- </systemProperties>
</configuration>
</plugin>
</plugins>
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=650836&r1=650835&r2=650836&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 Wed Apr 23 04:48:30 2008
@@ -27,16 +27,8 @@
public class IntegrationTest extends AbstractIntegrationTest {
static {
- File f = new File("target/smx4");
- f.mkdirs();
- System.setProperty("servicemix.home", f.getAbsolutePath());
- System.setProperty("servicemix.base", f.getAbsolutePath());
- System.setProperty("org.apache.servicemix.filemonitor.configDir", new File(f, "etc").getAbsolutePath());
- System.setProperty("org.apache.servicemix.filemonitor.monitorDir", new File(f, "deploy").getAbsolutePath());
- System.setProperty("org.apache.servicemix.filemonitor.generatedJarDir", new File(f, "data/generate-bundles").getAbsolutePath());
System.setProperty("javax.xml.parsers.DocumentBuilderFactory", "com.sun.org.apache.xerces.internal.jaxp.DocumentBuilderFactoryImpl");
System.setProperty("javax.xml.parsers.SAXParserFactory", "com.sun.org.apache.xerces.internal.jaxp.SAXParserFactoryImpl");
- System.setProperty("org.osgi.vendor.framework", "org.apache.servicemix.jbi");
}
private Properties dependencies;
@@ -69,8 +61,9 @@
*/
protected String[] getTestBundlesNames() {
return new String[] {
- getBundle("org.apache.geronimo.specs", "geronimo-stax-api_1.0_spec"),
+ getBundle("org.apache.servicemix.specs", "org.apache.servicemix.specs.stax-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"),
getBundle("org.apache.xbean", "xbean-classloader"),
getBundle("org.apache.servicemix.nmr", "org.apache.servicemix.nmr.api"),
Modified: servicemix/smx4/nmr/trunk/jbi/itests/src/test/resources/log4j.properties
URL: http://svn.apache.org/viewvc/servicemix/smx4/nmr/trunk/jbi/itests/src/test/resources/log4j.properties?rev=650836&r1=650835&r2=650836&view=diff
==============================================================================
--- servicemix/smx4/nmr/trunk/jbi/itests/src/test/resources/log4j.properties (original)
+++ servicemix/smx4/nmr/trunk/jbi/itests/src/test/resources/log4j.properties Wed Apr 23 04:48:30 2008
@@ -16,7 +16,7 @@
#
################################################################################
-log4j.rootLogger=DEBUG, out
+log4j.rootLogger=DEBUG, stdout
log4j.logger.org.springframework.osgi=DEBUG
log4j.logger.org.apache.camel=DEBUG
Modified: servicemix/smx4/nmr/trunk/jbi/management/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/nmr/trunk/jbi/management/pom.xml?rev=650836&r1=650835&r2=650836&view=diff
==============================================================================
--- servicemix/smx4/nmr/trunk/jbi/management/pom.xml (original)
+++ servicemix/smx4/nmr/trunk/jbi/management/pom.xml Wed Apr 23 04:48:30 2008
@@ -29,7 +29,7 @@
<groupId>org.apache.servicemix.jbi</groupId>
<artifactId>org.apache.servicemix.jbi.management</artifactId>
<packaging>bundle</packaging>
- <name>ServiceMix JBI Management</name>
+ <name>Apache ServiceMix JBI Management</name>
<dependencies>
<dependency>
Modified: servicemix/smx4/nmr/trunk/jbi/osgi/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/nmr/trunk/jbi/osgi/pom.xml?rev=650836&r1=650835&r2=650836&view=diff
==============================================================================
--- servicemix/smx4/nmr/trunk/jbi/osgi/pom.xml (original)
+++ servicemix/smx4/nmr/trunk/jbi/osgi/pom.xml Wed Apr 23 04:48:30 2008
@@ -29,7 +29,7 @@
<groupId>org.apache.servicemix.jbi</groupId>
<artifactId>org.apache.servicemix.jbi.osgi</artifactId>
<packaging>bundle</packaging>
- <name>ServiceMix JBI OSGi</name>
+ <name>Apache ServiceMix JBI OSGi</name>
<dependencies>
<dependency>
Modified: servicemix/smx4/nmr/trunk/jbi/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/nmr/trunk/jbi/pom.xml?rev=650836&r1=650835&r2=650836&view=diff
==============================================================================
--- servicemix/smx4/nmr/trunk/jbi/pom.xml (original)
+++ servicemix/smx4/nmr/trunk/jbi/pom.xml Wed Apr 23 04:48:30 2008
@@ -30,7 +30,7 @@
<artifactId>jbi</artifactId>
<packaging>pom</packaging>
<version>1.0-m2-SNAPSHOT</version>
- <name>ServiceMix JBI</name>
+ <name>Apache ServiceMix JBI</name>
<modules>
<module>api</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=650836&r1=650835&r2=650836&view=diff
==============================================================================
--- servicemix/smx4/nmr/trunk/jbi/runtime/pom.xml (original)
+++ servicemix/smx4/nmr/trunk/jbi/runtime/pom.xml Wed Apr 23 04:48:30 2008
@@ -29,7 +29,7 @@
<groupId>org.apache.servicemix.jbi</groupId>
<artifactId>org.apache.servicemix.jbi.runtime</artifactId>
<packaging>bundle</packaging>
- <name>ServiceMix JBI Runtime</name>
+ <name>Apache ServiceMix JBI Runtime</name>
<dependencies>
<dependency>
@@ -50,7 +50,7 @@
<dependency>
<groupId>org.apache.servicemix</groupId>
<artifactId>servicemix-eip</artifactId>
- <version>${smx3.version}</version>
+ <version>${servicemix3.version}</version>
<scope>test</scope>
<exclusions>
<exclusion>
@@ -74,13 +74,13 @@
<dependency>
<groupId>org.apache.servicemix</groupId>
<artifactId>servicemix-common</artifactId>
- <version>${smx3.version}</version>
+ <version>${servicemix3.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.servicemix</groupId>
<artifactId>servicemix-core</artifactId>
- <version>${smx3.version}</version>
+ <version>${servicemix3.version}</version>
<scope>test</scope>
</dependency>
<dependency>
Modified: servicemix/smx4/nmr/trunk/nmr/api/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/nmr/trunk/nmr/api/pom.xml?rev=650836&r1=650835&r2=650836&view=diff
==============================================================================
--- servicemix/smx4/nmr/trunk/nmr/api/pom.xml (original)
+++ servicemix/smx4/nmr/trunk/nmr/api/pom.xml Wed Apr 23 04:48:30 2008
@@ -29,7 +29,7 @@
<groupId>org.apache.servicemix.nmr</groupId>
<artifactId>org.apache.servicemix.nmr.api</artifactId>
<packaging>bundle</packaging>
- <name>ServiceMix NMR API</name>
+ <name>Apache ServiceMix NMR API</name>
<dependencies>
<dependency>
Modified: servicemix/smx4/nmr/trunk/nmr/commands/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/nmr/trunk/nmr/commands/pom.xml?rev=650836&r1=650835&r2=650836&view=diff
==============================================================================
--- servicemix/smx4/nmr/trunk/nmr/commands/pom.xml (original)
+++ servicemix/smx4/nmr/trunk/nmr/commands/pom.xml Wed Apr 23 04:48:30 2008
@@ -29,7 +29,7 @@
<groupId>org.apache.servicemix.nmr</groupId>
<artifactId>org.apache.servicemix.nmr.commands</artifactId>
<packaging>bundle</packaging>
- <name>ServiceMix NMR Commands</name>
+ <name>Apache ServiceMix NMR Commands</name>
<dependencies>
<dependency>
@@ -40,7 +40,7 @@
<dependency>
<groupId>org.apache.servicemix.kernel.gshell</groupId>
<artifactId>org.apache.servicemix.kernel.gshell.core</artifactId>
- <version>${smx.kernel.version}</version>
+ <version>${servicemix.kernel.version}</version>
</dependency>
</dependencies>
Modified: servicemix/smx4/nmr/trunk/nmr/core/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/nmr/trunk/nmr/core/pom.xml?rev=650836&r1=650835&r2=650836&view=diff
==============================================================================
--- servicemix/smx4/nmr/trunk/nmr/core/pom.xml (original)
+++ servicemix/smx4/nmr/trunk/nmr/core/pom.xml Wed Apr 23 04:48:30 2008
@@ -29,7 +29,7 @@
<groupId>org.apache.servicemix.nmr</groupId>
<artifactId>org.apache.servicemix.nmr.core</artifactId>
<packaging>bundle</packaging>
- <name>ServiceMix NMR Core</name>
+ <name>Apache ServiceMix NMR Core</name>
<dependencies>
<dependency>
Modified: servicemix/smx4/nmr/trunk/nmr/management/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/nmr/trunk/nmr/management/pom.xml?rev=650836&r1=650835&r2=650836&view=diff
==============================================================================
--- servicemix/smx4/nmr/trunk/nmr/management/pom.xml (original)
+++ servicemix/smx4/nmr/trunk/nmr/management/pom.xml Wed Apr 23 04:48:30 2008
@@ -29,7 +29,7 @@
<groupId>org.apache.servicemix.nmr</groupId>
<artifactId>org.apache.servicemix.nmr.management</artifactId>
<packaging>bundle</packaging>
- <name>ServiceMix NMR Management</name>
+ <name>Apache ServiceMix NMR Management</name>
<dependencies>
<dependency>
Modified: servicemix/smx4/nmr/trunk/nmr/osgi/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/nmr/trunk/nmr/osgi/pom.xml?rev=650836&r1=650835&r2=650836&view=diff
==============================================================================
--- servicemix/smx4/nmr/trunk/nmr/osgi/pom.xml (original)
+++ servicemix/smx4/nmr/trunk/nmr/osgi/pom.xml Wed Apr 23 04:48:30 2008
@@ -29,7 +29,7 @@
<groupId>org.apache.servicemix.nmr</groupId>
<artifactId>org.apache.servicemix.nmr.osgi</artifactId>
<packaging>bundle</packaging>
- <name>ServiceMix NMR OSGi</name>
+ <name>Apache ServiceMix NMR OSGi</name>
<dependencies>
<dependency>
Modified: servicemix/smx4/nmr/trunk/nmr/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/nmr/trunk/nmr/pom.xml?rev=650836&r1=650835&r2=650836&view=diff
==============================================================================
--- servicemix/smx4/nmr/trunk/nmr/pom.xml (original)
+++ servicemix/smx4/nmr/trunk/nmr/pom.xml Wed Apr 23 04:48:30 2008
@@ -29,7 +29,7 @@
<groupId>org.apache.servicemix.nmr</groupId>
<artifactId>nmr</artifactId>
<packaging>pom</packaging>
- <name>ServiceMix NMR</name>
+ <name>Apache ServiceMix NMR</name>
<modules>
<module>api</module>
Modified: servicemix/smx4/nmr/trunk/nmr/spring/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/nmr/trunk/nmr/spring/pom.xml?rev=650836&r1=650835&r2=650836&view=diff
==============================================================================
--- servicemix/smx4/nmr/trunk/nmr/spring/pom.xml (original)
+++ servicemix/smx4/nmr/trunk/nmr/spring/pom.xml Wed Apr 23 04:48:30 2008
@@ -29,7 +29,7 @@
<groupId>org.apache.servicemix.nmr</groupId>
<artifactId>org.apache.servicemix.nmr.spring</artifactId>
<packaging>bundle</packaging>
- <name>ServiceMix NMR Spring</name>
+ <name>Apache ServiceMix NMR Spring</name>
<dependencies>
<dependency>
Modified: servicemix/smx4/nmr/trunk/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/nmr/trunk/pom.xml?rev=650836&r1=650835&r2=650836&view=diff
==============================================================================
--- servicemix/smx4/nmr/trunk/pom.xml (original)
+++ servicemix/smx4/nmr/trunk/pom.xml Wed Apr 23 04:48:30 2008
@@ -75,17 +75,18 @@
<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>
- <geronimo.stax.version>1.0.1</geronimo.stax.version>
<gshell.version>1.0-alpha-1</gshell.version>
<junit.version>4.4</junit.version>
<jline.version>0.9.93</jline.version>
<log4j.version>1.2.14</log4j.version>
<mina.version>1.1.6</mina.version>
<pax.logging.version>1.0</pax.logging.version>
- <smx3.version>3.2.1</smx3.version>
- <smx.kernel.version>1.0-m2</smx.kernel.version>
- <spring.osgi.version>1.0</spring.osgi.version>
- <spring.version>2.5.1</spring.version>
+ <servicemix3.version>3.2.1</servicemix3.version>
+ <servicemix.kernel.version>1.0-m3-SNAPSHOT</servicemix.kernel.version>
+ <servicemix.legal.version>1.0-SNAPSHOT</servicemix.legal.version>
+ <servicemix.specs.version>1.0-SNAPSHOT</servicemix.specs.version>
+ <spring.osgi.version>1.0.2</spring.osgi.version>
+ <spring.version>2.5.2</spring.version>
<woodstox.version>3.2.3</woodstox.version>
<xbean.version>3.3.1-r631610</xbean.version>
<xstream.version>1.2.2</xstream.version>
@@ -101,7 +102,7 @@
<!-- ServiceMix repo -->
<repository>
<id>servicemix</id>
- <name>ServiceMix Repository</name>
+ <name>Apache ServiceMix Repository</name>
<url>http://svn.apache.org/repos/asf/servicemix/m2-repo</url>
</repository>
<!-- Apache snapshot -->
@@ -274,8 +275,34 @@
</pluginManagement>
<plugins>
<plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-dependency-plugin</artifactId>
+ <version>2.0</version>
+ <executions>
+ <execution>
+ <id>copy-legal</id>
+ <phase>generate-resources</phase>
+ <goals>
+ <goal>copy</goal>
+ </goals>
+ <configuration>
+ <artifactItems>
+ <artifactItem>
+ <groupId>org.apache.servicemix.legal</groupId>
+ <artifactId>legal</artifactId>
+ <version>${servicemix.legal.version}</version>
+ <type>xml</type>
+ <outputDirectory>target/legal/</outputDirectory>
+ </artifactItem>
+ </artifactItems>
+ <stripVersion>true</stripVersion>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
<artifactId>maven-remote-resources-plugin</artifactId>
- <version>1.0-beta-2</version>
+ <version>1.0</version>
<executions>
<execution>
<goals>
@@ -283,10 +310,14 @@
</goals>
<configuration>
<resourceBundles>
- <resourceBundle>org.apache:apache-jar-resource-bundle:1.3</resourceBundle>
+ <resourceBundle>org.apache:apache-jar-resource-bundle:1.4</resourceBundle>
</resourceBundles>
+ <supplementalModels>
+ <supplementalModel>target/legal/legal.xml</supplementalModel>
+ </supplementalModels>
<properties>
<addLicense>true</addLicense>
+ <addArtifact>true</addArtifact>
<projectName>Apache ServiceMix</projectName>
</properties>
</configuration>