[jbossws-commits] JBossWS SVN: r17319 - in stack/native/branches/jbossws-native-3.1.2.SP3-patch-02_JBPAPP-10637/modules: testsuite and 1 other directory.

Wednesday, 13 February 2013


Author: klape
Date: 2013-02-13 11:59:21 -0500 (Wed, 13 Feb 2013)
New Revision: 17319

Modified:
  
stack/native/branches/jbossws-native-3.1.2.SP3-patch-02_JBPAPP-10637/modules/core/src/main/java/org/jboss/wsf/stack/jbws/NativeWebServiceContext.java
  
stack/native/branches/jbossws-native-3.1.2.SP3-patch-02_JBPAPP-10637/modules/core/src/main/java/org/jboss/wsf/stack/jbws/WebServiceContextEJB.java
  
stack/native/branches/jbossws-native-3.1.2.SP3-patch-02_JBPAPP-10637/modules/core/src/main/java/org/jboss/wsf/stack/jbws/WebServiceContextFactoryImpl.java
  
stack/native/branches/jbossws-native-3.1.2.SP3-patch-02_JBPAPP-10637/modules/core/src/main/java/org/jboss/wsf/stack/jbws/WebServiceContextJSE.java
  
stack/native/branches/jbossws-native-3.1.2.SP3-patch-02_JBPAPP-10637/modules/testsuite/pom.xml
Log:
[JBPAPP-10637] The WebServiceContext injection needs to be maintained using a ThreadLocal

Modified:
stack/native/branches/jbossws-native-3.1.2.SP3-patch-02_JBPAPP-10637/modules/core/src/main/java/org/jboss/wsf/stack/jbws/NativeWebServiceContext.java
===================================================================
---
stack/native/branches/jbossws-native-3.1.2.SP3-patch-02_JBPAPP-10637/modules/core/src/main/java/org/jboss/wsf/stack/jbws/NativeWebServiceContext.java	2013-02-13
16:58:36 UTC (rev 17318)
+++
stack/native/branches/jbossws-native-3.1.2.SP3-patch-02_JBPAPP-10637/modules/core/src/main/java/org/jboss/wsf/stack/jbws/NativeWebServiceContext.java	2013-02-13
16:59:21 UTC (rev 17319)
@@ -21,6 +21,8 @@
  */
 package org.jboss.wsf.stack.jbws;
 
+import java.security.Principal;
+
 import javax.xml.ws.EndpointReference;
 import javax.xml.ws.WebServiceException;
 import javax.xml.ws.handler.MessageContext;
@@ -35,24 +37,24 @@
 import org.w3c.dom.Element;
 
 /**
- * An ExtensibileWebServiceContext implementing the getEndpointReference jaxws 2.1
methods 
+ * A WebServiceContext implementing the getEndpointReference jaxws methods. 
  * 
  * @author alessio.soldano(a)jboss.com
- * @since 27-Jan-2009
+ * @author <a href="mailto:ropalka@redhat.com">Richard Opalka</a>
  */
-public abstract class NativeWebServiceContext extends ExtensibleWebServiceContext
+public final class NativeWebServiceContext extends ExtensibleWebServiceContext
 {
-   public NativeWebServiceContext(MessageContext messageContext)
+   public NativeWebServiceContext(final MessageContext messageContext)
    {
       super(messageContext);
    }
    
-   public EndpointReference getEndpointReference(Element... referenceParameters)
+   public EndpointReference getEndpointReference(final Element... referenceParameters)
    {
-      return getEndpointReference(W3CEndpointReference.class, referenceParameters);
+      return this.getEndpointReference(W3CEndpointReference.class, referenceParameters);
    }
 
-   public <T extends EndpointReference> T getEndpointReference(Class<T>
clazz, Element... referenceParameters)
+   public <T extends EndpointReference> T getEndpointReference(final Class<T>
clazz, final Element... referenceParameters)
    {
       EndpointMetaData epMetaData =
((CommonMessageContext)getMessageContext()).getEndpointMetaData();
       if (epMetaData == null)
@@ -75,4 +77,16 @@
       }
       return EndpointReferenceUtil.transform(clazz, builder.build());
    }
+
+   @Override
+   public Principal getUserPrincipal()
+   {
+      throw new UnsupportedOperationException();
+   }
+
+   @Override
+   public boolean isUserInRole(String role)
+   {
+      throw new UnsupportedOperationException();
+   }
 }

Modified:
stack/native/branches/jbossws-native-3.1.2.SP3-patch-02_JBPAPP-10637/modules/core/src/main/java/org/jboss/wsf/stack/jbws/WebServiceContextEJB.java
===================================================================
---
stack/native/branches/jbossws-native-3.1.2.SP3-patch-02_JBPAPP-10637/modules/core/src/main/java/org/jboss/wsf/stack/jbws/WebServiceContextEJB.java	2013-02-13
16:58:36 UTC (rev 17318)
+++
stack/native/branches/jbossws-native-3.1.2.SP3-patch-02_JBPAPP-10637/modules/core/src/main/java/org/jboss/wsf/stack/jbws/WebServiceContextEJB.java	2013-02-13
16:59:21 UTC (rev 17319)
@@ -1,55 +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.stack.jbws;
-
-import java.security.Principal;
-
-import javax.ejb.EJBContext;
-import javax.xml.ws.handler.MessageContext;
-
-/**
- * A WebServiceContext implementation that delegates to the EJBContext.
- *
- * @author Thomas.Diesler(a)jboss.org
- * @since 23-Jan-2007
- */
-public class WebServiceContextEJB extends NativeWebServiceContext
-{
-   public WebServiceContextEJB(MessageContext msgContext)
-   {
-      super(msgContext);
-   }
-
-   public Principal getUserPrincipal()
-   {
-      EJBContext ejbContext = getAttachment(EJBContext.class);
-      Principal principal = ejbContext.getCallerPrincipal();
-      return principal;
-   }
-
-   public boolean isUserInRole(String role)
-   {
-      EJBContext ejbContext = getAttachment(EJBContext.class);
-      boolean isUserInRole = ejbContext.isCallerInRole(role);
-      return isUserInRole;
-   }
-}

Modified:
stack/native/branches/jbossws-native-3.1.2.SP3-patch-02_JBPAPP-10637/modules/core/src/main/java/org/jboss/wsf/stack/jbws/WebServiceContextFactoryImpl.java
===================================================================
---
stack/native/branches/jbossws-native-3.1.2.SP3-patch-02_JBPAPP-10637/modules/core/src/main/java/org/jboss/wsf/stack/jbws/WebServiceContextFactoryImpl.java	2013-02-13
16:58:36 UTC (rev 17318)
+++
stack/native/branches/jbossws-native-3.1.2.SP3-patch-02_JBPAPP-10637/modules/core/src/main/java/org/jboss/wsf/stack/jbws/WebServiceContextFactoryImpl.java	2013-02-13
16:59:21 UTC (rev 17319)
@@ -23,6 +23,8 @@
 
 import javax.xml.ws.handler.MessageContext;
 
+import org.jboss.wsf.common.invocation.WebServiceContextEJB;
+import org.jboss.wsf.common.invocation.WebServiceContextJSE;
 import org.jboss.wsf.spi.invocation.ExtensibleWebServiceContext;
 import org.jboss.wsf.spi.invocation.InvocationType;
 import org.jboss.wsf.spi.invocation.WebServiceContextFactory;
@@ -39,9 +41,9 @@
       ExtensibleWebServiceContext context = null;
 
       if(type.toString().indexOf("EJB")!=-1 ||
type.toString().indexOf("MDB")!=-1)
-         context = new WebServiceContextEJB(messageContext);
+         context = new WebServiceContextEJB(new
NativeWebServiceContext(messageContext));
       else
-         context = new WebServiceContextJSE(messageContext);
+         context = new WebServiceContextJSE(new
NativeWebServiceContext(messageContext));
 
       return context;
    }

Modified:
stack/native/branches/jbossws-native-3.1.2.SP3-patch-02_JBPAPP-10637/modules/core/src/main/java/org/jboss/wsf/stack/jbws/WebServiceContextJSE.java
===================================================================
---
stack/native/branches/jbossws-native-3.1.2.SP3-patch-02_JBPAPP-10637/modules/core/src/main/java/org/jboss/wsf/stack/jbws/WebServiceContextJSE.java	2013-02-13
16:58:36 UTC (rev 17318)
+++
stack/native/branches/jbossws-native-3.1.2.SP3-patch-02_JBPAPP-10637/modules/core/src/main/java/org/jboss/wsf/stack/jbws/WebServiceContextJSE.java	2013-02-13
16:59:21 UTC (rev 17319)
@@ -1,60 +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.stack.jbws;
-
-import java.security.Principal;
-
-import javax.servlet.http.HttpServletRequest;
-import javax.xml.ws.handler.MessageContext;
-
-/**
- * A WebServiceContext implementation that delegates to the HttpServletRequest.
- *
- * @author Thomas.Diesler(a)jboss.org
- * @since 23-Jan-2007
- */
-public class WebServiceContextJSE extends NativeWebServiceContext
-{
-   private HttpServletRequest httpRequest;
-
-   public WebServiceContextJSE(MessageContext msgContext)
-   {
-      super(msgContext);
-      httpRequest = (HttpServletRequest)msgContext.get(MessageContext.SERVLET_REQUEST);
-      if (httpRequest == null)
-         throw new IllegalStateException("Cannot obtain HTTPServletRequest from
message context");
-   }
-
-   @Override
-   public Principal getUserPrincipal()
-   {
-      Principal principal = httpRequest.getUserPrincipal();
-      return principal;
-   }
-
-   @Override
-   public boolean isUserInRole(String role)
-   {
-      boolean isUserInRole = httpRequest.isUserInRole(role);
-      return isUserInRole;
-   }
-}

Modified:
stack/native/branches/jbossws-native-3.1.2.SP3-patch-02_JBPAPP-10637/modules/testsuite/pom.xml
===================================================================
---
stack/native/branches/jbossws-native-3.1.2.SP3-patch-02_JBPAPP-10637/modules/testsuite/pom.xml	2013-02-13
16:58:36 UTC (rev 17318)
+++
stack/native/branches/jbossws-native-3.1.2.SP3-patch-02_JBPAPP-10637/modules/testsuite/pom.xml	2013-02-13
16:59:21 UTC (rev 17319)
@@ -53,7 +53,7 @@
       <artifactId>tools</artifactId>
       <version>1.5.0</version>
       <scope>system</scope>
-      <systemPath>${java.home}/../lib/tools.jar</systemPath>
+      <systemPath>${java.home}/../Classes/classes.jar</systemPath>
     </dependency>
     <dependency>
       <groupId>javax.ejb</groupId>


    

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

[jbossws-commits] JBossWS SVN: r17319 - in stack/native/branches/jbossws-native-3.1.2.SP3-patch-02_JBPAPP-10637/modules: testsuite and 1 other directory.