Return-Path: Delivered-To: apmail-cxf-commits-archive@www.apache.org Received: (qmail 63204 invoked from network); 22 Aug 2008 14:12:35 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 22 Aug 2008 14:12:35 -0000 Received: (qmail 81436 invoked by uid 500); 22 Aug 2008 14:12:33 -0000 Delivered-To: apmail-cxf-commits-archive@cxf.apache.org Received: (qmail 81384 invoked by uid 500); 22 Aug 2008 14:12:33 -0000 Mailing-List: contact commits-help@cxf.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@cxf.apache.org Delivered-To: mailing list commits@cxf.apache.org Received: (qmail 81375 invoked by uid 99); 22 Aug 2008 14:12:33 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 22 Aug 2008 07:12:33 -0700 X-ASF-Spam-Status: No, hits=-1998.5 required=10.0 tests=ALL_TRUSTED,WEIRD_PORT X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 22 Aug 2008 14:11:33 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id BA54C23889C2; Fri, 22 Aug 2008 07:12:02 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r688086 - in /cxf/trunk/tools/wsdlto: frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/generators/ frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/template/ test/src/test/java/org/apache/cxf/to... Date: Fri, 22 Aug 2008 14:12:02 -0000 To: commits@cxf.apache.org From: seanoc@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20080822141202.BA54C23889C2@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: seanoc Date: Fri Aug 22 07:12:01 2008 New Revision: 688086 URL: http://svn.apache.org/viewvc?rev=688086&view=rev Log: Fix for https://issues.apache.org/jira/browse/CXF-1048 wsdl2java generating incorrect portName in impl class Added: cxf/trunk/tools/wsdlto/test/src/test/resources/wsdl2java_wsdl/cxf1048/ cxf/trunk/tools/wsdlto/test/src/test/resources/wsdl2java_wsdl/cxf1048/test.wsdl Modified: cxf/trunk/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/generators/ImplGenerator.java cxf/trunk/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/template/server.vm cxf/trunk/tools/wsdlto/test/src/test/java/org/apache/cxf/tools/wsdlto/jaxws/CodeGenBugTest.java Modified: cxf/trunk/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/generators/ImplGenerator.java URL: http://svn.apache.org/viewvc/cxf/trunk/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/generators/ImplGenerator.java?rev=688086&r1=688085&r2=688086&view=diff ============================================================================== --- cxf/trunk/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/generators/ImplGenerator.java (original) +++ cxf/trunk/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/generators/ImplGenerator.java Fri Aug 22 07:12:01 2008 @@ -74,18 +74,23 @@ JavaServiceClass service = null; String port = ""; + Iterator portIterator = null; if (!services.values().isEmpty()) { JavaServiceClass javaservice = services.values().iterator().next(); service = javaservice; - + if (javaservice.getPorts().size() != 0) { - JavaPort jport = (JavaPort)javaservice.getPorts().get(0); - port = jport.getPortName(); + portIterator = javaservice.getPorts().iterator(); } } for (Iterator iter = interfaces.keySet().iterator(); iter.hasNext();) { String interfaceName = (String)iter.next(); JavaInterface intf = interfaces.get(interfaceName); + + if (portIterator != null) { + JavaPort jport = (JavaPort)portIterator.next(); + port = jport.getPortName(); + } clearAttributes(); setAttributes("intf", intf); Modified: cxf/trunk/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/template/server.vm URL: http://svn.apache.org/viewvc/cxf/trunk/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/template/server.vm?rev=688086&r1=688085&r2=688086&view=diff ============================================================================== --- cxf/trunk/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/template/server.vm (original) +++ cxf/trunk/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/template/server.vm Fri Aug 22 07:12:01 2008 @@ -40,7 +40,7 @@ System.out.println("Server ready..."); Thread.sleep(5 * 60 * 1000); - System.out.println("Server exitting"); + System.out.println("Server exiting"); System.exit(0); } } Modified: cxf/trunk/tools/wsdlto/test/src/test/java/org/apache/cxf/tools/wsdlto/jaxws/CodeGenBugTest.java URL: http://svn.apache.org/viewvc/cxf/trunk/tools/wsdlto/test/src/test/java/org/apache/cxf/tools/wsdlto/jaxws/CodeGenBugTest.java?rev=688086&r1=688085&r2=688086&view=diff ============================================================================== --- cxf/trunk/tools/wsdlto/test/src/test/java/org/apache/cxf/tools/wsdlto/jaxws/CodeGenBugTest.java (original) +++ cxf/trunk/tools/wsdlto/test/src/test/java/org/apache/cxf/tools/wsdlto/jaxws/CodeGenBugTest.java Fri Aug 22 07:12:01 2008 @@ -1022,5 +1022,24 @@ clz = classLoader.loadClass("org.apache.cxf.w2j.jaxb_custom_ext.types.Foo2"); assertEquals(1, clz.getDeclaredFields().length); } + + + @Test + public void testCXF1048() throws Exception { + + env.put(ToolConstants.CFG_COMPILE, "compile"); + env.put(ToolConstants.CFG_IMPL, ToolConstants.CFG_IMPL); + env.put(ToolConstants.CFG_OUTPUTDIR, output.getCanonicalPath()); + env.put(ToolConstants.CFG_CLASSDIR, output.getCanonicalPath() + "/classes"); + env.put(ToolConstants.CFG_WSDLURL, getLocation("/wsdl2java_wsdl/cxf1048/test.wsdl")); + processor.setContext(env); + processor.execute(); + Class clz = classLoader.loadClass("org.apache.hello_world_soap_http.PingImpl"); + + WebService webServiceAnn = AnnotationUtil.getPrivClassAnnotation(clz, WebService.class); + assertEquals("org.apache.hello_world_soap_http.Ping", webServiceAnn.endpointInterface()); + assertEquals("GreeterSOAPService", webServiceAnn.serviceName()); + assertEquals("PingSoapPort", webServiceAnn.portName()); + } } Added: cxf/trunk/tools/wsdlto/test/src/test/resources/wsdl2java_wsdl/cxf1048/test.wsdl URL: http://svn.apache.org/viewvc/cxf/trunk/tools/wsdlto/test/src/test/resources/wsdl2java_wsdl/cxf1048/test.wsdl?rev=688086&view=auto ============================================================================== --- cxf/trunk/tools/wsdlto/test/src/test/resources/wsdl2java_wsdl/cxf1048/test.wsdl (added) +++ cxf/trunk/tools/wsdlto/test/src/test/resources/wsdl2java_wsdl/cxf1048/test.wsdl Fri Aug 22 07:12:01 2008 @@ -0,0 +1,199 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file