[jbossws-commits] JBossWS SVN: r18662 - in stack/cxf/trunk: modules/client and 16 other directories.
jbossws-commits at lists.jboss.org
jbossws-commits at lists.jboss.org
Fri May 16 06:02:58 EDT 2014
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>
More information about the jbossws-commits
mailing list