Author: thomas.diesler(a)jboss.com Date: 2007-03-23 13:13:44 -0400 (Fri, 23 Mar 2007) New Revision: 2674 Modified: branches/jbossws-1.2.1/jbossws-tests/src/java/org/jboss/test/ws/jaxrpc/samples/secureejb/SecureEJBTestCase.java branches/jbossws-1.2.1/jbossws-tests/src/resources/jaxrpc/samples/secureejb/META-INF/jboss.xml branches/jbossws-1.2.1/jbossws-tests/src/resources/tests-jboss40-excludes.txt branches/jbossws-1.2.1/jbossws-tests/src/resources/tests-jboss40-noejb3-excludes.txt branches/jbossws-1.2.1/jbossws-tests/src/resources/tests-jboss42-excludes.txt branches/jbossws-1.2.1/jbossws-tests/src/resources/tests-jboss42-noejb3-excludes.txt branches/jbossws-1.2.1/jbossws-tests/src/resources/tests-tomcat-excludes.txt Log: Cleanup excludes Modified: branches/jbossws-1.2.1/jbossws-tests/src/java/org/jboss/test/ws/jaxrpc/samples/secureejb/SecureEJBTestCase.java =================================================================== --- branches/jbossws-1.2.1/jbossws-tests/src/java/org/jboss/test/ws/jaxrpc/samples/secureejb/SecureEJBTestCase.java 2007-03-23 16:27:29 UTC (rev 2673) +++ branches/jbossws-1.2.1/jbossws-tests/src/java/org/jboss/test/ws/jaxrpc/samples/secureejb/SecureEJBTestCase.java 2007-03-23 17:13:44 UTC (rev 2674) @@ -36,7 +36,6 @@ 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; @@ -133,22 +132,6 @@ 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-samples-ejb/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(); Modified: branches/jbossws-1.2.1/jbossws-tests/src/resources/jaxrpc/samples/secureejb/META-INF/jboss.xml =================================================================== --- branches/jbossws-1.2.1/jbossws-tests/src/resources/jaxrpc/samples/secureejb/META-INF/jboss.xml 2007-03-23 16:27:29 UTC (rev 2673) +++ branches/jbossws-1.2.1/jbossws-tests/src/resources/jaxrpc/samples/secureejb/META-INF/jboss.xml 2007-03-23 17:13:44 UTC (rev 2674) @@ -26,7 +26,6 @@ <port-component-uri>/jaxrpc-samples-ejb/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> @@ -36,7 +35,6 @@ <port-component-name>ConfidentialSecured</port-component-name> <port-component-uri>/jaxrpc-samples-ejb/ConfidentialSecured</port-component-uri> <transport-guarantee>CONFIDENTIAL</transport-guarantee> - <secure-wsdl-access>false</secure-wsdl-access> </port-component> </session> </enterprise-beans> Modified: branches/jbossws-1.2.1/jbossws-tests/src/resources/tests-jboss40-excludes.txt =================================================================== --- branches/jbossws-1.2.1/jbossws-tests/src/resources/tests-jboss40-excludes.txt 2007-03-23 16:27:29 UTC (rev 2673) +++ branches/jbossws-1.2.1/jbossws-tests/src/resources/tests-jboss40-excludes.txt 2007-03-23 17:13:44 UTC (rev 2674) @@ -2,8 +2,12 @@ org/jboss/test/ws/interop/** org/jboss/test/ws/benchmark/** +# JBossAS-4.2 excludes +org/jboss/test/ws/jaxrpc/jbws723/** + # EJB3/Injection excludes org/jboss/test/ws/jaxws/endpoint/** +org/jboss/test/ws/jaxws/jbws1581/** org/jboss/test/ws/jaxws/samples/handlerchain/HandlerChainClientTestCase* org/jboss/test/ws/jaxws/samples/retail/** org/jboss/test/ws/jaxws/samples/webserviceref/** Modified: branches/jbossws-1.2.1/jbossws-tests/src/resources/tests-jboss40-noejb3-excludes.txt =================================================================== --- branches/jbossws-1.2.1/jbossws-tests/src/resources/tests-jboss40-noejb3-excludes.txt 2007-03-23 16:27:29 UTC (rev 2673) +++ branches/jbossws-1.2.1/jbossws-tests/src/resources/tests-jboss40-noejb3-excludes.txt 2007-03-23 17:13:44 UTC (rev 2674) @@ -2,11 +2,15 @@ org/jboss/test/ws/interop/** org/jboss/test/ws/benchmark/** +# JBossAS-4.2 excludes +org/jboss/test/ws/jaxrpc/jbws723/** + # EJB3/Injection excludes org/jboss/test/ws/jaxws/eardeployment/** org/jboss/test/ws/jaxws/endpoint/** org/jboss/test/ws/jaxws/jbws944/** org/jboss/test/ws/jaxws/jbws981/** +org/jboss/test/ws/jaxws/jbws1581/** org/jboss/test/ws/jaxws/samples/context/WebServiceContextEJBTestCase* org/jboss/test/ws/jaxws/samples/handlerchain/HandlerChainClientTestCase* org/jboss/test/ws/jaxws/samples/jsr181ejb/JSR181WebServiceEJB3TestCase.* Modified: branches/jbossws-1.2.1/jbossws-tests/src/resources/tests-jboss42-excludes.txt =================================================================== --- branches/jbossws-1.2.1/jbossws-tests/src/resources/tests-jboss42-excludes.txt 2007-03-23 16:27:29 UTC (rev 2673) +++ branches/jbossws-1.2.1/jbossws-tests/src/resources/tests-jboss42-excludes.txt 2007-03-23 17:13:44 UTC (rev 2674) @@ -6,4 +6,5 @@ org/jboss/test/ws/jaxws/endpoint/** org/jboss/test/ws/jaxws/samples/handlerchain/HandlerChainClientTestCase.* org/jboss/test/ws/jaxws/samples/webserviceref/** +org/jboss/test/ws/jaxws/jbws1581/** org/jboss/test/ws/jaxws/serviceref/** Modified: branches/jbossws-1.2.1/jbossws-tests/src/resources/tests-jboss42-noejb3-excludes.txt =================================================================== --- branches/jbossws-1.2.1/jbossws-tests/src/resources/tests-jboss42-noejb3-excludes.txt 2007-03-23 16:27:29 UTC (rev 2673) +++ branches/jbossws-1.2.1/jbossws-tests/src/resources/tests-jboss42-noejb3-excludes.txt 2007-03-23 17:13:44 UTC (rev 2674) @@ -7,6 +7,7 @@ org/jboss/test/ws/jaxws/endpoint/** org/jboss/test/ws/jaxws/jbws944/** org/jboss/test/ws/jaxws/jbws981/** +org/jboss/test/ws/jaxws/jbws1581/** org/jboss/test/ws/jaxws/samples/context/WebServiceContextEJBTestCase* org/jboss/test/ws/jaxws/samples/handlerchain/HandlerChainClientTestCase* org/jboss/test/ws/jaxws/samples/jsr181ejb/JSR181WebServiceEJB3TestCase.* Modified: branches/jbossws-1.2.1/jbossws-tests/src/resources/tests-tomcat-excludes.txt =================================================================== --- branches/jbossws-1.2.1/jbossws-tests/src/resources/tests-tomcat-excludes.txt 2007-03-23 16:27:29 UTC (rev 2673) +++ branches/jbossws-1.2.1/jbossws-tests/src/resources/tests-tomcat-excludes.txt 2007-03-23 17:13:44 UTC (rev 2674) @@ -14,10 +14,12 @@ org/jboss/test/ws/jaxws/samples/webserviceref/** # JBoss excludes +org/jboss/test/ws/jaxrpc/jbws723/** org/jboss/test/ws/jaxrpc/samples/dynamichandler/*TestCase.* org/jboss/test/ws/jaxrpc/samples/jmstransport/JMSTransportTestCase.* org/jboss/test/ws/jaxrpc/samples/jmstransport/OrganizationJMSEndpoint.* org/jboss/test/ws/jaxrpc/samples/wsbpel/hello/*TestCase.* +org/jboss/test/ws/jaxws/jbws1581/** org/jboss/test/ws/jaxws/samples/jaxr/** # TODO: Why are these excluded