[jbossws-commits] JBossWS SVN: r18660 - in stack/cxf/trunk: modules/addons and 28 other directories.

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=&quot;**/jbossws-cxf-resources-(a){jbossid}.jar&quot;/&gt; - <include name=&quot;**/jbossws-(a){jbossid}-server-integration.jar&quot;/&gt; - </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#... --> - <!-- --> - <!-- ============================================================================== --> - <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#... --> - <!-- --> - <!-- ============================================================================== --> - <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#... --> - <!-- --> - <!-- ============================================================================== --> - <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 -->