[jbossws-commits] JBossWS SVN: r2591 - in branches/jbossws-1.2.0: integration-jboss40/src/java/org/jboss/ws/integration/jboss40 and 12 other directories.

Author: thomas.diesler(a)jboss.com Date: 2007-03-10 16:59:14 -0500 (Sat, 10 Mar 2007) New Revision: 2591 Added: branches/jbossws-1.2.0/integration-jboss40/src/java/org/jboss/ws/integration/jboss40/ApplicationMetaDataAdapter.java branches/jbossws-1.2.0/integration-jboss40/src/java/org/jboss/ws/integration/jboss40/ServiceRefMetaDataAdapter.java branches/jbossws-1.2.0/integration-jboss40/src/java/org/jboss/ws/integration/jboss40/ServiceRefMetaDataAdapterFactory.java branches/jbossws-1.2.0/integration-jboss42/src/java/org/jboss/ws/integration/jboss42/AbstractApplicationMetaDataAdapter.java branches/jbossws-1.2.0/integration-jboss42/src/java/org/jboss/ws/integration/jboss42/ApplicationMetaDataAdapter.java branches/jbossws-1.2.0/integration-jboss42/src/java/org/jboss/ws/integration/jboss42/DeploymentInfoAdapter.java branches/jbossws-1.2.0/integration-jboss42/src/java/org/jboss/ws/integration/jboss42/DeploymentInfoAdapterFactory.java branches/jbossws-1.2.0/integration-jboss42/src/java/org/jboss/ws/integration/jboss42/WebMetaDataAdapter.java branches/jbossws-1.2.0/jbossws-tests/src/java/org/jboss/test/ws/jaxrpc/jbws723/ branches/jbossws-1.2.0/jbossws-tests/src/java/org/jboss/test/ws/jaxrpc/jbws723/JBWS723TestCase.java branches/jbossws-1.2.0/jbossws-tests/src/java/org/jboss/test/ws/jaxrpc/jbws723/OrganizationHome.java branches/jbossws-1.2.0/jbossws-tests/src/java/org/jboss/test/ws/jaxrpc/jbws723/OrganizationImpl.java branches/jbossws-1.2.0/jbossws-tests/src/java/org/jboss/test/ws/jaxrpc/jbws723/OrganizationRemote.java branches/jbossws-1.2.0/jbossws-tests/src/java/org/jboss/test/ws/jaxrpc/jbws723/OrganizationService.java branches/jbossws-1.2.0/jbossws-tests/src/resources/jaxrpc/jbws723/ branches/jbossws-1.2.0/jbossws-tests/src/resources/jaxrpc/jbws723/META-INF/ branches/jbossws-1.2.0/jbossws-tests/src/resources/jaxrpc/jbws723/META-INF/application-client.xml branches/jbossws-1.2.0/jbossws-tests/src/resources/jaxrpc/jbws723/META-INF/ejb-jar.xml branches/jbossws-1.2.0/jbossws-tests/src/resources/jaxrpc/jbws723/META-INF/jaxrpc-mapping.xml branches/jbossws-1.2.0/jbossws-tests/src/resources/jaxrpc/jbws723/META-INF/jboss-client.xml branches/jbossws-1.2.0/jbossws-tests/src/resources/jaxrpc/jbws723/META-INF/jboss.xml branches/jbossws-1.2.0/jbossws-tests/src/resources/jaxrpc/jbws723/META-INF/webservices.xml branches/jbossws-1.2.0/jbossws-tests/src/resources/jaxrpc/jbws723/META-INF/wsdl/ branches/jbossws-1.2.0/jbossws-tests/src/resources/jaxrpc/jbws723/META-INF/wsdl/OrganizationService.wsdl Removed: branches/jbossws-1.2.0/integration-jboss40/src/java/org/jboss/ws/integration/jboss40/ServiceRefMetaDataAdaptor.java branches/jbossws-1.2.0/integration-jboss42/src/java/org/jboss/ws/integration/jboss42/ApplicationMetaDataAdaptor.java branches/jbossws-1.2.0/integration-jboss42/src/java/org/jboss/ws/integration/jboss42/DeploymentInfoAdaptor.java branches/jbossws-1.2.0/integration-jboss42/src/java/org/jboss/ws/integration/jboss42/WebMetaDataAdaptor.java branches/jbossws-1.2.0/jbossws-tests/src/java/org/jboss/test/ws/jaxrpc/jbws723/JBWS723TestCase.java branches/jbossws-1.2.0/jbossws-tests/src/java/org/jboss/test/ws/jaxrpc/jbws723/OrganizationHome.java branches/jbossws-1.2.0/jbossws-tests/src/java/org/jboss/test/ws/jaxrpc/jbws723/OrganizationImpl.java branches/jbossws-1.2.0/jbossws-tests/src/java/org/jboss/test/ws/jaxrpc/jbws723/OrganizationRemote.java branches/jbossws-1.2.0/jbossws-tests/src/java/org/jboss/test/ws/jaxrpc/jbws723/OrganizationService.java branches/jbossws-1.2.0/jbossws-tests/src/resources/jaxrpc/jbws723/META-INF/ branches/jbossws-1.2.0/jbossws-tests/src/resources/jaxrpc/jbws723/META-INF/application-client.xml branches/jbossws-1.2.0/jbossws-tests/src/resources/jaxrpc/jbws723/META-INF/ejb-jar.xml branches/jbossws-1.2.0/jbossws-tests/src/resources/jaxrpc/jbws723/META-INF/jaxrpc-mapping.xml branches/jbossws-1.2.0/jbossws-tests/src/resources/jaxrpc/jbws723/META-INF/jboss-client.xml branches/jbossws-1.2.0/jbossws-tests/src/resources/jaxrpc/jbws723/META-INF/jboss.xml branches/jbossws-1.2.0/jbossws-tests/src/resources/jaxrpc/jbws723/META-INF/webservices.xml branches/jbossws-1.2.0/jbossws-tests/src/resources/jaxrpc/jbws723/META-INF/wsdl/ branches/jbossws-1.2.0/jbossws-tests/src/resources/jaxrpc/jbws723/META-INF/wsdl/OrganizationService.wsdl Modified: branches/jbossws-1.2.0/integration-jboss40/build.xml branches/jbossws-1.2.0/integration-jboss40/src/java/org/jboss/ws/integration/jboss40/WebServiceClientDeployer.java branches/jbossws-1.2.0/integration-jboss40/src/resources/jbossws.beans/META-INF/jboss-beans.xml 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/DeployerInterceptorEJB3.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/resources/jbossws.beans/META-INF/jboss-beans.xml branches/jbossws-1.2.0/integration-tomcat/.classpath branches/jbossws-1.2.0/jbossws-tests/ant-import/build-jars-jaxrpc.xml branches/jbossws-1.2.0/jbossws-tests/src/resources/tests-jboss40-excludes.txt branches/jbossws-1.2.0/jbossws-tests/src/resources/tests-jboss40-noejb3-excludes.txt Log: [JBWS-723] Protect access to WSDL. Externalize meta data adapters Modified: branches/jbossws-1.2.0/integration-jboss40/build.xml =================================================================== --- branches/jbossws-1.2.0/integration-jboss40/build.xml 2007-03-10 20:47:44 UTC (rev 2590) +++ branches/jbossws-1.2.0/integration-jboss40/build.xml 2007-03-10 21:59:14 UTC (rev 2591) @@ -63,6 +63,7 @@ <src location="${jboss40.java.dir}"/> <include name="org/jboss/ws/integration/jboss40/**"/> <include name="org/jboss/ws/integration/jboss42/**"/> + <exclude name="org/jboss/ws/integration/jboss42/ApplicationMetaDataAdapter.java"/> <exclude name="org/jboss/ws/integration/jboss42/DeployerInterceptorEJB3.java"/> <exclude name="org/jboss/ws/integration/jboss42/ServiceEndpointGeneratorEJB3.java"/> <exclude name="org/jboss/ws/integration/jboss42/ServiceEndpointInvokerEJB3.java"/> @@ -185,7 +186,7 @@ <include name="wsdl4j.jar"/> <include name="xmlsec.jar"/> </fileset> - <fileset dir="${jboss42.resources.dir}"> + <fileset dir="${jboss40.resources.dir}"> <include name="jbossws.beans/META-INF/jboss-beans.xml"/> </fileset> <metainf dir="${core.resources.dir}/jbossws.sar/META-INF"> Added: branches/jbossws-1.2.0/integration-jboss40/src/java/org/jboss/ws/integration/jboss40/ApplicationMetaDataAdapter.java =================================================================== --- branches/jbossws-1.2.0/integration-jboss40/src/java/org/jboss/ws/integration/jboss40/ApplicationMetaDataAdapter.java (rev 0) +++ branches/jbossws-1.2.0/integration-jboss40/src/java/org/jboss/ws/integration/jboss40/ApplicationMetaDataAdapter.java 2007-03-10 21:59:14 UTC (rev 2591) @@ -0,0 +1,82 @@ +/* + * 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.jboss40; + +// $Id$ + +import org.jboss.metadata.BeanMetaData; +import org.jboss.metadata.EjbPortComponentMetaData; +import org.jboss.metadata.MessageDrivenMetaData; +import org.jboss.metadata.SessionMetaData; +import org.jboss.ws.integration.jboss42.AbstractApplicationMetaDataAdapter; +import org.jboss.ws.metadata.j2ee.UnifiedBeanMetaData; +import org.jboss.ws.metadata.j2ee.UnifiedEjbPortComponentMetaData; +import org.jboss.ws.metadata.j2ee.UnifiedMessageDrivenMetaData; +import org.jboss.ws.metadata.j2ee.UnifiedSessionMetaData; + +/** + * Build container independent application meta data + * + * @author Thomas.Diesler(a)jboss.org + * @since 05-May-2006 + */ +public class ApplicationMetaDataAdapter extends AbstractApplicationMetaDataAdapter +{ + @Override + protected UnifiedBeanMetaData buildUnifiedBeanMetaData(BeanMetaData bmd) + { + UnifiedBeanMetaData ubmd = null; + if (bmd instanceof SessionMetaData) + { + ubmd = new UnifiedSessionMetaData(); + } + else if (bmd instanceof MessageDrivenMetaData) + { + ubmd = new UnifiedMessageDrivenMetaData(); + ((UnifiedMessageDrivenMetaData)ubmd).setDestinationJndiName(((MessageDrivenMetaData)bmd).getDestinationJndiName()); + } + + if (ubmd != null) + { + ubmd.setEjbName(bmd.getEjbName()); + ubmd.setEjbClass(bmd.getEjbClass()); + ubmd.setServiceEndpointInterface(bmd.getServiceEndpoint()); + ubmd.setHome(bmd.getHome()); + ubmd.setLocalHome(bmd.getLocalHome()); + ubmd.setJndiName(bmd.getJndiName()); + ubmd.setLocalJndiName(bmd.getLocalJndiName()); + + EjbPortComponentMetaData pcmd = bmd.getPortComponent(); + if (pcmd != null) + { + UnifiedEjbPortComponentMetaData upcmd = new UnifiedEjbPortComponentMetaData(); + upcmd.setPortComponentName(pcmd.getPortComponentName()); + upcmd.setPortComponentURI(pcmd.getPortComponentURI()); + upcmd.setAuthMethod(pcmd.getAuthMethod()); + upcmd.setTransportGuarantee(pcmd.getTransportGuarantee()); + //upcmd.setSecureWSDLAccess(pcmd.getSecureWSDLAccess()); + ubmd.setPortComponent(upcmd); + } + } + return ubmd; + } +} Property changes on: branches/jbossws-1.2.0/integration-jboss40/src/java/org/jboss/ws/integration/jboss40/ApplicationMetaDataAdapter.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Copied: branches/jbossws-1.2.0/integration-jboss40/src/java/org/jboss/ws/integration/jboss40/ServiceRefMetaDataAdapter.java (from rev 2584, 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/ServiceRefMetaDataAdapter.java (rev 0) +++ branches/jbossws-1.2.0/integration-jboss40/src/java/org/jboss/ws/integration/jboss40/ServiceRefMetaDataAdapter.java 2007-03-10 21:59:14 UTC (rev 2591) @@ -0,0 +1,131 @@ +/* + * 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.jboss40; + +// $Id$ + +import java.io.IOException; +import java.net.URL; +import java.util.Enumeration; +import java.util.LinkedHashMap; +import java.util.Properties; + +import javax.xml.namespace.QName; + +import org.jboss.webservice.metadata.serviceref.HandlerMetaData; +import org.jboss.webservice.metadata.serviceref.InitParamMetaData; +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.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 + * + * @author Thomas.Diesler(a)jboss.org + * @since 05-May-2006 + */ +public class ServiceRefMetaDataAdapter +{ + public UnifiedServiceRefMetaData buildServiceRefMetaData(UnifiedDeploymentInfo udi, ServiceRefMetaData srmd) throws IOException + { + UnifiedServiceRefMetaData usrmd = new UnifiedServiceRefMetaData(udi.vfRoot); + usrmd.setServiceRefName(srmd.getServiceRefName()); + usrmd.setServiceInterface(srmd.getServiceInterface()); + 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(usrmd); + upcmd.setServiceEndpointInterface(pcmd.getServiceEndpointInterface()); + upcmd.setPortComponentLink(pcmd.getPortComponentLink()); + 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); + } + + 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()) + { + UnifiedInitParamMetaData ip = new UnifiedInitParamMetaData(); + 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); + } + usrmd.addHandler(uhmd); + } + + usrmd.setConfigName(srmd.getConfigName()); + usrmd.setConfigFile(srmd.getConfigFile()); + URL wsdlOverride = srmd.getWsdlOverride(); + if (wsdlOverride != null) + usrmd.setWsdlOverride(wsdlOverride.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; + } +} Added: branches/jbossws-1.2.0/integration-jboss40/src/java/org/jboss/ws/integration/jboss40/ServiceRefMetaDataAdapterFactory.java =================================================================== --- branches/jbossws-1.2.0/integration-jboss40/src/java/org/jboss/ws/integration/jboss40/ServiceRefMetaDataAdapterFactory.java (rev 0) +++ branches/jbossws-1.2.0/integration-jboss40/src/java/org/jboss/ws/integration/jboss40/ServiceRefMetaDataAdapterFactory.java 2007-03-10 21:59:14 UTC (rev 2591) @@ -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.jboss40; + +// $Id$ + +import org.jboss.kernel.spi.registry.KernelRegistry; +import org.jboss.kernel.spi.registry.KernelRegistryEntry; +import org.jboss.ws.integration.KernelLocator; + +/** + * @author Thomas.Diesler(a)jboss.org + * @since 10-Mar-2007 + */ +public class ServiceRefMetaDataAdapterFactory +{ + // Hide ctor + private ServiceRefMetaDataAdapterFactory() + { + } + + public static ServiceRefMetaDataAdapter newInstance() + { + KernelRegistry registry = KernelLocator.getKernel().getRegistry(); + KernelRegistryEntry entry = registry.getEntry("ServiceRefMetaDataAdapter"); + return (ServiceRefMetaDataAdapter)entry.getTarget(); + } +} Property changes on: branches/jbossws-1.2.0/integration-jboss40/src/java/org/jboss/ws/integration/jboss40/ServiceRefMetaDataAdapterFactory.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Deleted: 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-10 20:47:44 UTC (rev 2590) +++ branches/jbossws-1.2.0/integration-jboss40/src/java/org/jboss/ws/integration/jboss40/ServiceRefMetaDataAdaptor.java 2007-03-10 21:59:14 UTC (rev 2591) @@ -1,131 +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.jboss40; - -// $Id$ - -import java.io.IOException; -import java.net.URL; -import java.util.Enumeration; -import java.util.LinkedHashMap; -import java.util.Properties; - -import javax.xml.namespace.QName; - -import org.jboss.webservice.metadata.serviceref.HandlerMetaData; -import org.jboss.webservice.metadata.serviceref.InitParamMetaData; -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.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 - * - * @author Thomas.Diesler(a)jboss.org - * @since 05-May-2006 - */ -public class ServiceRefMetaDataAdaptor -{ - public static UnifiedServiceRefMetaData buildServiceRefMetaData(UnifiedDeploymentInfo udi, ServiceRefMetaData srmd) throws IOException - { - UnifiedServiceRefMetaData usrmd = new UnifiedServiceRefMetaData(udi.vfRoot); - usrmd.setServiceRefName(srmd.getServiceRefName()); - usrmd.setServiceInterface(srmd.getServiceInterface()); - 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(usrmd); - upcmd.setServiceEndpointInterface(pcmd.getServiceEndpointInterface()); - upcmd.setPortComponentLink(pcmd.getPortComponentLink()); - 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); - } - - 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()) - { - UnifiedInitParamMetaData ip = new UnifiedInitParamMetaData(); - 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); - } - usrmd.addHandler(uhmd); - } - - usrmd.setConfigName(srmd.getConfigName()); - usrmd.setConfigFile(srmd.getConfigFile()); - URL wsdlOverride = srmd.getWsdlOverride(); - if (wsdlOverride != null) - usrmd.setWsdlOverride(wsdlOverride.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-10 20:47:44 UTC (rev 2590) +++ branches/jbossws-1.2.0/integration-jboss40/src/java/org/jboss/ws/integration/jboss40/WebServiceClientDeployer.java 2007-03-10 21:59:14 UTC (rev 2591) @@ -35,7 +35,7 @@ import org.jboss.ws.core.jaxrpc.client.ServiceReferenceable; import org.jboss.ws.core.server.UnifiedDeploymentInfo; import org.jboss.ws.integration.URLLoaderAdapter; -import org.jboss.ws.integration.jboss42.DeploymentInfoAdaptor; +import org.jboss.ws.integration.jboss42.DeploymentInfoAdapterFactory; import org.jboss.ws.metadata.builder.jaxrpc.JAXRPCClientDeployment; import org.jboss.ws.metadata.j2ee.serviceref.UnifiedServiceRefMetaData; @@ -67,9 +67,9 @@ // Build the container independent deployment info UnifiedDeploymentInfo udi = new JAXRPCClientDeployment(UnifiedDeploymentInfo.DeploymentType.JAXRPC_Client); - DeploymentInfoAdaptor.buildDeploymentInfo(udi, di); + DeploymentInfoAdapterFactory.newInstance().buildDeploymentInfo(udi, di); - UnifiedServiceRefMetaData usr = ServiceRefMetaDataAdaptor.buildServiceRefMetaData(udi, serviceRef); + UnifiedServiceRefMetaData usr = ServiceRefMetaDataAdapterFactory.newInstance().buildServiceRefMetaData(udi, serviceRef); usr.setVfsRoot(new URLLoaderAdapter(udi.url)); ServiceReferenceable ref = new ServiceReferenceable(usr); @@ -83,4 +83,10 @@ throw new DeploymentException("Cannot bind webservice to client environment", e); } } + + private ServiceRefMetaDataAdapter getServiceRefMetaDataAdaptor() + { + // TODO Auto-generated method stub + return null; + } } Modified: branches/jbossws-1.2.0/integration-jboss40/src/resources/jbossws.beans/META-INF/jboss-beans.xml =================================================================== --- branches/jbossws-1.2.0/integration-jboss40/src/resources/jbossws.beans/META-INF/jboss-beans.xml 2007-03-10 20:47:44 UTC (rev 2590) +++ branches/jbossws-1.2.0/integration-jboss40/src/resources/jbossws.beans/META-INF/jboss-beans.xml 2007-03-10 21:59:14 UTC (rev 2591) @@ -51,4 +51,16 @@ <bean name="ServerConfig" class="org.jboss.ws.integration.jboss42.ServerConfigImpl"/> + <bean name="DeploymentInfoAdapter" class="org.jboss.ws.integration.jboss42.DeploymentInfoAdapter"> + <property name="applicationMetaDataAdapter"> + <inject bean="ApplicationMetaDataAdapter"/> + </property> + <property name="webMetaDataAdapter"> + <inject bean="WebMetaDataAdapter"/> + </property> + </bean> + <bean name="ServiceRefMetaDataAdapter" class="org.jboss.ws.integration.jboss40.ServiceRefMetaDataAdapter"/> + <bean name="ApplicationMetaDataAdapter" class="org.jboss.ws.integration.jboss40.ApplicationMetaDataAdapter"/> + <bean name="WebMetaDataAdapter" class="org.jboss.ws.integration.jboss42.WebMetaDataAdapter"/> + </deployment> Added: branches/jbossws-1.2.0/integration-jboss42/src/java/org/jboss/ws/integration/jboss42/AbstractApplicationMetaDataAdapter.java =================================================================== --- branches/jbossws-1.2.0/integration-jboss42/src/java/org/jboss/ws/integration/jboss42/AbstractApplicationMetaDataAdapter.java (rev 0) +++ branches/jbossws-1.2.0/integration-jboss42/src/java/org/jboss/ws/integration/jboss42/AbstractApplicationMetaDataAdapter.java 2007-03-10 21:59:14 UTC (rev 2591) @@ -0,0 +1,84 @@ +/* + * 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.util.ArrayList; +import java.util.Iterator; +import java.util.List; + +import org.jboss.metadata.ApplicationMetaData; +import org.jboss.metadata.BeanMetaData; +import org.jboss.ws.metadata.j2ee.UnifiedApplicationMetaData; +import org.jboss.ws.metadata.j2ee.UnifiedBeanMetaData; +import org.jboss.ws.metadata.j2ee.UnifiedApplicationMetaData.PublishLocationAdapter; + +/** + * Build container independent application meta data + * + * @author Thomas.Diesler(a)jboss.org + * @since 05-May-2006 + */ +public abstract class AbstractApplicationMetaDataAdapter +{ + public UnifiedApplicationMetaData buildUnifiedApplicationMetaData(ApplicationMetaData apmd) + { + UnifiedApplicationMetaData umd = new UnifiedApplicationMetaData(); + buildUnifiedBeanMetaData(umd, apmd); + umd.setConfigName(apmd.getConfigName()); + umd.setConfigFile(apmd.getConfigFile()); + umd.setWebServiceContextRoot(apmd.getWebServiceContextRoot()); + umd.setSecurityDomain(apmd.getSecurityDomain()); + umd.setPublishLocationAdapter(getPublishLocationAdpater(apmd)); + return umd; + } + + protected PublishLocationAdapter getPublishLocationAdpater(final ApplicationMetaData apmd) + { + return new PublishLocationAdapter () + { + public String getWsdlPublishLocationByName(String name) + { + return apmd.getWsdlPublishLocationByName(name); + } + }; + } + + protected void buildUnifiedBeanMetaData(UnifiedApplicationMetaData umd, ApplicationMetaData metaData) + { + List<UnifiedBeanMetaData> beans = new ArrayList<UnifiedBeanMetaData>(); + Iterator it = metaData.getEnterpriseBeans(); + while (it.hasNext()) + { + BeanMetaData bmd = (BeanMetaData)it.next(); + UnifiedBeanMetaData ubmd = buildUnifiedBeanMetaData(bmd); + if (ubmd != null) + { + beans.add(ubmd); + } + } + umd.setEnterpriseBeans(beans); + } + + protected abstract UnifiedBeanMetaData buildUnifiedBeanMetaData(BeanMetaData bmd); +} Property changes on: branches/jbossws-1.2.0/integration-jboss42/src/java/org/jboss/ws/integration/jboss42/AbstractApplicationMetaDataAdapter.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: branches/jbossws-1.2.0/integration-jboss42/src/java/org/jboss/ws/integration/jboss42/ApplicationMetaDataAdapter.java =================================================================== --- branches/jbossws-1.2.0/integration-jboss42/src/java/org/jboss/ws/integration/jboss42/ApplicationMetaDataAdapter.java (rev 0) +++ branches/jbossws-1.2.0/integration-jboss42/src/java/org/jboss/ws/integration/jboss42/ApplicationMetaDataAdapter.java 2007-03-10 21:59:14 UTC (rev 2591) @@ -0,0 +1,80 @@ +/* + * 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 org.jboss.metadata.BeanMetaData; +import org.jboss.metadata.EjbPortComponentMetaData; +import org.jboss.metadata.MessageDrivenMetaData; +import org.jboss.metadata.SessionMetaData; +import org.jboss.ws.metadata.j2ee.UnifiedBeanMetaData; +import org.jboss.ws.metadata.j2ee.UnifiedEjbPortComponentMetaData; +import org.jboss.ws.metadata.j2ee.UnifiedMessageDrivenMetaData; +import org.jboss.ws.metadata.j2ee.UnifiedSessionMetaData; + +/** + * Build container independent application meta data + * + * @author Thomas.Diesler(a)jboss.org + * @since 05-May-2006 + */ +public class ApplicationMetaDataAdapter extends AbstractApplicationMetaDataAdapter +{ + protected UnifiedBeanMetaData buildUnifiedBeanMetaData(BeanMetaData bmd) + { + UnifiedBeanMetaData ubmd = null; + if (bmd instanceof SessionMetaData) + { + ubmd = new UnifiedSessionMetaData(); + } + else if (bmd instanceof MessageDrivenMetaData) + { + ubmd = new UnifiedMessageDrivenMetaData(); + ((UnifiedMessageDrivenMetaData)ubmd).setDestinationJndiName(((MessageDrivenMetaData)bmd).getDestinationJndiName()); + } + + if (ubmd != null) + { + ubmd.setEjbName(bmd.getEjbName()); + ubmd.setEjbClass(bmd.getEjbClass()); + ubmd.setServiceEndpointInterface(bmd.getServiceEndpoint()); + ubmd.setHome(bmd.getHome()); + ubmd.setLocalHome(bmd.getLocalHome()); + ubmd.setJndiName(bmd.getJndiName()); + ubmd.setLocalJndiName(bmd.getLocalJndiName()); + + EjbPortComponentMetaData pcmd = bmd.getPortComponent(); + if (pcmd != null) + { + UnifiedEjbPortComponentMetaData upcmd = new UnifiedEjbPortComponentMetaData(); + upcmd.setPortComponentName(pcmd.getPortComponentName()); + upcmd.setPortComponentURI(pcmd.getPortComponentURI()); + upcmd.setAuthMethod(pcmd.getAuthMethod()); + upcmd.setTransportGuarantee(pcmd.getTransportGuarantee()); + upcmd.setSecureWSDLAccess(pcmd.getSecureWSDLAccess()); + ubmd.setPortComponent(upcmd); + } + } + return ubmd; + } +} Deleted: branches/jbossws-1.2.0/integration-jboss42/src/java/org/jboss/ws/integration/jboss42/ApplicationMetaDataAdaptor.java =================================================================== --- branches/jbossws-1.2.0/integration-jboss42/src/java/org/jboss/ws/integration/jboss42/ApplicationMetaDataAdaptor.java 2007-03-10 20:47:44 UTC (rev 2590) +++ branches/jbossws-1.2.0/integration-jboss42/src/java/org/jboss/ws/integration/jboss42/ApplicationMetaDataAdaptor.java 2007-03-10 21:59:14 UTC (rev 2591) @@ -1,125 +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.util.ArrayList; -import java.util.Iterator; -import java.util.List; - -import org.jboss.metadata.ApplicationMetaData; -import org.jboss.metadata.BeanMetaData; -import org.jboss.metadata.EjbPortComponentMetaData; -import org.jboss.metadata.MessageDrivenMetaData; -import org.jboss.metadata.SessionMetaData; -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.UnifiedMessageDrivenMetaData; -import org.jboss.ws.metadata.j2ee.UnifiedSessionMetaData; -import org.jboss.ws.metadata.j2ee.UnifiedApplicationMetaData.PublishLocationAdapter; - -/** - * Build container independent application meta data - * - * @author Thomas.Diesler(a)jboss.org - * @since 05-May-2006 - */ -public class ApplicationMetaDataAdaptor -{ - public static UnifiedApplicationMetaData buildUnifiedApplicationMetaData(ApplicationMetaData apmd) - { - UnifiedApplicationMetaData umd = new UnifiedApplicationMetaData(); - buildUnifiedBeanMetaData(umd, apmd); - umd.setConfigName(apmd.getConfigName()); - umd.setConfigFile(apmd.getConfigFile()); - umd.setWebServiceContextRoot(apmd.getWebServiceContextRoot()); - umd.setSecurityDomain(apmd.getSecurityDomain()); - umd.setPublishLocationAdapter(getPublishLocationAdpater(apmd)); - return umd; - } - - private static PublishLocationAdapter getPublishLocationAdpater(final ApplicationMetaData apmd) - { - return new PublishLocationAdapter () - { - public String getWsdlPublishLocationByName(String name) - { - return apmd.getWsdlPublishLocationByName(name); - } - }; - } - - private static void buildUnifiedBeanMetaData(UnifiedApplicationMetaData umd, ApplicationMetaData metaData) - { - List<UnifiedBeanMetaData> beans = new ArrayList<UnifiedBeanMetaData>(); - Iterator it = metaData.getEnterpriseBeans(); - while (it.hasNext()) - { - BeanMetaData bmd = (BeanMetaData)it.next(); - UnifiedBeanMetaData ubmd = buildUnifiedBeanMetaData(bmd); - if (ubmd != null) - { - beans.add(ubmd); - } - } - umd.setEnterpriseBeans(beans); - } - - private static UnifiedBeanMetaData buildUnifiedBeanMetaData(BeanMetaData bmd) - { - UnifiedBeanMetaData ubmd = null; - if (bmd instanceof SessionMetaData) - { - ubmd = new UnifiedSessionMetaData(); - } - else if (bmd instanceof MessageDrivenMetaData) - { - ubmd = new UnifiedMessageDrivenMetaData(); - ((UnifiedMessageDrivenMetaData)ubmd).setDestinationJndiName(((MessageDrivenMetaData)bmd).getDestinationJndiName()); - } - - if (ubmd != null) - { - ubmd.setEjbName(bmd.getEjbName()); - ubmd.setEjbClass(bmd.getEjbClass()); - ubmd.setServiceEndpointInterface(bmd.getServiceEndpoint()); - ubmd.setHome(bmd.getHome()); - ubmd.setLocalHome(bmd.getLocalHome()); - ubmd.setJndiName(bmd.getJndiName()); - ubmd.setLocalJndiName(bmd.getLocalJndiName()); - - EjbPortComponentMetaData pcmd = bmd.getPortComponent(); - if (pcmd != null) - { - UnifiedEjbPortComponentMetaData upcmd = new UnifiedEjbPortComponentMetaData(); - upcmd.setPortComponentName(pcmd.getPortComponentName()); - upcmd.setPortComponentURI(pcmd.getPortComponentURI()); - upcmd.setAuthMethod(pcmd.getAuthMethod()); - upcmd.setTransportGuarantee(pcmd.getTransportGuarantee()); - ubmd.setPortComponent(upcmd); - } - } - return ubmd; - } -} 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-10 20:47:44 UTC (rev 2590) +++ branches/jbossws-1.2.0/integration-jboss42/src/java/org/jboss/ws/integration/jboss42/DeployerInterceptorEJB21.java 2007-03-10 21:59:14 UTC (rev 2591) @@ -49,7 +49,7 @@ { UnifiedVirtualFile vfsWebservices = getWebservicesFile(di); UnifiedDeploymentInfo udi = new JAXRPCDeployment(UnifiedDeploymentInfo.DeploymentType.JAXRPC_EJB21, vfsWebservices); - DeploymentInfoAdaptor.buildDeploymentInfo(udi, di); + DeploymentInfoAdapterFactory.newInstance().buildDeploymentInfo(udi, di); return udi; } Modified: branches/jbossws-1.2.0/integration-jboss42/src/java/org/jboss/ws/integration/jboss42/DeployerInterceptorEJB3.java =================================================================== --- branches/jbossws-1.2.0/integration-jboss42/src/java/org/jboss/ws/integration/jboss42/DeployerInterceptorEJB3.java 2007-03-10 20:47:44 UTC (rev 2590) +++ branches/jbossws-1.2.0/integration-jboss42/src/java/org/jboss/ws/integration/jboss42/DeployerInterceptorEJB3.java 2007-03-10 21:59:14 UTC (rev 2591) @@ -55,7 +55,7 @@ protected UnifiedDeploymentInfo createUnifiedDeploymentInfo(DeploymentInfo di) throws Exception { UnifiedDeploymentInfo udi = new JAXWSDeployment(UnifiedDeploymentInfo.DeploymentType.JAXWS_EJB3); - DeploymentInfoAdaptor.buildDeploymentInfo(udi, di); + DeploymentInfoAdapterFactory.newInstance().buildDeploymentInfo(udi, di); Ejb3ModuleMBean ejb3Module = getEJB3Module(udi.deployedObject); 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-10 20:47:44 UTC (rev 2590) +++ branches/jbossws-1.2.0/integration-jboss42/src/java/org/jboss/ws/integration/jboss42/DeployerInterceptorJSE.java 2007-03-10 21:59:14 UTC (rev 2591) @@ -108,12 +108,12 @@ { UnifiedVirtualFile vfsWebservices = getWebservicesFile(di); udi = new JAXRPCDeployment(UnifiedDeploymentInfo.DeploymentType.JAXRPC_JSE, vfsWebservices); - DeploymentInfoAdaptor.buildDeploymentInfo(udi, di); + DeploymentInfoAdapterFactory.newInstance().buildDeploymentInfo(udi, di); } else if (type == UnifiedDeploymentInfo.DeploymentType.JAXWS_JSE) { udi = new JAXWSDeployment(UnifiedDeploymentInfo.DeploymentType.JAXWS_JSE); - DeploymentInfoAdaptor.buildDeploymentInfo(udi, di); + DeploymentInfoAdapterFactory.newInstance().buildDeploymentInfo(udi, di); } else { Copied: branches/jbossws-1.2.0/integration-jboss42/src/java/org/jboss/ws/integration/jboss42/DeploymentInfoAdapter.java (from rev 2584, branches/jbossws-1.2.0/integration-jboss42/src/java/org/jboss/ws/integration/jboss42/DeploymentInfoAdaptor.java) =================================================================== --- branches/jbossws-1.2.0/integration-jboss42/src/java/org/jboss/ws/integration/jboss42/DeploymentInfoAdapter.java (rev 0) +++ branches/jbossws-1.2.0/integration-jboss42/src/java/org/jboss/ws/integration/jboss42/DeploymentInfoAdapter.java 2007-03-10 21:59:14 UTC (rev 2591) @@ -0,0 +1,103 @@ +/* + * 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.File; +import java.net.MalformedURLException; +import java.net.URL; + +import org.jboss.deployment.DeploymentInfo; +import org.jboss.metadata.ApplicationMetaData; +import org.jboss.metadata.WebMetaData; +import org.jboss.ws.core.server.UnifiedDeploymentInfo; +import org.jboss.ws.integration.ResourceLoaderAdapter; + +/** + * Build container independent deployment info. + * + * @author Thomas.Diesler(a)jboss.org + * @since 05-May-2006 + */ +public class DeploymentInfoAdapter +{ + private WebMetaDataAdapter webMetaDataAdapter; + private AbstractApplicationMetaDataAdapter applicationMetaDataAdapter; + + public void setApplicationMetaDataAdapter(AbstractApplicationMetaDataAdapter applicationMetaDataAdapter) + { + this.applicationMetaDataAdapter = applicationMetaDataAdapter; + } + + public void setWebMetaDataAdapter(WebMetaDataAdapter webMetaDataAdapter) + { + this.webMetaDataAdapter = webMetaDataAdapter; + } + + public UnifiedDeploymentInfo buildDeploymentInfo(UnifiedDeploymentInfo udi, DeploymentInfo di) throws Exception + { + if (di.parent != null) + { + udi.parent = new UnifiedDeploymentInfo(null); + buildDeploymentInfo(udi.parent, di.parent); + } + + udi.vfRoot = new ResourceLoaderAdapter(di.localCl); + udi.name = di.getCanonicalName(); + udi.simpleName = di.shortName; + udi.url = getDeploymentURL(di); + udi.classLoader = di.annotationsCl; + udi.deployedObject = di.deployedObject; + + buildMetaData(udi, di.metaData); + + return udi; + } + + private URL getDeploymentURL(DeploymentInfo di) throws MalformedURLException + { + URL deploymentURL = (di.localUrl != null ? di.localUrl : di.url); + if ("file".equals(deploymentURL.getProtocol())) + { + String path = deploymentURL.getPath(); + if (new File(path).isFile()) + { + deploymentURL = new URL("jar:file:" + path + "!/"); + } + } + return deploymentURL; + } + + private void buildMetaData(UnifiedDeploymentInfo udi, Object metaData) + { + if (metaData instanceof WebMetaData) + { + udi.metaData = webMetaDataAdapter.buildUnifiedWebMetaData((WebMetaData)metaData); + udi.webappURL = udi.url; + } + else if (metaData instanceof ApplicationMetaData) + { + udi.metaData = applicationMetaDataAdapter.buildUnifiedApplicationMetaData((ApplicationMetaData)metaData); + } + } +} Added: branches/jbossws-1.2.0/integration-jboss42/src/java/org/jboss/ws/integration/jboss42/DeploymentInfoAdapterFactory.java =================================================================== --- branches/jbossws-1.2.0/integration-jboss42/src/java/org/jboss/ws/integration/jboss42/DeploymentInfoAdapterFactory.java (rev 0) +++ branches/jbossws-1.2.0/integration-jboss42/src/java/org/jboss/ws/integration/jboss42/DeploymentInfoAdapterFactory.java 2007-03-10 21:59:14 UTC (rev 2591) @@ -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.jboss42; + +// $Id$ + +import org.jboss.kernel.spi.registry.KernelRegistry; +import org.jboss.kernel.spi.registry.KernelRegistryEntry; +import org.jboss.ws.integration.KernelLocator; + +/** + * @author Thomas.Diesler(a)jboss.org + * @since 10-Mar-2007 + */ +public class DeploymentInfoAdapterFactory +{ + // Hide ctor + private DeploymentInfoAdapterFactory() + { + } + + public static DeploymentInfoAdapter newInstance() + { + KernelRegistry registry = KernelLocator.getKernel().getRegistry(); + KernelRegistryEntry entry = registry.getEntry("DeploymentInfoAdapter"); + return (DeploymentInfoAdapter)entry.getTarget(); + } +} Property changes on: branches/jbossws-1.2.0/integration-jboss42/src/java/org/jboss/ws/integration/jboss42/DeploymentInfoAdapterFactory.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Deleted: branches/jbossws-1.2.0/integration-jboss42/src/java/org/jboss/ws/integration/jboss42/DeploymentInfoAdaptor.java =================================================================== --- branches/jbossws-1.2.0/integration-jboss42/src/java/org/jboss/ws/integration/jboss42/DeploymentInfoAdaptor.java 2007-03-10 20:47:44 UTC (rev 2590) +++ branches/jbossws-1.2.0/integration-jboss42/src/java/org/jboss/ws/integration/jboss42/DeploymentInfoAdaptor.java 2007-03-10 21:59:14 UTC (rev 2591) @@ -1,90 +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.File; -import java.net.MalformedURLException; -import java.net.URL; - -import org.jboss.deployment.DeploymentInfo; -import org.jboss.metadata.ApplicationMetaData; -import org.jboss.metadata.WebMetaData; -import org.jboss.ws.core.server.UnifiedDeploymentInfo; -import org.jboss.ws.integration.ResourceLoaderAdapter; - -/** - * Build container independent deployment info. - * - * @author Thomas.Diesler(a)jboss.org - * @since 05-May-2006 - */ -public class DeploymentInfoAdaptor -{ - public static UnifiedDeploymentInfo buildDeploymentInfo(UnifiedDeploymentInfo udi, DeploymentInfo di) throws Exception - { - if (di.parent != null) - { - udi.parent = new UnifiedDeploymentInfo(null); - buildDeploymentInfo(udi.parent, di.parent); - } - - udi.vfRoot = new ResourceLoaderAdapter(di.localCl); - udi.name = di.getCanonicalName(); - udi.simpleName = di.shortName; - udi.url = getDeploymentURL(di); - udi.classLoader = di.annotationsCl; - udi.deployedObject = di.deployedObject; - - buildMetaData(udi, di.metaData); - - return udi; - } - - private static URL getDeploymentURL(DeploymentInfo di) throws MalformedURLException - { - URL deploymentURL = (di.localUrl != null ? di.localUrl : di.url); - if ("file".equals(deploymentURL.getProtocol())) - { - String path = deploymentURL.getPath(); - if (new File(path).isFile()) - { - deploymentURL = new URL("jar:file:" + path + "!/"); - } - } - return deploymentURL; - } - - private static void buildMetaData(UnifiedDeploymentInfo udi, Object metaData) - { - if (metaData instanceof WebMetaData) - { - udi.metaData = WebMetaDataAdaptor.buildUnifiedWebMetaData((WebMetaData)metaData); - udi.webappURL = udi.url; - } - else if (metaData instanceof ApplicationMetaData) - { - udi.metaData = ApplicationMetaDataAdaptor.buildUnifiedApplicationMetaData((ApplicationMetaData)metaData); - } - } -} Copied: branches/jbossws-1.2.0/integration-jboss42/src/java/org/jboss/ws/integration/jboss42/WebMetaDataAdapter.java (from rev 2584, branches/jbossws-1.2.0/integration-jboss42/src/java/org/jboss/ws/integration/jboss42/WebMetaDataAdaptor.java) =================================================================== --- branches/jbossws-1.2.0/integration-jboss42/src/java/org/jboss/ws/integration/jboss42/WebMetaDataAdapter.java (rev 0) +++ branches/jbossws-1.2.0/integration-jboss42/src/java/org/jboss/ws/integration/jboss42/WebMetaDataAdapter.java 2007-03-10 21:59:14 UTC (rev 2591) @@ -0,0 +1,119 @@ +/* + * 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.util.ArrayList; +import java.util.HashMap; +import java.util.Iterator; +import java.util.List; +import java.util.Map; +import java.util.Map.Entry; + +import org.jboss.metadata.WebMetaData; +import org.jboss.metadata.WebSecurityMetaData; +import org.jboss.metadata.WebSecurityMetaData.WebResourceCollection; +import org.jboss.ws.metadata.j2ee.UnifiedWebMetaData; +import org.jboss.ws.metadata.j2ee.UnifiedWebSecurityMetaData; +import org.jboss.ws.metadata.j2ee.UnifiedWebMetaData.PublishLocationAdapter; +import org.jboss.ws.metadata.j2ee.UnifiedWebSecurityMetaData.UnifiedWebResourceCollection; + +/** + * Build container independent web meta data + * + * @author Thomas.Diesler(a)jboss.org + * @since 05-May-2006 + */ +public class WebMetaDataAdapter +{ + public UnifiedWebMetaData buildUnifiedWebMetaData(WebMetaData wmd) + { + UnifiedWebMetaData umd = new UnifiedWebMetaData(); + umd.setContextRoot(wmd.getContextRoot()); + umd.setServletMappings(wmd.getServletMappings()); + umd.setServletClassNames(getServletClassMap(wmd)); + umd.setConfigName(wmd.getConfigName()); + umd.setConfigFile(wmd.getConfigFile()); + umd.setSecurityDomain(wmd.getSecurityDomain()); + umd.setPublishLocationAdapter(getPublishLocationAdpater(wmd)); + umd.setSecurityMetaData(getSecurityMetaData(wmd.getSecurityContraints())); + + return umd; + } + + private PublishLocationAdapter getPublishLocationAdpater(final WebMetaData wmd) + { + return new PublishLocationAdapter () + { + public String getWsdlPublishLocationByName(String name) + { + return wmd.getWsdlPublishLocationByName(name); + } + }; + } + + private List<UnifiedWebSecurityMetaData> getSecurityMetaData(final Iterator securityConstraints) + { + ArrayList<UnifiedWebSecurityMetaData> unifiedsecurityMetaData = new ArrayList<UnifiedWebSecurityMetaData>(); + + while (securityConstraints.hasNext()) + { + WebSecurityMetaData securityMetaData = (WebSecurityMetaData)securityConstraints.next(); + + UnifiedWebSecurityMetaData current = new UnifiedWebSecurityMetaData(); + unifiedsecurityMetaData.add(current); + + current.setTransportGuarantee(securityMetaData.getTransportGuarantee()); + + HashMap resources = securityMetaData.getWebResources(); + for (Object webResourceObj : resources.values()) + { + WebResourceCollection webResource = (WebResourceCollection)webResourceObj; + UnifiedWebResourceCollection currentResource = current.addWebResource(webResource.getName()); + for (String currentPattern : webResource.getUrlPatterns()) + { + currentResource.addPattern(currentPattern); + } + } + + } + + return unifiedsecurityMetaData; + } + + private Map<String, String> getServletClassMap(WebMetaData wmd) + { + Map<String, String> mappings = new HashMap<String, String>(); + Iterator it = wmd.getServletClassMap().entrySet().iterator(); + while(it.hasNext()) + { + Map.Entry entry = (Entry)it.next(); + String servletName = (String)entry.getKey(); + String servletClass = (String)entry.getValue(); + // Skip JSPs + if (servletClass != null) + mappings.put(servletName, servletClass); + } + return mappings; + } +} Deleted: branches/jbossws-1.2.0/integration-jboss42/src/java/org/jboss/ws/integration/jboss42/WebMetaDataAdaptor.java =================================================================== --- branches/jbossws-1.2.0/integration-jboss42/src/java/org/jboss/ws/integration/jboss42/WebMetaDataAdaptor.java 2007-03-10 20:47:44 UTC (rev 2590) +++ branches/jbossws-1.2.0/integration-jboss42/src/java/org/jboss/ws/integration/jboss42/WebMetaDataAdaptor.java 2007-03-10 21:59:14 UTC (rev 2591) @@ -1,119 +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.util.ArrayList; -import java.util.HashMap; -import java.util.Iterator; -import java.util.List; -import java.util.Map; -import java.util.Map.Entry; - -import org.jboss.metadata.WebMetaData; -import org.jboss.metadata.WebSecurityMetaData; -import org.jboss.metadata.WebSecurityMetaData.WebResourceCollection; -import org.jboss.ws.metadata.j2ee.UnifiedWebMetaData; -import org.jboss.ws.metadata.j2ee.UnifiedWebSecurityMetaData; -import org.jboss.ws.metadata.j2ee.UnifiedWebMetaData.PublishLocationAdapter; -import org.jboss.ws.metadata.j2ee.UnifiedWebSecurityMetaData.UnifiedWebResourceCollection; - -/** - * Build container independent web meta data - * - * @author Thomas.Diesler(a)jboss.org - * @since 05-May-2006 - */ -public class WebMetaDataAdaptor -{ - public static UnifiedWebMetaData buildUnifiedWebMetaData(WebMetaData wmd) - { - UnifiedWebMetaData umd = new UnifiedWebMetaData(); - umd.setContextRoot(wmd.getContextRoot()); - umd.setServletMappings(wmd.getServletMappings()); - umd.setServletClassNames(getServletClassMap(wmd)); - umd.setConfigName(wmd.getConfigName()); - umd.setConfigFile(wmd.getConfigFile()); - umd.setSecurityDomain(wmd.getSecurityDomain()); - umd.setPublishLocationAdapter(getPublishLocationAdpater(wmd)); - umd.setSecurityMetaData(getSecurityMetaData(wmd.getSecurityContraints())); - - return umd; - } - - private static PublishLocationAdapter getPublishLocationAdpater(final WebMetaData wmd) - { - return new PublishLocationAdapter () - { - public String getWsdlPublishLocationByName(String name) - { - return wmd.getWsdlPublishLocationByName(name); - } - }; - } - - private static List<UnifiedWebSecurityMetaData> getSecurityMetaData(final Iterator securityConstraints) - { - ArrayList<UnifiedWebSecurityMetaData> unifiedsecurityMetaData = new ArrayList<UnifiedWebSecurityMetaData>(); - - while (securityConstraints.hasNext()) - { - WebSecurityMetaData securityMetaData = (WebSecurityMetaData)securityConstraints.next(); - - UnifiedWebSecurityMetaData current = new UnifiedWebSecurityMetaData(); - unifiedsecurityMetaData.add(current); - - current.setTransportGuarantee(securityMetaData.getTransportGuarantee()); - - HashMap resources = securityMetaData.getWebResources(); - for (Object webResourceObj : resources.values()) - { - WebResourceCollection webResource = (WebResourceCollection)webResourceObj; - UnifiedWebResourceCollection currentResource = current.addWebResource(webResource.getName()); - for (String currentPattern : webResource.getUrlPatterns()) - { - currentResource.addPattern(currentPattern); - } - } - - } - - return unifiedsecurityMetaData; - } - - private static Map<String, String> getServletClassMap(WebMetaData wmd) - { - Map<String, String> mappings = new HashMap<String, String>(); - Iterator it = wmd.getServletClassMap().entrySet().iterator(); - while(it.hasNext()) - { - Map.Entry entry = (Entry)it.next(); - String servletName = (String)entry.getKey(); - String servletClass = (String)entry.getValue(); - // Skip JSPs - if (servletClass != null) - mappings.put(servletName, servletClass); - } - return mappings; - } -} Modified: branches/jbossws-1.2.0/integration-jboss42/src/resources/jbossws.beans/META-INF/jboss-beans.xml =================================================================== --- branches/jbossws-1.2.0/integration-jboss42/src/resources/jbossws.beans/META-INF/jboss-beans.xml 2007-03-10 20:47:44 UTC (rev 2590) +++ branches/jbossws-1.2.0/integration-jboss42/src/resources/jbossws.beans/META-INF/jboss-beans.xml 2007-03-10 21:59:14 UTC (rev 2591) @@ -53,5 +53,16 @@ <bean name="SubscriptionManager" class="org.jboss.ws.extensions.eventing.mgmt.SubscriptionManager"/> <bean name="ServerConfig" class="org.jboss.ws.integration.jboss42.ServerConfigImpl"/> - + + <bean name="DeploymentInfoAdapter" class="org.jboss.ws.integration.jboss42.DeploymentInfoAdapter"> + <property name="applicationMetaDataAdapter"> + <inject bean="ApplicationMetaDataAdapter"/> + </property> + <property name="webMetaDataAdapter"> + <inject bean="WebMetaDataAdapter"/> + </property> + </bean> + <bean name="ApplicationMetaDataAdapter" class="org.jboss.ws.integration.jboss42.ApplicationMetaDataAdapter"/> + <bean name="WebMetaDataAdapter" class="org.jboss.ws.integration.jboss42.WebMetaDataAdapter"/> + </deployment> Modified: branches/jbossws-1.2.0/integration-tomcat/.classpath =================================================================== --- branches/jbossws-1.2.0/integration-tomcat/.classpath 2007-03-10 20:47:44 UTC (rev 2590) +++ branches/jbossws-1.2.0/integration-tomcat/.classpath 2007-03-10 21:59:14 UTC (rev 2591) @@ -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/ant.jar"/> Modified: branches/jbossws-1.2.0/jbossws-tests/ant-import/build-jars-jaxrpc.xml =================================================================== --- branches/jbossws-1.2.0/jbossws-tests/ant-import/build-jars-jaxrpc.xml 2007-03-10 20:47:44 UTC (rev 2590) +++ branches/jbossws-1.2.0/jbossws-tests/ant-import/build-jars-jaxrpc.xml 2007-03-10 21:59:14 UTC (rev 2591) @@ -1689,6 +1689,36 @@ </metainf> </jar> + <!-- jaxrpc-jbws723 --> + <jar jarfile="${tests.output.dir}/libs/jaxrpc-jbws723.jar"> + <fileset dir="${tests.output.dir}/classes"> + <include name="org/jboss/test/ws/jaxrpc/jbws723/OrganizationService.class"/> + <include name="org/jboss/test/ws/jaxrpc/jbws723/OrganizationHome.class"/> + <include name="org/jboss/test/ws/jaxrpc/jbws723/OrganizationRemote.class"/> + <include name="org/jboss/test/ws/jaxrpc/jbws723/OrganizationImpl.class"/> + </fileset> + <metainf dir="${tests.output.dir}/resources/jaxrpc/jbws723/META-INF"> + <include name="jaxrpc-mapping.xml"/> + <include name="webservices.xml"/> + <include name="ejb-jar.xml"/> + <include name="jboss.xml"/> + <include name="wsdl/**"/> + </metainf> + </jar> + <jar jarfile="${tests.output.dir}/libs/jaxrpc-jbws723-client.jar"> + <fileset dir="${tests.output.dir}/classes"> + <include name="org/jboss/test/ws/jaxrpc/jbws723/OrganizationService.class"/> + <include name="org/jboss/test/ws/jaxrpc/jbws723/OrganizationHome.class"/> + <include name="org/jboss/test/ws/jaxrpc/jbws723/OrganizationRemote.class"/> + </fileset> + <metainf dir="${tests.output.dir}/resources/jaxrpc/jbws723/META-INF"> + <include name="application-client.xml"/> + <include name="jboss-client.xml"/> + <include name="jaxrpc-mapping.xml"/> + <include name="wsdl/**"/> + </metainf> + </jar> + <!-- jaxrpc-jbws732 --> <war warfile="${tests.output.dir}/libs/jaxrpc-jbws732.war" webxml="${tests.output.dir}/resources/jaxrpc/jbws732/WEB-INF/web.xml"> <classes dir="${tests.output.dir}/classes"> Copied: branches/jbossws-1.2.0/jbossws-tests/src/java/org/jboss/test/ws/jaxrpc/jbws723 (from rev 2589, trunk/jbossws-tests/src/java/org/jboss/test/ws/jaxrpc/jbws723) Deleted: branches/jbossws-1.2.0/jbossws-tests/src/java/org/jboss/test/ws/jaxrpc/jbws723/JBWS723TestCase.java =================================================================== --- trunk/jbossws-tests/src/java/org/jboss/test/ws/jaxrpc/jbws723/JBWS723TestCase.java 2007-03-10 20:37:25 UTC (rev 2589) +++ branches/jbossws-1.2.0/jbossws-tests/src/java/org/jboss/test/ws/jaxrpc/jbws723/JBWS723TestCase.java 2007-03-10 21:59:14 UTC (rev 2591) @@ -1,219 +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.test.ws.jaxrpc.jbws723; - -import java.net.URL; -import java.rmi.RemoteException; - -import javax.naming.InitialContext; -import javax.xml.namespace.QName; -import javax.xml.rpc.Service; -import javax.xml.rpc.Stub; - -import junit.framework.Test; - -import org.jboss.security.SecurityAssociation; -import org.jboss.security.SimplePrincipal; -import org.jboss.test.ws.JBossWSTest; -import org.jboss.test.ws.JBossWSTestSetup; -import org.jboss.ws.metadata.wsdl.WSDLDefinitions; -import org.jboss.ws.metadata.wsdl.WSDLException; -import org.jboss.ws.tools.wsdl.WSDLDefinitionsFactory; - - -/** - * Protect access to WSDL - * - * http://jira.jboss.org/jira/browse/JBWS-723 - * - * @author Thomas.Diesler(a)jboss.org - * @since 10-Mar-2007 - */ -public class JBWS723TestCase extends JBossWSTest -{ - public static final String USERNAME = "kermit"; - public static final String PASSWORD = "thefrog"; - - public static Test suite() throws Exception - { - return JBossWSTestSetup.newTestSetup(JBWS723TestCase.class, "jaxrpc-jbws723.jar, jaxrpc-jbws723-client.jar"); - } - - protected void setUp() throws Exception - { - super.setUp(); - SecurityAssociation.setPrincipal(null); - SecurityAssociation.setCredential(null); - } - - /** Test required principal/credential for this bean - */ - public void testRoleSecuredSLSB() throws Exception - { - InitialContext iniCtx = getInitialContext(); - OrganizationHome home = (OrganizationHome)iniCtx.lookup("ejb/RoleSecuredSLSB"); - - OrganizationRemote bean = null; - try - { - bean = home.create(); - fail("Security exception expected"); - } - catch (Exception e) - { - // all cool, now try again with valid credentials - SecurityAssociation.setPrincipal(new SimplePrincipal(USERNAME)); - SecurityAssociation.setCredential(PASSWORD); - bean = home.create(); - } - - String info = bean.getContactInfo("mafia"); - assertEquals("The 'mafia' boss is currently out of office, please call again.", info); - } - - public void testRoleSecuredWSDLAccess() throws Exception - { - URL wsdlURL = new URL("http://" + getServerHost() + ":8080/jaxrpc-jbws723/RoleSecured?wsdl"); - WSDLDefinitionsFactory factory = WSDLDefinitionsFactory.newInstance(); - WSDLDefinitions wsdl = factory.parse(wsdlURL); - assertNotNull("Expect unsecured wsdl access by default for jaxrpc", wsdl); - } - - public void testRoleSecuredServiceAccess() throws Exception - { - InitialContext iniCtx = getInitialContext(); - Service service = (Service)iniCtx.lookup("java:comp/env/service/RoleSecured"); - QName portName = new QName("http://org.jboss.ws/jbws723", "RoleSecuredPort"); - OrganizationService port = (OrganizationService)service.getPort(portName, OrganizationService.class); - - try - { - port.getContactInfo("mafia"); - fail("Security exception expected"); - } - catch (RemoteException ignore) - { - // ignore expected exception - } - - Stub stub = (Stub)port; - stub._setProperty(Stub.USERNAME_PROPERTY, USERNAME); - stub._setProperty(Stub.PASSWORD_PROPERTY, PASSWORD); - - String info = port.getContactInfo("mafia"); - assertEquals("The 'mafia' boss is currently out of office, please call again.", info); - } - - /** Test that the remote access to this bean is unchecked - */ - public void testBasicSecuredSLSB() throws Exception - { - InitialContext iniCtx = getInitialContext(); - OrganizationHome home = (OrganizationHome)iniCtx.lookup("ejb/BasicSecuredSLSB"); - - OrganizationRemote bean = home.create(); - String info = bean.getContactInfo("mafia"); - assertEquals("The 'mafia' boss is currently out of office, please call again.", info); - } - - public void testBasicSecuredWSDLAccess() throws Exception - { - URL wsdlURL = new URL("http://" + getServerHost() + ":8080/jaxrpc-jbws723/BasicSecured?wsdl"); - WSDLDefinitionsFactory factory = WSDLDefinitionsFactory.newInstance(); - try - { - factory.parse(wsdlURL); - fail("Expect secured wsdl access"); - } - catch (WSDLException ex) - { - String cause = ex.getCause().getMessage(); - assertTrue("Server returned HTTP response code: 401", cause.startsWith("Server returned HTTP response code: 401")); - } - } - - public void testBasicSecuredServiceAccess() throws Exception - { - InitialContext iniCtx = getInitialContext(); - Service service = (Service)iniCtx.lookup("java:comp/env/service/BasicSecured"); - QName portName = new QName("http://org.jboss.ws/jbws723", "BasicSecuredPort"); - OrganizationService port = (OrganizationService)service.getPort(portName, OrganizationService.class); - - try - { - port.getContactInfo("mafia"); - fail("Security exception expected"); - } - catch (RemoteException ignore) - { - // ignore expected exception - } - - Stub stub = (Stub)port; - stub._setProperty(Stub.USERNAME_PROPERTY, USERNAME); - stub._setProperty(Stub.PASSWORD_PROPERTY, PASSWORD); - - String info = port.getContactInfo("mafia"); - assertEquals("The 'mafia' boss is currently out of office, please call again.", info); - } - - public void testConfidentialSecuredWSDLAccess() throws Exception - { - URL wsdlURL = new URL("http://" + getServerHost() + ":8080/jaxrpc-jbws723/ConfidentialSecured?wsdl"); - WSDLDefinitionsFactory factory = WSDLDefinitionsFactory.newInstance(); - WSDLDefinitions wsdl = factory.parse(wsdlURL); - assertNotNull("Expect unsecured wsdl access", wsdl); - } - - public void testConfidentialServiceAccess() throws Exception - { - InitialContext iniCtx = getInitialContext(); - Service service = (Service)iniCtx.lookup("java:comp/env/service/ConfidentialSecured"); - QName portName = new QName("http://org.jboss.ws/jbws723", "ConfidentialPort"); - OrganizationService port = (OrganizationService)service.getPort(portName, OrganizationService.class); - - Stub stub = (Stub)port; - String address = (String)stub._getProperty(Stub.ENDPOINT_ADDRESS_PROPERTY); - assertEquals("https://" + getServerHost() + ":8443/jaxrpc-jbws723/ConfidentialSecured", address); - - // test non-confidential access - try - { - stub._setProperty(Stub.ENDPOINT_ADDRESS_PROPERTY, "http://" + getServerHost() + ":8080/jaxrpc-jbws723/ConfidentialSecured"); - port.getContactInfo("mafia"); - - if (isTargetJBoss50()) - System.out.println("FIXME: [JBAS-3595] - Tomcat allows http access with transport guarantie CONFIDENTIAL"); - else - fail("Security exception expected"); - } - catch (RemoteException ignore) - { - // ignore expected exception - } - - // test confidential access - //stub._setProperty(Stub.ENDPOINT_ADDRESS_PROPERTY, "https://" + getServerHost() + ":8443/jaxrpc-jbws723/ConfidentialSecured"); - //String info = port.getContactInfo("mafia"); - //assertEquals("The 'mafia' boss is currently out of office, please call again.", info); - } -} Copied: branches/jbossws-1.2.0/jbossws-tests/src/java/org/jboss/test/ws/jaxrpc/jbws723/JBWS723TestCase.java (from rev 2589, trunk/jbossws-tests/src/java/org/jboss/test/ws/jaxrpc/jbws723/JBWS723TestCase.java) =================================================================== --- branches/jbossws-1.2.0/jbossws-tests/src/java/org/jboss/test/ws/jaxrpc/jbws723/JBWS723TestCase.java (rev 0) +++ branches/jbossws-1.2.0/jbossws-tests/src/java/org/jboss/test/ws/jaxrpc/jbws723/JBWS723TestCase.java 2007-03-10 21:59:14 UTC (rev 2591) @@ -0,0 +1,219 @@ +/* + * 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.test.ws.jaxrpc.jbws723; + +import java.net.URL; +import java.rmi.RemoteException; + +import javax.naming.InitialContext; +import javax.xml.namespace.QName; +import javax.xml.rpc.Service; +import javax.xml.rpc.Stub; + +import junit.framework.Test; + +import org.jboss.security.SecurityAssociation; +import org.jboss.security.SimplePrincipal; +import org.jboss.test.ws.JBossWSTest; +import org.jboss.test.ws.JBossWSTestSetup; +import org.jboss.ws.metadata.wsdl.WSDLDefinitions; +import org.jboss.ws.metadata.wsdl.WSDLException; +import org.jboss.ws.tools.wsdl.WSDLDefinitionsFactory; + + +/** + * Protect access to WSDL + * + * http://jira.jboss.org/jira/browse/JBWS-723 + * + * @author Thomas.Diesler(a)jboss.org + * @since 10-Mar-2007 + */ +public class JBWS723TestCase extends JBossWSTest +{ + public static final String USERNAME = "kermit"; + public static final String PASSWORD = "thefrog"; + + public static Test suite() throws Exception + { + return JBossWSTestSetup.newTestSetup(JBWS723TestCase.class, "jaxrpc-jbws723.jar, jaxrpc-jbws723-client.jar"); + } + + protected void setUp() throws Exception + { + super.setUp(); + SecurityAssociation.setPrincipal(null); + SecurityAssociation.setCredential(null); + } + + /** Test required principal/credential for this bean + */ + public void testRoleSecuredSLSB() throws Exception + { + InitialContext iniCtx = getInitialContext(); + OrganizationHome home = (OrganizationHome)iniCtx.lookup("ejb/RoleSecuredSLSB"); + + OrganizationRemote bean = null; + try + { + bean = home.create(); + fail("Security exception expected"); + } + catch (Exception e) + { + // all cool, now try again with valid credentials + SecurityAssociation.setPrincipal(new SimplePrincipal(USERNAME)); + SecurityAssociation.setCredential(PASSWORD); + bean = home.create(); + } + + String info = bean.getContactInfo("mafia"); + assertEquals("The 'mafia' boss is currently out of office, please call again.", info); + } + + public void testRoleSecuredWSDLAccess() throws Exception + { + URL wsdlURL = new URL("http://" + getServerHost() + ":8080/jaxrpc-jbws723/RoleSecured?wsdl"); + WSDLDefinitionsFactory factory = WSDLDefinitionsFactory.newInstance(); + WSDLDefinitions wsdl = factory.parse(wsdlURL); + assertNotNull("Expect unsecured wsdl access by default for jaxrpc", wsdl); + } + + public void testRoleSecuredServiceAccess() throws Exception + { + InitialContext iniCtx = getInitialContext(); + Service service = (Service)iniCtx.lookup("java:comp/env/service/RoleSecured"); + QName portName = new QName("http://org.jboss.ws/jbws723", "RoleSecuredPort"); + OrganizationService port = (OrganizationService)service.getPort(portName, OrganizationService.class); + + try + { + port.getContactInfo("mafia"); + fail("Security exception expected"); + } + catch (RemoteException ignore) + { + // ignore expected exception + } + + Stub stub = (Stub)port; + stub._setProperty(Stub.USERNAME_PROPERTY, USERNAME); + stub._setProperty(Stub.PASSWORD_PROPERTY, PASSWORD); + + String info = port.getContactInfo("mafia"); + assertEquals("The 'mafia' boss is currently out of office, please call again.", info); + } + + /** Test that the remote access to this bean is unchecked + */ + public void testBasicSecuredSLSB() throws Exception + { + InitialContext iniCtx = getInitialContext(); + OrganizationHome home = (OrganizationHome)iniCtx.lookup("ejb/BasicSecuredSLSB"); + + OrganizationRemote bean = home.create(); + String info = bean.getContactInfo("mafia"); + assertEquals("The 'mafia' boss is currently out of office, please call again.", info); + } + + public void testBasicSecuredWSDLAccess() throws Exception + { + URL wsdlURL = new URL("http://" + getServerHost() + ":8080/jaxrpc-jbws723/BasicSecured?wsdl"); + WSDLDefinitionsFactory factory = WSDLDefinitionsFactory.newInstance(); + try + { + factory.parse(wsdlURL); + fail("Expect secured wsdl access"); + } + catch (WSDLException ex) + { + String cause = ex.getCause().getMessage(); + assertTrue("Server returned HTTP response code: 401", cause.startsWith("Server returned HTTP response code: 401")); + } + } + + public void testBasicSecuredServiceAccess() throws Exception + { + InitialContext iniCtx = getInitialContext(); + Service service = (Service)iniCtx.lookup("java:comp/env/service/BasicSecured"); + QName portName = new QName("http://org.jboss.ws/jbws723", "BasicSecuredPort"); + OrganizationService port = (OrganizationService)service.getPort(portName, OrganizationService.class); + + try + { + port.getContactInfo("mafia"); + fail("Security exception expected"); + } + catch (RemoteException ignore) + { + // ignore expected exception + } + + Stub stub = (Stub)port; + stub._setProperty(Stub.USERNAME_PROPERTY, USERNAME); + stub._setProperty(Stub.PASSWORD_PROPERTY, PASSWORD); + + String info = port.getContactInfo("mafia"); + assertEquals("The 'mafia' boss is currently out of office, please call again.", info); + } + + public void testConfidentialSecuredWSDLAccess() throws Exception + { + URL wsdlURL = new URL("http://" + getServerHost() + ":8080/jaxrpc-jbws723/ConfidentialSecured?wsdl"); + WSDLDefinitionsFactory factory = WSDLDefinitionsFactory.newInstance(); + WSDLDefinitions wsdl = factory.parse(wsdlURL); + assertNotNull("Expect unsecured wsdl access", wsdl); + } + + public void testConfidentialServiceAccess() throws Exception + { + InitialContext iniCtx = getInitialContext(); + Service service = (Service)iniCtx.lookup("java:comp/env/service/ConfidentialSecured"); + QName portName = new QName("http://org.jboss.ws/jbws723", "ConfidentialPort"); + OrganizationService port = (OrganizationService)service.getPort(portName, OrganizationService.class); + + Stub stub = (Stub)port; + String address = (String)stub._getProperty(Stub.ENDPOINT_ADDRESS_PROPERTY); + assertEquals("https://" + getServerHost() + ":8443/jaxrpc-jbws723/ConfidentialSecured", address); + + // test non-confidential access + try + { + stub._setProperty(Stub.ENDPOINT_ADDRESS_PROPERTY, "http://" + getServerHost() + ":8080/jaxrpc-jbws723/ConfidentialSecured"); + port.getContactInfo("mafia"); + + if (isTargetJBoss50()) + System.out.println("FIXME: [JBAS-3595] - Tomcat allows http access with transport guarantie CONFIDENTIAL"); + else + fail("Security exception expected"); + } + catch (RemoteException ignore) + { + // ignore expected exception + } + + // test confidential access + //stub._setProperty(Stub.ENDPOINT_ADDRESS_PROPERTY, "https://" + getServerHost() + ":8443/jaxrpc-jbws723/ConfidentialSecured"); + //String info = port.getContactInfo("mafia"); + //assertEquals("The 'mafia' boss is currently out of office, please call again.", info); + } +} Deleted: branches/jbossws-1.2.0/jbossws-tests/src/java/org/jboss/test/ws/jaxrpc/jbws723/OrganizationHome.java =================================================================== --- trunk/jbossws-tests/src/java/org/jboss/test/ws/jaxrpc/jbws723/OrganizationHome.java 2007-03-10 20:37:25 UTC (rev 2589) +++ branches/jbossws-1.2.0/jbossws-tests/src/java/org/jboss/test/ws/jaxrpc/jbws723/OrganizationHome.java 2007-03-10 21:59:14 UTC (rev 2591) @@ -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.test.ws.jaxrpc.jbws723; - -import java.rmi.RemoteException; - -import javax.ejb.CreateException; -import javax.ejb.EJBHome; - -/** - * An example of a remote home interface - * - * @author Thomas.Diesler(a)jboss.org - * @since 26-Apr-2004 - */ -public interface OrganizationHome extends EJBHome -{ - public OrganizationRemote create() throws CreateException, RemoteException; -} Copied: branches/jbossws-1.2.0/jbossws-tests/src/java/org/jboss/test/ws/jaxrpc/jbws723/OrganizationHome.java (from rev 2589, trunk/jbossws-tests/src/java/org/jboss/test/ws/jaxrpc/jbws723/OrganizationHome.java) =================================================================== --- branches/jbossws-1.2.0/jbossws-tests/src/java/org/jboss/test/ws/jaxrpc/jbws723/OrganizationHome.java (rev 0) +++ branches/jbossws-1.2.0/jbossws-tests/src/java/org/jboss/test/ws/jaxrpc/jbws723/OrganizationHome.java 2007-03-10 21:59:14 UTC (rev 2591) @@ -0,0 +1,38 @@ +/* + * 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.test.ws.jaxrpc.jbws723; + +import java.rmi.RemoteException; + +import javax.ejb.CreateException; +import javax.ejb.EJBHome; + +/** + * An example of a remote home interface + * + * @author Thomas.Diesler(a)jboss.org + * @since 26-Apr-2004 + */ +public interface OrganizationHome extends EJBHome +{ + public OrganizationRemote create() throws CreateException, RemoteException; +} Deleted: branches/jbossws-1.2.0/jbossws-tests/src/java/org/jboss/test/ws/jaxrpc/jbws723/OrganizationImpl.java =================================================================== --- trunk/jbossws-tests/src/java/org/jboss/test/ws/jaxrpc/jbws723/OrganizationImpl.java 2007-03-10 20:37:25 UTC (rev 2589) +++ branches/jbossws-1.2.0/jbossws-tests/src/java/org/jboss/test/ws/jaxrpc/jbws723/OrganizationImpl.java 2007-03-10 21:59:14 UTC (rev 2591) @@ -1,70 +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.test.ws.jaxrpc.jbws723; - -import java.rmi.RemoteException; - -import javax.ejb.EJBException; -import javax.ejb.SessionBean; -import javax.ejb.SessionContext; - -import org.jboss.logging.Logger; - -/** - * An example of an EJB service endpoint. - * - * @author Thomas.Diesler(a)jboss.org - * @since 26-Apr-2004 - */ -public class OrganizationImpl implements SessionBean -{ - // provide logging - private static final Logger log = Logger.getLogger(OrganizationImpl.class); - - public String getContactInfo(String organization) throws RemoteException - { - log.info("getContactInfo: " + organization); - return "The '" + organization + "' boss is currently out of office, please call again."; - } - - // SLSB Lifecycle *************************************************************************************************** - - public void ejbCreate() - { - } - - public void setSessionContext(SessionContext ctx) throws EJBException, RemoteException - { - } - - public void ejbRemove() throws EJBException, RemoteException - { - } - - public void ejbActivate() throws EJBException, RemoteException - { - } - - public void ejbPassivate() throws EJBException, RemoteException - { - } -} Copied: branches/jbossws-1.2.0/jbossws-tests/src/java/org/jboss/test/ws/jaxrpc/jbws723/OrganizationImpl.java (from rev 2589, trunk/jbossws-tests/src/java/org/jboss/test/ws/jaxrpc/jbws723/OrganizationImpl.java) =================================================================== --- branches/jbossws-1.2.0/jbossws-tests/src/java/org/jboss/test/ws/jaxrpc/jbws723/OrganizationImpl.java (rev 0) +++ branches/jbossws-1.2.0/jbossws-tests/src/java/org/jboss/test/ws/jaxrpc/jbws723/OrganizationImpl.java 2007-03-10 21:59:14 UTC (rev 2591) @@ -0,0 +1,70 @@ +/* + * 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.test.ws.jaxrpc.jbws723; + +import java.rmi.RemoteException; + +import javax.ejb.EJBException; +import javax.ejb.SessionBean; +import javax.ejb.SessionContext; + +import org.jboss.logging.Logger; + +/** + * An example of an EJB service endpoint. + * + * @author Thomas.Diesler(a)jboss.org + * @since 26-Apr-2004 + */ +public class OrganizationImpl implements SessionBean +{ + // provide logging + private static final Logger log = Logger.getLogger(OrganizationImpl.class); + + public String getContactInfo(String organization) throws RemoteException + { + log.info("getContactInfo: " + organization); + return "The '" + organization + "' boss is currently out of office, please call again."; + } + + // SLSB Lifecycle *************************************************************************************************** + + public void ejbCreate() + { + } + + public void setSessionContext(SessionContext ctx) throws EJBException, RemoteException + { + } + + public void ejbRemove() throws EJBException, RemoteException + { + } + + public void ejbActivate() throws EJBException, RemoteException + { + } + + public void ejbPassivate() throws EJBException, RemoteException + { + } +} Deleted: branches/jbossws-1.2.0/jbossws-tests/src/java/org/jboss/test/ws/jaxrpc/jbws723/OrganizationRemote.java =================================================================== --- trunk/jbossws-tests/src/java/org/jboss/test/ws/jaxrpc/jbws723/OrganizationRemote.java 2007-03-10 20:37:25 UTC (rev 2589) +++ branches/jbossws-1.2.0/jbossws-tests/src/java/org/jboss/test/ws/jaxrpc/jbws723/OrganizationRemote.java 2007-03-10 21:59:14 UTC (rev 2591) @@ -1,37 +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.test.ws.jaxrpc.jbws723; - -import java.rmi.RemoteException; - -import javax.ejb.EJBObject; - -/** - * An example of a remote interface - * - * @author Thomas.Diesler(a)jboss.org - * @since 26-Apr-2004 - */ -public interface OrganizationRemote extends EJBObject -{ - String getContactInfo(String organization) throws RemoteException; -} Copied: branches/jbossws-1.2.0/jbossws-tests/src/java/org/jboss/test/ws/jaxrpc/jbws723/OrganizationRemote.java (from rev 2589, trunk/jbossws-tests/src/java/org/jboss/test/ws/jaxrpc/jbws723/OrganizationRemote.java) =================================================================== --- branches/jbossws-1.2.0/jbossws-tests/src/java/org/jboss/test/ws/jaxrpc/jbws723/OrganizationRemote.java (rev 0) +++ branches/jbossws-1.2.0/jbossws-tests/src/java/org/jboss/test/ws/jaxrpc/jbws723/OrganizationRemote.java 2007-03-10 21:59:14 UTC (rev 2591) @@ -0,0 +1,37 @@ +/* + * 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.test.ws.jaxrpc.jbws723; + +import java.rmi.RemoteException; + +import javax.ejb.EJBObject; + +/** + * An example of a remote interface + * + * @author Thomas.Diesler(a)jboss.org + * @since 26-Apr-2004 + */ +public interface OrganizationRemote extends EJBObject +{ + String getContactInfo(String organization) throws RemoteException; +} Deleted: branches/jbossws-1.2.0/jbossws-tests/src/java/org/jboss/test/ws/jaxrpc/jbws723/OrganizationService.java =================================================================== --- trunk/jbossws-tests/src/java/org/jboss/test/ws/jaxrpc/jbws723/OrganizationService.java 2007-03-10 20:37:25 UTC (rev 2589) +++ branches/jbossws-1.2.0/jbossws-tests/src/java/org/jboss/test/ws/jaxrpc/jbws723/OrganizationService.java 2007-03-10 21:59:14 UTC (rev 2591) @@ -1,36 +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.test.ws.jaxrpc.jbws723; - -import java.rmi.Remote; -import java.rmi.RemoteException; - -/** - * An example of a service endpoint - * - * @author Thomas.Diesler(a)jboss.org - * @since 26-Apr-2004 - */ -public interface OrganizationService extends Remote -{ - String getContactInfo(String organization) throws RemoteException; -} Copied: branches/jbossws-1.2.0/jbossws-tests/src/java/org/jboss/test/ws/jaxrpc/jbws723/OrganizationService.java (from rev 2589, trunk/jbossws-tests/src/java/org/jboss/test/ws/jaxrpc/jbws723/OrganizationService.java) =================================================================== --- branches/jbossws-1.2.0/jbossws-tests/src/java/org/jboss/test/ws/jaxrpc/jbws723/OrganizationService.java (rev 0) +++ branches/jbossws-1.2.0/jbossws-tests/src/java/org/jboss/test/ws/jaxrpc/jbws723/OrganizationService.java 2007-03-10 21:59:14 UTC (rev 2591) @@ -0,0 +1,36 @@ +/* + * 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.test.ws.jaxrpc.jbws723; + +import java.rmi.Remote; +import java.rmi.RemoteException; + +/** + * An example of a service endpoint + * + * @author Thomas.Diesler(a)jboss.org + * @since 26-Apr-2004 + */ +public interface OrganizationService extends Remote +{ + String getContactInfo(String organization) throws RemoteException; +} Copied: branches/jbossws-1.2.0/jbossws-tests/src/resources/jaxrpc/jbws723 (from rev 2589, trunk/jbossws-tests/src/resources/jaxrpc/jbws723) Copied: branches/jbossws-1.2.0/jbossws-tests/src/resources/jaxrpc/jbws723/META-INF (from rev 2589, trunk/jbossws-tests/src/resources/jaxrpc/jbws723/META-INF) Deleted: branches/jbossws-1.2.0/jbossws-tests/src/resources/jaxrpc/jbws723/META-INF/application-client.xml =================================================================== --- trunk/jbossws-tests/src/resources/jaxrpc/jbws723/META-INF/application-client.xml 2007-03-10 20:37:25 UTC (rev 2589) +++ branches/jbossws-1.2.0/jbossws-tests/src/resources/jaxrpc/jbws723/META-INF/application-client.xml 2007-03-10 21:59:14 UTC (rev 2591) @@ -1,29 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - -<application-client xmlns="http://java.sun.com/xml/ns/j2ee" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/application-client_1_4.xsd" - version="1.4"> - - <display-name>webservice client app</display-name> - - <service-ref> - <service-ref-name>service/BasicSecured</service-ref-name> - <service-interface>javax.xml.rpc.Service</service-interface> - <wsdl-file>META-INF/wsdl/OrganizationService.wsdl</wsdl-file> - <jaxrpc-mapping-file>META-INF/jaxrpc-mapping.xml</jaxrpc-mapping-file> - </service-ref> - <service-ref> - <service-ref-name>service/RoleSecured</service-ref-name> - <service-interface>javax.xml.rpc.Service</service-interface> - <wsdl-file>META-INF/wsdl/OrganizationService.wsdl</wsdl-file> - <jaxrpc-mapping-file>META-INF/jaxrpc-mapping.xml</jaxrpc-mapping-file> - </service-ref> - <service-ref> - <service-ref-name>service/ConfidentialSecured</service-ref-name> - <service-interface>javax.xml.rpc.Service</service-interface> - <wsdl-file>META-INF/wsdl/OrganizationService.wsdl</wsdl-file> - <jaxrpc-mapping-file>META-INF/jaxrpc-mapping.xml</jaxrpc-mapping-file> - </service-ref> - -</application-client> Copied: branches/jbossws-1.2.0/jbossws-tests/src/resources/jaxrpc/jbws723/META-INF/application-client.xml (from rev 2589, trunk/jbossws-tests/src/resources/jaxrpc/jbws723/META-INF/application-client.xml) =================================================================== --- branches/jbossws-1.2.0/jbossws-tests/src/resources/jaxrpc/jbws723/META-INF/application-client.xml (rev 0) +++ branches/jbossws-1.2.0/jbossws-tests/src/resources/jaxrpc/jbws723/META-INF/application-client.xml 2007-03-10 21:59:14 UTC (rev 2591) @@ -0,0 +1,29 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<application-client xmlns="http://java.sun.com/xml/ns/j2ee" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/application-client_1_4.xsd" + version="1.4"> + + <display-name>webservice client app</display-name> + + <service-ref> + <service-ref-name>service/BasicSecured</service-ref-name> + <service-interface>javax.xml.rpc.Service</service-interface> + <wsdl-file>META-INF/wsdl/OrganizationService.wsdl</wsdl-file> + <jaxrpc-mapping-file>META-INF/jaxrpc-mapping.xml</jaxrpc-mapping-file> + </service-ref> + <service-ref> + <service-ref-name>service/RoleSecured</service-ref-name> + <service-interface>javax.xml.rpc.Service</service-interface> + <wsdl-file>META-INF/wsdl/OrganizationService.wsdl</wsdl-file> + <jaxrpc-mapping-file>META-INF/jaxrpc-mapping.xml</jaxrpc-mapping-file> + </service-ref> + <service-ref> + <service-ref-name>service/ConfidentialSecured</service-ref-name> + <service-interface>javax.xml.rpc.Service</service-interface> + <wsdl-file>META-INF/wsdl/OrganizationService.wsdl</wsdl-file> + <jaxrpc-mapping-file>META-INF/jaxrpc-mapping.xml</jaxrpc-mapping-file> + </service-ref> + +</application-client> Deleted: branches/jbossws-1.2.0/jbossws-tests/src/resources/jaxrpc/jbws723/META-INF/ejb-jar.xml =================================================================== --- trunk/jbossws-tests/src/resources/jaxrpc/jbws723/META-INF/ejb-jar.xml 2007-03-10 20:37:25 UTC (rev 2589) +++ branches/jbossws-1.2.0/jbossws-tests/src/resources/jaxrpc/jbws723/META-INF/ejb-jar.xml 2007-03-10 21:59:14 UTC (rev 2591) @@ -1,68 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - -<ejb-jar xmlns="http://java.sun.com/xml/ns/j2ee" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/ejb-jar_2_1.xsd" - version="2.1"> - - <enterprise-beans> - <session> - <ejb-name>RoleSecuredSLSB</ejb-name> - <remote>org.jboss.test.ws.jaxrpc.jbws723.OrganizationRemote</remote> - <home>org.jboss.test.ws.jaxrpc.jbws723.OrganizationHome</home> - <service-endpoint>org.jboss.test.ws.jaxrpc.jbws723.OrganizationService</service-endpoint> - <ejb-class>org.jboss.test.ws.jaxrpc.jbws723.OrganizationImpl</ejb-class> - <session-type>Stateless</session-type> - <transaction-type>Container</transaction-type> - <security-role-ref> - <role-name>friend</role-name> - </security-role-ref> - </session> - <session> - <ejb-name>BasicSecuredSLSB</ejb-name> - <remote>org.jboss.test.ws.jaxrpc.jbws723.OrganizationRemote</remote> - <home>org.jboss.test.ws.jaxrpc.jbws723.OrganizationHome</home> - <service-endpoint>org.jboss.test.ws.jaxrpc.jbws723.OrganizationService</service-endpoint> - <ejb-class>org.jboss.test.ws.jaxrpc.jbws723.OrganizationImpl</ejb-class> - <session-type>Stateless</session-type> - <transaction-type>Container</transaction-type> - </session> - <session> - <ejb-name>ConfidentialSLSB</ejb-name> - <remote>org.jboss.test.ws.jaxrpc.jbws723.OrganizationRemote</remote> - <home>org.jboss.test.ws.jaxrpc.jbws723.OrganizationHome</home> - <service-endpoint>org.jboss.test.ws.jaxrpc.jbws723.OrganizationService</service-endpoint> - <ejb-class>org.jboss.test.ws.jaxrpc.jbws723.OrganizationImpl</ejb-class> - <session-type>Stateless</session-type> - <transaction-type>Container</transaction-type> - </session> - </enterprise-beans> - - <assembly-descriptor> - <security-role> - <role-name>friend</role-name> - </security-role> - <method-permission> - <role-name>friend</role-name> - <method> - <ejb-name>RoleSecuredSLSB</ejb-name> - <method-name>*</method-name> - </method> - </method-permission> - <method-permission> - <unchecked/> - <method> - <ejb-name>BasicSecuredSLSB</ejb-name> - <method-name>*</method-name> - </method> - </method-permission> - <method-permission> - <unchecked/> - <method> - <ejb-name>ConfidentialSLSB</ejb-name> - <method-name>*</method-name> - </method> - </method-permission> - </assembly-descriptor> - -</ejb-jar> Copied: branches/jbossws-1.2.0/jbossws-tests/src/resources/jaxrpc/jbws723/META-INF/ejb-jar.xml (from rev 2589, trunk/jbossws-tests/src/resources/jaxrpc/jbws723/META-INF/ejb-jar.xml) =================================================================== --- branches/jbossws-1.2.0/jbossws-tests/src/resources/jaxrpc/jbws723/META-INF/ejb-jar.xml (rev 0) +++ branches/jbossws-1.2.0/jbossws-tests/src/resources/jaxrpc/jbws723/META-INF/ejb-jar.xml 2007-03-10 21:59:14 UTC (rev 2591) @@ -0,0 +1,68 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<ejb-jar xmlns="http://java.sun.com/xml/ns/j2ee" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/ejb-jar_2_1.xsd" + version="2.1"> + + <enterprise-beans> + <session> + <ejb-name>RoleSecuredSLSB</ejb-name> + <remote>org.jboss.test.ws.jaxrpc.jbws723.OrganizationRemote</remote> + <home>org.jboss.test.ws.jaxrpc.jbws723.OrganizationHome</home> + <service-endpoint>org.jboss.test.ws.jaxrpc.jbws723.OrganizationService</service-endpoint> + <ejb-class>org.jboss.test.ws.jaxrpc.jbws723.OrganizationImpl</ejb-class> + <session-type>Stateless</session-type> + <transaction-type>Container</transaction-type> + <security-role-ref> + <role-name>friend</role-name> + </security-role-ref> + </session> + <session> + <ejb-name>BasicSecuredSLSB</ejb-name> + <remote>org.jboss.test.ws.jaxrpc.jbws723.OrganizationRemote</remote> + <home>org.jboss.test.ws.jaxrpc.jbws723.OrganizationHome</home> + <service-endpoint>org.jboss.test.ws.jaxrpc.jbws723.OrganizationService</service-endpoint> + <ejb-class>org.jboss.test.ws.jaxrpc.jbws723.OrganizationImpl</ejb-class> + <session-type>Stateless</session-type> + <transaction-type>Container</transaction-type> + </session> + <session> + <ejb-name>ConfidentialSLSB</ejb-name> + <remote>org.jboss.test.ws.jaxrpc.jbws723.OrganizationRemote</remote> + <home>org.jboss.test.ws.jaxrpc.jbws723.OrganizationHome</home> + <service-endpoint>org.jboss.test.ws.jaxrpc.jbws723.OrganizationService</service-endpoint> + <ejb-class>org.jboss.test.ws.jaxrpc.jbws723.OrganizationImpl</ejb-class> + <session-type>Stateless</session-type> + <transaction-type>Container</transaction-type> + </session> + </enterprise-beans> + + <assembly-descriptor> + <security-role> + <role-name>friend</role-name> + </security-role> + <method-permission> + <role-name>friend</role-name> + <method> + <ejb-name>RoleSecuredSLSB</ejb-name> + <method-name>*</method-name> + </method> + </method-permission> + <method-permission> + <unchecked/> + <method> + <ejb-name>BasicSecuredSLSB</ejb-name> + <method-name>*</method-name> + </method> + </method-permission> + <method-permission> + <unchecked/> + <method> + <ejb-name>ConfidentialSLSB</ejb-name> + <method-name>*</method-name> + </method> + </method-permission> + </assembly-descriptor> + +</ejb-jar> Deleted: branches/jbossws-1.2.0/jbossws-tests/src/resources/jaxrpc/jbws723/META-INF/jaxrpc-mapping.xml =================================================================== --- trunk/jbossws-tests/src/resources/jaxrpc/jbws723/META-INF/jaxrpc-mapping.xml 2007-03-10 20:37:25 UTC (rev 2589) +++ branches/jbossws-1.2.0/jbossws-tests/src/resources/jaxrpc/jbws723/META-INF/jaxrpc-mapping.xml 2007-03-10 21:59:14 UTC (rev 2591) @@ -1,37 +0,0 @@ -<?xml version='1.0' encoding='UTF-8'?><java-wsdl-mapping version='1.1' xmlns='http://java.sun.com/xml/ns/j2ee' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xsi:schemaLocation='http://java.sun.com/xml/ns/j2ee http://www.ibm.com/webservices/xsd/j2ee_jaxrpc_mapping_1_1.xsd'> - <package-mapping> - <package-type>org.jboss.test.ws.jaxrpc.jbws723</package-type> - <namespaceURI>http://org.jboss.ws/jbws723/types</namespaceURI> - </package-mapping> - <service-interface-mapping> - <service-interface>org.jboss.test.ws.jaxrpc.jbws723.OrganizationService</service-interface> - <wsdl-service-name xmlns:serviceNS='http://org.jboss.ws/jbws723'>serviceNS:OrganizationService</wsdl-service-name> - <port-mapping> - <port-name>OrganizationServicePort</port-name> - <java-port-name>OrganizationServicePort</java-port-name> - </port-mapping> - </service-interface-mapping> - <service-endpoint-interface-mapping> - <service-endpoint-interface>org.jboss.test.ws.jaxrpc.jbws723.OrganizationService</service-endpoint-interface> - <wsdl-port-type xmlns:portTypeNS='http://org.jboss.ws/jbws723'>portTypeNS:OrganizationService</wsdl-port-type> - <wsdl-binding xmlns:bindingNS='http://org.jboss.ws/jbws723'>bindingNS:OrganizationServiceBinding</wsdl-binding> - <service-endpoint-method-mapping> - <java-method-name>getContactInfo</java-method-name> - <wsdl-operation>getContactInfo</wsdl-operation> - <method-param-parts-mapping> - <param-position>0</param-position> - <param-type>java.lang.String</param-type> - <wsdl-message-mapping> - <wsdl-message xmlns:wsdlMsgNS='http://org.jboss.ws/jbws723'>wsdlMsgNS:OrganizationService_getContactInfo</wsdl-message> - <wsdl-message-part-name>String_1</wsdl-message-part-name> - <parameter-mode>IN</parameter-mode> - </wsdl-message-mapping> - </method-param-parts-mapping> - <wsdl-return-value-mapping> - <method-return-value>java.lang.String</method-return-value> - <wsdl-message xmlns:wsdlMsgNS='http://org.jboss.ws/jbws723'>wsdlMsgNS:OrganizationService_getContactInfoResponse</wsdl-message> - <wsdl-message-part-name>result</wsdl-message-part-name> - </wsdl-return-value-mapping> - </service-endpoint-method-mapping> - </service-endpoint-interface-mapping> -</java-wsdl-mapping> \ No newline at end of file Copied: branches/jbossws-1.2.0/jbossws-tests/src/resources/jaxrpc/jbws723/META-INF/jaxrpc-mapping.xml (from rev 2589, trunk/jbossws-tests/src/resources/jaxrpc/jbws723/META-INF/jaxrpc-mapping.xml) =================================================================== --- branches/jbossws-1.2.0/jbossws-tests/src/resources/jaxrpc/jbws723/META-INF/jaxrpc-mapping.xml (rev 0) +++ branches/jbossws-1.2.0/jbossws-tests/src/resources/jaxrpc/jbws723/META-INF/jaxrpc-mapping.xml 2007-03-10 21:59:14 UTC (rev 2591) @@ -0,0 +1,37 @@ +<?xml version='1.0' encoding='UTF-8'?><java-wsdl-mapping version='1.1' xmlns='http://java.sun.com/xml/ns/j2ee' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xsi:schemaLocation='http://java.sun.com/xml/ns/j2ee http://www.ibm.com/webservices/xsd/j2ee_jaxrpc_mapping_1_1.xsd'> + <package-mapping> + <package-type>org.jboss.test.ws.jaxrpc.jbws723</package-type> + <namespaceURI>http://org.jboss.ws/jbws723/types</namespaceURI> + </package-mapping> + <service-interface-mapping> + <service-interface>org.jboss.test.ws.jaxrpc.jbws723.OrganizationService</service-interface> + <wsdl-service-name xmlns:serviceNS='http://org.jboss.ws/jbws723'>serviceNS:OrganizationService</wsdl-service-name> + <port-mapping> + <port-name>OrganizationServicePort</port-name> + <java-port-name>OrganizationServicePort</java-port-name> + </port-mapping> + </service-interface-mapping> + <service-endpoint-interface-mapping> + <service-endpoint-interface>org.jboss.test.ws.jaxrpc.jbws723.OrganizationService</service-endpoint-interface> + <wsdl-port-type xmlns:portTypeNS='http://org.jboss.ws/jbws723'>portTypeNS:OrganizationService</wsdl-port-type> + <wsdl-binding xmlns:bindingNS='http://org.jboss.ws/jbws723'>bindingNS:OrganizationServiceBinding</wsdl-binding> + <service-endpoint-method-mapping> + <java-method-name>getContactInfo</java-method-name> + <wsdl-operation>getContactInfo</wsdl-operation> + <method-param-parts-mapping> + <param-position>0</param-position> + <param-type>java.lang.String</param-type> + <wsdl-message-mapping> + <wsdl-message xmlns:wsdlMsgNS='http://org.jboss.ws/jbws723'>wsdlMsgNS:OrganizationService_getContactInfo</wsdl-message> + <wsdl-message-part-name>String_1</wsdl-message-part-name> + <parameter-mode>IN</parameter-mode> + </wsdl-message-mapping> + </method-param-parts-mapping> + <wsdl-return-value-mapping> + <method-return-value>java.lang.String</method-return-value> + <wsdl-message xmlns:wsdlMsgNS='http://org.jboss.ws/jbws723'>wsdlMsgNS:OrganizationService_getContactInfoResponse</wsdl-message> + <wsdl-message-part-name>result</wsdl-message-part-name> + </wsdl-return-value-mapping> + </service-endpoint-method-mapping> + </service-endpoint-interface-mapping> +</java-wsdl-mapping> \ No newline at end of file Deleted: branches/jbossws-1.2.0/jbossws-tests/src/resources/jaxrpc/jbws723/META-INF/jboss-client.xml =================================================================== --- trunk/jbossws-tests/src/resources/jaxrpc/jbws723/META-INF/jboss-client.xml 2007-03-10 20:37:25 UTC (rev 2589) +++ branches/jbossws-1.2.0/jbossws-tests/src/resources/jaxrpc/jbws723/META-INF/jboss-client.xml 2007-03-10 21:59:14 UTC (rev 2591) @@ -1,7 +0,0 @@ -<?xml version='1.0' encoding='UTF-8' ?> - -<!DOCTYPE jboss-client PUBLIC "-//JBoss//DTD Application Client 4.0//EN" "http://www.jboss.org/j2ee/dtd/jboss-client_4_0.dtd"> - -<jboss-client> - <jndi-name>jbossws-client</jndi-name> -</jboss-client> Copied: branches/jbossws-1.2.0/jbossws-tests/src/resources/jaxrpc/jbws723/META-INF/jboss-client.xml (from rev 2589, trunk/jbossws-tests/src/resources/jaxrpc/jbws723/META-INF/jboss-client.xml) =================================================================== --- branches/jbossws-1.2.0/jbossws-tests/src/resources/jaxrpc/jbws723/META-INF/jboss-client.xml (rev 0) +++ branches/jbossws-1.2.0/jbossws-tests/src/resources/jaxrpc/jbws723/META-INF/jboss-client.xml 2007-03-10 21:59:14 UTC (rev 2591) @@ -0,0 +1,7 @@ +<?xml version='1.0' encoding='UTF-8' ?> + +<!DOCTYPE jboss-client PUBLIC "-//JBoss//DTD Application Client 4.0//EN" "http://www.jboss.org/j2ee/dtd/jboss-client_4_0.dtd"> + +<jboss-client> + <jndi-name>jbossws-client</jndi-name> +</jboss-client> Deleted: branches/jbossws-1.2.0/jbossws-tests/src/resources/jaxrpc/jbws723/META-INF/jboss.xml =================================================================== --- trunk/jbossws-tests/src/resources/jaxrpc/jbws723/META-INF/jboss.xml 2007-03-10 20:37:25 UTC (rev 2589) +++ branches/jbossws-1.2.0/jbossws-tests/src/resources/jaxrpc/jbws723/META-INF/jboss.xml 2007-03-10 21:59:14 UTC (rev 2591) @@ -1,43 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - -<!DOCTYPE jboss PUBLIC "-//JBoss//DTD JBOSS 4.2//EN" "http://www.jboss.org/j2ee/dtd/jboss_4_2.dtd"> - -<jboss> - - <security-domain>java:/jaas/JBossWS</security-domain> - - <enterprise-beans> - <session> - <ejb-name>RoleSecuredSLSB</ejb-name> - <jndi-name>ejb/RoleSecuredSLSB</jndi-name> - <port-component> - <port-component-name>RoleSecured</port-component-name> - <port-component-uri>/jaxrpc-jbws723/RoleSecured</port-component-uri> - <auth-method>BASIC</auth-method> - <transport-guarantee>NONE</transport-guarantee> - <!-- default secure-wsdl-access (false for jaxrpc) --> - </port-component> - </session> - <session> - <ejb-name>BasicSecuredSLSB</ejb-name> - <jndi-name>ejb/BasicSecuredSLSB</jndi-name> - <port-component> - <port-component-name>BasicSecured</port-component-name> - <port-component-uri>/jaxrpc-jbws723/BasicSecured</port-component-uri> - <auth-method>BASIC</auth-method> - <transport-guarantee>NONE</transport-guarantee> - <secure-wsdl-access>true</secure-wsdl-access> - </port-component> - </session> - <session> - <ejb-name>ConfidentialSLSB</ejb-name> - <jndi-name>ejb/ConfidentialSLSB</jndi-name> - <port-component> - <port-component-name>ConfidentialSecured</port-component-name> - <port-component-uri>/jaxrpc-jbws723/ConfidentialSecured</port-component-uri> - <transport-guarantee>CONFIDENTIAL</transport-guarantee> - <secure-wsdl-access>false</secure-wsdl-access> - </port-component> - </session> - </enterprise-beans> -</jboss> Copied: branches/jbossws-1.2.0/jbossws-tests/src/resources/jaxrpc/jbws723/META-INF/jboss.xml (from rev 2589, trunk/jbossws-tests/src/resources/jaxrpc/jbws723/META-INF/jboss.xml) =================================================================== --- branches/jbossws-1.2.0/jbossws-tests/src/resources/jaxrpc/jbws723/META-INF/jboss.xml (rev 0) +++ branches/jbossws-1.2.0/jbossws-tests/src/resources/jaxrpc/jbws723/META-INF/jboss.xml 2007-03-10 21:59:14 UTC (rev 2591) @@ -0,0 +1,43 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<!DOCTYPE jboss PUBLIC "-//JBoss//DTD JBOSS 4.2//EN" "http://www.jboss.org/j2ee/dtd/jboss_4_2.dtd"> + +<jboss> + + <security-domain>java:/jaas/JBossWS</security-domain> + + <enterprise-beans> + <session> + <ejb-name>RoleSecuredSLSB</ejb-name> + <jndi-name>ejb/RoleSecuredSLSB</jndi-name> + <port-component> + <port-component-name>RoleSecured</port-component-name> + <port-component-uri>/jaxrpc-jbws723/RoleSecured</port-component-uri> + <auth-method>BASIC</auth-method> + <transport-guarantee>NONE</transport-guarantee> + <!-- default secure-wsdl-access (false for jaxrpc) --> + </port-component> + </session> + <session> + <ejb-name>BasicSecuredSLSB</ejb-name> + <jndi-name>ejb/BasicSecuredSLSB</jndi-name> + <port-component> + <port-component-name>BasicSecured</port-component-name> + <port-component-uri>/jaxrpc-jbws723/BasicSecured</port-component-uri> + <auth-method>BASIC</auth-method> + <transport-guarantee>NONE</transport-guarantee> + <secure-wsdl-access>true</secure-wsdl-access> + </port-component> + </session> + <session> + <ejb-name>ConfidentialSLSB</ejb-name> + <jndi-name>ejb/ConfidentialSLSB</jndi-name> + <port-component> + <port-component-name>ConfidentialSecured</port-component-name> + <port-component-uri>/jaxrpc-jbws723/ConfidentialSecured</port-component-uri> + <transport-guarantee>CONFIDENTIAL</transport-guarantee> + <secure-wsdl-access>false</secure-wsdl-access> + </port-component> + </session> + </enterprise-beans> +</jboss> Deleted: branches/jbossws-1.2.0/jbossws-tests/src/resources/jaxrpc/jbws723/META-INF/webservices.xml =================================================================== --- trunk/jbossws-tests/src/resources/jaxrpc/jbws723/META-INF/webservices.xml 2007-03-10 20:37:25 UTC (rev 2589) +++ branches/jbossws-1.2.0/jbossws-tests/src/resources/jaxrpc/jbws723/META-INF/webservices.xml 2007-03-10 21:59:14 UTC (rev 2591) @@ -1,38 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - -<webservices xmlns="http://java.sun.com/xml/ns/j2ee" - xmlns:impl="http://org.jboss.ws/jbws723" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://www.ibm.com/webservices/xsd/j2ee_web_services_1_1.xsd" - version="1.1"> - - <webservice-description> - <webservice-description-name>OrganizationServiceEJB</webservice-description-name> - <wsdl-file>META-INF/wsdl/OrganizationService.wsdl</wsdl-file> - <jaxrpc-mapping-file>META-INF/jaxrpc-mapping.xml</jaxrpc-mapping-file> - <port-component> - <port-component-name>RoleSecured</port-component-name> - <wsdl-port>impl:RoleSecuredPort</wsdl-port> - <service-endpoint-interface>org.jboss.test.ws.jaxrpc.jbws723.OrganizationService</service-endpoint-interface> - <service-impl-bean> - <ejb-link>RoleSecuredSLSB</ejb-link> - </service-impl-bean> - </port-component> - <port-component> - <port-component-name>BasicSecured</port-component-name> - <wsdl-port>impl:BasicSecuredPort</wsdl-port> - <service-endpoint-interface>org.jboss.test.ws.jaxrpc.jbws723.OrganizationService</service-endpoint-interface> - <service-impl-bean> - <ejb-link>BasicSecuredSLSB</ejb-link> - </service-impl-bean> - </port-component> - <port-component> - <port-component-name>ConfidentialSecured</port-component-name> - <wsdl-port>impl:ConfidentialPort</wsdl-port> - <service-endpoint-interface>org.jboss.test.ws.jaxrpc.jbws723.OrganizationService</service-endpoint-interface> - <service-impl-bean> - <ejb-link>ConfidentialSLSB</ejb-link> - </service-impl-bean> - </port-component> - </webservice-description> -</webservices> Copied: branches/jbossws-1.2.0/jbossws-tests/src/resources/jaxrpc/jbws723/META-INF/webservices.xml (from rev 2589, trunk/jbossws-tests/src/resources/jaxrpc/jbws723/META-INF/webservices.xml) =================================================================== --- branches/jbossws-1.2.0/jbossws-tests/src/resources/jaxrpc/jbws723/META-INF/webservices.xml (rev 0) +++ branches/jbossws-1.2.0/jbossws-tests/src/resources/jaxrpc/jbws723/META-INF/webservices.xml 2007-03-10 21:59:14 UTC (rev 2591) @@ -0,0 +1,38 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<webservices xmlns="http://java.sun.com/xml/ns/j2ee" + xmlns:impl="http://org.jboss.ws/jbws723" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://www.ibm.com/webservices/xsd/j2ee_web_services_1_1.xsd" + version="1.1"> + + <webservice-description> + <webservice-description-name>OrganizationServiceEJB</webservice-description-name> + <wsdl-file>META-INF/wsdl/OrganizationService.wsdl</wsdl-file> + <jaxrpc-mapping-file>META-INF/jaxrpc-mapping.xml</jaxrpc-mapping-file> + <port-component> + <port-component-name>RoleSecured</port-component-name> + <wsdl-port>impl:RoleSecuredPort</wsdl-port> + <service-endpoint-interface>org.jboss.test.ws.jaxrpc.jbws723.OrganizationService</service-endpoint-interface> + <service-impl-bean> + <ejb-link>RoleSecuredSLSB</ejb-link> + </service-impl-bean> + </port-component> + <port-component> + <port-component-name>BasicSecured</port-component-name> + <wsdl-port>impl:BasicSecuredPort</wsdl-port> + <service-endpoint-interface>org.jboss.test.ws.jaxrpc.jbws723.OrganizationService</service-endpoint-interface> + <service-impl-bean> + <ejb-link>BasicSecuredSLSB</ejb-link> + </service-impl-bean> + </port-component> + <port-component> + <port-component-name>ConfidentialSecured</port-component-name> + <wsdl-port>impl:ConfidentialPort</wsdl-port> + <service-endpoint-interface>org.jboss.test.ws.jaxrpc.jbws723.OrganizationService</service-endpoint-interface> + <service-impl-bean> + <ejb-link>ConfidentialSLSB</ejb-link> + </service-impl-bean> + </port-component> + </webservice-description> +</webservices> Copied: branches/jbossws-1.2.0/jbossws-tests/src/resources/jaxrpc/jbws723/META-INF/wsdl (from rev 2589, trunk/jbossws-tests/src/resources/jaxrpc/jbws723/META-INF/wsdl) Deleted: branches/jbossws-1.2.0/jbossws-tests/src/resources/jaxrpc/jbws723/META-INF/wsdl/OrganizationService.wsdl =================================================================== --- trunk/jbossws-tests/src/resources/jaxrpc/jbws723/META-INF/wsdl/OrganizationService.wsdl 2007-03-10 20:37:25 UTC (rev 2589) +++ branches/jbossws-1.2.0/jbossws-tests/src/resources/jaxrpc/jbws723/META-INF/wsdl/OrganizationService.wsdl 2007-03-10 21:59:14 UTC (rev 2591) @@ -1,39 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<definitions name='OrganizationService' targetNamespace='http://org.jboss.ws/jbws723' xmlns='http://schemas.xmlsoap.org/wsdl/' xmlns:soap='http://schemas.xmlsoap.org/wsdl/soap/' xmlns:tns='http://org.jboss.ws/jbws723' xmlns:xsd='http://www.w3.org/2001/XMLSchema'> - <types/> - <message name='OrganizationService_getContactInfo'> - <part name='String_1' type='xsd:string'/> - </message> - <message name='OrganizationService_getContactInfoResponse'> - <part name='result' type='xsd:string'/> - </message> - <portType name='OrganizationService'> - <operation name='getContactInfo' parameterOrder='String_1'> - <input message='tns:OrganizationService_getContactInfo'/> - <output message='tns:OrganizationService_getContactInfoResponse'/> - </operation> - </portType> - <binding name='OrganizationServiceBinding' type='tns:OrganizationService'> - <soap:binding style='rpc' transport='http://schemas.xmlsoap.org/soap/http'/> - <operation name='getContactInfo'> - <soap:operation soapAction=''/> - <input> - <soap:body namespace='http://org.jboss.ws/jbws723' use='literal'/> - </input> - <output> - <soap:body namespace='http://org.jboss.ws/jbws723' use='literal'/> - </output> - </operation> - </binding> - <service name="OrganizationService"> - <port name="BasicSecuredPort" binding="tns:OrganizationServiceBinding"> - <soap:address location="http://@jbosstest.host.name@:8080/jaxrpc-jbws723/BasicSecured"/> - </port> - <port name="RoleSecuredPort" binding="tns:OrganizationServiceBinding"> - <soap:address location="http://@jbosstest.host.name@:8080/jaxrpc-jbws723/RoleSecured"/> - </port> - <port name="ConfidentialPort" binding="tns:OrganizationServiceBinding"> - <soap:address location="https://@jbosstest.host.name@:8443/jaxrpc-jbws723/ConfidentialSecured"/> - </port> - </service> -</definitions> \ No newline at end of file Copied: branches/jbossws-1.2.0/jbossws-tests/src/resources/jaxrpc/jbws723/META-INF/wsdl/OrganizationService.wsdl (from rev 2589, trunk/jbossws-tests/src/resources/jaxrpc/jbws723/META-INF/wsdl/OrganizationService.wsdl) =================================================================== --- branches/jbossws-1.2.0/jbossws-tests/src/resources/jaxrpc/jbws723/META-INF/wsdl/OrganizationService.wsdl (rev 0) +++ branches/jbossws-1.2.0/jbossws-tests/src/resources/jaxrpc/jbws723/META-INF/wsdl/OrganizationService.wsdl 2007-03-10 21:59:14 UTC (rev 2591) @@ -0,0 +1,39 @@ +<?xml version="1.0" encoding="UTF-8"?> +<definitions name='OrganizationService' targetNamespace='http://org.jboss.ws/jbws723' xmlns='http://schemas.xmlsoap.org/wsdl/' xmlns:soap='http://schemas.xmlsoap.org/wsdl/soap/' xmlns:tns='http://org.jboss.ws/jbws723' xmlns:xsd='http://www.w3.org/2001/XMLSchema'> + <types/> + <message name='OrganizationService_getContactInfo'> + <part name='String_1' type='xsd:string'/> + </message> + <message name='OrganizationService_getContactInfoResponse'> + <part name='result' type='xsd:string'/> + </message> + <portType name='OrganizationService'> + <operation name='getContactInfo' parameterOrder='String_1'> + <input message='tns:OrganizationService_getContactInfo'/> + <output message='tns:OrganizationService_getContactInfoResponse'/> + </operation> + </portType> + <binding name='OrganizationServiceBinding' type='tns:OrganizationService'> + <soap:binding style='rpc' transport='http://schemas.xmlsoap.org/soap/http'/> + <operation name='getContactInfo'> + <soap:operation soapAction=''/> + <input> + <soap:body namespace='http://org.jboss.ws/jbws723' use='literal'/> + </input> + <output> + <soap:body namespace='http://org.jboss.ws/jbws723' use='literal'/> + </output> + </operation> + </binding> + <service name="OrganizationService"> + <port name="BasicSecuredPort" binding="tns:OrganizationServiceBinding"> + <soap:address location="http://@jbosstest.host.name@:8080/jaxrpc-jbws723/BasicSecured"/> + </port> + <port name="RoleSecuredPort" binding="tns:OrganizationServiceBinding"> + <soap:address location="http://@jbosstest.host.name@:8080/jaxrpc-jbws723/RoleSecured"/> + </port> + <port name="ConfidentialPort" binding="tns:OrganizationServiceBinding"> + <soap:address location="https://@jbosstest.host.name@:8443/jaxrpc-jbws723/ConfidentialSecured"/> + </port> + </service> +</definitions> \ No newline at end of file Modified: branches/jbossws-1.2.0/jbossws-tests/src/resources/tests-jboss40-excludes.txt =================================================================== --- branches/jbossws-1.2.0/jbossws-tests/src/resources/tests-jboss40-excludes.txt 2007-03-10 20:47:44 UTC (rev 2590) +++ branches/jbossws-1.2.0/jbossws-tests/src/resources/tests-jboss40-excludes.txt 2007-03-10 21:59:14 UTC (rev 2591) @@ -2,6 +2,9 @@ org/jboss/test/ws/interop/** org/jboss/test/ws/benchmark/** +# JBoss-4.2.x excludes +org/jboss/test/ws/jaxrpc/jbws723/** + # EJB3/Injection excludes org/jboss/test/ws/jaxws/endpoint/** org/jboss/test/ws/jaxws/samples/handlerchain/HandlerChainClientTestCase* Modified: branches/jbossws-1.2.0/jbossws-tests/src/resources/tests-jboss40-noejb3-excludes.txt =================================================================== --- branches/jbossws-1.2.0/jbossws-tests/src/resources/tests-jboss40-noejb3-excludes.txt 2007-03-10 20:47:44 UTC (rev 2590) +++ branches/jbossws-1.2.0/jbossws-tests/src/resources/tests-jboss40-noejb3-excludes.txt 2007-03-10 21:59:14 UTC (rev 2591) @@ -2,6 +2,9 @@ org/jboss/test/ws/interop/** org/jboss/test/ws/benchmark/** +# JBoss-4.2.x excludes +org/jboss/test/ws/jaxrpc/jbws723/** + # EJB3/Injection excludes org/jboss/test/ws/jaxws/eardeployment/** org/jboss/test/ws/jaxws/endpoint/**