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 2008/08/28 07:58:44 UTC

svn commit: r689725 - in /activemq/camel/trunk/components/camel-cxf/src/test/resources: logging.properties org/apache/camel/component/cxf/WsdlFirstBeans.xml org/apache/camel/component/cxf/WsdlFirstProcessor.xml person-non-wrapper-binding.xml

Author: ningjiang
Date: Wed Aug 27 22:58:43 2008
New Revision: 689725

URL: http://svn.apache.org/viewvc?rev=689725&view=rev
Log:
CAMEL-867 fixed the test of CxfWsdlFirstProcessorTest

Modified:
    activemq/camel/trunk/components/camel-cxf/src/test/resources/logging.properties
    activemq/camel/trunk/components/camel-cxf/src/test/resources/org/apache/camel/component/cxf/WsdlFirstBeans.xml
    activemq/camel/trunk/components/camel-cxf/src/test/resources/org/apache/camel/component/cxf/WsdlFirstProcessor.xml
    activemq/camel/trunk/components/camel-cxf/src/test/resources/person-non-wrapper-binding.xml

Modified: activemq/camel/trunk/components/camel-cxf/src/test/resources/logging.properties
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-cxf/src/test/resources/logging.properties?rev=689725&r1=689724&r2=689725&view=diff
==============================================================================
--- activemq/camel/trunk/components/camel-cxf/src/test/resources/logging.properties (original)
+++ activemq/camel/trunk/components/camel-cxf/src/test/resources/logging.properties Wed Aug 27 22:58:43 2008
@@ -22,7 +22,7 @@
 #  	Default Logging Configuration File
 #
 # You can use a different file by specifying a filename
-# with the java.util.logging.config.file system property.  
+# with the java.util.logging.config.file system property.
 # For example java -Djava.util.logging.config.file=myfile
 ############################################################
 
@@ -30,7 +30,7 @@
 #  	Global properties
 ############################################################
 
-# "handlers" specifies a comma separated list of log Handler 
+# "handlers" specifies a comma separated list of log Handler
 # classes.  These handlers will be installed during VM startup.
 # Note that these classes must be on the system classpath.
 # By default we only configure a ConsoleHandler, which will only

Modified: activemq/camel/trunk/components/camel-cxf/src/test/resources/org/apache/camel/component/cxf/WsdlFirstBeans.xml
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-cxf/src/test/resources/org/apache/camel/component/cxf/WsdlFirstBeans.xml?rev=689725&r1=689724&r2=689725&view=diff
==============================================================================
--- activemq/camel/trunk/components/camel-cxf/src/test/resources/org/apache/camel/component/cxf/WsdlFirstBeans.xml (original)
+++ activemq/camel/trunk/components/camel-cxf/src/test/resources/org/apache/camel/component/cxf/WsdlFirstBeans.xml Wed Aug 27 22:58:43 2008
@@ -37,10 +37,9 @@
                    serviceClass="org.apache.camel.wsdl_first.Person"
                    endpointName="person:soap"
                    serviceName="person:PersonService"
-                   wsdlURL="person.wsdl"
                    xmlns:person="http://camel.apache.org/wsdl-first"/>
 
-   <camelContext xmlns="http://activemq.apache.org/camel/schema/spring">
+   <camelContext id="camel" xmlns="http://activemq.apache.org/camel/schema/spring">
       <route>
             <from uri="cxf:bean:routerEndpoint?dataFormat=MESSAGE"/>
             <to uri="cxf:bean:serviceEndpoint?dataFormat=MESSAGE"/>
@@ -48,7 +47,7 @@
 
       <route>
          <from uri="direct:producer" />
-         <to uri="cxf:bean:serviceEndpoint" />
+         <to uri="cxf:bean:serviceEndpoint?dataFormat=POJO" />
       </route>
 
     </camelContext>

Modified: activemq/camel/trunk/components/camel-cxf/src/test/resources/org/apache/camel/component/cxf/WsdlFirstProcessor.xml
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-cxf/src/test/resources/org/apache/camel/component/cxf/WsdlFirstProcessor.xml?rev=689725&r1=689724&r2=689725&view=diff
==============================================================================
--- activemq/camel/trunk/components/camel-cxf/src/test/resources/org/apache/camel/component/cxf/WsdlFirstProcessor.xml (original)
+++ activemq/camel/trunk/components/camel-cxf/src/test/resources/org/apache/camel/component/cxf/WsdlFirstProcessor.xml Wed Aug 27 22:58:43 2008
@@ -1,46 +1,63 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-    Licensed to the Apache Software Foundation (ASF) under one or more
-    contributor license agreements.  See the NOTICE file distributed with
-    this work for additional information regarding copyright ownership.
-    The ASF licenses this file to You under the Apache License, Version 2.0
-    (the "License"); you may not use this file except in compliance with
-    the License.  You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-    Unless required by applicable law or agreed to in writing, software
-    distributed under the License is distributed on an "AS IS" BASIS,
-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-    See the License for the specific language governing permissions and
-    limitations under the License.
+	Licensed to the Apache Software Foundation (ASF) under one or more
+	contributor license agreements.  See the NOTICE file distributed with
+	this work for additional information regarding copyright ownership.
+	The ASF licenses this file to You under the Apache License, Version 2.0
+	(the "License"); you may not use this file except in compliance with
+	the License.  You may obtain a copy of the License at
+
+	http://www.apache.org/licenses/LICENSE-2.0
+
+	Unless required by applicable law or agreed to in writing, software
+	distributed under the License is distributed on an "AS IS" BASIS,
+	WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+	See the License for the specific language governing permissions and
+	limitations under the License.
 -->
 <beans xmlns="http://www.springframework.org/schema/beans"
-       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-       xmlns:cxf="http://activemq.apache.org/camel/schema/cxfEndpoint"
-       xmlns:camel="http://activemq.apache.org/camel/schema/spring"
-       xsi:schemaLocation="
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xmlns:cxf="http://activemq.apache.org/camel/schema/cxfEndpoint"
+	xmlns:camel="http://activemq.apache.org/camel/schema/spring"
+	xsi:schemaLocation="
        http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
        http://activemq.apache.org/camel/schema/cxfEndpoint http://activemq.apache.org/camel/schema/cxf/cxfEndpoint.xsd
        http://activemq.apache.org/camel/schema/spring http://activemq.apache.org/camel/schema/spring/camel-spring.xsd
     ">
 
 
-  <cxf:cxfEndpoint id="routerEndpoint" address="http://localhost:8092/PersonService/"
-                   serviceClass="org.apache.camel.wsdl_first.Person"
-                   endpointName="person:soap"
-                   serviceName="person:PersonService"
-                   xmlns:person="http://camel.apache.org/wsdl-first"/>
-
-   <bean id="personProcessor" class="org.apache.camel.wsdl_first.PersonProcessor"/>
-
-   <camelContext xmlns="http://activemq.apache.org/camel/schema/spring">
-      <route>
-            <from uri="cxf:bean:routerEndpoint?dataFormat=POJO"/>
-            <process ref= "personProcessor"/>
-      </route>
+	<cxf:cxfEndpoint id="routerEndpoint"
+		address="http://localhost:8092/PersonService/"
+		serviceClass="org.apache.camel.wsdl_first.Person"
+		endpointName="person:soap"
+		serviceName="person:PersonService"
+		xmlns:person="http://camel.apache.org/wsdl-first" />
+
+	<cxf:cxfEndpoint id="serviceEndpoint"
+		address="http://localhost:9000/PersonService/"
+		serviceClass="org.apache.camel.wsdl_first.Person"
+		endpointName="person:soap"
+		serviceName="person:PersonService"
+		xmlns:person="http://camel.apache.org/wsdl-first" />
+
+	<bean id="personProcessor"
+		class="org.apache.camel.wsdl_first.PersonProcessor" />
+
+	<camelContext
+		xmlns="http://activemq.apache.org/camel/schema/spring">
+
+		<route>
+			<from uri="cxf:bean:routerEndpoint?dataFormat=POJO"/>
+			<process ref="personProcessor" />
+		</route>
+
+		<route>
+			<from uri="direct:producer" />
+			<to uri="cxf:bean:serviceEndpoint?dataFormat=POJO"/>
+		</route>
 
-    </camelContext>
+
+	</camelContext>
 
 
 </beans>

Modified: activemq/camel/trunk/components/camel-cxf/src/test/resources/person-non-wrapper-binding.xml
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-cxf/src/test/resources/person-non-wrapper-binding.xml?rev=689725&r1=689724&r2=689725&view=diff
==============================================================================
--- activemq/camel/trunk/components/camel-cxf/src/test/resources/person-non-wrapper-binding.xml (original)
+++ activemq/camel/trunk/components/camel-cxf/src/test/resources/person-non-wrapper-binding.xml Wed Aug 27 22:58:43 2008
@@ -1,3 +1,21 @@
+<!--
+
+    Licensed to the Apache Software Foundation (ASF) under one or more
+    contributor license agreements.  See the NOTICE file distributed with
+    this work for additional information regarding copyright ownership.
+    The ASF licenses this file to You under the Apache License, Version 2.0
+    (the "License"); you may not use this file except in compliance with
+    the License.  You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+
+-->
 <bindings
     xmlns:xsd="http://www.w3.org/2001/XMLSchema"
     xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"