Author: thomas.diesler(a)jboss.com Date: 2007-01-19 09:36:35 -0500 (Fri, 19 Jan 2007) New Revision: 2012 Modified: trunk/integration-jboss50/src/main/java/org/jboss/ws/integration/jboss50/UnifiedServiceRefObjectFactory.java trunk/jbossws-tests/src/main/resources/jaxws/webserviceref/META-INF-override/jboss-client.xml trunk/jbossws-tests/src/main/resources/jaxws/webserviceref/META-INF-secure/jboss-client.xml Log: Change qname layout in <service-ref> to QName.valueOf() Modified: trunk/integration-jboss50/src/main/java/org/jboss/ws/integration/jboss50/UnifiedServiceRefObjectFactory.java =================================================================== --- trunk/integration-jboss50/src/main/java/org/jboss/ws/integration/jboss50/UnifiedServiceRefObjectFactory.java 2007-01-19 13:42:58 UTC (rev 2011) +++ trunk/integration-jboss50/src/main/java/org/jboss/ws/integration/jboss50/UnifiedServiceRefObjectFactory.java 2007-01-19 14:36:35 UTC (rev 2012) @@ -25,6 +25,7 @@ import java.io.ByteArrayOutputStream; import java.io.InputStream; +import javax.xml.namespace.QName; import javax.xml.transform.Source; import javax.xml.transform.TransformerFactory; import javax.xml.transform.stream.StreamResult; @@ -104,7 +105,7 @@ } else if (localName.equals("service-qname")) { - ref.setServiceQName(navigator.resolveQName(value)); + ref.setServiceQName(QName.valueOf(value)); } else if (localName.equals("config-name")) { @@ -143,7 +144,7 @@ } else if (localName.equals("port-qname")) { - portInfo.setPortQName(navigator.resolveQName(value)); + portInfo.setPortQName(QName.valueOf(value)); } else if (localName.equals("config-name")) { Modified: trunk/jbossws-tests/src/main/resources/jaxws/webserviceref/META-INF-override/jboss-client.xml =================================================================== --- trunk/jbossws-tests/src/main/resources/jaxws/webserviceref/META-INF-override/jboss-client.xml 2007-01-19 13:42:58 UTC (rev 2011) +++ trunk/jbossws-tests/src/main/resources/jaxws/webserviceref/META-INF-override/jboss-client.xml 2007-01-19 14:36:35 UTC (rev 2012) @@ -5,14 +5,13 @@ <jboss-client> <jndi-name>jbossws-client</jndi-name> - <!-- @WebServiceRef(name = "Service1") --> <service-ref> <service-ref-name>Service1</service-ref-name> <service-class-name>org.jboss.test.ws.jaxws.webserviceref.TestEndpointService</service-class-name> - <service-qname xmlns:nss="http://org.jboss.ws/wsref">nss:TestEndpointService</service-qname> + <service-qname>{http://org.jboss.ws/wsref}TestEndpointService</service-qname> <wsdl-override>META-INF/wsdl/TestEndpoint.wsdl</wsdl-override> </service-ref> @@ -32,7 +31,7 @@ <service-ref> <service-ref-name>Service3</service-ref-name> <service-class-name>org.jboss.test.ws.jaxws.webserviceref.TestEndpointService</service-class-name> - <service-qname xmlns:nss="http://org.jboss.ws/wsref">nss:TestEndpointService</service-qname> + <service-qname>{http://org.jboss.ws/wsref}TestEndpointService</service-qname> <wsdl-override>META-INF/wsdl/TestEndpoint.wsdl</wsdl-override> </service-ref> @@ -55,7 +54,7 @@ <service-ref> <service-ref-name>Port1</service-ref-name> <port-info> - <port-qname xmlns:nsp='http://org.jboss.ws/wsref'>nsp:TestEndpointPort</port-qname> + <port-qname>{http://org.jboss.ws/wsref}TestEndpointPort</port-qname> <config-name>Custom Client</config-name> <config-file>META-INF/jbossws-client-config.xml</config-file> </port-info> @@ -82,7 +81,7 @@ <service-ref-name>Port3</service-ref-name> <port-info> <service-endpoint-interface>org.jboss.test.ws.jaxws.webserviceref.TestEndpoint</service-endpoint-interface> - <port-qname xmlns:nsp='http://org.jboss.ws/wsref'>nsp:TestEndpointPort</port-qname> + <port-qname>{http://org.jboss.ws/wsref}TestEndpointPort</port-qname> <stub-property> <name>javax.xml.ws.security.auth.username</name> <value>kermit</value> Modified: trunk/jbossws-tests/src/main/resources/jaxws/webserviceref/META-INF-secure/jboss-client.xml =================================================================== --- trunk/jbossws-tests/src/main/resources/jaxws/webserviceref/META-INF-secure/jboss-client.xml 2007-01-19 13:42:58 UTC (rev 2011) +++ trunk/jbossws-tests/src/main/resources/jaxws/webserviceref/META-INF-secure/jboss-client.xml 2007-01-19 14:36:35 UTC (rev 2012) @@ -8,10 +8,10 @@ <service-ref> <service-ref-name>SecureService1</service-ref-name> <service-class-name>org.jboss.test.ws.jaxws.webserviceref.SecureEndpointService</service-class-name> - <service-qname xmlns:nss='http://org.jboss.ws/wsref'>nss:SecureEndpointService</service-qname> + <service-qname>{http://org.jboss.ws/wsref}SecureEndpointService</service-qname> <port-info> <service-endpoint-interface>org.jboss.test.ws.jaxws.webserviceref.SecureEndpoint</service-endpoint-interface> - <port-qname xmlns:nsp='http://org.jboss.ws/wsref'>nsp:SecureEndpointPort</port-qname> + <port-qname>{http://org.jboss.ws/wsref}SecureEndpointPort</port-qname> <stub-property> <name>javax.xml.ws.security.auth.username</name> <value>kermit</value> @@ -27,7 +27,7 @@ <service-ref> <service-ref-name>SecureService2</service-ref-name> <port-info> - <port-qname xmlns:nsp='http://org.jboss.ws/wsref'>nsp:SecureEndpointPort</port-qname> + <port-qname>{http://org.jboss.ws/wsref}SecureEndpointPort</port-qname> <stub-property> <name>javax.xml.ws.security.auth.username</name> <value>kermit</value>