Author: mageshbk(a)jboss.com Date: 2008-09-28 03:12:00 -0400 (Sun, 28 Sep 2008) New Revision: 8276 Added: framework/branches/jbossws-framework-2.0.1.GA_CP/src/test/etc/auth.conf Modified: framework/branches/jbossws-framework-2.0.1.GA_CP/src/test/ant-import/build-testsuite.xml framework/branches/jbossws-framework-2.0.1.GA_CP/src/test/java/org/jboss/test/ws/jaxws/samples/jaxr/scout/JaxrBaseTest.java framework/branches/jbossws-framework-2.0.1.GA_CP/src/test/java/org/jboss/test/ws/jaxws/samples/jaxr/scout/publish/JaxrDeleteOrganizationTestCase.java framework/branches/jbossws-framework-2.0.1.GA_CP/src/test/java/org/jboss/test/ws/jaxws/samples/jaxr/scout/publish/JaxrSaveOrganizationTestCase.java framework/branches/jbossws-framework-2.0.1.GA_CP/src/test/java/org/jboss/test/ws/jaxws/samples/jaxr/scout/query/JaxrBusinessQueryTestCase.java Log: [JBPAPP-1194]-Fix Testcase failures against EAP Modified: framework/branches/jbossws-framework-2.0.1.GA_CP/src/test/ant-import/build-testsuite.xml =================================================================== --- framework/branches/jbossws-framework-2.0.1.GA_CP/src/test/ant-import/build-testsuite.xml 2008-09-28 07:10:57 UTC (rev 8275) +++ framework/branches/jbossws-framework-2.0.1.GA_CP/src/test/ant-import/build-testsuite.xml 2008-09-28 07:12:00 UTC (rev 8276) @@ -294,6 +294,7 @@ <include name="jndi.properties"/> <include name="tst.policy"/> <include name="log4j.xml"/> + <include name="auth.conf"/> </fileset> <filterset> <filter token="jboss.bind.address" value="${node0}"/> @@ -407,6 +408,7 @@ <sysproperty key="jbossws.integration.target" value="${jbossws.integration.target}"/> <sysproperty key="jmx.authentication.username" value="${jmx.authentication.username}"/> <sysproperty key="jmx.authentication.password" value="${jmx.authentication.password}"/> + <sysproperty key="java.security.auth.login.config" value="${tests.output.dir}/classes/auth.conf"/> <sysproperty key="org.jboss.ws.wsse.keyStore" value="${tests.output.dir}/resources/jaxrpc/samples/wssecurity/wsse.keystore"/> <sysproperty key="org.jboss.ws.wsse.trustStore" value="${tests.output.dir}/resources/jaxrpc/samples/wssecurity/wsse.truststore"/> <sysproperty key="org.jboss.ws.wsse.keyStorePassword" value="jbossws"/> @@ -446,6 +448,7 @@ <sysproperty key="jbossws.integration.target" value="${jbossws.integration.target}"/> <sysproperty key="jmx.authentication.username" value="${jmx.authentication.username}"/> <sysproperty key="jmx.authentication.password" value="${jmx.authentication.password}"/> + <sysproperty key="java.security.auth.login.config" value="${tests.output.dir}/classes/auth.conf"/> <!-- http://jira.jboss.com/jira/browse/JBWS-917 <sysproperty key="javax.net.ssl.keyStore" value="${tests.output.dir}/resources/jaxrpc/samples/wssecurity/wsse.keystore"/> Added: framework/branches/jbossws-framework-2.0.1.GA_CP/src/test/etc/auth.conf =================================================================== --- framework/branches/jbossws-framework-2.0.1.GA_CP/src/test/etc/auth.conf (rev 0) +++ framework/branches/jbossws-framework-2.0.1.GA_CP/src/test/etc/auth.conf 2008-09-28 07:12:00 UTC (rev 8276) @@ -0,0 +1,9 @@ +other { + // Put your login modules that work without jBoss here + + // jBoss LoginModule + org.jboss.security.ClientLoginModule required; + + // Put your login modules that need jBoss here + +}; \ No newline at end of file Modified: framework/branches/jbossws-framework-2.0.1.GA_CP/src/test/java/org/jboss/test/ws/jaxws/samples/jaxr/scout/JaxrBaseTest.java =================================================================== --- framework/branches/jbossws-framework-2.0.1.GA_CP/src/test/java/org/jboss/test/ws/jaxws/samples/jaxr/scout/JaxrBaseTest.java 2008-09-28 07:10:57 UTC (rev 8275) +++ framework/branches/jbossws-framework-2.0.1.GA_CP/src/test/java/org/jboss/test/ws/jaxws/samples/jaxr/scout/JaxrBaseTest.java 2008-09-28 07:12:00 UTC (rev 8276) @@ -91,10 +91,12 @@ { //Change the createonstart setting for juddi service and restart it server = getServer(); + login(); server.invoke(OBJECT_NAME, "setCreateOnStart", new Object[] { Boolean.TRUE }, new String[] { Boolean.TYPE.getName() }); server.invoke(OBJECT_NAME, "stop", null, null); server.invoke(OBJECT_NAME, "start", null, null); - + logout(); + //Ensure that the Jaxr Connection Factory class is setup String factoryString = "javax.xml.registry.ConnectionFactoryClass"; String factoryClass = System.getProperty(factoryString); @@ -127,16 +129,18 @@ { if (connection != null) connection.close(); - + + login(); //stop the juddi service so that all the tables are dropped server.invoke(OBJECT_NAME, "setCreateOnStart", new Object[] { Boolean.FALSE }, new String[] { Boolean.TYPE.getName() }); server.invoke(OBJECT_NAME, "stop", null, null); + logout(); } /** * Does authentication with the uddi registry */ - protected void login() throws JAXRException + protected void jaxrLogin() throws JAXRException { PasswordAuthentication passwdAuth = new PasswordAuthentication(userid, passwd.toCharArray()); Set creds = new HashSet(); Modified: framework/branches/jbossws-framework-2.0.1.GA_CP/src/test/java/org/jboss/test/ws/jaxws/samples/jaxr/scout/publish/JaxrDeleteOrganizationTestCase.java =================================================================== --- framework/branches/jbossws-framework-2.0.1.GA_CP/src/test/java/org/jboss/test/ws/jaxws/samples/jaxr/scout/publish/JaxrDeleteOrganizationTestCase.java 2008-09-28 07:10:57 UTC (rev 8275) +++ framework/branches/jbossws-framework-2.0.1.GA_CP/src/test/java/org/jboss/test/ws/jaxws/samples/jaxr/scout/publish/JaxrDeleteOrganizationTestCase.java 2008-09-28 07:12:00 UTC (rev 8276) @@ -45,7 +45,7 @@ public String saveOrg(String orgname) throws JAXRException { String keyid = ""; - login(); + jaxrLogin(); getJAXREssentials(); Collection orgs = new ArrayList(); Modified: framework/branches/jbossws-framework-2.0.1.GA_CP/src/test/java/org/jboss/test/ws/jaxws/samples/jaxr/scout/publish/JaxrSaveOrganizationTestCase.java =================================================================== --- framework/branches/jbossws-framework-2.0.1.GA_CP/src/test/java/org/jboss/test/ws/jaxws/samples/jaxr/scout/publish/JaxrSaveOrganizationTestCase.java 2008-09-28 07:10:57 UTC (rev 8275) +++ framework/branches/jbossws-framework-2.0.1.GA_CP/src/test/java/org/jboss/test/ws/jaxws/samples/jaxr/scout/publish/JaxrSaveOrganizationTestCase.java 2008-09-28 07:12:00 UTC (rev 8276) @@ -47,7 +47,7 @@ public void testSaveOrg() throws JAXRException { String keyid = ""; - login(); + jaxrLogin(); rs = connection.getRegistryService(); Modified: framework/branches/jbossws-framework-2.0.1.GA_CP/src/test/java/org/jboss/test/ws/jaxws/samples/jaxr/scout/query/JaxrBusinessQueryTestCase.java =================================================================== --- framework/branches/jbossws-framework-2.0.1.GA_CP/src/test/java/org/jboss/test/ws/jaxws/samples/jaxr/scout/query/JaxrBusinessQueryTestCase.java 2008-09-28 07:10:57 UTC (rev 8275) +++ framework/branches/jbossws-framework-2.0.1.GA_CP/src/test/java/org/jboss/test/ws/jaxws/samples/jaxr/scout/query/JaxrBusinessQueryTestCase.java 2008-09-28 07:12:00 UTC (rev 8276) @@ -48,7 +48,7 @@ { super.setUp(); String keyid = ""; - login(); + jaxrLogin(); getJAXREssentials(); Collection orgs = new ArrayList();