Author: richard.opalka(a)jboss.com Date: 2008-05-20 10:20:31 -0400 (Tue, 20 May 2008) New Revision: 7111 Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws723/JBWS723TestCase.java stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws723/META-INF/ejb-jar.xml stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws723/META-INF/jboss.xml stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws723/META-INF/webservices.xml Log: don't share EJB names with jaxrpc/samples/secureejb test case Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws723/JBWS723TestCase.java =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws723/JBWS723TestCase.java 2008-05-20 13:43:20 UTC (rev 7110) +++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws723/JBWS723TestCase.java 2008-05-20 14:20:31 UTC (rev 7111) @@ -93,7 +93,7 @@ public void testBasicSecuredSLSB() throws Exception { InitialContext iniCtx = getInitialContext(); - OrganizationHome home = (OrganizationHome)iniCtx.lookup("ejb/BasicSecuredSLSB"); + OrganizationHome home = (OrganizationHome)iniCtx.lookup("ejb/JBWS723BasicSecuredSLSB"); OrganizationRemote bean = home.create(); String info = bean.getContactInfo("mafia"); Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws723/META-INF/ejb-jar.xml =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws723/META-INF/ejb-jar.xml 2008-05-20 13:43:20 UTC (rev 7110) +++ stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws723/META-INF/ejb-jar.xml 2008-05-20 14:20:31 UTC (rev 7111) @@ -7,7 +7,7 @@ <enterprise-beans> <session> - <ejb-name>RoleSecuredSLSB</ejb-name> + <ejb-name>JBWS723RoleSecuredSLSB</ejb-name> <home>org.jboss.test.ws.jaxrpc.jbws723.OrganizationHome</home> <remote>org.jboss.test.ws.jaxrpc.jbws723.OrganizationRemote</remote> <service-endpoint>org.jboss.test.ws.jaxrpc.jbws723.OrganizationService</service-endpoint> @@ -19,7 +19,7 @@ </security-role-ref> </session> <session> - <ejb-name>BasicSecuredSLSB</ejb-name> + <ejb-name>JBWS723BasicSecuredSLSB</ejb-name> <home>org.jboss.test.ws.jaxrpc.jbws723.OrganizationHome</home> <remote>org.jboss.test.ws.jaxrpc.jbws723.OrganizationRemote</remote> <service-endpoint>org.jboss.test.ws.jaxrpc.jbws723.OrganizationService</service-endpoint> @@ -28,7 +28,7 @@ <transaction-type>Container</transaction-type> </session> <session> - <ejb-name>ConfidentialSLSB</ejb-name> + <ejb-name>JBWS723ConfidentialSLSB</ejb-name> <home>org.jboss.test.ws.jaxrpc.jbws723.OrganizationHome</home> <remote>org.jboss.test.ws.jaxrpc.jbws723.OrganizationRemote</remote> <service-endpoint>org.jboss.test.ws.jaxrpc.jbws723.OrganizationService</service-endpoint> @@ -45,21 +45,21 @@ <method-permission> <role-name>friend</role-name> <method> - <ejb-name>RoleSecuredSLSB</ejb-name> + <ejb-name>JBWS723RoleSecuredSLSB</ejb-name> <method-name>*</method-name> </method> </method-permission> <method-permission> <unchecked/> <method> - <ejb-name>BasicSecuredSLSB</ejb-name> + <ejb-name>JBWS723BasicSecuredSLSB</ejb-name> <method-name>*</method-name> </method> </method-permission> <method-permission> <unchecked/> <method> - <ejb-name>ConfidentialSLSB</ejb-name> + <ejb-name>JBWS723ConfidentialSLSB</ejb-name> <method-name>*</method-name> </method> </method-permission> Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws723/META-INF/jboss.xml =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws723/META-INF/jboss.xml 2008-05-20 13:43:20 UTC (rev 7110) +++ stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws723/META-INF/jboss.xml 2008-05-20 14:20:31 UTC (rev 7111) @@ -8,8 +8,8 @@ <enterprise-beans> <session> - <ejb-name>RoleSecuredSLSB</ejb-name> - <jndi-name>ejb/RoleSecuredSLSB</jndi-name> + <ejb-name>JBWS723RoleSecuredSLSB</ejb-name> + <jndi-name>ejb/JBWS723RoleSecuredSLSB</jndi-name> <port-component> <port-component-name>RoleSecured</port-component-name> <port-component-uri>/jaxrpc-jbws723/RoleSecured</port-component-uri> @@ -19,8 +19,8 @@ </port-component> </session> <session> - <ejb-name>BasicSecuredSLSB</ejb-name> - <jndi-name>ejb/BasicSecuredSLSB</jndi-name> + <ejb-name>JBWS723BasicSecuredSLSB</ejb-name> + <jndi-name>ejb/JBWS723BasicSecuredSLSB</jndi-name> <port-component> <port-component-name>BasicSecured</port-component-name> <port-component-uri>/jaxrpc-jbws723/BasicSecured</port-component-uri> @@ -30,8 +30,8 @@ </port-component> </session> <session> - <ejb-name>ConfidentialSLSB</ejb-name> - <jndi-name>ejb/ConfidentialSLSB</jndi-name> + <ejb-name>JBWS723ConfidentialSLSB</ejb-name> + <jndi-name>ejb/JBWS723ConfidentialSLSB</jndi-name> <port-component> <port-component-name>ConfidentialSecured</port-component-name> <port-component-uri>/jaxrpc-jbws723/ConfidentialSecured</port-component-uri> Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws723/META-INF/webservices.xml =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws723/META-INF/webservices.xml 2008-05-20 13:43:20 UTC (rev 7110) +++ stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws723/META-INF/webservices.xml 2008-05-20 14:20:31 UTC (rev 7111) @@ -15,7 +15,7 @@ <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> + <ejb-link>JBWS723RoleSecuredSLSB</ejb-link> </service-impl-bean> </port-component> <port-component> @@ -23,7 +23,7 @@ <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> + <ejb-link>JBWS723BasicSecuredSLSB</ejb-link> </service-impl-bean> </port-component> <port-component> @@ -31,7 +31,7 @@ <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> + <ejb-link>JBWS723ConfidentialSLSB</ejb-link> </service-impl-bean> </port-component> </webservice-description>