Return-Path: Delivered-To: apmail-incubator-cxf-commits-archive@locus.apache.org Received: (qmail 46277 invoked from network); 26 Apr 2007 03:45:07 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 26 Apr 2007 03:45:07 -0000 Received: (qmail 47282 invoked by uid 500); 26 Apr 2007 03:45:14 -0000 Delivered-To: apmail-incubator-cxf-commits-archive@incubator.apache.org Received: (qmail 47228 invoked by uid 500); 26 Apr 2007 03:45:13 -0000 Mailing-List: contact cxf-commits-help@incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: cxf-dev@incubator.apache.org Delivered-To: mailing list cxf-commits@incubator.apache.org Received: (qmail 47219 invoked by uid 99); 26 Apr 2007 03:45:13 -0000 Received: from herse.apache.org (HELO herse.apache.org) (140.211.11.133) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 25 Apr 2007 20:45:13 -0700 X-ASF-Spam-Status: No, hits=-99.5 required=10.0 tests=ALL_TRUSTED,NO_REAL_NAME X-Spam-Check-By: apache.org Received: from [140.211.11.3] (HELO eris.apache.org) (140.211.11.3) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 25 Apr 2007 20:45:06 -0700 Received: by eris.apache.org (Postfix, from userid 65534) id C61461A9838; Wed, 25 Apr 2007 20:44:45 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r532594 - in /incubator/cxf/trunk: rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/support/ tools/javato/src/main/java/org/apache/cxf/tools/java2wsdl/processor/ tools/javato/src/main/java/org/apache/cxf/tools/java2wsdl/processor/intern... Date: Thu, 26 Apr 2007 03:44:45 -0000 To: cxf-commits@incubator.apache.org From: mmao@apache.org X-Mailer: svnmailer-1.1.0 Message-Id: <20070426034445.C61461A9838@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: mmao Date: Wed Apr 25 20:44:44 2007 New Revision: 532594 URL: http://svn.apache.org/viewvc?view=rev&rev=532594 Log: CXF-545 Set the serviceName through java2wsdl using the JaxwsServiceFactoryBean Added: incubator/cxf/trunk/tools/javato/src/test/java/org/apache/cxf/tools/java2wsdl/processor/expected/my_hello_soap12.wsdl Modified: incubator/cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/support/JaxWsServiceFactoryBean.java incubator/cxf/trunk/tools/javato/src/main/java/org/apache/cxf/tools/java2wsdl/processor/JavaToProcessor.java incubator/cxf/trunk/tools/javato/src/main/java/org/apache/cxf/tools/java2wsdl/processor/internal/ServiceBuilderFactory.java incubator/cxf/trunk/tools/javato/src/test/java/org/apache/cxf/tools/java2wsdl/processor/JavaToProcessorTest.java Modified: incubator/cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/support/JaxWsServiceFactoryBean.java URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/support/JaxWsServiceFactoryBean.java?view=diff&rev=532594&r1=532593&r2=532594 ============================================================================== --- incubator/cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/support/JaxWsServiceFactoryBean.java (original) +++ incubator/cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/support/JaxWsServiceFactoryBean.java Wed Apr 25 20:44:44 2007 @@ -406,6 +406,7 @@ setDataBinding(new SourceDataBinding()); } else { jaxWsConfiguration = new JaxWsServiceConfiguration(); + jaxWsConfiguration.setServiceFactory(this); getServiceConfigurations().add(0, jaxWsConfiguration); } methodDispatcher = new JAXWSMethodDispatcher(implInfo); Modified: incubator/cxf/trunk/tools/javato/src/main/java/org/apache/cxf/tools/java2wsdl/processor/JavaToProcessor.java URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/tools/javato/src/main/java/org/apache/cxf/tools/java2wsdl/processor/JavaToProcessor.java?view=diff&rev=532594&r1=532593&r2=532594 ============================================================================== --- incubator/cxf/trunk/tools/javato/src/main/java/org/apache/cxf/tools/java2wsdl/processor/JavaToProcessor.java (original) +++ incubator/cxf/trunk/tools/javato/src/main/java/org/apache/cxf/tools/java2wsdl/processor/JavaToProcessor.java Wed Apr 25 20:44:44 2007 @@ -21,6 +21,7 @@ import java.io.File; import java.util.logging.Logger; +import javax.xml.namespace.QName; import javax.xml.ws.BindingType; import javax.xml.ws.soap.SOAPBinding; @@ -32,6 +33,8 @@ import org.apache.cxf.binding.soap.SoapBindingConfiguration; import org.apache.cxf.common.i18n.Message; import org.apache.cxf.common.logging.LogUtils; +import org.apache.cxf.common.util.StringUtils; +import org.apache.cxf.service.factory.ReflectionServiceFactoryBean; import org.apache.cxf.service.model.ServiceInfo; import org.apache.cxf.tools.common.Processor; import org.apache.cxf.tools.common.ToolConstants; @@ -50,6 +53,25 @@ private ToolContext context; public void process() throws ToolException { + ServiceBuilder builder = getServiceBuilder(); + ServiceInfo service = builder.build(); + + File output = getOutputFile(builder.getOutputFile(), + service.getName().getLocalPart() + ".wsdl"); + generate(service, output); + } + + public void generate(ServiceInfo service, File output) throws ToolException { + WSDLGeneratorFactory factory = WSDLGeneratorFactory.getInstance(); + factory.setWSDLVersion(getWSDLVersion()); + + AbstractGenerator generator = factory.newGenerator(); + generator.setAllowImports(context.containsKey(ToolConstants.CFG_CREATE_XSD_IMPORTS)); + generator.setServiceModel(service); + generator.generate(output); + } + + public ServiceBuilder getServiceBuilder() throws ToolException { init(); ServiceBuilderFactory builderFactory = ServiceBuilderFactory.getInstance(); builderFactory.setServiceClass(getServiceClass()); @@ -61,18 +83,16 @@ builder.setBus(getBus()); builder.setBindingConfig(getBindingConfig()); - ServiceInfo service = builder.build(); + ReflectionServiceFactoryBean serviceFactory = builder.getServiceFactory(); - File output = getOutputFile(builder.getOutputFile(), - service.getName().getLocalPart() + ".wsdl"); - - WSDLGeneratorFactory factory = WSDLGeneratorFactory.getInstance(); - factory.setWSDLVersion(getWSDLVersion()); - - AbstractGenerator generator = factory.newGenerator(); - generator.setAllowImports(context.containsKey(ToolConstants.CFG_CREATE_XSD_IMPORTS)); - generator.setServiceModel(service); - generator.generate(output); + if (!StringUtils.isEmpty(getServiceName())) { + QName serviceQName = serviceFactory.getServiceQName(); + if (serviceQName != null) { + serviceFactory.setServiceName(new QName(serviceQName.getNamespaceURI(), getServiceName())); + } + } + + return builder; } protected String getTransportId() { @@ -146,6 +166,10 @@ return wsVersion; } + public String getServiceName() { + return (String) this.context.get(ToolConstants.CFG_SERVICENAME); + } + public Bus getBus() { return BusFactory.getDefaultBus(); } Modified: incubator/cxf/trunk/tools/javato/src/main/java/org/apache/cxf/tools/java2wsdl/processor/internal/ServiceBuilderFactory.java URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/tools/javato/src/main/java/org/apache/cxf/tools/java2wsdl/processor/internal/ServiceBuilderFactory.java?view=diff&rev=532594&r1=532593&r2=532594 ============================================================================== --- incubator/cxf/trunk/tools/javato/src/main/java/org/apache/cxf/tools/java2wsdl/processor/internal/ServiceBuilderFactory.java (original) +++ incubator/cxf/trunk/tools/javato/src/main/java/org/apache/cxf/tools/java2wsdl/processor/internal/ServiceBuilderFactory.java Wed Apr 25 20:44:44 2007 @@ -51,6 +51,7 @@ throw new ToolException("Can not find the ServiceBulider for style: " + s, e); } builder.setServiceClass(serviceClass); + builder.getServiceFactory().setServiceClass(serviceClass); return builder; } Modified: incubator/cxf/trunk/tools/javato/src/test/java/org/apache/cxf/tools/java2wsdl/processor/JavaToProcessorTest.java URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/tools/javato/src/test/java/org/apache/cxf/tools/java2wsdl/processor/JavaToProcessorTest.java?view=diff&rev=532594&r1=532593&r2=532594 ============================================================================== --- incubator/cxf/trunk/tools/javato/src/test/java/org/apache/cxf/tools/java2wsdl/processor/JavaToProcessorTest.java (original) +++ incubator/cxf/trunk/tools/javato/src/test/java/org/apache/cxf/tools/java2wsdl/processor/JavaToProcessorTest.java Wed Apr 25 20:44:44 2007 @@ -154,15 +154,37 @@ @Test public void testDataBase() throws Exception { - ToolContext context = new ToolContext(); - context.put(ToolConstants.CFG_CLASSNAME, "org.apache.cxf.tools.fortest.cxf523.Database"); - context.put(ToolConstants.CFG_OUTPUTFILE, output.getPath() + "/db.wsdl"); + env.put(ToolConstants.CFG_CLASSNAME, "org.apache.cxf.tools.fortest.cxf523.Database"); + env.put(ToolConstants.CFG_OUTPUTFILE, output.getPath() + "/db.wsdl"); - processor.setEnvironment(context); + processor.setEnvironment(env); processor.process(); String expectedFile = getClass().getResource("expected/db.wsdl").getFile(); assertFileEquals(new File(expectedFile), new File(output, "db.wsdl")); } + @Test + public void testGetServiceName() throws Exception { + processor.setEnvironment(env); + assertNull(processor.getServiceName()); + + env.put(ToolConstants.CFG_SERVICENAME, "myservice"); + processor.setEnvironment(env); + assertEquals("myservice", processor.getServiceName()); + } + + @Test + public void testSetServiceName() throws Exception { + env.put(ToolConstants.CFG_CLASSNAME, "org.apache.hello_world_soap12_http.Greeter"); + env.put(ToolConstants.CFG_SOAP12, "soap12"); + env.put(ToolConstants.CFG_OUTPUTFILE, output.getPath() + "/my_hello_soap12.wsdl"); + env.put(ToolConstants.CFG_SERVICENAME, "MyService"); + + processor.setEnvironment(env); + processor.process(); + + String expectedFile = getClass().getResource("expected/my_hello_soap12.wsdl").getFile(); + assertFileEquals(new File(expectedFile), new File(output, "my_hello_soap12.wsdl")); + } } Added: incubator/cxf/trunk/tools/javato/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/src/test/java/org/apache/cxf/tools/java2wsdl/processor/expected/my_hello_soap12.wsdl?view=auto&rev=532594 ============================================================================== --- incubator/cxf/trunk/tools/javato/src/test/java/org/apache/cxf/tools/java2wsdl/processor/expected/my_hello_soap12.wsdl (added) +++ incubator/cxf/trunk/tools/javato/src/test/java/org/apache/cxf/tools/java2wsdl/processor/expected/my_hello_soap12.wsdl Wed Apr 25 20:44:44 2007 @@ -0,0 +1,96 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +