JBossWS SVN: r13647 - stack/native/branches/jbossws-native-3.1.2/modules/endorsed/src/main/resources/META-INF/services.
by jbossws-commits＠lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2011-01-31 06:00:23 -0500 (Mon, 31 Jan 2011)
New Revision: 13647
Added:
stack/native/branches/jbossws-native-3.1.2/modules/endorsed/src/main/resources/META-INF/services/javax.xml.soap.SOAPConnectionFactory
Log:
[JBPAPP-5839] Always endorse javax.xml.soap.SOAPConnectionFactory
Added: stack/native/branches/jbossws-native-3.1.2/modules/endorsed/src/main/resources/META-INF/services/javax.xml.soap.SOAPConnectionFactory
===================================================================
--- stack/native/branches/jbossws-native-3.1.2/modules/endorsed/src/main/resources/META-INF/services/javax.xml.soap.SOAPConnectionFactory (rev 0)
+++ stack/native/branches/jbossws-native-3.1.2/modules/endorsed/src/main/resources/META-INF/services/javax.xml.soap.SOAPConnectionFactory 2011-01-31 11:00:23 UTC (rev 13647)
@@ -0,0 +1 @@
+org.jboss.ws.core.soap.SOAPConnectionFactoryImpl
\ No newline at end of file
13 years, 10 months
JBossWS SVN: r13646 - stack/cxf/trunk/modules/dist/src/main/distro.
by jbossws-commits＠lists.jboss.org
Author: jim.ma
Date: 2011-01-28 21:35:56 -0500 (Fri, 28 Jan 2011)
New Revision: 13646
Modified:
stack/cxf/trunk/modules/dist/src/main/distro/test-exclude.xsl
Log:
[JBWS-3080]:Correct xslt file
Modified: stack/cxf/trunk/modules/dist/src/main/distro/test-exclude.xsl
===================================================================
--- stack/cxf/trunk/modules/dist/src/main/distro/test-exclude.xsl 2011-01-29 00:43:36 UTC (rev 13645)
+++ stack/cxf/trunk/modules/dist/src/main/distro/test-exclude.xsl 2011-01-29 02:35:56 UTC (rev 13646)
@@ -1,11 +1,11 @@
<?xml version="1.0"?>
<xsl:stylesheet version="1.0"
-xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:m="http://maven.apache.org/POM/4.0.0">
-<xsl:param name="targetName"/>
-<xsl:output method="text"/>
-<xsl:template match="/">
-<xsl:for-each select="//m:profile[m:id='$targetName']/m:build/m:plugins/m:plugin[m:artifactId='maven-surefire-plugin']//m:exclude">
-<xsl:value-of select="."/><xsl:text> </xsl:text>
-</xsl:for-each>
-</xsl:template>
+ xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:m="http://maven.apache.org/POM/4.0.0">
+ <xsl:param name="targetName"/>
+ <xsl:output method="text"/>
+ <xsl:template match="/">
+ <xsl:for-each select="//m:profile[m:id=$targetName]/m:build/m:plugins/m:plugin[m:artifactId='maven-surefire-plugin']//m:exclude">
+ <xsl:value-of select="."/><xsl:text> </xsl:text>
+ </xsl:for-each>
+ </xsl:template>
</xsl:stylesheet>
13 years, 11 months
JBossWS SVN: r13645 - in hudson/trunk: scripts and 1 other directory.
by jbossws-commits＠lists.jboss.org
Author: jim.ma
Date: 2011-01-28 19:43:36 -0500 (Fri, 28 Jan 2011)
New Revision: 13645
Modified:
hudson/trunk/hudson-home/jobs/AS-TESTS-AS-6.0.0/config.xml
hudson/trunk/scripts/jbossws-qa.sh
Log:
[JBWS-3080]:Remove the lines to copy profiles.xml
Modified: hudson/trunk/hudson-home/jobs/AS-TESTS-AS-6.0.0/config.xml
===================================================================
--- hudson/trunk/hudson-home/jobs/AS-TESTS-AS-6.0.0/config.xml 2011-01-28 15:26:31 UTC (rev 13644)
+++ hudson/trunk/hudson-home/jobs/AS-TESTS-AS-6.0.0/config.xml 2011-01-29 00:43:36 UTC (rev 13645)
@@ -30,7 +30,6 @@
# build and deploy
#
cd $STACK_DIR
-cp profiles.xml.example profiles.xml
mvn -Ptestsuite clean
ant $ENVIRONMENT deploy-jboss600
Modified: hudson/trunk/scripts/jbossws-qa.sh
===================================================================
--- hudson/trunk/scripts/jbossws-qa.sh 2011-01-28 15:26:31 UTC (rev 13644)
+++ hudson/trunk/scripts/jbossws-qa.sh 2011-01-29 00:43:36 UTC (rev 13645)
@@ -66,21 +66,18 @@
deployCoreDistributionWithSpring() {
cd $STACK_DIR
- cp profiles.xml.example profiles.xml
mvn -Ptestsuite,spring clean
ant $ENVIRONMENT -Dspring=true deploy-$JBOSS_TARGET
}
deployCoreDistribution() {
cd $STACK_DIR
- cp profiles.xml.example profiles.xml
mvn -Ptestsuite clean
ant $ENVIRONMENT deploy-$JBOSS_TARGET
}
deployBinaryDistributionWithSpring() {
cd $STACK_DIR
- cp profiles.xml.example profiles.xml
mvn -Ptestsuite clean
ant $ENVIRONMENT build-bin-dist
cd target
@@ -93,7 +90,6 @@
deployBinaryDistribution() {
cd $STACK_DIR
- cp profiles.xml.example profiles.xml
mvn -Ptestsuite clean
ant $ENVIRONMENT build-bin-dist
cd target
@@ -112,27 +108,23 @@
deploySourceDistributionWithSpring() {
cd $STACK_DIR
- cp profiles.xml.example profiles.xml
mvn -Ptestsuite,spring clean
ant $ENVIRONMENT build-src-dist
cd target
rm -rf jbossws-$STACK_ID-src-dist
unzip jbossws-$STACK_ID-src-dist.zip
cd jbossws-$STACK_ID-src-dist
- cp profiles.xml.example profiles.xml
ant $ENVIRONMENT -Dspring=true deploy-$JBOSS_TARGET
}
deploySourceDistribution() {
cd $STACK_DIR
- cp profiles.xml.example profiles.xml
mvn -Ptestsuite clean
ant $ENVIRONMENT build-src-dist
cd target
rm -rf jbossws-$STACK_ID-src-dist
unzip jbossws-$STACK_ID-src-dist.zip
cd jbossws-$STACK_ID-src-dist
- cp profiles.xml.example profiles.xml
ant $ENVIRONMENT deploy-$JBOSS_TARGET
}
13 years, 11 months
JBossWS SVN: r13643 - stack/cxf/branches/jbossws-cxf-3.1.2.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2011-01-28 10:05:00 -0500 (Fri, 28 Jan 2011)
New Revision: 13643
Modified:
stack/cxf/branches/jbossws-cxf-3.1.2/build.xml
Log:
[JBPAPP-5719] Adding maven.opts parameter to the effective settings call of the build; it's now possible to use maven.opts="-s my-settings.xml" for using a completely different mvn conf
Modified: stack/cxf/branches/jbossws-cxf-3.1.2/build.xml
===================================================================
--- stack/cxf/branches/jbossws-cxf-3.1.2/build.xml 2011-01-28 15:02:25 UTC (rev 13642)
+++ stack/cxf/branches/jbossws-cxf-3.1.2/build.xml 2011-01-28 15:05:00 UTC (rev 13643)
@@ -47,11 +47,12 @@
</target>
<target name="mvn-settings" depends="os-init">
+ <!-- Use a system property to overwrite the empty default value -->
+ <property name="maven.opts" value=""/>
<!-- Loads the properties from the effective maven settings -->
<mkdir dir="${stack.output.dir}"/>
<exec dir="${basedir}" executable="${mvn}" failonerror="true">
- <arg value="-Doutput=${stack.output.dir}/effective-settings.xml"/>
- <arg value="help:effective-settings"/>
+ <arg line="${maven.opts} -Doutput=${stack.output.dir}/effective-settings.xml help:effective-settings"/>
</exec>
<xmlproperty file="${stack.output.dir}/effective-settings.xml" keeproot="false"/>
<condition property="jboss510.home" value="${profiles.profile.properties.jboss510.home}">
13 years, 11 months
JBossWS SVN: r13642 - stack/native/branches/jbossws-native-3.1.2.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2011-01-28 10:02:25 -0500 (Fri, 28 Jan 2011)
New Revision: 13642
Modified:
stack/native/branches/jbossws-native-3.1.2/build.xml
Log:
[JBPAPP-5719] Adding maven.opts parameter to the effective settings call of the build; it's now possible to use maven.opts="-s my-settings.xml" for using a completely different mvn conf
Modified: stack/native/branches/jbossws-native-3.1.2/build.xml
===================================================================
--- stack/native/branches/jbossws-native-3.1.2/build.xml 2011-01-28 14:57:14 UTC (rev 13641)
+++ stack/native/branches/jbossws-native-3.1.2/build.xml 2011-01-28 15:02:25 UTC (rev 13642)
@@ -43,11 +43,12 @@
</target>
<target name="mvn-settings" depends="os-init">
+ <!-- Use a system property to overwrite the empty default value -->
+ <property name="maven.opts" value=""/>
<!-- Loads the properties from the effective maven settings -->
<mkdir dir="${stack.output.dir}"/>
<exec dir="${basedir}" executable="${mvn}" failonerror="true">
- <arg value="-Doutput=${stack.output.dir}/effective-settings.xml"/>
- <arg value="help:effective-settings"/>
+ <arg line="${maven.opts} -Doutput=${stack.output.dir}/effective-settings.xml help:effective-settings"/>
</exec>
<xmlproperty file="${stack.output.dir}/effective-settings.xml" keeproot="false"/>
<condition property="jboss510.home" value="${profiles.profile.properties.jboss510.home}">
13 years, 11 months
JBossWS SVN: r13641 - in stack/cxf/branches/jbossws-cxf-4.0.0.SNAPSHOT-Maven3/modules/dist/src/main: scripts and 1 other directory.
by jbossws-commits＠lists.jboss.org
Author: jim.ma
Date: 2011-01-28 09:57:14 -0500 (Fri, 28 Jan 2011)
New Revision: 13641
Added:
stack/cxf/branches/jbossws-cxf-4.0.0.SNAPSHOT-Maven3/modules/dist/src/main/distro/test-exclude.xsl
Removed:
stack/cxf/branches/jbossws-cxf-4.0.0.SNAPSHOT-Maven3/modules/dist/src/main/scripts/test-exclude.xsl
Log:
Moved test-exclude.xsl to the right place
Added: stack/cxf/branches/jbossws-cxf-4.0.0.SNAPSHOT-Maven3/modules/dist/src/main/distro/test-exclude.xsl
===================================================================
--- stack/cxf/branches/jbossws-cxf-4.0.0.SNAPSHOT-Maven3/modules/dist/src/main/distro/test-exclude.xsl (rev 0)
+++ stack/cxf/branches/jbossws-cxf-4.0.0.SNAPSHOT-Maven3/modules/dist/src/main/distro/test-exclude.xsl 2011-01-28 14:57:14 UTC (rev 13641)
@@ -0,0 +1,11 @@
+<?xml version="1.0"?>
+<xsl:stylesheet version="1.0"
+ xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:m="http://maven.apache.org/POM/4.0.0">
+ <xsl:param name="targetName"/>
+ <xsl:output method="text"/>
+ <xsl:template match="/">
+ <xsl:for-each select="//m:profile[m:id='jboss600']/m:build/m:plugins/m:plugin[m:artifactId='maven-surefire-plugin']//m:exclude">
+ <xsl:value-of select="."/><xsl:text> </xsl:text>
+ </xsl:for-each>
+ </xsl:template>
+</xsl:stylesheet>
Deleted: stack/cxf/branches/jbossws-cxf-4.0.0.SNAPSHOT-Maven3/modules/dist/src/main/scripts/test-exclude.xsl
===================================================================
--- stack/cxf/branches/jbossws-cxf-4.0.0.SNAPSHOT-Maven3/modules/dist/src/main/scripts/test-exclude.xsl 2011-01-28 14:23:49 UTC (rev 13640)
+++ stack/cxf/branches/jbossws-cxf-4.0.0.SNAPSHOT-Maven3/modules/dist/src/main/scripts/test-exclude.xsl 2011-01-28 14:57:14 UTC (rev 13641)
@@ -1,11 +0,0 @@
-<?xml version="1.0"?>
-<xsl:stylesheet version="1.0"
-xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:m="http://maven.apache.org/POM/4.0.0">
-<xsl:param name="targetName"/>
-<xsl:output method="text"/>
-<xsl:template match="/">
-<xsl:for-each select="//m:profile[m:id='$targetName']/m:build/m:plugins/m:plugin[m:artifactId='maven-surefire-plugin']//m:exclude">
-<xsl:value-of select="."/><xsl:text> </xsl:text>
-</xsl:for-each>
-</xsl:template>
-</xsl:stylesheet>
13 years, 11 months
JBossWS SVN: r13640 - stack/cxf/branches/jbossws-cxf-4.0.0.SNAPSHOT-Maven3.
by jbossws-commits＠lists.jboss.org
Author: jim.ma
Date: 2011-01-28 09:23:49 -0500 (Fri, 28 Jan 2011)
New Revision: 13640
Modified:
stack/cxf/branches/jbossws-cxf-4.0.0.SNAPSHOT-Maven3/build.xml
Log:
Update distribution maven build script
Modified: stack/cxf/branches/jbossws-cxf-4.0.0.SNAPSHOT-Maven3/build.xml
===================================================================
--- stack/cxf/branches/jbossws-cxf-4.0.0.SNAPSHOT-Maven3/build.xml 2011-01-28 12:51:28 UTC (rev 13639)
+++ stack/cxf/branches/jbossws-cxf-4.0.0.SNAPSHOT-Maven3/build.xml 2011-01-28 14:23:49 UTC (rev 13640)
@@ -122,7 +122,7 @@
<delete dir="${dist.output.dir}/jbossws-cxf-bin-dist"/>
<exec dir="${basedir}" executable="${mvn}" failonerror="true">
- <arg line="${maven.opts} -Pdist -Dbindist clean install"/>
+ <arg line="${maven.opts} -Pdist -Dbindist install"/>
</exec>
<zip destfile="${stack.output.dir}/jbossws-cxf-bin-dist.zip">
@@ -138,7 +138,7 @@
<!-- Use a system property to overwrite the empty default value -->
<property name="maven.opts" value=""/>
<echo/>
- <echo message="${mvn} ${maven.opts} -Pdist -Dsrcdist clean install"/>
+ <echo message="${mvn} ${maven.opts} -Pdist -Dsrcdist install"/>
<echo/>
<delete dir="${dist.output.dir}/jbossws-cxf-src-dist"/>
13 years, 11 months
JBossWS SVN: r13639 - stack/cxf/branches/jbossws-cxf-3.1.2/modules/testsuite.
by jbossws-commits＠lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2011-01-28 07:51:28 -0500 (Fri, 28 Jan 2011)
New Revision: 13639
Modified:
stack/cxf/branches/jbossws-cxf-3.1.2/modules/testsuite/test-excludes-jboss510.txt
Log:
excluding MSFT interop tests - for now
Modified: stack/cxf/branches/jbossws-cxf-3.1.2/modules/testsuite/test-excludes-jboss510.txt
===================================================================
--- stack/cxf/branches/jbossws-cxf-3.1.2/modules/testsuite/test-excludes-jboss510.txt 2011-01-28 12:47:22 UTC (rev 13638)
+++ stack/cxf/branches/jbossws-cxf-3.1.2/modules/testsuite/test-excludes-jboss510.txt 2011-01-28 12:51:28 UTC (rev 13639)
@@ -44,3 +44,6 @@
# [JBWS-3020] Investigate why HandlerScopeTestCase fails
org/jboss/test/ws/jaxws/handlerscope/*TestCase.*
+
+# Seems MSFT interop. endpoints are down :(
+org/jboss/test/ws/jaxws/cxf/interop/wstrust10/**
13 years, 11 months
JBossWS SVN: r13638 - stack/cxf/branches/jbossws-cxf-3.1.2/modules/server/src/main/java/org/jboss/wsf/stack/cxf.
by jbossws-commits＠lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2011-01-28 07:47:22 -0500 (Fri, 28 Jan 2011)
New Revision: 13638
Removed:
stack/cxf/branches/jbossws-cxf-3.1.2/modules/server/src/main/java/org/jboss/wsf/stack/cxf/WebServiceContextEJB.java
stack/cxf/branches/jbossws-cxf-3.1.2/modules/server/src/main/java/org/jboss/wsf/stack/cxf/WebServiceContextJSE.java
Modified:
stack/cxf/branches/jbossws-cxf-3.1.2/modules/server/src/main/java/org/jboss/wsf/stack/cxf/WebServiceContextFactoryImpl.java
Log:
[JBPAPP-5052] backporting ThreadLocal aware WebServiceContext implementation
Deleted: stack/cxf/branches/jbossws-cxf-3.1.2/modules/server/src/main/java/org/jboss/wsf/stack/cxf/WebServiceContextEJB.java
===================================================================
--- stack/cxf/branches/jbossws-cxf-3.1.2/modules/server/src/main/java/org/jboss/wsf/stack/cxf/WebServiceContextEJB.java 2011-01-28 12:23:19 UTC (rev 13637)
+++ stack/cxf/branches/jbossws-cxf-3.1.2/modules/server/src/main/java/org/jboss/wsf/stack/cxf/WebServiceContextEJB.java 2011-01-28 12:47:22 UTC (rev 13638)
@@ -1,56 +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.cxf;
-
-import java.security.Principal;
-
-import javax.ejb.EJBContext;
-import javax.xml.ws.WebServiceContext;
-
-import org.jboss.wsf.spi.invocation.WebServiceContextDelegate;
-
-/**
- *
- * @author alessio.soldano(a)jboss.com
- * @since 27-Jan-2009
- */
-public class WebServiceContextEJB extends WebServiceContextDelegate
-{
- public WebServiceContextEJB(WebServiceContext ctx)
- {
- super(ctx);
- }
-
- 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/cxf/branches/jbossws-cxf-3.1.2/modules/server/src/main/java/org/jboss/wsf/stack/cxf/WebServiceContextFactoryImpl.java
===================================================================
--- stack/cxf/branches/jbossws-cxf-3.1.2/modules/server/src/main/java/org/jboss/wsf/stack/cxf/WebServiceContextFactoryImpl.java 2011-01-28 12:23:19 UTC (rev 13637)
+++ stack/cxf/branches/jbossws-cxf-3.1.2/modules/server/src/main/java/org/jboss/wsf/stack/cxf/WebServiceContextFactoryImpl.java 2011-01-28 12:47:22 UTC (rev 13638)
@@ -24,14 +24,17 @@
import javax.xml.ws.handler.MessageContext;
import org.apache.cxf.jaxws.context.WebServiceContextImpl;
+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;
/**
- *
+ * WebServiceContext factory for CXF integration.
+ *
* @author alessio.soldano(a)jboss.com
- *
+ * @author <a href="mailto:ropalka@redhat.com">Richard Opalka</a>
*/
public class WebServiceContextFactoryImpl extends WebServiceContextFactory
{
Deleted: stack/cxf/branches/jbossws-cxf-3.1.2/modules/server/src/main/java/org/jboss/wsf/stack/cxf/WebServiceContextJSE.java
===================================================================
--- stack/cxf/branches/jbossws-cxf-3.1.2/modules/server/src/main/java/org/jboss/wsf/stack/cxf/WebServiceContextJSE.java 2011-01-28 12:23:19 UTC (rev 13637)
+++ stack/cxf/branches/jbossws-cxf-3.1.2/modules/server/src/main/java/org/jboss/wsf/stack/cxf/WebServiceContextJSE.java 2011-01-28 12:47:22 UTC (rev 13638)
@@ -1,62 +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.cxf;
-
-import java.security.Principal;
-
-import javax.servlet.http.HttpServletRequest;
-import javax.xml.ws.WebServiceContext;
-import javax.xml.ws.handler.MessageContext;
-
-import org.jboss.wsf.spi.invocation.WebServiceContextDelegate;
-
-/**
- *
- * @author alessio.soldano(a)jboss.com
- * @since 27-Jan-2009
- */
-public class WebServiceContextJSE extends WebServiceContextDelegate
-{
- private HttpServletRequest httpRequest;
-
- public WebServiceContextJSE(WebServiceContext ctx)
- {
- super(ctx);
- httpRequest = (HttpServletRequest)ctx.getMessageContext().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;
- }
-}
13 years, 11 months
JBossWS SVN: r13637 - stack/native/branches/jbossws-native-3.1.2/modules/core/src/main/java/org/jboss/wsf/stack/jbws.
by jbossws-commits＠lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2011-01-28 07:23:19 -0500 (Fri, 28 Jan 2011)
New Revision: 13637
Removed:
stack/native/branches/jbossws-native-3.1.2/modules/core/src/main/java/org/jboss/wsf/stack/jbws/WebServiceContextEJB.java
stack/native/branches/jbossws-native-3.1.2/modules/core/src/main/java/org/jboss/wsf/stack/jbws/WebServiceContextJSE.java
Modified:
stack/native/branches/jbossws-native-3.1.2/modules/core/src/main/java/org/jboss/wsf/stack/jbws/NativeWebServiceContext.java
stack/native/branches/jbossws-native-3.1.2/modules/core/src/main/java/org/jboss/wsf/stack/jbws/WebServiceContextFactoryImpl.java
Log:
[JBPAPP-5052] backporting ThreadLocal aware WebServiceContext implementation
Modified: stack/native/branches/jbossws-native-3.1.2/modules/core/src/main/java/org/jboss/wsf/stack/jbws/NativeWebServiceContext.java
===================================================================
--- stack/native/branches/jbossws-native-3.1.2/modules/core/src/main/java/org/jboss/wsf/stack/jbws/NativeWebServiceContext.java 2011-01-28 12:22:32 UTC (rev 13636)
+++ stack/native/branches/jbossws-native-3.1.2/modules/core/src/main/java/org/jboss/wsf/stack/jbws/NativeWebServiceContext.java 2011-01-28 12:23:19 UTC (rev 13637)
@@ -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();
+ }
}
Deleted: stack/native/branches/jbossws-native-3.1.2/modules/core/src/main/java/org/jboss/wsf/stack/jbws/WebServiceContextEJB.java
===================================================================
--- stack/native/branches/jbossws-native-3.1.2/modules/core/src/main/java/org/jboss/wsf/stack/jbws/WebServiceContextEJB.java 2011-01-28 12:22:32 UTC (rev 13636)
+++ stack/native/branches/jbossws-native-3.1.2/modules/core/src/main/java/org/jboss/wsf/stack/jbws/WebServiceContextEJB.java 2011-01-28 12:23:19 UTC (rev 13637)
@@ -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/modules/core/src/main/java/org/jboss/wsf/stack/jbws/WebServiceContextFactoryImpl.java
===================================================================
--- stack/native/branches/jbossws-native-3.1.2/modules/core/src/main/java/org/jboss/wsf/stack/jbws/WebServiceContextFactoryImpl.java 2011-01-28 12:22:32 UTC (rev 13636)
+++ stack/native/branches/jbossws-native-3.1.2/modules/core/src/main/java/org/jboss/wsf/stack/jbws/WebServiceContextFactoryImpl.java 2011-01-28 12:23:19 UTC (rev 13637)
@@ -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;
}
Deleted: stack/native/branches/jbossws-native-3.1.2/modules/core/src/main/java/org/jboss/wsf/stack/jbws/WebServiceContextJSE.java
===================================================================
--- stack/native/branches/jbossws-native-3.1.2/modules/core/src/main/java/org/jboss/wsf/stack/jbws/WebServiceContextJSE.java 2011-01-28 12:22:32 UTC (rev 13636)
+++ stack/native/branches/jbossws-native-3.1.2/modules/core/src/main/java/org/jboss/wsf/stack/jbws/WebServiceContextJSE.java 2011-01-28 12:23:19 UTC (rev 13637)
@@ -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;
- }
-}
13 years, 11 months