[jbossws-commits] JBossWS SVN: r18654 - in stack/cxf/trunk: modules/dist and 69 other directories.

Author: asoldano Date: 2014-05-14 13:22:45 -0400 (Wed, 14 May 2014) New Revision: 18654 Added: stack/cxf/trunk/modules/resources/src/main/resources/modules/wildfly900/ stack/cxf/trunk/modules/resources/src/main/resources/modules/wildfly900/org/ stack/cxf/trunk/modules/resources/src/main/resources/modules/wildfly900/org/apache/ stack/cxf/trunk/modules/resources/src/main/resources/modules/wildfly900/org/apache/cxf/ stack/cxf/trunk/modules/resources/src/main/resources/modules/wildfly900/org/apache/cxf/impl/ stack/cxf/trunk/modules/resources/src/main/resources/modules/wildfly900/org/apache/cxf/impl/main/ stack/cxf/trunk/modules/resources/src/main/resources/modules/wildfly900/org/apache/cxf/impl/main/module.xml stack/cxf/trunk/modules/resources/src/main/resources/modules/wildfly900/org/apache/cxf/main/ stack/cxf/trunk/modules/resources/src/main/resources/modules/wildfly900/org/apache/cxf/main/module.xml stack/cxf/trunk/modules/resources/src/main/resources/modules/wildfly900/org/apache/neethi/ stack/cxf/trunk/modules/resources/src/main/resources/modules/wildfly900/org/apache/neethi/main/ stack/cxf/trunk/modules/resources/src/main/resources/modules/wildfly900/org/apache/neethi/main/module.xml stack/cxf/trunk/modules/resources/src/main/resources/modules/wildfly900/org/apache/santuario/ stack/cxf/trunk/modules/resources/src/main/resources/modules/wildfly900/org/apache/santuario/xmlsec/ stack/cxf/trunk/modules/resources/src/main/resources/modules/wildfly900/org/apache/santuario/xmlsec/main/ stack/cxf/trunk/modules/resources/src/main/resources/modules/wildfly900/org/apache/santuario/xmlsec/main/module.xml stack/cxf/trunk/modules/resources/src/main/resources/modules/wildfly900/org/apache/ws/ stack/cxf/trunk/modules/resources/src/main/resources/modules/wildfly900/org/apache/ws/security/ stack/cxf/trunk/modules/resources/src/main/resources/modules/wildfly900/org/apache/ws/security/main/ stack/cxf/trunk/modules/resources/src/main/resources/modules/wildfly900/org/apache/ws/security/main/module.xml stack/cxf/trunk/modules/resources/src/main/resources/modules/wildfly900/org/apache/ws/xmlschema/ stack/cxf/trunk/modules/resources/src/main/resources/modules/wildfly900/org/apache/ws/xmlschema/main/ stack/cxf/trunk/modules/resources/src/main/resources/modules/wildfly900/org/apache/ws/xmlschema/main/module.xml stack/cxf/trunk/modules/resources/src/main/resources/modules/wildfly900/org/jboss/ stack/cxf/trunk/modules/resources/src/main/resources/modules/wildfly900/org/jboss/as/ stack/cxf/trunk/modules/resources/src/main/resources/modules/wildfly900/org/jboss/as/webservices/ stack/cxf/trunk/modules/resources/src/main/resources/modules/wildfly900/org/jboss/as/webservices/main/ stack/cxf/trunk/modules/resources/src/main/resources/modules/wildfly900/org/jboss/as/webservices/main/module.xml stack/cxf/trunk/modules/resources/src/main/resources/modules/wildfly900/org/jboss/as/webservices/server/ stack/cxf/trunk/modules/resources/src/main/resources/modules/wildfly900/org/jboss/as/webservices/server/integration/ stack/cxf/trunk/modules/resources/src/main/resources/modules/wildfly900/org/jboss/as/webservices/server/integration/main/ stack/cxf/trunk/modules/resources/src/main/resources/modules/wildfly900/org/jboss/as/webservices/server/integration/main/module.xml stack/cxf/trunk/modules/resources/src/main/resources/modules/wildfly900/org/jboss/ws/ stack/cxf/trunk/modules/resources/src/main/resources/modules/wildfly900/org/jboss/ws/api/ stack/cxf/trunk/modules/resources/src/main/resources/modules/wildfly900/org/jboss/ws/api/main/ stack/cxf/trunk/modules/resources/src/main/resources/modules/wildfly900/org/jboss/ws/api/main/module.xml stack/cxf/trunk/modules/resources/src/main/resources/modules/wildfly900/org/jboss/ws/common/ stack/cxf/trunk/modules/resources/src/main/resources/modules/wildfly900/org/jboss/ws/common/main/ stack/cxf/trunk/modules/resources/src/main/resources/modules/wildfly900/org/jboss/ws/common/main/module.xml stack/cxf/trunk/modules/resources/src/main/resources/modules/wildfly900/org/jboss/ws/cxf/ stack/cxf/trunk/modules/resources/src/main/resources/modules/wildfly900/org/jboss/ws/cxf/jbossws-cxf-client/ stack/cxf/trunk/modules/resources/src/main/resources/modules/wildfly900/org/jboss/ws/cxf/jbossws-cxf-client/main/ stack/cxf/trunk/modules/resources/src/main/resources/modules/wildfly900/org/jboss/ws/cxf/jbossws-cxf-client/main/module.xml stack/cxf/trunk/modules/resources/src/main/resources/modules/wildfly900/org/jboss/ws/cxf/jbossws-cxf-factories/ stack/cxf/trunk/modules/resources/src/main/resources/modules/wildfly900/org/jboss/ws/cxf/jbossws-cxf-factories/main/ stack/cxf/trunk/modules/resources/src/main/resources/modules/wildfly900/org/jboss/ws/cxf/jbossws-cxf-factories/main/module.xml stack/cxf/trunk/modules/resources/src/main/resources/modules/wildfly900/org/jboss/ws/cxf/jbossws-cxf-server/ stack/cxf/trunk/modules/resources/src/main/resources/modules/wildfly900/org/jboss/ws/cxf/jbossws-cxf-server/main/ stack/cxf/trunk/modules/resources/src/main/resources/modules/wildfly900/org/jboss/ws/cxf/jbossws-cxf-server/main/module.xml stack/cxf/trunk/modules/resources/src/main/resources/modules/wildfly900/org/jboss/ws/cxf/jbossws-cxf-transports-udp/ stack/cxf/trunk/modules/resources/src/main/resources/modules/wildfly900/org/jboss/ws/cxf/jbossws-cxf-transports-udp/main/ stack/cxf/trunk/modules/resources/src/main/resources/modules/wildfly900/org/jboss/ws/cxf/jbossws-cxf-transports-udp/main/module.xml stack/cxf/trunk/modules/resources/src/main/resources/modules/wildfly900/org/jboss/ws/cxf/jbossws-cxf-transports-undertow/ stack/cxf/trunk/modules/resources/src/main/resources/modules/wildfly900/org/jboss/ws/cxf/jbossws-cxf-transports-undertow/main/ stack/cxf/trunk/modules/resources/src/main/resources/modules/wildfly900/org/jboss/ws/cxf/jbossws-cxf-transports-undertow/main/module.xml stack/cxf/trunk/modules/resources/src/main/resources/modules/wildfly900/org/jboss/ws/jaxws-client/ stack/cxf/trunk/modules/resources/src/main/resources/modules/wildfly900/org/jboss/ws/jaxws-client/main/ stack/cxf/trunk/modules/resources/src/main/resources/modules/wildfly900/org/jboss/ws/jaxws-client/main/module.xml stack/cxf/trunk/modules/resources/src/main/resources/modules/wildfly900/org/jboss/ws/jaxws-undertow-httpspi/ stack/cxf/trunk/modules/resources/src/main/resources/modules/wildfly900/org/jboss/ws/jaxws-undertow-httpspi/main/ stack/cxf/trunk/modules/resources/src/main/resources/modules/wildfly900/org/jboss/ws/jaxws-undertow-httpspi/main/module.xml stack/cxf/trunk/modules/resources/src/main/resources/modules/wildfly900/org/jboss/ws/saaj-impl/ stack/cxf/trunk/modules/resources/src/main/resources/modules/wildfly900/org/jboss/ws/saaj-impl/main/ stack/cxf/trunk/modules/resources/src/main/resources/modules/wildfly900/org/jboss/ws/saaj-impl/main/module.xml stack/cxf/trunk/modules/resources/src/main/resources/modules/wildfly900/org/jboss/ws/spi/ stack/cxf/trunk/modules/resources/src/main/resources/modules/wildfly900/org/jboss/ws/spi/main/ stack/cxf/trunk/modules/resources/src/main/resources/modules/wildfly900/org/jboss/ws/spi/main/module.xml stack/cxf/trunk/modules/resources/src/main/resources/modules/wildfly900/org/jboss/ws/tools/ stack/cxf/trunk/modules/resources/src/main/resources/modules/wildfly900/org/jboss/ws/tools/common/ stack/cxf/trunk/modules/resources/src/main/resources/modules/wildfly900/org/jboss/ws/tools/common/main/ stack/cxf/trunk/modules/resources/src/main/resources/modules/wildfly900/org/jboss/ws/tools/common/main/module.xml stack/cxf/trunk/modules/resources/src/main/resources/modules/wildfly900/org/jboss/ws/tools/wsconsume/ stack/cxf/trunk/modules/resources/src/main/resources/modules/wildfly900/org/jboss/ws/tools/wsconsume/main/ stack/cxf/trunk/modules/resources/src/main/resources/modules/wildfly900/org/jboss/ws/tools/wsconsume/main/module.xml stack/cxf/trunk/modules/resources/src/main/resources/modules/wildfly900/org/jboss/ws/tools/wsprovide/ stack/cxf/trunk/modules/resources/src/main/resources/modules/wildfly900/org/jboss/ws/tools/wsprovide/main/ stack/cxf/trunk/modules/resources/src/main/resources/modules/wildfly900/org/jboss/ws/tools/wsprovide/main/module.xml stack/cxf/trunk/modules/resources/src/main/resources/modules/wildfly900/org/opensaml/ stack/cxf/trunk/modules/resources/src/main/resources/modules/wildfly900/org/opensaml/main/ stack/cxf/trunk/modules/resources/src/main/resources/modules/wildfly900/org/opensaml/main/module.xml stack/cxf/trunk/modules/resources/src/main/resources/modules/wildfly900/org/springframework/ stack/cxf/trunk/modules/resources/src/main/resources/modules/wildfly900/org/springframework/spring/ stack/cxf/trunk/modules/resources/src/main/resources/modules/wildfly900/org/springframework/spring/main/ stack/cxf/trunk/modules/resources/src/main/resources/modules/wildfly900/org/springframework/spring/main/module.xml stack/cxf/trunk/modules/server/src/main/resources/jbossws-cxf-config-as9.xml Modified: stack/cxf/trunk/build.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/server/src/main/scripts/antrun-beans-config.xml 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/pom.xml Log: [JBWS-3794] Updating target containers Modified: stack/cxf/trunk/build.xml =================================================================== --- stack/cxf/trunk/build.xml 2014-05-14 17:21:17 UTC (rev 18653) +++ stack/cxf/trunk/build.xml 2014-05-14 17:22:45 UTC (rev 18654) @@ -77,9 +77,12 @@ <condition property="wildfly810.home" value="${profiles.profile.properties.wildfly810.home}"> <isset property="profiles.profile.properties.wildfly810.home"/> </condition> + <condition property="wildfly900.home" value="${profiles.profile.properties.wildfly900.home}"> + <isset property="profiles.profile.properties.wildfly900.home"/> + </condition> - <fail message="Application server home not set, jboss720.home=value, wildfly800.home=value or wildfly810.home=value to set"> + <fail message="Application server home not set, jboss720.home=value, wildfly800.home=value, wildfly810.home=value or wildfly900.home to set"> <condition> <and> <not> @@ -91,6 +94,9 @@ <not> <isset property="wildfly810.home"/> </not> + <not> + <isset property="wildfly900.home"/> + </not> </and> </condition> </fail> @@ -99,6 +105,7 @@ <echo message="jboss720.home=${jboss720.home}"/> <echo message="wildfly800.home=${wildfly800.home}"/> <echo message="wildfly810.home=${wildfly810.home}"/> + <echo message="wildfly900.home=${wildfly900.home}"/> </target> <target name="init" depends="mvn-settings,prepare,os-init"> Modified: stack/cxf/trunk/modules/dist/pom.xml =================================================================== --- stack/cxf/trunk/modules/dist/pom.xml 2014-05-14 17:21:17 UTC (rev 18653) +++ stack/cxf/trunk/modules/dist/pom.xml 2014-05-14 17:22:45 UTC (rev 18654) @@ -69,6 +69,13 @@ <dependency> <groupId>org.jboss.ws.cxf</groupId> + <artifactId>jbossws-cxf-resources</artifactId> + <version>${project.version}</version> + <classifier>wildfly900</classifier> + </dependency> + + <dependency> + <groupId>org.jboss.ws.cxf</groupId> <artifactId>jbossws-cxf-server</artifactId> <version>${project.version}</version> </dependency> @@ -136,6 +143,11 @@ <scope>provided</scope> </dependency> <dependency> + <groupId>org.jboss.ws</groupId> + <artifactId>jbossws-wildfly810-server-integration</artifactId> + <scope>provided</scope> + </dependency> + <dependency> <groupId>org.jboss</groupId> <artifactId>jandex</artifactId> </dependency> @@ -203,6 +215,9 @@ <xslt style="${basedir}/src/main/distro/test-exclude.xsl" in="../testsuite/pom.xml" out="${basedir}/target/exclude-file/test-excludes-wildfly810.txt"> <param name="targetName" expression="wildfly810" /> </xslt> + <xslt style="${basedir}/src/main/distro/test-exclude.xsl" in="../testsuite/pom.xml" out="${basedir}/target/exclude-file/test-excludes-wildfly900.txt"> + <param name="targetName" expression="wildfly900" /> + </xslt> </target> </configuration> <goals> @@ -240,6 +255,11 @@ <scope>provided</scope> </dependency> <dependency> + <groupId>org.jboss.ws</groupId> + <artifactId>jbossws-wildfly810-tests-integration</artifactId> + <scope>provided</scope> + </dependency> + <dependency> <groupId>org.wildfly</groupId> <artifactId>wildfly-webservices-tests-integration</artifactId> <scope>provided</scope> Modified: stack/cxf/trunk/modules/dist/src/main/distro/Install.txt =================================================================== --- stack/cxf/trunk/modules/dist/src/main/distro/Install.txt 2014-05-14 17:21:17 UTC (rev 18653) +++ stack/cxf/trunk/modules/dist/src/main/distro/Install.txt 2014-05-14 17:22:45 UTC (rev 18654) @@ -16,12 +16,13 @@ ant deploy-jboss720 ant deploy-wildfly800 ant deploy-wildfly810 + ant deploy-wildfly900 By default Spring Framework libraries are not installed to application server. In order to do that, please add the -Dspring=true property option when running the ant script: - ant -Dspring=true deploy-jboss720 + ant -Dspring=true deploy-jboss800 Please note Spring is required for advanced configuration only, whenever users want to provide their own jbossws-cxf.xml Spring configuration file. 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-14 17:21:17 UTC (rev 18653) +++ stack/cxf/trunk/modules/dist/src/main/distro/ant.properties.example 2014-05-14 17:22:45 UTC (rev 18654) @@ -6,9 +6,10 @@ 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] -jbossws.integration.target=jboss720 +# The JBoss server under test. This can be [jboss720|wildfly800|wildfly810|wildfly900] +jbossws.integration.target=wildfly800 # The JBoss settings jboss.bind.address=localhost 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-14 17:21:17 UTC (rev 18653) +++ stack/cxf/trunk/modules/dist/src/main/distro/build-deploy.xml 2014-05-14 17:22:45 UTC (rev 18654) @@ -177,10 +177,71 @@ <target name="undeploy-wildfly810" depends="target-wildfly810,init" description="Remove jbossws from wildfly810"> <fail message="Not available: ${wildfly810.available.file}" unless="wildfly810.available"/> - <macro-undeploy-jbossws-modules targetdir="${wildfly810.home}/modules/system/layers/base" defaultmodulesconf="${jbossws.default.modules.conf}" modifyjbossintegration="false"/> + <macro-undeploy-jbossws-modules targetdir="${wildfly810.home}/modules/system/layers/base" defaultmodulesconf="${jbossws.default.modules.conf}" modifyjbossintegration="true"/> </target> <!-- ================================================================== --> + <!-- Prepare Deployment Structure WildFly-9.0.x --> + <!-- ================================================================== --> + + <target name="deploy-structure-wildfly90x" 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-as9" 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="wildfly900"/> + </antcall> + <copy toDir="${deploy.structure}/modules/system/layers/base"> + <fileset dir="${deploy.artifacts.dir}/modules/wildfly900"> + <include name="**/jboss/as/webservices/main/module.xml"/> + <include name="**/jboss/as/webservices/server/integration/main/module.xml"/> + </fileset> + </copy> + </target> + + <!-- ================================================================== --> + <!-- Deployment wildfly900 --> + <!-- ================================================================== --> + + <target name="target-wildfly900"> + <property name="jbossws.integration.target" value="wildfly900"/> + <echo message="jbossws.integration.target=${jbossws.integration.target}" file="${target.properties.file}"/> + </target> + <target name="deploy-wildfly900" depends="undeploy-wildfly900,deploy-structure-wildfly90x,check-spring,install-spring-module90x" description="Deploy jbossws to wildfly900"> + <fail message="Not available: ${wildfly900.available.file}" unless="wildfly900.available"/> + <copy todir="${wildfly900.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="${wildfly900.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-wildfly900" depends="target-wildfly900,init" description="Remove jbossws from wildfly900"> + <fail message="Not available: ${wildfly900.available.file}" unless="wildfly900.available"/> + <macro-undeploy-jbossws-modules targetdir="${wildfly900.home}/modules/system/layers/base" defaultmodulesconf="${jbossws.default.modules.conf}" modifyjbossintegration="false"/> + </target> + + <!-- ================================================================== --> <!-- Spring --> <!-- ================================================================== --> <target name="check-spring"> @@ -207,4 +268,12 @@ </antcall> </target> + <target name="install-spring-module90x" 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="wildfly900"/> + </antcall> + </target> + </project> 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-14 17:21:17 UTC (rev 18653) +++ stack/cxf/trunk/modules/dist/src/main/distro/build-setup.xml 2014-05-14 17:22:45 UTC (rev 18654) @@ -36,10 +36,12 @@ <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}"/> <tstamp> <format property="build.id" pattern="yyyyMMddHHmm"/> 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-14 17:21:17 UTC (rev 18653) +++ stack/cxf/trunk/modules/dist/src/main/distro/build-testsuite.xml 2014-05-14 17:22:45 UTC (rev 18654) @@ -40,6 +40,9 @@ <condition property="jboss.home" value="${wildfly810.home}"> <equals arg1="${jbossws.integration.target}" arg2="wildfly810"/> </condition> + <condition property="jboss.home" value="${wildfly900.home}"> + <equals arg1="${jbossws.integration.target}" arg2="wildfly900"/> + </condition> <!-- Verify required properties that must be set before this file is imported --> <fail message="Tests output dir not set." unless="tests.output.dir"/> @@ -457,7 +460,182 @@ <pathelement location="${tools.jar}"/> </path> </target> - + + <target name="tests-classpath-wildfly90x" depends="tests-prepare" if="jbossws.integration.wildfly90x"> + + <!-- 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="javax.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/federation/main/"> + <include name="picketlink-*.jar"/> + </fileset> + <fileset dir="${jboss.home}/modules/system/layers/base/javax/ejb/api/main/"> + <include name="jboss-ejb-api_3.2_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.1_spec-*.jar"/> + </fileset> + <fileset dir="${jboss.home}/modules/system/layers/base/javax/annotation/api/main/"> + <include name="jboss-annotations-api_1.2_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 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 --> + <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="wildfly-controller-*.jar"/> + </fileset> + <fileset dir="${jboss.home}/modules/system/layers/base/org/jboss/as/controller-client/main/"> + <include name="wildfly-controller-client-*.jar"/> + </fileset> + <fileset dir="${jboss.home}/modules/system/layers/base/org/wildfly/security/manager/main/"> + <include name="wildfly-security-manager-*.jar"/> + </fileset> + <fileset dir="${jboss.home}/modules/system/layers/base/org/jboss/as/server/main/"> + <include name="wildfly-server-*.jar"/> + </fileset> + <fileset dir="${jboss.home}/modules/system/layers/base/org/jboss/as/protocol/main/"> + <include name="wildfly-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/jboss/log4j/logmanager/main/"> + <include name="log4j-jboss-logmanager-*.jar"/> + </fileset> + <fileset dir="${jboss.home}/modules/system/layers/base/javax/mail/api/main/"> + <include name="javax.mail-*.jar"/> + </fileset> + <fileset dir="${jboss.home}/modules/system/layers/base/javax/servlet/api/main/"> + <include name="jboss-servlet-api_3.1_spec-*.jar"/> + </fileset> + <fileset dir="${jboss.home}/modules/system/layers/base/javax/transaction/api/main/"> + <include name="jboss-transaction-api_1.2_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/federation/main/"> + <include name="picketlink-*.jar"/> + </fileset> + <fileset dir="${jboss.home}/modules/system/layers/base/org/picketlink/core/main/"> + <include name="picketlink-*.jar"/> + </fileset> + <fileset dir="${jboss.home}/modules/system/layers/base/javax/ejb/api/main/"> + <include name="jboss-ejb-api_3.2_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/remoting/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/io/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> + <fileset dir="${jboss.home}/modules/system/layers/base/org/bouncycastle/main/"> + <include name="bcprov-*.jar"/> + </fileset> + <pathelement location="${tools.jar}"/> + </path> + </target> + + <!-- ================================================================== --> <!-- Compiling --> <!-- ================================================================== --> Modified: stack/cxf/trunk/modules/dist/src/main/distro/build.xml =================================================================== --- stack/cxf/trunk/modules/dist/src/main/distro/build.xml 2014-05-14 17:21:17 UTC (rev 18653) +++ stack/cxf/trunk/modules/dist/src/main/distro/build.xml 2014-05-14 17:22:45 UTC (rev 18654) @@ -70,14 +70,20 @@ </or> </condition> + <condition property="jbossws.integration.wildfly90x" value="true"> + <or> + <equals arg1="${jbossws.integration.target}" arg2="wildfly900"/> + </or> + </condition> + <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="8080" else="4447"> - <isset property="jbossws.integration.wildfly80x"/> + <condition property="remote.port" value="4447" else="8080"> + <isset property="jbossws.integration.jboss72x"/> </condition> - <condition property="remote.protocol" value="http-remoting" else="remote"> - <isset property="jbossws.integration.wildfly80x"/> + <condition property="remote.protocol" value="remote" else="http-remoting"> + <isset property="jbossws.integration.jboss72x"/> </condition> </target> 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-14 17:21:17 UTC (rev 18653) +++ stack/cxf/trunk/modules/dist/src/main/scripts/assembly-deploy-artifacts.xml 2014-05-14 17:22:45 UTC (rev 18654) @@ -112,7 +112,7 @@ <includes> <include>org.wildfly:wildfly-webservices-tests-integration:jar</include> </includes> - <outputFileNameMapping>jbossws-wildfly810-tests-integration.jar</outputFileNameMapping> + <outputFileNameMapping>jbossws-wildfly900-tests-integration.jar</outputFileNameMapping> <scope>provided</scope> <useProjectArtifact>false</useProjectArtifact> </dependencySet> Modified: stack/cxf/trunk/modules/resources/pom.xml =================================================================== --- stack/cxf/trunk/modules/resources/pom.xml 2014-05-14 17:21:17 UTC (rev 18653) +++ stack/cxf/trunk/modules/resources/pom.xml 2014-05-14 17:22:45 UTC (rev 18654) @@ -77,6 +77,15 @@ <classesDirectory>${project.build.directory}/classes/resources/jbossws-wildfly810/jbossws.beans</classesDirectory> </configuration> </execution> + <execution> + <id>wildfly900</id> + <goals><goal>jar</goal></goals> + <phase>package</phase> + <configuration> + <classifier>wildfly900</classifier> + <classesDirectory>${project.build.directory}/classes/resources/jbossws-wildfly900/jbossws.beans</classesDirectory> + </configuration> + </execution> </executions> </plugin> </plugins> Added: stack/cxf/trunk/modules/resources/src/main/resources/modules/wildfly900/org/apache/cxf/impl/main/module.xml =================================================================== --- stack/cxf/trunk/modules/resources/src/main/resources/modules/wildfly900/org/apache/cxf/impl/main/module.xml (rev 0) +++ stack/cxf/trunk/modules/resources/src/main/resources/modules/wildfly900/org/apache/cxf/impl/main/module.xml 2014-05-14 17:22:45 UTC (rev 18654) @@ -0,0 +1,71 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<!-- + ~ JBoss, Home of Professional Open Source. + ~ Copyright 2012, 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. + --> + +<module xmlns="urn:jboss:module:1.1" name="org.apache.cxf.impl"> + <resources> + <!-- Insert resources here --> + </resources> + + <dependencies> + <module name="asm.asm" /> + <module name="javax.api" /> + <module name="javax.annotation.api" /> + <module name="javax.jms.api" /> + <module name="javax.jws.api" /> + <module name="javax.mail.api" /> + <module name="javax.resource.api" /> + <module name="javax.servlet.api" /> + <module name="javax.wsdl4j.api" /> + <module name="javax.xml.bind.api" services="import"/> + <module name="com.sun.xml.bind" services="import"/> + <module name="javax.xml.soap.api" /> + <module name="javax.xml.stream.api" /> + <module name="javax.xml.ws.api" /> + <module name="org.apache.commons.lang" /> + <module name="org.apache.neethi" /> + <module name="org.apache.velocity" /> + <module name="org.apache.xml-resolver" /> + <module name="org.apache.ws.xmlschema" /> + <module name="org.apache.ws.security" /> + <module name="org.apache.santuario.xmlsec" /> + <module name="org.codehaus.woodstox" /> + <module name="org.joda.time" /> + <module name="org.opensaml" /> + <module name="org.springframework.spring" optional="true"> + <imports> + <include path="META-INF"/> + </imports> + </module> + <module name="org.apache.cxf" export="true"> + <imports> + <include path="META-INF/cxf"/> + <include path="META-INF"/> + </imports> + <exports> + <include path="META-INF/cxf"/> + <include path="META-INF"/> + </exports> + </module> + </dependencies> +</module> Property changes on: stack/cxf/trunk/modules/resources/src/main/resources/modules/wildfly900/org/apache/cxf/impl/main/module.xml ___________________________________________________________________ Added: svn:mime-type + text/xml Added: svn:keywords + Rev Date Added: svn:eol-style + native Added: stack/cxf/trunk/modules/resources/src/main/resources/modules/wildfly900/org/apache/cxf/main/module.xml =================================================================== --- stack/cxf/trunk/modules/resources/src/main/resources/modules/wildfly900/org/apache/cxf/main/module.xml (rev 0) +++ stack/cxf/trunk/modules/resources/src/main/resources/modules/wildfly900/org/apache/cxf/main/module.xml 2014-05-14 17:22:45 UTC (rev 18654) @@ -0,0 +1,60 @@ +<?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. + --> + +<module xmlns="urn:jboss:module:1.1" name="org.apache.cxf"> + + <resources> + <!-- Insert resources here --> + </resources> + + <dependencies> + <module name="org.apache.cxf.impl" services="import"> + <imports> + <include path="META-INF/cxf"/> <!-- required to also pull in the bus extensions from META-INF --> + <include path="META-INF"/> + </imports> + </module> + <module name="asm.asm" /> + <module name="javax.api" /> + <module name="javax.annotation.api" /> + <module name="javax.jws.api" /> + <module name="javax.mail.api" /> + <module name="javax.resource.api" /> + <module name="javax.wsdl4j.api" /> + <module name="javax.xml.bind.api" services="import"/> + <module name="com.sun.xml.bind" services="import"/> + <module name="javax.xml.soap.api" /> + <module name="javax.xml.stream.api" /> + <module name="javax.xml.ws.api" /> + <module name="com.sun.xml.fastinfoset"/> + <module name="org.apache.neethi" /> + <module name="org.apache.ws.xmlschema" /> + <module name="org.codehaus.woodstox" /> + <module name="org.springframework.spring" optional="true"> + <imports> + <include path="META-INF"/> + </imports> + </module> + </dependencies> +</module> Property changes on: stack/cxf/trunk/modules/resources/src/main/resources/modules/wildfly900/org/apache/cxf/main/module.xml ___________________________________________________________________ Added: svn:mime-type + text/xml Added: svn:keywords + Rev Date Added: svn:eol-style + native Added: stack/cxf/trunk/modules/resources/src/main/resources/modules/wildfly900/org/apache/neethi/main/module.xml =================================================================== --- stack/cxf/trunk/modules/resources/src/main/resources/modules/wildfly900/org/apache/neethi/main/module.xml (rev 0) +++ stack/cxf/trunk/modules/resources/src/main/resources/modules/wildfly900/org/apache/neethi/main/module.xml 2014-05-14 17:22:45 UTC (rev 18654) @@ -0,0 +1,38 @@ +<?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. + --> + +<module xmlns="urn:jboss:module:1.1" name="org.apache.neethi"> + <properties> + <property name="jboss.api" value="private"/> + </properties> + + <resources> + <!-- Insert resources here --> + </resources> + + <dependencies> + <module name="javax.api"/> + <module name="javax.xml.stream.api" /> + </dependencies> +</module> Property changes on: stack/cxf/trunk/modules/resources/src/main/resources/modules/wildfly900/org/apache/neethi/main/module.xml ___________________________________________________________________ Added: svn:mime-type + text/xml Added: svn:keywords + Rev Date Added: svn:eol-style + native Added: stack/cxf/trunk/modules/resources/src/main/resources/modules/wildfly900/org/apache/santuario/xmlsec/main/module.xml =================================================================== --- stack/cxf/trunk/modules/resources/src/main/resources/modules/wildfly900/org/apache/santuario/xmlsec/main/module.xml (rev 0) +++ stack/cxf/trunk/modules/resources/src/main/resources/modules/wildfly900/org/apache/santuario/xmlsec/main/module.xml 2014-05-14 17:22:45 UTC (rev 18654) @@ -0,0 +1,47 @@ +<?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. + --> + +<module xmlns="urn:jboss:module:1.1" name="org.apache.santuario.xmlsec"> + + <exports> + <exclude path="javax/**"/> + </exports> + + <properties> + <property name="jboss.api" value="private"/> + </properties> + + <resources> + <!-- Insert resources here --> + </resources> + + <dependencies> + <module name="javax.api" /> + <module name="org.apache.commons.logging" /> + <module name="org.apache.xalan" /> + <module name="org.slf4j" /> + <module name="javax.xml.bind.api" services="import"/> + <module name="com.sun.xml.bind" services="import"/> + </dependencies> +</module> Property changes on: stack/cxf/trunk/modules/resources/src/main/resources/modules/wildfly900/org/apache/santuario/xmlsec/main/module.xml ___________________________________________________________________ Added: svn:mime-type + text/xml Added: svn:keywords + Rev Date Added: svn:eol-style + native Added: stack/cxf/trunk/modules/resources/src/main/resources/modules/wildfly900/org/apache/ws/security/main/module.xml =================================================================== --- stack/cxf/trunk/modules/resources/src/main/resources/modules/wildfly900/org/apache/ws/security/main/module.xml (rev 0) +++ stack/cxf/trunk/modules/resources/src/main/resources/modules/wildfly900/org/apache/ws/security/main/module.xml 2014-05-14 17:22:45 UTC (rev 18654) @@ -0,0 +1,42 @@ +<?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. + --> + +<module xmlns="urn:jboss:module:1.1" name="org.apache.ws.security"> + <resources> + <!-- Insert resources here --> + </resources> + + <dependencies> + <module name="javax.api" /> + <module name="javax.xml.rpc.api" /> + <module name="org.apache.commons.codec" /> + <module name="org.apache.commons.logging" /> + <module name="org.apache.neethi" /> + <module name="org.apache.santuario.xmlsec" /> + <module name="org.apache.xalan" /> + <module name="org.joda.time" /> + <module name="org.opensaml" /> + <module name="org.slf4j" /> + </dependencies> +</module> Property changes on: stack/cxf/trunk/modules/resources/src/main/resources/modules/wildfly900/org/apache/ws/security/main/module.xml ___________________________________________________________________ Added: svn:mime-type + text/xml Added: svn:keywords + Rev Date Added: svn:eol-style + native Added: stack/cxf/trunk/modules/resources/src/main/resources/modules/wildfly900/org/apache/ws/xmlschema/main/module.xml =================================================================== --- stack/cxf/trunk/modules/resources/src/main/resources/modules/wildfly900/org/apache/ws/xmlschema/main/module.xml (rev 0) +++ stack/cxf/trunk/modules/resources/src/main/resources/modules/wildfly900/org/apache/ws/xmlschema/main/module.xml 2014-05-14 17:22:45 UTC (rev 18654) @@ -0,0 +1,37 @@ +<?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. + --> + +<module xmlns="urn:jboss:module:1.1" name="org.apache.ws.xmlschema"> + <properties> + <property name="jboss.api" value="private"/> + </properties> + + <resources> + <!-- Insert resources here --> + </resources> + + <dependencies> + <module name="javax.api" /> + </dependencies> +</module> Property changes on: stack/cxf/trunk/modules/resources/src/main/resources/modules/wildfly900/org/apache/ws/xmlschema/main/module.xml ___________________________________________________________________ Added: svn:mime-type + text/xml Added: svn:keywords + Rev Date Added: svn:eol-style + native Added: stack/cxf/trunk/modules/resources/src/main/resources/modules/wildfly900/org/jboss/as/webservices/main/module.xml =================================================================== --- stack/cxf/trunk/modules/resources/src/main/resources/modules/wildfly900/org/jboss/as/webservices/main/module.xml (rev 0) +++ stack/cxf/trunk/modules/resources/src/main/resources/modules/wildfly900/org/jboss/as/webservices/main/module.xml 2014-05-14 17:22:45 UTC (rev 18654) @@ -0,0 +1,65 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<!-- + ~ JBoss, Home of Professional Open Source. + ~ Copyright 2010, 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. + --> + +<module xmlns="urn:jboss:module:1.1" name="org.jboss.as.webservices"> + <properties> + <property name="jboss.api" value="private"/> + </properties> + + <resources> + <!-- Insert resources here --> + </resources> + + <dependencies> + <module name="javax.annotation.api"/> + <module name="javax.api"/> + <module name="javax.ejb.api"/> + <module name="javax.jws.api"/> + <module name="javax.servlet.api"/> + <module name="javax.xml.ws.api"/> + <module name="org.jboss.ejb3"/> + <module name="org.jboss.invocation"/> + <module name="org.jboss.jandex"/> + <module name="org.jboss.metadata"/> + <module name="org.jboss.staxmapper"/> + <module name="org.jboss.as.controller"/> + <module name="org.jboss.as.ejb3"/> + <module name="org.jboss.as.server"/> + <module name="org.jboss.as.ee"/> + <module name="org.jboss.as.naming"/> + <module name="org.jboss.as.security"/> + <module name="org.wildfly.security.manager"/> + <module name="org.jboss.as.web-common"/> + <module name="org.jboss.threads"/> + <module name="org.jboss.modules"/> + <module name="org.jboss.msc"/> + <module name="org.jboss.vfs"/> + <module name="org.jboss.logging"/> + <module name="org.jboss.common-core" /> + <module name="org.jboss.ws.api" /> + <module name="org.jboss.ws.common" services="import" /> + <module name="org.jboss.ws.spi" /> + <module name="org.picketbox" /> + </dependencies> +</module> Property changes on: stack/cxf/trunk/modules/resources/src/main/resources/modules/wildfly900/org/jboss/as/webservices/main/module.xml ___________________________________________________________________ Added: svn:mime-type + text/xml Added: svn:keywords + Rev Date Added: svn:eol-style + native Added: stack/cxf/trunk/modules/resources/src/main/resources/modules/wildfly900/org/jboss/as/webservices/server/integration/main/module.xml =================================================================== --- stack/cxf/trunk/modules/resources/src/main/resources/modules/wildfly900/org/jboss/as/webservices/server/integration/main/module.xml (rev 0) +++ stack/cxf/trunk/modules/resources/src/main/resources/modules/wildfly900/org/jboss/as/webservices/server/integration/main/module.xml 2014-05-14 17:22:45 UTC (rev 18654) @@ -0,0 +1,107 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<!-- + ~ JBoss, Home of Professional Open Source. + ~ Copyright 2010, 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. + --> + +<module xmlns="urn:jboss:module:1.1" name="org.jboss.as.webservices.server.integration"> + <properties> + <property name="jboss.api" value="private"/> + </properties> + + <resources> + </resources> + + <dependencies> + <module name="javax.api" export="true"/> + <module name="javax.jws.api" export="true"/> + <module name="javax.wsdl4j.api" export="true"/> + <module name="javax.xml.ws.api" export="true"/> + <module name="com.sun.xml.bind" services="export" export="true"/> + <module name="org.jboss.ws.api" export="true"/> + <module name="org.jboss.ws.spi" export="true"/> + <module name="org.jboss.ws.common" services="import" export="true"/> + <module name="org.jboss.ws.jaxws-client" services="export" export="true"> + <imports> + <include path="META-INF/cxf"/> + <include path="META-INF"/> + </imports> + <exports> + <include path="META-INF/cxf"/> + <include path="META-INF"/> + </exports> + </module> + <module name="org.jboss.ws.cxf.jbossws-cxf-factories" services="export" export="true"/> + <module name="org.jboss.ws.cxf.jbossws-cxf-transports-undertow" export="true"> + <imports> + <include path="META-INF/cxf"/> + <include path="META-INF"/> + </imports> + <exports> + <include path="META-INF/cxf"/> + <include path="META-INF"/> + </exports> + </module> + <module name="org.jboss.ws.cxf.jbossws-cxf-transports-udp" export="true"> + <imports> + <include path="META-INF/cxf"/> + <include path="META-INF"/> + </imports> + <exports> + <include path="META-INF/cxf"/> + <include path="META-INF"/> + </exports> + </module> + <module name="org.jboss.ws.cxf.jbossws-cxf-server" services="export" export="true"/> + <!-- Do not import services from cxf module directly, those need to come from jbossws --> + <module name="org.apache.cxf.impl" export="true"> + <imports> + <include path="META-INF/cxf"/> + <include path="META-INF"/> + </imports> + <exports> + <include path="META-INF/cxf"/> + <include path="META-INF"/> + </exports> + </module> + <module name="org.apache.xalan" services="export" export="true"/> + <module name="org.apache.xerces" services="export" export="true"/> + <module name="org.jboss.as.webservices" services="export" export="true"/> + <module name="com.sun.xml.messaging.saaj" services="export" export="true"/> + <module name="org.apache.ws.security" export="true"/> + <module name="org.apache.santuario.xmlsec" export="true"/> + <module name="org.bouncycastle" export="true"/> + <module name="org.springframework.spring" optional="true" export="true"> + <imports> + <include path="META-INF"/> + </imports> + <exports> + <include path="META-INF"/> + </exports> + </module> + <module name="org.jboss.xts"> + <imports> + <include path="com.arjuna.mw.wst11.client"/> + <include path="org.jboss.jbossts.txbridge.outbound"/> + </imports> + </module> + </dependencies> +</module> Property changes on: stack/cxf/trunk/modules/resources/src/main/resources/modules/wildfly900/org/jboss/as/webservices/server/integration/main/module.xml ___________________________________________________________________ Added: svn:mime-type + text/xml Added: svn:keywords + Rev Date Added: svn:eol-style + native Added: stack/cxf/trunk/modules/resources/src/main/resources/modules/wildfly900/org/jboss/ws/api/main/module.xml =================================================================== --- stack/cxf/trunk/modules/resources/src/main/resources/modules/wildfly900/org/jboss/ws/api/main/module.xml (rev 0) +++ stack/cxf/trunk/modules/resources/src/main/resources/modules/wildfly900/org/jboss/ws/api/main/module.xml 2014-05-14 17:22:45 UTC (rev 18654) @@ -0,0 +1,40 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<!-- + ~ JBoss, Home of Professional Open Source. + ~ Copyright 2010, 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. + --> + +<module xmlns="urn:jboss:module:1.1" name="org.jboss.ws.api"> + + <resources> + <!-- Insert resources here --> + </resources> + + <dependencies> + <module name="javax.api"/> + <module name="javax.xml.soap.api"/> + <module name="javax.xml.ws.api"/> + <module name="org.jboss.logging"/> + <module name="org.jboss.modules"/> + <module name="org.jboss.ws.jaxws-client" services="import"/> + </dependencies> + +</module> Property changes on: stack/cxf/trunk/modules/resources/src/main/resources/modules/wildfly900/org/jboss/ws/api/main/module.xml ___________________________________________________________________ Added: svn:mime-type + text/xml Added: svn:keywords + Rev Date Added: svn:eol-style + native Added: stack/cxf/trunk/modules/resources/src/main/resources/modules/wildfly900/org/jboss/ws/common/main/module.xml =================================================================== --- stack/cxf/trunk/modules/resources/src/main/resources/modules/wildfly900/org/jboss/ws/common/main/module.xml (rev 0) +++ stack/cxf/trunk/modules/resources/src/main/resources/modules/wildfly900/org/jboss/ws/common/main/module.xml 2014-05-14 17:22:45 UTC (rev 18654) @@ -0,0 +1,51 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<!-- + ~ JBoss, Home of Professional Open Source. + ~ Copyright 2010, 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. + --> + +<module xmlns="urn:jboss:module:1.1" name="org.jboss.ws.common"> + + <properties> + <property name="jboss.api" value="private"/> + </properties> + + <resources> + <!-- Insert resources here --> + </resources> + + <dependencies> + <module name="javax.api"/> + <module name="javax.annotation.api"/> + <module name="javax.xml.stream.api"/> + <module name="javax.ejb.api"/> + <module name="javax.jws.api"/> + <module name="javax.servlet.api"/> + <module name="javax.wsdl4j.api" /> + <module name="javax.xml.ws.api"/> + <module name="org.jboss.ws.api"/> + <module name="org.jboss.ws.spi"/> + <module name="org.jboss.logging"/> + <module name="org.jboss.common-core"/> + <module name="org.apache.xerces" services="import"/> + <module name="org.jboss.jaxbintros"/> + </dependencies> +</module> Property changes on: stack/cxf/trunk/modules/resources/src/main/resources/modules/wildfly900/org/jboss/ws/common/main/module.xml ___________________________________________________________________ Added: svn:mime-type + text/xml Added: svn:keywords + Rev Date Added: svn:eol-style + native Added: stack/cxf/trunk/modules/resources/src/main/resources/modules/wildfly900/org/jboss/ws/cxf/jbossws-cxf-client/main/module.xml =================================================================== --- stack/cxf/trunk/modules/resources/src/main/resources/modules/wildfly900/org/jboss/ws/cxf/jbossws-cxf-client/main/module.xml (rev 0) +++ stack/cxf/trunk/modules/resources/src/main/resources/modules/wildfly900/org/jboss/ws/cxf/jbossws-cxf-client/main/module.xml 2014-05-14 17:22:45 UTC (rev 18654) @@ -0,0 +1,54 @@ +<?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. + --> + +<module xmlns="urn:jboss:module:1.1" name="org.jboss.ws.cxf.jbossws-cxf-client"> + + <resources> + <!-- Insert resources here --> + </resources> + + <dependencies> + <!-- JAXB API + REF IMPL --> + <module name="javax.xml.bind.api" export="true"/> + <module name="com.sun.xml.bind" export="true" services="export"/> + <module name="javax.xml.ws.api" export="true"/> + <module name="javax.jws.api" export="true"/> + <!-- WSDL4J API --> + <module name="javax.wsdl4j.api" export="true"/> + <!-- JBossWS API --> + <module name="org.jboss.ws.api" export="true" /> + <!-- JBossWS JAXWS client --> + <module name="org.jboss.ws.jaxws-client" export="true" services="export" /> + <!-- JBossWS configuration of Apache CXF --> + <module name="org.jboss.ws.cxf.jbossws-cxf-factories" services="export" /> + <!-- Apache CXF APIs only --> + <module name="org.apache.cxf" export="true" /> + <module name="org.jboss.ws.cxf.jbossws-cxf-transports-undertow" export="true" services="export" /> + <module name="org.jboss.ws.cxf.jbossws-cxf-transports-udp" export="true" services="export" /> + <module name="org.jboss.jaxbintros" export="true"/> + <module name="javax.security.auth.message.api" export="true"/> + <module name="org.picketbox" export="true"/> + <module name="org.apache.ws.security" export="true"/> + </dependencies> +</module> Property changes on: stack/cxf/trunk/modules/resources/src/main/resources/modules/wildfly900/org/jboss/ws/cxf/jbossws-cxf-client/main/module.xml ___________________________________________________________________ Added: svn:mime-type + text/xml Added: svn:keywords + Rev Date Added: svn:eol-style + native Added: stack/cxf/trunk/modules/resources/src/main/resources/modules/wildfly900/org/jboss/ws/cxf/jbossws-cxf-factories/main/module.xml =================================================================== --- stack/cxf/trunk/modules/resources/src/main/resources/modules/wildfly900/org/jboss/ws/cxf/jbossws-cxf-factories/main/module.xml (rev 0) +++ stack/cxf/trunk/modules/resources/src/main/resources/modules/wildfly900/org/jboss/ws/cxf/jbossws-cxf-factories/main/module.xml 2014-05-14 17:22:45 UTC (rev 18654) @@ -0,0 +1,36 @@ +<?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. + --> + +<module xmlns="urn:jboss:module:1.1" name="org.jboss.ws.cxf.jbossws-cxf-factories"> + + <properties> + <property name="jboss.api" value="private"/> + </properties> + + <resources> + <!-- Insert resources here --> + </resources> + + <dependencies/> +</module> Property changes on: stack/cxf/trunk/modules/resources/src/main/resources/modules/wildfly900/org/jboss/ws/cxf/jbossws-cxf-factories/main/module.xml ___________________________________________________________________ Added: svn:mime-type + text/xml Added: svn:keywords + Rev Date Added: svn:eol-style + native Added: stack/cxf/trunk/modules/resources/src/main/resources/modules/wildfly900/org/jboss/ws/cxf/jbossws-cxf-server/main/module.xml =================================================================== --- stack/cxf/trunk/modules/resources/src/main/resources/modules/wildfly900/org/jboss/ws/cxf/jbossws-cxf-server/main/module.xml (rev 0) +++ stack/cxf/trunk/modules/resources/src/main/resources/modules/wildfly900/org/jboss/ws/cxf/jbossws-cxf-server/main/module.xml 2014-05-14 17:22:45 UTC (rev 18654) @@ -0,0 +1,78 @@ +<?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. + --> + +<module xmlns="urn:jboss:module:1.1" name="org.jboss.ws.cxf.jbossws-cxf-server"> + + <properties> + <property name="jboss.api" value="private"/> + </properties> + + <resources> + <!-- Insert resources here --> + </resources> + + <dependencies> + <module name="javax.api" /> + <module name="javax.security.auth.message.api"/> + <module name="javax.servlet.api" /> + <module name="javax.jws.api" /> + <module name="javax.wsdl4j.api" /> + <module name="javax.xml.bind.api" /> + <module name="javax.xml.stream.api" /> + <module name="javax.xml.ws.api" /> + <module name="org.jboss.ws.api" /> + <module name="org.jboss.ws.spi" /> + <module name="org.jboss.ws.common" /> + <module name="org.jboss.ws.jaxws-client" /> + <module name="org.jboss.ws.cxf.jbossws-cxf-factories" services="import"/> + <!-- do not import services from cxf, those need to come from jbossws --> + <module name="org.apache.cxf.impl"> + <imports> + <include path="META-INF/cxf"/> <!-- required to also pull in the bus extensions from META-INF --> + <include path="META-INF"/> + </imports> + </module> + <module name="org.jboss.ws.cxf.jbossws-cxf-transports-undertow" services="import"> + <imports> + <include path="META-INF/cxf"/> <!-- required to also pull in the bus extensions from META-INF --> + <include path="META-INF"/> + </imports> + </module> + <module name="org.jboss.ws.cxf.jbossws-cxf-transports-udp" services="import"> + <imports> + <include path="META-INF/cxf"/> <!-- required to also pull in the bus extensions from META-INF --> + <include path="META-INF"/> + </imports> + </module> + <module name="org.jboss.common-core" /> + <module name="org.jboss.logging" /> + <module name="org.apache.ws.security" /> + <module name="org.picketbox" /> + <module name="org.springframework.spring" optional="true"> + <imports> + <include path="META-INF"/> + </imports> + </module> + </dependencies> +</module> Property changes on: stack/cxf/trunk/modules/resources/src/main/resources/modules/wildfly900/org/jboss/ws/cxf/jbossws-cxf-server/main/module.xml ___________________________________________________________________ Added: svn:mime-type + text/xml Added: svn:keywords + Rev Date Added: svn:eol-style + native Added: stack/cxf/trunk/modules/resources/src/main/resources/modules/wildfly900/org/jboss/ws/cxf/jbossws-cxf-transports-udp/main/module.xml =================================================================== --- stack/cxf/trunk/modules/resources/src/main/resources/modules/wildfly900/org/jboss/ws/cxf/jbossws-cxf-transports-udp/main/module.xml (rev 0) +++ stack/cxf/trunk/modules/resources/src/main/resources/modules/wildfly900/org/jboss/ws/cxf/jbossws-cxf-transports-udp/main/module.xml 2014-05-14 17:22:45 UTC (rev 18654) @@ -0,0 +1,45 @@ +<?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. + --> + +<module xmlns="urn:jboss:module:1.1" name="org.jboss.ws.cxf.jbossws-cxf-transports-udp"> + + <properties> + <property name="jboss.api" value="private"/> + </properties> + + <resources> + <!-- Insert resources here --> + </resources> + + <dependencies> + <module name="javax.annotation.api" /> + <module name="javax.xml.ws.api" /> + <module name="org.apache.cxf.impl" services="import"> + <imports> + <include path="META-INF/cxf"/> <!-- required to also pull in the bus extensions from META-INF --> + <include path="META-INF"/> + </imports> + </module> + </dependencies> +</module> Property changes on: stack/cxf/trunk/modules/resources/src/main/resources/modules/wildfly900/org/jboss/ws/cxf/jbossws-cxf-transports-udp/main/module.xml ___________________________________________________________________ Added: svn:mime-type + text/xml Added: svn:keywords + Rev Date Added: svn:eol-style + native Added: stack/cxf/trunk/modules/resources/src/main/resources/modules/wildfly900/org/jboss/ws/cxf/jbossws-cxf-transports-undertow/main/module.xml =================================================================== --- stack/cxf/trunk/modules/resources/src/main/resources/modules/wildfly900/org/jboss/ws/cxf/jbossws-cxf-transports-undertow/main/module.xml (rev 0) +++ stack/cxf/trunk/modules/resources/src/main/resources/modules/wildfly900/org/jboss/ws/cxf/jbossws-cxf-transports-undertow/main/module.xml 2014-05-14 17:22:45 UTC (rev 18654) @@ -0,0 +1,49 @@ +<?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. + --> + +<module xmlns="urn:jboss:module:1.1" name="org.jboss.ws.cxf.jbossws-cxf-transports-undertow"> + + <properties> + <property name="jboss.api" value="private"/> + </properties> + + <resources> + <!-- Insert resources here --> + </resources> + + <dependencies> + <module name="org.jboss.ws.spi" /> + <module name="org.jboss.ws.common" /> + <module name="javax.annotation.api" /> + <module name="javax.xml.ws.api" /> + <module name="org.jboss.ws.jaxws-undertow-httpspi" /> + <module name="org.apache.cxf.impl" services="import"> + <imports> + <include path="META-INF/cxf"/> <!-- required to also pull in the bus extensions from META-INF --> + <include path="META-INF"/> + </imports> + </module> + <module name="io.undertow.core"/> + </dependencies> +</module> Property changes on: stack/cxf/trunk/modules/resources/src/main/resources/modules/wildfly900/org/jboss/ws/cxf/jbossws-cxf-transports-undertow/main/module.xml ___________________________________________________________________ Added: svn:mime-type + text/xml Added: svn:keywords + Rev Date Added: svn:eol-style + native Added: stack/cxf/trunk/modules/resources/src/main/resources/modules/wildfly900/org/jboss/ws/jaxws-client/main/module.xml =================================================================== --- stack/cxf/trunk/modules/resources/src/main/resources/modules/wildfly900/org/jboss/ws/jaxws-client/main/module.xml (rev 0) +++ stack/cxf/trunk/modules/resources/src/main/resources/modules/wildfly900/org/jboss/ws/jaxws-client/main/module.xml 2014-05-14 17:22:45 UTC (rev 18654) @@ -0,0 +1,77 @@ +<?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. + --> + +<module xmlns="urn:jboss:module:1.1" name="org.jboss.ws.jaxws-client"> + + <properties> + <property name="jboss.api" value="private"/> + </properties> + + <resources> + <!-- Insert resources here --> + </resources> + + <dependencies> + <module name="javax.api" /> + <module name="javax.servlet.api" /> + <module name="javax.xml.bind.api" /> + <module name="javax.security.auth.message.api"/> + <module name="com.sun.xml.bind" services="import"/> + <module name="javax.xml.ws.api" /> + <module name="org.jboss.ws.api" /> + <module name="org.jboss.ws.spi" /> + <module name="org.jboss.ws.common" /> + <module name="org.jboss.ws.cxf.jbossws-cxf-factories" services="import"/> + <!-- do not import services from cxf, those need to come from jbossws --> + <module name="org.apache.cxf.impl"> + <imports> + <include path="META-INF/cxf"/> <!-- required to also pull in the bus extensions from META-INF --> + <include path="META-INF"/> + </imports> + </module> + <module name="org.jboss.ws.cxf.jbossws-cxf-transports-undertow" services="import"> + <imports> + <include path="META-INF/cxf"/> <!-- required to also pull in the bus extensions from META-INF --> + <include path="META-INF"/> + </imports> + </module> + <module name="org.jboss.ws.cxf.jbossws-cxf-transports-udp" services="import"> + <imports> + <include path="META-INF/cxf"/> <!-- required to also pull in the bus extensions from META-INF --> + <include path="META-INF"/> + </imports> + </module> + <module name="org.apache.log4j" /> + <module name="org.apache.neethi" /> + <module name="org.apache.ws.security" /> + <module name="org.jboss.logging" /> + <module name="org.picketbox"/> + <module name="org.springframework.spring" optional="true"> + <imports> + <include path="META-INF"/> + </imports> + </module> + <module name="javax.wsdl4j.api" /> + </dependencies> +</module> Property changes on: stack/cxf/trunk/modules/resources/src/main/resources/modules/wildfly900/org/jboss/ws/jaxws-client/main/module.xml ___________________________________________________________________ Added: svn:mime-type + text/xml Added: svn:keywords + Rev Date Added: svn:eol-style + native Added: stack/cxf/trunk/modules/resources/src/main/resources/modules/wildfly900/org/jboss/ws/jaxws-undertow-httpspi/main/module.xml =================================================================== --- stack/cxf/trunk/modules/resources/src/main/resources/modules/wildfly900/org/jboss/ws/jaxws-undertow-httpspi/main/module.xml (rev 0) +++ stack/cxf/trunk/modules/resources/src/main/resources/modules/wildfly900/org/jboss/ws/jaxws-undertow-httpspi/main/module.xml 2014-05-14 17:22:45 UTC (rev 18654) @@ -0,0 +1,39 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<!-- + ~ JBoss, Home of Professional Open Source. + ~ Copyright 2010, 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. + --> + +<module xmlns="urn:jboss:module:1.1" name="org.jboss.ws.jaxws-undertow-httpspi"> + + <properties> + <property name="jboss.api" value="private"/> + </properties> + + <resources> + <!-- Insert resources here --> + </resources> + + <dependencies> + <module name="javax.xml.ws.api" /> + <module name="io.undertow.core"/> + </dependencies> +</module> Property changes on: stack/cxf/trunk/modules/resources/src/main/resources/modules/wildfly900/org/jboss/ws/jaxws-undertow-httpspi/main/module.xml ___________________________________________________________________ Added: svn:mime-type + text/xml Added: svn:keywords + Rev Date Added: svn:eol-style + native Added: stack/cxf/trunk/modules/resources/src/main/resources/modules/wildfly900/org/jboss/ws/saaj-impl/main/module.xml =================================================================== --- stack/cxf/trunk/modules/resources/src/main/resources/modules/wildfly900/org/jboss/ws/saaj-impl/main/module.xml (rev 0) +++ stack/cxf/trunk/modules/resources/src/main/resources/modules/wildfly900/org/jboss/ws/saaj-impl/main/module.xml 2014-05-14 17:22:45 UTC (rev 18654) @@ -0,0 +1,40 @@ +<?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. + --> + +<module xmlns="urn:jboss:module:1.1" name="org.jboss.ws.saaj-impl"> + + <properties> + <property name="jboss.api" value="private"/> + </properties> + + <resources> + <!-- Insert resources here --> + </resources> + + <dependencies> + <module name="org.jboss.ws.jaxws-client" services="import"/> <!-- to pull the jbossws-cxf SOAPConnection impl --> + <module name="com.sun.xml.messaging.saaj" services="import"/> + </dependencies> + +</module> Property changes on: stack/cxf/trunk/modules/resources/src/main/resources/modules/wildfly900/org/jboss/ws/saaj-impl/main/module.xml ___________________________________________________________________ Added: svn:mime-type + text/xml Added: svn:keywords + Rev Date Added: svn:eol-style + native Added: stack/cxf/trunk/modules/resources/src/main/resources/modules/wildfly900/org/jboss/ws/spi/main/module.xml =================================================================== --- stack/cxf/trunk/modules/resources/src/main/resources/modules/wildfly900/org/jboss/ws/spi/main/module.xml (rev 0) +++ stack/cxf/trunk/modules/resources/src/main/resources/modules/wildfly900/org/jboss/ws/spi/main/module.xml 2014-05-14 17:22:45 UTC (rev 18654) @@ -0,0 +1,44 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<!-- + ~ JBoss, Home of Professional Open Source. + ~ Copyright 2010, 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. + --> + +<module xmlns="urn:jboss:module:1.1" name="org.jboss.ws.spi"> + + <properties> + <property name="jboss.api" value="private"/> + </properties> + + <resources> + <!-- Insert resources here --> + </resources> + + <dependencies> + <module name="javax.api"/> + <module name="javax.servlet.api"/> + <module name="javax.xml.stream.api"/> + <module name="javax.xml.ws.api"/> + <module name="org.jboss.logging"/> + <module name="org.jboss.ws.api"/> + <module name="org.jboss.as.webservices"/> + </dependencies> +</module> Property changes on: stack/cxf/trunk/modules/resources/src/main/resources/modules/wildfly900/org/jboss/ws/spi/main/module.xml ___________________________________________________________________ Added: svn:mime-type + text/xml Added: svn:keywords + Rev Date Added: svn:eol-style + native Added: stack/cxf/trunk/modules/resources/src/main/resources/modules/wildfly900/org/jboss/ws/tools/common/main/module.xml =================================================================== --- stack/cxf/trunk/modules/resources/src/main/resources/modules/wildfly900/org/jboss/ws/tools/common/main/module.xml (rev 0) +++ stack/cxf/trunk/modules/resources/src/main/resources/modules/wildfly900/org/jboss/ws/tools/common/main/module.xml 2014-05-14 17:22:45 UTC (rev 18654) @@ -0,0 +1,46 @@ +<?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. + --> + +<module xmlns="urn:jboss:module:1.1" name="org.jboss.ws.tools.common"> + + <properties> + <property name="jboss.api" value="private"/> + </properties> + + <resources> + <!-- Insert resources here --> + </resources> + + <dependencies> + <module name="gnu.getopt"/> + <module name="org.apache.log4j"/> + <module name="org.jboss.as.webservices.server.integration" services="import"> + <imports> + <include path="META-INF"/> + <include path="META-INF/cxf"/> + </imports> + </module> + </dependencies> + +</module> Property changes on: stack/cxf/trunk/modules/resources/src/main/resources/modules/wildfly900/org/jboss/ws/tools/common/main/module.xml ___________________________________________________________________ Added: svn:mime-type + text/xml Added: svn:keywords + Rev Date Added: svn:eol-style + native Added: stack/cxf/trunk/modules/resources/src/main/resources/modules/wildfly900/org/jboss/ws/tools/wsconsume/main/module.xml =================================================================== --- stack/cxf/trunk/modules/resources/src/main/resources/modules/wildfly900/org/jboss/ws/tools/wsconsume/main/module.xml (rev 0) +++ stack/cxf/trunk/modules/resources/src/main/resources/modules/wildfly900/org/jboss/ws/tools/wsconsume/main/module.xml 2014-05-14 17:22:45 UTC (rev 18654) @@ -0,0 +1,38 @@ +<?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. + --> + +<module xmlns="urn:jboss:module:1.1" name="org.jboss.ws.tools.wsconsume"> + + <properties> + <property name="jboss.api" value="private"/> + </properties> + + <main-class name="org.jboss.ws.tools.cmd.WSConsume"/> + + <dependencies> + <module name="org.jboss.logmanager" services="import"/> + <module name="org.jboss.ws.tools.common"/> + </dependencies> + +</module> Property changes on: stack/cxf/trunk/modules/resources/src/main/resources/modules/wildfly900/org/jboss/ws/tools/wsconsume/main/module.xml ___________________________________________________________________ Added: svn:mime-type + text/xml Added: svn:keywords + Rev Date Added: svn:eol-style + native Added: stack/cxf/trunk/modules/resources/src/main/resources/modules/wildfly900/org/jboss/ws/tools/wsprovide/main/module.xml =================================================================== --- stack/cxf/trunk/modules/resources/src/main/resources/modules/wildfly900/org/jboss/ws/tools/wsprovide/main/module.xml (rev 0) +++ stack/cxf/trunk/modules/resources/src/main/resources/modules/wildfly900/org/jboss/ws/tools/wsprovide/main/module.xml 2014-05-14 17:22:45 UTC (rev 18654) @@ -0,0 +1,38 @@ +<?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. + --> + +<module xmlns="urn:jboss:module:1.1" name="org.jboss.ws.tools.wsprovide"> + + <properties> + <property name="jboss.api" value="private"/> + </properties> + + <main-class name="org.jboss.ws.tools.cmd.WSProvide"/> + + <dependencies> + <module name="org.jboss.logmanager" services="import"/> + <module name="org.jboss.ws.tools.common"/> + </dependencies> + +</module> Property changes on: stack/cxf/trunk/modules/resources/src/main/resources/modules/wildfly900/org/jboss/ws/tools/wsprovide/main/module.xml ___________________________________________________________________ Added: svn:mime-type + text/xml Added: svn:keywords + Rev Date Added: svn:eol-style + native Added: stack/cxf/trunk/modules/resources/src/main/resources/modules/wildfly900/org/opensaml/main/module.xml =================================================================== --- stack/cxf/trunk/modules/resources/src/main/resources/modules/wildfly900/org/opensaml/main/module.xml (rev 0) +++ stack/cxf/trunk/modules/resources/src/main/resources/modules/wildfly900/org/opensaml/main/module.xml 2014-05-14 17:22:45 UTC (rev 18654) @@ -0,0 +1,38 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<!-- + ~ JBoss, Home of Professional Open Source. + ~ Copyright 2012, 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. + --> + +<module xmlns="urn:jboss:module:1.1" name="org.opensaml"> + + <resources> + <!-- Insert resources here --> + </resources> + + <dependencies> + <module name="javax.api"/> + <module name="org.slf4j"/> + <module name="org.apache.santuario.xmlsec"/> + <module name="org.apache.ws.security" /> + <module name="org.joda.time"/> + </dependencies> +</module> Property changes on: stack/cxf/trunk/modules/resources/src/main/resources/modules/wildfly900/org/opensaml/main/module.xml ___________________________________________________________________ Added: svn:mime-type + text/xml Added: svn:keywords + Rev Date Added: svn:eol-style + native Added: stack/cxf/trunk/modules/resources/src/main/resources/modules/wildfly900/org/springframework/spring/main/module.xml =================================================================== --- stack/cxf/trunk/modules/resources/src/main/resources/modules/wildfly900/org/springframework/spring/main/module.xml (rev 0) +++ stack/cxf/trunk/modules/resources/src/main/resources/modules/wildfly900/org/springframework/spring/main/module.xml 2014-05-14 17:22:45 UTC (rev 18654) @@ -0,0 +1,38 @@ +<?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. + --> + +<module xmlns="urn:jboss:module:1.1" name="org.springframework.spring"> + + <resources> + <!-- Insert resources here --> + </resources> + + <dependencies> + <module name="javax.api" /> + <module name="javax.jms.api" /> + <module name="javax.annotation.api" /> + <module name="org.apache.commons.logging" /> + <module name="org.jboss.vfs" /> + </dependencies> +</module> Property changes on: stack/cxf/trunk/modules/resources/src/main/resources/modules/wildfly900/org/springframework/spring/main/module.xml ___________________________________________________________________ Added: svn:mime-type + text/xml Added: svn:keywords + Rev Date Added: svn:eol-style + native 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-14 17:21:17 UTC (rev 18653) +++ stack/cxf/trunk/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml 2014-05-14 17:22:45 UTC (rev 18654) @@ -28,6 +28,120 @@ <!-- Modules --> <!-- ================================================================== --> + <macrodef name="macro-deploy-jbossws-modules-as9"> + <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"/> + <include name="**/jbossws-cxf-jaspi.jar"/> + </fileset> + </copy> + <copy todir="@{targetdir}/org/jboss/ws/jaxws-undertow-httpspi/main" flatten="false" overwrite="true"> + <fileset dir="@{thirdpartydir}/lib"> + <include name="**/jaxws-undertow-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-undertow/main" flatten="false" overwrite="true"> + <fileset dir="@{thirdpartydir}/lib"> + <include name="**/jbossws-cxf-transports-undertow.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/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/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> + <macrodef name="macro-deploy-jbossws-modules-as8"> <attribute name="thirdpartydir"/> <attribute name="targetdir"/> @@ -293,7 +407,13 @@ <fail message="thirdpartydir must be specified" unless="thirdpartydir"/> <macro-deploy-jbossws-modules-as8 targetdir="${installserver}" thirdpartydir="${thirdpartydir}" jbossid="${jbossid}" modules-jbossid="${modules-jbossid}"/> </target> - + + <target name="deploy-jbossws-cxf-modules-as9"> + <fail message="installserver must be specified" unless="installserver"/> + <fail message="thirdpartydir must be specified" unless="thirdpartydir"/> + <macro-deploy-jbossws-modules-as9 targetdir="${installserver}" thirdpartydir="${thirdpartydir}" jbossid="${jbossid}" modules-jbossid="${modules-jbossid}"/> + </target> + <!-- ================================================================== --> <!-- Install Spring --> <!-- ================================================================== --> Added: stack/cxf/trunk/modules/server/src/main/resources/jbossws-cxf-config-as9.xml =================================================================== --- stack/cxf/trunk/modules/server/src/main/resources/jbossws-cxf-config-as9.xml (rev 0) +++ stack/cxf/trunk/modules/server/src/main/resources/jbossws-cxf-config-as9.xml 2014-05-14 17:22:45 UTC (rev 18654) @@ -0,0 +1,75 @@ +<?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> + Property changes on: stack/cxf/trunk/modules/server/src/main/resources/jbossws-cxf-config-as9.xml ___________________________________________________________________ Added: svn:mime-type + text/xml Added: svn:keywords + Rev Date Added: svn:eol-style + native 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-14 17:21:17 UTC (rev 18653) +++ stack/cxf/trunk/modules/server/src/main/scripts/antrun-beans-config.xml 2014-05-14 17:22:45 UTC (rev 18654) @@ -48,6 +48,16 @@ tofile="${dest.dir}/jbossws-wildfly810/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" + /> + + <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/JBossWSTestHelper.java =================================================================== --- stack/cxf/trunk/modules/test-utils/src/main/java/org/jboss/wsf/test/JBossWSTestHelper.java 2014-05-14 17:21:17 UTC (rev 18653) +++ stack/cxf/trunk/modules/test-utils/src/main/java/org/jboss/wsf/test/JBossWSTestHelper.java 2014-05-14 17:22:45 UTC (rev 18654) @@ -169,6 +169,12 @@ return target.startsWith("wildfly80"); } + public static boolean isTargetWildFly9() + { + String target = getIntegrationTarget(); + return target.startsWith("wildfly9"); + } + public static boolean isIntegrationNative() { String vendor = getImplementationInfo(); @@ -246,7 +252,7 @@ { server = getServerConnection("service:jmx:remoting-jmx://" + getServerHost() + ":" + 9999); } - else if (integrationTarget.startsWith("wildfly8")) + else if (integrationTarget.startsWith("wildfly")) { server = getServerConnection("service:jmx:http-remoting-jmx://" + getServerHost() + ":" + 9990); } Modified: stack/cxf/trunk/modules/testsuite/pom.xml =================================================================== --- stack/cxf/trunk/modules/testsuite/pom.xml 2014-05-14 17:21:17 UTC (rev 18653) +++ stack/cxf/trunk/modules/testsuite/pom.xml 2014-05-14 17:22:45 UTC (rev 18654) @@ -830,6 +830,98 @@ </properties> <dependencies> <dependency> + <groupId>org.jboss.ws</groupId> + <artifactId>jbossws-wildfly810-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> + <!-- Let the container messaging subsystem control the Netty dependency version --> + <exclusion> + <groupId>io.netty</groupId> + <artifactId>netty-all</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 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> + + <!--# [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> + + <!-- # [JBWS-3620] Authentication failures w/ Undertow --> + <exclude>org/jboss/test/ws/jaxws/cxf/httpauth/HelloDigestTestCase*</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> + + <!-- Manually setup KDC before run this test--> + <exclude>org/jboss/test/ws/jaxws/samples/wsse/kerberos/*TestCase*</exclude> + </excludes> + </configuration> + </plugin> + </plugins> + </build> + </profile> + + <!-- + Name: wildfly900 + Descr: WildFly-9.0.0 specific options + --> + <profile> + <id>wildfly900</id> + <properties> + <jboss.version>${wildfly900.version}</jboss.version> + <jbossws.integration.target>wildfly900</jbossws.integration.target> + <remote.port>8080</remote.port> + <remote.protocol>http-remoting</remote.protocol> + </properties> + <dependencies> + <dependency> <groupId>org.wildfly</groupId> <artifactId>wildfly-webservices-tests-integration</artifactId> <version>${jboss.version}</version> @@ -908,7 +1000,7 @@ </plugins> </build> </profile> - + <!-- Name: secmgr Descr: Additional testsuite exclusions when running against a container with security manager enabled Modified: stack/cxf/trunk/pom.xml =================================================================== --- stack/cxf/trunk/pom.xml 2014-05-14 17:21:17 UTC (rev 18653) +++ stack/cxf/trunk/pom.xml 2014-05-14 17:22:45 UTC (rev 18654) @@ -67,10 +67,12 @@ <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.Final-SNAPSHOT</wildfly810.version> + <wildfly810.version>8.1.0.CR2</wildfly810.version> + <wildfly900.version>9.0.0.Alpha1-SNAPSHOT</wildfly900.version> <ejb.api.version>1.0.2.Final</ejb.api.version> <cxf.version>3.0.0-SNAPSHOT</cxf.version> <cxf.asm.version>3.3.1</cxf.asm.version> @@ -161,9 +163,19 @@ <version>${jbossws.wildfly800.version}</version> </dependency> <dependency> + <groupId>org.jboss.ws</groupId> + <artifactId>jbossws-wildfly810-server-integration</artifactId> + <version>${jbossws.wildfly810.version}</version> + </dependency> + <dependency> + <groupId>org.jboss.ws</groupId> + <artifactId>jbossws-wildfly810-tests-integration</artifactId> + <version>${jbossws.wildfly810.version}</version> + </dependency> + <dependency> <groupId>org.wildfly</groupId> <artifactId>wildfly-webservices-tests-integration</artifactId> - <version>${wildfly810.version}</version> + <version>${wildfly900.version}</version> </dependency> <dependency> <groupId>org.jboss.ws.projects</groupId> @@ -1392,6 +1404,18 @@ </profile> <!-- + Name: wildfly900 + Descr: WildFly-9.0.0 specific options + --> + <profile> + <id>wildfly900</id> + <properties> + <jbossws.integration.target>wildfly900</jbossws.integration.target> + <jboss.home>${wildfly900.home}</jboss.home> + </properties> + </profile> + + <!-- Name: smoketest Descr: Executes the smoke tests -->