Author: iocanel
Date: Wed Mar 2 12:22:35 2011
New Revision: 1076188
URL: http://svn.apache.org/viewvc?rev=1076188&view=rev
Log:
[SMX4NMR-255] The NMR now uses karaf version 2.2.0 and aries 0.3.
Modified:
servicemix/smx4/nmr/trunk/assembly/pom.xml
servicemix/smx4/nmr/trunk/assembly/src/main/filtered-resources/etc/org.apache.karaf.features.cfg
servicemix/smx4/nmr/trunk/assembly/src/main/filtered-resources/features.xml
servicemix/smx4/nmr/trunk/jbi/commands/pom.xml
servicemix/smx4/nmr/trunk/jbi/itests/pom.xml
servicemix/smx4/nmr/trunk/jbi/itests/src/test/java/org/apache/servicemix/jbi/itests/IntegrationTest.java
servicemix/smx4/nmr/trunk/jbi/itests/src/test/java/org/apache/servicemix/jbi/itests/ManagementTest.java
servicemix/smx4/nmr/trunk/nmr/commands/pom.xml
servicemix/smx4/nmr/trunk/pom.xml
servicemix/smx4/nmr/trunk/testing/support/src/main/java/org/apache/servicemix/platform/testing/support/AbstractIntegrationTest.java
Modified: servicemix/smx4/nmr/trunk/assembly/pom.xml
URL:
http://svn.apache.org/viewvc/servicemix/smx4/nmr/trunk/assembly/pom.xml?rev=1076188&r1=1076187&r2=1076188&view=diff
==============================================================================
--- servicemix/smx4/nmr/trunk/assembly/pom.xml (original)
+++ servicemix/smx4/nmr/trunk/assembly/pom.xml Wed Mar 2 12:22:35 2011
@@ -46,8 +46,14 @@
<type>zip</type>
</dependency>
<dependency>
- <groupId>org.apache.karaf</groupId>
- <artifactId>apache-karaf</artifactId>
+ <groupId>org.apache.karaf.assemblies.features</groupId>
+ <artifactId>standard</artifactId>
+ <type>xml</type>
+ <classifier>features</classifier>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.karaf.assemblies.features</groupId>
+ <artifactId>enterprise</artifactId>
<type>xml</type>
<classifier>features</classifier>
</dependency>
@@ -294,7 +300,8 @@
</goals>
<configuration>
<descriptors>
-
<descriptor>mvn:org.apache.karaf/apache-karaf/${karaf.version}/xml/features</descriptor>
+
<descriptor>mvn:org.apache.karaf.assemblies.features/standard/${karaf.version}/xml/features</descriptor>
+
<descriptor>mvn:org.apache.karaf.assemblies.features/enterprise/${karaf.version}/xml/features</descriptor>
<descriptor>file:${basedir}/target/classes/features.xml</descriptor>
</descriptors>
<features>
@@ -369,6 +376,7 @@
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>build-helper-maven-plugin</artifactId>
+ <version>${build-helper-maven-plugin.version}</version>
<executions>
<execution>
<id>attach-artifacts</id>
Modified:
servicemix/smx4/nmr/trunk/assembly/src/main/filtered-resources/etc/org.apache.karaf.features.cfg
URL:
http://svn.apache.org/viewvc/servicemix/smx4/nmr/trunk/assembly/src/main/filtered-resources/etc/org.apache.karaf.features.cfg?rev=1076188&r1=1076187&r2=1076188&view=diff
==============================================================================
---
servicemix/smx4/nmr/trunk/assembly/src/main/filtered-resources/etc/org.apache.karaf.features.cfg
(original)
+++
servicemix/smx4/nmr/trunk/assembly/src/main/filtered-resources/etc/org.apache.karaf.features.cfg
Wed Mar 2 12:22:35 2011
@@ -20,7 +20,7 @@
#
# Comma separated list of features repositories to register by default
#
-featuresRepositories=mvn:org.apache.karaf/apache-karaf/${karaf.version}/xml/features,mvn:org.apache.servicemix.nmr/apache-servicemix-nmr/${version}/xml/features
+featuresRepositories=mvn:org.apache.karaf.assemblies.features/standard/${karaf.version}/xml/features,mvn:org.apache.karaf.assemblies.features/enterprise/${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/smx4/nmr/trunk/assembly/src/main/filtered-resources/features.xml
URL:
http://svn.apache.org/viewvc/servicemix/smx4/nmr/trunk/assembly/src/main/filtered-resources/features.xml?rev=1076188&r1=1076187&r2=1076188&view=diff
==============================================================================
--- servicemix/smx4/nmr/trunk/assembly/src/main/filtered-resources/features.xml
(original)
+++ servicemix/smx4/nmr/trunk/assembly/src/main/filtered-resources/features.xml
Wed Mar 2 12:22:35 2011
@@ -16,13 +16,11 @@
limitations under the License.
-->
<features>
-
<repository>mvn:org.apache.karaf/apache-karaf/${karaf.version}/xml/features</repository>
+
<repository>mvn:org.apache.karaf.assemblies.features/standard/${karaf.version}/xml/features</repository>
+
<repository>mvn:org.apache.karaf.assemblies.features/enterprise/${karaf.version}/xml/features</repository>
<feature name="naming" version="${version}">
<bundle>mvn:org.apache.servicemix.naming/org.apache.servicemix.naming/${pom.version}</bundle>
</feature>
- <feature name="transaction" version="${aries.transaction.version}">
-
<bundle>mvn:org.apache.aries.transaction/org.apache.aries.transaction.manager/${aries.transaction.version}</bundle>
- </feature>
<feature name="document" version="${version}">
<bundle>mvn:org.apache.servicemix.document/org.apache.servicemix.document/${pom.version}</bundle>
</feature>
Modified: servicemix/smx4/nmr/trunk/jbi/commands/pom.xml
URL:
http://svn.apache.org/viewvc/servicemix/smx4/nmr/trunk/jbi/commands/pom.xml?rev=1076188&r1=1076187&r2=1076188&view=diff
==============================================================================
--- servicemix/smx4/nmr/trunk/jbi/commands/pom.xml (original)
+++ servicemix/smx4/nmr/trunk/jbi/commands/pom.xml Wed Mar 2 12:22:35 2011
@@ -55,7 +55,7 @@
<Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
<Bundle-Description>${project.description}</Bundle-Description>
<Import-Package>
- org.osgi.service.command,
+ org.osgi.service.command;resolution:=optional,
org.apache.felix.gogo.commands,
org.apache.karaf.shell.console,
*
Modified: servicemix/smx4/nmr/trunk/jbi/itests/pom.xml
URL:
http://svn.apache.org/viewvc/servicemix/smx4/nmr/trunk/jbi/itests/pom.xml?rev=1076188&r1=1076187&r2=1076188&view=diff
==============================================================================
--- servicemix/smx4/nmr/trunk/jbi/itests/pom.xml (original)
+++ servicemix/smx4/nmr/trunk/jbi/itests/pom.xml Wed Mar 2 12:22:35 2011
@@ -64,6 +64,14 @@
<scope>test</scope>
</dependency>
<dependency>
+ <groupId>org.apache.aries</groupId>
+ <artifactId>org.apache.aries.util</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.aries.proxy</groupId>
+ <artifactId>org.apache.aries.proxy</artifactId>
+ </dependency>
+ <dependency>
<groupId>org.apache.aries.blueprint</groupId>
<artifactId>org.apache.aries.blueprint</artifactId>
</dependency>
@@ -94,6 +102,10 @@
</dependency>
<dependency>
<groupId>org.apache.servicemix.bundles</groupId>
+ <artifactId>org.apache.servicemix.bundles.asm</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.servicemix.bundles</groupId>
<artifactId>org.apache.servicemix.bundles.cglib</artifactId>
</dependency>
<dependency>
@@ -368,6 +380,7 @@
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>build-helper-maven-plugin</artifactId>
+ <version>${build-helper-maven-plugin.version}</version>
<executions>
<execution>
<id>reserve-network-port</id>
Modified:
servicemix/smx4/nmr/trunk/jbi/itests/src/test/java/org/apache/servicemix/jbi/itests/IntegrationTest.java
URL:
http://svn.apache.org/viewvc/servicemix/smx4/nmr/trunk/jbi/itests/src/test/java/org/apache/servicemix/jbi/itests/IntegrationTest.java?rev=1076188&r1=1076187&r2=1076188&view=diff
==============================================================================
---
servicemix/smx4/nmr/trunk/jbi/itests/src/test/java/org/apache/servicemix/jbi/itests/IntegrationTest.java
(original)
+++
servicemix/smx4/nmr/trunk/jbi/itests/src/test/java/org/apache/servicemix/jbi/itests/IntegrationTest.java
Wed Mar 2 12:22:35 2011
@@ -257,6 +257,9 @@ public class IntegrationTest extends Abs
// Felix Config Admin
mavenBundle("org.apache.felix", "org.apache.felix.configadmin"),
// Blueprint
+ mavenBundle("org.apache.servicemix.bundles",
"org.apache.servicemix.bundles.asm"),
+ mavenBundle("org.apache.aries", "org.apache.aries.util"),
+ mavenBundle("org.apache.aries.proxy", "org.apache.aries.proxy"),
mavenBundle("org.apache.aries.blueprint",
"org.apache.aries.blueprint"),
// Pax mvn handler
mavenBundle("org.ops4j.pax.url", "pax-url-mvn"),
Modified:
servicemix/smx4/nmr/trunk/jbi/itests/src/test/java/org/apache/servicemix/jbi/itests/ManagementTest.java
URL:
http://svn.apache.org/viewvc/servicemix/smx4/nmr/trunk/jbi/itests/src/test/java/org/apache/servicemix/jbi/itests/ManagementTest.java?rev=1076188&r1=1076187&r2=1076188&view=diff
==============================================================================
---
servicemix/smx4/nmr/trunk/jbi/itests/src/test/java/org/apache/servicemix/jbi/itests/ManagementTest.java
(original)
+++
servicemix/smx4/nmr/trunk/jbi/itests/src/test/java/org/apache/servicemix/jbi/itests/ManagementTest.java
Wed Mar 2 12:22:35 2011
@@ -277,6 +277,9 @@ public class ManagementTest extends Abst
// Felix Config Admin
mavenBundle("org.apache.felix", "org.apache.felix.configadmin"),
// Blueprint
+ mavenBundle("org.apache.servicemix.bundles",
"org.apache.servicemix.bundles.asm"),
+ mavenBundle("org.apache.aries", "org.apache.aries.util"),
+ mavenBundle("org.apache.aries.proxy", "org.apache.aries.proxy"),
mavenBundle("org.apache.aries.blueprint",
"org.apache.aries.blueprint"),
// Pax mvn handler
mavenBundle("org.ops4j.pax.url", "pax-url-mvn"),
Modified: servicemix/smx4/nmr/trunk/nmr/commands/pom.xml
URL:
http://svn.apache.org/viewvc/servicemix/smx4/nmr/trunk/nmr/commands/pom.xml?rev=1076188&r1=1076187&r2=1076188&view=diff
==============================================================================
--- servicemix/smx4/nmr/trunk/nmr/commands/pom.xml (original)
+++ servicemix/smx4/nmr/trunk/nmr/commands/pom.xml Wed Mar 2 12:22:35 2011
@@ -55,7 +55,7 @@
<Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
<Bundle-Description>${project.description}</Bundle-Description>
<Import-Package>
- org.osgi.service.command,
+ org.osgi.service.command;resolution:=optional,
org.apache.felix.gogo.commands,
org.apache.karaf.shell.console,
*
Modified: servicemix/smx4/nmr/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/servicemix/smx4/nmr/trunk/pom.xml?rev=1076188&r1=1076187&r2=1076188&view=diff
==============================================================================
--- servicemix/smx4/nmr/trunk/pom.xml (original)
+++ servicemix/smx4/nmr/trunk/pom.xml Wed Mar 2 12:22:35 2011
@@ -66,14 +66,16 @@
<sonar.skippedModules>examples</sonar.skippedModules>
<!-- OSGi (Felix framework, Aries, Karaf, Equinox) -->
- <aries.transaction.version>0.2-incubating</aries.transaction.version>
- <aries.blueprint.version>0.2-incubating</aries.blueprint.version>
+ <aries.proxy.version>0.3</aries.proxy.version>
+ <aries.util.version>0.3</aries.util.version>
+ <aries.transaction.version>0.3</aries.transaction.version>
+ <aries.blueprint.version>0.3</aries.blueprint.version>
<felix.configadmin.version>1.2.4</felix.configadmin.version>
<felix.framework.version>3.0.2</felix.framework.version>
<felix.fileinstall.version>3.0.2</felix.fileinstall.version>
<felix.gogo.version>0.4.0</felix.gogo.version>
<felix.plugin.version>2.1.0</felix.plugin.version>
- <karaf.version>2.1.3</karaf.version>
+ <karaf.version>2.2.0</karaf.version>
<osgi.core.version>4.2.0</osgi.core.version>
<!-- ActiveMQ -->
@@ -135,6 +137,7 @@
<equinox.version>3.6.0.v20100517</equinox.version>
<!-- Maven Plugins -->
<depends-maven-plugin.version>1.2</depends-maven-plugin.version>
+
<build-helper-maven-plugin.version>1.5</build-helper-maven-plugin.version>
<!--
Fix the assembly plugin version to avoid:
http://jira.codehaus.org/browse/MASSEMBLY-462
@@ -167,6 +170,16 @@
<version>${aries.blueprint.version}</version>
</dependency>
<dependency>
+ <groupId>org.apache.aries</groupId>
+ <artifactId>org.apache.aries.util</artifactId>
+ <version>${aries.util.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.aries.proxy</groupId>
+ <artifactId>org.apache.aries.proxy</artifactId>
+ <version>${aries.proxy.version}</version>
+ </dependency>
+ <dependency>
<groupId>org.apache.aries.transaction</groupId>
<artifactId>org.apache.aries.transaction.manager</artifactId>
<version>${aries.transaction.version}</version>
@@ -186,8 +199,15 @@
<type>zip</type>
</dependency>
<dependency>
- <groupId>org.apache.karaf</groupId>
- <artifactId>apache-karaf</artifactId>
+ <groupId>org.apache.karaf.assemblies.features</groupId>
+ <artifactId>standard</artifactId>
+ <version>${karaf.version}</version>
+ <type>xml</type>
+ <classifier>features</classifier>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.karaf.assemblies.features</groupId>
+ <artifactId>enterprise</artifactId>
<version>${karaf.version}</version>
<type>xml</type>
<classifier>features</classifier>
Modified:
servicemix/smx4/nmr/trunk/testing/support/src/main/java/org/apache/servicemix/platform/testing/support/AbstractIntegrationTest.java
URL:
http://svn.apache.org/viewvc/servicemix/smx4/nmr/trunk/testing/support/src/main/java/org/apache/servicemix/platform/testing/support/AbstractIntegrationTest.java?rev=1076188&r1=1076187&r2=1076188&view=diff
==============================================================================
---
servicemix/smx4/nmr/trunk/testing/support/src/main/java/org/apache/servicemix/platform/testing/support/AbstractIntegrationTest.java
(original)
+++
servicemix/smx4/nmr/trunk/testing/support/src/main/java/org/apache/servicemix/platform/testing/support/AbstractIntegrationTest.java
Wed Mar 2 12:22:35 2011
@@ -100,6 +100,8 @@ public class AbstractIntegrationTest ext
getBundle("org.apache.servicemix.bundles",
"org.apache.servicemix.bundles.aopalliance"),
getBundle("org.apache.servicemix.bundles",
"org.apache.servicemix.bundles.asm"),
getBundle("org.apache.servicemix.bundles",
"org.apache.servicemix.bundles.junit"),
+ getBundle("org.apache.aries", "org.apache.aries.util"),
+ getBundle("org.apache.aries.proxy", "org.apache.aries.proxy"),
getBundle("org.apache.aries.blueprint",
"org.apache.aries.blueprint"),
getBundle("org.springframework", "spring-beans"),
getBundle("org.springframework", "spring-core"),
