JBossWS SVN: r18664 - stack/cxf/trunk.
by jbossws-commits＠lists.jboss.org
Author: asoldano
Date: 2014-05-16 08:40:47 -0400 (Fri, 16 May 2014)
New Revision: 18664
Modified:
stack/cxf/trunk/pom.xml
Log:
Use latest jbossws-api
Modified: stack/cxf/trunk/pom.xml
===================================================================
--- stack/cxf/trunk/pom.xml 2014-05-16 12:39:35 UTC (rev 18663)
+++ stack/cxf/trunk/pom.xml 2014-05-16 12:40:47 UTC (rev 18664)
@@ -61,7 +61,7 @@
<!-- Properties -->
<properties>
- <jbossws.api.version>1.0.2.Final</jbossws.api.version>
+ <jbossws.api.version>1.0.3-SNAPSHOT</jbossws.api.version>
<jbossws.spi.version>3.0.0-SNAPSHOT</jbossws.spi.version>
<jbossws.common.version>3.0.0-SNAPSHOT</jbossws.common.version>
<jbossws.common.tools.version>1.2.0.Final</jbossws.common.tools.version>
10 years, 7 months
- 1
- 0
JBossWS SVN: r18663 - api/trunk/src/main/java/org/jboss/ws/api/handler.
by jbossws-commits＠lists.jboss.org
Author: asoldano
Date: 2014-05-16 08:39:35 -0400 (Fri, 16 May 2014)
New Revision: 18663
Modified:
api/trunk/src/main/java/org/jboss/ws/api/handler/GenericHandler.java
api/trunk/src/main/java/org/jboss/ws/api/handler/GenericLogicalHandler.java
api/trunk/src/main/java/org/jboss/ws/api/handler/GenericSOAPHandler.java
Log:
[JBWS-3795] Improve and fix org.jboss.ws.api.handler.* classes
Modified: api/trunk/src/main/java/org/jboss/ws/api/handler/GenericHandler.java
===================================================================
--- api/trunk/src/main/java/org/jboss/ws/api/handler/GenericHandler.java 2014-05-16 10:02:58 UTC (rev 18662)
+++ api/trunk/src/main/java/org/jboss/ws/api/handler/GenericHandler.java 2014-05-16 12:39:35 UTC (rev 18663)
@@ -1,6 +1,6 @@
/*
* JBoss, Home of Professional Open Source.
- * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * Copyright 2014, 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.
*
@@ -30,11 +30,12 @@
* A generic JAX-WS handler
*
* @author <a href="mailto:Thomas.Diesler@jboss.org">Thomas Diesler</a>
+ * @author <a href="mailto:alessio.soldano@jboss.com">Alessio Soldano</a>
* @since 13-Aug-2006
*/
-public abstract class GenericHandler implements Handler
+public abstract class GenericHandler<C extends MessageContext> implements Handler<C>
{
- private String handlerName;
+ private volatile String handlerName;
public String getHandlerName()
{
@@ -46,7 +47,7 @@
this.handlerName = handlerName;
}
- public boolean handleMessage(MessageContext msgContext)
+ public boolean handleMessage(C msgContext)
{
Boolean outbound = (Boolean)msgContext.get(MessageContext.MESSAGE_OUTBOUND_PROPERTY);
if (outbound == null)
@@ -55,17 +56,17 @@
return outbound ? handleOutbound(msgContext) : handleInbound(msgContext);
}
- protected boolean handleOutbound(MessageContext msgContext)
+ protected boolean handleOutbound(C msgContext)
{
return true;
}
- protected boolean handleInbound(MessageContext msgContext)
+ protected boolean handleInbound(C msgContext)
{
return true;
}
- public boolean handleFault(MessageContext messagecontext)
+ public boolean handleFault(C messagecontext)
{
return true;
}
Modified: api/trunk/src/main/java/org/jboss/ws/api/handler/GenericLogicalHandler.java
===================================================================
--- api/trunk/src/main/java/org/jboss/ws/api/handler/GenericLogicalHandler.java 2014-05-16 10:02:58 UTC (rev 18662)
+++ api/trunk/src/main/java/org/jboss/ws/api/handler/GenericLogicalHandler.java 2014-05-16 12:39:35 UTC (rev 18663)
@@ -1,6 +1,6 @@
/*
* JBoss, Home of Professional Open Source.
- * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * Copyright 2014, 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.
*
@@ -30,6 +30,6 @@
* @author <a href="mailto:Thomas.Diesler@jboss.org">Thomas Diesler</a>
* @since 13-Aug-2006
*/
-public class GenericLogicalHandler<C extends LogicalMessageContext> extends GenericHandler implements LogicalHandler
+public class GenericLogicalHandler<C extends LogicalMessageContext> extends GenericHandler<C> implements LogicalHandler<C>
{
}
Modified: api/trunk/src/main/java/org/jboss/ws/api/handler/GenericSOAPHandler.java
===================================================================
--- api/trunk/src/main/java/org/jboss/ws/api/handler/GenericSOAPHandler.java 2014-05-16 10:02:58 UTC (rev 18662)
+++ api/trunk/src/main/java/org/jboss/ws/api/handler/GenericSOAPHandler.java 2014-05-16 12:39:35 UTC (rev 18663)
@@ -1,6 +1,6 @@
/*
* JBoss, Home of Professional Open Source.
- * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * Copyright 2014, 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.
*
@@ -21,23 +21,25 @@
*/
package org.jboss.ws.api.handler;
+import java.util.Collections;
import java.util.HashSet;
import java.util.Set;
import javax.xml.namespace.QName;
-import javax.xml.ws.handler.LogicalMessageContext;
import javax.xml.ws.handler.soap.SOAPHandler;
+import javax.xml.ws.handler.soap.SOAPMessageContext;
/**
* A generic JAX-WS soap handler
*
- * @author Thomas.Diesler(a)jboss.org
+ * @author <a href="mailto:Thomas.Diesler@jboss.org">Thomas Diesler</a>
+ * @author <a href="mailto:alessio.soldano@jboss.com">Alessio Soldano</a>
* @since 13-Aug-2006
*/
-public abstract class GenericSOAPHandler<C extends LogicalMessageContext> extends GenericHandler implements SOAPHandler
+public abstract class GenericSOAPHandler<C extends SOAPMessageContext> extends GenericHandler<C> implements SOAPHandler<C>
{
// The header blocks that can be processed by this Handler instance
- private Set<QName> headers = new HashSet<QName>();
+ private volatile Set<QName> headers = null;
/**
* Gets the header blocks that can be processed by this Handler instance.
@@ -46,7 +48,11 @@
*/
public Set<QName> getHeaders()
{
- return headers;
+ if (headers == null) {
+ return Collections.emptySet();
+ } else {
+ return headers;
+ }
}
/**
@@ -56,6 +62,6 @@
*/
public void setHeaders(Set<QName> headers)
{
- this.headers = headers;
+ this.headers = Collections.unmodifiableSet(new HashSet<QName>(headers));
}
}
10 years, 7 months
- 1
- 0
JBossWS SVN: r18662 - in stack/cxf/trunk: modules/client and 16 other directories.
by jbossws-commits＠lists.jboss.org
Author: asoldano
Date: 2014-05-16 06:02:58 -0400 (Fri, 16 May 2014)
New Revision: 18662
Removed:
stack/cxf/trunk/modules/testsuite/shared-tests/src/test/ant-import/build-samples-jaxrpc.xml
stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxrpc/
stack/cxf/trunk/modules/testsuite/shared-tests/src/test/resources/jaxrpc/
Modified:
stack/cxf/trunk/modules/client/pom.xml
stack/cxf/trunk/modules/client/src/main/java/org/jboss/wsf/stack/cxf/extensions/addressing/map/CXFMAP.java
stack/cxf/trunk/modules/dist/pom.xml
stack/cxf/trunk/modules/dist/src/main/distro/build-testsuite.xml
stack/cxf/trunk/modules/dist/src/main/distro/build.xml
stack/cxf/trunk/modules/dist/src/main/scripts/assembly-bin-dist.xml
stack/cxf/trunk/modules/dist/src/main/scripts/assembly-deploy-artifacts.xml
stack/cxf/trunk/modules/resources/src/main/resources/resources/modules-deploy.conf
stack/cxf/trunk/modules/server/pom.xml
stack/cxf/trunk/modules/test-utils/src/main/java/org/jboss/wsf/test/JBossWSTest.java
stack/cxf/trunk/modules/test-utils/src/main/java/org/jboss/wsf/test/JBossWSTestHelper.java
stack/cxf/trunk/modules/testsuite/pom.xml
stack/cxf/trunk/modules/testsuite/shared-tests/pom.xml
stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws1582/JBWS1582TestCase.java
stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws3477/JaxWsSpiProviderTestCase.java
stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/samples/xop/doclit/XOPBase.java
stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/smoke/tools/PluginBase.java
stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/smoke/tools/WSProviderTestCaseForked.java
stack/cxf/trunk/pom.xml
Log:
[JBWS-3779] Cleanup of jbws-native / jax-rpc stuff
Modified: stack/cxf/trunk/modules/client/pom.xml
===================================================================
--- stack/cxf/trunk/modules/client/pom.xml 2014-05-16 08:50:04 UTC (rev 18661)
+++ stack/cxf/trunk/modules/client/pom.xml 2014-05-16 10:02:58 UTC (rev 18662)
@@ -193,11 +193,6 @@
http://jira.codehaus.org/browse/MASSEMBLY-317
-->
<dependency>
- <groupId>org.jboss.spec.javax.xml.rpc</groupId>
- <artifactId>jboss-jaxrpc-api_1.1_spec</artifactId>
- </dependency>
-
- <dependency>
<groupId>javax.jws</groupId>
<artifactId>jsr181-api</artifactId>
</dependency>
@@ -217,6 +212,11 @@
<artifactId>jboss-saaj-api_1.3_spec</artifactId>
</dependency>
+ <dependency>
+ <groupId>org.jboss.spec.javax.servlet</groupId>
+ <artifactId>jboss-servlet-api_3.0_spec</artifactId>
+ </dependency>
+
<!-- [JBWS-3722] Explicit JAXB dependencies to ensure the dependency management from jbossws-cxf pom.xml applies -->
<dependency>
<groupId>com.sun.xml.bind</groupId>
Modified: stack/cxf/trunk/modules/client/src/main/java/org/jboss/wsf/stack/cxf/extensions/addressing/map/CXFMAP.java
===================================================================
--- stack/cxf/trunk/modules/client/src/main/java/org/jboss/wsf/stack/cxf/extensions/addressing/map/CXFMAP.java 2014-05-16 08:50:04 UTC (rev 18661)
+++ stack/cxf/trunk/modules/client/src/main/java/org/jboss/wsf/stack/cxf/extensions/addressing/map/CXFMAP.java 2014-05-16 10:02:58 UTC (rev 18662)
@@ -57,10 +57,6 @@
*/
private AddressingProperties implementation;
- /**
- * JBossWS Native specific constructor
- * @param implementation
- */
CXFMAP(AddressingProperties implementation)
{
this.implementation = implementation;
Modified: stack/cxf/trunk/modules/dist/pom.xml
===================================================================
--- stack/cxf/trunk/modules/dist/pom.xml 2014-05-16 08:50:04 UTC (rev 18661)
+++ stack/cxf/trunk/modules/dist/pom.xml 2014-05-16 10:02:58 UTC (rev 18662)
@@ -73,16 +73,6 @@
<scope>provided</scope>
</dependency>
- <dependency>
- <groupId>org.jboss.ws.native</groupId>
- <artifactId>jbossws-native-core</artifactId>
- </dependency>
-
- <dependency>
- <groupId>org.jboss.ws.native</groupId>
- <artifactId>jbossws-native-services</artifactId>
- </dependency>
-
<!-- Spring -->
<dependency>
<groupId>org.springframework</groupId>
Modified: stack/cxf/trunk/modules/dist/src/main/distro/build-testsuite.xml
===================================================================
--- stack/cxf/trunk/modules/dist/src/main/distro/build-testsuite.xml 2014-05-16 08:50:04 UTC (rev 18661)
+++ stack/cxf/trunk/modules/dist/src/main/distro/build-testsuite.xml 2014-05-16 10:02:58 UTC (rev 18662)
@@ -521,7 +521,6 @@
<fileset dir="@{srcdir}/resources">
<include name="**/*.wsdl"/>
<include name="**/*.xml"/>
- <exclude name="jaxrpc/samples-override/**"/>
</fileset>
<filterset>
<filter token="java.home" value="${java.home}"/>
Modified: stack/cxf/trunk/modules/dist/src/main/distro/build.xml
===================================================================
--- stack/cxf/trunk/modules/dist/src/main/distro/build.xml 2014-05-16 08:50:04 UTC (rev 18661)
+++ stack/cxf/trunk/modules/dist/src/main/distro/build.xml 2014-05-16 10:02:58 UTC (rev 18662)
@@ -79,11 +79,9 @@
<target name="tests-init" depends="init,tests-classpath">
<!-- JBossWS jars first to override META-INF/services declarations duplicated in CXF jars (alternative is using endorsing) -->
- <!-- Avoid including jbossws-native-services.jar, we just need and want jbossws-native-core for jaxrpc tests -->
<path id="ws.stack.classpath">
<fileset dir="${thirdparty.dir}">
<include name="**/jbossws*.jar"/>
- <exclude name="**/jbossws-native-services.jar"/>
<exclude name="**/jbossws-jboss*.jar"/>
<exclude name="**/jbossws-wildfly*.jar"/>
</fileset>
@@ -115,7 +113,6 @@
<target name="tests-jars" depends="tests-compile,tests-copy-resources">
<ant antfile="${tests.dir}/ant-import/build-samples-jaxws.xml" target="build-samples-jaxws" inheritall="true"/>
- <ant antfile="${tests.dir}/ant-import/build-samples-jaxrpc.xml" target="build-samples-jaxrpc" inheritall="true"/>
<ant antfile="${tests.dir}/ant-import/cxf-samples-jars-jaxws.xml" target="build-jars-jaxws" inheritall="true"/>
</target>
Modified: stack/cxf/trunk/modules/dist/src/main/scripts/assembly-bin-dist.xml
===================================================================
--- stack/cxf/trunk/modules/dist/src/main/scripts/assembly-bin-dist.xml 2014-05-16 08:50:04 UTC (rev 18661)
+++ stack/cxf/trunk/modules/dist/src/main/scripts/assembly-bin-dist.xml 2014-05-16 10:02:58 UTC (rev 18662)
@@ -109,13 +109,11 @@
<includes>
<include>ant-import/**</include>
<include>java/org/jboss/test/helper/**</include>
- <include>java/org/jboss/test/ws/jaxrpc/samples/**</include>
<include>java/org/jboss/test/ws/jaxws/samples/**</include>
<include>java/org/jboss/test/ws/jaxws/smoke/**</include>
<include>java/org/jboss/test/ws/appclient/**</include>
<include>java/org/jboss/test/ws/management/**</include>
<include>java/org/jboss/test/ws/saaj/**</include>
- <include>resources/jaxrpc/samples/**</include>
<include>resources/jaxws/samples/**</include>
<include>resources/jaxws/smoke/**</include>
<include>resources/management/**</include>
Modified: stack/cxf/trunk/modules/dist/src/main/scripts/assembly-deploy-artifacts.xml
===================================================================
--- stack/cxf/trunk/modules/dist/src/main/scripts/assembly-deploy-artifacts.xml 2014-05-16 08:50:04 UTC (rev 18661)
+++ stack/cxf/trunk/modules/dist/src/main/scripts/assembly-deploy-artifacts.xml 2014-05-16 10:02:58 UTC (rev 18662)
@@ -35,8 +35,6 @@
<include>org.jboss.ws.cxf:jbossws-cxf-server:jar</include>
<include>org.jboss.ws.cxf:jbossws-cxf-transports-undertow:jar</include>
<include>org.jboss.ws.cxf:jbossws-cxf-transports-udp:jar</include>
- <include>org.jboss.ws.native:jbossws-native-core:jar</include>
- <include>org.jboss.ws.native:jbossws-native-services:jar</include>
<include>org.jboss.ws.projects:jaxws-undertow-httpspi:jar</include>
<include>io.undertow:undertow-core:jar</include>
<include>org.apache.cxf:cxf-*</include>
@@ -156,15 +154,6 @@
</includes>
<useProjectArtifact>false</useProjectArtifact>
</dependencySet>
- <dependencySet>
- <outputDirectory>deploy-artifacts/lib</outputDirectory>
- <unpack>false</unpack>
- <outputFileNameMapping>jaxrpc-api.jar</outputFileNameMapping>
- <includes>
- <include>org.jboss.spec.javax.xml.rpc:jboss-jaxrpc-api_1.1_spec:jar</include>
- </includes>
- <useProjectArtifact>false</useProjectArtifact>
- </dependencySet>
<dependencySet>
<outputDirectory>deploy-artifacts/lib</outputDirectory>
Modified: stack/cxf/trunk/modules/resources/src/main/resources/resources/modules-deploy.conf
===================================================================
--- stack/cxf/trunk/modules/resources/src/main/resources/resources/modules-deploy.conf 2014-05-16 08:50:04 UTC (rev 18661)
+++ stack/cxf/trunk/modules/resources/src/main/resources/resources/modules-deploy.conf 2014-05-16 10:02:58 UTC (rev 18662)
@@ -1 +1 @@
-org/apache/cxf/**, org/apache/ws/security/**, org/apache/neethi/**, org/apache/ws/commons/xmlschema/**, org/jboss/ws/cxf/**, org/jboss/ws/api/**, org/jboss/ws/common/**, org/jboss/ws/jaxws-client/**, org/jboss/ws/jaxws-jboss-httpserver-httpspi/**, org/jboss/ws/jaxws-undertow-httpspi/**,org/jboss/ws/saaj-impl/**, org/jboss/ws/spi/**, org/jboss/ws/tools/**, org/opensaml/**, org/springframework/spring/**, org/jboss/ws/native/**
+org/apache/cxf/**, org/apache/ws/security/**, org/apache/neethi/**, org/apache/ws/commons/xmlschema/**, org/jboss/ws/cxf/**, org/jboss/ws/api/**, org/jboss/ws/common/**, org/jboss/ws/jaxws-client/**, org/jboss/ws/jaxws-jboss-httpserver-httpspi/**, org/jboss/ws/jaxws-undertow-httpspi/**,org/jboss/ws/saaj-impl/**, org/jboss/ws/spi/**, org/jboss/ws/tools/**, org/opensaml/**, org/springframework/spring/**
Modified: stack/cxf/trunk/modules/server/pom.xml
===================================================================
--- stack/cxf/trunk/modules/server/pom.xml 2014-05-16 08:50:04 UTC (rev 18661)
+++ stack/cxf/trunk/modules/server/pom.xml 2014-05-16 10:02:58 UTC (rev 18662)
@@ -142,10 +142,6 @@
<artifactId>commons-lang</artifactId>
</dependency>
<dependency>
- <groupId>org.jboss.spec.javax.xml.rpc</groupId>
- <artifactId>jboss-jaxrpc-api_1.1_spec</artifactId>
- </dependency>
- <dependency>
<groupId>javax.xml.stream</groupId>
<artifactId>stax-api</artifactId>
</dependency>
Modified: stack/cxf/trunk/modules/test-utils/src/main/java/org/jboss/wsf/test/JBossWSTest.java
===================================================================
--- stack/cxf/trunk/modules/test-utils/src/main/java/org/jboss/wsf/test/JBossWSTest.java 2014-05-16 08:50:04 UTC (rev 18661)
+++ stack/cxf/trunk/modules/test-utils/src/main/java/org/jboss/wsf/test/JBossWSTest.java 2014-05-16 10:02:58 UTC (rev 18662)
@@ -202,11 +202,6 @@
return JBossWSTestHelper.getServer();
}
- public static boolean isIntegrationNative()
- {
- return JBossWSTestHelper.isIntegrationNative();
- }
-
public static boolean isIntegrationCXF()
{
return JBossWSTestHelper.isIntegrationCXF();
Modified: stack/cxf/trunk/modules/test-utils/src/main/java/org/jboss/wsf/test/JBossWSTestHelper.java
===================================================================
--- stack/cxf/trunk/modules/test-utils/src/main/java/org/jboss/wsf/test/JBossWSTestHelper.java 2014-05-16 08:50:04 UTC (rev 18661)
+++ stack/cxf/trunk/modules/test-utils/src/main/java/org/jboss/wsf/test/JBossWSTestHelper.java 2014-05-16 10:02:58 UTC (rev 18662)
@@ -163,12 +163,6 @@
return target.startsWith("wildfly9");
}
- public static boolean isIntegrationNative()
- {
- String vendor = getImplementationInfo();
- return vendor.toLowerCase().indexOf("jboss") != -1;
- }
-
public static boolean isIntegrationCXF()
{
String vendor = getImplementationInfo();
Modified: stack/cxf/trunk/modules/testsuite/pom.xml
===================================================================
--- stack/cxf/trunk/modules/testsuite/pom.xml 2014-05-16 08:50:04 UTC (rev 18661)
+++ stack/cxf/trunk/modules/testsuite/pom.xml 2014-05-16 10:02:58 UTC (rev 18662)
@@ -87,11 +87,6 @@
<version>${project.version}</version>
</dependency>
<dependency>
- <groupId>org.jboss.ws.native</groupId>
- <artifactId>jbossws-native-core</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<scope>test</scope>
@@ -682,9 +677,6 @@
<configuration>
<argLine>${surefire.jvm.args} ${surefire.jvm.management.args} ${surefire.default-mgmt-serurity.args} -Djava.endorsed.dirs=${project.build.directory}/endorsed</argLine>
<excludes combine.children="append">
- <!--# JAX-RPC removed in EE 7 -->
- <exclude>org/jboss/test/ws/jaxrpc/**</exclude>
-
<!--# [CXF-1519] Explicitly set the namespace of a WebFault-->
<exclude>org/jboss/test/ws/jaxws/jbws1904/**</exclude>
@@ -774,9 +766,6 @@
<configuration>
<argLine>${surefire.jvm.args} ${surefire.jvm.management.args} ${surefire.default-mgmt-serurity.args} -Djava.endorsed.dirs=${project.build.directory}/endorsed</argLine>
<excludes combine.children="append">
- <!--# JAX-RPC removed in EE 7 -->
- <exclude>org/jboss/test/ws/jaxrpc/**</exclude>
-
<!--# [CXF-1519] Explicitly set the namespace of a WebFault-->
<exclude>org/jboss/test/ws/jaxws/jbws1904/**</exclude>
@@ -867,9 +856,6 @@
<configuration>
<argLine>${surefire.jvm.args} ${surefire.jvm.management.args} ${surefire.default-mgmt-serurity.args} -Djava.endorsed.dirs=${project.build.directory}/endorsed</argLine>
<excludes combine.children="append">
- <!--# JAX-RPC removed in EE 7 -->
- <exclude>org/jboss/test/ws/jaxrpc/**</exclude>
-
<!--# [CXF-1519] Explicitly set the namespace of a WebFault-->
<exclude>org/jboss/test/ws/jaxws/jbws1904/**</exclude>
Modified: stack/cxf/trunk/modules/testsuite/shared-tests/pom.xml
===================================================================
--- stack/cxf/trunk/modules/testsuite/shared-tests/pom.xml 2014-05-16 08:50:04 UTC (rev 18661)
+++ stack/cxf/trunk/modules/testsuite/shared-tests/pom.xml 2014-05-16 10:02:58 UTC (rev 18662)
@@ -90,7 +90,6 @@
<ant antfile="scripts/antrun-wsprovide.xml" target="wsprovide"/>
<ant antfile="src/test/ant-import/build-jars-jaxws.xml" target="build-jars-jaxws"/>
<ant antfile="src/test/ant-import/build-samples-jaxws.xml" target="build-samples-jaxws"/>
- <ant antfile="src/test/ant-import/build-samples-jaxrpc.xml" target="build-samples-jaxrpc"/>
</target>
</configuration>
</execution>
Deleted: stack/cxf/trunk/modules/testsuite/shared-tests/src/test/ant-import/build-samples-jaxrpc.xml
===================================================================
--- stack/cxf/trunk/modules/testsuite/shared-tests/src/test/ant-import/build-samples-jaxrpc.xml 2014-05-16 08:50:04 UTC (rev 18661)
+++ stack/cxf/trunk/modules/testsuite/shared-tests/src/test/ant-import/build-samples-jaxrpc.xml 2014-05-16 10:02:58 UTC (rev 18662)
@@ -1,453 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!--
- ~ JBoss, Home of Professional Open Source.
- ~ Copyright 2011, Red Hat, Inc., 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.
- -->
-
-<project>
-
- <!-- ================================================================== -->
- <!-- Building -->
- <!-- ================================================================== -->
-
- <target name="build-samples-jaxrpc" description="Build the jaxrpc samples deployments">
-
- <mkdir dir="${tests.output.dir}/test-libs"/>
-
- <!-- jaxrpc-samples-docstyle-bare -->
- <war warfile="${tests.output.dir}/test-libs/jaxrpc-samples-docstyle-bare.war"
- webxml="${tests.output.dir}/test-resources/jaxrpc/samples/docstyle/bare/WEB-INF/web.xml">
- <classes dir="${tests.output.dir}/test-classes">
- <include name="org/jboss/test/ws/jaxrpc/samples/docstyle/bare/TrivialEndpointJSE.class"/>
- <include name="org/jboss/test/ws/jaxrpc/samples/docstyle/bare/TrivialService.class"/>
- <include name="org/jboss/test/ws/jaxrpc/samples/docstyle/bare/TrivialOrder.class"/>
- <include name="org/jboss/test/ws/jaxrpc/samples/docstyle/bare/TrivialOrderResponse.class"/>
- </classes>
- <webinf dir="${tests.output.dir}/test-resources/jaxrpc/samples/docstyle/bare/WEB-INF">
- <include name="jaxrpc-mapping.xml"/>
- <include name="webservices.xml"/>
- <include name="wsdl/**"/>
- </webinf>
- </war>
- <jar jarfile="${tests.output.dir}/test-libs/jaxrpc-samples-docstyle-bare-client.jar">
- <fileset dir="${tests.output.dir}/test-classes">
- <include name="org/jboss/test/ws/jaxrpc/samples/docstyle/bare/TrivialService.class"/>
- <include name="org/jboss/test/ws/jaxrpc/samples/docstyle/bare/TrivialOrder.class"/>
- <include name="org/jboss/test/ws/jaxrpc/samples/docstyle/bare/TrivialOrderResponse.class"/>
- </fileset>
- <metainf dir="${tests.output.dir}/test-resources/jaxrpc/samples/docstyle/bare/META-INF">
- <include name="application-client.xml"/>
- <include name="jboss-client.xml"/>
- </metainf>
- <metainf dir="${tests.output.dir}/test-resources/jaxrpc/samples/docstyle/bare/WEB-INF">
- <include name="jaxrpc-mapping.xml"/>
- <include name="wsdl/**"/>
- </metainf>
- </jar>
-
- <!-- jaxrpc-samples-docstyle-wrapped -->
- <war warfile="${tests.output.dir}/test-libs/jaxrpc-samples-docstyle-wrapped.war"
- webxml="${tests.output.dir}/test-resources/jaxrpc/samples/docstyle/wrapped/WEB-INF/web.xml">
- <classes dir="${tests.output.dir}/test-classes">
- <include name="org/jboss/test/ws/jaxrpc/samples/docstyle/wrapped/TrivialEndpointJSE.class"/>
- <include name="org/jboss/test/ws/jaxrpc/samples/docstyle/wrapped/TrivialService.class"/>
- <include name="org/jboss/test/ws/jaxrpc/samples/docstyle/wrapped/TrivialService*RequestStruct.class"/>
- <include name="org/jboss/test/ws/jaxrpc/samples/docstyle/wrapped/TrivialService*ResponseStruct.class"/>
- </classes>
- <webinf dir="${tests.output.dir}/test-resources/jaxrpc/samples/docstyle/wrapped/WEB-INF">
- <include name="jaxrpc-mapping.xml"/>
- <include name="webservices.xml"/>
- <include name="wsdl/**"/>
- </webinf>
- </war>
- <jar jarfile="${tests.output.dir}/test-libs/jaxrpc-samples-docstyle-wrapped-client.jar">
- <fileset dir="${tests.output.dir}/test-classes">
- <include name="org/jboss/test/ws/jaxrpc/samples/docstyle/wrapped/TrivialService.class"/>
- <include name="org/jboss/test/ws/jaxrpc/samples/docstyle/wrapped/TrivialService*RequestStruct.class"/>
- <include name="org/jboss/test/ws/jaxrpc/samples/docstyle/wrapped/TrivialService*ResponseStruct.class"/>
- </fileset>
- <metainf dir="${tests.output.dir}/test-resources/jaxrpc/samples/docstyle/wrapped/META-INF">
- <include name="application-client.xml"/>
- <include name="jboss-client.xml"/>
- </metainf>
- <metainf dir="${tests.output.dir}/test-resources/jaxrpc/samples/docstyle/wrapped/WEB-INF">
- <include name="jaxrpc-mapping.xml"/>
- <include name="wsdl/**"/>
- </metainf>
- </jar>
-
- <!-- jaxrpc-samples-exception -->
- <war destfile="${tests.output.dir}/test-libs/jaxrpc-samples-exception.war" webxml="${tests.output.dir}/test-resources/jaxrpc/samples/exception/WEB-INF/web.xml">
- <classes dir="${tests.output.dir}/test-classes">
- <include name="org/jboss/test/ws/jaxrpc/samples/exception/*Exception.class"/>
- <include name="org/jboss/test/ws/jaxrpc/samples/exception/ServerHandler.class"/>
- <include name="org/jboss/test/ws/jaxrpc/samples/exception/ExceptionServiceInterface.class"/>
- <include name="org/jboss/test/ws/jaxrpc/samples/exception/ExceptionBeanImpl.class"/>
- </classes>
- <webinf dir="${tests.output.dir}/test-resources/jaxrpc/samples/exception/WEB-INF">
- <include name="jaxrpc-mapping.xml"/>
- <include name="webservices.xml"/>
- <include name="wsdl/**"/>
- </webinf>
- </war>
- <jar destfile="${tests.output.dir}/test-libs/jaxrpc-samples-exception-client.jar">
- <fileset dir="${tests.output.dir}/test-classes">
- <include name="org/jboss/test/ws/jaxrpc/samples/exception/*Exception.class"/>
- <include name="org/jboss/test/ws/jaxrpc/samples/exception/ExceptionServiceInterface.class"/>
- <include name="org/jboss/test/ws/jaxrpc/samples/exception/ExceptionService.class"/>
- </fileset>
- <metainf dir="${tests.output.dir}/test-resources/jaxrpc/samples/exception/META-INF">
- <include name="application-client.xml"/>
- <include name="jboss-client.xml"/>
- </metainf>
- <metainf dir="${tests.output.dir}/test-resources/jaxrpc/samples/exception/WEB-INF">
- <include name="jaxrpc-mapping.xml"/>
- <include name="wsdl/**"/>
- </metainf>
- </jar>
-
- <!-- jaxrpc-samples-handler -->
- <war warfile="${tests.output.dir}/test-libs/jaxrpc-samples-handler.war" webxml="${tests.output.dir}/test-resources/jaxrpc/samples/handler/WEB-INF/web.xml">
- <classes dir="${tests.output.dir}/test-classes">
- <include name="org/jboss/test/ws/jaxrpc/samples/handler/*Service.class"/>
- <include name="org/jboss/test/ws/jaxrpc/samples/handler/*ServiceBean.class"/>
- <include name="org/jboss/test/ws/jaxrpc/samples/handler/ServerSideHandler.class"/>
- </classes>
- <webinf dir="${tests.output.dir}/test-resources/jaxrpc/samples/handler/WEB-INF">
- <include name="jaxrpc-mapping.xml"/>
- <include name="webservices.xml"/>
- <include name="wsdl/**"/>
- </webinf>
- </war>
- <jar jarfile="${tests.output.dir}/test-libs/jaxrpc-samples-handler-client.jar">
- <fileset dir="${tests.output.dir}/test-classes">
- <include name="org/jboss/test/ws/jaxrpc/samples/handler/*Service.class"/>
- <include name="org/jboss/test/ws/jaxrpc/samples/handler/ClientSideHandler.class"/>
- </fileset>
- <metainf dir="${tests.output.dir}/test-resources/jaxrpc/samples/handler/WEB-INF">
- <include name="jaxrpc-mapping.xml"/>
- <include name="wsdl/**"/>
- </metainf>
- <metainf dir="${tests.output.dir}/test-resources/jaxrpc/samples/handler/META-INF">
- <include name="application-client.xml"/>
- <include name="jboss-client.xml"/>
- </metainf>
- </jar>
-
- <!-- jaxrpc-samples-holder -->
- <war warfile="${tests.output.dir}/test-libs/jaxrpc-samples-holder.war" webxml="${tests.output.dir}/test-resources/jaxrpc/samples/holder/WEB-INF/web.xml">
- <classes dir="${tests.output.dir}/test-classes">
- <include name="org/jboss/test/ws/jaxrpc/samples/holder/*Service.class"/>
- <include name="org/jboss/test/ws/jaxrpc/samples/holder/*ServiceBean.class"/>
- </classes>
- <webinf dir="${tests.output.dir}/test-resources/jaxrpc/samples/holder/WEB-INF">
- <include name="jaxrpc-mapping.xml"/>
- <include name="webservices.xml"/>
- <include name="wsdl/**"/>
- </webinf>
- </war>
- <jar jarfile="${tests.output.dir}/test-libs/jaxrpc-samples-holder-client.jar">
- <fileset dir="${tests.output.dir}/test-classes">
- <include name="org/jboss/test/ws/jaxrpc/samples/holder/*Service.class"/>
- </fileset>
- <metainf dir="${tests.output.dir}/test-resources/jaxrpc/samples/holder/WEB-INF">
- <include name="jaxrpc-mapping.xml"/>
- <include name="wsdl/**"/>
- </metainf>
- <metainf dir="${tests.output.dir}/test-resources/jaxrpc/samples/holder/META-INF">
- <include name="application-client.xml"/>
- <include name="jboss-client.xml"/>
- </metainf>
- </jar>
-
- <!-- jaxrpc-samples-jsr109ejb-rpc -->
- <jar jarfile="${tests.output.dir}/test-libs/jaxrpc-samples-jsr109ejb-rpc.jar">
- <fileset dir="${tests.output.dir}/test-classes">
- <include name="org/jboss/test/ws/jaxrpc/samples/jsr109ejb/*Type.class"/>
- <include name="org/jboss/test/ws/jaxrpc/samples/jsr109ejb/*Service.class"/>
- <include name="org/jboss/test/ws/jaxrpc/samples/jsr109ejb/*EJBEndpoint.class"/>
- </fileset>
- <metainf dir="${tests.output.dir}/test-resources/jaxrpc/samples/jsr109ejb/rpclit/META-INF">
- <include name="ejb-jar.xml"/>
- <include name="jboss-webservices.xml"/>
- <include name="jaxrpc-mapping.xml"/>
- <include name="webservices.xml"/>
- <include name="wsdl/**"/>
- </metainf>
- </jar>
- <jar jarfile="${tests.output.dir}/test-libs/jaxrpc-samples-jsr109ejb-rpc-client.jar">
- <fileset dir="${tests.output.dir}/test-classes">
- <include name="org/jboss/test/ws/jaxrpc/samples/jsr109ejb/*Type.class"/>
- <include name="org/jboss/test/ws/jaxrpc/samples/jsr109ejb/*Service.class"/>
- </fileset>
- <metainf dir="${tests.output.dir}/test-resources/jaxrpc/samples/jsr109ejb/rpclit/META-INF">
- <include name="application-client.xml"/>
- <include name="jboss-client.xml"/>
- <include name="jaxrpc-mapping.xml"/>
- <include name="wsdl/**"/>
- </metainf>
- </jar>
-
- <!-- jaxrpc-samples-jsr109ejb-doc -->
- <jar jarfile="${tests.output.dir}/test-libs/jaxrpc-samples-jsr109ejb-doc.jar">
- <fileset dir="${tests.output.dir}/test-classes">
- <include name="org/jboss/test/ws/jaxrpc/samples/jsr109ejb/*Type.class"/>
- <include name="org/jboss/test/ws/jaxrpc/samples/jsr109ejb/*Struct.class"/>
- <include name="org/jboss/test/ws/jaxrpc/samples/jsr109ejb/*Service.class"/>
- <include name="org/jboss/test/ws/jaxrpc/samples/jsr109ejb/*EJBEndpoint.class"/>
- </fileset>
- <metainf dir="${tests.output.dir}/test-resources/jaxrpc/samples/jsr109ejb/doclit/META-INF">
- <include name="ejb-jar.xml"/>
- <include name="jboss-webservices.xml"/>
- <include name="jaxrpc-mapping.xml"/>
- <include name="webservices.xml"/>
- <include name="wsdl/**"/>
- </metainf>
- </jar>
- <jar jarfile="${tests.output.dir}/test-libs/jaxrpc-samples-jsr109ejb-doc-client.jar">
- <fileset dir="${tests.output.dir}/test-classes">
- <include name="org/jboss/test/ws/jaxrpc/samples/jsr109ejb/*Type.class"/>
- <include name="org/jboss/test/ws/jaxrpc/samples/jsr109ejb/*Struct.class"/>
- <include name="org/jboss/test/ws/jaxrpc/samples/jsr109ejb/*Service.class"/>
- </fileset>
- <metainf dir="${tests.output.dir}/test-resources/jaxrpc/samples/jsr109ejb/doclit/META-INF">
- <include name="application-client.xml"/>
- <include name="jboss-client.xml"/>
- <include name="jaxrpc-mapping.xml"/>
- <include name="wsdl/**"/>
- </metainf>
- </jar>
-
- <!-- jaxrpc-samples-jsr109pojo-rpc -->
- <war warfile="${tests.output.dir}/test-libs/jaxrpc-samples-jsr109pojo-rpc.war"
- webxml="${tests.output.dir}/test-resources/jaxrpc/samples/jsr109pojo/rpclit/WEB-INF/web.xml">
- <classes dir="${tests.output.dir}/test-classes">
- <include name="org/jboss/test/ws/jaxrpc/samples/jsr109pojo/*Type.class"/>
- <include name="org/jboss/test/ws/jaxrpc/samples/jsr109pojo/*Service.class"/>
- <include name="org/jboss/test/ws/jaxrpc/samples/jsr109pojo/*JSEEndpoint.class"/>
- </classes>
- <webinf dir="${tests.output.dir}/test-resources/jaxrpc/samples/jsr109pojo/rpclit/WEB-INF">
- <include name="jaxrpc-mapping.xml"/>
- <include name="webservices.xml"/>
- <include name="jboss-webservices.xml"/>
- <include name="wsdl/**"/>
- </webinf>
- </war>
- <jar jarfile="${tests.output.dir}/test-libs/jaxrpc-samples-jsr109pojo-rpc-client.jar">
- <fileset dir="${tests.output.dir}/test-classes">
- <include name="org/jboss/test/ws/jaxrpc/samples/jsr109pojo/*Type.class"/>
- <include name="org/jboss/test/ws/jaxrpc/samples/jsr109pojo/*Service.class"/>
- </fileset>
- <metainf dir="${tests.output.dir}/test-resources/jaxrpc/samples/jsr109pojo/rpclit/META-INF">
- <include name="application-client.xml"/>
- <include name="jboss-client.xml"/>
- </metainf>
- <metainf dir="${tests.output.dir}/test-resources/jaxrpc/samples/jsr109pojo/rpclit/WEB-INF">
- <include name="jaxrpc-mapping.xml"/>
- <include name="wsdl/**"/>
- </metainf>
- </jar>
-
- <!-- jaxrpc-samples-jsr109pojo-doc -->
- <war warfile="${tests.output.dir}/test-libs/jaxrpc-samples-jsr109pojo-doc.war"
- webxml="${tests.output.dir}/test-resources/jaxrpc/samples/jsr109pojo/doclit/WEB-INF/web.xml">
- <classes dir="${tests.output.dir}/test-classes">
- <include name="org/jboss/test/ws/jaxrpc/samples/jsr109pojo/*Type.class"/>
- <include name="org/jboss/test/ws/jaxrpc/samples/jsr109pojo/*Struct.class"/>
- <include name="org/jboss/test/ws/jaxrpc/samples/jsr109pojo/*Service.class"/>
- <include name="org/jboss/test/ws/jaxrpc/samples/jsr109pojo/*JSEEndpoint.class"/>
- </classes>
- <webinf dir="${tests.output.dir}/test-resources/jaxrpc/samples/jsr109pojo/doclit/WEB-INF">
- <include name="jaxrpc-mapping.xml"/>
- <include name="webservices.xml"/>
- <include name="wsdl/**"/>
- </webinf>
- </war>
- <jar jarfile="${tests.output.dir}/test-libs/jaxrpc-samples-jsr109pojo-doc-client.jar">
- <fileset dir="${tests.output.dir}/test-classes">
- <include name="org/jboss/test/ws/jaxrpc/samples/jsr109pojo/*Type.class"/>
- <include name="org/jboss/test/ws/jaxrpc/samples/jsr109pojo/*Struct.class"/>
- <include name="org/jboss/test/ws/jaxrpc/samples/jsr109pojo/*Service.class"/>
- </fileset>
- <metainf dir="${tests.output.dir}/test-resources/jaxrpc/samples/jsr109pojo/doclit/META-INF">
- <include name="application-client.xml"/>
- <include name="jboss-client.xml"/>
- </metainf>
- <metainf dir="${tests.output.dir}/test-resources/jaxrpc/samples/jsr109pojo/doclit/WEB-INF">
- <include name="jaxrpc-mapping.xml"/>
- <include name="wsdl/**"/>
- </metainf>
- </jar>
-
- <!-- jaxrpc-samples-message -->
- <war warfile="${tests.output.dir}/test-libs/jaxrpc-samples-message.war" webxml="${tests.output.dir}/test-resources/jaxrpc/samples/message/WEB-INF/web.xml">
- <classes dir="${tests.output.dir}/test-classes">
- <include name="org/jboss/test/ws/jaxrpc/samples/message/*Service.class"/>
- <include name="org/jboss/test/ws/jaxrpc/samples/message/*ServiceBean.class"/>
- </classes>
- <webinf dir="${tests.output.dir}/test-resources/jaxrpc/samples/message/WEB-INF">
- <include name="jaxrpc-mapping.xml"/>
- <include name="webservices.xml"/>
- <include name="wsdl/**"/>
- </webinf>
- <manifest>
- <attribute name="Dependencies" value="org.jboss.ws.common"/>
- </manifest>
- </war>
- <jar jarfile="${tests.output.dir}/test-libs/jaxrpc-samples-message-client.jar">
- <fileset dir="${tests.output.dir}/test-classes">
- <include name="org/jboss/test/ws/jaxrpc/samples/message/*Service.class"/>
- </fileset>
- <metainf dir="${tests.output.dir}/test-resources/jaxrpc/samples/message/WEB-INF">
- <include name="jaxrpc-mapping.xml"/>
- <include name="wsdl/**"/>
- </metainf>
- <metainf dir="${tests.output.dir}/test-resources/jaxrpc/samples/message/META-INF">
- <include name="application-client.xml"/>
- <include name="jboss-client.xml"/>
- </metainf>
- </jar>
-
- <!-- jaxrpc-samples-oneway -->
- <war warfile="${tests.output.dir}/test-libs/jaxrpc-samples-oneway.war" webxml="${tests.output.dir}/test-resources/jaxrpc/samples/oneway/WEB-INF/web.xml">
- <classes dir="${tests.output.dir}/test-classes">
- <include name="org/jboss/test/ws/jaxrpc/samples/oneway/*Service.class"/>
- <include name="org/jboss/test/ws/jaxrpc/samples/oneway/*ServiceBean.class"/>
- </classes>
- <webinf dir="${tests.output.dir}/test-resources/jaxrpc/samples/oneway/WEB-INF">
- <include name="jaxrpc-mapping.xml"/>
- <include name="webservices.xml"/>
- <include name="wsdl/**"/>
- </webinf>
- </war>
- <jar jarfile="${tests.output.dir}/test-libs/jaxrpc-samples-oneway-client.jar">
- <fileset dir="${tests.output.dir}/test-classes">
- <include name="org/jboss/test/ws/jaxrpc/samples/oneway/*Service.class"/>
- </fileset>
- <metainf dir="${tests.output.dir}/test-resources/jaxrpc/samples/oneway/WEB-INF">
- <include name="jaxrpc-mapping.xml"/>
- <include name="wsdl/**"/>
- </metainf>
- <metainf dir="${tests.output.dir}/test-resources/jaxrpc/samples/oneway/META-INF">
- <include name="application-client.xml"/>
- <include name="jboss-client.xml"/>
- </metainf>
- </jar>
-
- <!-- jaxrpc-samples-rpcstyle -->
- <war warfile="${tests.output.dir}/test-libs/jaxrpc-samples-rpcstyle.war" webxml="${tests.output.dir}/test-resources/jaxrpc/samples/rpcstyle/WEB-INF/web.xml">
- <classes dir="${tests.output.dir}/test-classes">
- <include name="org/jboss/test/ws/jaxrpc/samples/rpcstyle/TrivialEndpointJSE.class"/>
- <include name="org/jboss/test/ws/jaxrpc/samples/rpcstyle/TrivialService.class"/>
- </classes>
- <webinf dir="${tests.output.dir}/test-resources/jaxrpc/samples/rpcstyle/WEB-INF">
- <include name="jaxrpc-mapping.xml"/>
- <include name="webservices.xml"/>
- <include name="wsdl/**"/>
- </webinf>
- </war>
- <jar jarfile="${tests.output.dir}/test-libs/jaxrpc-samples-rpcstyle-client.jar">
- <fileset dir="${tests.output.dir}/test-classes">
- <include name="org/jboss/test/ws/jaxrpc/samples/rpcstyle/TrivialService.class"/>
- </fileset>
- <metainf dir="${tests.output.dir}/test-resources/jaxrpc/samples/rpcstyle/META-INF">
- <include name="application-client.xml"/>
- <include name="jboss-client.xml"/>
- </metainf>
- <metainf dir="${tests.output.dir}/test-resources/jaxrpc/samples/rpcstyle/WEB-INF">
- <include name="jaxrpc-mapping.xml"/>
- <include name="wsdl/**"/>
- </metainf>
- </jar>
-
- <!-- jaxrpc-samples-serviceref -->
- <war warfile="${tests.output.dir}/test-libs/jaxrpc-samples-serviceref.war" webxml="${tests.output.dir}/test-resources/jaxrpc/samples/serviceref/WEB-INF/web.xml">
- <classes dir="${tests.output.dir}/test-classes">
- <include name="org/jboss/test/ws/jaxrpc/samples/serviceref/TestEndpointImpl.class"/>
- <include name="org/jboss/test/ws/jaxrpc/samples/serviceref/TestEndpoint.class"/>
- </classes>
- <webinf dir="${tests.output.dir}/test-resources/jaxrpc/samples/serviceref/META-INF">
- <include name="jaxrpc-mapping.xml"/>
- <include name="wsdl/**"/>
- </webinf>
- <webinf dir="${tests.output.dir}/test-resources/jaxrpc/samples/serviceref/WEB-INF">
- <include name="webservices.xml"/>
- </webinf>
- </war>
- <war destfile="${tests.output.dir}/test-libs/jaxrpc-samples-serviceref-servlet-client.war"
- webxml="${tests.output.dir}/test-resources/jaxrpc/samples/serviceref/servlet-client/WEB-INF/web.xml">
- <classes dir="${tests.output.dir}/test-classes">
- <include name="org/jboss/test/ws/jaxrpc/samples/serviceref/ServletClient.class"/>
- <include name="org/jboss/test/ws/jaxrpc/samples/serviceref/TestEndpointService.class"/>
- <include name="org/jboss/test/ws/jaxrpc/samples/serviceref/TestEndpoint.class"/>
- <include name="org/jboss/test/ws/jaxrpc/samples/serviceref/ExampleHandler.class"/>
- </classes>
- <webinf dir="${tests.output.dir}/test-resources/jaxrpc/samples/serviceref/META-INF">
- <include name="jaxrpc-mapping.xml"/>
- <include name="wsdl/**"/>
- </webinf>
- </war>
- <jar destfile="${tests.output.dir}/test-libs/jaxrpc-samples-serviceref-ejbclient.jar">
- <fileset dir="${tests.output.dir}/test-classes">
- <include name="org/jboss/test/ws/jaxrpc/samples/serviceref/EJBClient.class"/>
- <include name="org/jboss/test/ws/jaxrpc/samples/serviceref/EJBRemote.class"/>
- <include name="org/jboss/test/ws/jaxrpc/samples/serviceref/EJBRemoteHome.class"/>
- <include name="org/jboss/test/ws/jaxrpc/samples/serviceref/TestEndpointService.class"/>
- <include name="org/jboss/test/ws/jaxrpc/samples/serviceref/TestEndpoint.class"/>
- </fileset>
- <metainf dir="${tests.output.dir}/test-resources/jaxrpc/samples/serviceref/META-INF">
- <include name="ejb-jar.xml"/>
- <include name="jaxrpc-mapping.xml"/>
- <include name="wsdl/**"/>
- </metainf>
- </jar>
-
- <!-- jaxrpc-samples-swa -->
- <war warfile="${tests.output.dir}/test-libs/jaxrpc-samples-swa.war" webxml="${tests.output.dir}/test-resources/jaxrpc/samples/swa/WEB-INF/web.xml">
- <classes dir="${tests.output.dir}/test-classes">
- <include name="org/jboss/test/ws/jaxrpc/samples/swa/AttachmentImpl.class"/>
- <include name="org/jboss/test/ws/jaxrpc/samples/swa/Attachment.class"/>
- </classes>
- <webinf dir="${tests.output.dir}/test-resources/jaxrpc/samples/swa/WEB-INF">
- <include name="jaxrpc-mapping.xml"/>
- <include name="webservices.xml"/>
- <include name="wsdl/**"/>
- </webinf>
- </war>
- <jar destfile="${tests.output.dir}/test-libs/jaxrpc-samples-swa-client.jar">
- <fileset dir="${tests.output.dir}/test-classes">
- <include name="org/jboss/test/ws/jaxrpc/samples/swa/Attachment.class"/>
- </fileset>
- <metainf dir="${tests.output.dir}/test-resources/jaxrpc/samples/swa/META-INF">
- <include name="application-client.xml"/>
- <include name="jboss-client.xml"/>
- </metainf>
- <metainf dir="${tests.output.dir}/test-resources/jaxrpc/samples/swa/WEB-INF">
- <include name="jaxrpc-mapping.xml"/>
- <include name="wsdl/**"/>
- </metainf>
- </jar>
-
- <!-- Please add alphabetically -->
-
- </target>
-
-</project>
Modified: stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws1582/JBWS1582TestCase.java
===================================================================
--- stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws1582/JBWS1582TestCase.java 2014-05-16 08:50:04 UTC (rev 18661)
+++ stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws1582/JBWS1582TestCase.java 2014-05-16 10:02:58 UTC (rev 18662)
@@ -81,11 +81,6 @@
{
assertTrue(response.contains("Error reading XMLStreamReader"));
}
- else if(isIntegrationNative())
- {
- assertTrue(response.contains("DOCTYPE is disallowed when the feature"));
- assertTrue(response.contains("http://apache.org/xml/features/disallow-doctype-decl"));
- }
else
{
throw new IllegalStateException("Unknown SOAP stack in use");
@@ -100,11 +95,6 @@
{
assertTrue(response.contains("Error reading XMLStreamReader"));
}
- else if(isIntegrationNative())
- {
- assertTrue(response.contains("DOCTYPE is disallowed when the feature"));
- assertTrue(response.contains("http://apache.org/xml/features/disallow-doctype-decl"));
- }
else
{
throw new IllegalStateException("Unknown SOAP stack in use");
Modified: stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws3477/JaxWsSpiProviderTestCase.java
===================================================================
--- stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws3477/JaxWsSpiProviderTestCase.java 2014-05-16 08:50:04 UTC (rev 18661)
+++ stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws3477/JaxWsSpiProviderTestCase.java 2014-05-16 10:02:58 UTC (rev 18662)
@@ -48,9 +48,6 @@
if (isIntegrationCXF()) {
defaultProvider = "org.jboss.wsf.stack.cxf.client.ProviderImpl";
}
- else if (isIntegrationNative()) {
- defaultProvider = "org.jboss.ws.core.jaxws.spi.ProviderImpl";
- }
}
public void testClientSide()
Modified: stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/samples/xop/doclit/XOPBase.java
===================================================================
--- stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/samples/xop/doclit/XOPBase.java 2014-05-16 08:50:04 UTC (rev 18661)
+++ stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/samples/xop/doclit/XOPBase.java 2014-05-16 10:02:58 UTC (rev 18662)
@@ -138,31 +138,6 @@
assertTrue(response.getData() instanceof Source);
}
- public void testAttachmentpartSwap() throws Exception
- {
- if (!isIntegrationNative())
- {
- //early return for non-native stack integration, as the test basically
- //check for native stack specific implementation details
- return;
- }
- getBinding().setMTOMEnabled(true);
-
- DataHandler dh = new DataHandler(new GeneratorDataSource(1024 * 128));
- DHResponse response = getPort().echoDataHandler(new DHRequest(dh));
- assertNotNull(response);
- assertNotNull(response.getDataHandler().getContent());
-
- File tmpDir = new File(System.getProperty("jboss.home") + FS + "standalone" + FS + "tmp" + FS + "jbossws");
- assertTrue("Temp dir doesn't exist: " + tmpDir, tmpDir.exists());
-
- //[JBWS-2834]: windows file delete issue
- /*for (String fileName : tmpDir.list())
- {
- assertTrue("Attachment part swap file does still exist: " + fileName, fileName.indexOf("JBossWSattachment") == -1);
- }*/
- }
-
protected Object getContent(DataHandler dh) throws IOException
{
Object content = dh.getContent();
Modified: stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/smoke/tools/PluginBase.java
===================================================================
--- stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/smoke/tools/PluginBase.java 2014-05-16 08:50:04 UTC (rev 18661)
+++ stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/smoke/tools/PluginBase.java 2014-05-16 10:02:58 UTC (rev 18662)
@@ -151,7 +151,7 @@
protected void readIntegrationStack()
{
- this.integrationNative = isIntegrationNative();
+ this.integrationNative = false;
this.integrationCXF = isIntegrationCXF();
}
}
Modified: stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/smoke/tools/WSProviderTestCaseForked.java
===================================================================
--- stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/smoke/tools/WSProviderTestCaseForked.java 2014-05-16 08:50:04 UTC (rev 18661)
+++ stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/smoke/tools/WSProviderTestCaseForked.java 2014-05-16 10:02:58 UTC (rev 18662)
@@ -94,8 +94,6 @@
*/
protected boolean filtered(String jarName)
{
- return (isIntegrationNative() &&
- (jarName.indexOf("jaxws-rt")!=-1 || jarName.indexOf("jaxws-tools")!=-1)
- );
+ return false;
}
}
Modified: stack/cxf/trunk/pom.xml
===================================================================
--- stack/cxf/trunk/pom.xml 2014-05-16 08:50:04 UTC (rev 18661)
+++ stack/cxf/trunk/pom.xml 2014-05-16 10:02:58 UTC (rev 18662)
@@ -67,7 +67,6 @@
<jbossws.common.tools.version>1.2.0.Final</jbossws.common.tools.version>
<jbossws.wildfly800.version>5.0.0-SNAPSHOT</jbossws.wildfly800.version>
<jbossws.wildfly810.version>5.0.0-SNAPSHOT</jbossws.wildfly810.version>
- <jbossws.native.version>4.2.0.Final</jbossws.native.version>
<wildfly800.version>8.0.0.Final</wildfly800.version>
<wildfly810.version>8.1.0.CR2</wildfly810.version>
<wildfly900.version>9.0.0.Alpha1-SNAPSHOT</wildfly900.version>
@@ -86,7 +85,6 @@
<io.undertow.version>1.0.10.Final</io.undertow.version>
<jaxb.api.version>1.0.4.Final</jaxb.api.version>
<jaxb.impl.version>2.2.6</jaxb.impl.version>
- <jaxrpc.api.version>1.0.1.Final</jaxrpc.api.version>
<jaxws.api.version>2.0.2.Final</jaxws.api.version>
<jsr181.api.version>1.0-MR1</jsr181.api.version>
<commons-collections.version>3.2.1</commons-collections.version>
@@ -849,11 +847,6 @@
</dependency>
<dependency>
- <groupId>org.jboss.spec.javax.xml.rpc</groupId>
- <artifactId>jboss-jaxrpc-api_1.1_spec</artifactId>
- <version>${jaxrpc.api.version}</version>
- </dependency>
- <dependency>
<groupId>org.jboss.spec.javax.xml.soap</groupId>
<artifactId>jboss-saaj-api_1.3_spec</artifactId>
<version>${saaj.api.version}</version>
@@ -1064,53 +1057,7 @@
<scope>provided</scope>
</dependency>
- <!-- JBossWS Native dependencies for installation and testsuite only -->
<dependency>
- <groupId>org.jboss.ws.native</groupId>
- <artifactId>jbossws-native-core</artifactId>
- <version>${jbossws.native.version}</version>
- <exclusions>
- <exclusion>
- <groupId>javax.servlet</groupId>
- <artifactId>servlet-api</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.jboss</groupId>
- <artifactId>jbossxb</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.javassist</groupId>
- <artifactId>javassist</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.jboss</groupId>
- <artifactId>jboss-common-core</artifactId>
- </exclusion>
- <exclusion>
- <groupId>xerces</groupId>
- <artifactId>xercesImpl</artifactId>
- </exclusion>
- <exclusion>
- <groupId>javax.mail</groupId>
- <artifactId>mail</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.jboss.netty</groupId>
- <artifactId>netty</artifactId>
- </exclusion>
- <exclusion>
- <groupId>wsdl4j</groupId>
- <artifactId>wsdl4j</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>org.jboss.ws.native</groupId>
- <artifactId>jbossws-native-services</artifactId>
- <version>${jbossws.native.version}</version>
- </dependency>
-
- <dependency>
<groupId>javax.jws</groupId>
<artifactId>jsr181-api</artifactId>
<version>${jsr181.api.version}</version>
10 years, 7 months
- 1
- 0
JBossWS SVN: r18661 - in hudson/trunk: hudson-home and 4 other directories.
by jbossws-commits＠lists.jboss.org
Author: asoldano
Date: 2014-05-16 04:50:04 -0400 (Fri, 16 May 2014)
New Revision: 18661
Removed:
hudson/trunk/hudson-home/jobs/AS-7.2.0/
hudson/trunk/hudson-home/jobs/CXF-BINDIST-AS-7.2.0-SPRING/
hudson/trunk/hudson-home/jobs/CXF-BINDIST-AS-7.2.0/
hudson/trunk/hudson-home/jobs/CXF-CORE-AS-7.2.0-SPRING/
hudson/trunk/hudson-home/jobs/CXF-CORE-AS-7.2.0/
hudson/trunk/hudson-home/jobs/CXF-SRCDIST-AS-7.2.0-SPRING/
hudson/trunk/hudson-home/jobs/CXF-SRCDIST-AS-7.2.0/
Modified:
hudson/trunk/ant.properties.example
hudson/trunk/hudson-home/config.xml
hudson/trunk/hudson-home/jobs/AS-ALL/config.xml
hudson/trunk/hudson-home/jobs/CXF-ALL/config.xml
hudson/trunk/hudson-home/jobs/CXF-LIGHT/config.xml
Log:
[JBWS-3780] Removing AS720 hudson jobs
Modified: hudson/trunk/ant.properties.example
===================================================================
--- hudson/trunk/ant.properties.example 2014-05-15 17:40:32 UTC (rev 18660)
+++ hudson/trunk/ant.properties.example 2014-05-16 08:50:04 UTC (rev 18661)
@@ -19,10 +19,6 @@
hudson.cxf.url=http://anonsvn.jboss.org/repos/jbossws/stack/cxf/trunk
-hudson.jboss720.url=https://github.com/jbossas/jboss-as
-hudson.jboss720.build=jboss-as-7.2.0.Final
-hudson.jboss720.rev=7.2.0.Final-prerelease1
-
hudson.jboss800.url=https://github.com/wildfly/wildfly
hudson.jboss800.build=wildfly-8.0.0.Final
hudson.jboss800.rev=8.0.0.Final
Modified: hudson/trunk/hudson-home/config.xml
===================================================================
--- hudson/trunk/hudson-home/config.xml 2014-05-15 17:40:32 UTC (rev 18660)
+++ hudson/trunk/hudson-home/config.xml 2014-05-16 08:50:04 UTC (rev 18661)
@@ -35,7 +35,6 @@
<tr><td colspan=2></td></tr>
<tr><th align=left>JBossWS CXF:</th><td>@hudson.cxf.url@</td></tr>
<tr><td colspan=2></td></tr>
- <tr><th align=left>@hudson.jboss720.build@</th><td>-r(a)hudson.jboss720.rev@ @hudson.jboss720.url@</td></tr>
<tr><th align=left>@hudson.jboss800.build@</th><td>-r(a)hudson.jboss800.rev@ @hudson.jboss800.url@</td></tr>
<tr><th align=left>@hudson.jboss810.build@</th><td>-r(a)hudson.jboss810.rev@ @hudson.jboss810.url@</td></tr>
<tr><th align=left>@hudson.jboss900.build@</th><td>-r(a)hudson.jboss900.rev@ @hudson.jboss900.url@</td></tr>
@@ -55,7 +54,6 @@
<no-comparator/>
<string>AS-ALL</string>
<string>AS-LIGHT</string>
- <string>AS-7.2.0</string>
<string>AS-8.0.0</string>
<string>AS-8.0.0-SECMGR</string>
<string>AS-8.1.0</string>
@@ -78,30 +76,24 @@
<no-comparator/>
<string>CXF-ALL</string>
<string>CXF-LIGHT</string>
- <string>CXF-CORE-AS-7.2.0-SUN-JDK-6</string>
<string>CXF-CORE-AS-8.0.0-SUN-JDK-6</string>
<string>CXF-CORE-AS-8.0.0-SECMGR</string>
<string>CXF-CORE-AS-8.1.0-SUN-JDK-6</string>
<string>CXF-CORE-AS-8.1.0-SECMGR</string>
<string>CXF-CORE-AS-9.0.0-SUN-JDK-6</string>
<string>CXF-CORE-AS-9.0.0-SECMGR</string>
- <string>CXF-CORE-AS-7.2.0-SPRING-SUN-JDK-6</string>
<string>CXF-CORE-AS-8.0.0-SPRING-SUN-JDK-6</string>
<string>CXF-CORE-AS-8.1.0-SPRING-SUN-JDK-6</string>
<string>CXF-CORE-AS-9.0.0-SPRING-SUN-JDK-6</string>
- <string>CXF-BINDIST-AS-7.2.0-SUN-JDK-6</string>
<string>CXF-BINDIST-AS-8.0.0-SUN-JDK-6</string>
<string>CXF-BINDIST-AS-8.1.0-SUN-JDK-6</string>
<string>CXF-BINDIST-AS-9.0.0-SUN-JDK-6</string>
- <string>CXF-BINDIST-AS-7.2.0-SPRING-SUN-JDK-6</string>
<string>CXF-BINDIST-AS-8.0.0-SPRING-SUN-JDK-6</string>
<string>CXF-BINDIST-AS-8.1.0-SPRING-SUN-JDK-6</string>
<string>CXF-BINDIST-AS-9.0.0-SPRING-SUN-JDK-6</string>
- <string>CXF-SRCDIST-AS-7.2.0-SUN-JDK-6</string>
<string>CXF-SRCDIST-AS-8.0.0-SUN-JDK-6</string>
<string>CXF-SRCDIST-AS-8.1.0-SUN-JDK-6</string>
<string>CXF-SRCDIST-AS-9.0.0-SUN-JDK-6</string>
- <string>CXF-SRCDIST-AS-7.2.0-SPRING-SUN-JDK-6</string>
<string>CXF-SRCDIST-AS-8.0.0-SPRING-SUN-JDK-6</string>
<string>CXF-SRCDIST-AS-8.1.0-SPRING-SUN-JDK-6</string>
<string>CXF-SRCDIST-AS-9.0.0-SPRING-SUN-JDK-6</string>
@@ -122,22 +114,18 @@
<jobNames class="tree-set">
<no-comparator/>
<string>CXF-LIGHT</string>
- <string>CXF-CORE-AS-7.2.0-SUN-JDK-6</string>
<string>CXF-CORE-AS-8.0.0-SUN-JDK-6</string>
<string>CXF-CORE-AS-8.0.0-SECMGR</string>
<string>CXF-CORE-AS-8.1.0-SUN-JDK-6</string>
<string>CXF-CORE-AS-9.0.0-SECMGR</string>
<string>CXF-CORE-AS-9.0.0-SUN-JDK-6</string>
<string>CXF-CORE-AS-8.1.0-SECMGR</string>
- <string>CXF-CORE-AS-7.2.0-SPRING-SUN-JDK-6</string>
<string>CXF-CORE-AS-8.0.0-SPRING-SUN-JDK-6</string>
<string>CXF-CORE-AS-8.1.0-SPRING-SUN-JDK-6</string>
<string>CXF-CORE-AS-9.0.0-SPRING-SUN-JDK-6</string>
- <string>CXF-BINDIST-AS-7.2.0-SUN-JDK-6</string>
<string>CXF-BINDIST-AS-8.0.0-SUN-JDK-6</string>
<string>CXF-BINDIST-AS-8.1.0-SUN-JDK-6</string>
<string>CXF-BINDIST-AS-9.0.0-SUN-JDK-6</string>
- <string>CXF-BINDIST-AS-7.2.0-SPRING-SUN-JDK-6</string>
<string>CXF-BINDIST-AS-8.0.0-SPRING-SUN-JDK-6</string>
<string>CXF-BINDIST-AS-8.1.0-SPRING-SUN-JDK-6</string>
<string>CXF-BINDIST-AS-9.0.0-SPRING-SUN-JDK-6</string>
Modified: hudson/trunk/hudson-home/jobs/AS-ALL/config.xml
===================================================================
--- hudson/trunk/hudson-home/jobs/AS-ALL/config.xml 2014-05-15 17:40:32 UTC (rev 18660)
+++ hudson/trunk/hudson-home/jobs/AS-ALL/config.xml 2014-05-16 08:50:04 UTC (rev 18661)
@@ -3,7 +3,7 @@
<builders class="vector"/>
<publishers class="vector">
<hudson.tasks.BuildTrigger>
- <childProjects>AS-7.2.0, AS-8.0.0, AS-8.1.0, AS-9.0.0, AS-8.0.0-SECMGR, AS-8.1.0-SECMGR, AS-9.0.0-SECMGR</childProjects>
+ <childProjects>AS-8.0.0, AS-8.1.0, AS-9.0.0, AS-8.0.0-SECMGR, AS-8.1.0-SECMGR, AS-9.0.0-SECMGR</childProjects>
<threshold>
<name>UNSTABLE</name>
<ordinal>1</ordinal>
Modified: hudson/trunk/hudson-home/jobs/CXF-ALL/config.xml
===================================================================
--- hudson/trunk/hudson-home/jobs/CXF-ALL/config.xml 2014-05-15 17:40:32 UTC (rev 18660)
+++ hudson/trunk/hudson-home/jobs/CXF-ALL/config.xml 2014-05-16 08:50:04 UTC (rev 18661)
@@ -4,16 +4,12 @@
<publishers class="vector">
<hudson.tasks.BuildTrigger>
<childProjects>
-CXF-CORE-AS-7.2.0
+CXF-CORE-AS-8.0.0
-, CXF-CORE-AS-8.0.0
-
, CXF-CORE-AS-8.1.0
, CXF-CORE-AS-9.0.0
-, CXF-CORE-AS-7.2.0-SPRING
-
, CXF-CORE-AS-8.0.0-SPRING
, CXF-CORE-AS-8.1.0-SPRING
@@ -26,32 +22,24 @@
, CXF-CORE-AS-9.0.0-SECMGR
-, CXF-BINDIST-AS-7.2.0
-
, CXF-BINDIST-AS-8.0.0
, CXF-BINDIST-AS-8.1.0
, CXF-BINDIST-AS-9.0.0
-, CXF-BINDIST-AS-7.2.0-SPRING
-
, CXF-BINDIST-AS-8.0.0-SPRING
, CXF-BINDIST-AS-8.1.0-SPRING
, CXF-BINDIST-AS-9.0.0-SPRING
-, CXF-SRCDIST-AS-7.2.0
-
, CXF-SRCDIST-AS-8.0.0
, CXF-SRCDIST-AS-8.1.0
, CXF-SRCDIST-AS-9.0.0
-, CXF-SRCDIST-AS-7.2.0-SPRING
-
, CXF-SRCDIST-AS-8.0.0-SPRING
, CXF-SRCDIST-AS-8.1.0-SPRING
Modified: hudson/trunk/hudson-home/jobs/CXF-LIGHT/config.xml
===================================================================
--- hudson/trunk/hudson-home/jobs/CXF-LIGHT/config.xml 2014-05-15 17:40:32 UTC (rev 18660)
+++ hudson/trunk/hudson-home/jobs/CXF-LIGHT/config.xml 2014-05-16 08:50:04 UTC (rev 18661)
@@ -4,12 +4,8 @@
<publishers class="vector">
<hudson.tasks.BuildTrigger>
<childProjects>
-CXF-CORE-AS-7.2.0
+CXF-CORE-AS-8.0.0
-, CXF-CORE-AS-7.2.0-SPRING
-
-, CXF-CORE-AS-8.0.0
-
, CXF-CORE-AS-8.1.0
, CXF-CORE-AS-9.0.0
@@ -26,10 +22,6 @@
, CXF-CORE-AS-9.0.0-SECMGR
-, CXF-BINDIST-AS-7.2.0
-
-, CXF-BINDIST-AS-7.2.0-SPRING
-
, CXF-BINDIST-AS-8.0.0
, CXF-BINDIST-AS-8.1.0
10 years, 7 months
- 1
- 0
JBossWS SVN: r18660 - in stack/cxf/trunk: modules/addons and 28 other directories.
by jbossws-commits＠lists.jboss.org
Author: asoldano
Date: 2014-05-15 13:40:32 -0400 (Thu, 15 May 2014)
New Revision: 18660
Removed:
stack/cxf/trunk/modules/addons/transports/http/httpserver/
stack/cxf/trunk/modules/resources/src/main/resources/modules/jboss720/
stack/cxf/trunk/modules/server/src/main/resources/jbossws-cxf-config-as7.xml
stack/cxf/trunk/modules/server/src/main/resources/jbossws-jaxrpc-config-as7.xml
stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/resources/jaxws/cxf/jms/META-INF-as7/
stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/resources/jaxws/cxf/jms_http/WEB-INF-as7/
Modified:
stack/cxf/trunk/build.xml
stack/cxf/trunk/modules/addons/pom.xml
stack/cxf/trunk/modules/addons/transports/http/undertow/src/main/java/org/jboss/wsf/stack/cxf/addons/transports/undertow/UndertowServerDestination.java
stack/cxf/trunk/modules/addons/transports/http/undertow/src/main/java/org/jboss/wsf/stack/cxf/addons/transports/undertow/UndertowServerEngineFactory.java
stack/cxf/trunk/modules/client/pom.xml
stack/cxf/trunk/modules/dist/pom.xml
stack/cxf/trunk/modules/dist/src/main/distro/Install.txt
stack/cxf/trunk/modules/dist/src/main/distro/ant.properties.example
stack/cxf/trunk/modules/dist/src/main/distro/build-deploy.xml
stack/cxf/trunk/modules/dist/src/main/distro/build-setup.xml
stack/cxf/trunk/modules/dist/src/main/distro/build-testsuite.xml
stack/cxf/trunk/modules/dist/src/main/distro/build.xml
stack/cxf/trunk/modules/dist/src/main/scripts/assembly-deploy-artifacts.xml
stack/cxf/trunk/modules/resources/pom.xml
stack/cxf/trunk/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml
stack/cxf/trunk/modules/resources/src/main/scripts/zip-other-configs.xml
stack/cxf/trunk/modules/server/src/main/scripts/antrun-beans-config.xml
stack/cxf/trunk/modules/test-utils/src/main/java/org/jboss/wsf/test/JBossWSTest.java
stack/cxf/trunk/modules/test-utils/src/main/java/org/jboss/wsf/test/JBossWSTestHelper.java
stack/cxf/trunk/modules/test-utils/src/main/java/org/jboss/wsf/test/JBossWSTestSetup.java
stack/cxf/trunk/modules/testsuite/cxf-spring-tests/scripts/cxf-jars-jaxws.xml
stack/cxf/trunk/modules/testsuite/cxf-spring-tests/scripts/cxf-samples-jaxws.xml
stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jms/JMSEndpointOnlyDeploymentTestCaseForked.java
stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jms_http/JMSHTTPEndpointDeploymentTestCaseForked.java
stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/samples/kerberos/KerberosTestCase.java
stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wssePolicy/UsernameTestCase.java
stack/cxf/trunk/modules/testsuite/cxf-tests/scripts/cxf-jars-jaxws.xml
stack/cxf/trunk/modules/testsuite/cxf-tests/scripts/cxf-samples-jars-jaxws.xml
stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/basic/UsernameOverTransportTestCase.java
stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/oasis/WSSecurityPolicyExamples21xTestCase.java
stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/oasis/WSSecurityPolicyExamples23xTestCase.java
stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/trust/WSTrustBearerTestCase.java
stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/trust/WSTrustHolderOfKeyTestCase.java
stack/cxf/trunk/modules/testsuite/pom.xml
stack/cxf/trunk/modules/testsuite/shared-tests/scripts/antrun-wsconsume.xml
stack/cxf/trunk/modules/testsuite/shared-tests/scripts/antrun-wsprovide.xml
stack/cxf/trunk/modules/testsuite/shared-tests/src/test/ant-import/build-jars-jaxws.xml
stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/endpoint/jse/UsecasesTestCase.java
stack/cxf/trunk/pom.xml
Log:
[JBWS-3780] Drop AS 7.2.0 container integration
Modified: stack/cxf/trunk/build.xml
===================================================================
--- stack/cxf/trunk/build.xml 2014-05-15 14:36:35 UTC (rev 18659)
+++ stack/cxf/trunk/build.xml 2014-05-15 17:40:32 UTC (rev 18660)
@@ -2,7 +2,7 @@
<!--
~ JBoss, Home of Professional Open Source.
- ~ Copyright 2011, Red Hat, Inc., and individual contributors
+ ~ Copyright 2014, Red Hat, Inc., and individual contributors
~ as indicated by the @author tags. See the copyright.txt file in the
~ distribution for a full listing of individual contributors.
~
@@ -68,9 +68,6 @@
<arg line="${maven.opts} help:effective-settings"/>
</exec>
<xmlproperty file="${dist.output.dir}/effective-settings.xml" keeproot="false"/>
- <condition property="jboss720.home" value="${profiles.profile.properties.jboss720.home}">
- <isset property="profiles.profile.properties.jboss720.home"/>
- </condition>
<condition property="wildfly800.home" value="${profiles.profile.properties.wildfly800.home}">
<isset property="profiles.profile.properties.wildfly800.home"/>
</condition>
@@ -82,13 +79,10 @@
</condition>
- <fail message="Application server home not set, jboss720.home=value, wildfly800.home=value, wildfly810.home=value or wildfly900.home to set">
+ <fail message="Application server home not set, wildfly800.home=value, wildfly810.home=value or wildfly900.home to set">
<condition>
<and>
<not>
- <isset property="jboss720.home"/>
- </not>
- <not>
<isset property="wildfly800.home"/>
</not>
<not>
@@ -102,7 +96,6 @@
</fail>
<echo/>
- <echo message="jboss720.home=${jboss720.home}"/>
<echo message="wildfly800.home=${wildfly800.home}"/>
<echo message="wildfly810.home=${wildfly810.home}"/>
<echo message="wildfly900.home=${wildfly900.home}"/>
Modified: stack/cxf/trunk/modules/addons/pom.xml
===================================================================
--- stack/cxf/trunk/modules/addons/pom.xml 2014-05-15 14:36:35 UTC (rev 18659)
+++ stack/cxf/trunk/modules/addons/pom.xml 2014-05-15 17:40:32 UTC (rev 18660)
@@ -16,7 +16,6 @@
<!-- Modules -->
<modules>
- <module>transports/http/httpserver</module>
<module>transports/http/undertow</module>
<module>transports/udp</module>
</modules>
Modified: stack/cxf/trunk/modules/addons/transports/http/undertow/src/main/java/org/jboss/wsf/stack/cxf/addons/transports/undertow/UndertowServerDestination.java
===================================================================
--- stack/cxf/trunk/modules/addons/transports/http/undertow/src/main/java/org/jboss/wsf/stack/cxf/addons/transports/undertow/UndertowServerDestination.java 2014-05-15 14:36:35 UTC (rev 18659)
+++ stack/cxf/trunk/modules/addons/transports/http/undertow/src/main/java/org/jboss/wsf/stack/cxf/addons/transports/undertow/UndertowServerDestination.java 2014-05-15 17:40:32 UTC (rev 18660)
@@ -38,7 +38,7 @@
import org.jboss.ws.undertow_httpspi.UndertowHttpExchange;
/**
- * HTTP destination to be used with the JDK6 httpserver; this extends the
+ * HTTP destination to be used with Undertow; this extends the
* basic JAXWSHttpSpiDestination with all the mechanisms for properly
* handling destination and factory life-cycles.
*
Modified: stack/cxf/trunk/modules/addons/transports/http/undertow/src/main/java/org/jboss/wsf/stack/cxf/addons/transports/undertow/UndertowServerEngineFactory.java
===================================================================
--- stack/cxf/trunk/modules/addons/transports/http/undertow/src/main/java/org/jboss/wsf/stack/cxf/addons/transports/undertow/UndertowServerEngineFactory.java 2014-05-15 14:36:35 UTC (rev 18659)
+++ stack/cxf/trunk/modules/addons/transports/http/undertow/src/main/java/org/jboss/wsf/stack/cxf/addons/transports/undertow/UndertowServerEngineFactory.java 2014-05-15 17:40:32 UTC (rev 18660)
@@ -151,7 +151,7 @@
public synchronized void postShutdown()
{
- // shut down the httpserver in the portMap
+ // shut down the engine in the portMap
// To avoid the CurrentModificationException,
// do not use portMap.vaules directly
UndertowServerEngine[] engines = null;
Modified: stack/cxf/trunk/modules/client/pom.xml
===================================================================
--- stack/cxf/trunk/modules/client/pom.xml 2014-05-15 14:36:35 UTC (rev 18659)
+++ stack/cxf/trunk/modules/client/pom.xml 2014-05-15 17:40:32 UTC (rev 18660)
@@ -39,12 +39,12 @@
</dependency>
<dependency>
<groupId>org.jboss.ws.cxf</groupId>
- <artifactId>jbossws-cxf-transports-httpserver</artifactId>
+ <artifactId>jbossws-cxf-transports-udp</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.jboss.ws.cxf</groupId>
- <artifactId>jbossws-cxf-transports-udp</artifactId>
+ <artifactId>jbossws-cxf-transports-undertow</artifactId>
<version>${project.version}</version>
</dependency>
Modified: stack/cxf/trunk/modules/dist/pom.xml
===================================================================
--- stack/cxf/trunk/modules/dist/pom.xml 2014-05-15 14:36:35 UTC (rev 18659)
+++ stack/cxf/trunk/modules/dist/pom.xml 2014-05-15 17:40:32 UTC (rev 18660)
@@ -30,12 +30,6 @@
<dependency>
<groupId>org.jboss.ws.cxf</groupId>
- <artifactId>jbossws-cxf-transports-httpserver</artifactId>
- <version>${project.version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.jboss.ws.cxf</groupId>
<artifactId>jbossws-cxf-transports-undertow</artifactId>
<version>${project.version}</version>
</dependency>
@@ -50,13 +44,6 @@
<groupId>org.jboss.ws.cxf</groupId>
<artifactId>jbossws-cxf-resources</artifactId>
<version>${project.version}</version>
- <classifier>jboss720</classifier>
- </dependency>
-
- <dependency>
- <groupId>org.jboss.ws.cxf</groupId>
- <artifactId>jbossws-cxf-resources</artifactId>
- <version>${project.version}</version>
<classifier>wildfly800</classifier>
</dependency>
@@ -134,11 +121,6 @@
<!-- container integration -->
<dependency>
<groupId>org.jboss.ws</groupId>
- <artifactId>jbossws-jboss720-server-integration</artifactId>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.jboss.ws</groupId>
<artifactId>jbossws-wildfly800-server-integration</artifactId>
<scope>provided</scope>
</dependency>
@@ -206,9 +188,6 @@
<configuration>
<target>
<mkdir dir="${basedir}/target/exclude-file" />
- <xslt style="${basedir}/src/main/distro/test-exclude.xsl" in="../testsuite/pom.xml" out="${basedir}/target/exclude-file/test-excludes-jboss720.txt">
- <param name="targetName" expression="jboss720" />
- </xslt>
<xslt style="${basedir}/src/main/distro/test-exclude.xsl" in="../testsuite/pom.xml" out="${basedir}/target/exclude-file/test-excludes-wildfly800.txt">
<param name="targetName" expression="wildfly800" />
</xslt>
@@ -246,11 +225,6 @@
<!-- Libraries required for running binary distro testsuite and not available on server-->
<dependency>
<groupId>org.jboss.ws</groupId>
- <artifactId>jbossws-jboss720-tests-integration</artifactId>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.jboss.ws</groupId>
<artifactId>jbossws-wildfly800-tests-integration</artifactId>
<scope>provided</scope>
</dependency>
Modified: stack/cxf/trunk/modules/dist/src/main/distro/Install.txt
===================================================================
--- stack/cxf/trunk/modules/dist/src/main/distro/Install.txt 2014-05-15 14:36:35 UTC (rev 18659)
+++ stack/cxf/trunk/modules/dist/src/main/distro/Install.txt 2014-05-15 17:40:32 UTC (rev 18660)
@@ -13,7 +13,6 @@
2.) Modify the target container location in ant.properties
3.) Execute one of the following
- ant deploy-jboss720
ant deploy-wildfly800
ant deploy-wildfly810
ant deploy-wildfly900
Modified: stack/cxf/trunk/modules/dist/src/main/distro/ant.properties.example
===================================================================
--- stack/cxf/trunk/modules/dist/src/main/distro/ant.properties.example 2014-05-15 14:36:35 UTC (rev 18659)
+++ stack/cxf/trunk/modules/dist/src/main/distro/ant.properties.example 2014-05-15 17:40:32 UTC (rev 18660)
@@ -3,18 +3,17 @@
#
# Optional JBoss Home
-jboss720.home=(a)jboss720.home@
wildfly800.home=(a)wildfly800.home@
wildfly810.home=(a)wildfly810.home@
wildfly900.home=(a)wildfly900.home@
-# The JBoss server under test. This can be [jboss720|wildfly800|wildfly810|wildfly900]
+# The JBoss server under test. This can be [wildfly800|wildfly810|wildfly900]
jbossws.integration.target=wildfly800
# The JBoss settings
jboss.bind.address=localhost
-# JBoss Management console authentication (AS 7.1.x)
+# Management console authentication
jbossws.deployer.authentication.username=admin
jbossws.deployer.authentication.password=admin
Modified: stack/cxf/trunk/modules/dist/src/main/distro/build-deploy.xml
===================================================================
--- stack/cxf/trunk/modules/dist/src/main/distro/build-deploy.xml 2014-05-15 14:36:35 UTC (rev 18659)
+++ stack/cxf/trunk/modules/dist/src/main/distro/build-deploy.xml 2014-05-15 17:40:32 UTC (rev 18660)
@@ -2,7 +2,7 @@
<!--
~ JBoss, Home of Professional Open Source.
- ~ Copyright 2011, Red Hat, Inc., and individual contributors
+ ~ Copyright 2014, Red Hat, Inc., and individual contributors
~ as indicated by the @author tags. See the copyright.txt file in the
~ distribution for a full listing of individual contributors.
~
@@ -25,69 +25,6 @@
<project>
<!-- ================================================================== -->
- <!-- Prepare Deployment Structure JBoss-7.2.x -->
- <!-- ================================================================== -->
-
- <target name="deploy-structure-jboss72x" depends="prepare-deploy">
- <delete dir="${deploy.structure}"/>
-
- <path id="jboss.ant.tasks.classpath">
- <fileset dir="${deploy.artifacts.dir}">
- <include name="**/jbossws-common-tools.jar"/>
- <include name="**/jandex.jar"/>
- </fileset>
- </path>
- <taskdef name="installModules" classname="org.jboss.ws.tools.ant.InstallModulesTask" classpathref="jboss.ant.tasks.classpath"/>
- <taskdef name="jandex" classname="org.jboss.jandex.JandexAntTask" classpathref="jboss.ant.tasks.classpath"/>
-
- <jandex run="true" verbose="false" newJar="true">
- <fileset dir="${deploy.artifacts.dir}/lib">
- <include name="cxf*security.jar"/>
- </fileset>
- </jandex>
- <antcall target="deploy-jbossws-cxf-modules-as7" inheritall="false">
- <param name="installserver" value="${deploy.structure}/modules/system/layers/base"/>
- <param name="thirdpartydir" value="${deploy.artifacts.dir}"/>
- <param name="jbossid" value="${jbossws.integration.target}"/>
- <param name="modules-jbossid" value="jboss720"/>
- </antcall>
- <copy toDir="${deploy.structure}/modules/system/layers/base">
- <fileset dir="${deploy.artifacts.dir}/modules/jboss720">
- <include name="**/jboss/as/webservices/**/module.xml"/>
- </fileset>
- </copy>
- </target>
-
- <!-- ================================================================== -->
- <!-- Deployment jboss720 -->
- <!-- ================================================================== -->
-
- <target name="target-jboss720">
- <property name="jbossws.integration.target" value="jboss720"/>
- <echo message="jbossws.integration.target=${jbossws.integration.target}" file="${target.properties.file}"/>
- </target>
-
- <target name="deploy-jboss720" depends="undeploy-jboss720,deploy-structure-jboss72x,check-spring,install-spring-module72x" description="Deploy jbossws to jboss720">
- <fail message="Not available: ${jboss720.available.file}" unless="jboss720.available"/>
- <copy todir="${jboss720.home}" overwrite="true" verbose="true">
- <fileset dir="${deploy.structure}">
- <exclude name="**/jboss/as/webservices/**/module.xml"/>
- </fileset>
- </copy>
- <!-- Install org/jboss/as/webservices module.xml separately since it needs to reference libs already on the AS -->
- <installModules targetDir="${jboss720.home}/modules/system/layers/base/">
- <fileset dir="${deploy.structure}/modules/system/layers/base">
- <include name="**/jboss/as/webservices/**/module.xml"/>
- </fileset>
- </installModules>
- </target>
-
- <target name="undeploy-jboss720" depends="target-jboss720,init" description="Remove jbossws from jboss720">
- <fail message="Not available: ${jboss720.available.file}" unless="jboss720.available"/>
- <macro-undeploy-jbossws-modules targetdir="${jboss720.home}/modules/system/layers/base" defaultmodulesconf="${jbossws.default.modules.conf}" modifyjbossintegration="true"/>
- </target>
-
- <!-- ================================================================== -->
<!-- Prepare Deployment Structure WildFly-8.0.x -->
<!-- ================================================================== -->
@@ -252,14 +189,6 @@
</condition>
</target>
- <target name="install-spring-module72x" if="spring-required">
- <antcall target="deploy-spring-module" inheritall="false">
- <param name="installserver" value="${deploy.structure}/modules/system/layers/base"/>
- <param name="thirdpartydir" value="${deploy.artifacts.dir}"/>
- <param name="modules-jbossid" value="jboss720"/>
- </antcall>
- </target>
-
<target name="install-spring-module80x" if="spring-required">
<antcall target="deploy-spring-module" inheritall="false">
<param name="installserver" value="${deploy.structure}/modules/system/layers/base"/>
Modified: stack/cxf/trunk/modules/dist/src/main/distro/build-setup.xml
===================================================================
--- stack/cxf/trunk/modules/dist/src/main/distro/build-setup.xml 2014-05-15 14:36:35 UTC (rev 18659)
+++ stack/cxf/trunk/modules/dist/src/main/distro/build-setup.xml 2014-05-15 17:40:32 UTC (rev 18660)
@@ -2,7 +2,7 @@
<!--
~ JBoss, Home of Professional Open Source.
- ~ Copyright 2011, Red Hat, Inc., and individual contributors
+ ~ Copyright 2014, Red Hat, Inc., and individual contributors
~ as indicated by the @author tags. See the copyright.txt file in the
~ distribution for a full listing of individual contributors.
~
@@ -33,12 +33,10 @@
<!-- Load jbossws.integration.target properties -->
<property file="${target.properties.file}"/>
- <property name="jboss720.available.file" value="${jboss720.home}/jboss-modules.jar"/>
<property name="wildfly800.available.file" value="${wildfly800.home}/jboss-modules.jar"/>
<property name="wildfly810.available.file" value="${wildfly810.home}/jboss-modules.jar"/>
<property name="wildfly900.available.file" value="${wildfly900.home}/jboss-modules.jar"/>
- <available property="jboss720.available" file="${jboss720.available.file}"/>
<available property="wildfly800.available" file="${wildfly800.available.file}"/>
<available property="wildfly810.available" file="${wildfly810.available.file}"/>
<available property="wildfly900.available" file="${wildfly900.available.file}"/>
Modified: stack/cxf/trunk/modules/dist/src/main/distro/build-testsuite.xml
===================================================================
--- stack/cxf/trunk/modules/dist/src/main/distro/build-testsuite.xml 2014-05-15 14:36:35 UTC (rev 18659)
+++ stack/cxf/trunk/modules/dist/src/main/distro/build-testsuite.xml 2014-05-15 17:40:32 UTC (rev 18660)
@@ -2,7 +2,7 @@
<!--
~ JBoss, Home of Professional Open Source.
- ~ Copyright 2011, Red Hat, Inc., and individual contributors
+ ~ Copyright 2014, Red Hat, Inc., and individual contributors
~ as indicated by the @author tags. See the copyright.txt file in the
~ distribution for a full listing of individual contributors.
~
@@ -31,9 +31,6 @@
<target name="tests-prepare" depends="prepare">
<!-- Define jboss.home -->
- <condition property="jboss.home" value="${jboss720.home}">
- <equals arg1="${jbossws.integration.target}" arg2="jboss720"/>
- </condition>
<condition property="jboss.home" value="${wildfly800.home}">
<equals arg1="${jbossws.integration.target}" arg2="wildfly800"/>
</condition>
@@ -111,7 +108,7 @@
</tstamp>
</target>
- <target name="tests-classpath" depends="tests-classpath-jboss72x,tests-classpath-wildfly80x,tests-classpath-wildfly90x">
+ <target name="tests-classpath" depends="tests-classpath-wildfly80x,tests-classpath-wildfly90x">
<path id="tests.javac.classpath">
<path refid="ws.stack.classpath"/>
<path refid="integration.target.javac.classpath"/>
@@ -121,171 +118,6 @@
<path refid="integration.target.client.classpath"/>
</path>
</target>
-
- <target name="tests-classpath-jboss72x" depends="tests-prepare" if="jbossws.integration.jboss72x">
-
- <!-- Java Endorsed -->
- <condition property="endorsed.dirs" value="${jboss.home}/modules/system/layers/base/javax/xml/ws/api/main/">
- <isset property="jboss.home"/>
- </condition>
-
- <path id="integration.target.javac.classpath">
- <fileset dir="${jboss.home}/modules/system/layers/base/javax/activation/api/main/">
- <include name="activation-*.jar"/>
- </fileset>
- <fileset dir="${jboss.home}/modules/system/layers/base/javax/mail/api/main/">
- <include name="mail-*.jar"/>
- </fileset>
- <fileset dir="${jboss.home}/modules/system/layers/base/org/jboss/common-core/main/">
- <include name="jboss-common-core-*.jar"/>
- </fileset>
- <fileset dir="${jboss.home}/modules/system/layers/base/org/jboss/logging/main/">
- <include name="jboss-logging-*.jar"/>
- </fileset>
- <fileset dir="${jboss.home}/modules/system/layers/base/org/picketlink/main/">
- <include name="picketlink-core*.jar"/>
- </fileset>
- <fileset dir="${jboss.home}/modules/system/layers/base/javax/ejb/api/main/">
- <include name="jboss-ejb-api_3.1_spec-*.jar"/>
- </fileset>
- <fileset dir="${jboss.home}/modules/system/layers/base/org/jboss/ejb3/main/">
- <include name="jboss-ejb3-ext-api-*.jar"/>
- </fileset>
- <fileset dir="${jboss.home}/modules/system/layers/base/javax/servlet/api/main/">
- <include name="jboss-servlet-api_3.0_spec-*.jar"/>
- </fileset>
- <fileset dir="${jboss.home}/modules/system/layers/base/javax/annotation/api/main/">
- <include name="jboss-annotations-api_1.1_spec-*.jar"/>
- </fileset>
- </path>
-
- <!--
- The 's.client.classpath' contains jars that are available in the target container's client directory.
- There jars apply to all supported stacks. It MUST NOT contains jars from a local thirdparty dir.
-
- The 'ws.stack.classpath' contains jars that come with a specific stack distribution.
- The 's.extra.classpath' contains stack specific jars that are needed to run the stack specific tests.
- -->
- <path id="integration.target.client.classpath">
- <!-- Use httpserver based transport -->
- <pathelement location="${thirdparty.dir}/jbossws-cxf-transports-httpserver.jar"/>
- <!-- included from thirdparty local dir as it's not installed on AS - START -->
- <pathelement location="${thirdparty.dir}/jbossws-${jbossws.integration.target}-tests-integration.jar"/>
- <!-- included from thirdparty local dir as it's not installed on AS - END -->
- <pathelement location="${jboss.home}/jboss-modules.jar"/>
- <fileset dir="${jboss.home}/modules/system/layers/base/org/jboss/logging/main/">
- <include name="jboss-logging-*.jar"/>
- </fileset>
- <fileset dir="${jboss.home}/modules/system/layers/base/org/jboss/as/controller/main/">
- <include name="jboss-as-controller-*.jar"/>
- </fileset>
- <fileset dir="${jboss.home}/modules/system/layers/base/org/jboss/as/controller-client/main/">
- <include name="jboss-as-controller-client-*.jar"/>
- </fileset>
- <fileset dir="${jboss.home}/modules/system/layers/base/org/jboss/as/server/main/">
- <include name="jboss-as-server-*.jar"/>
- </fileset>
- <fileset dir="${jboss.home}/modules/system/layers/base/org/jboss/as/protocol/main/">
- <include name="jboss-as-protocol-*.jar"/>
- </fileset>
- <fileset dir="${jboss.home}/modules/system/layers/base/org/jboss/dmr/main/">
- <include name="jboss-dmr-*.jar"/>
- </fileset>
- <fileset dir="${jboss.home}/modules/system/layers/base/org/jboss/marshalling/main/">
- <include name="jboss-marshalling-*.jar"/>
- </fileset>
- <fileset dir="${jboss.home}/modules/system/layers/base/org/slf4j/main/">
- <include name="slf4j-api-*.jar"/>
- </fileset>
- <fileset dir="${jboss.home}/modules/system/layers/base/org/slf4j/jcl-over-slf4j/main/">
- <include name="jcl-over-slf4j-*.jar"/>
- </fileset>
- <fileset dir="${jboss.home}/modules/system/layers/base/org/slf4j/impl/main/">
- <include name="slf4j-jboss-logmanager-*.jar"/>
- </fileset>
- <fileset dir="${jboss.home}/modules/system/layers/base/org/jboss/logmanager/main/">
- <include name="jboss-logmanager-*.jar"/>
- </fileset>
- <fileset dir="${jboss.home}/modules/system/layers/base/org/apache/log4j/main/">
- <include name="log4j-*.jar"/>
- </fileset>
- <fileset dir="${jboss.home}/modules/system/layers/base/javax/mail/api/main/">
- <include name="mail-*.jar"/>
- </fileset>
- <fileset dir="${jboss.home}/modules/system/layers/base/javax/servlet/api/main/">
- <include name="jboss-servlet-api_3.0_spec-*.jar"/>
- </fileset>
- <fileset dir="${jboss.home}/modules/system/layers/base/javax/transaction/api/main/">
- <include name="jboss-transaction-api_1.1_spec-*.jar"/>
- </fileset>
- <fileset dir="${jboss.home}/modules/system/layers/base/org/jboss/threads/main/">
- <include name="jboss-threads-*.jar"/>
- </fileset>
- <fileset dir="${jboss.home}/modules/system/layers/base/org/picketbox/main/">
- <include name="picketbox-*.jar"/>
- </fileset>
- <fileset dir="${jboss.home}/modules/system/layers/base/org/picketlink/main/">
- <include name="picketlink-core*.jar"/>
- </fileset>
- <fileset dir="${jboss.home}/modules/system/layers/base/javax/ejb/api/main/">
- <include name="jboss-ejb-api_3.1_spec-*.jar"/>
- </fileset>
- <fileset dir="${jboss.home}/modules/system/layers/base/org/jboss/ejb-client/main/">
- <include name="jboss-ejb-client-*.jar"/>
- </fileset>
- <fileset dir="${jboss.home}/modules/system/layers/base/org/apache/xerces/main/">
- <include name="xercesImpl-*.jar"/>
- </fileset>
- <fileset dir="${jboss.home}/modules/system/layers/base/org/jboss/common-core/main/">
- <include name="jboss-common-core-*.jar"/>
- </fileset>
- <fileset dir="${jboss.home}/modules/system/layers/base/org/javassist/main/">
- <include name="javassist-*.jar"/>
- </fileset>
- <fileset dir="${jboss.home}/modules/system/layers/base/javax/security/jacc/api/main/">
- <include name="jboss-jacc-api*.jar"/>
- </fileset>
- <fileset dir="${jboss.home}/modules/system/layers/base/org/jboss/remoting3/main/">
- <include name="jboss-remoting-*.jar"/>
- </fileset>
- <fileset dir="${jboss.home}/modules/system/layers/base/org/jboss/marshalling/river/main/">
- <include name="jboss-marshalling-river-*.jar"/>
- </fileset>
- <fileset dir="${jboss.home}/modules/system/layers/base/org/jboss/remoting-jmx/main/">
- <include name="remoting-jmx-*.jar"/>
- </fileset>
- <fileset dir="${jboss.home}/modules/system/layers/base/org/jboss/sasl/main/">
- <include name="jboss-sasl-*.jar"/>
- </fileset>
- <fileset dir="${jboss.home}/modules/system/layers/base/org/jboss/netty/main/">
- <include name="netty-*.jar"/>
- </fileset>
- <fileset dir="${jboss.home}/modules/system/layers/base/org/jboss/xb/main/">
- <include name="jbossxb-*.jar"/>
- </fileset>
- <fileset dir="${jboss.home}/modules/system/layers/base/org/joda/time/main/">
- <include name="joda-time-*.jar"/>
- </fileset>
- <fileset dir="${jboss.home}/modules/system/layers/base/org/apache/xalan/main/">
- <include name="serializer-*.jar"/>
- <include name="xalan-*.jar"/>
- </fileset>
- <fileset dir="${jboss.home}/modules/system/layers/base/org/codehaus/woodstox/main/">
- <include name="woodstox-core-asl-*.jar"/>
- <include name="stax2-api-*.jar"/>
- </fileset>
- <fileset dir="${jboss.home}/modules/system/layers/base/org/jboss/xnio/main/">
- <include name="xnio-api-*.jar"/>
- </fileset>
- <fileset dir="${jboss.home}/modules/system/layers/base/org/jboss/xnio/nio/main/">
- <include name="xnio-nio-*.jar"/>
- </fileset>
- <fileset dir="${jboss.home}/modules/system/layers/base/org/jboss/remote-naming/main/">
- <include name="jboss-remote-naming-*.jar"/>
- </fileset>
- <pathelement location="${tools.jar}"/>
- </path>
- </target>
<target name="tests-classpath-wildfly80x" depends="tests-prepare" if="jbossws.integration.wildfly80x">
@@ -332,8 +164,6 @@
The 's.extra.classpath' contains stack specific jars that are needed to run the stack specific tests.
-->
<path id="integration.target.client.classpath">
- <!-- Use undertow based transport -->
- <pathelement location="${thirdparty.dir}/jbossws-cxf-transports-undertow.jar"/>
<!-- included from thirdparty local dir as it's not installed on AS - START -->
<pathelement location="${thirdparty.dir}/jbossws-${jbossws.integration.target}-tests-integration.jar"/>
<!-- included from thirdparty local dir as it's not installed on AS - END -->
@@ -506,8 +336,6 @@
The 's.extra.classpath' contains stack specific jars that are needed to run the stack specific tests.
-->
<path id="integration.target.client.classpath">
- <!-- Use undertow based transport -->
- <pathelement location="${thirdparty.dir}/jbossws-cxf-transports-undertow.jar"/>
<!-- included from thirdparty local dir as it's not installed on AS - START -->
<pathelement location="${thirdparty.dir}/jbossws-${jbossws.integration.target}-tests-integration.jar"/>
<!-- included from thirdparty local dir as it's not installed on AS - END -->
Modified: stack/cxf/trunk/modules/dist/src/main/distro/build.xml
===================================================================
--- stack/cxf/trunk/modules/dist/src/main/distro/build.xml 2014-05-15 14:36:35 UTC (rev 18659)
+++ stack/cxf/trunk/modules/dist/src/main/distro/build.xml 2014-05-15 17:40:32 UTC (rev 18660)
@@ -2,7 +2,7 @@
<!--
~ JBoss, Home of Professional Open Source.
- ~ Copyright 2011, Red Hat, Inc., and individual contributors
+ ~ Copyright 2014, Red Hat, Inc., and individual contributors
~ as indicated by the @author tags. See the copyright.txt file in the
~ distribution for a full listing of individual contributors.
~
@@ -57,12 +57,6 @@
<fail message="jbossws.integration.target not set" unless="jbossws.integration.target"/>
<echo message="integration.target=${jbossws.integration.target}"/>
- <condition property="jbossws.integration.jboss72x" value="true">
- <or>
- <equals arg1="${jbossws.integration.target}" arg2="jboss720"/>
- </or>
- </condition>
-
<condition property="jbossws.integration.wildfly80x" value="true">
<or>
<equals arg1="${jbossws.integration.target}" arg2="wildfly800"/>
@@ -79,12 +73,8 @@
<property name="deploy.structure" value="${output.dir}/deploy-${jbossws.integration.target}"/>
<property name="excludesfile" value="${tests.dir}/resources/test-excludes-${jbossws.integration.target}.txt"/>
- <condition property="remote.port" value="4447" else="8080">
- <isset property="jbossws.integration.jboss72x"/>
- </condition>
- <condition property="remote.protocol" value="remote" else="http-remoting">
- <isset property="jbossws.integration.jboss72x"/>
- </condition>
+ <property name="remote.port" value="8080"/>
+ <property name="remote.protocol" value="http-remoting"/>
</target>
<target name="tests-init" depends="init,tests-classpath">
@@ -96,9 +86,6 @@
<exclude name="**/jbossws-native-services.jar"/>
<exclude name="**/jbossws-jboss*.jar"/>
<exclude name="**/jbossws-wildfly*.jar"/>
- <!-- httpserver vs undertow transport selection in build-testsuite (container specific) -->
- <exclude name="**/jbossws-cxf-transports-httpserver.jar"/>
- <exclude name="**/jbossws-cxf-transports-undertow.jar"/>
</fileset>
<fileset dir="${thirdparty.dir}">
<exclude name="**/jbossws*.jar"/>
Modified: stack/cxf/trunk/modules/dist/src/main/scripts/assembly-deploy-artifacts.xml
===================================================================
--- stack/cxf/trunk/modules/dist/src/main/scripts/assembly-deploy-artifacts.xml 2014-05-15 14:36:35 UTC (rev 18659)
+++ stack/cxf/trunk/modules/dist/src/main/scripts/assembly-deploy-artifacts.xml 2014-05-15 17:40:32 UTC (rev 18660)
@@ -33,14 +33,11 @@
<include>org.jboss.ws.cxf:jbossws-cxf-jaspi:jar</include>
<include>org.jboss.ws.cxf:jbossws-cxf-factories:jar</include>
<include>org.jboss.ws.cxf:jbossws-cxf-server:jar</include>
- <include>org.jboss.ws.cxf:jbossws-cxf-transports-httpserver:jar</include>
<include>org.jboss.ws.cxf:jbossws-cxf-transports-undertow:jar</include>
<include>org.jboss.ws.cxf:jbossws-cxf-transports-udp:jar</include>
<include>org.jboss.ws.native:jbossws-native-core:jar</include>
<include>org.jboss.ws.native:jbossws-native-services:jar</include>
- <include>org.jboss.ws.projects:jaxws-jboss-httpserver-httpspi:jar</include>
<include>org.jboss.ws.projects:jaxws-undertow-httpspi:jar</include>
- <include>org.jboss.com.sun.httpserver:httpserver:jar</include>
<include>io.undertow:undertow-core:jar</include>
<include>org.apache.cxf:cxf-*</include>
<include>org.apache.cxf.services.sts:cxf-services-sts-core:jar</include>
Modified: stack/cxf/trunk/modules/resources/pom.xml
===================================================================
--- stack/cxf/trunk/modules/resources/pom.xml 2014-05-15 14:36:35 UTC (rev 18659)
+++ stack/cxf/trunk/modules/resources/pom.xml 2014-05-15 17:40:32 UTC (rev 18660)
@@ -51,15 +51,6 @@
<phase>package</phase>
</execution>
<execution>
- <id>jboss720</id>
- <goals><goal>jar</goal></goals>
- <phase>package</phase>
- <configuration>
- <classifier>jboss720</classifier>
- <classesDirectory>${project.build.directory}/classes/resources/jbossws-jboss720/jbossws.beans</classesDirectory>
- </configuration>
- </execution>
- <execution>
<id>wildfly800</id>
<goals><goal>jar</goal></goals>
<phase>package</phase>
Modified: stack/cxf/trunk/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml
===================================================================
--- stack/cxf/trunk/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml 2014-05-15 14:36:35 UTC (rev 18659)
+++ stack/cxf/trunk/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml 2014-05-15 17:40:32 UTC (rev 18660)
@@ -2,7 +2,7 @@
<!--
~ JBoss, Home of Professional Open Source.
- ~ Copyright 2011, Red Hat, Inc., and individual contributors
+ ~ Copyright 2014, Red Hat, Inc., and individual contributors
~ as indicated by the @author tags. See the copyright.txt file in the
~ distribution for a full listing of individual contributors.
~
@@ -256,135 +256,6 @@
</sequential>
</macrodef>
- <macrodef name="macro-deploy-jbossws-modules-as7">
- <attribute name="thirdpartydir"/>
- <attribute name="targetdir"/>
- <attribute name="jbossid"/>
- <attribute name="modules-jbossid"/>
- <sequential>
- <!-- libraries -->
- <copy todir="@{targetdir}/org/jboss/ws/jaxws-client/main" flatten="false" overwrite="true">
- <fileset dir="@{thirdpartydir}/lib">
- <include name="**/jbossws-cxf-client.jar"/>
- </fileset>
- </copy>
- <copy todir="@{targetdir}/org/jboss/ws/jaxws-jboss-httpserver-httpspi/main" flatten="false" overwrite="true">
- <fileset dir="@{thirdpartydir}/lib">
- <include name="**/jaxws-jboss-httpserver-httpspi.jar"/>
- </fileset>
- </copy>
- <copy todir="@{targetdir}/org/jboss/ws/cxf/jbossws-cxf-server/main" flatten="false" overwrite="true">
- <fileset dir="@{thirdpartydir}/lib">
- <include name="**/jbossws-cxf-server.jar"/>
- </fileset>
- </copy>
- <copy todir="@{targetdir}/org/jboss/ws/cxf/jbossws-cxf-factories/main" flatten="false" overwrite="true">
- <fileset dir="@{thirdpartydir}/lib">
- <include name="**/jbossws-cxf-factories.jar"/>
- </fileset>
- </copy>
- <copy todir="@{targetdir}/org/jboss/ws/cxf/jbossws-cxf-transports-httpserver/main" flatten="false" overwrite="true">
- <fileset dir="@{thirdpartydir}/lib">
- <include name="**/jbossws-cxf-transports-httpserver.jar"/>
- </fileset>
- </copy>
- <copy todir="@{targetdir}/org/jboss/ws/cxf/jbossws-cxf-transports-udp/main" flatten="false" overwrite="true">
- <fileset dir="@{thirdpartydir}/lib">
- <include name="**/jbossws-cxf-transports-udp.jar"/>
- </fileset>
- </copy>
- <copy todir="@{targetdir}/org/jboss/ws/native/jbossws-native-core/main" flatten="false" overwrite="true">
- <fileset dir="@{thirdpartydir}/lib">
- <include name="**/jbossws-native-core.jar"/>
- </fileset>
- </copy>
- <copy todir="@{targetdir}/org/jboss/ws/native/jbossws-native-services/main" flatten="false" overwrite="true">
- <fileset dir="@{thirdpartydir}/lib">
- <include name="**/jbossws-native-services.jar"/>
- </fileset>
- </copy>
- <copy todir="@{targetdir}/org/apache/cxf/main" flatten="false" overwrite="true">
- <fileset dir="@{thirdpartydir}/lib">
- <include name="**/cxf-core*.jar"/>
- </fileset>
- </copy>
- <copy todir="@{targetdir}/org/apache/cxf/impl/main" flatten="false" overwrite="true">
- <fileset dir="@{thirdpartydir}/lib">
- <include name="**/cxf-*.jar"/>
- <exclude name="**/cxf-core*.jar"/>
- </fileset>
- </copy>
- <copy todir="@{targetdir}/org/jboss/ws/api/main" flatten="false" overwrite="true">
- <fileset dir="@{thirdpartydir}/lib">
- <include name="**/jbossws-api.jar"/>
- </fileset>
- </copy>
- <copy todir="@{targetdir}/org/jboss/ws/common/main" flatten="false" overwrite="true">
- <fileset dir="@{thirdpartydir}/lib">
- <include name="**/jbossws-common.jar"/>
- </fileset>
- </copy>
- <copy todir="@{targetdir}/org/jboss/ws/tools/common/main" flatten="false" overwrite="true">
- <fileset dir="@{thirdpartydir}/lib">
- <include name="**/jbossws-common-tools.jar"/>
- </fileset>
- </copy>
- <copy todir="@{targetdir}/org/jboss/ws/spi/main" flatten="false" overwrite="true">
- <fileset dir="@{thirdpartydir}/lib">
- <include name="**/jbossws-spi.jar"/>
- </fileset>
- </copy>
- <copy todir="@{targetdir}/org/apache/neethi/main" flatten="false" overwrite="true">
- <fileset dir="@{thirdpartydir}/lib">
- <include name="**/neethi.jar"/>
- </fileset>
- </copy>
- <copy todir="@{targetdir}/org/apache/santuario/xmlsec/main" flatten="false" overwrite="true">
- <fileset dir="@{thirdpartydir}/lib">
- <include name="**/xmlsec.jar"/>
- </fileset>
- </copy>
- <copy todir="@{targetdir}/org/apache/ws/security/main" flatten="false" overwrite="true">
- <fileset dir="@{thirdpartydir}/lib">
- <include name="**/wss4j-*.jar"/>
- <include name="**/jasypt.jar"/>
- </fileset>
- </copy>
- <copy todir="@{targetdir}/org/apache/ws/xmlschema/main" flatten="false" overwrite="true">
- <fileset dir="@{thirdpartydir}/lib">
- <include name="**/xmlschema-core.jar"/>
- </fileset>
- </copy>
- <copy todir="@{targetdir}/org/opensaml/main" flatten="false" overwrite="true">
- <fileset dir="@{thirdpartydir}/lib">
- <include name="**/opensaml.jar"/>
- <include name="**/openws.jar"/>
- <include name="**/xmltooling.jar"/>
- </fileset>
- </copy>
- <copy todir="@{targetdir}/org/codehaus/woodstox/main" flatten="false" overwrite="true">
- <fileset dir="@{thirdpartydir}/lib">
- <include name="**/woodstox-core-asl.jar"/>
- <include name="**/stax2-api.jar"/>
- </fileset>
- </copy>
- <copy todir="@{targetdir}/org/jboss/as/webservices/main" flatten="false" overwrite="true">
- <fileset dir="@{thirdpartydir}/lib">
- <include name="**/jbossws-cxf-resources-(a){jbossid}.jar"/>
- <include name="**/jbossws-(a){jbossid}-server-integration.jar"/>
- </fileset>
- </copy>
- <!-- module.xml files -->
- <installModules targetDir="@{targetdir}">
- <fileset dir="@{thirdpartydir}/modules/@{modules-jbossid}">
- <include name="**/module.xml"/>
- <exclude name="**/jboss/as/webservices/**/module.xml"/>
- <exclude name="**/spring/**/module.xml"/>
- </fileset>
- </installModules>
- </sequential>
- </macrodef>
-
<!-- ================================================================== -->
<!-- Deploy JBossWS -->
<!-- ================================================================== -->
@@ -396,12 +267,6 @@
<fail message="modifyjbossintegration must be specified" unless="modifyjbossintegration"/>
</target>
- <target name="deploy-jbossws-cxf-modules-as7">
- <fail message="installserver must be specified" unless="installserver"/>
- <fail message="thirdpartydir must be specified" unless="thirdpartydir"/>
- <macro-deploy-jbossws-modules-as7 targetdir="${installserver}" thirdpartydir="${thirdpartydir}" jbossid="${jbossid}" modules-jbossid="${modules-jbossid}"/>
- </target>
-
<target name="deploy-jbossws-cxf-modules-as8">
<fail message="installserver must be specified" unless="installserver"/>
<fail message="thirdpartydir must be specified" unless="thirdpartydir"/>
Modified: stack/cxf/trunk/modules/resources/src/main/scripts/zip-other-configs.xml
===================================================================
--- stack/cxf/trunk/modules/resources/src/main/scripts/zip-other-configs.xml 2014-05-15 14:36:35 UTC (rev 18659)
+++ stack/cxf/trunk/modules/resources/src/main/scripts/zip-other-configs.xml 2014-05-15 17:40:32 UTC (rev 18660)
@@ -2,7 +2,7 @@
<!--
~ JBoss, Home of Professional Open Source.
- ~ Copyright 2011, Red Hat, Inc., and individual contributors
+ ~ Copyright 2014, Red Hat, Inc., and individual contributors
~ as indicated by the @author tags. See the copyright.txt file in the
~ distribution for a full listing of individual contributors.
~
Deleted: stack/cxf/trunk/modules/server/src/main/resources/jbossws-cxf-config-as7.xml
===================================================================
--- stack/cxf/trunk/modules/server/src/main/resources/jbossws-cxf-config-as7.xml 2014-05-15 14:36:35 UTC (rev 18659)
+++ stack/cxf/trunk/modules/server/src/main/resources/jbossws-cxf-config-as7.xml 2014-05-15 17:40:32 UTC (rev 18660)
@@ -1,75 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!--
- ~ JBoss, Home of Professional Open Source.
- ~ Copyright 2011, Red Hat, Inc., 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.
- -->
-
-<deploymentAspects xmlns="urn:jboss:ws:deployment:aspects:1.0">
-
- <deploymentAspect class="org.jboss.ws.common.deployment.ContextPropertiesDeploymentAspect">
- <property name="provides" class="java.lang.String">ContextProperties</property>
- <property name="contextProperties" class="java.util.HashMap">
- <map keyClass="java.lang.String" valueClass="java.lang.String">
- <entry>
- <key>stack.transport.class</key>
- <value>org.jboss.wsf.stack.cxf.CXFServletExt</value>
- </entry>
- </map>
- </property>
- <property name="forJaxRpc" class="boolean">false</property>
- </deploymentAspect>
-
- <deploymentAspect class="org.jboss.wsf.stack.cxf.deployment.aspect.DescriptorDeploymentAspect">
- <property name="requires" class="java.lang.String">EndpointAddress,JAXBIntros</property>
- <property name="provides" class="java.lang.String">StackDescriptor</property>
- <property name="forJaxRpc" class="boolean">false</property>
- </deploymentAspect>
-
- <deploymentAspect class="org.jboss.wsf.stack.cxf.deployment.aspect.ResourceResolverDeploymentAspect">
- <property name="provides" class="java.lang.String">ResourceResolver</property>
- <property name="forJaxRpc" class="boolean">false</property>
- </deploymentAspect>
-
- <deploymentAspect class="org.jboss.ws.common.deployment.EndpointHandlerDeploymentAspect">
- <property name="requires" class="java.lang.String">ContainerMetaData</property>
- <property name="provides" class="java.lang.String">StackEndpointHandler</property>
- <property name="forJaxRpc" class="boolean">false</property>
- </deploymentAspect>
-
- <deploymentAspect class="org.jboss.wsf.stack.cxf.deployment.aspect.CXFInstanceProviderDeploymentAspect">
- <property name="requires" class="java.lang.String">ContainerMetaData,BusHolder</property>
- <property name="provides" class="java.lang.String">StackInstanceProvider</property>
- <property name="forJaxRpc" class="boolean">false</property>
- </deploymentAspect>
-
- <deploymentAspect class="org.jboss.ws.common.deployment.JAXBIntroDeploymentAspect">
- <property name="provides" class="java.lang.String">JAXBIntros</property>
- <property name="forJaxRpc" class="boolean">false</property>
- </deploymentAspect>
-
- <deploymentAspect class="org.jboss.wsf.stack.cxf.deployment.aspect.BusDeploymentAspect">
- <property name="provides" class="java.lang.String">BusHolder</property>
- <property name="requires" class="java.lang.String">ResourceResolver,StackDescriptor</property>
- <property name="forJaxRpc" class="boolean">false</property>
- </deploymentAspect>
-
-</deploymentAspects>
-
Deleted: stack/cxf/trunk/modules/server/src/main/resources/jbossws-jaxrpc-config-as7.xml
===================================================================
--- stack/cxf/trunk/modules/server/src/main/resources/jbossws-jaxrpc-config-as7.xml 2014-05-15 14:36:35 UTC (rev 18659)
+++ stack/cxf/trunk/modules/server/src/main/resources/jbossws-jaxrpc-config-as7.xml 2014-05-15 17:40:32 UTC (rev 18660)
@@ -1,76 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!--
- ~ JBoss, Home of Professional Open Source.
- ~ Copyright 2011, Red Hat, Inc., 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.
- -->
-
-<deploymentAspects xmlns="urn:jboss:ws:deployment:aspects:1.0">
-
- <deploymentAspect class="org.jboss.ws.common.deployment.ContextPropertiesDeploymentAspect">
- <property name="provides" class="java.lang.String">ContextProperties, StackDescriptor</property>
- <property name="contextProperties" class="java.util.HashMap">
- <map keyClass="java.lang.String" valueClass="java.lang.String">
- <entry>
- <key>stack.transport.class</key>
- <value>org.jboss.wsf.stack.jbws.EndpointServlet</value>
- </entry>
- </map>
- </property>
- <property name="forJaxWs" class="boolean">false</property>
- </deploymentAspect>
-
- <deploymentAspect class="org.jboss.wsf.stack.jbws.EagerInitializeDeploymentAspect">
- <property name="requires" class="java.lang.String">UnifiedMetaDataModel</property>
- <property name="provides" class="java.lang.String">InitializedMetaDataModel</property>
- <property name="forJaxWs" class="boolean">false</property>
- </deploymentAspect>
-
- <deploymentAspect class="org.jboss.ws.common.deployment.EndpointHandlerDeploymentAspect">
- <property name="requires" class="java.lang.String">ContainerMetaData</property>
- <property name="provides" class="java.lang.String">StackEndpointHandler</property>
- <property name="forJaxWs" class="boolean">false</property>
- </deploymentAspect>
-
- <deploymentAspect class="org.jboss.wsf.stack.jbws.NativeInstanceProviderDeploymentAspect">
- <property name="requires" class="java.lang.String">ContainerMetaData</property>
- <property name="provides" class="java.lang.String">StackInstanceProvider</property>
- <property name="forJaxWs" class="boolean">false</property>
- </deploymentAspect>
-
- <deploymentAspect class="org.jboss.wsf.stack.jbws.PublishContractDeploymentAspect">
- <property name="requires" class="java.lang.String">UnifiedMetaDataModel, JAXBIntros</property>
- <property name="provides" class="java.lang.String">PublishedContract</property>
- <property name="forJaxWs" class="boolean">false</property>
- </deploymentAspect>
-
- <deploymentAspect class="org.jboss.wsf.stack.jbws.ServiceEndpointInvokerDeploymentAspect">
- <property name="requires" class="java.lang.String">UnifiedMetaDataModel</property>
- <property name="forJaxWs" class="boolean">false</property>
- </deploymentAspect>
-
- <deploymentAspect class="org.jboss.wsf.stack.jbws.UnifiedMetaDataDeploymentAspect">
- <property name="requires" class="java.lang.String">ContainerMetaData, URLPattern, EndpointAddress, VFSRoot, JAXBIntros</property>
- <property name="provides" class="java.lang.String">UnifiedMetaDataModel</property>
- <property name="forJaxWs" class="boolean">false</property>
- </deploymentAspect>
-
-</deploymentAspects>
-
Modified: stack/cxf/trunk/modules/server/src/main/scripts/antrun-beans-config.xml
===================================================================
--- stack/cxf/trunk/modules/server/src/main/scripts/antrun-beans-config.xml 2014-05-15 14:36:35 UTC (rev 18659)
+++ stack/cxf/trunk/modules/server/src/main/scripts/antrun-beans-config.xml 2014-05-15 17:40:32 UTC (rev 18660)
@@ -2,7 +2,7 @@
<!--
~ JBoss, Home of Professional Open Source.
- ~ Copyright 2011, Red Hat, Inc., and individual contributors
+ ~ Copyright 2014, Red Hat, Inc., and individual contributors
~ as indicated by the @author tags. See the copyright.txt file in the
~ distribution for a full listing of individual contributors.
~
@@ -30,15 +30,6 @@
<target name="main">
<copy
- file="${src.dir}/jbossws-cxf-config-as7.xml"
- tofile="${dest.dir}/jbossws-jboss720/jbossws.beans/META-INF/stack-specific-deployment-aspects.xml"
- />
- <copy
- file="${src.dir}/jbossws-jaxrpc-config-as7.xml"
- tofile="${dest.dir}/jbossws-jboss720/jbossws.beans/META-INF/jaxrpc-deployment-aspects.xml"
- />
-
- <copy
file="${src.dir}/jbossws-cxf-config-as8.xml"
tofile="${dest.dir}/jbossws-wildfly800/jbossws.beans/META-INF/stack-specific-deployment-aspects.xml"
/>
@@ -53,11 +44,6 @@
tofile="${dest.dir}/jbossws-wildfly900/jbossws.beans/META-INF/stack-specific-deployment-aspects.xml"
/>
- <copy
- file="${src.dir}/jbossws-cxf-config-as9.xml"
- tofile="${dest.dir}/jbossws-wildfly900/jbossws.beans/META-INF/stack-specific-deployment-aspects.xml"
- />
-
</target>
</project>
Modified: stack/cxf/trunk/modules/test-utils/src/main/java/org/jboss/wsf/test/JBossWSTest.java
===================================================================
--- stack/cxf/trunk/modules/test-utils/src/main/java/org/jboss/wsf/test/JBossWSTest.java 2014-05-15 14:36:35 UTC (rev 18659)
+++ stack/cxf/trunk/modules/test-utils/src/main/java/org/jboss/wsf/test/JBossWSTest.java 2014-05-15 17:40:32 UTC (rev 18660)
@@ -1,6 +1,6 @@
/*
* JBoss, Home of Professional Open Source.
- * Copyright 2013, Red Hat Middleware LLC, and individual contributors
+ * Copyright 2014, 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.
*
@@ -202,16 +202,6 @@
return JBossWSTestHelper.getServer();
}
- public static boolean isTargetJBoss7()
- {
- return JBossWSTestHelper.isTargetJBoss7();
- }
-
- public static boolean isTargetJBoss72()
- {
- return JBossWSTestHelper.isTargetJBoss72();
- }
-
public static boolean isIntegrationNative()
{
return JBossWSTestHelper.isIntegrationNative();
Modified: stack/cxf/trunk/modules/test-utils/src/main/java/org/jboss/wsf/test/JBossWSTestHelper.java
===================================================================
--- stack/cxf/trunk/modules/test-utils/src/main/java/org/jboss/wsf/test/JBossWSTestHelper.java 2014-05-15 14:36:35 UTC (rev 18659)
+++ stack/cxf/trunk/modules/test-utils/src/main/java/org/jboss/wsf/test/JBossWSTestHelper.java 2014-05-15 17:40:32 UTC (rev 18660)
@@ -1,6 +1,6 @@
/*
* JBoss, Home of Professional Open Source.
- * Copyright 2013, Red Hat Middleware LLC, and individual contributors
+ * Copyright 2014, 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.
*
@@ -145,18 +145,6 @@
}
}
- public static boolean isTargetJBoss7()
- {
- String target = getIntegrationTarget();
- return target.startsWith("jboss7");
- }
-
- public static boolean isTargetJBoss72()
- {
- String target = getIntegrationTarget();
- return target.startsWith("jboss72");
- }
-
public static boolean isTargetWildFly8()
{
String target = getIntegrationTarget();
@@ -248,12 +236,8 @@
if (server == null)
{
String integrationTarget = getIntegrationTarget();
- if (integrationTarget.startsWith("jboss7"))
+ if (integrationTarget.startsWith("wildfly"))
{
- server = getServerConnection("service:jmx:remoting-jmx://" + getServerHost() + ":" + 9999);
- }
- else if (integrationTarget.startsWith("wildfly"))
- {
server = getServerConnection("service:jmx:http-remoting-jmx://" + getServerHost() + ":" + 9990);
}
else
Modified: stack/cxf/trunk/modules/test-utils/src/main/java/org/jboss/wsf/test/JBossWSTestSetup.java
===================================================================
--- stack/cxf/trunk/modules/test-utils/src/main/java/org/jboss/wsf/test/JBossWSTestSetup.java 2014-05-15 14:36:35 UTC (rev 18659)
+++ stack/cxf/trunk/modules/test-utils/src/main/java/org/jboss/wsf/test/JBossWSTestSetup.java 2014-05-15 17:40:32 UTC (rev 18660)
@@ -1,6 +1,6 @@
/*
* JBoss, Home of Professional Open Source.
- * Copyright 2012, Red Hat Middleware LLC, and individual contributors
+ * Copyright 2014, 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.
*
Modified: stack/cxf/trunk/modules/testsuite/cxf-spring-tests/scripts/cxf-jars-jaxws.xml
===================================================================
--- stack/cxf/trunk/modules/testsuite/cxf-spring-tests/scripts/cxf-jars-jaxws.xml 2014-05-15 14:36:35 UTC (rev 18659)
+++ stack/cxf/trunk/modules/testsuite/cxf-spring-tests/scripts/cxf-jars-jaxws.xml 2014-05-15 17:40:32 UTC (rev 18660)
@@ -2,7 +2,7 @@
<!--
~ JBoss, Home of Professional Open Source.
- ~ Copyright 2011, Red Hat, Inc., and individual contributors
+ ~ Copyright 2014, Red Hat, Inc., and individual contributors
~ as indicated by the @author tags. See the copyright.txt file in the
~ distribution for a full listing of individual contributors.
~
@@ -26,14 +26,6 @@
<description>JBossWS test archive builder</description>
- <!-- ============================================================================== -->
- <!-- Building -->
- <!-- -->
- <!-- Where to create your tests -->
- <!-- http://www.jboss.com/index.html?module=bb&op=viewtopic&p=4144172#4144172 -->
- <!-- -->
- <!-- ============================================================================== -->
-
<target name="build-jars-jaxws" description="Build the deployments.">
<mkdir dir="${tests.output.dir}/test-libs"/>
@@ -178,19 +170,6 @@
</manifest>
</war>
- <!-- jaxws-cxf-jms-only-deployment-as7 -->
- <jar destfile="${tests.output.dir}/test-libs/jaxws-cxf-jms-only-deployment-as7.jar">
- <fileset dir="${tests.output.dir}/test-classes">
- <include name="org/jboss/test/ws/jaxws/cxf/jms/HelloWorld*.class"/>
- </fileset>
- <metainf dir="${tests.output.dir}/test-resources/jaxws/cxf/jms/META-INF-as7">
- <include name="wsdl/**/*" />
- </metainf>
- <manifest>
- <attribute name="Dependencies" value="org.hornetq"/>
- </manifest>
- </jar>
-
<!-- jaxws-cxf-jms-only-deployment -->
<jar destfile="${tests.output.dir}/test-libs/jaxws-cxf-jms-only-deployment.jar">
<fileset dir="${tests.output.dir}/test-classes">
@@ -204,20 +183,6 @@
</manifest>
</jar>
- <!-- jaxws-cxf-jms-http-deployment-as7 -->
- <war warfile="${tests.output.dir}/test-libs/jaxws-cxf-jms-http-deployment-as7.war" webxml="${tests.output.dir}/test-resources/jaxws/cxf/jms_http/WEB-INF/web.xml">
- <classes dir="${tests.output.dir}/test-classes">
- <include name="org/jboss/test/ws/jaxws/cxf/jms_http/HelloWorld*.class"/>
- <include name="org/jboss/test/ws/jaxws/cxf/jms_http/HttpHelloWorld*.class"/>
- </classes>
- <webinf dir="${tests.output.dir}/test-resources/jaxws/cxf/jms_http/WEB-INF-as7">
- <include name="wsdl/**"/>
- </webinf>
- <manifest>
- <attribute name="Dependencies" value="org.hornetq"/>
- </manifest>
- </war>
-
<!-- jaxws-cxf-jms-http-deployment -->
<war warfile="${tests.output.dir}/test-libs/jaxws-cxf-jms-http-deployment.war" webxml="${tests.output.dir}/test-resources/jaxws/cxf/jms_http/WEB-INF/web.xml">
<classes dir="${tests.output.dir}/test-classes">
@@ -247,21 +212,6 @@
</manifest>
</war>
- <!-- jaxws-cxf-jms-http-deployment-test-servlet-as7 -->
- <war warfile="${tests.output.dir}/test-libs/jaxws-cxf-jms-http-deployment-test-servlet-as7.war"
- needxmlfile='false'>
- <classes dir="${tests.output.dir}/test-classes">
- <include name="org/jboss/test/ws/jaxws/cxf/jms_http/DeploymentTestServlet.class"/>
- <include name="org/jboss/test/ws/jaxws/cxf/jms_http/HelloWorld.class"/>
- </classes>
- <zipfileset
- dir="${tests.output.dir}/test-resources/jaxws/cxf/jms_http/WEB-INF-as7/wsdl"
- prefix="WEB-INF/classes/META-INF/wsdl"/>
- <manifest>
- <attribute name="Dependencies" value="org.jboss.ws.cxf.jbossws-cxf-client services,org.hornetq"/>
- </manifest>
- </war>
-
<!-- jaxws-cxf-jms-http-deployment-test-servlet -->
<war warfile="${tests.output.dir}/test-libs/jaxws-cxf-jms-http-deployment-test-servlet.war"
needxmlfile='false'>
Modified: stack/cxf/trunk/modules/testsuite/cxf-spring-tests/scripts/cxf-samples-jaxws.xml
===================================================================
--- stack/cxf/trunk/modules/testsuite/cxf-spring-tests/scripts/cxf-samples-jaxws.xml 2014-05-15 14:36:35 UTC (rev 18659)
+++ stack/cxf/trunk/modules/testsuite/cxf-spring-tests/scripts/cxf-samples-jaxws.xml 2014-05-15 17:40:32 UTC (rev 18660)
@@ -2,7 +2,7 @@
<!--
~ JBoss, Home of Professional Open Source.
- ~ Copyright 2011, Red Hat, Inc., and individual contributors
+ ~ Copyright 2014, Red Hat, Inc., and individual contributors
~ as indicated by the @author tags. See the copyright.txt file in the
~ distribution for a full listing of individual contributors.
~
Modified: stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jms/JMSEndpointOnlyDeploymentTestCaseForked.java
===================================================================
--- stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jms/JMSEndpointOnlyDeploymentTestCaseForked.java 2014-05-15 14:36:35 UTC (rev 18659)
+++ stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jms/JMSEndpointOnlyDeploymentTestCaseForked.java 2014-05-15 17:40:32 UTC (rev 18660)
@@ -62,8 +62,7 @@
public static Test suite()
{
- return new JBossWSCXFTestSetup(JMSEndpointOnlyDeploymentTestCaseForked.class, "jaxws-cxf-jms-only-deployment-test-servlet.war, " +
- (isTargetJBoss7() ? "jaxws-cxf-jms-only-deployment-as7.jar" : "jaxws-cxf-jms-only-deployment.jar"));
+ return new JBossWSCXFTestSetup(JMSEndpointOnlyDeploymentTestCaseForked.class, "jaxws-cxf-jms-only-deployment-test-servlet.war, jaxws-cxf-jms-only-deployment.jar");
}
public void testJMSEndpointServerSide() throws Exception
@@ -74,8 +73,7 @@
public void testJMSEndpointClientSide() throws Exception
{
- final String suffix = isTargetJBoss7() ? "-as7" : "";
- URL wsdlUrl = getResourceURL("jaxws/cxf/jms/META-INF" + suffix + "/wsdl/HelloWorldService.wsdl");
+ URL wsdlUrl = getResourceURL("jaxws/cxf/jms/META-INF/wsdl/HelloWorldService.wsdl");
QName serviceName = new QName("http://org.jboss.ws/jaxws/cxf/jms", "HelloWorldService");
Service service = Service.create(wsdlUrl, serviceName);
@@ -110,11 +108,7 @@
Properties env = new Properties();
env.put(Context.INITIAL_CONTEXT_FACTORY, "org.jboss.naming.remote.client.InitialContextFactory");
- if (isTargetJBoss7()) {
- env.put(Context.PROVIDER_URL, "remote://" + getServerHost() + ":4447");
- } else {
- env.put(Context.PROVIDER_URL, "http-remoting://" + getServerHost() + ":8080");
- }
+ env.put(Context.PROVIDER_URL, "http-remoting://" + getServerHost() + ":8080");
env.put(Context.SECURITY_PRINCIPAL, JBossWSTestHelper.getTestUsername());
env.put(Context.SECURITY_CREDENTIALS, JBossWSTestHelper.getTestPassword());
InitialContext context = null;
Modified: stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jms_http/JMSHTTPEndpointDeploymentTestCaseForked.java
===================================================================
--- stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jms_http/JMSHTTPEndpointDeploymentTestCaseForked.java 2014-05-15 14:36:35 UTC (rev 18659)
+++ stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jms_http/JMSHTTPEndpointDeploymentTestCaseForked.java 2014-05-15 17:40:32 UTC (rev 18660)
@@ -49,22 +49,18 @@
{
public static Test suite()
{
- return new JBossWSCXFTestSetup(JMSHTTPEndpointDeploymentTestCaseForked.class, (isTargetJBoss7() ?
- "jaxws-cxf-jms-http-deployment-test-servlet-as7.war, jaxws-cxf-jms-http-deployment-as7.war" :
- "jaxws-cxf-jms-http-deployment-test-servlet.war, jaxws-cxf-jms-http-deployment.war"));
+ return new JBossWSCXFTestSetup(JMSHTTPEndpointDeploymentTestCaseForked.class, "jaxws-cxf-jms-http-deployment-test-servlet.war, jaxws-cxf-jms-http-deployment.war");
}
public void testJMSEndpointServerSide() throws Exception
{
- final String suffix = isTargetJBoss7() ? "-as7" : "";
- URL url = new URL("http://" + getServerHost() + ":8080/jaxws-cxf-jms-http-deployment-test-servlet" + suffix);
+ URL url = new URL("http://" + getServerHost() + ":8080/jaxws-cxf-jms-http-deployment-test-servlet");
assertEquals("true", IOUtils.readAndCloseStream(url.openStream()));
}
public void testJMSEndpointClientSide() throws Exception
{
- final String suffix = isTargetJBoss7() ? "-as7" : "";
- URL wsdlUrl = getResourceURL("jaxws/cxf/jms_http/WEB-INF" + suffix + "/wsdl/HelloWorldService.wsdl");
+ URL wsdlUrl = getResourceURL("jaxws/cxf/jms_http/WEB-INF/wsdl/HelloWorldService.wsdl");
QName serviceName = new QName("http://org.jboss.ws/jaxws/cxf/jms", "HelloWorldService");
Service service = Service.create(wsdlUrl, serviceName);
@@ -82,8 +78,7 @@
public void testHTTPEndpointClientSide() throws Exception
{
- final String suffix = isTargetJBoss7() ? "-as7" : "";
- URL wsdlUrl = new URL("http://" + getServerHost() + ":8080/jaxws-cxf-jms-http-deployment" + suffix + "?wsdl");
+ URL wsdlUrl = new URL("http://" + getServerHost() + ":8080/jaxws-cxf-jms-http-deployment?wsdl");
QName serviceName = new QName("http://org.jboss.ws/jaxws/cxf/jms", "HelloWorldService");
Service service = Service.create(wsdlUrl, serviceName);
Modified: stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/samples/kerberos/KerberosTestCase.java
===================================================================
--- stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/samples/kerberos/KerberosTestCase.java 2014-05-15 14:36:35 UTC (rev 18659)
+++ stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/samples/kerberos/KerberosTestCase.java 2014-05-15 17:40:32 UTC (rev 18660)
@@ -95,19 +95,9 @@
JBossWSCXFTestSetup testSetup;
testSetup = new JBossWSCXFTestSetup(KerberosTestCase.class, "jaxws-samples-wsse-kerberos-client.jar jaxws-samples-wsse-kerberos.war");
Map<String, String> sslOptions = new HashMap<String, String>();
- if (isTargetJBoss7())
- {
- sslOptions.put("certificate-key-file", System.getProperty("org.jboss.ws.testsuite.server.keystore"));
- sslOptions.put("password", "changeit");
- sslOptions.put("verify-client", "false");
- sslOptions.put("key-alias", "tomcat");
- }
- else
- {
- sslOptions.put("server-identity.ssl.keystore-path", System.getProperty("org.jboss.ws.testsuite.server.keystore"));
- sslOptions.put("server-identity.ssl.keystore-password", "changeit");
- sslOptions.put("server-identity.ssl.alias", "tomcat");
- }
+ sslOptions.put("server-identity.ssl.keystore-path", System.getProperty("org.jboss.ws.testsuite.server.keystore"));
+ sslOptions.put("server-identity.ssl.keystore-password", "changeit");
+ sslOptions.put("server-identity.ssl.alias", "tomcat");
testSetup.setHttpsConnectorRequirement(sslOptions);
return testSetup;
Modified: stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wssePolicy/UsernameTestCase.java
===================================================================
--- stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wssePolicy/UsernameTestCase.java 2014-05-15 14:36:35 UTC (rev 18659)
+++ stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wssePolicy/UsernameTestCase.java 2014-05-15 17:40:32 UTC (rev 18660)
@@ -56,19 +56,9 @@
*/
JBossWSTestSetup setup = new JBossWSCXFTestSetup(UsernameTestCase.class, "jaxws-samples-wssePolicy-username.war");
Map<String, String> sslOptions = new HashMap<String, String>();
- if (isTargetJBoss7())
- {
- sslOptions.put("certificate-key-file", System.getProperty("org.jboss.ws.testsuite.server.keystore"));
- sslOptions.put("password", "changeit");
- sslOptions.put("verify-client", "false");
- sslOptions.put("key-alias", "tomcat");
- }
- else
- {
- sslOptions.put("server-identity.ssl.keystore-path", System.getProperty("org.jboss.ws.testsuite.server.keystore"));
- sslOptions.put("server-identity.ssl.keystore-password", "changeit");
- sslOptions.put("server-identity.ssl.alias", "tomcat");
- }
+ sslOptions.put("server-identity.ssl.keystore-path", System.getProperty("org.jboss.ws.testsuite.server.keystore"));
+ sslOptions.put("server-identity.ssl.keystore-password", "changeit");
+ sslOptions.put("server-identity.ssl.alias", "tomcat");
setup.setHttpsConnectorRequirement(sslOptions);
return setup;
}
Modified: stack/cxf/trunk/modules/testsuite/cxf-tests/scripts/cxf-jars-jaxws.xml
===================================================================
--- stack/cxf/trunk/modules/testsuite/cxf-tests/scripts/cxf-jars-jaxws.xml 2014-05-15 14:36:35 UTC (rev 18659)
+++ stack/cxf/trunk/modules/testsuite/cxf-tests/scripts/cxf-jars-jaxws.xml 2014-05-15 17:40:32 UTC (rev 18660)
@@ -2,7 +2,7 @@
<!--
~ JBoss, Home of Professional Open Source.
- ~ Copyright 2011, Red Hat, Inc., and individual contributors
+ ~ Copyright 2014, Red Hat, Inc., and individual contributors
~ as indicated by the @author tags. See the copyright.txt file in the
~ distribution for a full listing of individual contributors.
~
@@ -26,14 +26,6 @@
<description>JBossWS test archive builder</description>
- <!-- ============================================================================== -->
- <!-- Building -->
- <!-- -->
- <!-- Where to create your tests -->
- <!-- http://www.jboss.com/index.html?module=bb&op=viewtopic&p=4144172#4144172 -->
- <!-- -->
- <!-- ============================================================================== -->
-
<target name="build-jars-jaxws" description="Build the deployments.">
<mkdir dir="${tests.output.dir}/test-libs"/>
Modified: stack/cxf/trunk/modules/testsuite/cxf-tests/scripts/cxf-samples-jars-jaxws.xml
===================================================================
--- stack/cxf/trunk/modules/testsuite/cxf-tests/scripts/cxf-samples-jars-jaxws.xml 2014-05-15 14:36:35 UTC (rev 18659)
+++ stack/cxf/trunk/modules/testsuite/cxf-tests/scripts/cxf-samples-jars-jaxws.xml 2014-05-15 17:40:32 UTC (rev 18660)
@@ -2,7 +2,7 @@
<!--
~ JBoss, Home of Professional Open Source.
- ~ Copyright 2012, Red Hat, Inc., and individual contributors
+ ~ Copyright 2014, Red Hat, Inc., and individual contributors
~ as indicated by the @author tags. See the copyright.txt file in the
~ distribution for a full listing of individual contributors.
~
@@ -26,14 +26,6 @@
<description>JBossWS test archive builder</description>
- <!-- ============================================================================== -->
- <!-- Building -->
- <!-- -->
- <!-- Where to create your tests -->
- <!-- http://www.jboss.com/index.html?module=bb&op=viewtopic&p=4144172#4144172 -->
- <!-- -->
- <!-- ============================================================================== -->
-
<target name="build-jars-jaxws" description="Build the deployments.">
<mkdir dir="${tests.output.dir}/test-libs"/>
Modified: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/basic/UsernameOverTransportTestCase.java
===================================================================
--- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/basic/UsernameOverTransportTestCase.java 2014-05-15 14:36:35 UTC (rev 18659)
+++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/basic/UsernameOverTransportTestCase.java 2014-05-15 17:40:32 UTC (rev 18660)
@@ -56,19 +56,9 @@
*/
JBossWSTestSetup setup = new JBossWSCXFTestSetup(UsernameOverTransportTestCase.class, "jaxws-samples-wsse-policy-username.war");
Map<String, String> sslOptions = new HashMap<String, String>();
- if (isTargetJBoss7())
- {
- sslOptions.put("certificate-key-file", System.getProperty("org.jboss.ws.testsuite.server.keystore"));
- sslOptions.put("password", "changeit");
- sslOptions.put("verify-client", "false");
- sslOptions.put("key-alias", "tomcat");
- }
- else
- {
- sslOptions.put("server-identity.ssl.keystore-path", System.getProperty("org.jboss.ws.testsuite.server.keystore"));
- sslOptions.put("server-identity.ssl.keystore-password", "changeit");
- sslOptions.put("server-identity.ssl.alias", "tomcat");
- }
+ sslOptions.put("server-identity.ssl.keystore-path", System.getProperty("org.jboss.ws.testsuite.server.keystore"));
+ sslOptions.put("server-identity.ssl.keystore-password", "changeit");
+ sslOptions.put("server-identity.ssl.alias", "tomcat");
setup.setHttpsConnectorRequirement(sslOptions);
return setup;
}
Modified: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/oasis/WSSecurityPolicyExamples21xTestCase.java
===================================================================
--- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/oasis/WSSecurityPolicyExamples21xTestCase.java 2014-05-15 14:36:35 UTC (rev 18659)
+++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/oasis/WSSecurityPolicyExamples21xTestCase.java 2014-05-15 17:40:32 UTC (rev 18660)
@@ -62,19 +62,9 @@
JBossWSCXFTestSetup setup = new JBossWSCXFTestSetup(WSSecurityPolicyExamples21xTestCase.class,
"jaxws-samples-wsse-policy-oasis-21x.war,jaxws-samples-wsse-policy-oasis-client.jar");
Map<String, String> sslOptions = new HashMap<String, String>();
- if (isTargetJBoss7())
- {
- sslOptions.put("certificate-key-file", System.getProperty("org.jboss.ws.testsuite.server.keystore"));
- sslOptions.put("password", "changeit");
- sslOptions.put("verify-client", "false");
- sslOptions.put("key-alias", "tomcat");
- }
- else
- {
- sslOptions.put("server-identity.ssl.keystore-path", System.getProperty("org.jboss.ws.testsuite.server.keystore"));
- sslOptions.put("server-identity.ssl.keystore-password", "changeit");
- sslOptions.put("server-identity.ssl.alias", "tomcat");
- }
+ sslOptions.put("server-identity.ssl.keystore-path", System.getProperty("org.jboss.ws.testsuite.server.keystore"));
+ sslOptions.put("server-identity.ssl.keystore-password", "changeit");
+ sslOptions.put("server-identity.ssl.alias", "tomcat");
setup.setHttpsConnectorRequirement(sslOptions);
return setup;
}
Modified: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/oasis/WSSecurityPolicyExamples23xTestCase.java
===================================================================
--- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/oasis/WSSecurityPolicyExamples23xTestCase.java 2014-05-15 14:36:35 UTC (rev 18659)
+++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/oasis/WSSecurityPolicyExamples23xTestCase.java 2014-05-15 17:40:32 UTC (rev 18660)
@@ -66,26 +66,13 @@
JBossWSCXFTestSetup setup = new JBossWSCXFTestSetup(WSSecurityPolicyExamples23xTestCase.class,
"jaxws-samples-wsse-policy-oasis-23x.war,jaxws-samples-wsse-policy-oasis-client.jar");
Map<String, String> sslOptions = new HashMap<String, String>();
- if (isTargetJBoss7())
- {
- sslOptions.put("certificate-key-file", System.getProperty("org.jboss.ws.testsuite.server.keystore"));
- sslOptions.put("password", "changeit");
- sslOptions.put("key-alias", "tomcat");
- //enable SSL mutual authentication (https client cert is checked on server side)
- sslOptions.put("verify-client", "true");
- sslOptions.put("ca-certificate-file", System.getProperty("org.jboss.ws.testsuite.server.truststore"));
- sslOptions.put("ca-certificate-password", "changeit");
- }
- else
- {
- sslOptions.put("server-identity.ssl.keystore-path", System.getProperty("org.jboss.ws.testsuite.server.keystore"));
- sslOptions.put("server-identity.ssl.keystore-password", "changeit");
- sslOptions.put("server-identity.ssl.alias", "tomcat");
- //enable SSL mutual authentication (https client cert is checked on server side)
- sslOptions.put("verify-client", "REQUESTED");
- sslOptions.put("authentication.truststore.keystore-path", System.getProperty("org.jboss.ws.testsuite.server.truststore"));
- sslOptions.put("authentication.truststore.keystore-password", "changeit");
- }
+ sslOptions.put("server-identity.ssl.keystore-path", System.getProperty("org.jboss.ws.testsuite.server.keystore"));
+ sslOptions.put("server-identity.ssl.keystore-password", "changeit");
+ sslOptions.put("server-identity.ssl.alias", "tomcat");
+ //enable SSL mutual authentication (https client cert is checked on server side)
+ sslOptions.put("verify-client", "REQUESTED");
+ sslOptions.put("authentication.truststore.keystore-path", System.getProperty("org.jboss.ws.testsuite.server.truststore"));
+ sslOptions.put("authentication.truststore.keystore-password", "changeit");
setup.setHttpsConnectorRequirement(sslOptions);
return setup;
}
Modified: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/trust/WSTrustBearerTestCase.java
===================================================================
--- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/trust/WSTrustBearerTestCase.java 2014-05-15 14:36:35 UTC (rev 18659)
+++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/trust/WSTrustBearerTestCase.java 2014-05-15 17:40:32 UTC (rev 18660)
@@ -55,19 +55,9 @@
// setup the https connector in the server config file.
Map<String, String> sslOptions = new HashMap<String, String>();
- if (isTargetJBoss7())
- {
- sslOptions.put("certificate-key-file", System.getProperty("org.jboss.ws.testsuite.server.keystore"));
- sslOptions.put("password", "changeit");
- sslOptions.put("verify-client", "false");
- sslOptions.put("key-alias", "tomcat");
- }
- else
- {
- sslOptions.put("server-identity.ssl.keystore-path", System.getProperty("org.jboss.ws.testsuite.server.keystore"));
- sslOptions.put("server-identity.ssl.keystore-password", "changeit");
- sslOptions.put("server-identity.ssl.alias", "tomcat");
- }
+ sslOptions.put("server-identity.ssl.keystore-path", System.getProperty("org.jboss.ws.testsuite.server.keystore"));
+ sslOptions.put("server-identity.ssl.keystore-password", "changeit");
+ sslOptions.put("server-identity.ssl.alias", "tomcat");
testSetup.setHttpsConnectorRequirement(sslOptions);
return testSetup;
}
Modified: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/trust/WSTrustHolderOfKeyTestCase.java
===================================================================
--- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/trust/WSTrustHolderOfKeyTestCase.java 2014-05-15 14:36:35 UTC (rev 18659)
+++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/trust/WSTrustHolderOfKeyTestCase.java 2014-05-15 17:40:32 UTC (rev 18660)
@@ -56,19 +56,9 @@
// setup the https connector in the server config file.
Map<String, String> sslOptions = new HashMap<String, String>();
- if (isTargetJBoss7())
- {
- sslOptions.put("certificate-key-file", System.getProperty("org.jboss.ws.testsuite.server.keystore"));
- sslOptions.put("password", "changeit");
- sslOptions.put("verify-client", "false");
- sslOptions.put("key-alias", "tomcat");
- }
- else
- {
- sslOptions.put("server-identity.ssl.keystore-path", System.getProperty("org.jboss.ws.testsuite.server.keystore"));
- sslOptions.put("server-identity.ssl.keystore-password", "changeit");
- sslOptions.put("server-identity.ssl.alias", "tomcat");
- }
+ sslOptions.put("server-identity.ssl.keystore-path", System.getProperty("org.jboss.ws.testsuite.server.keystore"));
+ sslOptions.put("server-identity.ssl.keystore-password", "changeit");
+ sslOptions.put("server-identity.ssl.alias", "tomcat");
testSetup.setHttpsConnectorRequirement(sslOptions);
return testSetup;
Modified: stack/cxf/trunk/modules/testsuite/pom.xml
===================================================================
--- stack/cxf/trunk/modules/testsuite/pom.xml 2014-05-15 14:36:35 UTC (rev 18659)
+++ stack/cxf/trunk/modules/testsuite/pom.xml 2014-05-15 17:40:32 UTC (rev 18660)
@@ -625,106 +625,6 @@
</profile>
<!--
- Name: jboss720
- Descr: JBoss-7.2.0 specific options
- -->
- <profile>
- <id>jboss720</id>
- <properties>
- <jboss.version>${jboss720.version}</jboss.version>
- <jbossws.integration.target>jboss720</jbossws.integration.target>
- </properties>
- <dependencies>
- <dependency>
- <groupId>org.jboss.ws</groupId>
- <artifactId>jbossws-jboss720-tests-integration</artifactId>
- </dependency>
- <!-- LittleProxy depencency declared in this profile as other profiles require different exclusions -->
- <dependency>
- <groupId>org.littleshoot</groupId>
- <artifactId>littleproxy</artifactId>
- <version>${org.littleshoot.littleproxy.version}</version>
- <exclusions>
- <exclusion>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-api</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-log4j12</artifactId>
- </exclusion>
- <exclusion>
- <groupId>net.sf.ehcache</groupId>
- <artifactId>ehcache-core</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- </dependencies>
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-compiler-plugin</artifactId>
- <configuration>
- <compilerArguments>
- <endorseddirs>${project.build.directory}/endorsed</endorseddirs>
- </compilerArguments>
- </configuration>
- </plugin>
- <plugin>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <argLine>${surefire.jvm.args} ${surefire.jvm.management.args} ${surefire.default-mgmt-serurity.args} -Djava.endorsed.dirs=${project.build.directory}/endorsed</argLine>
- <excludes>
- <!--# [CXF-1519] Explicitly set the namespace of a WebFault-->
- <exclude>org/jboss/test/ws/jaxws/jbws1904/**</exclude>
-
- <!--# [CXF-2006] RespectBinding feature and not understood required extensibility elements-->
- <exclude>org/jboss/test/ws/jaxws/jbws2449/**</exclude>
-
- <!--# [JBWS-2561] XOP request not properly inlined-->
- <exclude>org/jboss/test/ws/jaxws/samples/xop/doclit/XOPHandlerTestCase.*</exclude>
-
- <!--# [JBWS-2480] Soap attachments are dropped on server response-->
- <exclude>org/jboss/test/ws/jaxws/jbws1283/**</exclude>
-
- <!-- # Tests migrated from JBossWS-Native specific testsuite which are meant to pass with JBossWS-CXF too, but are still to be fixed -->
- <exclude>org/jboss/test/ws/jaxws/jbws2978/**</exclude>
-
- <!-- # [PLFED-390] PicketLink STS chokes on WS-Policy 1.5 tags -->
- <exclude>org/jboss/test/ws/jaxws/samples/wsse/policy/trust/WSTrustPicketLinkTestCase*</exclude>
-
- <!--# [AS7-537] Fixed on AS 8 or greater -->
- <exclude>org/jboss/test/ws/jaxws/cxf/noIntegration/AS7537TestCase**</exclude>
-
- <!--# [JBWS-3560] fastinfoset module is required in as720 -->
- <exclude>org/jboss/test/ws/jaxws/cxf/fastinfoset/FastInfosetTestCase*</exclude>
-
- <!--# [WFLY-308] Provide facility for running ejb3 ws endpoints authorization independently -->
- <exclude>org/jboss/test/ws/jaxws/handlerauth/HandlerAuthTestCase*</exclude>
-
- <!-- Manually setup KDC before run this test-->
- <exclude>org/jboss/test/ws/jaxws/samples/wsse/kerberos/*TestCase*</exclude>
-
- <!--There is no jbossws-cxf-jaspi installed in as720-->
- <exclude>org/jboss/test/ws/jaxws/samples/wsse/policy/jaspi/Jaspi*TestCase*</exclude>
-
- <!-- [JBWS-3773][CXF-5602] HttpServletRequestSnapshot is not created for requests with WSA ReplyTo prop set -->
- <exclude>org/jboss/test/ws/jaxws/cxf/jbws3773/**</exclude>
-
- <!-- [WELD-1328] @WebServiceRef injection not working w/ Weld 1.x -->
- <exclude>org/jboss/test/ws/jaxws/cxf/jbws3679/**</exclude>
-
- <!-- [JBWS-3686] Restore WSTrustActAsTestCase and WSTrustOnBehalfOfTestCase -->
- <exclude>org/jboss/test/ws/jaxws/samples/wsse/policy/trust/WSTrustActAsTestCase.*</exclude>
- <exclude>org/jboss/test/ws/jaxws/samples/wsse/policy/trust/WSTrustOnBehalfOfTestCase.*</exclude>
- </excludes>
- </configuration>
- </plugin>
- </plugins>
- </build>
- </profile>
-
- <!--
Name: wildfly800
Descr: WildFly-8.0.0 specific options
-->
Modified: stack/cxf/trunk/modules/testsuite/shared-tests/scripts/antrun-wsconsume.xml
===================================================================
--- stack/cxf/trunk/modules/testsuite/shared-tests/scripts/antrun-wsconsume.xml 2014-05-15 14:36:35 UTC (rev 18659)
+++ stack/cxf/trunk/modules/testsuite/shared-tests/scripts/antrun-wsconsume.xml 2014-05-15 17:40:32 UTC (rev 18660)
@@ -2,7 +2,7 @@
<!--
~ JBoss, Home of Professional Open Source.
- ~ Copyright 2011, Red Hat, Inc., and individual contributors
+ ~ Copyright 2014, Red Hat, Inc., and individual contributors
~ as indicated by the @author tags. See the copyright.txt file in the
~ distribution for a full listing of individual contributors.
~
Modified: stack/cxf/trunk/modules/testsuite/shared-tests/scripts/antrun-wsprovide.xml
===================================================================
--- stack/cxf/trunk/modules/testsuite/shared-tests/scripts/antrun-wsprovide.xml 2014-05-15 14:36:35 UTC (rev 18659)
+++ stack/cxf/trunk/modules/testsuite/shared-tests/scripts/antrun-wsprovide.xml 2014-05-15 17:40:32 UTC (rev 18660)
@@ -2,7 +2,7 @@
<!--
~ JBoss, Home of Professional Open Source.
- ~ Copyright 2011, Red Hat, Inc., and individual contributors
+ ~ Copyright 2014, Red Hat, Inc., and individual contributors
~ as indicated by the @author tags. See the copyright.txt file in the
~ distribution for a full listing of individual contributors.
~
Modified: stack/cxf/trunk/modules/testsuite/shared-tests/src/test/ant-import/build-jars-jaxws.xml
===================================================================
--- stack/cxf/trunk/modules/testsuite/shared-tests/src/test/ant-import/build-jars-jaxws.xml 2014-05-15 14:36:35 UTC (rev 18659)
+++ stack/cxf/trunk/modules/testsuite/shared-tests/src/test/ant-import/build-jars-jaxws.xml 2014-05-15 17:40:32 UTC (rev 18660)
@@ -2,7 +2,7 @@
<!--
~ JBoss, Home of Professional Open Source.
- ~ Copyright 2011, Red Hat, Inc., and individual contributors
+ ~ Copyright 2014, Red Hat, Inc., and individual contributors
~ as indicated by the @author tags. See the copyright.txt file in the
~ distribution for a full listing of individual contributors.
~
Modified: stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/endpoint/jse/UsecasesTestCase.java
===================================================================
--- stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/endpoint/jse/UsecasesTestCase.java 2014-05-15 14:36:35 UTC (rev 18659)
+++ stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/endpoint/jse/UsecasesTestCase.java 2014-05-15 17:40:32 UTC (rev 18660)
@@ -1,6 +1,6 @@
/*
* JBoss, Home of Professional Open Source.
- * Copyright 2009, Red Hat Middleware LLC, and individual contributors
+ * Copyright 2014, 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.
*
@@ -26,8 +26,6 @@
import java.io.InputStream;
import java.io.OutputStream;
import java.net.URL;
-import java.util.Currency;
-import java.util.Locale;
import javax.activation.DataHandler;
import javax.activation.DataSource;
@@ -56,9 +54,6 @@
private static int port1 = 8871;
private static int port2 = 8872;
- @SuppressWarnings("unused")
- private static Currency currency = Currency.getInstance(Locale.US); //workaround for JBWS-3623
-
public void testDifferentPortsSameContext() throws Exception
{
String publishURL1 = "http://" + getServerHost() + ":" + port1 + "/jaxws-endpoint/";
Modified: stack/cxf/trunk/pom.xml
===================================================================
--- stack/cxf/trunk/pom.xml 2014-05-15 14:36:35 UTC (rev 18659)
+++ stack/cxf/trunk/pom.xml 2014-05-15 17:40:32 UTC (rev 18660)
@@ -2,7 +2,7 @@
<!--
~ JBoss, Home of Professional Open Source.
- ~ Copyright 2011, Red Hat, Inc., and individual contributors
+ ~ Copyright 2014, Red Hat, Inc., and individual contributors
~ as indicated by the @author tags. See the copyright.txt file in the
~ distribution for a full listing of individual contributors.
~
@@ -65,11 +65,9 @@
<jbossws.spi.version>3.0.0-SNAPSHOT</jbossws.spi.version>
<jbossws.common.version>3.0.0-SNAPSHOT</jbossws.common.version>
<jbossws.common.tools.version>1.2.0.Final</jbossws.common.tools.version>
- <jbossws.jboss720.version>5.0.0-SNAPSHOT</jbossws.jboss720.version>
<jbossws.wildfly800.version>5.0.0-SNAPSHOT</jbossws.wildfly800.version>
<jbossws.wildfly810.version>5.0.0-SNAPSHOT</jbossws.wildfly810.version>
<jbossws.native.version>4.2.0.Final</jbossws.native.version>
- <jboss720.version>7.2.0.Final</jboss720.version>
<wildfly800.version>8.0.0.Final</wildfly800.version>
<wildfly810.version>8.1.0.CR2</wildfly810.version>
<wildfly900.version>9.0.0.Alpha1-SNAPSHOT</wildfly900.version>
@@ -84,10 +82,8 @@
<jboss.xb.version>2.0.3.GA</jboss.xb.version>
<picketbox.version>4.0.19.Final</picketbox.version>
<picketlink.version>2.5.2.Final</picketlink.version>
- <jaxws-jboss-httpserver-httpspi.version>1.0.1.GA</jaxws-jboss-httpserver-httpspi.version>
<jaxws-undertow-httpspi.version>1.0.1.Beta1</jaxws-undertow-httpspi.version>
- <httpserver.version>1.0.0.Final</httpserver.version>
- <io.undertow.version>1.0.0.Beta33</io.undertow.version>
+ <io.undertow.version>1.0.10.Final</io.undertow.version>
<jaxb.api.version>1.0.4.Final</jaxb.api.version>
<jaxb.impl.version>2.2.6</jaxb.impl.version>
<jaxrpc.api.version>1.0.1.Final</jaxrpc.api.version>
@@ -144,16 +140,6 @@
</dependency>
<dependency>
<groupId>org.jboss.ws</groupId>
- <artifactId>jbossws-jboss720-server-integration</artifactId>
- <version>${jbossws.jboss720.version}</version>
- </dependency>
- <dependency>
- <groupId>org.jboss.ws</groupId>
- <artifactId>jbossws-jboss720-tests-integration</artifactId>
- <version>${jbossws.jboss720.version}</version>
- </dependency>
- <dependency>
- <groupId>org.jboss.ws</groupId>
<artifactId>jbossws-wildfly800-server-integration</artifactId>
<version>${jbossws.wildfly800.version}</version>
</dependency>
@@ -179,11 +165,6 @@
</dependency>
<dependency>
<groupId>org.jboss.ws.projects</groupId>
- <artifactId>jaxws-jboss-httpserver-httpspi</artifactId>
- <version>${jaxws-jboss-httpserver-httpspi.version}</version>
- </dependency>
- <dependency>
- <groupId>org.jboss.ws.projects</groupId>
<artifactId>jaxws-undertow-httpspi</artifactId>
<version>${jaxws-undertow-httpspi.version}</version>
</dependency>
@@ -954,11 +935,6 @@
<version>${cxf.asm.version}</version>
</dependency>
<dependency>
- <groupId>org.jboss.com.sun.httpserver</groupId>
- <artifactId>httpserver</artifactId>
- <version>${httpserver.version}</version>
- </dependency>
- <dependency>
<groupId>io.undertow</groupId>
<artifactId>undertow-core</artifactId>
<version>${io.undertow.version}</version>
@@ -1368,18 +1344,6 @@
</profile>
<!--
- Name: jboss720
- Descr: JBoss-7.2.0 specific options
- -->
- <profile>
- <id>jboss720</id>
- <properties>
- <jbossws.integration.target>jboss720</jbossws.integration.target>
- <jboss.home>${jboss720.home}</jboss.home>
- </properties>
- </profile>
-
- <!--
Name: wildfly800
Descr: WildFly-8.0.0 specific options
-->
10 years, 7 months
- 1
- 0
JBossWS SVN: r18659 - stack/cxf/trunk/modules/dist/src/main/distro.
by jbossws-commits＠lists.jboss.org
Author: asoldano
Date: 2014-05-15 10:36:35 -0400 (Thu, 15 May 2014)
New Revision: 18659
Modified:
stack/cxf/trunk/modules/dist/src/main/distro/build-testsuite.xml
Log:
[JBWS-3794] Bugfix
Modified: stack/cxf/trunk/modules/dist/src/main/distro/build-testsuite.xml
===================================================================
--- stack/cxf/trunk/modules/dist/src/main/distro/build-testsuite.xml 2014-05-15 08:16:11 UTC (rev 18658)
+++ stack/cxf/trunk/modules/dist/src/main/distro/build-testsuite.xml 2014-05-15 14:36:35 UTC (rev 18659)
@@ -111,7 +111,7 @@
</tstamp>
</target>
- <target name="tests-classpath" depends="tests-classpath-jboss72x,tests-classpath-wildfly80x">
+ <target name="tests-classpath" depends="tests-classpath-jboss72x,tests-classpath-wildfly80x,tests-classpath-wildfly90x">
<path id="tests.javac.classpath">
<path refid="ws.stack.classpath"/>
<path refid="integration.target.javac.classpath"/>
10 years, 7 months
- 1
- 0
JBossWS SVN: r18658 - hudson/trunk.
by jbossws-commits＠lists.jboss.org
Author: asoldano
Date: 2014-05-15 04:16:11 -0400 (Thu, 15 May 2014)
New Revision: 18658
Modified:
hudson/trunk/ant.properties.example
Log:
Modified: hudson/trunk/ant.properties.example
===================================================================
--- hudson/trunk/ant.properties.example 2014-05-14 20:56:02 UTC (rev 18657)
+++ hudson/trunk/ant.properties.example 2014-05-15 08:16:11 UTC (rev 18658)
@@ -25,11 +25,11 @@
hudson.jboss800.url=https://github.com/wildfly/wildfly
hudson.jboss800.build=wildfly-8.0.0.Final
-hudson.jboss800.rev=wildfly-8.0.0.Final
+hudson.jboss800.rev=8.0.0.Final
hudson.jboss810.url=https://github.com/wildfly/wildfly
hudson.jboss810.build=wildfly-8.1.0.CR2
-hudson.jboss810.rev=wildfly-8.1.0.CR2
+hudson.jboss810.rev=8.1.0.CR2
hudson.jboss900.url=https://github.com/wildfly/wildfly
hudson.jboss900.build=wildfly-9.0.0.Alpha1-SNAPSHOT
10 years, 7 months
- 1
- 0
JBossWS SVN: r18657 - hudson/trunk/hudson-home.
by jbossws-commits＠lists.jboss.org
Author: asoldano
Date: 2014-05-14 16:56:02 -0400 (Wed, 14 May 2014)
New Revision: 18657
Modified:
hudson/trunk/hudson-home/config.xml
Log:
Fix
Modified: hudson/trunk/hudson-home/config.xml
===================================================================
--- hudson/trunk/hudson-home/config.xml 2014-05-14 20:50:02 UTC (rev 18656)
+++ hudson/trunk/hudson-home/config.xml 2014-05-14 20:56:02 UTC (rev 18657)
@@ -38,7 +38,7 @@
<tr><th align=left>@hudson.jboss720.build@</th><td>-r(a)hudson.jboss720.rev@ @hudson.jboss720.url@</td></tr>
<tr><th align=left>@hudson.jboss800.build@</th><td>-r(a)hudson.jboss800.rev@ @hudson.jboss800.url@</td></tr>
<tr><th align=left>@hudson.jboss810.build@</th><td>-r(a)hudson.jboss810.rev@ @hudson.jboss810.url@</td></tr>
- <tr><th align=left>@hudson.jboss810.build@</th><td>-r(a)hudson.jboss900.rev@ @hudson.jboss900.url@</td></tr>
+ <tr><th align=left>@hudson.jboss900.build@</th><td>-r(a)hudson.jboss900.rev@ @hudson.jboss900.url@</td></tr>
<tr><td colspan=2></td></tr>
</table>
]]>
10 years, 7 months
- 1
- 0
JBossWS SVN: r18656 - in hudson/trunk: hudson-home and 16 other directories.
by jbossws-commits＠lists.jboss.org
Author: asoldano
Date: 2014-05-14 16:50:02 -0400 (Wed, 14 May 2014)
New Revision: 18656
Added:
hudson/trunk/hudson-home/jobs/AS-9.0.0-SECMGR/
hudson/trunk/hudson-home/jobs/AS-9.0.0-SECMGR/config.xml
hudson/trunk/hudson-home/jobs/AS-9.0.0/
hudson/trunk/hudson-home/jobs/AS-9.0.0/config.xml
hudson/trunk/hudson-home/jobs/CXF-BINDIST-AS-9.0.0-SPRING/
hudson/trunk/hudson-home/jobs/CXF-BINDIST-AS-9.0.0-SPRING/config.xml
hudson/trunk/hudson-home/jobs/CXF-BINDIST-AS-9.0.0/
hudson/trunk/hudson-home/jobs/CXF-BINDIST-AS-9.0.0/config.xml
hudson/trunk/hudson-home/jobs/CXF-CORE-AS-9.0.0-SECMGR/
hudson/trunk/hudson-home/jobs/CXF-CORE-AS-9.0.0-SECMGR/config.xml
hudson/trunk/hudson-home/jobs/CXF-CORE-AS-9.0.0-SPRING/
hudson/trunk/hudson-home/jobs/CXF-CORE-AS-9.0.0-SPRING/config.xml
hudson/trunk/hudson-home/jobs/CXF-CORE-AS-9.0.0/
hudson/trunk/hudson-home/jobs/CXF-CORE-AS-9.0.0/config.xml
hudson/trunk/hudson-home/jobs/CXF-SRCDIST-AS-9.0.0-SPRING/
hudson/trunk/hudson-home/jobs/CXF-SRCDIST-AS-9.0.0-SPRING/config.xml
hudson/trunk/hudson-home/jobs/CXF-SRCDIST-AS-9.0.0/
hudson/trunk/hudson-home/jobs/CXF-SRCDIST-AS-9.0.0/config.xml
Modified:
hudson/trunk/ant.properties.example
hudson/trunk/hudson-home/config.xml
hudson/trunk/hudson-home/jobs/AS-ALL/config.xml
hudson/trunk/hudson-home/jobs/AS-LIGHT/config.xml
hudson/trunk/hudson-home/jobs/CXF-ALL/config.xml
hudson/trunk/hudson-home/jobs/CXF-LIGHT/config.xml
hudson/trunk/hudson-home/jobs/CXF-SRCDIST-AS-8.0.0-SPRING/config.xml
hudson/trunk/hudson-home/jobs/CXF-SRCDIST-AS-8.1.0-SPRING/config.xml
Log:
Updating hudson jobs to use current target containers
Modified: hudson/trunk/ant.properties.example
===================================================================
--- hudson/trunk/ant.properties.example 2014-05-14 17:58:24 UTC (rev 18655)
+++ hudson/trunk/ant.properties.example 2014-05-14 20:50:02 UTC (rev 18656)
@@ -28,9 +28,13 @@
hudson.jboss800.rev=wildfly-8.0.0.Final
hudson.jboss810.url=https://github.com/wildfly/wildfly
-hudson.jboss810.build=wildfly-8.1.0.Final-SNAPSHOT
-hudson.jboss810.rev=master
+hudson.jboss810.build=wildfly-8.1.0.CR2
+hudson.jboss810.rev=wildfly-8.1.0.CR2
+hudson.jboss900.url=https://github.com/wildfly/wildfly
+hudson.jboss900.build=wildfly-9.0.0.Alpha1-SNAPSHOT
+hudson.jboss900.rev=master
+
hudson.mail.recipients=
hudson.smtp.host=localhost
Modified: hudson/trunk/hudson-home/config.xml
===================================================================
--- hudson/trunk/hudson-home/config.xml 2014-05-14 17:58:24 UTC (rev 18655)
+++ hudson/trunk/hudson-home/config.xml 2014-05-14 20:50:02 UTC (rev 18656)
@@ -38,6 +38,7 @@
<tr><th align=left>@hudson.jboss720.build@</th><td>-r(a)hudson.jboss720.rev@ @hudson.jboss720.url@</td></tr>
<tr><th align=left>@hudson.jboss800.build@</th><td>-r(a)hudson.jboss800.rev@ @hudson.jboss800.url@</td></tr>
<tr><th align=left>@hudson.jboss810.build@</th><td>-r(a)hudson.jboss810.rev@ @hudson.jboss810.url@</td></tr>
+ <tr><th align=left>@hudson.jboss810.build@</th><td>-r(a)hudson.jboss900.rev@ @hudson.jboss900.url@</td></tr>
<tr><td colspan=2></td></tr>
</table>
]]>
@@ -57,6 +58,10 @@
<string>AS-7.2.0</string>
<string>AS-8.0.0</string>
<string>AS-8.0.0-SECMGR</string>
+ <string>AS-8.1.0</string>
+ <string>AS-8.1.0-SECMGR</string>
+ <string>AS-9.0.0</string>
+ <string>AS-9.0.0-SECMGR</string>
</jobNames>
<name>AS Builds</name>
<description>
@@ -78,21 +83,28 @@
<string>CXF-CORE-AS-8.0.0-SECMGR</string>
<string>CXF-CORE-AS-8.1.0-SUN-JDK-6</string>
<string>CXF-CORE-AS-8.1.0-SECMGR</string>
+ <string>CXF-CORE-AS-9.0.0-SUN-JDK-6</string>
+ <string>CXF-CORE-AS-9.0.0-SECMGR</string>
<string>CXF-CORE-AS-7.2.0-SPRING-SUN-JDK-6</string>
<string>CXF-CORE-AS-8.0.0-SPRING-SUN-JDK-6</string>
<string>CXF-CORE-AS-8.1.0-SPRING-SUN-JDK-6</string>
+ <string>CXF-CORE-AS-9.0.0-SPRING-SUN-JDK-6</string>
<string>CXF-BINDIST-AS-7.2.0-SUN-JDK-6</string>
<string>CXF-BINDIST-AS-8.0.0-SUN-JDK-6</string>
<string>CXF-BINDIST-AS-8.1.0-SUN-JDK-6</string>
+ <string>CXF-BINDIST-AS-9.0.0-SUN-JDK-6</string>
<string>CXF-BINDIST-AS-7.2.0-SPRING-SUN-JDK-6</string>
<string>CXF-BINDIST-AS-8.0.0-SPRING-SUN-JDK-6</string>
<string>CXF-BINDIST-AS-8.1.0-SPRING-SUN-JDK-6</string>
+ <string>CXF-BINDIST-AS-9.0.0-SPRING-SUN-JDK-6</string>
<string>CXF-SRCDIST-AS-7.2.0-SUN-JDK-6</string>
<string>CXF-SRCDIST-AS-8.0.0-SUN-JDK-6</string>
<string>CXF-SRCDIST-AS-8.1.0-SUN-JDK-6</string>
+ <string>CXF-SRCDIST-AS-9.0.0-SUN-JDK-6</string>
<string>CXF-SRCDIST-AS-7.2.0-SPRING-SUN-JDK-6</string>
<string>CXF-SRCDIST-AS-8.0.0-SPRING-SUN-JDK-6</string>
<string>CXF-SRCDIST-AS-8.1.0-SPRING-SUN-JDK-6</string>
+ <string>CXF-SRCDIST-AS-9.0.0-SPRING-SUN-JDK-6</string>
</jobNames>
<name>CXF Tests</name>
<description>
@@ -114,16 +126,21 @@
<string>CXF-CORE-AS-8.0.0-SUN-JDK-6</string>
<string>CXF-CORE-AS-8.0.0-SECMGR</string>
<string>CXF-CORE-AS-8.1.0-SUN-JDK-6</string>
+ <string>CXF-CORE-AS-9.0.0-SECMGR</string>
+ <string>CXF-CORE-AS-9.0.0-SUN-JDK-6</string>
<string>CXF-CORE-AS-8.1.0-SECMGR</string>
<string>CXF-CORE-AS-7.2.0-SPRING-SUN-JDK-6</string>
<string>CXF-CORE-AS-8.0.0-SPRING-SUN-JDK-6</string>
<string>CXF-CORE-AS-8.1.0-SPRING-SUN-JDK-6</string>
+ <string>CXF-CORE-AS-9.0.0-SPRING-SUN-JDK-6</string>
<string>CXF-BINDIST-AS-7.2.0-SUN-JDK-6</string>
<string>CXF-BINDIST-AS-8.0.0-SUN-JDK-6</string>
<string>CXF-BINDIST-AS-8.1.0-SUN-JDK-6</string>
+ <string>CXF-BINDIST-AS-9.0.0-SUN-JDK-6</string>
<string>CXF-BINDIST-AS-7.2.0-SPRING-SUN-JDK-6</string>
<string>CXF-BINDIST-AS-8.0.0-SPRING-SUN-JDK-6</string>
<string>CXF-BINDIST-AS-8.1.0-SPRING-SUN-JDK-6</string>
+ <string>CXF-BINDIST-AS-9.0.0-SPRING-SUN-JDK-6</string>
</jobNames>
<name>Working Days Tests</name>
<description>
Added: hudson/trunk/hudson-home/jobs/AS-9.0.0/config.xml
===================================================================
--- hudson/trunk/hudson-home/jobs/AS-9.0.0/config.xml (rev 0)
+++ hudson/trunk/hudson-home/jobs/AS-9.0.0/config.xml 2014-05-14 20:50:02 UTC (rev 18656)
@@ -0,0 +1,75 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<project>
+ <actions/>
+ <description>Builds WildFly 9.0.0</description>
+ <logRotator>
+ <daysToKeep>-1</daysToKeep>
+ <numToKeep>20</numToKeep>
+ <artifactDaysToKeep>-1</artifactDaysToKeep>
+ <artifactNumToKeep>-1</artifactNumToKeep>
+ </logRotator>
+ <keepDependencies>false</keepDependencies>
+ <properties/>
+ <scm class="hudson.plugins.git.GitSCM">
+ <configVersion>1</configVersion>
+ <remoteRepositories>
+ <org.spearce.jgit.transport.RemoteConfig>
+ <string>origin</string>
+ <int>5</int>
+ <string>fetch</string>
+ <string>+refs/heads/*:refs/remotes/origin/*</string>
+ <string>receivepack</string>
+ <string>git-upload-pack</string>
+ <string>uploadpack</string>
+ <string>git-upload-pack</string>
+ <string>url</string>
+ <string>@hudson.jboss900.url@.git</string>
+ <string>tagopt</string>
+ <string></string>
+ </org.spearce.jgit.transport.RemoteConfig>
+ </remoteRepositories>
+ <branches>
+ <hudson.plugins.git.BranchSpec>
+ <name>@hudson.jboss900.rev@</name>
+ </hudson.plugins.git.BranchSpec>
+ </branches>
+ <localBranch></localBranch>
+ <mergeOptions/>
+ <recursiveSubmodules>false</recursiveSubmodules>
+ <doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
+ <authorOrCommitter>false</authorOrCommitter>
+ <clean>false</clean>
+ <wipeOutWorkspace>false</wipeOutWorkspace>
+ <pruneBranches>false</pruneBranches>
+ <buildChooser class="hudson.plugins.git.util.DefaultBuildChooser"/>
+ <gitTool>Default</gitTool>
+ <browser class="hudson.plugins.git.browser.GithubWeb">
+ <url>@hudson.jboss900.url@</url>
+ </browser>
+ <submoduleCfg class="list"/>
+ <relativeTargetDir></relativeTargetDir>
+ <excludedRegions></excludedRegions>
+ <excludedUsers></excludedUsers>
+ </scm>
+ <canRoam>true</canRoam>
+ <disabled>false</disabled>
+ <blockBuildWhenUpstreamBuilding>false</blockBuildWhenUpstreamBuilding>
+ <triggers class="vector"/>
+ <concurrentBuild>false</concurrentBuild>
+ <builders>
+ <hudson.tasks.Shell>
+ <command>MAVEN_OPTS="-Xmx1024m -Xms512m -XX:MaxPermSize=128m"
+export MAVEN_OPTS
+export JAVA_HOME=(a)java.home.sun.jdk6@
+./build.sh clean install -Dskip-download-sources -DskipTests=true -U -B</command>
+ </hudson.tasks.Shell>
+ </builders>
+ <publishers>
+ <hudson.tasks.Mailer>
+ <recipients></recipients>
+ <dontNotifyEveryUnstableBuild>false</dontNotifyEveryUnstableBuild>
+ <sendToIndividuals>false</sendToIndividuals>
+ </hudson.tasks.Mailer>
+ </publishers>
+ <buildWrappers/>
+</project>
Property changes on: hudson/trunk/hudson-home/jobs/AS-9.0.0/config.xml
___________________________________________________________________
Added: svn:mime-type
+ text/xml
Added: svn:keywords
+ Rev Date
Added: svn:eol-style
+ native
Added: hudson/trunk/hudson-home/jobs/AS-9.0.0-SECMGR/config.xml
===================================================================
--- hudson/trunk/hudson-home/jobs/AS-9.0.0-SECMGR/config.xml (rev 0)
+++ hudson/trunk/hudson-home/jobs/AS-9.0.0-SECMGR/config.xml 2014-05-14 20:50:02 UTC (rev 18656)
@@ -0,0 +1,75 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<project>
+ <actions/>
+ <description>Builds WildFly 9.0.0 with security manager enabled</description>
+ <logRotator>
+ <daysToKeep>-1</daysToKeep>
+ <numToKeep>20</numToKeep>
+ <artifactDaysToKeep>-1</artifactDaysToKeep>
+ <artifactNumToKeep>-1</artifactNumToKeep>
+ </logRotator>
+ <keepDependencies>false</keepDependencies>
+ <properties/>
+ <scm class="hudson.plugins.git.GitSCM">
+ <configVersion>1</configVersion>
+ <remoteRepositories>
+ <org.spearce.jgit.transport.RemoteConfig>
+ <string>origin</string>
+ <int>5</int>
+ <string>fetch</string>
+ <string>+refs/heads/*:refs/remotes/origin/*</string>
+ <string>receivepack</string>
+ <string>git-upload-pack</string>
+ <string>uploadpack</string>
+ <string>git-upload-pack</string>
+ <string>url</string>
+ <string>@hudson.jboss900.url@.git</string>
+ <string>tagopt</string>
+ <string></string>
+ </org.spearce.jgit.transport.RemoteConfig>
+ </remoteRepositories>
+ <branches>
+ <hudson.plugins.git.BranchSpec>
+ <name>@hudson.jboss900.rev@</name>
+ </hudson.plugins.git.BranchSpec>
+ </branches>
+ <localBranch></localBranch>
+ <mergeOptions/>
+ <recursiveSubmodules>false</recursiveSubmodules>
+ <doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
+ <authorOrCommitter>false</authorOrCommitter>
+ <clean>false</clean>
+ <wipeOutWorkspace>false</wipeOutWorkspace>
+ <pruneBranches>false</pruneBranches>
+ <buildChooser class="hudson.plugins.git.util.DefaultBuildChooser"/>
+ <gitTool>Default</gitTool>
+ <browser class="hudson.plugins.git.browser.GithubWeb">
+ <url>@hudson.jboss900.url@</url>
+ </browser>
+ <submoduleCfg class="list"/>
+ <relativeTargetDir></relativeTargetDir>
+ <excludedRegions></excludedRegions>
+ <excludedUsers></excludedUsers>
+ </scm>
+ <canRoam>true</canRoam>
+ <disabled>false</disabled>
+ <blockBuildWhenUpstreamBuilding>false</blockBuildWhenUpstreamBuilding>
+ <triggers class="vector"/>
+ <concurrentBuild>false</concurrentBuild>
+ <builders>
+ <hudson.tasks.Shell>
+ <command>MAVEN_OPTS="-Xmx1024m -Xms512m -XX:MaxPermSize=128m"
+export MAVEN_OPTS
+export JAVA_HOME=(a)java.home.sun.jdk6@
+./build.sh clean install -Dskip-download-sources -DskipTests=true -Dsecurity.manager=yes -U -B</command>
+ </hudson.tasks.Shell>
+ </builders>
+ <publishers>
+ <hudson.tasks.Mailer>
+ <recipients></recipients>
+ <dontNotifyEveryUnstableBuild>false</dontNotifyEveryUnstableBuild>
+ <sendToIndividuals>false</sendToIndividuals>
+ </hudson.tasks.Mailer>
+ </publishers>
+ <buildWrappers/>
+</project>
Property changes on: hudson/trunk/hudson-home/jobs/AS-9.0.0-SECMGR/config.xml
___________________________________________________________________
Added: svn:mime-type
+ text/xml
Added: svn:keywords
+ Rev Date
Added: svn:eol-style
+ native
Modified: hudson/trunk/hudson-home/jobs/AS-ALL/config.xml
===================================================================
--- hudson/trunk/hudson-home/jobs/AS-ALL/config.xml 2014-05-14 17:58:24 UTC (rev 18655)
+++ hudson/trunk/hudson-home/jobs/AS-ALL/config.xml 2014-05-14 20:50:02 UTC (rev 18656)
@@ -3,7 +3,7 @@
<builders class="vector"/>
<publishers class="vector">
<hudson.tasks.BuildTrigger>
- <childProjects>AS-7.2.0, AS-8.0.0, AS-8.1.0, AS-8.0.0-SECMGR, AS-8.1.0-SECMGR</childProjects>
+ <childProjects>AS-7.2.0, AS-8.0.0, AS-8.1.0, AS-9.0.0, AS-8.0.0-SECMGR, AS-8.1.0-SECMGR, AS-9.0.0-SECMGR</childProjects>
<threshold>
<name>UNSTABLE</name>
<ordinal>1</ordinal>
Modified: hudson/trunk/hudson-home/jobs/AS-LIGHT/config.xml
===================================================================
--- hudson/trunk/hudson-home/jobs/AS-LIGHT/config.xml 2014-05-14 17:58:24 UTC (rev 18655)
+++ hudson/trunk/hudson-home/jobs/AS-LIGHT/config.xml 2014-05-14 20:50:02 UTC (rev 18656)
@@ -3,7 +3,7 @@
<builders class="vector"/>
<publishers class="vector">
<hudson.tasks.BuildTrigger>
- <childProjects>AS-8.1.0, AS-8.1.0-SECMGR</childProjects>
+ <childProjects>AS-9.0.0, AS-9.0.0-SECMGR</childProjects>
<threshold>
<name>UNSTABLE</name>
<ordinal>1</ordinal>
Modified: hudson/trunk/hudson-home/jobs/CXF-ALL/config.xml
===================================================================
--- hudson/trunk/hudson-home/jobs/CXF-ALL/config.xml 2014-05-14 17:58:24 UTC (rev 18655)
+++ hudson/trunk/hudson-home/jobs/CXF-ALL/config.xml 2014-05-14 20:50:02 UTC (rev 18656)
@@ -10,39 +10,53 @@
, CXF-CORE-AS-8.1.0
+, CXF-CORE-AS-9.0.0
+
, CXF-CORE-AS-7.2.0-SPRING
, CXF-CORE-AS-8.0.0-SPRING
, CXF-CORE-AS-8.1.0-SPRING
+, CXF-CORE-AS-9.0.0-SPRING
+
, CXF-CORE-AS-8.0.0-SECMGR
, CXF-CORE-AS-8.1.0-SECMGR
+, CXF-CORE-AS-9.0.0-SECMGR
+
, CXF-BINDIST-AS-7.2.0
, CXF-BINDIST-AS-8.0.0
, CXF-BINDIST-AS-8.1.0
+, CXF-BINDIST-AS-9.0.0
+
, CXF-BINDIST-AS-7.2.0-SPRING
, CXF-BINDIST-AS-8.0.0-SPRING
, CXF-BINDIST-AS-8.1.0-SPRING
+, CXF-BINDIST-AS-9.0.0-SPRING
+
, CXF-SRCDIST-AS-7.2.0
, CXF-SRCDIST-AS-8.0.0
, CXF-SRCDIST-AS-8.1.0
+, CXF-SRCDIST-AS-9.0.0
+
, CXF-SRCDIST-AS-7.2.0-SPRING
, CXF-SRCDIST-AS-8.0.0-SPRING
, CXF-SRCDIST-AS-8.1.0-SPRING
+
+, CXF-SRCDIST-AS-9.0.0-SPRING
</childProjects>
<threshold>
<name>UNSTABLE</name>
Added: hudson/trunk/hudson-home/jobs/CXF-BINDIST-AS-9.0.0/config.xml
===================================================================
--- hudson/trunk/hudson-home/jobs/CXF-BINDIST-AS-9.0.0/config.xml (rev 0)
+++ hudson/trunk/hudson-home/jobs/CXF-BINDIST-AS-9.0.0/config.xml 2014-05-14 20:50:02 UTC (rev 18656)
@@ -0,0 +1,74 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<project>
+ <builders class="vector">
+ <hudson.tasks.Shell>
+ <command>
+#
+# Module settings
+#
+MODULE=CXF-BINDIST-AS-9.0.0
+
+WORKSPACE=`pwd`
+STACK_ID=cxf
+JAVA_HOME=(a)java.home.sun.jdk6@
+SCRIPTS_DIR=$WORKSPACE/hudson-scripts
+STACK_DIR=$WORKSPACE/stack-cxf
+TEST_OPTS=
+JBOSS_TARGET=wildfly900
+JBOSS_BIND_ADDRESS=(a)jboss.bind.address@
+JBOSS_INSTANCE=@hudson.home@/jobs/AS-9.0.0/workspace/build/target/(a)hudson.jboss900.build@
+
+#
+# load test functions
+#
+. $SCRIPTS_DIR/jbossws-qa.sh
+
+#
+# execute binary distribution tests
+#
+binaryDistributionTest
+
+</command>
+ </hudson.tasks.Shell>
+ </builders>
+ <publishers class="vector">
+ <hudson.tasks.junit.JUnitResultArchiver>
+ <testResults>stack-cxf/target/jbossws-cxf-bin-dist/output/test-reports/TEST-*.xml</testResults>
+ </hudson.tasks.junit.JUnitResultArchiver>
+ <hudson.tasks.Mailer>
+ <recipients>@hudson.mail.recipients@</recipients>
+ <dontNotifyEveryUnstableBuild>false</dontNotifyEveryUnstableBuild>
+ <sendToIndividuals>true</sendToIndividuals>
+ </hudson.tasks.Mailer>
+ </publishers>
+ <buildWrappers class="vector"/>
+ <scm class="hudson.scm.SubversionSCM">
+ <locations>
+ <hudson.scm.SubversionSCM-ModuleLocation>
+ <remote>@jbossws.hudson.url@/scripts</remote>
+ <local>hudson-scripts</local>
+ </hudson.scm.SubversionSCM-ModuleLocation>
+ <hudson.scm.SubversionSCM-ModuleLocation>
+ <remote>@hudson.cxf.url@</remote>
+ <local>stack-cxf</local>
+ </hudson.scm.SubversionSCM-ModuleLocation>
+ </locations>
+ <useUpdate>true</useUpdate>
+ <browser class="hudson.scm.browsers.FishEyeSVN">
+ <url>http://fisheye.jboss.com/browse/JBossWS/</url>
+ <rootModule></rootModule>
+ </browser>
+ </scm>
+ <canRoam>true</canRoam>
+ <disabled>false</disabled>
+ <enableRemoteTrigger>false</enableRemoteTrigger>
+ <triggers class="vector"/>
+ <logRotator>
+ <daysToKeep>14</daysToKeep>
+ <numToKeep>-1</numToKeep>
+ </logRotator>
+ <keepDependencies>false</keepDependencies>
+ <properties/>
+ <description>Build and test jbossws-cxf-(a)version.id@ binary distribution against WildFly 9.0.0</description>
+ <actions class="vector"/>
+</project>
Property changes on: hudson/trunk/hudson-home/jobs/CXF-BINDIST-AS-9.0.0/config.xml
___________________________________________________________________
Added: svn:mime-type
+ text/xml
Added: svn:keywords
+ Rev Date
Added: svn:eol-style
+ native
Added: hudson/trunk/hudson-home/jobs/CXF-BINDIST-AS-9.0.0-SPRING/config.xml
===================================================================
--- hudson/trunk/hudson-home/jobs/CXF-BINDIST-AS-9.0.0-SPRING/config.xml (rev 0)
+++ hudson/trunk/hudson-home/jobs/CXF-BINDIST-AS-9.0.0-SPRING/config.xml 2014-05-14 20:50:02 UTC (rev 18656)
@@ -0,0 +1,74 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<project>
+ <builders class="vector">
+ <hudson.tasks.Shell>
+ <command>
+#
+# Module settings
+#
+MODULE=CXF-BINDIST-AS-9.0.0-SPRING
+
+WORKSPACE=`pwd`
+STACK_ID=cxf
+JAVA_HOME=(a)java.home.sun.jdk6@
+SCRIPTS_DIR=$WORKSPACE/hudson-scripts
+STACK_DIR=$WORKSPACE/stack-cxf
+TEST_OPTS=
+JBOSS_TARGET=wildfly900
+JBOSS_BIND_ADDRESS=(a)jboss.bind.address@
+JBOSS_INSTANCE=@hudson.home@/jobs/AS-9.0.0/workspace/build/target/(a)hudson.jboss900.build@
+
+#
+# load test functions
+#
+. $SCRIPTS_DIR/jbossws-qa.sh
+
+#
+# execute binary distribution tests
+#
+binaryDistributionTestWithSpring
+
+</command>
+ </hudson.tasks.Shell>
+ </builders>
+ <publishers class="vector">
+ <hudson.tasks.junit.JUnitResultArchiver>
+ <testResults>stack-cxf/target/jbossws-cxf-bin-dist/output/test-reports/TEST-*.xml</testResults>
+ </hudson.tasks.junit.JUnitResultArchiver>
+ <hudson.tasks.Mailer>
+ <recipients>@hudson.mail.recipients@</recipients>
+ <dontNotifyEveryUnstableBuild>false</dontNotifyEveryUnstableBuild>
+ <sendToIndividuals>true</sendToIndividuals>
+ </hudson.tasks.Mailer>
+ </publishers>
+ <buildWrappers class="vector"/>
+ <scm class="hudson.scm.SubversionSCM">
+ <locations>
+ <hudson.scm.SubversionSCM-ModuleLocation>
+ <remote>@jbossws.hudson.url@/scripts</remote>
+ <local>hudson-scripts</local>
+ </hudson.scm.SubversionSCM-ModuleLocation>
+ <hudson.scm.SubversionSCM-ModuleLocation>
+ <remote>@hudson.cxf.url@</remote>
+ <local>stack-cxf</local>
+ </hudson.scm.SubversionSCM-ModuleLocation>
+ </locations>
+ <useUpdate>true</useUpdate>
+ <browser class="hudson.scm.browsers.FishEyeSVN">
+ <url>http://fisheye.jboss.com/browse/JBossWS/</url>
+ <rootModule></rootModule>
+ </browser>
+ </scm>
+ <canRoam>true</canRoam>
+ <disabled>false</disabled>
+ <enableRemoteTrigger>false</enableRemoteTrigger>
+ <triggers class="vector"/>
+ <logRotator>
+ <daysToKeep>14</daysToKeep>
+ <numToKeep>-1</numToKeep>
+ </logRotator>
+ <keepDependencies>false</keepDependencies>
+ <properties/>
+ <description>Build and test jbossws-cxf-(a)version.id@ binary distribution against WildFly 9.0.0 with SpringFramework libraries available</description>
+ <actions class="vector"/>
+</project>
Property changes on: hudson/trunk/hudson-home/jobs/CXF-BINDIST-AS-9.0.0-SPRING/config.xml
___________________________________________________________________
Added: svn:mime-type
+ text/xml
Added: svn:keywords
+ Rev Date
Added: svn:eol-style
+ native
Added: hudson/trunk/hudson-home/jobs/CXF-CORE-AS-9.0.0/config.xml
===================================================================
--- hudson/trunk/hudson-home/jobs/CXF-CORE-AS-9.0.0/config.xml (rev 0)
+++ hudson/trunk/hudson-home/jobs/CXF-CORE-AS-9.0.0/config.xml 2014-05-14 20:50:02 UTC (rev 18656)
@@ -0,0 +1,74 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<project>
+ <builders class="vector">
+ <hudson.tasks.Shell>
+ <command>
+#
+# Module settings
+#
+MODULE=CXF-CORE-AS-9.0.0
+
+WORKSPACE=`pwd`
+STACK_ID=cxf
+JAVA_HOME=(a)java.home.sun.jdk6@
+SCRIPTS_DIR=$WORKSPACE/hudson-scripts
+STACK_DIR=$WORKSPACE/stack-cxf
+TEST_OPTS=
+JBOSS_TARGET=wildfly900
+JBOSS_BIND_ADDRESS=(a)jboss.bind.address@
+JBOSS_INSTANCE=@hudson.home@/jobs/AS-9.0.0/workspace/build/target/(a)hudson.jboss900.build@
+
+#
+# load test functions
+#
+. $SCRIPTS_DIR/jbossws-qa.sh
+
+#
+# execute core tests
+#
+coreTest
+
+</command>
+ </hudson.tasks.Shell>
+ </builders>
+ <publishers class="vector">
+ <hudson.tasks.junit.JUnitResultArchiver>
+ <testResults>stack-cxf/**/target/surefire-reports/*.xml</testResults>
+ </hudson.tasks.junit.JUnitResultArchiver>
+ <hudson.tasks.Mailer>
+ <recipients>@hudson.mail.recipients@</recipients>
+ <dontNotifyEveryUnstableBuild>false</dontNotifyEveryUnstableBuild>
+ <sendToIndividuals>true</sendToIndividuals>
+ </hudson.tasks.Mailer>
+ </publishers>
+ <buildWrappers class="vector"/>
+ <scm class="hudson.scm.SubversionSCM">
+ <locations>
+ <hudson.scm.SubversionSCM-ModuleLocation>
+ <remote>@jbossws.hudson.url@/scripts</remote>
+ <local>hudson-scripts</local>
+ </hudson.scm.SubversionSCM-ModuleLocation>
+ <hudson.scm.SubversionSCM-ModuleLocation>
+ <remote>@hudson.cxf.url@</remote>
+ <local>stack-cxf</local>
+ </hudson.scm.SubversionSCM-ModuleLocation>
+ </locations>
+ <useUpdate>true</useUpdate>
+ <browser class="hudson.scm.browsers.FishEyeSVN">
+ <url>http://fisheye.jboss.com/browse/JBossWS/</url>
+ <rootModule></rootModule>
+ </browser>
+ </scm>
+ <canRoam>true</canRoam>
+ <disabled>false</disabled>
+ <enableRemoteTrigger>false</enableRemoteTrigger>
+ <triggers class="vector"/>
+ <logRotator>
+ <daysToKeep>14</daysToKeep>
+ <numToKeep>-1</numToKeep>
+ </logRotator>
+ <keepDependencies>false</keepDependencies>
+ <properties/>
+ <description>Build and test jbossws-cxf-(a)version.id@ against @hudson.jboss900.build@</description>
+ <actions class="vector"/>
+</project>
Property changes on: hudson/trunk/hudson-home/jobs/CXF-CORE-AS-9.0.0/config.xml
___________________________________________________________________
Added: svn:mime-type
+ text/xml
Added: svn:keywords
+ Rev Date
Added: svn:eol-style
+ native
Added: hudson/trunk/hudson-home/jobs/CXF-CORE-AS-9.0.0-SECMGR/config.xml
===================================================================
--- hudson/trunk/hudson-home/jobs/CXF-CORE-AS-9.0.0-SECMGR/config.xml (rev 0)
+++ hudson/trunk/hudson-home/jobs/CXF-CORE-AS-9.0.0-SECMGR/config.xml 2014-05-14 20:50:02 UTC (rev 18656)
@@ -0,0 +1,74 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<project>
+ <builders class="vector">
+ <hudson.tasks.Shell>
+ <command>
+#
+# Module settings
+#
+MODULE=CXF-CORE-AS-9.0.0-SECMGR
+
+WORKSPACE=`pwd`
+STACK_ID=cxf
+JAVA_HOME=(a)java.home.sun.jdk6@
+SCRIPTS_DIR=$WORKSPACE/hudson-scripts
+STACK_DIR=$WORKSPACE/stack-cxf
+TEST_OPTS=-Dsecmgr=true
+JBOSS_TARGET=wildfly900
+JBOSS_BIND_ADDRESS=(a)jboss.bind.address@
+JBOSS_INSTANCE=@hudson.home@/jobs/AS-9.0.0-SECMGR/workspace/build/target/(a)hudson.jboss900.build@
+
+#
+# load test functions
+#
+. $SCRIPTS_DIR/jbossws-qa.sh
+
+#
+# execute core tests
+#
+coreTest
+
+</command>
+ </hudson.tasks.Shell>
+ </builders>
+ <publishers class="vector">
+ <hudson.tasks.junit.JUnitResultArchiver>
+ <testResults>stack-cxf/**/target/surefire-reports/*.xml</testResults>
+ </hudson.tasks.junit.JUnitResultArchiver>
+ <hudson.tasks.Mailer>
+ <recipients>@hudson.mail.recipients@</recipients>
+ <dontNotifyEveryUnstableBuild>false</dontNotifyEveryUnstableBuild>
+ <sendToIndividuals>true</sendToIndividuals>
+ </hudson.tasks.Mailer>
+ </publishers>
+ <buildWrappers class="vector"/>
+ <scm class="hudson.scm.SubversionSCM">
+ <locations>
+ <hudson.scm.SubversionSCM-ModuleLocation>
+ <remote>@jbossws.hudson.url@/scripts</remote>
+ <local>hudson-scripts</local>
+ </hudson.scm.SubversionSCM-ModuleLocation>
+ <hudson.scm.SubversionSCM-ModuleLocation>
+ <remote>@hudson.cxf.url@</remote>
+ <local>stack-cxf</local>
+ </hudson.scm.SubversionSCM-ModuleLocation>
+ </locations>
+ <useUpdate>true</useUpdate>
+ <browser class="hudson.scm.browsers.FishEyeSVN">
+ <url>http://fisheye.jboss.com/browse/JBossWS/</url>
+ <rootModule></rootModule>
+ </browser>
+ </scm>
+ <canRoam>true</canRoam>
+ <disabled>false</disabled>
+ <enableRemoteTrigger>false</enableRemoteTrigger>
+ <triggers class="vector"/>
+ <logRotator>
+ <daysToKeep>14</daysToKeep>
+ <numToKeep>-1</numToKeep>
+ </logRotator>
+ <keepDependencies>false</keepDependencies>
+ <properties/>
+ <description>Build and test jbossws-cxf-(a)version.id@ against @hudson.jboss900.build@ (security manager enabled)</description>
+ <actions class="vector"/>
+</project>
Property changes on: hudson/trunk/hudson-home/jobs/CXF-CORE-AS-9.0.0-SECMGR/config.xml
___________________________________________________________________
Added: svn:mime-type
+ text/xml
Added: svn:keywords
+ Rev Date
Added: svn:eol-style
+ native
Added: hudson/trunk/hudson-home/jobs/CXF-CORE-AS-9.0.0-SPRING/config.xml
===================================================================
--- hudson/trunk/hudson-home/jobs/CXF-CORE-AS-9.0.0-SPRING/config.xml (rev 0)
+++ hudson/trunk/hudson-home/jobs/CXF-CORE-AS-9.0.0-SPRING/config.xml 2014-05-14 20:50:02 UTC (rev 18656)
@@ -0,0 +1,74 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<project>
+ <builders class="vector">
+ <hudson.tasks.Shell>
+ <command>
+#
+# Module settings
+#
+MODULE=CXF-CORE-AS-9.0.0-SPRING
+
+WORKSPACE=`pwd`
+STACK_ID=cxf
+JAVA_HOME=(a)java.home.sun.jdk6@
+SCRIPTS_DIR=$WORKSPACE/hudson-scripts
+STACK_DIR=$WORKSPACE/stack-cxf
+TEST_OPTS=
+JBOSS_TARGET=wildfly900
+JBOSS_BIND_ADDRESS=(a)jboss.bind.address@
+JBOSS_INSTANCE=@hudson.home@/jobs/AS-9.0.0/workspace/build/target/(a)hudson.jboss900.build@
+
+#
+# load test functions
+#
+. $SCRIPTS_DIR/jbossws-qa.sh
+
+#
+# execute core tests
+#
+coreTestWithSpring
+
+</command>
+ </hudson.tasks.Shell>
+ </builders>
+ <publishers class="vector">
+ <hudson.tasks.junit.JUnitResultArchiver>
+ <testResults>stack-cxf/**/target/surefire-reports/*.xml</testResults>
+ </hudson.tasks.junit.JUnitResultArchiver>
+ <hudson.tasks.Mailer>
+ <recipients>@hudson.mail.recipients@</recipients>
+ <dontNotifyEveryUnstableBuild>false</dontNotifyEveryUnstableBuild>
+ <sendToIndividuals>true</sendToIndividuals>
+ </hudson.tasks.Mailer>
+ </publishers>
+ <buildWrappers class="vector"/>
+ <scm class="hudson.scm.SubversionSCM">
+ <locations>
+ <hudson.scm.SubversionSCM-ModuleLocation>
+ <remote>@jbossws.hudson.url@/scripts</remote>
+ <local>hudson-scripts</local>
+ </hudson.scm.SubversionSCM-ModuleLocation>
+ <hudson.scm.SubversionSCM-ModuleLocation>
+ <remote>@hudson.cxf.url@</remote>
+ <local>stack-cxf</local>
+ </hudson.scm.SubversionSCM-ModuleLocation>
+ </locations>
+ <useUpdate>true</useUpdate>
+ <browser class="hudson.scm.browsers.FishEyeSVN">
+ <url>http://fisheye.jboss.com/browse/JBossWS/</url>
+ <rootModule></rootModule>
+ </browser>
+ </scm>
+ <canRoam>true</canRoam>
+ <disabled>false</disabled>
+ <enableRemoteTrigger>false</enableRemoteTrigger>
+ <triggers class="vector"/>
+ <logRotator>
+ <daysToKeep>14</daysToKeep>
+ <numToKeep>-1</numToKeep>
+ </logRotator>
+ <keepDependencies>false</keepDependencies>
+ <properties/>
+ <description>Build and test jbossws-cxf-(a)version.id@ against @hudson.jboss900.build@ with SpringFramework libraires available</description>
+ <actions class="vector"/>
+</project>
Property changes on: hudson/trunk/hudson-home/jobs/CXF-CORE-AS-9.0.0-SPRING/config.xml
___________________________________________________________________
Added: svn:mime-type
+ text/xml
Added: svn:keywords
+ Rev Date
Added: svn:eol-style
+ native
Modified: hudson/trunk/hudson-home/jobs/CXF-LIGHT/config.xml
===================================================================
--- hudson/trunk/hudson-home/jobs/CXF-LIGHT/config.xml 2014-05-14 17:58:24 UTC (rev 18655)
+++ hudson/trunk/hudson-home/jobs/CXF-LIGHT/config.xml 2014-05-14 20:50:02 UTC (rev 18656)
@@ -12,14 +12,20 @@
, CXF-CORE-AS-8.1.0
+, CXF-CORE-AS-9.0.0
+
, CXF-CORE-AS-8.0.0-SPRING
, CXF-CORE-AS-8.1.0-SPRING
+, CXF-CORE-AS-9.0.0-SPRING
+
, CXF-CORE-AS-8.0.0-SECMGR
, CXF-CORE-AS-8.1.0-SECMGR
+, CXF-CORE-AS-9.0.0-SECMGR
+
, CXF-BINDIST-AS-7.2.0
, CXF-BINDIST-AS-7.2.0-SPRING
@@ -28,9 +34,13 @@
, CXF-BINDIST-AS-8.1.0
+, CXF-BINDIST-AS-9.0.0
+
, CXF-BINDIST-AS-8.0.0-SPRING
, CXF-BINDIST-AS-8.1.0-SPRING
+
+, CXF-BINDIST-AS-9.0.0-SPRING
</childProjects>
<threshold>
<name>UNSTABLE</name>
Modified: hudson/trunk/hudson-home/jobs/CXF-SRCDIST-AS-8.0.0-SPRING/config.xml
===================================================================
--- hudson/trunk/hudson-home/jobs/CXF-SRCDIST-AS-8.0.0-SPRING/config.xml 2014-05-14 17:58:24 UTC (rev 18655)
+++ hudson/trunk/hudson-home/jobs/CXF-SRCDIST-AS-8.0.0-SPRING/config.xml 2014-05-14 20:50:02 UTC (rev 18656)
@@ -6,7 +6,7 @@
#
# Module settings
#
-MODULE=CXF-SRCDIST-AS-8.0.0
+MODULE=CXF-SRCDIST-AS-8.0.0-SPRING
WORKSPACE=`pwd`
STACK_ID=cxf
Modified: hudson/trunk/hudson-home/jobs/CXF-SRCDIST-AS-8.1.0-SPRING/config.xml
===================================================================
--- hudson/trunk/hudson-home/jobs/CXF-SRCDIST-AS-8.1.0-SPRING/config.xml 2014-05-14 17:58:24 UTC (rev 18655)
+++ hudson/trunk/hudson-home/jobs/CXF-SRCDIST-AS-8.1.0-SPRING/config.xml 2014-05-14 20:50:02 UTC (rev 18656)
@@ -6,7 +6,7 @@
#
# Module settings
#
-MODULE=CXF-SRCDIST-AS-8.1.0
+MODULE=CXF-SRCDIST-AS-8.1.0-SPRING
WORKSPACE=`pwd`
STACK_ID=cxf
Added: hudson/trunk/hudson-home/jobs/CXF-SRCDIST-AS-9.0.0/config.xml
===================================================================
--- hudson/trunk/hudson-home/jobs/CXF-SRCDIST-AS-9.0.0/config.xml (rev 0)
+++ hudson/trunk/hudson-home/jobs/CXF-SRCDIST-AS-9.0.0/config.xml 2014-05-14 20:50:02 UTC (rev 18656)
@@ -0,0 +1,74 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<project>
+ <builders class="vector">
+ <hudson.tasks.Shell>
+ <command>
+#
+# Module settings
+#
+MODULE=CXF-SRCDIST-AS-9.0.0
+
+WORKSPACE=`pwd`
+STACK_ID=cxf
+JAVA_HOME=(a)java.home.sun.jdk6@
+SCRIPTS_DIR=$WORKSPACE/hudson-scripts
+STACK_DIR=$WORKSPACE/stack-cxf
+TEST_OPTS=
+JBOSS_TARGET=wildfly900
+JBOSS_BIND_ADDRESS=(a)jboss.bind.address@
+JBOSS_INSTANCE=@hudson.home@/jobs/AS-9.0.0/workspace/build/target/(a)hudson.jboss900.build@
+
+#
+# load test functions
+#
+. $SCRIPTS_DIR/jbossws-qa.sh
+
+#
+# execute source distribution tests
+#
+sourceDistributionTest
+
+</command>
+ </hudson.tasks.Shell>
+ </builders>
+ <publishers class="vector">
+ <hudson.tasks.junit.JUnitResultArchiver>
+ <testResults>stack-cxf/target/jbossws-cxf-src-dist/modules/testsuite/**/target/surefire-reports/TEST-*.xml</testResults>
+ </hudson.tasks.junit.JUnitResultArchiver>
+ <hudson.tasks.Mailer>
+ <recipients>@hudson.mail.recipients@</recipients>
+ <dontNotifyEveryUnstableBuild>false</dontNotifyEveryUnstableBuild>
+ <sendToIndividuals>true</sendToIndividuals>
+ </hudson.tasks.Mailer>
+ </publishers>
+ <buildWrappers class="vector"/>
+ <scm class="hudson.scm.SubversionSCM">
+ <locations>
+ <hudson.scm.SubversionSCM-ModuleLocation>
+ <remote>@jbossws.hudson.url@/scripts</remote>
+ <local>hudson-scripts</local>
+ </hudson.scm.SubversionSCM-ModuleLocation>
+ <hudson.scm.SubversionSCM-ModuleLocation>
+ <remote>@hudson.cxf.url@</remote>
+ <local>stack-cxf</local>
+ </hudson.scm.SubversionSCM-ModuleLocation>
+ </locations>
+ <useUpdate>true</useUpdate>
+ <browser class="hudson.scm.browsers.FishEyeSVN">
+ <url>http://fisheye.jboss.com/browse/JBossWS/</url>
+ <rootModule></rootModule>
+ </browser>
+ </scm>
+ <canRoam>true</canRoam>
+ <disabled>false</disabled>
+ <enableRemoteTrigger>false</enableRemoteTrigger>
+ <triggers class="vector"/>
+ <logRotator>
+ <daysToKeep>14</daysToKeep>
+ <numToKeep>-1</numToKeep>
+ </logRotator>
+ <keepDependencies>false</keepDependencies>
+ <properties/>
+ <description>Build and test jbossws-cxf-(a)version.id@ source distribution against AS-9.0.0</description>
+ <actions class="vector"/>
+</project>
Property changes on: hudson/trunk/hudson-home/jobs/CXF-SRCDIST-AS-9.0.0/config.xml
___________________________________________________________________
Added: svn:mime-type
+ text/xml
Added: svn:keywords
+ Rev Date
Added: svn:eol-style
+ native
Added: hudson/trunk/hudson-home/jobs/CXF-SRCDIST-AS-9.0.0-SPRING/config.xml
===================================================================
--- hudson/trunk/hudson-home/jobs/CXF-SRCDIST-AS-9.0.0-SPRING/config.xml (rev 0)
+++ hudson/trunk/hudson-home/jobs/CXF-SRCDIST-AS-9.0.0-SPRING/config.xml 2014-05-14 20:50:02 UTC (rev 18656)
@@ -0,0 +1,74 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<project>
+ <builders class="vector">
+ <hudson.tasks.Shell>
+ <command>
+#
+# Module settings
+#
+MODULE=CXF-SRCDIST-AS-9.0.0-SPRING
+
+WORKSPACE=`pwd`
+STACK_ID=cxf
+JAVA_HOME=(a)java.home.sun.jdk6@
+SCRIPTS_DIR=$WORKSPACE/hudson-scripts
+STACK_DIR=$WORKSPACE/stack-cxf
+TEST_OPTS=
+JBOSS_TARGET=wildfly900
+JBOSS_BIND_ADDRESS=(a)jboss.bind.address@
+JBOSS_INSTANCE=@hudson.home@/jobs/AS-9.0.0/workspace/build/target/(a)hudson.jboss900.build@
+
+#
+# load test functions
+#
+. $SCRIPTS_DIR/jbossws-qa.sh
+
+#
+# execute source distribution tests
+#
+sourceDistributionTestWithSpring
+
+</command>
+ </hudson.tasks.Shell>
+ </builders>
+ <publishers class="vector">
+ <hudson.tasks.junit.JUnitResultArchiver>
+ <testResults>stack-cxf/target/jbossws-cxf-src-dist/modules/testsuite/**/target/surefire-reports/TEST-*.xml</testResults>
+ </hudson.tasks.junit.JUnitResultArchiver>
+ <hudson.tasks.Mailer>
+ <recipients>@hudson.mail.recipients@</recipients>
+ <dontNotifyEveryUnstableBuild>false</dontNotifyEveryUnstableBuild>
+ <sendToIndividuals>true</sendToIndividuals>
+ </hudson.tasks.Mailer>
+ </publishers>
+ <buildWrappers class="vector"/>
+ <scm class="hudson.scm.SubversionSCM">
+ <locations>
+ <hudson.scm.SubversionSCM-ModuleLocation>
+ <remote>@jbossws.hudson.url@/scripts</remote>
+ <local>hudson-scripts</local>
+ </hudson.scm.SubversionSCM-ModuleLocation>
+ <hudson.scm.SubversionSCM-ModuleLocation>
+ <remote>@hudson.cxf.url@</remote>
+ <local>stack-cxf</local>
+ </hudson.scm.SubversionSCM-ModuleLocation>
+ </locations>
+ <useUpdate>true</useUpdate>
+ <browser class="hudson.scm.browsers.FishEyeSVN">
+ <url>http://fisheye.jboss.com/browse/JBossWS/</url>
+ <rootModule></rootModule>
+ </browser>
+ </scm>
+ <canRoam>true</canRoam>
+ <disabled>false</disabled>
+ <enableRemoteTrigger>false</enableRemoteTrigger>
+ <triggers class="vector"/>
+ <logRotator>
+ <daysToKeep>14</daysToKeep>
+ <numToKeep>-1</numToKeep>
+ </logRotator>
+ <keepDependencies>false</keepDependencies>
+ <properties/>
+ <description>Build and test jbossws-cxf-(a)version.id@ source distribution against AS-9.0.0 with SpringFramework libraries available</description>
+ <actions class="vector"/>
+</project>
Property changes on: hudson/trunk/hudson-home/jobs/CXF-SRCDIST-AS-9.0.0-SPRING/config.xml
___________________________________________________________________
Added: svn:mime-type
+ text/xml
Added: svn:keywords
+ Rev Date
Added: svn:eol-style
+ native
10 years, 7 months
- 1
- 0
JBossWS SVN: r18655 - stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/noIntegration.
by jbossws-commits＠lists.jboss.org
Author: asoldano
Date: 2014-05-14 13:58:24 -0400 (Wed, 14 May 2014)
New Revision: 18655
Modified:
stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/noIntegration/AS7537TestCase.java
Log:
[WFLY-2864] Fixing testcase
Modified: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/noIntegration/AS7537TestCase.java
===================================================================
--- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/noIntegration/AS7537TestCase.java 2014-05-14 17:22:45 UTC (rev 18654)
+++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/noIntegration/AS7537TestCase.java 2014-05-14 17:58:24 UTC (rev 18655)
@@ -41,7 +41,7 @@
fail("Deployment failure expected");
} catch (Exception e) {
undeploy = false;
- assertTrue(e.getMessage().contains("JBAS015599"));
+ assertTrue(e.getMessage().contains("JBAS015599") || e.getMessage().contains("WFLYWS0059"));
} finally {
if (undeploy) {
try {
10 years, 7 months
- 1
- 0