Author: asoldano Date: 2014-02-13 06:45:16 -0500 (Thu, 13 Feb 2014) New Revision: 18354 Removed: stack/native/trunk/modules/resources/src/main/resources/modules/jboss800/ stack/native/trunk/modules/testsuite/src/test/resources/jboss800/ Modified: stack/native/trunk/modules/core/src/main/scripts/antrun-beans-config.xml stack/native/trunk/modules/dist/pom.xml stack/native/trunk/modules/dist/src/main/distro/build-deploy.xml stack/native/trunk/modules/dist/src/main/distro/build-setup.xml stack/native/trunk/modules/resources/pom.xml stack/native/trunk/modules/testsuite/pom.xml stack/native/trunk/pom.xml Log: Remove jboss800 target; WildfFly will never have jaxrpc support and hence never use jbossws-native at all Modified: stack/native/trunk/modules/core/src/main/scripts/antrun-beans-config.xml =================================================================== --- stack/native/trunk/modules/core/src/main/scripts/antrun-beans-config.xml 2014-02-13 11:31:00 UTC (rev 18353) +++ stack/native/trunk/modules/core/src/main/scripts/antrun-beans-config.xml 2014-02-13 11:45:16 UTC (rev 18354) @@ -34,11 +34,6 @@ tofile="${dest.dir}/jbossws-jboss720/jbossws.beans/META-INF/stack-specific-deployment-aspects.xml" /> - <copy - file="${src.dir}/jbossws-native-config-as7.xml" - tofile="${dest.dir}/jbossws-jboss800/jbossws.beans/META-INF/stack-specific-deployment-aspects.xml" - /> - </target> </project> Modified: stack/native/trunk/modules/dist/pom.xml =================================================================== --- stack/native/trunk/modules/dist/pom.xml 2014-02-13 11:31:00 UTC (rev 18353) +++ stack/native/trunk/modules/dist/pom.xml 2014-02-13 11:45:16 UTC (rev 18354) @@ -34,13 +34,6 @@ </dependency> <dependency> - <groupId>org.jboss.ws.native</groupId> - <artifactId>jbossws-native-resources</artifactId> - <version>${project.version}</version> - <classifier>jboss800</classifier> - </dependency> - - <dependency> <groupId>org.jboss.ws</groupId> <artifactId>jbossws-common-tools</artifactId> <scope>provided</scope> Modified: stack/native/trunk/modules/dist/src/main/distro/build-deploy.xml =================================================================== --- stack/native/trunk/modules/dist/src/main/distro/build-deploy.xml 2014-02-13 11:31:00 UTC (rev 18353) +++ stack/native/trunk/modules/dist/src/main/distro/build-deploy.xml 2014-02-13 11:45:16 UTC (rev 18354) @@ -52,33 +52,6 @@ </target> <!-- ================================================================== --> - <!-- Prepare Deployment Structure JBoss-8.0.x --> - <!-- ================================================================== --> - - <target name="deploy-structure-jboss80x" depends="prepare-deploy"> - <delete dir="${deploy.structure}"/> - - <path id="jbossws-common.path"> - <fileset dir="${deploy.artifacts.dir}"> - <include name="**/jbossws-common-tools.jar"/> - </fileset> - </path> - <taskdef name="installModules" classname="org.jboss.ws.tools.ant.InstallModulesTask" classpathref="jbossws-common.path"/> - - <antcall target="deploy-jbossws-native-modules" 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="jboss800"/> - </antcall> - <copy toDir="${deploy.structure}/modules/system/layers/base"> - <fileset dir="${deploy.artifacts.dir}/modules/jboss800"> - <include name="**/jboss/as/webservices/**/module.xml"/> - </fileset> - </copy> - </target> - - <!-- ================================================================== --> <!-- Deployment jboss720 --> <!-- ================================================================== --> @@ -107,33 +80,4 @@ <macro-undeploy-jbossws-modules targetdir="${jboss720.home}/modules/system/layers/base" defaultmodulesconf="${jbossws.default.modules.conf}" modifyjbossintegration="true"/> </target> - <!-- ================================================================== --> - <!-- Deployment jboss800 --> - <!-- ================================================================== --> - - <target name="target-jboss800"> - <property name="jbossws.integration.target" value="jboss800"/> - <echo message="jbossws.integration.target=${jbossws.integration.target}" file="${target.properties.file}"/> - </target> - - <target name="deploy-jboss800" depends="undeploy-jboss800,deploy-structure-jboss80x" description="Deploy jbossws to jboss800"> - <fail message="Not available: ${jboss800.available.file}" unless="jboss800.available"/> - <copy todir="${jboss800.home}" overwrite="true" verbose="true"> - <fileset dir="${deploy.structure}"> - <exclude name="**/jboss/as/webservices/**/module.xml"/> - </fileset> - </copy> - <!-- Install org/jboss/as/webservices module.xml separately since it needs to reference libs already on the AS --> - <installModules targetDir="${jboss800.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-jboss800" depends="target-jboss800,init" description="Remove jbossws from jboss800"> - <fail message="Not available: ${jboss800.available.file}" unless="jboss800.available"/> - <macro-undeploy-jbossws-modules targetdir="${jboss800.home}/modules/system/layers/base" defaultmodulesconf="${jbossws.default.modules.conf}" modifyjbossintegration="false"/> - </target> - </project> Modified: stack/native/trunk/modules/dist/src/main/distro/build-setup.xml =================================================================== --- stack/native/trunk/modules/dist/src/main/distro/build-setup.xml 2014-02-13 11:31:00 UTC (rev 18353) +++ stack/native/trunk/modules/dist/src/main/distro/build-setup.xml 2014-02-13 11:45:16 UTC (rev 18354) @@ -35,10 +35,8 @@ <property name="jboss.server.instance" value="default"/> <property name="jboss720.available.file" value="${jboss720.home}/jboss-modules.jar"/> - <property name="jboss800.available.file" value="${jboss800.home}/jboss-modules.jar"/> <available property="jboss720.available" file="${jboss720.available.file}"/> - <available property="jboss800.available" file="${jboss800.available.file}"/> <tstamp> <format property="build.id" pattern="yyyyMMddHHmm"/> Modified: stack/native/trunk/modules/resources/pom.xml =================================================================== --- stack/native/trunk/modules/resources/pom.xml 2014-02-13 11:31:00 UTC (rev 18353) +++ stack/native/trunk/modules/resources/pom.xml 2014-02-13 11:45:16 UTC (rev 18354) @@ -51,15 +51,6 @@ <classesDirectory>${project.build.directory}/classes/resources/jbossws-jboss720/jbossws.beans</classesDirectory> </configuration> </execution> - <execution> - <id>jboss800</id> - <goals><goal>jar</goal></goals> - <phase>package</phase> - <configuration> - <classifier>jboss800</classifier> - <classesDirectory>${project.build.directory}/classes/resources/jbossws-jboss800/jbossws.beans</classesDirectory> - </configuration> - </execution> </executions> </plugin> </plugins> Modified: stack/native/trunk/modules/testsuite/pom.xml =================================================================== --- stack/native/trunk/modules/testsuite/pom.xml 2014-02-13 11:31:00 UTC (rev 18353) +++ stack/native/trunk/modules/testsuite/pom.xml 2014-02-13 11:45:16 UTC (rev 18354) @@ -281,37 +281,6 @@ </profile> <!-- - Name: jboss800 - Descr: JBoss-8.0.0 specific options - --> - <profile> - <id>jboss800</id> - <properties> - <jboss.version>${jboss800.version}</jboss.version> - <jbossws.integration.target>jboss800</jbossws.integration.target> - </properties> - <dependencies> - <dependency> - <groupId>org.jboss.as</groupId> - <artifactId>jboss-as-webservices-tests-integration</artifactId> - <version>${jboss.version}</version> - </dependency> - </dependencies> - <build> - <plugins> - <plugin> - <artifactId>maven-surefire-plugin</artifactId> - <configuration> - <argLine>${surefire.jvm.args} ${surefire.default-mgmt-serurity.args}</argLine> - <excludes> - <!-- no excludes ATM --> - </excludes> - </configuration> - </plugin> - </plugins> - </build> - </profile> - <!-- Name: no-jboss-bind-address Descr: Set the default jboss.bind.address Modified: stack/native/trunk/pom.xml =================================================================== --- stack/native/trunk/pom.xml 2014-02-13 11:31:00 UTC (rev 18353) +++ stack/native/trunk/pom.xml 2014-02-13 11:45:16 UTC (rev 18354) @@ -63,7 +63,6 @@ <jbossws.shared.testsuite.version>4.2.0.Beta1</jbossws.shared.testsuite.version> <jbossws.jboss720.version>4.3.0-SNAPSHOT</jbossws.jboss720.version> <jboss720.version>7.2.0.Final</jboss720.version> - <jboss800.version>8.0.0.Alpha1-SNAPSHOT</jboss800.version> <javassist.version>3.15.0-GA</javassist.version> <ejb.api.version>1.0.1.Final</ejb.api.version> <jaxrpc.api.version>1.0.0.Final</jaxrpc.api.version> @@ -373,18 +372,6 @@ </profile> <!-- - Name: jboss800 - Descr: JBoss-8.0.0 specific options - --> - <profile> - <id>jboss800</id> - <properties> - <jbossws.integration.target>jboss800</jbossws.integration.target> - <jboss.home>${jboss800.home}</jboss.home> - </properties> - </profile> - - <!-- Name: testsuite Descr: Executes the testsuite -->