You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by ni...@apache.org on 2009/12/28 14:34:21 UTC
svn commit: r894170 - in /camel/trunk: components/ components/camel-osgi/
components/camel-spring-javaconfig/ examples/
examples/camel-example-cxf/src/test/java/org/apache/camel/example/cxf/
examples/camel-example-spring-javaconfig/ parent/
Author: ningjiang
Date: Mon Dec 28 13:34:20 2009
New Revision: 894170
URL: http://svn.apache.org/viewvc?rev=894170&view=rev
Log:
CAMEL-2316 using spring 2.5.6 by default
Modified:
camel/trunk/components/camel-osgi/pom.xml
camel/trunk/components/camel-spring-javaconfig/pom.xml
camel/trunk/components/pom.xml
camel/trunk/examples/camel-example-cxf/src/test/java/org/apache/camel/example/cxf/CxfHttpJmsClientServerTest.java
camel/trunk/examples/camel-example-spring-javaconfig/pom.xml
camel/trunk/examples/pom.xml
camel/trunk/parent/pom.xml
Modified: camel/trunk/components/camel-osgi/pom.xml
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-osgi/pom.xml?rev=894170&r1=894169&r2=894170&view=diff
==============================================================================
--- camel/trunk/components/camel-osgi/pom.xml (original)
+++ camel/trunk/components/camel-osgi/pom.xml Mon Dec 28 13:34:20 2009
@@ -77,7 +77,6 @@
<groupId>org.springframework</groupId>
<artifactId>org.springframework.core</artifactId>
</exclusion>
-
</exclusions>
</dependency>
<dependency>
Modified: camel/trunk/components/camel-spring-javaconfig/pom.xml
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-spring-javaconfig/pom.xml?rev=894170&r1=894169&r2=894170&view=diff
==============================================================================
--- camel/trunk/components/camel-spring-javaconfig/pom.xml (original)
+++ camel/trunk/components/camel-spring-javaconfig/pom.xml Mon Dec 28 13:34:20 2009
@@ -38,8 +38,9 @@
org.apache.camel.*;${camel.osgi.import.camel.version},
org.springframework.*;version="[3,4)",
*
- </camel.osgi.import>
-
+ </camel.osgi.import>
+ <spring-version>3.0.0.RELEASE</spring-version>
+ <junit-version>4.6</junit-version>
</properties>
<repositories>
@@ -58,6 +59,48 @@
<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-spring</artifactId>
+ <exclusions>
+ <exclusion>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-aop</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-beans</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-context</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-core</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-tx</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-aop</artifactId>
+ <version>${spring-version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-beans</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-core</artifactId>
+ <version>${spring-version}</version>
</dependency>
<dependency>
<groupId>net.sourceforge.cglib</groupId>
@@ -67,11 +110,13 @@
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
+ <version>${junit-version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-test</artifactId>
+ <version>${spring-version}</version>
</dependency>
<dependency>
<groupId>javax.annotation</groupId>
Modified: camel/trunk/components/pom.xml
URL: http://svn.apache.org/viewvc/camel/trunk/components/pom.xml?rev=894170&r1=894169&r2=894170&view=diff
==============================================================================
--- camel/trunk/components/pom.xml (original)
+++ camel/trunk/components/pom.xml Mon Dec 28 13:34:20 2009
@@ -88,6 +88,7 @@
<module>camel-snmp</module>
<module>camel-spring</module>
<module>camel-spring-integration</module>
+ <module>camel-spring-javaconfig</module>
<module>camel-spring-osgi</module>
<module>camel-sql</module>
<module>camel-stringtemplate</module>
@@ -102,19 +103,4 @@
<module>camel-web</module>
<module>camel-web-standalone</module>
</modules>
- <profiles>
- <profile>
- <id>spring-3.x</id>
- <activation>
- <activeByDefault>true</activeByDefault>
- </activation>
- <modules>
- <!-- current camel-spring only work with Spring 3.x-->
- <module>camel-spring-javaconfig</module>
- </modules>
- </profile>
- <profile>
- <id>spring-2.x</id>
- </profile>
- </profiles>
</project>
Modified: camel/trunk/examples/camel-example-cxf/src/test/java/org/apache/camel/example/cxf/CxfHttpJmsClientServerTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/examples/camel-example-cxf/src/test/java/org/apache/camel/example/cxf/CxfHttpJmsClientServerTest.java?rev=894170&r1=894169&r2=894170&view=diff
==============================================================================
--- camel/trunk/examples/camel-example-cxf/src/test/java/org/apache/camel/example/cxf/CxfHttpJmsClientServerTest.java (original)
+++ camel/trunk/examples/camel-example-cxf/src/test/java/org/apache/camel/example/cxf/CxfHttpJmsClientServerTest.java Mon Dec 28 13:34:20 2009
@@ -22,7 +22,7 @@
import org.apache.hello_world_soap_http.Greeter;
import org.apache.hello_world_soap_http.PingMeFault;
import org.apache.hello_world_soap_http.types.FaultDetail;
-import org.junit.Ignore;
+
import org.junit.Test;
import org.springframework.context.support.AbstractXmlApplicationContext;
import org.springframework.context.support.ClassPathXmlApplicationContext;
@@ -32,8 +32,8 @@
@Test
- @Ignore("Dure to the Spring 3.0.0 doesn't call the JMS listener container's start method by default"
- + "This test will be fix in the next released CXF")
+ //@Ignore("Due to the Spring 3.0.0 doesn't call the JMS listener container's start method by default"
+ // + "This test will be fix in the next released CXF")
public void testClientInvocation() throws MalformedURLException {
Client client = new Client(ROUTER_ADDRESS + "?wsdl");
Greeter proxy = client.getProxy();
Modified: camel/trunk/examples/camel-example-spring-javaconfig/pom.xml
URL: http://svn.apache.org/viewvc/camel/trunk/examples/camel-example-spring-javaconfig/pom.xml?rev=894170&r1=894169&r2=894170&view=diff
==============================================================================
--- camel/trunk/examples/camel-example-spring-javaconfig/pom.xml (original)
+++ camel/trunk/examples/camel-example-spring-javaconfig/pom.xml Mon Dec 28 13:34:20 2009
@@ -48,6 +48,28 @@
<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-spring</artifactId>
+ <exclusions>
+ <exclusion>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-aop</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-beans</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-context</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-core</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-tx</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
@@ -63,11 +85,34 @@
<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-jms</artifactId>
+ <exclusions>
+ <exclusion>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-jms</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-beans</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-context</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-core</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-tx</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>org.apache.activemq</groupId>
<artifactId>activemq-core</artifactId>
+ <scope>test</scope>
</dependency>
<dependency>
Modified: camel/trunk/examples/pom.xml
URL: http://svn.apache.org/viewvc/camel/trunk/examples/pom.xml?rev=894170&r1=894169&r2=894170&view=diff
==============================================================================
--- camel/trunk/examples/pom.xml (original)
+++ camel/trunk/examples/pom.xml Mon Dec 28 13:34:20 2009
@@ -71,19 +71,6 @@
</modules>
<profiles>
- <profile>
- <id>spring-3.x</id>
- <activation>
- <activeByDefault>true</activeByDefault>
- </activation>
- <modules>
- <!-- current this module just work for spring 3.x -->
- <module>camel-example-spring-javaconfig</module>
- </modules>
- </profile>
- <profile>
- <id>spring-2.x</id>
- </profile>
<!--
This profile allows you to add a repository to the repo list so that
you can test the examples out against a staged version of the camel distribution
Modified: camel/trunk/parent/pom.xml
URL: http://svn.apache.org/viewvc/camel/trunk/parent/pom.xml?rev=894170&r1=894169&r2=894170&view=diff
==============================================================================
--- camel/trunk/parent/pom.xml (original)
+++ camel/trunk/parent/pom.xml Mon Dec 28 13:34:20 2009
@@ -34,7 +34,6 @@
<properties>
<compiler.fork>false</compiler.fork>
- <spring-3.x>true</spring-3.x>
<!-- Note that activemq dependency is only used for testing! -->
<activemq-version>5.3.0</activemq-version>
<apacheds-version>1.5.4</apacheds-version>
@@ -57,7 +56,7 @@
<slf4j-version>1.5.8</slf4j-version>
<openjpa-version>1.2.1</openjpa-version>
<jruby-version>1.2.0</jruby-version>
- <spring-version>3.0.0.RELEASE</spring-version>
+ <spring-version>2.5.6</spring-version>
<spring-osgi-version>1.2.0</spring-osgi-version>
<mina-version>1.1.7</mina-version>
<javax-mail-version>1.4.1_2</javax-mail-version>
@@ -83,7 +82,8 @@
<hsqldb-version>1.8.0.7</hsqldb-version>
<groovy-version>1.7.0</groovy-version>
<guiceyfruit-version>2.0</guiceyfruit-version>
- <junit-version>4.6</junit-version>
+ <!-- spring 2.5.x is only compatible with junit 4.4 or lower - see SPR-5145 -->
+ <junit-version>4.4</junit-version>
<ognl-version>2.7.3_1</ognl-version>
<pax-exam-version>1.2.0</pax-exam-version>
<pax-tiny-bundle-version>1.2.0</pax-tiny-bundle-version>
@@ -1277,12 +1277,10 @@
</build>
</profile>
<profile>
- <id>spring-2.x</id>
+ <id>spring-3.x</id>
<properties>
- <spring-version>2.5.6</spring-version>
- <spring-3.x>false</spring-3.x>
- <!-- spring 2.5.x is only compatible with junit 4.4 or lower - see SPR-5145 -->
- <junit-version>4.4</junit-version>
+ <spring-version>3.0.0.RELEASE</spring-version>
+ <junit-version>4.6</junit-version>
</properties>
<!--repositories>
<repository>