You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@servicemix.apache.org by ff...@apache.org on 2009/09/21 10:03:36 UTC
svn commit: r817187 - in
/servicemix/smx4/features/trunk/examples/itests/tests: pom.xml
src/test/java/org/apache/servicemix/examples/CXFNMRIntegrationTest.java
src/test/java/org/apache/servicemix/examples/IntegrationTest.java
Author: ffang
Date: Mon Sep 21 08:03:32 2009
New Revision: 817187
URL: http://svn.apache.org/viewvc?rev=817187&view=rev
Log:
[SMX4-368]fix IntegrationTest wit karaf
Modified:
servicemix/smx4/features/trunk/examples/itests/tests/pom.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
Modified: servicemix/smx4/features/trunk/examples/itests/tests/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/examples/itests/tests/pom.xml?rev=817187&r1=817186&r2=817187&view=diff
==============================================================================
--- servicemix/smx4/features/trunk/examples/itests/tests/pom.xml (original)
+++ servicemix/smx4/features/trunk/examples/itests/tests/pom.xml Mon Sep 21 08:03:32 2009
@@ -190,6 +190,13 @@
<artifactId>org.apache.felix.prefs</artifactId>
<version>${felix.prefs.version}</version>
<scope>test</scope>
+ <exclusions>
+ <exclusion>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>org.osgi.core</artifactId>
+ </exclusion>
+ </exclusions>
+
</dependency>
<dependency>
<groupId>org.apache.servicemix.examples</groupId>
@@ -360,6 +367,17 @@
</dependency>
<dependency>
<groupId>org.springframework</groupId>
+ <artifactId>spring-aop</artifactId>
+ <version>${spring.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-test</artifactId>
+ <version>${spring.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.springframework</groupId>
<artifactId>spring-jms</artifactId>
<version>${spring.version}</version>
</dependency>
@@ -408,7 +426,6 @@
<artifactId>org.apache.servicemix.specs.jsr311-api-${jaxrs.api.version}</artifactId>
<version>${servicemix.specs.version}</version>
</dependency>
-
</dependencies>
<build>
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=817187&r1=817186&r2=817187&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 Sep 21 08:03:32 2009
@@ -108,7 +108,7 @@
getBundle("org.ops4j.pax.web-extender", "pax-web-ex-whiteboard"),
getBundle("org.apache.servicemix", "servicemix-utils"),
getBundle("org.fusesource.commonman", "commons-management"),
- getBundle("org.apache.servicemix.kernel", "org.apache.servicemix.kernel.management"),
+ getBundle("org.apache.felix.karaf", "org.apache.felix.karaf.management"),
getBundle("org.apache.cxf", "cxf-bundle"),
getBundle("org.apache.servicemix.cxf", "org.apache.servicemix.cxf.transport.nmr"),
getBundle("org.apache.servicemix.nmr", "org.apache.servicemix.nmr.api"),
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=817187&r1=817186&r2=817187&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 Sep 21 08:03:32 2009
@@ -122,7 +122,7 @@
getBundle("org.ops4j.pax.web-extender", "pax-web-ex-whiteboard"),
getBundle("org.apache.servicemix", "servicemix-utils"),
getBundle("org.fusesource.commonman", "commons-management"),
- getBundle("org.apache.servicemix.kernel", "org.apache.servicemix.kernel.management"),
+ getBundle("org.apache.felix.karaf", "org.apache.felix.karaf.management"),
getBundle("org.apache.cxf", "cxf-bundle"),
getBundle("org.apache.servicemix.cxf", "org.apache.servicemix.cxf.transport.osgi"),
getBundle("org.apache.servicemix.cxf", "org.apache.servicemix.cxf.transport.nmr"),