JBossWS SVN: r13771 - stack/cxf/trunk/modules/testsuite.
by jbossws-commits@lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2011-02-18 07:21:35 -0500 (Fri, 18 Feb 2011)
New Revision: 13771
Modified:
stack/cxf/trunk/modules/testsuite/pom.xml
Log:
[JBAS-8871][JBW-3223][JBWS-3226][JBWS-3227][JBWS-3228][JBWS-3229][JBWS-3230][JBWS-3231] updating test excludes
Modified: stack/cxf/trunk/modules/testsuite/pom.xml
===================================================================
--- stack/cxf/trunk/modules/testsuite/pom.xml 2011-02-18 10:54:25 UTC (rev 13770)
+++ stack/cxf/trunk/modules/testsuite/pom.xml 2011-02-18 12:21:35 UTC (rev 13771)
@@ -903,9 +903,35 @@
<exclude>org/jboss/test/ws/jaxws/smoke/tools/*ScriptTestCase*</exclude>
<exclude>org/jboss/test/ws/jaxws/smoke/tools/WSRunClientTestCase*</exclude>
+ <!-- # [JBWS-3223] proper CL for WEB & EJBs to include WS functionality -->
+ <exclude>org/jboss/test/ws/jaxws/endpoint/EndpointTestCase*</exclude>
+ <exclude>org/jboss/test/ws/jaxws/cxf/endorse/**</exclude>
+
<!-- # [JBWS-3225] jbossws console not yet available -->
<exclude>org/jboss/test/ws/console/**</exclude>
+ <!-- # [JBWS-3226] jboss-service.xml not matching AS7 format -->
+ <exclude>org/jboss/test/ws/jaxws/jbws1854/**</exclude>
+
+ <!-- # [JBWS-3227] handles config file not found on classpath -->
+ <exclude>org/jboss/test/ws/jaxws/jbws3034/**</exclude>
+
+ <!-- # [JBWS-3228] seems we need to use woodstox for WS endpoints? -->
+ <exclude>org/jboss/test/ws/jaxws/samples/provider/ProviderJAXBTestCase*</exclude>
+ <exclude>org/jboss/test/ws/jaxws/samples/httpbinding/HttpJAXBTestCase*</exclude>
+
+ <!-- # [JBWS-3229] DOMUtils issue on test classpath - probably missing xercesImpl on CP? -->
+ <exclude>org/jboss/test/ws/jaxws/jbws2960/**</exclude>
+
+ <!-- # [JBWS-3230] WS RM namespace issue -->
+ <exclude>org/jboss/test/ws/jaxws/samples/wsrm/client/WSReliableMessagingWithAPITestCase*</exclude>
+
+ <!-- # [JBWS-3231] not satisfied policy alternatives -->
+ <exclude>org/jboss/test/ws/jaxws/samples/mtom/MtomTestCase*</exclude>
+
+ <!-- # [JBAS-8871] AS7 undeployment issue -->
+ <exclude>org/jboss/test/ws/saaj/jbws3084/**</exclude>
+
<!-- # [JBAS-8891] Parse issue on web.xml -->
<exclude>org/jboss/test/ws/jaxws/jbws3140/**</exclude>
13 years, 7 months
JBossWS SVN: r13770 - stack/cxf/trunk/modules/testsuite.
by jbossws-commits@lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2011-02-18 05:54:25 -0500 (Fri, 18 Feb 2011)
New Revision: 13770
Modified:
stack/cxf/trunk/modules/testsuite/pom.xml
Log:
[JBWS-3225] excluding test
Modified: stack/cxf/trunk/modules/testsuite/pom.xml
===================================================================
--- stack/cxf/trunk/modules/testsuite/pom.xml 2011-02-18 02:09:41 UTC (rev 13769)
+++ stack/cxf/trunk/modules/testsuite/pom.xml 2011-02-18 10:54:25 UTC (rev 13770)
@@ -903,6 +903,9 @@
<exclude>org/jboss/test/ws/jaxws/smoke/tools/*ScriptTestCase*</exclude>
<exclude>org/jboss/test/ws/jaxws/smoke/tools/WSRunClientTestCase*</exclude>
+ <!-- # [JBWS-3225] jbossws console not yet available -->
+ <exclude>org/jboss/test/ws/console/**</exclude>
+
<!-- # [JBAS-8891] Parse issue on web.xml -->
<exclude>org/jboss/test/ws/jaxws/jbws3140/**</exclude>
13 years, 7 months
JBossWS SVN: r13769 - stack/native/trunk/modules/testsuite.
by jbossws-commits@lists.jboss.org
Author: jim.ma
Date: 2011-02-17 21:09:41 -0500 (Thu, 17 Feb 2011)
New Revision: 13769
Modified:
stack/native/trunk/modules/testsuite/pom.xml
Log:
[JBWS-3080]:Change the scope of jboss-as-depchain dependency to test to fix the maven3 build warning
Modified: stack/native/trunk/modules/testsuite/pom.xml
===================================================================
--- stack/native/trunk/modules/testsuite/pom.xml 2011-02-17 08:18:23 UTC (rev 13768)
+++ stack/native/trunk/modules/testsuite/pom.xml 2011-02-18 02:09:41 UTC (rev 13769)
@@ -333,7 +333,7 @@
<dependency>
<groupId>org.jboss.jbossas</groupId>
<artifactId>jboss-as-depchain</artifactId>
- <scope>import</scope>
+ <scope>test</scope>
<type>pom</type>
<version>${jboss.version}</version>
<exclusions>
@@ -468,7 +468,7 @@
<dependency>
<groupId>org.jboss.jbossas</groupId>
<artifactId>jboss-as-depchain</artifactId>
- <scope>import</scope>
+ <scope>test</scope>
<type>pom</type>
<version>${jboss.version}</version>
<exclusions>
13 years, 7 months
JBossWS SVN: r13768 - maven/parent/trunk.
by jbossws-commits@lists.jboss.org
Author: jim.ma
Date: 2011-02-17 03:18:23 -0500 (Thu, 17 Feb 2011)
New Revision: 13768
Modified:
maven/parent/trunk/pom.xml
Log:
Remove duplicate plugin configuation
Modified: maven/parent/trunk/pom.xml
===================================================================
--- maven/parent/trunk/pom.xml 2011-02-17 08:16:50 UTC (rev 13767)
+++ maven/parent/trunk/pom.xml 2011-02-17 08:18:23 UTC (rev 13768)
@@ -130,11 +130,6 @@
<version>2.7.2</version>
</plugin>
<plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-clean-plugin</artifactId>
- <version>2.4.1</version>
- </plugin>
- <plugin>
<artifactId>maven-resources-plugin</artifactId>
<version>2.4.3</version>
</plugin>
13 years, 7 months
JBossWS SVN: r13767 - maven/parent/trunk.
by jbossws-commits@lists.jboss.org
Author: jim.ma
Date: 2011-02-17 03:16:50 -0500 (Thu, 17 Feb 2011)
New Revision: 13767
Modified:
maven/parent/trunk/pom.xml
Log:
[JBWS-3080]:Update maven plugin to the latest version
Modified: maven/parent/trunk/pom.xml
===================================================================
--- maven/parent/trunk/pom.xml 2011-02-17 08:01:42 UTC (rev 13766)
+++ maven/parent/trunk/pom.xml 2011-02-17 08:16:50 UTC (rev 13767)
@@ -107,7 +107,7 @@
</plugin>
<plugin>
<artifactId>maven-compiler-plugin</artifactId>
- <version>2.0.2.SP1</version>
+ <version>2.3.2</version>
</plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
@@ -127,8 +127,17 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
- <version>2.5</version>
+ <version>2.7.2</version>
</plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-clean-plugin</artifactId>
+ <version>2.4.1</version>
+ </plugin>
+ <plugin>
+ <artifactId>maven-resources-plugin</artifactId>
+ <version>2.4.3</version>
+ </plugin>
</plugins>
</pluginManagement>
</build>
13 years, 7 months
JBossWS SVN: r13766 - stack/native/trunk/modules/dist.
by jbossws-commits@lists.jboss.org
Author: jim.ma
Date: 2011-02-17 03:01:42 -0500 (Thu, 17 Feb 2011)
New Revision: 13766
Modified:
stack/native/trunk/modules/dist/pom.xml
Log:
[JBWS-3080]:Update jdocbook plugin configuration
Modified: stack/native/trunk/modules/dist/pom.xml
===================================================================
--- stack/native/trunk/modules/dist/pom.xml 2011-02-17 07:34:30 UTC (rev 13765)
+++ stack/native/trunk/modules/dist/pom.xml 2011-02-17 08:01:42 UTC (rev 13766)
@@ -193,9 +193,9 @@
</executions>
<configuration>
<sourceDocumentName>JBossWS-Native.xml</sourceDocumentName>
- <sourceDirectory>src/main/doc</sourceDirectory>
+ <sourceDirectory>${basedir}/src/main/doc</sourceDirectory>
<imageResource>
- <directory>src/main/doc</directory>
+ <directory>${basedir}/src/main/doc</directory>
<includes>
<include>images/*</include>
</includes>
13 years, 7 months
JBossWS SVN: r13765 - stack/native/trunk/modules/testsuite.
by jbossws-commits@lists.jboss.org
Author: jim.ma
Date: 2011-02-17 02:34:30 -0500 (Thu, 17 Feb 2011)
New Revision: 13765
Modified:
stack/native/trunk/modules/testsuite/pom.xml
Log:
[JBWS-3220]:Fix test failures when build with Maven3
Modified: stack/native/trunk/modules/testsuite/pom.xml
===================================================================
--- stack/native/trunk/modules/testsuite/pom.xml 2011-02-17 07:03:48 UTC (rev 13764)
+++ stack/native/trunk/modules/testsuite/pom.xml 2011-02-17 07:34:30 UTC (rev 13765)
@@ -413,6 +413,12 @@
<groupId>org.slf4j</groupId>
<artifactId>slf4j-log4j12</artifactId>
</exclusion>
+
+ <!-- Exclude Sun's stax implementation : com.sun.xml.stream:sjsxp:jar:1.0.1 -->
+ <exclusion>
+ <groupId>org.jboss.resteasy</groupId>
+ <artifactId>resteasy-jaxb-provider</artifactId>
+ </exclusion>
</exclusions>
</dependency>
</dependencies>
@@ -440,10 +446,7 @@
<!-- # [JBWS-3150] This test causes hudson to freeze -->
<exclude>org/jboss/test/ws/common/soap/SOAPConnectionTestCase.*</exclude>
- <!-- # [JBWS-3220] Failures after update to maven3 -->
- <exclude>org/jboss/test/ws/jaxws/json/*TestCase.*</exclude>
- <exclude>org/jboss/test/ws/jaxrpc/jbws383/JBWS383TestCase.*</exclude>
- <exclude>org/jboss/test/ws/jaxws/jbws2000/JBWS2000TestCase.*</exclude>
+
</excludes>
</configuration>
</plugin>
@@ -528,6 +531,11 @@
<groupId>org.slf4j</groupId>
<artifactId>slf4j-log4j12</artifactId>
</exclusion>
+ <!-- Exclude Sun's stax implementation : com.sun.xml.stream:sjsxp:jar:1.0.1 -->
+ <exclusion>
+ <groupId>org.jboss.resteasy</groupId>
+ <artifactId>resteasy-jaxb-provider</artifactId>
+ </exclusion>
</exclusions>
</dependency>
</dependencies>
@@ -555,9 +563,6 @@
<!-- # [JBWS-3150] This test causes hudson to freeze -->
<exclude>org/jboss/test/ws/common/soap/SOAPConnectionTestCase.*</exclude>
- <exclude>org/jboss/test/ws/jaxws/json/*TestCase.*</exclude>
- <exclude>org/jboss/test/ws/jaxrpc/jbws383/JBWS383TestCase.*</exclude>
- <exclude>org/jboss/test/ws/jaxws/jbws2000/JBWS2000TestCase.*</exclude>
</excludes>
</configuration>
</plugin>
13 years, 7 months
JBossWS SVN: r13764 - in stack/native/branches/jbossws-native-3.1.2.SP7_JBPAPP-5943: modules/testsuite/native-tests/scripts and 6 other directories.
by jbossws-commits@lists.jboss.org
Author: bmaxwell
Date: 2011-02-17 02:03:48 -0500 (Thu, 17 Feb 2011)
New Revision: 13764
Added:
stack/native/branches/jbossws-native-3.1.2.SP7_JBPAPP-5943/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2934/
stack/native/branches/jbossws-native-3.1.2.SP7_JBPAPP-5943/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2934/AbstractEndpoint.java
stack/native/branches/jbossws-native-3.1.2.SP7_JBPAPP-5943/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2934/AbstractTestCase.java
stack/native/branches/jbossws-native-3.1.2.SP7_JBPAPP-5943/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2934/Endpoint.java
stack/native/branches/jbossws-native-3.1.2.SP7_JBPAPP-5943/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2934/EndpointEJB.java
stack/native/branches/jbossws-native-3.1.2.SP7_JBPAPP-5943/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2934/EndpointJSE.java
stack/native/branches/jbossws-native-3.1.2.SP7_JBPAPP-5943/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2934/JBWS2934EJBTestCase.java
stack/native/branches/jbossws-native-3.1.2.SP7_JBPAPP-5943/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2934/JBWS2934JSETestCase.java
stack/native/branches/jbossws-native-3.1.2.SP7_JBPAPP-5943/modules/testsuite/native-tests/src/test/resources/jaxws/jbws2934/
stack/native/branches/jbossws-native-3.1.2.SP7_JBPAPP-5943/modules/testsuite/native-tests/src/test/resources/jaxws/jbws2934/WEB-INF/
stack/native/branches/jbossws-native-3.1.2.SP7_JBPAPP-5943/modules/testsuite/native-tests/src/test/resources/jaxws/jbws2934/WEB-INF/web.xml
Removed:
stack/native/branches/jbossws-native-3.1.2.SP7_JBPAPP-5943/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2934/AbstractEndpoint.java
stack/native/branches/jbossws-native-3.1.2.SP7_JBPAPP-5943/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2934/AbstractTestCase.java
stack/native/branches/jbossws-native-3.1.2.SP7_JBPAPP-5943/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2934/Endpoint.java
stack/native/branches/jbossws-native-3.1.2.SP7_JBPAPP-5943/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2934/EndpointEJB.java
stack/native/branches/jbossws-native-3.1.2.SP7_JBPAPP-5943/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2934/EndpointJSE.java
stack/native/branches/jbossws-native-3.1.2.SP7_JBPAPP-5943/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2934/JBWS2934EJBTestCase.java
stack/native/branches/jbossws-native-3.1.2.SP7_JBPAPP-5943/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2934/JBWS2934JSETestCase.java
stack/native/branches/jbossws-native-3.1.2.SP7_JBPAPP-5943/modules/testsuite/native-tests/src/test/resources/jaxws/jbws2934/WEB-INF/
stack/native/branches/jbossws-native-3.1.2.SP7_JBPAPP-5943/modules/testsuite/native-tests/src/test/resources/jaxws/jbws2934/WEB-INF/web.xml
Modified:
stack/native/branches/jbossws-native-3.1.2.SP7_JBPAPP-5943/
stack/native/branches/jbossws-native-3.1.2.SP7_JBPAPP-5943/modules/testsuite/native-tests/scripts/build-jars-jaxws.xml
stack/native/branches/jbossws-native-3.1.2.SP7_JBPAPP-5943/src/main/scripts/assembly-deploy-artifacts.xml
Log:
[JBPAPP-5943] Added test case to reproduce failure.
Property changes on: stack/native/branches/jbossws-native-3.1.2.SP7_JBPAPP-5943
___________________________________________________________________
Added: svn:mergeinfo
+ /stack/native/branches/jbossws-native-3.1.2.SP3_CP01_JBPAPP-5053:12945,12947
Modified: stack/native/branches/jbossws-native-3.1.2.SP7_JBPAPP-5943/modules/testsuite/native-tests/scripts/build-jars-jaxws.xml
===================================================================
--- stack/native/branches/jbossws-native-3.1.2.SP7_JBPAPP-5943/modules/testsuite/native-tests/scripts/build-jars-jaxws.xml 2011-02-17 05:34:21 UTC (rev 13763)
+++ stack/native/branches/jbossws-native-3.1.2.SP7_JBPAPP-5943/modules/testsuite/native-tests/scripts/build-jars-jaxws.xml 2011-02-17 07:03:48 UTC (rev 13764)
@@ -695,6 +695,22 @@
</classes>
</war>
+ <!-- jaxws-jbws2934 -->
+ <war warfile="${tests.output.dir}/test-libs/jaxws-jbws2934.war" webxml="${tests.output.dir}/test-resources/jaxws/jbws2934/WEB-INF/web.xml">
+ <classes dir="${tests.output.dir}/test-classes">
+ <include name="org/jboss/test/ws/jaxws/jbws2934/*.class" />
+ <exclude name="org/jboss/test/ws/jaxws/jbws2934/EndpointEJB.class" />
+ <exclude name="org/jboss/test/ws/jaxws/jbws2934/*TestCase*.class" />
+ </classes>
+ </war>
+ <jar destfile="${tests.output.dir}/test-libs/jaxws-jbws2934.jar">
+ <fileset dir="${tests.output.dir}/test-classes">
+ <include name="org/jboss/test/ws/jaxws/jbws2934/*.class" />
+ <exclude name="org/jboss/test/ws/jaxws/jbws2934/EndpointJSE.class" />
+ <exclude name="org/jboss/test/ws/jaxws/jbws2934/*TestCase*.class" />
+ </fileset>
+ </jar>
+
<!-- jaxws-webserviceref -->
<war warfile="${tests.output.dir}/test-libs/jaxws-webserviceref.war" webxml="${tests.output.dir}/test-resources/jaxws/webserviceref/WEB-INF/web.xml">
<classes dir="${tests.output.dir}/test-classes">
Deleted: stack/native/branches/jbossws-native-3.1.2.SP7_JBPAPP-5943/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2934/AbstractEndpoint.java
===================================================================
--- stack/native/branches/jbossws-native-3.1.2.SP3_CP01_JBPAPP-5053/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2934/AbstractEndpoint.java 2010-09-09 17:09:02 UTC (rev 12947)
+++ stack/native/branches/jbossws-native-3.1.2.SP7_JBPAPP-5943/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2934/AbstractEndpoint.java 2011-02-17 07:03:48 UTC (rev 13764)
@@ -1,86 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2010, 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.test.ws.jaxws.jbws2934;
-
-import javax.annotation.PostConstruct;
-import javax.annotation.Resource;
-import javax.servlet.http.HttpServletRequest;
-import javax.xml.ws.WebServiceContext;
-import javax.xml.ws.WebServiceException;
-import javax.xml.ws.handler.MessageContext;
-
-/**
- * Abstract endpoint implementation reused in both JSE and EJB endpoint.
- *
- * @author <a href="mailto:ropalka@redhat.com">Richard Opalka</a>
- */
-abstract class AbstractEndpoint implements Endpoint
-{
-
- protected AbstractEndpoint()
- {
- super();
- }
-
- @Resource
- WebServiceContext wsCtx1;
- WebServiceContext wsCtx2;
-
- @Resource
- void setWebServiceContext(WebServiceContext wsCtx)
- {
- this.wsCtx2 = wsCtx;
- }
-
- @PostConstruct
- private void init()
- {
- this.assertWebServiceContexts();
- }
-
- protected int getQueryParameterInternal(String key)
- {
- this.assertWebServiceContexts();
- int ctx1Value = this.getValue(this.wsCtx1, key);
- int ctx2Value = this.getValue(this.wsCtx2, key);
- if (ctx1Value != ctx2Value)
- throw new WebServiceException("Values have to be equivalent, they're comming from the same request");
-
- return ++ctx1Value;
- }
-
- protected int getValue(WebServiceContext wsCtx, String queryKey)
- {
- HttpServletRequest servletReq = (HttpServletRequest)wsCtx.getMessageContext().get(MessageContext.SERVLET_REQUEST);
- String queryString = servletReq.getQueryString();
- int equalsSignPosition = queryString.indexOf('=');
- return Integer.valueOf(queryString.substring(equalsSignPosition + 1));
- }
-
- protected void assertWebServiceContexts()
- {
- if (this.wsCtx1 == null)
- throw new WebServiceException("Web service context 1 is null");
- if (this.wsCtx2 == null)
- throw new WebServiceException("Web service context 2 is null");
- }
-}
Copied: stack/native/branches/jbossws-native-3.1.2.SP7_JBPAPP-5943/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2934/AbstractEndpoint.java (from rev 12947, stack/native/branches/jbossws-native-3.1.2.SP3_CP01_JBPAPP-5053/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2934/AbstractEndpoint.java)
===================================================================
--- stack/native/branches/jbossws-native-3.1.2.SP7_JBPAPP-5943/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2934/AbstractEndpoint.java (rev 0)
+++ stack/native/branches/jbossws-native-3.1.2.SP7_JBPAPP-5943/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2934/AbstractEndpoint.java 2011-02-17 07:03:48 UTC (rev 13764)
@@ -0,0 +1,86 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2010, 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.test.ws.jaxws.jbws2934;
+
+import javax.annotation.PostConstruct;
+import javax.annotation.Resource;
+import javax.servlet.http.HttpServletRequest;
+import javax.xml.ws.WebServiceContext;
+import javax.xml.ws.WebServiceException;
+import javax.xml.ws.handler.MessageContext;
+
+/**
+ * Abstract endpoint implementation reused in both JSE and EJB endpoint.
+ *
+ * @author <a href="mailto:ropalka@redhat.com">Richard Opalka</a>
+ */
+abstract class AbstractEndpoint implements Endpoint
+{
+
+ protected AbstractEndpoint()
+ {
+ super();
+ }
+
+ @Resource
+ WebServiceContext wsCtx1;
+ WebServiceContext wsCtx2;
+
+ @Resource
+ void setWebServiceContext(WebServiceContext wsCtx)
+ {
+ this.wsCtx2 = wsCtx;
+ }
+
+ @PostConstruct
+ private void init()
+ {
+ this.assertWebServiceContexts();
+ }
+
+ protected int getQueryParameterInternal(String key)
+ {
+ this.assertWebServiceContexts();
+ int ctx1Value = this.getValue(this.wsCtx1, key);
+ int ctx2Value = this.getValue(this.wsCtx2, key);
+ if (ctx1Value != ctx2Value)
+ throw new WebServiceException("Values have to be equivalent, they're comming from the same request");
+
+ return ++ctx1Value;
+ }
+
+ protected int getValue(WebServiceContext wsCtx, String queryKey)
+ {
+ HttpServletRequest servletReq = (HttpServletRequest)wsCtx.getMessageContext().get(MessageContext.SERVLET_REQUEST);
+ String queryString = servletReq.getQueryString();
+ int equalsSignPosition = queryString.indexOf('=');
+ return Integer.valueOf(queryString.substring(equalsSignPosition + 1));
+ }
+
+ protected void assertWebServiceContexts()
+ {
+ if (this.wsCtx1 == null)
+ throw new WebServiceException("Web service context 1 is null");
+ if (this.wsCtx2 == null)
+ throw new WebServiceException("Web service context 2 is null");
+ }
+}
Deleted: stack/native/branches/jbossws-native-3.1.2.SP7_JBPAPP-5943/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2934/AbstractTestCase.java
===================================================================
--- stack/native/branches/jbossws-native-3.1.2.SP3_CP01_JBPAPP-5053/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2934/AbstractTestCase.java 2010-09-09 17:09:02 UTC (rev 12947)
+++ stack/native/branches/jbossws-native-3.1.2.SP7_JBPAPP-5943/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2934/AbstractTestCase.java 2011-02-17 07:03:48 UTC (rev 13764)
@@ -1,129 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2010, 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.test.ws.jaxws.jbws2934;
-
-import java.net.URL;
-
-import javax.xml.namespace.QName;
-import javax.xml.ws.BindingProvider;
-import javax.xml.ws.Service;
-
-import org.jboss.wsf.test.JBossWSTest;
-
-/**
- * [JBWS-2934] WebServiceContext implementation have to be ThreadLocal aware.
- *
- * @author <a href="mailto:ropalka@redhat.com">Richard Opalka</a>
- */
-abstract class AbstractTestCase extends JBossWSTest
-{
- private static final int THREADS_COUNT = 20;
- private static final int REQUESTS_COUNT = 20;
- private static final String ENDPOINT_ADDRESS = "http://" + System.getProperty("jboss.bind.address", "localhost") + ":8080/jaxws-jbws2934";
- private final Endpoint[] proxies = new Endpoint[THREADS_COUNT];
- private final Thread[] threads = new Thread[THREADS_COUNT];
- private final TestJob[] jobs = new TestJob[THREADS_COUNT];
-
- @Override
- protected void setUp() throws Exception
- {
- super.setUp();
-
- QName serviceName = new QName("http://jboss.org/jbws2934", "EndpointService");
- URL wsdlURL = new URL(ENDPOINT_ADDRESS + "?wsdl");
-
- Service service = Service.create(wsdlURL, serviceName);
- for (int i = 0; i < THREADS_COUNT; i++)
- proxies[i] = service.getPort(Endpoint.class);
- }
-
- public void testEndpointConcurrently() throws Exception
- {
- for (int i = 0; i < THREADS_COUNT; i++)
- {
- System.out.println("Creating thread " + (i + 1));
- jobs[i] = new TestJob(proxies[i], REQUESTS_COUNT, "TestJob" + i);
- threads[i] = new Thread(jobs[i]);
- }
- for (int i = 0; i < THREADS_COUNT; i++)
- {
- System.out.println("Starting thread " + (i + 1));
- threads[i].start();
- }
- Exception e = null;
- for (int i = 0; i < THREADS_COUNT; i++)
- {
- System.out.println("Joining thread " + (i + 1));
- threads[i].join();
- if (e == null)
- e = jobs[i].getException();
- }
- if (e != null) throw e;
- }
-
- private static final class TestJob implements Runnable
- {
- private final String jobName;
- private final Endpoint proxy;
- private final int countOfRequests;
- private Exception exception;
-
- TestJob(Endpoint proxy, int countOfRequests, String jobName)
- {
- this.proxy = proxy;
- this.countOfRequests = countOfRequests;
- this.jobName = jobName;
- }
-
- public void run()
- {
- try
- {
- for (int i = 0; i < this.countOfRequests; i++)
- {
- this.setQueryParameter(proxy, i);
- int retVal = proxy.getQueryParameter(jobName);
- System.out.println("Thread=" + this.jobName + ", iteration=" + i);
- if (retVal != (i + 1))
- throw new RuntimeException("Thread=" + this.jobName + ", iteration=" + i + ", received=" + retVal);
- }
- }
- catch (Exception e)
- {
- System.out.println("Exception caught: " + e.getMessage());
- this.exception = e;
- }
- }
-
- private void setQueryParameter(Endpoint proxy, int value)
- {
- BindingProvider bp = (BindingProvider)proxy;
- String queryString = "?" + this.jobName + "=" + value;
- bp.getRequestContext().put(BindingProvider.ENDPOINT_ADDRESS_PROPERTY, ENDPOINT_ADDRESS + queryString);
- }
-
- Exception getException()
- {
- return this.exception;
- }
- }
-}
Copied: stack/native/branches/jbossws-native-3.1.2.SP7_JBPAPP-5943/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2934/AbstractTestCase.java (from rev 12947, stack/native/branches/jbossws-native-3.1.2.SP3_CP01_JBPAPP-5053/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2934/AbstractTestCase.java)
===================================================================
--- stack/native/branches/jbossws-native-3.1.2.SP7_JBPAPP-5943/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2934/AbstractTestCase.java (rev 0)
+++ stack/native/branches/jbossws-native-3.1.2.SP7_JBPAPP-5943/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2934/AbstractTestCase.java 2011-02-17 07:03:48 UTC (rev 13764)
@@ -0,0 +1,129 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2010, 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.test.ws.jaxws.jbws2934;
+
+import java.net.URL;
+
+import javax.xml.namespace.QName;
+import javax.xml.ws.BindingProvider;
+import javax.xml.ws.Service;
+
+import org.jboss.wsf.test.JBossWSTest;
+
+/**
+ * [JBWS-2934] WebServiceContext implementation have to be ThreadLocal aware.
+ *
+ * @author <a href="mailto:ropalka@redhat.com">Richard Opalka</a>
+ */
+abstract class AbstractTestCase extends JBossWSTest
+{
+ private static final int THREADS_COUNT = 20;
+ private static final int REQUESTS_COUNT = 20;
+ private static final String ENDPOINT_ADDRESS = "http://" + System.getProperty("jboss.bind.address", "localhost") + ":8080/jaxws-jbws2934";
+ private final Endpoint[] proxies = new Endpoint[THREADS_COUNT];
+ private final Thread[] threads = new Thread[THREADS_COUNT];
+ private final TestJob[] jobs = new TestJob[THREADS_COUNT];
+
+ @Override
+ protected void setUp() throws Exception
+ {
+ super.setUp();
+
+ QName serviceName = new QName("http://jboss.org/jbws2934", "EndpointService");
+ URL wsdlURL = new URL(ENDPOINT_ADDRESS + "?wsdl");
+
+ Service service = Service.create(wsdlURL, serviceName);
+ for (int i = 0; i < THREADS_COUNT; i++)
+ proxies[i] = service.getPort(Endpoint.class);
+ }
+
+ public void testEndpointConcurrently() throws Exception
+ {
+ for (int i = 0; i < THREADS_COUNT; i++)
+ {
+ System.out.println("Creating thread " + (i + 1));
+ jobs[i] = new TestJob(proxies[i], REQUESTS_COUNT, "TestJob" + i);
+ threads[i] = new Thread(jobs[i]);
+ }
+ for (int i = 0; i < THREADS_COUNT; i++)
+ {
+ System.out.println("Starting thread " + (i + 1));
+ threads[i].start();
+ }
+ Exception e = null;
+ for (int i = 0; i < THREADS_COUNT; i++)
+ {
+ System.out.println("Joining thread " + (i + 1));
+ threads[i].join();
+ if (e == null)
+ e = jobs[i].getException();
+ }
+ if (e != null) throw e;
+ }
+
+ private static final class TestJob implements Runnable
+ {
+ private final String jobName;
+ private final Endpoint proxy;
+ private final int countOfRequests;
+ private Exception exception;
+
+ TestJob(Endpoint proxy, int countOfRequests, String jobName)
+ {
+ this.proxy = proxy;
+ this.countOfRequests = countOfRequests;
+ this.jobName = jobName;
+ }
+
+ public void run()
+ {
+ try
+ {
+ for (int i = 0; i < this.countOfRequests; i++)
+ {
+ this.setQueryParameter(proxy, i);
+ int retVal = proxy.getQueryParameter(jobName);
+ System.out.println("Thread=" + this.jobName + ", iteration=" + i);
+ if (retVal != (i + 1))
+ throw new RuntimeException("Thread=" + this.jobName + ", iteration=" + i + ", received=" + retVal);
+ }
+ }
+ catch (Exception e)
+ {
+ System.out.println("Exception caught: " + e.getMessage());
+ this.exception = e;
+ }
+ }
+
+ private void setQueryParameter(Endpoint proxy, int value)
+ {
+ BindingProvider bp = (BindingProvider)proxy;
+ String queryString = "?" + this.jobName + "=" + value;
+ bp.getRequestContext().put(BindingProvider.ENDPOINT_ADDRESS_PROPERTY, ENDPOINT_ADDRESS + queryString);
+ }
+
+ Exception getException()
+ {
+ return this.exception;
+ }
+ }
+}
Deleted: stack/native/branches/jbossws-native-3.1.2.SP7_JBPAPP-5943/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2934/Endpoint.java
===================================================================
--- stack/native/branches/jbossws-native-3.1.2.SP3_CP01_JBPAPP-5053/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2934/Endpoint.java 2010-09-09 17:09:02 UTC (rev 12947)
+++ stack/native/branches/jbossws-native-3.1.2.SP7_JBPAPP-5943/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2934/Endpoint.java 2011-02-17 07:03:48 UTC (rev 13764)
@@ -1,37 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2010, 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.test.ws.jaxws.jbws2934;
-
-import javax.jws.WebMethod;
-import javax.jws.WebService;
-
-/**
- * Endpoint interface.
- *
- * @author <a href="mailto:ropalka@redhat.com">Richard Opalka</a>
- */
-@WebService(name="Endpoint", targetNamespace="http://jboss.org/jbws2934")
-public interface Endpoint
-{
- @WebMethod
- public int getQueryParameter(String key);
-}
Copied: stack/native/branches/jbossws-native-3.1.2.SP7_JBPAPP-5943/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2934/Endpoint.java (from rev 12947, stack/native/branches/jbossws-native-3.1.2.SP3_CP01_JBPAPP-5053/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2934/Endpoint.java)
===================================================================
--- stack/native/branches/jbossws-native-3.1.2.SP7_JBPAPP-5943/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2934/Endpoint.java (rev 0)
+++ stack/native/branches/jbossws-native-3.1.2.SP7_JBPAPP-5943/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2934/Endpoint.java 2011-02-17 07:03:48 UTC (rev 13764)
@@ -0,0 +1,37 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2010, 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.test.ws.jaxws.jbws2934;
+
+import javax.jws.WebMethod;
+import javax.jws.WebService;
+
+/**
+ * Endpoint interface.
+ *
+ * @author <a href="mailto:ropalka@redhat.com">Richard Opalka</a>
+ */
+@WebService(name="Endpoint", targetNamespace="http://jboss.org/jbws2934")
+public interface Endpoint
+{
+ @WebMethod
+ public int getQueryParameter(String key);
+}
Deleted: stack/native/branches/jbossws-native-3.1.2.SP7_JBPAPP-5943/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2934/EndpointEJB.java
===================================================================
--- stack/native/branches/jbossws-native-3.1.2.SP3_CP01_JBPAPP-5053/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2934/EndpointEJB.java 2010-09-09 17:09:02 UTC (rev 12947)
+++ stack/native/branches/jbossws-native-3.1.2.SP7_JBPAPP-5943/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2934/EndpointEJB.java 2011-02-17 07:03:48 UTC (rev 13764)
@@ -1,60 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2010, 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.test.ws.jaxws.jbws2934;
-
-import javax.jws.WebMethod;
-import javax.jws.WebService;
-import javax.jws.soap.SOAPBinding;
-import javax.jws.soap.SOAPBinding.Style;
-import javax.xml.ws.WebServiceException;
-
-import javax.ejb.Stateless;
-import org.jboss.wsf.spi.annotation.AuthMethod;
-import org.jboss.wsf.spi.annotation.TransportGuarantee;
-import org.jboss.wsf.spi.annotation.WebContext;
-
-/**
- * Endpoint EJB implementation.
- *
- * @author <a href="mailto:ropalka@redhat.com">Richard Opalka</a>
- */
-@Stateless
-@WebService
-(
- name = "Endpoint",
- serviceName = "EndpointService",
- targetNamespace="http://jboss.org/jbws2934",
- endpointInterface="org.jboss.test.ws.jaxws.jbws2934.Endpoint"
-)
-@WebContext
-(
- contextRoot = "/jaxws-jbws2934",
- urlPattern = "/*"
-)
-public class EndpointEJB extends AbstractEndpoint
-{
- @WebMethod
- public int getQueryParameter(String key)
- {
- return super.getQueryParameterInternal(key);
- }
-}
Copied: stack/native/branches/jbossws-native-3.1.2.SP7_JBPAPP-5943/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2934/EndpointEJB.java (from rev 12947, stack/native/branches/jbossws-native-3.1.2.SP3_CP01_JBPAPP-5053/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2934/EndpointEJB.java)
===================================================================
--- stack/native/branches/jbossws-native-3.1.2.SP7_JBPAPP-5943/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2934/EndpointEJB.java (rev 0)
+++ stack/native/branches/jbossws-native-3.1.2.SP7_JBPAPP-5943/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2934/EndpointEJB.java 2011-02-17 07:03:48 UTC (rev 13764)
@@ -0,0 +1,60 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2010, 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.test.ws.jaxws.jbws2934;
+
+import javax.jws.WebMethod;
+import javax.jws.WebService;
+import javax.jws.soap.SOAPBinding;
+import javax.jws.soap.SOAPBinding.Style;
+import javax.xml.ws.WebServiceException;
+
+import javax.ejb.Stateless;
+import org.jboss.wsf.spi.annotation.AuthMethod;
+import org.jboss.wsf.spi.annotation.TransportGuarantee;
+import org.jboss.wsf.spi.annotation.WebContext;
+
+/**
+ * Endpoint EJB implementation.
+ *
+ * @author <a href="mailto:ropalka@redhat.com">Richard Opalka</a>
+ */
+@Stateless
+@WebService
+(
+ name = "Endpoint",
+ serviceName = "EndpointService",
+ targetNamespace="http://jboss.org/jbws2934",
+ endpointInterface="org.jboss.test.ws.jaxws.jbws2934.Endpoint"
+)
+@WebContext
+(
+ contextRoot = "/jaxws-jbws2934",
+ urlPattern = "/*"
+)
+public class EndpointEJB extends AbstractEndpoint
+{
+ @WebMethod
+ public int getQueryParameter(String key)
+ {
+ return super.getQueryParameterInternal(key);
+ }
+}
Deleted: stack/native/branches/jbossws-native-3.1.2.SP7_JBPAPP-5943/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2934/EndpointJSE.java
===================================================================
--- stack/native/branches/jbossws-native-3.1.2.SP3_CP01_JBPAPP-5053/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2934/EndpointJSE.java 2010-09-09 17:09:02 UTC (rev 12947)
+++ stack/native/branches/jbossws-native-3.1.2.SP7_JBPAPP-5943/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2934/EndpointJSE.java 2011-02-17 07:03:48 UTC (rev 13764)
@@ -1,46 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2010, 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.test.ws.jaxws.jbws2934;
-
-import javax.jws.WebMethod;
-import javax.jws.WebService;
-
-/**
- * Endpoint JSE implementation.
- *
- * @author <a href="mailto:ropalka@redhat.com">Richard Opalka</a>
- */
-@WebService
-(
- name = "Endpoint",
- serviceName = "EndpointService",
- targetNamespace="http://jboss.org/jbws2934",
- endpointInterface="org.jboss.test.ws.jaxws.jbws2934.Endpoint"
-)
-public class EndpointJSE extends AbstractEndpoint
-{
- @WebMethod
- public int getQueryParameter(String key)
- {
- return super.getQueryParameterInternal(key);
- }
-}
Copied: stack/native/branches/jbossws-native-3.1.2.SP7_JBPAPP-5943/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2934/EndpointJSE.java (from rev 12947, stack/native/branches/jbossws-native-3.1.2.SP3_CP01_JBPAPP-5053/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2934/EndpointJSE.java)
===================================================================
--- stack/native/branches/jbossws-native-3.1.2.SP7_JBPAPP-5943/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2934/EndpointJSE.java (rev 0)
+++ stack/native/branches/jbossws-native-3.1.2.SP7_JBPAPP-5943/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2934/EndpointJSE.java 2011-02-17 07:03:48 UTC (rev 13764)
@@ -0,0 +1,46 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2010, 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.test.ws.jaxws.jbws2934;
+
+import javax.jws.WebMethod;
+import javax.jws.WebService;
+
+/**
+ * Endpoint JSE implementation.
+ *
+ * @author <a href="mailto:ropalka@redhat.com">Richard Opalka</a>
+ */
+@WebService
+(
+ name = "Endpoint",
+ serviceName = "EndpointService",
+ targetNamespace="http://jboss.org/jbws2934",
+ endpointInterface="org.jboss.test.ws.jaxws.jbws2934.Endpoint"
+)
+public class EndpointJSE extends AbstractEndpoint
+{
+ @WebMethod
+ public int getQueryParameter(String key)
+ {
+ return super.getQueryParameterInternal(key);
+ }
+}
Deleted: stack/native/branches/jbossws-native-3.1.2.SP7_JBPAPP-5943/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2934/JBWS2934EJBTestCase.java
===================================================================
--- stack/native/branches/jbossws-native-3.1.2.SP3_CP01_JBPAPP-5053/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2934/JBWS2934EJBTestCase.java 2010-09-09 17:09:02 UTC (rev 12947)
+++ stack/native/branches/jbossws-native-3.1.2.SP7_JBPAPP-5943/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2934/JBWS2934EJBTestCase.java 2011-02-17 07:03:48 UTC (rev 13764)
@@ -1,39 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2010, 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.test.ws.jaxws.jbws2934;
-
-import junit.framework.Test;
-
-import org.jboss.wsf.test.JBossWSTestSetup;
-
-/**
- * [JBWS-2934] WebServiceContext implementation have to be ThreadLocal aware - EJB version.
- *
- * @author <a href="mailto:ropalka@redhat.com">Richard Opalka</a>
- */
-public final class JBWS2934EJBTestCase extends AbstractTestCase
-{
- public static Test suite()
- {
- return new JBossWSTestSetup(JBWS2934EJBTestCase.class, "jaxws-jbws2934.jar");
- }
-}
Copied: stack/native/branches/jbossws-native-3.1.2.SP7_JBPAPP-5943/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2934/JBWS2934EJBTestCase.java (from rev 12947, stack/native/branches/jbossws-native-3.1.2.SP3_CP01_JBPAPP-5053/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2934/JBWS2934EJBTestCase.java)
===================================================================
--- stack/native/branches/jbossws-native-3.1.2.SP7_JBPAPP-5943/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2934/JBWS2934EJBTestCase.java (rev 0)
+++ stack/native/branches/jbossws-native-3.1.2.SP7_JBPAPP-5943/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2934/JBWS2934EJBTestCase.java 2011-02-17 07:03:48 UTC (rev 13764)
@@ -0,0 +1,39 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2010, 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.test.ws.jaxws.jbws2934;
+
+import junit.framework.Test;
+
+import org.jboss.wsf.test.JBossWSTestSetup;
+
+/**
+ * [JBWS-2934] WebServiceContext implementation have to be ThreadLocal aware - EJB version.
+ *
+ * @author <a href="mailto:ropalka@redhat.com">Richard Opalka</a>
+ */
+public final class JBWS2934EJBTestCase extends AbstractTestCase
+{
+ public static Test suite()
+ {
+ return new JBossWSTestSetup(JBWS2934EJBTestCase.class, "jaxws-jbws2934.jar");
+ }
+}
Deleted: stack/native/branches/jbossws-native-3.1.2.SP7_JBPAPP-5943/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2934/JBWS2934JSETestCase.java
===================================================================
--- stack/native/branches/jbossws-native-3.1.2.SP3_CP01_JBPAPP-5053/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2934/JBWS2934JSETestCase.java 2010-09-09 17:09:02 UTC (rev 12947)
+++ stack/native/branches/jbossws-native-3.1.2.SP7_JBPAPP-5943/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2934/JBWS2934JSETestCase.java 2011-02-17 07:03:48 UTC (rev 13764)
@@ -1,39 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2010, 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.test.ws.jaxws.jbws2934;
-
-import junit.framework.Test;
-
-import org.jboss.wsf.test.JBossWSTestSetup;
-
-/**
- * [JBWS-2934] WebServiceContext implementation have to be ThreadLocal aware - JSE version.
- *
- * @author <a href="mailto:ropalka@redhat.com">Richard Opalka</a>
- */
-public final class JBWS2934JSETestCase extends AbstractTestCase
-{
- public static Test suite()
- {
- return new JBossWSTestSetup(JBWS2934JSETestCase.class, "jaxws-jbws2934.war");
- }
-}
Copied: stack/native/branches/jbossws-native-3.1.2.SP7_JBPAPP-5943/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2934/JBWS2934JSETestCase.java (from rev 12947, stack/native/branches/jbossws-native-3.1.2.SP3_CP01_JBPAPP-5053/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2934/JBWS2934JSETestCase.java)
===================================================================
--- stack/native/branches/jbossws-native-3.1.2.SP7_JBPAPP-5943/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2934/JBWS2934JSETestCase.java (rev 0)
+++ stack/native/branches/jbossws-native-3.1.2.SP7_JBPAPP-5943/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2934/JBWS2934JSETestCase.java 2011-02-17 07:03:48 UTC (rev 13764)
@@ -0,0 +1,39 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2010, 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.test.ws.jaxws.jbws2934;
+
+import junit.framework.Test;
+
+import org.jboss.wsf.test.JBossWSTestSetup;
+
+/**
+ * [JBWS-2934] WebServiceContext implementation have to be ThreadLocal aware - JSE version.
+ *
+ * @author <a href="mailto:ropalka@redhat.com">Richard Opalka</a>
+ */
+public final class JBWS2934JSETestCase extends AbstractTestCase
+{
+ public static Test suite()
+ {
+ return new JBossWSTestSetup(JBWS2934JSETestCase.class, "jaxws-jbws2934.war");
+ }
+}
Deleted: stack/native/branches/jbossws-native-3.1.2.SP7_JBPAPP-5943/modules/testsuite/native-tests/src/test/resources/jaxws/jbws2934/WEB-INF/web.xml
===================================================================
--- stack/native/branches/jbossws-native-3.1.2.SP3_CP01_JBPAPP-5053/modules/testsuite/native-tests/src/test/resources/jaxws/jbws2934/WEB-INF/web.xml 2010-09-09 17:09:02 UTC (rev 12947)
+++ stack/native/branches/jbossws-native-3.1.2.SP7_JBPAPP-5943/modules/testsuite/native-tests/src/test/resources/jaxws/jbws2934/WEB-INF/web.xml 2011-02-17 07:03:48 UTC (rev 13764)
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<web-app xmlns="http://java.sun.com/xml/ns/j2ee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd" version="2.4">
-
- <servlet>
- <servlet-name>TestEndpoint</servlet-name>
- <servlet-class>org.jboss.test.ws.jaxws.jbws2934.EndpointJSE</servlet-class>
- </servlet>
-
- <servlet-mapping>
- <servlet-name>TestEndpoint</servlet-name>
- <url-pattern>/*</url-pattern>
- </servlet-mapping>
-
-</web-app>
-
Copied: stack/native/branches/jbossws-native-3.1.2.SP7_JBPAPP-5943/modules/testsuite/native-tests/src/test/resources/jaxws/jbws2934/WEB-INF/web.xml (from rev 12947, stack/native/branches/jbossws-native-3.1.2.SP3_CP01_JBPAPP-5053/modules/testsuite/native-tests/src/test/resources/jaxws/jbws2934/WEB-INF/web.xml)
===================================================================
--- stack/native/branches/jbossws-native-3.1.2.SP7_JBPAPP-5943/modules/testsuite/native-tests/src/test/resources/jaxws/jbws2934/WEB-INF/web.xml (rev 0)
+++ stack/native/branches/jbossws-native-3.1.2.SP7_JBPAPP-5943/modules/testsuite/native-tests/src/test/resources/jaxws/jbws2934/WEB-INF/web.xml 2011-02-17 07:03:48 UTC (rev 13764)
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<web-app xmlns="http://java.sun.com/xml/ns/j2ee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd" version="2.4">
+
+ <servlet>
+ <servlet-name>TestEndpoint</servlet-name>
+ <servlet-class>org.jboss.test.ws.jaxws.jbws2934.EndpointJSE</servlet-class>
+ </servlet>
+
+ <servlet-mapping>
+ <servlet-name>TestEndpoint</servlet-name>
+ <url-pattern>/*</url-pattern>
+ </servlet-mapping>
+
+</web-app>
+
Modified: stack/native/branches/jbossws-native-3.1.2.SP7_JBPAPP-5943/src/main/scripts/assembly-deploy-artifacts.xml
===================================================================
--- stack/native/branches/jbossws-native-3.1.2.SP7_JBPAPP-5943/src/main/scripts/assembly-deploy-artifacts.xml 2011-02-17 05:34:21 UTC (rev 13763)
+++ stack/native/branches/jbossws-native-3.1.2.SP7_JBPAPP-5943/src/main/scripts/assembly-deploy-artifacts.xml 2011-02-17 07:03:48 UTC (rev 13764)
@@ -46,9 +46,9 @@
<include>org.jboss.ws.native:jbossws-native-jaxws-ext:jar</include>
<include>org.jboss.ws.native:jbossws-native-saaj:jar</include>
<include>org.codehaus.jettison:jettison:jar</include>
- <include>stax:stax-api:jar</include>
+ <include>stax:stax-api:jar</include>
<include>org.jvnet.staxex:stax-ex:jar</include>
- <include>com.sun.xml.stream.buffer:streambuffer:jar</include>
+ <include>com.sun.xml.stream.buffer:streambuffer:jar</include>
<include>wsdl4j:wsdl4j:jar</include>
<include>org.apache:xmlsec:jar</include>
<include>org.codehaus.woodstox:wstx:jar</include>
13 years, 7 months
JBossWS SVN: r13763 - framework/branches.
by jbossws-commits@lists.jboss.org
Author: bmaxwell
Date: 2011-02-17 00:34:21 -0500 (Thu, 17 Feb 2011)
New Revision: 13763
Removed:
framework/branches/jbossws-framework-3.1.2.SP8_JBPAPP-5943/
Log:
[JBPAPP-5943] branch not required
13 years, 7 months
JBossWS SVN: r13762 - common/branches.
by jbossws-commits@lists.jboss.org
Author: bmaxwell
Date: 2011-02-17 00:34:03 -0500 (Thu, 17 Feb 2011)
New Revision: 13762
Removed:
common/branches/jbossws-common-1.1.0.SP6_JBPAPP-5943/
Log:
[JBPAPP-5943] branch not required
13 years, 7 months