You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by da...@apache.org on 2008/04/14 21:20:34 UTC
svn commit: r647941 - in /activemq/camel/trunk: ./ camel-core/
components/camel-bam/ components/camel-groovy/ components/camel-ibatis/
components/camel-jms/ components/camel-jpa/ components/camel-mail/
components/camel-osgi/ components/camel-ruby/ comp...
Author: davsclaus
Date: Mon Apr 14 12:20:25 2008
New Revision: 647941
URL: http://svn.apache.org/viewvc?rev=647941&view=rev
Log:
CAMEL-281 using individual spring jars instead of just spring.jar. In some components removed dependency on spring as it was not used at all.
Modified:
activemq/camel/trunk/camel-core/pom.xml
activemq/camel/trunk/components/camel-bam/pom.xml
activemq/camel/trunk/components/camel-groovy/pom.xml
activemq/camel/trunk/components/camel-ibatis/pom.xml
activemq/camel/trunk/components/camel-jms/pom.xml
activemq/camel/trunk/components/camel-jpa/pom.xml
activemq/camel/trunk/components/camel-mail/pom.xml
activemq/camel/trunk/components/camel-osgi/pom.xml
activemq/camel/trunk/components/camel-ruby/pom.xml
activemq/camel/trunk/components/camel-script/pom.xml
activemq/camel/trunk/components/camel-spring/pom.xml
activemq/camel/trunk/components/camel-sql/pom.xml
activemq/camel/trunk/components/camel-stringtemplate/pom.xml
activemq/camel/trunk/components/camel-testng/pom.xml
activemq/camel/trunk/components/camel-uface/pom.xml
activemq/camel/trunk/components/camel-velocity/pom.xml
activemq/camel/trunk/examples/camel-example-spring-xquery/pom.xml
activemq/camel/trunk/examples/camel-example-spring/pom.xml
activemq/camel/trunk/pom.xml
Modified: activemq/camel/trunk/camel-core/pom.xml
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/pom.xml?rev=647941&r1=647940&r2=647941&view=diff
==============================================================================
--- activemq/camel/trunk/camel-core/pom.xml (original)
+++ activemq/camel/trunk/camel-core/pom.xml Mon Apr 14 12:20:25 2008
@@ -48,10 +48,11 @@
</dependency>
- <!-- to allow Spring annotations to be used; could replace with the micro-jar later -->
+ <!-- to allow Spring annotations to be used -->
<dependency>
<groupId>org.springframework</groupId>
- <artifactId>spring</artifactId>
+ <artifactId>spring-context</artifactId>
+ <version>${spring-version}</version>
<optional>true</optional>
<scope>compile</scope>
</dependency>
@@ -75,6 +76,12 @@
<dependency>
<groupId>org.easymock</groupId>
<artifactId>easymockclassextension</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-aop</artifactId>
+ <version>${spring-version}</version>
<scope>test</scope>
</dependency>
</dependencies>
Modified: activemq/camel/trunk/components/camel-bam/pom.xml
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-bam/pom.xml?rev=647941&r1=647940&r2=647941&view=diff
==============================================================================
--- activemq/camel/trunk/components/camel-bam/pom.xml (original)
+++ activemq/camel/trunk/components/camel-bam/pom.xml Mon Apr 14 12:20:25 2008
@@ -48,6 +48,11 @@
<artifactId>camel-spring</artifactId>
</dependency>
<dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-orm</artifactId>
+ <version>${spring-version}</version>
+ </dependency>
+ <dependency>
<groupId>javax.persistence</groupId>
<artifactId>persistence-api</artifactId>
<version>1.0</version>
Modified: activemq/camel/trunk/components/camel-groovy/pom.xml
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-groovy/pom.xml?rev=647941&r1=647940&r2=647941&view=diff
==============================================================================
--- activemq/camel/trunk/components/camel-groovy/pom.xml (original)
+++ activemq/camel/trunk/components/camel-groovy/pom.xml Mon Apr 14 12:20:25 2008
@@ -48,10 +48,6 @@
<artifactId>camel-spring</artifactId>
</dependency>
<dependency>
- <groupId>org.springframework</groupId>
- <artifactId>spring</artifactId>
- </dependency>
- <dependency>
<groupId>org.codehaus.groovy</groupId>
<artifactId>groovy-all</artifactId>
</dependency>
Modified: activemq/camel/trunk/components/camel-ibatis/pom.xml
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-ibatis/pom.xml?rev=647941&r1=647940&r2=647941&view=diff
==============================================================================
--- activemq/camel/trunk/components/camel-ibatis/pom.xml (original)
+++ activemq/camel/trunk/components/camel-ibatis/pom.xml Mon Apr 14 12:20:25 2008
@@ -49,7 +49,8 @@
</dependency>
<dependency>
<groupId>org.springframework</groupId>
- <artifactId>spring</artifactId>
+ <artifactId>spring-core</artifactId>
+ <version>${spring-version}</version>
</dependency>
<dependency>
<groupId>org.apache.ibatis</groupId>
Modified: activemq/camel/trunk/components/camel-jms/pom.xml
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-jms/pom.xml?rev=647941&r1=647940&r2=647941&view=diff
==============================================================================
--- activemq/camel/trunk/components/camel-jms/pom.xml (original)
+++ activemq/camel/trunk/components/camel-jms/pom.xml Mon Apr 14 12:20:25 2008
@@ -49,7 +49,8 @@
</dependency>
<dependency>
<groupId>org.springframework</groupId>
- <artifactId>spring</artifactId>
+ <artifactId>spring-jms</artifactId>
+ <version>${spring-version}</version>
</dependency>
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
Modified: activemq/camel/trunk/components/camel-jpa/pom.xml
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-jpa/pom.xml?rev=647941&r1=647940&r2=647941&view=diff
==============================================================================
--- activemq/camel/trunk/components/camel-jpa/pom.xml (original)
+++ activemq/camel/trunk/components/camel-jpa/pom.xml Mon Apr 14 12:20:25 2008
@@ -57,7 +57,13 @@
<dependency>
<groupId>org.springframework</groupId>
- <artifactId>spring</artifactId>
+ <artifactId>spring-jdbc</artifactId>
+ <version>${spring-version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-orm</artifactId>
+ <version>${spring-version}</version>
</dependency>
<dependency>
Modified: activemq/camel/trunk/components/camel-mail/pom.xml
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-mail/pom.xml?rev=647941&r1=647940&r2=647941&view=diff
==============================================================================
--- activemq/camel/trunk/components/camel-mail/pom.xml (original)
+++ activemq/camel/trunk/components/camel-mail/pom.xml Mon Apr 14 12:20:25 2008
@@ -58,7 +58,8 @@
</dependency>
<dependency>
<groupId>org.springframework</groupId>
- <artifactId>spring</artifactId>
+ <artifactId>spring-context-support</artifactId>
+ <version>${spring-version}</version>
</dependency>
<dependency>
<groupId>javax.mail</groupId>
Modified: activemq/camel/trunk/components/camel-osgi/pom.xml
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-osgi/pom.xml?rev=647941&r1=647940&r2=647941&view=diff
==============================================================================
--- activemq/camel/trunk/components/camel-osgi/pom.xml (original)
+++ activemq/camel/trunk/components/camel-osgi/pom.xml Mon Apr 14 12:20:25 2008
@@ -48,8 +48,9 @@
<artifactId>camel-spring</artifactId>
</dependency>
<dependency>
- <groupId>org.springframework</groupId>
- <artifactId>spring</artifactId>
+ <groupId>org.springframework.osgi</groupId>
+ <artifactId>spring-osgi-core</artifactId>
+ <version>${spring-osgi-version}</version>
</dependency>
<dependency>
<groupId>javax.xml.bind</groupId>
Modified: activemq/camel/trunk/components/camel-ruby/pom.xml
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-ruby/pom.xml?rev=647941&r1=647940&r2=647941&view=diff
==============================================================================
--- activemq/camel/trunk/components/camel-ruby/pom.xml (original)
+++ activemq/camel/trunk/components/camel-ruby/pom.xml Mon Apr 14 12:20:25 2008
@@ -48,10 +48,6 @@
<artifactId>camel-spring</artifactId>
</dependency>
<dependency>
- <groupId>org.springframework</groupId>
- <artifactId>spring</artifactId>
- </dependency>
- <dependency>
<groupId>org.jruby</groupId>
<artifactId>jruby</artifactId>
<version>1.0.1</version>
Modified: activemq/camel/trunk/components/camel-script/pom.xml
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-script/pom.xml?rev=647941&r1=647940&r2=647941&view=diff
==============================================================================
--- activemq/camel/trunk/components/camel-script/pom.xml (original)
+++ activemq/camel/trunk/components/camel-script/pom.xml Mon Apr 14 12:20:25 2008
@@ -54,7 +54,8 @@
<dependency>
<groupId>org.springframework</groupId>
- <artifactId>spring</artifactId>
+ <artifactId>spring-core</artifactId>
+ <version>${spring-version}</version>
</dependency>
<!-- testing -->
Modified: activemq/camel/trunk/components/camel-spring/pom.xml
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-spring/pom.xml?rev=647941&r1=647940&r2=647941&view=diff
==============================================================================
--- activemq/camel/trunk/components/camel-spring/pom.xml (original)
+++ activemq/camel/trunk/components/camel-spring/pom.xml Mon Apr 14 12:20:25 2008
@@ -52,7 +52,18 @@
</dependency>
<dependency>
<groupId>org.springframework</groupId>
- <artifactId>spring</artifactId>
+ <artifactId>spring-core</artifactId>
+ <version>${spring-version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-context</artifactId>
+ <version>${spring-version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-tx</artifactId>
+ <version>${spring-version}</version>
</dependency>
<!-- for testing -->
@@ -64,6 +75,12 @@
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-test</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-aop</artifactId>
+ <version>${spring-version}</version>
<scope>test</scope>
</dependency>
<dependency>
Modified: activemq/camel/trunk/components/camel-sql/pom.xml
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-sql/pom.xml?rev=647941&r1=647940&r2=647941&view=diff
==============================================================================
--- activemq/camel/trunk/components/camel-sql/pom.xml (original)
+++ activemq/camel/trunk/components/camel-sql/pom.xml Mon Apr 14 12:20:25 2008
@@ -39,7 +39,8 @@
</dependency>
<dependency>
<groupId>org.springframework</groupId>
- <artifactId>spring</artifactId>
+ <artifactId>spring-jdbc</artifactId>
+ <version>${spring-version}</version>
</dependency>
<!-- test dependencies -->
<dependency>
Modified: activemq/camel/trunk/components/camel-stringtemplate/pom.xml
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-stringtemplate/pom.xml?rev=647941&r1=647940&r2=647941&view=diff
==============================================================================
--- activemq/camel/trunk/components/camel-stringtemplate/pom.xml (original)
+++ activemq/camel/trunk/components/camel-stringtemplate/pom.xml Mon Apr 14 12:20:25 2008
@@ -48,10 +48,6 @@
<artifactId>camel-spring</artifactId>
</dependency>
<dependency>
- <groupId>org.springframework</groupId>
- <artifactId>spring</artifactId>
- </dependency>
- <dependency>
<groupId>antlr</groupId>
<artifactId>stringtemplate</artifactId>
<version>2.3b6</version>
Modified: activemq/camel/trunk/components/camel-testng/pom.xml
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-testng/pom.xml?rev=647941&r1=647940&r2=647941&view=diff
==============================================================================
--- activemq/camel/trunk/components/camel-testng/pom.xml (original)
+++ activemq/camel/trunk/components/camel-testng/pom.xml Mon Apr 14 12:20:25 2008
@@ -48,10 +48,6 @@
<artifactId>camel-spring</artifactId>
</dependency>
<dependency>
- <groupId>org.springframework</groupId>
- <artifactId>spring</artifactId>
- </dependency>
- <dependency>
<groupId>org.testng</groupId>
<artifactId>testng</artifactId>
<classifier>jdk15</classifier>
Modified: activemq/camel/trunk/components/camel-uface/pom.xml
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-uface/pom.xml?rev=647941&r1=647940&r2=647941&view=diff
==============================================================================
--- activemq/camel/trunk/components/camel-uface/pom.xml (original)
+++ activemq/camel/trunk/components/camel-uface/pom.xml Mon Apr 14 12:20:25 2008
@@ -48,10 +48,6 @@
<artifactId>camel-spring</artifactId>
</dependency>
<dependency>
- <groupId>org.springframework</groupId>
- <artifactId>spring</artifactId>
- </dependency>
- <dependency>
<groupId>org.ufacekit</groupId>
<artifactId>org.ufacekit.ui</artifactId>
<version>${uface-version}</version>
Modified: activemq/camel/trunk/components/camel-velocity/pom.xml
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-velocity/pom.xml?rev=647941&r1=647940&r2=647941&view=diff
==============================================================================
--- activemq/camel/trunk/components/camel-velocity/pom.xml (original)
+++ activemq/camel/trunk/components/camel-velocity/pom.xml Mon Apr 14 12:20:25 2008
@@ -48,10 +48,6 @@
<artifactId>camel-spring</artifactId>
</dependency>
<dependency>
- <groupId>org.springframework</groupId>
- <artifactId>spring</artifactId>
- </dependency>
- <dependency>
<groupId>velocity</groupId>
<artifactId>velocity</artifactId>
<version>1.4</version>
Modified: activemq/camel/trunk/examples/camel-example-spring-xquery/pom.xml
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/examples/camel-example-spring-xquery/pom.xml?rev=647941&r1=647940&r2=647941&view=diff
==============================================================================
--- activemq/camel/trunk/examples/camel-example-spring-xquery/pom.xml (original)
+++ activemq/camel/trunk/examples/camel-example-spring-xquery/pom.xml Mon Apr 14 12:20:25 2008
@@ -41,32 +41,11 @@
<groupId>org.apache.camel</groupId>
<artifactId>camel-spring</artifactId>
</dependency>
- <!-- not really required - should be transitive -->
- <dependency>
- <groupId>org.springframework</groupId>
- <artifactId>spring</artifactId>
- </dependency>
<!-- xquery support -->
<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-saxon</artifactId>
- </dependency>
- <!-- not really required - should be transitive -->
- <dependency>
- <groupId>net.sf.saxon</groupId>
- <artifactId>saxon</artifactId>
- <version>${saxon-version}</version>
- </dependency>
- <dependency>
- <groupId>net.sf.saxon</groupId>
- <artifactId>saxon-dom</artifactId>
- <version>${saxon-version}</version>
- </dependency>
- <dependency>
- <groupId>net.sf.saxon</groupId>
- <artifactId>saxon-sql</artifactId>
- <version>${saxon-version}</version>
</dependency>
<!-- jms support -->
Modified: activemq/camel/trunk/examples/camel-example-spring/pom.xml
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/examples/camel-example-spring/pom.xml?rev=647941&r1=647940&r2=647941&view=diff
==============================================================================
--- activemq/camel/trunk/examples/camel-example-spring/pom.xml (original)
+++ activemq/camel/trunk/examples/camel-example-spring/pom.xml Mon Apr 14 12:20:25 2008
@@ -42,10 +42,6 @@
<groupId>org.apache.camel</groupId>
<artifactId>camel-spring</artifactId>
</dependency>
- <dependency>
- <groupId>org.springframework</groupId>
- <artifactId>spring</artifactId>
- </dependency>
<dependency>
<groupId>org.apache.camel</groupId>
Modified: activemq/camel/trunk/pom.xml
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/pom.xml?rev=647941&r1=647940&r2=647941&view=diff
==============================================================================
--- activemq/camel/trunk/pom.xml (original)
+++ activemq/camel/trunk/pom.xml Mon Apr 14 12:20:25 2008
@@ -45,6 +45,7 @@
<slf4j-version>1.3.0</slf4j-version>
<openjpa-version>1.0.2</openjpa-version>
<spring-version>2.5.3</spring-version>
+ <spring-osgi-version>1.0.2</spring-osgi-version>
<mina-version>1.1.6</mina-version>
<uface-version>1.0-m1</uface-version>
@@ -636,38 +637,8 @@
<!-- Optional Spring Support -->
<dependency>
<groupId>org.springframework</groupId>
- <artifactId>spring</artifactId>
+ <artifactId>spring-context</artifactId>
<version>${spring-version}</version>
- <exclusions>
- <exclusion>
- <groupId>javax.mail</groupId>
- <artifactId>mail</artifactId>
- </exclusion>
- <exclusion>
- <groupId>javax.resource</groupId>
- <artifactId>connector</artifactId>
- </exclusion>
- <exclusion>
- <groupId>javax.transaction</groupId>
- <artifactId>jta</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.springframework</groupId>
- <artifactId>spring-support</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.springframework</groupId>
- <artifactId>spring-orm</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.springframework</groupId>
- <artifactId>spring-hibernate</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.springframework</groupId>
- <artifactId>spring-remoting</artifactId>
- </exclusion>
- </exclusions>
</dependency>
<dependency>
<groupId>org.springframework</groupId>