Author: ccustine
Date: Tue Sep 1 21:24:41 2009
New Revision: 810245
URL: http://svn.apache.org/viewvc?rev=810245&view=rev
Log:
SMX4NMR-140 Refactor management infrastructure to eliminate duplication and
allow for easier pluggability
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=810245&r1=810244&r2=810245&view=diff
==============================================================================
--- servicemix/smx4/features/trunk/examples/itests/tests/pom.xml (original)
+++ servicemix/smx4/features/trunk/examples/itests/tests/pom.xml Tue Sep 1
21:24:41 2009
@@ -69,6 +69,12 @@
</exclusions>
</dependency>
<dependency>
+ <groupId>org.apache.servicemix.kernel</groupId>
+ <artifactId>org.apache.servicemix.kernel.management</artifactId>
+ <version>${servicemix.kernel.version}</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
<groupId>org.apache.servicemix.bundles</groupId>
<artifactId>org.apache.servicemix.bundles.ant</artifactId>
<version>${ant.version}</version>
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=810245&r1=810244&r2=810245&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
Tue Sep 1 21:24:41 2009
@@ -82,8 +82,7 @@
getBundle("org.apache.geronimo.specs",
"geronimo-ws-metadata_2.0_spec"),
getBundle("org.apache.geronimo.specs",
"geronimo-j2ee-connector_1.5_spec"),
getBundle("org.apache.geronimo.specs", "geronimo-jta_1.1_spec"),
-
- getBundle("org.apache.servicemix.specs",
"org.apache.servicemix.specs.jbi-api-1.0"),
+ getBundle("org.apache.servicemix.specs",
"org.apache.servicemix.specs.jbi-api-1.0"),
getBundle("org.apache.servicemix.specs",
"org.apache.servicemix.specs.stax-api-1.0"),
getBundle("org.apache.servicemix.specs",
"org.apache.servicemix.specs.saaj-api-1.3"),
getBundle("org.apache.servicemix.specs",
"org.apache.servicemix.specs.jaxb-api-2.1"),
@@ -108,10 +107,12 @@
getBundle("org.ops4j.pax.web", "pax-web-bundle"),
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.cxf", "cxf-bundle"),
-
getBundle("org.apache.servicemix.cxf",
"org.apache.servicemix.cxf.transport.nmr"),
getBundle("org.apache.servicemix.nmr",
"org.apache.servicemix.nmr.api"),
+ getBundle("org.apache.servicemix.nmr",
"org.apache.servicemix.nmr.management"),
getBundle("org.apache.servicemix.nmr",
"org.apache.servicemix.nmr.core"),
getBundle("org.apache.servicemix.nmr",
"org.apache.servicemix.nmr.spring"),
getBundle("org.apache.servicemix.nmr",
"org.apache.servicemix.nmr.osgi"),
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=810245&r1=810244&r2=810245&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
Tue Sep 1 21:24:41 2009
@@ -121,10 +121,13 @@
getBundle("org.ops4j.pax.web", "pax-web-bundle"),
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.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"),
getBundle("org.apache.servicemix.nmr",
"org.apache.servicemix.nmr.api"),
+ getBundle("org.apache.servicemix.nmr",
"org.apache.servicemix.nmr.management"),
getBundle("org.apache.servicemix.nmr",
"org.apache.servicemix.nmr.core"),
getBundle("org.apache.servicemix.nmr",
"org.apache.servicemix.nmr.spring"),
getBundle("org.apache.servicemix.nmr",
"org.apache.servicemix.nmr.osgi"),
