[jbossws-commits] JBossWS SVN: r2540 - in branches/tdiesler/trunk: jbossws-core/src/java/org/jboss/ws/core/jaxws/client and 6 other directories.

Author: thomas.diesler(a)jboss.com Date: 2007-03-07 07:14:57 -0500 (Wed, 07 Mar 2007) New Revision: 2540 Added: branches/tdiesler/trunk/jbossws-tests/src/resources/jaxws/samples/webserviceref/WEB-INF-client/jboss-web.xml Removed: branches/tdiesler/trunk/jbossws-tests/src/resources/jaxws/samples/webserviceref/META-INF/jboss-web.xml Modified: branches/tdiesler/trunk/integration-jboss50/src/java/org/jboss/ws/integration/jboss50/ServiceRefHandler.java branches/tdiesler/trunk/jbossws-core/src/java/org/jboss/ws/core/jaxws/client/ServiceObjectFactory.java branches/tdiesler/trunk/jbossws-core/src/java/org/jboss/ws/core/jaxws/client/ServiceRefHandlerJAXWS.java branches/tdiesler/trunk/jbossws-core/src/java/org/jboss/ws/core/jaxws/client/ServiceReferenceable.java branches/tdiesler/trunk/jbossws-core/src/java/org/jboss/ws/metadata/j2ee/serviceref/ServiceRefMetaData.java branches/tdiesler/trunk/jbossws-core/src/java/org/jboss/ws/metadata/j2ee/serviceref/ServiceRefObjectFactory.java branches/tdiesler/trunk/jbossws-tests/ant-import/build-samples-jaxws.xml branches/tdiesler/trunk/jbossws-tests/src/resources/jaxws/samples/webserviceref/META-INF-override/jboss-client.xml branches/tdiesler/trunk/jbossws-tests/src/resources/jaxws/samples/webserviceref/META-INF-secure/jboss-client.xml Log: partial Modified: branches/tdiesler/trunk/integration-jboss50/src/java/org/jboss/ws/integration/jboss50/ServiceRefHandler.java =================================================================== --- branches/tdiesler/trunk/integration-jboss50/src/java/org/jboss/ws/integration/jboss50/ServiceRefHandler.java 2007-03-07 08:08:09 UTC (rev 2539) +++ branches/tdiesler/trunk/integration-jboss50/src/java/org/jboss/ws/integration/jboss50/ServiceRefHandler.java 2007-03-07 12:14:57 UTC (rev 2540) @@ -62,7 +62,7 @@ { Element root = DOMUtils.parse(xmlFragment); if (log.isDebugEnabled()) - log.info(DOMWriter.printNode(root, true)); + log.info("setupServiceRef\n" + DOMWriter.printNode(root, true)); } catch (IOException e) { @@ -87,7 +87,9 @@ private boolean isServiceRefJaxRpc(ServiceRefMetaData serviceRef) { - return false; + // The <service-interface> is a required element + // for JAXRPC and not defined for JAXWS + return serviceRef.getServiceInterface() != null; } public void create() throws Exception Modified: branches/tdiesler/trunk/jbossws-core/src/java/org/jboss/ws/core/jaxws/client/ServiceObjectFactory.java =================================================================== --- branches/tdiesler/trunk/jbossws-core/src/java/org/jboss/ws/core/jaxws/client/ServiceObjectFactory.java 2007-03-07 08:08:09 UTC (rev 2539) +++ branches/tdiesler/trunk/jbossws-core/src/java/org/jboss/ws/core/jaxws/client/ServiceObjectFactory.java 2007-03-07 12:14:57 UTC (rev 2540) @@ -96,19 +96,19 @@ String serviceRefName = serviceRef.getServiceRefName(); QName serviceQName = serviceRef.getServiceQName(); - String serviceInterface = serviceRef.getServiceInterface(); - if (serviceInterface == null) - serviceInterface = (String)ref.get(ServiceReferenceable.SERVICE_CLASS_NAME).getContent(); + String serviceImplClass = serviceRef.getServiceImplClass(); + if (serviceImplClass == null) + serviceImplClass = (String)ref.get(ServiceReferenceable.SERVICE_IMPL_CLASS).getContent(); // If the target defaults to javax.xml.ws.Service, user the service as the target if (Service.class.getName().equals(targetClassName)) - targetClassName = serviceInterface; + targetClassName = serviceImplClass; - if(log.isDebugEnabled()) log.debug("[name=" + serviceRefName + ",service=" + serviceInterface + ",target=" + targetClassName + "]"); + if(log.isDebugEnabled()) log.debug("[name=" + serviceRefName + ",service=" + serviceImplClass + ",target=" + targetClassName + "]"); // Load the service class ClassLoader ctxLoader = Thread.currentThread().getContextClassLoader(); - Class serviceClass = ctxLoader.loadClass(serviceInterface); + Class serviceClass = ctxLoader.loadClass(serviceImplClass); Class targetClass = (targetClassName != null ? ctxLoader.loadClass(targetClassName) : null); if (Service.class.isAssignableFrom(serviceClass) == false) @@ -158,7 +158,7 @@ // Configure the service configureService((Service)target, serviceRef); - if (targetClassName != null && targetClassName.equals(serviceInterface) == false) + if (targetClassName != null && targetClassName.equals(serviceImplClass) == false) { try { Modified: branches/tdiesler/trunk/jbossws-core/src/java/org/jboss/ws/core/jaxws/client/ServiceRefHandlerJAXWS.java =================================================================== --- branches/tdiesler/trunk/jbossws-core/src/java/org/jboss/ws/core/jaxws/client/ServiceRefHandlerJAXWS.java 2007-03-07 08:08:09 UTC (rev 2539) +++ branches/tdiesler/trunk/jbossws-core/src/java/org/jboss/ws/core/jaxws/client/ServiceRefHandlerJAXWS.java 2007-03-07 12:14:57 UTC (rev 2540) @@ -60,16 +60,19 @@ // Build the list of @WebServiceRef relevant annotations List<WebServiceRef> wsrefList = new ArrayList<WebServiceRef>(); - for (Annotation an : anElement.getAnnotations()) + if (anElement != null) { - if (an instanceof WebServiceRef) - wsrefList.add((WebServiceRef)an); + for (Annotation an : anElement.getAnnotations()) + { + if (an instanceof WebServiceRef) + wsrefList.add((WebServiceRef)an); - if (an instanceof WebServiceRefs) - { - WebServiceRefs wsrefs = (WebServiceRefs)an; - for (WebServiceRef aux : wsrefs.value()) - wsrefList.add(aux); + if (an instanceof WebServiceRefs) + { + WebServiceRefs wsrefs = (WebServiceRefs)an; + for (WebServiceRef aux : wsrefs.value()) + wsrefList.add(aux); + } } } @@ -90,9 +93,6 @@ } } - if (wsref == null) - throw new IllegalArgumentException("@WebServiceRef must be present on: " + anElement); - Class targetClass = null; if (anElement instanceof Field) targetClass = ((Field)anElement).getType(); @@ -103,22 +103,22 @@ String targetClassName = (targetClass != null ? targetClass.getName() : null); log.debug("setupWebServiceRef [jndi=" + externalName + ",target=" + targetClassName + "]"); - String serviceClassName = null; + String serviceImplClass = null; // #1 Use the explicit @WebServiceRef.value - if (wsref.value() != Object.class) - serviceClassName = wsref.value().getName(); + if (wsref != null && wsref.value() != Object.class) + serviceImplClass = wsref.value().getName(); // #2 Use the target ref type - if (serviceClassName == null && targetClass != null && Service.class.isAssignableFrom(targetClass)) - serviceClassName = targetClass.getName(); + if (serviceImplClass == null && targetClass != null && Service.class.isAssignableFrom(targetClass)) + serviceImplClass = targetClass.getName(); // #3 Use javax.xml.ws.Service - if (serviceClassName == null) - serviceClassName = Service.class.getName(); + if (serviceImplClass == null) + serviceImplClass = Service.class.getName(); // #1 Use the explicit @WebServiceRef.type - if (wsref.type() != Object.class) + if (wsref != null && wsref.type() != Object.class) targetClassName = wsref.type().getName(); // #2 Use the target ref type @@ -126,14 +126,17 @@ targetClassName = targetClass.getName(); // Set the wsdlLocation if there is no override already - if (serviceRef.getWsdlOverride() == null && wsref.wsdlLocation().length() > 0) - serviceRef.setWsdlFile(wsref.wsdlLocation()); + if (serviceRef.getWsdlOverride() == null && wsref != null && wsref.wsdlLocation().length() > 0) + serviceRef.setWsdlOverride(wsref.wsdlLocation()); // Set the handlerChain from @HandlerChain on the annotated element String handlerChain = serviceRef.getHandlerChain(); - HandlerChain anHandlerChain = anElement.getAnnotation(HandlerChain.class); - if (handlerChain == null && anHandlerChain != null && anHandlerChain.file().length() > 0) - handlerChain = anHandlerChain.file(); + if (anElement != null) + { + HandlerChain anHandlerChain = anElement.getAnnotation(HandlerChain.class); + if (handlerChain == null && anHandlerChain != null && anHandlerChain.file().length() > 0) + handlerChain = anHandlerChain.file(); + } // Resolve path to handler chain if (handlerChain != null) @@ -160,7 +163,7 @@ // Do not use rebind, the binding should be unique // [JBWS-1499] - Revisit WebServiceRefHandler JNDI rebind - Util.rebind(encCtx, encName, new ServiceReferenceable(serviceClassName, targetClassName, serviceRef)); + Util.rebind(encCtx, encName, new ServiceReferenceable(serviceImplClass, targetClassName, serviceRef)); log.debug("<service-ref> bound to: java:comp/env/" + encName); } Modified: branches/tdiesler/trunk/jbossws-core/src/java/org/jboss/ws/core/jaxws/client/ServiceReferenceable.java =================================================================== --- branches/tdiesler/trunk/jbossws-core/src/java/org/jboss/ws/core/jaxws/client/ServiceReferenceable.java 2007-03-07 08:08:09 UTC (rev 2539) +++ branches/tdiesler/trunk/jbossws-core/src/java/org/jboss/ws/core/jaxws/client/ServiceReferenceable.java 2007-03-07 12:14:57 UTC (rev 2540) @@ -49,16 +49,16 @@ public class ServiceReferenceable implements Referenceable { public static final String SERVICE_REF_META_DATA = "SERVICE_REF_META_DATA"; - public static final String SERVICE_CLASS_NAME = "SERVICE_CLASS_NAME"; + public static final String SERVICE_IMPL_CLASS = "SERVICE_CLASS_NAME"; public static final String TARGET_CLASS_NAME = "TARGET_CLASS_NAME"; - private String serviceClassName; + private String serviceImplClass; private String targetClassName; private ServiceRefMetaData serviceRef; - public ServiceReferenceable(String serviceClassName, String targetClassName, ServiceRefMetaData serviceRef) + public ServiceReferenceable(String serviceImplClass, String targetClassName, ServiceRefMetaData serviceRef) { - this.serviceClassName = serviceClassName; + this.serviceImplClass = serviceImplClass; this.targetClassName = targetClassName; this.serviceRef = serviceRef; } @@ -73,7 +73,7 @@ { Reference myRef = new Reference(ServiceReferenceable.class.getName(), ServiceObjectFactory.class.getName(), null); - myRef.add(new StringRefAddr(SERVICE_CLASS_NAME, serviceClassName)); + myRef.add(new StringRefAddr(SERVICE_IMPL_CLASS, serviceImplClass)); myRef.add(new StringRefAddr(TARGET_CLASS_NAME, targetClassName)); myRef.add(new BinaryRefAddr(SERVICE_REF_META_DATA, marshall(serviceRef))); Modified: branches/tdiesler/trunk/jbossws-core/src/java/org/jboss/ws/metadata/j2ee/serviceref/ServiceRefMetaData.java =================================================================== --- branches/tdiesler/trunk/jbossws-core/src/java/org/jboss/ws/metadata/j2ee/serviceref/ServiceRefMetaData.java 2007-03-07 08:08:09 UTC (rev 2539) +++ branches/tdiesler/trunk/jbossws-core/src/java/org/jboss/ws/metadata/j2ee/serviceref/ServiceRefMetaData.java 2007-03-07 12:14:57 UTC (rev 2540) @@ -51,9 +51,11 @@ private UnifiedVirtualFile vfsRoot; + // Standard properties + // The required <service-ref-name> element private String serviceRefName; - // The required <service-interface> element + // The JAXRPC required <service-interface> element private String serviceInterface; // service-res-type private String serviceRefType; @@ -69,14 +71,19 @@ private List<HandlerMetaData> handlers = new ArrayList<HandlerMetaData>(); // The optional <handler-chains> elements. JAX-WS handlers declared in the standard JavaEE5 descriptor private HandlerChainsMetaData handlerChains; - // The optional <handler-chain> element. JAX-WS handler chain declared in the JBoss JavaEE5 descriptor - private String handlerChain; + + // JBoss properties + + // The optional <service-impl-class> element + private String serviceImplClass; // The optional JBossWS config-name private String configName; // The optional JBossWS config-file private String configFile; // The optional URL of the actual WSDL to use, <wsdl-override> private String wsdlOverride; + // The optional <handler-chain> element. JAX-WS handler chain declared in the JBoss JavaEE5 descriptor + private String handlerChain; // Arbitrary proxy properties given by <call-property> private List<CallPropertyMetaData> callProperties = new ArrayList<CallPropertyMetaData>(); @@ -163,6 +170,16 @@ this.serviceInterface = serviceInterface; } + public String getServiceImplClass() + { + return serviceImplClass; + } + + public void setServiceImplClass(String serviceImplClass) + { + this.serviceImplClass = serviceImplClass; + } + public QName getServiceQName() { return serviceQName; Modified: branches/tdiesler/trunk/jbossws-core/src/java/org/jboss/ws/metadata/j2ee/serviceref/ServiceRefObjectFactory.java =================================================================== --- branches/tdiesler/trunk/jbossws-core/src/java/org/jboss/ws/metadata/j2ee/serviceref/ServiceRefObjectFactory.java 2007-03-07 08:08:09 UTC (rev 2539) +++ branches/tdiesler/trunk/jbossws-core/src/java/org/jboss/ws/metadata/j2ee/serviceref/ServiceRefObjectFactory.java 2007-03-07 12:14:57 UTC (rev 2540) @@ -109,6 +109,10 @@ } /* JBoss properties */ + else if (localName.equals("service-impl-class")) + { + ref.setServiceImplClass(value); + } else if (localName.equals("config-name")) { ref.setConfigName(value); @@ -193,8 +197,16 @@ } else if (localName.equals("port-qname")) { - ref.setPortComponentLink(value); + ref.setPortQName(QName.valueOf(value)); } + else if (localName.equals("config-name")) + { + ref.setConfigName(value); + } + else if (localName.equals("config-file")) + { + ref.setConfigFile(value); + } } public Object newChild(PortComponentRefMetaData ref, UnmarshallingContext navigator, String namespaceURI, String localName, Attributes attrs) @@ -297,6 +309,16 @@ } } + public void addChild(PortComponentRefMetaData ref, CallPropertyMetaData callProp, UnmarshallingContext navigator, String namespaceURI, String localName) + { + ref.addCallProperty(callProp); + } + + public void addChild(PortComponentRefMetaData ref, StubPropertyMetaData stubProp, UnmarshallingContext navigator, String namespaceURI, String localName) + { + ref.addStubProperty(stubProp); + } + // END ServiceRefMetaData // ******************************************************** } Modified: branches/tdiesler/trunk/jbossws-tests/ant-import/build-samples-jaxws.xml =================================================================== --- branches/tdiesler/trunk/jbossws-tests/ant-import/build-samples-jaxws.xml 2007-03-07 08:08:09 UTC (rev 2539) +++ branches/tdiesler/trunk/jbossws-tests/ant-import/build-samples-jaxws.xml 2007-03-07 12:14:57 UTC (rev 2540) @@ -325,9 +325,11 @@ <include name="org/jboss/test/ws/jaxws/samples/webserviceref/Echo.class"/> </classes> <webinf dir="${tests.output.dir}/resources/jaxws/samples/webserviceref/META-INF"> - <include name="jboss-web.xml"/> <include name="wsdl/**"/> </webinf> + <webinf dir="${tests.output.dir}/resources/jaxws/samples/webserviceref/WEB-INF-client"> + <include name="jboss-web.xml"/> + </webinf> </war> <jar destfile="${tests.output.dir}/libs/jaxws-samples-webserviceref-ejb3-client.jar"> <fileset dir="${tests.output.dir}/classes"> Deleted: branches/tdiesler/trunk/jbossws-tests/src/resources/jaxws/samples/webserviceref/META-INF/jboss-web.xml =================================================================== --- branches/tdiesler/trunk/jbossws-tests/src/resources/jaxws/samples/webserviceref/META-INF/jboss-web.xml 2007-03-07 08:08:09 UTC (rev 2539) +++ branches/tdiesler/trunk/jbossws-tests/src/resources/jaxws/samples/webserviceref/META-INF/jboss-web.xml 2007-03-07 12:14:57 UTC (rev 2540) @@ -1,80 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - -<!DOCTYPE jboss-web PUBLIC "-//JBoss//DTD Web Application 5.0//EN" "http://www.jboss.org/j2ee/dtd/jboss-web_5_0.dtd"> - -<jboss-web> - - - <!-- - @WebServiceRef(name = "service1", value = TestEndpointService.class, wsdlLocation = "WEB-INF/wsdl/TestEndpoint.wsdl") - <service-ref> - <service-ref-name>service1</service-ref-name> - <wsdl-override>WEB-INF/wsdl/TestEndpoint.wsdl</wsdl-override> - </service-ref> - --> - - <!-- - @WebServiceRef(name = "service2", value = TestEndpointService.class) - --> - <service-ref> - <service-ref-name>service2</service-ref-name> - <wsdl-override>WEB-INF/wsdl/TestEndpoint.wsdl</wsdl-override> - </service-ref> - - <!-- - @WebServiceRef(name = "TestEndpointService3") - --> - <service-ref> - <service-ref-name>TestEndpointService3</service-ref-name> - <wsdl-override>WEB-INF/wsdl/TestEndpoint.wsdl</wsdl-override> - </service-ref> - - <!-- - @WebServiceRef - --> - <service-ref> - <service-ref-name>org.jboss.test.ws.jaxws.samples.webserviceref.ServletClient/service4</service-ref-name> - <wsdl-override>WEB-INF/wsdl/TestEndpoint.wsdl</wsdl-override> - </service-ref> - - <!-- - @WebServiceRef(name = "TestEndpointService5") - --> - <service-ref> - <service-ref-name>TestEndpointService5</service-ref-name> - <wsdl-override>WEB-INF/wsdl/TestEndpoint.wsdl</wsdl-override> - </service-ref> - - <!-- - @WebServiceRef - --> - <service-ref> - <service-ref-name>org.jboss.test.ws.jaxws.samples.webserviceref.ServletClient/service6</service-ref-name> - <wsdl-override>WEB-INF/wsdl/TestEndpoint.wsdl</wsdl-override> - </service-ref> - - <!-- - @WebServiceRef(name = "port1", value = TestEndpointService.class, type = TestEndpoint.class) - --> - <service-ref> - <service-ref-name>port1</service-ref-name> - <wsdl-override>WEB-INF/wsdl/TestEndpoint.wsdl</wsdl-override> - </service-ref> - - <!-- - @WebServiceRef(name = "Port2", value = TestEndpointService.class) - --> - <service-ref> - <service-ref-name>Port2</service-ref-name> - <wsdl-override>WEB-INF/wsdl/TestEndpoint.wsdl</wsdl-override> - </service-ref> - - <!-- - @WebServiceRef(value = TestEndpointService.class) - --> - <service-ref> - <service-ref-name>org.jboss.test.ws.jaxws.samples.webserviceref.ServletClient/port3</service-ref-name> - <wsdl-override>WEB-INF/wsdl/TestEndpoint.wsdl</wsdl-override> - </service-ref> - -</jboss-web> \ No newline at end of file Modified: branches/tdiesler/trunk/jbossws-tests/src/resources/jaxws/samples/webserviceref/META-INF-override/jboss-client.xml =================================================================== --- branches/tdiesler/trunk/jbossws-tests/src/resources/jaxws/samples/webserviceref/META-INF-override/jboss-client.xml 2007-03-07 08:08:09 UTC (rev 2539) +++ branches/tdiesler/trunk/jbossws-tests/src/resources/jaxws/samples/webserviceref/META-INF-override/jboss-client.xml 2007-03-07 12:14:57 UTC (rev 2540) @@ -10,7 +10,7 @@ --> <service-ref> <service-ref-name>Service1</service-ref-name> - <service-interface>org.jboss.test.ws.jaxws.samples.webserviceref.TestEndpointService</service-interface> + <service-impl-class>org.jboss.test.ws.jaxws.samples.webserviceref.TestEndpointService</service-impl-class> <service-qname>{http://org.jboss.ws/wsref}TestEndpointService</service-qname> <wsdl-override>META-INF/wsdl/TestEndpoint.wsdl</wsdl-override> </service-ref> @@ -30,7 +30,7 @@ --> <service-ref> <service-ref-name>Service3</service-ref-name> - <service-interface>org.jboss.test.ws.jaxws.samples.webserviceref.TestEndpointService</service-interface> + <service-impl-class>org.jboss.test.ws.jaxws.samples.webserviceref.TestEndpointService</service-impl-class> <service-qname>{http://org.jboss.ws/wsref}TestEndpointService</service-qname> <wsdl-override>META-INF/wsdl/TestEndpoint.wsdl</wsdl-override> </service-ref> @@ -83,12 +83,12 @@ <service-endpoint-interface>org.jboss.test.ws.jaxws.samples.webserviceref.TestEndpoint</service-endpoint-interface> <port-qname>{http://org.jboss.ws/wsref}TestEndpointPort</port-qname> <stub-property> - <name>javax.xml.ws.security.auth.username</name> - <value>kermit</value> + <prop-name>javax.xml.ws.security.auth.username</prop-name> + <prop-value>kermit</prop-value> </stub-property> <stub-property> - <name>javax.xml.ws.security.auth.password</name> - <value>thefrog</value> + <prop-name>javax.xml.ws.security.auth.password</prop-name> + <prop-value>thefrog</prop-value> </stub-property> </port-component-ref> <wsdl-override>META-INF/wsdl/TestEndpoint.wsdl</wsdl-override> Modified: branches/tdiesler/trunk/jbossws-tests/src/resources/jaxws/samples/webserviceref/META-INF-secure/jboss-client.xml =================================================================== --- branches/tdiesler/trunk/jbossws-tests/src/resources/jaxws/samples/webserviceref/META-INF-secure/jboss-client.xml 2007-03-07 08:08:09 UTC (rev 2539) +++ branches/tdiesler/trunk/jbossws-tests/src/resources/jaxws/samples/webserviceref/META-INF-secure/jboss-client.xml 2007-03-07 12:14:57 UTC (rev 2540) @@ -7,18 +7,18 @@ <service-ref> <service-ref-name>SecureService1</service-ref-name> - <service-interface>org.jboss.test.ws.jaxws.samples.webserviceref.SecureEndpointService</service-interface> + <service-impl-class>org.jboss.test.ws.jaxws.samples.webserviceref.SecureEndpointService</service-impl-class> <service-qname>{http://org.jboss.ws/wsref}SecureEndpointService</service-qname> <port-component-ref> <service-endpoint-interface>org.jboss.test.ws.jaxws.samples.webserviceref.SecureEndpoint</service-endpoint-interface> <port-qname>{http://org.jboss.ws/wsref}SecureEndpointPort</port-qname> <stub-property> - <name>javax.xml.ws.security.auth.username</name> - <value>kermit</value> + <prop-name>javax.xml.ws.security.auth.username</prop-name> + <prop-value>kermit</prop-value> </stub-property> <stub-property> - <name>javax.xml.ws.security.auth.password</name> - <value>thefrog</value> + <prop-name>javax.xml.ws.security.auth.password</prop-name> + <prop-value>thefrog</prop-value> </stub-property> </port-component-ref> <wsdl-override>http://@jbosstest.host.name@:8080/jaxws-samples-webserviceref-secure/SecureEndpoint?wsdl</wsdl-override> @@ -29,12 +29,12 @@ <port-component-ref> <port-qname>{http://org.jboss.ws/wsref}SecureEndpointPort</port-qname> <stub-property> - <name>javax.xml.ws.security.auth.username</name> - <value>kermit</value> + <prop-name>javax.xml.ws.security.auth.username</prop-name> + <prop-value>kermit</prop-value> </stub-property> <stub-property> - <name>javax.xml.ws.security.auth.password</name> - <value>thefrog</value> + <prop-name>javax.xml.ws.security.auth.password</prop-name> + <prop-value>thefrog</prop-value> </stub-property> </port-component-ref> <wsdl-override>http://@jbosstest.host.name@:8080/jaxws-samples-webserviceref-secure/SecureEndpoint?wsdl</wsdl-override> @@ -45,12 +45,12 @@ <port-component-ref> <service-endpoint-interface>org.jboss.test.ws.jaxws.samples.webserviceref.SecureEndpoint</service-endpoint-interface> <stub-property> - <name>javax.xml.ws.security.auth.username</name> - <value>kermit</value> + <prop-name>javax.xml.ws.security.auth.username</prop-name> + <prop-value>kermit</prop-value> </stub-property> <stub-property> - <name>javax.xml.ws.security.auth.password</name> - <value>thefrog</value> + <prop-name>javax.xml.ws.security.auth.password</prop-name> + <prop-value>thefrog</prop-value> </stub-property> </port-component-ref> <wsdl-override>http://@jbosstest.host.name@:8080/jaxws-samples-webserviceref-secure/SecureEndpoint?wsdl</wsdl-override> Copied: branches/tdiesler/trunk/jbossws-tests/src/resources/jaxws/samples/webserviceref/WEB-INF-client/jboss-web.xml (from rev 2539, branches/tdiesler/trunk/jbossws-tests/src/resources/jaxws/samples/webserviceref/META-INF/jboss-web.xml) =================================================================== --- branches/tdiesler/trunk/jbossws-tests/src/resources/jaxws/samples/webserviceref/WEB-INF-client/jboss-web.xml (rev 0) +++ branches/tdiesler/trunk/jbossws-tests/src/resources/jaxws/samples/webserviceref/WEB-INF-client/jboss-web.xml 2007-03-07 12:14:57 UTC (rev 2540) @@ -0,0 +1,80 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<!DOCTYPE jboss-web PUBLIC "-//JBoss//DTD Web Application 5.0//EN" "http://www.jboss.org/j2ee/dtd/jboss-web_5_0.dtd"> + +<jboss-web> + + + <!-- + @WebServiceRef(name = "service1", value = TestEndpointService.class, wsdlLocation = "WEB-INF/wsdl/TestEndpoint.wsdl") + <service-ref> + <service-ref-name>service1</service-ref-name> + <wsdl-override>WEB-INF/wsdl/TestEndpoint.wsdl</wsdl-override> + </service-ref> + --> + + <!-- + @WebServiceRef(name = "service2", value = TestEndpointService.class) + --> + <service-ref> + <service-ref-name>service2</service-ref-name> + <wsdl-override>WEB-INF/wsdl/TestEndpoint.wsdl</wsdl-override> + </service-ref> + + <!-- + @WebServiceRef(name = "TestEndpointService3") + --> + <service-ref> + <service-ref-name>TestEndpointService3</service-ref-name> + <wsdl-override>WEB-INF/wsdl/TestEndpoint.wsdl</wsdl-override> + </service-ref> + + <!-- + @WebServiceRef + --> + <service-ref> + <service-ref-name>org.jboss.test.ws.jaxws.samples.webserviceref.ServletClient/service4</service-ref-name> + <wsdl-override>WEB-INF/wsdl/TestEndpoint.wsdl</wsdl-override> + </service-ref> + + <!-- + @WebServiceRef(name = "TestEndpointService5") + --> + <service-ref> + <service-ref-name>TestEndpointService5</service-ref-name> + <wsdl-override>WEB-INF/wsdl/TestEndpoint.wsdl</wsdl-override> + </service-ref> + + <!-- + @WebServiceRef + --> + <service-ref> + <service-ref-name>org.jboss.test.ws.jaxws.samples.webserviceref.ServletClient/service6</service-ref-name> + <wsdl-override>WEB-INF/wsdl/TestEndpoint.wsdl</wsdl-override> + </service-ref> + + <!-- + @WebServiceRef(name = "port1", value = TestEndpointService.class, type = TestEndpoint.class) + --> + <service-ref> + <service-ref-name>port1</service-ref-name> + <wsdl-override>WEB-INF/wsdl/TestEndpoint.wsdl</wsdl-override> + </service-ref> + + <!-- + @WebServiceRef(name = "Port2", value = TestEndpointService.class) + --> + <service-ref> + <service-ref-name>Port2</service-ref-name> + <wsdl-override>WEB-INF/wsdl/TestEndpoint.wsdl</wsdl-override> + </service-ref> + + <!-- + @WebServiceRef(value = TestEndpointService.class) + --> + <service-ref> + <service-ref-name>org.jboss.test.ws.jaxws.samples.webserviceref.ServletClient/port3</service-ref-name> + <wsdl-override>WEB-INF/wsdl/TestEndpoint.wsdl</wsdl-override> + </service-ref> + +</jboss-web> \ No newline at end of file