Skip to content

Commit

Permalink
[JBWS-3934] Remove WildFly 8.1.0.Final from the supported target cont…
Browse files Browse the repository at this point in the history 
…ainers set
  • Loading branch information
@asoldano
asoldano committed Jul 30, 2015
1 parent 26ebcba commit a7da74c
Show file tree
Hide file tree
Showing 6 changed files with 1 addition and 169 deletions.
27 changes: 0 additions & 27 deletions modules/dist/pom.xml
View file
Expand Up @@ -200,33 +200,6 @@
</properties>
</profile>

<!--
Name: wildfly810
Descr: WildFly-8.1.0 specific dependencies
-->
<profile>
<id>wildfly810</id>
<dependencies>
<dependency>
<groupId>org.jboss.ws.cxf</groupId>
<artifactId>jbossws-cxf-resources</artifactId>
<version>${project.version}</version>
<classifier>wildfly810</classifier>
<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>
<scope>provided</scope>
</dependency>
</dependencies>
</profile>

<!--
Name: wildfly820
Descr: WildFly-8.2.0 specific dependencies
Expand Down
40 changes: 1 addition & 39 deletions modules/dist/src/main/scripts/build-deploy.xml
View file
Expand Up @@ -28,11 +28,7 @@
<property name="deploy.artifacts.dir" value="${basedir}/target/assembly/deploy-artifacts"/>
<property name="jbossws.default.modules.conf" value="${basedir}/target/assembly/deploy-artifacts/modules-deploy.conf"/>

<target name="deploy" depends="prepare,deploy-wildfly810-if-available,deploy-wildfly820-if-available,deploy-wildfly900-if-available,deploy-wildfly1000-if-available" description="Deploy jbossws to wildfly"/>

<target name="deploy-wildfly810-if-available" if="wildfly810.available">
<antcall target="deploy-wildfly810"/>
</target>
<target name="deploy" depends="prepare,deploy-wildfly820-if-available,deploy-wildfly900-if-available,deploy-wildfly1000-if-available" description="Deploy jbossws to wildfly"/>

<target name="deploy-wildfly820-if-available" if="wildfly820.available">
<antcall target="deploy-wildfly820"/>
Expand All @@ -47,9 +43,6 @@
</target>

<target name="prepare">
<condition property="wildfly810.home" value="${jboss.home}">
<equals arg1="${jbossws.integration.target}" arg2="wildfly810"/>
</condition>
<condition property="wildfly820.home" value="${jboss.home}">
<equals arg1="${jbossws.integration.target}" arg2="wildfly820"/>
</condition>
Expand All @@ -59,11 +52,9 @@
<condition property="wildfly1000.home" value="${jboss.home}">
<equals arg1="${jbossws.integration.target}" arg2="wildfly1000"/>
</condition>
<property name="wildfly810.available.file" value="${wildfly810.home}/jboss-modules.jar"/>
<property name="wildfly820.available.file" value="${wildfly820.home}/jboss-modules.jar"/>
<property name="wildfly900.available.file" value="${wildfly900.home}/jboss-modules.jar"/>
<property name="wildfly1000.available.file" value="${wildfly1000.home}/jboss-modules.jar"/>
<available property="wildfly810.available" file="${wildfly810.available.file}"/>
<available property="wildfly820.available" file="${wildfly820.available.file}"/>
<available property="wildfly900.available" file="${wildfly900.available.file}"/>
<available property="wildfly1000.available" file="${wildfly1000.available.file}"/>
Expand Down Expand Up @@ -115,35 +106,6 @@
</copy>
</target>

<!-- ================================================================== -->
<!-- Deployment wildfly810 -->
<!-- ================================================================== -->

<target name="target-wildfly810">
<property name="jbossws.integration.target" value="wildfly810"/>
<echo message="jbossws.integration.target=${jbossws.integration.target}"/>
</target>

<target name="deploy-wildfly810" depends="undeploy-wildfly810,deploy-structure-wildfly80x">
<fail message="Not available: ${wildfly810.available.file}" unless="wildfly810.available"/>
<copy todir="${wildfly810.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="${wildfly810.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-wildfly810" depends="target-wildfly810,init">
<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="true"/>
</target>

<!-- ================================================================== -->
<!-- Deployment wildfly820 -->
<!-- ================================================================== -->
Expand Down
9 changes: 0 additions & 9 deletions modules/resources/pom.xml
View file
Expand Up @@ -50,15 +50,6 @@
<goals><goal>jar</goal></goals>
<phase>package</phase>
</execution>
<execution>
<id>wildfly810</id>
<goals><goal>jar</goal></goals>
<phase>package</phase>
<configuration>
<classifier>wildfly810</classifier>
<classesDirectory>${project.build.directory}/classes/resources/jbossws-wildfly810/jbossws.beans</classesDirectory>
</configuration>
</execution>
<execution>
<id>wildfly820</id>
<goals><goal>jar</goal></goals>
Expand Down
5 changes: 0 additions & 5 deletions modules/server/src/main/scripts/antrun-beans-config.xml
View file
Expand Up @@ -29,11 +29,6 @@

<target name="main">

<copy
file="${src.dir}/jbossws-cxf-config-as8.xml"
tofile="${dest.dir}/jbossws-wildfly810/jbossws.beans/META-INF/stack-specific-deployment-aspects.xml"
/>

<copy
file="${src.dir}/jbossws-cxf-config-as8.xml"
tofile="${dest.dir}/jbossws-wildfly820/jbossws.beans/META-INF/stack-specific-deployment-aspects.xml"
Expand Down
50 changes: 0 additions & 50 deletions modules/testsuite/pom.xml
View file
Expand Up @@ -553,56 +553,6 @@
</build>
</profile>

<!--
Name: wildfly810
Descr: WildFly-8.1.0 specific options
-->
<profile>
<id>wildfly810</id>
<dependencies>
<dependency>
<groupId>org.jboss.ws</groupId>
<artifactId>jbossws-wildfly810-tests-integration</artifactId>
</dependency>
<!-- Arquillian container integration -->
<dependency>
<groupId>org.wildfly.arquillian</groupId>
<artifactId>wildfly-arquillian-container-managed</artifactId>
</dependency>
<dependency>
<groupId>org.jboss.arquillian.protocol</groupId>
<artifactId>arquillian-protocol-servlet</artifactId>
<version>${arquillian.version}</version>
<scope>test</scope>
</dependency>
<!-- LittleProxy depencency declared in this profile as other profiles require different exclusions -->
<dependency>
<groupId>org.littleshoot</groupId>
<artifactId>littleproxy</artifactId>
<version>${org.littleshoot.littleproxy.version}</version>
<exclusions>
<exclusion>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
</exclusion>
<exclusion>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-log4j12</artifactId>
</exclusion>
<exclusion>
<groupId>net.sf.ehcache</groupId>
<artifactId>ehcache-core</artifactId>
</exclusion>
<!-- Let the container messaging subsystem control the Netty dependency version -->
<exclusion>
<groupId>io.netty</groupId>
<artifactId>netty-all</artifactId>
</exclusion>
</exclusions>
</dependency>
</dependencies>
</profile>

<!--
Name: wildfly820
Descr: WildFly-8.2.0 specific options
Expand Down
39 changes: 0 additions & 39 deletions pom.xml
View file
Expand Up @@ -65,10 +65,8 @@
<jbossws.spi.version>3.1.0-SNAPSHOT</jbossws.spi.version>
<jbossws.common.version>3.1.0-SNAPSHOT</jbossws.common.version>
<jbossws.common.tools.version>1.2.1.Final</jbossws.common.tools.version>
<jbossws.wildfly810.version>5.0.0.Final</jbossws.wildfly810.version>
<jbossws.wildfly820.version>5.0.0.Final</jbossws.wildfly820.version>
<jbossws.wildfly900.version>5.1.0-SNAPSHOT</jbossws.wildfly900.version>
<wildfly810.version>8.1.0.Final</wildfly810.version>
<wildfly820.version>8.2.0.Final</wildfly820.version>
<wildfly900.version>9.0.0.Final</wildfly900.version>
<wildfly1000.version>10.0.0.Beta1-SNAPSHOT</wildfly1000.version>
Expand Down Expand Up @@ -141,16 +139,6 @@
<artifactId>jbossws-spi</artifactId>
<version>${jbossws.spi.version}</version>
</dependency>
<dependency>
<groupId>org.jboss.ws</groupId>
<artifactId>jbossws-wildfly810-server-integration</artifactId>
<version>${jbossws.wildfly810.version}</version>
</dependency>
<dependency>
<groupId>org.jboss.ws</groupId>
<artifactId>jbossws-wildfly810-tests-integration</artifactId>
<version>${jbossws.wildfly810.version}</version>
</dependency>
<dependency>
<groupId>org.jboss.ws</groupId>
<artifactId>jbossws-wildfly820-server-integration</artifactId>
Expand Down Expand Up @@ -1238,33 +1226,6 @@
</properties>
</profile>

<!--
Name: wildfly810
Descr: WildFly-8.1.0 specific options
-->
<profile>
<id>wildfly810</id>
<properties>
<jbossws.integration.target>wildfly810</jbossws.integration.target>
<jboss.home>${server.home}</jboss.home>
<jboss.version>${wildfly810.version}</jboss.version>
<additionalJvmArgs>-Djavax.wsdl.factory.WSDLFactory=com.ibm.wsdl.factory.WSDLFactoryImpl ${ipVerArgs}</additionalJvmArgs>
</properties>
<modules>
<module>modules/dist</module>
<module>modules/testsuite</module>
</modules>
<dependencyManagement>
<dependencies>
<dependency>
<groupId>org.jboss</groupId>
<artifactId>jandex</artifactId>
<version>1.1.0.Final</version>
</dependency>
</dependencies>
</dependencyManagement>
</profile>

<!--
Name: wildfly820
Descr: WildFly-8.2.0 specific options
Expand Down

0 comments on commit a7da74c

Please sign in to comment.