Author: gnodet
Date: Wed Apr 23 04:52:48 2008
New Revision: 650837

URL: http://svn.apache.org/viewvc?rev=650837&view=rev
Log:
Use the new spec jars, upgrade spring and kernel to latest versions, add an integration test for cxf

Added:
    servicemix/smx4/features/trunk/examples/itests/   (with props)
    servicemix/smx4/features/trunk/examples/itests/pom.xml
      - copied, changed from r646413, servicemix/smx4/nmr/trunk/jbi/itests/pom.xml
    servicemix/smx4/features/trunk/examples/itests/src/
    servicemix/smx4/features/trunk/examples/itests/src/test/
    servicemix/smx4/features/trunk/examples/itests/src/test/java/
    servicemix/smx4/features/trunk/examples/itests/src/test/java/org/
    servicemix/smx4/features/trunk/examples/itests/src/test/java/org/apache/
    servicemix/smx4/features/trunk/examples/itests/src/test/java/org/apache/servicemix/
    servicemix/smx4/features/trunk/examples/itests/src/test/java/org/apache/servicemix/examples/
    servicemix/smx4/features/trunk/examples/itests/src/test/java/org/apache/servicemix/examples/IntegrationTest.java
    servicemix/smx4/features/trunk/examples/itests/src/test/resources/
    servicemix/smx4/features/trunk/examples/itests/src/test/resources/log4j.properties
    servicemix/smx4/features/trunk/examples/itests/src/test/resources/org/
    servicemix/smx4/features/trunk/examples/itests/src/test/resources/org/apache/
    servicemix/smx4/features/trunk/examples/itests/src/test/resources/org/apache/servicemix/
    servicemix/smx4/features/trunk/examples/itests/src/test/resources/org/apache/servicemix/MANIFEST.MF
Removed:
    servicemix/smx4/features/trunk/camel/bundles/jaxb-api/
    servicemix/smx4/features/trunk/cxf/bundles/jaxws-api/
Modified:
    servicemix/smx4/features/trunk/assembly/pom.xml
    servicemix/smx4/features/trunk/assembly/src/main/descriptors/unix-bin.xml
    servicemix/smx4/features/trunk/assembly/src/main/descriptors/windows-bin.xml
    servicemix/smx4/features/trunk/assembly/src/main/filtered-resources/etc/startup.properties
    servicemix/smx4/features/trunk/assembly/src/main/filtered-resources/features.xml
    servicemix/smx4/features/trunk/camel/bundles/jaxb-impl/pom.xml
    servicemix/smx4/features/trunk/camel/bundles/pom.xml
    servicemix/smx4/features/trunk/cxf/bundles/cxf/pom.xml
    servicemix/smx4/features/trunk/cxf/bundles/pom.xml
    servicemix/smx4/features/trunk/examples/cxf-camel-nmr/pom.xml
    servicemix/smx4/features/trunk/examples/cxf-nmr/pom.xml
    servicemix/smx4/features/trunk/examples/cxf-osgi/pom.xml
    servicemix/smx4/features/trunk/examples/pom.xml
    servicemix/smx4/features/trunk/management/acegi/pom.xml
    servicemix/smx4/features/trunk/pom.xml

Modified: servicemix/smx4/features/trunk/assembly/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/assembly/pom.xml?rev=650837&r1=650836&r2=650837&view=diff
==============================================================================
--- servicemix/smx4/features/trunk/assembly/pom.xml (original)
+++ servicemix/smx4/features/trunk/assembly/pom.xml Wed Apr 23 04:52:48 2008
@@ -199,18 +199,28 @@
         </dependency>
         <dependency>
             <groupId>org.apache.servicemix.bundles</groupId>
-            <artifactId>org.apache.servicemix.bundles.jaxb-api-2.0</artifactId>
+            <artifactId>org.apache.servicemix.bundles.wsdl4j-1.6.1</artifactId>
             <version>${version}</version>
         </dependency>
         <dependency>
-            <groupId>org.apache.servicemix.bundles</groupId>
-            <artifactId>org.apache.servicemix.bundles.jaxws-api-2.0</artifactId>
-            <version>${version}</version>
+            <groupId>org.apache.servicemix.specs</groupId>
+            <artifactId>org.apache.servicemix.specs.jaxb-api-2.0</artifactId>
+            <version>${servicemix.specs.version}</version>
         </dependency>
         <dependency>
-            <groupId>org.apache.servicemix.bundles</groupId>
-            <artifactId>org.apache.servicemix.bundles.wsdl4j-1.6.1</artifactId>
-            <version>${version}</version>
+            <groupId>org.apache.servicemix.specs</groupId>
+            <artifactId>org.apache.servicemix.specs.jaxws-api-2.0</artifactId>
+            <version>${servicemix.specs.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.servicemix.specs</groupId>
+            <artifactId>org.apache.servicemix.specs.stax-api-1.0</artifactId>
+            <version>${servicemix.specs.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.servicemix.specs</groupId>
+            <artifactId>org.apache.servicemix.specs.saaj-api-1.3</artifactId>
+            <version>${servicemix.specs.version}</version>
         </dependency>
         <dependency>
             <groupId>org.apache.xbean</groupId>
@@ -412,17 +422,6 @@
 		<!-- Dependencies not included directly, but repackaged in bundles.
      	     Listed for legal reasons (and LICENSE file generation) -->
 			<dependency>
-				<groupId>javax.xml.bind</groupId>
-				<artifactId>jaxb-api</artifactId>
-				<version>${jaxb.api.version}</version>
-				<exclusions>
-					<exclusion>
-						<groupId>javax.activation</groupId>
-						<artifactId>activation</artifactId>
-					</exclusion>
-				</exclusions>
-			</dependency>
-			<dependency>
 				<groupId>com.sun.xml.bind</groupId>
 				<artifactId>jaxb-impl</artifactId>
 				<version>${jaxb.impl.version}</version>
@@ -432,11 +431,6 @@
 						<artifactId>activation</artifactId>
 					</exclusion>
 				</exclusions>
-			</dependency>
-			<dependency>
-	            <groupId>javax.xml.ws</groupId>
-				<artifactId>jaxws-api</artifactId>
-				<version>${jaxws.api.version}</version>
 			</dependency>
 			<dependency>
 	            <groupId>com.sun.xml.messaging.saaj</groupId>

Modified: servicemix/smx4/features/trunk/assembly/src/main/descriptors/unix-bin.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/assembly/src/main/descriptors/unix-bin.xml?rev=650837&r1=650836&r2=650837&view=diff
==============================================================================
--- servicemix/smx4/features/trunk/assembly/src/main/descriptors/unix-bin.xml (original)
+++ servicemix/smx4/features/trunk/assembly/src/main/descriptors/unix-bin.xml Wed Apr 23 04:52:48 2008
@@ -106,6 +106,7 @@
             <includes>
                 <!-- NMR / JBI -->
                 <include>org.apache.geronimo.specs:geronimo-activation_1.1_spec</include>
+                <include>org.apache.servicemix.specs:org.apache.servicemix.specs.stax-api-1.0</include>
                 <include>org.apache.servicemix.bundles:org.apache.servicemix.bundles.woodstox-3.2.3</include>
                 <include>org.apache.felix:org.apache.felix.prefs</include>
                 <include>org.apache.xbean:xbean-classloader</include>
@@ -156,13 +157,13 @@
                 <!-- CXF -->
                 <include>org.apache.geronimo.specs:geronimo-annotation_1.0_spec</include>
                 <include>org.apache.geronimo.specs:geronimo-javamail_1.4_spec</include>
-                <include>org.apache.geronimo.specs:geronimo-saaj_1.3_spec</include>
+                <include>org.apache.servicemix.specs:org.apache.servicemix.specs.saaj-api-1.3</include>
                 <include>org.apache.geronimo.specs:geronimo-ws-metadata_2.0_spec</include>
                 <include>org.apache.servicemix.bundles:org.apache.servicemix.bundles.asm-2.2.3</include>
                 <include>org.apache.servicemix.bundles:org.apache.servicemix.bundles.cxf-2.0.5</include>
-                <include>org.apache.servicemix.bundles:org.apache.servicemix.bundles.jaxb-api-2.0</include>
+                <include>org.apache.servicemix.specs:org.apache.servicemix.specs.jaxb-api-2.0</include>
                 <include>org.apache.servicemix.bundles:org.apache.servicemix.bundles.jaxb-impl-2.0.3</include>
-                <include>org.apache.servicemix.bundles:org.apache.servicemix.bundles.jaxws-api-2.0</include>
+                <include>org.apache.servicemix.specs:org.apache.servicemix.specs.jaxws-api-2.0</include>
                 <include>org.apache.servicemix.bundles:org.apache.servicemix.bundles.neethi-2.0.2</include>
                 <include>org.apache.servicemix.bundles:org.apache.servicemix.bundles.saaj-impl-1.3</include>
                 <include>org.apache.servicemix.bundles:org.apache.servicemix.bundles.woodstox-3.2.3</include>

Modified: servicemix/smx4/features/trunk/assembly/src/main/descriptors/windows-bin.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/assembly/src/main/descriptors/windows-bin.xml?rev=650837&r1=650836&r2=650837&view=diff
==============================================================================
--- servicemix/smx4/features/trunk/assembly/src/main/descriptors/windows-bin.xml (original)
+++ servicemix/smx4/features/trunk/assembly/src/main/descriptors/windows-bin.xml Wed Apr 23 04:52:48 2008
@@ -97,6 +97,7 @@
             <includes>
                 <!-- NMR / JBI -->
                 <include>org.apache.geronimo.specs:geronimo-activation_1.1_spec</include>
+                <include>org.apache.servicemix.specs:org.apache.servicemix.specs.stax-api-1.0</include>
                 <include>org.apache.servicemix.bundles:org.apache.servicemix.bundles.woodstox-3.2.3</include>
                 <include>org.apache.felix:org.apache.felix.prefs</include>
                 <include>org.apache.xbean:xbean-classloader</include>
@@ -147,13 +148,13 @@
                 <!-- CXF -->
                 <include>org.apache.geronimo.specs:geronimo-annotation_1.0_spec</include>
                 <include>org.apache.geronimo.specs:geronimo-javamail_1.4_spec</include>
-                <include>org.apache.geronimo.specs:geronimo-saaj_1.3_spec</include>
+                <include>org.apache.servicemix.specs:org.apache.servicemix.specs.saaj-api-1.3</include>
                 <include>org.apache.geronimo.specs:geronimo-ws-metadata_2.0_spec</include>
                 <include>org.apache.servicemix.bundles:org.apache.servicemix.bundles.asm-2.2.3</include>
                 <include>org.apache.servicemix.bundles:org.apache.servicemix.bundles.cxf-2.0.5</include>
-                <include>org.apache.servicemix.bundles:org.apache.servicemix.bundles.jaxb-api-2.0</include>
+                <include>org.apache.servicemix.specs:org.apache.servicemix.specs.jaxb-api-2.0</include>
                 <include>org.apache.servicemix.bundles:org.apache.servicemix.bundles.jaxb-impl-2.0.3</include>
-                <include>org.apache.servicemix.bundles:org.apache.servicemix.bundles.jaxws-api-2.0</include>
+                <include>org.apache.servicemix.specs:org.apache.servicemix.specs.jaxws-api-2.0</include>
                 <include>org.apache.servicemix.bundles:org.apache.servicemix.bundles.neethi-2.0.2</include>
                 <include>org.apache.servicemix.bundles:org.apache.servicemix.bundles.saaj-impl-1.3</include>
                 <include>org.apache.servicemix.bundles:org.apache.servicemix.bundles.woodstox-3.2.3</include>

Modified: servicemix/smx4/features/trunk/assembly/src/main/filtered-resources/etc/startup.properties
URL: http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/assembly/src/main/filtered-resources/etc/startup.properties?rev=650837&r1=650836&r2=650837&view=diff
==============================================================================
--- servicemix/smx4/features/trunk/assembly/src/main/filtered-resources/etc/startup.properties (original)
+++ servicemix/smx4/features/trunk/assembly/src/main/filtered-resources/etc/startup.properties Wed Apr 23 04:52:48 2008
@@ -97,14 +97,15 @@
 
 geronimo-annotation_1.0_spec-${geronimo.annotation.version}.jar=50
 geronimo-javamail_1.4_spec-${geronimo.javamail.version}.jar=50
-geronimo-saaj_1.3_spec-${geronimo.saaj.version}.jar=50
 geronimo-ws-metadata_2.0_spec-${geronimo.wsmetadata.version}.jar=50
+org.apache.servicemix.specs.saaj-api-1.3-${servicemix.specs.version}.jar=50
+org.apache.servicemix.specs.stax-api-1.0-${servicemix.specs.version}.jar=50
+org.apache.servicemix.specs.jaxb-api-2.0-${servicemix.specs.version}.jar=50
+org.apache.servicemix.specs.jaxws-api-2.0-${servicemix.specs.version}.jar=50
 
 org.apache.servicemix.bundles.asm-2.2.3-${servicemix.kernel.version}.jar=50
 org.apache.servicemix.bundles.cxf-2.0.5-${version}.jar=50
-org.apache.servicemix.bundles.jaxb-api-2.0-${version}.jar=50
 org.apache.servicemix.bundles.jaxb-impl-2.0.3-${version}.jar=50
-org.apache.servicemix.bundles.jaxws-api-2.0-${version}.jar=50
 org.apache.servicemix.bundles.neethi-2.0.2-${version}.jar=50
 org.apache.servicemix.bundles.saaj-impl-1.3-${version}.jar=50
 org.apache.servicemix.bundles.woodstox-3.2.3-${servicemix.nmr.version}.jar=50

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=650837&r1=650836&r2=650837&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 Wed Apr 23 04:52:48 2008
@@ -60,13 +60,13 @@
 		<feature>cxf</feature>
 		<feature>web-core</feature>
         <bundle>mvn:org.ops4j.pax.web-extender/pax-web-ex-whiteboard/${pax.web.extender.version}</bundle>
-		<bundle>mvn:org.apache.servicemix.ejb3/org.apache.servicemix.cxf.transport.osgi/${version}</bundle>
+		<bundle>mvn:org.apache.servicemix.cxf/org.apache.servicemix.cxf.transport.osgi/${version}</bundle>
 	</feature>
 	<feature name="cxf-nmr">
 		<feature>cxf</feature>
 		<feature>nmr</feature>
-		<bundle>mvn:org.apache.servicemix.ejb3/org.apache.servicemix.cxf.transport.nmr/${version}</bundle>
-		<bundle>mvn:org.apache.servicemix.ejb3/org.apache.servicemix.cxf.binding.nmr/${version}</bundle>
+		<bundle>mvn:org.apache.servicemix.cxf/org.apache.servicemix.cxf.transport.nmr/${version}</bundle>
+		<bundle>mvn:org.apache.servicemix.cxf/org.apache.servicemix.cxf.binding.nmr/${version}</bundle>
 	</feature>
 	<feature name="camel">
 		<bundle>mvn:org.apache.geronimo.specs/geronimo-activation_1.1_spec/${geronimo.activation.version}</bundle>

Modified: servicemix/smx4/features/trunk/camel/bundles/jaxb-impl/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/camel/bundles/jaxb-impl/pom.xml?rev=650837&r1=650836&r2=650837&view=diff
==============================================================================
--- servicemix/smx4/features/trunk/camel/bundles/jaxb-impl/pom.xml (original)
+++ servicemix/smx4/features/trunk/camel/bundles/jaxb-impl/pom.xml Wed Apr 23 04:52:48 2008
@@ -59,6 +59,18 @@
             <optional>true</optional>
         </dependency>
         <dependency>
+            <groupId>org.apache.servicemix.specs</groupId>
+            <artifactId>org.apache.servicemix.specs.stax-api-1.0</artifactId>
+            <version>${servicemix.specs.version}</version>
+            <optional>true</optional>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.servicemix.specs</groupId>
+            <artifactId>org.apache.servicemix.specs.jaxb-api-2.0</artifactId>
+            <version>${servicemix.specs.version}</version>
+            <optional>true</optional>
+        </dependency>
+        <dependency>
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>
             <version>${junit.version}</version>

Modified: servicemix/smx4/features/trunk/camel/bundles/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/camel/bundles/pom.xml?rev=650837&r1=650836&r2=650837&view=diff
==============================================================================
--- servicemix/smx4/features/trunk/camel/bundles/pom.xml (original)
+++ servicemix/smx4/features/trunk/camel/bundles/pom.xml Wed Apr 23 04:52:48 2008
@@ -33,7 +33,6 @@
     <name>Apache ServiceMix OSGI Common Bundles</name>
 
     <modules>
-        <module>jaxb-api</module>
         <module>jaxb-impl</module>
     </modules>
 

Modified: servicemix/smx4/features/trunk/cxf/bundles/cxf/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/cxf/bundles/cxf/pom.xml?rev=650837&r1=650836&r2=650837&view=diff
==============================================================================
--- servicemix/smx4/features/trunk/cxf/bundles/cxf/pom.xml (original)
+++ servicemix/smx4/features/trunk/cxf/bundles/cxf/pom.xml Wed Apr 23 04:52:48 2008
@@ -79,9 +79,9 @@
 
         <!-- Dependency on other bundles -->
         <dependency>
-            <groupId>org.apache.servicemix.bundles</groupId>
-            <artifactId>org.apache.servicemix.bundles.jaxws-api-2.0</artifactId>
-            <version>${pom.version}</version>
+            <groupId>org.apache.servicemix.specs</groupId>
+            <artifactId>org.apache.servicemix.specs.jaxws-api-2.0</artifactId>
+            <version>${servicemix.specs.version}</version>
         </dependency>
         <dependency>
             <groupId>org.apache.servicemix.bundles</groupId>

Modified: servicemix/smx4/features/trunk/cxf/bundles/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/cxf/bundles/pom.xml?rev=650837&r1=650836&r2=650837&view=diff
==============================================================================
--- servicemix/smx4/features/trunk/cxf/bundles/pom.xml (original)
+++ servicemix/smx4/features/trunk/cxf/bundles/pom.xml Wed Apr 23 04:52:48 2008
@@ -34,7 +34,6 @@
 
     <modules>
         <module>cxf</module>
-        <module>jaxws-api</module>
         <module>neethi</module>
         <module>saaj-impl</module>
         <module>wsdl4j</module>

Modified: servicemix/smx4/features/trunk/examples/cxf-camel-nmr/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/examples/cxf-camel-nmr/pom.xml?rev=650837&r1=650836&r2=650837&view=diff
==============================================================================
--- servicemix/smx4/features/trunk/examples/cxf-camel-nmr/pom.xml (original)
+++ servicemix/smx4/features/trunk/examples/cxf-camel-nmr/pom.xml Wed Apr 23 04:52:48 2008
@@ -62,7 +62,6 @@
                         <Bundle-SymbolicName>${pom.artifactId}</Bundle-SymbolicName>
                         <Import-Package>javax.jws,META-INF.cxf,META-INF.cxf.transport.nmr,org.apache.servicemix.camel,*</Import-Package>
                         <Private-Package>org.apache.servicemix.examples.cxfcamel</Private-Package>
-                        <Require-Bundle>org.apache.servicemix.bundles.woodstox-3.2.3</Require-Bundle>
                     </instructions>
                 </configuration>
             </plugin>

Modified: servicemix/smx4/features/trunk/examples/cxf-nmr/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/examples/cxf-nmr/pom.xml?rev=650837&r1=650836&r2=650837&view=diff
==============================================================================
--- servicemix/smx4/features/trunk/examples/cxf-nmr/pom.xml (original)
+++ servicemix/smx4/features/trunk/examples/cxf-nmr/pom.xml Wed Apr 23 04:52:48 2008
@@ -51,7 +51,6 @@
                         <Bundle-SymbolicName>${pom.artifactId}</Bundle-SymbolicName>
                         <Import-Package>javax.jws,META-INF.cxf,META-INF.cxf.transport.nmr</Import-Package>
                         <Private-Package>org.apache.servicemix.examples.cxf</Private-Package>
-                        <Require-Bundle>org.apache.servicemix.bundles.woodstox-3.2.3</Require-Bundle>
                     </instructions>
                 </configuration>
             </plugin>

Modified: servicemix/smx4/features/trunk/examples/cxf-osgi/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/examples/cxf-osgi/pom.xml?rev=650837&r1=650836&r2=650837&view=diff
==============================================================================
--- servicemix/smx4/features/trunk/examples/cxf-osgi/pom.xml (original)
+++ servicemix/smx4/features/trunk/examples/cxf-osgi/pom.xml Wed Apr 23 04:52:48 2008
@@ -51,7 +51,6 @@
                         <Bundle-SymbolicName>${pom.artifactId}</Bundle-SymbolicName>
                         <Import-Package>javax.jws,META-INF.cxf,META-INF.cxf.osgi</Import-Package>
                         <Private-Package>org.apache.servicemix.examples.cxf</Private-Package>
-                        <Require-Bundle>org.apache.servicemix.bundles.woodstox-3.2.3</Require-Bundle>
                     </instructions>
                 </configuration>
             </plugin>

Propchange: servicemix/smx4/features/trunk/examples/itests/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Wed Apr 23 04:52:48 2008
@@ -0,0 +1,9 @@
+target
+*.iml
+*.ipr
+*.iws
+.classpath
+.project
+.settings
+
+

Copied: servicemix/smx4/features/trunk/examples/itests/pom.xml (from r646413, servicemix/smx4/nmr/trunk/jbi/itests/pom.xml)
URL: http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/examples/itests/pom.xml?p2=servicemix/smx4/features/trunk/examples/itests/pom.xml&p1=servicemix/smx4/nmr/trunk/jbi/itests/pom.xml&r1=646413&r2=650837&rev=650837&view=diff
==============================================================================
--- servicemix/smx4/nmr/trunk/jbi/itests/pom.xml (original)
+++ servicemix/smx4/features/trunk/examples/itests/pom.xml Wed Apr 23 04:52:48 2008
@@ -21,25 +21,21 @@
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
-        <groupId>org.apache.servicemix.jbi</groupId>
-        <artifactId>jbi</artifactId>
-        <version>1.0-m2-SNAPSHOT</version>
+        <groupId>org.apache.servicemix.examples</groupId>
+        <artifactId>examples</artifactId>
+        <version>4.0-m2-SNAPSHOT</version>
     </parent>
 
-    <groupId>org.apache.servicemix.jbi</groupId>
-    <artifactId>org.apache.servicemix.jbi.itests</artifactId>
+    <groupId>org.apache.servicemix.examples</groupId>
+    <artifactId>org.apache.servicemix.examples.itests</artifactId>
     <packaging>jar</packaging>
-    <name>ServiceMix JBI Integration Tests</name>
-
-    <properties>
-        <osgi.test.platform>org.springframework.osgi.test.platform.FelixPlatform</osgi.test.platform>
-    </properties>
+    <name>Apache ServiceMix Examples Integration Tests</name>
 
     <dependencies>
         <dependency>
             <groupId>org.apache.servicemix.kernel</groupId>
             <artifactId>org.apache.servicemix.kernel.main</artifactId>
-            <version>${smx.kernel.version}</version>
+            <version>${servicemix.kernel.version}</version>
             <scope>test</scope>
             <exclusions>
                 <exclusion>
@@ -51,7 +47,7 @@
         <dependency>
             <groupId>org.apache.servicemix.kernel.testing</groupId>
             <artifactId>org.apache.servicemix.kernel.testing.support</artifactId>
-		    <version>${smx.kernel.version}</version>
+		    <version>${servicemix.kernel.version}</version>
             <scope>test</scope>
             <exclusions>
                 <exclusion>
@@ -63,7 +59,7 @@
         <dependency>
             <groupId>org.apache.servicemix.kernel</groupId>
             <artifactId>org.apache.servicemix.kernel.filemonitor</artifactId>
-            <version>${smx.kernel.version}</version>
+            <version>${servicemix.kernel.version}</version>
             <scope>test</scope>
             <exclusions>
                 <exclusion>
@@ -75,121 +71,164 @@
         <dependency>
             <groupId>org.apache.servicemix.bundles</groupId>
             <artifactId>org.apache.servicemix.bundles.ant-${ant.version}</artifactId>
-            <version>${smx.kernel.version}</version>
+            <version>${servicemix.kernel.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.servicemix.bundles</groupId>
+            <artifactId>org.apache.servicemix.bundles.jaxb-impl-2.0.3</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.servicemix.bundles</groupId>
+            <artifactId>org.apache.servicemix.bundles.neethi-2.0.2</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.servicemix.bundles</groupId>
+            <artifactId>org.apache.servicemix.bundles.woodstox-3.2.3</artifactId>
+            <version>${servicemix.nmr.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.servicemix.bundles</groupId>
+            <artifactId>org.apache.servicemix.bundles.wsdl4j-1.6.1</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.servicemix.bundles</groupId>
+            <artifactId>org.apache.servicemix.bundles.xmlschema-1.3.2</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.servicemix.bundles</groupId>
+            <artifactId>org.apache.servicemix.bundles.xmlresolver-1.2</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.servicemix.bundles</groupId>
+            <artifactId>org.apache.servicemix.bundles.cxf-2.0.5</artifactId>
+            <version>${project.version}</version>
         </dependency>
         <dependency>
             <groupId>org.apache.servicemix.nmr</groupId>
             <artifactId>org.apache.servicemix.nmr.api</artifactId>
-            <version>${project.version}</version>
+            <version>${servicemix.nmr.version}</version>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>org.apache.servicemix.nmr</groupId>
             <artifactId>org.apache.servicemix.nmr.core</artifactId>
-            <version>${project.version}</version>
+            <version>${servicemix.nmr.version}</version>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>org.apache.servicemix.nmr</groupId>
             <artifactId>org.apache.servicemix.nmr.osgi</artifactId>
-            <version>${project.version}</version>
+            <version>${servicemix.nmr.version}</version>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>org.apache.servicemix.nmr</groupId>
             <artifactId>org.apache.servicemix.nmr.spring</artifactId>
-            <version>${project.version}</version>
+            <version>${servicemix.nmr.version}</version>
             <scope>test</scope>
         </dependency>
         <dependency>
-            <groupId>org.apache.servicemix.jbi</groupId>
-            <artifactId>org.apache.servicemix.jbi.api</artifactId>
+            <groupId>org.apache.servicemix.cxf</groupId>
+            <artifactId>org.apache.servicemix.cxf.transport.osgi</artifactId>
             <version>${project.version}</version>
             <scope>test</scope>
         </dependency>
         <dependency>
-            <groupId>org.apache.servicemix.jbi</groupId>
-            <artifactId>org.apache.servicemix.jbi.runtime</artifactId>
+            <groupId>org.apache.servicemix.cxf</groupId>
+            <artifactId>org.apache.servicemix.cxf.transport.nmr</artifactId>
             <version>${project.version}</version>
             <scope>test</scope>
         </dependency>
         <dependency>
-            <groupId>org.apache.servicemix.jbi</groupId>
-            <artifactId>org.apache.servicemix.jbi.osgi</artifactId>
-            <version>${project.version}</version>
+            <groupId>org.apache.felix</groupId>
+            <artifactId>org.apache.felix.prefs</artifactId>
+            <version>${felix.prefs.version}</version>
             <scope>test</scope>
         </dependency>
         <dependency>
-            <groupId>org.apache.servicemix.jbi</groupId>
-            <artifactId>org.apache.servicemix.jbi.deployer</artifactId>
+		    <groupId>org.apache.servicemix.examples</groupId>
+		    <artifactId>cxf-osgi</artifactId>
             <version>${project.version}</version>
-            <scope>test</scope>
         </dependency>
         <dependency>
-            <groupId>org.apache.felix</groupId>
-            <artifactId>org.apache.felix.prefs</artifactId>
-            <version>${felix.prefs.version}</version>
-            <scope>test</scope>
+		    <groupId>org.apache.servicemix.examples</groupId>
+		    <artifactId>cxf-nmr</artifactId>
+            <version>${project.version}</version>
         </dependency>
-	    <dependency>
-            <groupId>org.apache.xbean</groupId>
-            <artifactId>xbean-classloader</artifactId>
-            <version>${xbean.version}</version>
-            <scope>test</scope>
+        <dependency>
+		    <groupId>org.apache.servicemix.specs</groupId>
+		    <artifactId>org.apache.servicemix.specs.stax-api-1.0</artifactId>
+            <version>${servicemix.specs.version}</version>
         </dependency>
         <dependency>
-            <groupId>org.apache.servicemix</groupId>
-            <artifactId>servicemix-shared-compat</artifactId>
-            <version>${smx3.version}</version>
-            <classifier>installer</classifier>
-            <type>zip</type>
+		    <groupId>org.apache.servicemix.specs</groupId>
+		    <artifactId>org.apache.servicemix.specs.saaj-api-1.3</artifactId>
+            <version>${servicemix.specs.version}</version>
         </dependency>
         <dependency>
-            <groupId>org.apache.servicemix</groupId>
-            <artifactId>servicemix-eip</artifactId>
-            <version>${smx3.version}</version>
-            <classifier>installer</classifier>
-            <type>zip</type>
+		    <groupId>org.apache.servicemix.specs</groupId>
+		    <artifactId>org.apache.servicemix.specs.jaxb-api-2.0</artifactId>
+            <version>${servicemix.specs.version}</version>
         </dependency>
         <dependency>
-            <groupId>org.apache.servicemix</groupId>
-            <artifactId>servicemix-jsr181</artifactId>
-            <version>${smx3.version}</version>
-            <classifier>installer</classifier>
-            <type>zip</type>
-            <exclusions>
-                <exclusion>
-                    <groupId>org.springframework</groupId>
-                    <artifactId>spring</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>xfire</groupId>
-                    <artifactId>saaj-impl</artifactId>
-                </exclusion>
-            </exclusions>
+		    <groupId>org.apache.servicemix.specs</groupId>
+		    <artifactId>org.apache.servicemix.specs.jaxws-api-2.0</artifactId>
+            <version>${servicemix.specs.version}</version>
         </dependency>
         <dependency>
-            <groupId>org.apache.servicemix</groupId>
-            <artifactId>servicemix-http</artifactId>
-            <version>${smx3.version}</version>
-            <classifier>installer</classifier>
-            <type>zip</type>
+		    <groupId>org.apache.geronimo.specs</groupId>
+		    <artifactId>geronimo-activation_1.1_spec</artifactId>
+            <version>${geronimo.activation.version}</version>
         </dependency>
         <dependency>
-            <groupId>org.apache.servicemix.samples.wsdl-first</groupId>
-            <artifactId>wsdl-first-sa</artifactId>
-            <version>${smx3.version}</version>
-            <type>zip</type>
-            <exclusions>
-                <exclusion>
-                    <groupId>org.apache.servicemix.samples.wsdl-first</groupId>
-                    <artifactId>wsdl-first-jsr181-su</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>org.apache.servicemix.samples.wsdl-first</groupId>
-                    <artifactId>wsdl-first-http-su</artifactId>
-                </exclusion>
-            </exclusions>
+		    <groupId>org.apache.geronimo.specs</groupId>
+		    <artifactId>geronimo-annotation_1.0_spec</artifactId>
+            <version>${geronimo.annotation.version}</version>
+        </dependency>
+        <dependency>
+		    <groupId>org.apache.geronimo.specs</groupId>
+		    <artifactId>geronimo-javamail_1.4_spec</artifactId>
+            <version>${geronimo.javamail.version}</version>
+        </dependency>
+        <dependency>
+		    <groupId>org.apache.geronimo.specs</groupId>
+		    <artifactId>geronimo-servlet_2.5_spec</artifactId>
+            <version>${geronimo.servlet.version}</version>
+        </dependency>
+        <dependency>
+		    <groupId>org.apache.geronimo.specs</groupId>
+		    <artifactId>geronimo-saaj_1.3_spec</artifactId>
+            <version>${geronimo.saaj.version}</version>
+        </dependency>
+        <dependency>
+		    <groupId>org.apache.geronimo.specs</groupId>
+		    <artifactId>geronimo-ws-metadata_2.0_spec</artifactId>
+            <version>${geronimo.wsmetadata.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.mortbay.jetty</groupId>
+            <artifactId>jetty-util</artifactId>
+            <version>${jetty.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.mortbay.jetty</groupId>
+            <artifactId>jetty</artifactId>
+            <version>${jetty.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.ops4j.pax.web</groupId>
+            <artifactId>pax-web-bundle</artifactId>
+            <version>${pax.web.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.ops4j.pax.web-extender</groupId>
+            <artifactId>pax-web-ex-whiteboard</artifactId>
+            <version>${pax.web.extender.version}</version>
         </dependency>
     </dependencies>
 
@@ -199,7 +238,7 @@
             <plugin>
                 <groupId>org.apache.servicemix.kernel.testing</groupId>
                 <artifactId>depends-maven-plugin</artifactId>
-                <version>${smx.kernel.version}</version>
+                <version>${servicemix.kernel.version}</version>
                 <executions>
                     <execution>
                         <id>generate-depends-file</id>
@@ -209,70 +248,11 @@
                     </execution>
                 </executions>
             </plugin>
-            <!-- Copy shared library and component -->
-            <plugin>
-                <groupId>org.codehaus.mojo</groupId>
-                <artifactId>dependency-maven-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <id>copy-components</id>
-                        <phase>generate-resources</phase>
-                        <goals>
-                            <goal>copy</goal>
-                        </goals>
-                        <configuration>
-                            <outputDirectory>target/components</outputDirectory>
-                            <artifactItems>
-                                <artifactItem>
-                                    <groupId>org.apache.servicemix</groupId>
-                                    <artifactId>servicemix-shared-compat</artifactId>
-                                    <version>${smx3.version}</version>
-                                    <classifier>installer</classifier>
-                                    <type>zip</type>
-                                </artifactItem>
-                                <artifactItem>
-                                    <groupId>org.apache.servicemix</groupId>
-                                    <artifactId>servicemix-eip</artifactId>
-                                    <version>${smx3.version}</version>
-                                    <classifier>installer</classifier>
-                                    <type>zip</type>
-                                </artifactItem>
-                                <artifactItem>
-                                    <groupId>org.apache.servicemix</groupId>
-                                    <artifactId>servicemix-jsr181</artifactId>
-                                    <version>${smx3.version}</version>
-                                    <classifier>installer</classifier>
-                                    <type>zip</type>
-                                </artifactItem>
-                                <artifactItem>
-                                    <groupId>org.apache.servicemix</groupId>
-                                    <artifactId>servicemix-http</artifactId>
-                                    <version>${smx3.version}</version>
-                                    <classifier>installer</classifier>
-                                    <type>zip</type>
-                                </artifactItem>
-                                <artifactItem>
-                                    <groupId>org.apache.servicemix.samples.wsdl-first</groupId>
-                                    <artifactId>wsdl-first-sa</artifactId>
-                                    <version>${smx3.version}</version>
-                                    <type>zip</type>
-                                </artifactItem>
-                            </artifactItems>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-surefire-plugin</artifactId>
                 <configuration>
                     <forkMode>pertest</forkMode>
-                    <systemProperties>
-                        <property>
-                            <name>org.springframework.osgi.test.framework</name>
-                            <value>${osgi.test.platform}</value>
-                        </property>
-                    </systemProperties>
                 </configuration>
             </plugin>
         </plugins>

Added: servicemix/smx4/features/trunk/examples/itests/src/test/java/org/apache/servicemix/examples/IntegrationTest.java
URL: http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/examples/itests/src/test/java/org/apache/servicemix/examples/IntegrationTest.java?rev=650837&view=auto
==============================================================================
--- servicemix/smx4/features/trunk/examples/itests/src/test/java/org/apache/servicemix/examples/IntegrationTest.java (added)
+++ servicemix/smx4/features/trunk/examples/itests/src/test/java/org/apache/servicemix/examples/IntegrationTest.java Wed Apr 23 04:52:48 2008
@@ -0,0 +1,94 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.servicemix.examples;
+
+import java.io.File;
+import java.util.Properties;
+import java.util.List;
+
+import org.apache.servicemix.kernel.testing.support.AbstractIntegrationTest;
+import org.springframework.osgi.test.platform.OsgiPlatform;
+
+public class IntegrationTest extends AbstractIntegrationTest {
+
+    private Properties dependencies;
+
+    /**
+	 * The manifest to use for the "virtual bundle" created
+	 * out of the test classes and resources in this project
+	 *
+	 * This is actually the boilerplate manifest with one additional
+	 * import-package added. We should provide a simpler customization
+	 * point for such use cases that doesn't require duplication
+	 * of the entire manifest...
+	 */
+	protected String getManifestLocation() {
+		return "classpath:org/apache/servicemix/MANIFEST.MF";
+	}
+
+    /**
+	 * The location of the packaged OSGi bundles to be installed
+	 * for this test. Values are Spring resource paths. The bundles
+	 * we want to use are part of the same multi-project maven
+	 * build as this project is. Hence we use the localMavenArtifact
+	 * helper method to find the bundles produced by the package
+	 * phase of the maven build (these tests will run after the
+	 * packaging phase, in the integration-test phase).
+	 *
+	 * JUnit, commons-logging, spring-core and the spring OSGi
+	 * test bundle are automatically included so do not need
+	 * to be specified here.
+	 */
+	protected String[] getTestBundlesNames() {
+        return new String[] {
+            getBundle("org.apache.felix", "org.apache.felix.prefs"),
+            getBundle("org.apache.geronimo.specs", "geronimo-activation_1.1_spec"),
+            getBundle("org.apache.geronimo.specs", "geronimo-annotation_1.0_spec"),
+            getBundle("org.apache.geronimo.specs", "geronimo-javamail_1.4_spec"),
+            getBundle("org.apache.geronimo.specs", "geronimo-servlet_2.5_spec"),
+            getBundle("org.apache.geronimo.specs", "geronimo-ws-metadata_2.0_spec"),
+            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.0"),
+            getBundle("org.apache.servicemix.specs", "org.apache.servicemix.specs.jaxws-api-2.0"),
+            getBundle("org.apache.servicemix.bundles", "org.apache.servicemix.bundles.asm-2.2.3"),
+            getBundle("org.apache.servicemix.bundles", "org.apache.servicemix.bundles.jaxb-impl-2.0.3"),
+            getBundle("org.apache.servicemix.bundles", "org.apache.servicemix.bundles.neethi-2.0.2"),
+            getBundle("org.apache.servicemix.bundles", "org.apache.servicemix.bundles.woodstox-3.2.3"),
+            getBundle("org.apache.servicemix.bundles", "org.apache.servicemix.bundles.wsdl4j-1.6.1"),
+            getBundle("org.apache.servicemix.bundles", "org.apache.servicemix.bundles.xmlschema-1.3.2"),
+            getBundle("org.apache.servicemix.bundles", "org.apache.servicemix.bundles.xmlresolver-1.2"),
+            getBundle("org.mortbay.jetty", "jetty-util"),
+            getBundle("org.mortbay.jetty", "jetty"),
+            getBundle("org.ops4j.pax.web", "pax-web-bundle"),
+            getBundle("org.ops4j.pax.web-extender", "pax-web-ex-whiteboard"),
+            getBundle("org.apache.servicemix.bundles", "org.apache.servicemix.bundles.cxf-2.0.5"),
+            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.core"),
+            getBundle("org.apache.servicemix.nmr", "org.apache.servicemix.nmr.spring"),
+            getBundle("org.apache.servicemix.nmr", "org.apache.servicemix.nmr.osgi"),
+		};
+	}
+
+    public void testJbiComponent() throws Exception {
+        installBundle("org.apache.servicemix.examples", "cxf-nmr", null, "jar");
+    }
+
+
+}

Added: servicemix/smx4/features/trunk/examples/itests/src/test/resources/log4j.properties
URL: http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/examples/itests/src/test/resources/log4j.properties?rev=650837&view=auto
==============================================================================
--- servicemix/smx4/features/trunk/examples/itests/src/test/resources/log4j.properties (added)
+++ servicemix/smx4/features/trunk/examples/itests/src/test/resources/log4j.properties Wed Apr 23 04:52:48 2008
@@ -0,0 +1,34 @@
+#
+#    Licensed to the Apache Software Foundation (ASF) under one or more
+#    contributor license agreements.  See the NOTICE file distributed with
+#    this work for additional information regarding copyright ownership.
+#    The ASF licenses this file to You under the Apache License, Version 2.0
+#    (the "License"); you may not use this file except in compliance with
+#    the License.  You may obtain a copy of the License at
+#
+#       http://www.apache.org/licenses/LICENSE-2.0
+#
+#    Unless required by applicable law or agreed to in writing, software
+#    distributed under the License is distributed on an "AS IS" BASIS,
+#    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+#    See the License for the specific language governing permissions and
+#    limitations under the License.
+#
+################################################################################
+
+log4j.rootLogger=DEBUG, stdout
+
+log4j.logger.org.springframework.osgi=DEBUG
+log4j.logger.org.apache.camel=DEBUG
+log4j.logger.org.apache.servicemix=DEBUG
+
+log4j.appender.stdout=org.apache.log4j.ConsoleAppender
+log4j.appender.stdout.layout=org.apache.log4j.PatternLayout
+log4j.appender.stdout.layout.ConversionPattern=%d %p [%c] - %m%n
+
+log4j.appender.out=org.apache.log4j.FileAppender
+log4j.appender.out.layout=org.apache.log4j.PatternLayout
+log4j.appender.out.layout.ConversionPattern=%d [%-15.15t] %-5p %-30.30c{1} - %m%n
+log4j.appender.out.file=target/servicemix-test.log
+log4j.appender.out.append=true
+

Added: servicemix/smx4/features/trunk/examples/itests/src/test/resources/org/apache/servicemix/MANIFEST.MF
URL: http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/examples/itests/src/test/resources/org/apache/servicemix/MANIFEST.MF?rev=650837&view=auto
==============================================================================
--- servicemix/smx4/features/trunk/examples/itests/src/test/resources/org/apache/servicemix/MANIFEST.MF (added)
+++ servicemix/smx4/features/trunk/examples/itests/src/test/resources/org/apache/servicemix/MANIFEST.MF Wed Apr 23 04:52:48 2008
@@ -0,0 +1,32 @@
+Manifest-Version: 1.0
+License-00: . 
+License-01: Licensed to the Apache Software Foundation (ASF) under one or more
+License-02: contributor license agreements.  See the NOTICE file distributed with
+License-03: this work for additional information regarding copyright ownership.
+License-04: The ASF licenses this file to You under the Apache License, Version 2.0
+License-05: (the "License"); you may not use this file except in compliance with
+License-06: the License.  You may obtain a copy of the License at
+License-07: .
+License-08:      http://www.apache.org/licenses/LICENSE-2.0
+License-09: .
+License-10: Unless required by applicable law or agreed to in writing, software
+License-11: distributed under the License is distributed on an "AS IS" BASIS,
+License-12: WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+License-13: See the License for the specific language governing permissions and
+License-14: limitations under the License.
+License-15: .
+Bundle-Name: org.apache.servicemix.test
+Bundle-SymbolicName: org.apache.servicemix.test
+Bundle-Vendor: Spring Framework
+Bundle-Activator: org.springframework.osgi.test.JUnitTestActivator
+Import-Package: junit.framework,
+ org.osgi.framework;specification-version="1.3.0",
+ org.apache.commons.logging,
+ org.springframework.core,
+ org.springframework.core.io,
+ org.springframework.osgi.test,
+ org.springframework.osgi.test.platform,
+ org.apache.servicemix.nmr.api,
+ org.apache.servicemix.nmr.core,
+ org.apache.servicemix.kernel.testing.support,
+ org.springframework.osgi.util

Modified: servicemix/smx4/features/trunk/examples/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/examples/pom.xml?rev=650837&r1=650836&r2=650837&view=diff
==============================================================================
--- servicemix/smx4/features/trunk/examples/pom.xml (original)
+++ servicemix/smx4/features/trunk/examples/pom.xml Wed Apr 23 04:52:48 2008
@@ -38,6 +38,7 @@
         <module>cxf-camel-nmr</module>
         <module>cxf-nmr</module>
         <module>cxf-osgi</module>
+        <module>itests</module>
     </modules>
 
 </project>

Modified: servicemix/smx4/features/trunk/management/acegi/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/management/acegi/pom.xml?rev=650837&r1=650836&r2=650837&view=diff
==============================================================================
--- servicemix/smx4/features/trunk/management/acegi/pom.xml (original)
+++ servicemix/smx4/features/trunk/management/acegi/pom.xml Wed Apr 23 04:52:48 2008
@@ -43,6 +43,10 @@
 		            <groupId>org.springframework</groupId>
 		            <artifactId>spring-remoting</artifactId>
                 </exclusion>
+                <exclusion>
+		            <groupId>org.springframework</groupId>
+		            <artifactId>spring-jdbc</artifactId>
+                </exclusion>
             </exclusions>
         </dependency>
         <dependency>
@@ -50,11 +54,13 @@
             <artifactId>spring-context</artifactId>
             <version>${spring.version}</version>
         </dependency>
+<!--
         <dependency>
             <groupId>org.springframework</groupId>
             <artifactId>spring-jdbc</artifactId>
             <version>${spring.version}</version>
         </dependency>
+-->
         <dependency>
             <groupId>org.apache.felix</groupId>
             <artifactId>org.osgi.core</artifactId>

Modified: servicemix/smx4/features/trunk/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/pom.xml?rev=650837&r1=650836&r2=650837&view=diff
==============================================================================
--- servicemix/smx4/features/trunk/pom.xml (original)
+++ servicemix/smx4/features/trunk/pom.xml Wed Apr 23 04:52:48 2008
@@ -113,11 +113,12 @@
       <pax.url.version>0.3.0</pax.url.version>
       <pax.web.version>0.4.1</pax.web.version>
       <pax.web.extender.version>0.3.0</pax.web.extender.version>
-      <servicemix.legal.version>1.0</servicemix.legal.version>
-      <servicemix.kernel.version>1.0-m2</servicemix.kernel.version>
+      <servicemix.legal.version>1.0-SNAPSHOT</servicemix.legal.version>
+      <servicemix.kernel.version>1.0-m3-SNAPSHOT</servicemix.kernel.version>
       <servicemix.nmr.version>1.0-m1</servicemix.nmr.version>
-      <spring.version>2.5.1</spring.version>
-      <spring.osgi.version>1.0</spring.osgi.version>
+      <servicemix.specs.version>1.0-SNAPSHOT</servicemix.specs.version>
+      <spring.version>2.5.2</spring.version>
+      <spring.osgi.version>1.0.2</spring.osgi.version>
       <xstream.version>1.2.2</xstream.version>
       <xbean.version>3.3.1-r643297</xbean.version>
   </properties>
@@ -357,16 +358,15 @@
 
       <pluginManagement>
           <plugins>
-            <plugin>
-              <groupId>org.apache.maven.plugins</groupId>
-              <artifactId>maven-eclipse-plugin</artifactId>
-              <version>2.4</version>
-              <configuration>
-                <outputDirectory>${basedir}/eclipse-classes</outputDirectory>
-                <downloadSources>true</downloadSources>
-                <downloadJavadocs>true</downloadJavadocs>
-              </configuration>
-            </plugin>              
+              <plugin>
+                  <groupId>org.apache.maven.plugins</groupId>
+                  <artifactId>maven-release-plugin</artifactId>
+                  <version>2.0-beta-7</version>
+                  <configuration>
+                      <preparationGoals>clean,verify,install</preparationGoals>
+                      <autoVersionSubmodules>true</autoVersionSubmodules>
+                  </configuration>
+              </plugin>
               <plugin>
                   <groupId>org.apache.felix</groupId>
                   <artifactId>maven-bundle-plugin</artifactId>
@@ -404,6 +404,7 @@
           <plugin>
               <groupId>org.apache.maven.plugins</groupId>
               <artifactId>maven-dependency-plugin</artifactId>
+              <version>2.0</version>
               <executions>
                   <execution>
                       <id>copy-legal</id>