Author: mageshbk(a)jboss.com Date: 2008-09-27 05:01:44 -0400 (Sat, 27 Sep 2008) New Revision: 8265 Modified: common/branches/jbossws-common-1.0.0.GA_CP01_JBPAPP-1211/src/main/java/org/jboss/wsf/test/JBossWSTest.java common/branches/jbossws-common-1.0.0.GA_CP01_JBPAPP-1211/src/main/java/org/jboss/wsf/test/JBossWSTestHelper.java common/branches/jbossws-common-1.0.0.GA_CP01_JBPAPP-1211/src/main/java/org/jboss/wsf/test/JBossWSTestSetup.java common/branches/jbossws-common-1.0.0.GA_CP01_JBPAPP-1211/version.properties Log: [JBPAPP-1155]-Fix Framework test case failures with EAP Modified: common/branches/jbossws-common-1.0.0.GA_CP01_JBPAPP-1211/src/main/java/org/jboss/wsf/test/JBossWSTest.java =================================================================== --- common/branches/jbossws-common-1.0.0.GA_CP01_JBPAPP-1211/src/main/java/org/jboss/wsf/test/JBossWSTest.java 2008-09-27 07:14:01 UTC (rev 8264) +++ common/branches/jbossws-common-1.0.0.GA_CP01_JBPAPP-1211/src/main/java/org/jboss/wsf/test/JBossWSTest.java 2008-09-27 09:01:44 UTC (rev 8265) @@ -66,6 +66,16 @@ return delegate.getServer(); } + public void login() + { + delegate.login(); + } + + public void logout() + { + delegate.logout(); + } + public boolean isTargetJBoss50() { return delegate.isTargetJBoss50(); Modified: common/branches/jbossws-common-1.0.0.GA_CP01_JBPAPP-1211/src/main/java/org/jboss/wsf/test/JBossWSTestHelper.java =================================================================== --- common/branches/jbossws-common-1.0.0.GA_CP01_JBPAPP-1211/src/main/java/org/jboss/wsf/test/JBossWSTestHelper.java 2008-09-27 07:14:01 UTC (rev 8264) +++ common/branches/jbossws-common-1.0.0.GA_CP01_JBPAPP-1211/src/main/java/org/jboss/wsf/test/JBossWSTestHelper.java 2008-09-27 09:01:44 UTC (rev 8265) @@ -30,6 +30,13 @@ import javax.management.ObjectName; import javax.naming.InitialContext; import javax.naming.NamingException; +import javax.security.auth.callback.Callback; +import javax.security.auth.callback.CallbackHandler; +import javax.security.auth.callback.NameCallback; +import javax.security.auth.callback.PasswordCallback; +import javax.security.auth.callback.UnsupportedCallbackException; +import javax.security.auth.login.LoginContext; +import javax.security.auth.login.LoginException; import javax.xml.namespace.QName; import javax.xml.transform.Source; import javax.xml.ws.Dispatch; @@ -56,6 +63,9 @@ private static String implVendor; private static String implTitle; private static String implVersion; + private static LoginContext loginContext; + private static String user = System.getProperty("jmx.authentication.username"); + private static String pass = System.getProperty("jmx.authentication.password"); /** Deploy the given archive */ @@ -160,6 +170,30 @@ return server; } + public static void login() + { + try + { + if (loginContext == null) + { + loginContext = new LoginContext("Login", new AppCallbackHandler(user, pass)); + } + loginContext.login(); + } + catch (LoginException le) + { + throw new RuntimeException("Cannot login to server with username:[" + user + "], password:[" + pass + "]", le); + } + } + + public static void logout() + { + if (loginContext != null) + { + try { loginContext.logout(); } catch (LoginException ex) { } + } + } + private TestDeployer getDeployer() { return new TestDeployerJBoss(getServer()); @@ -242,4 +276,44 @@ return url; } + + public static class AppCallbackHandler implements CallbackHandler + { + + private String username; + private String password; + + public AppCallbackHandler(String usern, String passw) + { + this.username = usern; + this.password = passw; + } + + public void handle(Callback[] callbacks) throws java.io.IOException, UnsupportedCallbackException + { + for (int i = 0; i < callbacks.length; i++) + { + if (callbacks[i] instanceof NameCallback) + { + NameCallback nc = (NameCallback) callbacks[i]; + if (password == null) + nc.setName("anonymous"); + else + nc.setName(username); + } + else if (callbacks[i] instanceof PasswordCallback) + { + PasswordCallback pc = (PasswordCallback) callbacks[i]; + if (password != null) + { + pc.setPassword(password.toCharArray()); + } + } + else + { + throw new UnsupportedCallbackException(callbacks[i], "Unrecognized Callback"); + } + } + } + } } Modified: common/branches/jbossws-common-1.0.0.GA_CP01_JBPAPP-1211/src/main/java/org/jboss/wsf/test/JBossWSTestSetup.java =================================================================== --- common/branches/jbossws-common-1.0.0.GA_CP01_JBPAPP-1211/src/main/java/org/jboss/wsf/test/JBossWSTestSetup.java 2008-09-27 07:14:01 UTC (rev 8264) +++ common/branches/jbossws-common-1.0.0.GA_CP01_JBPAPP-1211/src/main/java/org/jboss/wsf/test/JBossWSTestSetup.java 2008-09-27 09:01:44 UTC (rev 8265) @@ -133,4 +133,14 @@ { return delegate.getServer(); } + + public void login() + { + delegate.login(); + } + + public void logout() + { + delegate.logout(); + } } Modified: common/branches/jbossws-common-1.0.0.GA_CP01_JBPAPP-1211/version.properties =================================================================== --- common/branches/jbossws-common-1.0.0.GA_CP01_JBPAPP-1211/version.properties 2008-09-27 07:14:01 UTC (rev 8264) +++ common/branches/jbossws-common-1.0.0.GA_CP01_JBPAPP-1211/version.properties 2008-09-27 09:01:44 UTC (rev 8265) @@ -5,8 +5,8 @@ specification.vendor=JBoss (http://www.jboss.org) specification.version=jbossws-2.0 -version.id=1.0.0.GA_CP01 -repository.id=1.0.0.GA_CP01 +version.id=1.0.0.GA_CP01_JBPAPP-1211 +repository.id=1.0.0.GA_CP01_JBPAPP-1211 implementation.title=JBoss Web Services - Common implementation.url=http://www.jboss.org/products/jbossws