Author: thomas.diesler(a)jboss.com Date: 2007-03-09 09:11:08 -0500 (Fri, 09 Mar 2007) New Revision: 2570 Added: branches/jbossws-1.2.0/jbossws-core/src/java/org/jboss/ws/integration/ branches/jbossws-1.2.0/jbossws-core/src/java/org/jboss/ws/integration/KernelLocator.java branches/jbossws-1.2.0/jbossws-core/src/java/org/jboss/ws/integration/UnifiedVirtualFile.java branches/jbossws-1.2.0/jbossws-core/src/java/org/jboss/ws/metadata/j2ee/serviceref/ Removed: branches/jbossws-1.2.0/integration-jboss42/src/java/org/jboss/ws/integration/jboss42/ServiceRefHandler.java branches/jbossws-1.2.0/integration-jboss42/src/java/org/jboss/ws/integration/jboss42/ServiceRefHandlerMBean.java branches/jbossws-1.2.0/integration-jboss42/src/java/org/jboss/ws/integration/jboss42/ServiceRefMetaDataAdaptor.java branches/jbossws-1.2.0/integration-jboss42/src/java/org/jboss/ws/integration/jboss42/WebServiceRefHandler.java branches/jbossws-1.2.0/integration-jboss42/src/java/org/jboss/ws/integration/jboss42/WebServiceRefHandlerMBean.java branches/jbossws-1.2.0/integration-jboss50/src/java/org/jboss/ws/integration/jboss50/WebServiceRefHandler.java branches/jbossws-1.2.0/integration-jboss50/src/java/org/jboss/ws/integration/jboss50/WebServiceRefHandlerMBean.java branches/jbossws-1.2.0/jbossws-core/src/java/org/jboss/ws/core/UnifiedVirtualFile.java branches/jbossws-1.2.0/jbossws-core/src/java/org/jboss/ws/core/jaxws/UnifiedServiceRefObjectFactory.java branches/jbossws-1.2.0/jbossws-core/src/java/org/jboss/ws/core/jaxws/UnifiedWebServiceRefHandler.java branches/jbossws-1.2.0/jbossws-core/src/java/org/jboss/ws/core/jaxws/client/PortInfo.java branches/jbossws-1.2.0/jbossws-core/src/java/org/jboss/ws/core/jaxws/client/UnifiedServiceRef.java branches/jbossws-1.2.0/jbossws-core/src/java/org/jboss/ws/core/server/KernelLocator.java branches/jbossws-1.2.0/jbossws-core/src/java/org/jboss/ws/metadata/j2ee/UnifiedHandlerMetaData.java branches/jbossws-1.2.0/jbossws-core/src/java/org/jboss/ws/metadata/j2ee/UnifiedPortComponentRefMetaData.java branches/jbossws-1.2.0/jbossws-core/src/java/org/jboss/ws/metadata/j2ee/UnifiedServiceRefMetaData.java branches/jbossws-1.2.0/jbossws-core/src/java/org/jboss/ws/metadata/jsr181/ branches/jbossws-1.2.0/jbossws-core/src/main/ branches/jbossws-1.2.0/jbossws-tests/src/main/ Modified: branches/jbossws-1.2.0/build/ant-import/build-thirdparty.xml branches/jbossws-1.2.0/build/build.xml branches/jbossws-1.2.0/integration-jboss40/.classpath branches/jbossws-1.2.0/integration-jboss40/src/java/org/jboss/ws/integration/jboss40/ServiceRefMetaDataAdaptor.java branches/jbossws-1.2.0/integration-jboss40/src/java/org/jboss/ws/integration/jboss40/WebServiceClientDeployer.java branches/jbossws-1.2.0/integration-jboss42/.classpath branches/jbossws-1.2.0/integration-jboss42/src/java/org/jboss/ws/integration/jboss42/DeployerInterceptor.java branches/jbossws-1.2.0/integration-jboss42/src/java/org/jboss/ws/integration/jboss42/DeployerInterceptorEJB21.java branches/jbossws-1.2.0/integration-jboss42/src/java/org/jboss/ws/integration/jboss42/DeployerInterceptorJSE.java branches/jbossws-1.2.0/integration-jboss42/src/java/org/jboss/ws/integration/jboss42/URLLoaderAdapter.java branches/jbossws-1.2.0/integration-jboss50/.classpath branches/jbossws-1.2.0/integration-jboss50/src/java/org/jboss/ws/integration/jboss50/AbstractDeployer.java branches/jbossws-1.2.0/integration-jboss50/src/java/org/jboss/ws/integration/jboss50/ApplicationMetaDataAdaptor.java branches/jbossws-1.2.0/integration-jboss50/src/java/org/jboss/ws/integration/jboss50/JAXRPCDeployerJSE.java branches/jbossws-1.2.0/integration-jboss50/src/java/org/jboss/ws/integration/jboss50/JBossServiceEndpointServlet.java branches/jbossws-1.2.0/integration-jboss50/src/java/org/jboss/ws/integration/jboss50/ServiceEndpointInvokerEJB21.java branches/jbossws-1.2.0/integration-jboss50/src/java/org/jboss/ws/integration/jboss50/ServiceEndpointLifecycleDeployer.java branches/jbossws-1.2.0/integration-jboss50/src/java/org/jboss/ws/integration/jboss50/VirtualFileAdaptor.java branches/jbossws-1.2.0/integration-jboss50/src/resources/jbossws.deployer/META-INF/jbossws-deployer-beans.xml branches/jbossws-1.2.0/integration-tomcat/src/main/java/org/jboss/ws/integration/tomcat/KernelBootstrap.java branches/jbossws-1.2.0/integration-tomcat/src/main/java/org/jboss/ws/integration/tomcat/TomcatServiceEndpointServlet.java branches/jbossws-1.2.0/jbossws-core/.classpath branches/jbossws-1.2.0/jbossws-core/src/java/org/jboss/ws/core/jaxrpc/client/ServiceImpl.java branches/jbossws-1.2.0/jbossws-core/src/java/org/jboss/ws/core/jaxrpc/client/ServiceObjectFactory.java branches/jbossws-1.2.0/jbossws-core/src/java/org/jboss/ws/core/jaxrpc/client/ServiceReferenceable.java branches/jbossws-1.2.0/jbossws-core/src/java/org/jboss/ws/core/jaxrpc/handler/HandlerDelegateJAXRPC.java branches/jbossws-1.2.0/jbossws-core/src/java/org/jboss/ws/core/jaxws/client/ServiceExt.java branches/jbossws-1.2.0/jbossws-core/src/java/org/jboss/ws/core/jaxws/client/ServiceObjectFactory.java branches/jbossws-1.2.0/jbossws-core/src/java/org/jboss/ws/core/jaxws/client/ServiceReferenceable.java branches/jbossws-1.2.0/jbossws-core/src/java/org/jboss/ws/core/jaxws/spi/ServiceDelegateImpl.java branches/jbossws-1.2.0/jbossws-core/src/java/org/jboss/ws/core/server/ServerConfigFactory.java branches/jbossws-1.2.0/jbossws-core/src/java/org/jboss/ws/core/server/ServiceEndpointManagerFactory.java branches/jbossws-1.2.0/jbossws-core/src/java/org/jboss/ws/core/server/UnifiedDeploymentInfo.java branches/jbossws-1.2.0/jbossws-core/src/java/org/jboss/ws/extensions/eventing/mgmt/SubscriptionManagerFactory.java branches/jbossws-1.2.0/jbossws-core/src/java/org/jboss/ws/extensions/security/jaxrpc/WSSecurityHandler.java branches/jbossws-1.2.0/jbossws-core/src/java/org/jboss/ws/extensions/security/jaxws/WSSecurityHandler.java branches/jbossws-1.2.0/jbossws-core/src/java/org/jboss/ws/metadata/builder/jaxrpc/JAXRPCClientMetaDataBuilder.java branches/jbossws-1.2.0/jbossws-core/src/java/org/jboss/ws/metadata/builder/jaxrpc/JAXRPCDeployment.java branches/jbossws-1.2.0/jbossws-core/src/java/org/jboss/ws/metadata/builder/jaxrpc/JAXRPCServerMetaDataBuilder.java branches/jbossws-1.2.0/jbossws-core/src/java/org/jboss/ws/metadata/builder/jaxws/JAXWSClientMetaDataBuilder.java branches/jbossws-1.2.0/jbossws-core/src/java/org/jboss/ws/metadata/builder/jaxws/JAXWSMetaDataBuilder.java branches/jbossws-1.2.0/jbossws-core/src/java/org/jboss/ws/metadata/config/JBossWSConfigFactory.java branches/jbossws-1.2.0/jbossws-core/src/java/org/jboss/ws/metadata/config/binding/OMFactoryJAXRPC.java branches/jbossws-1.2.0/jbossws-core/src/java/org/jboss/ws/metadata/config/binding/OMFactoryJAXWS.java branches/jbossws-1.2.0/jbossws-core/src/java/org/jboss/ws/metadata/config/jaxrpc/CommonConfigJAXRPC.java branches/jbossws-1.2.0/jbossws-core/src/java/org/jboss/ws/metadata/config/jaxws/CommonConfigJAXWS.java branches/jbossws-1.2.0/jbossws-core/src/java/org/jboss/ws/metadata/config/jaxws/HandlerChainsConfigJAXWS.java branches/jbossws-1.2.0/jbossws-core/src/java/org/jboss/ws/metadata/j2ee/UnifiedEjbPortComponentMetaData.java branches/jbossws-1.2.0/jbossws-core/src/java/org/jboss/ws/metadata/umdm/EndpointMetaData.java branches/jbossws-1.2.0/jbossws-core/src/java/org/jboss/ws/metadata/umdm/HandlerMetaData.java branches/jbossws-1.2.0/jbossws-core/src/java/org/jboss/ws/metadata/umdm/ResourceLoaderAdapter.java branches/jbossws-1.2.0/jbossws-core/src/java/org/jboss/ws/metadata/umdm/ServiceMetaData.java branches/jbossws-1.2.0/jbossws-core/src/java/org/jboss/ws/metadata/umdm/UnifiedMetaData.java branches/jbossws-1.2.0/jbossws-core/src/java/org/jboss/ws/metadata/webservices/PortComponentMetaData.java branches/jbossws-1.2.0/jbossws-core/src/java/org/jboss/ws/metadata/webservices/WebservicesFactory.java branches/jbossws-1.2.0/jbossws-core/src/java/org/jboss/ws/metadata/wsse/WSSecurityConfigFactory.java branches/jbossws-1.2.0/jbossws-tests/ant-import/build-samples-jaxws.xml branches/jbossws-1.2.0/jbossws-tests/src/java/org/jboss/test/ws/common/config/ConfigFactoryTestCase.java branches/jbossws-1.2.0/jbossws-tests/src/resources/jaxrpc/jbws425/META-INF/application-client.xml branches/jbossws-1.2.0/jbossws-tests/src/resources/jaxws/samples/handlerchain/META-INF/jboss-client.xml branches/jbossws-1.2.0/jbossws-tests/src/resources/jaxws/samples/webserviceref/META-INF-override/jboss-client.xml branches/jbossws-1.2.0/jbossws-tests/src/resources/jaxws/samples/webserviceref/META-INF-secure/jboss-client.xml branches/jbossws-1.2.0/jbossws-tests/src/resources/jaxws/samples/webserviceref/META-INF/jboss-client.xml branches/jbossws-1.2.0/jbossws-tests/src/resources/jaxws/samples/webserviceref/META-INF/jboss.xml Log: Unified service-ref handling for jboss50 Modified: branches/jbossws-1.2.0/build/ant-import/build-thirdparty.xml =================================================================== --- branches/jbossws-1.2.0/build/ant-import/build-thirdparty.xml 2007-03-09 13:53:08 UTC (rev 2569) +++ branches/jbossws-1.2.0/build/ant-import/build-thirdparty.xml 2007-03-09 14:11:08 UTC (rev 2570) @@ -115,6 +115,8 @@ <pathelement location="${jboss50.lib}/jboss-aop-jdk50.jar"/> <pathelement location="${jboss50.lib}/jboss-deployers.jar"/> <pathelement location="${jboss50.lib}/jboss-j2se.jar"/> + <pathelement location="${jboss50.lib}/jboss-system.jar"/> + <pathelement location="${jboss50.lib}/jboss-system-jmx.jar"/> <pathelement location="${jboss50.lib}/jboss-vfs.jar"/> <pathelement location="${jboss50.server.lib}/jboss.jar"/> <pathelement location="${jboss50.server.lib}/jnpserver.jar"/> Modified: branches/jbossws-1.2.0/build/build.xml =================================================================== --- branches/jbossws-1.2.0/build/build.xml 2007-03-09 13:53:08 UTC (rev 2569) +++ branches/jbossws-1.2.0/build/build.xml 2007-03-09 14:11:08 UTC (rev 2570) @@ -48,7 +48,7 @@ <ant antfile="${integration.jboss42.dir}/build.xml" target="clean" inheritall="false"/> <ant antfile="${integration.jboss50.dir}/build.xml" target="clean" inheritall="false"/> <ant antfile="${integration.tomcat.dir}/build.xml" target="clean" inheritall="false"/> - <ant antfile="${tests.dir}/build.xml" target="clean" inheritall="false"/> + <!--ant antfile="${tests.dir}/build.xml" target="clean" inheritall="false"/--> </target> <target name="main" description="Executes the default target (most)." depends="most"> Modified: branches/jbossws-1.2.0/integration-jboss40/.classpath =================================================================== --- branches/jbossws-1.2.0/integration-jboss40/.classpath 2007-03-09 13:53:08 UTC (rev 2569) +++ branches/jbossws-1.2.0/integration-jboss40/.classpath 2007-03-09 14:11:08 UTC (rev 2570) @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <classpath> - <classpathentry kind="src" path="src/main/java"/> + <classpathentry kind="src" path="src/java"/> <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/> <classpathentry combineaccessrules="false" kind="src" path="/jbossws-core"/> <classpathentry combineaccessrules="false" kind="src" path="/integration-jboss42"/> Modified: branches/jbossws-1.2.0/integration-jboss40/src/java/org/jboss/ws/integration/jboss40/ServiceRefMetaDataAdaptor.java =================================================================== --- branches/jbossws-1.2.0/integration-jboss40/src/java/org/jboss/ws/integration/jboss40/ServiceRefMetaDataAdaptor.java 2007-03-09 13:53:08 UTC (rev 2569) +++ branches/jbossws-1.2.0/integration-jboss40/src/java/org/jboss/ws/integration/jboss40/ServiceRefMetaDataAdaptor.java 2007-03-09 14:11:08 UTC (rev 2570) @@ -24,8 +24,9 @@ // $Id$ import java.io.IOException; -import java.util.ArrayList; +import java.util.Enumeration; import java.util.LinkedHashMap; +import java.util.Properties; import javax.xml.namespace.QName; @@ -34,10 +35,11 @@ import org.jboss.webservice.metadata.serviceref.PortComponentRefMetaData; import org.jboss.webservice.metadata.serviceref.ServiceRefMetaData; import org.jboss.ws.core.server.UnifiedDeploymentInfo; -import org.jboss.ws.metadata.j2ee.UnifiedHandlerMetaData; -import org.jboss.ws.metadata.j2ee.UnifiedPortComponentRefMetaData; -import org.jboss.ws.metadata.j2ee.UnifiedServiceRefMetaData; -import org.jboss.ws.metadata.umdm.HandlerMetaData.HandlerInitParam; +import org.jboss.ws.metadata.j2ee.serviceref.UnifiedCallPropertyMetaData; +import org.jboss.ws.metadata.j2ee.serviceref.UnifiedHandlerMetaData; +import org.jboss.ws.metadata.j2ee.serviceref.UnifiedInitParamMetaData; +import org.jboss.ws.metadata.j2ee.serviceref.UnifiedPortComponentRefMetaData; +import org.jboss.ws.metadata.j2ee.serviceref.UnifiedServiceRefMetaData; /** * Build container independent service ref meta data @@ -47,27 +49,36 @@ */ public class ServiceRefMetaDataAdaptor { - public static UnifiedServiceRefMetaData buildUnifiedServiceRefMetaData(UnifiedDeploymentInfo udi, ServiceRefMetaData srmd) throws IOException + public static UnifiedServiceRefMetaData buildServiceRefMetaData(UnifiedDeploymentInfo udi, ServiceRefMetaData srmd) throws IOException { - UnifiedServiceRefMetaData usrmd = new UnifiedServiceRefMetaData(); + UnifiedServiceRefMetaData usrmd = new UnifiedServiceRefMetaData(udi.vfRoot); usrmd.setServiceRefName(srmd.getServiceRefName()); usrmd.setServiceInterface(srmd.getServiceInterface()); - usrmd.setWsdlLocation(srmd.getWsdlURL()); - usrmd.setMappingLocation(udi.getMetaDataFileURL(srmd.getJaxrpcMappingFile())); + usrmd.setWsdlFile(srmd.getWsdlFile()); + usrmd.setMappingFile(srmd.getJaxrpcMappingFile()); usrmd.setServiceQName(srmd.getServiceQName()); LinkedHashMap<String, UnifiedPortComponentRefMetaData> pcrefs = new LinkedHashMap<String, UnifiedPortComponentRefMetaData>(); for (PortComponentRefMetaData pcmd : srmd.getPortComponentRefs()) { - UnifiedPortComponentRefMetaData upcmd = new UnifiedPortComponentRefMetaData(); + UnifiedPortComponentRefMetaData upcmd = new UnifiedPortComponentRefMetaData(usrmd); upcmd.setServiceEndpointInterface(pcmd.getServiceEndpointInterface()); upcmd.setPortComponentLink(pcmd.getPortComponentLink()); - upcmd.setCallProperties(pcmd.getCallProperties()); + Properties callProps = pcmd.getCallProperties(); + if (callProps != null) + { + Enumeration<Object> keys = callProps.keys(); + while(keys.hasMoreElements()) + { + String name = (String)keys.nextElement(); + String value = callProps.getProperty(name); + upcmd.addCallProperty(new UnifiedCallPropertyMetaData(name, value)); + } + } pcrefs.put(pcmd.getServiceEndpointInterface(), upcmd); + usrmd.addPortComponentRef(upcmd); } - usrmd.setPortComponentRefs(pcrefs); - ArrayList<UnifiedHandlerMetaData> handlers = new ArrayList<UnifiedHandlerMetaData>(); for (HandlerMetaData hmd : srmd.getHandlers()) { UnifiedHandlerMetaData uhmd = new UnifiedHandlerMetaData(null); @@ -80,7 +91,7 @@ } for (InitParamMetaData ipmd : hmd.getInitParams()) { - HandlerInitParam ip = new HandlerInitParam(); + UnifiedInitParamMetaData ip = new UnifiedInitParamMetaData(); ip.setParamName(ipmd.getParamName()); ip.setParamValue(ipmd.getParamValue()); uhmd.addInitParam(ip); @@ -93,15 +104,25 @@ { uhmd.addSoapRole(soapRole); } - handlers.add(uhmd); + usrmd.addHandler(uhmd); } - usrmd.setHandlers(handlers); usrmd.setConfigName(srmd.getConfigName()); usrmd.setConfigFile(srmd.getConfigFile()); - usrmd.setWsdlOverride(srmd.getWsdlOverride()); - usrmd.setCallProperties(srmd.getCallProperties()); + usrmd.setWsdlOverride(srmd.getWsdlOverride().toExternalForm()); + Properties callProps = srmd.getCallProperties(); + if (callProps != null) + { + Enumeration<Object> keys = callProps.keys(); + while(keys.hasMoreElements()) + { + String name = (String)keys.nextElement(); + String value = callProps.getProperty(name); + usrmd.addCallProperty(new UnifiedCallPropertyMetaData(name, value)); + } + } + return usrmd; } } Modified: branches/jbossws-1.2.0/integration-jboss40/src/java/org/jboss/ws/integration/jboss40/WebServiceClientDeployer.java =================================================================== --- branches/jbossws-1.2.0/integration-jboss40/src/java/org/jboss/ws/integration/jboss40/WebServiceClientDeployer.java 2007-03-09 13:53:08 UTC (rev 2569) +++ branches/jbossws-1.2.0/integration-jboss40/src/java/org/jboss/ws/integration/jboss40/WebServiceClientDeployer.java 2007-03-09 14:11:08 UTC (rev 2570) @@ -23,28 +23,21 @@ // $Id$ -import java.net.URL; import java.util.Iterator; import javax.naming.Context; -import javax.wsdl.Definition; -import javax.wsdl.WSDLException; -import javax.xml.rpc.JAXRPCException; import org.jboss.deployment.DeploymentException; import org.jboss.deployment.DeploymentInfo; import org.jboss.system.ServiceMBeanSupport; import org.jboss.util.naming.Util; import org.jboss.webservice.metadata.serviceref.ServiceRefMetaData; -import org.jboss.ws.WSException; import org.jboss.ws.core.jaxrpc.client.ServiceReferenceable; import org.jboss.ws.core.server.UnifiedDeploymentInfo; import org.jboss.ws.integration.jboss42.DeploymentInfoAdaptor; +import org.jboss.ws.integration.jboss42.URLLoaderAdapter; import org.jboss.ws.metadata.builder.jaxrpc.JAXRPCClientDeployment; -import org.jboss.ws.metadata.j2ee.UnifiedServiceRefMetaData; -import org.jboss.ws.metadata.jaxrpcmapping.JavaWsdlMapping; -import org.jboss.ws.metadata.jaxrpcmapping.JavaWsdlMappingFactory; -import org.jboss.ws.tools.wsdl.WSDL11DefinitionFactory; +import org.jboss.ws.metadata.j2ee.serviceref.UnifiedServiceRefMetaData; /** * Binds a JAXRPC Service object in the client's ENC for every service-ref element in the @@ -76,15 +69,10 @@ UnifiedDeploymentInfo udi = new JAXRPCClientDeployment(UnifiedDeploymentInfo.DeploymentType.JAXRPC_Client); DeploymentInfoAdaptor.buildDeploymentInfo(udi, di); - UnifiedServiceRefMetaData wsServiceRef = ServiceRefMetaDataAdaptor.buildUnifiedServiceRefMetaData(udi, serviceRef); + UnifiedServiceRefMetaData usr = ServiceRefMetaDataAdaptor.buildServiceRefMetaData(udi, serviceRef); + usr.setVfsRoot(new URLLoaderAdapter(udi.url)); - JavaWsdlMapping javaWsdlMapping = getJavaWsdlMapping(wsServiceRef); - wsServiceRef.setJavaWsdlMapping(javaWsdlMapping); - - Definition wsdlDefinition = getWsdlDefinition(wsServiceRef); - wsServiceRef.setWsdlDefinition(wsdlDefinition); - - ServiceReferenceable ref = new ServiceReferenceable(wsServiceRef, udi); + ServiceReferenceable ref = new ServiceReferenceable(usr); Util.bind(envCtx, serviceRefName, ref); log.debug("Webservice binding: java:comp/env/" + serviceRefName); @@ -95,46 +83,4 @@ throw new DeploymentException("Cannot bind webservice to client environment", e); } } - - private JavaWsdlMapping getJavaWsdlMapping(UnifiedServiceRefMetaData serviceRef) - { - JavaWsdlMapping javaWsdlMapping = null; - URL mappingURL = serviceRef.getMappingLocation(); - if (mappingURL != null) - { - try - { - // setup the XML binding Unmarshaller - JavaWsdlMappingFactory mappingFactory = JavaWsdlMappingFactory.newInstance(); - javaWsdlMapping = mappingFactory.parse(mappingURL); - } - catch (Exception e) - { - throw new JAXRPCException("Cannot unmarshal jaxrpc-mapping-file: " + mappingURL, e); - } - } - return javaWsdlMapping; - } - - private Definition getWsdlDefinition(UnifiedServiceRefMetaData serviceRef) - { - Definition wsdlDefinition = null; - { - URL wsdlOverride = serviceRef.getWsdlOverride(); - URL wsdlURL = serviceRef.getWsdlLocation(); - if (wsdlOverride == null && wsdlURL != null) - { - try - { - WSDL11DefinitionFactory factory = WSDL11DefinitionFactory.newInstance(); - wsdlDefinition = factory.parse(wsdlURL); - } - catch (WSDLException e) - { - throw new WSException("Cannot unmarshall wsdl, cause: " + e.toString()); - } - } - } - return wsdlDefinition; - } } Modified: branches/jbossws-1.2.0/integration-jboss42/.classpath =================================================================== --- branches/jbossws-1.2.0/integration-jboss42/.classpath 2007-03-09 13:53:08 UTC (rev 2569) +++ branches/jbossws-1.2.0/integration-jboss42/.classpath 2007-03-09 14:11:08 UTC (rev 2570) @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <classpath> - <classpathentry kind="src" path="src/main/java"/> + <classpathentry kind="src" path="src/java"/> <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/> <classpathentry kind="con" path="org.eclipse.jdt.USER_LIBRARY/jboss-4.2.x"/> <classpathentry combineaccessrules="false" kind="src" path="/jbossws-core"/> Modified: branches/jbossws-1.2.0/integration-jboss42/src/java/org/jboss/ws/integration/jboss42/DeployerInterceptor.java =================================================================== --- branches/jbossws-1.2.0/integration-jboss42/src/java/org/jboss/ws/integration/jboss42/DeployerInterceptor.java 2007-03-09 13:53:08 UTC (rev 2569) +++ branches/jbossws-1.2.0/integration-jboss42/src/java/org/jboss/ws/integration/jboss42/DeployerInterceptor.java 2007-03-09 14:11:08 UTC (rev 2570) @@ -33,9 +33,9 @@ import org.jboss.mx.server.Invocation; import org.jboss.mx.util.MBeanProxy; import org.jboss.ws.core.server.AbstractServiceEndpointPublisher; -import org.jboss.ws.core.server.KernelLocator; import org.jboss.ws.core.server.ServiceEndpointDeployer; import org.jboss.ws.core.server.UnifiedDeploymentInfo; +import org.jboss.ws.integration.KernelLocator; /** * A deployer service that manages WS4EE compliant Web Services Modified: branches/jbossws-1.2.0/integration-jboss42/src/java/org/jboss/ws/integration/jboss42/DeployerInterceptorEJB21.java =================================================================== --- branches/jbossws-1.2.0/integration-jboss42/src/java/org/jboss/ws/integration/jboss42/DeployerInterceptorEJB21.java 2007-03-09 13:53:08 UTC (rev 2569) +++ branches/jbossws-1.2.0/integration-jboss42/src/java/org/jboss/ws/integration/jboss42/DeployerInterceptorEJB21.java 2007-03-09 14:11:08 UTC (rev 2570) @@ -31,8 +31,8 @@ import org.jboss.metadata.ApplicationMetaData; import org.jboss.metadata.BeanMetaData; import org.jboss.ws.WSException; -import org.jboss.ws.core.UnifiedVirtualFile; import org.jboss.ws.core.server.UnifiedDeploymentInfo; +import org.jboss.ws.integration.UnifiedVirtualFile; import org.jboss.ws.metadata.builder.jaxrpc.JAXRPCDeployment; import org.jboss.ws.metadata.umdm.ResourceLoaderAdapter; import org.jboss.ws.metadata.umdm.UnifiedMetaData; Modified: branches/jbossws-1.2.0/integration-jboss42/src/java/org/jboss/ws/integration/jboss42/DeployerInterceptorJSE.java =================================================================== --- branches/jbossws-1.2.0/integration-jboss42/src/java/org/jboss/ws/integration/jboss42/DeployerInterceptorJSE.java 2007-03-09 13:53:08 UTC (rev 2569) +++ branches/jbossws-1.2.0/integration-jboss42/src/java/org/jboss/ws/integration/jboss42/DeployerInterceptorJSE.java 2007-03-09 14:11:08 UTC (rev 2570) @@ -33,12 +33,12 @@ import org.jboss.deployment.DeploymentInfo; import org.jboss.metadata.WebMetaData; import org.jboss.ws.WSException; -import org.jboss.ws.core.UnifiedVirtualFile; import org.jboss.ws.core.server.AbstractServiceEndpointPublisher; import org.jboss.ws.core.server.JAXWSDeployment; import org.jboss.ws.core.server.UnifiedDeploymentInfo; import org.jboss.ws.core.server.AbstractServiceEndpointPublisher.RewriteResults; import org.jboss.ws.core.server.UnifiedDeploymentInfo.DeploymentType; +import org.jboss.ws.integration.UnifiedVirtualFile; import org.jboss.ws.metadata.builder.jaxrpc.JAXRPCDeployment; import org.jboss.ws.metadata.umdm.EndpointMetaData; import org.jboss.ws.metadata.umdm.ResourceLoaderAdapter; Deleted: branches/jbossws-1.2.0/integration-jboss42/src/java/org/jboss/ws/integration/jboss42/ServiceRefHandler.java =================================================================== --- branches/jbossws-1.2.0/integration-jboss42/src/java/org/jboss/ws/integration/jboss42/ServiceRefHandler.java 2007-03-09 13:53:08 UTC (rev 2569) +++ branches/jbossws-1.2.0/integration-jboss42/src/java/org/jboss/ws/integration/jboss42/ServiceRefHandler.java 2007-03-09 14:11:08 UTC (rev 2570) @@ -1,139 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2005, 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.ws.integration.jboss42; - -// $Id$ - -import java.net.URL; -import java.util.Iterator; - -import javax.naming.Context; -import javax.wsdl.Definition; -import javax.wsdl.WSDLException; -import javax.xml.rpc.JAXRPCException; - -import org.jboss.deployment.DeploymentException; -import org.jboss.deployment.DeploymentInfo; -import org.jboss.metadata.serviceref.ServiceRefMetaData; -import org.jboss.system.ServiceMBeanSupport; -import org.jboss.util.naming.Util; -import org.jboss.ws.WSException; -import org.jboss.ws.core.jaxrpc.client.ServiceReferenceable; -import org.jboss.ws.core.server.UnifiedDeploymentInfo; -import org.jboss.ws.metadata.builder.jaxrpc.JAXRPCClientDeployment; -import org.jboss.ws.metadata.j2ee.UnifiedServiceRefMetaData; -import org.jboss.ws.metadata.jaxrpcmapping.JavaWsdlMapping; -import org.jboss.ws.metadata.jaxrpcmapping.JavaWsdlMappingFactory; -import org.jboss.ws.tools.wsdl.WSDL11DefinitionFactory; - -/** - * Binds a JAXRPC Service object in the client's ENC for every service-ref element in the - * deployment descriptor. - * - * @author Thomas.Diesler(a)jboss.org - * @since 15-Jan-2005 - */ -public class ServiceRefHandler extends ServiceMBeanSupport implements ServiceRefHandlerMBean -{ - /** - * This binds a jaxrpc Service into the callers ENC for every service-ref element - * - * @param envCtx ENC to bind the javax.rpc.xml.Service object to - * @param serviceRefs An iterator of the service-ref elements in the client deployment descriptor - * @param di The client's deployment info - * @throws org.jboss.deployment.DeploymentException if it goes wrong - */ - public void bindServiceRefs(Context envCtx, Iterator serviceRefs, DeploymentInfo di) throws DeploymentException - { - try - { - while (serviceRefs.hasNext()) - { - ServiceRefMetaData serviceRef = (ServiceRefMetaData)serviceRefs.next(); - String serviceRefName = serviceRef.getServiceRefName(); - - // Build the container independent deployment info - UnifiedDeploymentInfo udi = new JAXRPCClientDeployment(UnifiedDeploymentInfo.DeploymentType.JAXRPC_Client); - DeploymentInfoAdaptor.buildDeploymentInfo(udi, di); - - UnifiedServiceRefMetaData wsServiceRef = ServiceRefMetaDataAdaptor.buildUnifiedServiceRefMetaData(udi, serviceRef); - - JavaWsdlMapping javaWsdlMapping = getJavaWsdlMapping(wsServiceRef); - wsServiceRef.setJavaWsdlMapping(javaWsdlMapping); - - Definition wsdlDefinition = getWsdlDefinition(wsServiceRef); - wsServiceRef.setWsdlDefinition(wsdlDefinition); - - ServiceReferenceable ref = new ServiceReferenceable(wsServiceRef, udi); - Util.bind(envCtx, serviceRefName, ref); - - log.debug("Webservice binding: java:comp/env/" + serviceRefName); - } - } - catch (Exception e) - { - throw new DeploymentException("Cannot bind webservice to client environment", e); - } - } - - private JavaWsdlMapping getJavaWsdlMapping(UnifiedServiceRefMetaData serviceRef) - { - JavaWsdlMapping javaWsdlMapping = null; - URL mappingURL = serviceRef.getMappingLocation(); - if (mappingURL != null) - { - try - { - // setup the XML binding Unmarshaller - JavaWsdlMappingFactory mappingFactory = JavaWsdlMappingFactory.newInstance(); - javaWsdlMapping = mappingFactory.parse(mappingURL); - } - catch (Exception e) - { - throw new JAXRPCException("Cannot unmarshal jaxrpc-mapping-file: " + mappingURL, e); - } - } - return javaWsdlMapping; - } - - private Definition getWsdlDefinition(UnifiedServiceRefMetaData serviceRef) - { - Definition wsdlDefinition = null; - { - URL wsdlOverride = serviceRef.getWsdlOverride(); - URL wsdlURL = serviceRef.getWsdlLocation(); - if (wsdlOverride == null && wsdlURL != null) - { - try - { - WSDL11DefinitionFactory factory = WSDL11DefinitionFactory.newInstance(); - wsdlDefinition = factory.parse(wsdlURL); - } - catch (WSDLException e) - { - throw new WSException("Cannot unmarshall wsdl, cause: " + e.toString()); - } - } - } - return wsdlDefinition; - } -} Deleted: branches/jbossws-1.2.0/integration-jboss42/src/java/org/jboss/ws/integration/jboss42/ServiceRefHandlerMBean.java =================================================================== --- branches/jbossws-1.2.0/integration-jboss42/src/java/org/jboss/ws/integration/jboss42/ServiceRefHandlerMBean.java 2007-03-09 13:53:08 UTC (rev 2569) +++ branches/jbossws-1.2.0/integration-jboss42/src/java/org/jboss/ws/integration/jboss42/ServiceRefHandlerMBean.java 2007-03-09 14:11:08 UTC (rev 2570) @@ -1,38 +0,0 @@ -/* -* JBoss, Home of Professional Open Source -* Copyright 2005, 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.ws.integration.jboss42; - -import javax.management.ObjectName; - -import org.jboss.system.ServiceMBean; -import org.jboss.metadata.serviceref.ServiceRefHandler; -import org.jboss.ws.core.utils.ObjectNameFactory; - -/** - * MBean interface. - * @since 19-Jan-2005 - */ -public interface ServiceRefHandlerMBean extends ServiceRefHandler, ServiceMBean -{ - // default object name - public static final ObjectName OBJECT_NAME = ObjectNameFactory.create("jboss.ws:service=ServiceRefHandler"); -} Deleted: branches/jbossws-1.2.0/integration-jboss42/src/java/org/jboss/ws/integration/jboss42/ServiceRefMetaDataAdaptor.java =================================================================== --- branches/jbossws-1.2.0/integration-jboss42/src/java/org/jboss/ws/integration/jboss42/ServiceRefMetaDataAdaptor.java 2007-03-09 13:53:08 UTC (rev 2569) +++ branches/jbossws-1.2.0/integration-jboss42/src/java/org/jboss/ws/integration/jboss42/ServiceRefMetaDataAdaptor.java 2007-03-09 14:11:08 UTC (rev 2570) @@ -1,107 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2005, 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.ws.integration.jboss42; - -// $Id$ - -import java.io.IOException; -import java.util.ArrayList; -import java.util.LinkedHashMap; - -import javax.xml.namespace.QName; - -import org.jboss.metadata.serviceref.HandlerMetaData; -import org.jboss.metadata.serviceref.InitParamMetaData; -import org.jboss.metadata.serviceref.PortComponentRefMetaData; -import org.jboss.metadata.serviceref.ServiceRefMetaData; -import org.jboss.ws.core.server.UnifiedDeploymentInfo; -import org.jboss.ws.metadata.j2ee.UnifiedHandlerMetaData; -import org.jboss.ws.metadata.j2ee.UnifiedPortComponentRefMetaData; -import org.jboss.ws.metadata.j2ee.UnifiedServiceRefMetaData; -import org.jboss.ws.metadata.umdm.HandlerMetaData.HandlerInitParam; - -/** - * Build container independent service ref meta data - * - * @author Thomas.Diesler(a)jboss.org - * @since 05-May-2006 - */ -public class ServiceRefMetaDataAdaptor -{ - public static UnifiedServiceRefMetaData buildUnifiedServiceRefMetaData(UnifiedDeploymentInfo udi, ServiceRefMetaData srmd) throws IOException - { - UnifiedServiceRefMetaData usrmd = new UnifiedServiceRefMetaData(); - usrmd.setServiceRefName(srmd.getServiceRefName()); - usrmd.setServiceInterface(srmd.getServiceInterface()); - usrmd.setWsdlLocation(srmd.getWsdlURL()); - usrmd.setMappingLocation(udi.getMetaDataFileURL(srmd.getJaxrpcMappingFile())); - usrmd.setServiceQName(srmd.getServiceQName()); - - LinkedHashMap<String, UnifiedPortComponentRefMetaData> pcrefs = new LinkedHashMap<String, UnifiedPortComponentRefMetaData>(); - for (PortComponentRefMetaData pcmd : srmd.getPortComponentRefs()) - { - UnifiedPortComponentRefMetaData upcmd = new UnifiedPortComponentRefMetaData(); - upcmd.setServiceEndpointInterface(pcmd.getServiceEndpointInterface()); - upcmd.setPortComponentLink(pcmd.getPortComponentLink()); - upcmd.setCallProperties(pcmd.getCallProperties()); - pcrefs.put(pcmd.getServiceEndpointInterface(), upcmd); - } - usrmd.setPortComponentRefs(pcrefs); - - ArrayList<UnifiedHandlerMetaData> handlers = new ArrayList<UnifiedHandlerMetaData>(); - for (HandlerMetaData hmd : srmd.getHandlers()) - { - UnifiedHandlerMetaData uhmd = new UnifiedHandlerMetaData(null); - uhmd.setHandlerName(hmd.getHandlerName()); - uhmd.setHandlerClass(hmd.getHandlerClass()); - - for(String portname : hmd.getPortNames()) - { - uhmd.addPortName(portname); - } - for (InitParamMetaData ipmd : hmd.getInitParams()) - { - HandlerInitParam ip = new HandlerInitParam(); - ip.setParamName(ipmd.getParamName()); - ip.setParamValue(ipmd.getParamValue()); - uhmd.addInitParam(ip); - } - for (QName soapHeader : hmd.getSoapHeaders()) - { - uhmd.addSoapHeader(soapHeader); - } - for (String soapRole : hmd.getSoapRoles()) - { - uhmd.addSoapRole(soapRole); - } - handlers.add(uhmd); - } - usrmd.setHandlers(handlers); - - usrmd.setConfigName(srmd.getConfigName()); - usrmd.setConfigFile(srmd.getConfigFile()); - usrmd.setWsdlOverride(srmd.getWsdlOverride()); - usrmd.setCallProperties(srmd.getCallProperties()); - - return usrmd; - } -} Modified: branches/jbossws-1.2.0/integration-jboss42/src/java/org/jboss/ws/integration/jboss42/URLLoaderAdapter.java =================================================================== --- branches/jbossws-1.2.0/integration-jboss42/src/java/org/jboss/ws/integration/jboss42/URLLoaderAdapter.java 2007-03-09 13:53:08 UTC (rev 2569) +++ branches/jbossws-1.2.0/integration-jboss42/src/java/org/jboss/ws/integration/jboss42/URLLoaderAdapter.java 2007-03-09 14:11:08 UTC (rev 2570) @@ -29,7 +29,7 @@ import java.net.URL; import java.net.URLClassLoader; -import org.jboss.ws.core.UnifiedVirtualFile; +import org.jboss.ws.integration.UnifiedVirtualFile; /** * The default file adapter loads resources through an associated classloader. Deleted: branches/jbossws-1.2.0/integration-jboss42/src/java/org/jboss/ws/integration/jboss42/WebServiceRefHandler.java =================================================================== --- branches/jbossws-1.2.0/integration-jboss42/src/java/org/jboss/ws/integration/jboss42/WebServiceRefHandler.java 2007-03-09 13:53:08 UTC (rev 2569) +++ branches/jbossws-1.2.0/integration-jboss42/src/java/org/jboss/ws/integration/jboss42/WebServiceRefHandler.java 2007-03-09 14:11:08 UTC (rev 2570) @@ -1,63 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2005, 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.ws.integration.jboss42; - -// $Id$ - -import java.lang.reflect.AnnotatedElement; -import java.net.URL; - -import javax.management.MBeanServer; -import javax.naming.Context; -import javax.naming.NamingException; -import javax.xml.transform.Source; - -import org.jboss.mx.util.MBeanServerLocator; -import org.jboss.ws.core.jaxws.UnifiedWebServiceRefHandler; - -/** - * Binds a JAXWS @WebServiceRef object in the client's ENC - * - * @author Thomas.Diesler(a)jboss.org - * @since 17-Jan-2007 - */ -public class WebServiceRefHandler extends UnifiedWebServiceRefHandler implements WebServiceRefHandlerMBean -{ - public void setupWebServiceRef(Context encCtx, String encName, AnnotatedElement anElement, URL rootURL, Source metadata) throws NamingException - { - setupWebServiceRef(encCtx, encName, anElement, new URLLoaderAdapter(rootURL), metadata); - } - - public void create() throws Exception - { - MBeanServer server = MBeanServerLocator.locateJBoss(); - if (server != null) - server.registerMBean(this, OBJECT_NAME); - } - - public void destroy() throws Exception - { - MBeanServer server = MBeanServerLocator.locateJBoss(); - if (server != null) - server.unregisterMBean(OBJECT_NAME); - } -} Deleted: branches/jbossws-1.2.0/integration-jboss42/src/java/org/jboss/ws/integration/jboss42/WebServiceRefHandlerMBean.java =================================================================== --- branches/jbossws-1.2.0/integration-jboss42/src/java/org/jboss/ws/integration/jboss42/WebServiceRefHandlerMBean.java 2007-03-09 13:53:08 UTC (rev 2569) +++ branches/jbossws-1.2.0/integration-jboss42/src/java/org/jboss/ws/integration/jboss42/WebServiceRefHandlerMBean.java 2007-03-09 14:11:08 UTC (rev 2570) @@ -1,46 +0,0 @@ -/* -* JBoss, Home of Professional Open Source -* Copyright 2005, 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.ws.integration.jboss42; - - -import java.lang.reflect.AnnotatedElement; -import java.net.URL; - -import javax.management.ObjectName; -import javax.naming.Context; -import javax.naming.NamingException; -import javax.xml.transform.Source; - -import org.jboss.ws.core.utils.ObjectNameFactory; - -/** - * MBean interface. - */ -public interface WebServiceRefHandlerMBean -{ - // default object name - public static final ObjectName OBJECT_NAME = ObjectNameFactory.create("jboss.ws:service=WebServiceRefHandler"); - - /** Binds a JAXWS WebServiceRef into the callers ENC - */ - void setupWebServiceRef(Context encCtx, String encName, AnnotatedElement enElement, URL rootURL, Source metadata) throws NamingException; -} Modified: branches/jbossws-1.2.0/integration-jboss50/.classpath =================================================================== --- branches/jbossws-1.2.0/integration-jboss50/.classpath 2007-03-09 13:53:08 UTC (rev 2569) +++ branches/jbossws-1.2.0/integration-jboss50/.classpath 2007-03-09 14:11:08 UTC (rev 2570) @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <classpath> - <classpathentry kind="src" path="src/main/java"/> + <classpathentry kind="src" path="src/java"/> <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/> <classpathentry combineaccessrules="false" kind="src" path="/jbossws-core"/> <classpathentry kind="lib" path="/build/thirdparty/jboss-vfs.jar" sourcepath="/build/thirdparty/jboss-vfs-sources.jar"/> Modified: branches/jbossws-1.2.0/integration-jboss50/src/java/org/jboss/ws/integration/jboss50/AbstractDeployer.java =================================================================== --- branches/jbossws-1.2.0/integration-jboss50/src/java/org/jboss/ws/integration/jboss50/AbstractDeployer.java 2007-03-09 13:53:08 UTC (rev 2569) +++ branches/jbossws-1.2.0/integration-jboss50/src/java/org/jboss/ws/integration/jboss50/AbstractDeployer.java 2007-03-09 14:11:08 UTC (rev 2570) @@ -29,10 +29,10 @@ import org.jboss.kernel.spi.registry.KernelRegistry; import org.jboss.kernel.spi.registry.KernelRegistryEntry; import org.jboss.ws.core.server.AbstractServiceEndpointPublisher; -import org.jboss.ws.core.server.KernelLocator; import org.jboss.ws.core.server.ServiceEndpointDeployer; import org.jboss.ws.core.server.UnifiedDeploymentInfo; import org.jboss.ws.core.server.UnifiedDeploymentInfo.DeploymentType; +import org.jboss.ws.integration.KernelLocator; /** * An abstract web service deployer. Modified: branches/jbossws-1.2.0/integration-jboss50/src/java/org/jboss/ws/integration/jboss50/ApplicationMetaDataAdaptor.java =================================================================== --- branches/jbossws-1.2.0/integration-jboss50/src/java/org/jboss/ws/integration/jboss50/ApplicationMetaDataAdaptor.java 2007-03-09 13:53:08 UTC (rev 2569) +++ branches/jbossws-1.2.0/integration-jboss50/src/java/org/jboss/ws/integration/jboss50/ApplicationMetaDataAdaptor.java 2007-03-09 14:11:08 UTC (rev 2570) @@ -166,6 +166,7 @@ upcmd.setPortComponentURI(pcmd.getPortComponentURI()); upcmd.setAuthMethod(pcmd.getAuthMethod()); upcmd.setTransportGuarantee(pcmd.getTransportGuarantee()); + upcmd.setSecureWSDLAccess(pcmd.getSecureWSDLAccess()); ubmd.setPortComponent(upcmd); } } Modified: branches/jbossws-1.2.0/integration-jboss50/src/java/org/jboss/ws/integration/jboss50/JAXRPCDeployerJSE.java =================================================================== --- branches/jbossws-1.2.0/integration-jboss50/src/java/org/jboss/ws/integration/jboss50/JAXRPCDeployerJSE.java 2007-03-09 13:53:08 UTC (rev 2569) +++ branches/jbossws-1.2.0/integration-jboss50/src/java/org/jboss/ws/integration/jboss50/JAXRPCDeployerJSE.java 2007-03-09 14:11:08 UTC (rev 2570) @@ -27,9 +27,9 @@ import org.jboss.deployers.spi.deployer.DeploymentUnit; import org.jboss.metadata.WebMetaData; import org.jboss.virtual.VirtualFile; -import org.jboss.ws.core.UnifiedVirtualFile; import org.jboss.ws.core.server.UnifiedDeploymentInfo; import org.jboss.ws.core.server.UnifiedDeploymentInfo.DeploymentType; +import org.jboss.ws.integration.UnifiedVirtualFile; import org.jboss.ws.metadata.builder.jaxrpc.JAXRPCDeployment; /** Modified: branches/jbossws-1.2.0/integration-jboss50/src/java/org/jboss/ws/integration/jboss50/JBossServiceEndpointServlet.java =================================================================== --- branches/jbossws-1.2.0/integration-jboss50/src/java/org/jboss/ws/integration/jboss50/JBossServiceEndpointServlet.java 2007-03-09 13:53:08 UTC (rev 2569) +++ branches/jbossws-1.2.0/integration-jboss50/src/java/org/jboss/ws/integration/jboss50/JBossServiceEndpointServlet.java 2007-03-09 14:11:08 UTC (rev 2570) @@ -29,7 +29,6 @@ import org.jboss.ws.WSException; import org.jboss.ws.core.server.AbstractServiceEndpointServlet; import org.jboss.ws.core.server.ServiceEndpoint; -import org.jboss.ws.metadata.config.ConfigurationProvider; import org.jboss.ws.metadata.umdm.ServerEndpointMetaData; /** Modified: branches/jbossws-1.2.0/integration-jboss50/src/java/org/jboss/ws/integration/jboss50/ServiceEndpointInvokerEJB21.java =================================================================== --- branches/jbossws-1.2.0/integration-jboss50/src/java/org/jboss/ws/integration/jboss50/ServiceEndpointInvokerEJB21.java 2007-03-09 13:53:08 UTC (rev 2569) +++ branches/jbossws-1.2.0/integration-jboss50/src/java/org/jboss/ws/integration/jboss50/ServiceEndpointInvokerEJB21.java 2007-03-09 14:11:08 UTC (rev 2570) @@ -29,6 +29,9 @@ import javax.management.MBeanServer; import javax.management.ObjectName; +import org.jboss.ejb.EjbModule; +import org.jboss.ejb.Interceptor; +import org.jboss.ejb.StatelessSessionContainer; import org.jboss.invocation.Invocation; import org.jboss.invocation.InvocationKey; import org.jboss.invocation.InvocationType; @@ -102,6 +105,36 @@ throw new WSException("Cannot obtain JNDI name for: " + ejbName); objectName = ObjectNameFactory.create("jboss.j2ee:jndiName=" + jndiName + ",service=EJB"); + + // Dynamically add the service endpoint interceptor + // http://jira.jboss.org/jira/browse/JBWS-758 + try + { + EjbModule ejbModule = (EjbModule)server.getAttribute(objectName, "EjbModule"); + StatelessSessionContainer container = (StatelessSessionContainer)ejbModule.getContainer(ejbName); + + boolean injectionPointFound = false; + Interceptor prev = container.getInterceptor(); + while (prev != null && prev.getNext() != null) + { + Interceptor next = prev.getNext(); + if (next.getNext() == null) + { + log.debug("Inject service endpoint interceptor after: " + prev.getClass().getName()); + ServiceEndpointInterceptor sepInterceptor = new ServiceEndpointInterceptor(); + prev.setNext(sepInterceptor); + sepInterceptor.setNext(next); + injectionPointFound = true; + } + prev = next; + } + if (injectionPointFound == false) + log.warn("Cannot service endpoint interceptor injection point"); + } + catch (Exception ex) + { + log.warn("Cannot add service endpoint interceptor", ex); + } } /** Load the SEI implementation bean if necessary @@ -148,6 +181,7 @@ inv.setType(InvocationType.SERVICE_ENDPOINT); // Set the handler callback and endpoint invocation + inv.setValue(HandlerCallback.class.getName(), new HandlerCallback(seInfo), PayloadKey.TRANSIENT); inv.setValue(EndpointInvocation.class.getName(), epInv, PayloadKey.TRANSIENT); String[] sig = { Invocation.class.getName() }; @@ -192,4 +226,43 @@ else return true; } + + // The ServiceEndpointInterceptor calls the methods in this callback + public class HandlerCallback + { + private ServiceEndpointInfo seInfo; + + public HandlerCallback(ServiceEndpointInfo seInfo) + { + this.seInfo = seInfo; + } + + /** Handlers are beeing called through the HandlerCallback from the EJB interceptor */ + public boolean callRequestHandlerChain(HandlerType type) + { + if (type == HandlerType.PRE) + return true; + else + return handlerDelegate.callRequestHandlerChain(seInfo, type); + } + + /** Handlers are beeing called through the HandlerCallback from the EJB interceptor */ + public boolean callResponseHandlerChain(HandlerType type) + { + if (type == HandlerType.PRE) + return true; + else + return handlerDelegate.callResponseHandlerChain(seInfo, type); + } + + /** Handlers are beeing called through the HandlerCallback from the EJB interceptor */ + public boolean callFaultHandlerChain(HandlerType type, Exception ex) + { + if (type == HandlerType.PRE) + return true; + else + return handlerDelegate.callFaultHandlerChain(seInfo, type, ex); + } + + } } Modified: branches/jbossws-1.2.0/integration-jboss50/src/java/org/jboss/ws/integration/jboss50/ServiceEndpointLifecycleDeployer.java =================================================================== --- branches/jbossws-1.2.0/integration-jboss50/src/java/org/jboss/ws/integration/jboss50/ServiceEndpointLifecycleDeployer.java 2007-03-09 13:53:08 UTC (rev 2569) +++ branches/jbossws-1.2.0/integration-jboss50/src/java/org/jboss/ws/integration/jboss50/ServiceEndpointLifecycleDeployer.java 2007-03-09 14:11:08 UTC (rev 2570) @@ -31,9 +31,9 @@ import org.jboss.kernel.spi.registry.KernelRegistry; import org.jboss.kernel.spi.registry.KernelRegistryEntry; import org.jboss.metadata.WebMetaData; -import org.jboss.ws.core.server.KernelLocator; import org.jboss.ws.core.server.ServiceEndpointDeployer; import org.jboss.ws.core.server.UnifiedDeploymentInfo; +import org.jboss.ws.integration.KernelLocator; /** * A deployer that starts and stops web service deployments Modified: branches/jbossws-1.2.0/integration-jboss50/src/java/org/jboss/ws/integration/jboss50/VirtualFileAdaptor.java =================================================================== --- branches/jbossws-1.2.0/integration-jboss50/src/java/org/jboss/ws/integration/jboss50/VirtualFileAdaptor.java 2007-03-09 13:53:08 UTC (rev 2569) +++ branches/jbossws-1.2.0/integration-jboss50/src/java/org/jboss/ws/integration/jboss50/VirtualFileAdaptor.java 2007-03-09 14:11:08 UTC (rev 2570) @@ -25,7 +25,7 @@ import java.net.URL; import org.jboss.virtual.VirtualFile; -import org.jboss.ws.core.UnifiedVirtualFile; +import org.jboss.ws.integration.UnifiedVirtualFile; // $Id$ @@ -38,7 +38,7 @@ public class VirtualFileAdaptor implements UnifiedVirtualFile { private static final long serialVersionUID = 6547394037548338042L; - + private VirtualFile root; public VirtualFileAdaptor(VirtualFile root) Deleted: branches/jbossws-1.2.0/integration-jboss50/src/java/org/jboss/ws/integration/jboss50/WebServiceRefHandler.java =================================================================== --- branches/jbossws-1.2.0/integration-jboss50/src/java/org/jboss/ws/integration/jboss50/WebServiceRefHandler.java 2007-03-09 13:53:08 UTC (rev 2569) +++ branches/jbossws-1.2.0/integration-jboss50/src/java/org/jboss/ws/integration/jboss50/WebServiceRefHandler.java 2007-03-09 14:11:08 UTC (rev 2570) @@ -1,63 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2005, 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.ws.integration.jboss50; - -// $Id$ - -import java.lang.reflect.AnnotatedElement; - -import javax.management.MBeanServer; -import javax.naming.Context; -import javax.naming.NamingException; -import javax.xml.transform.Source; - -import org.jboss.mx.util.MBeanServerLocator; -import org.jboss.virtual.VirtualFile; -import org.jboss.ws.core.jaxws.UnifiedWebServiceRefHandler; - -/** - * Binds a JAXWS @WebServiceRef object in the client's ENC - * - * @author Thomas.Diesler(a)jboss.org - * @since 17-Jan-2007 - */ -public class WebServiceRefHandler extends UnifiedWebServiceRefHandler implements WebServiceRefHandlerMBean -{ - public void setupWebServiceRef(Context encCtx, String encName, AnnotatedElement anElement, VirtualFile vfsRoot, Source metadata) throws NamingException - { - setupWebServiceRef(encCtx, encName, anElement, new VirtualFileAdaptor(vfsRoot), metadata); - } - - public void create() throws Exception - { - MBeanServer server = MBeanServerLocator.locateJBoss(); - if (server != null) - server.registerMBean(this, OBJECT_NAME); - } - - public void destroy() throws Exception - { - MBeanServer server = MBeanServerLocator.locateJBoss(); - if (server != null) - server.unregisterMBean(OBJECT_NAME); - } -} Deleted: branches/jbossws-1.2.0/integration-jboss50/src/java/org/jboss/ws/integration/jboss50/WebServiceRefHandlerMBean.java =================================================================== --- branches/jbossws-1.2.0/integration-jboss50/src/java/org/jboss/ws/integration/jboss50/WebServiceRefHandlerMBean.java 2007-03-09 13:53:08 UTC (rev 2569) +++ branches/jbossws-1.2.0/integration-jboss50/src/java/org/jboss/ws/integration/jboss50/WebServiceRefHandlerMBean.java 2007-03-09 14:11:08 UTC (rev 2570) @@ -1,46 +0,0 @@ -/* -* JBoss, Home of Professional Open Source -* Copyright 2005, 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.ws.integration.jboss50; - - -import java.lang.reflect.AnnotatedElement; - -import javax.management.ObjectName; -import javax.naming.Context; -import javax.naming.NamingException; -import javax.xml.transform.Source; - -import org.jboss.virtual.VirtualFile; -import org.jboss.ws.core.utils.ObjectNameFactory; - -/** - * MBean interface. - */ -public interface WebServiceRefHandlerMBean -{ - // default object name - public static final ObjectName OBJECT_NAME = ObjectNameFactory.create("jboss.ws:service=WebServiceRefHandler"); - - /** Binds a JAXWS WebServiceRef into the callers ENC - */ - void setupWebServiceRef(Context encCtx, String encName, AnnotatedElement enElement, VirtualFile vfsRoot, Source metadata) throws NamingException; -} Modified: branches/jbossws-1.2.0/integration-jboss50/src/resources/jbossws.deployer/META-INF/jbossws-deployer-beans.xml =================================================================== --- branches/jbossws-1.2.0/integration-jboss50/src/resources/jbossws.deployer/META-INF/jbossws-deployer-beans.xml 2007-03-09 13:53:08 UTC (rev 2569) +++ branches/jbossws-1.2.0/integration-jboss50/src/resources/jbossws.deployer/META-INF/jbossws-deployer-beans.xml 2007-03-09 14:11:08 UTC (rev 2570) @@ -2,7 +2,7 @@ <deployment xmlns="urn:jboss:bean-deployer:2.0"> - <bean name="KernelLocator" class="org.jboss.ws.core.server.KernelLocator"> + <bean name="KernelLocator" class="org.jboss.ws.integration.KernelLocator"> <property name="kernel"><inject bean="jboss.kernel:service=Kernel"/></property> </bean> @@ -47,12 +47,9 @@ <property name="serviceEndpointServlet">org.jboss.ws.integration.jboss50.JBossServiceEndpointServlet</property> </bean> - <!-- Bind JAXRPC Service objects in client environment context --> - <bean name="ServiceRefHandler" class="org.jboss.ws.integration.jboss50.ServiceRefHandler"/> + <!-- Bind Service objects in client environment context --> + <bean name="ServiceRefHandler" class="org.jboss.ws.core.client.ServiceRefHandlerImpl"/> - <!-- Bind JAXWS Service objects in client environment context --> - <bean name="WebServiceRefHandler" class="org.jboss.ws.integration.jboss50.WebServiceRefHandler"/> - <!-- A subscription manager for WS-Eventing --> <bean name="SubscriptionManager" class="org.jboss.ws.extensions.eventing.mgmt.SubscriptionManager"/> Modified: branches/jbossws-1.2.0/integration-tomcat/src/main/java/org/jboss/ws/integration/tomcat/KernelBootstrap.java =================================================================== --- branches/jbossws-1.2.0/integration-tomcat/src/main/java/org/jboss/ws/integration/tomcat/KernelBootstrap.java 2007-03-09 13:53:08 UTC (rev 2569) +++ branches/jbossws-1.2.0/integration-tomcat/src/main/java/org/jboss/ws/integration/tomcat/KernelBootstrap.java 2007-03-09 14:11:08 UTC (rev 2570) @@ -28,7 +28,7 @@ import org.jboss.kernel.plugins.bootstrap.basic.BasicBootstrap; import org.jboss.kernel.plugins.deployment.xml.BeanXMLDeployer; import org.jboss.logging.Logger; -import org.jboss.ws.core.server.KernelLocator; +import org.jboss.ws.integration.KernelLocator; /** * Bootstrap the microkernel in Tomcat Modified: branches/jbossws-1.2.0/integration-tomcat/src/main/java/org/jboss/ws/integration/tomcat/TomcatServiceEndpointServlet.java =================================================================== --- branches/jbossws-1.2.0/integration-tomcat/src/main/java/org/jboss/ws/integration/tomcat/TomcatServiceEndpointServlet.java 2007-03-09 13:53:08 UTC (rev 2569) +++ branches/jbossws-1.2.0/integration-tomcat/src/main/java/org/jboss/ws/integration/tomcat/TomcatServiceEndpointServlet.java 2007-03-09 14:11:08 UTC (rev 2570) @@ -37,12 +37,12 @@ import org.jboss.kernel.spi.registry.KernelRegistryEntry; import org.jboss.logging.Logger; import org.jboss.ws.WSException; -import org.jboss.ws.core.UnifiedVirtualFile; import org.jboss.ws.core.server.AbstractServiceEndpointServlet; import org.jboss.ws.core.server.JAXWSDeployment; -import org.jboss.ws.core.server.KernelLocator; import org.jboss.ws.core.server.ServiceEndpointDeployer; import org.jboss.ws.core.server.UnifiedDeploymentInfo; +import org.jboss.ws.integration.KernelLocator; +import org.jboss.ws.integration.UnifiedVirtualFile; import org.jboss.ws.metadata.builder.jaxrpc.JAXRPCDeployment; import org.jboss.ws.metadata.umdm.ResourceLoaderAdapter; Modified: branches/jbossws-1.2.0/jbossws-core/.classpath =================================================================== --- branches/jbossws-1.2.0/jbossws-core/.classpath 2007-03-09 13:53:08 UTC (rev 2569) +++ branches/jbossws-1.2.0/jbossws-core/.classpath 2007-03-09 14:11:08 UTC (rev 2570) @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <classpath> - <classpathentry kind="src" path="src/main/java"/> + <classpathentry kind="src" path="src/java"/> <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/> <classpathentry kind="lib" path="/build/thirdparty/ant.jar"/> <classpathentry kind="lib" path="/build/thirdparty/activation.jar"/> Deleted: branches/jbossws-1.2.0/jbossws-core/src/java/org/jboss/ws/core/UnifiedVirtualFile.java =================================================================== --- branches/jbossws-1.2.0/jbossws-core/src/java/org/jboss/ws/core/UnifiedVirtualFile.java 2007-03-09 13:53:08 UTC (rev 2569) +++ branches/jbossws-1.2.0/jbossws-core/src/java/org/jboss/ws/core/UnifiedVirtualFile.java 2007-03-09 14:11:08 UTC (rev 2570) @@ -1,42 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2005, 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.ws.core; - -// $Id$ - -import java.io.IOException; -import java.io.Serializable; -import java.net.URL; - -/** - * An adaptor to a VirtualFile from jboss-vfs.jar - * jboss-vfs cannot be used in jboss-4.x because of its dependeny on jboss-common-core.jar - * - * @author Thomas.Diesler(a)jboss.org - * @since 05-May-2006 - */ -public interface UnifiedVirtualFile extends Serializable -{ - UnifiedVirtualFile findChild(String child) throws IOException; - - URL toURL(); -} Modified: branches/jbossws-1.2.0/jbossws-core/src/java/org/jboss/ws/core/jaxrpc/client/ServiceImpl.java =================================================================== --- branches/jbossws-1.2.0/jbossws-core/src/java/org/jboss/ws/core/jaxrpc/client/ServiceImpl.java 2007-03-09 13:53:08 UTC (rev 2569) +++ branches/jbossws-1.2.0/jbossws-core/src/java/org/jboss/ws/core/jaxrpc/client/ServiceImpl.java 2007-03-09 14:11:08 UTC (rev 2570) @@ -27,12 +27,10 @@ import java.net.URL; import java.rmi.Remote; import java.util.ArrayList; -import java.util.Enumeration; import java.util.HashMap; import java.util.HashSet; import java.util.Iterator; import java.util.List; -import java.util.Properties; import java.util.Set; import javax.xml.namespace.QName; @@ -47,8 +45,10 @@ import org.jboss.logging.Logger; import org.jboss.ws.core.StubExt; import org.jboss.ws.metadata.builder.jaxrpc.JAXRPCClientMetaDataBuilder; -import org.jboss.ws.metadata.j2ee.UnifiedPortComponentRefMetaData; -import org.jboss.ws.metadata.j2ee.UnifiedServiceRefMetaData; +import org.jboss.ws.metadata.j2ee.serviceref.UnifiedCallPropertyMetaData; +import org.jboss.ws.metadata.j2ee.serviceref.UnifiedInitParamMetaData; +import org.jboss.ws.metadata.j2ee.serviceref.UnifiedPortComponentRefMetaData; +import org.jboss.ws.metadata.j2ee.serviceref.UnifiedServiceRefMetaData; import org.jboss.ws.metadata.jaxrpcmapping.JavaWsdlMapping; import org.jboss.ws.metadata.umdm.EndpointMetaData; import org.jboss.ws.metadata.umdm.HandlerMetaData; @@ -57,7 +57,6 @@ import org.jboss.ws.metadata.umdm.ResourceLoaderAdapter; import org.jboss.ws.metadata.umdm.ServiceMetaData; import org.jboss.ws.metadata.umdm.UnifiedMetaData; -import org.jboss.ws.metadata.umdm.HandlerMetaData.HandlerInitParam; import org.jboss.ws.metadata.umdm.HandlerMetaData.HandlerType; import org.jboss.ws.metadata.wsse.WSSecurityConfiguration; @@ -122,7 +121,7 @@ JAXRPCClientMetaDataBuilder builder = new JAXRPCClientMetaDataBuilder(); ClassLoader ctxClassLoader = Thread.currentThread().getContextClassLoader(); - + serviceMetaData = builder.buildMetaData(serviceName, wsdlURL, mappingURL, securityConfig, usrMetaData, ctxClassLoader); handlerRegistry = new HandlerRegistryImpl(serviceMetaData); } @@ -419,37 +418,19 @@ // nothing to do if (usrMetaData == null) return; - + // General properties - Properties callProps = usrMetaData.getCallProperties(); - if (callProps != null) - { - Enumeration<?> names = callProps.propertyNames(); - while (names.hasMoreElements()) - { - String name = (String)names.nextElement(); - String value = callProps.getProperty(name); - call.setProperty(name, value); - } - } - + for (UnifiedCallPropertyMetaData prop : usrMetaData.getCallProperties()) + call.setProperty(prop.getPropName(), prop.getPropValue()); + if (seiName != null) { for (UnifiedPortComponentRefMetaData upcRef : usrMetaData.getPortComponentRefs()) { if (seiName.equals(upcRef.getServiceEndpointInterface())) { - callProps = upcRef.getCallProperties(); - if (callProps != null) - { - Enumeration<?> names = callProps.propertyNames(); - while (names.hasMoreElements()) - { - String name = (String)names.nextElement(); - String value = callProps.getProperty(name); - call.setProperty(name, value); - } - } + for (UnifiedCallPropertyMetaData prop : upcRef.getCallProperties()) + call.setProperty(prop.getPropName(), prop.getPropValue()); } } } @@ -482,7 +463,7 @@ handlerRoles.addAll(jaxrpcMetaData.getSoapRoles()); HashMap hConfig = new HashMap(); - for (HandlerInitParam param : jaxrpcMetaData.getInitParams()) + for (UnifiedInitParamMetaData param : jaxrpcMetaData.getInitParams()) { hConfig.put(param.getParamName(), param.getParamValue()); } @@ -495,7 +476,8 @@ hConfig.put(HandlerType.class.getName(), jaxrpcMetaData.getHandlerType()); HandlerInfo info = new HandlerInfo(hClass, hConfig, headerArr); - if(log.isDebugEnabled()) log.debug("Adding client side handler to endpoint '" + portName + "': " + info); + if (log.isDebugEnabled()) + log.debug("Adding client side handler to endpoint '" + portName + "': " + info); handlerInfos.add(info); // register the handlers with the client engine Modified: branches/jbossws-1.2.0/jbossws-core/src/java/org/jboss/ws/core/jaxrpc/client/ServiceObjectFactory.java =================================================================== --- branches/jbossws-1.2.0/jbossws-core/src/java/org/jboss/ws/core/jaxrpc/client/ServiceObjectFactory.java 2007-03-09 13:53:08 UTC (rev 2569) +++ branches/jbossws-1.2.0/jbossws-core/src/java/org/jboss/ws/core/jaxrpc/client/ServiceObjectFactory.java 2007-03-09 14:11:08 UTC (rev 2570) @@ -37,6 +37,7 @@ import java.rmi.Remote; import java.util.Hashtable; import java.util.List; +import java.util.Properties; import javax.naming.Context; import javax.naming.Name; @@ -44,6 +45,7 @@ import javax.naming.RefAddr; import javax.naming.Reference; import javax.naming.spi.ObjectFactory; +import javax.wsdl.Definition; import javax.xml.namespace.QName; import javax.xml.rpc.JAXRPCException; import javax.xml.rpc.Service; @@ -54,12 +56,15 @@ import org.jboss.ws.core.server.ServiceEndpoint; import org.jboss.ws.core.server.ServiceEndpointManager; import org.jboss.ws.core.server.ServiceEndpointManagerFactory; -import org.jboss.ws.metadata.j2ee.UnifiedPortComponentRefMetaData; -import org.jboss.ws.metadata.j2ee.UnifiedServiceRefMetaData; +import org.jboss.ws.metadata.j2ee.serviceref.UnifiedCallPropertyMetaData; +import org.jboss.ws.metadata.j2ee.serviceref.UnifiedPortComponentRefMetaData; +import org.jboss.ws.metadata.j2ee.serviceref.UnifiedServiceRefMetaData; import org.jboss.ws.metadata.jaxrpcmapping.JavaWsdlMapping; +import org.jboss.ws.metadata.jaxrpcmapping.JavaWsdlMappingFactory; import org.jboss.ws.metadata.umdm.EndpointMetaData; import org.jboss.ws.metadata.umdm.ServiceMetaData; import org.jboss.ws.metadata.wsse.WSSecurityConfiguration; +import org.jboss.ws.tools.wsdl.WSDL11DefinitionFactory; /** * This ServiceObjectFactory reconstructs a javax.xml.rpc.Service @@ -102,13 +107,13 @@ Reference ref = (Reference)obj; // Unmarshall the ServiceRefMetaData - UnifiedServiceRefMetaData usrMetaData = null; + UnifiedServiceRefMetaData serviceRef = null; RefAddr metaRefAddr = ref.get(ServiceReferenceable.SERVICE_REF_META_DATA); ByteArrayInputStream bais = new ByteArrayInputStream((byte[])metaRefAddr.getContent()); try { ObjectInputStream ois = new ObjectInputStream(bais); - usrMetaData = (UnifiedServiceRefMetaData)ois.readObject(); + serviceRef = (UnifiedServiceRefMetaData)ois.readObject(); ois.close(); } catch (IOException ex) @@ -137,15 +142,15 @@ } ServiceImpl jaxrpcService = null; - URL wsdlLocation = usrMetaData.getWsdlLocation(); + URL wsdlLocation = serviceRef.getWsdlLocation(); if (wsdlLocation != null) { if(log.isDebugEnabled()) log.debug("Create jaxrpc service from wsdl"); // Create the actual service object - QName serviceName = usrMetaData.getServiceQName(); - JavaWsdlMapping javaWsdlMapping = (JavaWsdlMapping)usrMetaData.getJavaWsdlMapping(); - jaxrpcService = new ServiceImpl(serviceName, wsdlLocation, javaWsdlMapping, securityConfig, usrMetaData); + QName serviceName = serviceRef.getServiceQName(); + JavaWsdlMapping javaWsdlMapping = getJavaWsdlMapping(serviceRef); + jaxrpcService = new ServiceImpl(serviceName, wsdlLocation, javaWsdlMapping, securityConfig, serviceRef); } else { @@ -153,9 +158,16 @@ jaxrpcService = new ServiceImpl(new QName(Constants.NS_JBOSSWS_URI, "AnonymousService")); } + ServiceMetaData serviceMetaData = jaxrpcService.getServiceMetaData(); + // Set any service level properties - ServiceMetaData serviceMetaData = jaxrpcService.getServiceMetaData(); - serviceMetaData.setProperties(usrMetaData.getCallProperties()); + if (serviceRef.getCallProperties().size() > 0) + { + Properties callProps = new Properties(); + serviceMetaData.setProperties(callProps); + for (UnifiedCallPropertyMetaData prop : serviceRef.getCallProperties()) + callProps.setProperty(prop.getPropName(), prop.getPropValue()); + } // The web service client using a port-component-link, the contet is the URL to // the PortComponentLinkServlet that will return the actual endpoint address @@ -211,15 +223,13 @@ // load the service interface class ClassLoader contextCL = Thread.currentThread().getContextClassLoader(); - Class siClass = contextCL.loadClass(usrMetaData.getServiceInterface()); + Class siClass = contextCL.loadClass(serviceRef.getServiceInterface()); if (Service.class.isAssignableFrom(siClass) == false) throw new JAXRPCException("The service interface does not implement javax.xml.rpc.Service: " + siClass.getName()); // load all service endpoint interface classes - UnifiedPortComponentRefMetaData[] pcrArray = usrMetaData.getPortComponentRefs(); - for (int i = 0; i < pcrArray.length; i++) + for (UnifiedPortComponentRefMetaData pcr : serviceRef.getPortComponentRefs()) { - UnifiedPortComponentRefMetaData pcr = pcrArray[i]; Class seiClass = contextCL.loadClass(pcr.getServiceEndpointInterface()); if (Remote.class.isAssignableFrom(seiClass) == false) throw new IllegalArgumentException("The SEI does not implement java.rmi.Remote: " + seiClass.getName()); @@ -249,4 +259,45 @@ jaxrpcService.setupHandlerChain(epMetaData); } } + + private JavaWsdlMapping getJavaWsdlMapping(UnifiedServiceRefMetaData serviceRef) + { + JavaWsdlMapping javaWsdlMapping = null; + if (serviceRef.getMappingFile() != null) + { + String mappingFile = serviceRef.getMappingFile(); + try + { + JavaWsdlMappingFactory mappingFactory = JavaWsdlMappingFactory.newInstance(); + URL mappingURL = serviceRef.getVfsRoot().findChild(mappingFile).toURL(); + javaWsdlMapping = mappingFactory.parse(mappingURL); + } + catch (Exception e) + { + throw new WSException("Cannot unmarshal jaxrpc-mapping-file: " + mappingFile, e); + } + } + return javaWsdlMapping; + } + + private Definition getWsdlDefinition(UnifiedServiceRefMetaData serviceRef) + { + Definition wsdlDefinition = null; + { + URL wsdlLocation = serviceRef.getWsdlLocation(); + if (wsdlLocation != null) + { + try + { + WSDL11DefinitionFactory factory = WSDL11DefinitionFactory.newInstance(); + wsdlDefinition = factory.parse(wsdlLocation); + } + catch (Exception e) + { + throw new WSException("Cannot unmarshall wsdl-file: " + wsdlLocation, e); + } + } + } + return wsdlDefinition; + } } Modified: branches/jbossws-1.2.0/jbossws-core/src/java/org/jboss/ws/core/jaxrpc/client/ServiceReferenceable.java =================================================================== --- branches/jbossws-1.2.0/jbossws-core/src/java/org/jboss/ws/core/jaxrpc/client/ServiceReferenceable.java 2007-03-09 13:53:08 UTC (rev 2569) +++ branches/jbossws-1.2.0/jbossws-core/src/java/org/jboss/ws/core/jaxrpc/client/ServiceReferenceable.java 2007-03-09 14:11:08 UTC (rev 2570) @@ -26,7 +26,6 @@ import java.io.ByteArrayOutputStream; import java.io.IOException; -import java.io.InputStream; import java.io.ObjectOutputStream; import java.net.URL; @@ -39,10 +38,9 @@ import org.jboss.logging.Logger; import org.jboss.ws.core.server.ServiceEndpointManager; import org.jboss.ws.core.server.ServiceEndpointManagerFactory; -import org.jboss.ws.core.server.UnifiedDeploymentInfo; -import org.jboss.ws.metadata.j2ee.UnifiedPortComponentRefMetaData; -import org.jboss.ws.metadata.j2ee.UnifiedServiceRefMetaData; -import org.jboss.ws.metadata.j2ee.UnifiedWebMetaData; +import org.jboss.ws.integration.UnifiedVirtualFile; +import org.jboss.ws.metadata.j2ee.serviceref.UnifiedPortComponentRefMetaData; +import org.jboss.ws.metadata.j2ee.serviceref.UnifiedServiceRefMetaData; import org.jboss.ws.metadata.wsse.WSSecurityConfiguration; import org.jboss.ws.metadata.wsse.WSSecurityOMFactory; @@ -61,25 +59,20 @@ private static Logger log = Logger.getLogger(ServiceReferenceable.class); public static final String SERVICE_REF_META_DATA = "SERVICE_REF_META_DATA"; - public static final String DEPLOYMENT_URL = "DEPLOYMENT_URL"; public static final String SECURITY_CONFIG = "SECURITY_CONFIG"; - public static final String DESCRIPTOR_LOC = "DESCRIPTOR_LOC"; public static final String PORT_COMPONENT_LINK = "PORT_COMPONENT_LINK"; public static final String PORT_COMPONENT_LINK_SERVLET = "PORT_COMPONENT_LINK_SERVLET"; private UnifiedServiceRefMetaData refMetaData; - private UnifiedDeploymentInfo udi; + private UnifiedVirtualFile vfsRoot; /** * A service referenceable for a WSDL document that is part of the deployment - * - * @param refMetaData The service-ref meta data - * @param udi The client DeploymentInfo */ - public ServiceReferenceable(UnifiedServiceRefMetaData refMetaData, UnifiedDeploymentInfo udi) + public ServiceReferenceable(UnifiedServiceRefMetaData refMetaData) { this.refMetaData = refMetaData; - this.udi = udi; + this.vfsRoot = refMetaData.getVfsRoot(); } /** @@ -92,11 +85,6 @@ { Reference myRef = new Reference(ServiceReferenceable.class.getName(), ServiceObjectFactory.class.getName(), null); - // The deployment URL of the web service client deployment - // Add a reference to the client deployment URL - String deploymentID = udi.name; - myRef.add(new StringRefAddr(DEPLOYMENT_URL, deploymentID)); - // Add a reference to the ServiceRefMetaData and WSDLDefinitions myRef.add(new BinaryRefAddr(SERVICE_REF_META_DATA, marshallServiceRef())); @@ -105,10 +93,8 @@ myRef.add(new BinaryRefAddr(SECURITY_CONFIG, marshallSecurityConfig())); // Add references to port component links - UnifiedPortComponentRefMetaData[] pcrArr = refMetaData.getPortComponentRefs(); - for (int i = 0; i < pcrArr.length; i++) + for (UnifiedPortComponentRefMetaData pcr : refMetaData.getPortComponentRefs()) { - UnifiedPortComponentRefMetaData pcr = pcrArr[i]; String pcLink = pcr.getPortComponentLink(); if (pcLink != null) { @@ -137,8 +123,6 @@ */ private byte[] marshallServiceRef() throws NamingException { - refMetaData.getJavaWsdlMapping(); - ByteArrayOutputStream baos = new ByteArrayOutputStream(512); try { @@ -161,8 +145,8 @@ try { ObjectOutputStream oos = new ObjectOutputStream(baos); - URL vfConfig = getSecurityConfig(); - WSSecurityConfiguration securityConfig = WSSecurityOMFactory.newInstance().parse(vfConfig); + WSSecurityOMFactory factory = WSSecurityOMFactory.newInstance(); + WSSecurityConfiguration securityConfig = factory.parse(getSecurityConfig()); oos.writeObject(securityConfig); oos.close(); } @@ -175,19 +159,25 @@ private URL getSecurityConfig() { - String descriptorPath = udi.metaData instanceof UnifiedWebMetaData ? "WEB-INF" : "META-INF"; - descriptorPath = descriptorPath + "/" + WSSecurityOMFactory.CLIENT_RESOURCE_NAME; + URL securityConfigURL = null; try { - URL vfConfig = udi.getMetaDataFileURL(descriptorPath); - InputStream inputStream = vfConfig.openStream(); - inputStream.close(); - return vfConfig; + UnifiedVirtualFile vfConfig = vfsRoot.findChild("WEB-INF/" + WSSecurityOMFactory.CLIENT_RESOURCE_NAME); + securityConfigURL = vfConfig.toURL(); } catch (IOException ex) { - if(log.isDebugEnabled()) log.debug("Cannot find security config: " + descriptorPath); - return null; + // ignore } + try + { + UnifiedVirtualFile vfConfig = vfsRoot.findChild("META-INF/" + WSSecurityOMFactory.CLIENT_RESOURCE_NAME); + securityConfigURL = vfConfig.toURL(); + } + catch (IOException ex) + { + // ignore + } + return securityConfigURL; } } \ No newline at end of file Modified: branches/jbossws-1.2.0/jbossws-core/src/java/org/jboss/ws/core/jaxrpc/handler/HandlerDelegateJAXRPC.java =================================================================== --- branches/jbossws-1.2.0/jbossws-core/src/java/org/jboss/ws/core/jaxrpc/handler/HandlerDelegateJAXRPC.java 2007-03-09 13:53:08 UTC (rev 2569) +++ branches/jbossws-1.2.0/jbossws-core/src/java/org/jboss/ws/core/jaxrpc/handler/HandlerDelegateJAXRPC.java 2007-03-09 14:11:08 UTC (rev 2570) @@ -38,10 +38,10 @@ import org.jboss.ws.core.server.ServiceEndpointInfo; import org.jboss.ws.core.soap.MessageContextAssociation; import org.jboss.ws.extensions.xop.XOPContext; +import org.jboss.ws.metadata.j2ee.serviceref.UnifiedInitParamMetaData; import org.jboss.ws.metadata.umdm.HandlerMetaData; import org.jboss.ws.metadata.umdm.HandlerMetaDataJAXRPC; import org.jboss.ws.metadata.umdm.ServerEndpointMetaData; -import org.jboss.ws.metadata.umdm.HandlerMetaData.HandlerInitParam; import org.jboss.ws.metadata.umdm.HandlerMetaData.HandlerType; /** Delegates to JAXRPC handlers @@ -158,7 +158,7 @@ handlerRoles.addAll(jaxrpcMetaData.getSoapRoles()); HashMap<String, Object> hConfig = new HashMap<String, Object>(); - for (HandlerInitParam param : jaxrpcMetaData.getInitParams()) + for (UnifiedInitParamMetaData param : jaxrpcMetaData.getInitParams()) { hConfig.put(param.getParamName(), param.getParamValue()); } Deleted: branches/jbossws-1.2.0/jbossws-core/src/java/org/jboss/ws/core/jaxws/UnifiedServiceRefObjectFactory.java =================================================================== --- branches/jbossws-1.2.0/jbossws-core/src/java/org/jboss/ws/core/jaxws/UnifiedServiceRefObjectFactory.java 2007-03-09 13:53:08 UTC (rev 2569) +++ branches/jbossws-1.2.0/jbossws-core/src/java/org/jboss/ws/core/jaxws/UnifiedServiceRefObjectFactory.java 2007-03-09 14:11:08 UTC (rev 2570) @@ -1,187 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2005, 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.ws.core.jaxws; - -import java.io.ByteArrayInputStream; -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; - -import org.jboss.ws.WSException; -import org.jboss.ws.core.jaxws.client.NameValuePair; -import org.jboss.ws.core.jaxws.client.PortInfo; -import org.jboss.ws.core.jaxws.client.UnifiedServiceRef; -import org.jboss.xb.binding.ObjectModelFactory; -import org.jboss.xb.binding.Unmarshaller; -import org.jboss.xb.binding.UnmarshallerFactory; -import org.jboss.xb.binding.UnmarshallingContext; -import org.xml.sax.Attributes; - -/** - * An ObjectModelFactory for UnifiedServiceRef - * - * @author Thomas.Diesler(a)jboss.org - * @since 17-Jan-2007 - */ -public class UnifiedServiceRefObjectFactory implements ObjectModelFactory -{ - // Hide constructor - private UnifiedServiceRefObjectFactory() - { - } - - public static UnifiedServiceRefObjectFactory newInstance() - { - return new UnifiedServiceRefObjectFactory(); - } - - public UnifiedServiceRef parse(Source source) - { - // setup the XML binding Unmarshaller - try - { - ByteArrayOutputStream baos = new ByteArrayOutputStream(); - StreamResult result = new StreamResult(baos); - TransformerFactory tf = TransformerFactory.newInstance(); - tf.newTransformer().transform(source, result); - - InputStream is = new ByteArrayInputStream(baos.toByteArray()); - - Unmarshaller unmarshaller = UnmarshallerFactory.newInstance().newUnmarshaller(); - return (UnifiedServiceRef)unmarshaller.unmarshal(is, this, null); - } - catch (Exception ex) - { - WSException.rethrow(ex); - return null; - } - } - - /** - * This method is called on the factory by the object model builder when the parsing starts. - */ - public Object newRoot(Object root, UnmarshallingContext navigator, String namespaceURI, String localName, Attributes attrs) - { - return new UnifiedServiceRef(); - } - - public Object completeRoot(Object root, UnmarshallingContext ctx, String uri, String name) - { - return root; - } - - public void setValue(UnifiedServiceRef ref, UnmarshallingContext navigator, String namespaceURI, String localName, String value) - { - if (localName.equals("service-ref-name")) - { - ref.setServiceRefName(value); - } - else if (localName.equals("service-class-name")) - { - ref.setServiceClassName(value); - } - else if (localName.equals("service-qname")) - { - ref.setServiceQName(QName.valueOf(value)); - } - else if (localName.equals("config-name")) - { - ref.setConfigName(value); - } - else if (localName.equals("config-file")) - { - ref.setConfigFile(value); - } - else if (localName.equals("handler-chain")) - { - ref.setHandlerChain(value); - } - else if (localName.equals("wsdl-override")) - { - ref.setWsdlLocation(value); - } - } - - public Object newChild(UnifiedServiceRef parent, UnmarshallingContext navigator, String namespaceURI, String localName, Attributes attrs) - { - Object child = null; - - if (localName.equals("port-info")) - child = new PortInfo(parent); - - return child; - } - - public void addChild(UnifiedServiceRef parent, PortInfo portInfo, UnmarshallingContext navigator, String namespaceURI, String localName) - { - parent.getPortInfos().add(portInfo); - } - - public void setValue(PortInfo portInfo, UnmarshallingContext navigator, String namespaceURI, String localName, String value) - { - if (localName.equals("service-endpoint-interface")) - { - portInfo.setServiceEndpointInterface(value); - } - else if (localName.equals("port-qname")) - { - portInfo.setPortQName(QName.valueOf(value)); - } - else if (localName.equals("config-name")) - { - portInfo.setConfigName(value); - } - else if (localName.equals("config-file")) - { - portInfo.setConfigFile(value); - } - } - - public Object newChild(PortInfo portInfo, UnmarshallingContext navigator, String namespaceURI, String localName, Attributes attrs) - { - Object child = null; - if (localName.equals("stub-property")) - child = new NameValuePair(); - return child; - } - - public void addChild(PortInfo parent, NameValuePair stubProp, UnmarshallingContext navigator, String namespaceURI, String localName) - { - parent.getStubProperties().add(stubProp); - } - - public void setValue(NameValuePair nvPair, UnmarshallingContext navigator, String namespaceURI, String localName, String value) - { - if (localName.equals("name")) - { - nvPair.setName(value); - } - else if (localName.equals("value")) - { - nvPair.setValue(value); - } - } -} Deleted: branches/jbossws-1.2.0/jbossws-core/src/java/org/jboss/ws/core/jaxws/UnifiedWebServiceRefHandler.java =================================================================== --- branches/jbossws-1.2.0/jbossws-core/src/java/org/jboss/ws/core/jaxws/UnifiedWebServiceRefHandler.java 2007-03-09 13:53:08 UTC (rev 2569) +++ branches/jbossws-1.2.0/jbossws-core/src/java/org/jboss/ws/core/jaxws/UnifiedWebServiceRefHandler.java 2007-03-09 14:11:08 UTC (rev 2570) @@ -1,188 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2005, 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.ws.core.jaxws; - -// $Id$ - -import java.lang.annotation.Annotation; -import java.lang.reflect.AnnotatedElement; -import java.lang.reflect.Field; -import java.lang.reflect.Method; -import java.net.MalformedURLException; -import java.net.URL; -import java.util.ArrayList; -import java.util.List; - -import javax.jws.HandlerChain; -import javax.naming.Context; -import javax.naming.NamingException; -import javax.xml.transform.Source; -import javax.xml.ws.Service; -import javax.xml.ws.WebServiceRef; -import javax.xml.ws.WebServiceRefs; - -import org.jboss.logging.Logger; -import org.jboss.util.naming.Util; -import org.jboss.ws.WSException; -import org.jboss.ws.core.UnifiedVirtualFile; -import org.jboss.ws.core.jaxws.client.ServiceReferenceable; -import org.jboss.ws.core.jaxws.client.UnifiedServiceRef; - -/** - * Binds a JAXWS Service object in the client's ENC - * - * @author Thomas.Diesler(a)jboss.org - * @since 17-Jan-2007 - */ -public class UnifiedWebServiceRefHandler -{ - // logging support - private static Logger log = Logger.getLogger(UnifiedWebServiceRefHandler.class); - - protected void setupWebServiceRef(Context encCtx, String encName, AnnotatedElement anElement, UnifiedVirtualFile vfsRoot, Source metadata) throws NamingException - { - WebServiceRef wsref = null; - - // Build the list of @WebServiceRef relevant annotations - List<WebServiceRef> wsrefList = new ArrayList<WebServiceRef>(); - 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); - } - } - - // Use the single @WebServiceRef - if (wsrefList.size() == 1) - { - wsref = wsrefList.get(0); - } - else - { - for (WebServiceRef aux : wsrefList) - { - if (encName.endsWith("/" + aux.name())) - { - wsref = aux; - break; - } - } - } - - if (wsref == null) - throw new IllegalArgumentException("@WebServiceRef must be present on: " + anElement); - - Class targetClass = null; - if (anElement instanceof Field) - targetClass = ((Field)anElement).getType(); - else if (anElement instanceof Method) - targetClass = ((Method)anElement).getParameterTypes()[0]; - - String externalName = encCtx.getNameInNamespace() + "/" + encName; - String targetClassName = (targetClass != null ? targetClass.getName() : null); - log.debug("setupWebServiceRef [jndi=" + externalName + ",target=" + targetClassName + "]"); - - String serviceClassName = null; - - // #1 Use the explicit @WebServiceRef.value - if (wsref.value() != Object.class) - serviceClassName = wsref.value().getName(); - - // #2 Use the target ref type - if (serviceClassName == null && targetClass != null && Service.class.isAssignableFrom(targetClass)) - serviceClassName = targetClass.getName(); - - // #3 Use javax.xml.ws.Service - if (serviceClassName == null) - serviceClassName = Service.class.getName(); - - // #1 Use the explicit @WebServiceRef.type - if (wsref.type() != Object.class) - targetClassName = wsref.type().getName(); - - // #2 Use the target ref type - if (targetClassName == null && targetClass != null && Service.class.isAssignableFrom(targetClass) == false) - targetClassName = targetClass.getName(); - - try - { - UnifiedServiceRefObjectFactory factory = UnifiedServiceRefObjectFactory.newInstance(); - UnifiedServiceRef usRef = factory.parse(metadata); - usRef.setRootFile(vfsRoot); - - // Set the wsdlLocation if there is no override already - if (usRef.getWsdlLocation() == null && wsref.wsdlLocation().length() > 0) - usRef.setWsdlLocation(wsref.wsdlLocation()); - - // Set the handlerChain from @HandlerChain on the annotated element - String handlerChain = usRef.getHandlerChain(); - 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) - { - try - { - new URL(handlerChain); - } - catch (MalformedURLException ex) - { - Class declaringClass = null; - if (anElement instanceof Field) - declaringClass = ((Field)anElement).getDeclaringClass(); - else if (anElement instanceof Method) - declaringClass = ((Method)anElement).getDeclaringClass(); - else if (anElement instanceof Class) - declaringClass = (Class)anElement; - - handlerChain = declaringClass.getPackage().getName().replace('.', '/') + "/" + handlerChain; - UnifiedVirtualFile vfHandlerChain = vfsRoot.findChild(handlerChain); - if (vfHandlerChain == null) - throw new IllegalStateException("Cannot find handler chain: " + handlerChain); - } - usRef.setHandlerChain(handlerChain); - } - - // Do not use rebind, the binding should be unique - // [JBWS-1499] - Revisit WebServiceRefHandler JNDI rebind - Util.rebind(encCtx, encName, new ServiceReferenceable(serviceClassName, targetClassName, usRef)); - - log.debug("<service-ref> bound to: java:comp/env/" + encName); - } - catch (RuntimeException rte) - { - throw rte; - } - catch (Exception ex) - { - throw new WSException("Cannot bind web service ref: " + encName, ex); - } - } -} Deleted: branches/jbossws-1.2.0/jbossws-core/src/java/org/jboss/ws/core/jaxws/client/PortInfo.java =================================================================== --- branches/jbossws-1.2.0/jbossws-core/src/java/org/jboss/ws/core/jaxws/client/PortInfo.java 2007-03-09 13:53:08 UTC (rev 2569) +++ branches/jbossws-1.2.0/jbossws-core/src/java/org/jboss/ws/core/jaxws/client/PortInfo.java 2007-03-09 14:11:08 UTC (rev 2570) @@ -1,102 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2005, 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.ws.core.jaxws.client; - -//$Id$ - -import java.io.Serializable; -import java.util.ArrayList; -import java.util.List; - -import javax.xml.namespace.QName; - -/** - * Represents a <port-info> element in <service-ref> - * - * @author Thomas.Diesler(a)jboss.com - */ -public class PortInfo implements Serializable -{ - private static final long serialVersionUID = -5517739021682888778L; - - private UnifiedServiceRef serviceRef; - private String serviceEndpointInterface; - private QName portQName; - private String configName; - private String configFile; - private List<NameValuePair> stubProperties = new ArrayList<NameValuePair>(); - - public PortInfo(UnifiedServiceRef serviceRef) - { - this.serviceRef = serviceRef; - } - - public UnifiedServiceRef getServiceRef() - { - return serviceRef; - } - - public QName getPortQName() - { - return portQName; - } - - public void setPortQName(QName portName) - { - this.portQName = portName; - } - - public String getServiceEndpointInterface() - { - return serviceEndpointInterface; - } - - public void setServiceEndpointInterface(String serviceEndpointInterface) - { - this.serviceEndpointInterface = serviceEndpointInterface; - } - - public String getConfigFile() - { - return configFile; - } - - public void setConfigFile(String configFile) - { - this.configFile = configFile; - } - - public String getConfigName() - { - return configName; - } - - public void setConfigName(String configName) - { - this.configName = configName; - } - - public List<NameValuePair> getStubProperties() - { - return stubProperties; - } -} Modified: branches/jbossws-1.2.0/jbossws-core/src/java/org/jboss/ws/core/jaxws/client/ServiceExt.java =================================================================== --- branches/jbossws-1.2.0/jbossws-core/src/java/org/jboss/ws/core/jaxws/client/ServiceExt.java 2007-03-09 13:53:08 UTC (rev 2569) +++ branches/jbossws-1.2.0/jbossws-core/src/java/org/jboss/ws/core/jaxws/client/ServiceExt.java 2007-03-09 14:11:08 UTC (rev 2570) @@ -34,7 +34,7 @@ import org.jboss.ws.WSException; import org.jboss.ws.core.ConfigProvider; import org.jboss.ws.core.StubExt; -import org.jboss.ws.core.UnifiedVirtualFile; +import org.jboss.ws.integration.UnifiedVirtualFile; import org.jboss.ws.metadata.umdm.EndpointMetaData; import org.jboss.ws.metadata.umdm.ServiceMetaData; import org.jboss.ws.metadata.wsse.WSSecurityConfigFactory; Modified: branches/jbossws-1.2.0/jbossws-core/src/java/org/jboss/ws/core/jaxws/client/ServiceObjectFactory.java =================================================================== --- branches/jbossws-1.2.0/jbossws-core/src/java/org/jboss/ws/core/jaxws/client/ServiceObjectFactory.java 2007-03-09 13:53:08 UTC (rev 2569) +++ branches/jbossws-1.2.0/jbossws-core/src/java/org/jboss/ws/core/jaxws/client/ServiceObjectFactory.java 2007-03-09 14:11:08 UTC (rev 2570) @@ -25,13 +25,11 @@ // $Id$ import java.io.ByteArrayInputStream; -import java.io.File; import java.io.IOException; import java.io.ObjectInputStream; import java.lang.reflect.Constructor; import java.lang.reflect.InvocationTargetException; import java.lang.reflect.Method; -import java.net.MalformedURLException; import java.net.URL; import java.util.Hashtable; @@ -47,7 +45,7 @@ import org.jboss.logging.Logger; import org.jboss.ws.WSException; import org.jboss.ws.core.ConfigProvider; -import org.jboss.ws.core.UnifiedVirtualFile; +import org.jboss.ws.metadata.j2ee.serviceref.UnifiedServiceRefMetaData; /** * This ServiceObjectFactory reconstructs a javax.xml.ws.Service @@ -61,8 +59,8 @@ // provide logging private static final Logger log = Logger.getLogger(ServiceObjectFactory.class); - // The UnifiedServiceRef association - private static ThreadLocal serviceRefAssociation = new ThreadLocal(); + // The ServiceRefMetaData association + private static ThreadLocal<UnifiedServiceRefMetaData> serviceRefAssociation = new ThreadLocal<UnifiedServiceRefMetaData>(); /** * Creates an object using the location or reference information specified. @@ -94,23 +92,23 @@ String targetClassName = (String)ref.get(ServiceReferenceable.TARGET_CLASS_NAME).getContent(); // Unmarshall the UnifiedServiceRef - UnifiedServiceRef usRef = unmarshallServiceRef(ref); - String serviceRefName = usRef.getServiceRefName(); - QName serviceQName = usRef.getServiceQName(); + UnifiedServiceRefMetaData serviceRef = unmarshallServiceRef(ref); + String serviceRefName = serviceRef.getServiceRefName(); + QName serviceQName = serviceRef.getServiceQName(); - String serviceClassName = usRef.getServiceClassName(); - if (serviceClassName == null) - serviceClassName = (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 = serviceClassName; + targetClassName = serviceImplClass; - if(log.isDebugEnabled()) log.debug("[name=" + serviceRefName + ",service=" + serviceClassName + ",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(serviceClassName); + Class serviceClass = ctxLoader.loadClass(serviceImplClass); Class targetClass = (targetClassName != null ? ctxLoader.loadClass(targetClassName) : null); if (Service.class.isAssignableFrom(serviceClass) == false) @@ -120,12 +118,11 @@ Object target; // Get the URL to the wsdl - URL wsdlURL = getWsdlLocationURL(targetClass != null ? targetClass : serviceClass, usRef); - + URL wsdlURL = serviceRef.getWsdlLocation(); try { - // Associate the UnifiedServiceRef with this thread - serviceRefAssociation.set(usRef); + // Associate the ServiceRefMetaData with this thread + serviceRefAssociation.set(serviceRef); // Generic javax.xml.ws.Service if (serviceClass == Service.class) @@ -159,9 +156,9 @@ } // Configure the service - configureService((Service)target, usRef); + configureService((Service)target, serviceRef); - if (targetClassName != null && targetClassName.equals(serviceClassName) == false) + if (targetClassName != null && targetClassName.equals(serviceImplClass) == false) { try { @@ -203,16 +200,16 @@ } } - public static UnifiedServiceRef getUnifiedServiceRefAssociation() + public static UnifiedServiceRefMetaData getServiceRefAssociation() { // The ServiceDelegateImpl get the usRef at ctor time - return (UnifiedServiceRef)serviceRefAssociation.get(); + return (UnifiedServiceRefMetaData)serviceRefAssociation.get(); } - private void configureService(Service service, UnifiedServiceRef usRef) + private void configureService(Service service, UnifiedServiceRefMetaData serviceRef) { - String configFile = usRef.getConfigFile(); - String configName = usRef.getConfigName(); + String configFile = serviceRef.getConfigFile(); + String configName = serviceRef.getConfigName(); if (service instanceof ConfigProvider) { if(log.isDebugEnabled()) log.debug("Configure Service: [configName=" + configName + ",configFile=" + configFile + "]"); @@ -223,15 +220,15 @@ } } - private UnifiedServiceRef unmarshallServiceRef(Reference ref) throws ClassNotFoundException, NamingException + private UnifiedServiceRefMetaData unmarshallServiceRef(Reference ref) throws ClassNotFoundException, NamingException { - UnifiedServiceRef sref; - RefAddr refAddr = ref.get(ServiceReferenceable.UNIFIED_SERVICE_REF); + UnifiedServiceRefMetaData sref; + RefAddr refAddr = ref.get(ServiceReferenceable.SERVICE_REF_META_DATA); ByteArrayInputStream bais = new ByteArrayInputStream((byte[])refAddr.getContent()); try { ObjectInputStream ois = new ObjectInputStream(bais); - sref = (UnifiedServiceRef)ois.readObject(); + sref = (UnifiedServiceRefMetaData)ois.readObject(); ois.close(); } catch (IOException e) @@ -240,71 +237,4 @@ } return sref; } - - private URL getWsdlLocationURL(Class userClass, UnifiedServiceRef usRef) - { - UnifiedVirtualFile vfsRoot = usRef.getRootFile(); - String wsdlLocation = usRef.getWsdlLocation(); - - URL wsdlURL = null; - if (wsdlLocation != null) - { - // Try the wsdlLocation as URL - try - { - wsdlURL = new URL(wsdlLocation); - } - catch (MalformedURLException ex) - { - // ignore - } - - // Try the filename as File - if (wsdlURL == null) - { - try - { - File file = new File(wsdlLocation); - if (file.exists()) - wsdlURL = file.toURL(); - } - catch (MalformedURLException e) - { - // ignore - } - } - - // Try the filename as Resource - if (wsdlURL == null) - { - try - { - wsdlURL = vfsRoot.findChild(wsdlLocation).toURL(); - } - catch (Exception ex) - { - // ignore - } - } - - // Try the filename relative to class - if (wsdlURL == null) - { - String packagePath = userClass.getPackage().getName().replace('.', '/'); - String wsdlPath = packagePath + "/" + wsdlLocation; - try - { - wsdlURL = vfsRoot.findChild(wsdlPath).toURL(); - } - catch (Exception ex) - { - // ignore - } - } - - if (wsdlURL == null) - throw new IllegalArgumentException("Cannot get URL for: " + wsdlLocation); - } - return wsdlURL; - } } Modified: branches/jbossws-1.2.0/jbossws-core/src/java/org/jboss/ws/core/jaxws/client/ServiceReferenceable.java =================================================================== --- branches/jbossws-1.2.0/jbossws-core/src/java/org/jboss/ws/core/jaxws/client/ServiceReferenceable.java 2007-03-09 13:53:08 UTC (rev 2569) +++ branches/jbossws-1.2.0/jbossws-core/src/java/org/jboss/ws/core/jaxws/client/ServiceReferenceable.java 2007-03-09 14:11:08 UTC (rev 2570) @@ -34,7 +34,9 @@ import javax.naming.Referenceable; import javax.naming.StringRefAddr; +import org.jboss.ws.metadata.j2ee.serviceref.UnifiedServiceRefMetaData; + /** * A JNDI reference to a javax.xml.ws.Service * @@ -46,19 +48,19 @@ */ public class ServiceReferenceable implements Referenceable { - public static final String UNIFIED_SERVICE_REF = "UNIFIED_SERVICE_REF"; - public static final String SERVICE_CLASS_NAME = "SERVICE_CLASS_NAME"; + public static final String SERVICE_REF_META_DATA = "SERVICE_REF_META_DATA"; + 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 UnifiedServiceRef usRef; + private UnifiedServiceRefMetaData serviceRef; - public ServiceReferenceable(String serviceClassName, String targetClassName, UnifiedServiceRef usRef) + public ServiceReferenceable(String serviceImplClass, String targetClassName, UnifiedServiceRefMetaData serviceRef) { - this.serviceClassName = serviceClassName; + this.serviceImplClass = serviceImplClass; this.targetClassName = targetClassName; - this.usRef = usRef; + this.serviceRef = serviceRef; } /** @@ -71,9 +73,9 @@ { 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(UNIFIED_SERVICE_REF, marshall(usRef))); + myRef.add(new BinaryRefAddr(SERVICE_REF_META_DATA, marshall(serviceRef))); return myRef; } Deleted: branches/jbossws-1.2.0/jbossws-core/src/java/org/jboss/ws/core/jaxws/client/UnifiedServiceRef.java =================================================================== --- branches/jbossws-1.2.0/jbossws-core/src/java/org/jboss/ws/core/jaxws/client/UnifiedServiceRef.java 2007-03-09 13:53:08 UTC (rev 2569) +++ branches/jbossws-1.2.0/jbossws-core/src/java/org/jboss/ws/core/jaxws/client/UnifiedServiceRef.java 2007-03-09 14:11:08 UTC (rev 2570) @@ -1,147 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2005, 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.ws.core.jaxws.client; - -//$Id$ - -import java.io.Serializable; -import java.util.ArrayList; -import java.util.List; - -import javax.xml.namespace.QName; - -import org.jboss.ws.core.UnifiedVirtualFile; - -/** - * Represents a <service-ref> element of the jboss.xml, jboss-web.xml, jboss-client.xml - * - * @author Thomas.Diesler(a)jboss.com - * @since 16-Dec-2006 - */ -public class UnifiedServiceRef implements Serializable -{ - private static final long serialVersionUID = -6242639118713373752L; - - private UnifiedVirtualFile vfsRoot; - private String serviceRefName; - private String serviceClassName; - private QName serviceQName; - private String configName; - private String configFile; - private String handlerChain; - private List<PortInfo> portInfos = new ArrayList<PortInfo>(); - private String wsdlLocation; - - public UnifiedVirtualFile getRootFile() - { - return vfsRoot; - } - - public void setRootFile(UnifiedVirtualFile vfsRoot) - { - this.vfsRoot = vfsRoot; - } - - public String getServiceRefName() - { - return serviceRefName; - } - - public void setServiceRefName(String name) - { - this.serviceRefName = name; - } - - public String getServiceClassName() - { - return serviceClassName; - } - - public void setServiceClassName(String serviceClassName) - { - this.serviceClassName = serviceClassName; - } - - public QName getServiceQName() - { - return serviceQName; - } - - public void setServiceQName(QName serviceQName) - { - this.serviceQName = serviceQName; - } - - public String getConfigFile() - { - return configFile; - } - - public void setConfigFile(String configFile) - { - this.configFile = configFile; - } - - public String getConfigName() - { - return configName; - } - - public void setConfigName(String configName) - { - this.configName = configName; - } - - public String getHandlerChain() - { - return handlerChain; - } - - public void setHandlerChain(String handlerChain) - { - this.handlerChain = handlerChain; - } - - public List<PortInfo> getPortInfos() - { - return portInfos; - } - - public String getWsdlLocation() - { - return wsdlLocation; - } - - public void setWsdlLocation(String wsdlLocation) - { - this.wsdlLocation = wsdlLocation; - } - - public String toString() - { - StringBuffer sb = new StringBuffer(100); - sb.append("["); - sb.append("name=").append(serviceRefName); - sb.append("]"); - return sb.toString(); - } -} Modified: branches/jbossws-1.2.0/jbossws-core/src/java/org/jboss/ws/core/jaxws/spi/ServiceDelegateImpl.java =================================================================== --- branches/jbossws-1.2.0/jbossws-core/src/java/org/jboss/ws/core/jaxws/spi/ServiceDelegateImpl.java 2007-03-09 13:53:08 UTC (rev 2569) +++ branches/jbossws-1.2.0/jbossws-core/src/java/org/jboss/ws/core/jaxws/spi/ServiceDelegateImpl.java 2007-03-09 14:11:08 UTC (rev 2570) @@ -48,16 +48,16 @@ import org.jboss.logging.Logger; import org.jboss.util.NotImplementedException; import org.jboss.ws.core.StubExt; -import org.jboss.ws.core.UnifiedVirtualFile; import org.jboss.ws.core.jaxws.client.ClientImpl; import org.jboss.ws.core.jaxws.client.ClientProxy; import org.jboss.ws.core.jaxws.client.DispatchImpl; -import org.jboss.ws.core.jaxws.client.NameValuePair; -import org.jboss.ws.core.jaxws.client.PortInfo; import org.jboss.ws.core.jaxws.client.ServiceObjectFactory; -import org.jboss.ws.core.jaxws.client.UnifiedServiceRef; import org.jboss.ws.core.jaxws.handler.HandlerResolverImpl; +import org.jboss.ws.integration.UnifiedVirtualFile; import org.jboss.ws.metadata.builder.jaxws.JAXWSClientMetaDataBuilder; +import org.jboss.ws.metadata.j2ee.serviceref.UnifiedPortComponentRefMetaData; +import org.jboss.ws.metadata.j2ee.serviceref.UnifiedServiceRefMetaData; +import org.jboss.ws.metadata.j2ee.serviceref.UnifiedStubPropertyMetaData; import org.jboss.ws.metadata.umdm.ClientEndpointMetaData; import org.jboss.ws.metadata.umdm.EndpointMetaData; import org.jboss.ws.metadata.umdm.ResourceLoaderAdapter; @@ -83,8 +83,8 @@ private static ExecutorService defaultExecutor = Executors.newCachedThreadPool(); // The service meta data that is associated with this JAXWS Service private ServiceMetaData serviceMetaData; - // The UnifiedServiceRef supplied by the ServiceObjectFactory - private UnifiedServiceRef usRef; + // The ServiceRefMetaData supplied by the ServiceObjectFactory + private UnifiedServiceRefMetaData usRef; // The handler resolver private HandlerResolver handlerResolver = new HandlerResolverImpl(); // The executor service @@ -95,11 +95,11 @@ public ServiceDelegateImpl(URL wsdlURL, QName serviceName) { - usRef = ServiceObjectFactory.getUnifiedServiceRefAssociation(); + usRef = ServiceObjectFactory.getServiceRefAssociation(); UnifiedVirtualFile vfsRoot; if(usRef!=null) - vfsRoot = usRef.getRootFile(); + vfsRoot = usRef.getVfsRoot(); else vfsRoot = new ResourceLoaderAdapter(); @@ -205,6 +205,7 @@ { JAXWSClientMetaDataBuilder metaDataBuilder = new JAXWSClientMetaDataBuilder(); metaDataBuilder.rebuildEndpointMetaData(epMetaData, seiClass); + annotatedPorts.add(portName); } return (T)createProxy(seiClass, epMetaData); @@ -350,7 +351,7 @@ String seiName = epMetaData.getServiceEndpointInterfaceName(); QName portName = epMetaData.getPortName(); - if(usRef == null || usRef.getPortInfos().size() == 0) + if(usRef == null || usRef.getPortComponentRefs().size() == 0) { if(log.isDebugEnabled()) log.debug("No port configuration for: " + portName); return; @@ -360,7 +361,7 @@ String configName = usRef.getConfigName(); boolean match = false; - for (PortInfo pi : usRef.getPortInfos()) + for (UnifiedPortComponentRefMetaData pi : usRef.getPortComponentRefs()) { String piSEI = pi.getServiceEndpointInterface(); QName piPort = pi.getPortQName(); @@ -381,10 +382,10 @@ BindingProvider bp = (BindingProvider)stub; Map<String, Object> reqCtx = bp.getRequestContext(); - for (NameValuePair nvp : pi.getStubProperties()) + for (UnifiedStubPropertyMetaData prop : pi.getStubProperties()) { - if(log.isDebugEnabled()) log.debug("Set stub property: " + nvp); - reqCtx.put(nvp.getName(), nvp.getValue()); + log.debug("Set stub property: " + prop); + reqCtx.put(prop.getPropName(), prop.getPropValue()); } break; } Deleted: branches/jbossws-1.2.0/jbossws-core/src/java/org/jboss/ws/core/server/KernelLocator.java =================================================================== --- branches/jbossws-1.2.0/jbossws-core/src/java/org/jboss/ws/core/server/KernelLocator.java 2007-03-09 13:53:08 UTC (rev 2569) +++ branches/jbossws-1.2.0/jbossws-core/src/java/org/jboss/ws/core/server/KernelLocator.java 2007-03-09 14:11:08 UTC (rev 2570) @@ -1,47 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2005, 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.ws.core.server; - -//$Id: WebServiceDeployer.java 312 2006-05-11 10:49:22Z thomas.diesler(a)jboss.com $ - -import org.jboss.kernel.Kernel; - -/** - * Locate the single instance of the kernel - * - * @author Thomas.Diesler(a)jboss.org - * @since 12-May-2006 - */ -public class KernelLocator -{ - private static Kernel kernel; - - public static Kernel getKernel() - { - return KernelLocator.kernel; - } - - public void setKernel(Kernel kernel) - { - KernelLocator.kernel = kernel; - } -} Modified: branches/jbossws-1.2.0/jbossws-core/src/java/org/jboss/ws/core/server/ServerConfigFactory.java =================================================================== --- branches/jbossws-1.2.0/jbossws-core/src/java/org/jboss/ws/core/server/ServerConfigFactory.java 2007-03-09 13:53:08 UTC (rev 2569) +++ branches/jbossws-1.2.0/jbossws-core/src/java/org/jboss/ws/core/server/ServerConfigFactory.java 2007-03-09 14:11:08 UTC (rev 2570) @@ -23,6 +23,7 @@ import org.jboss.kernel.spi.registry.KernelRegistry; import org.jboss.logging.Logger; +import org.jboss.ws.integration.KernelLocator; // $Id: ServiceEndpointManagerFactory.java 293 2006-05-08 16:31:50Z thomas.diesler(a)jboss.com $ Modified: branches/jbossws-1.2.0/jbossws-core/src/java/org/jboss/ws/core/server/ServiceEndpointManagerFactory.java =================================================================== --- branches/jbossws-1.2.0/jbossws-core/src/java/org/jboss/ws/core/server/ServiceEndpointManagerFactory.java 2007-03-09 13:53:08 UTC (rev 2569) +++ branches/jbossws-1.2.0/jbossws-core/src/java/org/jboss/ws/core/server/ServiceEndpointManagerFactory.java 2007-03-09 14:11:08 UTC (rev 2570) @@ -23,6 +23,7 @@ import org.jboss.kernel.spi.registry.KernelRegistry; import org.jboss.kernel.spi.registry.KernelRegistryEntry; +import org.jboss.ws.integration.KernelLocator; // $Id$ Modified: branches/jbossws-1.2.0/jbossws-core/src/java/org/jboss/ws/core/server/UnifiedDeploymentInfo.java =================================================================== --- branches/jbossws-1.2.0/jbossws-core/src/java/org/jboss/ws/core/server/UnifiedDeploymentInfo.java 2007-03-09 13:53:08 UTC (rev 2569) +++ branches/jbossws-1.2.0/jbossws-core/src/java/org/jboss/ws/core/server/UnifiedDeploymentInfo.java 2007-03-09 14:11:08 UTC (rev 2570) @@ -31,7 +31,7 @@ import javax.management.ObjectName; -import org.jboss.ws.core.UnifiedVirtualFile; +import org.jboss.ws.integration.UnifiedVirtualFile; /** * The container independent deployment info. Modified: branches/jbossws-1.2.0/jbossws-core/src/java/org/jboss/ws/extensions/eventing/mgmt/SubscriptionManagerFactory.java =================================================================== --- branches/jbossws-1.2.0/jbossws-core/src/java/org/jboss/ws/extensions/eventing/mgmt/SubscriptionManagerFactory.java 2007-03-09 13:53:08 UTC (rev 2569) +++ branches/jbossws-1.2.0/jbossws-core/src/java/org/jboss/ws/extensions/eventing/mgmt/SubscriptionManagerFactory.java 2007-03-09 14:11:08 UTC (rev 2570) @@ -2,7 +2,7 @@ import org.jboss.kernel.spi.registry.KernelRegistry; import org.jboss.kernel.spi.registry.KernelRegistryEntry; -import org.jboss.ws.core.server.KernelLocator; +import org.jboss.ws.integration.KernelLocator; /** * @author Heiko Braun, <heiko(a)openj.net&gt; Modified: branches/jbossws-1.2.0/jbossws-core/src/java/org/jboss/ws/extensions/security/jaxrpc/WSSecurityHandler.java =================================================================== --- branches/jbossws-1.2.0/jbossws-core/src/java/org/jboss/ws/extensions/security/jaxrpc/WSSecurityHandler.java 2007-03-09 13:53:08 UTC (rev 2569) +++ branches/jbossws-1.2.0/jbossws-core/src/java/org/jboss/ws/extensions/security/jaxrpc/WSSecurityHandler.java 2007-03-09 14:11:08 UTC (rev 2570) @@ -33,8 +33,8 @@ import org.jboss.logging.Logger; import org.jboss.ws.WSException; import org.jboss.ws.core.CommonMessageContext; -import org.jboss.ws.core.UnifiedVirtualFile; import org.jboss.ws.extensions.security.WSSecurityDispatcher; +import org.jboss.ws.integration.UnifiedVirtualFile; import org.jboss.ws.metadata.umdm.EndpointMetaData; import org.jboss.ws.metadata.umdm.ServiceMetaData; import org.jboss.ws.metadata.wsse.WSSecurityConfigFactory; Modified: branches/jbossws-1.2.0/jbossws-core/src/java/org/jboss/ws/extensions/security/jaxws/WSSecurityHandler.java =================================================================== --- branches/jbossws-1.2.0/jbossws-core/src/java/org/jboss/ws/extensions/security/jaxws/WSSecurityHandler.java 2007-03-09 13:53:08 UTC (rev 2569) +++ branches/jbossws-1.2.0/jbossws-core/src/java/org/jboss/ws/extensions/security/jaxws/WSSecurityHandler.java 2007-03-09 14:11:08 UTC (rev 2570) @@ -31,9 +31,9 @@ import org.jboss.logging.Logger; import org.jboss.ws.WSException; import org.jboss.ws.core.CommonMessageContext; -import org.jboss.ws.core.UnifiedVirtualFile; import org.jboss.ws.core.jaxws.handler.GenericSOAPHandler; import org.jboss.ws.extensions.security.WSSecurityDispatcher; +import org.jboss.ws.integration.UnifiedVirtualFile; import org.jboss.ws.metadata.umdm.EndpointMetaData; import org.jboss.ws.metadata.umdm.ServiceMetaData; import org.jboss.ws.metadata.wsse.WSSecurityConfigFactory; Copied: branches/jbossws-1.2.0/jbossws-core/src/java/org/jboss/ws/integration/KernelLocator.java (from rev 2566, branches/jbossws-1.2.0/jbossws-core/src/java/org/jboss/ws/core/server/KernelLocator.java) =================================================================== --- branches/jbossws-1.2.0/jbossws-core/src/java/org/jboss/ws/integration/KernelLocator.java (rev 0) +++ branches/jbossws-1.2.0/jbossws-core/src/java/org/jboss/ws/integration/KernelLocator.java 2007-03-09 14:11:08 UTC (rev 2570) @@ -0,0 +1,47 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2005, 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.ws.integration; + +//$Id: WebServiceDeployer.java 312 2006-05-11 10:49:22Z thomas.diesler(a)jboss.com $ + +import org.jboss.kernel.Kernel; + +/** + * Locate the single instance of the kernel + * + * @author Thomas.Diesler(a)jboss.org + * @since 12-May-2006 + */ +public class KernelLocator +{ + private static Kernel kernel; + + public static Kernel getKernel() + { + return KernelLocator.kernel; + } + + public void setKernel(Kernel kernel) + { + KernelLocator.kernel = kernel; + } +} Copied: branches/jbossws-1.2.0/jbossws-core/src/java/org/jboss/ws/integration/UnifiedVirtualFile.java (from rev 2564, branches/jbossws-1.2.0/jbossws-core/src/java/org/jboss/ws/core/UnifiedVirtualFile.java) =================================================================== --- branches/jbossws-1.2.0/jbossws-core/src/java/org/jboss/ws/integration/UnifiedVirtualFile.java (rev 0) +++ branches/jbossws-1.2.0/jbossws-core/src/java/org/jboss/ws/integration/UnifiedVirtualFile.java 2007-03-09 14:11:08 UTC (rev 2570) @@ -0,0 +1,42 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2005, 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.ws.integration; + +// $Id$ + +import java.io.IOException; +import java.io.Serializable; +import java.net.URL; + +/** + * An adaptor to a VirtualFile from jboss-vfs.jar + * jboss-vfs cannot be used in jboss-4.x because of its dependeny on jboss-common-core.jar + * + * @author Thomas.Diesler(a)jboss.org + * @since 05-May-2006 + */ +public interface UnifiedVirtualFile extends Serializable +{ + UnifiedVirtualFile findChild(String child) throws IOException; + + URL toURL(); +} Modified: branches/jbossws-1.2.0/jbossws-core/src/java/org/jboss/ws/metadata/builder/jaxrpc/JAXRPCClientMetaDataBuilder.java =================================================================== --- branches/jbossws-1.2.0/jbossws-core/src/java/org/jboss/ws/metadata/builder/jaxrpc/JAXRPCClientMetaDataBuilder.java 2007-03-09 13:53:08 UTC (rev 2569) +++ branches/jbossws-1.2.0/jbossws-core/src/java/org/jboss/ws/metadata/builder/jaxrpc/JAXRPCClientMetaDataBuilder.java 2007-03-09 14:11:08 UTC (rev 2570) @@ -32,9 +32,9 @@ import org.jboss.logging.Logger; import org.jboss.ws.Constants; import org.jboss.ws.WSException; -import org.jboss.ws.core.UnifiedVirtualFile; -import org.jboss.ws.metadata.j2ee.UnifiedHandlerMetaData; -import org.jboss.ws.metadata.j2ee.UnifiedServiceRefMetaData; +import org.jboss.ws.integration.UnifiedVirtualFile; +import org.jboss.ws.metadata.j2ee.serviceref.UnifiedHandlerMetaData; +import org.jboss.ws.metadata.j2ee.serviceref.UnifiedServiceRefMetaData; import org.jboss.ws.metadata.jaxrpcmapping.JavaWsdlMapping; import org.jboss.ws.metadata.jaxrpcmapping.JavaWsdlMappingFactory; import org.jboss.ws.metadata.jaxrpcmapping.ServiceEndpointInterfaceMapping; Modified: branches/jbossws-1.2.0/jbossws-core/src/java/org/jboss/ws/metadata/builder/jaxrpc/JAXRPCDeployment.java =================================================================== --- branches/jbossws-1.2.0/jbossws-core/src/java/org/jboss/ws/metadata/builder/jaxrpc/JAXRPCDeployment.java 2007-03-09 13:53:08 UTC (rev 2569) +++ branches/jbossws-1.2.0/jbossws-core/src/java/org/jboss/ws/metadata/builder/jaxrpc/JAXRPCDeployment.java 2007-03-09 14:11:08 UTC (rev 2570) @@ -25,8 +25,8 @@ import java.net.URL; import org.jboss.ws.WSException; -import org.jboss.ws.core.UnifiedVirtualFile; import org.jboss.ws.core.server.UnifiedDeploymentInfo; +import org.jboss.ws.integration.UnifiedVirtualFile; import org.jboss.ws.metadata.webservices.WebservicesFactory; import org.jboss.ws.metadata.webservices.WebservicesMetaData; import org.jboss.xb.binding.ObjectModelFactory; Modified: branches/jbossws-1.2.0/jbossws-core/src/java/org/jboss/ws/metadata/builder/jaxrpc/JAXRPCServerMetaDataBuilder.java =================================================================== --- branches/jbossws-1.2.0/jbossws-core/src/java/org/jboss/ws/metadata/builder/jaxrpc/JAXRPCServerMetaDataBuilder.java 2007-03-09 13:53:08 UTC (rev 2569) +++ branches/jbossws-1.2.0/jbossws-core/src/java/org/jboss/ws/metadata/builder/jaxrpc/JAXRPCServerMetaDataBuilder.java 2007-03-09 14:11:08 UTC (rev 2570) @@ -32,8 +32,8 @@ import org.jboss.ws.metadata.j2ee.UnifiedApplicationMetaData; import org.jboss.ws.metadata.j2ee.UnifiedBeanMetaData; import org.jboss.ws.metadata.j2ee.UnifiedEjbPortComponentMetaData; -import org.jboss.ws.metadata.j2ee.UnifiedHandlerMetaData; import org.jboss.ws.metadata.j2ee.UnifiedWebMetaData; +import org.jboss.ws.metadata.j2ee.serviceref.UnifiedHandlerMetaData; import org.jboss.ws.metadata.jaxrpcmapping.JavaWsdlMapping; import org.jboss.ws.metadata.jaxrpcmapping.ServiceEndpointInterfaceMapping; import org.jboss.ws.metadata.umdm.ServerEndpointMetaData; @@ -172,6 +172,11 @@ String transportGuarantee = bpcMetaData.getTransportGuarantee(); sepMetaData.setTransportGuarantee(transportGuarantee); } + if (bpcMetaData.getSecureWSDLAccess() != null) + { + Boolean secureWSDLAccess = bpcMetaData.getSecureWSDLAccess(); + sepMetaData.setSecureWSDLAccess(secureWSDLAccess); + } sepMetaData.setURLPattern(bpcMetaData.getURLPattern()); } Modified: branches/jbossws-1.2.0/jbossws-core/src/java/org/jboss/ws/metadata/builder/jaxws/JAXWSClientMetaDataBuilder.java =================================================================== --- branches/jbossws-1.2.0/jbossws-core/src/java/org/jboss/ws/metadata/builder/jaxws/JAXWSClientMetaDataBuilder.java 2007-03-09 13:53:08 UTC (rev 2569) +++ branches/jbossws-1.2.0/jbossws-core/src/java/org/jboss/ws/metadata/builder/jaxws/JAXWSClientMetaDataBuilder.java 2007-03-09 14:11:08 UTC (rev 2570) @@ -32,8 +32,8 @@ import org.jboss.ws.Constants; import org.jboss.ws.WSException; -import org.jboss.ws.core.UnifiedVirtualFile; import org.jboss.ws.core.jaxrpc.Style; +import org.jboss.ws.integration.UnifiedVirtualFile; import org.jboss.ws.metadata.umdm.ClientEndpointMetaData; import org.jboss.ws.metadata.umdm.EndpointMetaData; import org.jboss.ws.metadata.umdm.OperationMetaData; Modified: branches/jbossws-1.2.0/jbossws-core/src/java/org/jboss/ws/metadata/builder/jaxws/JAXWSMetaDataBuilder.java =================================================================== --- branches/jbossws-1.2.0/jbossws-core/src/java/org/jboss/ws/metadata/builder/jaxws/JAXWSMetaDataBuilder.java 2007-03-09 13:53:08 UTC (rev 2569) +++ branches/jbossws-1.2.0/jbossws-core/src/java/org/jboss/ws/metadata/builder/jaxws/JAXWSMetaDataBuilder.java 2007-03-09 14:11:08 UTC (rev 2570) @@ -69,10 +69,10 @@ import org.jboss.ws.extensions.addressing.metadata.AddressingOpMetaExt; import org.jboss.ws.metadata.acessor.JAXBAccessor; import org.jboss.ws.metadata.builder.MetaDataBuilder; -import org.jboss.ws.metadata.j2ee.UnifiedHandlerMetaData; -import org.jboss.ws.metadata.jsr181.HandlerChainFactory; -import org.jboss.ws.metadata.jsr181.HandlerChainMetaData; -import org.jboss.ws.metadata.jsr181.HandlerChainsMetaData; +import org.jboss.ws.metadata.j2ee.serviceref.HandlerChainsObjectFactory; +import org.jboss.ws.metadata.j2ee.serviceref.UnifiedHandlerChainMetaData; +import org.jboss.ws.metadata.j2ee.serviceref.UnifiedHandlerChainsMetaData; +import org.jboss.ws.metadata.j2ee.serviceref.UnifiedHandlerMetaData; import org.jboss.ws.metadata.umdm.EndpointMetaData; import org.jboss.ws.metadata.umdm.FaultMetaData; import org.jboss.ws.metadata.umdm.OperationMetaData; @@ -209,7 +209,7 @@ try { - HandlerChainsMetaData handlerChainsMetaData = null; + UnifiedHandlerChainsMetaData handlerChainsMetaData = null; InputStream is = fileURL.openStream(); try { @@ -217,8 +217,8 @@ unmarshaller.setValidation(true); unmarshaller.setSchemaValidation(true); unmarshaller.setEntityResolver(new JBossWSEntityResolver()); - ObjectModelFactory factory = new HandlerChainFactory(); - handlerChainsMetaData = (HandlerChainsMetaData)unmarshaller.unmarshal(is, factory, null); + ObjectModelFactory factory = new HandlerChainsObjectFactory(); + handlerChainsMetaData = (UnifiedHandlerChainsMetaData)unmarshaller.unmarshal(is, factory, null); } finally { @@ -226,7 +226,7 @@ } // Setup the endpoint handlers - for (HandlerChainMetaData handlerChainMetaData : handlerChainsMetaData.getHandlerChains()) + for (UnifiedHandlerChainMetaData handlerChainMetaData : handlerChainsMetaData.getHandlerChains()) { for (UnifiedHandlerMetaData uhmd : handlerChainMetaData.getHandlers()) { Modified: branches/jbossws-1.2.0/jbossws-core/src/java/org/jboss/ws/metadata/config/JBossWSConfigFactory.java =================================================================== --- branches/jbossws-1.2.0/jbossws-core/src/java/org/jboss/ws/metadata/config/JBossWSConfigFactory.java 2007-03-09 13:53:08 UTC (rev 2569) +++ branches/jbossws-1.2.0/jbossws-core/src/java/org/jboss/ws/metadata/config/JBossWSConfigFactory.java 2007-03-09 14:11:08 UTC (rev 2570) @@ -28,8 +28,8 @@ import org.jboss.logging.Logger; import org.jboss.ws.WSException; -import org.jboss.ws.core.UnifiedVirtualFile; import org.jboss.ws.core.utils.DOMUtils; +import org.jboss.ws.integration.UnifiedVirtualFile; import org.jboss.ws.metadata.config.binding.OMFactoryJAXRPC; import org.jboss.ws.metadata.config.binding.OMFactoryJAXWS; import org.jboss.ws.metadata.config.jaxrpc.ConfigRootJAXRPC; Modified: branches/jbossws-1.2.0/jbossws-core/src/java/org/jboss/ws/metadata/config/binding/OMFactoryJAXRPC.java =================================================================== --- branches/jbossws-1.2.0/jbossws-core/src/java/org/jboss/ws/metadata/config/binding/OMFactoryJAXRPC.java 2007-03-09 13:53:08 UTC (rev 2569) +++ branches/jbossws-1.2.0/jbossws-core/src/java/org/jboss/ws/metadata/config/binding/OMFactoryJAXRPC.java 2007-03-09 14:11:08 UTC (rev 2570) @@ -31,9 +31,9 @@ import org.jboss.ws.metadata.config.jaxrpc.CommonConfigJAXRPC; import org.jboss.ws.metadata.config.jaxrpc.ConfigRootJAXRPC; import org.jboss.ws.metadata.config.jaxrpc.EndpointConfigJAXRPC; -import org.jboss.ws.metadata.j2ee.UnifiedHandlerMetaData; -import org.jboss.ws.metadata.jsr181.HandlerChainMetaData; -import org.jboss.ws.metadata.umdm.HandlerMetaData.HandlerInitParam; +import org.jboss.ws.metadata.j2ee.serviceref.UnifiedHandlerChainMetaData; +import org.jboss.ws.metadata.j2ee.serviceref.UnifiedHandlerMetaData; +import org.jboss.ws.metadata.j2ee.serviceref.UnifiedInitParamMetaData; import org.jboss.xb.binding.ObjectModelFactory; import org.jboss.xb.binding.UnmarshallingContext; import org.xml.sax.Attributes; @@ -115,13 +115,13 @@ if ("pre-handler-chain".equals(localName)) { - HandlerChainMetaData preHandlerChain = new HandlerChainMetaData(null); + UnifiedHandlerChainMetaData preHandlerChain = new UnifiedHandlerChainMetaData(null); commonConfig.setPreHandlerChain(preHandlerChain); return preHandlerChain; } if ("post-handler-chain".equals(localName)) { - HandlerChainMetaData postHandlerChain = new HandlerChainMetaData(null); + UnifiedHandlerChainMetaData postHandlerChain = new UnifiedHandlerChainMetaData(null); commonConfig.setPostHandlerChain(postHandlerChain); return postHandlerChain; } @@ -131,13 +131,13 @@ /** * Called when parsing of a new element started. */ - public Object newChild(HandlerChainMetaData handlerChainMetaData, UnmarshallingContext navigator, String namespaceURI, String localName, Attributes attrs) + public Object newChild(UnifiedHandlerChainMetaData UnifiedHandlerChainMetaData, UnmarshallingContext navigator, String namespaceURI, String localName, Attributes attrs) { log.trace("WSHandlerChainConfig newChild: " + localName); if ("handler".equals(localName)) { - UnifiedHandlerMetaData handler = new UnifiedHandlerMetaData(handlerChainMetaData); - List<UnifiedHandlerMetaData> handlers = handlerChainMetaData.getHandlers(); + UnifiedHandlerMetaData handler = new UnifiedHandlerMetaData(UnifiedHandlerChainMetaData); + List<UnifiedHandlerMetaData> handlers = UnifiedHandlerChainMetaData.getHandlers(); handlers.add(handler); return handler; } @@ -167,7 +167,7 @@ /** * Called when a new simple child element with text value was read from the XML content. */ - public void setValue(HandlerInitParam param, UnmarshallingContext navigator, String namespaceURI, String localName, String value) + public void setValue(UnifiedInitParamMetaData param, UnmarshallingContext navigator, String namespaceURI, String localName, String value) { if (log.isTraceEnabled()) log.trace("UnifiedInitParamMetaData setValue: nuri=" + namespaceURI + " localName=" + localName + " value=" + value); Modified: branches/jbossws-1.2.0/jbossws-core/src/java/org/jboss/ws/metadata/config/binding/OMFactoryJAXWS.java =================================================================== --- branches/jbossws-1.2.0/jbossws-core/src/java/org/jboss/ws/metadata/config/binding/OMFactoryJAXWS.java 2007-03-09 13:53:08 UTC (rev 2569) +++ branches/jbossws-1.2.0/jbossws-core/src/java/org/jboss/ws/metadata/config/binding/OMFactoryJAXWS.java 2007-03-09 14:11:08 UTC (rev 2570) @@ -30,8 +30,8 @@ import org.jboss.ws.metadata.config.jaxws.ConfigRootJAXWS; import org.jboss.ws.metadata.config.jaxws.EndpointConfigJAXWS; import org.jboss.ws.metadata.config.jaxws.HandlerChainsConfigJAXWS; -import org.jboss.ws.metadata.jsr181.HandlerChainFactory; -import org.jboss.ws.metadata.jsr181.HandlerChainMetaData; +import org.jboss.ws.metadata.j2ee.serviceref.HandlerChainsObjectFactory; +import org.jboss.ws.metadata.j2ee.serviceref.UnifiedHandlerChainMetaData; import org.jboss.xb.binding.UnmarshallingContext; import org.xml.sax.Attributes; @@ -42,7 +42,7 @@ * @author Heiko.Braun(a)jboss.org * @since 18-Dec-2005 */ -public class OMFactoryJAXWS extends HandlerChainFactory +public class OMFactoryJAXWS extends HandlerChainsObjectFactory { // provide logging private final Logger log = Logger.getLogger(OMFactoryJAXWS.class); @@ -135,7 +135,7 @@ if ("handler-chain".equals(localName)) { - HandlerChainMetaData handlerChain = new HandlerChainMetaData(null); + UnifiedHandlerChainMetaData handlerChain = new UnifiedHandlerChainMetaData(null); handlerChains.getHandlerChains().add(handlerChain); return handlerChain; } Modified: branches/jbossws-1.2.0/jbossws-core/src/java/org/jboss/ws/metadata/config/jaxrpc/CommonConfigJAXRPC.java =================================================================== --- branches/jbossws-1.2.0/jbossws-core/src/java/org/jboss/ws/metadata/config/jaxrpc/CommonConfigJAXRPC.java 2007-03-09 13:53:08 UTC (rev 2569) +++ branches/jbossws-1.2.0/jbossws-core/src/java/org/jboss/ws/metadata/config/jaxrpc/CommonConfigJAXRPC.java 2007-03-09 14:11:08 UTC (rev 2570) @@ -25,8 +25,8 @@ import java.util.List; import org.jboss.ws.metadata.config.CommonConfig; -import org.jboss.ws.metadata.j2ee.UnifiedHandlerMetaData; -import org.jboss.ws.metadata.jsr181.HandlerChainMetaData; +import org.jboss.ws.metadata.j2ee.serviceref.UnifiedHandlerChainMetaData; +import org.jboss.ws.metadata.j2ee.serviceref.UnifiedHandlerMetaData; import org.jboss.ws.metadata.umdm.EndpointMetaData; import org.jboss.ws.metadata.umdm.HandlerMetaData; import org.jboss.ws.metadata.umdm.HandlerMetaData.HandlerType; @@ -42,25 +42,25 @@ */ public abstract class CommonConfigJAXRPC extends CommonConfig { - private HandlerChainMetaData preHandlerChain; - private HandlerChainMetaData postHandlerChain; + private UnifiedHandlerChainMetaData preHandlerChain; + private UnifiedHandlerChainMetaData postHandlerChain; - public HandlerChainMetaData getPostHandlerChain() + public UnifiedHandlerChainMetaData getPostHandlerChain() { return postHandlerChain; } - public void setPostHandlerChain(HandlerChainMetaData postHandlerChain) + public void setPostHandlerChain(UnifiedHandlerChainMetaData postHandlerChain) { this.postHandlerChain = postHandlerChain; } - public HandlerChainMetaData getPreHandlerChain() + public UnifiedHandlerChainMetaData getPreHandlerChain() { return preHandlerChain; } - public void setPreHandlerChain(HandlerChainMetaData preHandlerChain) + public void setPreHandlerChain(UnifiedHandlerChainMetaData preHandlerChain) { this.preHandlerChain = preHandlerChain; } @@ -70,7 +70,7 @@ { List<HandlerMetaData> handlers = new ArrayList<HandlerMetaData>(); - HandlerChainMetaData handlerChain; + UnifiedHandlerChainMetaData handlerChain; if (type == HandlerType.PRE) handlerChain = getPreHandlerChain(); else if (type == HandlerType.POST) Modified: branches/jbossws-1.2.0/jbossws-core/src/java/org/jboss/ws/metadata/config/jaxws/CommonConfigJAXWS.java =================================================================== --- branches/jbossws-1.2.0/jbossws-core/src/java/org/jboss/ws/metadata/config/jaxws/CommonConfigJAXWS.java 2007-03-09 13:53:08 UTC (rev 2569) +++ branches/jbossws-1.2.0/jbossws-core/src/java/org/jboss/ws/metadata/config/jaxws/CommonConfigJAXWS.java 2007-03-09 14:11:08 UTC (rev 2570) @@ -25,8 +25,8 @@ import java.util.List; import org.jboss.ws.metadata.config.CommonConfig; -import org.jboss.ws.metadata.j2ee.UnifiedHandlerMetaData; -import org.jboss.ws.metadata.jsr181.HandlerChainMetaData; +import org.jboss.ws.metadata.j2ee.serviceref.UnifiedHandlerChainMetaData; +import org.jboss.ws.metadata.j2ee.serviceref.UnifiedHandlerMetaData; import org.jboss.ws.metadata.umdm.EndpointMetaData; import org.jboss.ws.metadata.umdm.HandlerMetaData; import org.jboss.ws.metadata.umdm.HandlerMetaData.HandlerType; @@ -77,7 +77,7 @@ if (handlerChains != null) { - for (HandlerChainMetaData handlerChainMetaData : handlerChains.getHandlerChains()) + for (UnifiedHandlerChainMetaData handlerChainMetaData : handlerChains.getHandlerChains()) { for (UnifiedHandlerMetaData uhmd : handlerChainMetaData.getHandlers()) { Modified: branches/jbossws-1.2.0/jbossws-core/src/java/org/jboss/ws/metadata/config/jaxws/HandlerChainsConfigJAXWS.java =================================================================== --- branches/jbossws-1.2.0/jbossws-core/src/java/org/jboss/ws/metadata/config/jaxws/HandlerChainsConfigJAXWS.java 2007-03-09 13:53:08 UTC (rev 2569) +++ branches/jbossws-1.2.0/jbossws-core/src/java/org/jboss/ws/metadata/config/jaxws/HandlerChainsConfigJAXWS.java 2007-03-09 14:11:08 UTC (rev 2570) @@ -24,7 +24,7 @@ import java.util.ArrayList; import java.util.List; -import org.jboss.ws.metadata.jsr181.HandlerChainMetaData; +import org.jboss.ws.metadata.j2ee.serviceref.UnifiedHandlerChainMetaData; /** @@ -35,13 +35,13 @@ */ public class HandlerChainsConfigJAXWS { - private List<HandlerChainMetaData> chains = new ArrayList<HandlerChainMetaData>(); + private List<UnifiedHandlerChainMetaData> chains = new ArrayList<UnifiedHandlerChainMetaData>(); public HandlerChainsConfigJAXWS() { } - public List<HandlerChainMetaData> getHandlerChains() + public List<UnifiedHandlerChainMetaData> getHandlerChains() { return chains; } Modified: branches/jbossws-1.2.0/jbossws-core/src/java/org/jboss/ws/metadata/j2ee/UnifiedEjbPortComponentMetaData.java =================================================================== --- branches/jbossws-1.2.0/jbossws-core/src/java/org/jboss/ws/metadata/j2ee/UnifiedEjbPortComponentMetaData.java 2007-03-09 13:53:08 UTC (rev 2569) +++ branches/jbossws-1.2.0/jbossws-core/src/java/org/jboss/ws/metadata/j2ee/UnifiedEjbPortComponentMetaData.java 2007-03-09 14:11:08 UTC (rev 2570) @@ -37,6 +37,7 @@ private String portComponentURI; private String authMethod; private String transportGuarantee; + private Boolean secureWSDLAccess; public String getPortComponentName() { @@ -87,4 +88,14 @@ { this.transportGuarantee = transportGuarantee; } + + public Boolean getSecureWSDLAccess() + { + return secureWSDLAccess; + } + + public void setSecureWSDLAccess(Boolean secureWSDLAccess) + { + this.secureWSDLAccess = secureWSDLAccess; + } } Deleted: branches/jbossws-1.2.0/jbossws-core/src/java/org/jboss/ws/metadata/j2ee/UnifiedHandlerMetaData.java =================================================================== --- branches/jbossws-1.2.0/jbossws-core/src/java/org/jboss/ws/metadata/j2ee/UnifiedHandlerMetaData.java 2007-03-09 13:53:08 UTC (rev 2569) +++ branches/jbossws-1.2.0/jbossws-core/src/java/org/jboss/ws/metadata/j2ee/UnifiedHandlerMetaData.java 2007-03-09 14:11:08 UTC (rev 2570) @@ -1,183 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2005, 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.ws.metadata.j2ee; - -//$Id$ - -import java.io.Serializable; -import java.util.ArrayList; -import java.util.HashSet; -import java.util.List; -import java.util.Set; - -import javax.xml.namespace.QName; - -import org.jboss.ws.metadata.jsr181.HandlerChainMetaData; -import org.jboss.ws.metadata.umdm.EndpointMetaData; -import org.jboss.ws.metadata.umdm.HandlerMetaDataJAXRPC; -import org.jboss.ws.metadata.umdm.HandlerMetaDataJAXWS; -import org.jboss.ws.metadata.umdm.HandlerMetaData.HandlerInitParam; -import org.jboss.ws.metadata.umdm.HandlerMetaData.HandlerType; - -/** - * The container independent metdata data for a handler element - * - * @author Thomas.Diesler(a)jboss.org - * @since 05-May-2006 - */ -public class UnifiedHandlerMetaData implements Serializable -{ - private static final long serialVersionUID = -3019416564080333900L; - - private HandlerChainMetaData chainConfig; - - // The required <handler-name> element - private String handlerName; - // The required <handler-class> element - private String handlerClass; - // The optional <init-param> elements - private ArrayList<HandlerInitParam> initParams = new ArrayList<HandlerInitParam>(); - // The optional <soap-header> elements - private Set<QName> soapHeaders = new HashSet<QName>(); - // The optional <soap-role> elements - private Set<String> soapRoles = new HashSet<String>(); - // The optional <port-name> elements - private Set<String> portNames = new HashSet<String>(); - - public UnifiedHandlerMetaData(HandlerChainMetaData handlerChainMetaData) - { - this.chainConfig = handlerChainMetaData; - } - - public void setHandlerName(String value) - { - this.handlerName = value; - } - - public String getHandlerName() - { - return handlerName; - } - - public void setHandlerClass(String handlerClass) - { - this.handlerClass = handlerClass; - } - - public String getHandlerClass() - { - return handlerClass; - } - - public void addInitParam(HandlerInitParam param) - { - initParams.add(param); - } - - public List<HandlerInitParam> getInitParams() - { - return initParams; - } - - public void addSoapRole(String value) - { - soapRoles.add(value); - } - - public Set<String> getSoapRoles() - { - return soapRoles; - } - - public void addSoapHeader(QName qName) - { - soapHeaders.add(qName); - } - - public Set<QName> getSoapHeaders() - { - return soapHeaders; - } - - public String getProtocolBindings() - { - return (chainConfig != null ? chainConfig.getProtocolBindings() : null); - } - - public QName getServiceNamePattern() - { - return (chainConfig != null ? chainConfig.getServiceNamePattern() : null); - } - - public QName getPortNamePattern() - { - return (chainConfig != null ? chainConfig.getPortNamePattern() : null); - } - - public void addPortName(String portName) - { - portNames.add(portName); - } - - public Set<String> getPortNames() - { - return portNames; - } - - public HandlerMetaDataJAXRPC getHandlerMetaDataJAXRPC (EndpointMetaData epMetaData, HandlerType type) - { - HandlerMetaDataJAXRPC hmd = new HandlerMetaDataJAXRPC(epMetaData, type); - hmd.setHandlerName(getHandlerName()); - hmd.setHandlerClassName(getHandlerClass()); - hmd.seiInitParams(getInitParams()); - hmd.setSoapHeaders(getSoapHeaders()); - hmd.setSoapRoles(getSoapRoles()); - hmd.setPortNames(getPortNames()); - return hmd; - } - - public HandlerMetaDataJAXWS getHandlerMetaDataJAXWS (EndpointMetaData epMetaData, HandlerType type) - { - HandlerMetaDataJAXWS hmd = new HandlerMetaDataJAXWS(epMetaData, type); - hmd.setHandlerName(getHandlerName()); - hmd.setHandlerClassName(getHandlerClass()); - hmd.seiInitParams(getInitParams()); - hmd.setProtocolBindings(getProtocolBindings()); - hmd.setServiceNamePattern(getServiceNamePattern()); - hmd.setPortNamePattern(getPortNamePattern()); - return hmd; - } - - public String toString() - { - StringBuffer buffer = new StringBuffer("\nUnifiedHandlerMetaData:"); - buffer.append("\n name=" + getHandlerName()); - buffer.append("\n class=" + getHandlerClass()); - buffer.append("\n params=" + getInitParams()); - buffer.append("\n headers=" + getSoapHeaders()); - buffer.append("\n roles=" + getSoapRoles()); - buffer.append("\n protocols=" + getProtocolBindings()); - buffer.append("\n services=" + getServiceNamePattern()); - buffer.append("\n ports=" + (getPortNamePattern() != null ? getPortNamePattern() : portNames)); - return buffer.toString(); - } -} Deleted: branches/jbossws-1.2.0/jbossws-core/src/java/org/jboss/ws/metadata/j2ee/UnifiedPortComponentRefMetaData.java =================================================================== --- branches/jbossws-1.2.0/jbossws-core/src/java/org/jboss/ws/metadata/j2ee/UnifiedPortComponentRefMetaData.java 2007-03-09 13:53:08 UTC (rev 2569) +++ branches/jbossws-1.2.0/jbossws-core/src/java/org/jboss/ws/metadata/j2ee/UnifiedPortComponentRefMetaData.java 2007-03-09 14:11:08 UTC (rev 2570) @@ -1,76 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2005, 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.ws.metadata.j2ee; - -import java.io.Serializable; -import java.util.Properties; - -//$Id$ - -/** - * The container independent metdata data from handler init params - * - * @author Thomas.Diesler(a)jboss.org - * @since 05-May-2006 - */ -public class UnifiedPortComponentRefMetaData implements Serializable -{ - private static final long serialVersionUID = -7030007637678646740L; - - // The required <service-endpoint-interface> element - private String serviceEndpointInterface; - // The optional <port-component-link> element - private String portComponentLink; - // Arbitrary proxy properties given by <call-property> - private Properties callProperties; - - public String getPortComponentLink() - { - return portComponentLink; - } - - public void setPortComponentLink(String portComponentLink) - { - this.portComponentLink = portComponentLink; - } - - public String getServiceEndpointInterface() - { - return serviceEndpointInterface; - } - - public void setServiceEndpointInterface(String serviceEndpointInterface) - { - this.serviceEndpointInterface = serviceEndpointInterface; - } - - public Properties getCallProperties() - { - return callProperties; - } - - public void setCallProperties(Properties callProperties) - { - this.callProperties = callProperties; - } - -} Deleted: branches/jbossws-1.2.0/jbossws-core/src/java/org/jboss/ws/metadata/j2ee/UnifiedServiceRefMetaData.java =================================================================== --- branches/jbossws-1.2.0/jbossws-core/src/java/org/jboss/ws/metadata/j2ee/UnifiedServiceRefMetaData.java 2007-03-09 13:53:08 UTC (rev 2569) +++ branches/jbossws-1.2.0/jbossws-core/src/java/org/jboss/ws/metadata/j2ee/UnifiedServiceRefMetaData.java 2007-03-09 14:11:08 UTC (rev 2570) @@ -1,210 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2005, 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.ws.metadata.j2ee; - -//$Id$ - -import java.io.Serializable; -import java.net.URL; -import java.util.ArrayList; -import java.util.LinkedHashMap; -import java.util.List; -import java.util.Map; -import java.util.Properties; - -import javax.xml.namespace.QName; - - -/** - * The container independent metdata data from service-ref element in web.xml, ejb-jar.xml, and - * application-client.xml. - * - * @author Thomas.Diesler(a)jboss.org - * @since 05-May-2006 - */ -public class UnifiedServiceRefMetaData implements Serializable -{ - private static final long serialVersionUID = -6845188004746036291L; - - // The required <service-ref-name> element - private String serviceRefName; - // The required <service-interface> element - private String serviceInterface; - // The optional <wsdl-file> element - private URL wsdlLocation; - // The optional <jaxrpc-mapping-file> element - private URL mappingLocation; - // The optional <service-qname> element - private QName serviceQName; - // The LinkedHashMap<String, UnifiedPortComponentRefMetaData> for <port-component-ref> elements - private Map<String, UnifiedPortComponentRefMetaData> portComponentRefs = new LinkedHashMap<String, UnifiedPortComponentRefMetaData>(); - // The optional <handler> elements - private List<UnifiedHandlerMetaData> handlers = new ArrayList<UnifiedHandlerMetaData>(); - - // The optional JBossWS config-name - private String configName; - // The optional JBossWS config-file - private String configFile; - /** The URL of the actual WSDL to use, <wsdl-override> */ - private URL wsdlOverride; - /** Arbitrary proxy properties given by <call-property> */ - private Properties callProperties; - - // The wsdl definition, if we have one - private Object wsdlDefinition; - // The java/wsdl mapping, if we have one - private Object javaWsdlMapping; - - public URL getMappingLocation() - { - return mappingLocation; - } - - public void setMappingLocation(URL mappingLocation) - { - this.mappingLocation = mappingLocation; - } - - public Object getJavaWsdlMapping() - { - return javaWsdlMapping; - } - - public void setJavaWsdlMapping(Object javaWsdlMapping) - { - this.javaWsdlMapping = javaWsdlMapping; - } - - public UnifiedPortComponentRefMetaData[] getPortComponentRefs() - { - UnifiedPortComponentRefMetaData[] array = new UnifiedPortComponentRefMetaData[portComponentRefs.size()]; - portComponentRefs.values().toArray(array); - return array; - } - - public void setPortComponentRefs(LinkedHashMap<String, UnifiedPortComponentRefMetaData> portComponentRefs) - { - this.portComponentRefs = portComponentRefs; - } - - public UnifiedHandlerMetaData[] getHandlers() - { - UnifiedHandlerMetaData[] array = new UnifiedHandlerMetaData[handlers.size()]; - handlers.toArray(array); - return array; - } - - public void setHandlers(ArrayList<UnifiedHandlerMetaData> handlers) - { - this.handlers = handlers; - } - - public String getServiceInterface() - { - return serviceInterface; - } - - public void setServiceInterface(String serviceInterface) - { - this.serviceInterface = serviceInterface; - } - - public QName getServiceQName() - { - return serviceQName; - } - - public void setServiceQName(QName serviceQName) - { - this.serviceQName = serviceQName; - } - - public String getServiceRefName() - { - return serviceRefName; - } - - public void setServiceRefName(String serviceRefName) - { - this.serviceRefName = serviceRefName; - } - - public URL getWsdlLocation() - { - return wsdlLocation; - } - - public void setWsdlLocation(URL wsdlLocation) - { - this.wsdlLocation = wsdlLocation; - } - - public String getConfigFile() - { - return configFile; - } - - public void setConfigFile(String configFile) - { - this.configFile = configFile; - } - - public String getConfigName() - { - return configName; - } - - public void setConfigName(String configName) - { - this.configName = configName; - } - - public URL getWsdlOverride() - { - return wsdlOverride; - } - - public void setWsdlOverride(URL wsdlOverride) - { - this.wsdlOverride = wsdlOverride; - } - - public Properties getCallProperties() - { - return callProperties; - } - - public void setCallProperties(Properties callProperties) - { - this.callProperties = callProperties; - } - - public Object getWsdlDefinition() - { - return wsdlDefinition; - } - - public void setWsdlDefinition(Object wsdlDefinition) - { - this.wsdlDefinition = wsdlDefinition; - } -} Modified: branches/jbossws-1.2.0/jbossws-core/src/java/org/jboss/ws/metadata/umdm/EndpointMetaData.java =================================================================== --- branches/jbossws-1.2.0/jbossws-core/src/java/org/jboss/ws/metadata/umdm/EndpointMetaData.java 2007-03-09 13:53:08 UTC (rev 2569) +++ branches/jbossws-1.2.0/jbossws-core/src/java/org/jboss/ws/metadata/umdm/EndpointMetaData.java 2007-03-09 14:11:08 UTC (rev 2570) @@ -43,7 +43,6 @@ import org.jboss.ws.WSException; import org.jboss.ws.core.CommonBindingProvider; import org.jboss.ws.core.CommonSOAPBinding; -import org.jboss.ws.core.UnifiedVirtualFile; import org.jboss.ws.core.jaxrpc.Style; import org.jboss.ws.core.jaxrpc.TypeMappingImpl; import org.jboss.ws.core.jaxrpc.Use; @@ -55,6 +54,7 @@ import org.jboss.ws.core.jaxws.JAXBDeserializerFactory; import org.jboss.ws.core.jaxws.JAXBSerializerFactory; import org.jboss.ws.core.utils.JavaUtils; +import org.jboss.ws.integration.UnifiedVirtualFile; import org.jboss.ws.metadata.config.CommonConfig; import org.jboss.ws.metadata.config.Configurable; import org.jboss.ws.metadata.config.ConfigurationProvider; Modified: branches/jbossws-1.2.0/jbossws-core/src/java/org/jboss/ws/metadata/umdm/HandlerMetaData.java =================================================================== --- branches/jbossws-1.2.0/jbossws-core/src/java/org/jboss/ws/metadata/umdm/HandlerMetaData.java 2007-03-09 13:53:08 UTC (rev 2569) +++ branches/jbossws-1.2.0/jbossws-core/src/java/org/jboss/ws/metadata/umdm/HandlerMetaData.java 2007-03-09 14:11:08 UTC (rev 2570) @@ -33,6 +33,7 @@ import org.jboss.logging.Logger; import org.jboss.ws.WSException; +import org.jboss.ws.metadata.j2ee.serviceref.UnifiedInitParamMetaData; /** * The common metdata data for a handler element @@ -61,7 +62,7 @@ // The optional <soap-header> elements private Set<QName> soapHeaders = new HashSet<QName>(); // The optional <init-param> elements - private List<HandlerInitParam> initParams = new ArrayList<HandlerInitParam>(); + private List<UnifiedInitParamMetaData> initParams = new ArrayList<UnifiedInitParamMetaData>(); // The cached handler class private Class handlerClass; @@ -137,12 +138,12 @@ return soapHeaders; } - public void seiInitParams(List<HandlerInitParam> initParams) + public void seiInitParams(List<UnifiedInitParamMetaData> initParams) { this.initParams = initParams; } - public List<HandlerInitParam> getInitParams() + public List<UnifiedInitParamMetaData> getInitParams() { return initParams; } @@ -166,39 +167,4 @@ { handlerClass = getHandlerClass(); } - - public static class HandlerInitParam implements Serializable - { - private static final long serialVersionUID = -8687875291620457318L; - - // The required <handler-name> element - private String paramName; - // The required <handler-class> element - private String paramValue; - - public String getParamName() - { - return paramName; - } - - public void setParamName(String paramName) - { - this.paramName = paramName; - } - - public String getParamValue() - { - return paramValue; - } - - public void setParamValue(String paramValue) - { - this.paramValue = paramValue; - } - - public String toString() - { - return "[name=" + paramName + ",value=" + paramValue + "]"; - } - } } Modified: branches/jbossws-1.2.0/jbossws-core/src/java/org/jboss/ws/metadata/umdm/ResourceLoaderAdapter.java =================================================================== --- branches/jbossws-1.2.0/jbossws-core/src/java/org/jboss/ws/metadata/umdm/ResourceLoaderAdapter.java 2007-03-09 13:53:08 UTC (rev 2569) +++ branches/jbossws-1.2.0/jbossws-core/src/java/org/jboss/ws/metadata/umdm/ResourceLoaderAdapter.java 2007-03-09 14:11:08 UTC (rev 2570) @@ -28,7 +28,7 @@ import java.net.MalformedURLException; import java.net.URL; -import org.jboss.ws.core.UnifiedVirtualFile; +import org.jboss.ws.integration.UnifiedVirtualFile; /** * The default file adapter loads resources through an associated classloader. Modified: branches/jbossws-1.2.0/jbossws-core/src/java/org/jboss/ws/metadata/umdm/ServiceMetaData.java =================================================================== --- branches/jbossws-1.2.0/jbossws-core/src/java/org/jboss/ws/metadata/umdm/ServiceMetaData.java 2007-03-09 13:53:08 UTC (rev 2569) +++ branches/jbossws-1.2.0/jbossws-core/src/java/org/jboss/ws/metadata/umdm/ServiceMetaData.java 2007-03-09 14:11:08 UTC (rev 2570) @@ -37,11 +37,11 @@ import org.jboss.logging.Logger; import org.jboss.ws.WSException; -import org.jboss.ws.core.UnifiedVirtualFile; import org.jboss.ws.core.jaxrpc.TypeMappingImpl; import org.jboss.ws.core.jaxrpc.TypeMappingRegistryImpl; import org.jboss.ws.core.jaxrpc.Use; import org.jboss.ws.core.jaxrpc.binding.jbossxb.SchemaBindingBuilder; +import org.jboss.ws.integration.UnifiedVirtualFile; import org.jboss.ws.metadata.jaxrpcmapping.JavaWsdlMapping; import org.jboss.ws.metadata.jaxrpcmapping.JavaWsdlMappingFactory; import org.jboss.ws.metadata.umdm.HandlerMetaData.HandlerType; Modified: branches/jbossws-1.2.0/jbossws-core/src/java/org/jboss/ws/metadata/umdm/UnifiedMetaData.java =================================================================== --- branches/jbossws-1.2.0/jbossws-core/src/java/org/jboss/ws/metadata/umdm/UnifiedMetaData.java 2007-03-09 13:53:08 UTC (rev 2569) +++ branches/jbossws-1.2.0/jbossws-core/src/java/org/jboss/ws/metadata/umdm/UnifiedMetaData.java 2007-03-09 14:11:08 UTC (rev 2570) @@ -30,8 +30,8 @@ import java.util.StringTokenizer; import org.jboss.logging.Logger; -import org.jboss.ws.core.UnifiedVirtualFile; import org.jboss.ws.core.server.ServiceEndpointManager; +import org.jboss.ws.integration.UnifiedVirtualFile; import org.jboss.ws.metadata.jaxrpcmapping.JavaWsdlMapping; import org.jboss.ws.metadata.wsdl.WSDLDefinitions; Modified: branches/jbossws-1.2.0/jbossws-core/src/java/org/jboss/ws/metadata/webservices/PortComponentMetaData.java =================================================================== --- branches/jbossws-1.2.0/jbossws-core/src/java/org/jboss/ws/metadata/webservices/PortComponentMetaData.java 2007-03-09 13:53:08 UTC (rev 2569) +++ branches/jbossws-1.2.0/jbossws-core/src/java/org/jboss/ws/metadata/webservices/PortComponentMetaData.java 2007-03-09 14:11:08 UTC (rev 2570) @@ -30,7 +30,7 @@ import javax.xml.namespace.QName; import org.jboss.logging.Logger; -import org.jboss.ws.metadata.j2ee.UnifiedHandlerMetaData; +import org.jboss.ws.metadata.j2ee.serviceref.UnifiedHandlerMetaData; /** * XML Binding and ws4ee meta-data element for @@ -73,6 +73,8 @@ // The HTTP context root private String contextRoot; + // The optional secure wsdl access + private Boolean secureWSDLAccess; /** Construct a new PortComponentMetaData for a given WebserviceDescriptionMetaData */ @@ -161,11 +163,16 @@ this.contextRoot = contextRoot; } - /** - * Serialize as a String - * - * @return - */ + public Boolean getSecureWSDLAccess() + { + return secureWSDLAccess; + } + + public void setSecureWSDLAccess(Boolean secureWSDLAccess) + { + this.secureWSDLAccess = secureWSDLAccess; + } + public String serialize() { StringBuilder builder = new StringBuilder("<port-component>"); @@ -175,17 +182,9 @@ builder.append("<service-endpoint-interface>").append(serviceEndpointInterface).append("</service-endpoint-interface>"); builder.append("<service-impl-bean>"); if (ejbLink != null) - { - builder.append("<ejb-link>"); - builder.append(ejbLink); - builder.append("</ejb-link>"); - } + builder.append("<ejb-link>" + ejbLink + "</ejb-link>"); else - { - builder.append("<servlet-link>"); - builder.append(servletLink); - builder.append("</servlet-link>"); - } + builder.append("<servlet-link>"+ servletLink + "</servlet-link>"); builder.append("</service-impl-bean>"); builder.append("</port-component>"); return builder.toString(); Modified: branches/jbossws-1.2.0/jbossws-core/src/java/org/jboss/ws/metadata/webservices/WebservicesFactory.java =================================================================== --- branches/jbossws-1.2.0/jbossws-core/src/java/org/jboss/ws/metadata/webservices/WebservicesFactory.java 2007-03-09 13:53:08 UTC (rev 2569) +++ branches/jbossws-1.2.0/jbossws-core/src/java/org/jboss/ws/metadata/webservices/WebservicesFactory.java 2007-03-09 14:11:08 UTC (rev 2570) @@ -26,8 +26,8 @@ import java.net.URL; import org.jboss.logging.Logger; -import org.jboss.ws.metadata.j2ee.UnifiedHandlerMetaData; -import org.jboss.ws.metadata.umdm.HandlerMetaData.HandlerInitParam; +import org.jboss.ws.metadata.j2ee.serviceref.UnifiedHandlerMetaData; +import org.jboss.ws.metadata.j2ee.serviceref.UnifiedInitParamMetaData; import org.jboss.xb.binding.ObjectModelFactory; import org.jboss.xb.binding.UnmarshallingContext; import org.xml.sax.Attributes; @@ -129,14 +129,14 @@ public Object newChild(UnifiedHandlerMetaData handler, UnmarshallingContext navigator, String namespaceURI, String localName, Attributes attrs) { if ("init-param".equals(localName)) - return new HandlerInitParam(); + return new UnifiedInitParamMetaData(); else return null; } /** * Called when parsing character is complete. */ - public void addChild(UnifiedHandlerMetaData handler, HandlerInitParam param, UnmarshallingContext navigator, String namespaceURI, String localName) + public void addChild(UnifiedHandlerMetaData handler, UnifiedInitParamMetaData param, UnmarshallingContext navigator, String namespaceURI, String localName) { handler.addInitParam(param); } @@ -200,7 +200,7 @@ /** * Called when a new simple child element with text value was read from the XML content. */ - public void setValue(HandlerInitParam param, UnmarshallingContext navigator, String namespaceURI, String localName, String value) + public void setValue(UnifiedInitParamMetaData param, UnmarshallingContext navigator, String namespaceURI, String localName, String value) { if (log.isTraceEnabled()) log.trace("UnifiedInitParamMetaData setValue: nuri=" + namespaceURI + " localName=" + localName + " value=" + value); Modified: branches/jbossws-1.2.0/jbossws-core/src/java/org/jboss/ws/metadata/wsse/WSSecurityConfigFactory.java =================================================================== --- branches/jbossws-1.2.0/jbossws-core/src/java/org/jboss/ws/metadata/wsse/WSSecurityConfigFactory.java 2007-03-09 13:53:08 UTC (rev 2569) +++ branches/jbossws-1.2.0/jbossws-core/src/java/org/jboss/ws/metadata/wsse/WSSecurityConfigFactory.java 2007-03-09 14:11:08 UTC (rev 2570) @@ -29,7 +29,7 @@ import org.jboss.logging.Logger; import org.jboss.ws.WSException; -import org.jboss.ws.core.UnifiedVirtualFile; +import org.jboss.ws.integration.UnifiedVirtualFile; import org.jboss.ws.metadata.builder.jaxrpc.JAXRPCServerMetaDataBuilder; /** Modified: branches/jbossws-1.2.0/jbossws-tests/ant-import/build-samples-jaxws.xml =================================================================== --- branches/jbossws-1.2.0/jbossws-tests/ant-import/build-samples-jaxws.xml 2007-03-09 13:53:08 UTC (rev 2569) +++ branches/jbossws-1.2.0/jbossws-tests/ant-import/build-samples-jaxws.xml 2007-03-09 14:11:08 UTC (rev 2570) @@ -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"> Modified: branches/jbossws-1.2.0/jbossws-tests/src/java/org/jboss/test/ws/common/config/ConfigFactoryTestCase.java =================================================================== --- branches/jbossws-1.2.0/jbossws-tests/src/java/org/jboss/test/ws/common/config/ConfigFactoryTestCase.java 2007-03-09 13:53:08 UTC (rev 2569) +++ branches/jbossws-1.2.0/jbossws-tests/src/java/org/jboss/test/ws/common/config/ConfigFactoryTestCase.java 2007-03-09 14:11:08 UTC (rev 2570) @@ -31,8 +31,8 @@ import org.jboss.ws.metadata.config.jaxrpc.CommonConfigJAXRPC; import org.jboss.ws.metadata.config.jaxws.ConfigRootJAXWS; import org.jboss.ws.metadata.config.jaxws.EndpointConfigJAXWS; -import org.jboss.ws.metadata.j2ee.UnifiedHandlerMetaData; -import org.jboss.ws.metadata.jsr181.HandlerChainMetaData; +import org.jboss.ws.metadata.j2ee.serviceref.UnifiedHandlerChainMetaData; +import org.jboss.ws.metadata.j2ee.serviceref.UnifiedHandlerMetaData; /** * Test parsing of the JBossWS config @@ -63,7 +63,7 @@ assertFalse("MTOM should not be enabled" , epc1.hasFeature("http://org.jboss.ws/mtom")); assertEquals("Standard WSSecurity Endpoint", epc2.getConfigName()); - HandlerChainMetaData preChain = epc2.getPreHandlerChain(); + UnifiedHandlerChainMetaData preChain = epc2.getPreHandlerChain(); assertEquals(1, preChain.getHandlers().size()); UnifiedHandlerMetaData h1 = (UnifiedHandlerMetaData)preChain.getHandlers().get(0); assertEquals("WSSecurityHandlerInbound", h1.getHandlerName()); Modified: branches/jbossws-1.2.0/jbossws-tests/src/resources/jaxrpc/jbws425/META-INF/application-client.xml =================================================================== --- branches/jbossws-1.2.0/jbossws-tests/src/resources/jaxrpc/jbws425/META-INF/application-client.xml 2007-03-09 13:53:08 UTC (rev 2569) +++ branches/jbossws-1.2.0/jbossws-tests/src/resources/jaxrpc/jbws425/META-INF/application-client.xml 2007-03-09 14:11:08 UTC (rev 2570) @@ -10,6 +10,7 @@ <wsdl-file>META-INF/wsdl/HelloService.wsdl</wsdl-file> <jaxrpc-mapping-file>META-INF/jaxrpc-mapping.xml</jaxrpc-mapping-file> <port-component-ref> + <!-- keep the white space , it's part of the test --> <service-endpoint-interface> org.jboss.test.ws.jaxrpc.jbws425.Hello</service-endpoint-interface> </port-component-ref> </service-ref> Modified: branches/jbossws-1.2.0/jbossws-tests/src/resources/jaxws/samples/handlerchain/META-INF/jboss-client.xml =================================================================== --- branches/jbossws-1.2.0/jbossws-tests/src/resources/jaxws/samples/handlerchain/META-INF/jboss-client.xml 2007-03-09 13:53:08 UTC (rev 2569) +++ branches/jbossws-1.2.0/jbossws-tests/src/resources/jaxws/samples/handlerchain/META-INF/jboss-client.xml 2007-03-09 14:11:08 UTC (rev 2570) @@ -5,20 +5,20 @@ <jboss-client> <jndi-name>jbossws-client</jndi-name> - <webservice-ref> + <service-ref> <service-ref-name>Service1</service-ref-name> <wsdl-override>http://@jbosstest.host.name@:8080/jaxws-samples-handlerchain/TestService?wsdl</wsdl-override> - </webservice-ref> + </service-ref> - <webservice-ref> + <service-ref> <service-ref-name>Service2</service-ref-name> <wsdl-override>http://@jbosstest.host.name@:8080/jaxws-samples-handlerchain/TestService?wsdl</wsdl-override> - </webservice-ref> + </service-ref> - <webservice-ref> + <service-ref> <service-ref-name>Service3</service-ref-name> <handler-chain>jaxws-handlers.xml</handler-chain> <wsdl-override>http://@jbosstest.host.name@:8080/jaxws-samples-handlerchain/TestService?wsdl</wsdl-override> - </webservice-ref> + </service-ref> </jboss-client> \ No newline at end of file Modified: branches/jbossws-1.2.0/jbossws-tests/src/resources/jaxws/samples/webserviceref/META-INF/jboss-client.xml =================================================================== --- branches/jbossws-1.2.0/jbossws-tests/src/resources/jaxws/samples/webserviceref/META-INF/jboss-client.xml 2007-03-09 13:53:08 UTC (rev 2569) +++ branches/jbossws-1.2.0/jbossws-tests/src/resources/jaxws/samples/webserviceref/META-INF/jboss-client.xml 2007-03-09 14:11:08 UTC (rev 2570) @@ -7,90 +7,90 @@ <!-- @WebServiceRef(name = "service1", value = TestEndpointService.class, wsdlLocation = "META-INF/wsdl/TestEndpoint.wsdl") - <webservice-ref> + <service-ref> <service-ref-name>service1</service-ref-name> <wsdl-override>META-INF/wsdl/TestEndpoint.wsdl</wsdl-override> - </webservice-ref> + </service-ref> --> <!-- @WebServiceRef(name = "service2", value = TestEndpointService.class) --> - <webservice-ref> + <service-ref> <service-ref-name>service2</service-ref-name> <wsdl-override>META-INF/wsdl/TestEndpoint.wsdl</wsdl-override> - </webservice-ref> + </service-ref> <!-- @WebServiceRef(name = "TestEndpointService3") --> - <webservice-ref> + <service-ref> <service-ref-name>TestEndpointService3</service-ref-name> <wsdl-override>META-INF/wsdl/TestEndpoint.wsdl</wsdl-override> - </webservice-ref> + </service-ref> <!-- @WebServiceRef --> - <webservice-ref> + <service-ref> <service-ref-name>org.jboss.test.ws.jaxws.samples.webserviceref.TestEndpointClientOne/service4</service-ref-name> <wsdl-override>META-INF/wsdl/TestEndpoint.wsdl</wsdl-override> - </webservice-ref> + </service-ref> <!-- @WebServiceRef(name = "TestEndpointService5") --> - <webservice-ref> + <service-ref> <service-ref-name>TestEndpointService5</service-ref-name> <wsdl-override>META-INF/wsdl/TestEndpoint.wsdl</wsdl-override> - </webservice-ref> + </service-ref> <!-- @WebServiceRef --> - <webservice-ref> + <service-ref> <service-ref-name>org.jboss.test.ws.jaxws.samples.webserviceref.TestEndpointClientOne/service6</service-ref-name> <wsdl-override>META-INF/wsdl/TestEndpoint.wsdl</wsdl-override> - </webservice-ref> + </service-ref> <!-- @WebServiceRef(name = "port1", value = TestEndpointService.class, type = TestEndpoint.class) --> - <webservice-ref> + <service-ref> <service-ref-name>port1</service-ref-name> <wsdl-override>META-INF/wsdl/TestEndpoint.wsdl</wsdl-override> - </webservice-ref> + </service-ref> <!-- @WebServiceRef(name = "Port2", value = TestEndpointService.class) --> - <webservice-ref> + <service-ref> <service-ref-name>Port2</service-ref-name> <wsdl-override>META-INF/wsdl/TestEndpoint.wsdl</wsdl-override> - </webservice-ref> + </service-ref> <!-- @WebServiceRef(value = TestEndpointService.class) --> - <webservice-ref> + <service-ref> <service-ref-name>org.jboss.test.ws.jaxws.samples.webserviceref.TestEndpointClientOne/port3</service-ref-name> <wsdl-override>META-INF/wsdl/TestEndpoint.wsdl</wsdl-override> - </webservice-ref> + </service-ref> <!-- @WebServiceRef --> - <webservice-ref> + <service-ref> <service-ref-name>org.jboss.test.ws.jaxws.samples.webserviceref.TestEndpointClientOne/port4</service-ref-name> <wsdl-override>META-INF/wsdl/TestEndpoint.wsdl</wsdl-override> - </webservice-ref> + </service-ref> <!-- @WebServiceRef(name = "Port5") --> - <webservice-ref> + <service-ref> <service-ref-name>Port5</service-ref-name> <wsdl-override>META-INF/wsdl/TestEndpoint.wsdl</wsdl-override> - </webservice-ref> + </service-ref> </jboss-client> \ No newline at end of file Modified: branches/jbossws-1.2.0/jbossws-tests/src/resources/jaxws/samples/webserviceref/META-INF/jboss.xml =================================================================== --- branches/jbossws-1.2.0/jbossws-tests/src/resources/jaxws/samples/webserviceref/META-INF/jboss.xml 2007-03-09 13:53:08 UTC (rev 2569) +++ branches/jbossws-1.2.0/jbossws-tests/src/resources/jaxws/samples/webserviceref/META-INF/jboss.xml 2007-03-09 14:11:08 UTC (rev 2570) @@ -10,75 +10,75 @@ <!-- @WebServiceRef(name = "service1", value = TestEndpointService.class, wsdlLocation = "META-INF/wsdl/TestEndpoint.wsdl") - <webservice-ref> + <service-ref> <service-ref-name>service1</service-ref-name> <wsdl-override>META-INF/wsdl/TestEndpoint.wsdl</wsdl-override> - </webservice-ref> + </service-ref> --> <!-- @WebServiceRef(name = "service2", value = TestEndpointService.class) --> - <webservice-ref> + <service-ref> <service-ref-name>service2</service-ref-name> <wsdl-override>META-INF/wsdl/TestEndpoint.wsdl</wsdl-override> - </webservice-ref> + </service-ref> <!-- @WebServiceRef(name = "TestEndpointService3") --> - <webservice-ref> + <service-ref> <service-ref-name>TestEndpointService3</service-ref-name> <wsdl-override>META-INF/wsdl/TestEndpoint.wsdl</wsdl-override> - </webservice-ref> + </service-ref> <!-- @WebServiceRef --> - <webservice-ref> + <service-ref> <service-ref-name>org.jboss.test.ws.jaxws.samples.webserviceref.EJB3Client/service4</service-ref-name> <wsdl-override>META-INF/wsdl/TestEndpoint.wsdl</wsdl-override> - </webservice-ref> + </service-ref> <!-- @WebServiceRef(name = "TestEndpointService5") --> - <webservice-ref> + <service-ref> <service-ref-name>TestEndpointService5</service-ref-name> <wsdl-override>META-INF/wsdl/TestEndpoint.wsdl</wsdl-override> - </webservice-ref> + </service-ref> <!-- @WebServiceRef --> - <webservice-ref> + <service-ref> <service-ref-name>org.jboss.test.ws.jaxws.samples.webserviceref.EJB3Client/service6</service-ref-name> <wsdl-override>META-INF/wsdl/TestEndpoint.wsdl</wsdl-override> - </webservice-ref> + </service-ref> <!-- @WebServiceRef(name = "port1", value = TestEndpointService.class, type = TestEndpoint.class) --> - <webservice-ref> + <service-ref> <service-ref-name>port1</service-ref-name> <wsdl-override>META-INF/wsdl/TestEndpoint.wsdl</wsdl-override> - </webservice-ref> + </service-ref> <!-- @WebServiceRef(name = "Port2", value = TestEndpointService.class) --> - <webservice-ref> + <service-ref> <service-ref-name>Port2</service-ref-name> <wsdl-override>META-INF/wsdl/TestEndpoint.wsdl</wsdl-override> - </webservice-ref> + </service-ref> <!-- @WebServiceRef(value = TestEndpointService.class) --> - <webservice-ref> + <service-ref> <service-ref-name>org.jboss.test.ws.jaxws.samples.webserviceref.EJB3Client/port3</service-ref-name> <wsdl-override>META-INF/wsdl/TestEndpoint.wsdl</wsdl-override> - </webservice-ref> + </service-ref> </session> </enterprise-beans> Modified: branches/jbossws-1.2.0/jbossws-tests/src/resources/jaxws/samples/webserviceref/META-INF-override/jboss-client.xml =================================================================== --- branches/jbossws-1.2.0/jbossws-tests/src/resources/jaxws/samples/webserviceref/META-INF-override/jboss-client.xml 2007-03-09 13:53:08 UTC (rev 2569) +++ branches/jbossws-1.2.0/jbossws-tests/src/resources/jaxws/samples/webserviceref/META-INF-override/jboss-client.xml 2007-03-09 14:11:08 UTC (rev 2570) @@ -8,90 +8,90 @@ <!-- @WebServiceRef(name = "Service1") --> - <webservice-ref> + <service-ref> <service-ref-name>Service1</service-ref-name> - <service-class-name>org.jboss.test.ws.jaxws.samples.webserviceref.TestEndpointService</service-class-name> + <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> - </webservice-ref> + </service-ref> <!-- @WebServiceRef(name = "Service2") --> - <webservice-ref> + <service-ref> <service-ref-name>Service2</service-ref-name> <config-name>Custom Client</config-name> <config-file>META-INF/jbossws-client-config.xml</config-file> <wsdl-override>META-INF/wsdl/TestEndpoint.wsdl</wsdl-override> - </webservice-ref> + </service-ref> <!-- @WebServiceRef(name = "Service3") --> - <webservice-ref> + <service-ref> <service-ref-name>Service3</service-ref-name> - <service-class-name>org.jboss.test.ws.jaxws.samples.webserviceref.TestEndpointService</service-class-name> + <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> - </webservice-ref> + </service-ref> <!-- @WebServiceRef(name = "Service4") --> - <webservice-ref> + <service-ref> <service-ref-name>Service4</service-ref-name> - <port-info> + <port-component-ref> <service-endpoint-interface>org.jboss.test.ws.jaxws.samples.webserviceref.TestEndpoint</service-endpoint-interface> <config-name>Custom Client</config-name> <config-file>META-INF/jbossws-client-config.xml</config-file> - </port-info> + </port-component-ref> <wsdl-override>META-INF/wsdl/TestEndpoint.wsdl</wsdl-override> - </webservice-ref> + </service-ref> <!-- @WebServiceRef(name = "Port1", type = TestEndpoint.class) --> - <webservice-ref> + <service-ref> <service-ref-name>Port1</service-ref-name> - <port-info> + <port-component-ref> <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> + </port-component-ref> <wsdl-override>META-INF/wsdl/TestEndpoint.wsdl</wsdl-override> - </webservice-ref> + </service-ref> <!-- @WebServiceRef(name = "Port2") --> - <webservice-ref> + <service-ref> <service-ref-name>Port2</service-ref-name> - <port-info> + <port-component-ref> <service-endpoint-interface>org.jboss.test.ws.jaxws.samples.webserviceref.TestEndpoint</service-endpoint-interface> <config-name>Custom Client</config-name> <config-file>META-INF/jbossws-client-config.xml</config-file> - </port-info> + </port-component-ref> <wsdl-override>META-INF/wsdl/TestEndpoint.wsdl</wsdl-override> - </webservice-ref> + </service-ref> <!-- @WebServiceRef(name = "Port3") --> - <webservice-ref> + <service-ref> <service-ref-name>Port3</service-ref-name> - <port-info> + <port-component-ref> <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-info> + </port-component-ref> <wsdl-override>META-INF/wsdl/TestEndpoint.wsdl</wsdl-override> - </webservice-ref> + </service-ref> </jboss-client> \ No newline at end of file Modified: branches/jbossws-1.2.0/jbossws-tests/src/resources/jaxws/samples/webserviceref/META-INF-secure/jboss-client.xml =================================================================== --- branches/jbossws-1.2.0/jbossws-tests/src/resources/jaxws/samples/webserviceref/META-INF-secure/jboss-client.xml 2007-03-09 13:53:08 UTC (rev 2569) +++ branches/jbossws-1.2.0/jbossws-tests/src/resources/jaxws/samples/webserviceref/META-INF-secure/jboss-client.xml 2007-03-09 14:11:08 UTC (rev 2570) @@ -5,55 +5,55 @@ <jboss-client> <jndi-name>jbossws-client</jndi-name> - <webservice-ref> + <service-ref> <service-ref-name>SecureService1</service-ref-name> - <service-class-name>org.jboss.test.ws.jaxws.samples.webserviceref.SecureEndpointService</service-class-name> + <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-info> + <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-info> + </port-component-ref> <wsdl-override>http://@jbosstest.host.name@:8080/jaxws-samples-webserviceref-secure/SecureEndpoint?wsdl</wsdl-override> - </webservice-ref> + </service-ref> - <webservice-ref> + <service-ref> <service-ref-name>SecureService2</service-ref-name> - <port-info> + <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-info> + </port-component-ref> <wsdl-override>http://@jbosstest.host.name@:8080/jaxws-samples-webserviceref-secure/SecureEndpoint?wsdl</wsdl-override> - </webservice-ref> + </service-ref> - <webservice-ref> + <service-ref> <service-ref-name>SecurePort1</service-ref-name> - <port-info> + <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-info> + </port-component-ref> <wsdl-override>http://@jbosstest.host.name@:8080/jaxws-samples-webserviceref-secure/SecureEndpoint?wsdl</wsdl-override> - </webservice-ref> + </service-ref> </jboss-client> \ No newline at end of file