cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From e..@apache.org
Subject svn commit: r599763 - in /incubator/cxf/branches/2.0.x-fixes: ./ 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/ja...
Date Fri, 30 Nov 2007 09:58:00 GMT
Author: ema
Date: Fri Nov 30 01:57:57 2007
New Revision: 599763

URL: http://svn.apache.org/viewvc?rev=599763&view=rev
Log:
Merged revisions 599738 via svnmerge from 
https://svn.apache.org/repos/asf/incubator/cxf/trunk

........
  r599738 | ema | 2007-11-30 16:41:37 +0800 (Fri, 30 Nov 2007) | 1 line
  
  [CXF-1242] Support -address flag in java2ws 
........

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

Propchange: incubator/cxf/branches/2.0.x-fixes/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.

Modified: incubator/cxf/branches/2.0.x-fixes/api/src/main/java/org/apache/cxf/tools/common/ToolConstants.java
URL: http://svn.apache.org/viewvc/incubator/cxf/branches/2.0.x-fixes/api/src/main/java/org/apache/cxf/tools/common/ToolConstants.java?rev=599763&r1=599762&r2=599763&view=diff
==============================================================================
--- incubator/cxf/branches/2.0.x-fixes/api/src/main/java/org/apache/cxf/tools/common/ToolConstants.java
(original)
+++ incubator/cxf/branches/2.0.x-fixes/api/src/main/java/org/apache/cxf/tools/common/ToolConstants.java
Fri Nov 30 01:57:57 2007
@@ -65,6 +65,8 @@
     public static final String CFG_FRONTEND = "frontend";
 
     public static final String CFG_DATABINDING = "db";
+    
+    public static final String DEFAULT_ADDRESS = "http://localhost:9090";
 
 
     // WSDL2Java Constants

Modified: incubator/cxf/branches/2.0.x-fixes/tools/javato/ws/src/main/java/org/apache/cxf/tools/java2ws/java2ws.xml
URL: http://svn.apache.org/viewvc/incubator/cxf/branches/2.0.x-fixes/tools/javato/ws/src/main/java/org/apache/cxf/tools/java2ws/java2ws.xml?rev=599763&r1=599762&r2=599763&view=diff
==============================================================================
--- incubator/cxf/branches/2.0.x-fixes/tools/javato/ws/src/main/java/org/apache/cxf/tools/java2ws/java2ws.xml
(original)
+++ incubator/cxf/branches/2.0.x-fixes/tools/javato/ws/src/main/java/org/apache/cxf/tools/java2ws/java2ws.xml
Fri Nov 30 01:57:57 2007
@@ -160,6 +160,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/branches/2.0.x-fixes/tools/javato/ws/src/main/java/org/apache/cxf/tools/java2wsdl/processor/JavaToWSDLProcessor.java
URL: http://svn.apache.org/viewvc/incubator/cxf/branches/2.0.x-fixes/tools/javato/ws/src/main/java/org/apache/cxf/tools/java2wsdl/processor/JavaToWSDLProcessor.java?rev=599763&r1=599762&r2=599763&view=diff
==============================================================================
--- incubator/cxf/branches/2.0.x-fixes/tools/javato/ws/src/main/java/org/apache/cxf/tools/java2wsdl/processor/JavaToWSDLProcessor.java
(original)
+++ incubator/cxf/branches/2.0.x-fixes/tools/javato/ws/src/main/java/org/apache/cxf/tools/java2wsdl/processor/JavaToWSDLProcessor.java
Fri Nov 30 01:57:57 2007
@@ -72,6 +72,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);
+        
     }
 
     public void process() throws ToolException {
@@ -87,6 +95,7 @@
         ServiceInfo service = builder.createService();
 
         customize(service);
+        
 
         File wsdlFile = getOutputFile(builder.getOutputFile(),
                                       service.getName().getLocalPart() + ".wsdl");

Modified: incubator/cxf/branches/2.0.x-fixes/tools/javato/ws/src/main/java/org/apache/cxf/tools/java2wsdl/processor/internal/jaxws/JAXWSFrontEndProcessor.java
URL: http://svn.apache.org/viewvc/incubator/cxf/branches/2.0.x-fixes/tools/javato/ws/src/main/java/org/apache/cxf/tools/java2wsdl/processor/internal/jaxws/JAXWSFrontEndProcessor.java?rev=599763&r1=599762&r2=599763&view=diff
==============================================================================
--- incubator/cxf/branches/2.0.x-fixes/tools/javato/ws/src/main/java/org/apache/cxf/tools/java2wsdl/processor/internal/jaxws/JAXWSFrontEndProcessor.java
(original)
+++ incubator/cxf/branches/2.0.x-fixes/tools/javato/ws/src/main/java/org/apache/cxf/tools/java2wsdl/processor/internal/jaxws/JAXWSFrontEndProcessor.java
Fri Nov 30 01:57:57 2007
@@ -72,7 +72,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/branches/2.0.x-fixes/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/branches/2.0.x-fixes/tools/javato/ws/src/main/java/org/apache/cxf/tools/java2wsdl/processor/internal/jaxws/generator/JaxwsClientGenerator.java?rev=599763&r1=599762&r2=599763&view=diff
==============================================================================
--- incubator/cxf/branches/2.0.x-fixes/tools/javato/ws/src/main/java/org/apache/cxf/tools/java2wsdl/processor/internal/jaxws/generator/JaxwsClientGenerator.java
(original)
+++ incubator/cxf/branches/2.0.x-fixes/tools/javato/ws/src/main/java/org/apache/cxf/tools/java2wsdl/processor/internal/jaxws/generator/JaxwsClientGenerator.java
Fri Nov 30 01:57:57 2007
@@ -60,7 +60,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/branches/2.0.x-fixes/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/branches/2.0.x-fixes/tools/javato/ws/src/main/java/org/apache/cxf/tools/java2wsdl/processor/internal/jaxws/generator/JaxwsServerGenerator.java?rev=599763&r1=599762&r2=599763&view=diff
==============================================================================
--- incubator/cxf/branches/2.0.x-fixes/tools/javato/ws/src/main/java/org/apache/cxf/tools/java2wsdl/processor/internal/jaxws/generator/JaxwsServerGenerator.java
(original)
+++ incubator/cxf/branches/2.0.x-fixes/tools/javato/ws/src/main/java/org/apache/cxf/tools/java2wsdl/processor/internal/jaxws/generator/JaxwsServerGenerator.java
Fri Nov 30 01:57:57 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/branches/2.0.x-fixes/tools/javato/ws/src/main/java/org/apache/cxf/tools/java2wsdl/processor/internal/simple/SimpleFrontEndProcessor.java
URL: http://svn.apache.org/viewvc/incubator/cxf/branches/2.0.x-fixes/tools/javato/ws/src/main/java/org/apache/cxf/tools/java2wsdl/processor/internal/simple/SimpleFrontEndProcessor.java?rev=599763&r1=599762&r2=599763&view=diff
==============================================================================
--- incubator/cxf/branches/2.0.x-fixes/tools/javato/ws/src/main/java/org/apache/cxf/tools/java2wsdl/processor/internal/simple/SimpleFrontEndProcessor.java
(original)
+++ incubator/cxf/branches/2.0.x-fixes/tools/javato/ws/src/main/java/org/apache/cxf/tools/java2wsdl/processor/internal/simple/SimpleFrontEndProcessor.java
Fri Nov 30 01:57:57 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/branches/2.0.x-fixes/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/branches/2.0.x-fixes/tools/javato/ws/src/main/java/org/apache/cxf/tools/java2wsdl/processor/internal/simple/generator/SimpleClientGenerator.java?rev=599763&r1=599762&r2=599763&view=diff
==============================================================================
--- incubator/cxf/branches/2.0.x-fixes/tools/javato/ws/src/main/java/org/apache/cxf/tools/java2wsdl/processor/internal/simple/generator/SimpleClientGenerator.java
(original)
+++ incubator/cxf/branches/2.0.x-fixes/tools/javato/ws/src/main/java/org/apache/cxf/tools/java2wsdl/processor/internal/simple/generator/SimpleClientGenerator.java
Fri Nov 30 01:57:57 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"));
 

Modified: incubator/cxf/branches/2.0.x-fixes/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/branches/2.0.x-fixes/tools/javato/ws/src/main/java/org/apache/cxf/tools/java2wsdl/processor/internal/simple/generator/SimpleServerGenerator.java?rev=599763&r1=599762&r2=599763&view=diff
==============================================================================
--- incubator/cxf/branches/2.0.x-fixes/tools/javato/ws/src/main/java/org/apache/cxf/tools/java2wsdl/processor/internal/simple/generator/SimpleServerGenerator.java
(original)
+++ incubator/cxf/branches/2.0.x-fixes/tools/javato/ws/src/main/java/org/apache/cxf/tools/java2wsdl/processor/internal/simple/generator/SimpleServerGenerator.java
Fri Nov 30 01:57:57 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"));
         }

Modified: incubator/cxf/branches/2.0.x-fixes/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/branches/2.0.x-fixes/tools/javato/ws/src/main/java/org/apache/cxf/tools/java2wsdl/processor/internal/simple/generator/template/client.vm?rev=599763&r1=599762&r2=599763&view=diff
==============================================================================
--- incubator/cxf/branches/2.0.x-fixes/tools/javato/ws/src/main/java/org/apache/cxf/tools/java2wsdl/processor/internal/simple/generator/template/client.vm
(original)
+++ incubator/cxf/branches/2.0.x-fixes/tools/javato/ws/src/main/java/org/apache/cxf/tools/java2wsdl/processor/internal/simple/generator/template/client.vm
Fri Nov 30 01:57:57 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/branches/2.0.x-fixes/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/branches/2.0.x-fixes/tools/javato/ws/src/main/java/org/apache/cxf/tools/java2wsdl/processor/internal/simple/generator/template/server.vm?rev=599763&r1=599762&r2=599763&view=diff
==============================================================================
--- incubator/cxf/branches/2.0.x-fixes/tools/javato/ws/src/main/java/org/apache/cxf/tools/java2wsdl/processor/internal/simple/generator/template/server.vm
(original)
+++ incubator/cxf/branches/2.0.x-fixes/tools/javato/ws/src/main/java/org/apache/cxf/tools/java2wsdl/processor/internal/simple/generator/template/server.vm
Fri Nov 30 01:57:57 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/branches/2.0.x-fixes/tools/javato/ws/src/test/java/org/apache/cxf/tools/java2ws/JavaToWSTest.java
URL: http://svn.apache.org/viewvc/incubator/cxf/branches/2.0.x-fixes/tools/javato/ws/src/test/java/org/apache/cxf/tools/java2ws/JavaToWSTest.java?rev=599763&r1=599762&r2=599763&view=diff
==============================================================================
--- incubator/cxf/branches/2.0.x-fixes/tools/javato/ws/src/test/java/org/apache/cxf/tools/java2ws/JavaToWSTest.java
(original)
+++ incubator/cxf/branches/2.0.x-fixes/tools/javato/ws/src/test/java/org/apache/cxf/tools/java2ws/JavaToWSTest.java
Fri Nov 30 01:57:57 2007
@@ -26,24 +26,30 @@
 import org.apache.cxf.helpers.FileUtils;
 import org.apache.cxf.tools.common.ToolContext;
 import org.apache.cxf.tools.common.ToolTestBase;
+import org.apache.cxf.tools.util.Compiler;
+
 import org.junit.After;
 import org.junit.Before;
-import org.junit.Ignore;
 import org.junit.Test;
 
 public class JavaToWSTest extends ToolTestBase {
     protected String cp;
     protected ToolContext env;
     protected File output;
+    protected File classDir;
 
     @Before
-    public void startUp() throws Exception {
+    public void setUpResource() throws Exception {
+        super.setUp();
         env = new ToolContext();
         cp = System.getProperty("java.class.path");
         URL url = getClass().getResource(".");
         output = new File(url.toURI());
+        System.setProperty("java.class.path", getClassPath());
         output = new File(output, "/generated/");
         FileUtils.mkDir(output);
+        classDir = new File(output, "/classes/");
+        FileUtils.mkDir(classDir);
     }
 
     @After
@@ -54,6 +60,10 @@
         output = null;
     }
 
+    private File outputFile(String name) {
+        return new File(output.getPath() + File.separator + name);
+    }
+
     @Test
     public void testVersionOutput() throws Exception {
         String[] args = new String[] {"-v"};
@@ -63,128 +73,238 @@
 
     @Test
     public void testFlagWSDL() throws Exception {
-        String[] args = new String[] {"-wsdl", "-o", output.getPath() + "/tmp.wsdl",
-                                      "-d", output.getPath(), "-client", "-server",
-                                      "org.apache.hello_world_soap12_http.Greeter"};
+        File wsdlFile = outputFile("tmp.wsdl");
+        String[] args = new String[] {"-wsdl", "-o", wsdlFile.getAbsolutePath(), "-s", output.getPath(),
+                                      "-client", "-server", "org.apache.hello_world_soap12_http.Greeter"};
+        JavaToWS.main(args);
+        checkStdErr();
+        assertTrue("Failed to generate WSDL file", wsdlFile.exists());
+    }
+
+    private void checkStdErr() {
+        String err = getStdErr();
+        if (err != null) {
+            assertEquals("errors: ", "", err);
+        }
+    }
+
+    @Test
+    public void testJaxwsFrontend() throws Exception {
+        File wsdlFile = outputFile("tmp.wsdl");
+        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);
-        File wsdlFile = new File(output.getPath() + "/tmp.wsdl");
-        assertTrue("wsdl is not generated", wsdlFile.exists());
+        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 testSimple() throws Exception {
-        String[] args = new String[] {"-wsdl", "-o", output.getPath() + "/tmp.wsdl", "-verbose",
-                                      "-d", output.getPath(),
-                                      "-frontend", "jaxws",
-                                      "-client", "-server",
+    public void testSimpleFrontend() throws Exception {
+        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");
+        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(),
+                                     impl.getAbsoluteFile().toString()};
+        compiler.compileFiles(files, this.classDir);
+
+
+    }
+
+    @Test
+    public void testMissingBeans() {
+        String[] args = new String[] {"-wsdl", "-o", output.getPath() + "/tmp.wsdl", "-verbose",
"-s",
+                                      output.getPath(), "-frontend", "jaxws", "-client",
"-server",
+                                      "-beans", "nobodyHome.xml",
+                                      "-beans", "nothing.xml",
                                       "org.apache.hello_world_doc_lit.Greeter"};
         JavaToWS.main(args);
-        File wsdlFile = new File(output.getPath() + "/tmp.wsdl");
-        assertTrue("wsdl is not generated", wsdlFile.exists());
+        String err = getStdErr();
+        assertTrue("Missing file error message",
+                   err.indexOf("Unable to open bean definition file nobodyHome.xml") >=
0);
     }
-    
-    //org.apache.cxf.tools.fortest
-    
+
     @Test
     public void testClassNoWebServiceAnno() throws Exception {
-        String[] args = new String[] {"-wsdl", "-o", output.getPath() + "/tmp.wsdl", "-verbose",
-                                      "-d", output.getPath(),
-                                      "-frontend", "jaxws",
-                                      "-client", "-server",
-                                      "org.apache.cxf.tools.fortest.Hello"};
-        JavaToWS.main(args);
-        File wsdlFile = new File(output.getPath() + "/tmp.wsdl");
-        assertTrue("wsdl is not generated", wsdlFile.exists());
-        assertTrue("Class does not carry WebService error should be detected"
-                   , getStdErr().indexOf("does not carry a WebService annotation") > -1);
+        File wsdlFile = outputFile("tmp.wsdl");
+        String[] args = new String[] {"-wsdl", "-o", output.getPath() + "/tmp.wsdl", "-verbose",
"-s",
+                                      output.getPath(), "-frontend", "jaxws", "-client",
"-server",
+                                      "org.apache.cxf.tools.fortest.HelloWithNoAnno"};
+        JavaToWS.main(args);
+        assertTrue("Failed to generate WSDL file", wsdlFile.exists());
+        assertTrue("Class does not carry WebService error should be detected", getStdErr()
+            .indexOf("does not carry a WebService annotation") > -1);
     }
-    
+
     @Test
     public void testClassWithRMI() throws Exception {
+        File wsdlFile = outputFile("tmp.wsdl");
         String[] args = new String[] {"-wsdl", "-o", output.getPath() + "/tmp.wsdl", "-verbose",
-                                      "-d", output.getPath(),
-                                      "-frontend", "jaxws",
-                                      "-client", "-server",
+                                      "-s", output.getPath(), "-frontend", "jaxws", "-client",
"-server",
                                       "org.apache.cxf.tools.fortest.HelloRMI"};
         JavaToWS.main(args);
-        File wsdlFile = new File(output.getPath() + "/tmp.wsdl");
-        assertTrue("wsdl is not generated", wsdlFile.exists());
-        assertTrue("Parameter or return type implemented java.rmi.Remote interface error
should be detected", 
+        assertTrue("Failed to generate WSDL file", wsdlFile.exists());
+        assertTrue("Parameter or return type implemented java.rmi.Remote interface error
should be detected",
                    getStdErr().indexOf("implemented the java.rmi.Remote interface") >
-1);
     }
-    
-    
-    
-    @Ignore
-    
+
+    @Test
     public void testGenServerAndClient() throws Exception {
-        String[] args = new String[] {"-d", output.getPath(), "-client", "-server",
+        File client = outputFile("org/apache/hello_world_soap12_http/GreeterClient.java");
+        File server = outputFile("org/apache/hello_world_soap12_http/GreeterServer.java");
+        File impl = outputFile("org/apache/hello_world_soap12_http/GreeterImpl.java");
+        String[] args = new String[] {"-s", output.getPath(), "-client", "-server",
                                       "org.apache.hello_world_soap12_http.Greeter"};
         JavaToWS.main(args);
-        File client = new File(output.getPath()
-                               + "/org/apache/hello_world_soap12_http/Greeter_GreeterPort_Client.java");
-
-        assertTrue("Client is not generated", client.exists());
+        checkStdErr();
+        assertTrue("Client was not generated", client.exists());
+        assertTrue("Greeter_GreeterPort_Server.java was not generated", server.exists());
+        assertTrue("Impl was not generated", impl.exists());
+        String implContent = FileUtils.getStringFromFile(impl);
+        assertTrue("serviceName annotation was not generated",
+                   implContent.indexOf("serviceName=\"GreeterService\"") > -1);
+    }
 
-        File service = new File(output.getPath() + "/org/apache/hello_world_soap12_http/GreeterService.java");
-        assertTrue("GreeterService is not generated", service.exists());
-        File server = new File(output.getPath()
-                               + "/org/apache/hello_world_soap12_http/Greeter_GreeterPort_Server.java");
-        assertTrue("Greeter_GreeterPort_Server.java is not generated", server.exists());
-    }
-    
-    
-    
-    @Ignore
+    @Test
     public void testGenServerAndImpl() throws Exception {
-        String[] args = new String[] {"-d", output.getPath(), "-impl", "-server",
+        File server = outputFile("org/apache/hello_world_soap12_http/GreeterServer.java");
+        File impl = outputFile("org/apache/hello_world_soap12_http/GreeterImpl.java");
+
+        String[] args = new String[] {"-s", output.getPath(), "-server",
                                       "org.apache.hello_world_soap12_http.Greeter"};
         JavaToWS.main(args);
-
-        File server = new File(output.getPath()
-                               + "/org/apache/hello_world_soap12_http/Greeter_GreeterPort_Server.java");
-        assertTrue("Greeter_GreeterPort_Server.java is not generated", server.exists());
-        
-        
-        File impl = new File(output.getPath()
-                               + "/org/apache/hello_world_soap12_http/GreeterImpl.java");
-        assertTrue("GreeterImpl.java is not generated", impl.exists());
+        checkStdErr();
+        assertTrue("GreeterServer.java was not generated", server.exists());
+        assertTrue("GreeterImpl.java was not generated", impl.exists());
     }
-    
+
     @Test
     public void testGenWrapperBean() throws Exception {
-        String[] args = new String[] {"-d", output.getPath(),
-                                      "-wrapperbean",
-                                      "-impl", "-server",
+        String[] args = new String[] {"-s", output.getPath(), "-wrapperbean", "-server",
                                       "org.apache.cxf.tools.java2ws.fortest.Calculator"};
-        JavaToWS.main(args);        
+        JavaToWS.main(args);
+        checkStdErr();
     }
-    
-    
+
     @Test
     public void testInvalidFlag() throws Exception {
         String[] args = new String[] {"-frontend", "tmp", "-wsdl", "-o", output.getPath()
+ "/tmp.wsdl",
                                       "org.apache.hello_world_soap12_http.Greeter"};
         JavaToWS.main(args);
-        assertTrue("invalid frontend flag should be detected",
-                   getStdErr().indexOf("is not a valid frontend,") > -1);
-
-        File wsdlFile = new File(output.getPath() + "/tmp.wsdl");
-        assertTrue("wsdl is not generated", wsdlFile.exists());
+        assertTrue("invalid frontend flag should be detected", getStdErr()
+            .indexOf("is not a valid frontend,") > -1);
     }
 
     @Test
     public void testInvalidFlag2() throws Exception {
-        String[] args = new String[] {"-frontend", "simple", "-wrapperbean", "-wsdl",
-                                      "-o", output.getPath() + "/tmp.wsdl",
+        String[] args = new String[] {"-frontend", "simple", "-wrapperbean", "-wsdl", "-o",
+                                      output.getPath() + "/tmp.wsdl",
+                                      "org.apache.hello_world_soap12_http.Greeter"};
+        JavaToWS.main(args);
+        assertTrue("wrapperbean flag error should be detected", getStdErr()
+            .indexOf("-wrapperbean is only valid for the jaxws front end.") > -1);
+    }
+
+    @Test
+    public void testInvalidFlag3() throws Exception {
+        String[] args = new String[] {"-databinding", "jaxb", "-frontend", "simple",
+                                      "-wsdl", "-o",
+                                      output.getPath() + "/tmp.wsdl",
                                       "org.apache.hello_world_soap12_http.Greeter"};
         JavaToWS.main(args);
-        assertTrue("wrapperbean flag error should be detected",
-                   getStdErr().indexOf("Wrapperbean only needs to be generated for jaxws
front end") > -1);
-        File wsdlFile = new File(output.getPath() + "/tmp.wsdl");
-        assertTrue("wsdl is not generated", wsdlFile.exists());
+        assertTrue("jaxb databinding warning should be detected", getStdErr()
+                   .indexOf("Simple front end only supports aegis databinding") > -1);
+    }
+
+
+    @Test
+    public void testImplClassWithoutSei() throws Exception {
+        File wsdlFile = outputFile("tmp.wsdl");
+        String[] args = new String[] {"-wsdl", "-o", output.getPath() + "/tmp.wsdl", "-verbose",
"-s",
+                                      output.getPath(), "-frontend", "jaxws", "-client",
"-server",
+                                      "org.apache.cxf.tools.fortest.GreeterImpl"};
+        JavaToWS.main(args);
+        assertTrue("Failed to generate WSDL file", wsdlFile.exists());
+
+        File sei = outputFile("org/apache/cxf/tools/fortest/GreeterImpl_PortType.java");
+        assertTrue("Failed to generate SEI file : GreeterImpl_PortType.java", sei.exists());
+        File client = outputFile("org/apache/cxf/tools/fortest/GreeterImpl_PortTypeClient.java");
+        assertTrue("Failed to generate client file : GreeterImpl_PortTypeClient.java", client.exists());
+        File server = outputFile("org/apache/cxf/tools/fortest/GreeterImpl_PortTypeServer.java");
+        assertTrue("Failed to generate SEI file : GreeterImpl_PortTypeServer.java", server.exists());
+    }
+
+    @Test
+    public void testXmlList() throws Exception {
+        String[] args = new String[] {"-o", output.getPath() + "/xml-list.wsdl", "-verbose",
+                                      "-wsdl", "org.apache.cxf.tools.fortest.xmllist.AddNumbersPortType"};
+        JavaToWS.main(args);
+
+        File file = new File(output.getPath() + "/xml-list.wsdl");
+        String str = FileUtils.getStringFromFile(file);
+        assertTrue("Java2wsdl did not generate xsd:list element",
+                   str.indexOf("<xsd:list  itemType=") > -1);
+
     }
 
+    @Test
+    public void testXmlAttachementRef() throws Exception {
+        String[] args = new String[] {"-o", output.getPath() + "/swa-ref.wsdl", "-verbose",
+                                      "-wsdl", "org.apache.attachment.AddNumbersImpl"};
+        JavaToWS.main(args);
+        File file = new File(output.getPath() + "/AddNumbers.wsdl");
+        String str = FileUtils.getStringFromFile(file);
+        String swaImport = "<xsd:import  namespace=\"http://ws-i.org/profiles/basic/1.1/xsd\""
+            + "  schemaLocation=\"http://ws-i.org/profiles/basic/1.1/swaref.xsd\"";
+
+        assertTrue("Java2wsdl did not generate swaRef type element",
+                   str.indexOf(":swaRef") > -1 && str.indexOf(swaImport) >
-1);
+
+    }
 
 
     protected String getClassPath() throws URISyntaxException {

Modified: incubator/cxf/branches/2.0.x-fixes/tools/javato/ws/src/test/java/org/apache/cxf/tools/java2wsdl/processor/expected/calculator.wsdl
URL: http://svn.apache.org/viewvc/incubator/cxf/branches/2.0.x-fixes/tools/javato/ws/src/test/java/org/apache/cxf/tools/java2wsdl/processor/expected/calculator.wsdl?rev=599763&r1=599762&r2=599763&view=diff
==============================================================================
--- incubator/cxf/branches/2.0.x-fixes/tools/javato/ws/src/test/java/org/apache/cxf/tools/java2wsdl/processor/expected/calculator.wsdl
(original)
+++ incubator/cxf/branches/2.0.x-fixes/tools/javato/ws/src/test/java/org/apache/cxf/tools/java2wsdl/processor/expected/calculator.wsdl
Fri Nov 30 01:57:57 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/branches/2.0.x-fixes/tools/javato/ws/src/test/java/org/apache/cxf/tools/java2wsdl/processor/expected/db.wsdl
URL: http://svn.apache.org/viewvc/incubator/cxf/branches/2.0.x-fixes/tools/javato/ws/src/test/java/org/apache/cxf/tools/java2wsdl/processor/expected/db.wsdl?rev=599763&r1=599762&r2=599763&view=diff
==============================================================================
--- incubator/cxf/branches/2.0.x-fixes/tools/javato/ws/src/test/java/org/apache/cxf/tools/java2wsdl/processor/expected/db.wsdl
(original)
+++ incubator/cxf/branches/2.0.x-fixes/tools/javato/ws/src/test/java/org/apache/cxf/tools/java2wsdl/processor/expected/db.wsdl
Fri Nov 30 01:57:57 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/branches/2.0.x-fixes/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/branches/2.0.x-fixes/tools/javato/ws/src/test/java/org/apache/cxf/tools/java2wsdl/processor/expected/expected_send_image.wsdl?rev=599763&r1=599762&r2=599763&view=diff
==============================================================================
--- incubator/cxf/branches/2.0.x-fixes/tools/javato/ws/src/test/java/org/apache/cxf/tools/java2wsdl/processor/expected/expected_send_image.wsdl
(original)
+++ incubator/cxf/branches/2.0.x-fixes/tools/javato/ws/src/test/java/org/apache/cxf/tools/java2wsdl/processor/expected/expected_send_image.wsdl
Fri Nov 30 01:57:57 2007
@@ -62,7 +62,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/branches/2.0.x-fixes/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/branches/2.0.x-fixes/tools/javato/ws/src/test/java/org/apache/cxf/tools/java2wsdl/processor/expected/expected_send_image2.wsdl?rev=599763&r1=599762&r2=599763&view=diff
==============================================================================
--- incubator/cxf/branches/2.0.x-fixes/tools/javato/ws/src/test/java/org/apache/cxf/tools/java2wsdl/processor/expected/expected_send_image2.wsdl
(original)
+++ incubator/cxf/branches/2.0.x-fixes/tools/javato/ws/src/test/java/org/apache/cxf/tools/java2wsdl/processor/expected/expected_send_image2.wsdl
Fri Nov 30 01:57:57 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/branches/2.0.x-fixes/tools/javato/ws/src/test/java/org/apache/cxf/tools/java2wsdl/processor/expected/hello_soap12.wsdl
URL: http://svn.apache.org/viewvc/incubator/cxf/branches/2.0.x-fixes/tools/javato/ws/src/test/java/org/apache/cxf/tools/java2wsdl/processor/expected/hello_soap12.wsdl?rev=599763&r1=599762&r2=599763&view=diff
==============================================================================
--- incubator/cxf/branches/2.0.x-fixes/tools/javato/ws/src/test/java/org/apache/cxf/tools/java2wsdl/processor/expected/hello_soap12.wsdl
(original)
+++ incubator/cxf/branches/2.0.x-fixes/tools/javato/ws/src/test/java/org/apache/cxf/tools/java2wsdl/processor/expected/hello_soap12.wsdl
Fri Nov 30 01:57:57 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/branches/2.0.x-fixes/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/branches/2.0.x-fixes/tools/javato/ws/src/test/java/org/apache/cxf/tools/java2wsdl/processor/expected/hello_world_fault_expected.wsdl?rev=599763&r1=599762&r2=599763&view=diff
==============================================================================
--- incubator/cxf/branches/2.0.x-fixes/tools/javato/ws/src/test/java/org/apache/cxf/tools/java2wsdl/processor/expected/hello_world_fault_expected.wsdl
(original)
+++ incubator/cxf/branches/2.0.x-fixes/tools/javato/ws/src/test/java/org/apache/cxf/tools/java2wsdl/processor/expected/hello_world_fault_expected.wsdl
Fri Nov 30 01:57:57 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/branches/2.0.x-fixes/tools/javato/ws/src/test/java/org/apache/cxf/tools/java2wsdl/processor/expected/list_expected.wsdl
URL: http://svn.apache.org/viewvc/incubator/cxf/branches/2.0.x-fixes/tools/javato/ws/src/test/java/org/apache/cxf/tools/java2wsdl/processor/expected/list_expected.wsdl?rev=599763&r1=599762&r2=599763&view=diff
==============================================================================
--- incubator/cxf/branches/2.0.x-fixes/tools/javato/ws/src/test/java/org/apache/cxf/tools/java2wsdl/processor/expected/list_expected.wsdl
(original)
+++ incubator/cxf/branches/2.0.x-fixes/tools/javato/ws/src/test/java/org/apache/cxf/tools/java2wsdl/processor/expected/list_expected.wsdl
Fri Nov 30 01:57:57 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/branches/2.0.x-fixes/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/branches/2.0.x-fixes/tools/javato/ws/src/test/java/org/apache/cxf/tools/java2wsdl/processor/expected/my_hello_soap12.wsdl?rev=599763&r1=599762&r2=599763&view=diff
==============================================================================
--- incubator/cxf/branches/2.0.x-fixes/tools/javato/ws/src/test/java/org/apache/cxf/tools/java2wsdl/processor/expected/my_hello_soap12.wsdl
(original)
+++ incubator/cxf/branches/2.0.x-fixes/tools/javato/ws/src/test/java/org/apache/cxf/tools/java2wsdl/processor/expected/my_hello_soap12.wsdl
Fri Nov 30 01:57:57 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/branches/2.0.x-fixes/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/branches/2.0.x-fixes/tools/javato/ws/src/test/java/org/apache/cxf/tools/java2wsdl/processor/expected/rpc-hello-expected.wsdl?rev=599763&r1=599762&r2=599763&view=diff
==============================================================================
--- incubator/cxf/branches/2.0.x-fixes/tools/javato/ws/src/test/java/org/apache/cxf/tools/java2wsdl/processor/expected/rpc-hello-expected.wsdl
(original)
+++ incubator/cxf/branches/2.0.x-fixes/tools/javato/ws/src/test/java/org/apache/cxf/tools/java2wsdl/processor/expected/rpc-hello-expected.wsdl
Fri Nov 30 01:57:57 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/branches/2.0.x-fixes/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/branches/2.0.x-fixes/tools/javato/ws/src/test/java/org/apache/cxf/tools/java2wsdl/processor/expected/xml-bare-expected.wsdl?rev=599763&r1=599762&r2=599763&view=diff
==============================================================================
--- incubator/cxf/branches/2.0.x-fixes/tools/javato/ws/src/test/java/org/apache/cxf/tools/java2wsdl/processor/expected/xml-bare-expected.wsdl
(original)
+++ incubator/cxf/branches/2.0.x-fixes/tools/javato/ws/src/test/java/org/apache/cxf/tools/java2wsdl/processor/expected/xml-bare-expected.wsdl
Fri Nov 30 01:57:57 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