JBossWS SVN: r17725 - hudson/trunk.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2013-06-24 06:18:38 -0400 (Mon, 24 Jun 2013)
New Revision: 17725
Modified:
hudson/trunk/ant.properties.example
Log:
Moving to WFLY 8.0.0.Alpha3-SNAPSHOT
Modified: hudson/trunk/ant.properties.example
===================================================================
--- hudson/trunk/ant.properties.example 2013-06-24 09:03:21 UTC (rev 17724)
+++ hudson/trunk/ant.properties.example 2013-06-24 10:18:38 UTC (rev 17725)
@@ -33,7 +33,7 @@
hudson.jboss720.rev=7.2.0.Final-prerelease1
hudson.jboss800.url=https://github.com/wildfly/wildfly
-hudson.jboss800.build=wildfly-8.0.0.Alpha2-SNAPSHOT
+hudson.jboss800.build=wildfly-8.0.0.Alpha3-SNAPSHOT
hudson.jboss800.rev=master
hudson.mail.recipients=
10 years, 10 months
JBossWS SVN: r17724 - common/trunk/src/main/java/org/jboss/ws/common/deployment.
by jbossws-commits＠lists.jboss.org
Author: jim.ma
Date: 2013-06-24 05:03:21 -0400 (Mon, 24 Jun 2013)
New Revision: 17724
Modified:
common/trunk/src/main/java/org/jboss/ws/common/deployment/AbstractDefaultEndpoint.java
Log:
[JBWS-3654]:synchronized assertEndpointSetterAccess() too
Modified: common/trunk/src/main/java/org/jboss/ws/common/deployment/AbstractDefaultEndpoint.java
===================================================================
--- common/trunk/src/main/java/org/jboss/ws/common/deployment/AbstractDefaultEndpoint.java 2013-06-24 08:09:47 UTC (rev 17723)
+++ common/trunk/src/main/java/org/jboss/ws/common/deployment/AbstractDefaultEndpoint.java 2013-06-24 09:03:21 UTC (rev 17724)
@@ -249,7 +249,7 @@
super.setProperty(key, value);
}
- protected void assertEndpointSetterAccess()
+ protected synchronized void assertEndpointSetterAccess()
{
if (state == EndpointState.STARTED)
throw Messages.MESSAGES.cannotModifyEndpointInState(state, getName());
10 years, 10 months
JBossWS SVN: r17723 - common/trunk/src/main/java/org/jboss/ws/common/deployment.
by jbossws-commits＠lists.jboss.org
Author: jim.ma
Date: 2013-06-24 04:09:47 -0400 (Mon, 24 Jun 2013)
New Revision: 17723
Modified:
common/trunk/src/main/java/org/jboss/ws/common/deployment/AbstractDefaultEndpoint.java
Log:
[JBWS-3654]:Fix intermittent failure in EndpointPublishTestCase
Modified: common/trunk/src/main/java/org/jboss/ws/common/deployment/AbstractDefaultEndpoint.java
===================================================================
--- common/trunk/src/main/java/org/jboss/ws/common/deployment/AbstractDefaultEndpoint.java 2013-06-21 17:45:53 UTC (rev 17722)
+++ common/trunk/src/main/java/org/jboss/ws/common/deployment/AbstractDefaultEndpoint.java 2013-06-24 08:09:47 UTC (rev 17723)
@@ -158,12 +158,12 @@
}
- public EndpointState getState()
+ public synchronized EndpointState getState()
{
return state;
}
- public void setState(EndpointState state)
+ public synchronized void setState(EndpointState state)
{
this.state = state;
}
10 years, 10 months
JBossWS SVN: r17722 - stack/cxf/branches/jbossws-cxf-4.1.x.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2013-06-21 13:45:53 -0400 (Fri, 21 Jun 2013)
New Revision: 17722
Modified:
stack/cxf/branches/jbossws-cxf-4.1.x/
Log:
Blocked revisions 17483,17494,17590,17603,17627,17629,17639,17645,17647,17666,17673-17676,17678,17686,17688-17689,17706,17708,17712,17716 via svnmerge
.......
r17483 | jim.ma | 2013-04-09 06:58:55 +0200 (Tue, 09 Apr 2013) | 1 line
[JBWS-3138]:Pass the -clientjar option to cxf's wsdl2java tool
.......
r17494 | alessio.soldano(a)jboss.com | 2013-04-16 01:23:31 +0200 (Tue, 16 Apr 2013) | 2 lines
Adding some tests on using Apache CXF on AS the same as on a servlet only container (webservices subsystem disabled using jboss-deployment-structure.xml)
.......
r17590 | alessio.soldano(a)jboss.com | 2013-05-16 14:22:23 +0200 (Thu, 16 May 2013) | 2 lines
Make sure shared-tests are not compiled using JBossWS-CXF / Apache CXF classes
.......
r17603 | alessio.soldano(a)jboss.com | 2013-05-20 14:00:01 +0200 (Mon, 20 May 2013) | 2 lines
[JBWS-3541] Making SubjectCreatingInterceptor directly extend WSS4JInInterceptor and adding filter on Group instances when looking for subject user principal
.......
r17627 | alessio.soldano(a)jboss.com | 2013-05-29 18:24:02 +0200 (Wed, 29 May 2013) | 2 lines
[JBWS-3647] remove from CopyOnWriteArrayList's iterator not supported
.......
r17629 | alessio.soldano(a)jboss.com | 2013-05-29 18:59:39 +0200 (Wed, 29 May 2013) | 2 lines
No need for lazy instanciating the RequestHandlerImpl
.......
r17639 | alessio.soldano(a)jboss.com | 2013-05-31 19:34:34 +0200 (Fri, 31 May 2013) | 2 lines
[JBWS-3644] Using new method
.......
r17645 | jim.ma | 2013-06-04 06:58:51 +0200 (Tue, 04 Jun 2013) | 1 line
[JBWS-3643]:Not iterate all endpoints from EndpointRegistry
.......
r17647 | alessio.soldano(a)jboss.com | 2013-06-04 11:27:13 +0200 (Tue, 04 Jun 2013) | 2 lines
Minor optimization / removal of duplicated code
.......
r17666 | jim.ma | 2013-06-08 12:24:31 +0200 (Sat, 08 Jun 2013) | 1 line
[JBWS-3560]:Add fastinfoset feature test
.......
r17673 | alessio.soldano(a)jboss.com | 2013-06-14 11:08:07 +0200 (Fri, 14 Jun 2013) | 2 lines
[JBWS-3648] @PolicySets support, misc tests, some predefined set xml
.......
r17674 | alessio.soldano(a)jboss.com | 2013-06-14 12:12:04 +0200 (Fri, 14 Jun 2013) | 2 lines
Misc refactoring of tests to avoid "polluting" buses that might be used by other threads or later by other tests running on the same threads
.......
r17675 | alessio.soldano(a)jboss.com | 2013-06-14 12:18:14 +0200 (Fri, 14 Jun 2013) | 2 lines
Fixing warning due to use of deprecated method
.......
r17676 | alessio.soldano(a)jboss.com | 2013-06-14 15:18:32 +0200 (Fri, 14 Jun 2013) | 2 lines
[JBWS-3651] Adding default PasswordCallbackHandler and fixing some tests to use it and avoid explicit dependency on org.apache.ws.security module.
.......
r17678 | alessio.soldano(a)jboss.com | 2013-06-14 15:46:58 +0200 (Fri, 14 Jun 2013) | 2 lines
[JBWS-3648] Package refactoring + moving @PolicySets to jbossws-api
.......
r17686 | jim.ma | 2013-06-17 07:59:08 +0200 (Mon, 17 Jun 2013) | 1 line
[JBWS-3560]:Enalbe fastinfoset test
.......
r17688 | alessio.soldano(a)jboss.com | 2013-06-17 14:59:29 +0200 (Mon, 17 Jun 2013) | 2 lines
[UNDERTOW-76] Excluding tests
.......
r17689 | alessio.soldano(a)jboss.com | 2013-06-17 17:50:06 +0200 (Mon, 17 Jun 2013) | 2 lines
[JBWS-3560] Adding FastInfoset dependency to jbossws-cxf-client and fixing cxf api module.xml
.......
r17706 | alessio.soldano(a)jboss.com | 2013-06-18 11:54:57 +0200 (Tue, 18 Jun 2013) | 2 lines
Preparing for tagging jbossws-cxf-4.2.0.CR1
.......
r17708 | alessio.soldano(a)jboss.com | 2013-06-18 11:58:27 +0200 (Tue, 18 Jun 2013) | 2 lines
Go ahead with dev
.......
r17712 | alessio.soldano(a)jboss.com | 2013-06-19 18:34:45 +0200 (Wed, 19 Jun 2013) | 2 lines
[JBWS-3593] Adding testcase including workaround
.......
r17716 | alessio.soldano(a)jboss.com | 2013-06-21 11:34:58 +0200 (Fri, 21 Jun 2013) | 2 lines
Update transaction api version in binary testsuite against WFLY8
.......
Property changes on: stack/cxf/branches/jbossws-cxf-4.1.x
___________________________________________________________________
Modified: svnmerge-blocked
- /stack/cxf/trunk:17219-17220,17224,17226,17243,17246,17256-17258,17335,17346-17347,17351,17362,17365-17366,17380-17381,17415,17427,17434,17453,17470,17478,17480,17485-17486,17491,17495-17500,17505,17521,17524-17528,17531-17538,17550-17551,17554-17555,17581,17583-17585,17587-17589,17593-17595,17597-17602,17604-17605,17609-17611,17615-17617,17619-17620
+ /stack/cxf/trunk:17219-17220,17224,17226,17243,17246,17256-17258,17335,17346-17347,17351,17362,17365-17366,17380-17381,17415,17427,17434,17453,17470,17478,17480,17483,17485-17486,17491,17494-17500,17505,17521,17524-17528,17531-17538,17550-17551,17554-17555,17581,17583-17585,17587-17590,17593-17595,17597-17605,17609-17611,17615-17617,17619-17620,17627,17629,17639,17645,17647,17666,17673-17676,17678,17686,17688-17689,17706,17708,17712,17716
10 years, 10 months
JBossWS SVN: r17721 - in shared-testsuite/branches/jbossws-shared-testsuite-4.1.x/testsuite/src/test: java/org/jboss/test/ws/jaxws/jbws2150 and 1 other directory.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2013-06-21 13:40:08 -0400 (Fri, 21 Jun 2013)
New Revision: 17721
Added:
shared-testsuite/branches/jbossws-shared-testsuite-4.1.x/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws2150/CodeFirstService.java
Modified:
shared-testsuite/branches/jbossws-shared-testsuite-4.1.x/testsuite/src/test/ant-import/build-jars-jaxws.xml
shared-testsuite/branches/jbossws-shared-testsuite-4.1.x/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws2150/JBWS2150TestCaseForked.java
Log:
Updating testcase for [JBWS-3653]
Modified: shared-testsuite/branches/jbossws-shared-testsuite-4.1.x/testsuite/src/test/ant-import/build-jars-jaxws.xml
===================================================================
--- shared-testsuite/branches/jbossws-shared-testsuite-4.1.x/testsuite/src/test/ant-import/build-jars-jaxws.xml 2013-06-21 17:39:26 UTC (rev 17720)
+++ shared-testsuite/branches/jbossws-shared-testsuite-4.1.x/testsuite/src/test/ant-import/build-jars-jaxws.xml 2013-06-21 17:40:08 UTC (rev 17721)
@@ -687,6 +687,7 @@
<war warfile="${tests.output.dir}/test-libs/jaxws-jbws2150.war" webxml="${tests.output.dir}/test-resources/jaxws/jbws2150/WEB-INF/web.xml">
<classes dir="${tests.output.dir}/test-classes">
<include name="org/jboss/test/ws/jaxws/jbws2150/*Service*.class" />
+ <exclude name="org/jboss/test/ws/jaxws/jbws2150/CodeFirstService.class" />
</classes>
<webinf dir="${tests.output.dir}/test-resources/jaxws/jbws2150/WEB-INF">
<include name="wsdl/**" />
@@ -695,11 +696,18 @@
<war warfile="${tests.output.dir}/test-libs/jaxws-jbws2150-sec.war" webxml="${tests.output.dir}/test-resources/jaxws/jbws2150/WEB-INF/web-sec.xml">
<classes dir="${tests.output.dir}/test-classes">
<include name="org/jboss/test/ws/jaxws/jbws2150/*Service*.class" />
+ <exclude name="org/jboss/test/ws/jaxws/jbws2150/CodeFirstService.class" />
</classes>
<webinf dir="${tests.output.dir}/test-resources/jaxws/jbws2150/WEB-INF">
<include name="wsdl/**" />
</webinf>
</war>
+ <war warfile="${tests.output.dir}/test-libs/jaxws-jbws2150-codefirst.war" needxmlfile="false">
+ <classes dir="${tests.output.dir}/test-classes">
+ <include name="org/jboss/test/ws/jaxws/jbws2150/CodeFirstService.class" />
+ <include name="org/jboss/test/ws/jaxws/jbws2150/ServiceIface.class" />
+ </classes>
+ </war>
<!-- jaxws-jbws2183 -->
<jar jarfile="${tests.output.dir}/test-libs/jaxws-jbws2183.jar" manifest="${tests.output.dir}/test-resources/jaxws/jbws2183/META-INF/MANIFEST.MF">
Added: shared-testsuite/branches/jbossws-shared-testsuite-4.1.x/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws2150/CodeFirstService.java
===================================================================
--- shared-testsuite/branches/jbossws-shared-testsuite-4.1.x/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws2150/CodeFirstService.java (rev 0)
+++ shared-testsuite/branches/jbossws-shared-testsuite-4.1.x/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws2150/CodeFirstService.java 2013-06-21 17:40:08 UTC (rev 17721)
@@ -0,0 +1,39 @@
+/*
+ * 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.test.ws.jaxws.jbws2150;
+
+import javax.jws.WebService;
+
+@WebService
+(
+ targetNamespace = "http://test.jboss.org/addressrewrite",
+ portName = "CodeFirstPort",
+ serviceName = "CodeFirstService",
+ endpointInterface = "org.jboss.test.ws.jaxws.jbws2150.ServiceIface"
+)
+public class CodeFirstService
+{
+ public String echo(String s)
+ {
+ return s;
+ }
+}
Modified: shared-testsuite/branches/jbossws-shared-testsuite-4.1.x/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws2150/JBWS2150TestCaseForked.java
===================================================================
--- shared-testsuite/branches/jbossws-shared-testsuite-4.1.x/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws2150/JBWS2150TestCaseForked.java 2013-06-21 17:39:26 UTC (rev 17720)
+++ shared-testsuite/branches/jbossws-shared-testsuite-4.1.x/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws2150/JBWS2150TestCaseForked.java 2013-06-21 17:40:08 UTC (rev 17721)
@@ -23,6 +23,9 @@
import java.net.URL;
import java.util.Collection;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Map.Entry;
import javax.management.Attribute;
import javax.management.ObjectName;
@@ -32,6 +35,7 @@
import javax.wsdl.factory.WSDLFactory;
import javax.wsdl.xml.WSDLReader;
import javax.xml.namespace.QName;
+import javax.xml.ws.BindingProvider;
import javax.xml.ws.Service;
import org.jboss.ws.common.ObjectNameFactory;
@@ -45,6 +49,12 @@
*
* soap:address rewrite tests
*
+ * Note: most of the tests here perform additional checks when the testsuite configured server host
+ * is "localhost" (which is the default anyway) by getting wsdls and invoking endpoints using the
+ * equivalent 127.0.0.1 IP. This is basically a shortcut to avoid requiring to add DNS entries or
+ * binding the AS to multiple addresses before verifying address rewrite mechanism.
+ *
+ *
* @author richard.opalka(a)jboss.com
* @author alessio.soldano(a)jboss.com
*/
@@ -85,35 +95,44 @@
deploy("jaxws-jbws2150.war");
try
{
- final String[] wsdlLocations = new String[4];
- wsdlLocations[0] = "http://" + getServerHost() + ":8080/jaxws-jbws2150/ValidURL?wsdl";
- wsdlLocations[1] = "http://" + getServerHost() + ":8080/jaxws-jbws2150/InvalidURL?wsdl";
- wsdlLocations[2] = "http://" + getServerHost() + ":8080/jaxws-jbws2150/ValidSecureURL?wsdl";
- wsdlLocations[3] = "http://" + getServerHost() + ":8080/jaxws-jbws2150/InvalidSecureURL?wsdl";
+ final Map<String, String> wsdlLocationsMap = new HashMap<String, String>();
+ final String serverHost = getServerHost();
+ wsdlLocationsMap.put("http://" + serverHost + ":8080/jaxws-jbws2150/ValidURL?wsdl", webServiceHost);
+ wsdlLocationsMap.put("http://" + serverHost + ":8080/jaxws-jbws2150/InvalidURL?wsdl", webServiceHost);
+ wsdlLocationsMap.put("http://" + serverHost + ":8080/jaxws-jbws2150/ValidSecureURL?wsdl", webServiceHost);
+ wsdlLocationsMap.put("http://" + serverHost + ":8080/jaxws-jbws2150/InvalidSecureURL?wsdl", webServiceHost);
+ if (isTestsuiteServerHostLocalhost()) {
+ wsdlLocationsMap.put("http://127.0.0.1:8080/jaxws-jbws2150/ValidURL?wsdl", webServiceHost);
+ wsdlLocationsMap.put("http://127.0.0.1:8080/jaxws-jbws2150/InvalidURL?wsdl", webServiceHost);
+ wsdlLocationsMap.put("http://127.0.0.1:8080/jaxws-jbws2150/ValidSecureURL?wsdl", webServiceHost);
+ wsdlLocationsMap.put("http://127.0.0.1:8080/jaxws-jbws2150/InvalidSecureURL?wsdl", webServiceHost);
+ }
- for (String wsdlLocation : wsdlLocations) {
+ for (Entry<String, String> entry : wsdlLocationsMap.entrySet()) {
+ String wsdlLocation = entry.getKey();
+ String host = entry.getValue();
Definition definition = getWSDLDefinition(wsdlLocation);
String address = getPortAddress(definition, "ValidURLService", "ValidURLPort");
- assertEquals("http://" + webServiceHost + ":8080/jaxws-jbws2150/ValidURL", address);
+ assertEquals("http://" + host + ":8080/jaxws-jbws2150/ValidURL", address);
//avoid invoking on https endpoints as that would require getting the imported wsdl using https...
- if (wsdlLocation.equals(wsdlLocations[0]) || wsdlLocation.equals(wsdlLocations[1])) {
+ if (!wsdlLocation.contains("Secure")) {
ServiceIface endpoint = getEndpoint(wsdlLocation, "ValidURLService");
assertEquals(endpoint.echo("hello"), "hello");
}
address = getPortAddress(definition, "InvalidURLService", "InvalidURLPort");
- assertEquals("http://" + webServiceHost + ":8080/jaxws-jbws2150/InvalidURL", address);
- if (wsdlLocation.equals(wsdlLocations[0]) || wsdlLocation.equals(wsdlLocations[1])) {
+ assertEquals("http://" + host + ":8080/jaxws-jbws2150/InvalidURL", address);
+ if (!wsdlLocation.contains("Secure")) {
ServiceIface endpoint = getEndpoint(wsdlLocation, "InvalidURLService");
assertEquals(endpoint.echo("hello"), "hello");
}
address = getPortAddress(definition, "ValidSecureURLService", "ValidSecureURLPort");
- assertEquals("https://" + webServiceHost + ":8443/jaxws-jbws2150/ValidSecureURL", address);
+ assertEquals("https://" + host + ":8443/jaxws-jbws2150/ValidSecureURL", address);
address = getPortAddress(definition, "InvalidSecureURLService", "InvalidSecureURLPort");
- assertEquals("https://" + webServiceHost + ":8443/jaxws-jbws2150/InvalidSecureURL", address);
+ assertEquals("https://" + host + ":8443/jaxws-jbws2150/InvalidSecureURL", address);
}
}
finally
@@ -135,29 +154,38 @@
deploy("jaxws-jbws2150.war");
try
{
- final String[] wsdlLocations = new String[4];
- wsdlLocations[0] = "http://" + getServerHost() + ":8080/jaxws-jbws2150/ValidURL?wsdl";
- wsdlLocations[1] = "http://" + getServerHost() + ":8080/jaxws-jbws2150/InvalidURL?wsdl";
- wsdlLocations[2] = "http://" + getServerHost() + ":8080/jaxws-jbws2150/ValidSecureURL?wsdl";
- wsdlLocations[3] = "http://" + getServerHost() + ":8080/jaxws-jbws2150/InvalidSecureURL?wsdl";
+ final Map<String, String> wsdlLocationsMap = new HashMap<String, String>();
+ final String serverHost = getServerHost();
+ wsdlLocationsMap.put("http://" + serverHost + ":8080/jaxws-jbws2150/ValidURL?wsdl", testWebServiceHost);
+ wsdlLocationsMap.put("http://" + serverHost + ":8080/jaxws-jbws2150/InvalidURL?wsdl", testWebServiceHost);
+ wsdlLocationsMap.put("http://" + serverHost + ":8080/jaxws-jbws2150/ValidSecureURL?wsdl", testWebServiceHost);
+ wsdlLocationsMap.put("http://" + serverHost + ":8080/jaxws-jbws2150/InvalidSecureURL?wsdl", testWebServiceHost);
+ if (isTestsuiteServerHostLocalhost()) {
+ wsdlLocationsMap.put("http://127.0.0.1:8080/jaxws-jbws2150/ValidURL?wsdl", testWebServiceHost);
+ wsdlLocationsMap.put("http://127.0.0.1:8080/jaxws-jbws2150/InvalidURL?wsdl", testWebServiceHost);
+ wsdlLocationsMap.put("http://127.0.0.1:8080/jaxws-jbws2150/ValidSecureURL?wsdl", testWebServiceHost);
+ wsdlLocationsMap.put("http://127.0.0.1:8080/jaxws-jbws2150/InvalidSecureURL?wsdl", testWebServiceHost);
+ }
- for (String wsdlLocation : wsdlLocations) {
+ for (Entry<String, String> entry : wsdlLocationsMap.entrySet()) {
+ String wsdlLocation = entry.getKey();
+ String host = entry.getValue();
Definition definition = getWSDLDefinition(wsdlLocation);
String address = getPortAddress(definition, "ValidURLService", "ValidURLPort");
- assertEquals("http://" + testWebServiceHost + ":8080/jaxws-jbws2150/ValidURL", address);
+ assertEquals("http://" + host + ":8080/jaxws-jbws2150/ValidURL", address);
address = getPortAddress(definition, "InvalidURLService", "InvalidURLPort");
- assertEquals("http://" + testWebServiceHost + ":8080/jaxws-jbws2150/InvalidURL", address);
+ assertEquals("http://" + host + ":8080/jaxws-jbws2150/InvalidURL", address);
address = getPortAddress(definition, "ValidSecureURLService", "ValidSecureURLPort");
- assertEquals("https://" + testWebServiceHost + ":8443/jaxws-jbws2150/ValidSecureURL", address);
+ assertEquals("https://" + host + ":8443/jaxws-jbws2150/ValidSecureURL", address);
address = getPortAddress(definition, "InvalidSecureURLService", "InvalidSecureURLPort");
- assertEquals("https://" + testWebServiceHost + ":8443/jaxws-jbws2150/InvalidSecureURL", address);
+ assertEquals("https://" + host + ":8443/jaxws-jbws2150/InvalidSecureURL", address);
//check wsdl import (which is bound to the endpoint currently serving the wsdl)
- assertTrue(getWsdlImportAddress(definition).contains(testWebServiceHost));
+ assertTrue(getWsdlImportAddress(definition).contains(host));
}
}
finally
@@ -178,20 +206,29 @@
deploy("jaxws-jbws2150.war");
try
{
- final String[] wsdlLocations = new String[4];
- wsdlLocations[0] = "http://" + getServerHost() + ":8080/jaxws-jbws2150/ValidURL?wsdl";
- wsdlLocations[1] = "http://" + getServerHost() + ":8080/jaxws-jbws2150/InvalidURL?wsdl";
- wsdlLocations[2] = "http://" + getServerHost() + ":8080/jaxws-jbws2150/ValidSecureURL?wsdl";
- wsdlLocations[3] = "http://" + getServerHost() + ":8080/jaxws-jbws2150/InvalidSecureURL?wsdl";
+ final Map<String, String> wsdlLocationsMap = new HashMap<String, String>();
+ final String serverHost = getServerHost();
+ wsdlLocationsMap.put("http://" + serverHost + ":8080/jaxws-jbws2150/ValidURL?wsdl", serverHost);
+ wsdlLocationsMap.put("http://" + serverHost + ":8080/jaxws-jbws2150/InvalidURL?wsdl", serverHost);
+ wsdlLocationsMap.put("http://" + serverHost + ":8080/jaxws-jbws2150/ValidSecureURL?wsdl", serverHost);
+ wsdlLocationsMap.put("http://" + serverHost + ":8080/jaxws-jbws2150/InvalidSecureURL?wsdl", serverHost);
+ if (isTestsuiteServerHostLocalhost()) {
+ wsdlLocationsMap.put("http://127.0.0.1:8080/jaxws-jbws2150/ValidURL?wsdl", "127.0.0.1");
+ wsdlLocationsMap.put("http://127.0.0.1:8080/jaxws-jbws2150/InvalidURL?wsdl", "127.0.0.1");
+ wsdlLocationsMap.put("http://127.0.0.1:8080/jaxws-jbws2150/ValidSecureURL?wsdl", "127.0.0.1");
+ wsdlLocationsMap.put("http://127.0.0.1:8080/jaxws-jbws2150/InvalidSecureURL?wsdl", "127.0.0.1");
+ }
- for (String wsdlLocation : wsdlLocations) {
+ for (Entry<String, String> entry : wsdlLocationsMap.entrySet()) {
+ String wsdlLocation = entry.getKey();
+ String host = entry.getValue();
Definition definition = getWSDLDefinition(wsdlLocation);
String address = getPortAddress(definition, "ValidURLService", "ValidURLPort");
- assertEquals("http://" + getServerHost() + ":8080/jaxws-jbws2150/ValidURL", address);
+ assertEquals("http://" + host + ":8080/jaxws-jbws2150/ValidURL", address);
address = getPortAddress(definition, "InvalidURLService", "InvalidURLPort");
- assertEquals("http://" + getServerHost() + ":8080/jaxws-jbws2150/InvalidURL", address);
+ assertEquals("http://" + host + ":8080/jaxws-jbws2150/InvalidURL", address);
//no further checks on the ports forcing https even when getting the wsdl over http
//as there's no way to tell which port to use for the secure access given the invoked wsdl address (on http)
@@ -214,26 +251,35 @@
deploy("jaxws-jbws2150-sec.war");
try
{
- final String[] wsdlLocationsSec = new String[4];
- wsdlLocationsSec[0] = "http://" + getServerHost() + ":8080/jaxws-jbws2150-sec/ValidURL?wsdl";
- wsdlLocationsSec[1] = "http://" + getServerHost() + ":8080/jaxws-jbws2150-sec/InvalidURL?wsdl";
- wsdlLocationsSec[2] = "http://" + getServerHost() + ":8080/jaxws-jbws2150-sec/ValidSecureURL?wsdl";
- wsdlLocationsSec[3] = "http://" + getServerHost() + ":8080/jaxws-jbws2150-sec/InvalidSecureURL?wsdl";
+ final Map<String, String> wsdlLocationsSecMap = new HashMap<String, String>();
+ final String serverHost = getServerHost();
+ wsdlLocationsSecMap.put("http://" + serverHost + ":8080/jaxws-jbws2150-sec/ValidURL?wsdl", webServiceHost);
+ wsdlLocationsSecMap.put("http://" + serverHost + ":8080/jaxws-jbws2150-sec/InvalidURL?wsdl", webServiceHost);
+ wsdlLocationsSecMap.put("http://" + serverHost + ":8080/jaxws-jbws2150-sec/ValidSecureURL?wsdl", webServiceHost);
+ wsdlLocationsSecMap.put("http://" + serverHost + ":8080/jaxws-jbws2150-sec/InvalidSecureURL?wsdl", webServiceHost);
+ if (isTestsuiteServerHostLocalhost()) {
+ wsdlLocationsSecMap.put("http://127.0.0.1:8080/jaxws-jbws2150-sec/ValidURL?wsdl", webServiceHost);
+ wsdlLocationsSecMap.put("http://127.0.0.1:8080/jaxws-jbws2150-sec/InvalidURL?wsdl", webServiceHost);
+ wsdlLocationsSecMap.put("http://127.0.0.1:8080/jaxws-jbws2150-sec/ValidSecureURL?wsdl", webServiceHost);
+ wsdlLocationsSecMap.put("http://127.0.0.1:8080/jaxws-jbws2150-sec/InvalidSecureURL?wsdl", webServiceHost);
+ }
- for (String wsdlLocationSec : wsdlLocationsSec) {
+ for (Entry<String, String> entry : wsdlLocationsSecMap.entrySet()) {
+ String wsdlLocationSec = entry.getKey();
+ String host = entry.getValue();
Definition definition = getWSDLDefinition(wsdlLocationSec);
String address = getPortAddress(definition, "ValidURLService", "ValidURLPort");
- assertEquals("https://" + webServiceHost + ":8443/jaxws-jbws2150-sec/ValidURL", address);
+ assertEquals("https://" + host + ":8443/jaxws-jbws2150-sec/ValidURL", address);
address = getPortAddress(definition, "InvalidURLService", "InvalidURLPort");
- assertEquals("https://" + webServiceHost + ":8443/jaxws-jbws2150-sec/InvalidURL", address);
+ assertEquals("https://" + host + ":8443/jaxws-jbws2150-sec/InvalidURL", address);
address = getPortAddress(definition, "ValidSecureURLService", "ValidSecureURLPort");
- assertEquals("https://" + webServiceHost + ":8443/jaxws-jbws2150-sec/ValidSecureURL", address);
+ assertEquals("https://" + host + ":8443/jaxws-jbws2150-sec/ValidSecureURL", address);
address = getPortAddress(definition, "InvalidSecureURLService", "InvalidSecureURLPort");
- assertEquals("https://" + webServiceHost + ":8443/jaxws-jbws2150-sec/InvalidSecureURL", address);
+ assertEquals("https://" + host + ":8443/jaxws-jbws2150-sec/InvalidSecureURL", address);
}
}
finally
@@ -255,29 +301,38 @@
deploy("jaxws-jbws2150-sec.war");
try
{
- final String[] wsdlLocationsSec = new String[4];
- wsdlLocationsSec[0] = "http://" + getServerHost() + ":8080/jaxws-jbws2150-sec/ValidURL?wsdl";
- wsdlLocationsSec[1] = "http://" + getServerHost() + ":8080/jaxws-jbws2150-sec/InvalidURL?wsdl";
- wsdlLocationsSec[2] = "http://" + getServerHost() + ":8080/jaxws-jbws2150-sec/ValidSecureURL?wsdl";
- wsdlLocationsSec[3] = "http://" + getServerHost() + ":8080/jaxws-jbws2150-sec/InvalidSecureURL?wsdl";
+ final Map<String, String> wsdlLocationsSecMap = new HashMap<String, String>();
+ final String serverHost = getServerHost();
+ wsdlLocationsSecMap.put("http://" + serverHost + ":8080/jaxws-jbws2150-sec/ValidURL?wsdl", testWebServiceHost);
+ wsdlLocationsSecMap.put("http://" + serverHost + ":8080/jaxws-jbws2150-sec/InvalidURL?wsdl", testWebServiceHost);
+ wsdlLocationsSecMap.put("http://" + serverHost + ":8080/jaxws-jbws2150-sec/ValidSecureURL?wsdl", testWebServiceHost);
+ wsdlLocationsSecMap.put("http://" + serverHost + ":8080/jaxws-jbws2150-sec/InvalidSecureURL?wsdl", testWebServiceHost);
+ if (isTestsuiteServerHostLocalhost()) {
+ wsdlLocationsSecMap.put("http://127.0.0.1:8080/jaxws-jbws2150-sec/ValidURL?wsdl", testWebServiceHost);
+ wsdlLocationsSecMap.put("http://127.0.0.1:8080/jaxws-jbws2150-sec/InvalidURL?wsdl", testWebServiceHost);
+ wsdlLocationsSecMap.put("http://127.0.0.1:8080/jaxws-jbws2150-sec/ValidSecureURL?wsdl", testWebServiceHost);
+ wsdlLocationsSecMap.put("http://127.0.0.1:8080/jaxws-jbws2150-sec/InvalidSecureURL?wsdl", testWebServiceHost);
+ }
- for (String wsdlLocationSec : wsdlLocationsSec) {
+ for (Entry<String, String> entry : wsdlLocationsSecMap.entrySet()) {
+ String wsdlLocationSec = entry.getKey();
+ String host = entry.getValue();
Definition definition = getWSDLDefinition(wsdlLocationSec);
String address = getPortAddress(definition, "ValidURLService", "ValidURLPort");
- assertEquals("https://" + testWebServiceHost + ":8443/jaxws-jbws2150-sec/ValidURL", address);
+ assertEquals("https://" + host + ":8443/jaxws-jbws2150-sec/ValidURL", address);
address = getPortAddress(definition, "InvalidURLService", "InvalidURLPort");
- assertEquals("https://" + testWebServiceHost + ":8443/jaxws-jbws2150-sec/InvalidURL", address);
+ assertEquals("https://" + host + ":8443/jaxws-jbws2150-sec/InvalidURL", address);
address = getPortAddress(definition, "ValidSecureURLService", "ValidSecureURLPort");
- assertEquals("https://" + testWebServiceHost + ":8443/jaxws-jbws2150-sec/ValidSecureURL", address);
+ assertEquals("https://" + host + ":8443/jaxws-jbws2150-sec/ValidSecureURL", address);
address = getPortAddress(definition, "InvalidSecureURLService", "InvalidSecureURLPort");
- assertEquals("https://" + testWebServiceHost + ":8443/jaxws-jbws2150-sec/InvalidSecureURL", address);
+ assertEquals("https://" + host + ":8443/jaxws-jbws2150-sec/InvalidSecureURL", address);
//check wsdl import (which is bound to the endpoint currently serving the wsdl)
- assertTrue(getWsdlImportAddress(definition).contains(testWebServiceHost));
+ assertTrue(getWsdlImportAddress(definition).contains(host));
}
}
finally
@@ -297,26 +352,35 @@
deploy("jaxws-jbws2150.war");
try
{
- final String[] wsdlLocations = new String[4];
- wsdlLocations[0] = "http://" + getServerHost() + ":8080/jaxws-jbws2150/ValidURL?wsdl";
- wsdlLocations[1] = "http://" + getServerHost() + ":8080/jaxws-jbws2150/InvalidURL?wsdl";
- wsdlLocations[2] = "http://" + getServerHost() + ":8080/jaxws-jbws2150/ValidSecureURL?wsdl";
- wsdlLocations[3] = "http://" + getServerHost() + ":8080/jaxws-jbws2150/InvalidSecureURL?wsdl";
+ final Map<String, String> wsdlLocationsMap = new HashMap<String, String>();
+ final String serverHost = getServerHost();
+ wsdlLocationsMap.put("http://" + serverHost + ":8080/jaxws-jbws2150/ValidURL?wsdl", webServiceHost);
+ wsdlLocationsMap.put("http://" + serverHost + ":8080/jaxws-jbws2150/InvalidURL?wsdl", webServiceHost);
+ wsdlLocationsMap.put("http://" + serverHost + ":8080/jaxws-jbws2150/ValidSecureURL?wsdl", webServiceHost);
+ wsdlLocationsMap.put("http://" + serverHost + ":8080/jaxws-jbws2150/InvalidSecureURL?wsdl", webServiceHost);
+ if (isTestsuiteServerHostLocalhost()) {
+ wsdlLocationsMap.put("http://127.0.0.1:8080/jaxws-jbws2150/ValidURL?wsdl", webServiceHost);
+ wsdlLocationsMap.put("http://127.0.0.1:8080/jaxws-jbws2150/InvalidURL?wsdl", webServiceHost);
+ wsdlLocationsMap.put("http://127.0.0.1:8080/jaxws-jbws2150/ValidSecureURL?wsdl", webServiceHost);
+ wsdlLocationsMap.put("http://127.0.0.1:8080/jaxws-jbws2150/InvalidSecureURL?wsdl", webServiceHost);
+ }
- for (String wsdlLocation : wsdlLocations) {
+ for (Entry<String, String> entry : wsdlLocationsMap.entrySet()) {
+ String wsdlLocation = entry.getKey();
+ String host = entry.getValue();
Definition definition = getWSDLDefinition(wsdlLocation);
String address = getPortAddress(definition, "ValidURLService", "ValidURLPort");
assertEquals("http://somehost:80/somepath", address);
address = getPortAddress(definition, "InvalidURLService", "InvalidURLPort");
- assertEquals("http://" + webServiceHost + ":8080/jaxws-jbws2150/InvalidURL", address);
+ assertEquals("http://" + host + ":8080/jaxws-jbws2150/InvalidURL", address);
address = getPortAddress(definition, "ValidSecureURLService", "ValidSecureURLPort");
assertEquals("https://somehost:443/some-secure-path", address);
address = getPortAddress(definition, "InvalidSecureURLService", "InvalidSecureURLPort");
- assertEquals("https://" + webServiceHost + ":8443/jaxws-jbws2150/InvalidSecureURL", address);
+ assertEquals("https://" + host + ":8443/jaxws-jbws2150/InvalidSecureURL", address);
}
}
finally
@@ -324,6 +388,141 @@
undeploy("jaxws-jbws2150.war");
}
}
+
+ /**
+ * Test soap:address rewrite with rewrite engine is on (code-first endpoint)
+ *
+ * @throws Exception
+ */
+ public void testRewriteCodeFirst() throws Exception
+ {
+ setModifySOAPAddress(true);
+ deploy("jaxws-jbws2150-codefirst.war");
+ try
+ {
+ checkWsdlAndInvokeCodeFirstEndpoint(getServerHost(), webServiceHost, false);
+ if (isTestsuiteServerHostLocalhost()) {
+ checkWsdlAndInvokeCodeFirstEndpoint("127.0.0.1", webServiceHost, false);
+ }
+ }
+ finally
+ {
+ undeploy("jaxws-jbws2150-codefirst.war");
+ }
+ }
+
+ /**
+ * Test soap:address rewrite when the rewrite engine is off (code-first endpoint)
+ *
+ * @throws Exception
+ */
+ public void testNoRewriteCodeFirst() throws Exception
+ {
+ setModifySOAPAddress(false);
+ deploy("jaxws-jbws2150-codefirst.war");
+ try
+ {
+ checkWsdlAndInvokeCodeFirstEndpoint(getServerHost(), webServiceHost, false);
+ if (isTestsuiteServerHostLocalhost()) {
+ checkWsdlAndInvokeCodeFirstEndpoint("127.0.0.1", webServiceHost, false);
+ }
+ }
+ finally
+ {
+ undeploy("jaxws-jbws2150-codefirst.war");
+ }
+ }
+
+ /**
+ * Test soap:address rewrite with rewrite engine on and the webServiceHost set to a (fake) load balancer host (code-first endpoint)
+ *
+ * @throws Exception
+ */
+ public void testRewriteLoadBalancerCodeFirst() throws Exception
+ {
+ setModifySOAPAddress(true);
+ final String testWebServiceHost = "myloadbalancer.com";
+ setWebServiceHost(testWebServiceHost);
+ deploy("jaxws-jbws2150-codefirst.war");
+ try
+ {
+ checkWsdlAndInvokeCodeFirstEndpoint(getServerHost(), testWebServiceHost, true);
+ if (isTestsuiteServerHostLocalhost()) {
+ checkWsdlAndInvokeCodeFirstEndpoint("127.0.0.1", testWebServiceHost, true);
+ }
+ }
+ finally
+ {
+ undeploy("jaxws-jbws2150-codefirst.war");
+ }
+ }
+
+ /**
+ * Basically the same as the test above; even if rewrite is off, we still get the loadbalancer address in the wsdl
+ * for code-first endpoint, as there's no user provided wsdl with a different address in it.
+ *
+ * @throws Exception
+ */
+ public void testNoRewriteLoadBalancerCodeFirst() throws Exception
+ {
+ setModifySOAPAddress(false);
+ final String testWebServiceHost = "myloadbalancer2.com";
+ setWebServiceHost(testWebServiceHost);
+ deploy("jaxws-jbws2150-codefirst.war");
+ try
+ {
+ checkWsdlAndInvokeCodeFirstEndpoint(getServerHost(), testWebServiceHost, true);
+ if (isTestsuiteServerHostLocalhost()) {
+ checkWsdlAndInvokeCodeFirstEndpoint("127.0.0.1", testWebServiceHost, true);
+ }
+ }
+ finally
+ {
+ undeploy("jaxws-jbws2150-codefirst.war");
+ }
+ }
+
+ /**
+ * Test soap:address rewrite with rewrite engine on and the webServiceHost set to jbossws.undefined.host (code-first endpoint)
+ *
+ * @throws Exception
+ */
+ public void testAutoRewriteCodeFirst() throws Exception
+ {
+ setModifySOAPAddress(true);
+ setWebServiceHost(ServerConfig.UNDEFINED_HOSTNAME);
+ deploy("jaxws-jbws2150-codefirst.war");
+ try
+ {
+ checkWsdlAndInvokeCodeFirstEndpoint(getServerHost(), getServerHost(), true);
+ if (isTestsuiteServerHostLocalhost()) {
+ checkWsdlAndInvokeCodeFirstEndpoint("127.0.0.1", "127.0.0.1", true);
+ }
+ }
+ finally
+ {
+ undeploy("jaxws-jbws2150-codefirst.war");
+ }
+ }
+
+ private void checkWsdlAndInvokeCodeFirstEndpoint(String testHost, String expectedWsdlHost, boolean setTargetAddress) throws Exception {
+ final String addr = "http://" + testHost + ":8080/jaxws-jbws2150-codefirst/CodeFirstService";
+ final String wsdlLocation = addr + "?wsdl";
+
+ Definition definition = getWSDLDefinition(wsdlLocation);
+ String address = getPortAddress(definition, "CodeFirstService", "CodeFirstPort");
+ assertEquals("http://" + expectedWsdlHost + ":8080/jaxws-jbws2150-codefirst/CodeFirstService", address);
+
+ ServiceIface endpoint = getEndpoint(wsdlLocation, "CodeFirstService");
+ if (setTargetAddress) {
+ ((BindingProvider)endpoint).getRequestContext().put(BindingProvider.ENDPOINT_ADDRESS_PROPERTY, addr);
+ }
+ assertEquals(endpoint.echo("hello"), "hello");
+ }
+
+ private static boolean isTestsuiteServerHostLocalhost() {
+ return "localhost".equals(getServerHost());
+ }
private void setModifySOAPAddress(Boolean value) throws Exception
{
@@ -361,6 +560,7 @@
return ((SOAPAddressImpl)port.getExtensibilityElements().get(0)).getLocationURI();
}
+ @SuppressWarnings("unchecked")
private String getWsdlImportAddress(Definition definition)
{
Collection<Import> imports = definition.getImports(NAMESPACE_IMP);
10 years, 10 months
JBossWS SVN: r17720 - shared-testsuite/branches/jbossws-shared-testsuite-4.1.x.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2013-06-21 13:39:26 -0400 (Fri, 21 Jun 2013)
New Revision: 17720
Modified:
shared-testsuite/branches/jbossws-shared-testsuite-4.1.x/README-COMMITTERS
Log:
Adding info on how to merge stuff from shared testsuite in jbws-cxf upstream
Modified: shared-testsuite/branches/jbossws-shared-testsuite-4.1.x/README-COMMITTERS
===================================================================
--- shared-testsuite/branches/jbossws-shared-testsuite-4.1.x/README-COMMITTERS 2013-06-21 17:38:07 UTC (rev 17719)
+++ shared-testsuite/branches/jbossws-shared-testsuite-4.1.x/README-COMMITTERS 2013-06-21 17:39:26 UTC (rev 17720)
@@ -2,3 +2,15 @@
* If you are using Eclipse then set your check style to eclipse/jboss-format.xml.
* According to http://community.jboss.org/wiki/CopyrightOwnershipandLicenses
ensure you're putting correct license headers to Java and XML files.
+
+
+ How to merge shared-testsuite changes from jbossws-cxf trunk
+ ------------------------------------------------------------
+
+The jbossws-shared-testsuite project has been removed upstream and the testsuite
+copied into the jbossws-cxf stack. In order for merging changes, the following
+procedure is suggested:
+1) generate a diff file in jbossws-cxf stack: 'svn diff -r rev1:rev2 > mydiff.diff'
+2) move to maintenance branch of jbossws-shared-testsuite
+3) move to the testsuite: 'cd testsuite'
+4) patch using diff file: 'patch -p3 < /path/mydiff.diff'
10 years, 10 months
JBossWS SVN: r17719 - in stack/cxf/branches/jbossws-cxf-4.1.x: modules/server/src/main/java/org/jboss/wsf/stack/cxf and 4 other directories.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2013-06-21 13:38:07 -0400 (Fri, 21 Jun 2013)
New Revision: 17719
Added:
stack/cxf/branches/jbossws-cxf-4.1.x/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/spring/ClientSpringAppTestCaseForked.java
Removed:
stack/cxf/branches/jbossws-cxf-4.1.x/modules/server/src/main/java/org/jboss/wsf/stack/cxf/HttpServletResponseExt.java
Modified:
stack/cxf/branches/jbossws-cxf-4.1.x/
stack/cxf/branches/jbossws-cxf-4.1.x/modules/server/src/main/java/org/jboss/wsf/stack/cxf/RequestHandlerImpl.java
stack/cxf/branches/jbossws-cxf-4.1.x/modules/server/src/main/java/org/jboss/wsf/stack/cxf/configuration/BusHolder.java
stack/cxf/branches/jbossws-cxf-4.1.x/modules/server/src/main/java/org/jboss/wsf/stack/cxf/metadata/MetadataBuilder.java
stack/cxf/branches/jbossws-cxf-4.1.x/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/spring/ClientSpringAppTestCase.java
stack/cxf/branches/jbossws-cxf-4.1.x/modules/testsuite/pom.xml
Log:
Merged revisions 17479,17618,17623,17628,17714-17715,17717 via svnmerge from
https://svn.jboss.org/repos/jbossws/stack/cxf/trunk
.......
r17479 | alessio.soldano(a)jboss.com | 2013-04-08 19:03:45 +0200 (Mon, 08 Apr 2013) | 2 lines
[JBWS-3621] Replace HttpServletResponseExt.java with HttpServletResonseWrapper
.......
r17618 | jim.ma | 2013-05-29 13:02:15 +0200 (Wed, 29 May 2013) | 1 line
[JBWS-3645]:Register the WorkQueueManager in JMXServer when cxf management is enabled
.......
r17623 | alessio.soldano(a)jboss.com | 2013-05-29 16:13:56 +0200 (Wed, 29 May 2013) | 2 lines
[JBWS-3645] Adding explanation comment in the code
.......
r17628 | alessio.soldano(a)jboss.com | 2013-05-29 18:24:56 +0200 (Wed, 29 May 2013) | 2 lines
Minor improvement, do not look for QueryHandlerRegistry for non wsdl get calls
.......
r17714 | alessio.soldano(a)jboss.com | 2013-06-21 09:42:31 +0200 (Fri, 21 Jun 2013) | 2 lines
[JBWS-3653] Fixing issue + adding new testcase for code-first scenario and enhancing the existing tests to explicitly verify automatic address rewrite is the testsuite server host is 'localhost'
.......
r17715 | alessio.soldano(a)jboss.com | 2013-06-21 09:58:07 +0200 (Fri, 21 Jun 2013) | 2 lines
[JBWS-3653] Always explicitly set the AUTO_REWRITE_ADDRESS_ALL prop to avoid relying on CXF default (false)
.......
r17717 | alessio.soldano(a)jboss.com | 2013-06-21 12:27:16 +0200 (Fri, 21 Jun 2013) | 2 lines
Split ClientSpringAppTestCase to prevent issues during parallel tests execution
.......
Property changes on: stack/cxf/branches/jbossws-cxf-4.1.x
___________________________________________________________________
Modified: svnmerge-integrated
- /stack/cxf/trunk:1-17199,17260-17277,17279,17345,17400-17414,17433
+ /stack/cxf/trunk:1-17199,17260-17277,17279,17345,17400-17414,17433,17479,17481-17482,17484,17487-17490,17492-17493,17501-17504,17506-17520,17522-17523,17529-17530,17540-17549,17552-17553,17556-17580,17582,17586,17591-17592,17596,17606-17608,17612-17614,17618,17621-17626,17628,17630-17638,17640-17644,17646,17648-17665,17667-17672,17677,17679-17685,17687,17690-17705,17707,17710,17713-17715,17717
Modified: svn:mergeinfo
- /stack/cxf/branches/asoldano:14032-14050,14068
/stack/cxf/branches/ropalka:16301-16305,16966-17008
/stack/cxf/branches/ropalka_JBWS-3550:16747-16757
/stack/cxf/trunk:17260-17277,17279,17345,17400-17414,17433
+ /stack/cxf/branches/asoldano:14032-14050,14068
/stack/cxf/branches/ropalka:16301-16305,16966-17008
/stack/cxf/branches/ropalka_JBWS-3550:16747-16757
/stack/cxf/trunk:17260-17277,17279,17345,17400-17414,17433,17479,17618,17623,17628,17714-17715,17717
Deleted: stack/cxf/branches/jbossws-cxf-4.1.x/modules/server/src/main/java/org/jboss/wsf/stack/cxf/HttpServletResponseExt.java
===================================================================
--- stack/cxf/branches/jbossws-cxf-4.1.x/modules/server/src/main/java/org/jboss/wsf/stack/cxf/HttpServletResponseExt.java 2013-06-21 17:36:51 UTC (rev 17718)
+++ stack/cxf/branches/jbossws-cxf-4.1.x/modules/server/src/main/java/org/jboss/wsf/stack/cxf/HttpServletResponseExt.java 2013-06-21 17:38:07 UTC (rev 17719)
@@ -1,241 +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.io.IOException;
-import java.io.PrintWriter;
-import java.util.Collection;
-import java.util.Locale;
-
-import javax.servlet.ServletOutputStream;
-import javax.servlet.http.Cookie;
-import javax.servlet.http.HttpServletResponse;
-
-/**
- * A HttpServletResponse delegate that externalizes fields.
- *
- * @author alessio.soldano(a)jboss.com
- * @since 17-Jul-2009
- */
-public class HttpServletResponseExt implements HttpServletResponse
-{
- private HttpServletResponse delegate;
- private int sc;
-
- public HttpServletResponseExt(HttpServletResponse delegate)
- {
- this.delegate = delegate;
- }
-
- /**
- * Get the status currently set in the HttpServletResponse
- *
- * @return the http status
- */
- public int getStatus()
- {
- return this.sc;
- }
-
- /* HttpServletResponse API */
-
- public void addCookie(Cookie cookie)
- {
- delegate.addCookie(cookie);
- }
-
- public void addDateHeader(String name, long date)
- {
- delegate.addDateHeader(name, date);
- }
-
- public void addHeader(String name, String value)
- {
- delegate.addHeader(name, value);
- }
-
- public void addIntHeader(String name, int value)
- {
- delegate.addIntHeader(name, value);
- }
-
- public boolean containsHeader(String name)
- {
- return delegate.containsHeader(name);
- }
-
- public String encodeRedirectURL(String url)
- {
- return delegate.encodeRedirectURL(url);
- }
-
- @Deprecated
- public String encodeRedirectUrl(String url)
- {
- return delegate.encodeRedirectUrl(url);
- }
-
- public String encodeURL(String url)
- {
- return delegate.encodeURL(url);
- }
-
- @Deprecated
- public String encodeUrl(String url)
- {
- return delegate.encodeUrl(url);
- }
-
- public void sendError(int sc) throws IOException
- {
- delegate.sendError(sc);
- }
-
- public void sendError(int sc, String msg) throws IOException
- {
- delegate.sendError(sc, msg);
- }
-
- public void sendRedirect(String location) throws IOException
- {
- delegate.sendRedirect(location);
- }
-
- public void setDateHeader(String name, long date)
- {
- delegate.setDateHeader(name, date);
- }
-
- public void setHeader(String name, String value)
- {
- delegate.setHeader(name, value);
- }
-
- public void setIntHeader(String name, int value)
- {
- delegate.setIntHeader(name, value);
- }
-
- public void setStatus(int sc)
- {
- delegate.setStatus(sc);
- this.sc = sc;
- }
-
- @Deprecated
- public void setStatus(int sc, String sm)
- {
- delegate.setStatus(sc, sm);
- this.sc = sc;
- }
-
- public void flushBuffer() throws IOException
- {
- delegate.flushBuffer();
- }
-
- public int getBufferSize()
- {
- return delegate.getBufferSize();
- }
-
- public String getCharacterEncoding()
- {
- return delegate.getCharacterEncoding();
- }
-
- public String getContentType()
- {
- return delegate.getContentType();
- }
-
- public Locale getLocale()
- {
- return delegate.getLocale();
- }
-
- public ServletOutputStream getOutputStream() throws IOException
- {
- return delegate.getOutputStream();
- }
-
- public PrintWriter getWriter() throws IOException
- {
- return delegate.getWriter();
- }
-
- public boolean isCommitted()
- {
- return delegate.isCommitted();
- }
-
- public void reset()
- {
- delegate.reset();
- }
-
- public void resetBuffer()
- {
- delegate.resetBuffer();
- }
-
- public void setBufferSize(int size)
- {
- delegate.setBufferSize(size);
- }
-
- public void setCharacterEncoding(String charset)
- {
- delegate.setCharacterEncoding(charset);
- }
-
- public void setContentLength(int len)
- {
- delegate.setContentLength(len);
- }
-
- public void setContentType(String type)
- {
- delegate.setContentType(type);
- }
-
- public void setLocale(Locale loc)
- {
- delegate.setLocale(loc);
- }
-
- public String getHeader(String arg0)
- {
- return delegate.getHeader(arg0);
- }
-
- public Collection<String> getHeaderNames()
- {
- return delegate.getHeaderNames();
- }
-
- public Collection<String> getHeaders(String arg0)
- {
- return delegate.getHeaders(arg0);
- }
-
-}
Modified: stack/cxf/branches/jbossws-cxf-4.1.x/modules/server/src/main/java/org/jboss/wsf/stack/cxf/RequestHandlerImpl.java
===================================================================
--- stack/cxf/branches/jbossws-cxf-4.1.x/modules/server/src/main/java/org/jboss/wsf/stack/cxf/RequestHandlerImpl.java 2013-06-21 17:36:51 UTC (rev 17718)
+++ stack/cxf/branches/jbossws-cxf-4.1.x/modules/server/src/main/java/org/jboss/wsf/stack/cxf/RequestHandlerImpl.java 2013-06-21 17:38:07 UTC (rev 17719)
@@ -33,6 +33,7 @@
import javax.servlet.ServletException;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
+import javax.servlet.http.HttpServletResponseWrapper;
import org.apache.cxf.Bus;
import org.apache.cxf.BusException;
@@ -52,6 +53,7 @@
import org.jboss.wsf.spi.invocation.RequestHandler;
import org.jboss.wsf.spi.management.EndpointMetrics;
import org.jboss.wsf.spi.management.ServerConfig;
+import org.jboss.wsf.stack.cxf.addressRewrite.SoapAddressRewriteHelper;
import org.jboss.wsf.stack.cxf.configuration.BusHolder;
/**
@@ -88,7 +90,7 @@
if (false == requestHandled)
{
Long beginTime = initRequestMetrics(ep);
- HttpServletResponseExt response = new HttpServletResponseExt(res);
+ HttpServletResponseWrapper response = new HttpServletResponseWrapper(res);
try
{
ServletConfig cfg = (ServletConfig)context.getAttribute(ServletConfig.class.getName());
@@ -193,39 +195,39 @@
* @return true if there was a query handler that successfully handled the request, false otherwise
* @throws ServletException if some problem occurs
*/
- private boolean handleQuery(HttpServletRequest req, HttpServletResponse res, AbstractHTTPDestination dest, Bus bus)
+ private final boolean handleQuery(HttpServletRequest req, HttpServletResponse res, AbstractHTTPDestination dest, Bus bus)
throws ServletException
{
- boolean hasQuery = (null != req.getQueryString()) && (req.getQueryString().length() > 0);
- boolean queryHandlerRegistryExists = bus.getExtension(QueryHandlerRegistry.class) != null;
-
- if (hasQuery && queryHandlerRegistryExists)
+ final String queryString = req.getQueryString();
+ if ((null != queryString) && (queryString.length() > 0))
{
- String ctxUri = req.getRequestURI();
- String baseUri = req.getRequestURL().toString() + "?" + req.getQueryString();
- EndpointInfo endpointInfo = dest.getEndpointInfo();
- ServerConfig serverConfig = AbstractServerConfig.getServerIntegrationServerConfig();
- if (serverConfig.isModifySOAPAddress()) {
- endpointInfo.setProperty(WSDLGetUtils.AUTO_REWRITE_ADDRESS_ALL,
- ServerConfig.UNDEFINED_HOSTNAME.equals(serverConfig.getWebServiceHost()));
- }
-
- for (QueryHandler queryHandler : bus.getExtension(QueryHandlerRegistry.class).getHandlers())
- {
- if (queryHandler.isRecognizedQuery(baseUri, ctxUri, endpointInfo))
+ final QueryHandlerRegistry qhr = bus.getExtension(QueryHandlerRegistry.class);
+ if (qhr != null) {
+ final String ctxUri = req.getRequestURI();
+ final String baseUri = req.getRequestURL().toString() + "?" + queryString;
+ final EndpointInfo endpointInfo = dest.getEndpointInfo();
+ final boolean autoRewrite = SoapAddressRewriteHelper.isAutoRewriteOn(
+ AbstractServerConfig.getServerIntegrationServerConfig());
+ endpointInfo.setProperty(WSDLGetUtils.AUTO_REWRITE_ADDRESS, autoRewrite);
+ endpointInfo.setProperty(WSDLGetUtils.AUTO_REWRITE_ADDRESS_ALL, autoRewrite);
+
+ for (QueryHandler queryHandler : qhr.getHandlers())
{
- res.setContentType(queryHandler.getResponseContentType(baseUri, ctxUri));
- try
+ if (queryHandler.isRecognizedQuery(baseUri, ctxUri, endpointInfo))
{
- OutputStream out = res.getOutputStream();
- queryHandler.writeResponse(baseUri, ctxUri, endpointInfo, out);
- out.flush();
- return true;
+ res.setContentType(queryHandler.getResponseContentType(baseUri, ctxUri));
+ try
+ {
+ OutputStream out = res.getOutputStream();
+ queryHandler.writeResponse(baseUri, ctxUri, endpointInfo, out);
+ out.flush();
+ return true;
+ }
+ catch (Exception e)
+ {
+ throw new ServletException(e);
+ }
}
- catch (Exception e)
- {
- throw new ServletException(e);
- }
}
}
}
Modified: stack/cxf/branches/jbossws-cxf-4.1.x/modules/server/src/main/java/org/jboss/wsf/stack/cxf/configuration/BusHolder.java
===================================================================
--- stack/cxf/branches/jbossws-cxf-4.1.x/modules/server/src/main/java/org/jboss/wsf/stack/cxf/configuration/BusHolder.java 2013-06-21 17:36:51 UTC (rev 17718)
+++ stack/cxf/branches/jbossws-cxf-4.1.x/modules/server/src/main/java/org/jboss/wsf/stack/cxf/configuration/BusHolder.java 2013-06-21 17:38:07 UTC (rev 17719)
@@ -103,10 +103,9 @@
if (bus.getExtension(PolicyEngine.class) != null)
{
bus.getExtension(PolicyEngine.class).setAlternativeSelector(getAlternativeSelector(props));
- }
-
- setAdditionalWorkQueues(bus, props);
- setCXFManagement(bus, props);
+ }
+ setCXFManagement(bus, props); //*first* enabled cxf management if required, *then* add anything else which could be manageable (e.g. work queues)
+ setAdditionalWorkQueues(bus, props);
}
Modified: stack/cxf/branches/jbossws-cxf-4.1.x/modules/server/src/main/java/org/jboss/wsf/stack/cxf/metadata/MetadataBuilder.java
===================================================================
--- stack/cxf/branches/jbossws-cxf-4.1.x/modules/server/src/main/java/org/jboss/wsf/stack/cxf/metadata/MetadataBuilder.java 2013-06-21 17:36:51 UTC (rev 17718)
+++ stack/cxf/branches/jbossws-cxf-4.1.x/modules/server/src/main/java/org/jboss/wsf/stack/cxf/metadata/MetadataBuilder.java 2013-06-21 17:38:07 UTC (rev 17719)
@@ -275,6 +275,7 @@
if (wsdlLocation == null) {
wsdlLocation = ddep.getAnnotationWsdlLocation();
}
+ final ServerConfig sc = AbstractServerConfig.getServerIntegrationServerConfig();
if (wsdlLocation != null) {
URL wsdlUrl = dep.getResourceResolver().resolveFailSafe(wsdlLocation);
if (wsdlUrl != null) {
@@ -282,7 +283,6 @@
//do not try rewriting addresses for not-http binding
String wsdlAddress = parser.filterSoapAddress(ddep.getServiceName(), ddep.getPortName(), SOAPAddressWSDLParser.SOAP_HTTP_NS);
- final ServerConfig sc = AbstractServerConfig.getServerIntegrationServerConfig();
String rewrittenWsdlAddress = SoapAddressRewriteHelper.getRewrittenPublishedEndpointUrl(wsdlAddress, ddep.getAddress(), sc);
//If "auto rewrite", leave "publishedEndpointUrl" unset so that CXF do not force host/port values for
//wsdl imports and auto-rewrite them too; otherwise set the new address into "publishedEndpointUrl",
@@ -293,6 +293,11 @@
} else {
METADATA_LOGGER.abortSoapAddressRewrite(wsdlLocation, null);
}
+ } else {
+ //same comment as above regarding auto rewrite...
+ if (!SoapAddressRewriteHelper.isAutoRewriteOn(sc)) {
+ ddep.setPublishedEndpointUrl(ddep.getAddress()); //force computed address for code first endpoints
+ }
}
}
Modified: stack/cxf/branches/jbossws-cxf-4.1.x/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/spring/ClientSpringAppTestCase.java
===================================================================
--- stack/cxf/branches/jbossws-cxf-4.1.x/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/spring/ClientSpringAppTestCase.java 2013-06-21 17:36:51 UTC (rev 17718)
+++ stack/cxf/branches/jbossws-cxf-4.1.x/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/spring/ClientSpringAppTestCase.java 2013-06-21 17:38:07 UTC (rev 17719)
@@ -49,11 +49,6 @@
assertEquals("1", runTestInContainer("testSpringAvailability", Helper.class.getName()));
}
- public void testJBossWSCXFBus() throws Exception
- {
- assertEquals("1", runTestInContainer("testJBossWSCXFBus", Helper.class.getName()));
- }
-
public void testJBossWSCXFSpringBus() throws Exception
{
assertEquals("1", runTestInContainer("testJBossWSCXFSpringBus", Helper.class.getName()));
Copied: stack/cxf/branches/jbossws-cxf-4.1.x/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/spring/ClientSpringAppTestCaseForked.java (from rev 17717, stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/spring/ClientSpringAppTestCaseForked.java)
===================================================================
--- stack/cxf/branches/jbossws-cxf-4.1.x/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/spring/ClientSpringAppTestCaseForked.java (rev 0)
+++ stack/cxf/branches/jbossws-cxf-4.1.x/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/spring/ClientSpringAppTestCaseForked.java 2013-06-21 17:38:07 UTC (rev 17719)
@@ -0,0 +1,59 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2012, 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.cxf.spring;
+
+import java.io.BufferedReader;
+import java.io.InputStreamReader;
+import java.net.URL;
+
+import junit.framework.Test;
+
+import org.jboss.wsf.test.JBossWSCXFTestSetup;
+import org.jboss.wsf.test.JBossWSTest;
+
+/**
+ * This test is an addition to the org.jboss.test.ws.jaxws.cxf.spring.ClientSpringAppTestCase that runs
+ * in forked mode as it requires setting sys props during test and hence can't be executed concurrently.
+ *
+ * @author alessio.soldano(a)jboss.com
+ * @since 21-Jun-2013
+ */
+public final class ClientSpringAppTestCaseForked extends JBossWSTest
+{
+ public static Test suite()
+ {
+ return new JBossWSCXFTestSetup(ClientSpringAppTestCaseForked.class, "jaxws-cxf-spring-client.war, jaxws-cxf-spring.war");
+ }
+
+ public void testJBossWSCXFBus() throws Exception
+ {
+ assertEquals("1", runTestInContainer("testJBossWSCXFBus", Helper.class.getName()));
+ }
+
+ private String runTestInContainer(String test, String helper) throws Exception
+ {
+ URL url = new URL("http://" + getServerHost() + ":8080/jaxws-cxf-spring-client?path=/jaxws-cxf-spring/EndpointService&method="
+ + test + "&helper=" + helper);
+ BufferedReader br = new BufferedReader(new InputStreamReader(url.openStream()));
+ return br.readLine();
+ }
+}
Modified: stack/cxf/branches/jbossws-cxf-4.1.x/modules/testsuite/pom.xml
===================================================================
--- stack/cxf/branches/jbossws-cxf-4.1.x/modules/testsuite/pom.xml 2013-06-21 17:36:51 UTC (rev 17718)
+++ stack/cxf/branches/jbossws-cxf-4.1.x/modules/testsuite/pom.xml 2013-06-21 17:38:07 UTC (rev 17719)
@@ -380,6 +380,7 @@
<skip>false</skip>
<includes>
<include>**/jaxws/cxf/httpproxy/*TestCaseForked.java</include>
+ <include>**/jaxws/cxf/spring/*TestCaseForked.java</include>
<include>**/jaxws/samples/schemavalidation/*TestCaseForked.java</include>
<include>**/jbws2150/**/*TestCaseForked.java</include>
<include>**/jms*/**/*TestCaseForked.java</include>
10 years, 10 months
JBossWS SVN: r17718 - stack/cxf/branches/jbossws-cxf-4.1.x.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2013-06-21 13:36:51 -0400 (Fri, 21 Jun 2013)
New Revision: 17718
Modified:
stack/cxf/branches/jbossws-cxf-4.1.x/pom.xml
Log:
Moving to Apache CXF 2.6.8
Modified: stack/cxf/branches/jbossws-cxf-4.1.x/pom.xml
===================================================================
--- stack/cxf/branches/jbossws-cxf-4.1.x/pom.xml 2013-06-21 10:27:16 UTC (rev 17717)
+++ stack/cxf/branches/jbossws-cxf-4.1.x/pom.xml 2013-06-21 17:36:51 UTC (rev 17718)
@@ -73,7 +73,7 @@
<jboss713.version>7.1.3.Final</jboss713.version>
<jboss720.version>7.2.0.Alpha1-SNAPSHOT</jboss720.version>
<ejb.api.version>1.0.1.Final</ejb.api.version>
- <cxf.version>2.6.6.jbossorg-1</cxf.version>
+ <cxf.version>2.6.8</cxf.version>
<cxf.asm.version>3.3.1</cxf.asm.version>
<cxf.xjcplugins.version>2.6.0</cxf.xjcplugins.version>
<jboss.common.core.version>2.2.17.GA</jboss.common.core.version>
@@ -103,8 +103,8 @@
<jms.api.version>1.0.0.Final</jms.api.version>
<velocity.version>1.7</velocity.version>
<xerces.version>2.9.1</xerces.version>
- <xmlsec.version>1.5.3</xmlsec.version>
- <wss4j.version>1.6.9.jbossorg-1</wss4j.version>
+ <xmlsec.version>1.5.4</xmlsec.version>
+ <wss4j.version>1.6.10</wss4j.version>
<wstx.version>4.2.0</wstx.version>
<spring.version>3.0.7.RELEASE</spring.version>
</properties>
10 years, 10 months
JBossWS SVN: r17717 - in stack/cxf/trunk/modules/testsuite: cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/spring and 1 other directory.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2013-06-21 06:27:16 -0400 (Fri, 21 Jun 2013)
New Revision: 17717
Added:
stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/spring/ClientSpringAppTestCaseForked.java
Modified:
stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/spring/ClientSpringAppTestCase.java
stack/cxf/trunk/modules/testsuite/pom.xml
Log:
Split ClientSpringAppTestCase to prevent issues during parallel tests execution
Modified: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/spring/ClientSpringAppTestCase.java
===================================================================
--- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/spring/ClientSpringAppTestCase.java 2013-06-21 09:34:58 UTC (rev 17716)
+++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/spring/ClientSpringAppTestCase.java 2013-06-21 10:27:16 UTC (rev 17717)
@@ -49,11 +49,6 @@
assertEquals("1", runTestInContainer("testSpringAvailability", Helper.class.getName()));
}
- public void testJBossWSCXFBus() throws Exception
- {
- assertEquals("1", runTestInContainer("testJBossWSCXFBus", Helper.class.getName()));
- }
-
public void testJBossWSCXFSpringBus() throws Exception
{
assertEquals("1", runTestInContainer("testJBossWSCXFSpringBus", Helper.class.getName()));
Added: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/spring/ClientSpringAppTestCaseForked.java
===================================================================
--- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/spring/ClientSpringAppTestCaseForked.java (rev 0)
+++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/spring/ClientSpringAppTestCaseForked.java 2013-06-21 10:27:16 UTC (rev 17717)
@@ -0,0 +1,59 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2012, 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.cxf.spring;
+
+import java.io.BufferedReader;
+import java.io.InputStreamReader;
+import java.net.URL;
+
+import junit.framework.Test;
+
+import org.jboss.wsf.test.JBossWSCXFTestSetup;
+import org.jboss.wsf.test.JBossWSTest;
+
+/**
+ * This test is an addition to the org.jboss.test.ws.jaxws.cxf.spring.ClientSpringAppTestCase that runs
+ * in forked mode as it requires setting sys props during test and hence can't be executed concurrently.
+ *
+ * @author alessio.soldano(a)jboss.com
+ * @since 21-Jun-2013
+ */
+public final class ClientSpringAppTestCaseForked extends JBossWSTest
+{
+ public static Test suite()
+ {
+ return new JBossWSCXFTestSetup(ClientSpringAppTestCaseForked.class, "jaxws-cxf-spring-client.war, jaxws-cxf-spring.war");
+ }
+
+ public void testJBossWSCXFBus() throws Exception
+ {
+ assertEquals("1", runTestInContainer("testJBossWSCXFBus", Helper.class.getName()));
+ }
+
+ private String runTestInContainer(String test, String helper) throws Exception
+ {
+ URL url = new URL("http://" + getServerHost() + ":8080/jaxws-cxf-spring-client?path=/jaxws-cxf-spring/EndpointService&method="
+ + test + "&helper=" + helper);
+ BufferedReader br = new BufferedReader(new InputStreamReader(url.openStream()));
+ return br.readLine();
+ }
+}
Modified: stack/cxf/trunk/modules/testsuite/pom.xml
===================================================================
--- stack/cxf/trunk/modules/testsuite/pom.xml 2013-06-21 09:34:58 UTC (rev 17716)
+++ stack/cxf/trunk/modules/testsuite/pom.xml 2013-06-21 10:27:16 UTC (rev 17717)
@@ -377,6 +377,7 @@
<skip>false</skip>
<includes>
<include>**/jaxws/cxf/httpproxy/*TestCaseForked.java</include>
+ <include>**/jaxws/cxf/spring/*TestCaseForked.java</include>
<include>**/jaxws/samples/schemavalidation/*TestCaseForked.java</include>
<include>**/jbws2150/**/*TestCaseForked.java</include>
<include>**/jms*/**/*TestCaseForked.java</include>
10 years, 10 months
JBossWS SVN: r17716 - stack/cxf/trunk/modules/dist/src/main/distro.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2013-06-21 05:34:58 -0400 (Fri, 21 Jun 2013)
New Revision: 17716
Modified:
stack/cxf/trunk/modules/dist/src/main/distro/build-testsuite.xml
Log:
Update transaction api version in binary testsuite against WFLY8
Modified: stack/cxf/trunk/modules/dist/src/main/distro/build-testsuite.xml
===================================================================
--- stack/cxf/trunk/modules/dist/src/main/distro/build-testsuite.xml 2013-06-21 07:58:07 UTC (rev 17715)
+++ stack/cxf/trunk/modules/dist/src/main/distro/build-testsuite.xml 2013-06-21 09:34:58 UTC (rev 17716)
@@ -552,7 +552,7 @@
<include name="jboss-servlet-api_3.1_spec-*.jar"/>
</fileset>
<fileset dir="${jboss.home}/modules/system/layers/base/javax/transaction/api/main/">
- <include name="jboss-transaction-api_1.1_spec-*.jar"/>
+ <include name="jboss-transaction-api_1.2_spec-*.jar"/>
</fileset>
<fileset dir="${jboss.home}/modules/system/layers/base/org/jboss/threads/main/">
<include name="jboss-threads-*.jar"/>
10 years, 10 months