[jbossws-commits] JBossWS SVN: r14387 - in stack/native/trunk/modules: testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wssecurity and 1 other directory.

[jbossws-commits at lists.jboss.org]

Author: alessio.soldano at jboss.com
Date: 2011-05-12 12:12:15 -0400 (Thu, 12 May 2011)
New Revision: 14387

Modified:
   stack/native/trunk/modules/core/src/main/java/org/jboss/ws/extensions/security/operation/ReceiveUsernameOperation.java
   stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wssecurity/UsernameBean.java
Log:
[JBWS-3256] Fixing testcase to properly use Principal api and fixing SPIProvider resolution in ReceiveUsernameOperation


Modified: stack/native/trunk/modules/core/src/main/java/org/jboss/ws/extensions/security/operation/ReceiveUsernameOperation.java
===================================================================
--- stack/native/trunk/modules/core/src/main/java/org/jboss/ws/extensions/security/operation/ReceiveUsernameOperation.java	2011-05-12 14:42:58 UTC (rev 14386)
+++ stack/native/trunk/modules/core/src/main/java/org/jboss/ws/extensions/security/operation/ReceiveUsernameOperation.java	2011-05-12 16:12:15 UTC (rev 14387)
@@ -37,6 +37,7 @@
 import org.jboss.ws.extensions.security.nonce.NonceStore;
 import org.jboss.wsf.spi.SPIProvider;
 import org.jboss.wsf.spi.SPIProviderResolver;
+import org.jboss.wsf.spi.classloading.ClassLoaderProvider;
 import org.jboss.wsf.spi.invocation.SecurityAdaptor;
 import org.jboss.wsf.spi.invocation.SecurityAdaptorFactory;
 import org.jboss.xb.binding.SimpleTypeBindings;
@@ -57,8 +58,9 @@
       this.store = store;
       this.nonceStore = nonceStore;
 
-      SPIProvider spiProvider = SPIProviderResolver.getInstance().getProvider();
-      secAdapterfactory = spiProvider.getSPI(SecurityAdaptorFactory.class);
+      ClassLoader cl = ClassLoaderProvider.getDefaultProvider().getServerIntegrationClassLoader();
+      SPIProvider spiProvider = SPIProviderResolver.getInstance(cl).getProvider();
+      secAdapterfactory = spiProvider.getSPI(SecurityAdaptorFactory.class, cl);
    }
 
    public void process(Document message, Token token) throws WSSecurityException

Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wssecurity/UsernameBean.java
===================================================================
--- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wssecurity/UsernameBean.java	2011-05-12 14:42:58 UTC (rev 14386)
+++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wssecurity/UsernameBean.java	2011-05-12 16:12:15 UTC (rev 14387)
@@ -56,6 +56,6 @@
    {
       Principal principal = wsCtx.getUserPrincipal();
       log.info("getUsernameToken: " + principal);
-      return principal.toString();
+      return principal.getName();
    }
 }