JBossWS SVN: r17715 - in stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf: metadata and 1 other directory.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2013-06-21 03:58:07 -0400 (Fri, 21 Jun 2013)
New Revision: 17715
Modified:
stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/RequestHandlerImpl.java
stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/metadata/MetadataBuilder.java
Log:
[JBWS-3653] Always explicitly set the AUTO_REWRITE_ADDRESS_ALL prop to avoid relying on CXF default (false)
Modified: stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/RequestHandlerImpl.java
===================================================================
--- stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/RequestHandlerImpl.java 2013-06-21 07:42:31 UTC (rev 17714)
+++ stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/RequestHandlerImpl.java 2013-06-21 07:58:07 UTC (rev 17715)
@@ -202,12 +202,10 @@
final String ctxUri = req.getRequestURI();
final String baseUri = req.getRequestURL().toString() + "?" + queryString;
final EndpointInfo endpointInfo = dest.getEndpointInfo();
- final ServerConfig serverConfig = AbstractServerConfig.getServerIntegrationServerConfig();
- endpointInfo.setProperty(WSDLGetUtils.AUTO_REWRITE_ADDRESS, SoapAddressRewriteHelper.isAutoRewriteOn(serverConfig));
- if (serverConfig.isModifySOAPAddress()) {
- endpointInfo.setProperty(WSDLGetUtils.AUTO_REWRITE_ADDRESS_ALL,
- ServerConfig.UNDEFINED_HOSTNAME.equals(serverConfig.getWebServiceHost()));
- }
+ 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())
{
Modified: stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/metadata/MetadataBuilder.java
===================================================================
--- stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/metadata/MetadataBuilder.java 2013-06-21 07:42:31 UTC (rev 17714)
+++ stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/metadata/MetadataBuilder.java 2013-06-21 07:58:07 UTC (rev 17715)
@@ -295,7 +295,7 @@
} else {
//same comment as above regarding auto rewrite...
if (!SoapAddressRewriteHelper.isAutoRewriteOn(sc)) {
- ddep.setPublishedEndpointUrl(ddep.getAddress()); //force compute address for code first endpoints
+ ddep.setPublishedEndpointUrl(ddep.getAddress()); //force computed address for code first endpoints
}
}
}
12 years, 4 months
- 1
- 0
JBossWS SVN: r17714 - in stack/cxf/trunk/modules: server/src/main/java/org/jboss/wsf/stack/cxf/metadata and 2 other directories.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2013-06-21 03:42:31 -0400 (Fri, 21 Jun 2013)
New Revision: 17714
Added:
stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2150/CodeFirstService.java
Modified:
stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/RequestHandlerImpl.java
stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/metadata/MetadataBuilder.java
stack/cxf/trunk/modules/testsuite/shared-tests/src/test/ant-import/build-jars-jaxws.xml
stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2150/JBWS2150TestCaseForked.java
Log:
[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'
Modified: stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/RequestHandlerImpl.java
===================================================================
--- stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/RequestHandlerImpl.java 2013-06-21 00:49:17 UTC (rev 17713)
+++ stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/RequestHandlerImpl.java 2013-06-21 07:42:31 UTC (rev 17714)
@@ -53,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;
/**
@@ -202,6 +203,7 @@
final String baseUri = req.getRequestURL().toString() + "?" + queryString;
final EndpointInfo endpointInfo = dest.getEndpointInfo();
final ServerConfig serverConfig = AbstractServerConfig.getServerIntegrationServerConfig();
+ endpointInfo.setProperty(WSDLGetUtils.AUTO_REWRITE_ADDRESS, SoapAddressRewriteHelper.isAutoRewriteOn(serverConfig));
if (serverConfig.isModifySOAPAddress()) {
endpointInfo.setProperty(WSDLGetUtils.AUTO_REWRITE_ADDRESS_ALL,
ServerConfig.UNDEFINED_HOSTNAME.equals(serverConfig.getWebServiceHost()));
Modified: stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/metadata/MetadataBuilder.java
===================================================================
--- stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/metadata/MetadataBuilder.java 2013-06-21 00:49:17 UTC (rev 17713)
+++ stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/metadata/MetadataBuilder.java 2013-06-21 07:42:31 UTC (rev 17714)
@@ -274,6 +274,7 @@
if (wsdlLocation == null) {
wsdlLocation = ddep.getAnnotationWsdlLocation();
}
+ final ServerConfig sc = AbstractServerConfig.getServerIntegrationServerConfig();
if (wsdlLocation != null) {
URL wsdlUrl = dep.getResourceResolver().resolveFailSafe(wsdlLocation);
if (wsdlUrl != null) {
@@ -281,7 +282,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",
@@ -292,6 +292,11 @@
} else {
METADATA_LOGGER.abortSoapAddressRewrite(wsdlLocation, null);
}
+ } else {
+ //same comment as above regarding auto rewrite...
+ if (!SoapAddressRewriteHelper.isAutoRewriteOn(sc)) {
+ ddep.setPublishedEndpointUrl(ddep.getAddress()); //force compute address for code first endpoints
+ }
}
}
Modified: stack/cxf/trunk/modules/testsuite/shared-tests/src/test/ant-import/build-jars-jaxws.xml
===================================================================
--- stack/cxf/trunk/modules/testsuite/shared-tests/src/test/ant-import/build-jars-jaxws.xml 2013-06-21 00:49:17 UTC (rev 17713)
+++ stack/cxf/trunk/modules/testsuite/shared-tests/src/test/ant-import/build-jars-jaxws.xml 2013-06-21 07:42:31 UTC (rev 17714)
@@ -690,6 +690,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/**" />
@@ -698,11 +699,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: stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2150/CodeFirstService.java
===================================================================
--- stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2150/CodeFirstService.java (rev 0)
+++ stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2150/CodeFirstService.java 2013-06-21 07:42:31 UTC (rev 17714)
@@ -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: stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2150/JBWS2150TestCaseForked.java
===================================================================
--- stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2150/JBWS2150TestCaseForked.java 2013-06-21 00:49:17 UTC (rev 17713)
+++ stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2150/JBWS2150TestCaseForked.java 2013-06-21 07:42:31 UTC (rev 17714)
@@ -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);
12 years, 4 months
- 1
- 0
JBossWS SVN: r17712 - in stack/cxf/trunk/modules/testsuite/cxf-tests: src/test/java/org/jboss/test/ws/jaxws/cxf and 1 other directories.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2013-06-19 12:34:45 -0400 (Wed, 19 Jun 2013)
New Revision: 17712
Added:
stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3593/
stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3593/ClientHandler.java
stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3593/Endpoint.java
stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3593/EndpointBean.java
stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3593/JBWS3593TestCase.java
stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3593/MTOMOutInterceptor.java
Modified:
stack/cxf/trunk/modules/testsuite/cxf-tests/scripts/cxf-jars-jaxws.xml
Log:
[JBWS-3593] Adding testcase including workaround
Modified: stack/cxf/trunk/modules/testsuite/cxf-tests/scripts/cxf-jars-jaxws.xml
===================================================================
--- stack/cxf/trunk/modules/testsuite/cxf-tests/scripts/cxf-jars-jaxws.xml 2013-06-19 12:03:48 UTC (rev 17711)
+++ stack/cxf/trunk/modules/testsuite/cxf-tests/scripts/cxf-jars-jaxws.xml 2013-06-19 16:34:45 UTC (rev 17712)
@@ -343,6 +343,17 @@
</manifest>
</jar>
+ <!-- jaxws-cxf-jbws3593 -->
+ <war warfile="${tests.output.dir}/test-libs/jaxws-cxf-jbws3593.war" needxmlfile='false'>
+ <classes dir="${tests.output.dir}/test-classes">
+ <include name="org/jboss/test/ws/jaxws/cxf/jbws3593/EndpointBean.class" />
+ <include name="org/jboss/test/ws/jaxws/cxf/jbws3593/MTOMOutInterceptor.class" />
+ </classes>
+ <manifest>
+ <attribute name="Dependencies" value="org.apache.cxf"/>
+ </manifest>
+ </war>
+
<!-- jaxws-cxf-jbws3648 -->
<war warfile="${tests.output.dir}/test-libs/jaxws-cxf-jbws3648.war" needxmlfile='false'>
<classes dir="${tests.output.dir}/test-classes">
Added: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3593/ClientHandler.java
===================================================================
--- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3593/ClientHandler.java (rev 0)
+++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3593/ClientHandler.java 2013-06-19 16:34:45 UTC (rev 17712)
@@ -0,0 +1,139 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2013, 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.jbws3593;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+
+import javax.mail.internet.ContentType;
+import javax.mail.internet.ParseException;
+import javax.xml.soap.MimeHeaders;
+import javax.xml.soap.SOAPConstants;
+import javax.xml.soap.SOAPEnvelope;
+import javax.xml.soap.SOAPException;
+import javax.xml.soap.SOAPMessage;
+import javax.xml.ws.WebServiceException;
+import javax.xml.ws.handler.MessageContext;
+import javax.xml.ws.handler.soap.SOAPMessageContext;
+
+import org.jboss.logging.Logger;
+import org.jboss.ws.api.handler.GenericSOAPHandler;
+
+public class ClientHandler extends GenericSOAPHandler
+{
+ private static Logger log = Logger.getLogger(ClientHandler.class);
+
+ private boolean checkMtom;
+
+ public ClientHandler(boolean checkMtom) {
+ super();
+ this.checkMtom = checkMtom;
+ }
+
+ public boolean handleInbound(MessageContext msgContext)
+ {
+ log.info("handleInbound");
+
+ try
+ {
+ SOAPEnvelope soapEnvelope = (SOAPEnvelope)((SOAPMessageContext)msgContext).getMessage().getSOAPPart().getEnvelope();
+ String nsURI = soapEnvelope.getNamespaceURI();
+
+ log.info("nsURI=" + nsURI);
+
+ if (!SOAPConstants.URI_NS_SOAP_1_1_ENVELOPE.equals(nsURI))
+ {
+ throw new RuntimeException("Wrong NS uri: " + nsURI);
+ }
+ }
+ catch (SOAPException se)
+ {
+ throw new WebServiceException(se);
+ }
+
+ ContentType contentType = getContentType(msgContext);
+
+ if (contentType != null)
+ {
+ log.info("contentType="+contentType);
+ String startInfo = contentType.getParameter("start-info");
+ if (!checkMtom) {
+ if (startInfo != null) {
+ throw new RuntimeException("Unexpected multipart/related message!");
+ } else {
+ return true;
+ }
+ }
+ if (!startInfo.equals(SOAPConstants.SOAP_1_1_CONTENT_TYPE))
+ {
+ throw new RuntimeException("Wrong start info: " + startInfo);
+ }
+ }
+ else
+ {
+ throw new RuntimeException("Missing content type");
+ }
+
+ return true;
+ }
+
+ protected ContentType getContentType(MessageContext msgContext)
+ {
+ ContentType contentType = null;
+
+ try
+ {
+ Map<String, List> headers = (Map)msgContext.get(MessageContext.HTTP_RESPONSE_HEADERS);
+ List<String> ctype = (headers == null) ? null : headers.get("Content-Type");
+ if (ctype == null)
+ {
+ //Cxf stores it in lower case
+ ctype = (headers == null) ? null : headers.get("content-type");
+ }
+ log.info("ctype="+ctype);
+
+ if (ctype == null)
+ {
+ //Native has already processed this header into the message
+ SOAPMessage soapMessage = ((SOAPMessageContext)msgContext).getMessage();
+ MimeHeaders mimeHeaders = soapMessage.getMimeHeaders();
+ String[] ct = mimeHeaders.getHeader("Content-Type");
+ log.info("ct="+ct);
+ if (ct != null)
+ {
+ contentType = new ContentType(ct[0]);
+ }
+ }
+ else
+ {
+ contentType = new ContentType(ctype.get(0));
+ }
+ }
+ catch (ParseException e)
+ {
+ throw new WebServiceException(e);
+ }
+
+ return contentType;
+ }
+}
Added: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3593/Endpoint.java
===================================================================
--- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3593/Endpoint.java (rev 0)
+++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3593/Endpoint.java 2013-06-19 16:34:45 UTC (rev 17712)
@@ -0,0 +1,39 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2013, 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.jbws3593;
+
+import java.util.List;
+
+import javax.activation.DataHandler;
+import javax.jws.WebService;
+import javax.jws.soap.SOAPBinding;
+import javax.xml.bind.annotation.XmlMimeType;
+
+@WebService(name = "Endpoint", targetNamespace = "http://org.jboss.ws/jaxws/jbws3593")
+@SOAPBinding(style = SOAPBinding.Style.RPC, parameterStyle = SOAPBinding.ParameterStyle.BARE)
+public interface Endpoint
+{
+ @XmlMimeType("text/plain")
+ public DataHandler namespace(@XmlMimeType("text/plain") DataHandler data);
+
+ public List<String> echoStrings(List<String> l);
+}
Added: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3593/EndpointBean.java
===================================================================
--- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3593/EndpointBean.java (rev 0)
+++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3593/EndpointBean.java 2013-06-19 16:34:45 UTC (rev 17712)
@@ -0,0 +1,94 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2013, 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.jbws3593;
+
+import static javax.xml.ws.soap.SOAPBinding.SOAP11HTTP_MTOM_BINDING;
+
+import java.io.BufferedReader;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.InputStreamReader;
+import java.util.List;
+
+import javax.activation.DataHandler;
+import javax.jws.WebService;
+import javax.jws.soap.SOAPBinding;
+import javax.xml.bind.annotation.XmlMimeType;
+import javax.xml.ws.BindingType;
+import javax.xml.ws.WebServiceException;
+
+import org.apache.cxf.interceptor.OutInterceptors;
+import org.jboss.logging.Logger;
+
+@WebService(name="Endpoint", targetNamespace="http://org.jboss.ws/jaxws/jbws3593")
+@SOAPBinding(style = SOAPBinding.Style.RPC, parameterStyle = SOAPBinding.ParameterStyle.BARE)
+@BindingType(SOAP11HTTP_MTOM_BINDING)
+@OutInterceptors(interceptors = {"org.jboss.test.ws.jaxws.cxf.jbws3593.MTOMOutInterceptor"})
+public class EndpointBean
+{
+ private static Logger log = Logger.getLogger(EndpointBean.class);
+
+ @XmlMimeType("text/plain")
+ public DataHandler namespace(@XmlMimeType("text/plain") DataHandler data)
+ {
+ try
+ {
+ String name = (String)getContent(data);
+ String type = (String)data.getContentType();
+ log.info("User " + name + " requested namespace with content type ["+ type +"]");
+
+ return new DataHandler("Hello " + name, "text/plain");
+ }
+ catch (IOException e)
+ {
+ throw new WebServiceException(e);
+ }
+ }
+
+ public List<String> echoStrings(List<String> l) {
+ if (l != null) {
+ for (String s : l) {
+ log.info("String: " + s);
+ }
+ }
+ return l;
+ }
+
+ protected Object getContent(DataHandler dh) throws IOException
+ {
+ Object content = dh.getContent();
+
+ if (content instanceof InputStream)
+ {
+ try
+ {
+ BufferedReader br = new BufferedReader(new InputStreamReader((InputStream)content));
+ return br.readLine();
+ }
+ finally
+ {
+ ((InputStream)content).close();
+ }
+ }
+ return content;
+ }
+}
Added: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3593/JBWS3593TestCase.java
===================================================================
--- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3593/JBWS3593TestCase.java (rev 0)
+++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3593/JBWS3593TestCase.java 2013-06-19 16:34:45 UTC (rev 17712)
@@ -0,0 +1,118 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2013, 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.jbws3593;
+
+import java.io.BufferedReader;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.InputStreamReader;
+import java.net.URL;
+import java.util.ArrayList;
+import java.util.LinkedList;
+import java.util.List;
+
+import javax.activation.DataHandler;
+import javax.xml.namespace.QName;
+import javax.xml.ws.BindingProvider;
+import javax.xml.ws.Service;
+import javax.xml.ws.handler.Handler;
+import javax.xml.ws.soap.SOAPBinding;
+
+import junit.framework.Test;
+
+import org.jboss.wsf.test.JBossWSTest;
+import org.jboss.wsf.test.JBossWSTestSetup;
+
+/**
+ *
+ * @author alessio.soldano(a)jboss.com
+ * @since 18-Jun-2013
+ */
+public class JBWS3593TestCase extends JBossWSTest
+{
+ public final String TARGET_ENDPOINT_ADDRESS = "http://" + getServerHost() + ":8080/jaxws-cxf-jbws3593/EndpointBean";
+
+ public static Test suite()
+ {
+ return new JBossWSTestSetup(JBWS3593TestCase.class, "jaxws-cxf-jbws3593.war");
+ }
+
+ public void testMTOMAccess() throws Exception
+ {
+ URL wsdlURL = new URL(TARGET_ENDPOINT_ADDRESS + "?wsdl");
+ QName qname = new QName("http://org.jboss.ws/jaxws/jbws3593", "EndpointBeanService");
+ Service service = Service.create(wsdlURL, qname);
+ Endpoint port = service.getPort(Endpoint.class);
+
+ addClientHandler((BindingProvider)port, true);
+
+ ((SOAPBinding)((BindingProvider)port).getBinding()).setMTOMEnabled(true);
+
+ DataHandler response = port.namespace(new DataHandler("Jimbo","text/plain"));
+ Object messg = getContent(response);
+ assertEquals("Hello Jimbo", messg);
+ }
+
+ public void testTextXmlAccess() throws Exception
+ {
+ URL wsdlURL = new URL(TARGET_ENDPOINT_ADDRESS + "?wsdl");
+ QName qname = new QName("http://org.jboss.ws/jaxws/jbws3593", "EndpointBeanService");
+ Service service = Service.create(wsdlURL, qname);
+ Endpoint port = service.getPort(Endpoint.class);
+
+ addClientHandler((BindingProvider)port, false);
+
+ List<String> list = new LinkedList<String>();
+ list.add("Hello");
+ list.add("Jimbo");
+ List<String> response = port.echoStrings(list);
+ assertEquals("Hello", response.get(0));
+ assertEquals("Jimbo", response.get(1));
+ }
+
+ @SuppressWarnings("rawtypes")
+ private void addClientHandler(BindingProvider provider, boolean checkMtom) {
+ List<Handler> handlerChain = new ArrayList<Handler>();
+ handlerChain.addAll(provider.getBinding().getHandlerChain());
+ handlerChain.add(new ClientHandler(checkMtom));
+ provider.getBinding().setHandlerChain(handlerChain);
+ }
+
+ protected Object getContent(DataHandler dh) throws IOException
+ {
+ Object content = dh.getContent();
+
+ if (content instanceof InputStream)
+ {
+ try
+ {
+ BufferedReader br = new BufferedReader(new InputStreamReader((InputStream)content));
+ return br.readLine();
+ }
+ finally
+ {
+ ((InputStream)content).close();
+ }
+ }
+ return content;
+ }
+}
Added: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3593/MTOMOutInterceptor.java
===================================================================
--- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3593/MTOMOutInterceptor.java (rev 0)
+++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3593/MTOMOutInterceptor.java 2013-06-19 16:34:45 UTC (rev 17712)
@@ -0,0 +1,49 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2013, 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.jbws3593;
+
+import org.apache.cxf.interceptor.AttachmentOutInterceptor;
+import org.apache.cxf.message.Message;
+import org.apache.cxf.phase.AbstractPhaseInterceptor;
+import org.apache.cxf.phase.Phase;
+import org.apache.cxf.service.model.MessageInfo;
+
+/**
+ * A CXF interceptor for selectively turn off MTOM
+ */
+public class MTOMOutInterceptor extends AbstractPhaseInterceptor<Message>
+{
+
+ public MTOMOutInterceptor()
+ {
+ super(Phase.PRE_STREAM);
+ addBefore(AttachmentOutInterceptor.class.getName());
+ }
+
+ public void handleMessage(Message message)
+ {
+ MessageInfo mi = (MessageInfo)message.get(MessageInfo.class.getName());
+ if ("echoStringsResponse".equals(mi.getName().getLocalPart())) {
+ message.put("mtom-enabled", false);
+ }
+ }
+}
12 years, 4 months
- 1
- 0
JBossWS SVN: r17711 - in stack/cxf/trunk/modules/resources/src/main/resources/modules: jboss710/org/apache/cxf/main and 19 other directories.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2013-06-19 08:03:48 -0400 (Wed, 19 Jun 2013)
New Revision: 17711
Modified:
stack/cxf/trunk/modules/resources/src/main/resources/modules/jboss710/org/apache/cxf/impl/main/module.xml
stack/cxf/trunk/modules/resources/src/main/resources/modules/jboss710/org/apache/cxf/main/module.xml
stack/cxf/trunk/modules/resources/src/main/resources/modules/jboss710/org/jboss/as/webservices/server/integration/main/module.xml
stack/cxf/trunk/modules/resources/src/main/resources/modules/jboss710/org/jboss/ws/cxf/jbossws-cxf-server/main/module.xml
stack/cxf/trunk/modules/resources/src/main/resources/modules/jboss710/org/jboss/ws/cxf/jbossws-cxf-transports-httpserver/main/module.xml
stack/cxf/trunk/modules/resources/src/main/resources/modules/jboss710/org/jboss/ws/cxf/jbossws-cxf-transports-udp/main/module.xml
stack/cxf/trunk/modules/resources/src/main/resources/modules/jboss710/org/jboss/ws/jaxws-client/main/module.xml
stack/cxf/trunk/modules/resources/src/main/resources/modules/jboss720/org/apache/cxf/impl/main/module.xml
stack/cxf/trunk/modules/resources/src/main/resources/modules/jboss720/org/apache/cxf/main/module.xml
stack/cxf/trunk/modules/resources/src/main/resources/modules/jboss720/org/jboss/as/webservices/server/integration/main/module.xml
stack/cxf/trunk/modules/resources/src/main/resources/modules/jboss720/org/jboss/ws/cxf/jbossws-cxf-server/main/module.xml
stack/cxf/trunk/modules/resources/src/main/resources/modules/jboss720/org/jboss/ws/cxf/jbossws-cxf-transports-httpserver/main/module.xml
stack/cxf/trunk/modules/resources/src/main/resources/modules/jboss720/org/jboss/ws/cxf/jbossws-cxf-transports-udp/main/module.xml
stack/cxf/trunk/modules/resources/src/main/resources/modules/jboss720/org/jboss/ws/jaxws-client/main/module.xml
stack/cxf/trunk/modules/resources/src/main/resources/modules/wildfly800/org/apache/cxf/impl/main/module.xml
stack/cxf/trunk/modules/resources/src/main/resources/modules/wildfly800/org/apache/cxf/main/module.xml
stack/cxf/trunk/modules/resources/src/main/resources/modules/wildfly800/org/jboss/as/webservices/server/integration/main/module.xml
stack/cxf/trunk/modules/resources/src/main/resources/modules/wildfly800/org/jboss/ws/cxf/jbossws-cxf-server/main/module.xml
stack/cxf/trunk/modules/resources/src/main/resources/modules/wildfly800/org/jboss/ws/cxf/jbossws-cxf-transports-httpserver/main/module.xml
stack/cxf/trunk/modules/resources/src/main/resources/modules/wildfly800/org/jboss/ws/cxf/jbossws-cxf-transports-udp/main/module.xml
stack/cxf/trunk/modules/resources/src/main/resources/modules/wildfly800/org/jboss/ws/jaxws-client/main/module.xml
Log:
[JBWS-3650] Misc fixes on module dependencies; import META-INF from spring module, move META-INF and META-INF/cxf import of cxf api module from AS server integration module to cxf impl module (to work for client side too), remove trailing slash in META-INF/ imports which makes the import ineffective.
Modified: stack/cxf/trunk/modules/resources/src/main/resources/modules/jboss710/org/apache/cxf/impl/main/module.xml
===================================================================
--- stack/cxf/trunk/modules/resources/src/main/resources/modules/jboss710/org/apache/cxf/impl/main/module.xml 2013-06-18 12:31:39 UTC (rev 17710)
+++ stack/cxf/trunk/modules/resources/src/main/resources/modules/jboss710/org/apache/cxf/impl/main/module.xml 2013-06-19 12:03:48 UTC (rev 17711)
@@ -52,7 +52,20 @@
<module name="org.apache.santuario.xmlsec" />
<module name="org.joda.time" />
<module name="org.opensaml" />
- <module name="org.springframework.spring" optional="true"/>
- <module name="org.apache.cxf" export="true"/>
+ <module name="org.springframework.spring" optional="true">
+ <imports>
+ <include path="META-INF"/>
+ </imports>
+ </module>
+ <module name="org.apache.cxf" export="true">
+ <imports>
+ <include path="META-INF/cxf"/>
+ <include path="META-INF"/>
+ </imports>
+ <exports>
+ <include path="META-INF/cxf"/>
+ <include path="META-INF"/>
+ </exports>
+ </module>
</dependencies>
</module>
Modified: stack/cxf/trunk/modules/resources/src/main/resources/modules/jboss710/org/apache/cxf/main/module.xml
===================================================================
--- stack/cxf/trunk/modules/resources/src/main/resources/modules/jboss710/org/apache/cxf/main/module.xml 2013-06-18 12:31:39 UTC (rev 17710)
+++ stack/cxf/trunk/modules/resources/src/main/resources/modules/jboss710/org/apache/cxf/main/module.xml 2013-06-19 12:03:48 UTC (rev 17711)
@@ -32,7 +32,7 @@
<module name="org.apache.cxf.impl" services="import">
<imports>
<include path="META-INF/cxf"/> <!-- required to also pull in the bus extensions from META-INF -->
- <include path="META-INF/"/>
+ <include path="META-INF"/>
</imports>
</module>
<module name="asm.asm" />
@@ -45,6 +45,10 @@
<module name="org.apache.neethi" />
<module name="org.apache.ws.xmlschema" />
<module name="org.codehaus.woodstox" />
- <module name="org.springframework.spring" optional="true" />
+ <module name="org.springframework.spring" optional="true">
+ <imports>
+ <include path="META-INF"/>
+ </imports>
+ </module>
</dependencies>
</module>
Modified: stack/cxf/trunk/modules/resources/src/main/resources/modules/jboss710/org/jboss/as/webservices/server/integration/main/module.xml
===================================================================
--- stack/cxf/trunk/modules/resources/src/main/resources/modules/jboss710/org/jboss/as/webservices/server/integration/main/module.xml 2013-06-18 12:31:39 UTC (rev 17710)
+++ stack/cxf/trunk/modules/resources/src/main/resources/modules/jboss710/org/jboss/as/webservices/server/integration/main/module.xml 2013-06-19 12:03:48 UTC (rev 17711)
@@ -79,16 +79,6 @@
<include path="META-INF"/>
</exports>
</module>
- <module name="org.apache.cxf" export="true">
- <imports>
- <include path="META-INF/cxf"/>
- <include path="META-INF"/>
- </imports>
- <exports>
- <include path="META-INF/cxf"/>
- <include path="META-INF"/>
- </exports>
- </module>
<module name="org.apache.xalan" services="export" export="true"/>
<module name="org.apache.xerces" services="export" export="true"/>
<module name="org.jboss.as.webservices" services="export" export="true"/>
Modified: stack/cxf/trunk/modules/resources/src/main/resources/modules/jboss710/org/jboss/ws/cxf/jbossws-cxf-server/main/module.xml
===================================================================
--- stack/cxf/trunk/modules/resources/src/main/resources/modules/jboss710/org/jboss/ws/cxf/jbossws-cxf-server/main/module.xml 2013-06-18 12:31:39 UTC (rev 17710)
+++ stack/cxf/trunk/modules/resources/src/main/resources/modules/jboss710/org/jboss/ws/cxf/jbossws-cxf-server/main/module.xml 2013-06-19 12:03:48 UTC (rev 17711)
@@ -45,25 +45,29 @@
<module name="org.apache.cxf.impl">
<imports>
<include path="META-INF/cxf"/> <!-- required to also pull in the bus extensions from META-INF -->
- <include path="META-INF/"/>
+ <include path="META-INF"/>
</imports>
</module>
<module name="org.jboss.ws.cxf.jbossws-cxf-transports-httpserver" services="import">
<imports>
<include path="META-INF/cxf"/> <!-- required to also pull in the bus extensions from META-INF -->
- <include path="META-INF/"/>
+ <include path="META-INF"/>
</imports>
</module>
<module name="org.jboss.ws.cxf.jbossws-cxf-transports-udp" services="import">
<imports>
<include path="META-INF/cxf"/> <!-- required to also pull in the bus extensions from META-INF -->
- <include path="META-INF/"/>
+ <include path="META-INF"/>
</imports>
</module>
<module name="org.jboss.common-core" />
<module name="org.jboss.logging" />
<module name="org.apache.ws.security" />
<module name="org.picketbox" />
- <module name="org.springframework.spring" optional="true" />
+ <module name="org.springframework.spring" optional="true">
+ <imports>
+ <include path="META-INF"/>
+ </imports>
+ </module>
</dependencies>
</module>
Modified: stack/cxf/trunk/modules/resources/src/main/resources/modules/jboss710/org/jboss/ws/cxf/jbossws-cxf-transports-httpserver/main/module.xml
===================================================================
--- stack/cxf/trunk/modules/resources/src/main/resources/modules/jboss710/org/jboss/ws/cxf/jbossws-cxf-transports-httpserver/main/module.xml 2013-06-18 12:31:39 UTC (rev 17710)
+++ stack/cxf/trunk/modules/resources/src/main/resources/modules/jboss710/org/jboss/ws/cxf/jbossws-cxf-transports-httpserver/main/module.xml 2013-06-19 12:03:48 UTC (rev 17711)
@@ -37,7 +37,7 @@
<module name="org.apache.cxf.impl" services="import">
<imports>
<include path="META-INF/cxf"/> <!-- required to also pull in the bus extensions from META-INF -->
- <include path="META-INF/"/>
+ <include path="META-INF"/>
</imports>
</module>
<module name="org.jboss.com.sun.httpserver"/>
Modified: stack/cxf/trunk/modules/resources/src/main/resources/modules/jboss710/org/jboss/ws/cxf/jbossws-cxf-transports-udp/main/module.xml
===================================================================
--- stack/cxf/trunk/modules/resources/src/main/resources/modules/jboss710/org/jboss/ws/cxf/jbossws-cxf-transports-udp/main/module.xml 2013-06-18 12:31:39 UTC (rev 17710)
+++ stack/cxf/trunk/modules/resources/src/main/resources/modules/jboss710/org/jboss/ws/cxf/jbossws-cxf-transports-udp/main/module.xml 2013-06-19 12:03:48 UTC (rev 17711)
@@ -34,7 +34,7 @@
<module name="org.apache.cxf.impl" services="import">
<imports>
<include path="META-INF/cxf"/> <!-- required to also pull in the bus extensions from META-INF -->
- <include path="META-INF/"/>
+ <include path="META-INF"/>
</imports>
</module>
</dependencies>
Modified: stack/cxf/trunk/modules/resources/src/main/resources/modules/jboss710/org/jboss/ws/jaxws-client/main/module.xml
===================================================================
--- stack/cxf/trunk/modules/resources/src/main/resources/modules/jboss710/org/jboss/ws/jaxws-client/main/module.xml 2013-06-18 12:31:39 UTC (rev 17710)
+++ stack/cxf/trunk/modules/resources/src/main/resources/modules/jboss710/org/jboss/ws/jaxws-client/main/module.xml 2013-06-19 12:03:48 UTC (rev 17711)
@@ -42,26 +42,30 @@
<module name="org.apache.cxf.impl">
<imports>
<include path="META-INF/cxf"/> <!-- required to also pull in the bus extensions from META-INF -->
- <include path="META-INF/"/>
+ <include path="META-INF"/>
</imports>
</module>
<module name="org.jboss.ws.cxf.jbossws-cxf-transports-httpserver" services="import">
<imports>
<include path="META-INF/cxf"/> <!-- required to also pull in the bus extensions from META-INF -->
- <include path="META-INF/"/>
+ <include path="META-INF"/>
</imports>
</module>
<module name="org.jboss.ws.cxf.jbossws-cxf-transports-udp" services="import">
<imports>
<include path="META-INF/cxf"/> <!-- required to also pull in the bus extensions from META-INF -->
- <include path="META-INF/"/>
+ <include path="META-INF"/>
</imports>
</module>
<module name="org.apache.log4j" />
<module name="org.apache.neethi" />
<module name="org.apache.ws.security" />
<module name="org.jboss.logging" />
- <module name="org.springframework.spring" optional="true" />
+ <module name="org.springframework.spring" optional="true">
+ <imports>
+ <include path="META-INF"/>
+ </imports>
+ </module>
<module name="javax.wsdl4j.api" />
</dependencies>
</module>
Modified: stack/cxf/trunk/modules/resources/src/main/resources/modules/jboss720/org/apache/cxf/impl/main/module.xml
===================================================================
--- stack/cxf/trunk/modules/resources/src/main/resources/modules/jboss720/org/apache/cxf/impl/main/module.xml 2013-06-18 12:31:39 UTC (rev 17710)
+++ stack/cxf/trunk/modules/resources/src/main/resources/modules/jboss720/org/apache/cxf/impl/main/module.xml 2013-06-19 12:03:48 UTC (rev 17711)
@@ -51,7 +51,20 @@
<module name="org.apache.santuario.xmlsec" />
<module name="org.joda.time" />
<module name="org.opensaml" />
- <module name="org.springframework.spring" optional="true"/>
- <module name="org.apache.cxf" export="true"/>
+ <module name="org.springframework.spring" optional="true">
+ <imports>
+ <include path="META-INF"/>
+ </imports>
+ </module>
+ <module name="org.apache.cxf" export="true">
+ <imports>
+ <include path="META-INF/cxf"/>
+ <include path="META-INF"/>
+ </imports>
+ <exports>
+ <include path="META-INF/cxf"/>
+ <include path="META-INF"/>
+ </exports>
+ </module>
</dependencies>
</module>
Modified: stack/cxf/trunk/modules/resources/src/main/resources/modules/jboss720/org/apache/cxf/main/module.xml
===================================================================
--- stack/cxf/trunk/modules/resources/src/main/resources/modules/jboss720/org/apache/cxf/main/module.xml 2013-06-18 12:31:39 UTC (rev 17710)
+++ stack/cxf/trunk/modules/resources/src/main/resources/modules/jboss720/org/apache/cxf/main/module.xml 2013-06-19 12:03:48 UTC (rev 17711)
@@ -32,7 +32,7 @@
<module name="org.apache.cxf.impl" services="import">
<imports>
<include path="META-INF/cxf"/> <!-- required to also pull in the bus extensions from META-INF -->
- <include path="META-INF/"/>
+ <include path="META-INF"/>
</imports>
</module>
<module name="asm.asm" />
@@ -45,6 +45,10 @@
<module name="org.apache.neethi" />
<module name="org.apache.ws.xmlschema" />
<module name="org.codehaus.woodstox" />
- <module name="org.springframework.spring" optional="true" />
+ <module name="org.springframework.spring" optional="true">
+ <imports>
+ <include path="META-INF"/>
+ </imports>
+ </module>
</dependencies>
</module>
Modified: stack/cxf/trunk/modules/resources/src/main/resources/modules/jboss720/org/jboss/as/webservices/server/integration/main/module.xml
===================================================================
--- stack/cxf/trunk/modules/resources/src/main/resources/modules/jboss720/org/jboss/as/webservices/server/integration/main/module.xml 2013-06-18 12:31:39 UTC (rev 17710)
+++ stack/cxf/trunk/modules/resources/src/main/resources/modules/jboss720/org/jboss/as/webservices/server/integration/main/module.xml 2013-06-19 12:03:48 UTC (rev 17711)
@@ -82,16 +82,6 @@
<include path="META-INF"/>
</exports>
</module>
- <module name="org.apache.cxf" export="true">
- <imports>
- <include path="META-INF/cxf"/>
- <include path="META-INF"/>
- </imports>
- <exports>
- <include path="META-INF/cxf"/>
- <include path="META-INF"/>
- </exports>
- </module>
<module name="org.apache.xalan" services="export" export="true"/>
<module name="org.apache.xerces" services="export" export="true"/>
<module name="org.jboss.as.webservices" services="export" export="true"/>
Modified: stack/cxf/trunk/modules/resources/src/main/resources/modules/jboss720/org/jboss/ws/cxf/jbossws-cxf-server/main/module.xml
===================================================================
--- stack/cxf/trunk/modules/resources/src/main/resources/modules/jboss720/org/jboss/ws/cxf/jbossws-cxf-server/main/module.xml 2013-06-18 12:31:39 UTC (rev 17710)
+++ stack/cxf/trunk/modules/resources/src/main/resources/modules/jboss720/org/jboss/ws/cxf/jbossws-cxf-server/main/module.xml 2013-06-19 12:03:48 UTC (rev 17711)
@@ -49,25 +49,29 @@
<module name="org.apache.cxf.impl">
<imports>
<include path="META-INF/cxf"/> <!-- required to also pull in the bus extensions from META-INF -->
- <include path="META-INF/"/>
+ <include path="META-INF"/>
</imports>
</module>
<module name="org.jboss.ws.cxf.jbossws-cxf-transports-httpserver" services="import">
<imports>
<include path="META-INF/cxf"/> <!-- required to also pull in the bus extensions from META-INF -->
- <include path="META-INF/"/>
+ <include path="META-INF"/>
</imports>
</module>
<module name="org.jboss.ws.cxf.jbossws-cxf-transports-udp" services="import">
<imports>
<include path="META-INF/cxf"/> <!-- required to also pull in the bus extensions from META-INF -->
- <include path="META-INF/"/>
+ <include path="META-INF"/>
</imports>
</module>
<module name="org.jboss.common-core" />
<module name="org.jboss.logging" />
<module name="org.apache.ws.security" />
<module name="org.picketbox" />
- <module name="org.springframework.spring" optional="true" />
+ <module name="org.springframework.spring" optional="true">
+ <imports>
+ <include path="META-INF"/>
+ </imports>
+ </module>
</dependencies>
</module>
Modified: stack/cxf/trunk/modules/resources/src/main/resources/modules/jboss720/org/jboss/ws/cxf/jbossws-cxf-transports-httpserver/main/module.xml
===================================================================
--- stack/cxf/trunk/modules/resources/src/main/resources/modules/jboss720/org/jboss/ws/cxf/jbossws-cxf-transports-httpserver/main/module.xml 2013-06-18 12:31:39 UTC (rev 17710)
+++ stack/cxf/trunk/modules/resources/src/main/resources/modules/jboss720/org/jboss/ws/cxf/jbossws-cxf-transports-httpserver/main/module.xml 2013-06-19 12:03:48 UTC (rev 17711)
@@ -41,7 +41,7 @@
<module name="org.apache.cxf.impl" services="import">
<imports>
<include path="META-INF/cxf"/> <!-- required to also pull in the bus extensions from META-INF -->
- <include path="META-INF/"/>
+ <include path="META-INF"/>
</imports>
</module>
<module name="org.jboss.com.sun.httpserver"/>
Modified: stack/cxf/trunk/modules/resources/src/main/resources/modules/jboss720/org/jboss/ws/cxf/jbossws-cxf-transports-udp/main/module.xml
===================================================================
--- stack/cxf/trunk/modules/resources/src/main/resources/modules/jboss720/org/jboss/ws/cxf/jbossws-cxf-transports-udp/main/module.xml 2013-06-18 12:31:39 UTC (rev 17710)
+++ stack/cxf/trunk/modules/resources/src/main/resources/modules/jboss720/org/jboss/ws/cxf/jbossws-cxf-transports-udp/main/module.xml 2013-06-19 12:03:48 UTC (rev 17711)
@@ -38,7 +38,7 @@
<module name="org.apache.cxf.impl" services="import">
<imports>
<include path="META-INF/cxf"/> <!-- required to also pull in the bus extensions from META-INF -->
- <include path="META-INF/"/>
+ <include path="META-INF"/>
</imports>
</module>
</dependencies>
Modified: stack/cxf/trunk/modules/resources/src/main/resources/modules/jboss720/org/jboss/ws/jaxws-client/main/module.xml
===================================================================
--- stack/cxf/trunk/modules/resources/src/main/resources/modules/jboss720/org/jboss/ws/jaxws-client/main/module.xml 2013-06-18 12:31:39 UTC (rev 17710)
+++ stack/cxf/trunk/modules/resources/src/main/resources/modules/jboss720/org/jboss/ws/jaxws-client/main/module.xml 2013-06-19 12:03:48 UTC (rev 17711)
@@ -46,26 +46,30 @@
<module name="org.apache.cxf.impl">
<imports>
<include path="META-INF/cxf"/> <!-- required to also pull in the bus extensions from META-INF -->
- <include path="META-INF/"/>
+ <include path="META-INF"/>
</imports>
</module>
<module name="org.jboss.ws.cxf.jbossws-cxf-transports-httpserver" services="import">
<imports>
<include path="META-INF/cxf"/> <!-- required to also pull in the bus extensions from META-INF -->
- <include path="META-INF/"/>
+ <include path="META-INF"/>
</imports>
</module>
<module name="org.jboss.ws.cxf.jbossws-cxf-transports-udp" services="import">
<imports>
<include path="META-INF/cxf"/> <!-- required to also pull in the bus extensions from META-INF -->
- <include path="META-INF/"/>
+ <include path="META-INF"/>
</imports>
</module>
<module name="org.apache.log4j" />
<module name="org.apache.neethi" />
<module name="org.apache.ws.security" />
<module name="org.jboss.logging" />
- <module name="org.springframework.spring" optional="true" />
+ <module name="org.springframework.spring" optional="true">
+ <imports>
+ <include path="META-INF"/>
+ </imports>
+ </module>
<module name="javax.wsdl4j.api" />
</dependencies>
</module>
Modified: stack/cxf/trunk/modules/resources/src/main/resources/modules/wildfly800/org/apache/cxf/impl/main/module.xml
===================================================================
--- stack/cxf/trunk/modules/resources/src/main/resources/modules/wildfly800/org/apache/cxf/impl/main/module.xml 2013-06-18 12:31:39 UTC (rev 17710)
+++ stack/cxf/trunk/modules/resources/src/main/resources/modules/wildfly800/org/apache/cxf/impl/main/module.xml 2013-06-19 12:03:48 UTC (rev 17711)
@@ -51,7 +51,20 @@
<module name="org.apache.santuario.xmlsec" />
<module name="org.joda.time" />
<module name="org.opensaml" />
- <module name="org.springframework.spring" optional="true"/>
- <module name="org.apache.cxf" export="true"/>
+ <module name="org.springframework.spring" optional="true">
+ <imports>
+ <include path="META-INF"/>
+ </imports>
+ </module>
+ <module name="org.apache.cxf" export="true">
+ <imports>
+ <include path="META-INF/cxf"/>
+ <include path="META-INF"/>
+ </imports>
+ <exports>
+ <include path="META-INF/cxf"/>
+ <include path="META-INF"/>
+ </exports>
+ </module>
</dependencies>
</module>
Modified: stack/cxf/trunk/modules/resources/src/main/resources/modules/wildfly800/org/apache/cxf/main/module.xml
===================================================================
--- stack/cxf/trunk/modules/resources/src/main/resources/modules/wildfly800/org/apache/cxf/main/module.xml 2013-06-18 12:31:39 UTC (rev 17710)
+++ stack/cxf/trunk/modules/resources/src/main/resources/modules/wildfly800/org/apache/cxf/main/module.xml 2013-06-19 12:03:48 UTC (rev 17711)
@@ -32,7 +32,7 @@
<module name="org.apache.cxf.impl" services="import">
<imports>
<include path="META-INF/cxf"/> <!-- required to also pull in the bus extensions from META-INF -->
- <include path="META-INF/"/>
+ <include path="META-INF"/>
</imports>
</module>
<module name="asm.asm" />
@@ -46,6 +46,10 @@
<module name="org.apache.neethi" />
<module name="org.apache.ws.xmlschema" />
<module name="org.codehaus.woodstox" />
- <module name="org.springframework.spring" optional="true" />
+ <module name="org.springframework.spring" optional="true">
+ <imports>
+ <include path="META-INF"/>
+ </imports>
+ </module>
</dependencies>
</module>
Modified: stack/cxf/trunk/modules/resources/src/main/resources/modules/wildfly800/org/jboss/as/webservices/server/integration/main/module.xml
===================================================================
--- stack/cxf/trunk/modules/resources/src/main/resources/modules/wildfly800/org/jboss/as/webservices/server/integration/main/module.xml 2013-06-18 12:31:39 UTC (rev 17710)
+++ stack/cxf/trunk/modules/resources/src/main/resources/modules/wildfly800/org/jboss/as/webservices/server/integration/main/module.xml 2013-06-19 12:03:48 UTC (rev 17711)
@@ -82,16 +82,6 @@
<include path="META-INF"/>
</exports>
</module>
- <module name="org.apache.cxf" export="true">
- <imports>
- <include path="META-INF/cxf"/>
- <include path="META-INF"/>
- </imports>
- <exports>
- <include path="META-INF/cxf"/>
- <include path="META-INF"/>
- </exports>
- </module>
<module name="org.apache.xalan" services="export" export="true"/>
<module name="org.apache.xerces" services="export" export="true"/>
<module name="org.jboss.as.webservices" services="export" export="true"/>
Modified: stack/cxf/trunk/modules/resources/src/main/resources/modules/wildfly800/org/jboss/ws/cxf/jbossws-cxf-server/main/module.xml
===================================================================
--- stack/cxf/trunk/modules/resources/src/main/resources/modules/wildfly800/org/jboss/ws/cxf/jbossws-cxf-server/main/module.xml 2013-06-18 12:31:39 UTC (rev 17710)
+++ stack/cxf/trunk/modules/resources/src/main/resources/modules/wildfly800/org/jboss/ws/cxf/jbossws-cxf-server/main/module.xml 2013-06-19 12:03:48 UTC (rev 17711)
@@ -49,25 +49,29 @@
<module name="org.apache.cxf.impl">
<imports>
<include path="META-INF/cxf"/> <!-- required to also pull in the bus extensions from META-INF -->
- <include path="META-INF/"/>
+ <include path="META-INF"/>
</imports>
</module>
<module name="org.jboss.ws.cxf.jbossws-cxf-transports-httpserver" services="import">
<imports>
<include path="META-INF/cxf"/> <!-- required to also pull in the bus extensions from META-INF -->
- <include path="META-INF/"/>
+ <include path="META-INF"/>
</imports>
</module>
<module name="org.jboss.ws.cxf.jbossws-cxf-transports-udp" services="import">
<imports>
<include path="META-INF/cxf"/> <!-- required to also pull in the bus extensions from META-INF -->
- <include path="META-INF/"/>
+ <include path="META-INF"/>
</imports>
</module>
<module name="org.jboss.common-core" />
<module name="org.jboss.logging" />
<module name="org.apache.ws.security" />
<module name="org.picketbox" />
- <module name="org.springframework.spring" optional="true" />
+ <module name="org.springframework.spring" optional="true">
+ <imports>
+ <include path="META-INF"/>
+ </imports>
+ </module>
</dependencies>
</module>
Modified: stack/cxf/trunk/modules/resources/src/main/resources/modules/wildfly800/org/jboss/ws/cxf/jbossws-cxf-transports-httpserver/main/module.xml
===================================================================
--- stack/cxf/trunk/modules/resources/src/main/resources/modules/wildfly800/org/jboss/ws/cxf/jbossws-cxf-transports-httpserver/main/module.xml 2013-06-18 12:31:39 UTC (rev 17710)
+++ stack/cxf/trunk/modules/resources/src/main/resources/modules/wildfly800/org/jboss/ws/cxf/jbossws-cxf-transports-httpserver/main/module.xml 2013-06-19 12:03:48 UTC (rev 17711)
@@ -41,7 +41,7 @@
<module name="org.apache.cxf.impl" services="import">
<imports>
<include path="META-INF/cxf"/> <!-- required to also pull in the bus extensions from META-INF -->
- <include path="META-INF/"/>
+ <include path="META-INF"/>
</imports>
</module>
<module name="org.jboss.com.sun.httpserver"/>
Modified: stack/cxf/trunk/modules/resources/src/main/resources/modules/wildfly800/org/jboss/ws/cxf/jbossws-cxf-transports-udp/main/module.xml
===================================================================
--- stack/cxf/trunk/modules/resources/src/main/resources/modules/wildfly800/org/jboss/ws/cxf/jbossws-cxf-transports-udp/main/module.xml 2013-06-18 12:31:39 UTC (rev 17710)
+++ stack/cxf/trunk/modules/resources/src/main/resources/modules/wildfly800/org/jboss/ws/cxf/jbossws-cxf-transports-udp/main/module.xml 2013-06-19 12:03:48 UTC (rev 17711)
@@ -38,7 +38,7 @@
<module name="org.apache.cxf.impl" services="import">
<imports>
<include path="META-INF/cxf"/> <!-- required to also pull in the bus extensions from META-INF -->
- <include path="META-INF/"/>
+ <include path="META-INF"/>
</imports>
</module>
</dependencies>
Modified: stack/cxf/trunk/modules/resources/src/main/resources/modules/wildfly800/org/jboss/ws/jaxws-client/main/module.xml
===================================================================
--- stack/cxf/trunk/modules/resources/src/main/resources/modules/wildfly800/org/jboss/ws/jaxws-client/main/module.xml 2013-06-18 12:31:39 UTC (rev 17710)
+++ stack/cxf/trunk/modules/resources/src/main/resources/modules/wildfly800/org/jboss/ws/jaxws-client/main/module.xml 2013-06-19 12:03:48 UTC (rev 17711)
@@ -46,26 +46,30 @@
<module name="org.apache.cxf.impl">
<imports>
<include path="META-INF/cxf"/> <!-- required to also pull in the bus extensions from META-INF -->
- <include path="META-INF/"/>
+ <include path="META-INF"/>
</imports>
</module>
<module name="org.jboss.ws.cxf.jbossws-cxf-transports-httpserver" services="import">
<imports>
<include path="META-INF/cxf"/> <!-- required to also pull in the bus extensions from META-INF -->
- <include path="META-INF/"/>
+ <include path="META-INF"/>
</imports>
</module>
<module name="org.jboss.ws.cxf.jbossws-cxf-transports-udp" services="import">
<imports>
<include path="META-INF/cxf"/> <!-- required to also pull in the bus extensions from META-INF -->
- <include path="META-INF/"/>
+ <include path="META-INF"/>
</imports>
</module>
<module name="org.apache.log4j" />
<module name="org.apache.neethi" />
<module name="org.apache.ws.security" />
<module name="org.jboss.logging" />
- <module name="org.springframework.spring" optional="true" />
+ <module name="org.springframework.spring" optional="true">
+ <imports>
+ <include path="META-INF"/>
+ </imports>
+ </module>
<module name="javax.wsdl4j.api" />
</dependencies>
</module>
12 years, 4 months
- 1
- 0
JBossWS SVN: r17709 - in stack/cxf/trunk/modules/resources/src/main/resources/modules: jboss720/org/jboss/as/webservices/server/integration/main and 1 other directories.
by jbossws-commits＠lists.jboss.org
Author: jim.ma
Date: 2013-06-18 06:15:27 -0400 (Tue, 18 Jun 2013)
New Revision: 17709
Modified:
stack/cxf/trunk/modules/resources/src/main/resources/modules/jboss710/org/jboss/as/webservices/server/integration/main/module.xml
stack/cxf/trunk/modules/resources/src/main/resources/modules/jboss720/org/jboss/as/webservices/server/integration/main/module.xml
stack/cxf/trunk/modules/resources/src/main/resources/modules/wildfly800/org/jboss/as/webservices/server/integration/main/module.xml
Log:
[JBWS-3650]:import service from org.apache.cxf module
Modified: stack/cxf/trunk/modules/resources/src/main/resources/modules/jboss710/org/jboss/as/webservices/server/integration/main/module.xml
===================================================================
--- stack/cxf/trunk/modules/resources/src/main/resources/modules/jboss710/org/jboss/as/webservices/server/integration/main/module.xml 2013-06-18 09:58:27 UTC (rev 17708)
+++ stack/cxf/trunk/modules/resources/src/main/resources/modules/jboss710/org/jboss/as/webservices/server/integration/main/module.xml 2013-06-18 10:15:27 UTC (rev 17709)
@@ -79,6 +79,16 @@
<include path="META-INF"/>
</exports>
</module>
+ <module name="org.apache.cxf" export="true">
+ <imports>
+ <include path="META-INF/cxf"/>
+ <include path="META-INF"/>
+ </imports>
+ <exports>
+ <include path="META-INF/cxf"/>
+ <include path="META-INF"/>
+ </exports>
+ </module>
<module name="org.apache.xalan" services="export" export="true"/>
<module name="org.apache.xerces" services="export" export="true"/>
<module name="org.jboss.as.webservices" services="export" export="true"/>
Modified: stack/cxf/trunk/modules/resources/src/main/resources/modules/jboss720/org/jboss/as/webservices/server/integration/main/module.xml
===================================================================
--- stack/cxf/trunk/modules/resources/src/main/resources/modules/jboss720/org/jboss/as/webservices/server/integration/main/module.xml 2013-06-18 09:58:27 UTC (rev 17708)
+++ stack/cxf/trunk/modules/resources/src/main/resources/modules/jboss720/org/jboss/as/webservices/server/integration/main/module.xml 2013-06-18 10:15:27 UTC (rev 17709)
@@ -82,6 +82,16 @@
<include path="META-INF"/>
</exports>
</module>
+ <module name="org.apache.cxf" export="true">
+ <imports>
+ <include path="META-INF/cxf"/>
+ <include path="META-INF"/>
+ </imports>
+ <exports>
+ <include path="META-INF/cxf"/>
+ <include path="META-INF"/>
+ </exports>
+ </module>
<module name="org.apache.xalan" services="export" export="true"/>
<module name="org.apache.xerces" services="export" export="true"/>
<module name="org.jboss.as.webservices" services="export" export="true"/>
Modified: stack/cxf/trunk/modules/resources/src/main/resources/modules/wildfly800/org/jboss/as/webservices/server/integration/main/module.xml
===================================================================
--- stack/cxf/trunk/modules/resources/src/main/resources/modules/wildfly800/org/jboss/as/webservices/server/integration/main/module.xml 2013-06-18 09:58:27 UTC (rev 17708)
+++ stack/cxf/trunk/modules/resources/src/main/resources/modules/wildfly800/org/jboss/as/webservices/server/integration/main/module.xml 2013-06-18 10:15:27 UTC (rev 17709)
@@ -82,6 +82,16 @@
<include path="META-INF"/>
</exports>
</module>
+ <module name="org.apache.cxf" export="true">
+ <imports>
+ <include path="META-INF/cxf"/>
+ <include path="META-INF"/>
+ </imports>
+ <exports>
+ <include path="META-INF/cxf"/>
+ <include path="META-INF"/>
+ </exports>
+ </module>
<module name="org.apache.xalan" services="export" export="true"/>
<module name="org.apache.xerces" services="export" export="true"/>
<module name="org.jboss.as.webservices" services="export" export="true"/>
12 years, 4 months
- 1
- 0
JBossWS SVN: r17708 - in stack/cxf/trunk: modules/addons and 12 other directories.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2013-06-18 05:58:27 -0400 (Tue, 18 Jun 2013)
New Revision: 17708
Modified:
stack/cxf/trunk/modules/addons/pom.xml
stack/cxf/trunk/modules/addons/transports/http/httpserver/pom.xml
stack/cxf/trunk/modules/addons/transports/udp/pom.xml
stack/cxf/trunk/modules/client/pom.xml
stack/cxf/trunk/modules/dist/pom.xml
stack/cxf/trunk/modules/endorsed/pom.xml
stack/cxf/trunk/modules/resources/pom.xml
stack/cxf/trunk/modules/server/pom.xml
stack/cxf/trunk/modules/testsuite/cxf-spring-tests/pom.xml
stack/cxf/trunk/modules/testsuite/cxf-tests/pom.xml
stack/cxf/trunk/modules/testsuite/pom.xml
stack/cxf/trunk/modules/testsuite/shared-tests/pom.xml
stack/cxf/trunk/modules/testsuite/test-utils/pom.xml
stack/cxf/trunk/pom.xml
Log:
Go ahead with dev
Modified: stack/cxf/trunk/modules/addons/pom.xml
===================================================================
--- stack/cxf/trunk/modules/addons/pom.xml 2013-06-18 09:55:35 UTC (rev 17707)
+++ stack/cxf/trunk/modules/addons/pom.xml 2013-06-18 09:58:27 UTC (rev 17708)
@@ -10,7 +10,7 @@
<parent>
<groupId>org.jboss.ws.cxf</groupId>
<artifactId>jbossws-cxf</artifactId>
- <version>4.2.0.CR1</version>
+ <version>4.2.0-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
Modified: stack/cxf/trunk/modules/addons/transports/http/httpserver/pom.xml
===================================================================
--- stack/cxf/trunk/modules/addons/transports/http/httpserver/pom.xml 2013-06-18 09:55:35 UTC (rev 17707)
+++ stack/cxf/trunk/modules/addons/transports/http/httpserver/pom.xml 2013-06-18 09:58:27 UTC (rev 17708)
@@ -8,7 +8,7 @@
<parent>
<groupId>org.jboss.ws.cxf</groupId>
<artifactId>jbossws-cxf-addons</artifactId>
- <version>4.2.0.CR1</version>
+ <version>4.2.0-SNAPSHOT</version>
<relativePath>../../../pom.xml</relativePath>
</parent>
Modified: stack/cxf/trunk/modules/addons/transports/udp/pom.xml
===================================================================
--- stack/cxf/trunk/modules/addons/transports/udp/pom.xml 2013-06-18 09:55:35 UTC (rev 17707)
+++ stack/cxf/trunk/modules/addons/transports/udp/pom.xml 2013-06-18 09:58:27 UTC (rev 17708)
@@ -8,7 +8,7 @@
<parent>
<groupId>org.jboss.ws.cxf</groupId>
<artifactId>jbossws-cxf-addons</artifactId>
- <version>4.2.0.CR1</version>
+ <version>4.2.0-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
Modified: stack/cxf/trunk/modules/client/pom.xml
===================================================================
--- stack/cxf/trunk/modules/client/pom.xml 2013-06-18 09:55:35 UTC (rev 17707)
+++ stack/cxf/trunk/modules/client/pom.xml 2013-06-18 09:58:27 UTC (rev 17708)
@@ -8,7 +8,7 @@
<parent>
<groupId>org.jboss.ws.cxf</groupId>
<artifactId>jbossws-cxf</artifactId>
- <version>4.2.0.CR1</version>
+ <version>4.2.0-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
Modified: stack/cxf/trunk/modules/dist/pom.xml
===================================================================
--- stack/cxf/trunk/modules/dist/pom.xml 2013-06-18 09:55:35 UTC (rev 17707)
+++ stack/cxf/trunk/modules/dist/pom.xml 2013-06-18 09:58:27 UTC (rev 17708)
@@ -8,7 +8,7 @@
<parent>
<groupId>org.jboss.ws.cxf</groupId>
<artifactId>jbossws-cxf</artifactId>
- <version>4.2.0.CR1</version>
+ <version>4.2.0-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
Modified: stack/cxf/trunk/modules/endorsed/pom.xml
===================================================================
--- stack/cxf/trunk/modules/endorsed/pom.xml 2013-06-18 09:55:35 UTC (rev 17707)
+++ stack/cxf/trunk/modules/endorsed/pom.xml 2013-06-18 09:58:27 UTC (rev 17708)
@@ -9,7 +9,7 @@
<parent>
<groupId>org.jboss.ws.cxf</groupId>
<artifactId>jbossws-cxf</artifactId>
- <version>4.2.0.CR1</version>
+ <version>4.2.0-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
Modified: stack/cxf/trunk/modules/resources/pom.xml
===================================================================
--- stack/cxf/trunk/modules/resources/pom.xml 2013-06-18 09:55:35 UTC (rev 17707)
+++ stack/cxf/trunk/modules/resources/pom.xml 2013-06-18 09:58:27 UTC (rev 17708)
@@ -9,7 +9,7 @@
<parent>
<groupId>org.jboss.ws.cxf</groupId>
<artifactId>jbossws-cxf</artifactId>
- <version>4.2.0.CR1</version>
+ <version>4.2.0-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
Modified: stack/cxf/trunk/modules/server/pom.xml
===================================================================
--- stack/cxf/trunk/modules/server/pom.xml 2013-06-18 09:55:35 UTC (rev 17707)
+++ stack/cxf/trunk/modules/server/pom.xml 2013-06-18 09:58:27 UTC (rev 17708)
@@ -9,7 +9,7 @@
<parent>
<groupId>org.jboss.ws.cxf</groupId>
<artifactId>jbossws-cxf</artifactId>
- <version>4.2.0.CR1</version>
+ <version>4.2.0-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
Modified: stack/cxf/trunk/modules/testsuite/cxf-spring-tests/pom.xml
===================================================================
--- stack/cxf/trunk/modules/testsuite/cxf-spring-tests/pom.xml 2013-06-18 09:55:35 UTC (rev 17707)
+++ stack/cxf/trunk/modules/testsuite/cxf-spring-tests/pom.xml 2013-06-18 09:58:27 UTC (rev 17708)
@@ -10,7 +10,7 @@
<parent>
<groupId>org.jboss.ws.cxf</groupId>
<artifactId>jbossws-cxf-testsuite</artifactId>
- <version>4.2.0.CR1</version>
+ <version>4.2.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
Modified: stack/cxf/trunk/modules/testsuite/cxf-tests/pom.xml
===================================================================
--- stack/cxf/trunk/modules/testsuite/cxf-tests/pom.xml 2013-06-18 09:55:35 UTC (rev 17707)
+++ stack/cxf/trunk/modules/testsuite/cxf-tests/pom.xml 2013-06-18 09:58:27 UTC (rev 17708)
@@ -10,7 +10,7 @@
<parent>
<groupId>org.jboss.ws.cxf</groupId>
<artifactId>jbossws-cxf-testsuite</artifactId>
- <version>4.2.0.CR1</version>
+ <version>4.2.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
Modified: stack/cxf/trunk/modules/testsuite/pom.xml
===================================================================
--- stack/cxf/trunk/modules/testsuite/pom.xml 2013-06-18 09:55:35 UTC (rev 17707)
+++ stack/cxf/trunk/modules/testsuite/pom.xml 2013-06-18 09:58:27 UTC (rev 17708)
@@ -10,7 +10,7 @@
<parent>
<groupId>org.jboss.ws.cxf</groupId>
<artifactId>jbossws-cxf</artifactId>
- <version>4.2.0.CR1</version>
+ <version>4.2.0-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
Modified: stack/cxf/trunk/modules/testsuite/shared-tests/pom.xml
===================================================================
--- stack/cxf/trunk/modules/testsuite/shared-tests/pom.xml 2013-06-18 09:55:35 UTC (rev 17707)
+++ stack/cxf/trunk/modules/testsuite/shared-tests/pom.xml 2013-06-18 09:58:27 UTC (rev 17708)
@@ -10,7 +10,7 @@
<parent>
<groupId>org.jboss.ws.cxf</groupId>
<artifactId>jbossws-cxf-testsuite</artifactId>
- <version>4.2.0.CR1</version>
+ <version>4.2.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
Modified: stack/cxf/trunk/modules/testsuite/test-utils/pom.xml
===================================================================
--- stack/cxf/trunk/modules/testsuite/test-utils/pom.xml 2013-06-18 09:55:35 UTC (rev 17707)
+++ stack/cxf/trunk/modules/testsuite/test-utils/pom.xml 2013-06-18 09:58:27 UTC (rev 17708)
@@ -10,7 +10,7 @@
<parent>
<groupId>org.jboss.ws.cxf</groupId>
<artifactId>jbossws-cxf-testsuite</artifactId>
- <version>4.2.0.CR1</version>
+ <version>4.2.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
Modified: stack/cxf/trunk/pom.xml
===================================================================
--- stack/cxf/trunk/pom.xml 2013-06-18 09:55:35 UTC (rev 17707)
+++ stack/cxf/trunk/pom.xml 2013-06-18 09:58:27 UTC (rev 17708)
@@ -32,7 +32,7 @@
<description>JBossWS CXF stack</description>
- <version>4.2.0.CR1</version>
+ <version>4.2.0-SNAPSHOT</version>
<!-- Parent -->
<parent>
@@ -43,9 +43,9 @@
<!-- Source Control Management -->
<scm>
- <connection>scm:svn:http://anonsvn.jboss.org/repos/jbossws/stack/cxf/tags/jbossws-cxf...</connection>
- <developerConnection>scm:svn:https://svn.jboss.org/repos/jbossws/stack/cxf/tags/jbossws-cxf-4....</developerConnection>
- <url>http://fisheye.jboss.com/viewrep/JBossWS/stack/cxf/tags/jbossws-cxf-4.2.0...</url>
+ <connection>scm:svn:http://anonsvn.jboss.org/repos/jbossws/stack/cxf/trunk</connection>
+ <developerConnection>scm:svn:https://svn.jboss.org/repos/jbossws/stack/cxf/trunk</developerConnection>
+ <url>http://fisheye.jboss.com/viewrep/JBossWS/stack/cxf/trunk</url>
</scm>
<!-- Modules -->
@@ -59,13 +59,13 @@
<!-- Properties -->
<properties>
- <jbossws.api.version>1.0.2.CR1</jbossws.api.version>
- <jbossws.spi.version>2.2.0.CR1</jbossws.spi.version>
- <jbossws.common.version>2.2.0.CR1</jbossws.common.version>
- <jbossws.common.tools.version>1.2.0.CR1</jbossws.common.tools.version>
- <jbossws.jboss712.version>4.2.0.Beta1</jbossws.jboss712.version>
- <jbossws.jboss713.version>4.2.0.Beta1</jbossws.jboss713.version>
- <jbossws.jboss720.version>4.2.0.CR1</jbossws.jboss720.version>
+ <jbossws.api.version>1.0.2-SNAPSHOT</jbossws.api.version>
+ <jbossws.spi.version>2.2.0-SNAPSHOT</jbossws.spi.version>
+ <jbossws.common.version>2.2.0-SNAPSHOT</jbossws.common.version>
+ <jbossws.common.tools.version>1.2.0-SNAPSHOT</jbossws.common.tools.version>
+ <jbossws.jboss712.version>4.2.0-SNAPSHOT</jbossws.jboss712.version>
+ <jbossws.jboss713.version>4.2.0-SNAPSHOT</jbossws.jboss713.version>
+ <jbossws.jboss720.version>4.2.0-SNAPSHOT</jbossws.jboss720.version>
<jbossws.native.version>4.1.1.Final</jbossws.native.version>
<jboss712.version>7.1.2.Final</jboss712.version>
<jboss713.version>7.1.3.Final</jboss713.version>
12 years, 4 months
- 1
- 0
JBossWS SVN: r17707 - stack/cxf/tags.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2013-06-18 05:55:35 -0400 (Tue, 18 Jun 2013)
New Revision: 17707
Added:
stack/cxf/tags/jbossws-cxf-4.2.0.CR1/
Log:
Tagging jbossws-cxf-4.2.0.CR1
12 years, 4 months
- 1
- 0
JBossWS SVN: r17706 - in stack/cxf/trunk: modules/addons and 12 other directories.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2013-06-18 05:54:57 -0400 (Tue, 18 Jun 2013)
New Revision: 17706
Modified:
stack/cxf/trunk/modules/addons/pom.xml
stack/cxf/trunk/modules/addons/transports/http/httpserver/pom.xml
stack/cxf/trunk/modules/addons/transports/udp/pom.xml
stack/cxf/trunk/modules/client/pom.xml
stack/cxf/trunk/modules/dist/pom.xml
stack/cxf/trunk/modules/endorsed/pom.xml
stack/cxf/trunk/modules/resources/pom.xml
stack/cxf/trunk/modules/server/pom.xml
stack/cxf/trunk/modules/testsuite/cxf-spring-tests/pom.xml
stack/cxf/trunk/modules/testsuite/cxf-tests/pom.xml
stack/cxf/trunk/modules/testsuite/pom.xml
stack/cxf/trunk/modules/testsuite/shared-tests/pom.xml
stack/cxf/trunk/modules/testsuite/test-utils/pom.xml
stack/cxf/trunk/pom.xml
Log:
Preparing for tagging jbossws-cxf-4.2.0.CR1
Modified: stack/cxf/trunk/modules/addons/pom.xml
===================================================================
--- stack/cxf/trunk/modules/addons/pom.xml 2013-06-18 09:05:39 UTC (rev 17705)
+++ stack/cxf/trunk/modules/addons/pom.xml 2013-06-18 09:54:57 UTC (rev 17706)
@@ -10,7 +10,7 @@
<parent>
<groupId>org.jboss.ws.cxf</groupId>
<artifactId>jbossws-cxf</artifactId>
- <version>4.2.0-SNAPSHOT</version>
+ <version>4.2.0.CR1</version>
<relativePath>../../pom.xml</relativePath>
</parent>
Modified: stack/cxf/trunk/modules/addons/transports/http/httpserver/pom.xml
===================================================================
--- stack/cxf/trunk/modules/addons/transports/http/httpserver/pom.xml 2013-06-18 09:05:39 UTC (rev 17705)
+++ stack/cxf/trunk/modules/addons/transports/http/httpserver/pom.xml 2013-06-18 09:54:57 UTC (rev 17706)
@@ -8,7 +8,7 @@
<parent>
<groupId>org.jboss.ws.cxf</groupId>
<artifactId>jbossws-cxf-addons</artifactId>
- <version>4.2.0-SNAPSHOT</version>
+ <version>4.2.0.CR1</version>
<relativePath>../../../pom.xml</relativePath>
</parent>
Modified: stack/cxf/trunk/modules/addons/transports/udp/pom.xml
===================================================================
--- stack/cxf/trunk/modules/addons/transports/udp/pom.xml 2013-06-18 09:05:39 UTC (rev 17705)
+++ stack/cxf/trunk/modules/addons/transports/udp/pom.xml 2013-06-18 09:54:57 UTC (rev 17706)
@@ -8,7 +8,7 @@
<parent>
<groupId>org.jboss.ws.cxf</groupId>
<artifactId>jbossws-cxf-addons</artifactId>
- <version>4.2.0-SNAPSHOT</version>
+ <version>4.2.0.CR1</version>
<relativePath>../../pom.xml</relativePath>
</parent>
Modified: stack/cxf/trunk/modules/client/pom.xml
===================================================================
--- stack/cxf/trunk/modules/client/pom.xml 2013-06-18 09:05:39 UTC (rev 17705)
+++ stack/cxf/trunk/modules/client/pom.xml 2013-06-18 09:54:57 UTC (rev 17706)
@@ -8,7 +8,7 @@
<parent>
<groupId>org.jboss.ws.cxf</groupId>
<artifactId>jbossws-cxf</artifactId>
- <version>4.2.0-SNAPSHOT</version>
+ <version>4.2.0.CR1</version>
<relativePath>../../pom.xml</relativePath>
</parent>
Modified: stack/cxf/trunk/modules/dist/pom.xml
===================================================================
--- stack/cxf/trunk/modules/dist/pom.xml 2013-06-18 09:05:39 UTC (rev 17705)
+++ stack/cxf/trunk/modules/dist/pom.xml 2013-06-18 09:54:57 UTC (rev 17706)
@@ -8,7 +8,7 @@
<parent>
<groupId>org.jboss.ws.cxf</groupId>
<artifactId>jbossws-cxf</artifactId>
- <version>4.2.0-SNAPSHOT</version>
+ <version>4.2.0.CR1</version>
<relativePath>../../pom.xml</relativePath>
</parent>
Modified: stack/cxf/trunk/modules/endorsed/pom.xml
===================================================================
--- stack/cxf/trunk/modules/endorsed/pom.xml 2013-06-18 09:05:39 UTC (rev 17705)
+++ stack/cxf/trunk/modules/endorsed/pom.xml 2013-06-18 09:54:57 UTC (rev 17706)
@@ -9,7 +9,7 @@
<parent>
<groupId>org.jboss.ws.cxf</groupId>
<artifactId>jbossws-cxf</artifactId>
- <version>4.2.0-SNAPSHOT</version>
+ <version>4.2.0.CR1</version>
<relativePath>../../pom.xml</relativePath>
</parent>
Modified: stack/cxf/trunk/modules/resources/pom.xml
===================================================================
--- stack/cxf/trunk/modules/resources/pom.xml 2013-06-18 09:05:39 UTC (rev 17705)
+++ stack/cxf/trunk/modules/resources/pom.xml 2013-06-18 09:54:57 UTC (rev 17706)
@@ -9,7 +9,7 @@
<parent>
<groupId>org.jboss.ws.cxf</groupId>
<artifactId>jbossws-cxf</artifactId>
- <version>4.2.0-SNAPSHOT</version>
+ <version>4.2.0.CR1</version>
<relativePath>../../pom.xml</relativePath>
</parent>
Modified: stack/cxf/trunk/modules/server/pom.xml
===================================================================
--- stack/cxf/trunk/modules/server/pom.xml 2013-06-18 09:05:39 UTC (rev 17705)
+++ stack/cxf/trunk/modules/server/pom.xml 2013-06-18 09:54:57 UTC (rev 17706)
@@ -9,7 +9,7 @@
<parent>
<groupId>org.jboss.ws.cxf</groupId>
<artifactId>jbossws-cxf</artifactId>
- <version>4.2.0-SNAPSHOT</version>
+ <version>4.2.0.CR1</version>
<relativePath>../../pom.xml</relativePath>
</parent>
Modified: stack/cxf/trunk/modules/testsuite/cxf-spring-tests/pom.xml
===================================================================
--- stack/cxf/trunk/modules/testsuite/cxf-spring-tests/pom.xml 2013-06-18 09:05:39 UTC (rev 17705)
+++ stack/cxf/trunk/modules/testsuite/cxf-spring-tests/pom.xml 2013-06-18 09:54:57 UTC (rev 17706)
@@ -10,7 +10,7 @@
<parent>
<groupId>org.jboss.ws.cxf</groupId>
<artifactId>jbossws-cxf-testsuite</artifactId>
- <version>4.2.0-SNAPSHOT</version>
+ <version>4.2.0.CR1</version>
<relativePath>../pom.xml</relativePath>
</parent>
Modified: stack/cxf/trunk/modules/testsuite/cxf-tests/pom.xml
===================================================================
--- stack/cxf/trunk/modules/testsuite/cxf-tests/pom.xml 2013-06-18 09:05:39 UTC (rev 17705)
+++ stack/cxf/trunk/modules/testsuite/cxf-tests/pom.xml 2013-06-18 09:54:57 UTC (rev 17706)
@@ -10,7 +10,7 @@
<parent>
<groupId>org.jboss.ws.cxf</groupId>
<artifactId>jbossws-cxf-testsuite</artifactId>
- <version>4.2.0-SNAPSHOT</version>
+ <version>4.2.0.CR1</version>
<relativePath>../pom.xml</relativePath>
</parent>
Modified: stack/cxf/trunk/modules/testsuite/pom.xml
===================================================================
--- stack/cxf/trunk/modules/testsuite/pom.xml 2013-06-18 09:05:39 UTC (rev 17705)
+++ stack/cxf/trunk/modules/testsuite/pom.xml 2013-06-18 09:54:57 UTC (rev 17706)
@@ -10,7 +10,7 @@
<parent>
<groupId>org.jboss.ws.cxf</groupId>
<artifactId>jbossws-cxf</artifactId>
- <version>4.2.0-SNAPSHOT</version>
+ <version>4.2.0.CR1</version>
<relativePath>../../pom.xml</relativePath>
</parent>
Modified: stack/cxf/trunk/modules/testsuite/shared-tests/pom.xml
===================================================================
--- stack/cxf/trunk/modules/testsuite/shared-tests/pom.xml 2013-06-18 09:05:39 UTC (rev 17705)
+++ stack/cxf/trunk/modules/testsuite/shared-tests/pom.xml 2013-06-18 09:54:57 UTC (rev 17706)
@@ -10,7 +10,7 @@
<parent>
<groupId>org.jboss.ws.cxf</groupId>
<artifactId>jbossws-cxf-testsuite</artifactId>
- <version>4.2.0-SNAPSHOT</version>
+ <version>4.2.0.CR1</version>
<relativePath>../pom.xml</relativePath>
</parent>
Modified: stack/cxf/trunk/modules/testsuite/test-utils/pom.xml
===================================================================
--- stack/cxf/trunk/modules/testsuite/test-utils/pom.xml 2013-06-18 09:05:39 UTC (rev 17705)
+++ stack/cxf/trunk/modules/testsuite/test-utils/pom.xml 2013-06-18 09:54:57 UTC (rev 17706)
@@ -10,7 +10,7 @@
<parent>
<groupId>org.jboss.ws.cxf</groupId>
<artifactId>jbossws-cxf-testsuite</artifactId>
- <version>4.2.0-SNAPSHOT</version>
+ <version>4.2.0.CR1</version>
<relativePath>../pom.xml</relativePath>
</parent>
Modified: stack/cxf/trunk/pom.xml
===================================================================
--- stack/cxf/trunk/pom.xml 2013-06-18 09:05:39 UTC (rev 17705)
+++ stack/cxf/trunk/pom.xml 2013-06-18 09:54:57 UTC (rev 17706)
@@ -32,7 +32,7 @@
<description>JBossWS CXF stack</description>
- <version>4.2.0-SNAPSHOT</version>
+ <version>4.2.0.CR1</version>
<!-- Parent -->
<parent>
@@ -43,9 +43,9 @@
<!-- Source Control Management -->
<scm>
- <connection>scm:svn:http://anonsvn.jboss.org/repos/jbossws/stack/cxf/trunk</connection>
- <developerConnection>scm:svn:https://svn.jboss.org/repos/jbossws/stack/cxf/trunk</developerConnection>
- <url>http://fisheye.jboss.com/viewrep/JBossWS/stack/cxf/trunk</url>
+ <connection>scm:svn:http://anonsvn.jboss.org/repos/jbossws/stack/cxf/tags/jbossws-cxf...</connection>
+ <developerConnection>scm:svn:https://svn.jboss.org/repos/jbossws/stack/cxf/tags/jbossws-cxf-4....</developerConnection>
+ <url>http://fisheye.jboss.com/viewrep/JBossWS/stack/cxf/tags/jbossws-cxf-4.2.0...</url>
</scm>
<!-- Modules -->
@@ -59,13 +59,13 @@
<!-- Properties -->
<properties>
- <jbossws.api.version>1.0.2-SNAPSHOT</jbossws.api.version>
- <jbossws.spi.version>2.2.0-SNAPSHOT</jbossws.spi.version>
- <jbossws.common.version>2.2.0-SNAPSHOT</jbossws.common.version>
- <jbossws.common.tools.version>1.2.0-SNAPSHOT</jbossws.common.tools.version>
- <jbossws.jboss712.version>4.2.0-SNAPSHOT</jbossws.jboss712.version>
- <jbossws.jboss713.version>4.2.0-SNAPSHOT</jbossws.jboss713.version>
- <jbossws.jboss720.version>4.2.0-SNAPSHOT</jbossws.jboss720.version>
+ <jbossws.api.version>1.0.2.CR1</jbossws.api.version>
+ <jbossws.spi.version>2.2.0.CR1</jbossws.spi.version>
+ <jbossws.common.version>2.2.0.CR1</jbossws.common.version>
+ <jbossws.common.tools.version>1.2.0.CR1</jbossws.common.tools.version>
+ <jbossws.jboss712.version>4.2.0.Beta1</jbossws.jboss712.version>
+ <jbossws.jboss713.version>4.2.0.Beta1</jbossws.jboss713.version>
+ <jbossws.jboss720.version>4.2.0.CR1</jbossws.jboss720.version>
<jbossws.native.version>4.1.1.Final</jbossws.native.version>
<jboss712.version>7.1.2.Final</jboss712.version>
<jboss713.version>7.1.3.Final</jboss713.version>
12 years, 4 months
- 1
- 0
JBossWS SVN: r17705 - common-tools/trunk.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2013-06-18 05:05:39 -0400 (Tue, 18 Jun 2013)
New Revision: 17705
Modified:
common-tools/trunk/pom.xml
Log:
Go ahead with dev
Modified: common-tools/trunk/pom.xml
===================================================================
--- common-tools/trunk/pom.xml 2013-06-18 09:04:29 UTC (rev 17704)
+++ common-tools/trunk/pom.xml 2013-06-18 09:05:39 UTC (rev 17705)
@@ -9,7 +9,7 @@
<packaging>jar</packaging>
<description>JBossWS Common Tools</description>
- <version>1.2.0.CR1</version>
+ <version>1.2.0-SNAPSHOT</version>
<parent>
<groupId>org.jboss.ws</groupId>
@@ -18,14 +18,14 @@
</parent>
<scm>
- <connection>scm:svn:http://anonsvn.jboss.org/repos/jbossws/common-tools/tags/jbossws-...</connection>
- <developerConnection>scm:svn:https://svn.jboss.org/repos/jbossws/common-tools/tags/jbossws-com...</developerConnection>
- <url>http://fisheye.jboss.com/viewrep/JBossWS/common-tools/tags/jbossws-common...</url>
+ <connection>scm:svn:http://anonsvn.jboss.org/repos/jbossws/common-tools/trunk</connection>
+ <developerConnection>scm:svn:https://svn.jboss.org/repos/jbossws/common-tools/trunk</developerConnection>
+ <url>http://fisheye.jboss.com/viewrep/JBossWS/common-tools/trunk</url>
</scm>
<properties>
- <jbossws.api.version>1.0.2.CR1</jbossws.api.version>
- <jbossws.spi.version>2.2.0.CR1</jbossws.spi.version>
+ <jbossws.api.version>1.0.2-SNAPSHOT</jbossws.api.version>
+ <jbossws.spi.version>2.2.0-SNAPSHOT</jbossws.spi.version>
<ant.version>1.7.1</ant.version>
<getopt.version>1.0.13</getopt.version>
<junit.version>3.8.2</junit.version>
12 years, 4 months
- 1
- 0
JBossWS SVN: r17704 - common-tools/tags.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2013-06-18 05:04:29 -0400 (Tue, 18 Jun 2013)
New Revision: 17704
Added:
common-tools/tags/jbossws-common-tools-1.2.0.CR1/
Log:
Tagging jbossws-common-tools-1.2.0.CR1
12 years, 4 months
- 1
- 0