JBossWS SVN: r19374 - in stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test: java/org/jboss/test/ws/jaxws/samples/wsse/policy/trust and 4 other directories.
by jbossws-commits＠lists.jboss.org
Author: asoldano
Date: 2015-01-14 09:22:53 -0500 (Wed, 14 Jan 2015)
New Revision: 19374
Removed:
stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/trust/shared/WSTrustAppUtils.java
Modified:
stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/secconv/SecureConversationTestCase.java
stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/trust/WSTrustTestCase.java
stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/trust/actas/ActAsServiceIface.java
stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/trust/actas/ActAsServiceImpl.java
stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/trust/onbehalfof/OnBehalfOfServiceIface.java
stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/trust/onbehalfof/OnBehalfOfServiceImpl.java
stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/policy/trust/WEB-INF/wsdl/ActAsService_schema1.xsd
stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/policy/trust/WEB-INF/wsdl/OnBehalfOfService_schema1.xsd
Log:
Explicitly pass target host/port to WS-Trust ActAs and OnBehalfOf test endpoints
Modified: stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/secconv/SecureConversationTestCase.java
===================================================================
--- stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/secconv/SecureConversationTestCase.java 2015-01-14 13:43:26 UTC (rev 19373)
+++ stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/secconv/SecureConversationTestCase.java 2015-01-14 14:22:53 UTC (rev 19374)
@@ -94,7 +94,7 @@
public void test() throws Exception
{
QName serviceName = new QName("http://www.jboss.org/jbossws/ws-extensions/wssecuritypolicy", "SecurityService");
- URL wsdlURL = new URL("http://" + getServerHost() + ":8080/jaxws-samples-wsse-policy-secconv/SecureConversationService?wsdl");
+ URL wsdlURL = new URL("http://" + getServerHost() + ":" + getServerPort() + "/jaxws-samples-wsse-policy-secconv/SecureConversationService?wsdl");
Service service = Service.create(wsdlURL, serviceName);
ServiceIface proxy = (ServiceIface)service.getPort(ServiceIface.class);
setupWsse(proxy, true);
Modified: stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/trust/WSTrustTestCase.java
===================================================================
--- stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/trust/WSTrustTestCase.java 2015-01-14 13:43:26 UTC (rev 19373)
+++ stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/trust/WSTrustTestCase.java 2015-01-14 14:22:53 UTC (rev 19374)
@@ -132,7 +132,6 @@
.addClass(org.jboss.test.ws.jaxws.samples.wsse.policy.trust.actas.ActAsServiceIface.class)
.addClass(org.jboss.test.ws.jaxws.samples.wsse.policy.trust.actas.ActAsServiceImpl.class)
.addClass(org.jboss.test.ws.jaxws.samples.wsse.policy.trust.service.ServiceIface.class)
- .addClass(org.jboss.test.ws.jaxws.samples.wsse.policy.trust.shared.WSTrustAppUtils.class)
.addAsWebInfResource(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/samples/wsse/policy/trust/WEB-INF/wsdl/ActAsService.wsdl"), "wsdl/ActAsService.wsdl")
.addAsWebInfResource(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/samples/wsse/policy/trust/WEB-INF/wsdl/ActAsService_schema1.xsd"), "wsdl/ActAsService_schema1.xsd")
.addAsWebInfResource(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/samples/wsse/policy/trust/WEB-INF/actasstore.jks"), "classes/actasstore.jks")
@@ -155,7 +154,6 @@
.addClass(org.jboss.test.ws.jaxws.samples.wsse.policy.trust.onbehalfof.OnBehalfOfServiceIface.class)
.addClass(org.jboss.test.ws.jaxws.samples.wsse.policy.trust.onbehalfof.OnBehalfOfServiceImpl.class)
.addClass(org.jboss.test.ws.jaxws.samples.wsse.policy.trust.service.ServiceIface.class)
- .addClass(org.jboss.test.ws.jaxws.samples.wsse.policy.trust.shared.WSTrustAppUtils.class)
.addAsWebInfResource(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/samples/wsse/policy/trust/WEB-INF/wsdl/OnBehalfOfService.wsdl"), "wsdl/OnBehalfOfService.wsdl")
.addAsWebInfResource(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/samples/wsse/policy/trust/WEB-INF/wsdl/OnBehalfOfService_schema1.xsd"), "wsdl/OnBehalfOfService_schema1.xsd")
.addAsWebInfResource(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/samples/wsse/policy/trust/WEB-INF/actasstore.jks"), "classes/actasstore.jks")
@@ -412,7 +410,7 @@
WSTrustTestUtils.setupWsseAndSTSClientActAs((BindingProvider) proxy, bus);
- assertEquals("ActAs WS-Trust Hello World!", proxy.sayHello());
+ assertEquals("ActAs WS-Trust Hello World!", proxy.sayHello(getServerHost(), String.valueOf(getServerPort())));
}
finally
{
@@ -447,7 +445,7 @@
*/
WSTrustTestUtils.setupWsseAndSTSClientOnBehalfOf((BindingProvider) proxy, bus);
- assertEquals("OnBehalfOf WS-Trust Hello World!", proxy.sayHello());
+ assertEquals("OnBehalfOf WS-Trust Hello World!", proxy.sayHello(getServerHost(), String.valueOf(getServerPort())));
}
finally
{
Modified: stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/trust/actas/ActAsServiceIface.java
===================================================================
--- stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/trust/actas/ActAsServiceIface.java 2015-01-14 13:43:26 UTC (rev 19373)
+++ stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/trust/actas/ActAsServiceIface.java 2015-01-14 14:22:53 UTC (rev 19374)
@@ -35,5 +35,5 @@
public interface ActAsServiceIface
{
@WebMethod
- String sayHello();
+ String sayHello(String host, String port);
}
Modified: stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/trust/actas/ActAsServiceImpl.java
===================================================================
--- stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/trust/actas/ActAsServiceImpl.java 2015-01-14 13:43:26 UTC (rev 19373)
+++ stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/trust/actas/ActAsServiceImpl.java 2015-01-14 14:22:53 UTC (rev 19374)
@@ -21,6 +21,15 @@
*/
package org.jboss.test.ws.jaxws.samples.wsse.policy.trust.actas;
+import java.net.MalformedURLException;
+import java.net.URL;
+import java.util.Map;
+
+import javax.jws.WebService;
+import javax.xml.namespace.QName;
+import javax.xml.ws.BindingProvider;
+import javax.xml.ws.Service;
+
import org.apache.cxf.Bus;
import org.apache.cxf.BusFactory;
import org.apache.cxf.annotations.EndpointProperties;
@@ -28,16 +37,7 @@
import org.apache.cxf.ws.security.SecurityConstants;
import org.apache.cxf.ws.security.trust.STSClient;
import org.jboss.test.ws.jaxws.samples.wsse.policy.trust.service.ServiceIface;
-import org.jboss.test.ws.jaxws.samples.wsse.policy.trust.shared.WSTrustAppUtils;
-import javax.jws.WebService;
-import javax.xml.namespace.QName;
-import javax.xml.ws.BindingProvider;
-import javax.xml.ws.Service;
-import java.net.MalformedURLException;
-import java.net.URL;
-import java.util.Map;
-
/**
* User: rsearls(a)redhat.com
* Date: 1/26/14
@@ -61,12 +61,12 @@
public class ActAsServiceImpl implements ActAsServiceIface
{
- public String sayHello() {
+ public String sayHello(String host, String port) {
Bus bus = BusFactory.newInstance().createBus();
try {
BusFactory.setThreadDefaultBus(bus);
- final String serviceURL = "http://" + WSTrustAppUtils.getServerHost() + ":8080/jaxws-samples-wsse-policy-trust/SecurityService";
+ final String serviceURL = "http://" + host + ":" + port + "/jaxws-samples-wsse-policy-trust/SecurityService";
final QName serviceName = new QName("http://www.jboss.org/jbossws/ws-extensions/wssecuritypolicy", "SecurityService");
final URL wsdlURL = new URL(serviceURL + "?wsdl");
Service service = Service.create(wsdlURL, serviceName);
Modified: stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/trust/onbehalfof/OnBehalfOfServiceIface.java
===================================================================
--- stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/trust/onbehalfof/OnBehalfOfServiceIface.java 2015-01-14 13:43:26 UTC (rev 19373)
+++ stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/trust/onbehalfof/OnBehalfOfServiceIface.java 2015-01-14 14:22:53 UTC (rev 19374)
@@ -35,5 +35,5 @@
public interface OnBehalfOfServiceIface
{
@WebMethod
- String sayHello();
+ String sayHello(String host, String port);
}
Modified: stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/trust/onbehalfof/OnBehalfOfServiceImpl.java
===================================================================
--- stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/trust/onbehalfof/OnBehalfOfServiceImpl.java 2015-01-14 13:43:26 UTC (rev 19373)
+++ stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/trust/onbehalfof/OnBehalfOfServiceImpl.java 2015-01-14 14:22:53 UTC (rev 19374)
@@ -28,7 +28,6 @@
import org.apache.cxf.ws.security.SecurityConstants;
import org.apache.cxf.ws.security.trust.STSClient;
import org.jboss.test.ws.jaxws.samples.wsse.policy.trust.service.ServiceIface;
-import org.jboss.test.ws.jaxws.samples.wsse.policy.trust.shared.WSTrustAppUtils;
import javax.jws.WebService;
import javax.xml.namespace.QName;
@@ -60,12 +59,12 @@
public class OnBehalfOfServiceImpl implements OnBehalfOfServiceIface
{
- public String sayHello() {
+ public String sayHello(String host, String port) {
Bus bus = BusFactory.newInstance().createBus();
try {
BusFactory.setThreadDefaultBus(bus);
- final String serviceURL = "http://" + WSTrustAppUtils.getServerHost() + ":8080/jaxws-samples-wsse-policy-trust/SecurityService";
+ final String serviceURL = "http://" + host + ":" + port + "/jaxws-samples-wsse-policy-trust/SecurityService";
final QName serviceName = new QName("http://www.jboss.org/jbossws/ws-extensions/wssecuritypolicy", "SecurityService");
final URL wsdlURL = new URL(serviceURL + "?wsdl");
Service service = Service.create(wsdlURL, serviceName);
Deleted: stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/trust/shared/WSTrustAppUtils.java
===================================================================
--- stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/trust/shared/WSTrustAppUtils.java 2015-01-14 13:43:26 UTC (rev 19373)
+++ stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/trust/shared/WSTrustAppUtils.java 2015-01-14 14:22:53 UTC (rev 19374)
@@ -1,64 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2012, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file in the
- * distribution for a full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.test.ws.jaxws.samples.wsse.policy.trust.shared;
-
-import java.net.Inet6Address;
-import java.net.InetAddress;
-import java.net.UnknownHostException;
-
-/**
- *
- * User: rsearls
- * Date: 2/5/14
- */
-public class WSTrustAppUtils {
-
- public static String getServerHost() {
- final String host = System.getProperty("jboss.bind.address", "localhost");
- return toIPv6URLFormat(host);
- }
-
- private static String toIPv6URLFormat(final String host)
- {
- try
- {
- if (host.startsWith("[") || host.startsWith(":"))
- {
- if (System.getProperty("java.net.preferIPv4Stack") == null)
- {
- throw new IllegalStateException("always provide java.net.preferIPv4Stack JVM property when using IPv6 address format");
- }
- if (System.getProperty("java.net.preferIPv6Addresses") == null)
- {
- throw new IllegalStateException("always provide java.net.preferIPv6Addresses JVM property when using IPv6 address format");
- }
- }
- final boolean isIPv6Address = InetAddress.getByName(host) instanceof Inet6Address;
- final boolean isIPv6Formatted = isIPv6Address && host.startsWith("[");
- return isIPv6Address && !isIPv6Formatted ? "[" + host + "]" : host;
- }
- catch (final UnknownHostException e)
- {
- throw new RuntimeException(e);
- }
- }
-}
Modified: stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/policy/trust/WEB-INF/wsdl/ActAsService_schema1.xsd
===================================================================
--- stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/policy/trust/WEB-INF/wsdl/ActAsService_schema1.xsd 2015-01-14 13:43:26 UTC (rev 19373)
+++ stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/policy/trust/WEB-INF/wsdl/ActAsService_schema1.xsd 2015-01-14 14:22:53 UTC (rev 19374)
@@ -8,7 +8,10 @@
<xs:element name="sayHelloResponse" type="tns:sayHelloResponse"/>
<xs:complexType name="sayHello">
- <xs:sequence/>
+ <xs:sequence>
+ <xs:element name="host" type="xs:string" minOccurs="0"/>
+ <xs:element name="port" type="xs:string" minOccurs="0"/>
+ </xs:sequence>
</xs:complexType>
<xs:complexType name="sayHelloResponse">
Modified: stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/policy/trust/WEB-INF/wsdl/OnBehalfOfService_schema1.xsd
===================================================================
--- stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/policy/trust/WEB-INF/wsdl/OnBehalfOfService_schema1.xsd 2015-01-14 13:43:26 UTC (rev 19373)
+++ stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/policy/trust/WEB-INF/wsdl/OnBehalfOfService_schema1.xsd 2015-01-14 14:22:53 UTC (rev 19374)
@@ -8,7 +8,10 @@
<xs:element name="sayHelloResponse" type="tns:sayHelloResponse"/>
<xs:complexType name="sayHello">
- <xs:sequence/>
+ <xs:sequence>
+ <xs:element name="host" type="xs:string" minOccurs="0"/>
+ <xs:element name="port" type="xs:string" minOccurs="0"/>
+ </xs:sequence>
</xs:complexType>
<xs:complexType name="sayHelloResponse">
9 years, 3 months
- 1
- 0
JBossWS SVN: r19373 - in stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test: java/org/jboss/test/ws/jaxws/jbws1807 and 24 other directories.
by jbossws-commits＠lists.jboss.org
Author: asoldano
Date: 2015-01-14 08:43:26 -0500 (Wed, 14 Jan 2015)
New Revision: 19373
Modified:
stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws1582/JBWS1582TestCase.java
stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws1807/JBWS1807TestCase.java
stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2978/JBWS2978TestCase.java
stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/resources/jaxws/holder/META-INF/wsdl/HolderService.wsdl
stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/resources/jaxws/jbws1581/META-INF/wsdl/TestService.wsdl
stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/resources/jaxws/jbws1841/META-INF/wsdl/TestService.wsdl
stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/resources/jaxws/jbws1969/META-INF/wsdl/echo/TestService.wsdl
stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/resources/jaxws/jbws2307/WEB-INF-client/wsdl/HelloService.wsdl
stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/resources/jaxws/jbws2307/WEB-INF-service/wsdl/HelloService.wsdl
stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/resources/jaxws/jbws2412/WEB-INF/wsdl/TestService.wsdl
stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/resources/jaxws/jbws2419/WEB-INF/wsdl/SOAP12Service.wsdl
stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/resources/jaxws/jbws2449/META-INF/wsdl/test.wsdl
stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/resources/jaxws/jbws2527/WEB-INF-client/wsdl/HelloService.wsdl
stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/resources/jaxws/jbws2527/WEB-INF-service/wsdl/HelloService.wsdl
stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/resources/jaxws/jbws2591/wsdl/JBWS2591TestService.wsdl
stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/resources/jaxws/jbws2957/WEB-INF/wsdl/HelloService.wsdl
stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/resources/jaxws/jbws3223/WEB-INF/wsdl/TestService.wsdl
stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/resources/jaxws/jbws3401/WEB-INF/wsdl/TestService.wsdl
stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/resources/jaxws/samples/addressing/META-INF/wsdl/TestService.wsdl
stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/resources/jaxws/samples/advanced/retail/META-INF/wsdl/CCVerificationService.wsdl
stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/resources/jaxws/samples/advanced/retail/META-INF/wsdl/OrderMgmtService.wsdl
stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/resources/jaxws/samples/advanced/retail/META-INF/wsdl/ProfileMgmtService.wsdl
stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/resources/jaxws/samples/asynchronous/WEB-INF/wsdl/TestService.wsdl
stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/resources/jaxws/samples/serviceref/META-INF/wsdl/Endpoint.wsdl
stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/resources/jaxws/samples/webparam/META-INF/wsdl/PingService.wsdl
stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/resources/jaxws/samples/webresult/META-INF/wsdl/CustomerService.wsdl
stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/resources/jaxws/samples/webserviceref/META-INF/wsdl/Endpoint.wsdl
stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/resources/jaxws/samples/webserviceref/META-INF/wsdl/MultipleEndpoint.wsdl
stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/resources/jaxws/samples/webservicerefsec/WEB-INF/wsdl/Endpoint.wsdl
Log:
Use maven-resources-plugin filter to avoid hardcoding port numbers including offsets
Modified: stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws1582/JBWS1582TestCase.java
===================================================================
--- stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws1582/JBWS1582TestCase.java 2015-01-14 11:53:20 UTC (rev 19372)
+++ stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws1582/JBWS1582TestCase.java 2015-01-14 13:43:26 UTC (rev 19373)
@@ -158,7 +158,6 @@
// send an HTTP request to the endpoint
out.write(("POST /jaxws-jbws1582/TestService HTTP/1.0" + CRNL).getBytes());
- //out.write(("Host: " + getServerHost() + ":8080" + CRNL).getBytes());
out.write(("Host: " + getServerHost() + ":" + getServerPort() + CRNL).getBytes());
out.write(("Content-Type: text/xml" + CRNL).getBytes());
out.write(("Content-Length: " + content.length() + CRNL).getBytes());
Modified: stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws1807/JBWS1807TestCase.java
===================================================================
--- stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws1807/JBWS1807TestCase.java 2015-01-14 11:53:20 UTC (rev 19372)
+++ stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws1807/JBWS1807TestCase.java 2015-01-14 13:43:26 UTC (rev 19373)
@@ -56,8 +56,6 @@
@RunWith(Arquillian.class)
public class JBWS1807TestCase extends JBossWSTest
{
- //public final String TARGET_ENDPOINT_ADDRESS = "http://" + getServerHost() + ":8080/jaxws-jbws1807";
-
@ArquillianResource
private URL baseURL;
Modified: stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2978/JBWS2978TestCase.java
===================================================================
--- stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2978/JBWS2978TestCase.java 2015-01-14 11:53:20 UTC (rev 19372)
+++ stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2978/JBWS2978TestCase.java 2015-01-14 13:43:26 UTC (rev 19373)
@@ -71,7 +71,7 @@
public void setUp() throws Exception
{
super.setUp();
- URL wsdlURL = new URL("http://" + getServerHost() + ":8080/jaxws-jbws2978" + "?wsdl");
+ URL wsdlURL = new URL("http://" + getServerHost() + ":" + getServerPort() + "/jaxws-jbws2978" + "?wsdl");
QName serviceName = new QName("http://ws.jboss.org", "AddNumbers");
service = Service.create(wsdlURL, serviceName);
}
@@ -81,7 +81,7 @@
public void testCall() throws Exception
{
setUp();
- String text = "http://" + getServerHost() + ":8080/jaxws-jbws2978";
+ String text = "http://" + getServerHost() + ":" + getServerPort() + "/jaxws-jbws2978";
String requestMessage = "<S:Envelope xmlns:S='http://schemas.xmlsoap.org/soap/envelope/'><S:Header><To xmlns='http://www.w3.org/2005/08/addressing'>"
+ text
+ "</To><Action xmlns='http://www.w3.org/2005/08/addressing'>inputAction</Action>"
Modified: stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/resources/jaxws/holder/META-INF/wsdl/HolderService.wsdl
===================================================================
--- stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/resources/jaxws/holder/META-INF/wsdl/HolderService.wsdl 2015-01-14 11:53:20 UTC (rev 19372)
+++ stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/resources/jaxws/holder/META-INF/wsdl/HolderService.wsdl 2015-01-14 13:43:26 UTC (rev 19373)
@@ -193,7 +193,7 @@
</binding>
<service name='HolderService'>
<port binding='tns:HolderBinding' name='HolderPort'>
- <soap:address location='http://@jboss.bind.address@:38080/jaxws-holder/HolderService'/>
+ <soap:address location='http://@jboss.bind.address@:@add_int(port-offset.shared-tests.jboss,8080)@/jaxws-holder/HolderService'/>
</port>
</service>
</definitions>
Modified: stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/resources/jaxws/jbws1581/META-INF/wsdl/TestService.wsdl
===================================================================
--- stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/resources/jaxws/jbws1581/META-INF/wsdl/TestService.wsdl 2015-01-14 11:53:20 UTC (rev 19372)
+++ stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/resources/jaxws/jbws1581/META-INF/wsdl/TestService.wsdl 2015-01-14 13:43:26 UTC (rev 19373)
@@ -27,7 +27,7 @@
</binding>
<service name='EndpointService'>
<port binding='tns:EndpointBeanBinding' name='EndpointBeanPort'>
- <soap:address location='http://@jboss.bind.address@:38080/jaxws-jbws1581-pojo'/>
+ <soap:address location='http://@jboss.bind.address@:@add_int(port-offset.shared-tests.jboss,8080)@/jaxws-jbws1581-pojo'/>
</port>
</service>
</definitions>
Modified: stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/resources/jaxws/jbws1841/META-INF/wsdl/TestService.wsdl
===================================================================
--- stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/resources/jaxws/jbws1841/META-INF/wsdl/TestService.wsdl 2015-01-14 11:53:20 UTC (rev 19372)
+++ stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/resources/jaxws/jbws1841/META-INF/wsdl/TestService.wsdl 2015-01-14 13:43:26 UTC (rev 19373)
@@ -33,7 +33,7 @@
<service name='EndpointService'>
<port binding='tns:EndpointInterfaceBinding' name='EJB3BeanPort'>
- <soap:address location='http://@jboss.bind.address@:38080/jaxws-jbws1841/EndpointService/EJB3Bean'/>
+ <soap:address location='http://@jboss.bind.address@:@add_int(port-offset.shared-tests.jboss,8080)@/jaxws-jbws1841/EndpointService/EJB3Bean'/>
</port>
</service>
</definitions>
Modified: stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/resources/jaxws/jbws1969/META-INF/wsdl/echo/TestService.wsdl
===================================================================
--- stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/resources/jaxws/jbws1969/META-INF/wsdl/echo/TestService.wsdl 2015-01-14 11:53:20 UTC (rev 19372)
+++ stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/resources/jaxws/jbws1969/META-INF/wsdl/echo/TestService.wsdl 2015-01-14 13:43:26 UTC (rev 19373)
@@ -38,7 +38,7 @@
</binding>
<service name='EndpointService'>
<port binding='tns:EndpointBinding' name='EndpointPort'>
- <soap:address location='http://127.0.0.1:38080/jaxws-jbws1969'/>
+ <soap:address location='http://127.0.0.1:@add_int(port-offset.shared-tests.jboss,8080)@/jaxws-jbw...'/>
</port>
</service>
</definitions>
Modified: stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/resources/jaxws/jbws2307/WEB-INF-client/wsdl/HelloService.wsdl
===================================================================
--- stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/resources/jaxws/jbws2307/WEB-INF-client/wsdl/HelloService.wsdl 2015-01-14 11:53:20 UTC (rev 19372)
+++ stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/resources/jaxws/jbws2307/WEB-INF-client/wsdl/HelloService.wsdl 2015-01-14 13:43:26 UTC (rev 19373)
@@ -71,4 +71,4 @@
</binding>
<service name="HelloService">
<port name="HelloPort" binding="tns:HelloBinding">
- <soap:address location="http://@jboss.bind.address@:38080/jaxws-jbws2307-service/jaxws/Hello"/></port></service></definitions>
+ <soap:address location="http://@jboss.bind.address@:@add_int(port-offset.shared-tests.jboss,8080)@/jaxws-jbws2307-service/jaxws/Hello"/></port></service></definitions>
Modified: stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/resources/jaxws/jbws2307/WEB-INF-service/wsdl/HelloService.wsdl
===================================================================
--- stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/resources/jaxws/jbws2307/WEB-INF-service/wsdl/HelloService.wsdl 2015-01-14 11:53:20 UTC (rev 19372)
+++ stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/resources/jaxws/jbws2307/WEB-INF-service/wsdl/HelloService.wsdl 2015-01-14 13:43:26 UTC (rev 19373)
@@ -71,4 +71,4 @@
</binding>
<service name="HelloService">
<port name="HelloPort" binding="tns:HelloBinding">
- <soap:address location="http://@jboss.bind.address@:38080/jaxws-jbws2307-service/jaxws/Hello"/></port></service></definitions>
+ <soap:address location="http://@jboss.bind.address@:@add_int(port-offset.shared-tests.jboss,8080)@/jaxws-jbws2307-service/jaxws/Hello"/></port></service></definitions>
Modified: stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/resources/jaxws/jbws2412/WEB-INF/wsdl/TestService.wsdl
===================================================================
--- stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/resources/jaxws/jbws2412/WEB-INF/wsdl/TestService.wsdl 2015-01-14 11:53:20 UTC (rev 19372)
+++ stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/resources/jaxws/jbws2412/WEB-INF/wsdl/TestService.wsdl 2015-01-14 13:43:26 UTC (rev 19373)
@@ -45,7 +45,7 @@
</binding>
<service name='TestEndpointService'>
<port binding='tns:TestEndpointBinding' name='TestEndpointPort'>
- <soap:address location='http://127.0.0.1:38080/jaxws-jbws2412'/>
+ <soap:address location='http://127.0.0.1:@add_int(port-offset.shared-tests.jboss,8080)@/jaxws-jbw...'/>
</port>
</service>
</definitions>
Modified: stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/resources/jaxws/jbws2419/WEB-INF/wsdl/SOAP12Service.wsdl
===================================================================
--- stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/resources/jaxws/jbws2419/WEB-INF/wsdl/SOAP12Service.wsdl 2015-01-14 11:53:20 UTC (rev 19372)
+++ stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/resources/jaxws/jbws2419/WEB-INF/wsdl/SOAP12Service.wsdl 2015-01-14 13:43:26 UTC (rev 19373)
@@ -32,7 +32,7 @@
</binding>
<service name="SOAP12EndpointBeanService">
<port name="SOAP12EndpointPort" binding="tns:SOAP12EndpointBinding">
- <soap12:address location="http://127.0.0.1:38080/jaxws-jbws2419/soap12"/>
+ <soap12:address location="http://127.0.0.1:@add_int(port-offset.shared-tests.jboss,8080)@/jaxws-jbw..."/>
</port>
</service>
</definitions>
Modified: stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/resources/jaxws/jbws2449/META-INF/wsdl/test.wsdl
===================================================================
--- stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/resources/jaxws/jbws2449/META-INF/wsdl/test.wsdl 2015-01-14 11:53:20 UTC (rev 19372)
+++ stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/resources/jaxws/jbws2449/META-INF/wsdl/test.wsdl 2015-01-14 13:43:26 UTC (rev 19373)
@@ -48,7 +48,7 @@
</binding>
<service name='EndpointService'>
<port binding='tns:EndpointBinding' name='EndpointPort'>
- <soap:address location='http://127.0.0.1:38080/jaxws-jbws2449'/>
+ <soap:address location='http://127.0.0.1:@add_int(port-offset.shared-tests.jboss,8080)@/jaxws-jbw...'/>
</port>
</service>
</definitions>
Modified: stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/resources/jaxws/jbws2527/WEB-INF-client/wsdl/HelloService.wsdl
===================================================================
--- stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/resources/jaxws/jbws2527/WEB-INF-client/wsdl/HelloService.wsdl 2015-01-14 11:53:20 UTC (rev 19372)
+++ stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/resources/jaxws/jbws2527/WEB-INF-client/wsdl/HelloService.wsdl 2015-01-14 13:43:26 UTC (rev 19373)
@@ -71,4 +71,4 @@
</binding>
<service name="HelloService">
<port name="HelloPort" binding="tns:HelloBinding">
- <soap:address location="http://@jboss.bind.address@:38080/jaxws-jbws2527-service/jaxws/Hello"/></port></service></definitions>
+ <soap:address location="http://@jboss.bind.address@:@add_int(port-offset.shared-tests.jboss,8080)@/jaxws-jbws2527-service/jaxws/Hello"/></port></service></definitions>
Modified: stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/resources/jaxws/jbws2527/WEB-INF-service/wsdl/HelloService.wsdl
===================================================================
--- stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/resources/jaxws/jbws2527/WEB-INF-service/wsdl/HelloService.wsdl 2015-01-14 11:53:20 UTC (rev 19372)
+++ stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/resources/jaxws/jbws2527/WEB-INF-service/wsdl/HelloService.wsdl 2015-01-14 13:43:26 UTC (rev 19373)
@@ -71,4 +71,4 @@
</binding>
<service name="HelloService">
<port name="HelloPort" binding="tns:HelloBinding">
- <soap:address location="http://@jboss.bind.address@:38080/jaxws-jbws2527-service/jaxws/Hello"/></port></service></definitions>
+ <soap:address location="http://@jboss.bind.address@:@add_int(port-offset.shared-tests.jboss,8080)@/jaxws-jbws2527-service/jaxws/Hello"/></port></service></definitions>
Modified: stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/resources/jaxws/jbws2591/wsdl/JBWS2591TestService.wsdl
===================================================================
--- stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/resources/jaxws/jbws2591/wsdl/JBWS2591TestService.wsdl 2015-01-14 11:53:20 UTC (rev 19372)
+++ stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/resources/jaxws/jbws2591/wsdl/JBWS2591TestService.wsdl 2015-01-14 13:43:26 UTC (rev 19373)
@@ -31,7 +31,7 @@
</binding>
<service name="MarshallTestService">
<port name="MarshallTestPort2" binding="tns:NewSchemaTestSoapBinding">
- <soap:address location="http://@jboss.bind.address@:38080/W2JDLMarshallTest/jaxws/NewSchemaTest" />
+ <soap:address location="http://@jboss.bind.address@:@add_int(port-offset.shared-tests.jboss,8080)@/W2JDLMarshallTest/jaxws/NewSchemaTest" />
</port>
</service>
</definitions>
Modified: stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/resources/jaxws/jbws2957/WEB-INF/wsdl/HelloService.wsdl
===================================================================
--- stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/resources/jaxws/jbws2957/WEB-INF/wsdl/HelloService.wsdl 2015-01-14 11:53:20 UTC (rev 19372)
+++ stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/resources/jaxws/jbws2957/WEB-INF/wsdl/HelloService.wsdl 2015-01-14 13:43:26 UTC (rev 19373)
@@ -25,7 +25,7 @@
</binding>
<service name="Service">
<port binding="tns:HelloIfaceBinding" name="HelloImplPort">
- <soap:address location="http://@jboss.bind.address@:38080/foo/bar"/>
+ <soap:address location="http://@jboss.bind.address@:@add_int(port-offset.shared-tests.jboss,8080)@/foo/bar"/>
</port>
</service>
</definitions>
Modified: stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/resources/jaxws/jbws3223/WEB-INF/wsdl/TestService.wsdl
===================================================================
--- stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/resources/jaxws/jbws3223/WEB-INF/wsdl/TestService.wsdl 2015-01-14 11:53:20 UTC (rev 19372)
+++ stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/resources/jaxws/jbws3223/WEB-INF/wsdl/TestService.wsdl 2015-01-14 13:43:26 UTC (rev 19373)
@@ -29,7 +29,7 @@
</binding>
<service name="EndpointService">
<port name="EndpointInterfacePort" binding="tns:EndpointInterfaceBinding">
- <soap:address location="http://@jboss.bind.address@:38080/jaxws-jbws3223"/>
+ <soap:address location="http://@jboss.bind.address@:@add_int(port-offset.shared-tests.jboss,8080)@/jaxws-jbws3223"/>
</port>
</service>
</definitions>
Modified: stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/resources/jaxws/jbws3401/WEB-INF/wsdl/TestService.wsdl
===================================================================
--- stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/resources/jaxws/jbws3401/WEB-INF/wsdl/TestService.wsdl 2015-01-14 11:53:20 UTC (rev 19372)
+++ stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/resources/jaxws/jbws3401/WEB-INF/wsdl/TestService.wsdl 2015-01-14 13:43:26 UTC (rev 19373)
@@ -45,7 +45,7 @@
</binding>
<service name='TestEndpointService'>
<port binding='tns:TestEndpointBinding' name='TestEndpointPort'>
- <soap:address location='http://127.0.0.1:38080/jaxws-jbws3401'/>
+ <soap:address location='http://127.0.0.1:@add_int(port-offset.shared-tests.jboss,8080)@/jaxws-jbw...'/>
</port>
</service>
</definitions>
Modified: stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/resources/jaxws/samples/addressing/META-INF/wsdl/TestService.wsdl
===================================================================
--- stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/resources/jaxws/samples/addressing/META-INF/wsdl/TestService.wsdl 2015-01-14 11:53:20 UTC (rev 19372)
+++ stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/resources/jaxws/samples/addressing/META-INF/wsdl/TestService.wsdl 2015-01-14 13:43:26 UTC (rev 19373)
@@ -56,7 +56,7 @@
</binding>
<service name='TestService'>
<port binding='tns:StatefulEndpointBinding' name='StatefulEndpointPort'>
- <soap:address location='http://@jboss.bind.address@:38080/jaxws-samples-wsaddressing/TestService'/>
+ <soap:address location='http://@jboss.bind.address@:@add_int(port-offset.shared-tests.jboss,8080)@/jaxws-samples-wsaddressing/TestService'/>
</port>
</service>
</definitions>
Modified: stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/resources/jaxws/samples/advanced/retail/META-INF/wsdl/CCVerificationService.wsdl
===================================================================
--- stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/resources/jaxws/samples/advanced/retail/META-INF/wsdl/CCVerificationService.wsdl 2015-01-14 11:53:20 UTC (rev 19372)
+++ stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/resources/jaxws/samples/advanced/retail/META-INF/wsdl/CCVerificationService.wsdl 2015-01-14 13:43:26 UTC (rev 19373)
@@ -41,7 +41,7 @@
</binding>
<service name="CCVerificationService">
<port binding="tns:CCVerificationBinding" name="CCVerificationPort">
- <soap:address location="http://@jboss.bind.address@:38080/jaxws-samples-retail/CCVerificationBean"/>
+ <soap:address location="http://@jboss.bind.address@:@add_int(port-offset.shared-tests.jboss,8080)@/jaxws-samples-retail/CCVerificationBean"/>
</port>
</service>
</definitions>
Modified: stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/resources/jaxws/samples/advanced/retail/META-INF/wsdl/OrderMgmtService.wsdl
===================================================================
--- stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/resources/jaxws/samples/advanced/retail/META-INF/wsdl/OrderMgmtService.wsdl 2015-01-14 11:53:20 UTC (rev 19372)
+++ stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/resources/jaxws/samples/advanced/retail/META-INF/wsdl/OrderMgmtService.wsdl 2015-01-14 13:43:26 UTC (rev 19373)
@@ -59,7 +59,7 @@
</binding>
<service name="OrderMgmtService">
<port binding="tns:OrderMgmtBinding" name="OrderMgmtPort">
- <soap:address location="http://@jboss.bind.address@:38080/jaxws-samples-retail/OrderMgmtService/OrderMgmtBean"/>
+ <soap:address location="http://@jboss.bind.address@:@add_int(port-offset.shared-tests.jboss,8080)@/jaxws-samples-retail/OrderMgmtService/OrderMgmtBean"/>
</port>
</service>
</definitions>
Modified: stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/resources/jaxws/samples/advanced/retail/META-INF/wsdl/ProfileMgmtService.wsdl
===================================================================
--- stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/resources/jaxws/samples/advanced/retail/META-INF/wsdl/ProfileMgmtService.wsdl 2015-01-14 11:53:20 UTC (rev 19372)
+++ stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/resources/jaxws/samples/advanced/retail/META-INF/wsdl/ProfileMgmtService.wsdl 2015-01-14 13:43:26 UTC (rev 19373)
@@ -52,7 +52,7 @@
</binding>
<service name='ProfileMgmtService'>
<port binding='tns:ProfileMgmtBinding' name='ProfileMgmtPort'>
- <soap:address location='http://@jboss.bind.address@:38080/jaxws-samples-retail/ProfileMgmtService/ProfileMgmtBean'/>
+ <soap:address location='http://@jboss.bind.address@:@add_int(port-offset.shared-tests.jboss,8080)@/jaxws-samples-retail/ProfileMgmtService/ProfileMgmtBean'/>
</port>
</service>
</definitions>
Modified: stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/resources/jaxws/samples/asynchronous/WEB-INF/wsdl/TestService.wsdl
===================================================================
--- stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/resources/jaxws/samples/asynchronous/WEB-INF/wsdl/TestService.wsdl 2015-01-14 11:53:20 UTC (rev 19372)
+++ stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/resources/jaxws/samples/asynchronous/WEB-INF/wsdl/TestService.wsdl 2015-01-14 13:43:26 UTC (rev 19373)
@@ -38,7 +38,7 @@
</binding>
<service name='EndpointService'>
<port binding='tns:EndpointBinding' name='EndpointPort'>
- <soap:address location='http://tdvaio:38080/jaxws-samples-asynchronous/Endpoint'/>
+ <soap:address location='http://tdvaio:@add_int(port-offset.shared-tests.jboss,8080)@/jaxws-sample...'/>
</port>
</service>
</definitions>
Modified: stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/resources/jaxws/samples/serviceref/META-INF/wsdl/Endpoint.wsdl
===================================================================
--- stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/resources/jaxws/samples/serviceref/META-INF/wsdl/Endpoint.wsdl 2015-01-14 11:53:20 UTC (rev 19372)
+++ stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/resources/jaxws/samples/serviceref/META-INF/wsdl/Endpoint.wsdl 2015-01-14 13:43:26 UTC (rev 19373)
@@ -26,7 +26,7 @@
</binding>
<service name='EndpointService'>
<port binding='tns:EndpointBinding' name='EndpointPort'>
- <soap:address location='http://@jboss.bind.address@:38080/jaxws-samples-serviceref'/>
+ <soap:address location='http://@jboss.bind.address@:@add_int(port-offset.shared-tests.jboss,8080)@/jaxws-samples-serviceref'/>
</port>
</service>
</definitions>
\ No newline at end of file
Modified: stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/resources/jaxws/samples/webparam/META-INF/wsdl/PingService.wsdl
===================================================================
--- stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/resources/jaxws/samples/webparam/META-INF/wsdl/PingService.wsdl 2015-01-14 11:53:20 UTC (rev 19372)
+++ stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/resources/jaxws/samples/webparam/META-INF/wsdl/PingService.wsdl 2015-01-14 13:43:26 UTC (rev 19373)
@@ -89,7 +89,7 @@
<service name='PingServiceService'>
<port binding='tns:PingServiceBinding' name='PingServicePort'>
- <soap:address location='http://@jboss.bind.address@:38080/jaxws-samples-webparam'/>
+ <soap:address location='http://@jboss.bind.address@:@add_int(port-offset.shared-tests.jboss,8080)@/jaxws-samples-webparam'/>
</port>
</service>
</definitions>
Modified: stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/resources/jaxws/samples/webresult/META-INF/wsdl/CustomerService.wsdl
===================================================================
--- stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/resources/jaxws/samples/webresult/META-INF/wsdl/CustomerService.wsdl 2015-01-14 11:53:20 UTC (rev 19372)
+++ stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/resources/jaxws/samples/webresult/META-INF/wsdl/CustomerService.wsdl 2015-01-14 13:43:26 UTC (rev 19373)
@@ -47,7 +47,7 @@
<service name='CustomerServiceService'>
<port binding='tns:CustomerServiceBinding' name='CustomerServicePort'>
- <soap:address location='http://@jboss.bind.address@:38080/jaxws-samples-webresult'/>
+ <soap:address location='http://@jboss.bind.address@:@add_int(port-offset.shared-tests.jboss,8080)@/jaxws-samples-webresult'/>
</port>
</service>
</definitions>
Modified: stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/resources/jaxws/samples/webserviceref/META-INF/wsdl/Endpoint.wsdl
===================================================================
--- stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/resources/jaxws/samples/webserviceref/META-INF/wsdl/Endpoint.wsdl 2015-01-14 11:53:20 UTC (rev 19372)
+++ stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/resources/jaxws/samples/webserviceref/META-INF/wsdl/Endpoint.wsdl 2015-01-14 13:43:26 UTC (rev 19373)
@@ -32,7 +32,7 @@
<service name='EndpointService'>
<port binding='tns:EndpointBinding' name='EndpointPort'>
- <soap:address location='http://@jboss.bind.address@:38080/jaxws-samples-webserviceref'/>
+ <soap:address location='http://@jboss.bind.address@:@add_int(port-offset.shared-tests.jboss,8080)@/jaxws-samples-webserviceref'/>
</port>
</service>
Modified: stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/resources/jaxws/samples/webserviceref/META-INF/wsdl/MultipleEndpoint.wsdl
===================================================================
--- stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/resources/jaxws/samples/webserviceref/META-INF/wsdl/MultipleEndpoint.wsdl 2015-01-14 11:53:20 UTC (rev 19372)
+++ stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/resources/jaxws/samples/webserviceref/META-INF/wsdl/MultipleEndpoint.wsdl 2015-01-14 13:43:26 UTC (rev 19373)
@@ -45,10 +45,10 @@
<service name='EndpointService'>
<port binding='tns:EndpointBinding' name='EndpointPort'>
- <soap:address location='http://@jboss.bind.address@:38080/jaxws-samples-webserviceref'/>
+ <soap:address location='http://@jboss.bind.address@:@add_int(port-offset.shared-tests.jboss,8080)@/jaxws-samples-webserviceref'/>
</port>
<port binding='tns:EndpointBinding2' name='EndpointPort2'>
- <soap:address location='http://@jboss.bind.address@:38080/jaxws-samples-webserviceref'/>
+ <soap:address location='http://@jboss.bind.address@:@add_int(port-offset.shared-tests.jboss,8080)@/jaxws-samples-webserviceref'/>
</port>
</service>
Modified: stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/resources/jaxws/samples/webservicerefsec/WEB-INF/wsdl/Endpoint.wsdl
===================================================================
--- stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/resources/jaxws/samples/webservicerefsec/WEB-INF/wsdl/Endpoint.wsdl 2015-01-14 11:53:20 UTC (rev 19372)
+++ stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/resources/jaxws/samples/webservicerefsec/WEB-INF/wsdl/Endpoint.wsdl 2015-01-14 13:43:26 UTC (rev 19373)
@@ -29,7 +29,7 @@
<service name='EndpointService'>
<port binding='tns:EndpointBinding' name='EndpointPort'>
- <soap:address location='http://@jboss.bind.address@:38080/jaxws-samples-webservicerefsec'/>
+ <soap:address location='http://@jboss.bind.address@:@add_int(port-offset.shared-tests.jboss,8080)@/jaxws-samples-webservicerefsec'/>
</port>
</service>
9 years, 3 months
- 1
- 0
JBossWS SVN: r19372 - maven/parent/trunk.
by jbossws-commits＠lists.jboss.org
Author: asoldano
Date: 2015-01-14 06:53:20 -0500 (Wed, 14 Jan 2015)
New Revision: 19372
Modified:
maven/parent/trunk/pom.xml
Log:
Updating maven-resources-plugin and maven-surefire-plugin
Modified: maven/parent/trunk/pom.xml
===================================================================
--- maven/parent/trunk/pom.xml 2015-01-14 11:43:33 UTC (rev 19371)
+++ maven/parent/trunk/pom.xml 2015-01-14 11:53:20 UTC (rev 19372)
@@ -159,11 +159,11 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
- <version>2.11</version>
+ <version>2.13</version>
</plugin>
<plugin>
<artifactId>maven-resources-plugin</artifactId>
- <version>2.4.3</version>
+ <version>2.5</version>
</plugin>
</plugins>
</pluginManagement>
9 years, 3 months
- 1
- 0
JBossWS SVN: r19371 - in stack/cxf/branches/arquillian/modules/testsuite: cxf-tests/src/test/etc and 4 other directories.
by jbossws-commits＠lists.jboss.org
Author: asoldano
Date: 2015-01-14 06:43:33 -0500 (Wed, 14 Jan 2015)
New Revision: 19371
Modified:
stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/etc/arquillian.xml
stack/cxf/branches/arquillian/modules/testsuite/pom.xml
stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/etc/arquillian.xml
stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/resources/jaxws/complex/META-INF/wsdl/RegistrationService.wsdl
stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/resources/jaxws/jbws3140/wsdl/TestEndpoint.wsdl
stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/resources/saaj/jbws3084/WEB-INF/wsdl/SaajService.wsdl
Log:
Initial changes for using the custom maven-resources-plugin filter extension to automatically sum port numbers with proper port offsets and avoid manually keeping in sych port numbers in the various descriptors
Modified: stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/etc/arquillian.xml
===================================================================
--- stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/etc/arquillian.xml 2015-01-14 11:39:24 UTC (rev 19370)
+++ stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/etc/arquillian.xml 2015-01-14 11:43:33 UTC (rev 19371)
@@ -25,9 +25,9 @@
<property name="allowConnectingToRunningServer">true</property>
<property name="managementAddress">${jboss.bind.address:localhost}</property>
<property name="jbossArguments">${jbossArguments}</property>
- <property name="managementPort">${as.managementPort:19990}</property> <!-- Keep in sync with the port-offset -->
+ <property name="managementPort">${add_int(port-offset.cxf-tests.ssl-mutual-auth,9990)}</property>
<!-- AS7-4070 -->
- <property name="waitForPorts">${as.debug.port:18787} ${as.managementPort:19990}</property> <!-- Keep in sync with the port-offset -->
+ <property name="waitForPorts">${add_int(port-offset.cxf-tests.ssl-mutual-auth,8787)} ${add_int(port-offset.cxf-tests.ssl-mutual-auth,9990)}</property>
<property name="waitForPortsTimeoutInSeconds">8</property>
</configuration>
</container>
@@ -39,9 +39,9 @@
<property name="allowConnectingToRunningServer">true</property>
<property name="managementAddress">${jboss.bind.address:localhost}</property>
<property name="jbossArguments">${jbossArguments}</property>
- <property name="managementPort">${as.managementPort:29990}</property> <!-- Keep in sync with the port-offset -->
+ <property name="managementPort">${add_int(port-offset.cxf-tests.default-config-tests,9990)}</property>
<!-- AS7-4070 -->
- <property name="waitForPorts">${as.debug.port:28787} ${as.managementPort:29990}</property> <!-- Keep in sync with the port-offset -->
+ <property name="waitForPorts">${add_int(port-offset.cxf-tests.default-config-tests,8787)} ${add_int(port-offset.cxf-tests.default-config-tests,9990)}</property>
<property name="waitForPortsTimeoutInSeconds">8</property>
</configuration>
</container>
Modified: stack/cxf/branches/arquillian/modules/testsuite/pom.xml
===================================================================
--- stack/cxf/branches/arquillian/modules/testsuite/pom.xml 2015-01-14 11:39:24 UTC (rev 19370)
+++ stack/cxf/branches/arquillian/modules/testsuite/pom.xml 2015-01-14 11:43:33 UTC (rev 19371)
@@ -30,6 +30,7 @@
<org.slf4j.version>1.6.1</org.slf4j.version>
<gnu.getopt.version>1.0.13</gnu.getopt.version>
<bc.version>1.49</bc.version>
+ <resources-plugin-filters.version>1.0.0-SNAPSHOT</resources-plugin-filters.version>
<log4j.version>1.2.14</log4j.version>
<port-offset.cxf-tests.jboss>0</port-offset.cxf-tests.jboss>
<port-offset.cxf-tests.ssl-mutual-auth>10000</port-offset.cxf-tests.ssl-mutual-auth>
@@ -183,6 +184,23 @@
</testResources>
<plugins>
<plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-resources-plugin</artifactId>
+ <configuration>
+ <encoding>UTF-8</encoding>
+ <mavenFilteringHints>
+ <mavenFilteringHint>custom</mavenFilteringHint>
+ </mavenFilteringHints>
+ </configuration>
+ <dependencies>
+ <dependency>
+ <groupId>org.jboss.ws.plugins</groupId>
+ <artifactId>resources-plugin-filters</artifactId>
+ <version>${resources-plugin-filters.version}</version>
+ </dependency>
+ </dependencies>
+ </plugin>
+ <plugin>
<artifactId>maven-dependency-plugin</artifactId>
<executions>
<execution>
Modified: stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/etc/arquillian.xml
===================================================================
--- stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/etc/arquillian.xml 2015-01-14 11:39:24 UTC (rev 19370)
+++ stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/etc/arquillian.xml 2015-01-14 11:43:33 UTC (rev 19371)
@@ -9,9 +9,9 @@
<property name="javaVmArguments">-server -XX:+UseCompressedOops -Xms64m -Xmx512m -XX:MaxPermSize=256m -Djboss.socket.binding.port-offset=${port-offset.shared-tests.jboss} -Djavax.wsdl.factory.WSDLFactory=com.ibm.wsdl.factory.WSDLFactoryImpl</property>
<property name="serverConfig">jbws-testsuite-shared-default.xml</property>
<property name="allowConnectingToRunningServer">true</property>
- <property name="managementPort">${as.managementPort:39990}</property> <!-- Keep in sync with the port-offset -->
+ <property name="managementPort">${add_int(port-offset.shared-tests.jboss,9990)}</property>
<!-- AS7-4070 -->
- <property name="waitForPorts">${as.debug.port:38787} ${as.managementPort:39990}</property> <!-- Keep in sync with the port-offset -->
+ <property name="waitForPorts">${add_int(port-offset.shared-tests.jboss,8787)} ${add_int(port-offset.shared-tests.jboss,9990)}</property>
<property name="waitForPortsTimeoutInSeconds">8</property>
</configuration>
</container>
@@ -21,9 +21,9 @@
<property name="javaVmArguments">-server -XX:+UseCompressedOops -Xms48m -Xmx384m -XX:MaxPermSize=192m -Djboss.socket.binding.port-offset=${port-offset.shared-tests.default-config-tests} -Djavax.wsdl.factory.WSDLFactory=com.ibm.wsdl.factory.WSDLFactoryImpl</property>
<property name="serverConfig">jbws-testsuite-shared-default-config-tests.xml</property>
<property name="allowConnectingToRunningServer">true</property>
- <property name="managementPort">${as.managementPort:49990}</property> <!-- Keep in sync with the port-offset -->
+ <property name="managementPort">${add_int(port-offset.shared-tests.default-config-tests,9990)}</property>
<!-- AS7-4070 -->
- <property name="waitForPorts">${as.debug.port:48787} ${as.managementPort:49990}</property> <!-- Keep in sync with the port-offset -->
+ <property name="waitForPorts">${add_int(port-offset.shared-tests.default-config-tests,8787)} ${add_int(port-offset.shared-tests.default-config-tests,9990)}</property>
<property name="waitForPortsTimeoutInSeconds">8</property>
</configuration>
</container>
Modified: stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/resources/jaxws/complex/META-INF/wsdl/RegistrationService.wsdl
===================================================================
--- stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/resources/jaxws/complex/META-INF/wsdl/RegistrationService.wsdl 2015-01-14 11:39:24 UTC (rev 19370)
+++ stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/resources/jaxws/complex/META-INF/wsdl/RegistrationService.wsdl 2015-01-14 11:43:33 UTC (rev 19371)
@@ -7,7 +7,7 @@
<import namespace="http://types.complex.jaxws.ws.test.jboss.org/" location="Registration_PortType.wsdl"/>
<service name="RegistrationService">
<port name="RegistrationPort" binding="ns1:RegistrationBinding">
- <soap:address location="http://@jboss.bind.address@:38080/jaxws-complex/RegistrationService"/>
+ <soap:address location="http://@jboss.bind.address@:@add_int(port-offset.shared-tests.jboss,8080)@/jaxws-complex/RegistrationService"/>
</port>
</service>
</definitions>
Modified: stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/resources/jaxws/jbws3140/wsdl/TestEndpoint.wsdl
===================================================================
--- stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/resources/jaxws/jbws3140/wsdl/TestEndpoint.wsdl 2015-01-14 11:39:24 UTC (rev 19370)
+++ stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/resources/jaxws/jbws3140/wsdl/TestEndpoint.wsdl 2015-01-14 11:43:33 UTC (rev 19371)
@@ -63,7 +63,7 @@
<service name="TestEndpointService">
<port name="MTOMTestPort" binding="tns:MTOMBindind">
- <soap:address location="http://@jboss.bind.address@:38080/jaxws3140-server"/>
+ <soap:address location="http://@jboss.bind.address@:@add_int(port-offset.shared-tests.jboss,8080)@/jaxws3140-server"/>
</port>
</service>
</definitions>
Modified: stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/resources/saaj/jbws3084/WEB-INF/wsdl/SaajService.wsdl
===================================================================
--- stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/resources/saaj/jbws3084/WEB-INF/wsdl/SaajService.wsdl 2015-01-14 11:39:24 UTC (rev 19370)
+++ stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/resources/saaj/jbws3084/WEB-INF/wsdl/SaajService.wsdl 2015-01-14 11:43:33 UTC (rev 19371)
@@ -48,7 +48,7 @@
<wsdl:service name="SaajService">
<wsdl:port name="SaajServicePort" binding="tns:SaajServiceSoapBinding">
- <soap:address location="http://@jboss.bind.address@:38080/SaajService"/>
+ <soap:address location="http://@jboss.bind.address@:@add_int(port-offset.shared-tests.jboss,8080)@/SaajService"/>
</wsdl:port>
</wsdl:service>
9 years, 3 months
- 1
- 0
JBossWS SVN: r19370 - in projects/plugins/maven: resource-filter and 10 other directories.
by jbossws-commits＠lists.jboss.org
Author: asoldano
Date: 2015-01-14 06:39:24 -0500 (Wed, 14 Jan 2015)
New Revision: 19370
Added:
projects/plugins/maven/resource-filter/
projects/plugins/maven/resource-filter/branches/
projects/plugins/maven/resource-filter/tags/
projects/plugins/maven/resource-filter/trunk/
projects/plugins/maven/resource-filter/trunk/pom.xml
projects/plugins/maven/resource-filter/trunk/src/
projects/plugins/maven/resource-filter/trunk/src/main/
projects/plugins/maven/resource-filter/trunk/src/main/java/
projects/plugins/maven/resource-filter/trunk/src/main/java/org/
projects/plugins/maven/resource-filter/trunk/src/main/java/org/jboss/
projects/plugins/maven/resource-filter/trunk/src/main/java/org/jboss/ws/
projects/plugins/maven/resource-filter/trunk/src/main/java/org/jboss/ws/plugins/
projects/plugins/maven/resource-filter/trunk/src/main/java/org/jboss/ws/plugins/filters/
projects/plugins/maven/resource-filter/trunk/src/main/java/org/jboss/ws/plugins/filters/OperationsMavenResourcesFilter.java
projects/plugins/maven/resource-filter/trunk/src/main/java/org/jboss/ws/plugins/filters/OperationsValueSource.java
projects/plugins/maven/resource-filter/trunk/src/main/java/org/jboss/ws/plugins/filters/OperationsValueSourceCreator.java
projects/plugins/maven/resource-filter/trunk/src/main/java/org/jboss/ws/plugins/filters/ValueSourceCreator.java
projects/plugins/maven/resource-filter/trunk/src/main/resources/
projects/plugins/maven/resource-filter/trunk/src/test/
projects/plugins/maven/resource-filter/trunk/src/test/java/
projects/plugins/maven/resource-filter/trunk/src/test/resources/
Log:
Adding a small project containing a maven-resources-plugin filter extension to be used for performing arithmetic operations on numeric properties
Property changes on: projects/plugins/maven/resource-filter/trunk
___________________________________________________________________
Added: svn:ignore
+ target
.project
.classpath
.settings
Added: projects/plugins/maven/resource-filter/trunk/pom.xml
===================================================================
--- projects/plugins/maven/resource-filter/trunk/pom.xml (rev 0)
+++ projects/plugins/maven/resource-filter/trunk/pom.xml 2015-01-14 11:39:24 UTC (rev 19370)
@@ -0,0 +1,131 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+
+ <name>JBoss Web Services - resources-plugin-filters</name>
+ <groupId>org.jboss.ws.plugins</groupId>
+ <artifactId>resources-plugin-filters</artifactId>
+ <packaging>jar</packaging>
+ <description>Additional custom resources-plugin filters</description>
+
+ <version>1.0.0-SNAPSHOT</version>
+
+ <!-- Parent -->
+ <parent>
+ <groupId>org.jboss.ws</groupId>
+ <artifactId>jbossws-parent</artifactId>
+ <version>1.1.0.GA</version>
+ </parent>
+
+ <!-- Source Control Management -->
+ <scm>
+ <connection>scm:svn:http://anonsvn.jboss.org/repos/jbossws/projects/plugins/maven/res...</connection>
+ <developerConnection>scm:svn:https://svn.jboss.org/repos/jbossws/projects/plugins/maven/resour...</developerConnection>
+ <url>http://fisheye.jboss.com/viewrep/JBossWS/projects/plugins/maven/resource-...</url>
+ </scm>
+
+ <properties>
+ <jboss-logging.version>3.1.2.GA</jboss-logging.version>
+ <jboss-logging-processor.version>1.0.3.Final</jboss-logging-processor.version>
+ <junit.version>3.8.2</junit.version>
+ <maven-filtering.version>1.1</maven-filtering.version>
+ <plexus-maven-plugin.version>1.3.8</plexus-maven-plugin.version>
+ </properties>
+
+ <!-- Dependencies -->
+ <dependencies>
+
+ <!-- provided apis -->
+ <dependency>
+ <groupId>org.jboss.logging</groupId>
+ <artifactId>jboss-logging</artifactId>
+ <version>${jboss-logging.version}</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.logging</groupId>
+ <artifactId>jboss-logging-processor</artifactId>
+ <version>${jboss-logging-processor.version}</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.maven.shared</groupId>
+ <artifactId>maven-filtering</artifactId>
+ <version>${maven-filtering.version}</version>
+ </dependency>
+
+ <!-- test dependencies -->
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>${junit.version}</version>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+
+ <!-- Plugins -->
+ <build>
+ <testResources>
+ <testResource>
+ <directory>src/test/java</directory>
+ <includes>
+ <include>**/*.properties</include>
+ </includes>
+ </testResource>
+ <testResource>
+ <directory>src/test/resources</directory>
+ <includes>
+ <include>**</include>
+ </includes>
+ </testResource>
+ </testResources>
+
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-release-plugin</artifactId>
+ <version>2.0-beta-8</version>
+ <configuration>
+ <scmCommentPrefix>[${jira.issue}] :</scmCommentPrefix>
+ <autoVersionSubmodules>true</autoVersionSubmodules>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.codehaus.plexus</groupId>
+ <artifactId>plexus-maven-plugin</artifactId>
+ <version>${plexus-maven-plugin.version}</version>
+ <executions>
+ <execution>
+ <goals>
+ <goal>descriptor</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-javadoc-plugin</artifactId>
+ <version>2.8</version>
+ <executions>
+ <execution>
+ <phase>package</phase>
+ <goals>
+ <goal>jar</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <configuration>
+ <!-- Optional if you wan to generate skeleton translation properties files -->
+ <compilerArgument>
+ -AgeneratedTranslationFilesPath=${project.basedir}/target/generated-translation-files
+ </compilerArgument>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+
+</project>
Property changes on: projects/plugins/maven/resource-filter/trunk/pom.xml
___________________________________________________________________
Added: svn:mime-type
+ text/xml
Added: svn:keywords
+ Rev Date
Added: svn:eol-style
+ native
Added: projects/plugins/maven/resource-filter/trunk/src/main/java/org/jboss/ws/plugins/filters/OperationsMavenResourcesFilter.java
===================================================================
--- projects/plugins/maven/resource-filter/trunk/src/main/java/org/jboss/ws/plugins/filters/OperationsMavenResourcesFilter.java (rev 0)
+++ projects/plugins/maven/resource-filter/trunk/src/main/java/org/jboss/ws/plugins/filters/OperationsMavenResourcesFilter.java 2015-01-14 11:39:24 UTC (rev 19370)
@@ -0,0 +1,412 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2015, 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.ws.plugins.filters;
+
+import java.io.File;
+import java.io.IOException;
+import java.io.Reader;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Iterator;
+import java.util.LinkedHashSet;
+import java.util.List;
+
+import org.apache.maven.execution.MavenSession;
+import org.apache.maven.model.Resource;
+import org.apache.maven.project.MavenProject;
+import org.apache.maven.settings.Settings;
+import org.apache.maven.shared.filtering.FilteringUtils;
+import org.apache.maven.shared.filtering.MavenFileFilter;
+import org.apache.maven.shared.filtering.MavenFilteringException;
+import org.apache.maven.shared.filtering.MavenResourcesExecution;
+import org.apache.maven.shared.filtering.MavenResourcesFiltering;
+import org.apache.maven.shared.filtering.MultiDelimiterInterpolatorFilterReaderLineEnding;
+import org.codehaus.plexus.interpolation.InterpolationPostProcessor;
+import org.codehaus.plexus.interpolation.PrefixAwareRecursionInterceptor;
+import org.codehaus.plexus.interpolation.PrefixedObjectValueSource;
+import org.codehaus.plexus.interpolation.RecursionInterceptor;
+import org.codehaus.plexus.interpolation.SimpleRecursionInterceptor;
+import org.codehaus.plexus.interpolation.SingleResponseValueSource;
+import org.codehaus.plexus.interpolation.ValueSource;
+import org.codehaus.plexus.interpolation.multi.MultiDelimiterStringSearchInterpolator;
+import org.codehaus.plexus.logging.AbstractLogEnabled;
+import org.codehaus.plexus.personality.plexus.lifecycle.phase.Initializable;
+import org.codehaus.plexus.personality.plexus.lifecycle.phase.InitializationException;
+import org.codehaus.plexus.util.FileUtils;
+import org.codehaus.plexus.util.FileUtils.FilterWrapper;
+import org.codehaus.plexus.util.PathTool;
+import org.codehaus.plexus.util.ReaderFactory;
+import org.codehaus.plexus.util.Scanner;
+import org.codehaus.plexus.util.StringUtils;
+import org.sonatype.plexus.build.incremental.BuildContext;
+
+/**
+ *
+ * @plexus.component role="org.apache.maven.shared.filtering.MavenResourcesFiltering"
+ * role-hint="custom"
+ */
+public class OperationsMavenResourcesFilter extends AbstractLogEnabled implements MavenResourcesFiltering,
+ Initializable {
+
+ private static final String[] EMPTY_STRING_ARRAY = {};
+
+ private static final String[] DEFAULT_INCLUDES = { "**/**" };
+
+ /** @plexus.requirement */
+ private BuildContext buildContext;
+
+ /**
+ * @plexus.requirement role-hint="default"
+ */
+ protected MavenResourcesFiltering defaultMavenResourcesFiltering;
+
+ /**
+ * @plexus.requirement role="org.jboss.ws.plugins.filters.OperationsValueSourceCreator"
+ */
+ private List<ValueSourceCreator> valueSourceCreators;
+
+
+ // ------------------------------------------------
+ // Plexus lifecycle
+ // ------------------------------------------------
+ @Override
+ public void initialize() throws InitializationException {
+ }
+
+ /**
+ * @plexus.requirement
+ * role-hint="default"
+ */
+ private MavenFileFilter mavenFileFilter;
+
+ @Override
+ public void filterResources( List<Resource> resources, File outputDirectory, MavenProject mavenProject, String encoding,
+ List<String> fileFilters, List<String> nonFilteredFileExtensions, MavenSession mavenSession ) throws MavenFilteringException {
+ final MavenResourcesExecution mavenResourcesExecution = new MavenResourcesExecution(resources, outputDirectory,
+ mavenProject, encoding, fileFilters, nonFilteredFileExtensions, mavenSession);
+
+ mavenResourcesExecution.setUseDefaultFilterWrappers(true);
+ // mavenResourcesExecution.setEscapeWindowsPaths( false );
+
+ this.filterResources(mavenResourcesExecution);
+ }
+
+ @Override
+ public void filterResources( List<Resource> resources, File outputDirectory, String encoding,
+ List<FileUtils.FilterWrapper> filterWrappers, File resourcesBaseDirectory,
+ List<String> nonFilteredFileExtensions ) throws MavenFilteringException {
+
+ final MavenResourcesExecution mavenResourcesExecution = new MavenResourcesExecution(resources, outputDirectory,
+ encoding, filterWrappers, resourcesBaseDirectory, nonFilteredFileExtensions);
+
+ this.filterResources(mavenResourcesExecution);
+ }
+
+ @Override
+ public boolean filteredFileExtension( String fileName, List<String> userNonFilteredFileExtensions ) {
+ final List<String> nonFilteredFileExtensions = new ArrayList<String>(this.getDefaultNonFilteredFileExtensions());
+ if (userNonFilteredFileExtensions != null) {
+ nonFilteredFileExtensions.addAll(userNonFilteredFileExtensions);
+ }
+ final boolean filteredFileExtension = !nonFilteredFileExtensions.contains(StringUtils.lowerCase(FileUtils
+ .extension(fileName)));
+ if (this.getLogger().isDebugEnabled()) {
+ this.getLogger().debug("file " + fileName + " has a" + (filteredFileExtension ? " " : " non ")
+ + "filtered file extension");
+ }
+ return filteredFileExtension;
+ }
+
+ @Override
+ @SuppressWarnings("unchecked")
+ public List<String> getDefaultNonFilteredFileExtensions() {
+ return this.defaultMavenResourcesFiltering.getDefaultNonFilteredFileExtensions();
+ }
+
+ @Override
+ public void filterResources(final MavenResourcesExecution mavenResourcesExecution) throws MavenFilteringException {
+ if (mavenResourcesExecution == null) {
+ throw new MavenFilteringException("mavenResourcesExecution cannot be null");
+ }
+
+ if (mavenResourcesExecution.getResources() == null) {
+ this.getLogger().info("No resources configured skip copying/filtering");
+ return;
+ }
+
+ if (mavenResourcesExecution.getOutputDirectory() == null) {
+ throw new MavenFilteringException("outputDirectory cannot be null");
+ }
+
+ if (mavenResourcesExecution.getEncoding() == null || mavenResourcesExecution.getEncoding().length() < 1) {
+ this.getLogger().warn("Using platform encoding (" + ReaderFactory.FILE_ENCODING
+ + " actually) to copy filtered resources, i.e. build is platform dependent!");
+ }
+ else {
+ this.getLogger().info("Using '" + mavenResourcesExecution.getEncoding()
+ + "' encoding to copy filtered resources.");
+ }
+
+ if (valueSourceCreators.size() == 0) {
+ this.getLogger().warn("No ValueSourceCreators were defined, no additional filtering will be done");
+ }
+
+ //Create value sources
+ final List<ValueSource> valueSources = new ArrayList<ValueSource>(valueSourceCreators.size());
+ for (final ValueSourceCreator valueSourceCreator : this.valueSourceCreators) {
+ final ValueSource valueSource = valueSourceCreator.createValueSource(mavenResourcesExecution);
+ if (valueSource != null) {
+ valueSources.add(valueSource);
+ }
+ }
+
+ if (valueSources.size() == 0) {
+ this.getLogger().info("No ValueSources were created, no additional filtering will be done");
+ }
+
+ final FilterWrapper filterWrapper = this.createFilterWrapper(mavenResourcesExecution, valueSources);
+ final List<FilterWrapper> filterWrappers = Arrays.asList(filterWrapper);
+
+ //For each resources directory ...
+ for (final Resource resource : mavenResourcesExecution.getResources()) {
+
+ if (!resource.isFiltering()) {
+ //Only bother with filtered resources
+ this.getLogger().debug("skip non filtered resourceDirectory " + resource.getDirectory());
+ continue;
+ }
+
+ if (this.getLogger().isDebugEnabled()) {
+ final String ls = System.getProperty("line.separator");
+ final StringBuffer debugMessage = new StringBuffer("resource with targetPath "
+ + resource.getTargetPath()).append(ls);
+ debugMessage.append("directory " + resource.getDirectory()).append(ls);
+ debugMessage.append("excludes "
+ + (resource.getExcludes() == null ? " empty " : resource.getExcludes().toString())).append(ls);
+ debugMessage.append("includes "
+ + (resource.getIncludes() == null ? " empty " : resource.getIncludes().toString()));
+ this.getLogger().debug(debugMessage.toString());
+ }
+
+ final String targetPath = resource.getTargetPath();
+
+ File resourceDirectory = new File(resource.getDirectory());
+
+ if (!resourceDirectory.isAbsolute()) {
+ resourceDirectory = new File(mavenResourcesExecution.getResourcesBaseDirectory(),
+ resourceDirectory.getPath());
+ }
+
+ if (!resourceDirectory.exists()) {
+ this.getLogger().info("skip non existing resourceDirectory " + resourceDirectory.getPath());
+ continue;
+ }
+
+ // this part is required in case the user specified "../something" as destination
+ // see MNG-1345
+ final File outputDirectory = mavenResourcesExecution.getOutputDirectory();
+ final boolean outputExists = outputDirectory.exists();
+ if (!outputExists && !outputDirectory.mkdirs()) {
+ throw new MavenFilteringException("Cannot create resource output directory: " + outputDirectory);
+ }
+
+ final boolean ignoreDelta = !outputExists
+ || this.buildContext.hasDelta(mavenResourcesExecution.getFileFilters())
+ || this.buildContext.hasDelta(this.getRelativeOutputDirectory(mavenResourcesExecution));
+ this.getLogger().debug("ignoreDelta " + ignoreDelta);
+ Scanner scanner = this.buildContext.newScanner(resourceDirectory, ignoreDelta);
+
+ this.setupScanner(resource, scanner);
+
+ scanner.scan();
+
+ final List<String> includedFiles = Arrays.asList(scanner.getIncludedFiles());
+
+ this.getLogger().info("Copying " + includedFiles.size() + " resource"
+ + (includedFiles.size() > 1 ? "s" : "") + (targetPath == null ? "" : " to " + targetPath));
+
+ for (final Iterator<String> j = includedFiles.iterator(); j.hasNext();) {
+ final String name = j.next();
+
+ final File source = new File(resourceDirectory, name);
+
+ final File destinationFile = this.getDestinationFile(outputDirectory, targetPath, name);
+
+ final boolean filteredExt = this.filteredFileExtension(source.getName(),
+ mavenResourcesExecution.getNonFilteredFileExtensions());
+
+ if (filteredExt) {
+ //do property decrypting on already filtered resources by copy the already filtered resource
+ //to a temp file and then filtering that back into the dest
+ File tempFile = null;
+ try {
+ tempFile = File.createTempFile(destinationFile.getName(), ".tmp", destinationFile.getParentFile());
+ FileUtils.copyFile(destinationFile, tempFile);
+
+ this.mavenFileFilter.copyFile(tempFile,
+ destinationFile,
+ true,
+ filterWrappers,
+ mavenResourcesExecution.getEncoding(),
+ true);
+ }
+ catch (IOException e) {
+ throw new RuntimeException(e);
+ }
+ finally {
+ if (tempFile != null) {
+ tempFile.delete();
+ }
+ }
+ }
+ }
+ }
+
+ }
+
+ /**
+ * Adds a new FilterWrapper that uses the specified value source
+ */
+ protected FileUtils.FilterWrapper createFilterWrapper(final MavenResourcesExecution mavenResourcesExecution, final List<ValueSource> valueSources) {
+ return new FileUtils.FilterWrapper() {
+ public Reader getReader(Reader reader) {
+ MultiDelimiterStringSearchInterpolator interpolator = new MultiDelimiterStringSearchInterpolator();
+ final LinkedHashSet<String> delimiters = mavenResourcesExecution.getDelimiters();
+ interpolator.setDelimiterSpecs(delimiters);
+
+ final List<?> projectStartExpressions = mavenResourcesExecution.getProjectStartExpressions();
+ RecursionInterceptor ri = null;
+ if (projectStartExpressions != null && !projectStartExpressions.isEmpty()) {
+ ri = new PrefixAwareRecursionInterceptor(projectStartExpressions, true);
+ }
+ else {
+ ri = new SimpleRecursionInterceptor();
+ }
+
+ for (final ValueSource valueSource : valueSources) {
+ interpolator.addValueSource(valueSource);
+ }
+
+ final MavenProject project = mavenResourcesExecution.getMavenProject();
+ if (project != null) {
+ interpolator.addValueSource(new PrefixedObjectValueSource(projectStartExpressions, project, true));
+ }
+
+ final MavenSession mavenSession = mavenResourcesExecution.getMavenSession();
+ if (mavenSession != null) {
+ interpolator.addValueSource(new PrefixedObjectValueSource("session", mavenSession));
+
+ final Settings settings = mavenSession.getSettings();
+ if (settings != null) {
+ interpolator.addValueSource(new PrefixedObjectValueSource("settings", settings));
+ interpolator.addValueSource(new SingleResponseValueSource("localRepository", settings
+ .getLocalRepository()));
+ }
+ }
+
+ final String escapeString = mavenResourcesExecution.getEscapeString();
+ interpolator.setEscapeString(escapeString);
+
+ final boolean escapeWindowsPaths = mavenResourcesExecution.isEscapeWindowsPaths();
+ if (escapeWindowsPaths) {
+ interpolator.addPostProcessor(new InterpolationPostProcessor() {
+ public Object execute(String expression, Object value) {
+ if (value instanceof String) {
+ return FilteringUtils.escapeWindowsPath((String) value);
+ }
+
+ return value;
+ }
+ });
+ }
+
+ final boolean supportMultiLineFiltering = mavenResourcesExecution.isSupportMultiLineFiltering();
+ MultiDelimiterInterpolatorFilterReaderLineEnding filterReader = new MultiDelimiterInterpolatorFilterReaderLineEnding(
+ reader, interpolator, supportMultiLineFiltering);
+ filterReader.setRecursionInterceptor(ri);
+ filterReader.setDelimiterSpecs(delimiters);
+
+ filterReader.setInterpolateWithPrefixPattern(false);
+ filterReader.setEscapeString(escapeString);
+
+ return filterReader;
+ }
+ };
+ }
+
+ private File getDestinationFile(File outputDirectory, String targetPath, String name) {
+ String destination = name;
+
+ if (targetPath != null) {
+ destination = targetPath + "/" + name;
+ }
+
+ File destinationFile = new File(destination);
+ if (!destinationFile.isAbsolute()) {
+ destinationFile = new File(outputDirectory, destination);
+ }
+
+ if (!destinationFile.getParentFile().exists()) {
+ destinationFile.getParentFile().mkdirs();
+ }
+ return destinationFile;
+ }
+
+ @SuppressWarnings("unchecked")
+ private String[] setupScanner(Resource resource, Scanner scanner) {
+ String[] includes = null;
+ if (resource.getIncludes() != null && !resource.getIncludes().isEmpty()) {
+ includes = (String[]) resource.getIncludes().toArray(EMPTY_STRING_ARRAY);
+ }
+ else {
+ includes = DEFAULT_INCLUDES;
+ }
+ scanner.setIncludes(includes);
+
+ String[] excludes = null;
+ if (resource.getExcludes() != null && !resource.getExcludes().isEmpty()) {
+ excludes = (String[]) resource.getExcludes().toArray(EMPTY_STRING_ARRAY);
+ scanner.setExcludes(excludes);
+ }
+
+ scanner.addDefaultExcludes();
+ return includes;
+ }
+
+ private String getRelativeOutputDirectory(MavenResourcesExecution execution) {
+ String relOutDir = execution.getOutputDirectory().getAbsolutePath();
+
+ if (execution.getMavenProject() != null && execution.getMavenProject().getBasedir() != null) {
+ final String basedir = execution.getMavenProject().getBasedir().getAbsolutePath();
+ relOutDir = PathTool.getRelativeFilePath(basedir, relOutDir);
+ if (relOutDir == null) {
+ relOutDir = execution.getOutputDirectory().getPath();
+ }
+ else {
+ relOutDir = relOutDir.replace('\\', '/');
+ }
+ }
+
+ return relOutDir;
+ }
+
+}
Property changes on: projects/plugins/maven/resource-filter/trunk/src/main/java/org/jboss/ws/plugins/filters/OperationsMavenResourcesFilter.java
___________________________________________________________________
Added: svn:keywords
+ Rev Date
Added: svn:eol-style
+ native
Added: projects/plugins/maven/resource-filter/trunk/src/main/java/org/jboss/ws/plugins/filters/OperationsValueSource.java
===================================================================
--- projects/plugins/maven/resource-filter/trunk/src/main/java/org/jboss/ws/plugins/filters/OperationsValueSource.java (rev 0)
+++ projects/plugins/maven/resource-filter/trunk/src/main/java/org/jboss/ws/plugins/filters/OperationsValueSource.java 2015-01-14 11:39:24 UTC (rev 19370)
@@ -0,0 +1,66 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2015, 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.ws.plugins.filters;
+
+import java.util.Collections;
+import java.util.List;
+import java.util.Properties;
+import java.util.StringTokenizer;
+
+import org.codehaus.plexus.interpolation.ValueSource;
+import org.codehaus.plexus.logging.AbstractLogEnabled;
+
+public class OperationsValueSource extends AbstractLogEnabled implements ValueSource {
+
+ private static final String ADD_INT = "add_int";
+ private Properties properties;
+
+ public OperationsValueSource(Properties props) {
+ this.properties = props;
+ }
+
+ @Override
+ public Object getValue(String expression) {
+ if (expression.startsWith(ADD_INT + "(") && expression.endsWith(")")) {
+ expression = expression.substring(ADD_INT.length() + 1, expression.length() - 1);
+ StringTokenizer st = new StringTokenizer(expression, ",", false);
+ int sum = 0;
+ while (st.hasMoreTokens()) {
+ final String token = st.nextToken();
+ sum = sum + Integer.valueOf(properties.getProperty(token, token));
+ }
+ return sum;
+ }
+ return null;
+ }
+
+ @Override
+ public void clearFeedback() {
+ // NOOP
+ }
+
+ @SuppressWarnings("rawtypes")
+ @Override
+ public List getFeedback() {
+ return Collections.EMPTY_LIST;
+ }
+}
Property changes on: projects/plugins/maven/resource-filter/trunk/src/main/java/org/jboss/ws/plugins/filters/OperationsValueSource.java
___________________________________________________________________
Added: svn:keywords
+ Rev Date
Added: svn:eol-style
+ native
Added: projects/plugins/maven/resource-filter/trunk/src/main/java/org/jboss/ws/plugins/filters/OperationsValueSourceCreator.java
===================================================================
--- projects/plugins/maven/resource-filter/trunk/src/main/java/org/jboss/ws/plugins/filters/OperationsValueSourceCreator.java (rev 0)
+++ projects/plugins/maven/resource-filter/trunk/src/main/java/org/jboss/ws/plugins/filters/OperationsValueSourceCreator.java 2015-01-14 11:39:24 UTC (rev 19370)
@@ -0,0 +1,46 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2015, 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.ws.plugins.filters;
+
+import java.util.Properties;
+
+import org.apache.maven.shared.filtering.MavenResourcesExecution;
+import org.codehaus.plexus.interpolation.ValueSource;
+import org.codehaus.plexus.logging.AbstractLogEnabled;
+
+/**
+ *
+ * @plexus.component role="org.jboss.ws.plugins.filters.OperationsValueSourceCreator"
+ * role-hint="operations"
+ */
+public class OperationsValueSourceCreator extends AbstractLogEnabled implements ValueSourceCreator {
+
+ @Override
+ public ValueSource createValueSource(MavenResourcesExecution mavenResourcesExecution) {
+ final Properties projectProperties = mavenResourcesExecution.getMavenProject().getProperties();
+
+ OperationsValueSource valueSource = new OperationsValueSource(projectProperties);
+ valueSource.enableLogging(this.getLogger());
+ return valueSource;
+ }
+
+}
\ No newline at end of file
Property changes on: projects/plugins/maven/resource-filter/trunk/src/main/java/org/jboss/ws/plugins/filters/OperationsValueSourceCreator.java
___________________________________________________________________
Added: svn:keywords
+ Rev Date
Added: svn:eol-style
+ native
Added: projects/plugins/maven/resource-filter/trunk/src/main/java/org/jboss/ws/plugins/filters/ValueSourceCreator.java
===================================================================
--- projects/plugins/maven/resource-filter/trunk/src/main/java/org/jboss/ws/plugins/filters/ValueSourceCreator.java (rev 0)
+++ projects/plugins/maven/resource-filter/trunk/src/main/java/org/jboss/ws/plugins/filters/ValueSourceCreator.java 2015-01-14 11:39:24 UTC (rev 19370)
@@ -0,0 +1,31 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2015, 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.ws.plugins.filters;
+
+import org.apache.maven.shared.filtering.MavenResourcesExecution;
+import org.codehaus.plexus.interpolation.ValueSource;
+
+public interface ValueSourceCreator {
+
+ ValueSource createValueSource(MavenResourcesExecution mavenResourcesExecution);
+}
Property changes on: projects/plugins/maven/resource-filter/trunk/src/main/java/org/jboss/ws/plugins/filters/ValueSourceCreator.java
___________________________________________________________________
Added: svn:keywords
+ Rev Date
Added: svn:eol-style
+ native
9 years, 3 months
- 1
- 0
JBossWS SVN: r19369 - stack/cxf/branches/arquillian/modules/testsuite.
by jbossws-commits＠lists.jboss.org
Author: asoldano
Date: 2015-01-13 12:32:53 -0500 (Tue, 13 Jan 2015)
New Revision: 19369
Modified:
stack/cxf/branches/arquillian/modules/testsuite/pom.xml
Log:
Also remove maven-resources-plugin usage for populating endorsed dirs in testsuite parent pom
Modified: stack/cxf/branches/arquillian/modules/testsuite/pom.xml
===================================================================
--- stack/cxf/branches/arquillian/modules/testsuite/pom.xml 2015-01-13 10:22:29 UTC (rev 19368)
+++ stack/cxf/branches/arquillian/modules/testsuite/pom.xml 2015-01-13 17:32:53 UTC (rev 19369)
@@ -236,29 +236,6 @@
</execution>
</executions>
</plugin>
- <plugin> <!-- This copies jbossws-cxf-factories jar to endorsed dir before the integration-tests are run -->
- <artifactId>maven-resources-plugin</artifactId>
- <executions>
- <execution>
- <id>copy-factories-jar</id>
- <phase>pre-integration-test</phase>
- <goals>
- <goal>copy-resources</goal>
- </goals>
- <configuration>
- <outputDirectory>${project.build.directory}/endorsed</outputDirectory>
- <resources>
- <resource>
- <directory>${basedir}/../endorsed/target/</directory>
- <includes>
- <include>jbossws-cxf-factories-${project.version}.jar</include>
- </includes>
- </resource>
- </resources>
- </configuration>
- </execution>
- </executions>
- </plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>build-helper-maven-plugin</artifactId>
9 years, 3 months
- 1
- 0
JBossWS SVN: r19368 - stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws981.
by jbossws-commits＠lists.jboss.org
Author: asoldano
Date: 2015-01-13 05:22:29 -0500 (Tue, 13 Jan 2015)
New Revision: 19368
Modified:
stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws981/JBWS981TestCase.java
Log:
Removing system.out
Modified: stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws981/JBWS981TestCase.java
===================================================================
--- stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws981/JBWS981TestCase.java 2015-01-13 10:19:04 UTC (rev 19367)
+++ stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws981/JBWS981TestCase.java 2015-01-13 10:22:29 UTC (rev 19368)
@@ -63,7 +63,6 @@
@RunAsClient
public void testCall() throws Exception
{
- System.out.println("** " + baseURL);
URL wsdlURL = new URL(baseURL + "/jaxws-jbws981/EndpointService/EJB3Bean?wsdl");
QName serviceName = new QName("http://www.jboss.org/test/ws/jaxws/jbws981", "EndpointService");
Service.create(wsdlURL, serviceName);
9 years, 3 months
- 1
- 0
JBossWS SVN: r19367 - stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/clientConfig.
by jbossws-commits＠lists.jboss.org
Author: asoldano
Date: 2015-01-13 05:19:04 -0500 (Tue, 13 Jan 2015)
New Revision: 19367
Modified:
stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/clientConfig/ClientConfigurationTestCase.java
Log:
Properly deal with client classpath setup
Modified: stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/clientConfig/ClientConfigurationTestCase.java
===================================================================
--- stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/clientConfig/ClientConfigurationTestCase.java 2015-01-13 09:08:01 UTC (rev 19366)
+++ stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/clientConfig/ClientConfigurationTestCase.java 2015-01-13 10:19:04 UTC (rev 19367)
@@ -23,7 +23,6 @@
import java.io.File;
import java.net.URL;
-import java.net.URLClassLoader;
import org.jboss.arquillian.container.test.api.Deployment;
import org.jboss.arquillian.container.test.api.OperateOnDeployment;
@@ -32,13 +31,11 @@
import org.jboss.arquillian.test.api.ArquillianResource;
import org.jboss.shrinkwrap.api.ShrinkWrap;
import org.jboss.shrinkwrap.api.asset.StringAsset;
-import org.jboss.shrinkwrap.api.spec.JavaArchive;
import org.jboss.shrinkwrap.api.spec.WebArchive;
import org.jboss.ws.common.IOUtils;
import org.jboss.wsf.test.JBossWSTest;
import org.jboss.wsf.test.JBossWSTestHelper;
-import org.junit.After;
-import org.junit.Before;
+import org.jboss.wsf.test.WrapThreadContextClassLoader;
import org.junit.Test;
import org.junit.runner.RunWith;
@@ -54,26 +51,6 @@
@ArquillianResource
private URL baseURL;
- private ClassLoader originalClassLoader = null;
-
-
- @Before
- public void setupClientClassPath() throws Exception {
- originalClassLoader = Thread.currentThread().getContextClassLoader();
-
- URLClassLoader cl = new URLClassLoader(new URL[] { createClientJar() },
- originalClassLoader);
- Thread.currentThread().setContextClassLoader(cl);
-
- }
-
-
- @After
- public void restoreClassPath() {
- Thread.currentThread().setContextClassLoader(originalClassLoader);
- }
-
-
@Deployment(name = "jaxws-clientConfig-inContainer-client", order = 1, testable = false)
public static WebArchive createDeployment() {
WebArchive archive = ShrinkWrap.create(WebArchive.class, "jaxws-clientConfig-inContainer-client.war");
@@ -132,6 +109,7 @@
@Test
@RunAsClient
@OperateOnDeployment("jaxws-clientConfig")
+ @WrapThreadContextClassLoader
public void testCustomClientConfigurationFromFile() throws Exception {
assertTrue(getHelper().testCustomClientConfigurationFromFile());
}
@@ -139,6 +117,7 @@
@Test
@RunAsClient
@OperateOnDeployment("jaxws-clientConfig")
+ @WrapThreadContextClassLoader
public void testCustomClientConfigurationOnDispatchFromFile() throws Exception {
assertTrue(getHelper().testCustomClientConfigurationOnDispatchFromFile());
}
@@ -160,6 +139,7 @@
@Test
@RunAsClient
@OperateOnDeployment("jaxws-clientConfig")
+ @WrapThreadContextClassLoader
public void testCustomClientConfigurationFromFileUsingFeature() throws Exception {
assertTrue(getHelper().testCustomClientConfigurationFromFileUsingFeature());
}
@@ -167,6 +147,7 @@
@Test
@RunAsClient
@OperateOnDeployment("jaxws-clientConfig")
+ @WrapThreadContextClassLoader
public void testCustomClientConfigurationFromFileUsingFeatureOnDispatch() throws Exception {
assertTrue(getHelper().testCustomClientConfigurationFromFileUsingFeatureOnDispatch());
}
@@ -193,6 +174,7 @@
@Test
@RunAsClient
@OperateOnDeployment("jaxws-clientConfig")
+ @WrapThreadContextClassLoader
public void testConfigurationChange() throws Exception {
assertTrue(getHelper().testConfigurationChange());
}
@@ -201,6 +183,7 @@
@Test
@RunAsClient
@OperateOnDeployment("jaxws-clientConfig")
+ @WrapThreadContextClassLoader
public void testConfigurationChangeOnDispatch() throws Exception {
assertTrue(getHelper().testConfigurationChangeOnDispatch());
}
@@ -219,17 +202,16 @@
assertEquals("1", runTestInContainer("testConfigurationChangeOnDispatch"));
}
- private URL createClientJar() throws Exception {
- String clientJarName = "jaxws-clientConfig-client.jar";
- JavaArchive archive = ShrinkWrap.create(JavaArchive.class, clientJarName);
- archive
- .addManifest()
- .addAsResource("org/jboss/test/ws/jaxws/clientConfig/jaxws-client-config.xml", "jaxws-client-config.xml")
- .addAsManifestResource(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/clientConfig/META-INF/jaxws-client-config.xml"), "jaxws-client-config.xml");
- JBossWSTestHelper.writeToFile(archive);
- return JBossWSTest.getArchiveURL(clientJarName);
+ @Override
+ protected String getClientJarPaths() {
+ return JBossWSTestHelper.writeToFile(new JBossWSTestHelper.JarDeployment("jaxws-clientConfig-client.jar") { {
+ archive
+ .addManifest()
+ .addAsResource("org/jboss/test/ws/jaxws/clientConfig/jaxws-client-config.xml", "jaxws-client-config.xml")
+ .addAsManifestResource(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/clientConfig/META-INF/jaxws-client-config.xml"), "jaxws-client-config.xml");
+ }
+ });
}
-
private Helper getHelper() {
Helper helper = new Helper();
9 years, 3 months
- 1
- 0
JBossWS SVN: r19366 - stack/cxf/branches/arquillian/modules/dist.
by jbossws-commits＠lists.jboss.org
Author: asoldano
Date: 2015-01-13 04:08:01 -0500 (Tue, 13 Jan 2015)
New Revision: 19366
Modified:
stack/cxf/branches/arquillian/modules/dist/pom.xml
Log:
Allow maven-install-plugin and only disable maven-deploy-plugin in dist module
Modified: stack/cxf/branches/arquillian/modules/dist/pom.xml
===================================================================
--- stack/cxf/branches/arquillian/modules/dist/pom.xml 2015-01-13 08:56:37 UTC (rev 19365)
+++ stack/cxf/branches/arquillian/modules/dist/pom.xml 2015-01-13 09:08:01 UTC (rev 19366)
@@ -148,13 +148,6 @@
<skip>true</skip>
</configuration>
</plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-install-plugin</artifactId>
- <configuration>
- <skip>true</skip>
- </configuration>
- </plugin>
</plugins>
</build>
9 years, 3 months
- 1
- 0
JBossWS SVN: r19365 - in stack/cxf/branches/arquillian/modules/testsuite: cxf-tests and 1 other directories.
by jbossws-commits＠lists.jboss.org
Author: asoldano
Date: 2015-01-13 03:56:37 -0500 (Tue, 13 Jan 2015)
New Revision: 19365
Modified:
stack/cxf/branches/arquillian/modules/testsuite/cxf-spring-tests/pom.xml
stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/pom.xml
stack/cxf/branches/arquillian/modules/testsuite/shared-tests/pom.xml
Log:
Replace maven-resource-plugin with a proper execution of maven-dependency-plugin to copy the jbossws-cxf-factories jar into endorsed (this solves issues caused by poms accessing resources outside their module)
Modified: stack/cxf/branches/arquillian/modules/testsuite/cxf-spring-tests/pom.xml
===================================================================
--- stack/cxf/branches/arquillian/modules/testsuite/cxf-spring-tests/pom.xml 2015-01-13 07:24:05 UTC (rev 19364)
+++ stack/cxf/branches/arquillian/modules/testsuite/cxf-spring-tests/pom.xml 2015-01-13 08:56:37 UTC (rev 19365)
@@ -72,27 +72,27 @@
</activation>
<build>
<plugins>
- <plugin> <!-- This copies jbossws-cxf-factories jar to endorsed dir before the integration-tests are run -->
- <artifactId>maven-resources-plugin</artifactId>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-dependency-plugin</artifactId>
<executions>
- <execution>
- <id>copy-factories-jar</id>
- <phase>pre-integration-test</phase>
- <goals>
- <goal>copy-resources</goal>
- </goals>
- <configuration>
- <outputDirectory>${project.build.directory}/endorsed</outputDirectory>
- <resources>
- <resource>
- <directory>${basedir}/../../endorsed/target/</directory>
- <includes>
- <include>jbossws-cxf-factories-${project.version}.jar</include>
- </includes>
- </resource>
- </resources>
- </configuration>
- </execution>
+ <execution> <!-- This copies jbossws-cxf-factories jar to endorsed dir before the integration-tests are run -->
+ <id>copy-endorsed</id>
+ <phase>pre-integration-test</phase>
+ <goals>
+ <goal>copy</goal>
+ </goals>
+ <configuration>
+ <artifactItems>
+ <artifactItem>
+ <groupId>org.jboss.ws.cxf</groupId>
+ <artifactId>jbossws-cxf-factories</artifactId>
+ <version>${project.version}</version>
+ </artifactItem>
+ </artifactItems>
+ <outputDirectory>target/endorsed</outputDirectory>
+ </configuration>
+ </execution>
</executions>
</plugin>
</plugins>
Modified: stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/pom.xml
===================================================================
--- stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/pom.xml 2015-01-13 07:24:05 UTC (rev 19364)
+++ stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/pom.xml 2015-01-13 08:56:37 UTC (rev 19365)
@@ -36,6 +36,11 @@
<version>${project.version}</version>
</dependency>
<dependency>
+ <groupId>org.jboss.ws.cxf</groupId>
+ <artifactId>jbossws-cxf-factories</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
<groupId>org.picketlink</groupId>
<artifactId>picketlink-common</artifactId>
<scope>test</scope>
@@ -125,34 +130,28 @@
</execution>
</executions>
</plugin>
- <plugin> <!-- This copies jbossws-cxf-factories jar to endorsed dir before the integration-tests are run -->
- <artifactId>maven-resources-plugin</artifactId>
- <executions>
- <execution>
- <id>copy-factories-jar</id>
- <phase>pre-integration-test</phase>
- <goals>
- <goal>copy-resources</goal>
- </goals>
- <configuration>
- <outputDirectory>${project.build.directory}/endorsed</outputDirectory>
- <resources>
- <resource>
- <directory>${basedir}/../../endorsed/target/</directory>
- <includes>
- <include>jbossws-cxf-factories-${project.version}.jar</include>
- </includes>
- </resource>
- </resources>
- </configuration>
- </execution>
- </executions>
- </plugin>
- <plugin> <!-- This downloads and copies some Spring libs into target/spring to be later picked up and included in some test jars -->
+ <plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-dependency-plugin</artifactId>
<executions>
- <execution>
+ <execution> <!-- This copies jbossws-cxf-factories jar to endorsed dir before the integration-tests are run -->
+ <id>copy-endorsed</id>
+ <phase>pre-integration-test</phase>
+ <goals>
+ <goal>copy</goal>
+ </goals>
+ <configuration>
+ <artifactItems>
+ <artifactItem>
+ <groupId>org.jboss.ws.cxf</groupId>
+ <artifactId>jbossws-cxf-factories</artifactId>
+ <version>${project.version}</version>
+ </artifactItem>
+ </artifactItems>
+ <outputDirectory>target/endorsed</outputDirectory>
+ </configuration>
+ </execution>
+ <execution> <!-- This downloads and copies some Spring libs into target/spring to be later picked up and included in some test jars -->
<id>copy-spring</id>
<phase>process-test-resources</phase>
<goals>
Modified: stack/cxf/branches/arquillian/modules/testsuite/shared-tests/pom.xml
===================================================================
--- stack/cxf/branches/arquillian/modules/testsuite/shared-tests/pom.xml 2015-01-13 07:24:05 UTC (rev 19364)
+++ stack/cxf/branches/arquillian/modules/testsuite/shared-tests/pom.xml 2015-01-13 08:56:37 UTC (rev 19365)
@@ -135,27 +135,27 @@
</executions>
</plugin>
- <plugin> <!-- This copies jbossws-cxf-factories jar to endorsed dir before the integration-tests are run -->
- <artifactId>maven-resources-plugin</artifactId>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-dependency-plugin</artifactId>
<executions>
- <execution>
- <id>copy-factories-jar</id>
- <phase>pre-integration-test</phase>
- <goals>
- <goal>copy-resources</goal>
- </goals>
- <configuration>
- <outputDirectory>${project.build.directory}/endorsed</outputDirectory>
- <resources>
- <resource>
- <directory>${basedir}/../../endorsed/target/</directory>
- <includes>
- <include>jbossws-cxf-factories-${project.version}.jar</include>
- </includes>
- </resource>
- </resources>
- </configuration>
- </execution>
+ <execution> <!-- This copies jbossws-cxf-factories jar to endorsed dir before the integration-tests are run -->
+ <id>copy-endorsed</id>
+ <phase>pre-integration-test</phase>
+ <goals>
+ <goal>copy</goal>
+ </goals>
+ <configuration>
+ <artifactItems>
+ <artifactItem>
+ <groupId>org.jboss.ws.cxf</groupId>
+ <artifactId>jbossws-cxf-factories</artifactId>
+ <version>${project.version}</version>
+ </artifactItem>
+ </artifactItems>
+ <outputDirectory>target/endorsed</outputDirectory>
+ </configuration>
+ </execution>
</executions>
</plugin>
</plugins>
9 years, 3 months
- 1
- 0