Author: asoldano
Date: 2014-02-26 07:18:09 -0500 (Wed, 26 Feb 2014)
New Revision: 18439
Removed:
stack/cxf/trunk/modules/jaspi/src/main/java/org/jboss/wsf/stack/cxf/jaspi/client/SecurityActions.java
Modified:
stack/cxf/trunk/modules/jaspi/src/main/java/org/jboss/wsf/stack/cxf/jaspi/JaspiServerAuthenticator.java
stack/cxf/trunk/modules/jaspi/src/main/java/org/jboss/wsf/stack/cxf/jaspi/config/JBossWSServerAuthConfig.java
stack/cxf/trunk/modules/jaspi/src/main/java/org/jboss/wsf/stack/cxf/jaspi/interceptor/JaspiSubjectCreatingInitInterceptor.java
Log:
[JBWS-3767] Misc minor changes
Modified:
stack/cxf/trunk/modules/jaspi/src/main/java/org/jboss/wsf/stack/cxf/jaspi/JaspiServerAuthenticator.java
===================================================================
---
stack/cxf/trunk/modules/jaspi/src/main/java/org/jboss/wsf/stack/cxf/jaspi/JaspiServerAuthenticator.java 2014-02-26
12:17:10 UTC (rev 18438)
+++
stack/cxf/trunk/modules/jaspi/src/main/java/org/jboss/wsf/stack/cxf/jaspi/JaspiServerAuthenticator.java 2014-02-26
12:18:09 UTC (rev 18439)
@@ -73,7 +73,7 @@
}
else
{
- throw new SoapFault(e.getMessage(), new QName("", "japsi
AuthException"));
+ throw new SoapFault(e.getMessage(), new QName("", "jaspi
AuthException"));
}
}
Message response = null;
@@ -124,7 +124,7 @@
}
else
{
- throw new SoapFault(e.getMessage(), new QName("", "japsi
AuthException"));
+ throw new SoapFault(e.getMessage(), new QName("", "jaspi
AuthException"));
}
}
if (messageInfo.getResponseMessage() != null &&
!message.getExchange().isOneWay())
Deleted:
stack/cxf/trunk/modules/jaspi/src/main/java/org/jboss/wsf/stack/cxf/jaspi/client/SecurityActions.java
===================================================================
---
stack/cxf/trunk/modules/jaspi/src/main/java/org/jboss/wsf/stack/cxf/jaspi/client/SecurityActions.java 2014-02-26
12:17:10 UTC (rev 18438)
+++
stack/cxf/trunk/modules/jaspi/src/main/java/org/jboss/wsf/stack/cxf/jaspi/client/SecurityActions.java 2014-02-26
12:18:09 UTC (rev 18439)
@@ -1,107 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2013, Red Hat, Inc., and individual contributors
- * as indicated by the @author tags. See the copyright.txt file in the
- * distribution for a full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site:
http://www.fsf.org.
- */
-package org.jboss.wsf.stack.cxf.jaspi.client;
-
-/**
- * @author <a href="mailto:ema@redhat.com">Jim Ma</a>
- */
-import java.security.AccessController;
-import java.security.PrivilegedAction;
-import java.security.PrivilegedActionException;
-import java.security.PrivilegedExceptionAction;
-
-import org.jboss.security.SecurityContext;
-import org.jboss.security.SecurityContextAssociation;
-
-class SecurityActions
-{
- static ClassLoader getContextClassLoader()
- {
- return AccessController.doPrivileged(new PrivilegedAction<ClassLoader>()
- {
- public ClassLoader run()
- {
- return Thread.currentThread().getContextClassLoader();
- }
- });
-
- }
-
- static SecurityContext getSecurityContext()
- {
- return AccessController.doPrivileged(new PrivilegedAction<SecurityContext>()
- {
-
- public SecurityContext run()
- {
- return SecurityContextAssociation.getSecurityContext();
- }
- });
- }
-
- static Class<?> loadClass(final ClassLoader cl, final String name) throws
PrivilegedActionException
- {
- return AccessController.doPrivileged(new
PrivilegedExceptionAction<Class<?>>()
- {
- public Class<?> run() throws PrivilegedActionException
- {
- if (cl == null)
- {
- return loadClass(name);
- }
- try
- {
- return cl.loadClass(name);
- }
- catch (Exception ignore)
- {
- return loadClass(name);
- }
- }
- });
- }
-
- static Class<?> loadClass(final String name) throws PrivilegedActionException
- {
- return AccessController.doPrivileged(new
PrivilegedExceptionAction<Class<?>>()
- {
- public Class<?> run() throws PrivilegedActionException
- {
- try
- {
- return getClass().getClassLoader().loadClass(name);
- }
- catch (Exception ignore)
- {
- try
- {
- return getContextClassLoader().loadClass(name);
- }
- catch (Exception e)
- {
- throw new PrivilegedActionException(e);
- }
- }
- }
- });
- }
-}
\ No newline at end of file
Modified:
stack/cxf/trunk/modules/jaspi/src/main/java/org/jboss/wsf/stack/cxf/jaspi/config/JBossWSServerAuthConfig.java
===================================================================
---
stack/cxf/trunk/modules/jaspi/src/main/java/org/jboss/wsf/stack/cxf/jaspi/config/JBossWSServerAuthConfig.java 2014-02-26
12:17:10 UTC (rev 18438)
+++
stack/cxf/trunk/modules/jaspi/src/main/java/org/jboss/wsf/stack/cxf/jaspi/config/JBossWSServerAuthConfig.java 2014-02-26
12:18:09 UTC (rev 18439)
@@ -218,10 +218,8 @@
private ServerAuthModule createSAM(ClassLoader moduleCL, String name, String lmshName)
throws Exception
{
Class clazz = SecurityActions.loadClass(moduleCL, name);
- Constructor ctr = clazz.getConstructor(new Class[]
- {String.class});
- return (ServerAuthModule) ctr.newInstance(new Object[]
- {lmshName});
+ Constructor ctr = clazz.getConstructor(new Class[] {String.class});
+ return (ServerAuthModule) ctr.newInstance(new Object[] {lmshName});
}
}
\ No newline at end of file
Modified:
stack/cxf/trunk/modules/jaspi/src/main/java/org/jboss/wsf/stack/cxf/jaspi/interceptor/JaspiSubjectCreatingInitInterceptor.java
===================================================================
---
stack/cxf/trunk/modules/jaspi/src/main/java/org/jboss/wsf/stack/cxf/jaspi/interceptor/JaspiSubjectCreatingInitInterceptor.java 2014-02-26
12:17:10 UTC (rev 18438)
+++
stack/cxf/trunk/modules/jaspi/src/main/java/org/jboss/wsf/stack/cxf/jaspi/interceptor/JaspiSubjectCreatingInitInterceptor.java 2014-02-26
12:18:09 UTC (rev 18439)
@@ -1,3 +1,24 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2014, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site:
http://www.fsf.org.
+ */
package org.jboss.wsf.stack.cxf.jaspi.interceptor;
import org.apache.cxf.interceptor.Fault;
@@ -7,7 +28,7 @@
import org.jboss.security.auth.callback.JBossCallbackHandler;
import org.jboss.security.plugins.JBossAuthenticationManager;
-/*
+/**
* CXF interceptor to set jaspi JBossAuthenticationManager in message
* @author <a href="mailto:ema@redhat.com">Jim Ma</a>
*/