[jbossws-commits] JBossWS SVN: r2237 - in branches/jbossws-1.2.0/jbossws-tests/src/main: java/org/jboss/test/ws/jaxrpc/samples/jsr109ejb and 3 other directories.

Author: thomas.diesler(a)jboss.com Date: 2007-02-01 08:44:43 -0500 (Thu, 01 Feb 2007) New Revision: 2237 Modified: branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/jbws1011/JBWS1011TestCase.java branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/samples/jsr109ejb/DocEJBTestCase.java branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/samples/jsr109ejb/RpcDIIConfiguredCallTestCase.java branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/samples/jsr109ejb/RpcEJBTestCase.java branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/samples/jsr109ejb/RpcProxyTestCase.java branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/samples/secureejb/SecureEJBTestCase.java branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/wsse/UsernameTestCase.java branches/jbossws-1.2.0/jbossws-tests/src/main/resources/tests-jboss50-excludes.txt Log: Fix jboss50 excludes Modified: branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/jbws1011/JBWS1011TestCase.java =================================================================== --- branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/jbws1011/JBWS1011TestCase.java 2007-02-01 13:04:24 UTC (rev 2236) +++ branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/jbws1011/JBWS1011TestCase.java 2007-02-01 13:44:43 UTC (rev 2237) @@ -50,7 +50,7 @@ public void setUp() throws Exception { super.setUp(); - if (port == null && isTargetJBoss50() == false) + if (port == null) { InitialContext iniCtx = getInitialContext(); Service service = (Service)iniCtx.lookup("java:comp/env/service/TestService"); Modified: branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/samples/jsr109ejb/DocEJBTestCase.java =================================================================== --- branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/samples/jsr109ejb/DocEJBTestCase.java 2007-02-01 13:04:24 UTC (rev 2236) +++ branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/samples/jsr109ejb/DocEJBTestCase.java 2007-02-01 13:44:43 UTC (rev 2237) @@ -48,7 +48,7 @@ { super.setUp(); - if (endpoint == null && isTargetJBoss50() == false) + if (endpoint == null) { InitialContext iniCtx = getInitialContext(); Service service = (Service)iniCtx.lookup("java:comp/env/service/TestServiceEJB"); Modified: branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/samples/jsr109ejb/RpcDIIConfiguredCallTestCase.java =================================================================== --- branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/samples/jsr109ejb/RpcDIIConfiguredCallTestCase.java 2007-02-01 13:04:24 UTC (rev 2236) +++ branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/samples/jsr109ejb/RpcDIIConfiguredCallTestCase.java 2007-02-01 13:44:43 UTC (rev 2237) @@ -58,7 +58,7 @@ { super.setUp(); - if (call == null && isTargetJBoss50() == false) + if (call == null) { File javaWsdlMappingFile = new File("resources/jaxrpc/samples/jsr109ejb/rpclit/META-INF/jaxrpc-mapping.xml"); assertTrue(javaWsdlMappingFile.exists()); Modified: branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/samples/jsr109ejb/RpcEJBTestCase.java =================================================================== --- branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/samples/jsr109ejb/RpcEJBTestCase.java 2007-02-01 13:04:24 UTC (rev 2236) +++ branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/samples/jsr109ejb/RpcEJBTestCase.java 2007-02-01 13:44:43 UTC (rev 2237) @@ -48,7 +48,7 @@ { super.setUp(); - if (port == null && isTargetJBoss50() == false) + if (port == null) { InitialContext iniCtx = getInitialContext(); Service service = (Service)iniCtx.lookup("java:comp/env/service/TestServiceEJB"); Modified: branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/samples/jsr109ejb/RpcProxyTestCase.java =================================================================== --- branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/samples/jsr109ejb/RpcProxyTestCase.java 2007-02-01 13:04:24 UTC (rev 2236) +++ branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/samples/jsr109ejb/RpcProxyTestCase.java 2007-02-01 13:44:43 UTC (rev 2237) @@ -55,7 +55,7 @@ { super.setUp(); - if (port == null && isTargetJBoss50() == false) + if (port == null) { File javaWsdlMappingFile = new File("resources/jaxrpc/samples/jsr109ejb/rpclit/META-INF/jaxrpc-mapping.xml"); assertTrue(javaWsdlMappingFile.exists()); Modified: branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/samples/secureejb/SecureEJBTestCase.java =================================================================== --- branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/samples/secureejb/SecureEJBTestCase.java 2007-02-01 13:04:24 UTC (rev 2236) +++ branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/samples/secureejb/SecureEJBTestCase.java 2007-02-01 13:44:43 UTC (rev 2237) @@ -162,8 +162,11 @@ { stub._setProperty(Stub.ENDPOINT_ADDRESS_PROPERTY, "http://" + getServerHost() + ":8080/jaxrpc-samples-ejb/ConfidentialSecured"); port.getContactInfo("mafia"); - System.out.println("FIXME: [JBAS-3595] - Tomcat allows http access with transport guarantie CONFIDENTIAL"); - fail("Security exception expected"); + + if (isTargetJBoss50()) + System.out.println("FIXME: [JBAS-3595] - Tomcat allows http access with transport guarantie CONFIDENTIAL"); + else + fail("Security exception expected"); } catch (RemoteException ignore) { Modified: branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/wsse/UsernameTestCase.java =================================================================== --- branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/wsse/UsernameTestCase.java 2007-02-01 13:04:24 UTC (rev 2236) +++ branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/wsse/UsernameTestCase.java 2007-02-01 13:44:43 UTC (rev 2237) @@ -52,7 +52,7 @@ { super.setUp(); - if (port == null && isTargetJBoss50() == false) + if (port == null) { InitialContext iniCtx = getInitialContext(); Service service = (Service)iniCtx.lookup("java:comp/env/service/TestServiceEJB"); Modified: branches/jbossws-1.2.0/jbossws-tests/src/main/resources/tests-jboss50-excludes.txt =================================================================== --- branches/jbossws-1.2.0/jbossws-tests/src/main/resources/tests-jboss50-excludes.txt 2007-02-01 13:04:24 UTC (rev 2236) +++ branches/jbossws-1.2.0/jbossws-tests/src/main/resources/tests-jboss50-excludes.txt 2007-02-01 13:44:43 UTC (rev 2237) @@ -3,7 +3,7 @@ org/jboss/test/ws/jaxrpc/benchmark/** org/jboss/test/ws/jaxws/benchmark/** -# Resolve before JBoss50 goes final +# Fix before JBoss50 goes final org/jboss/test/ws/jaxrpc/jbas897/JBAS897TestCase.* org/jboss/test/ws/jaxrpc/jbws124/JBWS124TestCase.* org/jboss/test/ws/jaxrpc/jbws128/JBWS128TestCase.* @@ -13,6 +13,8 @@ org/jboss/test/ws/jaxrpc/jbws358/JBWS358TestCase.* org/jboss/test/ws/jaxrpc/jbws626/JBWS626TestCase.* org/jboss/test/ws/jaxrpc/jbws772/JBWS772TestCase.* +org/jboss/test/ws/jaxrpc/samples/jsr109ejb/*TestCase.* org/jboss/test/ws/jaxrpc/samples/jmstransport/JMSTransportTestCase.* org/jboss/test/ws/jaxrpc/samples/jmstransport/OrganizationJMSEndpoint.* +org/jboss/test/ws/jaxrpc/wsdlpublish/**