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 2009/08/21 10:44:46 UTC
svn commit: r806458 - in /servicemix/sandbox/karaf/nmr: ./ assembly/
assembly/src/main/descriptors/ assembly/src/main/filtered-resources/
assembly/src/main/filtered-resources/etc/
Author: gnodet
Date: Fri Aug 21 08:44:45 2009
New Revision: 806458
URL: http://svn.apache.org/viewvc?rev=806458&view=rev
Log:
Fix the NMR/karaf assembly a bit
Added:
servicemix/sandbox/karaf/nmr/assembly/src/main/filtered-resources/etc/org.apache.felix.karaf.features.cfg
- copied, changed from r805711, servicemix/sandbox/karaf/nmr/assembly/src/main/filtered-resources/etc/org.apache.servicemix.features.cfg
Removed:
servicemix/sandbox/karaf/nmr/assembly/src/main/filtered-resources/etc/org.apache.servicemix.features.cfg
Modified:
servicemix/sandbox/karaf/nmr/assembly/pom.xml
servicemix/sandbox/karaf/nmr/assembly/src/main/descriptors/unix-bin.xml
servicemix/sandbox/karaf/nmr/assembly/src/main/descriptors/windows-bin.xml
servicemix/sandbox/karaf/nmr/assembly/src/main/filtered-resources/features.xml
servicemix/sandbox/karaf/nmr/pom.xml
Modified: servicemix/sandbox/karaf/nmr/assembly/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/sandbox/karaf/nmr/assembly/pom.xml?rev=806458&r1=806457&r2=806458&view=diff
==============================================================================
--- servicemix/sandbox/karaf/nmr/assembly/pom.xml (original)
+++ servicemix/sandbox/karaf/nmr/assembly/pom.xml Fri Aug 21 08:44:45 2009
@@ -132,6 +132,14 @@
<artifactId>org.apache.servicemix.bundles.howl</artifactId>
</dependency>
<dependency>
+ <groupId>org.apache.servicemix.bundles</groupId>
+ <artifactId>org.apache.servicemix.bundles.aopalliance</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.servicemix.bundles</groupId>
+ <artifactId>org.apache.servicemix.bundles.cglib</artifactId>
+ </dependency>
+ <dependency>
<groupId>org.apache.servicemix.transaction</groupId>
<artifactId>org.apache.servicemix.transaction</artifactId>
</dependency>
@@ -155,6 +163,18 @@
<groupId>org.apache.xbean</groupId>
<artifactId>xbean-classloader</artifactId>
</dependency>
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-context-support</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework.osgi</groupId>
+ <artifactId>spring-osgi-extender</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework.osgi</groupId>
+ <artifactId>spring-osgi-annotation</artifactId>
+ </dependency>
</dependencies>
<build>
<resources>
@@ -238,8 +258,9 @@
</executions>
</plugin>
<plugin>
- <groupId>org.apache.servicemix.tooling</groupId>
+ <groupId>org.apache.felix.karaf.tooling</groupId>
<artifactId>features-maven-plugin</artifactId>
+ <version>${felix.karaf.version}</version>
<executions>
<execution>
<id>add-features-to-repo</id>
@@ -249,6 +270,7 @@
</goals>
<configuration>
<descriptors>
+ <descriptor>mvn:org.apache.felix.karaf/apache-felix-karaf/${felix.karaf.version}/xml/features</descriptor>
<descriptor>file:${basedir}/target/classes/features.xml</descriptor>
</descriptors>
<features>
Modified: servicemix/sandbox/karaf/nmr/assembly/src/main/descriptors/unix-bin.xml
URL: http://svn.apache.org/viewvc/servicemix/sandbox/karaf/nmr/assembly/src/main/descriptors/unix-bin.xml?rev=806458&r1=806457&r2=806458&view=diff
==============================================================================
--- servicemix/sandbox/karaf/nmr/assembly/src/main/descriptors/unix-bin.xml (original)
+++ servicemix/sandbox/karaf/nmr/assembly/src/main/descriptors/unix-bin.xml Fri Aug 21 08:44:45 2009
@@ -24,14 +24,14 @@
<fileSets>
- <!-- Expanded ServiceMix Runtime -->
+ <!-- Expanded Karaf -->
<fileSet>
- <directory>${basedir}/target/dependencies/unix/apache-servicemix-kernel-${servicemix.kernel.version}</directory>
+ <directory>${basedir}/target/dependencies/unix/apache-felix-karaf-${felix.karaf.version}</directory>
<outputDirectory>/</outputDirectory>
<excludes>
<exclude>bin/**</exclude>
<exclude>demos/**</exclude>
- <exclude>etc/org.apache.servicemix.features.cfg</exclude>
+ <exclude>etc/org.apache.felix.karaf.features.cfg</exclude>
<exclude>LICENSE.txt</exclude>
<exclude>NOTICE.txt</exclude>
<exclude>README.txt</exclude>
@@ -39,9 +39,9 @@
</excludes>
</fileSet>
- <!-- Copy over bin/servicemix separately to get the correct file mode -->
+ <!-- Copy over bin/karaf separately to get the correct file mode -->
<fileSet>
- <directory>${basedir}/target/dependencies/unix/apache-servicemix-kernel-${servicemix.kernel.version}</directory>
+ <directory>${basedir}/target/dependencies/unix/apache-felix-karaf-${felix.karaf.version}</directory>
<outputDirectory>/</outputDirectory>
<includes>
<include>bin/*</include>
Modified: servicemix/sandbox/karaf/nmr/assembly/src/main/descriptors/windows-bin.xml
URL: http://svn.apache.org/viewvc/servicemix/sandbox/karaf/nmr/assembly/src/main/descriptors/windows-bin.xml?rev=806458&r1=806457&r2=806458&view=diff
==============================================================================
--- servicemix/sandbox/karaf/nmr/assembly/src/main/descriptors/windows-bin.xml (original)
+++ servicemix/sandbox/karaf/nmr/assembly/src/main/descriptors/windows-bin.xml Fri Aug 21 08:44:45 2009
@@ -24,14 +24,14 @@
<fileSets>
- <!-- Expanded ServiceMix Runtime -->
+ <!-- Expanded Karaf -->
<fileSet>
- <directory>${basedir}/target/dependencies/unix/apache-servicemix-kernel-${servicemix.kernel.version}</directory>
+ <directory>${basedir}/target/dependencies/unix/apache-felix-karaf-${felix.karaf.version}</directory>
<outputDirectory>/</outputDirectory>
<excludes>
<exclude>bin/**</exclude>
<exclude>demos/**</exclude>
- <exclude>etc/org.apache.servicemix.features.cfg</exclude>
+ <exclude>etc/org.apache.felix.karaf.features.cfg</exclude>
<exclude>LICENSE.txt</exclude>
<exclude>NOTICE.txt</exclude>
<exclude>README.txt</exclude>
@@ -39,9 +39,9 @@
</excludes>
</fileSet>
- <!-- Copy over bin/servicemix separately to get the correct file mode -->
+ <!-- Copy over bin/karaf separately to get the correct file mode -->
<fileSet>
- <directory>${basedir}/target/dependencies/unix/apache-servicemix-kernel-${servicemix.kernel.version}</directory>
+ <directory>${basedir}/target/dependencies/unix/apache-felix-karaf-${felix.karaf.version}</directory>
<outputDirectory>/</outputDirectory>
<includes>
<include>bin/*</include>
Copied: servicemix/sandbox/karaf/nmr/assembly/src/main/filtered-resources/etc/org.apache.felix.karaf.features.cfg (from r805711, servicemix/sandbox/karaf/nmr/assembly/src/main/filtered-resources/etc/org.apache.servicemix.features.cfg)
URL: http://svn.apache.org/viewvc/servicemix/sandbox/karaf/nmr/assembly/src/main/filtered-resources/etc/org.apache.felix.karaf.features.cfg?p2=servicemix/sandbox/karaf/nmr/assembly/src/main/filtered-resources/etc/org.apache.felix.karaf.features.cfg&p1=servicemix/sandbox/karaf/nmr/assembly/src/main/filtered-resources/etc/org.apache.servicemix.features.cfg&r1=805711&r2=806458&rev=806458&view=diff
==============================================================================
--- servicemix/sandbox/karaf/nmr/assembly/src/main/filtered-resources/etc/org.apache.servicemix.features.cfg (original)
+++ servicemix/sandbox/karaf/nmr/assembly/src/main/filtered-resources/etc/org.apache.felix.karaf.features.cfg Fri Aug 21 08:44:45 2009
@@ -20,7 +20,7 @@
#
# Comma separated list of features repositories to register by default
#
-featuresRepositories=mvn:org.apache.servicemix.kernel/apache-servicemix-kernel/${servicemix.kernel.version}/xml/features,mvn:org.apache.servicemix.nmr/apache-servicemix-nmr/${version}/xml/features
+featuresRepositories=mvn:org.apache.felix.karaf/apache-felix-karaf/${felix.karaf.version}/xml/features,mvn:org.apache.servicemix.nmr/apache-servicemix-nmr/${version}/xml/features
#
# Comma separated list of features to install at startup
Modified: servicemix/sandbox/karaf/nmr/assembly/src/main/filtered-resources/features.xml
URL: http://svn.apache.org/viewvc/servicemix/sandbox/karaf/nmr/assembly/src/main/filtered-resources/features.xml?rev=806458&r1=806457&r2=806458&view=diff
==============================================================================
--- servicemix/sandbox/karaf/nmr/assembly/src/main/filtered-resources/features.xml (original)
+++ servicemix/sandbox/karaf/nmr/assembly/src/main/filtered-resources/features.xml Fri Aug 21 08:44:45 2009
@@ -18,10 +18,12 @@
-->
<features>
<feature name="naming" version="${version}">
+ <feature>spring-dm</feature>
<bundle>mvn:org.apache.xbean/xbean-naming/${xbean.version}</bundle>
<bundle>mvn:org.apache.servicemix.naming/org.apache.servicemix.naming/${pom.version}</bundle>
</feature>
<feature name="transaction" version="${version}">
+ <feature>spring-dm</feature>
<bundle>mvn:org.apache.geronimo.specs/geronimo-jta_1.1_spec/${geronimo.jta.version}</bundle>
<bundle>mvn:org.apache.geronimo.specs/geronimo-j2ee-connector_1.5_spec/${geronimo.j2ee.connector.version}</bundle>
<bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.howl/${howl.version}</bundle>
@@ -30,6 +32,7 @@
<bundle>mvn:org.apache.servicemix.transaction/org.apache.servicemix.transaction/${version}</bundle>
</feature>
<feature name="nmr" version="${version}">
+ <feature>spring-dm</feature>
<!-- those two bundles are currently required for servicemix-utils to resolve -->
<bundle>mvn:org.apache.servicemix.specs/org.apache.servicemix.specs.activation-api-1.1/${servicemix.specs.version}</bundle>
<bundle>mvn:org.apache.servicemix.specs/org.apache.servicemix.specs.jbi-api-1.0/${servicemix.specs.version}</bundle>
Modified: servicemix/sandbox/karaf/nmr/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/sandbox/karaf/nmr/pom.xml?rev=806458&r1=806457&r2=806458&view=diff
==============================================================================
--- servicemix/sandbox/karaf/nmr/pom.xml (original)
+++ servicemix/sandbox/karaf/nmr/pom.xml Fri Aug 21 08:44:45 2009
@@ -65,7 +65,7 @@
<ant.version>1.7.0_1</ant.version>
<aopalliance.version>1.0_1</aopalliance.version>
<asm.version>2.2.3_1</asm.version>
- <cglib.version>2.1_3</cglib.version>
+ <cglib.version>2.1_3_2</cglib.version>
<camel.version>1.6.0</camel.version>
<commons.io.version>1.3.2_1</commons.io.version>
<commons.logging.version>1.1.1</commons.logging.version>
@@ -92,7 +92,7 @@
<junit.version>3.8.2_1</junit.version>
<log4j.version>1.2.14</log4j.version>
<lucene.version>2.4.1</lucene.version>
- <pax.logging.version>1.1.1</pax.logging.version>
+ <pax.logging.version>1.4</pax.logging.version>
<servicemix3.version>3.3</servicemix3.version>
<servicemix.eip.version>2008.01</servicemix.eip.version>
<servicemix.http.version>2008.01</servicemix.http.version>
@@ -102,8 +102,8 @@
<servicemix.legal.version>1.0</servicemix.legal.version>
<servicemix.specs.version>1.3.0</servicemix.specs.version>
<servicemix.utils.version>1.1.0</servicemix.utils.version>
- <spring.osgi.version>1.2.0-rc1</spring.osgi.version>
- <spring.version>2.5.6</spring.version>
+ <spring.osgi.version>1.2.0</spring.osgi.version>
+ <spring.version>2.5.6.SEC01</spring.version>
<woodstox.version>3.2.7_1</woodstox.version>
<wsdl4j.version>1.6.1_1</wsdl4j.version>
<xbean.version>3.5</xbean.version>
@@ -210,6 +210,11 @@
</dependency>
<dependency>
<groupId>org.springframework</groupId>
+ <artifactId>spring-context-support</artifactId>
+ <version>${spring.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework</groupId>
<artifactId>spring-jms</artifactId>
<version>${spring.version}</version>
</dependency>
@@ -402,6 +407,16 @@
</dependency>
<dependency>
<groupId>org.apache.servicemix.bundles</groupId>
+ <artifactId>org.apache.servicemix.bundles.aopalliance</artifactId>
+ <version>${aopalliance.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.servicemix.bundles</groupId>
+ <artifactId>org.apache.servicemix.bundles.cglib</artifactId>
+ <version>${cglib.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.servicemix.bundles</groupId>
<artifactId>org.apache.servicemix.bundles.wsdl4j</artifactId>
<version>${wsdl4j.version}</version>
</dependency>
@@ -461,6 +476,21 @@
<version>${spring.osgi.version}</version>
</dependency>
<dependency>
+ <groupId>org.springframework.osgi</groupId>
+ <artifactId>spring-osgi-io</artifactId>
+ <version>${spring.osgi.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework.osgi</groupId>
+ <artifactId>spring-osgi-extender</artifactId>
+ <version>${spring.osgi.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework.osgi</groupId>
+ <artifactId>spring-osgi-annotation</artifactId>
+ <version>${spring.osgi.version}</version>
+ </dependency>
+ <dependency>
<groupId>org.apache.felix</groupId>
<artifactId>org.osgi.core</artifactId>
<version>${felix.osgi.version}</version>