[jboss-cvs] JBossAS SVN: r83574 - in branches/Branch_5_x: webservices/src/main/org/jboss/wsf/container/jboss50/invocation and 1 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Wed Jan 28 13:12:37 EST 2009
Author: alessio.soldano at jboss.com
Date: 2009-01-28 13:12:36 -0500 (Wed, 28 Jan 2009)
New Revision: 83574
Removed:
branches/Branch_5_x/webservices/src/main/org/jboss/wsf/container/jboss50/invocation/WebServiceContextFactoryImpl.java
branches/Branch_5_x/webservices/src/resources/jbossws-jboss50.jar/META-INF/services/org.jboss.wsf.spi.invocation.WebServiceContextFactory
Modified:
branches/Branch_5_x/component-matrix/pom.xml
branches/Branch_5_x/webservices/src/main/org/jboss/wsf/container/jboss50/invocation/SecurityAdaptorImpl.java
Log:
Moving to JBossWS Native 3.1.0.CR1
Modified: branches/Branch_5_x/component-matrix/pom.xml
===================================================================
--- branches/Branch_5_x/component-matrix/pom.xml 2009-01-28 18:06:55 UTC (rev 83573)
+++ branches/Branch_5_x/component-matrix/pom.xml 2009-01-28 18:12:36 UTC (rev 83574)
@@ -33,10 +33,10 @@
<version.jboss.jbossts>4.4.0.GA</version.jboss.jbossts>
<version.jboss.jms-integration-tests>1.0.1.GA</version.jboss.jms-integration-tests>
<version.jboss.jaxr>1.2.1.GA</version.jboss.jaxr>
- <version.jboss.jbossws>3.0.5.GA</version.jboss.jbossws>
- <version.jboss.jbossws-common>1.0.8.GA</version.jboss.jbossws-common>
- <version.jboss.jbossws-framework>3.0.5.GA</version.jboss.jbossws-framework>
- <version.jboss.jbossws-spi>1.0.7.GA</version.jboss.jbossws-spi>
+ <version.jboss.jbossws>3.1.0.CR1</version.jboss.jbossws>
+ <version.jboss.jbossws-common>1.0.9.CR1</version.jboss.jbossws-common>
+ <version.jboss.jbossws-framework>3.1.0.CR1</version.jboss.jbossws-framework>
+ <version.jboss.jbossws-spi>1.1.0.CR1</version.jboss.jbossws-spi>
<version.jboss.messaging>1.4.1.GA</version.jboss.messaging>
<version.jboss.web>2.1.2.CR1</version.jboss.web>
<version.org.hibernate>3.3.1.GA</version.org.hibernate>
Modified: branches/Branch_5_x/webservices/src/main/org/jboss/wsf/container/jboss50/invocation/SecurityAdaptorImpl.java
===================================================================
--- branches/Branch_5_x/webservices/src/main/org/jboss/wsf/container/jboss50/invocation/SecurityAdaptorImpl.java 2009-01-28 18:06:55 UTC (rev 83573)
+++ branches/Branch_5_x/webservices/src/main/org/jboss/wsf/container/jboss50/invocation/SecurityAdaptorImpl.java 2009-01-28 18:12:36 UTC (rev 83574)
@@ -22,10 +22,16 @@
package org.jboss.wsf.container.jboss50.invocation;
import org.jboss.security.SecurityAssociation;
+import org.jboss.security.SecurityContext;
+import org.jboss.security.SecurityContextAssociation;
import org.jboss.wsf.spi.invocation.SecurityAdaptor;
+import java.security.AccessController;
import java.security.Principal;
+import java.security.PrivilegedAction;
+import javax.security.auth.Subject;
+
/**
* A JBoss specific SecurityAssociationAdaptor
*
@@ -57,4 +63,36 @@
{
SecurityAssociation.setCredential(credential);
}
+
+ public void pushSubjectContext(Subject subject, Principal principal, Object credential)
+ {
+ SecurityAdaptorImpl.pushSubjectContext(principal, credential, subject);
+ }
+
+ private static SecurityContext getSecurityContext()
+ {
+ return (SecurityContext)AccessController.doPrivileged(new PrivilegedAction() {
+ public Object run()
+ {
+ return SecurityContextAssociation.getSecurityContext();
+ }
+ });
+ }
+
+ private static void pushSubjectContext(final Principal p, final Object cred, final Subject s)
+ {
+ AccessController.doPrivileged(new PrivilegedAction() {
+
+ public Object run()
+ {
+ SecurityContext sc = getSecurityContext();
+ if (sc == null)
+ throw new IllegalStateException("Security Context is null");
+ sc.getUtil().createSubjectInfo(p, cred, s);
+ return null;
+ }
+ });
+ }
+
+
}
Deleted: branches/Branch_5_x/webservices/src/main/org/jboss/wsf/container/jboss50/invocation/WebServiceContextFactoryImpl.java
===================================================================
--- branches/Branch_5_x/webservices/src/main/org/jboss/wsf/container/jboss50/invocation/WebServiceContextFactoryImpl.java 2009-01-28 18:06:55 UTC (rev 83573)
+++ branches/Branch_5_x/webservices/src/main/org/jboss/wsf/container/jboss50/invocation/WebServiceContextFactoryImpl.java 2009-01-28 18:12:36 UTC (rev 83574)
@@ -1,50 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2006, 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.container.jboss50.invocation;
-
-import org.jboss.wsf.spi.invocation.*;
-
-import javax.xml.ws.WebServiceContext;
-import javax.xml.ws.handler.MessageContext;
-
-/**
- * @author Heiko.Braun at jboss.com
- * Created: Jul 25, 2007
- */
-public class WebServiceContextFactoryImpl extends WebServiceContextFactory
-{
- public ExtensibleWebServiceContext newWebServiceContext(InvocationType type, MessageContext messageContext)
- {
- ExtensibleWebServiceContext context = null;
-
- //checking for a provided WebServiceContext in the MessageContext; to be removed after EJBTHREE-1604
- WebServiceContext providedContext = (WebServiceContext)messageContext.get(WebServiceContext.class.toString());
- if (providedContext != null)
- context = new WebServiceContextDelegate(providedContext);
- else if(type.toString().indexOf("EJB")!=-1 || type.toString().indexOf("MDB")!=-1)
- context = new WebServiceContextEJB(messageContext);
- else
- context = new WebServiceContextJSE(messageContext);
-
- return context;
- }
-}
Deleted: branches/Branch_5_x/webservices/src/resources/jbossws-jboss50.jar/META-INF/services/org.jboss.wsf.spi.invocation.WebServiceContextFactory
===================================================================
--- branches/Branch_5_x/webservices/src/resources/jbossws-jboss50.jar/META-INF/services/org.jboss.wsf.spi.invocation.WebServiceContextFactory 2009-01-28 18:06:55 UTC (rev 83573)
+++ branches/Branch_5_x/webservices/src/resources/jbossws-jboss50.jar/META-INF/services/org.jboss.wsf.spi.invocation.WebServiceContextFactory 2009-01-28 18:12:36 UTC (rev 83574)
@@ -1 +0,0 @@
-org.jboss.wsf.container.jboss50.invocation.WebServiceContextFactoryImpl
\ No newline at end of file
More information about the jboss-cvs-commits
mailing list