servicemix-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ge...@apache.org
Subject svn commit: r597487 - in /servicemix/branches/servicemix-3.2: deployables/bindingcomponents/servicemix-cxf-bc/ deployables/bindingcomponents/servicemix-http/ deployables/bindingcomponents/servicemix-jms/ deployables/serviceengines/servicemix-camel/ dep...
Date Thu, 22 Nov 2007 21:00:29 GMT
Author: gertv
Date: Thu Nov 22 13:00:28 2007
New Revision: 597487

URL: http://svn.apache.org/viewvc?rev=597487&view=rev
Log:
SM-1145: NoClassDefFoundException when deploying Camel example

Modified:
    servicemix/branches/servicemix-3.2/deployables/bindingcomponents/servicemix-cxf-bc/pom.xml
    servicemix/branches/servicemix-3.2/deployables/bindingcomponents/servicemix-http/pom.xml
    servicemix/branches/servicemix-3.2/deployables/bindingcomponents/servicemix-jms/pom.xml
    servicemix/branches/servicemix-3.2/deployables/serviceengines/servicemix-camel/pom.xml
    servicemix/branches/servicemix-3.2/deployables/serviceengines/servicemix-script/pom.xml
    servicemix/branches/servicemix-3.2/distributions/apache-servicemix/src/main/assembly/bin.xml

Modified: servicemix/branches/servicemix-3.2/deployables/bindingcomponents/servicemix-cxf-bc/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/branches/servicemix-3.2/deployables/bindingcomponents/servicemix-cxf-bc/pom.xml?rev=597487&r1=597486&r2=597487&view=diff
==============================================================================
--- servicemix/branches/servicemix-3.2/deployables/bindingcomponents/servicemix-cxf-bc/pom.xml
(original)
+++ servicemix/branches/servicemix-3.2/deployables/bindingcomponents/servicemix-cxf-bc/pom.xml
Thu Nov 22 13:00:28 2007
@@ -164,7 +164,6 @@
       <version>${spring-version}</version>
       <scope>provided</scope>
     </dependency>
-
     <dependency>
       <groupId>org.springframework</groupId>
       <artifactId>spring-context</artifactId>

Modified: servicemix/branches/servicemix-3.2/deployables/bindingcomponents/servicemix-http/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/branches/servicemix-3.2/deployables/bindingcomponents/servicemix-http/pom.xml?rev=597487&r1=597486&r2=597487&view=diff
==============================================================================
--- servicemix/branches/servicemix-3.2/deployables/bindingcomponents/servicemix-http/pom.xml
(original)
+++ servicemix/branches/servicemix-3.2/deployables/bindingcomponents/servicemix-http/pom.xml
Thu Nov 22 13:00:28 2007
@@ -195,8 +195,20 @@
     </dependency>
     <dependency>
       <groupId>org.springframework</groupId>
+      <artifactId>spring-aop</artifactId>
+      <version>${spring-version}</version>
+      <scope>provided</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.springframework</groupId>
       <artifactId>spring-remoting</artifactId>
       <version>${spring-version}</version>
+      <exclusions>
+        <exclusion>
+          <groupId>org.springframework</groupId>
+          <artifactId>spring-aop</artifactId>
+        </exclusion>
+      </exclusions>
     </dependency>
     <dependency>
       <groupId>xstream</groupId>

Modified: servicemix/branches/servicemix-3.2/deployables/bindingcomponents/servicemix-jms/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/branches/servicemix-3.2/deployables/bindingcomponents/servicemix-jms/pom.xml?rev=597487&r1=597486&r2=597487&view=diff
==============================================================================
--- servicemix/branches/servicemix-3.2/deployables/bindingcomponents/servicemix-jms/pom.xml
(original)
+++ servicemix/branches/servicemix-3.2/deployables/bindingcomponents/servicemix-jms/pom.xml
Thu Nov 22 13:00:28 2007
@@ -50,6 +50,12 @@
     <dependency>
       <groupId>org.jencks</groupId>
       <artifactId>jencks</artifactId>
+      <exclusions>
+        <exclusion>
+          <groupId>org.springframework</groupId>
+          <artifactId>spring-aop</artifactId>
+        </exclusion>
+      </exclusions>
     </dependency>
     <dependency>
       <groupId>org.apache.geronimo.modules</groupId>
@@ -150,6 +156,12 @@
       <version>${spring-version}</version>
       <scope>provided</scope>
     </dependency>
+    <dependency>
+      <groupId>org.springframework</groupId>
+      <artifactId>spring-aop</artifactId>
+      <version>${spring-version}</version>
+      <scope>provided</scope>
+    </dependency>    
   </dependencies>
 
   <build>

Modified: servicemix/branches/servicemix-3.2/deployables/serviceengines/servicemix-camel/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/branches/servicemix-3.2/deployables/serviceengines/servicemix-camel/pom.xml?rev=597487&r1=597486&r2=597487&view=diff
==============================================================================
--- servicemix/branches/servicemix-3.2/deployables/serviceengines/servicemix-camel/pom.xml
(original)
+++ servicemix/branches/servicemix-3.2/deployables/serviceengines/servicemix-camel/pom.xml
Thu Nov 22 13:00:28 2007
@@ -100,6 +100,12 @@
     </dependency>
     <dependency>
       <groupId>org.springframework</groupId>
+      <artifactId>spring-aop</artifactId>
+      <version>${spring-version}</version>
+      <scope>provided</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.springframework</groupId>
       <artifactId>spring-remoting</artifactId>
       <version>${spring-version}</version>
       <exclusions>
@@ -107,12 +113,10 @@
           <groupId>org.springframework</groupId>
           <artifactId>spring-web</artifactId>
         </exclusion>
-<!--
         <exclusion>
           <groupId>org.springframework</groupId>
           <artifactId>spring-aop</artifactId>
         </exclusion>
--->
         <exclusion>
           <groupId>aopalliance</groupId>
           <artifactId>aopalliance</artifactId>

Modified: servicemix/branches/servicemix-3.2/deployables/serviceengines/servicemix-script/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/branches/servicemix-3.2/deployables/serviceengines/servicemix-script/pom.xml?rev=597487&r1=597486&r2=597487&view=diff
==============================================================================
--- servicemix/branches/servicemix-3.2/deployables/serviceengines/servicemix-script/pom.xml
(original)
+++ servicemix/branches/servicemix-3.2/deployables/serviceengines/servicemix-script/pom.xml
Thu Nov 22 13:00:28 2007
@@ -62,6 +62,7 @@
 			<groupId>org.springframework</groupId>
 			<artifactId>spring-aop</artifactId>
 			<version>${spring-version}</version>
+			<scope>provided</scope>
 		</dependency>
 		<dependency>
 			<groupId>org.springframework</groupId>

Modified: servicemix/branches/servicemix-3.2/distributions/apache-servicemix/src/main/assembly/bin.xml
URL: http://svn.apache.org/viewvc/servicemix/branches/servicemix-3.2/distributions/apache-servicemix/src/main/assembly/bin.xml?rev=597487&r1=597486&r2=597487&view=diff
==============================================================================
--- servicemix/branches/servicemix-3.2/distributions/apache-servicemix/src/main/assembly/bin.xml
(original)
+++ servicemix/branches/servicemix-3.2/distributions/apache-servicemix/src/main/assembly/bin.xml
Thu Nov 22 13:00:28 2007
@@ -114,7 +114,7 @@
         <include>org.springframework:spring-context</include>
         <include>org.springframework:spring-jmx</include>
         <include>org.springframework:spring-dao</include>
-        
+        <include>org.springframework:spring-aop</include>
         <include>org.apache.geronimo.specs:geronimo-jms_1.1_spec</include>
         <include>org.apache.geronimo.specs:geronimo-jta_1.1_spec</include>
         <include>org.apache.geronimo.specs:geronimo-j2ee-management_1.0_spec</include>



Mime
View raw message