Author: ningjiang
Date: Thu Sep 25 21:35:39 2008
New Revision: 699175
URL: http://svn.apache.org/viewvc?rev=699175&view=rev
Log:
Clean up the camel-itest
Removed:
activemq/camel/trunk/tests/camel-itest/src/main/
Modified:
activemq/camel/trunk/tests/camel-itest/pom.xml
activemq/camel/trunk/tests/camel-itest/src/test/resources/spring-config/client-WsAddressingContext.xml
activemq/camel/trunk/tests/camel-itest/src/test/resources/spring-config/client-applicationContext.xml
activemq/camel/trunk/tests/camel-itest/src/test/resources/spring-config/server-WsAddressingContext.xml
activemq/camel/trunk/tests/camel-itest/src/test/resources/spring-config/server-applicationContext.xml
Modified: activemq/camel/trunk/tests/camel-itest/pom.xml
URL:
http://svn.apache.org/viewvc/activemq/camel/trunk/tests/camel-itest/pom.xml?rev=699175&r1=699174&r2=699175&view=diff
==============================================================================
--- activemq/camel/trunk/tests/camel-itest/pom.xml (original)
+++ activemq/camel/trunk/tests/camel-itest/pom.xml Thu Sep 25 21:35:39 2008
@@ -36,10 +36,12 @@
<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-jms</artifactId>
+ <scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-spring</artifactId>
+ <scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
@@ -48,6 +50,7 @@
<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-jetty</artifactId>
+ <scope>test</scope>
</dependency>
<dependency>
@@ -113,17 +116,23 @@
<version>${cxf-version}</version>
<executions>
<execution>
- <id>generate-sources</id>
+ <id>generate-test-sources</id>
<phase>generate-sources</phase>
<configuration>
- <sourceRoot>${basedir}/target/generated/src/main/java</sourceRoot>
+
<testSourceRoot>${basedir}/target/generated/src/test/java</testSourceRoot>
<wsdlOptions>
<wsdlOption>
-
<wsdl>${basedir}/src/main/resources/wsdl/CustomerService-1.0.0.wsdl</wsdl>
+
<wsdl>${basedir}/src/test/resources/wsdl/CustomerService-1.0.0.wsdl</wsdl>
+ <extraargs>
+ <extraarg>-verbose</extraarg>
+ </extraargs>
</wsdlOption>
<wsdlOption>
-
<wsdl>${basedir}/src/main/resources/wsdl/hello_world.wsdl</wsdl>
- </wsdlOption>
+
<wsdl>${basedir}/src/test/resources/wsdl/hello_world.wsdl</wsdl>
+ <extraargs>
+ <extraarg>-verbose</extraarg>
+ </extraargs>
+ </wsdlOption>
</wsdlOptions>
</configuration>
<goals>
Modified:
activemq/camel/trunk/tests/camel-itest/src/test/resources/spring-config/client-WsAddressingContext.xml
URL:
http://svn.apache.org/viewvc/activemq/camel/trunk/tests/camel-itest/src/test/resources/spring-config/client-WsAddressingContext.xml?rev=699175&r1=699174&r2=699175&view=diff
==============================================================================
---
activemq/camel/trunk/tests/camel-itest/src/test/resources/spring-config/client-WsAddressingContext.xml
(original)
+++
activemq/camel/trunk/tests/camel-itest/src/test/resources/spring-config/client-WsAddressingContext.xml
Thu Sep 25 21:35:39 2008
@@ -21,7 +21,7 @@
serviceName="customer:CustomerServiceV1"
endpointName="customer:CustomerServiceV1CamelPort"
serviceClass="org.apache.camel.itest.customerrelations.CustomerServiceV1"
-
wsdlLocation="./src/main/resources/wsdl/CustomerService_noSoapAction.wsdl">
+
wsdlLocation="./src/test/resources/wsdl/CustomerService_noSoapAction.wsdl">
<!-- properties>
<entry
xmlns="http://www.springframework.org/schema/beans";
key="mtom-enabled" value="true" />
Modified:
activemq/camel/trunk/tests/camel-itest/src/test/resources/spring-config/client-applicationContext.xml
URL:
http://svn.apache.org/viewvc/activemq/camel/trunk/tests/camel-itest/src/test/resources/spring-config/client-applicationContext.xml?rev=699175&r1=699174&r2=699175&view=diff
==============================================================================
---
activemq/camel/trunk/tests/camel-itest/src/test/resources/spring-config/client-applicationContext.xml
(original)
+++
activemq/camel/trunk/tests/camel-itest/src/test/resources/spring-config/client-applicationContext.xml
Thu Sep 25 21:35:39 2008
@@ -34,7 +34,7 @@
serviceName="customer:CustomerServiceV1"
endpointName="customer:CustomerServiceV1CamelPort"
serviceClass="org.apache.camel.itest.customerrelations.CustomerServiceV1"
-
wsdlLocation="./src/main/resources/wsdl/CustomerService-1.0.0.wsdl"
+
wsdlLocation="./src/test/resources/wsdl/CustomerService-1.0.0.wsdl"
address="camel://direct:clientOutbound">
<properties>
<entry xmlns="http://www.springframework.org/schema/beans";
key="mtom-enabled" value="true" />
Modified:
activemq/camel/trunk/tests/camel-itest/src/test/resources/spring-config/server-WsAddressingContext.xml
URL:
http://svn.apache.org/viewvc/activemq/camel/trunk/tests/camel-itest/src/test/resources/spring-config/server-WsAddressingContext.xml?rev=699175&r1=699174&r2=699175&view=diff
==============================================================================
---
activemq/camel/trunk/tests/camel-itest/src/test/resources/spring-config/server-WsAddressingContext.xml
(original)
+++
activemq/camel/trunk/tests/camel-itest/src/test/resources/spring-config/server-WsAddressingContext.xml
Thu Sep 25 21:35:39 2008
@@ -27,7 +27,7 @@
serviceName="customer:CustomerServiceV1"
endpointName="customer:CustomerServiceV1CamelPort"
address="camel://direct:serverInbound"
-
wsdlLocation="./src/main/resources/wsdl/CustomerService_noSoapAction.wsdl"
+
wsdlLocation="./src/test/resources/wsdl/CustomerService_noSoapAction.wsdl"
implementor="org.apache.camel.itest.customerrelations.CustomerServiceV1Impl">
<!-- properties>
<entry
xmlns="http://www.springframework.org/schema/beans";
Modified:
activemq/camel/trunk/tests/camel-itest/src/test/resources/spring-config/server-applicationContext.xml
URL:
http://svn.apache.org/viewvc/activemq/camel/trunk/tests/camel-itest/src/test/resources/spring-config/server-applicationContext.xml?rev=699175&r1=699174&r2=699175&view=diff
==============================================================================
---
activemq/camel/trunk/tests/camel-itest/src/test/resources/spring-config/server-applicationContext.xml
(original)
+++
activemq/camel/trunk/tests/camel-itest/src/test/resources/spring-config/server-applicationContext.xml
Thu Sep 25 21:35:39 2008
@@ -43,7 +43,7 @@
serviceName="customer:CustomerServiceV1"
endpointName="customer:CustomerServiceV1CamelPort"
address="camel://direct:serverInbound"
-
wsdlLocation="./src/main/resources/wsdl/CustomerService-1.0.0.wsdl"
+
wsdlLocation="./src/test/resources/wsdl/CustomerService-1.0.0.wsdl"
implementor="org.apache.camel.itest.customerrelations.CustomerServiceV1Impl">
<properties>
<entry
xmlns="http://www.springframework.org/schema/beans"; key="mtom-enabled"
value="true" />
