cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dk...@apache.org
Subject svn commit: r803147 - in /cxf/trunk/rt/databinding/sdo: ./ src/test/java/org/apache/cxf/sdo/ src/test/resources/wsdl_sdo/
Date Tue, 11 Aug 2009 15:07:18 GMT
Author: dkulp
Date: Tue Aug 11 15:07:17 2009
New Revision: 803147

URL: http://svn.apache.org/viewvc?rev=803147&view=rev
Log:
Change some namespaces in the tests so they don't conflict with
testutils and cause issues in eclipse

Modified:
    cxf/trunk/rt/databinding/sdo/pom.xml
    cxf/trunk/rt/databinding/sdo/src/test/java/org/apache/cxf/sdo/AbstractHelloWorldTest.java
    cxf/trunk/rt/databinding/sdo/src/test/java/org/apache/cxf/sdo/HelloWorldDynamicTest.java
    cxf/trunk/rt/databinding/sdo/src/test/java/org/apache/cxf/sdo/HelloWorldStaticTest.java
    cxf/trunk/rt/databinding/sdo/src/test/java/org/apache/cxf/sdo/bean11.xml
    cxf/trunk/rt/databinding/sdo/src/test/java/org/apache/cxf/sdo/structure.xml
    cxf/trunk/rt/databinding/sdo/src/test/resources/wsdl_sdo/HelloService.wsdl
    cxf/trunk/rt/databinding/sdo/src/test/resources/wsdl_sdo/HelloService_dynamic.wsdl
    cxf/trunk/rt/databinding/sdo/src/test/resources/wsdl_sdo/HelloService_static.wsdl

Modified: cxf/trunk/rt/databinding/sdo/pom.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/databinding/sdo/pom.xml?rev=803147&r1=803146&r2=803147&view=diff
==============================================================================
--- cxf/trunk/rt/databinding/sdo/pom.xml (original)
+++ cxf/trunk/rt/databinding/sdo/pom.xml Tue Aug 11 15:07:17 2009
@@ -167,9 +167,9 @@
                                         <extraarg>-db</extraarg>
                                         <extraarg>sdo</extraarg>
                                         <extraarg>-p</extraarg>
-                                        <extraarg>http://apache.org/hello_world_soap_http/types=helloworld.static_types.sdo</extraarg>
+                                        <extraarg>http://apache.org/cxf/databinding/sdo/hello_world_soap_http/types=helloworld.static_types.sdo</extraarg>
                                         <extraarg>-p</extraarg>
-                                        <extraarg>http://apache.org/hello_world_soap_http=helloworld.static_types.ws</extraarg>
+                                        <extraarg>http://apache.org/cxf/databinding/sdo/hello_world_soap_http=helloworld.static_types.ws</extraarg>
                                     </extraargs>
                                 </wsdlOption>
                                 <wsdlOption>
@@ -178,7 +178,7 @@
                                         <extraarg>-db</extraarg>
                                         <extraarg>sdo-dynamic</extraarg>
                                         <extraarg>-p</extraarg>
-                                        <extraarg>http://apache.org/hello_world_soap_http=helloworld.dynamic_types.ws</extraarg>
+                                        <extraarg>http://apache.org/cxf/databinding/sdo/hello_world_soap_http=helloworld.dynamic_types.ws</extraarg>
                                     </extraargs>
                                 </wsdlOption>
                             </wsdlOptions>

Modified: cxf/trunk/rt/databinding/sdo/src/test/java/org/apache/cxf/sdo/AbstractHelloWorldTest.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/databinding/sdo/src/test/java/org/apache/cxf/sdo/AbstractHelloWorldTest.java?rev=803147&r1=803146&r2=803147&view=diff
==============================================================================
--- cxf/trunk/rt/databinding/sdo/src/test/java/org/apache/cxf/sdo/AbstractHelloWorldTest.java
(original)
+++ cxf/trunk/rt/databinding/sdo/src/test/java/org/apache/cxf/sdo/AbstractHelloWorldTest.java
Tue Aug 11 15:07:17 2009
@@ -39,7 +39,7 @@
     @Test
     public void testBasicInvoke() throws Exception {
         Node response = invoke("TestService", "bean11.xml");
-        addNamespace("ns1", "http://apache.org/hello_world_soap_http/types");
+        addNamespace("ns1", "http://apache.org/cxf/databinding/sdo/hello_world_soap_http/types");
         assertValid("/s:Envelope/s:Body/ns1:greetMeResponse", response);
         assertValid("//ns1:greetMeResponse/ns1:responseType", response);
         assertValid("//ns1:greetMeResponse/ns1:responseType[text()='Hello World']", response);
@@ -48,7 +48,7 @@
     @Test
     public void testStructure() throws Exception {
         Node response = invoke("TestService", "structure.xml");
-        addNamespace("ns1", "http://apache.org/hello_world_soap_http/types");
+        addNamespace("ns1", "http://apache.org/cxf/databinding/sdo/hello_world_soap_http/types");
         assertValid("/s:Envelope/s:Body/ns1:echoStructResponse", response);
         assertValid("//ns1:echoStructResponse/ns1:return", response);
         assertValid("//ns1:echoStructResponse/ns1:return/ns1:text[text()='Hello']", response);
       
@@ -60,7 +60,8 @@
         for (Document doc : docs) {
             try {
                 assertValid("/wsdl:definitions/wsdl:types/xsd:schema"
-                            + "[@targetNamespace='http://apache.org/hello_world_soap_http/types']",

+                            + "[@targetNamespace='http://apache.org/cxf"
+                            + "/databinding/sdo/hello_world_soap_http/types']", 
                             doc);
                 return;
             } catch (AssertionFailedError ex) {

Modified: cxf/trunk/rt/databinding/sdo/src/test/java/org/apache/cxf/sdo/HelloWorldDynamicTest.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/databinding/sdo/src/test/java/org/apache/cxf/sdo/HelloWorldDynamicTest.java?rev=803147&r1=803146&r2=803147&view=diff
==============================================================================
--- cxf/trunk/rt/databinding/sdo/src/test/java/org/apache/cxf/sdo/HelloWorldDynamicTest.java
(original)
+++ cxf/trunk/rt/databinding/sdo/src/test/java/org/apache/cxf/sdo/HelloWorldDynamicTest.java
Tue Aug 11 15:07:17 2009
@@ -44,7 +44,7 @@
     }
     
     
-    @WebService(targetNamespace = "http://apache.org/hello_world_soap_http",
+    @WebService(targetNamespace = "http://apache.org/cxf/databinding/sdo/hello_world_soap_http",
                 name = "Greeter",
                 serviceName = "TestService",
                 endpointInterface = "helloworld.dynamic_types.ws.Greeter")
@@ -77,8 +77,10 @@
         ServerFactoryBean sf = super.createServiceFactory(serviceClass, serviceBean, address,
name, binding);
         sf.setWsdlLocation(HelloWorldStaticTest.class
                                .getResource("/wsdl_sdo/HelloService_dynamic.wsdl").toString());
-        sf.setServiceName(new QName("http://apache.org/hello_world_soap_http", "SOAPService"));
-        sf.setEndpointName(new QName("http://apache.org/hello_world_soap_http", "SoapPort"));
+        sf.setServiceName(new QName("http://apache.org/cxf/databinding/sdo/hello_world_soap_http",
+                                    "SOAPService"));
+        sf.setEndpointName(new QName("http://apache.org/cxf/databinding/sdo/hello_world_soap_http",
+                                     "SoapPort"));
         return sf;
     }
    

Modified: cxf/trunk/rt/databinding/sdo/src/test/java/org/apache/cxf/sdo/HelloWorldStaticTest.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/databinding/sdo/src/test/java/org/apache/cxf/sdo/HelloWorldStaticTest.java?rev=803147&r1=803146&r2=803147&view=diff
==============================================================================
--- cxf/trunk/rt/databinding/sdo/src/test/java/org/apache/cxf/sdo/HelloWorldStaticTest.java
(original)
+++ cxf/trunk/rt/databinding/sdo/src/test/java/org/apache/cxf/sdo/HelloWorldStaticTest.java
Tue Aug 11 15:07:17 2009
@@ -44,7 +44,7 @@
     }
     
     
-    @WebService(targetNamespace = "http://apache.org/hello_world_soap_http",
+    @WebService(targetNamespace = "http://apache.org/cxf/databinding/sdo/hello_world_soap_http",
                 name = "Greeter",
                 serviceName = "TestService",
                 endpointInterface = "helloworld.static_types.ws.Greeter")
@@ -77,8 +77,10 @@
         ServerFactoryBean sf = super.createServiceFactory(serviceClass, serviceBean, address,
name, binding);
         sf.setWsdlLocation(HelloWorldStaticTest.class
                                .getResource("/wsdl_sdo/HelloService_static.wsdl").toString());
-        sf.setServiceName(new QName("http://apache.org/hello_world_soap_http", "SOAPService"));
-        sf.setEndpointName(new QName("http://apache.org/hello_world_soap_http", "SoapPort"));
+        sf.setServiceName(new QName("http://apache.org/cxf/databinding/sdo/hello_world_soap_http",
+                                    "SOAPService"));
+        sf.setEndpointName(new QName("http://apache.org/cxf/databinding/sdo/hello_world_soap_http",
+                                     "SoapPort"));
         return sf;
     }
     

Modified: cxf/trunk/rt/databinding/sdo/src/test/java/org/apache/cxf/sdo/bean11.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/databinding/sdo/src/test/java/org/apache/cxf/sdo/bean11.xml?rev=803147&r1=803146&r2=803147&view=diff
==============================================================================
--- cxf/trunk/rt/databinding/sdo/src/test/java/org/apache/cxf/sdo/bean11.xml (original)
+++ cxf/trunk/rt/databinding/sdo/src/test/java/org/apache/cxf/sdo/bean11.xml Tue Aug 11 15:07:17
2009
@@ -1,7 +1,7 @@
 <env:Envelope xmlns:env="http://schemas.xmlsoap.org/soap/envelope/">
  <env:Header/>
  <env:Body>
-  <ns1:greetMe xmlns:ns1="http://apache.org/hello_world_soap_http/types">
+  <ns1:greetMe xmlns:ns1="http://apache.org/cxf/databinding/sdo/hello_world_soap_http/types">
   	<ns1:requestType>World</ns1:requestType>
   </ns1:greetMe>
  </env:Body>

Modified: cxf/trunk/rt/databinding/sdo/src/test/java/org/apache/cxf/sdo/structure.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/databinding/sdo/src/test/java/org/apache/cxf/sdo/structure.xml?rev=803147&r1=803146&r2=803147&view=diff
==============================================================================
--- cxf/trunk/rt/databinding/sdo/src/test/java/org/apache/cxf/sdo/structure.xml (original)
+++ cxf/trunk/rt/databinding/sdo/src/test/java/org/apache/cxf/sdo/structure.xml Tue Aug 11
15:07:17 2009
@@ -1,7 +1,7 @@
 <env:Envelope xmlns:env="http://schemas.xmlsoap.org/soap/envelope/">
  <env:Header/>
  <env:Body>
-  <echoStruct xmlns="http://apache.org/hello_world_soap_http/types">
+  <echoStruct xmlns="http://apache.org/cxf/databinding/sdo/hello_world_soap_http/types">
   	<struct>
   		<text>Hello</text>
   		<int>24</int>

Modified: cxf/trunk/rt/databinding/sdo/src/test/resources/wsdl_sdo/HelloService.wsdl
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/databinding/sdo/src/test/resources/wsdl_sdo/HelloService.wsdl?rev=803147&r1=803146&r2=803147&view=diff
==============================================================================
--- cxf/trunk/rt/databinding/sdo/src/test/resources/wsdl_sdo/HelloService.wsdl (original)
+++ cxf/trunk/rt/databinding/sdo/src/test/resources/wsdl_sdo/HelloService.wsdl Tue Aug 11
15:07:17 2009
@@ -17,12 +17,17 @@
  * specific language governing permissions and limitations
  * under the License.
  -->      
-<wsdl:definitions name="HelloWorld" targetNamespace="http://apache.org/hello_world_soap_http"
xmlns="http://schemas.xmlsoap.org/wsdl/"
-    xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns:tns="http://apache.org/hello_world_soap_http"
xmlns:x1="http://apache.org/hello_world_soap_http/types"
-    xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
+<wsdl:definitions name="HelloWorld" 
+    targetNamespace="http://apache.org/cxf/databinding/sdo/hello_world_soap_http"
+     xmlns="http://schemas.xmlsoap.org/wsdl/"
+    xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/"
+    xmlns:tns="http://apache.org/cxf/databinding/sdo/hello_world_soap_http" 
+    xmlns:x1="http://apache.org/cxf/databinding/sdo/hello_world_soap_http/types"
+    xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" 
+    xmlns:xsd="http://www.w3.org/2001/XMLSchema">
     <wsdl:types>
-        <schema targetNamespace="http://apache.org/hello_world_soap_http/types" xmlns="http://www.w3.org/2001/XMLSchema"
-            xmlns:tns="http://apache.org/hello_world_soap_http/types" elementFormDefault="qualified">
+        <schema targetNamespace="http://apache.org/cxf/databinding/sdo/hello_world_soap_http/types"
xmlns="http://www.w3.org/2001/XMLSchema"
+            xmlns:tns="http://apache.org/cxf/databinding/sdo/hello_world_soap_http/types"
elementFormDefault="qualified">
             <simpleType name="MyStringType">
                 <restriction base="string">
                     <maxLength value="30" />

Modified: cxf/trunk/rt/databinding/sdo/src/test/resources/wsdl_sdo/HelloService_dynamic.wsdl
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/databinding/sdo/src/test/resources/wsdl_sdo/HelloService_dynamic.wsdl?rev=803147&r1=803146&r2=803147&view=diff
==============================================================================
--- cxf/trunk/rt/databinding/sdo/src/test/resources/wsdl_sdo/HelloService_dynamic.wsdl (original)
+++ cxf/trunk/rt/databinding/sdo/src/test/resources/wsdl_sdo/HelloService_dynamic.wsdl Tue
Aug 11 15:07:17 2009
@@ -17,11 +17,11 @@
  * specific language governing permissions and limitations
  * under the License.
  -->      
-<wsdl:definitions name="HelloWorld" targetNamespace="http://apache.org/hello_world_soap_http"
xmlns="http://schemas.xmlsoap.org/wsdl/"
-    xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns:tns="http://apache.org/hello_world_soap_http"
xmlns:x1="http://apache.org/hello_world_soap_http/types"
+<wsdl:definitions name="HelloWorld" targetNamespace="http://apache.org/cxf/databinding/sdo/hello_world_soap_http"
xmlns="http://schemas.xmlsoap.org/wsdl/"
+    xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns:tns="http://apache.org/cxf/databinding/sdo/hello_world_soap_http"
xmlns:x1="http://apache.org/cxf/databinding/sdo/hello_world_soap_http/types"
     xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
 
-    <wsdl:import location="HelloService.wsdl" namespace="http://apache.org/hello_world_soap_http"
/>
+    <wsdl:import location="HelloService.wsdl" namespace="http://apache.org/cxf/databinding/sdo/hello_world_soap_http"
/>
 
     <wsdl:service name="SOAPService">
         <wsdl:port binding="tns:Greeter_SOAPBinding" name="SoapPort">

Modified: cxf/trunk/rt/databinding/sdo/src/test/resources/wsdl_sdo/HelloService_static.wsdl
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/databinding/sdo/src/test/resources/wsdl_sdo/HelloService_static.wsdl?rev=803147&r1=803146&r2=803147&view=diff
==============================================================================
--- cxf/trunk/rt/databinding/sdo/src/test/resources/wsdl_sdo/HelloService_static.wsdl (original)
+++ cxf/trunk/rt/databinding/sdo/src/test/resources/wsdl_sdo/HelloService_static.wsdl Tue
Aug 11 15:07:17 2009
@@ -17,11 +17,16 @@
  * specific language governing permissions and limitations
  * under the License.
  -->      
-<wsdl:definitions name="HelloWorld" targetNamespace="http://apache.org/hello_world_soap_http"
xmlns="http://schemas.xmlsoap.org/wsdl/"
-    xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns:tns="http://apache.org/hello_world_soap_http"
xmlns:x1="http://apache.org/hello_world_soap_http/types"
-    xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
+<wsdl:definitions name="HelloWorld"
+     targetNamespace="http://apache.org/cxf/databinding/sdo/hello_world_soap_http" 
+    xmlns="http://schemas.xmlsoap.org/wsdl/"
+    xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/"
+    xmlns:tns="http://apache.org/cxf/databinding/sdo/hello_world_soap_http" 
+    xmlns:x1="http://apache.org/cxf/databinding/sdo/hello_world_soap_http/types"
+    xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" 
+    xmlns:xsd="http://www.w3.org/2001/XMLSchema">
 
-    <wsdl:import location="HelloService.wsdl" namespace="http://apache.org/hello_world_soap_http"
/>
+    <wsdl:import location="HelloService.wsdl" namespace="http://apache.org/cxf/databinding/sdo/hello_world_soap_http"
/>
 
     <wsdl:service name="SOAPService">
         <wsdl:port binding="tns:Greeter_SOAPBinding" name="SoapPort">



Mime
View raw message