camel-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From davscl...@apache.org
Subject svn commit: r984101 - in /camel/trunk/tests/camel-itest/src/test: java/org/apache/camel/itest/customerrelations/ resources/spring-config/
Date Tue, 10 Aug 2010 15:58:46 GMT
Author: davsclaus
Date: Tue Aug 10 15:58:45 2010
New Revision: 984101

URL: http://svn.apache.org/viewvc?rev=984101&view=rev
Log:
Fixed part of test due camel context clash

Modified:
    camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/customerrelations/CustomerServicesWsAddressingTest.java
    camel/trunk/tests/camel-itest/src/test/resources/spring-config/client-WsAddressingContext.xml
    camel/trunk/tests/camel-itest/src/test/resources/spring-config/server-WsAddressingContext.xml

Modified: camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/customerrelations/CustomerServicesWsAddressingTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/customerrelations/CustomerServicesWsAddressingTest.java?rev=984101&r1=984100&r2=984101&view=diff
==============================================================================
--- camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/customerrelations/CustomerServicesWsAddressingTest.java
(original)
+++ camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/customerrelations/CustomerServicesWsAddressingTest.java
Tue Aug 10 15:58:45 2010
@@ -16,7 +16,6 @@
  */
 package org.apache.camel.itest.customerrelations;
 
-import junit.framework.TestCase;
 import org.junit.Assert;
 import org.junit.Test;
 import org.springframework.context.support.ClassPathXmlApplicationContext;

Modified: camel/trunk/tests/camel-itest/src/test/resources/spring-config/client-WsAddressingContext.xml
URL: http://svn.apache.org/viewvc/camel/trunk/tests/camel-itest/src/test/resources/spring-config/client-WsAddressingContext.xml?rev=984101&r1=984100&r2=984101&view=diff
==============================================================================
--- camel/trunk/tests/camel-itest/src/test/resources/spring-config/client-WsAddressingContext.xml
(original)
+++ camel/trunk/tests/camel-itest/src/test/resources/spring-config/client-WsAddressingContext.xml
Tue Aug 10 15:58:45 2010
@@ -37,18 +37,14 @@
 
 	<conduit xmlns="http://cxf.apache.org/transports/camel"
 		name="{http://www.mycompany.com/examples/customerrelations}CustomerServiceV1CamelPort.camel-conduit">
-		<camelContextRef>camelContext</camelContextRef>
+		<camelContextRef>camel-client</camelContextRef>
 	</conduit>
 
-	<camelContext id="camelContext"
-		xmlns="http://camel.apache.org/schema/spring">
+	<camelContext id="camel-client" xmlns="http://camel.apache.org/schema/spring">
 		<route>
-			<from
-				uri="direct:clientOutbound" />
-			<to
-				uri="jms://org.apache.camel.itest.customerrelations.Addressing" />
+			<from uri="direct:clientOutbound" />
+			<to uri="jms://org.apache.camel.itest.customerrelations.Addressing" />
 		</route>
 	</camelContext>
 
-
 </beans>

Modified: camel/trunk/tests/camel-itest/src/test/resources/spring-config/server-WsAddressingContext.xml
URL: http://svn.apache.org/viewvc/camel/trunk/tests/camel-itest/src/test/resources/spring-config/server-WsAddressingContext.xml?rev=984101&r1=984100&r2=984101&view=diff
==============================================================================
--- camel/trunk/tests/camel-itest/src/test/resources/spring-config/server-WsAddressingContext.xml
(original)
+++ camel/trunk/tests/camel-itest/src/test/resources/spring-config/server-WsAddressingContext.xml
Tue Aug 10 15:58:45 2010
@@ -45,16 +45,13 @@
 
 	<destination xmlns="http://cxf.apache.org/transports/camel"
 		name="{http://camel.apache.org/itest/customerrelations}CustomerServiceV1CamelPort.camel-destination">
-		<camelContextRef>camelContext</camelContextRef>
+		<camelContextRef>camel-server</camelContextRef>
 	</destination>
 
-	<camelContext id="camelContext"
-		xmlns="http://camel.apache.org/schema/spring">
+	<camelContext id="camel-server" xmlns="http://camel.apache.org/schema/spring">
 		<route>
-			<from
-				uri="jms://org.apache.camel.itest.customerrelations.Addressing" />
-			<to
-				uri="direct:serverInbound" />
+			<from uri="jms://org.apache.camel.itest.customerrelations.Addressing" />
+			<to uri="direct:serverInbound" />
 		</route>
 	</camelContext>
 



Mime
View raw message