Author: jbonofre
Date: Mon Nov 15 11:16:45 2010
New Revision: 1035225
URL: http://svn.apache.org/viewvc?rev=1035225&view=rev
Log:
[SMX4-673] Upgrade to Karaf 2.1.1 and fix Jetty 6.1.25_1 bundle artifactId.
Modified:
servicemix/smx4/features/trunk/assembly/src/main/filtered-resources/features.xml
servicemix/smx4/features/trunk/examples/itests/tests/src/test/java/org/apache/servicemix/examples/CXFNMRIntegrationTest.java
servicemix/smx4/features/trunk/examples/itests/tests/src/test/java/org/apache/servicemix/examples/IntegrationTest.java
servicemix/smx4/features/trunk/pom.xml
Modified:
servicemix/smx4/features/trunk/assembly/src/main/filtered-resources/features.xml
URL:
http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/assembly/src/main/filtered-resources/features.xml?rev=1035225&r1=1035224&r2=1035225&view=diff
==============================================================================
---
servicemix/smx4/features/trunk/assembly/src/main/filtered-resources/features.xml
(original)
+++
servicemix/smx4/features/trunk/assembly/src/main/filtered-resources/features.xml
Mon Nov 15 11:16:45 2010
@@ -181,7 +181,7 @@
<feature name="servicemix-cxf-bc" version="${servicemix-cxf-bc.version}">
<feature
version="${servicemix-shared.version}">servicemix-shared</feature>
<feature version="${cxf.version}">cxf</feature>
-
<bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.jetty-bundle/${jetty.bundle.version}</bundle>
+
<bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.jetty/${jetty.bundle.version}</bundle>
<bundle>mvn:org.springframework/spring-tx/${spring.version}</bundle>
<bundle>mvn:org.apache.geronimo.specs/geronimo-jms_1.1_spec/${geronimo-jms.version}</bundle>
<bundle>mvn:org.apache.servicemix/servicemix-soap2/${servicemix-shared.version}</bundle>
@@ -206,7 +206,7 @@
<bundle>mvn:org.apache.ws.commons.schema/XmlSchema/${xmlschema.version}</bundle>
<bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.xmlsec/${xmlsec.bundle.version}</bundle>
<bundle>mvn:org.apache.ws.security/wss4j/${wss4j.version}</bundle>
-
<bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.jetty-bundle/${jetty.bundle.version}</bundle>
+
<bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.jetty/${jetty.bundle.version}</bundle>
<bundle>mvn:org.apache.servicemix/servicemix-soap/${servicemix-shared.version}</bundle>
<bundle>mvn:org.apache.servicemix/servicemix-soap2/${servicemix-shared.version}</bundle>
<bundle>mvn:org.apache.servicemix/servicemix-http/${servicemix-http.version}</bundle>
Modified:
servicemix/smx4/features/trunk/examples/itests/tests/src/test/java/org/apache/servicemix/examples/CXFNMRIntegrationTest.java
URL:
http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/examples/itests/tests/src/test/java/org/apache/servicemix/examples/CXFNMRIntegrationTest.java?rev=1035225&r1=1035224&r2=1035225&view=diff
==============================================================================
---
servicemix/smx4/features/trunk/examples/itests/tests/src/test/java/org/apache/servicemix/examples/CXFNMRIntegrationTest.java
(original)
+++
servicemix/smx4/features/trunk/examples/itests/tests/src/test/java/org/apache/servicemix/examples/CXFNMRIntegrationTest.java
Mon Nov 15 11:16:45 2010
@@ -102,7 +102,7 @@ public class CXFNMRIntegrationTest exten
getBundle("org.apache.servicemix.bundles",
"org.apache.servicemix.bundles.xerces"),
getBundle("org.apache.servicemix.bundles",
"org.apache.servicemix.bundles.xalan"),
getBundle("org.apache.servicemix.bundles",
"org.apache.servicemix.bundles.xmlsec"),
- getBundle("org.apache.servicemix.bundles",
"org.apache.servicemix.bundles.jetty-bundle"),
+ getBundle("org.apache.servicemix.bundles",
"org.apache.servicemix.bundles.jetty"),
getBundle("javax.mail", "mail"),
getBundle("org.apache.servicemix.bundles",
"org.apache.servicemix.bundles.commons-codec"),
getBundle("org.apache.servicemix.bundles",
"org.apache.servicemix.bundles.abdera"),
Modified:
servicemix/smx4/features/trunk/examples/itests/tests/src/test/java/org/apache/servicemix/examples/IntegrationTest.java
URL:
http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/examples/itests/tests/src/test/java/org/apache/servicemix/examples/IntegrationTest.java?rev=1035225&r1=1035224&r2=1035225&view=diff
==============================================================================
---
servicemix/smx4/features/trunk/examples/itests/tests/src/test/java/org/apache/servicemix/examples/IntegrationTest.java
(original)
+++
servicemix/smx4/features/trunk/examples/itests/tests/src/test/java/org/apache/servicemix/examples/IntegrationTest.java
Mon Nov 15 11:16:45 2010
@@ -130,7 +130,7 @@ public class IntegrationTest extends Abs
getBundle("org.apache.servicemix.bundles",
"org.apache.servicemix.bundles.xerces"),
getBundle("org.apache.servicemix.bundles",
"org.apache.servicemix.bundles.xalan"),
getBundle("org.apache.servicemix.bundles",
"org.apache.servicemix.bundles.xmlsec"),
- getBundle("org.apache.servicemix.bundles",
"org.apache.servicemix.bundles.jetty-bundle"),
+ getBundle("org.apache.servicemix.bundles",
"org.apache.servicemix.bundles.jetty"),
getBundle("javax.mail", "mail"),
getBundle("org.apache.servicemix.bundles",
"org.apache.servicemix.bundles.commons-codec"),
getBundle("org.apache.servicemix.bundles",
"org.apache.servicemix.bundles.commons-httpclient"),
Modified: servicemix/smx4/features/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/pom.xml?rev=1035225&r1=1035224&r2=1035225&view=diff
==============================================================================
--- servicemix/smx4/features/trunk/pom.xml (original)
+++ servicemix/smx4/features/trunk/pom.xml Mon Nov 15 11:16:45 2010
@@ -120,7 +120,7 @@
<aries.transaction.version>0.2-incubating</aries.transaction.version>
<felix.fileinstall.version>3.0.2</felix.fileinstall.version>
<felix.prefs.version>1.0.4</felix.prefs.version>
- <karaf.version>2.1.99-SNAPSHOT</karaf.version>
+ <karaf.version>2.1.1</karaf.version>
<osgi.compendium.version>4.2.0</osgi.compendium.version>
<osgi.core.version>4.2.0</osgi.core.version>
@@ -396,13 +396,6 @@
<artifactId>org.osgi.core</artifactId>
<version>${osgi.core.version}</version>
</dependency>
-
- <!-- ServiceMix -->
- <dependency>
- <groupId>org.apache.servicemix</groupId>
- <artifactId>apache-servicemix</artifactId>
- <version>${servicemix.version}</version>
- </dependency>
<!-- ServiceMix NMR -->
<dependency>
