From jbossws-commits at lists.jboss.org Tue Feb 16 07:57:53 2010
Content-Type: multipart/mixed; boundary="===============3275388212389065197=="
MIME-Version: 1.0
From: jbossws-commits at lists.jboss.org
To: jbossws-commits at lists.jboss.org
Subject: [jbossws-commits] JBossWS SVN: r11595 -
stack/native/trunk/modules/core/src/main/java/org/jboss/wsf/stack/jbws.
Date: Tue, 16 Feb 2010 07:57:53 -0500
Message-ID: <201002161257.o1GCvr9E005514@svn01.web.mwc.hst.phx2.redhat.com>
--===============3275388212389065197==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable
Author: richard.opalka(a)jboss.com
Date: 2010-02-16 07:57:53 -0500 (Tue, 16 Feb 2010)
New Revision: 11595
Removed:
stack/native/trunk/modules/core/src/main/java/org/jboss/wsf/stack/jbws/W=
ebServiceContextEJB.java
stack/native/trunk/modules/core/src/main/java/org/jboss/wsf/stack/jbws/W=
ebServiceContextJSE.java
Modified:
stack/native/trunk/modules/core/src/main/java/org/jboss/wsf/stack/jbws/N=
ativeWebServiceContext.java
stack/native/trunk/modules/core/src/main/java/org/jboss/wsf/stack/jbws/W=
ebServiceContextFactoryImpl.java
Log:
[JBWS-2934] refactoring native WebServiceContext implementation
Modified: stack/native/trunk/modules/core/src/main/java/org/jboss/wsf/stack=
/jbws/NativeWebServiceContext.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- stack/native/trunk/modules/core/src/main/java/org/jboss/wsf/stack/jbws/=
NativeWebServiceContext.java 2010-02-16 10:12:53 UTC (rev 11594)
+++ stack/native/trunk/modules/core/src/main/java/org/jboss/wsf/stack/jbws/=
NativeWebServiceContext.java 2010-02-16 12:57:53 UTC (rev 11595)
@@ -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 j=
axws 2.1 methods =
+ * A WebServiceContext implementing the getEndpointReference jaxws methods=
. =
* =
* @author alessio.soldano(a)jboss.com
- * @since 27-Jan-2009
+ * @author Richard Opalka
*/
-public abstract class NativeWebServiceContext extends ExtensibleWebService=
Context
+public final class NativeWebServiceContext extends ExtensibleWebServiceCon=
text
{
- public NativeWebServiceContext(MessageContext messageContext)
+ public NativeWebServiceContext(final MessageContext messageContext)
{
super(messageContext);
}
=
- public EndpointReference getEndpointReference(Element... referenceParam=
eters)
+ public EndpointReference getEndpointReference(final Element... referenc=
eParameters)
{
- return getEndpointReference(W3CEndpointReference.class, referencePar=
ameters);
+ return this.getEndpointReference(W3CEndpointReference.class, referen=
ceParameters);
}
=
- public T getEndpointReference(Class cl=
azz, Element... referenceParameters)
+ public T getEndpointReference(final Class=
clazz, final Element... referenceParameters)
{
EndpointMetaData epMetaData =3D ((CommonMessageContext)getMessageCon=
text()).getEndpointMetaData();
if (epMetaData =3D=3D 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();
+ }
}
Deleted: stack/native/trunk/modules/core/src/main/java/org/jboss/wsf/stack/=
jbws/WebServiceContextEJB.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- stack/native/trunk/modules/core/src/main/java/org/jboss/wsf/stack/jbws/=
WebServiceContextEJB.java 2010-02-16 10:12:53 UTC (rev 11594)
+++ stack/native/trunk/modules/core/src/main/java/org/jboss/wsf/stack/jbws/=
WebServiceContextEJB.java 2010-02-16 12:57:53 UTC (rev 11595)
@@ -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 =3D getAttachment(EJBContext.class);
- Principal principal =3D ejbContext.getCallerPrincipal();
- return principal;
- }
-
- public boolean isUserInRole(String role)
- {
- EJBContext ejbContext =3D getAttachment(EJBContext.class);
- boolean isUserInRole =3D ejbContext.isCallerInRole(role);
- return isUserInRole;
- }
-}
Modified: stack/native/trunk/modules/core/src/main/java/org/jboss/wsf/stack=
/jbws/WebServiceContextFactoryImpl.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- stack/native/trunk/modules/core/src/main/java/org/jboss/wsf/stack/jbws/=
WebServiceContextFactoryImpl.java 2010-02-16 10:12:53 UTC (rev 11594)
+++ stack/native/trunk/modules/core/src/main/java/org/jboss/wsf/stack/jbws/=
WebServiceContextFactoryImpl.java 2010-02-16 12:57:53 UTC (rev 11595)
@@ -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 =3D null;
=
if(type.toString().indexOf("EJB")!=3D-1 || type.toString().indexOf("=
MDB")!=3D-1)
- context =3D new WebServiceContextEJB(messageContext);
+ context =3D new WebServiceContextEJB(new NativeWebServiceContext(=
messageContext));
else
- context =3D new WebServiceContextJSE(messageContext);
+ context =3D new WebServiceContextJSE(new NativeWebServiceContext(=
messageContext));
=
return context;
}
Deleted: stack/native/trunk/modules/core/src/main/java/org/jboss/wsf/stack/=
jbws/WebServiceContextJSE.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- stack/native/trunk/modules/core/src/main/java/org/jboss/wsf/stack/jbws/=
WebServiceContextJSE.java 2010-02-16 10:12:53 UTC (rev 11594)
+++ stack/native/trunk/modules/core/src/main/java/org/jboss/wsf/stack/jbws/=
WebServiceContextJSE.java 2010-02-16 12:57:53 UTC (rev 11595)
@@ -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 HttpServletReq=
uest.
- *
- * @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 =3D (HttpServletRequest)msgContext.get(MessageContext.SE=
RVLET_REQUEST);
- if (httpRequest =3D=3D null)
- throw new IllegalStateException("Cannot obtain HTTPServletRequest=
from message context");
- }
-
- @Override
- public Principal getUserPrincipal()
- {
- Principal principal =3D httpRequest.getUserPrincipal();
- return principal;
- }
-
- @Override
- public boolean isUserInRole(String role)
- {
- boolean isUserInRole =3D httpRequest.isUserInRole(role);
- return isUserInRole;
- }
-}
--===============3275388212389065197==--