Author: ningjiang
Date: Wed Jul 9 18:41:46 2008
New Revision: 675402
URL: http://svn.apache.org/viewvc?rev=675402&view=rev
Log:
Moved the wsdl to src\main\resources to avoid some weired issue of WSDL2Java
plugin, also applied the patch with thank to William
Added:
activemq/camel/trunk/tests/camel-itest/src/main/
activemq/camel/trunk/tests/camel-itest/src/main/resources/
activemq/camel/trunk/tests/camel-itest/src/main/resources/wsdl/
- copied from r675384,
activemq/camel/trunk/tests/camel-itest/src/test/resources/wsdl/
activemq/camel/trunk/tests/camel-itest/src/main/resources/xsd/
- copied from r675384,
activemq/camel/trunk/tests/camel-itest/src/test/resources/xsd/
Removed:
activemq/camel/trunk/tests/camel-itest/src/test/resources/wsdl/
activemq/camel/trunk/tests/camel-itest/src/test/resources/xsd/
Modified:
activemq/camel/trunk/tests/camel-itest/pom.xml
activemq/camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/jms/JmsPerformanceTest.java
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-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=675402&r1=675401&r2=675402&view=diff
==============================================================================
--- activemq/camel/trunk/tests/camel-itest/pom.xml (original)
+++ activemq/camel/trunk/tests/camel-itest/pom.xml Wed Jul 9 18:41:46 2008
@@ -105,16 +105,16 @@
<plugin>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-codegen-plugin</artifactId>
- <version>2.1.1</version>
+ <version>${cxf-version}</version>
<executions>
<execution>
<id>generate-sources</id>
<phase>generate-sources</phase>
<configuration>
+
<sourceRoot>${basedir}/target/generated/src/main/java</sourceRoot>
<wsdlOptions>
<wsdlOption>
-
<outputDir>target/generated/src/main/java</outputDir>
-
<wsdl>src/test/resources/wsdl/CustomerService-1.0.0.wsdl</wsdl>
+
<wsdl>${basedir}/src/main/resources/wsdl/CustomerService-1.0.0.wsdl</wsdl>
</wsdlOption>
</wsdlOptions>
</configuration>
Modified:
activemq/camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/jms/JmsPerformanceTest.java
URL:
http://svn.apache.org/viewvc/activemq/camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/jms/JmsPerformanceTest.java?rev=675402&r1=675401&r2=675402&view=diff
==============================================================================
---
activemq/camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/jms/JmsPerformanceTest.java
(original)
+++
activemq/camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/jms/JmsPerformanceTest.java
Wed Jul 9 18:41:46 2008
@@ -135,8 +135,8 @@
LOG.warn("Caught: " + e, e);
}
}
- receivedCountDown.countDown();
consumedMessageCount++;
+ receivedCountDown.countDown();
}
}
}
\ No newline at end of file
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=675402&r1=675401&r2=675402&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
Wed Jul 9 18:41:46 2008
@@ -19,7 +19,7 @@
xsi:schemaLocation="http://www.springframework.org/schema/beans
http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
http://cxf.apache.org/core
http://cxf.apache.org/schemas/core.xsd
http://cxf.apache.org/jaxws
http://cxf.apache.org/schemas/jaxws.xsd
- http://activemq.apache.org/camel/schema/spring
http://activemq.apache.org/camel/schema/spring/camel-spring-1.3.0.xsd
+ http://activemq.apache.org/camel/schema/spring
http://activemq.apache.org/camel/schema/spring/camel-spring.xsd
http://cxf.apache.org/transports/camel
http://cxf.apache.org/transports/camel.xsd";>
<import resource="classpath:META-INF/cxf/cxf.xml" />
@@ -45,7 +45,7 @@
serviceName="customer:CustomerServiceV1"
endpointName="customer:CustomerServiceV1CamelPort"
serviceClass="org.apache.camel.itest.customerrelations.CustomerServiceV1"
-
wsdlLocation="./src/test/resources/wsdl/CustomerService-1.0.0.wsdl">
+
wsdlLocation="./src/main/resources/wsdl/CustomerService-1.0.0.wsdl">
<features>
<!-- Enables logging of SOAP messages. -->
<logging xmlns="http://cxf.apache.org/core"; />
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=675402&r1=675401&r2=675402&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
Wed Jul 9 18:41:46 2008
@@ -22,7 +22,7 @@
http://cxf.apache.org/core
http://cxf.apache.org/schemas/core.xsd
http://cxf.apache.org/jaxws
http://cxf.apache.org/schemas/jaxws.xsd
http://activemq.apache.org/schema/core
http://activemq.apache.org/schema/core/activemq-core-5.1.0.xsd
- http://activemq.apache.org/camel/schema/spring
http://activemq.apache.org/camel/schema/spring/camel-spring-1.3.0.xsd
+ http://activemq.apache.org/camel/schema/spring
http://activemq.apache.org/camel/schema/spring/camel-spring.xsd
http://cxf.apache.org/transports/camel
http://cxf.apache.org/transports/camel.xsd";>
<import resource="classpath:META-INF/cxf/cxf.xml" />
