cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From e..@apache.org
Subject svn commit: r599738 - in /incubator/cxf/trunk: api/src/main/java/org/apache/cxf/tools/common/ tools/javato/ws/src/main/java/org/apache/cxf/tools/java2ws/ tools/javato/ws/src/main/java/org/apache/cxf/tools/java2wsdl/processor/ tools/javato/ws/src/main/j...
Date Fri, 30 Nov 2007 08:41:40 GMT
Author: ema
Date: Fri Nov 30 00:41:37 2007
New Revision: 599738

URL: http://svn.apache.org/viewvc?rev=599738&view=rev
Log:
[CXF-1242] Support -address flag in java2ws 

Modified:
    incubator/cxf/trunk/api/src/main/java/org/apache/cxf/tools/common/ToolConstants.java
    incubator/cxf/trunk/tools/javato/ws/src/main/java/org/apache/cxf/tools/java2ws/java2ws.xml
    incubator/cxf/trunk/tools/javato/ws/src/main/java/org/apache/cxf/tools/java2wsdl/processor/JavaToWSDLProcessor.java
    incubator/cxf/trunk/tools/javato/ws/src/main/java/org/apache/cxf/tools/java2wsdl/processor/internal/jaxws/JAXWSFrontEndProcessor.java
    incubator/cxf/trunk/tools/javato/ws/src/main/java/org/apache/cxf/tools/java2wsdl/processor/internal/jaxws/generator/JaxwsClientGenerator.java
    incubator/cxf/trunk/tools/javato/ws/src/main/java/org/apache/cxf/tools/java2wsdl/processor/internal/jaxws/generator/JaxwsServerGenerator.java
    incubator/cxf/trunk/tools/javato/ws/src/main/java/org/apache/cxf/tools/java2wsdl/processor/internal/simple/SimpleFrontEndProcessor.java
    incubator/cxf/trunk/tools/javato/ws/src/main/java/org/apache/cxf/tools/java2wsdl/processor/internal/simple/generator/SimpleClientGenerator.java
    incubator/cxf/trunk/tools/javato/ws/src/main/java/org/apache/cxf/tools/java2wsdl/processor/internal/simple/generator/SimpleServerGenerator.java
    incubator/cxf/trunk/tools/javato/ws/src/main/java/org/apache/cxf/tools/java2wsdl/processor/internal/simple/generator/template/client.vm
    incubator/cxf/trunk/tools/javato/ws/src/main/java/org/apache/cxf/tools/java2wsdl/processor/internal/simple/generator/template/server.vm
    incubator/cxf/trunk/tools/javato/ws/src/test/java/org/apache/cxf/tools/java2ws/JavaToWSTest.java
    incubator/cxf/trunk/tools/javato/ws/src/test/java/org/apache/cxf/tools/java2wsdl/processor/expected/calculator.wsdl
    incubator/cxf/trunk/tools/javato/ws/src/test/java/org/apache/cxf/tools/java2wsdl/processor/expected/db.wsdl
    incubator/cxf/trunk/tools/javato/ws/src/test/java/org/apache/cxf/tools/java2wsdl/processor/expected/expected_send_image.wsdl
    incubator/cxf/trunk/tools/javato/ws/src/test/java/org/apache/cxf/tools/java2wsdl/processor/expected/expected_send_image2.wsdl
    incubator/cxf/trunk/tools/javato/ws/src/test/java/org/apache/cxf/tools/java2wsdl/processor/expected/hello_soap12.wsdl
    incubator/cxf/trunk/tools/javato/ws/src/test/java/org/apache/cxf/tools/java2wsdl/processor/expected/hello_world_fault_expected.wsdl
    incubator/cxf/trunk/tools/javato/ws/src/test/java/org/apache/cxf/tools/java2wsdl/processor/expected/list_expected.wsdl
    incubator/cxf/trunk/tools/javato/ws/src/test/java/org/apache/cxf/tools/java2wsdl/processor/expected/my_hello_soap12.wsdl
    incubator/cxf/trunk/tools/javato/ws/src/test/java/org/apache/cxf/tools/java2wsdl/processor/expected/rpc-hello-expected.wsdl
    incubator/cxf/trunk/tools/javato/ws/src/test/java/org/apache/cxf/tools/java2wsdl/processor/expected/xml-bare-expected.wsdl

Modified: incubator/cxf/trunk/api/src/main/java/org/apache/cxf/tools/common/ToolConstants.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/api/src/main/java/org/apache/cxf/tools/common/ToolConstants.java?rev=599738&r1=599737&r2=599738&view=diff
==============================================================================
--- incubator/cxf/trunk/api/src/main/java/org/apache/cxf/tools/common/ToolConstants.java (original)
+++ incubator/cxf/trunk/api/src/main/java/org/apache/cxf/tools/common/ToolConstants.java Fri
Nov 30 00:41:37 2007
@@ -72,6 +72,8 @@
     public static final String CFG_FRONTEND = "frontend";
 
     public static final String CFG_DATABINDING = "databinding";
+    
+    public static final String DEFAULT_ADDRESS = "http://localhost:9090";
 
     // WSDL2Java Constants
 

Modified: incubator/cxf/trunk/tools/javato/ws/src/main/java/org/apache/cxf/tools/java2ws/java2ws.xml
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/tools/javato/ws/src/main/java/org/apache/cxf/tools/java2ws/java2ws.xml?rev=599738&r1=599737&r2=599738&view=diff
==============================================================================
--- incubator/cxf/trunk/tools/javato/ws/src/main/java/org/apache/cxf/tools/java2ws/java2ws.xml
(original)
+++ incubator/cxf/trunk/tools/javato/ws/src/main/java/org/apache/cxf/tools/java2ws/java2ws.xml
Fri Nov 30 00:41:37 2007
@@ -184,6 +184,17 @@
 					<annotation>port-name</annotation>
 				</associatedArgument>
 			</option>
+			
+			<option id="address" maxOccurs="1">
+				<annotation>
+					Specify the port address 
+				</annotation>
+				<switch>address</switch>
+				<associatedArgument placement="afterSpace">
+					<annotation>address</annotation>
+				</associatedArgument>
+			</option>			
+			
 
 			<option id="createxsdimports" maxOccurs="1">
 				<annotation>

Modified: incubator/cxf/trunk/tools/javato/ws/src/main/java/org/apache/cxf/tools/java2wsdl/processor/JavaToWSDLProcessor.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/tools/javato/ws/src/main/java/org/apache/cxf/tools/java2wsdl/processor/JavaToWSDLProcessor.java?rev=599738&r1=599737&r2=599738&view=diff
==============================================================================
--- incubator/cxf/trunk/tools/javato/ws/src/main/java/org/apache/cxf/tools/java2wsdl/processor/JavaToWSDLProcessor.java
(original)
+++ incubator/cxf/trunk/tools/javato/ws/src/main/java/org/apache/cxf/tools/java2wsdl/processor/JavaToWSDLProcessor.java
Fri Nov 30 00:41:37 2007
@@ -81,6 +81,14 @@
             String svName = getServiceName();
             service.setName(new QName(service.getName().getNamespaceURI(), svName));
         }
+        EndpointInfo endpointInfo = service.getEndpoints().iterator().next();
+        String address = ToolConstants.DEFAULT_ADDRESS + "/" + endpointInfo.getName().getLocalPart();
+        if (context.get(ToolConstants.CFG_ADDRESS) != null) {
+            address = (String)context.get(ToolConstants.CFG_ADDRESS);          
+        }
+        endpointInfo.setAddress(address);
+        context.put(ToolConstants.CFG_ADDRESS, address);
+        
     }
     
     /**
@@ -120,6 +128,7 @@
         ServiceInfo service = builder.createService();
 
         customize(service);
+        
 
         File wsdlFile = getOutputFile(builder.getOutputFile(),
                                       service.getName().getLocalPart() + ".wsdl");

Modified: incubator/cxf/trunk/tools/javato/ws/src/main/java/org/apache/cxf/tools/java2wsdl/processor/internal/jaxws/JAXWSFrontEndProcessor.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/tools/javato/ws/src/main/java/org/apache/cxf/tools/java2wsdl/processor/internal/jaxws/JAXWSFrontEndProcessor.java?rev=599738&r1=599737&r2=599738&view=diff
==============================================================================
--- incubator/cxf/trunk/tools/javato/ws/src/main/java/org/apache/cxf/tools/java2wsdl/processor/internal/jaxws/JAXWSFrontEndProcessor.java
(original)
+++ incubator/cxf/trunk/tools/javato/ws/src/main/java/org/apache/cxf/tools/java2wsdl/processor/internal/jaxws/JAXWSFrontEndProcessor.java
Fri Nov 30 00:41:37 2007
@@ -77,7 +77,7 @@
         jinf.setJavaModel(jm);
         context.put(JavaModel.class, jm);
         context.put(ToolConstants.SERVICE_NAME, serviceInfo.getName());
-        EndpointInfo endpointInfo = serviceInfo.getEndpoints().iterator().next();
+        EndpointInfo endpointInfo = serviceInfo.getEndpoints().iterator().next();       

         context.put(ToolConstants.PORT_NAME, endpointInfo.getName());
         generators.add(new JaxwsSEIGenerator());
         generators.add(new JaxwsImplGenerator());

Modified: incubator/cxf/trunk/tools/javato/ws/src/main/java/org/apache/cxf/tools/java2wsdl/processor/internal/jaxws/generator/JaxwsClientGenerator.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/tools/javato/ws/src/main/java/org/apache/cxf/tools/java2wsdl/processor/internal/jaxws/generator/JaxwsClientGenerator.java?rev=599738&r1=599737&r2=599738&view=diff
==============================================================================
--- incubator/cxf/trunk/tools/javato/ws/src/main/java/org/apache/cxf/tools/java2wsdl/processor/internal/jaxws/generator/JaxwsClientGenerator.java
(original)
+++ incubator/cxf/trunk/tools/javato/ws/src/main/java/org/apache/cxf/tools/java2wsdl/processor/internal/jaxws/generator/JaxwsClientGenerator.java
Fri Nov 30 00:41:37 2007
@@ -58,7 +58,7 @@
             setAttributes("intf", intf);
             setAttributes("service", service);
             setAttributes("port", port);
-            setAttributes("address", "http://localhost:9090/hello");
+            setAttributes("address", (String)penv.get(ToolConstants.CFG_ADDRESS));
             setAttributes("seiClass", (String)env.get(ToolConstants.SEI_CLASS));
             setCommonAttributes();
             doWrite(CLIENT_TEMPLATE, parseOutputName(intf.getPackageName(), intf.getName()
+ "Client"));

Modified: incubator/cxf/trunk/tools/javato/ws/src/main/java/org/apache/cxf/tools/java2wsdl/processor/internal/jaxws/generator/JaxwsServerGenerator.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/tools/javato/ws/src/main/java/org/apache/cxf/tools/java2wsdl/processor/internal/jaxws/generator/JaxwsServerGenerator.java?rev=599738&r1=599737&r2=599738&view=diff
==============================================================================
--- incubator/cxf/trunk/tools/javato/ws/src/main/java/org/apache/cxf/tools/java2wsdl/processor/internal/jaxws/generator/JaxwsServerGenerator.java
(original)
+++ incubator/cxf/trunk/tools/javato/ws/src/main/java/org/apache/cxf/tools/java2wsdl/processor/internal/jaxws/generator/JaxwsServerGenerator.java
Fri Nov 30 00:41:37 2007
@@ -59,7 +59,7 @@
         for (JavaInterface intf : interfaces.values()) {
             clearAttributes();
             setAttributes("intf", intf);
-            setAttributes("address", "http://localhost:9090/hello");
+            setAttributes("address", (String)penv.get(ToolConstants.CFG_ADDRESS));
             setAttributes("implClass", (String)env.get(ToolConstants.IMPL_CLASS));
             setCommonAttributes();
             doWrite(SERVER_TEMPLATE, parseOutputName(intf.getPackageName(), intf.getName()
+ "Server"));

Modified: incubator/cxf/trunk/tools/javato/ws/src/main/java/org/apache/cxf/tools/java2wsdl/processor/internal/simple/SimpleFrontEndProcessor.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/tools/javato/ws/src/main/java/org/apache/cxf/tools/java2wsdl/processor/internal/simple/SimpleFrontEndProcessor.java?rev=599738&r1=599737&r2=599738&view=diff
==============================================================================
--- incubator/cxf/trunk/tools/javato/ws/src/main/java/org/apache/cxf/tools/java2wsdl/processor/internal/simple/SimpleFrontEndProcessor.java
(original)
+++ incubator/cxf/trunk/tools/javato/ws/src/main/java/org/apache/cxf/tools/java2wsdl/processor/internal/simple/SimpleFrontEndProcessor.java
Fri Nov 30 00:41:37 2007
@@ -48,8 +48,6 @@
         jm.addInterface("inf", jinf);
         jinf.setJavaModel(jm);
         context.put(JavaModel.class, jm);
-        
-        
         generators.add(new SimpleSEIGenerator());
         generators.add(new SimpleImplGenerator());
         generators.add(new SimpleServerGenerator());

Modified: incubator/cxf/trunk/tools/javato/ws/src/main/java/org/apache/cxf/tools/java2wsdl/processor/internal/simple/generator/SimpleClientGenerator.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/tools/javato/ws/src/main/java/org/apache/cxf/tools/java2wsdl/processor/internal/simple/generator/SimpleClientGenerator.java?rev=599738&r1=599737&r2=599738&view=diff
==============================================================================
--- incubator/cxf/trunk/tools/javato/ws/src/main/java/org/apache/cxf/tools/java2wsdl/processor/internal/simple/generator/SimpleClientGenerator.java
(original)
+++ incubator/cxf/trunk/tools/javato/ws/src/main/java/org/apache/cxf/tools/java2wsdl/processor/internal/simple/generator/SimpleClientGenerator.java
Fri Nov 30 00:41:37 2007
@@ -56,6 +56,7 @@
             clearAttributes();
             setAttributes("intf", intf);
             setAttributes("seiClass", env.get(ToolConstants.SEI_CLASS));
+            setAttributes("address", env.get(ToolConstants.CFG_ADDRESS));
             setCommonAttributes();
             doWrite(CLIENT_TEMPLATE, parseOutputName(intf.getPackageName(), intf.getName()
+ "Client"));
             env.put(ToolConstants.CLIENT_CLASS, intf.getFullClassName() + "Client");

Modified: incubator/cxf/trunk/tools/javato/ws/src/main/java/org/apache/cxf/tools/java2wsdl/processor/internal/simple/generator/SimpleServerGenerator.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/tools/javato/ws/src/main/java/org/apache/cxf/tools/java2wsdl/processor/internal/simple/generator/SimpleServerGenerator.java?rev=599738&r1=599737&r2=599738&view=diff
==============================================================================
--- incubator/cxf/trunk/tools/javato/ws/src/main/java/org/apache/cxf/tools/java2wsdl/processor/internal/simple/generator/SimpleServerGenerator.java
(original)
+++ incubator/cxf/trunk/tools/javato/ws/src/main/java/org/apache/cxf/tools/java2wsdl/processor/internal/simple/generator/SimpleServerGenerator.java
Fri Nov 30 00:41:37 2007
@@ -60,6 +60,7 @@
             clearAttributes();
             setAttributes("intf", intf);
             setAttributes("implClass", env.get(ToolConstants.IMPL_CLASS));
+            setAttributes("address", env.get(ToolConstants.CFG_ADDRESS));
             setCommonAttributes();
             doWrite(SERVER_TEMPLATE, parseOutputName(intf.getPackageName(), intf.getName()
+ "Server"));
             env.put(ToolConstants.SERVER_CLASS, intf.getFullClassName() + "Server");

Modified: incubator/cxf/trunk/tools/javato/ws/src/main/java/org/apache/cxf/tools/java2wsdl/processor/internal/simple/generator/template/client.vm
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/tools/javato/ws/src/main/java/org/apache/cxf/tools/java2wsdl/processor/internal/simple/generator/template/client.vm?rev=599738&r1=599737&r2=599738&view=diff
==============================================================================
--- incubator/cxf/trunk/tools/javato/ws/src/main/java/org/apache/cxf/tools/java2wsdl/processor/internal/simple/generator/template/client.vm
(original)
+++ incubator/cxf/trunk/tools/javato/ws/src/main/java/org/apache/cxf/tools/java2wsdl/processor/internal/simple/generator/template/client.vm
Fri Nov 30 00:41:37 2007
@@ -35,7 +35,7 @@
     public static void main(String[] args) {
         ClientProxyFactoryBean proxyFactory = new ClientProxyFactoryBean();
         ClientFactoryBean clientBean = proxyFactory.getClientFactoryBean();
-        clientBean.setAddress("http://localhost:8088/Hello");
+        clientBean.setAddress("${address}");
         clientBean.setBus(CXFBusFactory.getDefaultBus());
         clientBean.setTransportId("http://schemas.xmlsoap.org/wsdl/http/");
         clientBean.setServiceClass(${seiClass}.class);

Modified: incubator/cxf/trunk/tools/javato/ws/src/main/java/org/apache/cxf/tools/java2wsdl/processor/internal/simple/generator/template/server.vm
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/tools/javato/ws/src/main/java/org/apache/cxf/tools/java2wsdl/processor/internal/simple/generator/template/server.vm?rev=599738&r1=599737&r2=599738&view=diff
==============================================================================
--- incubator/cxf/trunk/tools/javato/ws/src/main/java/org/apache/cxf/tools/java2wsdl/processor/internal/simple/generator/template/server.vm
(original)
+++ incubator/cxf/trunk/tools/javato/ws/src/main/java/org/apache/cxf/tools/java2wsdl/processor/internal/simple/generator/template/server.vm
Fri Nov 30 00:41:37 2007
@@ -35,7 +35,7 @@
     public static void main(String[] args) {
         ServerFactoryBean svrBean = new ServerFactoryBean();
         svrBean.setBus(CXFBusFactory.getDefaultBus());
-        svrBean.setAddress("http://localhost:8080/Hello");
+        svrBean.setAddress("${address}");
         svrBean.setTransportId("http://schemas.xmlsoap.org/wsdl/http/");
         svrBean.setBindingId("http://schemas.xmlsoap.org/soap/");
         svrBean.setServiceBean(new ${implClass}());

Modified: incubator/cxf/trunk/tools/javato/ws/src/test/java/org/apache/cxf/tools/java2ws/JavaToWSTest.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/tools/javato/ws/src/test/java/org/apache/cxf/tools/java2ws/JavaToWSTest.java?rev=599738&r1=599737&r2=599738&view=diff
==============================================================================
--- incubator/cxf/trunk/tools/javato/ws/src/test/java/org/apache/cxf/tools/java2ws/JavaToWSTest.java
(original)
+++ incubator/cxf/trunk/tools/javato/ws/src/test/java/org/apache/cxf/tools/java2ws/JavaToWSTest.java
Fri Nov 30 00:41:37 2007
@@ -89,28 +89,63 @@
     }
 
     @Test
-    public void testSimple() throws Exception {
+    public void testJaxwsFrontend() throws Exception {
         File wsdlFile = outputFile("tmp.wsdl");
-        String[] args = new String[] {"-wsdl", "-o", output.getPath() + "/tmp.wsdl", "-verbose",
"-s",
+        String[] args = new String[] {"-wsdl", "-o", output.getPath() + "/tmp.wsdl", "-s",
                                       output.getPath(), "-frontend", "jaxws", "-client",
"-server",
+                                      "-address", "http://localhost:1234/test",
                                       "org.apache.hello_world_doc_lit.Greeter"};
         JavaToWS.main(args);
-        checkStdErr();
+        //checkStdErr();
         assertTrue("Failed to generate WSDL file", wsdlFile.exists());
+        String str = FileUtils.getStringFromFile(wsdlFile);
+        assertTrue("Port address in generated wsdl is not correct", 
+                   str.indexOf("http://localhost:1234/test") > -1);
+        File client = outputFile("org/apache/hello_world_doc_lit/GreeterClient.java");
+        str = FileUtils.getStringFromFile(client);
+        assertTrue("Address generated in client side code is not correct", 
+                   str.indexOf("http://localhost:1234/test") > -1);
+        
+        File server = outputFile("org/apache/hello_world_doc_lit/GreeterServer.java");
+        str = FileUtils.getStringFromFile(server);
+        assertTrue("Address generated in server side code is not correct", 
+                   str.indexOf("http://localhost:1234/test") > -1); 
+        
+        File impl = outputFile("org/apache/hello_world_doc_lit/GreeterImpl.java");
+        Compiler compiler = new Compiler();
+        String[] files = new String[]{client.getAbsoluteFile().toString(),
+                                     server.getAbsoluteFile().toString(), 
+                                     impl.getAbsoluteFile().toString()};
+        compiler.compileFiles(files, this.classDir);
     }
     
     @Test
     public void testSimpleFrontend() throws Exception {
-        String[] args = new String[] {"-wsdl", "-o", output.getPath() + "/tmp.wsdl", "-verbose",
"-s",
+        String[] args = new String[] {"-wsdl", "-o", output.getPath() + "/tmp.wsdl", "-s",
                                       output.getPath(), "-frontend", "simple", "-client",
"-server",
+                                      "-address", "http://localhost:1234/test",
                                       "org.apache.cxf.tools.fortest.simple.Hello"};
         JavaToWS.main(args);
         File client = outputFile("org/apache/cxf/tools/fortest/simple/HelloPortTypeClient.java");
         File server = outputFile("org/apache/cxf/tools/fortest/simple/HelloPortTypeServer.java");
         File impl = outputFile("org/apache/cxf/tools/fortest/simple/HelloPortTypeImpl.java");
-        assertTrue("Failed to generate client file for simple front end ", client.exists());
+        File wsdl = outputFile("tmp.wsdl");
+        assertTrue("Failed to generate client file for simple front end ", client.exists());
       
         assertTrue("Failed to generate server file for simple front end ", server.exists());
         assertTrue("Failed to generate impl file for simple front end ", impl.exists());
+        assertTrue("Failed to generate wsdl file for simple front end ", wsdl.exists());
+        
+        String str = FileUtils.getStringFromFile(client);
+        assertTrue("Address generated in client side code is not correct", 
+                   str.indexOf("http://localhost:1234/test") > -1); 
+        str = FileUtils.getStringFromFile(server);
+        assertTrue("Address generated in server side code is not correct", 
+                   str.indexOf("http://localhost:1234/test") > -1); 
+        str = FileUtils.getStringFromFile(wsdl);
+        assertTrue("Address generated in wsdl is not correct", 
+                   str.indexOf("http://localhost:1234/test") > -1); 
+        
+        
         Compiler compiler = new Compiler();
         String[] files = new String[]{client.getAbsoluteFile().toString(),
                                      server.getAbsoluteFile().toString(), 

Modified: incubator/cxf/trunk/tools/javato/ws/src/test/java/org/apache/cxf/tools/java2wsdl/processor/expected/calculator.wsdl
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/tools/javato/ws/src/test/java/org/apache/cxf/tools/java2wsdl/processor/expected/calculator.wsdl?rev=599738&r1=599737&r2=599738&view=diff
==============================================================================
--- incubator/cxf/trunk/tools/javato/ws/src/test/java/org/apache/cxf/tools/java2wsdl/processor/expected/calculator.wsdl
(original)
+++ incubator/cxf/trunk/tools/javato/ws/src/test/java/org/apache/cxf/tools/java2wsdl/processor/expected/calculator.wsdl
Fri Nov 30 00:41:37 2007
@@ -78,7 +78,7 @@
   </wsdl:binding>
   <wsdl:service name="Calculator">
     <wsdl:port name="CalculatorPort" binding="tns:CalculatorSoapBinding">
-      <soap:address location="http://localhost:9090/hello"/>
+      <soap:address location="http://localhost:9090/CalculatorPort"/>
     </wsdl:port>
   </wsdl:service>
 </wsdl:definitions>

Modified: incubator/cxf/trunk/tools/javato/ws/src/test/java/org/apache/cxf/tools/java2wsdl/processor/expected/db.wsdl
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/tools/javato/ws/src/test/java/org/apache/cxf/tools/java2wsdl/processor/expected/db.wsdl?rev=599738&r1=599737&r2=599738&view=diff
==============================================================================
--- incubator/cxf/trunk/tools/javato/ws/src/test/java/org/apache/cxf/tools/java2wsdl/processor/expected/db.wsdl
(original)
+++ incubator/cxf/trunk/tools/javato/ws/src/test/java/org/apache/cxf/tools/java2wsdl/processor/expected/db.wsdl
Fri Nov 30 00:41:37 2007
@@ -85,7 +85,7 @@
   </wsdl:binding>
   <wsdl:service name="Database">
     <wsdl:port name="DatabasePort" binding="tns:DatabaseSoapBinding">
-      <soap:address location="http://localhost:9090/hello"/>
+      <soap:address location="http://localhost:9090/DatabasePort"/>
     </wsdl:port>
   </wsdl:service>
 </wsdl:definitions>

Modified: incubator/cxf/trunk/tools/javato/ws/src/test/java/org/apache/cxf/tools/java2wsdl/processor/expected/expected_send_image.wsdl
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/tools/javato/ws/src/test/java/org/apache/cxf/tools/java2wsdl/processor/expected/expected_send_image.wsdl?rev=599738&r1=599737&r2=599738&view=diff
==============================================================================
--- incubator/cxf/trunk/tools/javato/ws/src/test/java/org/apache/cxf/tools/java2wsdl/processor/expected/expected_send_image.wsdl
(original)
+++ incubator/cxf/trunk/tools/javato/ws/src/test/java/org/apache/cxf/tools/java2wsdl/processor/expected/expected_send_image.wsdl
Fri Nov 30 00:41:37 2007
@@ -74,7 +74,7 @@
   </wsdl:binding>
   <wsdl:service name="ImageSenderService">
     <wsdl:port name="ImageSenderPort" binding="tns:ImageSenderServiceSoapBinding">
-      <soap:address location="http://localhost:9090/hello"/>
+      <soap:address location="http://localhost:9090/ImageSenderPort"/>
     </wsdl:port>
   </wsdl:service>
 </wsdl:definitions>

Modified: incubator/cxf/trunk/tools/javato/ws/src/test/java/org/apache/cxf/tools/java2wsdl/processor/expected/expected_send_image2.wsdl
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/tools/javato/ws/src/test/java/org/apache/cxf/tools/java2wsdl/processor/expected/expected_send_image2.wsdl?rev=599738&r1=599737&r2=599738&view=diff
==============================================================================
--- incubator/cxf/trunk/tools/javato/ws/src/test/java/org/apache/cxf/tools/java2wsdl/processor/expected/expected_send_image2.wsdl
(original)
+++ incubator/cxf/trunk/tools/javato/ws/src/test/java/org/apache/cxf/tools/java2wsdl/processor/expected/expected_send_image2.wsdl
Fri Nov 30 00:41:37 2007
@@ -67,7 +67,7 @@
   </wsdl:binding>
   <wsdl:service name="ImageSender2Service">
     <wsdl:port name="ImageSender2Port" binding="tns:ImageSender2ServiceSoapBinding">
-      <soap:address location="http://localhost:9090/hello"/>
+      <soap:address location="http://localhost:9090/ImageSender2Port"/>
     </wsdl:port>
   </wsdl:service>
 </wsdl:definitions>

Modified: incubator/cxf/trunk/tools/javato/ws/src/test/java/org/apache/cxf/tools/java2wsdl/processor/expected/hello_soap12.wsdl
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/tools/javato/ws/src/test/java/org/apache/cxf/tools/java2wsdl/processor/expected/hello_soap12.wsdl?rev=599738&r1=599737&r2=599738&view=diff
==============================================================================
--- incubator/cxf/trunk/tools/javato/ws/src/test/java/org/apache/cxf/tools/java2wsdl/processor/expected/hello_soap12.wsdl
(original)
+++ incubator/cxf/trunk/tools/javato/ws/src/test/java/org/apache/cxf/tools/java2wsdl/processor/expected/hello_soap12.wsdl
Fri Nov 30 00:41:37 2007
@@ -108,7 +108,7 @@
   </wsdl:binding>
   <wsdl:service name="GreeterService">
     <wsdl:port name="GreeterPort" binding="tns:GreeterServiceSoapBinding">
-      <soap12:address location="http://localhost:9090/hello"/>
+      <soap12:address location="http://localhost:9090/GreeterPort"/>
     </wsdl:port>
   </wsdl:service>
 </wsdl:definitions>

Modified: incubator/cxf/trunk/tools/javato/ws/src/test/java/org/apache/cxf/tools/java2wsdl/processor/expected/hello_world_fault_expected.wsdl
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/tools/javato/ws/src/test/java/org/apache/cxf/tools/java2wsdl/processor/expected/hello_world_fault_expected.wsdl?rev=599738&r1=599737&r2=599738&view=diff
==============================================================================
--- incubator/cxf/trunk/tools/javato/ws/src/test/java/org/apache/cxf/tools/java2wsdl/processor/expected/hello_world_fault_expected.wsdl
(original)
+++ incubator/cxf/trunk/tools/javato/ws/src/test/java/org/apache/cxf/tools/java2wsdl/processor/expected/hello_world_fault_expected.wsdl
Fri Nov 30 00:41:37 2007
@@ -142,7 +142,7 @@
   </wsdl:binding>
   <wsdl:service name="GreeterService">
     <wsdl:port name="GreeterPort" binding="tns:GreeterServiceSoapBinding">
-      <soap:address location="http://localhost:9090/hello"/>
+      <soap:address location="http://localhost:9090/GreeterPort"/>
     </wsdl:port>
   </wsdl:service>
 </wsdl:definitions>

Modified: incubator/cxf/trunk/tools/javato/ws/src/test/java/org/apache/cxf/tools/java2wsdl/processor/expected/list_expected.wsdl
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/tools/javato/ws/src/test/java/org/apache/cxf/tools/java2wsdl/processor/expected/list_expected.wsdl?rev=599738&r1=599737&r2=599738&view=diff
==============================================================================
--- incubator/cxf/trunk/tools/javato/ws/src/test/java/org/apache/cxf/tools/java2wsdl/processor/expected/list_expected.wsdl
(original)
+++ incubator/cxf/trunk/tools/javato/ws/src/test/java/org/apache/cxf/tools/java2wsdl/processor/expected/list_expected.wsdl
Fri Nov 30 00:41:37 2007
@@ -64,7 +64,7 @@
   </wsdl:binding>
   <wsdl:service name="SOAPService">
     <wsdl:port name="SoapPort" binding="tns:SOAPServiceSoapBinding">
-      <soap:address location="http://localhost:9090/hello"/>
+      <soap:address location="http://localhost:9090/SoapPort"/>
     </wsdl:port>
   </wsdl:service>
 </wsdl:definitions>

Modified: incubator/cxf/trunk/tools/javato/ws/src/test/java/org/apache/cxf/tools/java2wsdl/processor/expected/my_hello_soap12.wsdl
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/tools/javato/ws/src/test/java/org/apache/cxf/tools/java2wsdl/processor/expected/my_hello_soap12.wsdl?rev=599738&r1=599737&r2=599738&view=diff
==============================================================================
--- incubator/cxf/trunk/tools/javato/ws/src/test/java/org/apache/cxf/tools/java2wsdl/processor/expected/my_hello_soap12.wsdl
(original)
+++ incubator/cxf/trunk/tools/javato/ws/src/test/java/org/apache/cxf/tools/java2wsdl/processor/expected/my_hello_soap12.wsdl
Fri Nov 30 00:41:37 2007
@@ -108,7 +108,7 @@
   </wsdl:binding>
   <wsdl:service name="MyService">
     <wsdl:port name="GreeterPort" binding="tns:GreeterServiceSoapBinding">
-      <soap12:address location="http://localhost:9090/hello"/>
+      <soap12:address location="http://localhost:9090/GreeterPort"/>
     </wsdl:port>
   </wsdl:service>
 </wsdl:definitions>

Modified: incubator/cxf/trunk/tools/javato/ws/src/test/java/org/apache/cxf/tools/java2wsdl/processor/expected/rpc-hello-expected.wsdl
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/tools/javato/ws/src/test/java/org/apache/cxf/tools/java2wsdl/processor/expected/rpc-hello-expected.wsdl?rev=599738&r1=599737&r2=599738&view=diff
==============================================================================
--- incubator/cxf/trunk/tools/javato/ws/src/test/java/org/apache/cxf/tools/java2wsdl/processor/expected/rpc-hello-expected.wsdl
(original)
+++ incubator/cxf/trunk/tools/javato/ws/src/test/java/org/apache/cxf/tools/java2wsdl/processor/expected/rpc-hello-expected.wsdl
Fri Nov 30 00:41:37 2007
@@ -48,7 +48,7 @@
   </wsdl:binding>
   <wsdl:service name="RPCHelloService">
     <wsdl:port name="RPCHelloPort" binding="tns:RPCHelloServiceSoapBinding">
-      <soap:address location="http://localhost:9090/hello"/>
+      <soap:address location="http://localhost:9090/RPCHelloPort"/>
     </wsdl:port>
   </wsdl:service>
 </wsdl:definitions>

Modified: incubator/cxf/trunk/tools/javato/ws/src/test/java/org/apache/cxf/tools/java2wsdl/processor/expected/xml-bare-expected.wsdl
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/tools/javato/ws/src/test/java/org/apache/cxf/tools/java2wsdl/processor/expected/xml-bare-expected.wsdl?rev=599738&r1=599737&r2=599738&view=diff
==============================================================================
--- incubator/cxf/trunk/tools/javato/ws/src/test/java/org/apache/cxf/tools/java2wsdl/processor/expected/xml-bare-expected.wsdl
(original)
+++ incubator/cxf/trunk/tools/javato/ws/src/test/java/org/apache/cxf/tools/java2wsdl/processor/expected/xml-bare-expected.wsdl
Fri Nov 30 00:41:37 2007
@@ -136,7 +136,7 @@
   </wsdl:binding>
   <wsdl:service name="GreeterService">
     <wsdl:port name="GreeterPort" binding="tns:GreeterServiceSoapBinding">
-      <soap:address location="http://localhost:9090/hello"/>
+      <soap:address location="http://localhost:9090/GreeterPort"/>
     </wsdl:port>
   </wsdl:service>
 </wsdl:definitions>



Mime
View raw message