Author: thomas.diesler(a)jboss.com Date: 2007-03-10 15:37:25 -0500 (Sat, 10 Mar 2007) New Revision: 2589 Added: trunk/jbossws-tests/src/java/org/jboss/test/ws/jaxrpc/jbws723/ trunk/jbossws-tests/src/java/org/jboss/test/ws/jaxrpc/jbws723/JBWS723TestCase.java trunk/jbossws-tests/src/resources/jaxrpc/jbws723/ trunk/jbossws-tests/src/resources/jaxrpc/jbws723/META-INF/jaxrpc-mapping.xml trunk/jbossws-tests/src/resources/jaxrpc/jbws723/META-INF/wsdl/ trunk/jbossws-tests/src/resources/jaxrpc/jbws723/META-INF/wsdl/OrganizationService.wsdl Removed: trunk/jbossws-tests/src/resources/jaxrpc/jbws723/wstools-config.xml Modified: trunk/jbossws-tests/ant-import/build-jars-jaxrpc.xml trunk/jbossws-tests/src/java/org/jboss/test/ws/jaxrpc/jbws723/OrganizationHome.java trunk/jbossws-tests/src/java/org/jboss/test/ws/jaxrpc/jbws723/OrganizationImpl.java trunk/jbossws-tests/src/java/org/jboss/test/ws/jaxrpc/jbws723/OrganizationRemote.java trunk/jbossws-tests/src/java/org/jboss/test/ws/jaxrpc/jbws723/OrganizationService.java trunk/jbossws-tests/src/resources/jaxrpc/jbws723/META-INF/ejb-jar.xml trunk/jbossws-tests/src/resources/jaxrpc/jbws723/META-INF/jboss.xml trunk/jbossws-tests/src/resources/jaxrpc/jbws723/META-INF/webservices.xml Log: [JBWS-723] Protect access to WSDL Modified: trunk/jbossws-tests/ant-import/build-jars-jaxrpc.xml =================================================================== --- trunk/jbossws-tests/ant-import/build-jars-jaxrpc.xml 2007-03-10 19:45:46 UTC (rev 2588) +++ trunk/jbossws-tests/ant-import/build-jars-jaxrpc.xml 2007-03-10 20:37:25 UTC (rev 2589) @@ -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: trunk/jbossws-tests/src/java/org/jboss/test/ws/jaxrpc/jbws723 (from rev 2583, trunk/jbossws-tests/src/java/org/jboss/test/ws/jaxrpc/samples/secureejb) Added: trunk/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 (rev 0) +++ trunk/jbossws-tests/src/java/org/jboss/test/ws/jaxrpc/jbws723/JBWS723TestCase.java 2007-03-10 20:37:25 UTC (rev 2589) @@ -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); + } +} Property changes on: trunk/jbossws-tests/src/java/org/jboss/test/ws/jaxrpc/jbws723/JBWS723TestCase.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Modified: trunk/jbossws-tests/src/java/org/jboss/test/ws/jaxrpc/jbws723/OrganizationHome.java =================================================================== --- trunk/jbossws-tests/src/java/org/jboss/test/ws/jaxrpc/samples/secureejb/OrganizationHome.java 2007-03-10 17:17:10 UTC (rev 2583) +++ trunk/jbossws-tests/src/java/org/jboss/test/ws/jaxrpc/jbws723/OrganizationHome.java 2007-03-10 20:37:25 UTC (rev 2589) @@ -19,7 +19,7 @@ * 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.samples.secureejb; +package org.jboss.test.ws.jaxrpc.jbws723; import java.rmi.RemoteException; Modified: trunk/jbossws-tests/src/java/org/jboss/test/ws/jaxrpc/jbws723/OrganizationImpl.java =================================================================== --- trunk/jbossws-tests/src/java/org/jboss/test/ws/jaxrpc/samples/secureejb/OrganizationImpl.java 2007-03-10 17:17:10 UTC (rev 2583) +++ trunk/jbossws-tests/src/java/org/jboss/test/ws/jaxrpc/jbws723/OrganizationImpl.java 2007-03-10 20:37:25 UTC (rev 2589) @@ -19,7 +19,7 @@ * 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.samples.secureejb; +package org.jboss.test.ws.jaxrpc.jbws723; import java.rmi.RemoteException; Modified: trunk/jbossws-tests/src/java/org/jboss/test/ws/jaxrpc/jbws723/OrganizationRemote.java =================================================================== --- trunk/jbossws-tests/src/java/org/jboss/test/ws/jaxrpc/samples/secureejb/OrganizationRemote.java 2007-03-10 17:17:10 UTC (rev 2583) +++ trunk/jbossws-tests/src/java/org/jboss/test/ws/jaxrpc/jbws723/OrganizationRemote.java 2007-03-10 20:37:25 UTC (rev 2589) @@ -19,7 +19,7 @@ * 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.samples.secureejb; +package org.jboss.test.ws.jaxrpc.jbws723; import java.rmi.RemoteException; Modified: trunk/jbossws-tests/src/java/org/jboss/test/ws/jaxrpc/jbws723/OrganizationService.java =================================================================== --- trunk/jbossws-tests/src/java/org/jboss/test/ws/jaxrpc/samples/secureejb/OrganizationService.java 2007-03-10 17:17:10 UTC (rev 2583) +++ trunk/jbossws-tests/src/java/org/jboss/test/ws/jaxrpc/jbws723/OrganizationService.java 2007-03-10 20:37:25 UTC (rev 2589) @@ -19,7 +19,7 @@ * 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.samples.secureejb; +package org.jboss.test.ws.jaxrpc.jbws723; import java.rmi.Remote; import java.rmi.RemoteException; Copied: trunk/jbossws-tests/src/resources/jaxrpc/jbws723 (from rev 2583, trunk/jbossws-tests/src/resources/jaxrpc/samples/secureejb) Modified: trunk/jbossws-tests/src/resources/jaxrpc/jbws723/META-INF/ejb-jar.xml =================================================================== --- trunk/jbossws-tests/src/resources/jaxrpc/samples/secureejb/META-INF/ejb-jar.xml 2007-03-10 17:17:10 UTC (rev 2583) +++ trunk/jbossws-tests/src/resources/jaxrpc/jbws723/META-INF/ejb-jar.xml 2007-03-10 20:37:25 UTC (rev 2589) @@ -8,10 +8,10 @@ <enterprise-beans> <session> <ejb-name>RoleSecuredSLSB</ejb-name> - <remote>org.jboss.test.ws.jaxrpc.samples.secureejb.OrganizationRemote</remote> - <home>org.jboss.test.ws.jaxrpc.samples.secureejb.OrganizationHome</home> - <service-endpoint>org.jboss.test.ws.jaxrpc.samples.secureejb.OrganizationService</service-endpoint> - <ejb-class>org.jboss.test.ws.jaxrpc.samples.secureejb.OrganizationImpl</ejb-class> + <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> @@ -20,19 +20,19 @@ </session> <session> <ejb-name>BasicSecuredSLSB</ejb-name> - <remote>org.jboss.test.ws.jaxrpc.samples.secureejb.OrganizationRemote</remote> - <home>org.jboss.test.ws.jaxrpc.samples.secureejb.OrganizationHome</home> - <service-endpoint>org.jboss.test.ws.jaxrpc.samples.secureejb.OrganizationService</service-endpoint> - <ejb-class>org.jboss.test.ws.jaxrpc.samples.secureejb.OrganizationImpl</ejb-class> + <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.samples.secureejb.OrganizationRemote</remote> - <home>org.jboss.test.ws.jaxrpc.samples.secureejb.OrganizationHome</home> - <service-endpoint>org.jboss.test.ws.jaxrpc.samples.secureejb.OrganizationService</service-endpoint> - <ejb-class>org.jboss.test.ws.jaxrpc.samples.secureejb.OrganizationImpl</ejb-class> + <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> Added: trunk/jbossws-tests/src/resources/jaxrpc/jbws723/META-INF/jaxrpc-mapping.xml =================================================================== --- trunk/jbossws-tests/src/resources/jaxrpc/jbws723/META-INF/jaxrpc-mapping.xml (rev 0) +++ trunk/jbossws-tests/src/resources/jaxrpc/jbws723/META-INF/jaxrpc-mapping.xml 2007-03-10 20:37:25 UTC (rev 2589) @@ -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 Property changes on: trunk/jbossws-tests/src/resources/jaxrpc/jbws723/META-INF/jaxrpc-mapping.xml ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Modified: trunk/jbossws-tests/src/resources/jaxrpc/jbws723/META-INF/jboss.xml =================================================================== --- trunk/jbossws-tests/src/resources/jaxrpc/samples/secureejb/META-INF/jboss.xml 2007-03-10 17:17:10 UTC (rev 2583) +++ trunk/jbossws-tests/src/resources/jaxrpc/jbws723/META-INF/jboss.xml 2007-03-10 20:37:25 UTC (rev 2589) @@ -12,7 +12,7 @@ <jndi-name>ejb/RoleSecuredSLSB</jndi-name> <port-component> <port-component-name>RoleSecured</port-component-name> - <port-component-uri>/jaxrpc-samples-ejb/RoleSecured</port-component-uri> + <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) --> @@ -23,7 +23,7 @@ <jndi-name>ejb/BasicSecuredSLSB</jndi-name> <port-component> <port-component-name>BasicSecured</port-component-name> - <port-component-uri>/jaxrpc-samples-ejb/BasicSecured</port-component-uri> + <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> @@ -34,7 +34,7 @@ <jndi-name>ejb/ConfidentialSLSB</jndi-name> <port-component> <port-component-name>ConfidentialSecured</port-component-name> - <port-component-uri>/jaxrpc-samples-ejb/ConfidentialSecured</port-component-uri> + <port-component-uri>/jaxrpc-jbws723/ConfidentialSecured</port-component-uri> <transport-guarantee>CONFIDENTIAL</transport-guarantee> <secure-wsdl-access>false</secure-wsdl-access> </port-component> Modified: trunk/jbossws-tests/src/resources/jaxrpc/jbws723/META-INF/webservices.xml =================================================================== --- trunk/jbossws-tests/src/resources/jaxrpc/samples/secureejb/META-INF/webservices.xml 2007-03-10 17:17:10 UTC (rev 2583) +++ trunk/jbossws-tests/src/resources/jaxrpc/jbws723/META-INF/webservices.xml 2007-03-10 20:37:25 UTC (rev 2589) @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <webservices xmlns="http://java.sun.com/xml/ns/j2ee" - xmlns:impl="http://org.jboss.ws/samples/secureejb" + 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"> @@ -13,7 +13,7 @@ <port-component> <port-component-name>RoleSecured</port-component-name> <wsdl-port>impl:RoleSecuredPort</wsdl-port> - <service-endpoint-interface>org.jboss.test.ws.jaxrpc.samples.secureejb.OrganizationService</service-endpoint-interface> + <service-endpoint-interface>org.jboss.test.ws.jaxrpc.jbws723.OrganizationService</service-endpoint-interface> <service-impl-bean> <ejb-link>RoleSecuredSLSB</ejb-link> </service-impl-bean> @@ -21,7 +21,7 @@ <port-component> <port-component-name>BasicSecured</port-component-name> <wsdl-port>impl:BasicSecuredPort</wsdl-port> - <service-endpoint-interface>org.jboss.test.ws.jaxrpc.samples.secureejb.OrganizationService</service-endpoint-interface> + <service-endpoint-interface>org.jboss.test.ws.jaxrpc.jbws723.OrganizationService</service-endpoint-interface> <service-impl-bean> <ejb-link>BasicSecuredSLSB</ejb-link> </service-impl-bean> @@ -29,7 +29,7 @@ <port-component> <port-component-name>ConfidentialSecured</port-component-name> <wsdl-port>impl:ConfidentialPort</wsdl-port> - <service-endpoint-interface>org.jboss.test.ws.jaxrpc.samples.secureejb.OrganizationService</service-endpoint-interface> + <service-endpoint-interface>org.jboss.test.ws.jaxrpc.jbws723.OrganizationService</service-endpoint-interface> <service-impl-bean> <ejb-link>ConfidentialSLSB</ejb-link> </service-impl-bean> Added: trunk/jbossws-tests/src/resources/jaxrpc/jbws723/META-INF/wsdl/OrganizationService.wsdl =================================================================== --- trunk/jbossws-tests/src/resources/jaxrpc/jbws723/META-INF/wsdl/OrganizationService.wsdl (rev 0) +++ trunk/jbossws-tests/src/resources/jaxrpc/jbws723/META-INF/wsdl/OrganizationService.wsdl 2007-03-10 20:37:25 UTC (rev 2589) @@ -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 Property changes on: trunk/jbossws-tests/src/resources/jaxrpc/jbws723/META-INF/wsdl/OrganizationService.wsdl ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Deleted: trunk/jbossws-tests/src/resources/jaxrpc/jbws723/wstools-config.xml =================================================================== --- trunk/jbossws-tests/src/resources/jaxrpc/samples/secureejb/wstools-config.xml 2007-03-10 17:17:10 UTC (rev 2583) +++ trunk/jbossws-tests/src/resources/jaxrpc/jbws723/wstools-config.xml 2007-03-10 20:37:25 UTC (rev 2589) @@ -1,28 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - -<!-- - wstools -cp ../../../output/classes -config wstools-config.xml ---> - -<configuration xmlns="http://www.jboss.org/jbossws-tools" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://www.jboss.org/jbossws-tools http://www.jboss.org/jbossws-tools/schema/jbossws-tool_1_0.xsd"> - - <java-wsdl> - <service name="OrganizationService" style="rpc" endpoint="org.jboss.test.ws.jaxrpc.samples.secureejb.OrganizationService"/> - <namespaces target-namespace="http://org.jboss.ws/samples/secureejb" type-namespace="http://org.jboss.ws/samples/secureejb/types"/> - <mapping file="jaxrpc-mapping.xml"/> - </java-wsdl> - -</configuration> - -<!-- - <service name="OrganizationService"> - <port name="BasicSecuredPort" binding="tns:OrganizationServiceBinding"> - <soap:address location="http://@jbosstest.host.name@:8080/jaxrpc-samples-ejb/BasicSecured"/> - </port> - <port name="RoleSecuredPort" binding="tns:OrganizationServiceBinding"> - <soap:address location="http://@jbosstest.host.name@:8080/jaxrpc-samples-ejb/RoleSecured"/> - </port> - </service> ---> \ No newline at end of file