Return-Path: X-Original-To: apmail-cxf-commits-archive@www.apache.org Delivered-To: apmail-cxf-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id B04534DAF for ; Wed, 25 May 2011 18:42:43 +0000 (UTC) Received: (qmail 47955 invoked by uid 500); 25 May 2011 18:42:43 -0000 Delivered-To: apmail-cxf-commits-archive@cxf.apache.org Received: (qmail 47896 invoked by uid 500); 25 May 2011 18:42:43 -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 47889 invoked by uid 99); 25 May 2011 18:42:43 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 25 May 2011 18:42:43 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED 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; Wed, 25 May 2011 18:42:41 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 502DD2388A19; Wed, 25 May 2011 18:42:21 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1127624 - in /cxf/trunk/systests/databinding/src/test: java/org/apache/cxf/systest/jibx/ java/org/apache/cxf/systest/xmlbeans/ resources/wsdl_systest_databinding/jibx/ resources/wsdl_systest_databinding/xmlbeans/ Date: Wed, 25 May 2011 18:42:21 -0000 To: commits@cxf.apache.org From: dkulp@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20110525184221.502DD2388A19@eris.apache.org> Author: dkulp Date: Wed May 25 18:42:20 2011 New Revision: 1127624 URL: http://svn.apache.org/viewvc?rev=1127624&view=rev Log: [CXF-3467] Make sure the jibx and xmlbeans classes are generated into different packages as they map the underscores differently which is ok on unix/linux, but can cause issues on Windows. Modified: cxf/trunk/systests/databinding/src/test/java/org/apache/cxf/systest/jibx/ClientServerJibxTest.java cxf/trunk/systests/databinding/src/test/java/org/apache/cxf/systest/jibx/GreeterImpl.java cxf/trunk/systests/databinding/src/test/java/org/apache/cxf/systest/jibx/cxf.xml cxf/trunk/systests/databinding/src/test/java/org/apache/cxf/systest/xmlbeans/ClientServerXmlBeansTest.java cxf/trunk/systests/databinding/src/test/java/org/apache/cxf/systest/xmlbeans/GreeterImpl.java cxf/trunk/systests/databinding/src/test/java/org/apache/cxf/systest/xmlbeans/cxf.xml cxf/trunk/systests/databinding/src/test/java/org/apache/cxf/systest/xmlbeans/cxf_no_wsdl.xml cxf/trunk/systests/databinding/src/test/resources/wsdl_systest_databinding/jibx/hello_world.wsdl cxf/trunk/systests/databinding/src/test/resources/wsdl_systest_databinding/xmlbeans/hello_world.wsdl Modified: cxf/trunk/systests/databinding/src/test/java/org/apache/cxf/systest/jibx/ClientServerJibxTest.java URL: http://svn.apache.org/viewvc/cxf/trunk/systests/databinding/src/test/java/org/apache/cxf/systest/jibx/ClientServerJibxTest.java?rev=1127624&r1=1127623&r2=1127624&view=diff ============================================================================== --- cxf/trunk/systests/databinding/src/test/java/org/apache/cxf/systest/jibx/ClientServerJibxTest.java (original) +++ cxf/trunk/systests/databinding/src/test/java/org/apache/cxf/systest/jibx/ClientServerJibxTest.java Wed May 25 18:42:20 2011 @@ -39,11 +39,11 @@ import org.apache.cxf.jibx.doclitbare.ty import org.apache.cxf.jibx.doclitbare.types.StringRespType; import org.apache.cxf.testutil.common.AbstractBusClientServerTestBase; import org.apache.cxf.testutil.common.TestUtil; -import org.apache.hello_world_soap_http.jibx.GreetMeFault; -import org.apache.hello_world_soap_http.jibx.Greeter; -import org.apache.hello_world_soap_http.jibx.PingMeFault; -import org.apache.hello_world_soap_http.jibx.SOAPService; -import org.apache.helloworldsoaphttp.jibx.types.FaultDetail; +import org.apache.hello_world_soap_http_jibx.jibx.GreetMeFault; +import org.apache.hello_world_soap_http_jibx.jibx.Greeter; +import org.apache.hello_world_soap_http_jibx.jibx.PingMeFault; +import org.apache.hello_world_soap_http_jibx.jibx.SOAPService; +import org.apache.helloworldsoaphttpjibx.jibx.types.FaultDetail; import org.junit.BeforeClass; import org.junit.Test; @@ -55,7 +55,7 @@ public class ClientServerJibxTest extend static final String WSDL_PORT = TestUtil.getPortNumber(Server.class); private static final QName SERVICE_NAME - = new QName("http://apache.org/hello_world_soap_http/jibx", "SOAPService"); + = new QName("http://apache.org/hello_world_soap_http_jibx/jibx", "SOAPService"); private static final QName DOC_LIT_BARE_SERVICE = new QName("http://cxf.apache.org/jibx/doc_lit_bare", "SOAPService"); Modified: cxf/trunk/systests/databinding/src/test/java/org/apache/cxf/systest/jibx/GreeterImpl.java URL: http://svn.apache.org/viewvc/cxf/trunk/systests/databinding/src/test/java/org/apache/cxf/systest/jibx/GreeterImpl.java?rev=1127624&r1=1127623&r2=1127624&view=diff ============================================================================== --- cxf/trunk/systests/databinding/src/test/java/org/apache/cxf/systest/jibx/GreeterImpl.java (original) +++ cxf/trunk/systests/databinding/src/test/java/org/apache/cxf/systest/jibx/GreeterImpl.java Wed May 25 18:42:20 2011 @@ -22,14 +22,14 @@ package org.apache.cxf.systest.jibx; import java.util.logging.Logger; import org.apache.cxf.common.logging.LogUtils; -import org.apache.hello_world_soap_http.jibx.GreetMeFault; -import org.apache.hello_world_soap_http.jibx.Greeter; -import org.apache.hello_world_soap_http.jibx.PingMeFault; -import org.apache.helloworldsoaphttp.jibx.types.FaultDetail; +import org.apache.hello_world_soap_http_jibx.jibx.GreetMeFault; +import org.apache.hello_world_soap_http_jibx.jibx.Greeter; +import org.apache.hello_world_soap_http_jibx.jibx.PingMeFault; +import org.apache.helloworldsoaphttpjibx.jibx.types.FaultDetail; @javax.jws.WebService(portName = "SoapPort", serviceName = "SOAPService", - targetNamespace = "http://apache.org/hello_world_soap_http/jibx", - endpointInterface = "org.apache.hello_world_soap_http.jibx.Greeter") + targetNamespace = "http://apache.org/hello_world_soap_http_jibx/jibx", + endpointInterface = "org.apache.hello_world_soap_http_jibx.jibx.Greeter") public class GreeterImpl implements Greeter { private static final Logger LOG = LogUtils.getL7dLogger(GreeterImpl.class); @@ -39,8 +39,8 @@ public class GreeterImpl implements Gree */ public String greetMe(String me) throws GreetMeFault { if ("fault".equals(me)) { - org.apache.helloworldsoaphttp.jibx.types.GreetMeFaultDetail detail - = new org.apache.helloworldsoaphttp.jibx.types.GreetMeFaultDetail(); + org.apache.helloworldsoaphttpjibx.jibx.types.GreetMeFaultDetail detail + = new org.apache.helloworldsoaphttpjibx.jibx.types.GreetMeFaultDetail(); detail.setGreetMeFaultDetail("Some fault detail"); throw new GreetMeFault("Fault String", detail); } Modified: cxf/trunk/systests/databinding/src/test/java/org/apache/cxf/systest/jibx/cxf.xml URL: http://svn.apache.org/viewvc/cxf/trunk/systests/databinding/src/test/java/org/apache/cxf/systest/jibx/cxf.xml?rev=1127624&r1=1127623&r2=1127624&view=diff ============================================================================== --- cxf/trunk/systests/databinding/src/test/java/org/apache/cxf/systest/jibx/cxf.xml (original) +++ cxf/trunk/systests/databinding/src/test/java/org/apache/cxf/systest/jibx/cxf.xml Wed May 25 18:42:20 2011 @@ -27,14 +27,14 @@ http://cxf.apache.org/core http://cxf.ap http://cxf.apache.org/jaxws http://cxf.apache.org/schemas/jaxws.xsd"> - - Modified: cxf/trunk/systests/databinding/src/test/java/org/apache/cxf/systest/xmlbeans/ClientServerXmlBeansTest.java URL: http://svn.apache.org/viewvc/cxf/trunk/systests/databinding/src/test/java/org/apache/cxf/systest/xmlbeans/ClientServerXmlBeansTest.java?rev=1127624&r1=1127623&r2=1127624&view=diff ============================================================================== --- cxf/trunk/systests/databinding/src/test/java/org/apache/cxf/systest/xmlbeans/ClientServerXmlBeansTest.java (original) +++ cxf/trunk/systests/databinding/src/test/java/org/apache/cxf/systest/xmlbeans/ClientServerXmlBeansTest.java Wed May 25 18:42:20 2011 @@ -49,12 +49,12 @@ import org.apache.cxf.xmlbeans.docLitBar import org.apache.cxf.xmlbeans.docLitBare.types.StringRespTypeDocument; import org.apache.cxf.xmlbeans.docLitBare.types.TradePriceData; import org.apache.cxf.xmlbeans.doc_lit_bare.PutLastTradedPricePortType; -import org.apache.helloWorldSoapHttp.xmlbeans.types.FaultDetailDocument; -import org.apache.helloWorldSoapHttp.xmlbeans.types.FaultDetailDocument.FaultDetail; -import org.apache.hello_world_soap_http.xmlbeans.GreetMeFault; -import org.apache.hello_world_soap_http.xmlbeans.Greeter; -import org.apache.hello_world_soap_http.xmlbeans.PingMeFault; -import org.apache.hello_world_soap_http.xmlbeans.SOAPService; +import org.apache.helloWorldSoapHttpXmlbeans.xmlbeans.types.FaultDetailDocument; +import org.apache.helloWorldSoapHttpXmlbeans.xmlbeans.types.FaultDetailDocument.FaultDetail; +import org.apache.hello_world_soap_http_xmlbeans.xmlbeans.GreetMeFault; +import org.apache.hello_world_soap_http_xmlbeans.xmlbeans.Greeter; +import org.apache.hello_world_soap_http_xmlbeans.xmlbeans.PingMeFault; +import org.apache.hello_world_soap_http_xmlbeans.xmlbeans.SOAPService; import org.junit.BeforeClass; import org.junit.Test; @@ -67,7 +67,7 @@ public class ClientServerXmlBeansTest ex static final String NOWSDL_PORT = TestUtil.getPortNumber(ServerNoWsdl.class); private static final QName SERVICE_NAME - = new QName("http://apache.org/hello_world_soap_http/xmlbeans", "SOAPService"); + = new QName("http://apache.org/hello_world_soap_http_xmlbeans/xmlbeans", "SOAPService"); private static final QName DOC_LIT_BARE_SERVICE = new QName("http://cxf.apache.org/xmlbeans/doc_lit_bare", "SOAPService"); @@ -179,7 +179,7 @@ public class ClientServerXmlBeansTest ex assertNotNull("We should have found the WSDL here. " , wsdl); SOAPService ss = new SOAPService(wsdl, SERVICE_NAME); - QName soapPort = new QName("http://apache.org/hello_world_soap_http/xmlbeans", "SoapPort"); + QName soapPort = new QName("http://apache.org/hello_world_soap_http_xmlbeans/xmlbeans", "SoapPort"); ss.addPort(soapPort, SOAPBinding.SOAP11HTTP_BINDING, "http://localhost:" + NOWSDL_PORT + "/SoapContext/SoapPort"); Greeter port = ss.getPort(soapPort, Greeter.class); @@ -228,7 +228,7 @@ public class ClientServerXmlBeansTest ex assertNotNull("We should have found the WSDL here. " , wsdl); SOAPService ss = new SOAPService(wsdl, SERVICE_NAME); - QName soapPort = new QName("http://apache.org/hello_world_soap_http/xmlbeans", "SoapPort"); + QName soapPort = new QName("http://apache.org/hello_world_soap_http_xmlbeans/xmlbeans", "SoapPort"); ss.addPort(soapPort, SOAPBinding.SOAP11HTTP_BINDING, "http://localhost:" + NOWSDL_PORT + "/SoapContext/SoapPort"); Greeter port = ss.getPort(soapPort, Greeter.class); @@ -236,14 +236,15 @@ public class ClientServerXmlBeansTest ex Client client = ClientProxy.getClient(port); List
headers = new ArrayList
(); - org.apache.helloWorldSoapHttp.xmlbeans.types.GreetMeDocument doc - = org.apache.helloWorldSoapHttp.xmlbeans.types.GreetMeDocument.Factory.newInstance(); + org.apache.helloWorldSoapHttpXmlbeans.xmlbeans.types.GreetMeDocument doc + = org.apache.helloWorldSoapHttpXmlbeans.xmlbeans.types.GreetMeDocument.Factory.newInstance(); doc.addNewGreetMe().setRequestType("doc format header"); Header head = new Header(new QName("", "doc"), doc, client.getEndpoint().getService().getDataBinding()); headers.add(head); - org.apache.helloWorldSoapHttp.xmlbeans.types.GreetMeDocument.GreetMe gm - = org.apache.helloWorldSoapHttp.xmlbeans.types.GreetMeDocument.GreetMe.Factory.newInstance(); + org.apache.helloWorldSoapHttpXmlbeans.xmlbeans.types.GreetMeDocument.GreetMe gm + = org.apache.helloWorldSoapHttpXmlbeans.xmlbeans.types + .GreetMeDocument.GreetMe.Factory.newInstance(); gm.setRequestType("non-doc format header"); head = new Header(new QName("http://somenamespace.com", "nondocheader"), gm, client.getEndpoint().getService().getDataBinding()); Modified: cxf/trunk/systests/databinding/src/test/java/org/apache/cxf/systest/xmlbeans/GreeterImpl.java URL: http://svn.apache.org/viewvc/cxf/trunk/systests/databinding/src/test/java/org/apache/cxf/systest/xmlbeans/GreeterImpl.java?rev=1127624&r1=1127623&r2=1127624&view=diff ============================================================================== --- cxf/trunk/systests/databinding/src/test/java/org/apache/cxf/systest/xmlbeans/GreeterImpl.java (original) +++ cxf/trunk/systests/databinding/src/test/java/org/apache/cxf/systest/xmlbeans/GreeterImpl.java Wed May 25 18:42:20 2011 @@ -22,15 +22,15 @@ package org.apache.cxf.systest.xmlbeans; import java.util.logging.Logger; import org.apache.cxf.common.logging.LogUtils; -import org.apache.helloWorldSoapHttp.xmlbeans.types.FaultDetailDocument; -import org.apache.helloWorldSoapHttp.xmlbeans.types.FaultDetailDocument.FaultDetail; -import org.apache.hello_world_soap_http.xmlbeans.GreetMeFault; -import org.apache.hello_world_soap_http.xmlbeans.Greeter; -import org.apache.hello_world_soap_http.xmlbeans.PingMeFault; +import org.apache.helloWorldSoapHttpXmlbeans.xmlbeans.types.FaultDetailDocument; +import org.apache.helloWorldSoapHttpXmlbeans.xmlbeans.types.FaultDetailDocument.FaultDetail; +import org.apache.hello_world_soap_http_xmlbeans.xmlbeans.GreetMeFault; +import org.apache.hello_world_soap_http_xmlbeans.xmlbeans.Greeter; +import org.apache.hello_world_soap_http_xmlbeans.xmlbeans.PingMeFault; @javax.jws.WebService(portName = "SoapPort", serviceName = "SOAPService", - targetNamespace = "http://apache.org/hello_world_soap_http/xmlbeans", - endpointInterface = "org.apache.hello_world_soap_http.xmlbeans.Greeter") + targetNamespace = "http://apache.org/hello_world_soap_http_xmlbeans/xmlbeans", + endpointInterface = "org.apache.hello_world_soap_http_xmlbeans.xmlbeans.Greeter") public class GreeterImpl implements Greeter { private static final Logger LOG = LogUtils.getL7dLogger(GreeterImpl.class); @@ -40,8 +40,8 @@ public class GreeterImpl implements Gree */ public String greetMe(String me) throws GreetMeFault { if ("fault".equals(me)) { - org.apache.helloWorldSoapHttp.xmlbeans.types.GreetMeFaultDetailDocument detail - = org.apache.helloWorldSoapHttp.xmlbeans.types.GreetMeFaultDetailDocument.Factory + org.apache.helloWorldSoapHttpXmlbeans.xmlbeans.types.GreetMeFaultDetailDocument detail + = org.apache.helloWorldSoapHttpXmlbeans.xmlbeans.types.GreetMeFaultDetailDocument.Factory .newInstance(); detail.setGreetMeFaultDetail("Some fault detail"); throw new GreetMeFault("Fault String", detail); @@ -68,7 +68,8 @@ public class GreeterImpl implements Gree public void pingMe() throws PingMeFault { // here we need to put the FaultDetail into the FaultDetailDocument FaultDetailDocument faultDocument = - org.apache.helloWorldSoapHttp.xmlbeans.types.FaultDetailDocument.Factory.newInstance(); + org.apache.helloWorldSoapHttpXmlbeans.xmlbeans.types.FaultDetailDocument + .Factory.newInstance(); FaultDetail faultDetail = faultDocument.addNewFaultDetail(); faultDetail.setMajor((short)2); faultDetail.setMinor((short)1); Modified: cxf/trunk/systests/databinding/src/test/java/org/apache/cxf/systest/xmlbeans/cxf.xml URL: http://svn.apache.org/viewvc/cxf/trunk/systests/databinding/src/test/java/org/apache/cxf/systest/xmlbeans/cxf.xml?rev=1127624&r1=1127623&r2=1127624&view=diff ============================================================================== --- cxf/trunk/systests/databinding/src/test/java/org/apache/cxf/systest/xmlbeans/cxf.xml (original) +++ cxf/trunk/systests/databinding/src/test/java/org/apache/cxf/systest/xmlbeans/cxf.xml Wed May 25 18:42:20 2011 @@ -27,14 +27,14 @@ http://cxf.apache.org/core http://cxf.ap http://cxf.apache.org/jaxws http://cxf.apache.org/schemas/jaxws.xsd"> - - Modified: cxf/trunk/systests/databinding/src/test/java/org/apache/cxf/systest/xmlbeans/cxf_no_wsdl.xml URL: http://svn.apache.org/viewvc/cxf/trunk/systests/databinding/src/test/java/org/apache/cxf/systest/xmlbeans/cxf_no_wsdl.xml?rev=1127624&r1=1127623&r2=1127624&view=diff ============================================================================== --- cxf/trunk/systests/databinding/src/test/java/org/apache/cxf/systest/xmlbeans/cxf_no_wsdl.xml (original) +++ cxf/trunk/systests/databinding/src/test/java/org/apache/cxf/systest/xmlbeans/cxf_no_wsdl.xml Wed May 25 18:42:20 2011 @@ -28,14 +28,14 @@ http://cxf.apache.org/jaxws http://cxf.a - - Modified: cxf/trunk/systests/databinding/src/test/resources/wsdl_systest_databinding/jibx/hello_world.wsdl URL: http://svn.apache.org/viewvc/cxf/trunk/systests/databinding/src/test/resources/wsdl_systest_databinding/jibx/hello_world.wsdl?rev=1127624&r1=1127623&r2=1127624&view=diff ============================================================================== --- cxf/trunk/systests/databinding/src/test/resources/wsdl_systest_databinding/jibx/hello_world.wsdl (original) +++ cxf/trunk/systests/databinding/src/test/resources/wsdl_systest_databinding/jibx/hello_world.wsdl Wed May 25 18:42:20 2011 @@ -17,17 +17,17 @@ specific language governing permissions and limitations under the License. --> - - Modified: cxf/trunk/systests/databinding/src/test/resources/wsdl_systest_databinding/xmlbeans/hello_world.wsdl URL: http://svn.apache.org/viewvc/cxf/trunk/systests/databinding/src/test/resources/wsdl_systest_databinding/xmlbeans/hello_world.wsdl?rev=1127624&r1=1127623&r2=1127624&view=diff ============================================================================== --- cxf/trunk/systests/databinding/src/test/resources/wsdl_systest_databinding/xmlbeans/hello_world.wsdl (original) +++ cxf/trunk/systests/databinding/src/test/resources/wsdl_systest_databinding/xmlbeans/hello_world.wsdl Wed May 25 18:42:20 2011 @@ -17,17 +17,17 @@ specific language governing permissions and limitations under the License. --> - -