JBossWS SVN: r4389 - stack/native/trunk.
by jbossws-commits＠lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2007-08-16 10:39:23 -0400 (Thu, 16 Aug 2007)
New Revision: 4389
Modified:
stack/native/trunk/ant.properties.example
Log:
verifying write access to the repository
Modified: stack/native/trunk/ant.properties.example
===================================================================
--- stack/native/trunk/ant.properties.example 2007-08-16 14:38:52 UTC (rev 4388)
+++ stack/native/trunk/ant.properties.example 2007-08-16 14:39:23 UTC (rev 4389)
@@ -12,7 +12,7 @@
#jboss40.home=/home/tdiesler/svn/jbossas/tags/JBoss_4_0_5_GA/build/output/jboss-4.0.5.GA-ejb3
# The JBoss server under test. This can be [jboss50|jboss42|jboss40|tomcat]
-jbossws.integration.target=jboss40
+jbossws.integration.target=jboss50
# The JBoss server instance
jboss.server.instance=default
17 years, 4 months
- 1
- 0
JBossWS SVN: r4388 - stack/native/trunk.
by jbossws-commits＠lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2007-08-16 10:38:52 -0400 (Thu, 16 Aug 2007)
New Revision: 4388
Modified:
stack/native/trunk/ant.properties.example
Log:
verifying write access to the repository
Modified: stack/native/trunk/ant.properties.example
===================================================================
--- stack/native/trunk/ant.properties.example 2007-08-16 14:23:43 UTC (rev 4387)
+++ stack/native/trunk/ant.properties.example 2007-08-16 14:38:52 UTC (rev 4388)
@@ -12,7 +12,7 @@
#jboss40.home=/home/tdiesler/svn/jbossas/tags/JBoss_4_0_5_GA/build/output/jboss-4.0.5.GA-ejb3
# The JBoss server under test. This can be [jboss50|jboss42|jboss40|tomcat]
-jbossws.integration.target=jboss50
+jbossws.integration.target=jboss40
# The JBoss server instance
jboss.server.instance=default
17 years, 4 months
- 1
- 0
JBossWS SVN: r4386 - stack/native/branches/native-2.0.
by jbossws-commits＠lists.jboss.org
Author: richard_opalka
Date: 2007-08-16 06:52:23 -0400 (Thu, 16 Aug 2007)
New Revision: 4386
Modified:
stack/native/branches/native-2.0/mergeinfo.txt
Log:
[JBWS-1787] updating merge info file
Modified: stack/native/branches/native-2.0/mergeinfo.txt
===================================================================
--- stack/native/branches/native-2.0/mergeinfo.txt 2007-08-16 10:49:29 UTC (rev 4385)
+++ stack/native/branches/native-2.0/mergeinfo.txt 2007-08-16 10:52:23 UTC (rev 4386)
@@ -34,3 +34,9 @@
darran.lofthouse(a)jboss.com 15-August-2007
svn merge -r4376:4377 https://svn.jboss.org/repos/jbossws/stack/native/branches/native-2.0
+
+richard.opalka(a)jboss.com 16-Aug-2007
+svn merge -r4366:4369 https://svn.jboss.org/repos/jbossws/stack/native/branches/native-2.0
+svn merge -r4371:4372 https://svn.jboss.org/repos/jbossws/stack/native/branches/native-2.0
+svn merge -r4377:4378 https://svn.jboss.org/repos/jbossws/stack/native/branches/native-2.0
+svn merge -r4382:4383 https://svn.jboss.org/repos/jbossws/stack/native/branches/native-2.0
17 years, 4 months
- 1
- 0
JBossWS SVN: r4385 - in stack/native/trunk/src/test: java/org/jboss/test/ws/jaxrpc/samples/jsr109pojo and 2 other directories.
by jbossws-commits＠lists.jboss.org
Author: richard_opalka
Date: 2007-08-16 06:49:29 -0400 (Thu, 16 Aug 2007)
New Revision: 4385
Modified:
stack/native/trunk/src/test/java/org/jboss/test/ws/jaxrpc/jbws434/JBWS434TestCase.java
stack/native/trunk/src/test/java/org/jboss/test/ws/jaxrpc/samples/jsr109pojo/RpcJSETestCase.java
stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/endpoint/EndpointTestCase.java
stack/native/trunk/src/test/resources/test-excludes-jboss40.txt
stack/native/trunk/src/test/resources/test-excludes-jboss42.txt
stack/native/trunk/src/test/resources/test-excludes-jboss50.txt
Log:
[JBWS-1787] propagating minimized fixmes and excludes list to the trunk
Modified: stack/native/trunk/src/test/java/org/jboss/test/ws/jaxrpc/jbws434/JBWS434TestCase.java
===================================================================
--- stack/native/trunk/src/test/java/org/jboss/test/ws/jaxrpc/jbws434/JBWS434TestCase.java 2007-08-16 09:33:05 UTC (rev 4384)
+++ stack/native/trunk/src/test/java/org/jboss/test/ws/jaxrpc/jbws434/JBWS434TestCase.java 2007-08-16 10:49:29 UTC (rev 4385)
@@ -28,6 +28,7 @@
import javax.naming.InitialContext;
import javax.xml.rpc.Service;
import javax.xml.soap.SOAPElement;
+import javax.xml.soap.SOAPFactory;
import junit.framework.Test;
@@ -65,71 +66,68 @@
public void testWildCardArrayWithOtherNS() throws Exception
{
- System.out.println("FIXME [JBWS-1738]: Regression between jbossxb 1.0.0.GA and 1.0.0.GA-brew");
-// SOAPFactory factory = SOAPFactory.newInstance();
-//
-// SOAPElement el1 = factory.createElement("name", "ns1", "http://somens");
-// el1.setValue("Kermmit");
-// SOAPElement el2 = factory.createElement("product", "ns1", "http://somens");
-// el2.setValue("Ferrari");
-//
-// ArrayOfAny inObj = new ArrayOfAny(new SOAPElement[] { el1, el2 });
-// ArrayOfAny retObj = port.echo(inObj);
-//
-// assertNotNull(retObj);
-// assertNotNull(retObj._any);
-// assertEquals(inObj._any.length, retObj._any.length);
-//
-// for(int i = 0; i < inObj._any.length; ++i)
-// {
-// SOAPElement inE = inObj._any[i];
-// SOAPElement retE = retObj._any[i];
-// assertEquals(inE, retE);
-// }
+ SOAPFactory factory = SOAPFactory.newInstance();
+
+ SOAPElement el1 = factory.createElement("name", "ns1", "http://somens");
+ el1.setValue("Kermmit");
+ SOAPElement el2 = factory.createElement("product", "ns1", "http://somens");
+ el2.setValue("Ferrari");
+
+ ArrayOfAny inObj = new ArrayOfAny(new SOAPElement[] { el1, el2 });
+ ArrayOfAny retObj = port.echo(inObj);
+
+ assertNotNull(retObj);
+ assertNotNull(retObj._any);
+ assertEquals(inObj._any.length, retObj._any.length);
+
+ for(int i = 0; i < inObj._any.length; ++i)
+ {
+ SOAPElement inE = inObj._any[i];
+ SOAPElement retE = retObj._any[i];
+ assertEquals(inE, retE);
+ }
}
public void testWildCardArrayWithAnyNS() throws Exception
{
- System.out.println("FIXME [JBWS-1738]: Regression between jbossxb 1.0.0.GA and 1.0.0.GA-brew");
-// SOAPFactory factory = SOAPFactory.newInstance();
-//
-// SOAPElement el1 = factory.createElement("name", "ns1", "http://somens");
-// el1.setValue("Kermmit");
-// SOAPElement el2 = factory.createElement("product", "ns1", "http://somens");
-// el2.setValue("Ferrari");
-//
-// ArrayOfAny2 inObj = new ArrayOfAny2(new SOAPElement[] { el1, el2 });
-// ArrayOfAny2 retObj = port.echo2(inObj);
-//
-// assertNotNull(retObj);
-// assertNotNull(retObj._any);
-// assertEquals(inObj._any.length, retObj._any.length);
-//
-// for(int i = 0; i < inObj._any.length; ++i)
-// {
-// SOAPElement inE = inObj._any[i];
-// SOAPElement retE = retObj._any[i];
-// assertEquals(inE, retE);
-// }
+ SOAPFactory factory = SOAPFactory.newInstance();
+
+ SOAPElement el1 = factory.createElement("name", "ns1", "http://somens");
+ el1.setValue("Kermmit");
+ SOAPElement el2 = factory.createElement("product", "ns1", "http://somens");
+ el2.setValue("Ferrari");
+
+ ArrayOfAny2 inObj = new ArrayOfAny2(new SOAPElement[] { el1, el2 });
+ ArrayOfAny2 retObj = port.echo2(inObj);
+
+ assertNotNull(retObj);
+ assertNotNull(retObj._any);
+ assertEquals(inObj._any.length, retObj._any.length);
+
+ for(int i = 0; i < inObj._any.length; ++i)
+ {
+ SOAPElement inE = inObj._any[i];
+ SOAPElement retE = retObj._any[i];
+ assertEquals(inE, retE);
+ }
}
public void testWildCardArrayWithMaxOccurance() throws Exception
{
-// SOAPFactory factory = SOAPFactory.newInstance();
-//
-// SOAPElement el1 = factory.createElement("name", "ns1", "http://somens");
-// el1.setValue("Kermmit");
-//
-// TypeOfAny3 inObj = new TypeOfAny3(el1);
-// TypeOfAny3 retObj = port.echo3(inObj);
-//
-// assertNotNull(retObj);
-// assertNotNull(retObj._any);
-//
-// SOAPElement inE = inObj._any;
-// SOAPElement retE = retObj._any;
-// assertEquals(inE, retE);
+ SOAPFactory factory = SOAPFactory.newInstance();
+ SOAPElement el1 = factory.createElement("name", "ns1", "http://somens");
+ el1.setValue("Kermmit");
+
+ TypeOfAny3 inObj = new TypeOfAny3(el1);
+ TypeOfAny3 retObj = port.echo3(inObj);
+
+ assertNotNull(retObj);
+ assertNotNull(retObj._any);
+
+ SOAPElement inE = inObj._any;
+ SOAPElement retE = retObj._any;
+ assertEquals(inE, retE);
}
/**
@@ -138,21 +136,20 @@
*/
public void testWildCardContentsDeclared() throws Exception
{
- System.out.println("FIXME [JBWS-1738]: Regression between jbossxb 1.0.0.GA and 1.0.0.GA-brew");
-// SOAPFactory factory = SOAPFactory.newInstance();
-//
-// SOAPElement el1 = factory.createElement("knownWildcard", "ns1", "http://somens");
-// el1.setValue("Kermmit");
-//
-// TypeOfAny3 inObj = new TypeOfAny3(el1);
-// TypeOfAny3 retObj = port.echo3(inObj);
-//
-// assertNotNull(retObj);
-// assertNotNull(retObj._any);
-//
-// SOAPElement inE = inObj._any;
-// SOAPElement retE = retObj._any;
-// assertEquals(inE, retE);
+ SOAPFactory factory = SOAPFactory.newInstance();
+
+ SOAPElement el1 = factory.createElement("knownWildcard", "ns1", "http://somens");
+ el1.setValue("Kermmit");
+
+ TypeOfAny3 inObj = new TypeOfAny3(el1);
+ TypeOfAny3 retObj = port.echo3(inObj);
+
+ assertNotNull(retObj);
+ assertNotNull(retObj._any);
+
+ SOAPElement inE = inObj._any;
+ SOAPElement retE = retObj._any;
+ assertEquals(inE, retE);
}
private static void assertEquals(SOAPElement myE, SOAPElement otherE)
Modified: stack/native/trunk/src/test/java/org/jboss/test/ws/jaxrpc/samples/jsr109pojo/RpcJSETestCase.java
===================================================================
--- stack/native/trunk/src/test/java/org/jboss/test/ws/jaxrpc/samples/jsr109pojo/RpcJSETestCase.java 2007-08-16 09:33:05 UTC (rev 4384)
+++ stack/native/trunk/src/test/java/org/jboss/test/ws/jaxrpc/samples/jsr109pojo/RpcJSETestCase.java 2007-08-16 10:49:29 UTC (rev 4385)
@@ -56,7 +56,7 @@
if (port == null)
{
- if (isTargetJBoss42())
+ if (!isTargetJBoss50())
{
InitialContext iniCtx = getInitialContext();
Service service = (Service)iniCtx.lookup("java:comp/env/service/TestServiceJSE");
@@ -64,9 +64,7 @@
}
else
{
- if (isTargetJBoss50())
- System.out.println("FIXME: [JBWS-1397] Fix <wsdl-publish-location> for jboss-5.0.x");
-
+ System.out.println("FIXME: [JBWS-1397] Fix <wsdl-publish-location> for jboss-5.0.x");
ServiceFactoryImpl factory = new ServiceFactoryImpl();
URL wsdlURL = new File("resources/jaxrpc/samples/jsr109pojo/rpclit//WEB-INF/wsdl/TestService.wsdl").toURL();
URL mappingURL = new File("resources/jaxrpc/samples/jsr109pojo/rpclit/WEB-INF/jaxrpc-mapping.xml").toURL();
Modified: stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/endpoint/EndpointTestCase.java
===================================================================
--- stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/endpoint/EndpointTestCase.java 2007-08-16 09:33:05 UTC (rev 4384)
+++ stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/endpoint/EndpointTestCase.java 2007-08-16 10:49:29 UTC (rev 4385)
@@ -77,12 +77,6 @@
public void testWSDLAccess() throws MalformedURLException
{
- if (isTargetJBoss50())
- {
- System.out.println("FIXME: [JBWEB-1770] Fix Endpoint API for jboss-5.0.0.Beta3");
- return;
- }
-
URL wsdlURL = new URL("http://" + getServerHost() + ":8080/jaxws-endpoint?wsdl");
WSDLDefinitionsFactory factory = WSDLDefinitionsFactory.newInstance();
WSDLDefinitions wsdlDefinitions = factory.parse(wsdlURL);
@@ -91,12 +85,6 @@
public void testClientAccess() throws Exception
{
- if (isTargetJBoss50())
- {
- System.out.println("FIXME: [JBWEB-1770] Fix Endpoint API for jboss-5.0.0.Beta3");
- return;
- }
-
// Create the port
URL wsdlURL = new File("resources/jaxws/endpoint/WEB-INF/wsdl/TestService.wsdl").toURL();
QName qname = new QName("http://org.jboss.ws/jaxws/endpoint", "TestService");
@@ -110,15 +98,8 @@
public void testServletAccess() throws Exception
{
- if (isTargetJBoss50())
- {
- System.out.println("FIXME: [JBWEB-1770] Fix Endpoint API for jboss-5.0.0.Beta3");
- return;
- }
-
URL url = new URL("http://" + getServerHost() + ":8080/jaxws-endpoint-servlet?param=hello-world");
BufferedReader br = new BufferedReader(new InputStreamReader(url.openStream()));
assertEquals("hello-world", br.readLine());
-
}
}
Modified: stack/native/trunk/src/test/resources/test-excludes-jboss40.txt
===================================================================
--- stack/native/trunk/src/test/resources/test-excludes-jboss40.txt 2007-08-16 09:33:05 UTC (rev 4384)
+++ stack/native/trunk/src/test/resources/test-excludes-jboss40.txt 2007-08-16 10:49:29 UTC (rev 4385)
@@ -1,14 +1,9 @@
# JBossAS-4.0 excludes
org/jboss/test/ws/jaxrpc/jbws723/**
-# benchmark tests
-org/jboss/test/ws/benchmark/**
-
# EJB3/Injection excludes
org/jboss/test/ws/jaxws/jbws1581/**
org/jboss/test/ws/jaxws/samples/context/WebServiceContextEJBTestCase*
-org/jboss/test/ws/jaxws/samples/handlerchain/HandlerChainClientTestCase*
org/jboss/test/ws/jaxws/samples/retail/**
-org/jboss/test/ws/jaxws/samples/serviceref/**
org/jboss/test/ws/jaxws/samples/webserviceref/**
org/jboss/test/ws/jaxws/webserviceref/**
Modified: stack/native/trunk/src/test/resources/test-excludes-jboss42.txt
===================================================================
--- stack/native/trunk/src/test/resources/test-excludes-jboss42.txt 2007-08-16 09:33:05 UTC (rev 4384)
+++ stack/native/trunk/src/test/resources/test-excludes-jboss42.txt 2007-08-16 10:49:29 UTC (rev 4385)
@@ -1,11 +1,3 @@
-# benchmark tests
-org/jboss/test/ws/benchmark/**
-
# EJB3/Injection excludes
-org/jboss/test/ws/jaxws/jbws1581/**
-org/jboss/test/ws/jaxws/samples/handlerchain/HandlerChainClientTestCase*
-org/jboss/test/ws/jaxws/samples/retail/**
-org/jboss/test/ws/jaxws/samples/serviceref/**
org/jboss/test/ws/jaxws/samples/webserviceref/**
-
org/jboss/test/ws/jaxws/webserviceref/**
Modified: stack/native/trunk/src/test/resources/test-excludes-jboss50.txt
===================================================================
--- stack/native/trunk/src/test/resources/test-excludes-jboss50.txt 2007-08-16 09:33:05 UTC (rev 4384)
+++ stack/native/trunk/src/test/resources/test-excludes-jboss50.txt 2007-08-16 10:49:29 UTC (rev 4385)
@@ -1,19 +1,6 @@
-# benchmark tests
-#org/jboss/test/ws/benchmark/**
-
# Fix before JBoss50 goes final
-org/jboss/test/ws/jaxrpc/jbas897/JBAS897TestCase.*
org/jboss/test/ws/jaxrpc/jbws124/JBWS124TestCase.*
org/jboss/test/ws/jaxrpc/jbws128/JBWS128TestCase.*
org/jboss/test/ws/jaxrpc/jbws153/JBWS153TestCase.*
-org/jboss/test/ws/jaxrpc/jbws165/JBWS165TestCase.*
-org/jboss/test/ws/jaxrpc/jbws331/JBWS331TestCase.*
-org/jboss/test/ws/jaxrpc/jbws358/JBWS358TestCase.*
-org/jboss/test/ws/jaxrpc/jbws626/JBWS626TestCase.*
-org/jboss/test/ws/jaxrpc/jbws772/JBWS772TestCase.*
-org/jboss/test/ws/jaxrpc/samples/jsr109ejb/*TestCase.*
-org/jboss/test/ws/jaxrpc/samples/jmstransport/JMSTransportTestCase.*
-org/jboss/test/ws/jaxrpc/samples/jmstransport/OrganizationJMSEndpoint.*
org/jboss/test/ws/jaxrpc/samples/wsbpel/hello/*TestCase.*
org/jboss/test/ws/jaxrpc/wsdlpublish/**
-
17 years, 4 months
- 1
- 0
JBossWS SVN: r4384 - stack/native/branches/native-2.0/src/test/java/org/jboss/test/ws/jaxws/samples/wssecurity.
by jbossws-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2007-08-16 05:33:05 -0400 (Thu, 16 Aug 2007)
New Revision: 4384
Modified:
stack/native/branches/native-2.0/src/test/java/org/jboss/test/ws/jaxws/samples/wssecurity/SimpleUsernameTestCase.java
Log:
Add FIXME to disable the test
Modified: stack/native/branches/native-2.0/src/test/java/org/jboss/test/ws/jaxws/samples/wssecurity/SimpleUsernameTestCase.java
===================================================================
--- stack/native/branches/native-2.0/src/test/java/org/jboss/test/ws/jaxws/samples/wssecurity/SimpleUsernameTestCase.java 2007-08-16 07:02:46 UTC (rev 4383)
+++ stack/native/branches/native-2.0/src/test/java/org/jboss/test/ws/jaxws/samples/wssecurity/SimpleUsernameTestCase.java 2007-08-16 09:33:05 UTC (rev 4384)
@@ -21,6 +21,8 @@
*/
package org.jboss.test.ws.jaxws.samples.wssecurity;
+// $Id$
+
import java.io.File;
import java.net.URL;
import java.util.Map;
@@ -44,9 +46,6 @@
*/
public class SimpleUsernameTestCase extends JBossWSTest
{
- /** Construct the test case with a given name
- */
-
/** Deploy the test */
public static Test suite() throws Exception
{
@@ -59,9 +58,10 @@
public void testUsernameToken() throws Exception
{
UsernameEndpoint username = getPort();
-
String retObj = username.getUsernameToken();
- assertTrue(retObj.indexOf("UsernameToken") > 0);
+
+ System.out.println("FIXME [JBWS-1766]: UsernameToken ignores BindingProvider.USERNAME_PROPERTY");
+ //assertTrue(retObj.indexOf("UsernameToken") > 0);
}
private UsernameEndpoint getPort() throws Exception
17 years, 4 months
- 1
- 0
JBossWS SVN: r4383 - stack/native/branches/native-2.0/src/test/java/org/jboss/test/ws/jaxrpc/samples/jsr109pojo.
by jbossws-commits＠lists.jboss.org
Author: richard_opalka
Date: 2007-08-16 03:02:46 -0400 (Thu, 16 Aug 2007)
New Revision: 4383
Modified:
stack/native/branches/native-2.0/src/test/java/org/jboss/test/ws/jaxrpc/samples/jsr109pojo/RpcJSETestCase.java
Log:
this test works properly on JBoss40 so changing the condition so
Modified: stack/native/branches/native-2.0/src/test/java/org/jboss/test/ws/jaxrpc/samples/jsr109pojo/RpcJSETestCase.java
===================================================================
--- stack/native/branches/native-2.0/src/test/java/org/jboss/test/ws/jaxrpc/samples/jsr109pojo/RpcJSETestCase.java 2007-08-15 19:29:52 UTC (rev 4382)
+++ stack/native/branches/native-2.0/src/test/java/org/jboss/test/ws/jaxrpc/samples/jsr109pojo/RpcJSETestCase.java 2007-08-16 07:02:46 UTC (rev 4383)
@@ -56,7 +56,7 @@
if (port == null)
{
- if (isTargetJBoss42())
+ if (!isTargetJBoss50())
{
InitialContext iniCtx = getInitialContext();
Service service = (Service)iniCtx.lookup("java:comp/env/service/TestServiceJSE");
@@ -64,9 +64,7 @@
}
else
{
- if (isTargetJBoss50())
- System.out.println("FIXME: [JBWS-1397] Fix <wsdl-publish-location> for jboss-5.0.x");
-
+ System.out.println("FIXME: [JBWS-1397] Fix <wsdl-publish-location> for jboss-5.0.x");
ServiceFactoryImpl factory = new ServiceFactoryImpl();
URL wsdlURL = new File("resources/jaxrpc/samples/jsr109pojo/rpclit//WEB-INF/wsdl/TestService.wsdl").toURL();
URL mappingURL = new File("resources/jaxrpc/samples/jsr109pojo/rpclit/WEB-INF/jaxrpc-mapping.xml").toURL();
17 years, 4 months
- 1
- 0
JBossWS SVN: r4382 - in legacy/branches/jbossws-1.2.1.GA_JBWS-1788: jbossws-core/src/java/org/jboss/ws/tools/helpers and 4 other directories.
by jbossws-commits＠lists.jboss.org
Author: darran.lofthouse(a)jboss.com
Date: 2007-08-15 15:29:52 -0400 (Wed, 15 Aug 2007)
New Revision: 4382
Added:
legacy/branches/jbossws-1.2.1.GA_JBWS-1788/jbossws-tests/src/java/org/jboss/test/ws/tools/jbws1453/
legacy/branches/jbossws-1.2.1.GA_JBWS-1788/jbossws-tests/src/java/org/jboss/test/ws/tools/jbws1453/JBWS1453TestCase.java
legacy/branches/jbossws-1.2.1.GA_JBWS-1788/jbossws-tests/src/resources/tools/jbws1453/
legacy/branches/jbossws-1.2.1.GA_JBWS-1788/jbossws-tests/src/resources/tools/jbws1453/A_Message.java
legacy/branches/jbossws-1.2.1.GA_JBWS-1788/jbossws-tests/src/resources/tools/jbws1453/A_Person.java
legacy/branches/jbossws-1.2.1.GA_JBWS-1788/jbossws-tests/src/resources/tools/jbws1453/Nick_Name.java
legacy/branches/jbossws-1.2.1.GA_JBWS-1788/jbossws-tests/src/resources/tools/jbws1453/PhoneBook.wsdl
legacy/branches/jbossws-1.2.1.GA_JBWS-1788/jbossws-tests/src/resources/tools/jbws1453/PhoneBook_PortType.java
legacy/branches/jbossws-1.2.1.GA_JBWS-1788/jbossws-tests/src/resources/tools/jbws1453/Telephone_Number.java
legacy/branches/jbossws-1.2.1.GA_JBWS-1788/jbossws-tests/src/resources/tools/jbws1453/jaxrpc-mapping.xml
legacy/branches/jbossws-1.2.1.GA_JBWS-1788/jbossws-tests/src/resources/tools/jbws1453/wstools-config.xml
Removed:
legacy/branches/jbossws-1.2.1.GA_JBWS-1788/jbossws-tests/src/java/org/jboss/test/ws/tools/jbws1453/JBWS1453TestCase.java
legacy/branches/jbossws-1.2.1.GA_JBWS-1788/jbossws-tests/src/resources/tools/jbws1453/A_Message.java
legacy/branches/jbossws-1.2.1.GA_JBWS-1788/jbossws-tests/src/resources/tools/jbws1453/A_Person.java
legacy/branches/jbossws-1.2.1.GA_JBWS-1788/jbossws-tests/src/resources/tools/jbws1453/Nick_Name.java
legacy/branches/jbossws-1.2.1.GA_JBWS-1788/jbossws-tests/src/resources/tools/jbws1453/PhoneBook.wsdl
legacy/branches/jbossws-1.2.1.GA_JBWS-1788/jbossws-tests/src/resources/tools/jbws1453/PhoneBook_PortType.java
legacy/branches/jbossws-1.2.1.GA_JBWS-1788/jbossws-tests/src/resources/tools/jbws1453/Telephone_Number.java
legacy/branches/jbossws-1.2.1.GA_JBWS-1788/jbossws-tests/src/resources/tools/jbws1453/jaxrpc-mapping.xml
legacy/branches/jbossws-1.2.1.GA_JBWS-1788/jbossws-tests/src/resources/tools/jbws1453/wstools-config.xml
Modified:
legacy/branches/jbossws-1.2.1.GA_JBWS-1788/jbossws-core/src/java/org/jboss/ws/tools/WSDLToJava.java
legacy/branches/jbossws-1.2.1.GA_JBWS-1788/jbossws-core/src/java/org/jboss/ws/tools/XSDTypeToJava.java
legacy/branches/jbossws-1.2.1.GA_JBWS-1788/jbossws-core/src/java/org/jboss/ws/tools/helpers/MappingFileGeneratorHelper.java
Log:
[JBWS-1788] - WSDL To Java - Various Fixes.
Modified: legacy/branches/jbossws-1.2.1.GA_JBWS-1788/jbossws-core/src/java/org/jboss/ws/tools/WSDLToJava.java
===================================================================
--- legacy/branches/jbossws-1.2.1.GA_JBWS-1788/jbossws-core/src/java/org/jboss/ws/tools/WSDLToJava.java 2007-08-15 15:59:00 UTC (rev 4381)
+++ legacy/branches/jbossws-1.2.1.GA_JBWS-1788/jbossws-core/src/java/org/jboss/ws/tools/WSDLToJava.java 2007-08-15 19:29:52 UTC (rev 4382)
@@ -626,6 +626,7 @@
if (className.charAt(0) == '>')
className = className.substring(1);
+ className = ToolsUtils.convertInvalidCharacters(className);
className = utils.firstLetterUpperCase(className);
className = seiPkgName + "." + className + arraySuffix;
@@ -666,9 +667,9 @@
//Check if the portType name conflicts with a service name
if (wsdl.getService(seiName) != null)
seiName += "_PortType";
-
+
seiName = JavaUtils.capitalize(seiName);
-
+
return seiName;
}
@@ -748,6 +749,7 @@
if (className.charAt(0) == '>')
className = className.substring(1);
+ className = ToolsUtils.convertInvalidCharacters(className);
className = utils.firstLetterUpperCase(className);
return seiPkgName + "." + className + arraySuffix;
}
Modified: legacy/branches/jbossws-1.2.1.GA_JBWS-1788/jbossws-core/src/java/org/jboss/ws/tools/XSDTypeToJava.java
===================================================================
--- legacy/branches/jbossws-1.2.1.GA_JBWS-1788/jbossws-core/src/java/org/jboss/ws/tools/XSDTypeToJava.java 2007-08-15 15:59:00 UTC (rev 4381)
+++ legacy/branches/jbossws-1.2.1.GA_JBWS-1788/jbossws-core/src/java/org/jboss/ws/tools/XSDTypeToJava.java 2007-08-15 19:29:52 UTC (rev 4382)
@@ -131,6 +131,8 @@
if (typeMapping == null)
throw new WSException("TypeMapping has not been set");
XSTypeDefinition baseType = type.getBaseType();
+ // Ensure the characters in the name are valid
+ fname = ToolsUtils.convertInvalidCharacters(fname);
//Ensure that the first character is uppercase
fname = utils.firstLetterUpperCase(fname);
List vars = new ArrayList();
@@ -535,13 +537,9 @@
// Handle xsd:any elements
if (xsterm instanceof XSWildcard)
{
- XSWildcard xsw = (XSWildcard)xsterm;
- // if (xsw.getConstraintType() == XSWildcard.NSCONSTRAINT_ANY)
- // {
VAR v = new VAR("_any", "javax.xml.soap.SOAPElement", arrayType);
vars.add(v);
return vars;
- // }
}
// Handle xsd:group
@@ -636,7 +634,7 @@
if (xstypename != null && xstypedef instanceof XSComplexTypeDefinition)
{
- this.fname = utils.firstLetterUpperCase(xstypename);
+ this.fname = ToolsUtils.convertInvalidCharacters(utils.firstLetterUpperCase(xstypename));
if (!generatedFiles.contains(this.fname))
{
generatedFiles.add(this.fname);
@@ -681,7 +679,7 @@
String nsuri = typename.getNamespaceURI();
if (!nsuri.equals(Constants.NS_SCHEMA_XSD))
qualifiedClassName = pkgname + ".";
- String className = wsdlUtils.firstLetterUpperCase(typename.getLocalPart());
+ String className = wsdlUtils.firstLetterUpperCase(ToolsUtils.convertInvalidCharacters(typename.getLocalPart()));
qualifiedClassName += className;
}
else if (qn != null)
Modified: legacy/branches/jbossws-1.2.1.GA_JBWS-1788/jbossws-core/src/java/org/jboss/ws/tools/helpers/MappingFileGeneratorHelper.java
===================================================================
--- legacy/branches/jbossws-1.2.1.GA_JBWS-1788/jbossws-core/src/java/org/jboss/ws/tools/helpers/MappingFileGeneratorHelper.java 2007-08-15 15:59:00 UTC (rev 4381)
+++ legacy/branches/jbossws-1.2.1.GA_JBWS-1788/jbossws-core/src/java/org/jboss/ws/tools/helpers/MappingFileGeneratorHelper.java 2007-08-15 19:29:52 UTC (rev 4382)
@@ -878,6 +878,7 @@
String className = xmlType.getLocalPart();
if (className.charAt(0) == '>')
className = className.substring(1);
+ className = ToolsUtils.convertInvalidCharacters(className);
jtype = packageName + "." + utils.firstLetterUpperCase(className);
}
else
Copied: legacy/branches/jbossws-1.2.1.GA_JBWS-1788/jbossws-tests/src/java/org/jboss/test/ws/tools/jbws1453 (from rev 4377, stack/native/branches/native-2.0/src/test/java/org/jboss/test/ws/tools/jbws1453)
Deleted: legacy/branches/jbossws-1.2.1.GA_JBWS-1788/jbossws-tests/src/java/org/jboss/test/ws/tools/jbws1453/JBWS1453TestCase.java
===================================================================
--- stack/native/branches/native-2.0/src/test/java/org/jboss/test/ws/tools/jbws1453/JBWS1453TestCase.java 2007-08-15 14:58:17 UTC (rev 4377)
+++ legacy/branches/jbossws-1.2.1.GA_JBWS-1788/jbossws-tests/src/java/org/jboss/test/ws/tools/jbws1453/JBWS1453TestCase.java 2007-08-15 19:29:52 UTC (rev 4382)
@@ -1,105 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2007, JBoss Inc., and individual contributors as indicated
- * by the @authors tag. See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.test.ws.tools.jbws1453;
-
-import java.io.File;
-import java.io.FilenameFilter;
-
-import org.jboss.test.ws.tools.fixture.JBossSourceComparator;
-import org.jboss.test.ws.tools.validation.JaxrpcMappingValidator;
-import org.jboss.ws.tools.WSTools;
-import org.jboss.wsf.test.JBossWSTest;
-
-/**
- * Test case for http://jira.jboss.com/jira/browse/JBWS-1453
- *
- * WSDL To Java - Invalid name for generated class
- * if complex type name contains a period.
- *
- * @author darran.lofthouse(a)jboss.com
- * @since 15 August 2007
- */
-public class JBWS1453TestCase extends JBossWSTest
-{
- /**
- * Test generation of the SEI.
- *
- * @throws Exception
- */
- public void testGenerate() throws Exception
- {
- String resourceDir = "resources/tools/jbws1453";
- String toolsDir = "tools/jbws1453";
- String[] args = new String[] { "-dest", toolsDir, "-config", resourceDir + "/wstools-config.xml" };
- new WSTools().generate(args);
-
- File resourceDirFile = new File(resourceDir);
- String[] expectedFiles = resourceDirFile.list(new FilenameFilter() {
- public boolean accept(File dir, String name)
- {
- return name.endsWith(".java");
- }
- });
-
- for (int i = 0; i < expectedFiles.length; i++)
- {
- String currentFile = expectedFiles[i];
-
- try
- {
- compareSource(resourceDir + "/" + currentFile, toolsDir + "/org/jboss/test/ws/jbws1453/" + currentFile);
- }
- catch (Exception e)
- {
- throw new Exception("Validation of '" + currentFile + "' failed.", e);
- }
- }
-
- File packageDir = new File(toolsDir + "/org/jboss/test/ws/jbws1453");
- String[] generatedFiles = packageDir.list();
- for (int i = 0; i < generatedFiles.length; i++)
- {
- String currentFile = generatedFiles[i];
-
- boolean matched = "PhoneBookService.java".equals(currentFile);
-
- for (int j = 0; j < expectedFiles.length && (matched == false); j++)
- matched = currentFile.equals(expectedFiles[j]);
-
- assertTrue("File '" + currentFile + "' was not expected to be generated", matched);
- }
-
- JaxrpcMappingValidator mappingValidator = new JaxrpcMappingValidator();
- mappingValidator.validate(resourceDir + "/jaxrpc-mapping.xml", toolsDir + "/jaxrpc-mapping.xml");
-
- }
-
- private static void compareSource(final String expectedName, final String generatedName) throws Exception
- {
- File expected = new File(expectedName);
- File generated = new File(generatedName);
-
- JBossSourceComparator sc = new JBossSourceComparator(expected, generated);
- sc.validate();
- sc.validateImports();
- }
-}
Copied: legacy/branches/jbossws-1.2.1.GA_JBWS-1788/jbossws-tests/src/java/org/jboss/test/ws/tools/jbws1453/JBWS1453TestCase.java (from rev 4377, stack/native/branches/native-2.0/src/test/java/org/jboss/test/ws/tools/jbws1453/JBWS1453TestCase.java)
===================================================================
--- legacy/branches/jbossws-1.2.1.GA_JBWS-1788/jbossws-tests/src/java/org/jboss/test/ws/tools/jbws1453/JBWS1453TestCase.java (rev 0)
+++ legacy/branches/jbossws-1.2.1.GA_JBWS-1788/jbossws-tests/src/java/org/jboss/test/ws/tools/jbws1453/JBWS1453TestCase.java 2007-08-15 19:29:52 UTC (rev 4382)
@@ -0,0 +1,105 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2007, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.test.ws.tools.jbws1453;
+
+import java.io.File;
+import java.io.FilenameFilter;
+
+import org.jboss.test.ws.tools.fixture.JBossSourceComparator;
+import org.jboss.test.ws.tools.validation.JaxrpcMappingValidator;
+import org.jboss.ws.tools.WSTools;
+import org.jboss.test.ws.JBossWSTest;;
+
+/**
+ * Test case for http://jira.jboss.com/jira/browse/JBWS-1453
+ *
+ * WSDL To Java - Invalid name for generated class
+ * if complex type name contains a period.
+ *
+ * @author darran.lofthouse(a)jboss.com
+ * @since 15 August 2007
+ */
+public class JBWS1453TestCase extends JBossWSTest
+{
+ /**
+ * Test generation of the SEI.
+ *
+ * @throws Exception
+ */
+ public void testGenerate() throws Exception
+ {
+ String resourceDir = "resources/tools/jbws1453";
+ String toolsDir = "tools/jbws1453";
+ String[] args = new String[] { "-dest", toolsDir, "-config", resourceDir + "/wstools-config.xml" };
+ new WSTools().generate(args);
+
+ File resourceDirFile = new File(resourceDir);
+ String[] expectedFiles = resourceDirFile.list(new FilenameFilter() {
+ public boolean accept(File dir, String name)
+ {
+ return name.endsWith(".java");
+ }
+ });
+
+ for (int i = 0; i < expectedFiles.length; i++)
+ {
+ String currentFile = expectedFiles[i];
+
+ try
+ {
+ compareSource(resourceDir + "/" + currentFile, toolsDir + "/org/jboss/test/ws/jbws1453/" + currentFile);
+ }
+ catch (Exception e)
+ {
+ throw new Exception("Validation of '" + currentFile + "' failed.", e);
+ }
+ }
+
+ File packageDir = new File(toolsDir + "/org/jboss/test/ws/jbws1453");
+ String[] generatedFiles = packageDir.list();
+ for (int i = 0; i < generatedFiles.length; i++)
+ {
+ String currentFile = generatedFiles[i];
+
+ boolean matched = "PhoneBookService.java".equals(currentFile);
+
+ for (int j = 0; j < expectedFiles.length && (matched == false); j++)
+ matched = currentFile.equals(expectedFiles[j]);
+
+ assertTrue("File '" + currentFile + "' was not expected to be generated", matched);
+ }
+
+ JaxrpcMappingValidator mappingValidator = new JaxrpcMappingValidator();
+ mappingValidator.validate(resourceDir + "/jaxrpc-mapping.xml", toolsDir + "/jaxrpc-mapping.xml");
+
+ }
+
+ private static void compareSource(final String expectedName, final String generatedName) throws Exception
+ {
+ File expected = new File(expectedName);
+ File generated = new File(generatedName);
+
+ JBossSourceComparator sc = new JBossSourceComparator(expected, generated);
+ sc.validate();
+ sc.validateImports();
+ }
+}
Copied: legacy/branches/jbossws-1.2.1.GA_JBWS-1788/jbossws-tests/src/resources/tools/jbws1453 (from rev 4377, stack/native/branches/native-2.0/src/test/resources/tools/jbws1453)
Deleted: legacy/branches/jbossws-1.2.1.GA_JBWS-1788/jbossws-tests/src/resources/tools/jbws1453/A_Message.java
===================================================================
--- stack/native/branches/native-2.0/src/test/resources/tools/jbws1453/A_Message.java 2007-08-15 14:58:17 UTC (rev 4377)
+++ legacy/branches/jbossws-1.2.1.GA_JBWS-1788/jbossws-tests/src/resources/tools/jbws1453/A_Message.java 2007-08-15 19:29:52 UTC (rev 4382)
@@ -1,27 +0,0 @@
-/*
- * JBossWS WS-Tools Generated Source
- *
- * Generation Date: Wed Aug 15 15:16:31 BST 2007
- *
- * This generated source code represents a derivative work of the input to
- * the generator that produced it. Consult the input for the copyright and
- * terms of use that apply to this source code.
- */
-
-package org.jboss.test.ws.jbws1453;
-
-
-public class A_Message
-{
-
-protected java.lang.String message;
-public A_Message(){}
-
-public A_Message(java.lang.String message){
-this.message=message;
-}
-public java.lang.String getMessage() { return message ;}
-
-public void setMessage(java.lang.String message){ this.message=message; }
-
-}
Copied: legacy/branches/jbossws-1.2.1.GA_JBWS-1788/jbossws-tests/src/resources/tools/jbws1453/A_Message.java (from rev 4377, stack/native/branches/native-2.0/src/test/resources/tools/jbws1453/A_Message.java)
===================================================================
--- legacy/branches/jbossws-1.2.1.GA_JBWS-1788/jbossws-tests/src/resources/tools/jbws1453/A_Message.java (rev 0)
+++ legacy/branches/jbossws-1.2.1.GA_JBWS-1788/jbossws-tests/src/resources/tools/jbws1453/A_Message.java 2007-08-15 19:29:52 UTC (rev 4382)
@@ -0,0 +1,27 @@
+/*
+ * JBossWS WS-Tools Generated Source
+ *
+ * Generation Date: Wed Aug 15 15:16:31 BST 2007
+ *
+ * This generated source code represents a derivative work of the input to
+ * the generator that produced it. Consult the input for the copyright and
+ * terms of use that apply to this source code.
+ */
+
+package org.jboss.test.ws.jbws1453;
+
+
+public class A_Message
+{
+
+protected java.lang.String message;
+public A_Message(){}
+
+public A_Message(java.lang.String message){
+this.message=message;
+}
+public java.lang.String getMessage() { return message ;}
+
+public void setMessage(java.lang.String message){ this.message=message; }
+
+}
Deleted: legacy/branches/jbossws-1.2.1.GA_JBWS-1788/jbossws-tests/src/resources/tools/jbws1453/A_Person.java
===================================================================
--- stack/native/branches/native-2.0/src/test/resources/tools/jbws1453/A_Person.java 2007-08-15 14:58:17 UTC (rev 4377)
+++ legacy/branches/jbossws-1.2.1.GA_JBWS-1788/jbossws-tests/src/resources/tools/jbws1453/A_Person.java 2007-08-15 19:29:52 UTC (rev 4382)
@@ -1,34 +0,0 @@
-/*
- * JBossWS WS-Tools Generated Source
- *
- * Generation Date: Wed Aug 15 15:16:31 BST 2007
- *
- * This generated source code represents a derivative work of the input to
- * the generator that produced it. Consult the input for the copyright and
- * terms of use that apply to this source code.
- */
-
-package org.jboss.test.ws.jbws1453;
-
-
-public class A_Person
-{
-
-protected java.lang.String surname;
-
-protected org.jboss.test.ws.jbws1453.Nick_Name nickName;
-public A_Person(){}
-
-public A_Person(java.lang.String surname, org.jboss.test.ws.jbws1453.Nick_Name nickName){
-this.surname=surname;
-this.nickName=nickName;
-}
-public java.lang.String getSurname() { return surname ;}
-
-public void setSurname(java.lang.String surname){ this.surname=surname; }
-
-public org.jboss.test.ws.jbws1453.Nick_Name getNickName() { return nickName ;}
-
-public void setNickName(org.jboss.test.ws.jbws1453.Nick_Name nickName){ this.nickName=nickName; }
-
-}
Copied: legacy/branches/jbossws-1.2.1.GA_JBWS-1788/jbossws-tests/src/resources/tools/jbws1453/A_Person.java (from rev 4377, stack/native/branches/native-2.0/src/test/resources/tools/jbws1453/A_Person.java)
===================================================================
--- legacy/branches/jbossws-1.2.1.GA_JBWS-1788/jbossws-tests/src/resources/tools/jbws1453/A_Person.java (rev 0)
+++ legacy/branches/jbossws-1.2.1.GA_JBWS-1788/jbossws-tests/src/resources/tools/jbws1453/A_Person.java 2007-08-15 19:29:52 UTC (rev 4382)
@@ -0,0 +1,34 @@
+/*
+ * JBossWS WS-Tools Generated Source
+ *
+ * Generation Date: Wed Aug 15 15:16:31 BST 2007
+ *
+ * This generated source code represents a derivative work of the input to
+ * the generator that produced it. Consult the input for the copyright and
+ * terms of use that apply to this source code.
+ */
+
+package org.jboss.test.ws.jbws1453;
+
+
+public class A_Person
+{
+
+protected java.lang.String surname;
+
+protected org.jboss.test.ws.jbws1453.Nick_Name nickName;
+public A_Person(){}
+
+public A_Person(java.lang.String surname, org.jboss.test.ws.jbws1453.Nick_Name nickName){
+this.surname=surname;
+this.nickName=nickName;
+}
+public java.lang.String getSurname() { return surname ;}
+
+public void setSurname(java.lang.String surname){ this.surname=surname; }
+
+public org.jboss.test.ws.jbws1453.Nick_Name getNickName() { return nickName ;}
+
+public void setNickName(org.jboss.test.ws.jbws1453.Nick_Name nickName){ this.nickName=nickName; }
+
+}
Deleted: legacy/branches/jbossws-1.2.1.GA_JBWS-1788/jbossws-tests/src/resources/tools/jbws1453/Nick_Name.java
===================================================================
--- stack/native/branches/native-2.0/src/test/resources/tools/jbws1453/Nick_Name.java 2007-08-15 14:58:17 UTC (rev 4377)
+++ legacy/branches/jbossws-1.2.1.GA_JBWS-1788/jbossws-tests/src/resources/tools/jbws1453/Nick_Name.java 2007-08-15 19:29:52 UTC (rev 4382)
@@ -1,27 +0,0 @@
-/*
- * JBossWS WS-Tools Generated Source
- *
- * Generation Date: Wed Aug 15 15:16:31 BST 2007
- *
- * This generated source code represents a derivative work of the input to
- * the generator that produced it. Consult the input for the copyright and
- * terms of use that apply to this source code.
- */
-
-package org.jboss.test.ws.jbws1453;
-
-
-public class Nick_Name
-{
-
-protected java.lang.String name;
-public Nick_Name(){}
-
-public Nick_Name(java.lang.String name){
-this.name=name;
-}
-public java.lang.String getName() { return name ;}
-
-public void setName(java.lang.String name){ this.name=name; }
-
-}
Copied: legacy/branches/jbossws-1.2.1.GA_JBWS-1788/jbossws-tests/src/resources/tools/jbws1453/Nick_Name.java (from rev 4377, stack/native/branches/native-2.0/src/test/resources/tools/jbws1453/Nick_Name.java)
===================================================================
--- legacy/branches/jbossws-1.2.1.GA_JBWS-1788/jbossws-tests/src/resources/tools/jbws1453/Nick_Name.java (rev 0)
+++ legacy/branches/jbossws-1.2.1.GA_JBWS-1788/jbossws-tests/src/resources/tools/jbws1453/Nick_Name.java 2007-08-15 19:29:52 UTC (rev 4382)
@@ -0,0 +1,27 @@
+/*
+ * JBossWS WS-Tools Generated Source
+ *
+ * Generation Date: Wed Aug 15 15:16:31 BST 2007
+ *
+ * This generated source code represents a derivative work of the input to
+ * the generator that produced it. Consult the input for the copyright and
+ * terms of use that apply to this source code.
+ */
+
+package org.jboss.test.ws.jbws1453;
+
+
+public class Nick_Name
+{
+
+protected java.lang.String name;
+public Nick_Name(){}
+
+public Nick_Name(java.lang.String name){
+this.name=name;
+}
+public java.lang.String getName() { return name ;}
+
+public void setName(java.lang.String name){ this.name=name; }
+
+}
Deleted: legacy/branches/jbossws-1.2.1.GA_JBWS-1788/jbossws-tests/src/resources/tools/jbws1453/PhoneBook.wsdl
===================================================================
--- stack/native/branches/native-2.0/src/test/resources/tools/jbws1453/PhoneBook.wsdl 2007-08-15 14:58:17 UTC (rev 4377)
+++ legacy/branches/jbossws-1.2.1.GA_JBWS-1788/jbossws-tests/src/resources/tools/jbws1453/PhoneBook.wsdl 2007-08-15 19:29:52 UTC (rev 4382)
@@ -1,78 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<definitions name='PhoneBook' targetNamespace='http://test.jboss.org/ws/jbws1453'
- xmlns='http://schemas.xmlsoap.org/wsdl/'
- xmlns:ns1='http://test.jboss.org/ws/jbws1453/types'
- xmlns:soap='http://schemas.xmlsoap.org/wsdl/soap/'
- xmlns:tns='http://test.jboss.org/ws/jbws1453'
- xmlns:xsd='http://www.w3.org/2001/XMLSchema'>
-
- <types>
- <schema targetNamespace='http://test.jboss.org/ws/jbws1453/types'
- xmlns='http://www.w3.org/2001/XMLSchema'
- xmlns:soap11-enc='http://schemas.xmlsoap.org/soap/encoding/'
- xmlns:tns='http://test.jboss.org/ws/jbws1453/types'
- xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance'>
-
- <complexType name='A.Person'>
- <sequence>
- <element name='surname' nillable='true' type='string'/>
- <element name='nickName' nillable='true' type='tns:Nick.Name'/>
- </sequence>
- </complexType>
-
- <complexType name='Nick.Name'>
- <sequence>
- <element name='name' nillable='true' type='string'/>
- </sequence>
- </complexType>
-
- <complexType name='A.Message'>
- <sequence>
- <element name='message' nillable='true' type='string'/>
- </sequence>
- </complexType>
-
- <complexType name='Telephone.Number'>
- <sequence>
- <element name='number' nillable='true' type='string'/>
- <element name='message' nillable='true' type='tns:A.Message'/>
- </sequence>
- </complexType>
-
- <element name='lookup' type='tns:A.Person'/>
- <element name='lookupResponse' type='tns:Telephone.Number'/>
-
- </schema>
- </types>
-
- <message name='PhoneBook_lookup'>
- <part element='ns1:lookup' name='parameters'/>
- </message>
- <message name='PhoneBook_lookupResponse'>
- <part element='ns1:lookupResponse' name='result'/>
- </message>
-
- <portType name='PhoneBook'>
- <operation name='lookup'>
- <input message='tns:PhoneBook_lookup'/>
- <output message='tns:PhoneBook_lookupResponse'/>
- </operation>
- </portType>
- <binding name='PhoneBookBinding' type='tns:PhoneBook'>
- <soap:binding style='document' transport='http://schemas.xmlsoap.org/soap/http'/>
- <operation name='lookup'>
- <soap:operation soapAction=''/>
- <input>
- <soap:body use='literal'/>
- </input>
- <output>
- <soap:body use='literal'/>
- </output>
- </operation>
- </binding>
- <service name='PhoneBook'>
- <port binding='tns:PhoneBookBinding' name='PhoneBookPort'>
- <soap:address location='REPLACE_WITH_ACTUAL_URL'/>
- </port>
- </service>
-</definitions>
Copied: legacy/branches/jbossws-1.2.1.GA_JBWS-1788/jbossws-tests/src/resources/tools/jbws1453/PhoneBook.wsdl (from rev 4377, stack/native/branches/native-2.0/src/test/resources/tools/jbws1453/PhoneBook.wsdl)
===================================================================
--- legacy/branches/jbossws-1.2.1.GA_JBWS-1788/jbossws-tests/src/resources/tools/jbws1453/PhoneBook.wsdl (rev 0)
+++ legacy/branches/jbossws-1.2.1.GA_JBWS-1788/jbossws-tests/src/resources/tools/jbws1453/PhoneBook.wsdl 2007-08-15 19:29:52 UTC (rev 4382)
@@ -0,0 +1,78 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<definitions name='PhoneBook' targetNamespace='http://test.jboss.org/ws/jbws1453'
+ xmlns='http://schemas.xmlsoap.org/wsdl/'
+ xmlns:ns1='http://test.jboss.org/ws/jbws1453/types'
+ xmlns:soap='http://schemas.xmlsoap.org/wsdl/soap/'
+ xmlns:tns='http://test.jboss.org/ws/jbws1453'
+ xmlns:xsd='http://www.w3.org/2001/XMLSchema'>
+
+ <types>
+ <schema targetNamespace='http://test.jboss.org/ws/jbws1453/types'
+ xmlns='http://www.w3.org/2001/XMLSchema'
+ xmlns:soap11-enc='http://schemas.xmlsoap.org/soap/encoding/'
+ xmlns:tns='http://test.jboss.org/ws/jbws1453/types'
+ xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance'>
+
+ <complexType name='A.Person'>
+ <sequence>
+ <element name='surname' nillable='true' type='string'/>
+ <element name='nickName' nillable='true' type='tns:Nick.Name'/>
+ </sequence>
+ </complexType>
+
+ <complexType name='Nick.Name'>
+ <sequence>
+ <element name='name' nillable='true' type='string'/>
+ </sequence>
+ </complexType>
+
+ <complexType name='A.Message'>
+ <sequence>
+ <element name='message' nillable='true' type='string'/>
+ </sequence>
+ </complexType>
+
+ <complexType name='Telephone.Number'>
+ <sequence>
+ <element name='number' nillable='true' type='string'/>
+ <element name='message' nillable='true' type='tns:A.Message'/>
+ </sequence>
+ </complexType>
+
+ <element name='lookup' type='tns:A.Person'/>
+ <element name='lookupResponse' type='tns:Telephone.Number'/>
+
+ </schema>
+ </types>
+
+ <message name='PhoneBook_lookup'>
+ <part element='ns1:lookup' name='parameters'/>
+ </message>
+ <message name='PhoneBook_lookupResponse'>
+ <part element='ns1:lookupResponse' name='result'/>
+ </message>
+
+ <portType name='PhoneBook'>
+ <operation name='lookup'>
+ <input message='tns:PhoneBook_lookup'/>
+ <output message='tns:PhoneBook_lookupResponse'/>
+ </operation>
+ </portType>
+ <binding name='PhoneBookBinding' type='tns:PhoneBook'>
+ <soap:binding style='document' transport='http://schemas.xmlsoap.org/soap/http'/>
+ <operation name='lookup'>
+ <soap:operation soapAction=''/>
+ <input>
+ <soap:body use='literal'/>
+ </input>
+ <output>
+ <soap:body use='literal'/>
+ </output>
+ </operation>
+ </binding>
+ <service name='PhoneBook'>
+ <port binding='tns:PhoneBookBinding' name='PhoneBookPort'>
+ <soap:address location='REPLACE_WITH_ACTUAL_URL'/>
+ </port>
+ </service>
+</definitions>
Deleted: legacy/branches/jbossws-1.2.1.GA_JBWS-1788/jbossws-tests/src/resources/tools/jbws1453/PhoneBook_PortType.java
===================================================================
--- stack/native/branches/native-2.0/src/test/resources/tools/jbws1453/PhoneBook_PortType.java 2007-08-15 14:58:17 UTC (rev 4377)
+++ legacy/branches/jbossws-1.2.1.GA_JBWS-1788/jbossws-tests/src/resources/tools/jbws1453/PhoneBook_PortType.java 2007-08-15 19:29:52 UTC (rev 4382)
@@ -1,15 +0,0 @@
-/*
- * JBossWS WS-Tools Generated Source
- *
- * Generation Date: Wed Aug 15 15:16:31 BST 2007
- *
- * This generated source code represents a derivative work of the input to
- * the generator that produced it. Consult the input for the copyright and
- * terms of use that apply to this source code.
- */
-package org.jboss.test.ws.jbws1453;
-public interface PhoneBook_PortType extends java.rmi.Remote
-{
-
- public org.jboss.test.ws.jbws1453.Telephone_Number lookup(org.jboss.test.ws.jbws1453.A_Person lookup) throws java.rmi.RemoteException;
-}
Copied: legacy/branches/jbossws-1.2.1.GA_JBWS-1788/jbossws-tests/src/resources/tools/jbws1453/PhoneBook_PortType.java (from rev 4377, stack/native/branches/native-2.0/src/test/resources/tools/jbws1453/PhoneBook_PortType.java)
===================================================================
--- legacy/branches/jbossws-1.2.1.GA_JBWS-1788/jbossws-tests/src/resources/tools/jbws1453/PhoneBook_PortType.java (rev 0)
+++ legacy/branches/jbossws-1.2.1.GA_JBWS-1788/jbossws-tests/src/resources/tools/jbws1453/PhoneBook_PortType.java 2007-08-15 19:29:52 UTC (rev 4382)
@@ -0,0 +1,15 @@
+/*
+ * JBossWS WS-Tools Generated Source
+ *
+ * Generation Date: Wed Aug 15 15:16:31 BST 2007
+ *
+ * This generated source code represents a derivative work of the input to
+ * the generator that produced it. Consult the input for the copyright and
+ * terms of use that apply to this source code.
+ */
+package org.jboss.test.ws.jbws1453;
+public interface PhoneBook_PortType extends java.rmi.Remote
+{
+
+ public org.jboss.test.ws.jbws1453.Telephone_Number lookup(org.jboss.test.ws.jbws1453.A_Person lookup) throws java.rmi.RemoteException;
+}
Deleted: legacy/branches/jbossws-1.2.1.GA_JBWS-1788/jbossws-tests/src/resources/tools/jbws1453/Telephone_Number.java
===================================================================
--- stack/native/branches/native-2.0/src/test/resources/tools/jbws1453/Telephone_Number.java 2007-08-15 14:58:17 UTC (rev 4377)
+++ legacy/branches/jbossws-1.2.1.GA_JBWS-1788/jbossws-tests/src/resources/tools/jbws1453/Telephone_Number.java 2007-08-15 19:29:52 UTC (rev 4382)
@@ -1,34 +0,0 @@
-/*
- * JBossWS WS-Tools Generated Source
- *
- * Generation Date: Wed Aug 15 15:16:31 BST 2007
- *
- * This generated source code represents a derivative work of the input to
- * the generator that produced it. Consult the input for the copyright and
- * terms of use that apply to this source code.
- */
-
-package org.jboss.test.ws.jbws1453;
-
-
-public class Telephone_Number
-{
-
-protected java.lang.String number;
-
-protected org.jboss.test.ws.jbws1453.A_Message message;
-public Telephone_Number(){}
-
-public Telephone_Number(java.lang.String number, org.jboss.test.ws.jbws1453.A_Message message){
-this.number=number;
-this.message=message;
-}
-public java.lang.String getNumber() { return number ;}
-
-public void setNumber(java.lang.String number){ this.number=number; }
-
-public org.jboss.test.ws.jbws1453.A_Message getMessage() { return message ;}
-
-public void setMessage(org.jboss.test.ws.jbws1453.A_Message message){ this.message=message; }
-
-}
Copied: legacy/branches/jbossws-1.2.1.GA_JBWS-1788/jbossws-tests/src/resources/tools/jbws1453/Telephone_Number.java (from rev 4377, stack/native/branches/native-2.0/src/test/resources/tools/jbws1453/Telephone_Number.java)
===================================================================
--- legacy/branches/jbossws-1.2.1.GA_JBWS-1788/jbossws-tests/src/resources/tools/jbws1453/Telephone_Number.java (rev 0)
+++ legacy/branches/jbossws-1.2.1.GA_JBWS-1788/jbossws-tests/src/resources/tools/jbws1453/Telephone_Number.java 2007-08-15 19:29:52 UTC (rev 4382)
@@ -0,0 +1,34 @@
+/*
+ * JBossWS WS-Tools Generated Source
+ *
+ * Generation Date: Wed Aug 15 15:16:31 BST 2007
+ *
+ * This generated source code represents a derivative work of the input to
+ * the generator that produced it. Consult the input for the copyright and
+ * terms of use that apply to this source code.
+ */
+
+package org.jboss.test.ws.jbws1453;
+
+
+public class Telephone_Number
+{
+
+protected java.lang.String number;
+
+protected org.jboss.test.ws.jbws1453.A_Message message;
+public Telephone_Number(){}
+
+public Telephone_Number(java.lang.String number, org.jboss.test.ws.jbws1453.A_Message message){
+this.number=number;
+this.message=message;
+}
+public java.lang.String getNumber() { return number ;}
+
+public void setNumber(java.lang.String number){ this.number=number; }
+
+public org.jboss.test.ws.jbws1453.A_Message getMessage() { return message ;}
+
+public void setMessage(org.jboss.test.ws.jbws1453.A_Message message){ this.message=message; }
+
+}
Deleted: legacy/branches/jbossws-1.2.1.GA_JBWS-1788/jbossws-tests/src/resources/tools/jbws1453/jaxrpc-mapping.xml
===================================================================
--- stack/native/branches/native-2.0/src/test/resources/tools/jbws1453/jaxrpc-mapping.xml 2007-08-15 14:58:17 UTC (rev 4377)
+++ legacy/branches/jbossws-1.2.1.GA_JBWS-1788/jbossws-tests/src/resources/tools/jbws1453/jaxrpc-mapping.xml 2007-08-15 19:29:52 UTC (rev 4382)
@@ -1,85 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?><java-wsdl-mapping version='1.1' xmlns='http://java.sun.com/xml/ns/j2ee' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xsi:schemaLocation='http://java.sun.com/xml/ns/j2ee http://www.ibm.com/webservices/xsd/j2ee_jaxrpc_mapping_1_1.xsd'>
- <package-mapping>
- <package-type>org.jboss.test.ws.jbws1453</package-type>
- <namespaceURI>http://test.jboss.org/ws/jbws1453/types</namespaceURI>
- </package-mapping>
- <package-mapping>
- <package-type>org.jboss.test.ws.jbws1453</package-type>
- <namespaceURI>http://test.jboss.org/ws/jbws1453</namespaceURI>
- </package-mapping>
- <java-xml-type-mapping>
- <java-type>org.jboss.test.ws.jbws1453.A_Person</java-type>
- <root-type-qname xmlns:typeNS='http://test.jboss.org/ws/jbws1453/types'>typeNS:A.Person</root-type-qname>
- <qname-scope>complexType</qname-scope>
- <variable-mapping>
- <java-variable-name>surname</java-variable-name>
- <xml-element-name>surname</xml-element-name>
- </variable-mapping>
- <variable-mapping>
- <java-variable-name>nickName</java-variable-name>
- <xml-element-name>nickName</xml-element-name>
- </variable-mapping>
- </java-xml-type-mapping>
- <java-xml-type-mapping>
- <java-type>org.jboss.test.ws.jbws1453.Nick_Name</java-type>
- <root-type-qname xmlns:typeNS='http://test.jboss.org/ws/jbws1453/types'>typeNS:Nick.Name</root-type-qname>
- <qname-scope>complexType</qname-scope>
- <variable-mapping>
- <java-variable-name>name</java-variable-name>
- <xml-element-name>name</xml-element-name>
- </variable-mapping>
- </java-xml-type-mapping>
- <java-xml-type-mapping>
- <java-type>org.jboss.test.ws.jbws1453.Telephone_Number</java-type>
- <root-type-qname xmlns:typeNS='http://test.jboss.org/ws/jbws1453/types'>typeNS:Telephone.Number</root-type-qname>
- <qname-scope>complexType</qname-scope>
- <variable-mapping>
- <java-variable-name>number</java-variable-name>
- <xml-element-name>number</xml-element-name>
- </variable-mapping>
- <variable-mapping>
- <java-variable-name>message</java-variable-name>
- <xml-element-name>message</xml-element-name>
- </variable-mapping>
- </java-xml-type-mapping>
- <java-xml-type-mapping>
- <java-type>org.jboss.test.ws.jbws1453.A_Message</java-type>
- <root-type-qname xmlns:typeNS='http://test.jboss.org/ws/jbws1453/types'>typeNS:A.Message</root-type-qname>
- <qname-scope>complexType</qname-scope>
- <variable-mapping>
- <java-variable-name>message</java-variable-name>
- <xml-element-name>message</xml-element-name>
- </variable-mapping>
- </java-xml-type-mapping>
- <service-interface-mapping>
- <service-interface>org.jboss.test.ws.jbws1453.PhoneBook_Service</service-interface>
- <wsdl-service-name xmlns:serviceNS='http://test.jboss.org/ws/jbws1453'>serviceNS:PhoneBook</wsdl-service-name>
- <port-mapping>
- <port-name>PhoneBookPort</port-name>
- <java-port-name>PhoneBookPort</java-port-name>
- </port-mapping>
- </service-interface-mapping>
- <service-endpoint-interface-mapping>
- <service-endpoint-interface>org.jboss.test.ws.jbws1453.PhoneBook_PortType</service-endpoint-interface>
- <wsdl-port-type xmlns:portTypeNS='http://test.jboss.org/ws/jbws1453'>portTypeNS:PhoneBook</wsdl-port-type>
- <wsdl-binding xmlns:bindingNS='http://test.jboss.org/ws/jbws1453'>bindingNS:PhoneBookBinding</wsdl-binding>
- <service-endpoint-method-mapping>
- <java-method-name>lookup</java-method-name>
- <wsdl-operation>lookup</wsdl-operation>
- <method-param-parts-mapping>
- <param-position>0</param-position>
- <param-type>org.jboss.test.ws.jbws1453.A_Person</param-type>
- <wsdl-message-mapping>
- <wsdl-message xmlns:wsdlMsgNS='http://test.jboss.org/ws/jbws1453'>wsdlMsgNS:PhoneBook_lookup</wsdl-message>
- <wsdl-message-part-name>parameters</wsdl-message-part-name>
- <parameter-mode>IN</parameter-mode>
- </wsdl-message-mapping>
- </method-param-parts-mapping>
- <wsdl-return-value-mapping>
- <method-return-value>org.jboss.test.ws.jbws1453.Telephone_Number</method-return-value>
- <wsdl-message xmlns:wsdlMsgNS='http://test.jboss.org/ws/jbws1453'>wsdlMsgNS:PhoneBook_lookupResponse</wsdl-message>
- <wsdl-message-part-name>result</wsdl-message-part-name>
- </wsdl-return-value-mapping>
- </service-endpoint-method-mapping>
- </service-endpoint-interface-mapping>
-</java-wsdl-mapping>
\ No newline at end of file
Copied: legacy/branches/jbossws-1.2.1.GA_JBWS-1788/jbossws-tests/src/resources/tools/jbws1453/jaxrpc-mapping.xml (from rev 4377, stack/native/branches/native-2.0/src/test/resources/tools/jbws1453/jaxrpc-mapping.xml)
===================================================================
--- legacy/branches/jbossws-1.2.1.GA_JBWS-1788/jbossws-tests/src/resources/tools/jbws1453/jaxrpc-mapping.xml (rev 0)
+++ legacy/branches/jbossws-1.2.1.GA_JBWS-1788/jbossws-tests/src/resources/tools/jbws1453/jaxrpc-mapping.xml 2007-08-15 19:29:52 UTC (rev 4382)
@@ -0,0 +1,85 @@
+<?xml version='1.0' encoding='UTF-8'?><java-wsdl-mapping version='1.1' xmlns='http://java.sun.com/xml/ns/j2ee' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xsi:schemaLocation='http://java.sun.com/xml/ns/j2ee http://www.ibm.com/webservices/xsd/j2ee_jaxrpc_mapping_1_1.xsd'>
+ <package-mapping>
+ <package-type>org.jboss.test.ws.jbws1453</package-type>
+ <namespaceURI>http://test.jboss.org/ws/jbws1453/types</namespaceURI>
+ </package-mapping>
+ <package-mapping>
+ <package-type>org.jboss.test.ws.jbws1453</package-type>
+ <namespaceURI>http://test.jboss.org/ws/jbws1453</namespaceURI>
+ </package-mapping>
+ <java-xml-type-mapping>
+ <java-type>org.jboss.test.ws.jbws1453.A_Person</java-type>
+ <root-type-qname xmlns:typeNS='http://test.jboss.org/ws/jbws1453/types'>typeNS:A.Person</root-type-qname>
+ <qname-scope>complexType</qname-scope>
+ <variable-mapping>
+ <java-variable-name>surname</java-variable-name>
+ <xml-element-name>surname</xml-element-name>
+ </variable-mapping>
+ <variable-mapping>
+ <java-variable-name>nickName</java-variable-name>
+ <xml-element-name>nickName</xml-element-name>
+ </variable-mapping>
+ </java-xml-type-mapping>
+ <java-xml-type-mapping>
+ <java-type>org.jboss.test.ws.jbws1453.Nick_Name</java-type>
+ <root-type-qname xmlns:typeNS='http://test.jboss.org/ws/jbws1453/types'>typeNS:Nick.Name</root-type-qname>
+ <qname-scope>complexType</qname-scope>
+ <variable-mapping>
+ <java-variable-name>name</java-variable-name>
+ <xml-element-name>name</xml-element-name>
+ </variable-mapping>
+ </java-xml-type-mapping>
+ <java-xml-type-mapping>
+ <java-type>org.jboss.test.ws.jbws1453.Telephone_Number</java-type>
+ <root-type-qname xmlns:typeNS='http://test.jboss.org/ws/jbws1453/types'>typeNS:Telephone.Number</root-type-qname>
+ <qname-scope>complexType</qname-scope>
+ <variable-mapping>
+ <java-variable-name>number</java-variable-name>
+ <xml-element-name>number</xml-element-name>
+ </variable-mapping>
+ <variable-mapping>
+ <java-variable-name>message</java-variable-name>
+ <xml-element-name>message</xml-element-name>
+ </variable-mapping>
+ </java-xml-type-mapping>
+ <java-xml-type-mapping>
+ <java-type>org.jboss.test.ws.jbws1453.A_Message</java-type>
+ <root-type-qname xmlns:typeNS='http://test.jboss.org/ws/jbws1453/types'>typeNS:A.Message</root-type-qname>
+ <qname-scope>complexType</qname-scope>
+ <variable-mapping>
+ <java-variable-name>message</java-variable-name>
+ <xml-element-name>message</xml-element-name>
+ </variable-mapping>
+ </java-xml-type-mapping>
+ <service-interface-mapping>
+ <service-interface>org.jboss.test.ws.jbws1453.PhoneBook_Service</service-interface>
+ <wsdl-service-name xmlns:serviceNS='http://test.jboss.org/ws/jbws1453'>serviceNS:PhoneBook</wsdl-service-name>
+ <port-mapping>
+ <port-name>PhoneBookPort</port-name>
+ <java-port-name>PhoneBookPort</java-port-name>
+ </port-mapping>
+ </service-interface-mapping>
+ <service-endpoint-interface-mapping>
+ <service-endpoint-interface>org.jboss.test.ws.jbws1453.PhoneBook_PortType</service-endpoint-interface>
+ <wsdl-port-type xmlns:portTypeNS='http://test.jboss.org/ws/jbws1453'>portTypeNS:PhoneBook</wsdl-port-type>
+ <wsdl-binding xmlns:bindingNS='http://test.jboss.org/ws/jbws1453'>bindingNS:PhoneBookBinding</wsdl-binding>
+ <service-endpoint-method-mapping>
+ <java-method-name>lookup</java-method-name>
+ <wsdl-operation>lookup</wsdl-operation>
+ <method-param-parts-mapping>
+ <param-position>0</param-position>
+ <param-type>org.jboss.test.ws.jbws1453.A_Person</param-type>
+ <wsdl-message-mapping>
+ <wsdl-message xmlns:wsdlMsgNS='http://test.jboss.org/ws/jbws1453'>wsdlMsgNS:PhoneBook_lookup</wsdl-message>
+ <wsdl-message-part-name>parameters</wsdl-message-part-name>
+ <parameter-mode>IN</parameter-mode>
+ </wsdl-message-mapping>
+ </method-param-parts-mapping>
+ <wsdl-return-value-mapping>
+ <method-return-value>org.jboss.test.ws.jbws1453.Telephone_Number</method-return-value>
+ <wsdl-message xmlns:wsdlMsgNS='http://test.jboss.org/ws/jbws1453'>wsdlMsgNS:PhoneBook_lookupResponse</wsdl-message>
+ <wsdl-message-part-name>result</wsdl-message-part-name>
+ </wsdl-return-value-mapping>
+ </service-endpoint-method-mapping>
+ </service-endpoint-interface-mapping>
+</java-wsdl-mapping>
\ No newline at end of file
Deleted: legacy/branches/jbossws-1.2.1.GA_JBWS-1788/jbossws-tests/src/resources/tools/jbws1453/wstools-config.xml
===================================================================
--- stack/native/branches/native-2.0/src/test/resources/tools/jbws1453/wstools-config.xml 2007-08-15 14:58:17 UTC (rev 4377)
+++ legacy/branches/jbossws-1.2.1.GA_JBWS-1788/jbossws-tests/src/resources/tools/jbws1453/wstools-config.xml 2007-08-15 19:29:52 UTC (rev 4382)
@@ -1,5 +0,0 @@
-<configuration>
- <wsdl-java location="resources/tools/jbws1453/PhoneBook.wsdl" parameter-style="bare">
- <mapping file="jaxrpc-mapping.xml"/>
- </wsdl-java>
-</configuration>
Copied: legacy/branches/jbossws-1.2.1.GA_JBWS-1788/jbossws-tests/src/resources/tools/jbws1453/wstools-config.xml (from rev 4377, stack/native/branches/native-2.0/src/test/resources/tools/jbws1453/wstools-config.xml)
===================================================================
--- legacy/branches/jbossws-1.2.1.GA_JBWS-1788/jbossws-tests/src/resources/tools/jbws1453/wstools-config.xml (rev 0)
+++ legacy/branches/jbossws-1.2.1.GA_JBWS-1788/jbossws-tests/src/resources/tools/jbws1453/wstools-config.xml 2007-08-15 19:29:52 UTC (rev 4382)
@@ -0,0 +1,5 @@
+<configuration>
+ <wsdl-java location="resources/tools/jbws1453/PhoneBook.wsdl" parameter-style="bare">
+ <mapping file="jaxrpc-mapping.xml"/>
+ </wsdl-java>
+</configuration>
17 years, 4 months
- 1
- 0
JBossWS SVN: r4381 - legacy/branches.
by jbossws-commits＠lists.jboss.org
Author: darran.lofthouse(a)jboss.com
Date: 2007-08-15 11:59:00 -0400 (Wed, 15 Aug 2007)
New Revision: 4381
Added:
legacy/branches/jbossws-1.2.1.GA_JBWS-1788/
Log:
Branch for JBWS-1788
Copied: legacy/branches/jbossws-1.2.1.GA_JBWS-1788 (from rev 4380, legacy/branches/jbossws-1.2.1.GA_JBWS-1768)
17 years, 4 months
- 1
- 0
JBossWS SVN: r4380 - stack/native/branches/native-2.0.
by jbossws-commits＠lists.jboss.org
Author: darran.lofthouse(a)jboss.com
Date: 2007-08-15 11:43:28 -0400 (Wed, 15 Aug 2007)
New Revision: 4380
Modified:
stack/native/branches/native-2.0/mergeinfo.txt
Log:
[JBWS-1453] - WSDL To Java - Invalid name for generated class if complex type name contains a period.
Modified: stack/native/branches/native-2.0/mergeinfo.txt
===================================================================
--- stack/native/branches/native-2.0/mergeinfo.txt 2007-08-15 15:43:12 UTC (rev 4379)
+++ stack/native/branches/native-2.0/mergeinfo.txt 2007-08-15 15:43:28 UTC (rev 4380)
@@ -31,3 +31,6 @@
richard.opalka(a)jboss.com 14-Aug-2007
svn merge -r4326:4329 https://svn.jboss.org/repos/jbossws/stack/native/branches/native-2.0
svn merge -r4357:4358 https://svn.jboss.org/repos/jbossws/stack/native/branches/native-2.0
+
+darran.lofthouse(a)jboss.com 15-August-2007
+svn merge -r4376:4377 https://svn.jboss.org/repos/jbossws/stack/native/branches/native-2.0
17 years, 4 months
- 1
- 0
JBossWS SVN: r4379 - in stack/native/trunk: ant-import and 9 other directories.
by jbossws-commits＠lists.jboss.org
Author: darran.lofthouse(a)jboss.com
Date: 2007-08-15 11:43:12 -0400 (Wed, 15 Aug 2007)
New Revision: 4379
Added:
stack/native/trunk/src/test/java/org/jboss/test/ws/tools/jbws1453/
stack/native/trunk/src/test/java/org/jboss/test/ws/tools/jbws1453/JBWS1453TestCase.java
stack/native/trunk/src/test/resources/tools/jbws1453/
stack/native/trunk/src/test/resources/tools/jbws1453/A_Message.java
stack/native/trunk/src/test/resources/tools/jbws1453/A_Person.java
stack/native/trunk/src/test/resources/tools/jbws1453/Nick_Name.java
stack/native/trunk/src/test/resources/tools/jbws1453/PhoneBook.wsdl
stack/native/trunk/src/test/resources/tools/jbws1453/PhoneBook_PortType.java
stack/native/trunk/src/test/resources/tools/jbws1453/Telephone_Number.java
stack/native/trunk/src/test/resources/tools/jbws1453/jaxrpc-mapping.xml
stack/native/trunk/src/test/resources/tools/jbws1453/wstools-config.xml
Removed:
stack/native/trunk/src/test/java/org/jboss/test/ws/tools/jbws1453/JBWS1453TestCase.java
stack/native/trunk/src/test/resources/tools/jbws1453/A_Message.java
stack/native/trunk/src/test/resources/tools/jbws1453/A_Person.java
stack/native/trunk/src/test/resources/tools/jbws1453/Nick_Name.java
stack/native/trunk/src/test/resources/tools/jbws1453/PhoneBook.wsdl
stack/native/trunk/src/test/resources/tools/jbws1453/PhoneBook_PortType.java
stack/native/trunk/src/test/resources/tools/jbws1453/Telephone_Number.java
stack/native/trunk/src/test/resources/tools/jbws1453/jaxrpc-mapping.xml
stack/native/trunk/src/test/resources/tools/jbws1453/wstools-config.xml
Modified:
stack/native/trunk/.classpath
stack/native/trunk/ant-import/build-thirdparty.xml
stack/native/trunk/src/main/java/org/jboss/ws/core/binding/BufferedStreamResult.java
stack/native/trunk/src/main/java/org/jboss/ws/core/binding/DeserializerSupport.java
stack/native/trunk/src/main/java/org/jboss/ws/core/jaxrpc/binding/BufferedStreamSource.java
stack/native/trunk/src/main/java/org/jboss/ws/core/soap/XMLFragment.java
stack/native/trunk/src/main/java/org/jboss/ws/tools/WSDLToJava.java
stack/native/trunk/src/main/java/org/jboss/ws/tools/XSDTypeToJava.java
stack/native/trunk/src/main/java/org/jboss/ws/tools/helpers/MappingFileGeneratorHelper.java
Log:
[JBWS-1453] - WSDL To Java - Invalid name for generated class if complex type name contains a period.
Modified: stack/native/trunk/.classpath
===================================================================
--- stack/native/trunk/.classpath 2007-08-15 15:20:34 UTC (rev 4378)
+++ stack/native/trunk/.classpath 2007-08-15 15:43:12 UTC (rev 4379)
@@ -38,8 +38,5 @@
<classpathentry combineaccessrules="false" kind="src" path="/spi"/>
<classpathentry combineaccessrules="false" kind="src" path="/common"/>
<classpathentry kind="lib" path="thirdparty/junit.jar"/>
- <classpathentry kind="lib" path="thirdparty/ejb3.deployer/jboss-ejb3x.jar"/>
- <classpathentry kind="lib" path="thirdparty/ejb3.deployer/jboss-ejb3.jar"/>
- <classpathentry kind="lib" path="thirdparty/ejb3.deployer/jboss-ejb3.jar"/>
<classpathentry kind="output" path="output/eclipse"/>
</classpath>
Modified: stack/native/trunk/ant-import/build-thirdparty.xml
===================================================================
--- stack/native/trunk/ant-import/build-thirdparty.xml 2007-08-15 15:20:34 UTC (rev 4378)
+++ stack/native/trunk/ant-import/build-thirdparty.xml 2007-08-15 15:43:12 UTC (rev 4379)
@@ -143,8 +143,8 @@
<pathelement location="${thirdparty.dir}/ejb3.deployer/jboss-annotations-ejb3.jar"/>
<pathelement location="${thirdparty.dir}/ejb3.deployer/jboss-ejb3x.jar"/>
- <pathelement location="${thirdparty.dir}/ant.jar"/>
- <pathelement location="${thirdparty.dir}/activation.jar"/>
+ <pathelement location="${thirdparty.dir}/ant.jar"/>
+ <pathelement location="${thirdparty.dir}/activation.jar"/>
<pathelement location="${thirdparty.dir}/dom4j.jar"/>
<pathelement location="${thirdparty.dir}/getopt.jar"/>
<pathelement location="${thirdparty.dir}/javassist.jar"/>
Modified: stack/native/trunk/src/main/java/org/jboss/ws/core/binding/BufferedStreamResult.java
===================================================================
--- stack/native/trunk/src/main/java/org/jboss/ws/core/binding/BufferedStreamResult.java 2007-08-15 15:20:34 UTC (rev 4378)
+++ stack/native/trunk/src/main/java/org/jboss/ws/core/binding/BufferedStreamResult.java 2007-08-15 15:43:12 UTC (rev 4379)
@@ -27,7 +27,6 @@
import java.io.ByteArrayOutputStream;
import java.io.IOException;
import java.io.OutputStream;
-import java.io.UnsupportedEncodingException;
import java.io.Writer;
import javax.xml.transform.stream.StreamResult;
@@ -52,7 +51,7 @@
{
try
{
- IOUtils.copyStream(getOutputStream(), new ByteArrayInputStream(xmlFragment.getBytes("UTF-8")));
+ IOUtils.copyStream(getOutputStream(), new ByteArrayInputStream(xmlFragment.getBytes()));
}
catch (IOException e)
{
@@ -86,16 +85,6 @@
public String toString()
{
- String result = null;
- try
- {
- result = baos.toString("UTF-8");
- }
- catch (UnsupportedEncodingException e)
- {
- WSException.rethrow(e);
- }
-
- return result;
+ return baos.toString();
}
}
Modified: stack/native/trunk/src/main/java/org/jboss/ws/core/binding/DeserializerSupport.java
===================================================================
--- stack/native/trunk/src/main/java/org/jboss/ws/core/binding/DeserializerSupport.java 2007-08-15 15:20:34 UTC (rev 4378)
+++ stack/native/trunk/src/main/java/org/jboss/ws/core/binding/DeserializerSupport.java 2007-08-15 15:43:12 UTC (rev 4379)
@@ -24,7 +24,6 @@
// $Id$
import java.io.ByteArrayOutputStream;
-import java.io.UnsupportedEncodingException;
import javax.xml.namespace.QName;
import javax.xml.rpc.encoding.Deserializer;
@@ -98,7 +97,7 @@
ByteArrayOutputStream baos = new ByteArrayOutputStream(1024);
StreamResult streamResult = new StreamResult(baos);
tf.newTransformer().transform(source, streamResult);
- xmlFragment = new String(baos.toByteArray(),"UTF-8");
+ xmlFragment = new String(baos.toByteArray());
if (xmlFragment.startsWith("<?xml"))
{
int index = xmlFragment.indexOf(">");
@@ -110,10 +109,6 @@
{
WSException.rethrow(e);
}
- catch (UnsupportedEncodingException e)
- {
- WSException.rethrow(e);
- }
return xmlFragment;
}
Modified: stack/native/trunk/src/main/java/org/jboss/ws/core/jaxrpc/binding/BufferedStreamSource.java
===================================================================
--- stack/native/trunk/src/main/java/org/jboss/ws/core/jaxrpc/binding/BufferedStreamSource.java 2007-08-15 15:20:34 UTC (rev 4378)
+++ stack/native/trunk/src/main/java/org/jboss/ws/core/jaxrpc/binding/BufferedStreamSource.java 2007-08-15 15:43:12 UTC (rev 4379)
@@ -30,7 +30,6 @@
import java.io.IOException;
import java.io.InputStream;
import java.io.Reader;
-import java.io.UnsupportedEncodingException;
import javax.xml.transform.stream.StreamSource;
@@ -113,16 +112,7 @@
{
String retStr = null;
if (bytes != null)
- {
- try
- {
- retStr = new String(bytes, "UTF-8");
- }
- catch (UnsupportedEncodingException e)
- {
- WSException.rethrow(e);
- }
- }
+ retStr = new String(bytes);
else if (chars != null)
retStr = new String(chars);
return "" + retStr;
Modified: stack/native/trunk/src/main/java/org/jboss/ws/core/soap/XMLFragment.java
===================================================================
--- stack/native/trunk/src/main/java/org/jboss/ws/core/soap/XMLFragment.java 2007-08-15 15:20:34 UTC (rev 4378)
+++ stack/native/trunk/src/main/java/org/jboss/ws/core/soap/XMLFragment.java 2007-08-15 15:43:12 UTC (rev 4379)
@@ -177,7 +177,7 @@
Reader reader = streamSource.getReader();
{
if (reader == null)
- reader = new InputStreamReader(streamSource.getInputStream(), "UTF-8");
+ reader = new InputStreamReader(streamSource.getInputStream());
}
char[] cbuf = new char[1024];
Modified: stack/native/trunk/src/main/java/org/jboss/ws/tools/WSDLToJava.java
===================================================================
--- stack/native/trunk/src/main/java/org/jboss/ws/tools/WSDLToJava.java 2007-08-15 15:20:34 UTC (rev 4378)
+++ stack/native/trunk/src/main/java/org/jboss/ws/tools/WSDLToJava.java 2007-08-15 15:43:12 UTC (rev 4379)
@@ -626,6 +626,7 @@
if (className.charAt(0) == '>')
className = className.substring(1);
+ className = ToolsUtils.convertInvalidCharacters(className);
className = utils.firstLetterUpperCase(className);
className = seiPkgName + "." + className + arraySuffix;
@@ -666,9 +667,9 @@
//Check if the portType name conflicts with a service name
if (wsdl.getService(seiName) != null)
seiName += "_PortType";
-
+
seiName = JavaUtils.capitalize(seiName);
-
+
return seiName;
}
@@ -748,6 +749,7 @@
if (className.charAt(0) == '>')
className = className.substring(1);
+ className = ToolsUtils.convertInvalidCharacters(className);
className = utils.firstLetterUpperCase(className);
return seiPkgName + "." + className + arraySuffix;
}
Modified: stack/native/trunk/src/main/java/org/jboss/ws/tools/XSDTypeToJava.java
===================================================================
--- stack/native/trunk/src/main/java/org/jboss/ws/tools/XSDTypeToJava.java 2007-08-15 15:20:34 UTC (rev 4378)
+++ stack/native/trunk/src/main/java/org/jboss/ws/tools/XSDTypeToJava.java 2007-08-15 15:43:12 UTC (rev 4379)
@@ -131,6 +131,8 @@
if (typeMapping == null)
throw new WSException("TypeMapping has not been set");
XSTypeDefinition baseType = type.getBaseType();
+ // Ensure the characters in the name are valid
+ fname = ToolsUtils.convertInvalidCharacters(fname);
//Ensure that the first character is uppercase
fname = utils.firstLetterUpperCase(fname);
List vars = new ArrayList();
@@ -535,13 +537,9 @@
// Handle xsd:any elements
if (xsterm instanceof XSWildcard)
{
- XSWildcard xsw = (XSWildcard)xsterm;
- // if (xsw.getConstraintType() == XSWildcard.NSCONSTRAINT_ANY)
- // {
VAR v = new VAR("_any", "javax.xml.soap.SOAPElement", arrayType);
vars.add(v);
return vars;
- // }
}
// Handle xsd:group
@@ -636,7 +634,7 @@
if (xstypename != null && xstypedef instanceof XSComplexTypeDefinition)
{
- this.fname = utils.firstLetterUpperCase(xstypename);
+ this.fname = ToolsUtils.convertInvalidCharacters(utils.firstLetterUpperCase(xstypename));
if (!generatedFiles.contains(this.fname))
{
generatedFiles.add(this.fname);
@@ -681,7 +679,7 @@
String nsuri = typename.getNamespaceURI();
if (!nsuri.equals(Constants.NS_SCHEMA_XSD))
qualifiedClassName = pkgname + ".";
- String className = wsdlUtils.firstLetterUpperCase(typename.getLocalPart());
+ String className = wsdlUtils.firstLetterUpperCase(ToolsUtils.convertInvalidCharacters(typename.getLocalPart()));
qualifiedClassName += className;
}
else if (qn != null)
Modified: stack/native/trunk/src/main/java/org/jboss/ws/tools/helpers/MappingFileGeneratorHelper.java
===================================================================
--- stack/native/trunk/src/main/java/org/jboss/ws/tools/helpers/MappingFileGeneratorHelper.java 2007-08-15 15:20:34 UTC (rev 4378)
+++ stack/native/trunk/src/main/java/org/jboss/ws/tools/helpers/MappingFileGeneratorHelper.java 2007-08-15 15:43:12 UTC (rev 4379)
@@ -878,6 +878,7 @@
String className = xmlType.getLocalPart();
if (className.charAt(0) == '>')
className = className.substring(1);
+ className = ToolsUtils.convertInvalidCharacters(className);
jtype = packageName + "." + utils.firstLetterUpperCase(className);
}
else
Copied: stack/native/trunk/src/test/java/org/jboss/test/ws/tools/jbws1453 (from rev 4377, stack/native/branches/native-2.0/src/test/java/org/jboss/test/ws/tools/jbws1453)
Deleted: stack/native/trunk/src/test/java/org/jboss/test/ws/tools/jbws1453/JBWS1453TestCase.java
===================================================================
--- stack/native/branches/native-2.0/src/test/java/org/jboss/test/ws/tools/jbws1453/JBWS1453TestCase.java 2007-08-15 14:58:17 UTC (rev 4377)
+++ stack/native/trunk/src/test/java/org/jboss/test/ws/tools/jbws1453/JBWS1453TestCase.java 2007-08-15 15:43:12 UTC (rev 4379)
@@ -1,105 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2007, JBoss Inc., and individual contributors as indicated
- * by the @authors tag. See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.test.ws.tools.jbws1453;
-
-import java.io.File;
-import java.io.FilenameFilter;
-
-import org.jboss.test.ws.tools.fixture.JBossSourceComparator;
-import org.jboss.test.ws.tools.validation.JaxrpcMappingValidator;
-import org.jboss.ws.tools.WSTools;
-import org.jboss.wsf.test.JBossWSTest;
-
-/**
- * Test case for http://jira.jboss.com/jira/browse/JBWS-1453
- *
- * WSDL To Java - Invalid name for generated class
- * if complex type name contains a period.
- *
- * @author darran.lofthouse(a)jboss.com
- * @since 15 August 2007
- */
-public class JBWS1453TestCase extends JBossWSTest
-{
- /**
- * Test generation of the SEI.
- *
- * @throws Exception
- */
- public void testGenerate() throws Exception
- {
- String resourceDir = "resources/tools/jbws1453";
- String toolsDir = "tools/jbws1453";
- String[] args = new String[] { "-dest", toolsDir, "-config", resourceDir + "/wstools-config.xml" };
- new WSTools().generate(args);
-
- File resourceDirFile = new File(resourceDir);
- String[] expectedFiles = resourceDirFile.list(new FilenameFilter() {
- public boolean accept(File dir, String name)
- {
- return name.endsWith(".java");
- }
- });
-
- for (int i = 0; i < expectedFiles.length; i++)
- {
- String currentFile = expectedFiles[i];
-
- try
- {
- compareSource(resourceDir + "/" + currentFile, toolsDir + "/org/jboss/test/ws/jbws1453/" + currentFile);
- }
- catch (Exception e)
- {
- throw new Exception("Validation of '" + currentFile + "' failed.", e);
- }
- }
-
- File packageDir = new File(toolsDir + "/org/jboss/test/ws/jbws1453");
- String[] generatedFiles = packageDir.list();
- for (int i = 0; i < generatedFiles.length; i++)
- {
- String currentFile = generatedFiles[i];
-
- boolean matched = "PhoneBookService.java".equals(currentFile);
-
- for (int j = 0; j < expectedFiles.length && (matched == false); j++)
- matched = currentFile.equals(expectedFiles[j]);
-
- assertTrue("File '" + currentFile + "' was not expected to be generated", matched);
- }
-
- JaxrpcMappingValidator mappingValidator = new JaxrpcMappingValidator();
- mappingValidator.validate(resourceDir + "/jaxrpc-mapping.xml", toolsDir + "/jaxrpc-mapping.xml");
-
- }
-
- private static void compareSource(final String expectedName, final String generatedName) throws Exception
- {
- File expected = new File(expectedName);
- File generated = new File(generatedName);
-
- JBossSourceComparator sc = new JBossSourceComparator(expected, generated);
- sc.validate();
- sc.validateImports();
- }
-}
Copied: stack/native/trunk/src/test/java/org/jboss/test/ws/tools/jbws1453/JBWS1453TestCase.java (from rev 4377, stack/native/branches/native-2.0/src/test/java/org/jboss/test/ws/tools/jbws1453/JBWS1453TestCase.java)
===================================================================
--- stack/native/trunk/src/test/java/org/jboss/test/ws/tools/jbws1453/JBWS1453TestCase.java (rev 0)
+++ stack/native/trunk/src/test/java/org/jboss/test/ws/tools/jbws1453/JBWS1453TestCase.java 2007-08-15 15:43:12 UTC (rev 4379)
@@ -0,0 +1,105 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2007, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.test.ws.tools.jbws1453;
+
+import java.io.File;
+import java.io.FilenameFilter;
+
+import org.jboss.test.ws.tools.fixture.JBossSourceComparator;
+import org.jboss.test.ws.tools.validation.JaxrpcMappingValidator;
+import org.jboss.ws.tools.WSTools;
+import org.jboss.wsf.test.JBossWSTest;
+
+/**
+ * Test case for http://jira.jboss.com/jira/browse/JBWS-1453
+ *
+ * WSDL To Java - Invalid name for generated class
+ * if complex type name contains a period.
+ *
+ * @author darran.lofthouse(a)jboss.com
+ * @since 15 August 2007
+ */
+public class JBWS1453TestCase extends JBossWSTest
+{
+ /**
+ * Test generation of the SEI.
+ *
+ * @throws Exception
+ */
+ public void testGenerate() throws Exception
+ {
+ String resourceDir = "resources/tools/jbws1453";
+ String toolsDir = "tools/jbws1453";
+ String[] args = new String[] { "-dest", toolsDir, "-config", resourceDir + "/wstools-config.xml" };
+ new WSTools().generate(args);
+
+ File resourceDirFile = new File(resourceDir);
+ String[] expectedFiles = resourceDirFile.list(new FilenameFilter() {
+ public boolean accept(File dir, String name)
+ {
+ return name.endsWith(".java");
+ }
+ });
+
+ for (int i = 0; i < expectedFiles.length; i++)
+ {
+ String currentFile = expectedFiles[i];
+
+ try
+ {
+ compareSource(resourceDir + "/" + currentFile, toolsDir + "/org/jboss/test/ws/jbws1453/" + currentFile);
+ }
+ catch (Exception e)
+ {
+ throw new Exception("Validation of '" + currentFile + "' failed.", e);
+ }
+ }
+
+ File packageDir = new File(toolsDir + "/org/jboss/test/ws/jbws1453");
+ String[] generatedFiles = packageDir.list();
+ for (int i = 0; i < generatedFiles.length; i++)
+ {
+ String currentFile = generatedFiles[i];
+
+ boolean matched = "PhoneBookService.java".equals(currentFile);
+
+ for (int j = 0; j < expectedFiles.length && (matched == false); j++)
+ matched = currentFile.equals(expectedFiles[j]);
+
+ assertTrue("File '" + currentFile + "' was not expected to be generated", matched);
+ }
+
+ JaxrpcMappingValidator mappingValidator = new JaxrpcMappingValidator();
+ mappingValidator.validate(resourceDir + "/jaxrpc-mapping.xml", toolsDir + "/jaxrpc-mapping.xml");
+
+ }
+
+ private static void compareSource(final String expectedName, final String generatedName) throws Exception
+ {
+ File expected = new File(expectedName);
+ File generated = new File(generatedName);
+
+ JBossSourceComparator sc = new JBossSourceComparator(expected, generated);
+ sc.validate();
+ sc.validateImports();
+ }
+}
Copied: stack/native/trunk/src/test/resources/tools/jbws1453 (from rev 4377, stack/native/branches/native-2.0/src/test/resources/tools/jbws1453)
Deleted: stack/native/trunk/src/test/resources/tools/jbws1453/A_Message.java
===================================================================
--- stack/native/branches/native-2.0/src/test/resources/tools/jbws1453/A_Message.java 2007-08-15 14:58:17 UTC (rev 4377)
+++ stack/native/trunk/src/test/resources/tools/jbws1453/A_Message.java 2007-08-15 15:43:12 UTC (rev 4379)
@@ -1,27 +0,0 @@
-/*
- * JBossWS WS-Tools Generated Source
- *
- * Generation Date: Wed Aug 15 15:16:31 BST 2007
- *
- * This generated source code represents a derivative work of the input to
- * the generator that produced it. Consult the input for the copyright and
- * terms of use that apply to this source code.
- */
-
-package org.jboss.test.ws.jbws1453;
-
-
-public class A_Message
-{
-
-protected java.lang.String message;
-public A_Message(){}
-
-public A_Message(java.lang.String message){
-this.message=message;
-}
-public java.lang.String getMessage() { return message ;}
-
-public void setMessage(java.lang.String message){ this.message=message; }
-
-}
Copied: stack/native/trunk/src/test/resources/tools/jbws1453/A_Message.java (from rev 4377, stack/native/branches/native-2.0/src/test/resources/tools/jbws1453/A_Message.java)
===================================================================
--- stack/native/trunk/src/test/resources/tools/jbws1453/A_Message.java (rev 0)
+++ stack/native/trunk/src/test/resources/tools/jbws1453/A_Message.java 2007-08-15 15:43:12 UTC (rev 4379)
@@ -0,0 +1,27 @@
+/*
+ * JBossWS WS-Tools Generated Source
+ *
+ * Generation Date: Wed Aug 15 15:16:31 BST 2007
+ *
+ * This generated source code represents a derivative work of the input to
+ * the generator that produced it. Consult the input for the copyright and
+ * terms of use that apply to this source code.
+ */
+
+package org.jboss.test.ws.jbws1453;
+
+
+public class A_Message
+{
+
+protected java.lang.String message;
+public A_Message(){}
+
+public A_Message(java.lang.String message){
+this.message=message;
+}
+public java.lang.String getMessage() { return message ;}
+
+public void setMessage(java.lang.String message){ this.message=message; }
+
+}
Deleted: stack/native/trunk/src/test/resources/tools/jbws1453/A_Person.java
===================================================================
--- stack/native/branches/native-2.0/src/test/resources/tools/jbws1453/A_Person.java 2007-08-15 14:58:17 UTC (rev 4377)
+++ stack/native/trunk/src/test/resources/tools/jbws1453/A_Person.java 2007-08-15 15:43:12 UTC (rev 4379)
@@ -1,34 +0,0 @@
-/*
- * JBossWS WS-Tools Generated Source
- *
- * Generation Date: Wed Aug 15 15:16:31 BST 2007
- *
- * This generated source code represents a derivative work of the input to
- * the generator that produced it. Consult the input for the copyright and
- * terms of use that apply to this source code.
- */
-
-package org.jboss.test.ws.jbws1453;
-
-
-public class A_Person
-{
-
-protected java.lang.String surname;
-
-protected org.jboss.test.ws.jbws1453.Nick_Name nickName;
-public A_Person(){}
-
-public A_Person(java.lang.String surname, org.jboss.test.ws.jbws1453.Nick_Name nickName){
-this.surname=surname;
-this.nickName=nickName;
-}
-public java.lang.String getSurname() { return surname ;}
-
-public void setSurname(java.lang.String surname){ this.surname=surname; }
-
-public org.jboss.test.ws.jbws1453.Nick_Name getNickName() { return nickName ;}
-
-public void setNickName(org.jboss.test.ws.jbws1453.Nick_Name nickName){ this.nickName=nickName; }
-
-}
Copied: stack/native/trunk/src/test/resources/tools/jbws1453/A_Person.java (from rev 4377, stack/native/branches/native-2.0/src/test/resources/tools/jbws1453/A_Person.java)
===================================================================
--- stack/native/trunk/src/test/resources/tools/jbws1453/A_Person.java (rev 0)
+++ stack/native/trunk/src/test/resources/tools/jbws1453/A_Person.java 2007-08-15 15:43:12 UTC (rev 4379)
@@ -0,0 +1,34 @@
+/*
+ * JBossWS WS-Tools Generated Source
+ *
+ * Generation Date: Wed Aug 15 15:16:31 BST 2007
+ *
+ * This generated source code represents a derivative work of the input to
+ * the generator that produced it. Consult the input for the copyright and
+ * terms of use that apply to this source code.
+ */
+
+package org.jboss.test.ws.jbws1453;
+
+
+public class A_Person
+{
+
+protected java.lang.String surname;
+
+protected org.jboss.test.ws.jbws1453.Nick_Name nickName;
+public A_Person(){}
+
+public A_Person(java.lang.String surname, org.jboss.test.ws.jbws1453.Nick_Name nickName){
+this.surname=surname;
+this.nickName=nickName;
+}
+public java.lang.String getSurname() { return surname ;}
+
+public void setSurname(java.lang.String surname){ this.surname=surname; }
+
+public org.jboss.test.ws.jbws1453.Nick_Name getNickName() { return nickName ;}
+
+public void setNickName(org.jboss.test.ws.jbws1453.Nick_Name nickName){ this.nickName=nickName; }
+
+}
Deleted: stack/native/trunk/src/test/resources/tools/jbws1453/Nick_Name.java
===================================================================
--- stack/native/branches/native-2.0/src/test/resources/tools/jbws1453/Nick_Name.java 2007-08-15 14:58:17 UTC (rev 4377)
+++ stack/native/trunk/src/test/resources/tools/jbws1453/Nick_Name.java 2007-08-15 15:43:12 UTC (rev 4379)
@@ -1,27 +0,0 @@
-/*
- * JBossWS WS-Tools Generated Source
- *
- * Generation Date: Wed Aug 15 15:16:31 BST 2007
- *
- * This generated source code represents a derivative work of the input to
- * the generator that produced it. Consult the input for the copyright and
- * terms of use that apply to this source code.
- */
-
-package org.jboss.test.ws.jbws1453;
-
-
-public class Nick_Name
-{
-
-protected java.lang.String name;
-public Nick_Name(){}
-
-public Nick_Name(java.lang.String name){
-this.name=name;
-}
-public java.lang.String getName() { return name ;}
-
-public void setName(java.lang.String name){ this.name=name; }
-
-}
Copied: stack/native/trunk/src/test/resources/tools/jbws1453/Nick_Name.java (from rev 4377, stack/native/branches/native-2.0/src/test/resources/tools/jbws1453/Nick_Name.java)
===================================================================
--- stack/native/trunk/src/test/resources/tools/jbws1453/Nick_Name.java (rev 0)
+++ stack/native/trunk/src/test/resources/tools/jbws1453/Nick_Name.java 2007-08-15 15:43:12 UTC (rev 4379)
@@ -0,0 +1,27 @@
+/*
+ * JBossWS WS-Tools Generated Source
+ *
+ * Generation Date: Wed Aug 15 15:16:31 BST 2007
+ *
+ * This generated source code represents a derivative work of the input to
+ * the generator that produced it. Consult the input for the copyright and
+ * terms of use that apply to this source code.
+ */
+
+package org.jboss.test.ws.jbws1453;
+
+
+public class Nick_Name
+{
+
+protected java.lang.String name;
+public Nick_Name(){}
+
+public Nick_Name(java.lang.String name){
+this.name=name;
+}
+public java.lang.String getName() { return name ;}
+
+public void setName(java.lang.String name){ this.name=name; }
+
+}
Deleted: stack/native/trunk/src/test/resources/tools/jbws1453/PhoneBook.wsdl
===================================================================
--- stack/native/branches/native-2.0/src/test/resources/tools/jbws1453/PhoneBook.wsdl 2007-08-15 14:58:17 UTC (rev 4377)
+++ stack/native/trunk/src/test/resources/tools/jbws1453/PhoneBook.wsdl 2007-08-15 15:43:12 UTC (rev 4379)
@@ -1,78 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<definitions name='PhoneBook' targetNamespace='http://test.jboss.org/ws/jbws1453'
- xmlns='http://schemas.xmlsoap.org/wsdl/'
- xmlns:ns1='http://test.jboss.org/ws/jbws1453/types'
- xmlns:soap='http://schemas.xmlsoap.org/wsdl/soap/'
- xmlns:tns='http://test.jboss.org/ws/jbws1453'
- xmlns:xsd='http://www.w3.org/2001/XMLSchema'>
-
- <types>
- <schema targetNamespace='http://test.jboss.org/ws/jbws1453/types'
- xmlns='http://www.w3.org/2001/XMLSchema'
- xmlns:soap11-enc='http://schemas.xmlsoap.org/soap/encoding/'
- xmlns:tns='http://test.jboss.org/ws/jbws1453/types'
- xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance'>
-
- <complexType name='A.Person'>
- <sequence>
- <element name='surname' nillable='true' type='string'/>
- <element name='nickName' nillable='true' type='tns:Nick.Name'/>
- </sequence>
- </complexType>
-
- <complexType name='Nick.Name'>
- <sequence>
- <element name='name' nillable='true' type='string'/>
- </sequence>
- </complexType>
-
- <complexType name='A.Message'>
- <sequence>
- <element name='message' nillable='true' type='string'/>
- </sequence>
- </complexType>
-
- <complexType name='Telephone.Number'>
- <sequence>
- <element name='number' nillable='true' type='string'/>
- <element name='message' nillable='true' type='tns:A.Message'/>
- </sequence>
- </complexType>
-
- <element name='lookup' type='tns:A.Person'/>
- <element name='lookupResponse' type='tns:Telephone.Number'/>
-
- </schema>
- </types>
-
- <message name='PhoneBook_lookup'>
- <part element='ns1:lookup' name='parameters'/>
- </message>
- <message name='PhoneBook_lookupResponse'>
- <part element='ns1:lookupResponse' name='result'/>
- </message>
-
- <portType name='PhoneBook'>
- <operation name='lookup'>
- <input message='tns:PhoneBook_lookup'/>
- <output message='tns:PhoneBook_lookupResponse'/>
- </operation>
- </portType>
- <binding name='PhoneBookBinding' type='tns:PhoneBook'>
- <soap:binding style='document' transport='http://schemas.xmlsoap.org/soap/http'/>
- <operation name='lookup'>
- <soap:operation soapAction=''/>
- <input>
- <soap:body use='literal'/>
- </input>
- <output>
- <soap:body use='literal'/>
- </output>
- </operation>
- </binding>
- <service name='PhoneBook'>
- <port binding='tns:PhoneBookBinding' name='PhoneBookPort'>
- <soap:address location='REPLACE_WITH_ACTUAL_URL'/>
- </port>
- </service>
-</definitions>
Copied: stack/native/trunk/src/test/resources/tools/jbws1453/PhoneBook.wsdl (from rev 4377, stack/native/branches/native-2.0/src/test/resources/tools/jbws1453/PhoneBook.wsdl)
===================================================================
--- stack/native/trunk/src/test/resources/tools/jbws1453/PhoneBook.wsdl (rev 0)
+++ stack/native/trunk/src/test/resources/tools/jbws1453/PhoneBook.wsdl 2007-08-15 15:43:12 UTC (rev 4379)
@@ -0,0 +1,78 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<definitions name='PhoneBook' targetNamespace='http://test.jboss.org/ws/jbws1453'
+ xmlns='http://schemas.xmlsoap.org/wsdl/'
+ xmlns:ns1='http://test.jboss.org/ws/jbws1453/types'
+ xmlns:soap='http://schemas.xmlsoap.org/wsdl/soap/'
+ xmlns:tns='http://test.jboss.org/ws/jbws1453'
+ xmlns:xsd='http://www.w3.org/2001/XMLSchema'>
+
+ <types>
+ <schema targetNamespace='http://test.jboss.org/ws/jbws1453/types'
+ xmlns='http://www.w3.org/2001/XMLSchema'
+ xmlns:soap11-enc='http://schemas.xmlsoap.org/soap/encoding/'
+ xmlns:tns='http://test.jboss.org/ws/jbws1453/types'
+ xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance'>
+
+ <complexType name='A.Person'>
+ <sequence>
+ <element name='surname' nillable='true' type='string'/>
+ <element name='nickName' nillable='true' type='tns:Nick.Name'/>
+ </sequence>
+ </complexType>
+
+ <complexType name='Nick.Name'>
+ <sequence>
+ <element name='name' nillable='true' type='string'/>
+ </sequence>
+ </complexType>
+
+ <complexType name='A.Message'>
+ <sequence>
+ <element name='message' nillable='true' type='string'/>
+ </sequence>
+ </complexType>
+
+ <complexType name='Telephone.Number'>
+ <sequence>
+ <element name='number' nillable='true' type='string'/>
+ <element name='message' nillable='true' type='tns:A.Message'/>
+ </sequence>
+ </complexType>
+
+ <element name='lookup' type='tns:A.Person'/>
+ <element name='lookupResponse' type='tns:Telephone.Number'/>
+
+ </schema>
+ </types>
+
+ <message name='PhoneBook_lookup'>
+ <part element='ns1:lookup' name='parameters'/>
+ </message>
+ <message name='PhoneBook_lookupResponse'>
+ <part element='ns1:lookupResponse' name='result'/>
+ </message>
+
+ <portType name='PhoneBook'>
+ <operation name='lookup'>
+ <input message='tns:PhoneBook_lookup'/>
+ <output message='tns:PhoneBook_lookupResponse'/>
+ </operation>
+ </portType>
+ <binding name='PhoneBookBinding' type='tns:PhoneBook'>
+ <soap:binding style='document' transport='http://schemas.xmlsoap.org/soap/http'/>
+ <operation name='lookup'>
+ <soap:operation soapAction=''/>
+ <input>
+ <soap:body use='literal'/>
+ </input>
+ <output>
+ <soap:body use='literal'/>
+ </output>
+ </operation>
+ </binding>
+ <service name='PhoneBook'>
+ <port binding='tns:PhoneBookBinding' name='PhoneBookPort'>
+ <soap:address location='REPLACE_WITH_ACTUAL_URL'/>
+ </port>
+ </service>
+</definitions>
Deleted: stack/native/trunk/src/test/resources/tools/jbws1453/PhoneBook_PortType.java
===================================================================
--- stack/native/branches/native-2.0/src/test/resources/tools/jbws1453/PhoneBook_PortType.java 2007-08-15 14:58:17 UTC (rev 4377)
+++ stack/native/trunk/src/test/resources/tools/jbws1453/PhoneBook_PortType.java 2007-08-15 15:43:12 UTC (rev 4379)
@@ -1,15 +0,0 @@
-/*
- * JBossWS WS-Tools Generated Source
- *
- * Generation Date: Wed Aug 15 15:16:31 BST 2007
- *
- * This generated source code represents a derivative work of the input to
- * the generator that produced it. Consult the input for the copyright and
- * terms of use that apply to this source code.
- */
-package org.jboss.test.ws.jbws1453;
-public interface PhoneBook_PortType extends java.rmi.Remote
-{
-
- public org.jboss.test.ws.jbws1453.Telephone_Number lookup(org.jboss.test.ws.jbws1453.A_Person lookup) throws java.rmi.RemoteException;
-}
Copied: stack/native/trunk/src/test/resources/tools/jbws1453/PhoneBook_PortType.java (from rev 4377, stack/native/branches/native-2.0/src/test/resources/tools/jbws1453/PhoneBook_PortType.java)
===================================================================
--- stack/native/trunk/src/test/resources/tools/jbws1453/PhoneBook_PortType.java (rev 0)
+++ stack/native/trunk/src/test/resources/tools/jbws1453/PhoneBook_PortType.java 2007-08-15 15:43:12 UTC (rev 4379)
@@ -0,0 +1,15 @@
+/*
+ * JBossWS WS-Tools Generated Source
+ *
+ * Generation Date: Wed Aug 15 15:16:31 BST 2007
+ *
+ * This generated source code represents a derivative work of the input to
+ * the generator that produced it. Consult the input for the copyright and
+ * terms of use that apply to this source code.
+ */
+package org.jboss.test.ws.jbws1453;
+public interface PhoneBook_PortType extends java.rmi.Remote
+{
+
+ public org.jboss.test.ws.jbws1453.Telephone_Number lookup(org.jboss.test.ws.jbws1453.A_Person lookup) throws java.rmi.RemoteException;
+}
Deleted: stack/native/trunk/src/test/resources/tools/jbws1453/Telephone_Number.java
===================================================================
--- stack/native/branches/native-2.0/src/test/resources/tools/jbws1453/Telephone_Number.java 2007-08-15 14:58:17 UTC (rev 4377)
+++ stack/native/trunk/src/test/resources/tools/jbws1453/Telephone_Number.java 2007-08-15 15:43:12 UTC (rev 4379)
@@ -1,34 +0,0 @@
-/*
- * JBossWS WS-Tools Generated Source
- *
- * Generation Date: Wed Aug 15 15:16:31 BST 2007
- *
- * This generated source code represents a derivative work of the input to
- * the generator that produced it. Consult the input for the copyright and
- * terms of use that apply to this source code.
- */
-
-package org.jboss.test.ws.jbws1453;
-
-
-public class Telephone_Number
-{
-
-protected java.lang.String number;
-
-protected org.jboss.test.ws.jbws1453.A_Message message;
-public Telephone_Number(){}
-
-public Telephone_Number(java.lang.String number, org.jboss.test.ws.jbws1453.A_Message message){
-this.number=number;
-this.message=message;
-}
-public java.lang.String getNumber() { return number ;}
-
-public void setNumber(java.lang.String number){ this.number=number; }
-
-public org.jboss.test.ws.jbws1453.A_Message getMessage() { return message ;}
-
-public void setMessage(org.jboss.test.ws.jbws1453.A_Message message){ this.message=message; }
-
-}
Copied: stack/native/trunk/src/test/resources/tools/jbws1453/Telephone_Number.java (from rev 4377, stack/native/branches/native-2.0/src/test/resources/tools/jbws1453/Telephone_Number.java)
===================================================================
--- stack/native/trunk/src/test/resources/tools/jbws1453/Telephone_Number.java (rev 0)
+++ stack/native/trunk/src/test/resources/tools/jbws1453/Telephone_Number.java 2007-08-15 15:43:12 UTC (rev 4379)
@@ -0,0 +1,34 @@
+/*
+ * JBossWS WS-Tools Generated Source
+ *
+ * Generation Date: Wed Aug 15 15:16:31 BST 2007
+ *
+ * This generated source code represents a derivative work of the input to
+ * the generator that produced it. Consult the input for the copyright and
+ * terms of use that apply to this source code.
+ */
+
+package org.jboss.test.ws.jbws1453;
+
+
+public class Telephone_Number
+{
+
+protected java.lang.String number;
+
+protected org.jboss.test.ws.jbws1453.A_Message message;
+public Telephone_Number(){}
+
+public Telephone_Number(java.lang.String number, org.jboss.test.ws.jbws1453.A_Message message){
+this.number=number;
+this.message=message;
+}
+public java.lang.String getNumber() { return number ;}
+
+public void setNumber(java.lang.String number){ this.number=number; }
+
+public org.jboss.test.ws.jbws1453.A_Message getMessage() { return message ;}
+
+public void setMessage(org.jboss.test.ws.jbws1453.A_Message message){ this.message=message; }
+
+}
Deleted: stack/native/trunk/src/test/resources/tools/jbws1453/jaxrpc-mapping.xml
===================================================================
--- stack/native/branches/native-2.0/src/test/resources/tools/jbws1453/jaxrpc-mapping.xml 2007-08-15 14:58:17 UTC (rev 4377)
+++ stack/native/trunk/src/test/resources/tools/jbws1453/jaxrpc-mapping.xml 2007-08-15 15:43:12 UTC (rev 4379)
@@ -1,85 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?><java-wsdl-mapping version='1.1' xmlns='http://java.sun.com/xml/ns/j2ee' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xsi:schemaLocation='http://java.sun.com/xml/ns/j2ee http://www.ibm.com/webservices/xsd/j2ee_jaxrpc_mapping_1_1.xsd'>
- <package-mapping>
- <package-type>org.jboss.test.ws.jbws1453</package-type>
- <namespaceURI>http://test.jboss.org/ws/jbws1453/types</namespaceURI>
- </package-mapping>
- <package-mapping>
- <package-type>org.jboss.test.ws.jbws1453</package-type>
- <namespaceURI>http://test.jboss.org/ws/jbws1453</namespaceURI>
- </package-mapping>
- <java-xml-type-mapping>
- <java-type>org.jboss.test.ws.jbws1453.A_Person</java-type>
- <root-type-qname xmlns:typeNS='http://test.jboss.org/ws/jbws1453/types'>typeNS:A.Person</root-type-qname>
- <qname-scope>complexType</qname-scope>
- <variable-mapping>
- <java-variable-name>surname</java-variable-name>
- <xml-element-name>surname</xml-element-name>
- </variable-mapping>
- <variable-mapping>
- <java-variable-name>nickName</java-variable-name>
- <xml-element-name>nickName</xml-element-name>
- </variable-mapping>
- </java-xml-type-mapping>
- <java-xml-type-mapping>
- <java-type>org.jboss.test.ws.jbws1453.Nick_Name</java-type>
- <root-type-qname xmlns:typeNS='http://test.jboss.org/ws/jbws1453/types'>typeNS:Nick.Name</root-type-qname>
- <qname-scope>complexType</qname-scope>
- <variable-mapping>
- <java-variable-name>name</java-variable-name>
- <xml-element-name>name</xml-element-name>
- </variable-mapping>
- </java-xml-type-mapping>
- <java-xml-type-mapping>
- <java-type>org.jboss.test.ws.jbws1453.Telephone_Number</java-type>
- <root-type-qname xmlns:typeNS='http://test.jboss.org/ws/jbws1453/types'>typeNS:Telephone.Number</root-type-qname>
- <qname-scope>complexType</qname-scope>
- <variable-mapping>
- <java-variable-name>number</java-variable-name>
- <xml-element-name>number</xml-element-name>
- </variable-mapping>
- <variable-mapping>
- <java-variable-name>message</java-variable-name>
- <xml-element-name>message</xml-element-name>
- </variable-mapping>
- </java-xml-type-mapping>
- <java-xml-type-mapping>
- <java-type>org.jboss.test.ws.jbws1453.A_Message</java-type>
- <root-type-qname xmlns:typeNS='http://test.jboss.org/ws/jbws1453/types'>typeNS:A.Message</root-type-qname>
- <qname-scope>complexType</qname-scope>
- <variable-mapping>
- <java-variable-name>message</java-variable-name>
- <xml-element-name>message</xml-element-name>
- </variable-mapping>
- </java-xml-type-mapping>
- <service-interface-mapping>
- <service-interface>org.jboss.test.ws.jbws1453.PhoneBook_Service</service-interface>
- <wsdl-service-name xmlns:serviceNS='http://test.jboss.org/ws/jbws1453'>serviceNS:PhoneBook</wsdl-service-name>
- <port-mapping>
- <port-name>PhoneBookPort</port-name>
- <java-port-name>PhoneBookPort</java-port-name>
- </port-mapping>
- </service-interface-mapping>
- <service-endpoint-interface-mapping>
- <service-endpoint-interface>org.jboss.test.ws.jbws1453.PhoneBook_PortType</service-endpoint-interface>
- <wsdl-port-type xmlns:portTypeNS='http://test.jboss.org/ws/jbws1453'>portTypeNS:PhoneBook</wsdl-port-type>
- <wsdl-binding xmlns:bindingNS='http://test.jboss.org/ws/jbws1453'>bindingNS:PhoneBookBinding</wsdl-binding>
- <service-endpoint-method-mapping>
- <java-method-name>lookup</java-method-name>
- <wsdl-operation>lookup</wsdl-operation>
- <method-param-parts-mapping>
- <param-position>0</param-position>
- <param-type>org.jboss.test.ws.jbws1453.A_Person</param-type>
- <wsdl-message-mapping>
- <wsdl-message xmlns:wsdlMsgNS='http://test.jboss.org/ws/jbws1453'>wsdlMsgNS:PhoneBook_lookup</wsdl-message>
- <wsdl-message-part-name>parameters</wsdl-message-part-name>
- <parameter-mode>IN</parameter-mode>
- </wsdl-message-mapping>
- </method-param-parts-mapping>
- <wsdl-return-value-mapping>
- <method-return-value>org.jboss.test.ws.jbws1453.Telephone_Number</method-return-value>
- <wsdl-message xmlns:wsdlMsgNS='http://test.jboss.org/ws/jbws1453'>wsdlMsgNS:PhoneBook_lookupResponse</wsdl-message>
- <wsdl-message-part-name>result</wsdl-message-part-name>
- </wsdl-return-value-mapping>
- </service-endpoint-method-mapping>
- </service-endpoint-interface-mapping>
-</java-wsdl-mapping>
\ No newline at end of file
Copied: stack/native/trunk/src/test/resources/tools/jbws1453/jaxrpc-mapping.xml (from rev 4377, stack/native/branches/native-2.0/src/test/resources/tools/jbws1453/jaxrpc-mapping.xml)
===================================================================
--- stack/native/trunk/src/test/resources/tools/jbws1453/jaxrpc-mapping.xml (rev 0)
+++ stack/native/trunk/src/test/resources/tools/jbws1453/jaxrpc-mapping.xml 2007-08-15 15:43:12 UTC (rev 4379)
@@ -0,0 +1,85 @@
+<?xml version='1.0' encoding='UTF-8'?><java-wsdl-mapping version='1.1' xmlns='http://java.sun.com/xml/ns/j2ee' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xsi:schemaLocation='http://java.sun.com/xml/ns/j2ee http://www.ibm.com/webservices/xsd/j2ee_jaxrpc_mapping_1_1.xsd'>
+ <package-mapping>
+ <package-type>org.jboss.test.ws.jbws1453</package-type>
+ <namespaceURI>http://test.jboss.org/ws/jbws1453/types</namespaceURI>
+ </package-mapping>
+ <package-mapping>
+ <package-type>org.jboss.test.ws.jbws1453</package-type>
+ <namespaceURI>http://test.jboss.org/ws/jbws1453</namespaceURI>
+ </package-mapping>
+ <java-xml-type-mapping>
+ <java-type>org.jboss.test.ws.jbws1453.A_Person</java-type>
+ <root-type-qname xmlns:typeNS='http://test.jboss.org/ws/jbws1453/types'>typeNS:A.Person</root-type-qname>
+ <qname-scope>complexType</qname-scope>
+ <variable-mapping>
+ <java-variable-name>surname</java-variable-name>
+ <xml-element-name>surname</xml-element-name>
+ </variable-mapping>
+ <variable-mapping>
+ <java-variable-name>nickName</java-variable-name>
+ <xml-element-name>nickName</xml-element-name>
+ </variable-mapping>
+ </java-xml-type-mapping>
+ <java-xml-type-mapping>
+ <java-type>org.jboss.test.ws.jbws1453.Nick_Name</java-type>
+ <root-type-qname xmlns:typeNS='http://test.jboss.org/ws/jbws1453/types'>typeNS:Nick.Name</root-type-qname>
+ <qname-scope>complexType</qname-scope>
+ <variable-mapping>
+ <java-variable-name>name</java-variable-name>
+ <xml-element-name>name</xml-element-name>
+ </variable-mapping>
+ </java-xml-type-mapping>
+ <java-xml-type-mapping>
+ <java-type>org.jboss.test.ws.jbws1453.Telephone_Number</java-type>
+ <root-type-qname xmlns:typeNS='http://test.jboss.org/ws/jbws1453/types'>typeNS:Telephone.Number</root-type-qname>
+ <qname-scope>complexType</qname-scope>
+ <variable-mapping>
+ <java-variable-name>number</java-variable-name>
+ <xml-element-name>number</xml-element-name>
+ </variable-mapping>
+ <variable-mapping>
+ <java-variable-name>message</java-variable-name>
+ <xml-element-name>message</xml-element-name>
+ </variable-mapping>
+ </java-xml-type-mapping>
+ <java-xml-type-mapping>
+ <java-type>org.jboss.test.ws.jbws1453.A_Message</java-type>
+ <root-type-qname xmlns:typeNS='http://test.jboss.org/ws/jbws1453/types'>typeNS:A.Message</root-type-qname>
+ <qname-scope>complexType</qname-scope>
+ <variable-mapping>
+ <java-variable-name>message</java-variable-name>
+ <xml-element-name>message</xml-element-name>
+ </variable-mapping>
+ </java-xml-type-mapping>
+ <service-interface-mapping>
+ <service-interface>org.jboss.test.ws.jbws1453.PhoneBook_Service</service-interface>
+ <wsdl-service-name xmlns:serviceNS='http://test.jboss.org/ws/jbws1453'>serviceNS:PhoneBook</wsdl-service-name>
+ <port-mapping>
+ <port-name>PhoneBookPort</port-name>
+ <java-port-name>PhoneBookPort</java-port-name>
+ </port-mapping>
+ </service-interface-mapping>
+ <service-endpoint-interface-mapping>
+ <service-endpoint-interface>org.jboss.test.ws.jbws1453.PhoneBook_PortType</service-endpoint-interface>
+ <wsdl-port-type xmlns:portTypeNS='http://test.jboss.org/ws/jbws1453'>portTypeNS:PhoneBook</wsdl-port-type>
+ <wsdl-binding xmlns:bindingNS='http://test.jboss.org/ws/jbws1453'>bindingNS:PhoneBookBinding</wsdl-binding>
+ <service-endpoint-method-mapping>
+ <java-method-name>lookup</java-method-name>
+ <wsdl-operation>lookup</wsdl-operation>
+ <method-param-parts-mapping>
+ <param-position>0</param-position>
+ <param-type>org.jboss.test.ws.jbws1453.A_Person</param-type>
+ <wsdl-message-mapping>
+ <wsdl-message xmlns:wsdlMsgNS='http://test.jboss.org/ws/jbws1453'>wsdlMsgNS:PhoneBook_lookup</wsdl-message>
+ <wsdl-message-part-name>parameters</wsdl-message-part-name>
+ <parameter-mode>IN</parameter-mode>
+ </wsdl-message-mapping>
+ </method-param-parts-mapping>
+ <wsdl-return-value-mapping>
+ <method-return-value>org.jboss.test.ws.jbws1453.Telephone_Number</method-return-value>
+ <wsdl-message xmlns:wsdlMsgNS='http://test.jboss.org/ws/jbws1453'>wsdlMsgNS:PhoneBook_lookupResponse</wsdl-message>
+ <wsdl-message-part-name>result</wsdl-message-part-name>
+ </wsdl-return-value-mapping>
+ </service-endpoint-method-mapping>
+ </service-endpoint-interface-mapping>
+</java-wsdl-mapping>
\ No newline at end of file
Deleted: stack/native/trunk/src/test/resources/tools/jbws1453/wstools-config.xml
===================================================================
--- stack/native/branches/native-2.0/src/test/resources/tools/jbws1453/wstools-config.xml 2007-08-15 14:58:17 UTC (rev 4377)
+++ stack/native/trunk/src/test/resources/tools/jbws1453/wstools-config.xml 2007-08-15 15:43:12 UTC (rev 4379)
@@ -1,5 +0,0 @@
-<configuration>
- <wsdl-java location="resources/tools/jbws1453/PhoneBook.wsdl" parameter-style="bare">
- <mapping file="jaxrpc-mapping.xml"/>
- </wsdl-java>
-</configuration>
Copied: stack/native/trunk/src/test/resources/tools/jbws1453/wstools-config.xml (from rev 4377, stack/native/branches/native-2.0/src/test/resources/tools/jbws1453/wstools-config.xml)
===================================================================
--- stack/native/trunk/src/test/resources/tools/jbws1453/wstools-config.xml (rev 0)
+++ stack/native/trunk/src/test/resources/tools/jbws1453/wstools-config.xml 2007-08-15 15:43:12 UTC (rev 4379)
@@ -0,0 +1,5 @@
+<configuration>
+ <wsdl-java location="resources/tools/jbws1453/PhoneBook.wsdl" parameter-style="bare">
+ <mapping file="jaxrpc-mapping.xml"/>
+ </wsdl-java>
+</configuration>
17 years, 4 months
- 1
- 0