Return-Path: Delivered-To: apmail-incubator-cxf-commits-archive@locus.apache.org Received: (qmail 58649 invoked from network); 18 Jun 2007 12:52:21 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 18 Jun 2007 12:52:21 -0000 Received: (qmail 71770 invoked by uid 500); 18 Jun 2007 12:52:24 -0000 Delivered-To: apmail-incubator-cxf-commits-archive@incubator.apache.org Received: (qmail 71654 invoked by uid 500); 18 Jun 2007 12:52:24 -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 71644 invoked by uid 99); 18 Jun 2007 12:52:23 -0000 Received: from herse.apache.org (HELO herse.apache.org) (140.211.11.133) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 18 Jun 2007 05:52:23 -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; Mon, 18 Jun 2007 05:52:19 -0700 Received: by eris.apache.org (Postfix, from userid 65534) id 28C101A981A; Mon, 18 Jun 2007 05:51:59 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r548344 - in /incubator/cxf/trunk: rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/ rt/frontend/simple/src/main/java/org/apache/cxf/service/factory/ tools/javato/test/ tools/javato/test/src/test/java/org/apache/cxf/tools/java2wsdl/proc... Date: Mon, 18 Jun 2007 12:51:56 -0000 To: cxf-commits@incubator.apache.org From: ema@apache.org X-Mailer: svnmailer-1.1.0 Message-Id: <20070618125159.28C101A981A@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: ema Date: Mon Jun 18 05:51:55 2007 New Revision: 548344 URL: http://svn.apache.org/viewvc?view=rev&rev=548344 Log: Fixed issue CXF-738 Added: incubator/cxf/trunk/tools/javato/test/src/test/java/org/apache/cxf/tools/java2wsdl/processor/expected/rpc-hello-expected.wsdl incubator/cxf/trunk/tools/javato/test/src/test/java/org/apache/cxf/tools/java2wsdl/processor/expected/xml-bare-expected.wsdl incubator/cxf/trunk/tools/javato/test/src/test/resources/java2wsdl_wsdl/hello_world_bare.wsdl Modified: incubator/cxf/trunk/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/CodeFirstTest.java incubator/cxf/trunk/rt/frontend/simple/src/main/java/org/apache/cxf/service/factory/ReflectionServiceFactoryBean.java incubator/cxf/trunk/tools/javato/test/pom.xml incubator/cxf/trunk/tools/javato/test/src/test/java/org/apache/cxf/tools/java2wsdl/processor/JavaToProcessorTest.java incubator/cxf/trunk/tools/javato/test/src/test/java/org/apache/cxf/tools/java2wsdl/processor/internal/jaxws/JaxwsServiceBuilderTest.java incubator/cxf/trunk/tools/javato/test/src/test/java/org/apache/cxf/tools/java2wsdl/processor/internal/jaxws/expected/expected_holder.wsdl Modified: incubator/cxf/trunk/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/CodeFirstTest.java URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/CodeFirstTest.java?view=diff&rev=548344&r1=548343&r2=548344 ============================================================================== --- incubator/cxf/trunk/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/CodeFirstTest.java (original) +++ incubator/cxf/trunk/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/CodeFirstTest.java Mon Jun 18 05:51:55 2007 @@ -84,7 +84,9 @@ assertValid("/wsdl:definitions/wsdl:binding/wsdl:operation[@name='getGreetings']" + "/wsdlsoap:operation[@soapAction='myaction']", - wsdl); + wsdl); + + } @Test @@ -280,6 +282,9 @@ assertValid("//xsd:schema[@targetNamespace='http://namespace3']", doc); assertValid("//xsd:schema[@targetNamespace='http://namespace5']", doc); + + assertValid("//xsd:element[@name='FooEcho2HeaderRequest'][1]", doc); + assertInvalid("//xsd:element[@name='FooEcho2HeaderRequest'][2]", doc); } @Test @@ -297,5 +302,5 @@ assertValid("//xsd:schema[@targetNamespace='http://namespace3']", doc); assertValid("//xsd:schema[@targetNamespace='http://namespace5']", doc); } - + } Modified: incubator/cxf/trunk/rt/frontend/simple/src/main/java/org/apache/cxf/service/factory/ReflectionServiceFactoryBean.java URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/frontend/simple/src/main/java/org/apache/cxf/service/factory/ReflectionServiceFactoryBean.java?view=diff&rev=548344&r1=548343&r2=548344 ============================================================================== --- incubator/cxf/trunk/rt/frontend/simple/src/main/java/org/apache/cxf/service/factory/ReflectionServiceFactoryBean.java (original) +++ incubator/cxf/trunk/rt/frontend/simple/src/main/java/org/apache/cxf/service/factory/ReflectionServiceFactoryBean.java Mon Jun 18 05:51:55 2007 @@ -468,8 +468,9 @@ XmlSchemaElement el = new XmlSchemaElement(); el.setQName(mpi.getElementQName()); el.setName(mpi.getElementQName().getLocalPart()); - schema.getItems().add(el); - + if (!isExistSchemaElement(schema, mpi.getElementQName())) { + schema.getItems().add(el); + } el.setMinOccurs(1); el.setMaxOccurs(0); el.setNillable(true); @@ -557,7 +558,10 @@ XmlSchemaElement el = new XmlSchemaElement(); el.setQName(qname); el.setName(qname.getLocalPart()); - schema.getItems().add(el); + + if (!isExistSchemaElement(schema, qname)) { + schema.getItems().add(el); + } el.setMinOccurs(1); el.setMaxOccurs(0); Modified: incubator/cxf/trunk/tools/javato/test/pom.xml URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/tools/javato/test/pom.xml?view=diff&rev=548344&r1=548343&r2=548344 ============================================================================== --- incubator/cxf/trunk/tools/javato/test/pom.xml (original) +++ incubator/cxf/trunk/tools/javato/test/pom.xml Mon Jun 18 05:51:55 2007 @@ -165,7 +165,9 @@ ${basedir}/src/test/resources/java2wsdl_wsdl/hello_world_soap12.wsdl - + + ${basedir}/src/test/resources/java2wsdl_wsdl/hello_world_bare.wsdl + Modified: incubator/cxf/trunk/tools/javato/test/src/test/java/org/apache/cxf/tools/java2wsdl/processor/JavaToProcessorTest.java URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/tools/javato/test/src/test/java/org/apache/cxf/tools/java2wsdl/processor/JavaToProcessorTest.java?view=diff&rev=548344&r1=548343&r2=548344 ============================================================================== --- incubator/cxf/trunk/tools/javato/test/src/test/java/org/apache/cxf/tools/java2wsdl/processor/JavaToProcessorTest.java (original) +++ incubator/cxf/trunk/tools/javato/test/src/test/java/org/apache/cxf/tools/java2wsdl/processor/JavaToProcessorTest.java Mon Jun 18 05:51:55 2007 @@ -287,6 +287,37 @@ assertTrue(requestWrapperClass.exists()); assertTrue(responseWrapperClass.exists()); } + + @Test + public void testRPCHello() throws Exception { + env.put(ToolConstants.CFG_OUTPUTFILE, output.getPath() + "/rpc-hello.wsdl"); + env.put(ToolConstants.CFG_CLASSNAME, "org.apache.cxf.tools.fortest.RPCHello"); + processor.setEnvironment(env); + processor.process(); + + File wsdlFile = new File(output, "rpc-hello.wsdl"); + assertTrue("Generate Wsdl Fail", wsdlFile.exists()); + String expectedFile = getClass().getResource("expected/rpc-hello-expected.wsdl").getFile(); + assertFileEquals(new File(expectedFile), new File(output, "rpc-hello.wsdl")); + + } + + + @Test + public void testXMlBare() { + env.put(ToolConstants.CFG_OUTPUTFILE, output.getPath() + "/xml-bare.wsdl"); + env.put(ToolConstants.CFG_CLASSNAME, "org.apache.xml_bare.Greeter"); + processor.setEnvironment(env); + processor.process(); + + File wsdlFile = new File(output, "xml-bare.wsdl"); + assertTrue("Generate Wsdl Fail", wsdlFile.exists()); + String expectedFile = getClass().getResource("expected/xml-bare-expected.wsdl").getFile(); + assertFileEquals(new File(expectedFile), new File(output, "/xml-bare.wsdl")); + + } + + @Test public void testResumeClasspath() throws Exception { @@ -305,20 +336,6 @@ } - public void testRPCHello() throws Exception { - env.put(ToolConstants.CFG_OUTPUTFILE, output.getPath() + "/rpc-hello.wsdl"); - env.put(ToolConstants.CFG_CLASSNAME, "org.apache.cxf.tools.fortest.RPCHello"); - processor.setEnvironment(env); - processor.process(); - - File wsdlFile = new File(output, "rpc-hello.wsdl"); - assertTrue("Generate Wsdl Fail", wsdlFile.exists()); - - - String expectedFile = getClass().getResource("expected/rpc_hello.wsdl").getFile(); - assertFileEquals(new File(expectedFile), new File(output, "rpc-hello.wsdl")); - - } Added: incubator/cxf/trunk/tools/javato/test/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/test/src/test/java/org/apache/cxf/tools/java2wsdl/processor/expected/rpc-hello-expected.wsdl?view=auto&rev=548344 ============================================================================== --- incubator/cxf/trunk/tools/javato/test/src/test/java/org/apache/cxf/tools/java2wsdl/processor/expected/rpc-hello-expected.wsdl (added) +++ incubator/cxf/trunk/tools/javato/test/src/test/java/org/apache/cxf/tools/java2wsdl/processor/expected/rpc-hello-expected.wsdl Mon Jun 18 05:51:55 2007 @@ -0,0 +1,54 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Added: incubator/cxf/trunk/tools/javato/test/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/test/src/test/java/org/apache/cxf/tools/java2wsdl/processor/expected/xml-bare-expected.wsdl?view=auto&rev=548344 ============================================================================== --- incubator/cxf/trunk/tools/javato/test/src/test/java/org/apache/cxf/tools/java2wsdl/processor/expected/xml-bare-expected.wsdl (added) +++ incubator/cxf/trunk/tools/javato/test/src/test/java/org/apache/cxf/tools/java2wsdl/processor/expected/xml-bare-expected.wsdl Mon Jun 18 05:51:55 2007 @@ -0,0 +1,142 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Modified: incubator/cxf/trunk/tools/javato/test/src/test/java/org/apache/cxf/tools/java2wsdl/processor/internal/jaxws/JaxwsServiceBuilderTest.java URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/tools/javato/test/src/test/java/org/apache/cxf/tools/java2wsdl/processor/internal/jaxws/JaxwsServiceBuilderTest.java?view=diff&rev=548344&r1=548343&r2=548344 ============================================================================== --- incubator/cxf/trunk/tools/javato/test/src/test/java/org/apache/cxf/tools/java2wsdl/processor/internal/jaxws/JaxwsServiceBuilderTest.java (original) +++ incubator/cxf/trunk/tools/javato/test/src/test/java/org/apache/cxf/tools/java2wsdl/processor/internal/jaxws/JaxwsServiceBuilderTest.java Mon Jun 18 05:51:55 2007 @@ -148,9 +148,6 @@ } @Test - @Ignore("Duplicate header elements") - //FIXME: CXF-564, generated wsdl is invalid - - //"invalid XML schema: "header" must refer to an existing element" public void testHolder() throws Exception { builder.setServiceClass(org.apache.cxf.tools.fortest.holder.HolderService.class); ServiceInfo service = builder.createService(); @@ -161,8 +158,7 @@ generator.generate(output); assertTrue(output.exists()); - String expectedFile = this.getClass() - .getResource("expected/expected_holder.wsdl").getFile(); + String expectedFile = this.getClass().getResource("expected/expected_holder.wsdl").getFile(); assertFileEquals(expectedFile, output.getAbsolutePath()); } Modified: incubator/cxf/trunk/tools/javato/test/src/test/java/org/apache/cxf/tools/java2wsdl/processor/internal/jaxws/expected/expected_holder.wsdl URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/tools/javato/test/src/test/java/org/apache/cxf/tools/java2wsdl/processor/internal/jaxws/expected/expected_holder.wsdl?view=diff&rev=548344&r1=548343&r2=548344 ============================================================================== --- incubator/cxf/trunk/tools/javato/test/src/test/java/org/apache/cxf/tools/java2wsdl/processor/internal/jaxws/expected/expected_holder.wsdl (original) +++ incubator/cxf/trunk/tools/javato/test/src/test/java/org/apache/cxf/tools/java2wsdl/processor/internal/jaxws/expected/expected_holder.wsdl Mon Jun 18 05:51:55 2007 @@ -1,3 +1,4 @@ + - Added: incubator/cxf/trunk/tools/javato/test/src/test/resources/java2wsdl_wsdl/hello_world_bare.wsdl URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/tools/javato/test/src/test/resources/java2wsdl_wsdl/hello_world_bare.wsdl?view=auto&rev=548344 ============================================================================== --- incubator/cxf/trunk/tools/javato/test/src/test/resources/java2wsdl_wsdl/hello_world_bare.wsdl (added) +++ incubator/cxf/trunk/tools/javato/test/src/test/resources/java2wsdl_wsdl/hello_world_bare.wsdl Mon Jun 18 05:51:55 2007 @@ -0,0 +1,133 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +