Author: asoldano Date: 2014-04-30 08:53:40 -0400 (Wed, 30 Apr 2014) New Revision: 18606 Modified: stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jms/JMSEndpointOnlyDeploymentTestCaseForked.java stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jms_http/JMSHTTPEndpointDeploymentTestCaseForked.java stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/samples/kerberos/KeystorePasswordCallback.java stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/KeystorePasswordCallback.java stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/ServerUsernamePasswordCallback.java stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wssePolicy/KeystorePasswordCallback.java stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wssePolicy/ServerUsernamePasswordCallback.java Log: [JBWS-3686] Fixing compile issues in spring testsuite too Modified: stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jms/JMSEndpointOnlyDeploymentTestCaseForked.java =================================================================== --- stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jms/JMSEndpointOnlyDeploymentTestCaseForked.java 2014-04-30 12:53:03 UTC (rev 18605) +++ stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jms/JMSEndpointOnlyDeploymentTestCaseForked.java 2014-04-30 12:53:40 UTC (rev 18606) @@ -43,7 +43,7 @@ import org.apache.cxf.frontend.ClientProxy; import org.apache.cxf.transport.jms.JMSConduit; -import org.apache.cxf.transport.jms.JNDIConfiguration; +import org.apache.cxf.transport.jms.JMSConfiguration; import org.jboss.ws.common.DOMUtils; import org.jboss.ws.common.IOUtils; import org.jboss.wsf.test.JBossWSCXFTestSetup; @@ -183,10 +183,10 @@ private void setupProxy(HelloWorld proxy) { JMSConduit conduit = (JMSConduit)ClientProxy.getClient(proxy).getConduit(); - JNDIConfiguration jndiConfig = conduit.getJmsConfig().getJndiConfig(); - jndiConfig.setConnectionUserName(JBossWSTestHelper.getTestUsername()); - jndiConfig.setConnectionPassword(JBossWSTestHelper.getTestPassword()); - Properties props = conduit.getJmsConfig().getJndiTemplate().getEnvironment(); + JMSConfiguration config = conduit.getJmsConfig(); + config.setUserName(JBossWSTestHelper.getTestUsername()); + config.setPassword(JBossWSTestHelper.getTestPassword()); + Properties props = conduit.getJmsConfig().getJndiEnvironment(); props.put(Context.SECURITY_PRINCIPAL, JBossWSTestHelper.getTestUsername()); props.put(Context.SECURITY_CREDENTIALS, JBossWSTestHelper.getTestPassword()); } Modified: stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jms_http/JMSHTTPEndpointDeploymentTestCaseForked.java =================================================================== --- stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jms_http/JMSHTTPEndpointDeploymentTestCaseForked.java 2014-04-30 12:53:03 UTC (rev 18605) +++ stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jms_http/JMSHTTPEndpointDeploymentTestCaseForked.java 2014-04-30 12:53:40 UTC (rev 18606) @@ -32,7 +32,7 @@ import org.apache.cxf.frontend.ClientProxy; import org.apache.cxf.transport.jms.JMSConduit; -import org.apache.cxf.transport.jms.JNDIConfiguration; +import org.apache.cxf.transport.jms.JMSConfiguration; import org.jboss.test.ws.jaxws.cxf.jms.HelloWorld; import org.jboss.ws.common.IOUtils; import org.jboss.wsf.test.JBossWSCXFTestSetup; @@ -93,10 +93,10 @@ private void setupProxy(HelloWorld proxy) { JMSConduit conduit = (JMSConduit)ClientProxy.getClient(proxy).getConduit(); - JNDIConfiguration jndiConfig = conduit.getJmsConfig().getJndiConfig(); - jndiConfig.setConnectionUserName(JBossWSTestHelper.getTestUsername()); - jndiConfig.setConnectionPassword(JBossWSTestHelper.getTestPassword()); - Properties props = conduit.getJmsConfig().getJndiTemplate().getEnvironment(); + JMSConfiguration config = conduit.getJmsConfig(); + config.setUserName(JBossWSTestHelper.getTestUsername()); + config.setPassword(JBossWSTestHelper.getTestPassword()); + Properties props = conduit.getJmsConfig().getJndiEnvironment(); props.put(Context.SECURITY_PRINCIPAL, JBossWSTestHelper.getTestUsername()); props.put(Context.SECURITY_CREDENTIALS, JBossWSTestHelper.getTestPassword()); } Modified: stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/samples/kerberos/KeystorePasswordCallback.java =================================================================== --- stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/samples/kerberos/KeystorePasswordCallback.java 2014-04-30 12:53:03 UTC (rev 18605) +++ stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/samples/kerberos/KeystorePasswordCallback.java 2014-04-30 12:53:40 UTC (rev 18606) @@ -27,7 +27,7 @@ import javax.security.auth.callback.CallbackHandler; import javax.security.auth.callback.UnsupportedCallbackException; -import org.apache.ws.security.WSPasswordCallback; +import org.apache.wss4j.common.ext.WSPasswordCallback; public class KeystorePasswordCallback implements CallbackHandler { Modified: stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/KeystorePasswordCallback.java =================================================================== --- stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/KeystorePasswordCallback.java 2014-04-30 12:53:03 UTC (rev 18605) +++ stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/KeystorePasswordCallback.java 2014-04-30 12:53:40 UTC (rev 18606) @@ -28,7 +28,7 @@ import javax.security.auth.callback.Callback; import javax.security.auth.callback.CallbackHandler; import javax.security.auth.callback.UnsupportedCallbackException; -import org.apache.ws.security.WSPasswordCallback; +import org.apache.wss4j.common.ext.WSPasswordCallback; public class KeystorePasswordCallback implements CallbackHandler { Modified: stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/ServerUsernamePasswordCallback.java =================================================================== --- stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/ServerUsernamePasswordCallback.java 2014-04-30 12:53:03 UTC (rev 18605) +++ stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/ServerUsernamePasswordCallback.java 2014-04-30 12:53:40 UTC (rev 18606) @@ -26,7 +26,7 @@ import javax.security.auth.callback.Callback; import javax.security.auth.callback.CallbackHandler; import javax.security.auth.callback.UnsupportedCallbackException; -import org.apache.ws.security.WSPasswordCallback; +import org.apache.wss4j.common.ext.WSPasswordCallback; public class ServerUsernamePasswordCallback implements CallbackHandler { Modified: stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wssePolicy/KeystorePasswordCallback.java =================================================================== --- stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wssePolicy/KeystorePasswordCallback.java 2014-04-30 12:53:03 UTC (rev 18605) +++ stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wssePolicy/KeystorePasswordCallback.java 2014-04-30 12:53:40 UTC (rev 18606) @@ -28,7 +28,7 @@ import javax.security.auth.callback.Callback; import javax.security.auth.callback.CallbackHandler; import javax.security.auth.callback.UnsupportedCallbackException; -import org.apache.ws.security.WSPasswordCallback; +import org.apache.wss4j.common.ext.WSPasswordCallback; public class KeystorePasswordCallback implements CallbackHandler { Modified: stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wssePolicy/ServerUsernamePasswordCallback.java =================================================================== --- stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wssePolicy/ServerUsernamePasswordCallback.java 2014-04-30 12:53:03 UTC (rev 18605) +++ stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wssePolicy/ServerUsernamePasswordCallback.java 2014-04-30 12:53:40 UTC (rev 18606) @@ -26,7 +26,7 @@ import javax.security.auth.callback.Callback; import javax.security.auth.callback.CallbackHandler; import javax.security.auth.callback.UnsupportedCallbackException; -import org.apache.ws.security.WSPasswordCallback; +import org.apache.wss4j.common.ext.WSPasswordCallback; public class ServerUsernamePasswordCallback implements CallbackHandler {