[jbossws-commits] JBossWS SVN: r1362 - in branches/JEE5_TCK/src: main/java/org/jboss/ws/deployment main/java/org/jboss/ws/metadata/wsdl main/resources/jbossws.beans/META-INF test/java/org/jboss/test/ws/jaxws/anonymous test/java/org/jboss/test/ws/jaxws/exception test/java/org/jboss/test/ws/jaxws/jbws871 test/java/org/jboss/test/ws/jaxws/jsr181/handlerchain test/java/org/jboss/test/ws/jaxws/jsr181/oneway test/java/org/jboss/test/ws/jaxws/jsr181/soapbinding test/java/org/jboss/test/ws/jaxws/jsr181/webmethod te

Author: heiko.braun(a)jboss.com Date: 2006-11-03 11:55:52 -0500 (Fri, 03 Nov 2006) New Revision: 1362 Modified: branches/JEE5_TCK/src/main/java/org/jboss/ws/deployment/JSR181MetaDataBuilder.java branches/JEE5_TCK/src/main/java/org/jboss/ws/metadata/wsdl/WSDLUtils.java branches/JEE5_TCK/src/main/resources/jbossws.beans/META-INF/jboss-beans.xml branches/JEE5_TCK/src/test/java/org/jboss/test/ws/jaxws/anonymous/AnonymousTestCase.java branches/JEE5_TCK/src/test/java/org/jboss/test/ws/jaxws/exception/ExceptionTestCase.java branches/JEE5_TCK/src/test/java/org/jboss/test/ws/jaxws/jbws871/JBWS871TestCase.java branches/JEE5_TCK/src/test/java/org/jboss/test/ws/jaxws/jsr181/handlerchain/JSR181HandlerChainTestCase.java branches/JEE5_TCK/src/test/java/org/jboss/test/ws/jaxws/jsr181/oneway/JSR181OneWayTestCase.java branches/JEE5_TCK/src/test/java/org/jboss/test/ws/jaxws/jsr181/soapbinding/JSR181SOAPBindingTestCase.java branches/JEE5_TCK/src/test/java/org/jboss/test/ws/jaxws/jsr181/soapbinding/PurchaseOrder.java branches/JEE5_TCK/src/test/java/org/jboss/test/ws/jaxws/jsr181/soapbinding/PurchaseOrderAck.java branches/JEE5_TCK/src/test/java/org/jboss/test/ws/jaxws/jsr181/soapbinding/SubmitBareRequest.java branches/JEE5_TCK/src/test/java/org/jboss/test/ws/jaxws/jsr181/soapbinding/SubmitBareResponse.java branches/JEE5_TCK/src/test/java/org/jboss/test/ws/jaxws/jsr181/webmethod/JSR181WebMethodTestCase.java branches/JEE5_TCK/src/test/java/org/jboss/test/ws/jaxws/jsr181/webresult/JSR181WebResultTestCase.java branches/JEE5_TCK/src/test/java/org/jboss/test/ws/jaxws/wrapped/accessor/AccessorTestCase.java branches/JEE5_TCK/src/test/resources/jaxws/jbws871/META-INF/wsdl/TestEndpoint.wsdl branches/JEE5_TCK/src/test/resources/jaxws/jsr181/complex/META-INF/wsdl/RegistrationService.wsdl branches/JEE5_TCK/src/test/resources/jaxws/jsr181/complex/jaxrpc-mapping.xml branches/JEE5_TCK/src/test/resources/jaxws/jsr181/webresult/jaxrpc-mapping.xml Log: Fix JAX-WS package to namespace mapping Modified: branches/JEE5_TCK/src/main/java/org/jboss/ws/deployment/JSR181MetaDataBuilder.java =================================================================== --- branches/JEE5_TCK/src/main/java/org/jboss/ws/deployment/JSR181MetaDataBuilder.java 2006-11-03 15:40:44 UTC (rev 1361) +++ branches/JEE5_TCK/src/main/java/org/jboss/ws/deployment/JSR181MetaDataBuilder.java 2006-11-03 16:55:52 UTC (rev 1362) @@ -131,7 +131,7 @@ { WebService anWebService = (WebService)sepClass.getAnnotation(WebService.class); if (anWebService == null) - throw new WSException("Cannot obtain @WebService annotaion from: " + sepClass.getName()); + throw new WSException("Cannot obtain @WebService annotation from: " + sepClass.getName()); try { Modified: branches/JEE5_TCK/src/main/java/org/jboss/ws/metadata/wsdl/WSDLUtils.java =================================================================== --- branches/JEE5_TCK/src/main/java/org/jboss/ws/metadata/wsdl/WSDLUtils.java 2006-11-03 15:40:44 UTC (rev 1361) +++ branches/JEE5_TCK/src/main/java/org/jboss/ws/metadata/wsdl/WSDLUtils.java 2006-11-03 16:55:52 UTC (rev 1362) @@ -222,7 +222,7 @@ if (baseType != null) { if (baseType.getNamespace() == Constants.NS_SCHEMA_XSD && - baseType.getName().equals("anyType")) + baseType.getName().equals("anyType")) bool = true; //Ignore this baseType } if (XSComplexTypeDefinition.CONTENTTYPE_SIMPLE == t.getContentType()) @@ -340,7 +340,7 @@ * @throws IOException Problem creating the file */ public File createPhysicalFile(File loc, String fname) - throws IOException + throws IOException { if(loc == null ) throw new IllegalArgumentException("Illegal Null Argument: loc"); @@ -365,9 +365,9 @@ * @return */ public StringBuilder createClassBasicStructure(String pkgname, - String fname, - XSTypeDefinition type, - List importList, String baseName) + String fname, + XSTypeDefinition type, + List importList, String baseName) { StringBuilder buf = new StringBuilder(); writeJbossHeader(buf); @@ -395,7 +395,7 @@ if (baseType != null) { if (baseType.getNamespace() == Constants.NS_SCHEMA_XSD && - baseType.getName().equals("anyType")) + baseType.getName().equals("anyType")) baseType = null; //Ignore this baseType } if (XSComplexTypeDefinition.CONTENTTYPE_SIMPLE == t.getContentType()) @@ -408,7 +408,7 @@ if(baseName == null && baseType != null) baseName = baseType.getName(); if(baseName != null) - buf.append(" extends " + baseName); + buf.append(" extends " + baseName); buf.append(newline); buf.append("{"); buf.append(newline); @@ -471,14 +471,14 @@ */ public int getArrayDimension(Class arr) { - if(arr == null || arr.isArray() == false) - throw new IllegalArgumentException("Illegal null or array arg:arr"); - int counter = 0; - while(arr.isArray()) { + if(arr == null || arr.isArray() == false) + throw new IllegalArgumentException("Illegal null or array arg:arr"); + int counter = 0; + while(arr.isArray()) { counter += 1; arr = arr.getComponentType(); - } - return counter; + } + return counter; } /** @@ -678,8 +678,8 @@ if(Constants.PREFIX_XSD.equals(prefix)) nsuri = Constants.NS_SCHEMA_XSD; if(nsuri == null) qn = new QName( formattedStr.substring(ind+1) ); - else - qn = new QName( nsuri,formattedStr.substring(ind+1),prefix); + else + qn = new QName( nsuri,formattedStr.substring(ind+1),prefix); return qn; } @@ -701,10 +701,8 @@ */ public String getPackageName(String typeNS) { - String pkgname = Util.xmlNamespaceToJavaPackage(typeNS); + String pkgname = Util.xmlNamespaceToJavaPackage(typeNS); int len = pkgname.length(); - if(pkgname.endsWith(".jaws")) //as per jaxws-2.0 spec - pkgname = pkgname.substring(0,len - 5); return pkgname; } @@ -722,32 +720,27 @@ public String getTypeNamespace(String packageName) { StringBuilder sb = new StringBuilder("http://"); - //sb.append(packageName.replace('.', '/')); + //Generate tokens with '.' as delimiter StringTokenizer st = new StringTokenizer(packageName,"."); + //Have a LIFO queue for the tokens - Stack stk = new Stack(); + Stack<String> stk = new Stack<String>(); while(st != null && st.hasMoreTokens()) { stk.push(st.nextToken()); } - try + + String next; + while(!stk.isEmpty() && (next=stk.pop())!=null) { - while(stk != null) - { - String str = (String)stk.pop(); - if(sb.toString().equals("http://") == false) sb.append("."); - sb.append(str); - } - }catch(EmptyStackException e) - { - //Ignore + if(sb.toString().equals("http://") == false) sb.append("."); + sb.append(next); } - finally - { - sb.append("/jaws"); - } + // trailing slash + sb.append("/"); + return sb.toString(); } Modified: branches/JEE5_TCK/src/main/resources/jbossws.beans/META-INF/jboss-beans.xml =================================================================== --- branches/JEE5_TCK/src/main/resources/jbossws.beans/META-INF/jboss-beans.xml 2006-11-03 15:40:44 UTC (rev 1361) +++ branches/JEE5_TCK/src/main/resources/jbossws.beans/META-INF/jboss-beans.xml 2006-11-03 16:55:52 UTC (rev 1362) @@ -4,27 +4,27 @@ xsi:schemaLocation="urn:jboss:bean-deployer:2.0 bean-deployer_2_0.xsd" xmlns="urn:jboss:bean-deployer:2.0"> - <bean name="ServiceEndpointManager" class="org.jboss.ws.server.ServiceEndpointManager"> - <!-- - The WSDL, that is a required deployment artifact for an endpoint, has a <soap:address> - element which points to the location of the endpoint. JBoss supports rewriting of that SOAP address. - - If the content of <soap:address> is a valid URL, JBossWS will not rewrite it unless AlwaysModifySOAPAddress is true. - If the content of <soap:address> is not a valid URL, JBossWS will rewrite it using the attribute values given below. - --> - <property name="webServiceHost">${jboss.bind.address}</property> - <property name="webServiceSecurePort">8443</property> - <property name="webServicePort">8080</property> - <property name="alwaysModifySOAPAddress">true</property> - - <property name="serviceEndpointInvokerJSE">org.jboss.ws.server.ServiceEndpointInvokerJSE</property> - <property name="serviceEndpointInvokerEJB21">org.jboss.ws.integration.jboss.ServiceEndpointInvokerEJB21</property> - <property name="serviceEndpointInvokerEJB3">org.jboss.ws.integration.jboss.ServiceEndpointInvokerEJB3</property> - <property name="serviceEndpointInvokerMDB">org.jboss.ws.integration.jboss.ServiceEndpointInvokerMDB</property> + <bean name="ServiceEndpointManager" class="org.jboss.ws.server.ServiceEndpointManager"> + <!-- + The WSDL, that is a required deployment artifact for an endpoint, has a <soap:address> + element which points to the location of the endpoint. JBoss supports rewriting of that SOAP address. + + If the content of <soap:address> is a valid URL, JBossWS will not rewrite it unless AlwaysModifySOAPAddress is true. + If the content of <soap:address> is not a valid URL, JBossWS will rewrite it using the attribute values given below. + --> + <property name="webServiceHost">${jboss.bind.address}</property> + <property name="webServiceSecurePort">8443</property> + <property name="webServicePort">8080</property> + <property name="alwaysModifySOAPAddress">true</property> + + <property name="serviceEndpointInvokerJSE">org.jboss.ws.server.ServiceEndpointInvokerJSE</property> + <property name="serviceEndpointInvokerEJB21">org.jboss.ws.integration.jboss.ServiceEndpointInvokerEJB21</property> + <property name="serviceEndpointInvokerEJB3">org.jboss.ws.integration.jboss.ServiceEndpointInvokerEJB3</property> + <property name="serviceEndpointInvokerMDB">org.jboss.ws.integration.jboss.ServiceEndpointInvokerMDB</property> </bean> - <bean name="ServiceEndpointDeployer" class="org.jboss.ws.deployment.ServiceEndpointDeployer"> - <property name="serviceEndpointManager"><inject bean="ServiceEndpointManager"/></property> + <bean name="ServiceEndpointDeployer" class="org.jboss.ws.deployment.ServiceEndpointDeployer"> + <property name="serviceEndpointManager"><inject bean="ServiceEndpointManager"/></property> </bean> <bean name="ServiceEndpointPublisher" class="org.jboss.ws.integration.jboss.JBossServiceEndpointPublisher"> Modified: branches/JEE5_TCK/src/test/java/org/jboss/test/ws/jaxws/anonymous/AnonymousTestCase.java =================================================================== --- branches/JEE5_TCK/src/test/java/org/jboss/test/ws/jaxws/anonymous/AnonymousTestCase.java 2006-11-03 15:40:44 UTC (rev 1361) +++ branches/JEE5_TCK/src/test/java/org/jboss/test/ws/jaxws/anonymous/AnonymousTestCase.java 2006-11-03 16:55:52 UTC (rev 1362) @@ -39,7 +39,7 @@ */ public class AnonymousTestCase extends JBossWSTest { - private String targetNS = "http://anonymous.jaxws.ws.test.jboss.org/jaws"; + private String targetNS = "http://anonymous.jaxws.ws.test.jboss.org/"; private Anonymous proxy; public static Test suite() Modified: branches/JEE5_TCK/src/test/java/org/jboss/test/ws/jaxws/exception/ExceptionTestCase.java =================================================================== --- branches/JEE5_TCK/src/test/java/org/jboss/test/ws/jaxws/exception/ExceptionTestCase.java 2006-11-03 15:40:44 UTC (rev 1361) +++ branches/JEE5_TCK/src/test/java/org/jboss/test/ws/jaxws/exception/ExceptionTestCase.java 2006-11-03 16:55:52 UTC (rev 1362) @@ -41,7 +41,7 @@ */ public class ExceptionTestCase extends JBossWSTest { - private String targetNS = "http://exception.jaxws.ws.test.jboss.org/jaws"; + private String targetNS = "http://exception.jaxws.ws.test.jboss.org/"; private ExceptionEndpoint proxy; public static Test suite() Modified: branches/JEE5_TCK/src/test/java/org/jboss/test/ws/jaxws/jbws871/JBWS871TestCase.java =================================================================== --- branches/JEE5_TCK/src/test/java/org/jboss/test/ws/jaxws/jbws871/JBWS871TestCase.java 2006-11-03 15:40:44 UTC (rev 1361) +++ branches/JEE5_TCK/src/test/java/org/jboss/test/ws/jaxws/jbws871/JBWS871TestCase.java 2006-11-03 16:55:52 UTC (rev 1362) @@ -64,7 +64,7 @@ if (endpoint == null) { URL wsdlURL = new File("resources/jaxws/jbws871/META-INF/wsdl/TestEndpoint.wsdl").toURL(); - QName serviceName = new QName("http://jbws871.jaxws.ws.test.jboss.org/jaws";, "RpcArrayEndpointService"); + QName serviceName = new QName("http://jbws871.jaxws.ws.test.jboss.org/";, "RpcArrayEndpointService"); Service service = Service.create(wsdlURL, serviceName); endpoint = (RpcArrayEndpoint)service.getPort(RpcArrayEndpoint.class); } Modified: branches/JEE5_TCK/src/test/java/org/jboss/test/ws/jaxws/jsr181/handlerchain/JSR181HandlerChainTestCase.java =================================================================== --- branches/JEE5_TCK/src/test/java/org/jboss/test/ws/jaxws/jsr181/handlerchain/JSR181HandlerChainTestCase.java 2006-11-03 15:40:44 UTC (rev 1361) +++ branches/JEE5_TCK/src/test/java/org/jboss/test/ws/jaxws/jsr181/handlerchain/JSR181HandlerChainTestCase.java 2006-11-03 16:55:52 UTC (rev 1362) @@ -43,7 +43,7 @@ */ public class JSR181HandlerChainTestCase extends JBossWSTest { - private static final String targetNS = "http://handlerchain.jsr181.jaxws.ws.test.jboss.org/jaws"; + private static final String targetNS = "http://handlerchain.jsr181.jaxws.ws.test.jboss.org/"; public static Test suite() { Modified: branches/JEE5_TCK/src/test/java/org/jboss/test/ws/jaxws/jsr181/oneway/JSR181OneWayTestCase.java =================================================================== --- branches/JEE5_TCK/src/test/java/org/jboss/test/ws/jaxws/jsr181/oneway/JSR181OneWayTestCase.java 2006-11-03 15:40:44 UTC (rev 1361) +++ branches/JEE5_TCK/src/test/java/org/jboss/test/ws/jaxws/jsr181/oneway/JSR181OneWayTestCase.java 2006-11-03 16:55:52 UTC (rev 1362) @@ -47,7 +47,7 @@ */ public class JSR181OneWayTestCase extends JBossWSTest { - private static final String targetNS = "http://oneway.jsr181.jaxws.ws.test.jboss.org/jaws"; + private static final String targetNS = "http://oneway.jsr181.jaxws.ws.test.jboss.org/"; public static Test suite() { @@ -62,10 +62,10 @@ Service service = Service.create(wsdlURL, serviceName); Dispatch dispatch = service.createDispatch(portName, StreamSource.class, Mode.PAYLOAD); - String payload = "<ns1:ping xmlns:ns1='http://oneway.jsr181.jaxws.ws.test.jboss.org/jaws'/>...; + String payload = "<ns1:ping xmlns:ns1='http://oneway.jsr181.jaxws.ws.test.jboss.org/'/>"; dispatch.invokeOneWay(new StreamSource(new StringReader(payload))); - payload = "<ns1:feedback xmlns:ns1='http://oneway.jsr181.jaxws.ws.test.jboss.org/jaws'/>...; + payload = "<ns1:feedback xmlns:ns1='http://oneway.jsr181.jaxws.ws.test.jboss.org/'/>"; StreamSource retObj = (StreamSource)dispatch.invoke(new StreamSource(new StringReader(payload))); Element retElement = DOMUtils.getFirstChildElement(DOMUtils.parse(new InputSource(retObj.getReader()))); String retPayload = DOMWriter.printNode(retElement, false); Modified: branches/JEE5_TCK/src/test/java/org/jboss/test/ws/jaxws/jsr181/soapbinding/JSR181SOAPBindingTestCase.java =================================================================== --- branches/JEE5_TCK/src/test/java/org/jboss/test/ws/jaxws/jsr181/soapbinding/JSR181SOAPBindingTestCase.java 2006-11-03 15:40:44 UTC (rev 1361) +++ branches/JEE5_TCK/src/test/java/org/jboss/test/ws/jaxws/jsr181/soapbinding/JSR181SOAPBindingTestCase.java 2006-11-03 16:55:52 UTC (rev 1362) @@ -50,7 +50,7 @@ */ public class JSR181SOAPBindingTestCase extends JBossWSTest { - private String targetNS = "http://soapbinding.jsr181.jaxws.ws.test.jboss.org/jaws"; + private String targetNS = "http://soapbinding.jsr181.jaxws.ws.test.jboss.org/"; public static Test suite() { Modified: branches/JEE5_TCK/src/test/java/org/jboss/test/ws/jaxws/jsr181/soapbinding/PurchaseOrder.java =================================================================== --- branches/JEE5_TCK/src/test/java/org/jboss/test/ws/jaxws/jsr181/soapbinding/PurchaseOrder.java 2006-11-03 15:40:44 UTC (rev 1361) +++ branches/JEE5_TCK/src/test/java/org/jboss/test/ws/jaxws/jsr181/soapbinding/PurchaseOrder.java 2006-11-03 16:55:52 UTC (rev 1362) @@ -28,10 +28,10 @@ @XmlAccessorType(XmlAccessType.FIELD) -@XmlType(name = "PurchaseOrderType", namespace="http://soapbinding.jsr181.jaxws.ws.test.jboss.org/jaws";, propOrder = { "product" }) +@XmlType(name = "PurchaseOrderType", namespace="http://soapbinding.jsr181.jaxws.ws.test.jboss.org/";, propOrder = { "product" }) public class PurchaseOrder { - @XmlElement(namespace="http://soapbinding.jsr181.jaxws.ws.test.jboss.org/jaws", required = true) + @XmlElement(namespace="http://soapbinding.jsr181.jaxws.ws.test.jboss.org/", required = true) private String product; public PurchaseOrder() Modified: branches/JEE5_TCK/src/test/java/org/jboss/test/ws/jaxws/jsr181/soapbinding/PurchaseOrderAck.java =================================================================== --- branches/JEE5_TCK/src/test/java/org/jboss/test/ws/jaxws/jsr181/soapbinding/PurchaseOrderAck.java 2006-11-03 15:40:44 UTC (rev 1361) +++ branches/JEE5_TCK/src/test/java/org/jboss/test/ws/jaxws/jsr181/soapbinding/PurchaseOrderAck.java 2006-11-03 16:55:52 UTC (rev 1362) @@ -28,10 +28,10 @@ @XmlAccessorType(XmlAccessType.FIELD) -@XmlType(name = "PurchaseOrderAckType", namespace="http://soapbinding.jsr181.jaxws.ws.test.jboss.org/jaws";, propOrder = { "product" }) +@XmlType(name = "PurchaseOrderAckType", namespace="http://soapbinding.jsr181.jaxws.ws.test.jboss.org/";, propOrder = { "product" }) public class PurchaseOrderAck { - @XmlElement(namespace="http://soapbinding.jsr181.jaxws.ws.test.jboss.org/jaws", required = true) + @XmlElement(namespace="http://soapbinding.jsr181.jaxws.ws.test.jboss.org/", required = true) private String product; public PurchaseOrderAck() Modified: branches/JEE5_TCK/src/test/java/org/jboss/test/ws/jaxws/jsr181/soapbinding/SubmitBareRequest.java =================================================================== --- branches/JEE5_TCK/src/test/java/org/jboss/test/ws/jaxws/jsr181/soapbinding/SubmitBareRequest.java 2006-11-03 15:40:44 UTC (rev 1361) +++ branches/JEE5_TCK/src/test/java/org/jboss/test/ws/jaxws/jsr181/soapbinding/SubmitBareRequest.java 2006-11-03 16:55:52 UTC (rev 1362) @@ -28,11 +28,11 @@ import javax.xml.bind.annotation.XmlType; @XmlAccessorType(XmlAccessType.FIELD) -@XmlType(name = "SubmitBareRequest", namespace="http://soapbinding.jsr181.jaxws.ws.test.jboss.org/jaws";, propOrder = { "product" }) -@XmlRootElement(namespace="http://soapbinding.jsr181.jaxws.ws.test.jboss.org/jaws", name = "SubmitPO") +@XmlType(name = "SubmitBareRequest", namespace="http://soapbinding.jsr181.jaxws.ws.test.jboss.org/";, propOrder = { "product" }) +@XmlRootElement(namespace="http://soapbinding.jsr181.jaxws.ws.test.jboss.org/", name = "SubmitPO") public class SubmitBareRequest { - @XmlElement(namespace="http://soapbinding.jsr181.jaxws.ws.test.jboss.org/jaws", required = true) + @XmlElement(namespace="http://soapbinding.jsr181.jaxws.ws.test.jboss.org/", required = true) private String product; public SubmitBareRequest() Modified: branches/JEE5_TCK/src/test/java/org/jboss/test/ws/jaxws/jsr181/soapbinding/SubmitBareResponse.java =================================================================== --- branches/JEE5_TCK/src/test/java/org/jboss/test/ws/jaxws/jsr181/soapbinding/SubmitBareResponse.java 2006-11-03 15:40:44 UTC (rev 1361) +++ branches/JEE5_TCK/src/test/java/org/jboss/test/ws/jaxws/jsr181/soapbinding/SubmitBareResponse.java 2006-11-03 16:55:52 UTC (rev 1362) @@ -28,11 +28,11 @@ import javax.xml.bind.annotation.XmlType; @XmlAccessorType(XmlAccessType.FIELD) -@XmlType(name = "SubmitBareResponse", namespace = "http://soapbinding.jsr181.jaxws.ws.test.jboss.org/jaws", propOrder = { "product" }) -@XmlRootElement(namespace="http://soapbinding.jsr181.jaxws.ws.test.jboss.org/jaws", name = "SubmitPOResponse") +@XmlType(name = "SubmitBareResponse", namespace = "http://soapbinding.jsr181.jaxws.ws.test.jboss.org/", propOrder = { "product" }) +@XmlRootElement(namespace="http://soapbinding.jsr181.jaxws.ws.test.jboss.org/", name = "SubmitPOResponse") public class SubmitBareResponse { - @XmlElement(namespace = "http://soapbinding.jsr181.jaxws.ws.test.jboss.org/jaws", required = true) + @XmlElement(namespace = "http://soapbinding.jsr181.jaxws.ws.test.jboss.org/", required = true) private String product; public SubmitBareResponse() Modified: branches/JEE5_TCK/src/test/java/org/jboss/test/ws/jaxws/jsr181/webmethod/JSR181WebMethodTestCase.java =================================================================== --- branches/JEE5_TCK/src/test/java/org/jboss/test/ws/jaxws/jsr181/webmethod/JSR181WebMethodTestCase.java 2006-11-03 15:40:44 UTC (rev 1361) +++ branches/JEE5_TCK/src/test/java/org/jboss/test/ws/jaxws/jsr181/webmethod/JSR181WebMethodTestCase.java 2006-11-03 16:55:52 UTC (rev 1362) @@ -56,7 +56,7 @@ public class JSR181WebMethodTestCase extends JBossWSTest { private String endpointURL = "http://" + getServerHost() + ":8080/jaxws-jsr181-webmethod/TestService"; - private String targetNS = "http://webmethod.jsr181.jaxws.ws.test.jboss.org/jaws"; + private String targetNS = "http://webmethod.jsr181.jaxws.ws.test.jboss.org/"; public static Test suite() { @@ -139,7 +139,7 @@ String expPayload = "<env:Fault xmlns:env='http://schemas.xmlsoap.org/soap/envelope/'>" + " <faultcode>env:Client</faultcode>" + - " <faultstring>Endpoint {http://webmethod.jsr181.jaxws.ws.test.jboss.org/jaws}TestEndpointPort does not contain operation meta data for: {http://webmethod.jsr181.jaxws.ws.test.jboss.org/jaws}noWebMethod</faultstring>" + + " <faultstring>Endpoint {http://webmethod.jsr181.jaxws.ws.test.jboss.org/}TestEndpointPort does not contain operation meta data for: {http://webmethod.jsr181.jaxws.ws.test.jboss.org/}noWebMethod</faultstring>" + "</env:Fault>"; Service service = Service.create(wsdlURL, serviceName); Modified: branches/JEE5_TCK/src/test/java/org/jboss/test/ws/jaxws/jsr181/webresult/JSR181WebResultTestCase.java =================================================================== --- branches/JEE5_TCK/src/test/java/org/jboss/test/ws/jaxws/jsr181/webresult/JSR181WebResultTestCase.java 2006-11-03 15:40:44 UTC (rev 1361) +++ branches/JEE5_TCK/src/test/java/org/jboss/test/ws/jaxws/jsr181/webresult/JSR181WebResultTestCase.java 2006-11-03 16:55:52 UTC (rev 1362) @@ -51,7 +51,7 @@ public class JSR181WebResultTestCase extends JBossWSTest { private String endpointURL = "http://" + getServerHost() + ":8080/jaxws-jsr181-webresult/TestService"; - private String targetNS = "http://webresult.jsr181.jaxws.ws.test.jboss.org/jaws"; + private String targetNS = "http://webresult.jsr181.jaxws.ws.test.jboss.org/"; public static Test suite() { Modified: branches/JEE5_TCK/src/test/java/org/jboss/test/ws/jaxws/wrapped/accessor/AccessorTestCase.java =================================================================== --- branches/JEE5_TCK/src/test/java/org/jboss/test/ws/jaxws/wrapped/accessor/AccessorTestCase.java 2006-11-03 15:40:44 UTC (rev 1361) +++ branches/JEE5_TCK/src/test/java/org/jboss/test/ws/jaxws/wrapped/accessor/AccessorTestCase.java 2006-11-03 16:55:52 UTC (rev 1362) @@ -39,7 +39,7 @@ */ public class AccessorTestCase extends JBossWSTest { - private String targetNS = "http://accessor.wrapped.jaxws.ws.test.jboss.org/jaws"; + private String targetNS = "http://accessor.wrapped.jaxws.ws.test.jboss.org/"; private Accessor proxy; public static Test suite() Modified: branches/JEE5_TCK/src/test/resources/jaxws/jbws871/META-INF/wsdl/TestEndpoint.wsdl =================================================================== --- branches/JEE5_TCK/src/test/resources/jaxws/jbws871/META-INF/wsdl/TestEndpoint.wsdl 2006-11-03 15:40:44 UTC (rev 1361) +++ branches/JEE5_TCK/src/test/resources/jaxws/jbws871/META-INF/wsdl/TestEndpoint.wsdl 2006-11-03 16:55:52 UTC (rev 1362) @@ -1,6 +1,6 @@ -<definitions name='RpcArrayEndpointService' targetNamespace='http://jbws871.jaxws.ws.test.jboss.org/jaws' xmlns='http://schemas.xmlsoap.org/wsdl/' xmlns:soap='http://schemas.xmlsoap.org/wsdl/soap/' xmlns:tns='http://jbws871.jaxws.ws.test.jboss.org/jaws' xmlns:xsd='http://www.w3.org/2001/XMLSchema'> +<definitions name='RpcArrayEndpointService' targetNamespace='http://jbws871.jaxws.ws.test.jboss.org/' xmlns='http://schemas.xmlsoap.org/wsdl/' xmlns:soap='http://schemas.xmlsoap.org/wsdl/soap/' xmlns:tns='http://jbws871.jaxws.ws.test.jboss.org/' xmlns:xsd='http://www.w3.org/2001/XMLSchema'> <types> - <schema elementFormDefault='qualified' targetNamespace='http://jbws871.jaxws.ws.test.jboss.org/jaws' xmlns='http://www.w3.org/2001/XMLSchema' xmlns:soap11-enc='http://schemas.xmlsoap.org/soap/encoding/' xmlns:tns='http://jbws871.jaxws.ws.test.jboss.org/jaws' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance'> + <schema elementFormDefault='qualified' targetNamespace='http://jbws871.jaxws.ws.test.jboss.org/' xmlns='http://www.w3.org/2001/XMLSchema' xmlns:soap11-enc='http://schemas.xmlsoap.org/soap/encoding/' xmlns:tns='http://jbws871.jaxws.ws.test.jboss.org/' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance'> <complexType name='Integer.Array'> <sequence> <element maxOccurs='unbounded' minOccurs='0' name='value' nillable='true' type='int'/> @@ -26,10 +26,10 @@ <operation name='intArr'> <soap:operation soapAction=''/> <input> - <soap:body namespace='http://jbws871.jaxws.ws.test.jboss.org/jaws' use='literal'/> + <soap:body namespace='http://jbws871.jaxws.ws.test.jboss.org/' use='literal'/> </input> <output> - <soap:body namespace='http://jbws871.jaxws.ws.test.jboss.org/jaws' use='literal'/> + <soap:body namespace='http://jbws871.jaxws.ws.test.jboss.org/' use='literal'/> </output> </operation> </binding> Modified: branches/JEE5_TCK/src/test/resources/jaxws/jsr181/complex/META-INF/wsdl/RegistrationService.wsdl =================================================================== --- branches/JEE5_TCK/src/test/resources/jaxws/jsr181/complex/META-INF/wsdl/RegistrationService.wsdl 2006-11-03 15:40:44 UTC (rev 1361) +++ branches/JEE5_TCK/src/test/resources/jaxws/jsr181/complex/META-INF/wsdl/RegistrationService.wsdl 2006-11-03 16:55:52 UTC (rev 1362) @@ -6,8 +6,8 @@ $Id$ --> <definitions name="RegistrationServiceService" targetNamespace="http://org.jboss.ws/jaxws/complex" xmlns="http://schemas.xmlsoap.org/wsdl/" - xmlns:soap='http://schemas.xmlsoap.org/wsdl/soap/' xmlns:ns1="http://complex.jsr181.jaxws.ws.test.jboss.org/jaws" - xmlns:ns2="http://extra.complex.jsr181.jaxws.ws.test.jboss.org/jaws&... xmlns:tns="http://org.jboss.ws/jaxws/complex" xmlns:xsd="http://www.w3.org/2001/XMLSchema" + xmlns:soap='http://schemas.xmlsoap.org/wsdl/soap/' xmlns:ns1="http://complex.jsr181.jaxws.ws.test.jboss.org/" + xmlns:ns2="http://extra.complex.jsr181.jaxws.ws.test.jboss.org/" xmlns:tns="http://org.jboss.ws/jaxws/complex" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:jaxws="http://java.sun.com/xml/ns/jaxws" xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"> <jaxws:bindings> @@ -16,7 +16,7 @@ <types> <schema elementFormDefault="qualified" targetNamespace="http://org.jboss.ws/jaxws/complex" xmlns="http://www.w3.org/2001/XMLSchema" - xmlns:ns2="http://complex.jsr181.jaxws.ws.test.jboss.org/jaws" xmlns:ns3="http://extra.complex.jsr181.jaxws.ws.test.jboss.org/jaws&... + xmlns:ns2="http://complex.jsr181.jaxws.ws.test.jboss.org/" xmlns:ns3="http://extra.complex.jsr181.jaxws.ws.test.jboss.org/" xmlns:tns="http://org.jboss.ws/jaxws/complex" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" jaxb:version="2.0"> <xsd:annotation> @@ -27,8 +27,8 @@ </xsd:appinfo> </xsd:annotation> - <import namespace="http://extra.complex.jsr181.jaxws.ws.test.jboss.org/jaws&... - <import namespace="http://complex.jsr181.jaxws.ws.test.jboss.org/jaws"/... + <import namespace="http://extra.complex.jsr181.jaxws.ws.test.jboss.org/"... + <import namespace="http://complex.jsr181.jaxws.ws.test.jboss.org/"/> <complexType name="AlreadyRegisteredException"> <complexContent> @@ -116,9 +116,9 @@ <element name="ValidationException" type="tns:ValidationException"/> </schema> - <schema elementFormDefault="qualified" targetNamespace="http://extra.complex.jsr181.jaxws.ws.test.jboss.org... xmlns="http://www.w3.org/2001/XMLSchema" - xmlns:ns1="http://org.jboss.ws/jaxws/complex" xmlns:ns2="http://complex.jsr181.jaxws.ws.test.jboss.org/jaws" - xmlns:tns="http://extra.complex.jsr181.jaxws.ws.test.jboss.org/jaws&... xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" jaxb:version="2.0"> + <schema elementFormDefault="qualified" targetNamespace="http://extra.complex.jsr181.jaxws.ws.test.jboss.org... xmlns="http://www.w3.org/2001/XMLSchema" + xmlns:ns1="http://org.jboss.ws/jaxws/complex" xmlns:ns2="http://complex.jsr181.jaxws.ws.test.jboss.org/" + xmlns:tns="http://extra.complex.jsr181.jaxws.ws.test.jboss.org/" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" jaxb:version="2.0"> <xsd:annotation> <xsd:appinfo> @@ -129,7 +129,7 @@ </xsd:annotation> <import namespace="http://org.jboss.ws/jaxws/complex"/> - <import namespace="http://complex.jsr181.jaxws.ws.test.jboss.org/jaws"/... + <import namespace="http://complex.jsr181.jaxws.ws.test.jboss.org/"/> <complexType name="Statistics"> <sequence> @@ -139,9 +139,9 @@ </complexType> </schema> - <schema elementFormDefault="qualified" targetNamespace="http://complex.jsr181.jaxws.ws.test.jboss.org/jaws&... xmlns="http://www.w3.org/2001/XMLSchema" - xmlns:ns1="http://org.jboss.ws/jaxws/complex" xmlns:ns3="http://extra.complex.jsr181.jaxws.ws.test.jboss.org/jaws&... - xmlns:tns="http://complex.jsr181.jaxws.ws.test.jboss.org/jaws" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" jaxb:version="2.0"> + <schema elementFormDefault="qualified" targetNamespace="http://complex.jsr181.jaxws.ws.test.jboss.org/" xmlns="http://www.w3.org/2001/XMLSchema" + xmlns:ns1="http://org.jboss.ws/jaxws/complex" xmlns:ns3="http://extra.complex.jsr181.jaxws.ws.test.jboss.org/" + xmlns:tns="http://complex.jsr181.jaxws.ws.test.jboss.org/" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" jaxb:version="2.0"> <xsd:annotation> <xsd:appinfo> @@ -152,7 +152,7 @@ </xsd:annotation> <import namespace="http://org.jboss.ws/jaxws/complex"/> - <import namespace="http://extra.complex.jsr181.jaxws.ws.test.jboss.org/jaws&... + <import namespace="http://extra.complex.jsr181.jaxws.ws.test.jboss.org/"... <complexType name="Address"> <sequence> Modified: branches/JEE5_TCK/src/test/resources/jaxws/jsr181/complex/jaxrpc-mapping.xml =================================================================== --- branches/JEE5_TCK/src/test/resources/jaxws/jsr181/complex/jaxrpc-mapping.xml 2006-11-03 15:40:44 UTC (rev 1361) +++ branches/JEE5_TCK/src/test/resources/jaxws/jsr181/complex/jaxrpc-mapping.xml 2006-11-03 16:55:52 UTC (rev 1362) @@ -2,15 +2,15 @@ <java-wsdl-mapping xmlns="http://java.sun.com/xml/ns/j2ee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.1" 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.jaxws.jsr181.complex.client</package-type> -<namespaceURI>http://complex.jsr181.jaxws.ws.test.jboss.org/jaws</namespaceURI> +<namespaceURI>http://complex.jsr181.jaxws.ws.test.jboss.org/</namespaceURI> </package-mapping> <package-mapping> <package-type>org.jboss.test.ws.jaxws.jsr181.complex.client</package-type> -<namespaceURI>http://extra.complex.jsr181.jaxws.ws.test.jboss.org/jaws</namespaceURI> +<namespaceURI>http://extra.complex.jsr181.jaxws.ws.test.jboss.org/</namespaceURI> </package-mapping> <java-xml-type-mapping> <java-type>org.jboss.test.ws.jaxws.jsr181.complex.client.Register</java-type> -<root-type-qname xmlns:typeNS="http://complex.jsr181.jaxws.ws.test.jboss.org/jaws&quo... +<root-type-qname xmlns:typeNS="http://complex.jsr181.jaxws.ws.test.jboss.org/"&g... <qname-scope>complexType</qname-scope> <variable-mapping> <java-variable-name>customer</java-variable-name> @@ -23,7 +23,7 @@ </java-xml-type-mapping> <java-xml-type-mapping> <java-type>org.jboss.test.ws.jaxws.jsr181.complex.client.Statistics</java-type> -<root-type-qname xmlns:typeNS="http://extra.complex.jsr181.jaxws.ws.test.jboss.org/ja... +<root-type-qname xmlns:typeNS="http://extra.complex.jsr181.jaxws.ws.test.jboss.org/&q... <qname-scope>complexType</qname-scope> <variable-mapping> <java-variable-name>activationTime</java-variable-name> @@ -36,7 +36,7 @@ </java-xml-type-mapping> <java-xml-type-mapping> <java-type>org.jboss.test.ws.jaxws.jsr181.complex.client.InvoiceCustomer</java-type> -<root-type-qname xmlns:typeNS="http://complex.jsr181.jaxws.ws.test.jboss.org/jaws&quo... +<root-type-qname xmlns:typeNS="http://complex.jsr181.jaxws.ws.test.jboss.org/"&g... <qname-scope>complexType</qname-scope> <variable-mapping> <java-variable-name>address</java-variable-name> @@ -65,7 +65,7 @@ </java-xml-type-mapping> <java-xml-type-mapping> <java-type>org.jboss.test.ws.jaxws.jsr181.complex.client.BulkRegister</java-type> -<root-type-qname xmlns:typeNS="http://complex.jsr181.jaxws.ws.test.jboss.org/jaws&quo... +<root-type-qname xmlns:typeNS="http://complex.jsr181.jaxws.ws.test.jboss.org/"&g... <qname-scope>complexType</qname-scope> <variable-mapping> <java-variable-name>customers</java-variable-name> @@ -78,7 +78,7 @@ </java-xml-type-mapping> <java-xml-type-mapping> <java-type>org.jboss.test.ws.jaxws.jsr181.complex.client.ValidationException</java-type> -<root-type-qname xmlns:typeNS="http://complex.jsr181.jaxws.ws.test.jboss.org/jaws&quo... +<root-type-qname xmlns:typeNS="http://complex.jsr181.jaxws.ws.test.jboss.org/"&g... <qname-scope>complexType</qname-scope> <variable-mapping> <java-variable-name>message</java-variable-name> @@ -91,7 +91,7 @@ </java-xml-type-mapping> <java-xml-type-mapping> <java-type>org.jboss.test.ws.jaxws.jsr181.complex.client.Address</java-type> -<root-type-qname xmlns:typeNS="http://complex.jsr181.jaxws.ws.test.jboss.org/jaws&quo... +<root-type-qname xmlns:typeNS="http://complex.jsr181.jaxws.ws.test.jboss.org/"&g... <qname-scope>complexType</qname-scope> <variable-mapping> <java-variable-name>city</java-variable-name> @@ -112,7 +112,7 @@ </java-xml-type-mapping> <java-xml-type-mapping> <java-type>org.jboss.test.ws.jaxws.jsr181.complex.client.Name</java-type> -<root-type-qname xmlns:typeNS="http://complex.jsr181.jaxws.ws.test.jboss.org/jaws&quo... +<root-type-qname xmlns:typeNS="http://complex.jsr181.jaxws.ws.test.jboss.org/"&g... <qname-scope>complexType</qname-scope> <variable-mapping> <java-variable-name>firstName</java-variable-name> @@ -129,7 +129,7 @@ </java-xml-type-mapping> <java-xml-type-mapping> <java-type>org.jboss.test.ws.jaxws.jsr181.complex.client.BulkRegisterResponse</java-type> -<root-type-qname xmlns:typeNS="http://complex.jsr181.jaxws.ws.test.jboss.org/jaws&quo... +<root-type-qname xmlns:typeNS="http://complex.jsr181.jaxws.ws.test.jboss.org/"&g... <qname-scope>complexType</qname-scope> <variable-mapping> <java-variable-name>registeredIDs</java-variable-name> @@ -138,7 +138,7 @@ </java-xml-type-mapping> <java-xml-type-mapping> <java-type>org.jboss.test.ws.jaxws.jsr181.complex.client.PhoneNumber</java-type> -<root-type-qname xmlns:typeNS="http://complex.jsr181.jaxws.ws.test.jboss.org/jaws&quo... +<root-type-qname xmlns:typeNS="http://complex.jsr181.jaxws.ws.test.jboss.org/"&g... <qname-scope>complexType</qname-scope> <variable-mapping> <java-variable-name>areaCode</java-variable-name> @@ -155,7 +155,7 @@ </java-xml-type-mapping> <java-xml-type-mapping> <java-type>org.jboss.test.ws.jaxws.jsr181.complex.client.RegisterForInvoiceResponse</java-type> -<root-type-qname xmlns:typeNS="http://complex.jsr181.jaxws.ws.test.jboss.org/jaws&quo... +<root-type-qname xmlns:typeNS="http://complex.jsr181.jaxws.ws.test.jboss.org/"&g... <qname-scope>complexType</qname-scope> <variable-mapping> <java-variable-name>done</java-variable-name> @@ -164,7 +164,7 @@ </java-xml-type-mapping> <java-xml-type-mapping> <java-type>org.jboss.test.ws.jaxws.jsr181.complex.client.RegisterForInvoice</java-type> -<root-type-qname xmlns:typeNS="http://complex.jsr181.jaxws.ws.test.jboss.org/jaws&quo... +<root-type-qname xmlns:typeNS="http://complex.jsr181.jaxws.ws.test.jboss.org/"&g... <qname-scope>complexType</qname-scope> <variable-mapping> <java-variable-name>invoiceCustomer</java-variable-name> @@ -173,7 +173,7 @@ </java-xml-type-mapping> <java-xml-type-mapping> <java-type>org.jboss.test.ws.jaxws.jsr181.complex.client.RegisterResponse</java-type> -<root-type-qname xmlns:typeNS="http://complex.jsr181.jaxws.ws.test.jboss.org/jaws&quo... +<root-type-qname xmlns:typeNS="http://complex.jsr181.jaxws.ws.test.jboss.org/"&g... <qname-scope>complexType</qname-scope> <variable-mapping> <java-variable-name>registeredID</java-variable-name> @@ -182,7 +182,7 @@ </java-xml-type-mapping> <java-xml-type-mapping> <java-type>org.jboss.test.ws.jaxws.jsr181.complex.client.GetStatistics</java-type> -<root-type-qname xmlns:typeNS="http://complex.jsr181.jaxws.ws.test.jboss.org/jaws&quo... +<root-type-qname xmlns:typeNS="http://complex.jsr181.jaxws.ws.test.jboss.org/"&g... <qname-scope>complexType</qname-scope> <variable-mapping> <java-variable-name>customer</java-variable-name> @@ -191,7 +191,7 @@ </java-xml-type-mapping> <java-xml-type-mapping> <java-type>org.jboss.test.ws.jaxws.jsr181.complex.client.GetStatisticsResponse</java-type> -<root-type-qname xmlns:typeNS="http://complex.jsr181.jaxws.ws.test.jboss.org/jaws&quo... +<root-type-qname xmlns:typeNS="http://complex.jsr181.jaxws.ws.test.jboss.org/"&g... <qname-scope>complexType</qname-scope> <variable-mapping> <java-variable-name>statistics</java-variable-name> @@ -200,7 +200,7 @@ </java-xml-type-mapping> <java-xml-type-mapping> <java-type>org.jboss.test.ws.jaxws.jsr181.complex.client.Customer</java-type> -<root-type-qname xmlns:typeNS="http://complex.jsr181.jaxws.ws.test.jboss.org/jaws&quo... +<root-type-qname xmlns:typeNS="http://complex.jsr181.jaxws.ws.test.jboss.org/"&g... <qname-scope>complexType</qname-scope> <variable-mapping> <java-variable-name>address</java-variable-name> @@ -225,7 +225,7 @@ </java-xml-type-mapping> <java-xml-type-mapping> <java-type>org.jboss.test.ws.jaxws.jsr181.complex.client.AlreadyRegisteredException</java-type> -<root-type-qname xmlns:typeNS="http://complex.jsr181.jaxws.ws.test.jboss.org/jaws&quo... +<root-type-qname xmlns:typeNS="http://complex.jsr181.jaxws.ws.test.jboss.org/"&g... <qname-scope>complexType</qname-scope> <variable-mapping> <java-variable-name>message</java-variable-name> @@ -238,22 +238,22 @@ </java-xml-type-mapping> <java-xml-type-mapping> <java-type>org.jboss.test.ws.jaxws.jsr181.complex.client.Customer[]</java-type> -<anonymous-type-qname>http://complex.jsr181.jaxws.ws.test.jboss.org/jaws:BulkRegister&gt;Customers[0,unbounded]</anonymous-type-qname> +<anonymous-type-qname>http://complex.jsr181.jaxws.ws.test.jboss.org/:BulkRegister&gt;Customers[0,unbounded]</anonymous-type-qname> <qname-scope>complexType</qname-scope> </java-xml-type-mapping> <java-xml-type-mapping> <java-type>long[]</java-type> -<anonymous-type-qname>http://complex.jsr181.jaxws.ws.test.jboss.org/jaws:BulkRegisterResponse&gt;RegisteredIDs[0,unbounded]</anonymous-type-qname> +<anonymous-type-qname>http://complex.jsr181.jaxws.ws.test.jboss.org/:BulkRegisterResponse&gt;RegisteredIDs[0,unbounded]</anonymous-type-qname> <qname-scope>complexType</qname-scope> </java-xml-type-mapping> <java-xml-type-mapping> <java-type>org.jboss.test.ws.jaxws.jsr181.complex.client.Customer[]</java-type> -<anonymous-type-qname>http://complex.jsr181.jaxws.ws.test.jboss.org/jaws:Customer&gt;referredCustomers[0,unbounded]</anonymous-type-qname> +<anonymous-type-qname>http://complex.jsr181.jaxws.ws.test.jboss.org/:Customer&gt;referredCustomers[0,unbounded]</anonymous-type-qname> <qname-scope>complexType</qname-scope> </java-xml-type-mapping> <exception-mapping> <exception-type>org.jboss.test.ws.jaxws.jsr181.complex.client.ValidationException</exception-type> -<wsdl-message xmlns:exMsgNS="http://complex.jsr181.jaxws.ws.test.jboss.org/jaws&qu... +<wsdl-message xmlns:exMsgNS="http://complex.jsr181.jaxws.ws.test.jboss.org/"&... <constructor-parameter-order> <element-name>message</element-name> <element-name>failiedCustomers</element-name> @@ -261,7 +261,7 @@ </exception-mapping> <exception-mapping> <exception-type>org.jboss.test.ws.jaxws.jsr181.complex.client.AlreadyRegisteredException</exception-type> -<wsdl-message xmlns:exMsgNS="http://complex.jsr181.jaxws.ws.test.jboss.org/jaws&qu... +<wsdl-message xmlns:exMsgNS="http://complex.jsr181.jaxws.ws.test.jboss.org/"&... <constructor-parameter-order> <element-name>message</element-name> <element-name>existingId</element-name> @@ -269,7 +269,7 @@ </exception-mapping> <service-interface-mapping> <service-interface>org.jboss.test.ws.jaxws.jsr181.complex.client.RegistrationServiceService</service-interface> -<wsdl-service-name xmlns:serviceNS="http://complex.jsr181.jaxws.ws.test.jboss.org/jaws&... +<wsdl-service-name xmlns:serviceNS="http://complex.jsr181.jaxws.ws.test.jboss.org/"... <port-mapping> <port-name>RegistrationServicePort</port-name> <java-port-name>RegistrationServicePort</java-port-name> @@ -277,8 +277,8 @@ </service-interface-mapping> <service-endpoint-interface-mapping> <service-endpoint-interface>org.jboss.test.ws.jaxws.jsr181.complex.client.RegistrationService</service-endpoint-interface> -<wsdl-port-type xmlns:portTypeNS="http://complex.jsr181.jaxws.ws.test.jboss.org/jaws... -<wsdl-binding xmlns:bindingNS="http://complex.jsr181.jaxws.ws.test.jboss.org/jaws&... +<wsdl-port-type xmlns:portTypeNS="http://complex.jsr181.jaxws.ws.test.jboss.org/&quo... +<wsdl-binding xmlns:bindingNS="http://complex.jsr181.jaxws.ws.test.jboss.org/"... <service-endpoint-method-mapping> <java-method-name>bulkRegister</java-method-name> <wsdl-operation>BulkRegister</wsdl-operation> @@ -287,7 +287,7 @@ <param-position>0</param-position> <param-type>org.jboss.test.ws.jaxws.jsr181.complex.client.Customer[]</param-type> <wsdl-message-mapping> -<wsdl-message xmlns:wsdlMsgNS="http://complex.jsr181.jaxws.ws.test.jboss.org/jaws&... +<wsdl-message xmlns:wsdlMsgNS="http://complex.jsr181.jaxws.ws.test.jboss.org/"... <wsdl-message-part-name>Customers</wsdl-message-part-name> <parameter-mode>IN</parameter-mode> </wsdl-message-mapping> @@ -296,14 +296,14 @@ <param-position>1</param-position> <param-type>java.util.Calendar</param-type> <wsdl-message-mapping> -<wsdl-message xmlns:wsdlMsgNS="http://complex.jsr181.jaxws.ws.test.jboss.org/jaws&... +<wsdl-message xmlns:wsdlMsgNS="http://complex.jsr181.jaxws.ws.test.jboss.org/"... <wsdl-message-part-name>When</wsdl-message-part-name> <parameter-mode>IN</parameter-mode> </wsdl-message-mapping> </method-param-parts-mapping> <wsdl-return-value-mapping> <method-return-value>long[]</method-return-value> -<wsdl-message xmlns:wsdlMsgNS="http://complex.jsr181.jaxws.ws.test.jboss.org/jaws&... +<wsdl-message xmlns:wsdlMsgNS="http://complex.jsr181.jaxws.ws.test.jboss.org/"... <wsdl-message-part-name>RegisteredIDs</wsdl-message-part-name> </wsdl-return-value-mapping> </service-endpoint-method-mapping> @@ -315,14 +315,14 @@ <param-position>0</param-position> <param-type>org.jboss.test.ws.jaxws.jsr181.complex.client.Customer</param-type> <wsdl-message-mapping> -<wsdl-message xmlns:wsdlMsgNS="http://complex.jsr181.jaxws.ws.test.jboss.org/jaws&... +<wsdl-message xmlns:wsdlMsgNS="http://complex.jsr181.jaxws.ws.test.jboss.org/"... <wsdl-message-part-name>Customer</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.jaxws.jsr181.complex.client.Statistics</method-return-value> -<wsdl-message xmlns:wsdlMsgNS="http://complex.jsr181.jaxws.ws.test.jboss.org/jaws&... +<wsdl-message xmlns:wsdlMsgNS="http://complex.jsr181.jaxws.ws.test.jboss.org/"... <wsdl-message-part-name>Statistics</wsdl-message-part-name> </wsdl-return-value-mapping> </service-endpoint-method-mapping> @@ -334,7 +334,7 @@ <param-position>0</param-position> <param-type>org.jboss.test.ws.jaxws.jsr181.complex.client.Customer</param-type> <wsdl-message-mapping> -<wsdl-message xmlns:wsdlMsgNS="http://complex.jsr181.jaxws.ws.test.jboss.org/jaws&... +<wsdl-message xmlns:wsdlMsgNS="http://complex.jsr181.jaxws.ws.test.jboss.org/"... <wsdl-message-part-name>Customer</wsdl-message-part-name> <parameter-mode>IN</parameter-mode> </wsdl-message-mapping> @@ -343,14 +343,14 @@ <param-position>1</param-position> <param-type>java.util.Calendar</param-type> <wsdl-message-mapping> -<wsdl-message xmlns:wsdlMsgNS="http://complex.jsr181.jaxws.ws.test.jboss.org/jaws&... +<wsdl-message xmlns:wsdlMsgNS="http://complex.jsr181.jaxws.ws.test.jboss.org/"... <wsdl-message-part-name>When</wsdl-message-part-name> <parameter-mode>IN</parameter-mode> </wsdl-message-mapping> </method-param-parts-mapping> <wsdl-return-value-mapping> <method-return-value>long</method-return-value> -<wsdl-message xmlns:wsdlMsgNS="http://complex.jsr181.jaxws.ws.test.jboss.org/jaws&... +<wsdl-message xmlns:wsdlMsgNS="http://complex.jsr181.jaxws.ws.test.jboss.org/"... <wsdl-message-part-name>RegisteredID</wsdl-message-part-name> </wsdl-return-value-mapping> </service-endpoint-method-mapping> @@ -362,14 +362,14 @@ <param-position>0</param-position> <param-type>org.jboss.test.ws.jaxws.jsr181.complex.client.InvoiceCustomer</param-type> <wsdl-message-mapping> -<wsdl-message xmlns:wsdlMsgNS="http://complex.jsr181.jaxws.ws.test.jboss.org/jaws&... +<wsdl-message xmlns:wsdlMsgNS="http://complex.jsr181.jaxws.ws.test.jboss.org/"... <wsdl-message-part-name>InvoiceCustomer</wsdl-message-part-name> <parameter-mode>IN</parameter-mode> </wsdl-message-mapping> </method-param-parts-mapping> <wsdl-return-value-mapping> <method-return-value>boolean</method-return-value> -<wsdl-message xmlns:wsdlMsgNS="http://complex.jsr181.jaxws.ws.test.jboss.org/jaws&... +<wsdl-message xmlns:wsdlMsgNS="http://complex.jsr181.jaxws.ws.test.jboss.org/"... <wsdl-message-part-name>done</wsdl-message-part-name> </wsdl-return-value-mapping> </service-endpoint-method-mapping> Modified: branches/JEE5_TCK/src/test/resources/jaxws/jsr181/webresult/jaxrpc-mapping.xml =================================================================== --- branches/JEE5_TCK/src/test/resources/jaxws/jsr181/webresult/jaxrpc-mapping.xml 2006-11-03 15:40:44 UTC (rev 1361) +++ branches/JEE5_TCK/src/test/resources/jaxws/jsr181/webresult/jaxrpc-mapping.xml 2006-11-03 16:55:52 UTC (rev 1362) @@ -5,7 +5,7 @@ <package-mapping> <package-type>org.jboss.test.ws.jaxws.jsr181.webresult</package-type> - <namespaceURI>http://webresult.jsr181.jaxws.ws.test.jboss.org/jaws</... + <namespaceURI>http://webresult.jsr181.jaxws.ws.test.jboss.org/</name... </package-mapping> </java-wsdl-mapping>