May 2014 - jbossws-commits - Jboss List Archives

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

by jbossws-commits＠lists.jboss.org

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>  +  +  + + <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> + +  +  +  + + <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> +  + <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> + +    <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>  <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"> + +  + <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> + +  + <path id="integration.target.client.classpath"> +  + <pathelement location="${thirdparty.dir}/jbossws-cxf-transports-undertow.jar"/> +  + <pathelement location="${thirdparty.dir}/jbossws-${jbossws.integration.target}-tests-integration.jar"/> +  + <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> + +    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"?> + + + +<module xmlns="urn:jboss:module:1.1" name="org.apache.cxf.impl"> + <resources> +  + </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"?> + + + +<module xmlns="urn:jboss:module:1.1" name="org.apache.cxf"> + + <resources> +  + </resources> + + <dependencies> + <module name="org.apache.cxf.impl" services="import"> + <imports> + <include path="META-INF/cxf"/>  + <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"?> + + + +<module xmlns="urn:jboss:module:1.1" name="org.apache.neethi"> + <properties> + <property name="jboss.api" value="private"/> + </properties> + + <resources> +  + </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"?> + + + +<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> +  + </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"?> + + + +<module xmlns="urn:jboss:module:1.1" name="org.apache.ws.security"> + <resources> +  + </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"?> + + + +<module xmlns="urn:jboss:module:1.1" name="org.apache.ws.xmlschema"> + <properties> + <property name="jboss.api" value="private"/> + </properties> + + <resources> +  + </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"?> + + + +<module xmlns="urn:jboss:module:1.1" name="org.jboss.as.webservices"> + <properties> + <property name="jboss.api" value="private"/> + </properties> + + <resources> +  + </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"?> + + + +<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"/> +  + <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"?> + + + +<module xmlns="urn:jboss:module:1.1" name="org.jboss.ws.api"> + + <resources> +  + </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"?> + + + +<module xmlns="urn:jboss:module:1.1" name="org.jboss.ws.common"> + + <properties> + <property name="jboss.api" value="private"/> + </properties> + + <resources> +  + </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"?> + + + +<module xmlns="urn:jboss:module:1.1" name="org.jboss.ws.cxf.jbossws-cxf-client"> + + <resources> +  + </resources> + + <dependencies> +  + <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"/> +  + <module name="javax.wsdl4j.api" export="true"/> +  + <module name="org.jboss.ws.api" export="true" /> +  + <module name="org.jboss.ws.jaxws-client" export="true" services="export" /> +  + <module name="org.jboss.ws.cxf.jbossws-cxf-factories" services="export" /> +  + <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"?> + + + +<module xmlns="urn:jboss:module:1.1" name="org.jboss.ws.cxf.jbossws-cxf-factories"> + + <properties> + <property name="jboss.api" value="private"/> + </properties> + + <resources> +  + </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"?> + + + +<module xmlns="urn:jboss:module:1.1" name="org.jboss.ws.cxf.jbossws-cxf-server"> + + <properties> + <property name="jboss.api" value="private"/> + </properties> + + <resources> +  + </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"/> +  + <module name="org.apache.cxf.impl"> + <imports> + <include path="META-INF/cxf"/>  + <include path="META-INF"/> + </imports> + </module> + <module name="org.jboss.ws.cxf.jbossws-cxf-transports-undertow" services="import"> + <imports> + <include path="META-INF/cxf"/>  + <include path="META-INF"/> + </imports> + </module> + <module name="org.jboss.ws.cxf.jbossws-cxf-transports-udp" services="import"> + <imports> + <include path="META-INF/cxf"/>  + <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"?> + + + +<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> +  + </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"/>  + <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"?> + + + +<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> +  + </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"/>  + <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"?> + + + +<module xmlns="urn:jboss:module:1.1" name="org.jboss.ws.jaxws-client"> + + <properties> + <property name="jboss.api" value="private"/> + </properties> + + <resources> +  + </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"/> +  + <module name="org.apache.cxf.impl"> + <imports> + <include path="META-INF/cxf"/>  + <include path="META-INF"/> + </imports> + </module> + <module name="org.jboss.ws.cxf.jbossws-cxf-transports-undertow" services="import"> + <imports> + <include path="META-INF/cxf"/>  + <include path="META-INF"/> + </imports> + </module> + <module name="org.jboss.ws.cxf.jbossws-cxf-transports-udp" services="import"> + <imports> + <include path="META-INF/cxf"/>  + <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"?> + + + +<module xmlns="urn:jboss:module:1.1" name="org.jboss.ws.jaxws-undertow-httpspi"> + + <properties> + <property name="jboss.api" value="private"/> + </properties> + + <resources> +  + </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"?> + + + +<module xmlns="urn:jboss:module:1.1" name="org.jboss.ws.saaj-impl"> + + <properties> + <property name="jboss.api" value="private"/> + </properties> + + <resources> +  + </resources> + + <dependencies> + <module name="org.jboss.ws.jaxws-client" services="import"/>  + <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"?> + + + +<module xmlns="urn:jboss:module:1.1" name="org.jboss.ws.spi"> + + <properties> + <property name="jboss.api" value="private"/> + </properties> + + <resources> +  + </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"?> + + + +<module xmlns="urn:jboss:module:1.1" name="org.jboss.ws.tools.common"> + + <properties> + <property name="jboss.api" value="private"/> + </properties> + + <resources> +  + </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"?> + + + +<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"?> + + + +<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"?> + + + +<module xmlns="urn:jboss:module:1.1" name="org.opensaml"> + + <resources> +  + </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"?> + + + +<module xmlns="urn:jboss:module:1.1" name="org.springframework.spring"> + + <resources> +  + </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 @@   + <macrodef name="macro-deploy-jbossws-modules-as9"> + <attribute name="thirdpartydir"/> + <attribute name="targetdir"/> + <attribute name="jbossid"/> + <attribute name="modules-jbossid"/> + <sequential> +  + <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="**/jbossws-cxf-resources-(a){jbossid}.jar"/> + <include name="**/jbossws-(a){jbossid}-server-integration.jar"/> + </fileset> + </copy> +  + <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> +    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"?> + + + +<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> +  + <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> +  + <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"> +  + <exclude>org/jboss/test/ws/jaxrpc/**</exclude> + +  + <exclude>org/jboss/test/ws/jaxws/jbws1904/**</exclude> + +  + <exclude>org/jboss/test/ws/jaxws/jbws2449/**</exclude> + +  + <exclude>org/jboss/test/ws/jaxws/samples/xop/doclit/XOPHandlerTestCase.*</exclude> + +  + <exclude>org/jboss/test/ws/jaxws/jbws1283/**</exclude> + +  + <exclude>org/jboss/test/ws/jaxws/jbws2978/**</exclude> + +  + <exclude>org/jboss/test/ws/jaxws/cxf/httpauth/HelloDigestTestCase*</exclude> + +  + <exclude>org/jboss/test/ws/jaxws/samples/wsse/policy/trust/WSTrustActAsTestCase.*</exclude> + <exclude>org/jboss/test/ws/jaxws/samples/wsse/policy/trust/WSTrustOnBehalfOfTestCase.*</exclude> + +  + <exclude>org/jboss/test/ws/jaxws/samples/wsse/kerberos/*TestCase*</exclude> + </excludes> + </configuration> + </plugin> + </plugins> + </build> + </profile> + +  + <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> - +  + <profile> + <id>wildfly900</id> + <properties> + <jbossws.integration.target>wildfly900</jbossws.integration.target> + <jboss.home>${wildfly900.home}</jboss.home> + </properties> + </profile> + +

10 years, 7 months

1
0
0 / 0

JBossWS SVN: r18653 - in stack/cxf/trunk: modules/client/src/main/java/org/jboss/wsf/stack/cxf/client/serviceref and 1 other directory.

by jbossws-commits＠lists.jboss.org

Author: asoldano Date: 2014-05-14 13:21:17 -0400 (Wed, 14 May 2014) New Revision: 18653 Modified: stack/cxf/trunk/modules/client/src/main/java/org/jboss/wsf/stack/cxf/client/serviceref/AbstractServiceObjectFactoryJAXWS.java stack/cxf/trunk/pom.xml Log: [JBWS-3793] Use latest jbossws-spi Modified: stack/cxf/trunk/modules/client/src/main/java/org/jboss/wsf/stack/cxf/client/serviceref/AbstractServiceObjectFactoryJAXWS.java =================================================================== --- stack/cxf/trunk/modules/client/src/main/java/org/jboss/wsf/stack/cxf/client/serviceref/AbstractServiceObjectFactoryJAXWS.java 2014-05-14 17:16:52 UTC (rev 18652) +++ stack/cxf/trunk/modules/client/src/main/java/org/jboss/wsf/stack/cxf/client/serviceref/AbstractServiceObjectFactoryJAXWS.java 2014-05-14 17:21:17 UTC (rev 18653) @@ -80,11 +80,10 @@ final WebServiceFeature[] portFeatures = this.getFeatures(targetClassName, serviceImplClass, serviceRef); String forcedAddress = null; //if there is no wsdlLocation, always use the local deployed endpoint address to initialize port - URL wsdlURL = this.getWsdlURL(serviceRef, serviceClass); - final QName serviceQName = this.getServiceQName(serviceRef, serviceClass); - if (wsdlURL == null && serviceRef.getDeployedServiceAddresses().get(serviceQName) != null) + if (getWsdlURL(serviceRef, serviceClass) == null) { - forcedAddress = serviceRef.getDeployedServiceAddresses().get(serviceQName); + final QName serviceQName = this.getServiceQName(serviceRef, serviceClass); + forcedAddress = serviceRef.getDeployedServiceAddress(serviceQName); } return instantiatePort(serviceClass, targetClass, serviceInstance, portQName, portFeatures, forcedAddress); @@ -228,16 +227,20 @@ final WebServiceFeature[] features = getFeatures(serviceRefMD); final QName serviceQName = this.getServiceQName(serviceRefMD, serviceClass); URL wsdlURL = this.getWsdlURL(serviceRefMD, serviceClass); - if (wsdlURL == null && serviceRefMD.getDeployedServiceAddresses().get(serviceQName) != null) + if (wsdlURL == null) { - try + final String deployedServiceAddress = serviceRefMD.getDeployedServiceAddress(serviceQName); + if (deployedServiceAddress != null) { - wsdlURL = new URL(serviceRefMD.getDeployedServiceAddresses().get(serviceQName) + "?wsdl"); + try + { + wsdlURL = new URL(deployedServiceAddress + "?wsdl"); + } + catch (MalformedURLException e) + { + //ignore + } } - catch (MalformedURLException e) - { - //ignore - } } Service target = null; if (serviceClass == Service.class) @@ -308,7 +311,7 @@ // use the @WebServiceClien(wsdlLocation=...) if the service ref wsdl location returned at this time would be null if (webServiceClientAnnotation.wsdlLocation().length() > 0) { - serviceRefMD.setWsdlOverride(webServiceClientAnnotation.wsdlLocation()); + return serviceRefMD.getWsdlLocation(webServiceClientAnnotation.wsdlLocation()); } } } Modified: stack/cxf/trunk/pom.xml =================================================================== --- stack/cxf/trunk/pom.xml 2014-05-14 17:16:52 UTC (rev 18652) +++ stack/cxf/trunk/pom.xml 2014-05-14 17:21:17 UTC (rev 18653) @@ -62,11 +62,11 @@  <properties> <jbossws.api.version>1.0.2.Final</jbossws.api.version> - <jbossws.spi.version>2.3.0.Final</jbossws.spi.version> - <jbossws.common.version>2.3.0.Final</jbossws.common.version> + <jbossws.spi.version>3.0.0-SNAPSHOT</jbossws.spi.version> + <jbossws.common.version>3.0.0-SNAPSHOT</jbossws.common.version> <jbossws.common.tools.version>1.2.0.Final</jbossws.common.tools.version> - <jbossws.jboss720.version>4.3.0.Final</jbossws.jboss720.version> - <jbossws.wildfly800.version>4.3.0.Final</jbossws.wildfly800.version> + <jbossws.jboss720.version>5.0.0-SNAPSHOT</jbossws.jboss720.version> + <jbossws.wildfly800.version>5.0.0-SNAPSHOT</jbossws.wildfly800.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>

10 years, 7 months

1
0
0 / 0

JBossWS SVN: r18652 - container/wildfly80/branches/jbossws-wildfly800.

by jbossws-commits＠lists.jboss.org

Author: asoldano Date: 2014-05-14 13:16:52 -0400 (Wed, 14 May 2014) New Revision: 18652 Modified: container/wildfly80/branches/jbossws-wildfly800/pom.xml Log: Use latest jbossws-common snapshot Modified: container/wildfly80/branches/jbossws-wildfly800/pom.xml =================================================================== --- container/wildfly80/branches/jbossws-wildfly800/pom.xml 2014-05-14 15:39:47 UTC (rev 18651) +++ container/wildfly80/branches/jbossws-wildfly800/pom.xml 2014-05-14 17:16:52 UTC (rev 18652) @@ -52,7 +52,7 @@ <properties> <jbossws.api.version>1.0.2.Final</jbossws.api.version> <jbossws.spi.version>3.0.0-SNAPSHOT</jbossws.spi.version> - <jbossws.common.version>2.3.0.Final</jbossws.common.version> + <jbossws.common.version>3.0.0-SNAPSHOT</jbossws.common.version> <jboss.msc.version>1.2.0.Final</jboss.msc.version> <wildfly.version>8.0.0.Final</wildfly.version> <wildfly.security-manager.version>1.0.0.Final</wildfly.security-manager.version>

10 years, 7 months

1
0
0 / 0

JBossWS SVN: r18651 - container/wildfly81/branches/jbossws-wildfly810.

by jbossws-commits＠lists.jboss.org

Author: asoldano Date: 2014-05-14 11:39:47 -0400 (Wed, 14 May 2014) New Revision: 18651 Modified: container/wildfly81/branches/jbossws-wildfly810/pom.xml Log: [JBWS-3794] Synch dependencies with WFLY 8.1.0.CR2 Modified: container/wildfly81/branches/jbossws-wildfly810/pom.xml =================================================================== --- container/wildfly81/branches/jbossws-wildfly810/pom.xml 2014-05-14 15:30:51 UTC (rev 18650) +++ container/wildfly81/branches/jbossws-wildfly810/pom.xml 2014-05-14 15:39:47 UTC (rev 18651) @@ -53,25 +53,25 @@ <jbossws.api.version>1.0.2.Final</jbossws.api.version> <jbossws.spi.version>3.0.0-SNAPSHOT</jbossws.spi.version> <jbossws.common.version>3.0.0-SNAPSHOT</jbossws.common.version> - <jboss.msc.version>1.2.0.Final</jboss.msc.version> + <jboss.msc.version>1.2.2.Final</jboss.msc.version> <wildfly.version>8.1.0.CR2</wildfly.version> <wildfly.security-manager.version>1.0.0.Final</wildfly.security-manager.version> - <marshalling.river.version>1.4.3.Final</marshalling.river.version> - <remote.naming.version>2.0.0.Final</remote.naming.version> + <marshalling.river.version>1.4.5.Final</marshalling.river.version> + <remote.naming.version>2.0.1.Final</remote.naming.version> <javax.mail.version>1.5.1</javax.mail.version> - <ejb.client.version>2.0.0.Final</ejb.client.version> + <ejb.client.version>2.0.1.Final</ejb.client.version> <ejb3.ext.api.version>2.1.0</ejb3.ext.api.version> <jboss.common.core.version>2.2.22.GA</jboss.common.core.version> <javassist.version>3.18.1-GA</javassist.version> <xerces.version>2.9.1-jbossas-2</xerces.version> - <remoting.version>4.0.0.Final</remoting.version> + <remoting.version>4.0.3.Final</remoting.version> <remoting.jmx.version>2.0.0.Final</remoting.jmx.version> <jbossxb.version>2.0.3.GA</jbossxb.version> <hornetq.version>2.4.1.Final</hornetq.version> - <xnio.version>3.2.0.Final</xnio.version> + <xnio.version>3.2.2.Final</xnio.version> <jboss.jaxws.api.version>2.0.2.Final</jboss.jaxws.api.version> <jboss.logging.tools.version>1.2.0.Final</jboss.logging.tools.version> - <junit.version>4.10</junit.version> + <junit.version>4.11</junit.version> </properties> <dependencyManagement>

10 years, 7 months

1
0
0 / 0

JBossWS SVN: r18650 - in container/wildfly81/branches/jbossws-wildfly810: server-integration and 1 other directories.

by jbossws-commits＠lists.jboss.org

Author: asoldano Date: 2014-05-14 11:30:51 -0400 (Wed, 14 May 2014) New Revision: 18650 Modified: container/wildfly81/branches/jbossws-wildfly810/ container/wildfly81/branches/jbossws-wildfly810/server-integration/ container/wildfly81/branches/jbossws-wildfly810/tests-integration/ Log: Setting svn:ignore props Property changes on: container/wildfly81/branches/jbossws-wildfly810 ___________________________________________________________________ Added: svn:ignore + .project .classpath .settings Property changes on: container/wildfly81/branches/jbossws-wildfly810/server-integration ___________________________________________________________________ Added: svn:ignore + target .settings .project .classpath Property changes on: container/wildfly81/branches/jbossws-wildfly810/tests-integration ___________________________________________________________________ Added: svn:ignore + target .settings .project .classpath

10 years, 7 months

1
0
0 / 0

JBossWS SVN: r18649 - in container/wildfly81/branches/jbossws-wildfly810: server-integration/src/main/java/org/jboss/as/webservices/metadata and 1 other directories.

by jbossws-commits＠lists.jboss.org

Author: asoldano Date: 2014-05-14 11:28:36 -0400 (Wed, 14 May 2014) New Revision: 18649 Modified: container/wildfly81/branches/jbossws-wildfly810/pom.xml container/wildfly81/branches/jbossws-wildfly810/server-integration/src/main/java/org/jboss/as/webservices/metadata/AbstractMetaDataBuilderEJB.java container/wildfly81/branches/jbossws-wildfly810/server-integration/src/main/java/org/jboss/as/webservices/metadata/AbstractMetaDataBuilderPOJO.java container/wildfly81/branches/jbossws-wildfly810/server-integration/src/main/java/org/jboss/as/webservices/metadata/MetaDataBuilderJAXWS_EJB.java container/wildfly81/branches/jbossws-wildfly810/server-integration/src/main/java/org/jboss/as/webservices/webserviceref/WSRefDDProcessor.java container/wildfly81/branches/jbossws-wildfly810/server-integration/src/main/java/org/jboss/as/webservices/webserviceref/WSRefUtils.java container/wildfly81/branches/jbossws-wildfly810/server-integration/src/main/java/org/jboss/as/webservices/webserviceref/WebServiceReferences.java Log: [JBWS-3793] Use latest jbossws-spi Modified: container/wildfly81/branches/jbossws-wildfly810/pom.xml =================================================================== --- container/wildfly81/branches/jbossws-wildfly810/pom.xml 2014-05-14 14:39:59 UTC (rev 18648) +++ container/wildfly81/branches/jbossws-wildfly810/pom.xml 2014-05-14 15:28:36 UTC (rev 18649) @@ -52,7 +52,7 @@ <properties> <jbossws.api.version>1.0.2.Final</jbossws.api.version> <jbossws.spi.version>3.0.0-SNAPSHOT</jbossws.spi.version> - <jbossws.common.version>2.3.0.Final</jbossws.common.version> + <jbossws.common.version>3.0.0-SNAPSHOT</jbossws.common.version> <jboss.msc.version>1.2.0.Final</jboss.msc.version> <wildfly.version>8.1.0.CR2</wildfly.version> <wildfly.security-manager.version>1.0.0.Final</wildfly.security-manager.version> Modified: container/wildfly81/branches/jbossws-wildfly810/server-integration/src/main/java/org/jboss/as/webservices/metadata/AbstractMetaDataBuilderEJB.java =================================================================== --- container/wildfly81/branches/jbossws-wildfly810/server-integration/src/main/java/org/jboss/as/webservices/metadata/AbstractMetaDataBuilderEJB.java 2014-05-14 14:39:59 UTC (rev 18648) +++ container/wildfly81/branches/jbossws-wildfly810/server-integration/src/main/java/org/jboss/as/webservices/metadata/AbstractMetaDataBuilderEJB.java 2014-05-14 15:28:36 UTC (rev 18649) @@ -1,6 +1,6 @@ /* * JBoss, Home of Professional Open Source. - * Copyright 2011, Red Hat Middleware LLC, and individual contributors + * Copyright 2014, Red Hat Middleware LLC, and individual contributors * as indicated by the @author tags. See the copyright.txt file in the * distribution for a full listing of individual contributors. * @@ -51,12 +51,12 @@ */ final EJBArchiveMetaData create(final Deployment dep) { ROOT_LOGGER.creatingEjbDeployment(dep.getSimpleName()); - final EJBArchiveMetaData ejbArchiveMD = new EJBArchiveMetaData(); + final EJBArchiveMetaData.Builder ejbArchiveMDBuilder = new EJBArchiveMetaData.Builder(); - this.buildEnterpriseBeansMetaData(dep, ejbArchiveMD); - this.buildWebservicesMetaData(dep, ejbArchiveMD); + this.buildEnterpriseBeansMetaData(dep, ejbArchiveMDBuilder); + this.buildWebservicesMetaData(dep, ejbArchiveMDBuilder); - return ejbArchiveMD; + return ejbArchiveMDBuilder.build(); } /** @@ -67,7 +67,7 @@ * @param ejbMetaData * universal EJB meta data model */ - protected abstract void buildEnterpriseBeansMetaData(Deployment dep, EJBArchiveMetaData ejbMetaData); + protected abstract void buildEnterpriseBeansMetaData(Deployment dep, EJBArchiveMetaData.Builder ejbMetaDataBuilder); /** * Builds webservices meta data. This methods sets: @@ -81,7 +81,7 @@ * @param dep webservice deployment * @param ejbArchiveMD universal EJB meta data model */ - private void buildWebservicesMetaData(final Deployment dep, final EJBArchiveMetaData ejbArchiveMD) + private void buildWebservicesMetaData(final Deployment dep, final EJBArchiveMetaData.Builder ejbArchiveMDBuilder) { final JBossWebservicesMetaData webservicesMD = WSHelper.getOptionalAttachment(dep, JBossWebservicesMetaData.class); @@ -89,23 +89,23 @@ // set context root final String contextRoot = webservicesMD.getContextRoot(); - ejbArchiveMD.setWebServiceContextRoot(contextRoot); + ejbArchiveMDBuilder.setWebServiceContextRoot(contextRoot); ROOT_LOGGER.settingContextRoot(contextRoot); // set config name final String configName = webservicesMD.getConfigName(); - ejbArchiveMD.setConfigName(configName); + ejbArchiveMDBuilder.setConfigName(configName); ROOT_LOGGER.settingConfigName(configName); // set config file final String configFile = webservicesMD.getConfigFile(); - ejbArchiveMD.setConfigFile(configFile); + ejbArchiveMDBuilder.setConfigFile(configFile); ROOT_LOGGER.settingConfigFile(configFile); // set wsdl location resolver final JBossWebserviceDescriptionMetaData[] wsDescriptionsMD = webservicesMD.getWebserviceDescriptions(); final PublishLocationAdapter resolver = new PublishLocationAdapterImpl(wsDescriptionsMD); - ejbArchiveMD.setPublishLocationAdapter(resolver); + ejbArchiveMDBuilder.setPublishLocationAdapter(resolver); } protected JBossPortComponentMetaData getPortComponent(final String ejbName, final JBossWebservicesMetaData jbossWebservicesMD) { @@ -125,37 +125,29 @@ * jboss agnostic EJBs meta data */ protected void buildEnterpriseBeanMetaData(final List<EJBMetaData> wsEjbsMD, final EJBEndpoint ejbEndpoint, final JBossWebservicesMetaData jbossWebservicesMD) { - final EJBMetaData wsEjbMD = new SLSBMetaData(); + final SLSBMetaData.Builder wsEjbMDBuilder = new SLSBMetaData.Builder(); // set EJB name and class - wsEjbMD.setEjbName(ejbEndpoint.getName()); - wsEjbMD.setEjbClass(ejbEndpoint.getClassName()); + wsEjbMDBuilder.setEjbName(ejbEndpoint.getName()); + wsEjbMDBuilder.setEjbClass(ejbEndpoint.getClassName()); final JBossPortComponentMetaData portComponentMD = getPortComponent(ejbEndpoint.getName(), jbossWebservicesMD); if (portComponentMD != null) { // set port component meta data - wsEjbMD.setPortComponentName(portComponentMD.getPortComponentName()); - wsEjbMD.setPortComponentURI(portComponentMD.getPortComponentURI()); + wsEjbMDBuilder.setPortComponentName(portComponentMD.getPortComponentName()); + wsEjbMDBuilder.setPortComponentURI(portComponentMD.getPortComponentURI()); } // set security meta data - buildSecurityMetaData(wsEjbMD, ejbEndpoint, portComponentMD); - - wsEjbsMD.add(wsEjbMD); - } - - private static void buildSecurityMetaData(final EJBMetaData wsEjbMD, final EJBEndpoint ejbEndpoint, final JBossPortComponentMetaData portComponentMD) { - final EJBSecurityMetaData smd = new EJBSecurityMetaData(); // auth method final String authMethod = getAuthMethod(ejbEndpoint, portComponentMD); - smd.setAuthMethod(authMethod); // transport guarantee final String transportGuarantee = getTransportGuarantee(ejbEndpoint, portComponentMD); - smd.setTransportGuarantee(transportGuarantee); // secure wsdl access final boolean secureWsdlAccess = isSecureWsdlAccess(ejbEndpoint, portComponentMD); - smd.setSecureWSDLAccess(secureWsdlAccess); // propagate - wsEjbMD.setSecurityMetaData(smd); + wsEjbMDBuilder.setSecurityMetaData(new EJBSecurityMetaData(authMethod, transportGuarantee, secureWsdlAccess)); + + wsEjbsMD.add(wsEjbMDBuilder.build()); } private static String getAuthMethod(final EJBEndpoint ejbEndpoint, final JBossPortComponentMetaData portComponentMD) { Modified: container/wildfly81/branches/jbossws-wildfly810/server-integration/src/main/java/org/jboss/as/webservices/metadata/AbstractMetaDataBuilderPOJO.java =================================================================== --- container/wildfly81/branches/jbossws-wildfly810/server-integration/src/main/java/org/jboss/as/webservices/metadata/AbstractMetaDataBuilderPOJO.java 2014-05-14 14:39:59 UTC (rev 18648) +++ container/wildfly81/branches/jbossws-wildfly810/server-integration/src/main/java/org/jboss/as/webservices/metadata/AbstractMetaDataBuilderPOJO.java 2014-05-14 15:28:36 UTC (rev 18649) @@ -1,6 +1,6 @@ /* * JBoss, Home of Professional Open Source. - * Copyright 2011, Red Hat Middleware LLC, and individual contributors + * Copyright 2014, Red Hat Middleware LLC, and individual contributors * as indicated by the @author tags. See the copyright.txt file in the * distribution for a full listing of individual contributors. * @@ -38,13 +38,11 @@ import org.jboss.metadata.web.spec.SecurityConstraintMetaData; import org.jboss.metadata.web.spec.ServletMappingMetaData; import org.jboss.metadata.web.spec.WebResourceCollectionMetaData; -import org.jboss.metadata.web.spec.WebResourceCollectionsMetaData; import org.jboss.ws.common.integration.WSConstants; import org.jboss.ws.common.integration.WSHelper; import org.jboss.wsf.spi.deployment.Deployment; import org.jboss.wsf.spi.metadata.j2ee.JSEArchiveMetaData; import org.jboss.wsf.spi.metadata.j2ee.JSESecurityMetaData; -import org.jboss.wsf.spi.metadata.j2ee.JSESecurityMetaData.JSEResourceCollection; import org.jboss.wsf.spi.metadata.j2ee.PublishLocationAdapter; import org.jboss.wsf.spi.metadata.webservices.JBossWebservicesMetaData; @@ -72,40 +70,40 @@ final JBossWebMetaData jbossWebMD = WSHelper.getRequiredAttachment(dep, JBossWebMetaData.class); final DeploymentUnit unit = WSHelper.getRequiredAttachment(dep, DeploymentUnit.class); final List<POJOEndpoint> pojoEndpoints = getPojoEndpoints(unit); - final JSEArchiveMetaData jseArchiveMD = new JSEArchiveMetaData(); + final JSEArchiveMetaData.Builder jseArchiveMDBuilder = new JSEArchiveMetaData.Builder(); // set context root final String contextRoot = getContextRoot(dep, jbossWebMD); - jseArchiveMD.setContextRoot(contextRoot); + jseArchiveMDBuilder.setContextRoot(contextRoot); ROOT_LOGGER.settingContextRoot(contextRoot); // set servlet url patterns mappings final Map<String, String> servletMappings = getServletUrlPatternsMappings(jbossWebMD, pojoEndpoints); - jseArchiveMD.setServletMappings(servletMappings); + jseArchiveMDBuilder.setServletMappings(servletMappings); // set servlet class names mappings final Map<String, String> servletClassNamesMappings = getServletClassMappings(jbossWebMD, pojoEndpoints); - jseArchiveMD.setServletClassNames(servletClassNamesMappings); + jseArchiveMDBuilder.setServletClassNames(servletClassNamesMappings); // set security domain final String securityDomain = jbossWebMD.getSecurityDomain(); - jseArchiveMD.setSecurityDomain(securityDomain); + jseArchiveMDBuilder.setSecurityDomain(securityDomain); // set wsdl location resolver final JBossWebservicesMetaData jbossWebservicesMD = WSHelper.getOptionalAttachment(dep, JBossWebservicesMetaData.class); if (jbossWebservicesMD != null) { final PublishLocationAdapter resolver = new PublishLocationAdapterImpl(jbossWebservicesMD.getWebserviceDescriptions()); - jseArchiveMD.setPublishLocationAdapter(resolver); + jseArchiveMDBuilder.setPublishLocationAdapter(resolver); } // set security meta data final List<JSESecurityMetaData> jseSecurityMDs = getSecurityMetaData(jbossWebMD.getSecurityConstraints()); - jseArchiveMD.setSecurityMetaData(jseSecurityMDs); + jseArchiveMDBuilder.setSecurityMetaData(jseSecurityMDs); // set config name and file - setConfigNameAndFile(jseArchiveMD, jbossWebMD, jbossWebservicesMD); + setConfigNameAndFile(jseArchiveMDBuilder, jbossWebMD, jbossWebservicesMD); - return jseArchiveMD; + return jseArchiveMDBuilder.build(); } protected abstract List<POJOEndpoint> getPojoEndpoints(final DeploymentUnit unit); @@ -116,14 +114,14 @@ * @param jseArchiveMD universal JSE meta data model * @param jbossWebMD jboss web meta data */ - private void setConfigNameAndFile(final JSEArchiveMetaData jseArchiveMD, final JBossWebMetaData jbossWebMD, final JBossWebservicesMetaData jbossWebservicesMD) { + private void setConfigNameAndFile(final JSEArchiveMetaData.Builder jseArchiveMDBuilder, final JBossWebMetaData jbossWebMD, final JBossWebservicesMetaData jbossWebservicesMD) { if (jbossWebservicesMD != null) { if (jbossWebservicesMD.getConfigName() != null) { final String configName = jbossWebservicesMD.getConfigName(); - jseArchiveMD.setConfigName(configName); + jseArchiveMDBuilder.setConfigName(configName); ROOT_LOGGER.settingConfigName(configName); final String configFile = jbossWebservicesMD.getConfigFile(); - jseArchiveMD.setConfigFile(configFile); + jseArchiveMDBuilder.setConfigFile(configFile); ROOT_LOGGER.settingConfigFile(configFile); // ensure higher priority against web.xml context parameters @@ -136,12 +134,12 @@ for (final ParamValueMetaData contextParam : contextParams) { if (WSConstants.JBOSSWS_CONFIG_NAME.equals(contextParam.getParamName())) { final String configName = contextParam.getParamValue(); - jseArchiveMD.setConfigName(configName); + jseArchiveMDBuilder.setConfigName(configName); ROOT_LOGGER.settingConfigName(configName); } if (WSConstants.JBOSSWS_CONFIG_FILE.equals(contextParam.getParamName())) { final String configFile = contextParam.getParamValue(); - jseArchiveMD.setConfigFile(configFile); + jseArchiveMDBuilder.setConfigFile(configFile); ROOT_LOGGER.settingConfigFile(configFile); } } @@ -159,15 +157,17 @@ if (securityConstraintsMD != null) { for (final SecurityConstraintMetaData securityConstraintMD : securityConstraintsMD) { - final JSESecurityMetaData jseSecurityMD = new JSESecurityMetaData(); + final JSESecurityMetaData.Builder jseSecurityMDBuilder = new JSESecurityMetaData.Builder(); // transport guarantee - jseSecurityMD.setTransportGuarantee(securityConstraintMD.getTransportGuarantee().name()); - + jseSecurityMDBuilder.setTransportGuarantee(securityConstraintMD.getTransportGuarantee().name()); + // web resources - this.setWebResources(jseSecurityMD, securityConstraintMD); + for (final WebResourceCollectionMetaData webResourceMD : securityConstraintMD.getResourceCollections()) { + jseSecurityMDBuilder.addWebResource(webResourceMD.getName(), webResourceMD.getUrlPatterns()); + } - jseSecurityMDs.add(jseSecurityMD); + jseSecurityMDs.add(jseSecurityMDBuilder.build()); } } @@ -175,24 +175,6 @@ } /** - * Sets web resources in universal meta data model. - * - * @param jseSecurityMD universal JSE security meta data model - * @param securityConstraintMD security constraint meta data - */ - private void setWebResources(final JSESecurityMetaData jseSecurityMD, final SecurityConstraintMetaData securityConstraintMD) { - final WebResourceCollectionsMetaData webResources = securityConstraintMD.getResourceCollections(); - - for (final WebResourceCollectionMetaData webResourceMD : webResources) { - final JSEResourceCollection jseResource = jseSecurityMD.addWebResource(webResourceMD.getName()); - - for (final String webResourceUrlPatterns : webResourceMD.getUrlPatterns()) { - jseResource.addPattern(webResourceUrlPatterns); - } - } - } - - /** * Returns servlet name to url pattern mappings. * * @param jbossWebMD jboss web meta data Modified: container/wildfly81/branches/jbossws-wildfly810/server-integration/src/main/java/org/jboss/as/webservices/metadata/MetaDataBuilderJAXWS_EJB.java =================================================================== --- container/wildfly81/branches/jbossws-wildfly810/server-integration/src/main/java/org/jboss/as/webservices/metadata/MetaDataBuilderJAXWS_EJB.java 2014-05-14 14:39:59 UTC (rev 18648) +++ container/wildfly81/branches/jbossws-wildfly810/server-integration/src/main/java/org/jboss/as/webservices/metadata/MetaDataBuilderJAXWS_EJB.java 2014-05-14 15:28:36 UTC (rev 18649) @@ -1,6 +1,6 @@ /* * JBoss, Home of Professional Open Source. - * Copyright 2011, Red Hat Middleware LLC, and individual contributors + * Copyright 2014, Red Hat Middleware LLC, and individual contributors * as indicated by the @author tags. See the copyright.txt file in the * distribution for a full listing of individual contributors. * @@ -42,14 +42,14 @@ final class MetaDataBuilderJAXWS_EJB extends AbstractMetaDataBuilderEJB { @Override - protected void buildEnterpriseBeansMetaData(final Deployment dep, final EJBArchiveMetaData ejbArchiveMD) { + protected void buildEnterpriseBeansMetaData(final Deployment dep, final EJBArchiveMetaData.Builder ejbArchiveMDBuilder) { if (!WSHelper.isJaxwsJseDeployment(dep)) { // [AS7-1605] support final JBossWebMetaData jbossWebMD = WSHelper.getOptionalAttachment(dep, JBossWebMetaData.class); final String contextRoot = getContextRoot(dep, jbossWebMD); if (contextRoot != null) { - final JSEArchiveMetaData jseArchiveMD = new JSEArchiveMetaData(); - jseArchiveMD.setContextRoot(contextRoot); - dep.addAttachment(JSEArchiveMetaData.class, jseArchiveMD); + final JSEArchiveMetaData.Builder jseArchiveMDBuilder = new JSEArchiveMetaData.Builder(); + jseArchiveMDBuilder.setContextRoot(contextRoot); + dep.addAttachment(JSEArchiveMetaData.class, jseArchiveMDBuilder.build()); } } @@ -61,7 +61,7 @@ buildEnterpriseBeanMetaData(wsEjbsMD, jbossEjbMD, jbossWebservicesMD); } - ejbArchiveMD.setEnterpriseBeans(wsEjbsMD); + ejbArchiveMDBuilder.setEnterpriseBeans(wsEjbsMD); } } Modified: container/wildfly81/branches/jbossws-wildfly810/server-integration/src/main/java/org/jboss/as/webservices/webserviceref/WSRefDDProcessor.java =================================================================== --- container/wildfly81/branches/jbossws-wildfly810/server-integration/src/main/java/org/jboss/as/webservices/webserviceref/WSRefDDProcessor.java 2014-05-14 14:39:59 UTC (rev 18648) +++ container/wildfly81/branches/jbossws-wildfly810/server-integration/src/main/java/org/jboss/as/webservices/webserviceref/WSRefDDProcessor.java 2014-05-14 15:28:36 UTC (rev 18649) @@ -89,8 +89,8 @@ throw MESSAGES.jaxRpcNotSupported(); } // construct service ref - final UnifiedServiceRefMetaData serviceRefUMDM = new UnifiedServiceRefMetaData(getUnifiedVirtualFile(unit)); - translate(serviceRefMD, serviceRefUMDM); + final UnifiedServiceRefMetaData serviceRefUMDM = translate(serviceRefMD); + serviceRefUMDM.setVfsRoot(getUnifiedVirtualFile(unit)); processWSFeatures(unit, serviceRefMD.getInjectionTargets(), serviceRefUMDM); final WSRefRegistry wsRefRegistry = ASHelper.getWSRefRegistry(unit); wsRefRegistry.add(getCacheKey(componentDescription, serviceRefUMDM), serviceRefUMDM); Modified: container/wildfly81/branches/jbossws-wildfly810/server-integration/src/main/java/org/jboss/as/webservices/webserviceref/WSRefUtils.java =================================================================== --- container/wildfly81/branches/jbossws-wildfly810/server-integration/src/main/java/org/jboss/as/webservices/webserviceref/WSRefUtils.java 2014-05-14 14:39:59 UTC (rev 18648) +++ container/wildfly81/branches/jbossws-wildfly810/server-integration/src/main/java/org/jboss/as/webservices/webserviceref/WSRefUtils.java 2014-05-14 15:28:36 UTC (rev 18649) @@ -1,6 +1,6 @@ /* * JBoss, Home of Professional Open Source. - * Copyright 2011, Red Hat, Inc., and individual contributors + * Copyright 2014, Red Hat, Inc., and individual contributors * as indicated by the @author tags. See the copyright.txt file in the * distribution for a full listing of individual contributors. * @@ -53,12 +53,17 @@ import org.jboss.metadata.javaee.spec.ServiceReferenceHandlerChainsMetaData; import org.jboss.metadata.javaee.spec.ServiceReferenceHandlerMetaData; import org.jboss.metadata.javaee.spec.ServiceReferenceMetaData; +import org.jboss.wsf.spi.metadata.j2ee.serviceref.AddressingMetadata; +import org.jboss.wsf.spi.metadata.j2ee.serviceref.MTOMMetadata; +import org.jboss.wsf.spi.metadata.j2ee.serviceref.RespectBindingMetadata; import org.jboss.wsf.spi.metadata.j2ee.serviceref.UnifiedHandlerChainMetaData; import org.jboss.wsf.spi.metadata.j2ee.serviceref.UnifiedHandlerChainsMetaData; import org.jboss.wsf.spi.metadata.j2ee.serviceref.UnifiedHandlerMetaData; import org.jboss.wsf.spi.metadata.j2ee.serviceref.UnifiedInitParamMetaData; import org.jboss.wsf.spi.metadata.j2ee.serviceref.UnifiedPortComponentRefMetaData; +import org.jboss.wsf.spi.metadata.j2ee.serviceref.UnifiedPortComponentRefMetaDataBuilder; import org.jboss.wsf.spi.metadata.j2ee.serviceref.UnifiedServiceRefMetaData; +import org.jboss.wsf.spi.metadata.j2ee.serviceref.UnifiedServiceRefMetaDataBuilder; import org.jboss.wsf.spi.metadata.j2ee.serviceref.UnifiedStubPropertyMetaData; import org.jboss.wsf.spi.serviceref.ServiceRefType; @@ -74,22 +79,22 @@ private WSRefUtils() { } - static UnifiedServiceRefMetaData translate(final ServiceReferenceMetaData serviceRefMD, final UnifiedServiceRefMetaData serviceRefUMDM) { - serviceRefUMDM.setServiceRefName(serviceRefMD.getName()); - serviceRefUMDM.setServiceRefType(serviceRefMD.getServiceRefType()); - serviceRefUMDM.setServiceInterface(serviceRefMD.getServiceInterface()); - serviceRefUMDM.setWsdlFile(serviceRefMD.getWsdlFile()); - serviceRefUMDM.setMappingFile(serviceRefMD.getJaxrpcMappingFile()); - serviceRefUMDM.setServiceQName(serviceRefMD.getServiceQname()); + static UnifiedServiceRefMetaData translate(final ServiceReferenceMetaData serviceRefMD) { + UnifiedServiceRefMetaDataBuilder builder = new UnifiedServiceRefMetaDataBuilder(); + builder.setServiceRefName(serviceRefMD.getName()); + builder.setServiceRefType(serviceRefMD.getServiceRefType()); + builder.setServiceInterface(serviceRefMD.getServiceInterface()); + builder.setWsdlFile(serviceRefMD.getWsdlFile()); + builder.setMappingFile(serviceRefMD.getJaxrpcMappingFile()); + builder.setServiceQName(serviceRefMD.getServiceQname()); // propagate port components final Collection<? extends PortComponentRef> portComponentsMD = serviceRefMD.getPortComponentRef(); if (portComponentsMD != null) { for (final PortComponentRef portComponentMD : portComponentsMD) { - final UnifiedPortComponentRefMetaData portComponentUMDM = getUnifiedPortComponentRefMetaData(serviceRefUMDM, - portComponentMD); + final UnifiedPortComponentRefMetaData portComponentUMDM = getUnifiedPortComponentRefMetaData(portComponentMD); if (portComponentUMDM.getServiceEndpointInterface() != null || portComponentUMDM.getPortQName() != null) { - serviceRefUMDM.addPortComponentRef(portComponentUMDM); + builder.addPortComponentRef(portComponentUMDM); } else { ROOT_LOGGER.ignoringPortComponentRef(portComponentUMDM); } @@ -101,7 +106,7 @@ if (handlersMD != null) { for (final ServiceReferenceHandlerMetaData handlerMD : handlersMD) { final UnifiedHandlerMetaData handlerUMDM = getUnifiedHandlerMetaData(handlerMD); - serviceRefUMDM.addHandler(handlerUMDM); + builder.addHandler(handlerUMDM); } } @@ -109,81 +114,73 @@ ServiceReferenceHandlerChainsMetaData handlerChainsMD = serviceRefMD.getHandlerChains(); if (handlerChainsMD != null) { final UnifiedHandlerChainsMetaData handlerChainsUMDM = getUnifiedHandlerChainsMetaData(handlerChainsMD); - serviceRefUMDM.setHandlerChains(handlerChainsUMDM); + builder.setHandlerChains(handlerChainsUMDM); } // propagate jboss specific MD if (serviceRefMD instanceof JBossServiceReferenceMetaData) { - processUnifiedJBossServiceRefMetaData(serviceRefUMDM, serviceRefMD); + final JBossServiceReferenceMetaData jbossServiceRefMD = (JBossServiceReferenceMetaData) serviceRefMD; + builder.setServiceImplClass(jbossServiceRefMD.getServiceClass()); + builder.setConfigName(jbossServiceRefMD.getConfigName()); + builder.setConfigFile(jbossServiceRefMD.getConfigFile()); + builder.setWsdlOverride(jbossServiceRefMD.getWsdlOverride()); + builder.setHandlerChain(jbossServiceRefMD.getHandlerChain()); } - serviceRefUMDM.setType(ServiceRefType.JAXWS); + builder.setType(ServiceRefType.JAXWS); - return serviceRefUMDM; + return builder.build(); } - private static void processUnifiedJBossServiceRefMetaData(final UnifiedServiceRefMetaData serviceRefUMDM, final ServiceReferenceMetaData serviceRefMD) { - final JBossServiceReferenceMetaData jbossServiceRefMD = (JBossServiceReferenceMetaData) serviceRefMD; - serviceRefUMDM.setServiceImplClass(jbossServiceRefMD.getServiceClass()); - serviceRefUMDM.setConfigName(jbossServiceRefMD.getConfigName()); - serviceRefUMDM.setConfigFile(jbossServiceRefMD.getConfigFile()); - serviceRefUMDM.setWsdlOverride(jbossServiceRefMD.getWsdlOverride()); - serviceRefUMDM.setHandlerChain(jbossServiceRefMD.getHandlerChain()); - } + private static UnifiedPortComponentRefMetaData getUnifiedPortComponentRefMetaData(final PortComponentRef portComponentMD) { + final UnifiedPortComponentRefMetaDataBuilder builder = new UnifiedPortComponentRefMetaDataBuilder(); - private static UnifiedPortComponentRefMetaData getUnifiedPortComponentRefMetaData(final UnifiedServiceRefMetaData serviceRefUMDM, final PortComponentRef portComponentMD) { - final UnifiedPortComponentRefMetaData portComponentUMDM = new UnifiedPortComponentRefMetaData(serviceRefUMDM); - // propagate service endpoint interface - portComponentUMDM.setServiceEndpointInterface(portComponentMD.getServiceEndpointInterface()); + builder.setServiceEndpointInterface(portComponentMD.getServiceEndpointInterface()); // propagate MTOM properties - portComponentUMDM.setMtomEnabled(portComponentMD.isEnableMtom()); - portComponentUMDM.setMtomThreshold(portComponentMD.getMtomThreshold()); + builder.setMtomEnabled(portComponentMD.isEnableMtom()); + builder.setMtomThreshold(portComponentMD.getMtomThreshold()); // propagate addressing properties final Addressing addressingMD = portComponentMD.getAddressing(); if (addressingMD != null) { - portComponentUMDM.setAddressingAnnotationSpecified(true); - portComponentUMDM.setAddressingEnabled(addressingMD.isEnabled()); - portComponentUMDM.setAddressingRequired(addressingMD.isRequired()); - portComponentUMDM.setAddressingResponses(addressingMD.getResponses()); + builder.setAddressingAnnotationSpecified(true); + builder.setAddressingEnabled(addressingMD.isEnabled()); + builder.setAddressingRequired(addressingMD.isRequired()); + builder.setAddressingResponses(addressingMD.getResponses()); } // propagate respect binding properties if (portComponentMD.getRespectBinding() != null) { - portComponentUMDM.setRespectBindingAnnotationSpecified(true); - portComponentUMDM.setRespectBindingEnabled(true); + builder.setRespectBindingAnnotationSpecified(true); + builder.setRespectBindingEnabled(true); } // propagate link - portComponentUMDM.setPortComponentLink(portComponentMD.getPortComponentLink()); + builder.setPortComponentLink(portComponentMD.getPortComponentLink()); // propagate jboss specific MD if (portComponentMD instanceof JBossPortComponentRef) { - processUnifiedJBossPortComponentRefMetaData(portComponentUMDM, portComponentMD); - } + final JBossPortComponentRef jbossPortComponentMD = (JBossPortComponentRef) portComponentMD; - return portComponentUMDM; - } + // propagate port QName + builder.setPortQName(jbossPortComponentMD.getPortQname()); - private static void processUnifiedJBossPortComponentRefMetaData(final UnifiedPortComponentRefMetaData portComponentUMDM, final PortComponentRef portComponentMD) { - final JBossPortComponentRef jbossPortComponentMD = (JBossPortComponentRef) portComponentMD; + // propagate configuration properties + builder.setConfigName(jbossPortComponentMD.getConfigName()); + builder.setConfigFile(jbossPortComponentMD.getConfigFile()); - // propagate port QName - portComponentUMDM.setPortQName(jbossPortComponentMD.getPortQname()); - - // propagate configuration properties - portComponentUMDM.setConfigName(jbossPortComponentMD.getConfigName()); - portComponentUMDM.setConfigFile(jbossPortComponentMD.getConfigFile()); - - // propagate stub properties - final List<StubPropertyMetaData> stubPropertiesMD = jbossPortComponentMD.getStubProperties(); - if (stubPropertiesMD != null) { - for (final StubPropertyMetaData stubPropertyMD : stubPropertiesMD) { - portComponentUMDM.addStubProperty(new UnifiedStubPropertyMetaData(stubPropertyMD.getPropName(), stubPropertyMD.getPropValue())); + // propagate stub properties + final List<StubPropertyMetaData> stubPropertiesMD = jbossPortComponentMD.getStubProperties(); + if (stubPropertiesMD != null) { + for (final StubPropertyMetaData stubPropertyMD : stubPropertiesMD) { + builder.addStubProperty(new UnifiedStubPropertyMetaData(stubPropertyMD.getPropName(), stubPropertyMD.getPropValue())); + } } } + + return builder.build(); } private static UnifiedHandlerMetaData getUnifiedHandlerMetaData(ServiceReferenceHandlerMetaData srhmd) { @@ -230,10 +227,10 @@ final javax.xml.ws.soap.Addressing addressingAnnotation = getAnnotation(anElement, javax.xml.ws.soap.Addressing.class); if (addressingAnnotation != null) { - serviceRefUMDM.setAddressingAnnotationSpecified(true); - serviceRefUMDM.setAddressingEnabled(addressingAnnotation.enabled()); - serviceRefUMDM.setAddressingRequired(addressingAnnotation.required()); - serviceRefUMDM.setAddressingResponses(addressingAnnotation.responses().toString()); + serviceRefUMDM.setAddressingMedadata(new AddressingMetadata(true, + addressingAnnotation.enabled(), + addressingAnnotation.required(), + addressingAnnotation.responses().toString())); } } @@ -241,9 +238,7 @@ final MTOM mtomAnnotation = getAnnotation(anElement, MTOM.class); if (mtomAnnotation != null) { - serviceRefUMDM.setMtomAnnotationSpecified(true); - serviceRefUMDM.setMtomEnabled(mtomAnnotation.enabled()); - serviceRefUMDM.setMtomThreshold(mtomAnnotation.threshold()); + serviceRefUMDM.setMTOMMetadata(new MTOMMetadata(true, mtomAnnotation.enabled(), mtomAnnotation.threshold())); } } @@ -251,8 +246,7 @@ final javax.xml.ws.RespectBinding respectBindingAnnotation = getAnnotation(anElement, javax.xml.ws.RespectBinding.class); if (respectBindingAnnotation != null) { - serviceRefUMDM.setRespectBindingAnnotationSpecified(true); - serviceRefUMDM.setRespectBindingEnabled(respectBindingAnnotation.enabled()); + serviceRefUMDM.setRespectBindingMetadata(new RespectBindingMetadata(true, respectBindingAnnotation.enabled())); } } Modified: container/wildfly81/branches/jbossws-wildfly810/server-integration/src/main/java/org/jboss/as/webservices/webserviceref/WebServiceReferences.java =================================================================== --- container/wildfly81/branches/jbossws-wildfly810/server-integration/src/main/java/org/jboss/as/webservices/webserviceref/WebServiceReferences.java 2014-05-14 14:39:59 UTC (rev 18648) +++ container/wildfly81/branches/jbossws-wildfly810/server-integration/src/main/java/org/jboss/as/webservices/webserviceref/WebServiceReferences.java 2014-05-14 15:28:36 UTC (rev 18649) @@ -45,8 +45,7 @@ final WSRefRegistry wsRefRegistry = ASHelper.getWSRefRegistry(unit); UnifiedServiceRefMetaData serviceRefUMDM = wsRefRegistry.get(refKey); if (serviceRefUMDM == null) { - serviceRefUMDM = new UnifiedServiceRefMetaData(getUnifiedVirtualFile(unit)); - serviceRefUMDM.setServiceRefName(bindingName); + serviceRefUMDM = new UnifiedServiceRefMetaData(getUnifiedVirtualFile(unit), bindingName); wsRefRegistry.add(refKey, serviceRefUMDM); } initServiceRef(unit, serviceRefUMDM, type, annotation);

10 years, 7 months

1
0
0 / 0

JBossWS SVN: r18648 - in container/wildfly81/branches/jbossws-wildfly810: server-integration/src/main/java/org/jboss/as/webservices/config and 15 other directories.

by jbossws-commits＠lists.jboss.org

Author: asoldano Date: 2014-05-14 10:39:59 -0400 (Wed, 14 May 2014) New Revision: 18648 Added: container/wildfly81/branches/jbossws-wildfly810/server-integration/src/main/java/org/jboss/as/webservices/config/DisabledOperationException.java container/wildfly81/branches/jbossws-wildfly810/server-integration/src/main/java/org/jboss/as/webservices/deployers/deployment/JandexAnnotationsInfo.java container/wildfly81/branches/jbossws-wildfly810/server-integration/src/main/java/org/jboss/as/webservices/dmr/ListInjector.java container/wildfly81/branches/jbossws-wildfly810/server-integration/src/main/java/org/jboss/as/webservices/dmr/WSServerConfigAttributeHandler.java container/wildfly81/branches/jbossws-wildfly810/server-integration/src/main/java/org/jboss/as/webservices/service/XTSClientIntegrationService.java container/wildfly81/branches/jbossws-wildfly810/server-integration/src/test/java/org/jboss/as/webservices/config/ container/wildfly81/branches/jbossws-wildfly810/server-integration/src/test/java/org/jboss/as/webservices/config/ServerConfigImplTestCase.java container/wildfly81/branches/jbossws-wildfly810/server-integration/src/test/resources/org/jboss/as/webservices/config/ container/wildfly81/branches/jbossws-wildfly810/server-integration/src/test/resources/org/jboss/as/webservices/config/util/ container/wildfly81/branches/jbossws-wildfly810/server-integration/src/test/resources/org/jboss/as/webservices/config/util/META-INF/ container/wildfly81/branches/jbossws-wildfly810/server-integration/src/test/resources/org/jboss/as/webservices/config/util/META-INF/services/ container/wildfly81/branches/jbossws-wildfly810/server-integration/src/test/resources/org/jboss/as/webservices/config/util/META-INF/services/org.jboss.wsf.spi.management.StackConfigFactory Modified: container/wildfly81/branches/jbossws-wildfly810/server-integration/src/main/java/org/jboss/as/webservices/WSMessages.java container/wildfly81/branches/jbossws-wildfly810/server-integration/src/main/java/org/jboss/as/webservices/config/ServerConfigImpl.java container/wildfly81/branches/jbossws-wildfly810/server-integration/src/main/java/org/jboss/as/webservices/config/WebServerInfoImpl.java container/wildfly81/branches/jbossws-wildfly810/server-integration/src/main/java/org/jboss/as/webservices/deployers/WSIntegrationProcessorJAXWS_JMS.java container/wildfly81/branches/jbossws-wildfly810/server-integration/src/main/java/org/jboss/as/webservices/deployers/WSModelDeploymentProcessor.java container/wildfly81/branches/jbossws-wildfly810/server-integration/src/main/java/org/jboss/as/webservices/deployers/WSServiceDependenciesProcessor.java container/wildfly81/branches/jbossws-wildfly810/server-integration/src/main/java/org/jboss/as/webservices/deployers/deployment/AbstractDeploymentModelBuilder.java container/wildfly81/branches/jbossws-wildfly810/server-integration/src/main/java/org/jboss/as/webservices/dmr/ClientConfigAdd.java container/wildfly81/branches/jbossws-wildfly810/server-integration/src/main/java/org/jboss/as/webservices/dmr/EndpointConfigAdd.java container/wildfly81/branches/jbossws-wildfly810/server-integration/src/main/java/org/jboss/as/webservices/dmr/HandlerAdd.java container/wildfly81/branches/jbossws-wildfly810/server-integration/src/main/java/org/jboss/as/webservices/dmr/HandlerChainAdd.java container/wildfly81/branches/jbossws-wildfly810/server-integration/src/main/java/org/jboss/as/webservices/dmr/PackageUtils.java container/wildfly81/branches/jbossws-wildfly810/server-integration/src/main/java/org/jboss/as/webservices/dmr/PropertyAdd.java container/wildfly81/branches/jbossws-wildfly810/server-integration/src/main/java/org/jboss/as/webservices/dmr/WSExtension.java container/wildfly81/branches/jbossws-wildfly810/server-integration/src/main/java/org/jboss/as/webservices/dmr/WSSubsystemAdd.java container/wildfly81/branches/jbossws-wildfly810/server-integration/src/main/java/org/jboss/as/webservices/injection/WSHandlerChainAnnotationProcessor.java container/wildfly81/branches/jbossws-wildfly810/server-integration/src/main/java/org/jboss/as/webservices/service/ConfigService.java container/wildfly81/branches/jbossws-wildfly810/server-integration/src/main/java/org/jboss/as/webservices/service/HandlerChainService.java container/wildfly81/branches/jbossws-wildfly810/server-integration/src/main/java/org/jboss/as/webservices/service/HandlerService.java container/wildfly81/branches/jbossws-wildfly810/server-integration/src/main/java/org/jboss/as/webservices/service/PropertyService.java container/wildfly81/branches/jbossws-wildfly810/server-integration/src/main/java/org/jboss/as/webservices/util/ASHelper.java container/wildfly81/branches/jbossws-wildfly810/server-integration/src/main/java/org/jboss/as/webservices/util/WSServices.java container/wildfly81/branches/jbossws-wildfly810/server-integration/src/main/java/org/jboss/as/webservices/webserviceref/WSRefUtils.java container/wildfly81/branches/jbossws-wildfly810/tests-integration/src/main/java/org/jboss/as/webservices/deployer/RemoteDeployer.java Log: [JBWS-3794] JBossWS 4.2.x -> 4.3.x Modified: container/wildfly81/branches/jbossws-wildfly810/server-integration/src/main/java/org/jboss/as/webservices/WSMessages.java =================================================================== --- container/wildfly81/branches/jbossws-wildfly810/server-integration/src/main/java/org/jboss/as/webservices/WSMessages.java 2014-05-14 14:00:52 UTC (rev 18647) +++ container/wildfly81/branches/jbossws-wildfly810/server-integration/src/main/java/org/jboss/as/webservices/WSMessages.java 2014-05-14 14:39:59 UTC (rev 18648) @@ -29,6 +29,7 @@ import org.jboss.as.controller.OperationFailedException; import org.jboss.as.server.deployment.DeploymentUnitProcessingException; import org.jboss.as.server.deployment.module.ResourceRoot; +import org.jboss.as.webservices.config.DisabledOperationException; import org.jboss.logging.Messages; import org.jboss.logging.annotations.Cause; import org.jboss.logging.annotations.Message; @@ -170,4 +171,10 @@ @Message(id = 15606, value = "Class verification of Java Web Service implementation class %s failed.") DeploymentUnitProcessingException jwsWebServiceClassVerificationFailed(Class<?> seiClass); + @Message(id = 15615, value = "Could not update WS server configuration because of pending former model update(s) requiring reload.") + DisabledOperationException couldNotUpdateServerConfigBecauseOfReloadRequired(); + + @Message(id = 15616, value = "Could not update WS server configuration because of existing WS deployment on the server.") + DisabledOperationException couldNotUpdateServerConfigBecauseOfExistingWSDeployment(); + } Added: container/wildfly81/branches/jbossws-wildfly810/server-integration/src/main/java/org/jboss/as/webservices/config/DisabledOperationException.java =================================================================== --- container/wildfly81/branches/jbossws-wildfly810/server-integration/src/main/java/org/jboss/as/webservices/config/DisabledOperationException.java (rev 0) +++ container/wildfly81/branches/jbossws-wildfly810/server-integration/src/main/java/org/jboss/as/webservices/config/DisabledOperationException.java 2014-05-14 14:39:59 UTC (rev 18648) @@ -0,0 +1,45 @@ +/* + * JBoss, Home of Professional Open Source. + * Copyright 2013, Red Hat Middleware LLC, and individual contributors + * as indicated by the @author tags. See the copyright.txt file in the + * distribution for a full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.jboss.as.webservices.config; + +/** + * Exception indicating the required operation is disabled (temporarly or pemanently) and hence coudn't be performed. + * + * @author <a href="mailto:alessio.soldano@jboss.com">Alessio Soldano</a> + */ +public final class DisabledOperationException extends RuntimeException { + + private static final long serialVersionUID = 1773053642986195568L; + + public DisabledOperationException() { + super(); + } + + public DisabledOperationException(String message) { + super(message); + } + + public DisabledOperationException(String message, Throwable cause) { + super(message, cause); + } + +} Property changes on: container/wildfly81/branches/jbossws-wildfly810/server-integration/src/main/java/org/jboss/as/webservices/config/DisabledOperationException.java ___________________________________________________________________ Added: svn:keywords + Rev Date Added: svn:eol-style + native Modified: container/wildfly81/branches/jbossws-wildfly810/server-integration/src/main/java/org/jboss/as/webservices/config/ServerConfigImpl.java =================================================================== --- container/wildfly81/branches/jbossws-wildfly810/server-integration/src/main/java/org/jboss/as/webservices/config/ServerConfigImpl.java 2014-05-14 14:00:52 UTC (rev 18647) +++ container/wildfly81/branches/jbossws-wildfly810/server-integration/src/main/java/org/jboss/as/webservices/config/ServerConfigImpl.java 2014-05-14 14:39:59 UTC (rev 18648) @@ -22,16 +22,21 @@ package org.jboss.as.webservices.config; import java.io.File; +import java.net.UnknownHostException; +import java.util.concurrent.atomic.AtomicInteger; import javax.management.MBeanServer; import org.jboss.as.server.ServerEnvironment; +import org.jboss.as.webservices.WSMessages; import org.jboss.msc.value.InjectedValue; import org.jboss.ws.common.management.AbstractServerConfig; import org.jboss.ws.common.management.AbstractServerConfigMBean; +import org.jboss.wsf.spi.metadata.config.ClientConfig; /** - * AS specific ServerConfig. + * WFLY specific ServerConfig, extending AbstractServerConfig with management + * related functionalities. * * @author <a href="mailto:asoldano@redhat.com">Alessio Soldano</a> * @author <a href="mailto:ropalka@redhat.com">Richard Opalka</a> @@ -41,11 +46,80 @@ private final InjectedValue<MBeanServer> injectedMBeanServer = new InjectedValue<MBeanServer>(); private final InjectedValue<ServerEnvironment> injectedServerEnvironment = new InjectedValue<ServerEnvironment>(); + private final AtomicInteger wsDeploymentCount = new AtomicInteger(0); + private final DMRSynchCheckHandler webServiceHostUCH = new DMRSynchCheckHandler(); + private final DMRSynchCheckHandler webServicePortUCH = new DMRSynchCheckHandler(); + private final DMRSynchCheckHandler webServiceSecurePortUCH = new DMRSynchCheckHandler(); + private final DMRSynchCheckHandler modifySOAPAddressUCH = new DMRSynchCheckHandler(); + private ServerConfigImpl() { // forbidden inheritance } + @Override + public void create() throws Exception { + super.create(); + wsDeploymentCount.set(0); + webServiceHostUCH.reset(); + webServicePortUCH.reset(); + webServiceSecurePortUCH.reset(); + modifySOAPAddressUCH.reset(); + } + + public void incrementWSDeploymentCount() { + wsDeploymentCount.incrementAndGet(); + } + + public void decrementWSDeploymentCount() { + wsDeploymentCount.decrementAndGet(); + } + + protected boolean isModifiable() { + return (wsDeploymentCount.get() == 0); + } + + public void setWebServiceHost(String host, boolean forceUpdate) throws UnknownHostException { + setWebServiceHost(host, forceUpdate ? null : webServiceHostUCH); + } + + @Override + public void setWebServiceHost(String host) throws UnknownHostException { + //prevent any change if the DMR configuration is not in synch anymore with the runtime + setWebServiceHost(host, webServiceHostUCH); + } + + public void setWebServicePort(int port, boolean forceUpdate) { + setWebServicePort(port, forceUpdate ? null : webServicePortUCH); + } + + @Override + public void setWebServicePort(int port) { + //prevent any change if the DMR configuration is not in synch anymore with the runtime + setWebServicePort(port, webServicePortUCH); + } + + public void setWebServiceSecurePort(int port, boolean forceUpdate) { + setWebServiceSecurePort(port, forceUpdate ? null : webServiceSecurePortUCH); + } + + @Override + public void setWebServiceSecurePort(int port) { + //prevent any change if the DMR configuration is not in synch anymore with the runtime + setWebServiceSecurePort(port, webServiceSecurePortUCH); + } + + public void setModifySOAPAddress(boolean flag, boolean forceUpdate) { + setModifySOAPAddress(flag, forceUpdate ? null : modifySOAPAddressUCH); + } + + @Override + public void setModifySOAPAddress(boolean flag) { + //prevent any change if the DMR configuration is not in synch anymore with the runtime + setModifySOAPAddress(flag, modifySOAPAddressUCH); + } + + public File getServerTempDir() { return getServerEnvironment().getServerTempDir(); } @@ -84,4 +158,29 @@ return new ServerConfigImpl(); } + public void setClientConfigWrapper(ClientConfig config, boolean reload) { + clientConfigStore.setWrapperConfig(config, reload); + } + + private class DMRSynchCheckHandler implements UpdateCallbackHandler { + + private volatile boolean dmrSynched = true; + + @Override + public void onBeforeUpdate() { + if (!dmrSynched) { + throw WSMessages.MESSAGES.couldNotUpdateServerConfigBecauseOfReloadRequired(); + } + //prevent any modification to the AbstractServerConfig members + //when there's at least a WS endpoint deployment on the server + if (!isModifiable()) { + dmrSynched = false; + throw WSMessages.MESSAGES.couldNotUpdateServerConfigBecauseOfExistingWSDeployment(); + } + } + + public void reset() { + dmrSynched = true; + } + } } Modified: container/wildfly81/branches/jbossws-wildfly810/server-integration/src/main/java/org/jboss/as/webservices/config/WebServerInfoImpl.java =================================================================== --- container/wildfly81/branches/jbossws-wildfly810/server-integration/src/main/java/org/jboss/as/webservices/config/WebServerInfoImpl.java 2014-05-14 14:00:52 UTC (rev 18647) +++ container/wildfly81/branches/jbossws-wildfly810/server-integration/src/main/java/org/jboss/as/webservices/config/WebServerInfoImpl.java 2014-05-14 14:39:59 UTC (rev 18648) @@ -26,7 +26,7 @@ public class WebServerInfoImpl implements WebServerInfo { - private CommonWebServer webServer; + private final CommonWebServer webServer; public WebServerInfoImpl(CommonWebServer webServer) { this.webServer = webServer; Modified: container/wildfly81/branches/jbossws-wildfly810/server-integration/src/main/java/org/jboss/as/webservices/deployers/WSIntegrationProcessorJAXWS_JMS.java =================================================================== --- container/wildfly81/branches/jbossws-wildfly810/server-integration/src/main/java/org/jboss/as/webservices/deployers/WSIntegrationProcessorJAXWS_JMS.java 2014-05-14 14:00:52 UTC (rev 18647) +++ container/wildfly81/branches/jbossws-wildfly810/server-integration/src/main/java/org/jboss/as/webservices/deployers/WSIntegrationProcessorJAXWS_JMS.java 2014-05-14 14:39:59 UTC (rev 18648) @@ -92,7 +92,7 @@ } //extract SOAP-over-JMS 1.0 bindings - final JMSEndpointsMetaData endpointsMetaData = new JMSEndpointsMetaData(); + List<JMSEndpointMetaData> list = new LinkedList<JMSEndpointMetaData>(); if (!map.isEmpty()) { for (String wsdlLocation : map.keySet()) { @@ -114,14 +114,7 @@ ClassInfo webServiceClassInfo = (ClassInfo) ai.target(); String beanClassName = webServiceClassInfo.name().toString(); //service name ? - JMSEndpointMetaData endpointMetaData = new JMSEndpointMetaData(endpointsMetaData); - endpointMetaData.setEndpointName(port); - endpointMetaData.setName(beanClassName); - endpointMetaData.setImplementor(beanClassName); - //endpointMetaData.setName(name); - endpointMetaData.setSoapAddress(soapAddress); - endpointMetaData.setWsdlLocation(wsdlLocation); - endpointsMetaData.addEndpointMetaData(endpointMetaData); + list.add(new JMSEndpointMetaData(beanClassName, port, beanClassName, wsdlLocation, soapAddress)); } } } catch (Exception ignore) { @@ -130,7 +123,7 @@ } } - unit.putAttachment(JMS_ENDPOINT_METADATA_KEY, endpointsMetaData); + unit.putAttachment(JMS_ENDPOINT_METADATA_KEY, new JMSEndpointsMetaData(list)); } @Override Modified: container/wildfly81/branches/jbossws-wildfly810/server-integration/src/main/java/org/jboss/as/webservices/deployers/WSModelDeploymentProcessor.java =================================================================== --- container/wildfly81/branches/jbossws-wildfly810/server-integration/src/main/java/org/jboss/as/webservices/deployers/WSModelDeploymentProcessor.java 2014-05-14 14:00:52 UTC (rev 18647) +++ container/wildfly81/branches/jbossws-wildfly810/server-integration/src/main/java/org/jboss/as/webservices/deployers/WSModelDeploymentProcessor.java 2014-05-14 14:39:59 UTC (rev 18648) @@ -25,7 +25,10 @@ import org.jboss.as.server.deployment.DeploymentUnit; import org.jboss.as.server.deployment.DeploymentUnitProcessingException; import org.jboss.as.server.deployment.DeploymentUnitProcessor; +import org.jboss.as.webservices.config.ServerConfigImpl; import org.jboss.as.webservices.deployers.deployment.WSDeploymentBuilder; +import org.jboss.as.webservices.util.WSAttachmentKeys; +import org.jboss.as.webservices.util.WSServices; /** * This deployer initializes JBossWS deployment meta data. @@ -39,11 +42,22 @@ public void internalDeploy(final DeploymentPhaseContext phaseContext) throws DeploymentUnitProcessingException { final DeploymentUnit unit = phaseContext.getDeploymentUnit(); WSDeploymentBuilder.getInstance().build(unit); + + if (isWebServiceDeployment(unit)) { //note, this check works only after the WSDeploymentBuilder above has run + ServerConfigImpl config = (ServerConfigImpl)phaseContext.getServiceRegistry().getRequiredService(WSServices.CONFIG_SERVICE).getValue(); + config.incrementWSDeploymentCount(); + } } @Override public void internalUndeploy(final org.jboss.as.server.deployment.DeploymentUnit context) { - // does nothing + if (isWebServiceDeployment(context)) { + ServerConfigImpl config = (ServerConfigImpl)context.getServiceRegistry().getRequiredService(WSServices.CONFIG_SERVICE).getValue(); + config.decrementWSDeploymentCount(); + } } + private static boolean isWebServiceDeployment(final DeploymentUnit unit) { + return unit.getAttachment(WSAttachmentKeys.DEPLOYMENT_KEY) != null; + } } Modified: container/wildfly81/branches/jbossws-wildfly810/server-integration/src/main/java/org/jboss/as/webservices/deployers/WSServiceDependenciesProcessor.java =================================================================== --- container/wildfly81/branches/jbossws-wildfly810/server-integration/src/main/java/org/jboss/as/webservices/deployers/WSServiceDependenciesProcessor.java 2014-05-14 14:00:52 UTC (rev 18647) +++ container/wildfly81/branches/jbossws-wildfly810/server-integration/src/main/java/org/jboss/as/webservices/deployers/WSServiceDependenciesProcessor.java 2014-05-14 14:39:59 UTC (rev 18648) @@ -29,7 +29,7 @@ import org.jboss.as.webservices.util.WSServices; /** - * A DUP that sets the service dependencies to be satisfied before installing any WS deployments + * A DUP that sets the service dependencies to be satisfied before installing any deployments * * @author <a href="mailto:alessio.soldano@jboss.com">Alessio Soldano</a> */ Modified: container/wildfly81/branches/jbossws-wildfly810/server-integration/src/main/java/org/jboss/as/webservices/deployers/deployment/AbstractDeploymentModelBuilder.java =================================================================== --- container/wildfly81/branches/jbossws-wildfly810/server-integration/src/main/java/org/jboss/as/webservices/deployers/deployment/AbstractDeploymentModelBuilder.java 2014-05-14 14:00:52 UTC (rev 18647) +++ container/wildfly81/branches/jbossws-wildfly810/server-integration/src/main/java/org/jboss/as/webservices/deployers/deployment/AbstractDeploymentModelBuilder.java 2014-05-14 14:39:59 UTC (rev 18648) @@ -44,6 +44,7 @@ import org.jboss.ws.common.ResourceLoaderAdapter; import org.jboss.wsf.spi.SPIProvider; import org.jboss.wsf.spi.SPIProviderResolver; +import org.jboss.wsf.spi.deployment.AnnotationsInfo; import org.jboss.wsf.spi.deployment.ArchiveDeployment; import org.jboss.wsf.spi.deployment.Deployment; import org.jboss.wsf.spi.deployment.DeploymentModelFactory; @@ -210,6 +211,8 @@ } dep.setRuntimeClassLoader(classLoader); dep.setType(deploymentType); + //add an AnnotationInfo attachment that uses composite jandex index + dep.addAttachment(AnnotationsInfo.class, new JandexAnnotationsInfo(unit)); return dep; } Added: container/wildfly81/branches/jbossws-wildfly810/server-integration/src/main/java/org/jboss/as/webservices/deployers/deployment/JandexAnnotationsInfo.java =================================================================== --- container/wildfly81/branches/jbossws-wildfly810/server-integration/src/main/java/org/jboss/as/webservices/deployers/deployment/JandexAnnotationsInfo.java (rev 0) +++ container/wildfly81/branches/jbossws-wildfly810/server-integration/src/main/java/org/jboss/as/webservices/deployers/deployment/JandexAnnotationsInfo.java 2014-05-14 14:39:59 UTC (rev 18648) @@ -0,0 +1,70 @@ +/* + * JBoss, Home of Professional Open Source. + * Copyright 2014, Red Hat Middleware LLC, and individual contributors + * as indicated by the @author tags. See the copyright.txt file in the + * distribution for a full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.jboss.as.webservices.deployers.deployment; + +import static org.jboss.as.server.deployment.Attachments.ANNOTATION_INDEX; + +import java.util.List; + +import org.jboss.as.server.deployment.DeploymentUnit; +import org.jboss.as.server.deployment.module.ResourceRoot; +import org.jboss.as.webservices.util.ASHelper; +import org.jboss.jandex.AnnotationInstance; +import org.jboss.jandex.DotName; +import org.jboss.jandex.Index; +import org.jboss.wsf.spi.deployment.AnnotationsInfo; + +/** + * A Jandex based implementation of org.jboss.wsf.spi.deployment.AnnotationsInfo + * + * @author <a href="mailto:alessio.soldano@jboss.com">Alessio Soldano</a> + */ +public final class JandexAnnotationsInfo implements AnnotationsInfo { + + private final List<ResourceRoot> resourceRoots; + + public JandexAnnotationsInfo(DeploymentUnit unit) { + resourceRoots = ASHelper.getResourceRoots(unit); + } + + @Override + public boolean hasAnnotatedClasses(String... annotation) { + if (annotation == null) { + throw new IllegalArgumentException(); + } + if (resourceRoots != null) { + Index index = null; + for (ResourceRoot resourceRoot : resourceRoots) { + index = resourceRoot.getAttachment(ANNOTATION_INDEX); + if (index != null) { + for (String ann : annotation) { + List<AnnotationInstance> list = index.getAnnotations(DotName.createSimple(ann)); + if (list != null && !list.isEmpty()) { + return true; + } + } + } + } + } + return false; + } +} Property changes on: container/wildfly81/branches/jbossws-wildfly810/server-integration/src/main/java/org/jboss/as/webservices/deployers/deployment/JandexAnnotationsInfo.java ___________________________________________________________________ Added: svn:keywords + Rev Date Added: svn:eol-style + native Modified: container/wildfly81/branches/jbossws-wildfly810/server-integration/src/main/java/org/jboss/as/webservices/dmr/ClientConfigAdd.java =================================================================== --- container/wildfly81/branches/jbossws-wildfly810/server-integration/src/main/java/org/jboss/as/webservices/dmr/ClientConfigAdd.java 2014-05-14 14:00:52 UTC (rev 18647) +++ container/wildfly81/branches/jbossws-wildfly810/server-integration/src/main/java/org/jboss/as/webservices/dmr/ClientConfigAdd.java 2014-05-14 14:39:59 UTC (rev 18648) @@ -32,14 +32,17 @@ import org.jboss.as.controller.PathAddress; import org.jboss.as.controller.ServiceVerificationHandler; import org.jboss.as.webservices.service.ConfigService; +import org.jboss.as.webservices.service.PropertyService; import org.jboss.as.webservices.util.ASHelper; import org.jboss.as.webservices.util.WSServices; import org.jboss.dmr.ModelNode; +import org.jboss.msc.inject.Injector; import org.jboss.msc.service.ServiceBuilder; import org.jboss.msc.service.ServiceController; import org.jboss.msc.service.ServiceName; import org.jboss.msc.service.ServiceTarget; import org.jboss.wsf.spi.management.ServerConfig; +import org.jboss.wsf.spi.metadata.j2ee.serviceref.UnifiedHandlerChainMetaData; /** * @author <a href="mailto:alessio.soldano@jboss.com">Alessio Soldano</a> @@ -77,7 +80,10 @@ final ConfigService clientConfigService = new ConfigService(serverConfig, name, true); final ServiceTarget target = context.getServiceTarget(); final ServiceBuilder<?> clientServiceBuilder = target.addService(serviceName, clientConfigService); - + setDependency(context, clientServiceBuilder, clientConfigService.getPropertiesInjector(), PropertyService.class, serviceName, address, Constants.PROPERTY); + setDependency(context, clientServiceBuilder, clientConfigService.getPreHandlerChainsInjector(), UnifiedHandlerChainMetaData.class, serviceName, address, Constants.PRE_HANDLER_CHAIN); + final Injector<UnifiedHandlerChainMetaData> postInjector = clientConfigService.getPostHandlerChainsInjector(); + setDependency(context, clientServiceBuilder, postInjector, UnifiedHandlerChainMetaData.class, serviceName, address, Constants.POST_HANDLER_CHAIN); ServiceController<?> controller = clientServiceBuilder.setInitialMode(ServiceController.Mode.ACTIVE).install(); if (newControllers != null) { newControllers.add(controller); @@ -86,4 +92,11 @@ context.reloadRequired(); } } + + private <T> void setDependency(final OperationContext context, final ServiceBuilder<?> builder, final Injector<T> injector, + final Class<T> injectedClass, final ServiceName serviceName, final PathAddress address, final String handlerChainType) { + for (ServiceName sn : PackageUtils.getServiceNameDependencies(context, serviceName, address, handlerChainType)) { + builder.addDependency(sn, injectedClass, injector); + } + } } Modified: container/wildfly81/branches/jbossws-wildfly810/server-integration/src/main/java/org/jboss/as/webservices/dmr/EndpointConfigAdd.java =================================================================== --- container/wildfly81/branches/jbossws-wildfly810/server-integration/src/main/java/org/jboss/as/webservices/dmr/EndpointConfigAdd.java 2014-05-14 14:00:52 UTC (rev 18647) +++ container/wildfly81/branches/jbossws-wildfly810/server-integration/src/main/java/org/jboss/as/webservices/dmr/EndpointConfigAdd.java 2014-05-14 14:39:59 UTC (rev 18648) @@ -35,11 +35,13 @@ import org.jboss.as.webservices.util.ASHelper; import org.jboss.as.webservices.util.WSServices; import org.jboss.dmr.ModelNode; +import org.jboss.msc.inject.Injector; import org.jboss.msc.service.ServiceBuilder; import org.jboss.msc.service.ServiceController; import org.jboss.msc.service.ServiceName; import org.jboss.msc.service.ServiceTarget; import org.jboss.wsf.spi.management.ServerConfig; +import org.jboss.wsf.spi.metadata.j2ee.serviceref.UnifiedHandlerChainMetaData; /** * @author <a href="ema(a)redhat.com">Jim Ma</a> @@ -81,6 +83,8 @@ final ServiceTarget target = context.getServiceTarget(); final ServiceBuilder<?> clientServiceBuilder = target.addService(serviceName, endpointConfigService); + setDependency(context, clientServiceBuilder, endpointConfigService.getPreHandlerChainsInjector(), serviceName, address, Constants.PRE_HANDLER_CHAIN); + setDependency(context, clientServiceBuilder, endpointConfigService.getPostHandlerChainsInjector(), serviceName, address, Constants.POST_HANDLER_CHAIN); ServiceController<?> controller = clientServiceBuilder.setInitialMode(ServiceController.Mode.ACTIVE).install(); if (newControllers != null) { newControllers.add(controller); @@ -89,4 +93,11 @@ context.reloadRequired(); } } + + private void setDependency(final OperationContext context, final ServiceBuilder<?> builder, final Injector<UnifiedHandlerChainMetaData> injector, + final ServiceName serviceName, final PathAddress address, final String handlerChainType) { + for (ServiceName sn : PackageUtils.getServiceNameDependencies(context, serviceName, address, handlerChainType)) { + builder.addDependency(sn, UnifiedHandlerChainMetaData.class, injector); + } + } } Modified: container/wildfly81/branches/jbossws-wildfly810/server-integration/src/main/java/org/jboss/as/webservices/dmr/HandlerAdd.java =================================================================== --- container/wildfly81/branches/jbossws-wildfly810/server-integration/src/main/java/org/jboss/as/webservices/dmr/HandlerAdd.java 2014-05-14 14:00:52 UTC (rev 18647) +++ container/wildfly81/branches/jbossws-wildfly810/server-integration/src/main/java/org/jboss/as/webservices/dmr/HandlerAdd.java 2014-05-14 14:39:59 UTC (rev 18648) @@ -1,6 +1,6 @@ /* * JBoss, Home of Professional Open Source. - * Copyright 2012, Red Hat, Inc., and individual contributors + * Copyright 2013, 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. * @@ -43,7 +43,6 @@ import org.jboss.msc.service.ServiceName; import org.jboss.msc.service.ServiceRegistry; import org.jboss.msc.service.ServiceTarget; -import org.jboss.wsf.spi.metadata.j2ee.serviceref.UnifiedHandlerChainMetaData; /** * @author <a href="mailto:alessio.soldano@jboss.com">Alessio Soldano</a> @@ -73,6 +72,7 @@ final PathElement confElem = address.getElement(address.size() - 3); final String configType = confElem.getKey(); final String configName = confElem.getValue(); + final String handlerChainType = address.getElement(address.size() - 2).getKey(); final String handlerChainId = address.getElement(address.size() - 2).getValue(); final String handlerName = address.getElement(address.size() - 1).getValue(); final String handlerClass = operation.require(CLASS).asString(); @@ -84,15 +84,13 @@ if (registry.getService(configServiceName) == null) { throw MESSAGES.missingConfig(configName); } - final ServiceName handlerChainServiceName = getHandlerChainServiceName(configServiceName, handlerChainId); + final ServiceName handlerChainServiceName = getHandlerChainServiceName(configServiceName, handlerChainType, handlerChainId); if (registry.getService(handlerChainServiceName) == null) { - String handlerChainType = address.getElement(address.size() - 2).getKey(); throw MESSAGES.missingHandlerChain(configName, handlerChainType, handlerChainId); } final ServiceName handlerServiceName = getHandlerServiceName(handlerChainServiceName, handlerName); final ServiceBuilder<?> handlerServiceBuilder = target.addService(handlerServiceName, service); - handlerServiceBuilder.addDependency(handlerChainServiceName, UnifiedHandlerChainMetaData.class, service.getHandlerChain()); ServiceController<?> controller = handlerServiceBuilder.setInitialMode(ServiceController.Mode.ACTIVE).install(); if (newControllers != null) { newControllers.add(controller); Modified: container/wildfly81/branches/jbossws-wildfly810/server-integration/src/main/java/org/jboss/as/webservices/dmr/HandlerChainAdd.java =================================================================== --- container/wildfly81/branches/jbossws-wildfly810/server-integration/src/main/java/org/jboss/as/webservices/dmr/HandlerChainAdd.java 2014-05-14 14:00:52 UTC (rev 18647) +++ container/wildfly81/branches/jbossws-wildfly810/server-integration/src/main/java/org/jboss/as/webservices/dmr/HandlerChainAdd.java 2014-05-14 14:39:59 UTC (rev 18648) @@ -23,6 +23,7 @@ import static org.jboss.as.controller.descriptions.ModelDescriptionConstants.OP_ADDR; import static org.jboss.as.webservices.WSMessages.MESSAGES; +import static org.jboss.as.webservices.dmr.Constants.HANDLER; import static org.jboss.as.webservices.dmr.Constants.PROTOCOL_BINDINGS; import static org.jboss.as.webservices.dmr.PackageUtils.getConfigServiceName; import static org.jboss.as.webservices.dmr.PackageUtils.getHandlerChainServiceName; @@ -37,11 +38,12 @@ import org.jboss.as.controller.ServiceVerificationHandler; import org.jboss.as.webservices.service.HandlerChainService; import org.jboss.dmr.ModelNode; +import org.jboss.msc.inject.Injector; import org.jboss.msc.service.ServiceBuilder; import org.jboss.msc.service.ServiceController; import org.jboss.msc.service.ServiceName; import org.jboss.msc.service.ServiceTarget; -import org.jboss.wsf.spi.metadata.config.AbstractCommonConfig; +import org.jboss.wsf.spi.metadata.j2ee.serviceref.UnifiedHandlerMetaData; /** * @author <a href="mailto:ropalka@redhat.com">Richard Opalka</a> @@ -80,11 +82,14 @@ throw MESSAGES.missingConfig(configName); } - final ServiceName handlerChainServiceName = getHandlerChainServiceName(configServiceName, handlerChainId); - final HandlerChainService<AbstractCommonConfig> service = new HandlerChainService<AbstractCommonConfig>(handlerChainType, handlerChainId, protocolBindings); + final ServiceName handlerChainServiceName = getHandlerChainServiceName(configServiceName, handlerChainType, handlerChainId); + final HandlerChainService service = new HandlerChainService(handlerChainType, handlerChainId, protocolBindings); final ServiceTarget target = context.getServiceTarget(); final ServiceBuilder<?> handlerChainServiceBuilder = target.addService(handlerChainServiceName, service); - handlerChainServiceBuilder.addDependency(configServiceName, AbstractCommonConfig.class, service.getAbstractCommonConfig()); + final Injector<UnifiedHandlerMetaData> injector = service.getHandlersInjector(); + for (ServiceName sn : PackageUtils.getServiceNameDependencies(context, handlerChainServiceName, address, HANDLER)) { + handlerChainServiceBuilder.addDependency(sn, UnifiedHandlerMetaData.class, injector); + } ServiceController<?> controller = handlerChainServiceBuilder.setInitialMode(ServiceController.Mode.ACTIVE).install(); if (newControllers != null) { newControllers.add(controller); Added: container/wildfly81/branches/jbossws-wildfly810/server-integration/src/main/java/org/jboss/as/webservices/dmr/ListInjector.java =================================================================== --- container/wildfly81/branches/jbossws-wildfly810/server-integration/src/main/java/org/jboss/as/webservices/dmr/ListInjector.java (rev 0) +++ container/wildfly81/branches/jbossws-wildfly810/server-integration/src/main/java/org/jboss/as/webservices/dmr/ListInjector.java 2014-05-14 14:39:59 UTC (rev 18648) @@ -0,0 +1,38 @@ +package org.jboss.as.webservices.dmr; + +import java.util.List; + +import org.jboss.msc.inject.InjectionException; +import org.jboss.msc.inject.Injector; +import org.jboss.msc.inject.RetainingInjector; +import org.jboss.msc.value.Value; + +public final class ListInjector<T> extends RetainingInjector<T> implements Injector<T> { + private final List<T> list; + + public ListInjector(final List<T> list) { + this.list = list; + } + + /** {@inheritDoc} */ + public void inject(final T value) throws InjectionException { + synchronized (list) { + if (value != null) { + list.add(value); + } + super.inject(value); + } + } + + /** {@inheritDoc} */ + public void uninject() { + synchronized (list) { + try { + final Value<T> storedValue = getStoredValue(); + if (storedValue != null) list.remove(storedValue.getValue()); + } finally { + super.uninject(); + } + } + } +} \ No newline at end of file Property changes on: container/wildfly81/branches/jbossws-wildfly810/server-integration/src/main/java/org/jboss/as/webservices/dmr/ListInjector.java ___________________________________________________________________ Added: svn:keywords + Rev Date Added: svn:eol-style + native Modified: container/wildfly81/branches/jbossws-wildfly810/server-integration/src/main/java/org/jboss/as/webservices/dmr/PackageUtils.java =================================================================== --- container/wildfly81/branches/jbossws-wildfly810/server-integration/src/main/java/org/jboss/as/webservices/dmr/PackageUtils.java 2014-05-14 14:00:52 UTC (rev 18647) +++ container/wildfly81/branches/jbossws-wildfly810/server-integration/src/main/java/org/jboss/as/webservices/dmr/PackageUtils.java 2014-05-14 14:39:59 UTC (rev 18648) @@ -24,9 +24,15 @@ import static org.jboss.as.webservices.dmr.Constants.ENDPOINT_CONFIG; import static org.jboss.as.webservices.dmr.Constants.HANDLER; -import static org.jboss.as.webservices.dmr.Constants.HANDLER_CHAIN; import static org.jboss.as.webservices.dmr.Constants.PROPERTY; +import java.util.LinkedList; +import java.util.List; + +import org.jboss.as.controller.OperationContext; +import org.jboss.as.controller.PathAddress; +import org.jboss.as.controller.registry.Resource; +import org.jboss.as.controller.registry.Resource.ResourceEntry; import org.jboss.as.webservices.util.WSServices; import org.jboss.msc.service.ServiceName; @@ -52,14 +58,10 @@ return (ENDPOINT_CONFIG.equals(configType) ? getEndpointConfigServiceName(configName) : getClientConfigServiceName(configName)); } - static ServiceName getHandlerChainServiceName(final String configType, final String configName, final String handlerChainId) { - return getHandlerChainServiceName(getConfigServiceName(configType, configName), handlerChainId); + static ServiceName getHandlerChainServiceName(final ServiceName configServiceName, final String handlerChainType, final String handlerChainId) { + return configServiceName.append(handlerChainType).append(handlerChainId); } - static ServiceName getHandlerChainServiceName(final ServiceName configServiceName, final String handlerChainId) { - return configServiceName.append(HANDLER_CHAIN).append(handlerChainId); - } - static ServiceName getHandlerServiceName(final ServiceName handlerChainServiceName, final String handlerName) { return handlerChainServiceName.append(HANDLER).append(handlerName); } @@ -68,4 +70,13 @@ return configServiceName.append(PROPERTY).append(propertyName); } + static List<ServiceName> getServiceNameDependencies(final OperationContext context, final ServiceName baseServiceName, final PathAddress address, final String childType) { + final List<ServiceName> childrenServiceNames = new LinkedList<ServiceName>(); + final Resource resource = context.readResourceFromRoot(address); + final ServiceName sn = baseServiceName.append(childType); + for (ResourceEntry re : resource.getChildren(childType)) { + childrenServiceNames.add(sn.append(re.getName())); + } + return childrenServiceNames; + } } \ No newline at end of file Modified: container/wildfly81/branches/jbossws-wildfly810/server-integration/src/main/java/org/jboss/as/webservices/dmr/PropertyAdd.java =================================================================== --- container/wildfly81/branches/jbossws-wildfly810/server-integration/src/main/java/org/jboss/as/webservices/dmr/PropertyAdd.java 2014-05-14 14:00:52 UTC (rev 18647) +++ container/wildfly81/branches/jbossws-wildfly810/server-integration/src/main/java/org/jboss/as/webservices/dmr/PropertyAdd.java 2014-05-14 14:39:59 UTC (rev 18648) @@ -41,7 +41,6 @@ import org.jboss.msc.service.ServiceController; import org.jboss.msc.service.ServiceName; import org.jboss.msc.service.ServiceTarget; -import org.jboss.wsf.spi.metadata.config.AbstractCommonConfig; /** * @author <a href="mailto:alessio.soldano@jboss.com">Alessio Soldano</a> @@ -74,7 +73,7 @@ final String configName = confElem.getValue(); final String propertyValue = operation.has(VALUE) ? Attributes.VALUE.resolveModelAttribute(context,operation).asString() : null; - final PropertyService<AbstractCommonConfig> service = new PropertyService<AbstractCommonConfig>(propertyName, propertyValue); + final PropertyService service = new PropertyService(propertyName, propertyValue); final ServiceTarget target = context.getServiceTarget(); final ServiceName configServiceName = getConfigServiceName(configType, configName); if (context.getServiceRegistry(false).getService(configServiceName) == null) { @@ -83,7 +82,6 @@ final ServiceName propertyServiceName = getPropertyServiceName(configServiceName, propertyName); final ServiceBuilder<?> propertyServiceBuilder = target.addService(propertyServiceName, service); - propertyServiceBuilder.addDependency(configServiceName, AbstractCommonConfig.class, service.getAbstractCommonConfig()); ServiceController<?> controller = propertyServiceBuilder.setInitialMode(ServiceController.Mode.ACTIVE).install(); if (newControllers != null) { newControllers.add(controller); Modified: container/wildfly81/branches/jbossws-wildfly810/server-integration/src/main/java/org/jboss/as/webservices/dmr/WSExtension.java =================================================================== --- container/wildfly81/branches/jbossws-wildfly810/server-integration/src/main/java/org/jboss/as/webservices/dmr/WSExtension.java 2014-05-14 14:00:52 UTC (rev 18647) +++ container/wildfly81/branches/jbossws-wildfly810/server-integration/src/main/java/org/jboss/as/webservices/dmr/WSExtension.java 2014-05-14 14:39:59 UTC (rev 18648) @@ -29,11 +29,6 @@ import static org.jboss.as.webservices.dmr.Constants.POST_HANDLER_CHAIN; import static org.jboss.as.webservices.dmr.Constants.PRE_HANDLER_CHAIN; import static org.jboss.as.webservices.dmr.Constants.PROPERTY; -import static org.jboss.as.webservices.dmr.Constants.ENDPOINT_WSDL; -import static org.jboss.as.webservices.dmr.Constants.ENDPOINT_CLASS; -import static org.jboss.as.webservices.dmr.Constants.ENDPOINT_CONTEXT; -import static org.jboss.as.webservices.dmr.Constants.ENDPOINT_TYPE; -import static org.jboss.as.webservices.dmr.Constants.ENDPOINT_NAME; import org.jboss.as.controller.Extension; import org.jboss.as.controller.AttributeDefinition; @@ -158,10 +153,10 @@ .build(); ResourceDefinition subsystemResource = ResourceBuilder.Factory.createSubsystemRoot(SUBSYSTEM_PATH, getResourceDescriptionResolver(), WSSubsystemAdd.INSTANCE, WSSubsystemRemove.INSTANCE) - .addReadWriteAttribute(Attributes.WSDL_HOST, null, new ReloadRequiredWriteAttributeHandler(Attributes.WSDL_HOST)) - .addReadWriteAttribute(Attributes.WSDL_PORT, null, new ReloadRequiredWriteAttributeHandler(Attributes.WSDL_PORT)) - .addReadWriteAttribute(Attributes.WSDL_SECURE_PORT, null, new ReloadRequiredWriteAttributeHandler(Attributes.WSDL_SECURE_PORT)) - .addReadWriteAttribute(Attributes.MODIFY_WSDL_ADDRESS, null, new ReloadRequiredWriteAttributeHandler(Attributes.MODIFY_WSDL_ADDRESS)) + .addReadWriteAttribute(Attributes.WSDL_HOST, null, new WSServerConfigAttributeHandler(Attributes.WSDL_HOST)) + .addReadWriteAttribute(Attributes.WSDL_PORT, null, new WSServerConfigAttributeHandler(Attributes.WSDL_PORT)) + .addReadWriteAttribute(Attributes.WSDL_SECURE_PORT, null, new WSServerConfigAttributeHandler(Attributes.WSDL_SECURE_PORT)) + .addReadWriteAttribute(Attributes.MODIFY_WSDL_ADDRESS, null, new WSServerConfigAttributeHandler(Attributes.MODIFY_WSDL_ADDRESS)) .build(); ManagementResourceRegistration subsystemRegistration = subsystem.registerSubsystemModel(subsystemResource); subsystemRegistration.registerSubModel(epConfigsDef); Added: container/wildfly81/branches/jbossws-wildfly810/server-integration/src/main/java/org/jboss/as/webservices/dmr/WSServerConfigAttributeHandler.java =================================================================== --- container/wildfly81/branches/jbossws-wildfly810/server-integration/src/main/java/org/jboss/as/webservices/dmr/WSServerConfigAttributeHandler.java (rev 0) +++ container/wildfly81/branches/jbossws-wildfly810/server-integration/src/main/java/org/jboss/as/webservices/dmr/WSServerConfigAttributeHandler.java 2014-05-14 14:39:59 UTC (rev 18648) @@ -0,0 +1,135 @@ +/* + * JBoss, Home of Professional Open Source. + * Copyright 2013, 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. + */ +package org.jboss.as.webservices.dmr; + +import static org.jboss.as.webservices.dmr.Constants.MODIFY_WSDL_ADDRESS; +import static org.jboss.as.webservices.dmr.Constants.WSDL_HOST; +import static org.jboss.as.webservices.dmr.Constants.WSDL_PORT; +import static org.jboss.as.webservices.dmr.Constants.WSDL_SECURE_PORT; + +import java.net.UnknownHostException; + +import org.jboss.as.controller.AbstractWriteAttributeHandler; +import org.jboss.as.controller.AttributeDefinition; +import org.jboss.as.controller.OperationContext; +import org.jboss.as.controller.OperationFailedException; +import org.jboss.as.webservices.config.DisabledOperationException; +import org.jboss.as.webservices.config.ServerConfigImpl; +import org.jboss.as.webservices.util.WSServices; +import org.jboss.dmr.ModelNode; + +/** + * An AbstractWriteAttributeHandler extension for updating basic WS server config attributes + * + * @author <a href="mailto:alessio.soldano@jboss.com">Alessio Soldano</a> + */ +final class WSServerConfigAttributeHandler extends AbstractWriteAttributeHandler<WSServerConfigAttributeHandler.RollbackInfo> { + + public WSServerConfigAttributeHandler(final AttributeDefinition... definitions) { + super(definitions); + } + + @Override + protected boolean applyUpdateToRuntime(OperationContext context, ModelNode operation, String attributeName, + ModelNode resolvedValue, ModelNode currentValue, HandbackHolder<WSServerConfigAttributeHandler.RollbackInfo> handbackHolder) + throws OperationFailedException { + + //if the server is booting or the required value is the current one, + //we do not need to do anything and reload is not required + if (resolvedValue.equals(currentValue) || context.isBooting()) { + return false; + } + + final String value = resolvedValue.isDefined() ? resolvedValue.asString() : null; + boolean done = updateServerConfig(context, attributeName, value, false); + handbackHolder.setHandback(new RollbackInfo(done)); + return !done; //reload required if runtime has not been updated + } + + @Override + protected void revertUpdateToRuntime(OperationContext context, ModelNode operation, String attributeName, + ModelNode valueToRestore, ModelNode valueToRevert, WSServerConfigAttributeHandler.RollbackInfo handback) throws OperationFailedException { + if (handback != null && handback.isRuntimeUpdated()) { //nothing to do if the runtime was not updated + final String value = valueToRestore.isDefined() ? valueToRestore.asString() : null; + try { + updateServerConfig(context, attributeName, value, true); + } catch (DisabledOperationException e) { //revert rejected by WS stack + throw new OperationFailedException(e); + } + } + } + + /** + * Returns true if the update operation succeeds in modifying the runtime, false otherwise. + * + * @param context + * @param attributeName + * @param value + * @return + * @throws OperationFailedException + * @throws DisabledOperationException + */ + private boolean updateServerConfig(OperationContext context, String attributeName, String value, boolean isRevert) throws OperationFailedException, DisabledOperationException { + ServerConfigImpl config = (ServerConfigImpl)context.getServiceRegistry(false).getRequiredService(WSServices.CONFIG_SERVICE).getValue(); + try { + if (MODIFY_WSDL_ADDRESS.equals(attributeName)) { + final boolean modifyWSDLAddress = value != null && Boolean.parseBoolean(value); + config.setModifySOAPAddress(modifyWSDLAddress, isRevert); + } else if (WSDL_HOST.equals(attributeName)) { + final String host = value != null ? value : null; + try { + config.setWebServiceHost(host, isRevert); + } catch (final UnknownHostException e) { + throw new OperationFailedException(e.getMessage(), e); + } + } else if (WSDL_PORT.equals(attributeName)) { + final int port = value != null ? Integer.parseInt(value) : -1; + config.setWebServicePort(port, isRevert); + } else if (WSDL_SECURE_PORT.equals(attributeName)) { + final int securePort = value != null ? Integer.parseInt(value) : -1; + config.setWebServiceSecurePort(securePort, isRevert); + } else { + throw new IllegalArgumentException(attributeName); + } + } catch (DisabledOperationException doe) { + // the WS stack rejected the runtime update + if (!isRevert) { + return false; + } else { + throw doe; + } + } + return true; + } + + static class RollbackInfo { + private final boolean runtimeUpdated; + + public RollbackInfo(boolean runtimeUpdated) { + this.runtimeUpdated = runtimeUpdated; + } + + public boolean isRuntimeUpdated() { + return this.runtimeUpdated; + } + } +} Property changes on: container/wildfly81/branches/jbossws-wildfly810/server-integration/src/main/java/org/jboss/as/webservices/dmr/WSServerConfigAttributeHandler.java ___________________________________________________________________ Added: svn:keywords + Rev Date Added: svn:eol-style + native Modified: container/wildfly81/branches/jbossws-wildfly810/server-integration/src/main/java/org/jboss/as/webservices/dmr/WSSubsystemAdd.java =================================================================== --- container/wildfly81/branches/jbossws-wildfly810/server-integration/src/main/java/org/jboss/as/webservices/dmr/WSSubsystemAdd.java 2014-05-14 14:00:52 UTC (rev 18647) +++ container/wildfly81/branches/jbossws-wildfly810/server-integration/src/main/java/org/jboss/as/webservices/dmr/WSSubsystemAdd.java 2014-05-14 14:39:59 UTC (rev 18648) @@ -47,6 +47,7 @@ import org.jboss.as.web.host.CommonWebServer; import org.jboss.as.webservices.config.ServerConfigImpl; import org.jboss.as.webservices.service.ServerConfigService; +import org.jboss.as.webservices.service.XTSClientIntegrationService; import org.jboss.as.webservices.util.ModuleClassLoaderProvider; import org.jboss.dmr.ModelNode; import org.jboss.msc.service.ServiceController; @@ -91,6 +92,7 @@ ServerConfigImpl serverConfig = createServerConfig(model, false, context); newControllers.add(ServerConfigService.install(serviceTarget, serverConfig, verificationHandler, getServerConfigDependencies(context, appclient), jmxAvailable)); } + newControllers.add(XTSClientIntegrationService.install(serviceTarget, verificationHandler)); } private static ServerConfigImpl createServerConfig(ModelNode configuration, boolean appclient, OperationContext context) throws OperationFailedException { @@ -133,24 +135,9 @@ ServiceName configServiceName = Constants.CLIENT_CONFIG.equals(configType) ? PackageUtils .getClientConfigServiceName(re.getName()) : PackageUtils.getEndpointConfigServiceName(re.getName()); serviceNames.add(configServiceName); - readHandlerChainServiceNames(serviceNames, re, Constants.PRE_HANDLER_CHAIN, configServiceName); - readHandlerChainServiceNames(serviceNames, re, Constants.POST_HANDLER_CHAIN, configServiceName); - for (String propertyName : re.getChildrenNames(Constants.PROPERTY)) { - serviceNames.add(PackageUtils.getPropertyServiceName(configServiceName, propertyName)); - } } } - private static void readHandlerChainServiceNames(List<ServiceName> serviceNames, Resource configResource, String chainType, ServiceName configServiceName) { - for (ResourceEntry re : configResource.getChildren(chainType)) { - ServiceName handlerChainServiceName = PackageUtils.getHandlerChainServiceName(configServiceName, re.getName()); - serviceNames.add(handlerChainServiceName); - for (String handlerName : re.getChildrenNames(Constants.HANDLER)) { - serviceNames.add(PackageUtils.getHandlerServiceName(handlerChainServiceName, handlerName)); - } - } - } - private static boolean isJMXSubsystemAvailable(final OperationContext context) { Resource root = context.readResourceFromRoot(PathAddress.pathAddress(PathAddress.EMPTY_ADDRESS), false); return root.hasChild(PathElement.pathElement(SUBSYSTEM, JMXExtension.SUBSYSTEM_NAME)); Modified: container/wildfly81/branches/jbossws-wildfly810/server-integration/src/main/java/org/jboss/as/webservices/injection/WSHandlerChainAnnotationProcessor.java =================================================================== --- container/wildfly81/branches/jbossws-wildfly810/server-integration/src/main/java/org/jboss/as/webservices/injection/WSHandlerChainAnnotationProcessor.java 2014-05-14 14:00:52 UTC (rev 18647) +++ container/wildfly81/branches/jbossws-wildfly810/server-integration/src/main/java/org/jboss/as/webservices/injection/WSHandlerChainAnnotationProcessor.java 2014-05-14 14:39:59 UTC (rev 18648) @@ -23,8 +23,6 @@ package org.jboss.as.webservices.injection; import static org.jboss.as.server.deployment.Attachments.ANNOTATION_INDEX; -import static org.jboss.as.server.deployment.Attachments.DEPLOYMENT_ROOT; -import static org.jboss.as.server.deployment.Attachments.RESOURCE_ROOTS; import static org.jboss.as.webservices.WSMessages.MESSAGES; import static org.jboss.as.webservices.util.ASHelper.isJaxwsService; import static org.jboss.as.webservices.util.DotNames.HANDLER_CHAIN_ANNOTATION; @@ -44,14 +42,13 @@ import org.jboss.as.ee.structure.DeploymentType; import org.jboss.as.ee.structure.DeploymentTypeMarker; -import org.jboss.as.server.deployment.AttachmentList; import org.jboss.as.server.deployment.DeploymentPhaseContext; import org.jboss.as.server.deployment.DeploymentUnit; import org.jboss.as.server.deployment.DeploymentUnitProcessingException; import org.jboss.as.server.deployment.DeploymentUnitProcessor; -import org.jboss.as.server.deployment.EjbDeploymentMarker; import org.jboss.as.server.deployment.module.ResourceRoot; import org.jboss.as.webservices.WSLogger; +import org.jboss.as.webservices.util.ASHelper; import org.jboss.jandex.AnnotationInstance; import org.jboss.jandex.AnnotationTarget; import org.jboss.jandex.ClassInfo; @@ -73,14 +70,7 @@ if (DeploymentTypeMarker.isType(DeploymentType.EAR, unit)) { return; } - // wars define resource roots - AttachmentList<ResourceRoot> resourceRoots = unit.getAttachment(RESOURCE_ROOTS); - if (!unit.getName().endsWith(".war") && EjbDeploymentMarker.isEjbDeployment(unit)) { - // ejb archives don't define resource roots, using root resource - resourceRoots = new AttachmentList<ResourceRoot>(ResourceRoot.class); - final ResourceRoot root = unit.getAttachment(DEPLOYMENT_ROOT); - resourceRoots.add(root); - } + List<ResourceRoot> resourceRoots = ASHelper.getResourceRoots(unit); if (resourceRoots == null) { return; } Modified: container/wildfly81/branches/jbossws-wildfly810/server-integration/src/main/java/org/jboss/as/webservices/service/ConfigService.java =================================================================== --- container/wildfly81/branches/jbossws-wildfly810/server-integration/src/main/java/org/jboss/as/webservices/service/ConfigService.java 2014-05-14 14:00:52 UTC (rev 18647) +++ container/wildfly81/branches/jbossws-wildfly810/server-integration/src/main/java/org/jboss/as/webservices/service/ConfigService.java 2014-05-14 14:39:59 UTC (rev 18648) @@ -21,6 +21,13 @@ */ package org.jboss.as.webservices.service; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +import org.jboss.as.webservices.dmr.ListInjector; +import org.jboss.msc.inject.Injector; import org.jboss.msc.service.Service; import org.jboss.msc.service.StartContext; import org.jboss.msc.service.StartException; @@ -29,6 +36,7 @@ import org.jboss.wsf.spi.metadata.config.AbstractCommonConfig; import org.jboss.wsf.spi.metadata.config.ClientConfig; import org.jboss.wsf.spi.metadata.config.EndpointConfig; +import org.jboss.wsf.spi.metadata.j2ee.serviceref.UnifiedHandlerChainMetaData; /** * A service for setting a ws client / endpoint config. @@ -41,6 +49,9 @@ private final ServerConfig serverConfig; private final String configName; private final boolean client; + private final List<UnifiedHandlerChainMetaData> preHandlerChains = new ArrayList<UnifiedHandlerChainMetaData>(1); + private final List<UnifiedHandlerChainMetaData> postHandlerChains = new ArrayList<UnifiedHandlerChainMetaData>(1); + private final List<PropertyService> properties = new ArrayList<PropertyService>(1); private volatile AbstractCommonConfig config; public ConfigService(ServerConfig serverConfig, String configName, boolean client) { @@ -56,15 +67,20 @@ @Override public void start(final StartContext context) throws StartException { + Map<String, String> props = null; + if (!properties.isEmpty()) { + props = new HashMap<String, String>(properties.size(), 1); + for (PropertyService ps : properties) { + props.put(ps.getPropName(), ps.getPropValue()); + } + } if (client) { - ClientConfig clientConfig = new ClientConfig(); - clientConfig.setConfigName(configName); - serverConfig.addClientConfig(clientConfig); + ClientConfig clientConfig = new ClientConfig(configName, preHandlerChains, postHandlerChains, props, null); + serverConfig.registerClientConfig(clientConfig); config = clientConfig; } else { - EndpointConfig endpointConfig = new EndpointConfig(); - endpointConfig.setConfigName(configName); - serverConfig.addEndpointConfig(endpointConfig); + EndpointConfig endpointConfig = new EndpointConfig(configName, preHandlerChains, postHandlerChains, props, null); + serverConfig.registerEndpointConfig(endpointConfig); config = endpointConfig; } } @@ -72,9 +88,22 @@ @Override public void stop(final StopContext context) { if (client) { - serverConfig.getClientConfigs().remove(config); + serverConfig.unregisterClientConfig((ClientConfig)config); } else { - serverConfig.getEndpointConfigs().remove(config); + serverConfig.unregisterEndpointConfig((EndpointConfig)config); } } + + public Injector<UnifiedHandlerChainMetaData> getPreHandlerChainsInjector() { + return new ListInjector<UnifiedHandlerChainMetaData>(preHandlerChains); + } + + public Injector<UnifiedHandlerChainMetaData> getPostHandlerChainsInjector() { + return new ListInjector<UnifiedHandlerChainMetaData>(postHandlerChains); + } + + public Injector<PropertyService> getPropertiesInjector() { + return new ListInjector<PropertyService>(properties); + } + } Modified: container/wildfly81/branches/jbossws-wildfly810/server-integration/src/main/java/org/jboss/as/webservices/service/HandlerChainService.java =================================================================== --- container/wildfly81/branches/jbossws-wildfly810/server-integration/src/main/java/org/jboss/as/webservices/service/HandlerChainService.java 2014-05-14 14:00:52 UTC (rev 18647) +++ container/wildfly81/branches/jbossws-wildfly810/server-integration/src/main/java/org/jboss/as/webservices/service/HandlerChainService.java 2014-05-14 14:39:59 UTC (rev 18648) @@ -23,32 +23,35 @@ import static org.jboss.as.webservices.WSMessages.MESSAGES; +import java.util.ArrayList; import java.util.List; -import java.util.concurrent.CopyOnWriteArrayList; +import org.jboss.as.webservices.dmr.ListInjector; +import org.jboss.msc.inject.Injector; import org.jboss.msc.service.Service; import org.jboss.msc.service.StartContext; import org.jboss.msc.service.StartException; import org.jboss.msc.service.StopContext; -import org.jboss.msc.value.InjectedValue; -import org.jboss.wsf.spi.metadata.config.AbstractCommonConfig; import org.jboss.wsf.spi.metadata.j2ee.serviceref.UnifiedHandlerChainMetaData; +import org.jboss.wsf.spi.metadata.j2ee.serviceref.UnifiedHandlerMetaData; /** - * A service for setting a handler chain into an endpoint / client config. + * A service for creating handler chain metadata. * * @author <a href="mailto:alessio.soldano@jboss.com">Alessio Soldano</a> */ -public final class HandlerChainService<T extends AbstractCommonConfig> implements Service<UnifiedHandlerChainMetaData> { +public final class HandlerChainService implements Service<UnifiedHandlerChainMetaData> { - private InjectedValue<T> abstractCommonConfig = new InjectedValue<T>(); - private final String handlerChainType; + private final List<UnifiedHandlerMetaData> handlers = new ArrayList<UnifiedHandlerMetaData>(2); private final String handlerChainId; private final String protocolBindings; private volatile UnifiedHandlerChainMetaData handlerChain; public HandlerChainService(String handlerChainType, String handlerChainId, String protocolBindings) { - this.handlerChainType = handlerChainType; + if (!handlerChainType.equalsIgnoreCase("pre-handler-chain") && !handlerChainType.equals("post-handler-chain")) { + throw new RuntimeException( + MESSAGES.wrongHandlerChainType(handlerChainType, "pre-handler-chain", "post-handler-chain")); + } this.handlerChainId = handlerChainId; this.protocolBindings = protocolBindings; } @@ -60,63 +63,15 @@ @Override public void start(final StartContext context) throws StartException { - final AbstractCommonConfig commonConfig = abstractCommonConfig.getValue(); - List<UnifiedHandlerChainMetaData> handlerChains; - if ("pre-handler-chain".equals(handlerChainType)) { - synchronized (commonConfig) { //JBWS-3707 - handlerChains = commonConfig.getPreHandlerChains(); - if (handlerChains == null) { - handlerChains = new CopyOnWriteArrayList<UnifiedHandlerChainMetaData>(); - commonConfig.setPreHandlerChains(handlerChains); - } - } - } else if ("post-handler-chain".equals(handlerChainType)) { - synchronized (commonConfig) { //JBWS-3707 - handlerChains = commonConfig.getPostHandlerChains(); - if (handlerChains == null) { - handlerChains = new CopyOnWriteArrayList<UnifiedHandlerChainMetaData>(); - commonConfig.setPostHandlerChains(handlerChains); - } - } - } else { - throw new StartException( - MESSAGES.wrongHandlerChainType(handlerChainType, "pre-handler-chain", "post-handler-chain")); - } - handlerChain = getChain(handlerChains, handlerChainId); - if (handlerChain != null) { - throw new StartException(MESSAGES.multipleHandlerChainsWithSameId(handlerChainType, handlerChainId, - commonConfig.getConfigName())); - } - handlerChain = new UnifiedHandlerChainMetaData(); - handlerChain.setId(handlerChainId); - handlerChain.setProtocolBindings(protocolBindings); - handlerChains.add(handlerChain); + handlerChain = new UnifiedHandlerChainMetaData(null, null, protocolBindings, handlers, false, handlerChainId); } - private static UnifiedHandlerChainMetaData getChain(final List<UnifiedHandlerChainMetaData> handlerChains, - final String handlerChainId) { - for (final UnifiedHandlerChainMetaData handlerChain : handlerChains) { - if (handlerChainId.equals(handlerChain.getId())) { - return handlerChain; - } - } - return null; - } - @Override public void stop(final StopContext context) { - final AbstractCommonConfig commonConfig = abstractCommonConfig.getValue(); - - final List<UnifiedHandlerChainMetaData> handlerChains; - if ("pre-handler-chain".equals(handlerChainType)) { - handlerChains = commonConfig.getPreHandlerChains(); - } else { - handlerChains = commonConfig.getPostHandlerChains(); - } - handlerChains.remove(handlerChain); + handlerChain = null; } - public InjectedValue<T> getAbstractCommonConfig() { - return abstractCommonConfig; + public Injector<UnifiedHandlerMetaData> getHandlersInjector() { + return new ListInjector<UnifiedHandlerMetaData>(handlers); } } Modified: container/wildfly81/branches/jbossws-wildfly810/server-integration/src/main/java/org/jboss/as/webservices/service/HandlerService.java =================================================================== --- container/wildfly81/branches/jbossws-wildfly810/server-integration/src/main/java/org/jboss/as/webservices/service/HandlerService.java 2014-05-14 14:00:52 UTC (rev 18647) +++ container/wildfly81/branches/jbossws-wildfly810/server-integration/src/main/java/org/jboss/as/webservices/service/HandlerService.java 2014-05-14 14:39:59 UTC (rev 18648) @@ -25,18 +25,15 @@ import org.jboss.msc.service.StartContext; import org.jboss.msc.service.StartException; import org.jboss.msc.service.StopContext; -import org.jboss.msc.value.InjectedValue; -import org.jboss.wsf.spi.metadata.j2ee.serviceref.UnifiedHandlerChainMetaData; import org.jboss.wsf.spi.metadata.j2ee.serviceref.UnifiedHandlerMetaData; /** - * A service for setting a handler into the handler-chain of an endpoint / client config. + * A service for creating handler metadata. * * @author <a href="mailto:alessio.soldano@jboss.com">Alessio Soldano</a> */ public final class HandlerService implements Service<UnifiedHandlerMetaData> { - private InjectedValue<UnifiedHandlerChainMetaData> handlerChain = new InjectedValue<UnifiedHandlerChainMetaData>(); private final String handlerName; private final String handlerClass; private volatile UnifiedHandlerMetaData handler; @@ -53,24 +50,11 @@ @Override public void start(final StartContext context) throws StartException { - final UnifiedHandlerMetaData handler = new UnifiedHandlerMetaData(); - handler.setHandlerName(handlerName); - handler.setHandlerClass(handlerClass); - final UnifiedHandlerChainMetaData chain = handlerChain.getValue(); - synchronized (chain) { //JBWS-3707 - chain.addHandler(handler); - } + handler = new UnifiedHandlerMetaData(handlerClass, handlerName, null, null, null, null); } @Override public void stop(final StopContext context) { - final UnifiedHandlerChainMetaData chain = handlerChain.getValue(); - synchronized (chain) { //JBWS-3707 - chain.getHandlers().remove(handler); - } + handler = null; } - - public InjectedValue<UnifiedHandlerChainMetaData> getHandlerChain() { - return handlerChain; - } } Modified: container/wildfly81/branches/jbossws-wildfly810/server-integration/src/main/java/org/jboss/as/webservices/service/PropertyService.java =================================================================== --- container/wildfly81/branches/jbossws-wildfly810/server-integration/src/main/java/org/jboss/as/webservices/service/PropertyService.java 2014-05-14 14:00:52 UTC (rev 18647) +++ container/wildfly81/branches/jbossws-wildfly810/server-integration/src/main/java/org/jboss/as/webservices/service/PropertyService.java 2014-05-14 14:39:59 UTC (rev 18648) @@ -25,19 +25,16 @@ import org.jboss.msc.service.StartContext; import org.jboss.msc.service.StartException; import org.jboss.msc.service.StopContext; -import org.jboss.msc.value.InjectedValue; -import org.jboss.wsf.spi.metadata.config.AbstractCommonConfig; /** - * A service for setting a property into an endpoint / client config. + * A service for getting a property to be stored in endpoint / client config. * * @author <a href="mailto:alessio.soldano@jboss.com">Alessio Soldano</a> */ -public final class PropertyService<T extends AbstractCommonConfig> implements Service<String> { +public final class PropertyService implements Service<PropertyService> { - private InjectedValue<T> abstractCommonConfig = new InjectedValue<T>(); - private final String propValue; private final String propName; + private final String propValue; public PropertyService(String propName, String propValue) { this.propValue = propValue; @@ -45,29 +42,26 @@ } @Override - public String getValue() { + public PropertyService getValue() { + return this; + } + + public String getPropName() { + return propName; + } + + public String getPropValue() { return propValue; } @Override public void start(final StartContext context) throws StartException { - final AbstractCommonConfig commonConfig = abstractCommonConfig.getValue(); - synchronized (commonConfig) { //JBWS-3707 - commonConfig.setProperty(propName, propValue); - } + //NOOP } @Override public void stop(final StopContext context) { - final AbstractCommonConfig commonConfig = abstractCommonConfig.getValue(); - synchronized (commonConfig) { //JBWS-3707 - if (commonConfig.getProperties().containsKey(propName)) { - commonConfig.getProperties().remove(propName); - } - } + //NOOP } - public InjectedValue<T> getAbstractCommonConfig() { - return abstractCommonConfig; - } } Added: container/wildfly81/branches/jbossws-wildfly810/server-integration/src/main/java/org/jboss/as/webservices/service/XTSClientIntegrationService.java =================================================================== --- container/wildfly81/branches/jbossws-wildfly810/server-integration/src/main/java/org/jboss/as/webservices/service/XTSClientIntegrationService.java (rev 0) +++ container/wildfly81/branches/jbossws-wildfly810/server-integration/src/main/java/org/jboss/as/webservices/service/XTSClientIntegrationService.java 2014-05-14 14:39:59 UTC (rev 18648) @@ -0,0 +1,93 @@ +/* + * JBoss, Home of Professional Open Source. + * Copyright 2013, 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. + */ +package org.jboss.as.webservices.service; + +import java.util.ArrayList; +import java.util.List; + +import org.jboss.as.webservices.config.ServerConfigImpl; +import org.jboss.as.webservices.dmr.ListInjector; +import org.jboss.as.webservices.util.WSServices; +import org.jboss.msc.inject.Injector; +import org.jboss.msc.service.Service; +import org.jboss.msc.service.ServiceBuilder; +import org.jboss.msc.service.ServiceController; +import org.jboss.msc.service.ServiceListener; +import org.jboss.msc.service.ServiceName; +import org.jboss.msc.service.ServiceTarget; +import org.jboss.msc.service.StartContext; +import org.jboss.msc.service.StartException; +import org.jboss.msc.service.StopContext; +import org.jboss.msc.value.InjectedValue; +import org.jboss.wsf.spi.management.ServerConfig; +import org.jboss.wsf.spi.metadata.config.ClientConfig; +import org.jboss.wsf.spi.metadata.j2ee.serviceref.UnifiedHandlerChainMetaData; + +/** + * A service for triggering the XTS client config integration + * + * @author <a href="mailto:alessio.soldano@jboss.com">Alessio Soldano</a> + */ +public final class XTSClientIntegrationService implements Service<Void> { + + private final InjectedValue<ServerConfig> serverConfig = new InjectedValue<ServerConfig>(); + private final List<UnifiedHandlerChainMetaData> postHandlerChains = new ArrayList<UnifiedHandlerChainMetaData>(1); + + private XTSClientIntegrationService() { + //NOOP + } + + @Override + public void start(final StartContext context) throws StartException { + ClientConfig wrapper = new ClientConfig(null, null, postHandlerChains, null, null); + ((ServerConfigImpl)(serverConfig.getValue())).setClientConfigWrapper(wrapper, true); + } + + @Override + public void stop(final StopContext context) { + ((ServerConfigImpl)(serverConfig.getValue())).setClientConfigWrapper(null, false); + } + + public Injector<UnifiedHandlerChainMetaData> getPostHandlerChainsInjector() { + return new ListInjector<UnifiedHandlerChainMetaData>(postHandlerChains); + } + + public Injector<ServerConfig> getServerConfigInjector() { + return serverConfig; + } + + public static ServiceController<?> install(final ServiceTarget serviceTarget, final ServiceListener<Object> listeners) { + final XTSClientIntegrationService service = new XTSClientIntegrationService(); + final ServiceBuilder<?> builder = serviceTarget.addService(WSServices.XTS_CLIENT_INTEGRATION_SERVICE, service); + builder.addDependency(ServiceName.JBOSS.append("xts").append("handlers"), UnifiedHandlerChainMetaData.class, service.getPostHandlerChainsInjector()); + builder.addDependency(WSServices.CONFIG_SERVICE, ServerConfig.class, service.getServerConfigInjector()); + builder.addListener(listeners); + //set passive initial mode, as this has to start only *if* the XTS service above is actually installed and started + return builder.setInitialMode(ServiceController.Mode.PASSIVE).install(); + } + + @Override + public Void getValue() { + return null; + } + +} Property changes on: container/wildfly81/branches/jbossws-wildfly810/server-integration/src/main/java/org/jboss/as/webservices/service/XTSClientIntegrationService.java ___________________________________________________________________ Added: svn:keywords + Rev Date Added: svn:eol-style + native Modified: container/wildfly81/branches/jbossws-wildfly810/server-integration/src/main/java/org/jboss/as/webservices/util/ASHelper.java =================================================================== --- container/wildfly81/branches/jbossws-wildfly810/server-integration/src/main/java/org/jboss/as/webservices/util/ASHelper.java 2014-05-14 14:00:52 UTC (rev 18647) +++ container/wildfly81/branches/jbossws-wildfly810/server-integration/src/main/java/org/jboss/as/webservices/util/ASHelper.java 2014-05-14 14:39:59 UTC (rev 18648) @@ -21,6 +21,8 @@ */ package org.jboss.as.webservices.util; +import static org.jboss.as.server.deployment.Attachments.DEPLOYMENT_ROOT; +import static org.jboss.as.server.deployment.Attachments.RESOURCE_ROOTS; import static org.jboss.as.webservices.WSLogger.ROOT_LOGGER; import static org.jboss.as.webservices.util.DotNames.JAXWS_SERVICE_CLASS; import static org.jboss.as.webservices.util.DotNames.WEB_SERVICE_ANNOTATION; @@ -39,9 +41,12 @@ import org.jboss.as.ee.metadata.ClassAnnotationInformation; import org.jboss.as.server.CurrentServiceContainer; import org.jboss.as.server.deployment.AttachmentKey; +import org.jboss.as.server.deployment.AttachmentList; import org.jboss.as.server.deployment.Attachments; import org.jboss.as.server.deployment.DeploymentUnit; +import org.jboss.as.server.deployment.EjbDeploymentMarker; import org.jboss.as.server.deployment.annotation.CompositeIndex; +import org.jboss.as.server.deployment.module.ResourceRoot; import org.jboss.as.web.common.WarMetaData; import org.jboss.as.webservices.deployers.WebServiceAnnotationInfo; import org.jboss.as.webservices.deployers.WebServiceProviderAnnotationInfo; @@ -344,4 +349,16 @@ } return refRegistry; } + + public static List<ResourceRoot> getResourceRoots(DeploymentUnit unit) { + // wars define resource roots + AttachmentList<ResourceRoot> resourceRoots = unit.getAttachment(RESOURCE_ROOTS); + if (!unit.getName().endsWith(".war") && EjbDeploymentMarker.isEjbDeployment(unit)) { + // ejb archives don't define resource roots, using root resource + resourceRoots = new AttachmentList<ResourceRoot>(ResourceRoot.class); + final ResourceRoot root = unit.getAttachment(DEPLOYMENT_ROOT); + resourceRoots.add(root); + } + return resourceRoots; + } } Modified: container/wildfly81/branches/jbossws-wildfly810/server-integration/src/main/java/org/jboss/as/webservices/util/WSServices.java =================================================================== --- container/wildfly81/branches/jbossws-wildfly810/server-integration/src/main/java/org/jboss/as/webservices/util/WSServices.java 2014-05-14 14:00:52 UTC (rev 18647) +++ container/wildfly81/branches/jbossws-wildfly810/server-integration/src/main/java/org/jboss/as/webservices/util/WSServices.java 2014-05-14 14:39:59 UTC (rev 18648) @@ -41,6 +41,7 @@ public static final ServiceName ENDPOINT_SERVICE = WS_SERVICE.append("endpoint"); public static final ServiceName ENDPOINT_DEPLOY_SERVICE = WS_SERVICE.append("endpoint-deploy"); public static final ServiceName ENDPOINT_PUBLISH_SERVICE = WS_SERVICE.append("endpoint-publish"); + public static final ServiceName XTS_CLIENT_INTEGRATION_SERVICE = WS_SERVICE.append("xts-integration"); private WSServices() { // forbidden inheritance Modified: container/wildfly81/branches/jbossws-wildfly810/server-integration/src/main/java/org/jboss/as/webservices/webserviceref/WSRefUtils.java =================================================================== --- container/wildfly81/branches/jbossws-wildfly810/server-integration/src/main/java/org/jboss/as/webservices/webserviceref/WSRefUtils.java 2014-05-14 14:00:52 UTC (rev 18647) +++ container/wildfly81/branches/jbossws-wildfly810/server-integration/src/main/java/org/jboss/as/webservices/webserviceref/WSRefUtils.java 2014-05-14 14:39:59 UTC (rev 18648) @@ -32,7 +32,10 @@ import java.net.URL; import java.util.ArrayList; import java.util.Collection; +import java.util.HashSet; +import java.util.LinkedList; import java.util.List; +import java.util.Set; import javax.xml.namespace.QName; import javax.xml.ws.Service; @@ -71,9 +74,6 @@ private WSRefUtils() { } - - - static UnifiedServiceRefMetaData translate(final ServiceReferenceMetaData serviceRefMD, final UnifiedServiceRefMetaData serviceRefUMDM) { serviceRefUMDM.setServiceRefName(serviceRefMD.getName()); serviceRefUMDM.setServiceRefType(serviceRefMD.getServiceRefType()); @@ -181,66 +181,41 @@ final List<StubPropertyMetaData> stubPropertiesMD = jbossPortComponentMD.getStubProperties(); if (stubPropertiesMD != null) { for (final StubPropertyMetaData stubPropertyMD : stubPropertiesMD) { - final UnifiedStubPropertyMetaData stubPropertyUMDM = new UnifiedStubPropertyMetaData(); - stubPropertyUMDM.setPropName(stubPropertyMD.getPropName()); - stubPropertyUMDM.setPropValue(stubPropertyMD.getPropValue()); - portComponentUMDM.addStubProperty(stubPropertyUMDM); + portComponentUMDM.addStubProperty(new UnifiedStubPropertyMetaData(stubPropertyMD.getPropName(), stubPropertyMD.getPropValue())); } } } private static UnifiedHandlerMetaData getUnifiedHandlerMetaData(ServiceReferenceHandlerMetaData srhmd) { - UnifiedHandlerMetaData handlerUMDM = new UnifiedHandlerMetaData(); - handlerUMDM.setHandlerName(srhmd.getHandlerName()); - handlerUMDM.setHandlerClass(srhmd.getHandlerClass()); + List<UnifiedInitParamMetaData> unifiedInitParamMDs = new LinkedList<UnifiedInitParamMetaData>(); List<ParamValueMetaData> initParams = srhmd.getInitParam(); if (initParams != null) { for (ParamValueMetaData initParam : initParams) { - UnifiedInitParamMetaData param = new UnifiedInitParamMetaData(); - param.setParamName(initParam.getParamName()); - param.setParamValue(initParam.getParamValue()); - handlerUMDM.addInitParam(param); + unifiedInitParamMDs.add(new UnifiedInitParamMetaData(initParam.getParamName(), initParam.getParamValue())); } } List<QName> soapHeaders = srhmd.getSoapHeader(); - if (soapHeaders != null) { - for (QName soapHeader : soapHeaders) { - handlerUMDM.addSoapHeader(soapHeader); - } - } + Set<QName> soapHeaderList = soapHeaders != null ? new HashSet<QName>(soapHeaders) : null; List<String> soapRoles = srhmd.getSoapRole(); - if (soapRoles != null) { - for (String soapRole : soapRoles) { - handlerUMDM.addSoapRole(soapRole); - } - } + Set<String> soapRolesList = soapRoles != null ? new HashSet<String>(soapRoles) : null; List<String> portNames = srhmd.getPortName(); - if (portNames != null) { - for (String portName : portNames) { - handlerUMDM.addPortName(portName); - } - } - return handlerUMDM; + Set<String> portNameList = portNames != null ? new HashSet<String>(portNames) : null; + return new UnifiedHandlerMetaData(srhmd.getHandlerClass(), srhmd.getHandlerName(), unifiedInitParamMDs, soapHeaderList, soapRolesList, portNameList); } private static UnifiedHandlerChainsMetaData getUnifiedHandlerChainsMetaData(final ServiceReferenceHandlerChainsMetaData handlerChainsMD) { - final UnifiedHandlerChainsMetaData handlerChainsUMDM = new UnifiedHandlerChainsMetaData(); - + List<UnifiedHandlerChainMetaData> uhcmds = new LinkedList<UnifiedHandlerChainMetaData>(); for (final ServiceReferenceHandlerChainMetaData handlerChainMD : handlerChainsMD.getHandlers()) { - final UnifiedHandlerChainMetaData handlerChainUMDM = new UnifiedHandlerChainMetaData(); - handlerChainUMDM.setServiceNamePattern(handlerChainMD.getServiceNamePattern()); - handlerChainUMDM.setPortNamePattern(handlerChainMD.getPortNamePattern()); - handlerChainUMDM.setProtocolBindings(handlerChainMD.getProtocolBindings()); - + List<UnifiedHandlerMetaData> uhmds = new LinkedList<UnifiedHandlerMetaData>(); for (final ServiceReferenceHandlerMetaData handlerMD : handlerChainMD.getHandler()) { final UnifiedHandlerMetaData handlerUMDM = getUnifiedHandlerMetaData(handlerMD); - handlerChainUMDM.addHandler(handlerUMDM); + uhmds.add(handlerUMDM); } - - handlerChainsUMDM.addHandlerChain(handlerChainUMDM); + uhcmds.add(new UnifiedHandlerChainMetaData(handlerChainMD.getServiceNamePattern(), handlerChainMD.getPortNamePattern(), + handlerChainMD.getProtocolBindings(), uhmds, false, null)); } - return handlerChainsUMDM; + return new UnifiedHandlerChainsMetaData(uhcmds); } static void processAnnotatedElement(final AnnotatedElement anElement, final UnifiedServiceRefMetaData serviceRefUMDM) { Added: container/wildfly81/branches/jbossws-wildfly810/server-integration/src/test/java/org/jboss/as/webservices/config/ServerConfigImplTestCase.java =================================================================== --- container/wildfly81/branches/jbossws-wildfly810/server-integration/src/test/java/org/jboss/as/webservices/config/ServerConfigImplTestCase.java (rev 0) +++ container/wildfly81/branches/jbossws-wildfly810/server-integration/src/test/java/org/jboss/as/webservices/config/ServerConfigImplTestCase.java 2014-05-14 14:39:59 UTC (rev 18648) @@ -0,0 +1,227 @@ +/* + * JBoss, Home of Professional Open Source. + * Copyright 2013, Red Hat Middleware LLC, and individual contributors + * as indicated by the @author tags. See the copyright.txt file in the + * distribution for a full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.jboss.as.webservices.config; + +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertTrue; +import static org.junit.Assert.fail; + +import java.net.URL; +import java.net.URLClassLoader; + +import javax.management.MBeanServer; + +import org.jboss.msc.value.ImmediateValue; +import org.jboss.wsf.spi.management.ServerConfig; +import org.jboss.wsf.spi.management.StackConfig; +import org.jboss.wsf.spi.management.StackConfigFactory; +import org.junit.AfterClass; +import org.junit.BeforeClass; +import org.junit.Test; + +/** + * + * + * @author <a href="mailto:alessio.soldano@jboss.com>Alessio Soldano</a> + */ +public class ServerConfigImplTestCase { + + private static ClassLoader origTCCL; + + public ServerConfigImplTestCase() { + } + + @Test + public void testIsModifiable() throws Exception { + ServerConfigImpl sc = newServerConfigImpl(); + sc.create(); + assertTrue(sc.isModifiable()); + sc.incrementWSDeploymentCount(); + assertFalse(sc.isModifiable()); + sc.decrementWSDeploymentCount(); + assertTrue(sc.isModifiable()); + sc.incrementWSDeploymentCount(); + sc.incrementWSDeploymentCount(); + assertFalse(sc.isModifiable()); + sc.create(); + assertTrue(sc.isModifiable()); + } + + @Test + public void testSingleAttributeUpdate() throws Exception { + internalTestSingleAttributeUpdate(new Callback() { + @Override + public void setAttribute(ServerConfig sc) throws Exception { + sc.setModifySOAPAddress(true); + } + }); + internalTestSingleAttributeUpdate(new Callback() { + @Override + public void setAttribute(ServerConfig sc) throws Exception { + sc.setWebServiceHost("foo"); + } + }); + internalTestSingleAttributeUpdate(new Callback() { + @Override + public void setAttribute(ServerConfig sc) throws Exception { + sc.setWebServicePort(976); + } + }); + internalTestSingleAttributeUpdate(new Callback() { + @Override + public void setAttribute(ServerConfig sc) throws Exception { + sc.setWebServiceSecurePort(5435); + } + }); + } + + @Test + public void testMultipleAttributesUpdate() throws Exception { + Callback cbA = new Callback() { + @Override + public void setAttribute(ServerConfig sc) throws Exception { + sc.setModifySOAPAddress(true); + } + }; + Callback cbB = new Callback() { + @Override + public void setAttribute(ServerConfig sc) throws Exception { + sc.setWebServiceHost("foo"); + } + }; + Callback cbC = new Callback() { + @Override + public void setAttribute(ServerConfig sc) throws Exception { + sc.setWebServicePort(976); + } + }; + Callback cbD = new Callback() { + @Override + public void setAttribute(ServerConfig sc) throws Exception { + sc.setWebServiceSecurePort(5435); + } + }; + internalTestMultipleAttributeUpdate(cbA, new Callback[]{cbB, cbC, cbD}); + internalTestMultipleAttributeUpdate(cbB, new Callback[]{cbA, cbC, cbD}); + internalTestMultipleAttributeUpdate(cbC, new Callback[]{cbA, cbB, cbD}); + internalTestMultipleAttributeUpdate(cbD, new Callback[]{cbA, cbB, cbC}); + } + + protected void internalTestSingleAttributeUpdate(Callback cb) throws Exception { + ServerConfigImpl sc = newServerConfigImpl(); + sc.create(); + assertTrue(sc.isModifiable()); + cb.setAttribute(sc); + sc.incrementWSDeploymentCount(); + assertFalse(sc.isModifiable()); + try { + cb.setAttribute(sc); + fail(); + } catch (DisabledOperationException e) { + //check the error message says the operation can't be done because there's an active deployment + assertTrue("Expected JBAS015616 message, but got " + e.getMessage(), e.getMessage().contains("JBAS015616")); + } + sc.decrementWSDeploymentCount(); + assertTrue(sc.isModifiable()); + try { + cb.setAttribute(sc); + fail(); + } catch (DisabledOperationException e) { + //check the error message says the operation can't be done because of pending former model update(s) requiring reload + assertTrue("Expected JBAS015615 message, but got " + e.getMessage(), e.getMessage().contains("JBAS015615")); + } + sc.create(); + assertTrue(sc.isModifiable()); + cb.setAttribute(sc); + } + + protected void internalTestMultipleAttributeUpdate(Callback cb1, Callback[] otherCbs) throws Exception { + ServerConfigImpl sc = newServerConfigImpl(); + sc.create(); + assertTrue(sc.isModifiable()); + cb1.setAttribute(sc); + sc.incrementWSDeploymentCount(); + assertFalse(sc.isModifiable()); + try { + cb1.setAttribute(sc); + fail(); + } catch (DisabledOperationException e) { + //check the error message says the operation can't be done because there's an active deployment + assertTrue("Expected JBAS015616 message, but got " + e.getMessage(), e.getMessage().contains("JBAS015616")); + } + sc.decrementWSDeploymentCount(); + assertTrue(sc.isModifiable()); + try { + cb1.setAttribute(sc); + fail(); + } catch (DisabledOperationException e) { + //check the error message says the operation can't be done because of pending former model update(s) requiring reload + assertTrue("Expected JBAS015615 message, but got " + e.getMessage(), e.getMessage().contains("JBAS015615")); + } + //other attributes are still modified properly as they're still in synch + for (Callback cb : otherCbs) { + cb.setAttribute(sc); + } + } + + private static ServerConfigImpl newServerConfigImpl() { + ServerConfigImpl sc = ServerConfigImpl.newInstance(); + sc.getMBeanServerInjector().setValue(new ImmediateValue<MBeanServer>(null)); + return sc; + } + + @BeforeClass + public static void setStackConfigFactory() throws Exception { + URL url = ServerConfigImplTestCase.class.getResource("util/"); + origTCCL = Thread.currentThread().getContextClassLoader(); + Thread.currentThread().setContextClassLoader(new URLClassLoader(new URL[] {url})); + } + + @AfterClass + public static void restoreStackConfigFactory() { + Thread.currentThread().setContextClassLoader(origTCCL); + origTCCL = null; + } + + public static interface Callback { + public void setAttribute(ServerConfig sc) throws Exception; + } + + public static class TestStackConfigFactory extends StackConfigFactory { + @Override + public StackConfig getStackConfig() { + return new TestStackConfig(); + } + } + + public static class TestStackConfig implements StackConfig { + @Override + public String getImplementationTitle() { + return null; + } + + @Override + public String getImplementationVersion() { + return null; + } + } +} Property changes on: container/wildfly81/branches/jbossws-wildfly810/server-integration/src/test/java/org/jboss/as/webservices/config/ServerConfigImplTestCase.java ___________________________________________________________________ Added: svn:keywords + Rev Date Added: svn:eol-style + native Added: container/wildfly81/branches/jbossws-wildfly810/server-integration/src/test/resources/org/jboss/as/webservices/config/util/META-INF/services/org.jboss.wsf.spi.management.StackConfigFactory =================================================================== --- container/wildfly81/branches/jbossws-wildfly810/server-integration/src/test/resources/org/jboss/as/webservices/config/util/META-INF/services/org.jboss.wsf.spi.management.StackConfigFactory (rev 0) +++ container/wildfly81/branches/jbossws-wildfly810/server-integration/src/test/resources/org/jboss/as/webservices/config/util/META-INF/services/org.jboss.wsf.spi.management.StackConfigFactory 2014-05-14 14:39:59 UTC (rev 18648) @@ -0,0 +1 @@ +org.jboss.as.webservices.config.ServerConfigImplTestCase$TestStackConfigFactory \ No newline at end of file Modified: container/wildfly81/branches/jbossws-wildfly810/tests-integration/src/main/java/org/jboss/as/webservices/deployer/RemoteDeployer.java =================================================================== --- container/wildfly81/branches/jbossws-wildfly810/tests-integration/src/main/java/org/jboss/as/webservices/deployer/RemoteDeployer.java 2014-05-14 14:00:52 UTC (rev 18647) +++ container/wildfly81/branches/jbossws-wildfly810/tests-integration/src/main/java/org/jboss/as/webservices/deployer/RemoteDeployer.java 2014-05-14 14:39:59 UTC (rev 18648) @@ -81,7 +81,11 @@ import static org.jboss.as.security.Constants.CLASSIC; import static org.jboss.as.security.Constants.CODE; import static org.jboss.as.security.Constants.FLAG; +import static org.jboss.as.security.Constants.AUTH_MODULE; +import static org.jboss.as.security.Constants.JASPI; import static org.jboss.as.security.Constants.LOGIN_MODULE; +import static org.jboss.as.security.Constants.LOGIN_MODULE_STACK; +import static org.jboss.as.security.Constants.LOGIN_MODULE_STACK_REF; import static org.jboss.as.security.Constants.MODULE_OPTIONS; import static org.jboss.as.security.Constants.SECURITY_DOMAIN; @@ -90,6 +94,7 @@ * * @author <a href="mailto:ropalka@redhat.com">Richard Opalka</a> * @author <a href="mailto:alessio.soldano@jboss.com">Alessio Soldano</a> + * @author <a href="mailto:ema@redhat.com">Jim Ma</a> */ public final class RemoteDeployer implements Deployer { @@ -256,6 +261,67 @@ } } + public void addJaspiSecurityDomain(String name, String loginModuleStackName, Map<String, String> loginModuleOptions, + String authModuleName, Map<String, String> authModuleOptions) throws Exception { + synchronized (securityDomainUsers) { + if (securityDomainUsers.containsKey(name)) { + int count = securityDomainUsers.get(name); + securityDomainUsers.put(name, (count + 1)); + return; + } else { + securityDomainUsers.put(name, 1); + } + + final List<ModelNode> updates = new ArrayList<ModelNode>(); + + final ModelNode compositeOp = new ModelNode(); + compositeOp.get(OP).set(COMPOSITE); + compositeOp.get(OP_ADDR).setEmptyList(); + compositeOp.get(OPERATION_HEADERS, ALLOW_RESOURCE_SERVICE_RESTART).set(true); + + ModelNode steps = compositeOp.get(STEPS); + PathAddress address = PathAddress.pathAddress().append(SUBSYSTEM, "security").append(SECURITY_DOMAIN, name); + steps.add(Util.createAddOperation(address)); + + PathAddress parentAddress = address.append(AUTHENTICATION, JASPI); + steps.add(Util.createAddOperation(parentAddress)); + + // step 3 + PathAddress loignStackAddress = parentAddress.append(LOGIN_MODULE_STACK, loginModuleStackName); + ModelNode loginStack = Util.createAddOperation(loignStackAddress); + steps.add(loginStack); + + // step 4 + ModelNode loginModule = Util.createAddOperation(loignStackAddress.append(LOGIN_MODULE, "UsersRoles")); + loginModule.get(CODE).set("UsersRoles"); + loginModule.get(FLAG).set(REQUIRED); + loginModule.get(OPERATION_HEADERS).get(ALLOW_RESOURCE_SERVICE_RESTART).set(true); + final ModelNode moduleOptions = loginModule.get(MODULE_OPTIONS); + if (loginModuleOptions != null) { + for (final String k : loginModuleOptions.keySet()) { + moduleOptions.add(k, loginModuleOptions.get(k)); + } + } + steps.add(loginModule); + + PathAddress authModule = parentAddress.append(AUTH_MODULE, authModuleName); + ModelNode authModuleNode = Util.createAddOperation(authModule); + authModuleNode.get(LOGIN_MODULE_STACK_REF).set(loginModuleStackName); + authModuleNode.get(CODE).set(authModuleName); + ModelNode options = authModuleNode.get(MODULE_OPTIONS); + if (authModuleOptions != null) { + for (final String k : authModuleOptions.keySet()) { + options.add(k, authModuleOptions.get(k)); + } + } + steps.add(authModuleNode); + + updates.add(compositeOp); + + applyUpdates(updates); + } + } + @Override public void removeSecurityDomain(String name) throws Exception { synchronized (securityDomainUsers) {

10 years, 7 months

1
0
0 / 0

JBossWS SVN: r18647 - container/wildfly81/branches/jbossws-wildfly810/server-integration.

by jbossws-commits＠lists.jboss.org

Author: asoldano Date: 2014-05-14 10:00:52 -0400 (Wed, 14 May 2014) New Revision: 18647 Modified: container/wildfly81/branches/jbossws-wildfly810/server-integration/pom.xml Log: [JBWS-3794] Fix typo Modified: container/wildfly81/branches/jbossws-wildfly810/server-integration/pom.xml =================================================================== --- container/wildfly81/branches/jbossws-wildfly810/server-integration/pom.xml 2014-05-14 13:59:38 UTC (rev 18646) +++ container/wildfly81/branches/jbossws-wildfly810/server-integration/pom.xml 2014-05-14 14:00:52 UTC (rev 18647) @@ -28,7 +28,7 @@ <parent> <groupId>org.jboss.ws</groupId> - <artifactId>jbossws-wildfly800-parent</artifactId> + <artifactId>jbossws-wildfly810-parent</artifactId> <version>5.0.0-SNAPSHOT</version> <relativePath>../pom.xml</relativePath> </parent>

10 years, 7 months

1
0
0 / 0

JBossWS SVN: r18645 - in container/wildfly81/branches: jbossws-wildfly810 and 2 other directories.

by jbossws-commits＠lists.jboss.org

Author: asoldano Date: 2014-05-14 09:39:21 -0400 (Wed, 14 May 2014) New Revision: 18645 Added: container/wildfly81/branches/jbossws-wildfly810/ container/wildfly81/branches/jbossws-wildfly810/pom.xml container/wildfly81/branches/jbossws-wildfly810/server-integration/ container/wildfly81/branches/jbossws-wildfly810/server-integration/pom.xml container/wildfly81/branches/jbossws-wildfly810/tests-integration/ container/wildfly81/branches/jbossws-wildfly810/tests-integration/pom.xml Log: [JBWS-3794] Initial wfly810 ASIL scheleton Added: container/wildfly81/branches/jbossws-wildfly810/pom.xml =================================================================== --- container/wildfly81/branches/jbossws-wildfly810/pom.xml (rev 0) +++ container/wildfly81/branches/jbossws-wildfly810/pom.xml 2014-05-14 13:39:21 UTC (rev 18645) @@ -0,0 +1,363 @@ +<?xml version="1.0" encoding="UTF-8"?> + + +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> + <modelVersion>4.0.0</modelVersion> + + <parent> + <groupId>org.jboss.ws</groupId> + <artifactId>jbossws-parent</artifactId> + <version>1.1.0.GA</version> + </parent> + + <name>JBossWS WildFly 8.1.0.Final Integration Parent</name> + <description>JBossWS WildFly 8.1.0.Final Integration Parent</description> + <groupId>org.jboss.ws</groupId> + <artifactId>jbossws-wildfly810-parent</artifactId> + <version>5.0.0-SNAPSHOT</version> + <packaging>pom</packaging> + + <scm> + <connection>scm:svn:http://anonsvn.jboss.org/repos/jbossws/container/wildfly81/branch...</connection> + <developerConnection>scm:svn:https://svn.jboss.org/repos/jbossws/container/wildfly81/branches/...</developerConnection> + <url>http://fisheye.jboss.com/viewrep/JBossWS/container/wildfly81/branches/jbo...</url> + </scm> + + <modules> + <module>server-integration</module> + <module>tests-integration</module> + </modules> + + <properties> + <jbossws.api.version>1.0.2.Final</jbossws.api.version> + <jbossws.spi.version>3.0.0-SNAPSHOT</jbossws.spi.version> + <jbossws.common.version>2.3.0.Final</jbossws.common.version> + <jboss.msc.version>1.2.0.Final</jboss.msc.version> + <wildfly.version>8.1.0.CR2</wildfly.version> + <wildfly.security-manager.version>1.0.0.Final</wildfly.security-manager.version> + <marshalling.river.version>1.4.3.Final</marshalling.river.version> + <remote.naming.version>2.0.0.Final</remote.naming.version> + <javax.mail.version>1.5.1</javax.mail.version> + <ejb.client.version>2.0.0.Final</ejb.client.version> + <ejb3.ext.api.version>2.1.0</ejb3.ext.api.version> + <jboss.common.core.version>2.2.22.GA</jboss.common.core.version> + <javassist.version>3.18.1-GA</javassist.version> + <xerces.version>2.9.1-jbossas-2</xerces.version> + <remoting.version>4.0.0.Final</remoting.version> + <remoting.jmx.version>2.0.0.Final</remoting.jmx.version> + <jbossxb.version>2.0.3.GA</jbossxb.version> + <hornetq.version>2.4.1.Final</hornetq.version> + <xnio.version>3.2.0.Final</xnio.version> + <jboss.jaxws.api.version>2.0.2.Final</jboss.jaxws.api.version> + <jboss.logging.tools.version>1.2.0.Final</jboss.logging.tools.version> + <junit.version>4.10</junit.version> + </properties> + + <dependencyManagement> + <dependencies> + <dependency> + <groupId>junit</groupId> + <artifactId>junit</artifactId> + <version>${junit.version}</version> + <scope>test</scope> + </dependency> + + <dependency> + <groupId>org.jboss.msc</groupId> + <artifactId>jboss-msc</artifactId> + <version>${jboss.msc.version}</version> + </dependency> + + <dependency> + <groupId>org.wildfly.security</groupId> + <artifactId>wildfly-security-manager</artifactId> + <version>${wildfly.security-manager.version}</version> + </dependency> + + <dependency> + <groupId>org.wildfly</groupId> + <artifactId>wildfly-controller-client</artifactId> + <version>${wildfly.version}</version> + </dependency> + + <dependency> + <groupId>org.wildfly</groupId> + <artifactId>wildfly-security</artifactId> + <version>${wildfly.version}</version> + </dependency> + + <dependency> + <groupId>org.wildfly</groupId> + <artifactId>wildfly-server</artifactId> + <version>${wildfly.version}</version> + </dependency> + + <dependency> + <groupId>org.wildfly</groupId> + <artifactId>wildfly-ee</artifactId> + <version>${wildfly.version}</version> + </dependency> + + <dependency> + <groupId>org.wildfly</groupId> + <artifactId>wildfly-ejb3</artifactId> + <version>${wildfly.version}</version> + </dependency> + + <dependency> + <groupId>org.wildfly</groupId> + <artifactId>wildfly-web-common</artifactId> + <version>${wildfly.version}</version> + </dependency> + + <dependency> + <groupId>org.jboss.marshalling</groupId> + <artifactId>jboss-marshalling-river</artifactId> + <version>${marshalling.river.version}</version> + </dependency> + + <dependency> + <groupId>org.jboss</groupId> + <artifactId>jboss-remote-naming</artifactId> + <version>${remote.naming.version}</version> + </dependency> + + <dependency> + <groupId>com.sun.mail</groupId> + <artifactId>javax.mail</artifactId> + <version>${javax.mail.version}</version> + </dependency> + + <dependency> + <groupId>org.jboss</groupId> + <artifactId>jboss-ejb-client</artifactId> + <version>${ejb.client.version}</version> + </dependency> + + <dependency> + <groupId>org.jboss.ejb3</groupId> + <artifactId>jboss-ejb3-ext-api</artifactId> + <version>${ejb3.ext.api.version}</version> + </dependency> + + <dependency> + <groupId>org.javassist</groupId> + <artifactId>javassist</artifactId> + <version>${javassist.version}</version> + </dependency> + + <dependency> + <groupId>org.jboss</groupId> + <artifactId>jboss-common-core</artifactId> + <version>${jboss.common.core.version}</version> + <exclusions> + <exclusion> + <groupId>org.jboss.logging</groupId> + <artifactId>jboss-logging-spi</artifactId> + </exclusion> + </exclusions> + </dependency> + + <dependency> + <groupId>xerces</groupId> + <artifactId>xercesImpl</artifactId> + <version>${xerces.version}</version> + <exclusions> + <exclusion> + <groupId>xml-apis</groupId> + <artifactId>xml-apis</artifactId> + </exclusion> + </exclusions> + </dependency> + + <dependency> + <groupId>org.jboss</groupId> + <artifactId>jbossxb</artifactId> + <version>${jbossxb.version}</version> + <exclusions> + <exclusion> + <groupId>apache-xerces</groupId> + <artifactId>xml-apis</artifactId> + </exclusion> + <exclusion> + <groupId>apache-xerces</groupId> + <artifactId>xercesImpl</artifactId> + </exclusion> + <exclusion> + <groupId>com.wutka</groupId> + <artifactId>dtdparser</artifactId> + </exclusion> + <exclusion> + <groupId>jboss</groupId> + <artifactId>jboss-common-core</artifactId> + </exclusion> + <exclusion> + <groupId>org.jboss</groupId> + <artifactId>jboss-reflect</artifactId> + </exclusion> + <exclusion> + <groupId>org.jboss.logging</groupId> + <artifactId>jboss-logging-spi</artifactId> + </exclusion> + <exclusion> + <groupId>org.jboss.logging</groupId> + <artifactId>jboss-logging-log4j</artifactId> + </exclusion> + <exclusion> + <groupId>sun-jaxb</groupId> + <artifactId>jaxb-api</artifactId> + </exclusion> + <exclusion> + <groupId>xml-apis</groupId> + <artifactId>xml-apis</artifactId> + </exclusion> + <exclusion> + <groupId>wutka-dtdparser</groupId> + <artifactId>dtdparser121</artifactId> + </exclusion> + </exclusions> + </dependency> + + <dependency> + <groupId>org.jboss.remotingjmx</groupId> + <artifactId>remoting-jmx</artifactId> + <version>${remoting.jmx.version}</version> + <exclusions> + <exclusion> + <groupId>org.jboss.logging</groupId> + <artifactId>jboss-logging-processor</artifactId> + </exclusion> + <exclusion> + <groupId>org.jboss.logmanager</groupId> + <artifactId>jboss-logmanager</artifactId> + </exclusion> + <exclusion> + <groupId>org.jboss.xnio</groupId> + <artifactId>xnio-nio</artifactId> + </exclusion> + </exclusions> + </dependency> + <dependency> + <groupId>org.jboss.remoting</groupId> + <artifactId>jboss-remoting</artifactId> + <version>${remoting.version}</version> + </dependency> + + <dependency> + <groupId>org.hornetq</groupId> + <artifactId>hornetq-jms-client</artifactId> + <version>${hornetq.version}</version> + </dependency> + + <dependency> + <groupId>org.hornetq</groupId> + <artifactId>hornetq-jms-server</artifactId> + <version>${hornetq.version}</version> + </dependency> + + <dependency> + <groupId>org.hornetq</groupId> + <artifactId>hornetq-core-client</artifactId> + <version>${hornetq.version}</version> + </dependency> + + <dependency> + <groupId>org.hornetq</groupId> + <artifactId>hornetq-server</artifactId> + <version>${hornetq.version}</version> + </dependency> + + <dependency> + <groupId>org.jboss.ws</groupId> + <artifactId>jbossws-api</artifactId> + <version>${jbossws.api.version}</version> + </dependency> + + <dependency> + <groupId>org.jboss.spec.javax.xml.ws</groupId> + <artifactId>jboss-jaxws-api_2.2_spec</artifactId> + <version>${jboss.jaxws.api.version}</version> + <scope>provided</scope> + </dependency> + + <dependency> + <groupId>org.jboss.xnio</groupId> + <artifactId>xnio-api</artifactId> + <version>${xnio.version}</version> + </dependency> + + <dependency> + <groupId>org.jboss.xnio</groupId> + <artifactId>xnio-nio</artifactId> + <version>${xnio.version}</version> + </dependency> + + + + <dependency> + <groupId>org.jboss.logging</groupId> + <artifactId>jboss-logging-annotations</artifactId> +  + <scope>provided</scope> + <optional>true</optional> + <version>${jboss.logging.tools.version}</version> + </dependency> + + <dependency> + <groupId>org.jboss.logging</groupId> + <artifactId>jboss-logging-processor</artifactId> +  + <scope>provided</scope> + <optional>true</optional> + <version>${jboss.logging.tools.version}</version> + </dependency> + + <dependency> + <groupId>org.jboss.ws</groupId> + <artifactId>jbossws-common</artifactId> + <version>${jbossws.common.version}</version> + </dependency> + + <dependency> + <groupId>org.jboss.ws</groupId> + <artifactId>jbossws-spi</artifactId> + <version>${jbossws.spi.version}</version> + </dependency> + + <dependency> + <groupId>org.wildfly</groupId> + <artifactId>wildfly-subsystem-test</artifactId> + <type>pom</type> + <scope>test</scope> + <version>${wildfly.version}</version> + </dependency> + </dependencies> + </dependencyManagement> + +</project> Property changes on: container/wildfly81/branches/jbossws-wildfly810/pom.xml ___________________________________________________________________ Added: svn:mime-type + text/xml Added: svn:keywords + Rev Date Added: svn:eol-style + native Added: container/wildfly81/branches/jbossws-wildfly810/server-integration/pom.xml =================================================================== --- container/wildfly81/branches/jbossws-wildfly810/server-integration/pom.xml (rev 0) +++ container/wildfly81/branches/jbossws-wildfly810/server-integration/pom.xml 2014-05-14 13:39:21 UTC (rev 18645) @@ -0,0 +1,136 @@ +<?xml version="1.0" encoding="UTF-8"?> + + +<project xmlns="http://maven.apache.org/POM/4.0.0" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> + <modelVersion>4.0.0</modelVersion> + + <parent> + <groupId>org.jboss.ws</groupId> + <artifactId>jbossws-wildfly800-parent</artifactId> + <version>5.0.0-SNAPSHOT</version> + <relativePath>../pom.xml</relativePath> + </parent> + + <name>JBossWS JBoss WildFly 8.1.0.Final Server Side Integration</name> + <description>JBossWS WildFly 8.1.0.Final Server Side Integration</description> + <groupId>org.jboss.ws</groupId> + <artifactId>jbossws-wildfly810-server-integration</artifactId> + <packaging>jar</packaging> + + <dependencies> + <dependency> + <groupId>junit</groupId> + <artifactId>junit</artifactId> + </dependency> + <dependency> + <groupId>org.jboss.msc</groupId> + <artifactId>jboss-msc</artifactId> + </dependency> + <dependency> + <groupId>org.wildfly.security</groupId> + <artifactId>wildfly-security-manager</artifactId> + </dependency> + <dependency> + <groupId>org.wildfly</groupId> + <artifactId>wildfly-server</artifactId> + </dependency> + <dependency> + <groupId>org.wildfly</groupId> + <artifactId>wildfly-ee</artifactId> + </dependency> + <dependency> + <groupId>org.wildfly</groupId> + <artifactId>wildfly-ejb3</artifactId> + </dependency> + <dependency> + <groupId>org.wildfly</groupId> + <artifactId>wildfly-web-common</artifactId> + </dependency> + <dependency> + <groupId>org.jboss.ws</groupId> + <artifactId>jbossws-api</artifactId> + </dependency> + <dependency> + <groupId>org.jboss.logging</groupId> + <artifactId>jboss-logging-annotations</artifactId> + </dependency> + <dependency> + <groupId>org.jboss.logging</groupId> + <artifactId>jboss-logging-processor</artifactId> + </dependency> + <dependency> + <groupId>org.jboss.ws</groupId> + <artifactId>jbossws-common</artifactId> + </dependency> + <dependency> + <groupId>org.jboss.ws</groupId> + <artifactId>jbossws-spi</artifactId> + </dependency> + <dependency> + <groupId>org.wildfly</groupId> + <artifactId>wildfly-subsystem-test</artifactId> + <type>pom</type> + </dependency> + </dependencies> + + <build> + <plugins> + <plugin> + <artifactId>maven-compiler-plugin</artifactId> + <configuration> + <showDeprecation>true</showDeprecation> + <showWarnings>true</showWarnings> + <fork>true</fork> + <source>1.7</source> + <target>1.7</target> + <compilerArgument>-Djava.endorsed.dirs=${project.build.directory}/endorsed</compilerArgument> + </configuration> + </plugin> + <plugin> + <artifactId>maven-dependency-plugin</artifactId> + <executions> + <execution> + <phase>generate-sources</phase> + <goals> + <goal>copy</goal> + </goals> + <configuration> + <artifactItems> + <artifactItem> + <groupId>org.jboss.spec.javax.xml.ws</groupId> + <artifactId>jboss-jaxws-api_2.2_spec</artifactId> + <type>jar</type> + <overWrite>true</overWrite> + <outputDirectory>${project.build.directory}/endorsed</outputDirectory> + </artifactItem> + </artifactItems> + </configuration> + </execution> + </executions> + </plugin> + </plugins> + </build> + +</project> Property changes on: container/wildfly81/branches/jbossws-wildfly810/server-integration/pom.xml ___________________________________________________________________ Added: svn:mime-type + text/xml Added: svn:keywords + Rev Date Added: svn:eol-style + native Added: container/wildfly81/branches/jbossws-wildfly810/tests-integration/pom.xml =================================================================== --- container/wildfly81/branches/jbossws-wildfly810/tests-integration/pom.xml (rev 0) +++ container/wildfly81/branches/jbossws-wildfly810/tests-integration/pom.xml 2014-05-14 13:39:21 UTC (rev 18645) @@ -0,0 +1,162 @@ +<?xml version="1.0" encoding="UTF-8"?> + + +<project xmlns="http://maven.apache.org/POM/4.0.0" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> + <modelVersion>4.0.0</modelVersion> + + <parent> + <groupId>org.jboss.ws</groupId> + <artifactId>jbossws-wildfly810-parent</artifactId> + <version>5.0.0-SNAPSHOT</version> + <relativePath>../pom.xml</relativePath> + </parent> + + <name>JBossWS JBoss WildFly 8.1.0.Final Tests Side Integration</name> + <description>JBossWS WildFly 8.1.0.Final Tests Side Integration</description> + <groupId>org.jboss.ws</groupId> + <artifactId>jbossws-wildfly810-tests-integration</artifactId> + <packaging>jar</packaging> + + <dependencies> + <dependency> + <groupId>org.jboss.ws</groupId> + <artifactId>jbossws-spi</artifactId> + </dependency> + <dependency> + <groupId>org.wildfly</groupId> + <artifactId>wildfly-controller-client</artifactId> + </dependency> + <dependency> + <groupId>org.wildfly</groupId> + <artifactId>wildfly-security</artifactId> + <exclusions> + <exclusion> + <groupId>org.hornetq</groupId> + <artifactId>hornetq-core</artifactId> + </exclusion> + </exclusions> + </dependency> + <dependency> + <groupId>org.jboss.marshalling</groupId> + <artifactId>jboss-marshalling-river</artifactId> + </dependency> +  + <dependency> + <groupId>org.jboss</groupId> + <artifactId>jboss-remote-naming</artifactId> + <exclusions> + <exclusion> + <groupId>org.jboss.xnio</groupId> + <artifactId>xnio-api</artifactId> + </exclusion> + <exclusion> + <groupId>org.jboss.remoting3</groupId> + <artifactId>jboss-remoting</artifactId> + </exclusion> + </exclusions> + </dependency> + <dependency> + <groupId>com.sun.mail</groupId> + <artifactId>javax.mail</artifactId> + </dependency> + <dependency> + <groupId>org.jboss</groupId> + <artifactId>jboss-ejb-client</artifactId> + <exclusions> + <exclusion> + <groupId>org.jboss.remoting</groupId> + <artifactId>jboss-remoting</artifactId> + </exclusion> + <exclusion> + <groupId>org.jboss.remoting3</groupId> + <artifactId>jboss-remoting</artifactId> + </exclusion> + <exclusion> + <groupId>org.jboss.xnio</groupId> + <artifactId>xnio-api</artifactId> + </exclusion> + </exclusions> + </dependency> + <dependency> + <groupId>org.jboss.ejb3</groupId> + <artifactId>jboss-ejb3-ext-api</artifactId> + </dependency> + <dependency> + <groupId>org.javassist</groupId> + <artifactId>javassist</artifactId> + </dependency> + <dependency> + <groupId>org.jboss</groupId> + <artifactId>jboss-common-core</artifactId> + </dependency> + <dependency> + <groupId>xerces</groupId> + <artifactId>xercesImpl</artifactId> + </dependency> + <dependency> + <groupId>org.jboss</groupId> + <artifactId>jbossxb</artifactId> + </dependency> + <dependency> + <groupId>org.jboss.remotingjmx</groupId> + <artifactId>remoting-jmx</artifactId> + <exclusions> + <exclusion> + <groupId>org.jboss.xnio</groupId> + <artifactId>xnio-nio</artifactId> + </exclusion> + </exclusions> + </dependency> + <dependency> + <groupId>org.jboss.remoting</groupId> + <artifactId>jboss-remoting</artifactId> + </dependency> + <dependency> + <groupId>org.hornetq</groupId> + <artifactId>hornetq-jms-client</artifactId> + </dependency> + <dependency> + <groupId>org.hornetq</groupId> + <artifactId>hornetq-jms-server</artifactId> + </dependency> + <dependency> + <groupId>org.hornetq</groupId> + <artifactId>hornetq-core-client</artifactId> + </dependency> + <dependency> + <groupId>org.hornetq</groupId> + <artifactId>hornetq-server</artifactId> + </dependency> + <dependency> + <groupId>org.jboss.xnio</groupId> + <artifactId>xnio-api</artifactId> + </dependency> + <dependency> + <groupId>org.jboss.xnio</groupId> + <artifactId>xnio-nio</artifactId> + </dependency> + </dependencies> + +</project> Property changes on: container/wildfly81/branches/jbossws-wildfly810/tests-integration/pom.xml ___________________________________________________________________ Added: svn:mime-type + text/xml Added: svn:keywords + Rev Date Added: svn:eol-style + native

10 years, 7 months

1
0
0 / 0

JBossWS SVN: r18644 - in container: wildfly81 and 1 other directory.

by jbossws-commits＠lists.jboss.org

Author: asoldano Date: 2014-05-14 09:34:58 -0400 (Wed, 14 May 2014) New Revision: 18644 Added: container/wildfly81/ container/wildfly81/branches/ container/wildfly81/tags/ Log: Adding WildFly 8.1.x integration layer area

10 years, 7 months

1
0
0 / 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

jbossws-commits May 2014