[jbossws-commits] JBossWS SVN: r9483 - in stack/metro/trunk: modules/management and 5 other directories.
jbossws-commits at lists.jboss.org
jbossws-commits at lists.jboss.org
Wed Mar 4 08:07:03 EST 2009
Author: alessio.soldano at jboss.com
Date: 2009-03-04 08:07:02 -0500 (Wed, 04 Mar 2009)
New Revision: 9483
Removed:
stack/metro/trunk/modules/testsuite/test-excludes-jboss424.txt
Modified:
stack/metro/trunk/modules/management/pom.xml
stack/metro/trunk/modules/server/pom.xml
stack/metro/trunk/modules/server/src/main/scripts/antrun-beans-config.xml
stack/metro/trunk/modules/testsuite/pom.xml
stack/metro/trunk/pom.xml
stack/metro/trunk/profiles.xml.example
stack/metro/trunk/src/main/distro/ant.properties.example
stack/metro/trunk/src/main/distro/build-deploy.xml
stack/metro/trunk/src/main/distro/build-setup.xml
stack/metro/trunk/src/main/distro/build.xml
stack/metro/trunk/src/main/scripts/assembly-deploy-artifacts.xml
Log:
[JBWS-2568] Removing 4.2.4 support
Modified: stack/metro/trunk/modules/management/pom.xml
===================================================================
--- stack/metro/trunk/modules/management/pom.xml 2009-03-04 12:56:38 UTC (rev 9482)
+++ stack/metro/trunk/modules/management/pom.xml 2009-03-04 13:07:02 UTC (rev 9483)
@@ -37,11 +37,6 @@
</dependency>
<dependency>
<groupId>org.jboss.ws</groupId>
- <artifactId>jbossws-jboss424x</artifactId>
- <scope>runtime</scope>
- </dependency>
- <dependency>
- <groupId>org.jboss.ws</groupId>
<artifactId>jbossws-jboss500</artifactId>
<scope>runtime</scope>
</dependency>
Modified: stack/metro/trunk/modules/server/pom.xml
===================================================================
--- stack/metro/trunk/modules/server/pom.xml 2009-03-04 12:56:38 UTC (rev 9482)
+++ stack/metro/trunk/modules/server/pom.xml 2009-03-04 13:07:02 UTC (rev 9483)
@@ -33,13 +33,6 @@
<classifier>resources</classifier>
<type>zip</type>
</dependency>
- <dependency>
- <groupId>org.jboss.ws</groupId>
- <artifactId>jbossws-jboss424x</artifactId>
- <version>${jbossws.jboss424.version}</version>
- <classifier>resources</classifier>
- <type>zip</type>
- </dependency>
<!-- Metro dependencies -->
<dependency>
@@ -161,14 +154,6 @@
</artifactItem>
<artifactItem>
<groupId>org.jboss.ws</groupId>
- <artifactId>jbossws-jboss424x</artifactId>
- <version>${jbossws.jboss424.version}</version>
- <classifier>resources</classifier>
- <type>zip</type>
- <outputDirectory>${project.build.directory}/resources/jbossws-jboss424</outputDirectory>
- </artifactItem>
- <artifactItem>
- <groupId>org.jboss.ws</groupId>
<artifactId>jbossws-jboss500</artifactId>
<version>${jbossws.jboss500.version}</version>
<classifier>resources</classifier>
Modified: stack/metro/trunk/modules/server/src/main/scripts/antrun-beans-config.xml
===================================================================
--- stack/metro/trunk/modules/server/src/main/scripts/antrun-beans-config.xml 2009-03-04 12:56:38 UTC (rev 9482)
+++ stack/metro/trunk/modules/server/src/main/scripts/antrun-beans-config.xml 2009-03-04 13:07:02 UTC (rev 9483)
@@ -39,18 +39,6 @@
</deployment> </footer>
</concat>
- <!-- Concat jbossws-jboss424/jbossws.beans -->
- <echo message="Concat jbossws-jboss424/jbossws.beans"/>
- <concat destfile="${project.build.resources.directory}/jbossws-jboss424/jbossws.beans/META-INF/jboss-beans.xml">
- <header trimleading="yes">
- <deployment xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="urn:jboss:bean-deployer bean-deployer_1_0.xsd"
- xmlns="urn:jboss:bean-deployer"> </header>
- <fileset file="${project.resources.directory}/jbossws-metro-config.xml"/>
- <fileset file="${project.build.resources.directory}/jbossws-jboss424/jbossws-jboss42-config.xml"/>
- <footer trimleading="yes">
- </deployment> </footer>
- </concat>
-
<!-- Concat jbossws-jboss500/jbossws.beans -->
<echo message="Concat jbossws-jboss500/jbossws.beans"/>
<concat destfile="${project.build.resources.directory}/jbossws-jboss500/jbossws.beans/META-INF/jboss-beans.xml">
Modified: stack/metro/trunk/modules/testsuite/pom.xml
===================================================================
--- stack/metro/trunk/modules/testsuite/pom.xml 2009-03-04 12:56:38 UTC (rev 9482)
+++ stack/metro/trunk/modules/testsuite/pom.xml 2009-03-04 13:07:02 UTC (rev 9483)
@@ -332,51 +332,6 @@
</profile>
<!--
- Name: jboss424
- Descr: JBoss-4.2.4 specific options
- -->
- <profile>
- <id>jboss424</id>
- <properties>
- <jboss.version>4.2.4-SNAPSHOT</jboss.version>
- <jbossws.integration.target>jboss424</jbossws.integration.target>
- </properties>
- <dependencies>
- <dependency>
- <groupId>org.jboss.client</groupId>
- <artifactId>jbossall-client</artifactId>
- <version>${jboss.version}</version>
- </dependency>
- <dependency>
- <groupId>org.jboss</groupId>
- <artifactId>jnpserver</artifactId>
- <version>${jboss.version}</version>
- </dependency>
- <dependency>
- <groupId>org.jboss.ws</groupId>
- <artifactId>jbossws-jboss424x</artifactId>
- </dependency>
- </dependencies>
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-compiler-plugin</artifactId>
- <configuration>
- <!-- http://jira.codehaus.org/browse/MCOMPILER-72 -->
- <testExcludeFile>../test-excludes-jboss424.txt</testExcludeFile>
- </configuration>
- </plugin>
- <plugin>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <argLine>${surefire.jvm.args} -Djava.endorsed.dirs=${jboss424.home}/lib/endorsed</argLine>
- </configuration>
- </plugin>
- </plugins>
- </build>
- </profile>
-
- <!--
Name: jboss500
Descr: JBoss-5.0.0 specific options
-->
Deleted: stack/metro/trunk/modules/testsuite/test-excludes-jboss424.txt
===================================================================
--- stack/metro/trunk/modules/testsuite/test-excludes-jboss424.txt 2009-03-04 12:56:38 UTC (rev 9482)
+++ stack/metro/trunk/modules/testsuite/test-excludes-jboss424.txt 2009-03-04 13:07:02 UTC (rev 9483)
@@ -1,65 +0,0 @@
-# EJB3/Injection excludes
-org/jboss/test/ws/jaxws/samples/webserviceref/**
-org/jboss/test/ws/jaxws/jbws2307/**
-
-# Exclude endpoints with AS5 @SecurityDomain
-org/jboss/test/ws/jaxws/samples/securityDomain/SecureEndpointAS5Impl.*
-
-# UsernameTestCase requires keystore & trustore in jboss-web tomcat configuration
-org/jboss/test/ws/jaxws/samples/wsse/UsernameTestCase.*
-
-# [JBWS-981] @WebContext defined virtual hosts only being fixed for JBoss 5
-org/jboss/test/ws/jaxws/jbws981/JBWS981TestCase.*
-
-# [JBWS-1841] WebServiceRef injection from DD doesn't work
-org/jboss/test/ws/jaxws/jbws1841/**
-
-# [JBWS-1949] Metro MTOM ignores content-type on attachment part
-org/jboss/test/ws/jaxws/samples/xop/doclit/XOPBare*.*
-org/jboss/test/ws/jaxws/samples/xop/doclit/XOPWrapped*.*
-org/jboss/test/ws/jaxws/samples/xop/doclit/MTOMFeatureTestCase.*
-
-# [JBWS-2127] Cannot generate WSDL for binding "http://www.w3.org/2003/05/soap/bindings/HTTP/"
-org/jboss/test/ws/jaxws/binding/**
-org/jboss/test/ws/jaxws/handlerscope/**
-org/jboss/test/ws/jaxws/jbws2183/**
-
-# [JBWS-2131] NoSuchElementException during wsdl generation at deploy
-org/jboss/test/ws/jaxws/jbws1702/**
-
-# [JBWS-2240] PortComponent from jboss.xml descriptor is not parsed
-org/jboss/test/ws/jaxws/jbws2241/**
-
-# [JBWS-2247] Write test for JBWS-1190 from scratch using MessageContext properties
-org/jboss/test/ws/jaxws/jbws1190/**
-
-# [JBWS-2257] Wrong WebServiceContext injected in EJB3 endpoints
-org/jboss/test/ws/jaxws/jbws2257/**
-
-# [JBWS-2308] faultCode argument for createFault was passed NULL
-org/jboss/test/ws/jaxws/jbws2308/JBWS2308ServletTestCase.*
-
-# [JBWS-2329] Failed to deploy service with multiple bindings
-org/jboss/test/ws/jaxws/jbws2278/**
-
-# [JBWS-2347] Rewrite @WebFault related tests
-org/jboss/test/ws/jaxws/jbws1904/**
-org/jboss/test/ws/jaxws/webfault/**
-
-# [JBWS-2348] Fix jbws1969 testcase
-org/jboss/test/ws/jaxws/jbws1969/**
-
-# [JBWS-2397] Fix jbws1797 testcase
-org/jboss/test/ws/jaxws/jbws1797/**
-
-# [JBWS-2400] Rewrite large attachment testcase
-org/jboss/test/ws/jaxws/jbws2000/**
-
-# [JBWS-2462] Address rewrite test fails in Metro integration
-org/jboss/test/ws/jaxws/jbws2150/**
-
-# [JBWS-2527] BeanFactory not initialized or already closed (fixed on AS 5.x series only)
-org/jboss/test/ws/jaxws/jbws2527/**
-
-# [JBWS-2532] Fix MTOM/XOP Content Type Testcase failure
-org/jboss/test/ws/jaxws/jbws2419/**
\ No newline at end of file
Modified: stack/metro/trunk/pom.xml
===================================================================
--- stack/metro/trunk/pom.xml 2009-03-04 12:56:38 UTC (rev 9482)
+++ stack/metro/trunk/pom.xml 2009-03-04 13:07:02 UTC (rev 9483)
@@ -49,7 +49,6 @@
<jbossws.framework.version>3.1.1-SNAPSHOT</jbossws.framework.version>
<jbossws.spi.version>1.1.1-SNAPSHOT</jbossws.spi.version>
<jbossws.jboss423.version>3.1.0.GA</jbossws.jboss423.version>
- <jbossws.jboss424.version>3.1.0.GA</jbossws.jboss424.version>
<jbossws.jboss500.version>3.1.0.GA</jbossws.jboss500.version>
<jbossws.jboss501.version>3.1.0.GA</jbossws.jboss501.version>
<!-- JBWS-2505 -->
@@ -118,18 +117,6 @@
</dependency>
<dependency>
<groupId>org.jboss.ws</groupId>
- <artifactId>jbossws-jboss424x</artifactId>
- <version>${jbossws.jboss424.version}</version>
- </dependency>
- <dependency>
- <groupId>org.jboss.ws</groupId>
- <artifactId>jbossws-jboss424x</artifactId>
- <version>${jbossws.jboss424.version}</version>
- <classifier>resources</classifier>
- <type>zip</type>
- </dependency>
- <dependency>
- <groupId>org.jboss.ws</groupId>
<artifactId>jbossws-jboss500</artifactId>
<version>${jbossws.jboss500.version}</version>
</dependency>
@@ -460,18 +447,6 @@
</profile>
<!--
- Name: jboss424
- Descr: JBoss-4.2.4 specific options
- -->
- <profile>
- <id>jboss424</id>
- <properties>
- <jbossws.integration.target>jboss424</jbossws.integration.target>
- <jboss.home>${jboss424.home}</jboss.home>
- </properties>
- </profile>
-
- <!--
Name: jboss500
Descr: JBoss-5.0.0 specific options
-->
Modified: stack/metro/trunk/profiles.xml.example
===================================================================
--- stack/metro/trunk/profiles.xml.example 2009-03-04 12:56:38 UTC (rev 9482)
+++ stack/metro/trunk/profiles.xml.example 2009-03-04 13:07:02 UTC (rev 9483)
@@ -12,7 +12,6 @@
</activation>
<properties>
<jboss423.home>/home/opalka/svn/jbossas/tags/JBoss_4_2_3_GA/build/output/jboss-4.2.3.GA</jboss423.home>
- <jboss424.home>/home/opalka/svn/jbossas/branches/Branch_4_2/build/output/jboss-4.2.4.GA</jboss424.home>
<jboss500.home>/home/opalka/svn/jbossas/tags/JBoss_5_0_0_GA/build/output/jboss-5.0.0.GA</jboss500.home>
<jboss501.home>/home/opalka/svn/jbossas/branches/Branch_5_0/build/output/jboss-5.0.1.GA</jboss501.home>
<jboss510.home>/home/opalka/svn/jbossas/branches/Branch_5_x/build/output/jboss-5.1.0.Beta1</jboss510.home>
Modified: stack/metro/trunk/src/main/distro/ant.properties.example
===================================================================
--- stack/metro/trunk/src/main/distro/ant.properties.example 2009-03-04 12:56:38 UTC (rev 9482)
+++ stack/metro/trunk/src/main/distro/ant.properties.example 2009-03-04 13:07:02 UTC (rev 9483)
@@ -4,13 +4,12 @@
# Optional JBoss Home
jboss423.home=@jboss423.home@
-jboss424.home=@jboss424.home@
jboss500.home=@jboss500.home@
jboss501.home=@jboss501.home@
jboss510.home=@jboss510.home@
jboss600.home=@jboss600.home@
-# The JBoss server under test. This can be [jboss423|jboss424|jboss500|jboss501|jboss510|jboss600]
+# The JBoss server under test. This can be [jboss423|jboss500|jboss501|jboss510|jboss600]
jbossws.integration.target=jboss500
# The JBoss settings
Modified: stack/metro/trunk/src/main/distro/build-deploy.xml
===================================================================
--- stack/metro/trunk/src/main/distro/build-deploy.xml 2009-03-04 12:56:38 UTC (rev 9482)
+++ stack/metro/trunk/src/main/distro/build-deploy.xml 2009-03-04 13:07:02 UTC (rev 9483)
@@ -51,30 +51,6 @@
</target>
<!-- ================================================================== -->
- <!-- Deployment JBoss424 -->
- <!-- ================================================================== -->
-
- <target name="target-jboss424">
- <property name="jboss.server.instance" value="default"/>
- <property name="jbossws.integration.target" value="jboss424"/>
- <echo message="jbossws.integration.target=${jbossws.integration.target}${line.separator}" file="${target.properties.file}"/>
- <echo message="jboss.server.instance=${jboss.server.instance}${line.separator}" file="${target.properties.file}" append="true"/>
- </target>
-
- <target name="deploy-jboss424" depends="undeploy-jboss424,deploy-structure-jboss42" description="Deploy jbossws to jboss424">
- <fail message="Not available: ${jboss424.available.file}" unless="jboss424.available"/>
- <copy todir="${jboss424.home}" overwrite="true">
- <fileset dir="${deploy.structure}"/>
- </copy>
- <chmod dir="${jboss424.home}/bin" perm="+x" includes="*.sh"/>
- </target>
-
- <target name="undeploy-jboss424" depends="target-jboss424,init" description="Remove jbossws from jboss424">
- <fail message="Not available: ${jboss424.available.file}" unless="jboss424.available"/>
- <macro-undeploy-jbossws42 targetdir="${jboss424.server.deploy}/jbossws.sar" defaultconf="${jbossws.as4.default.deploy.conf}"/>
- </target>
-
- <!-- ================================================================== -->
<!-- Prepare Deployment Structure JBoss-5.0.x -->
<!-- ================================================================== -->
Modified: stack/metro/trunk/src/main/distro/build-setup.xml
===================================================================
--- stack/metro/trunk/src/main/distro/build-setup.xml 2009-03-04 12:56:38 UTC (rev 9482)
+++ stack/metro/trunk/src/main/distro/build-setup.xml 2009-03-04 13:07:02 UTC (rev 9483)
@@ -26,12 +26,6 @@
<property name="jboss423.server.lib" value="${jboss423.server}/lib"/>
<property name="jboss423.server.deploy" value="${jboss423.server}/deploy"/>
- <property name="jboss424.lib" value="${jboss424.home}/lib"/>
- <property name="jboss424.client" value="${jboss424.home}/client"/>
- <property name="jboss424.server" value="${jboss424.home}/server/${jboss.server.instance}"/>
- <property name="jboss424.server.lib" value="${jboss424.server}/lib"/>
- <property name="jboss424.server.deploy" value="${jboss424.server}/deploy"/>
-
<property name="jboss500.lib" value="${jboss500.home}/lib"/>
<property name="jboss500.client" value="${jboss500.home}/client"/>
<property name="jboss500.server" value="${jboss500.home}/server/${jboss.server.instance}"/>
@@ -61,14 +55,12 @@
<property name="jboss600.server.deployers" value="${jboss600.server}/deployers"/>
<property name="jboss423.available.file" value="${jboss423.client}/jboss-client.jar"/>
- <property name="jboss424.available.file" value="${jboss424.client}/jboss-client.jar"/>
<property name="jboss500.available.file" value="${jboss500.client}/jboss-client.jar"/>
<property name="jboss501.available.file" value="${jboss501.client}/jboss-client.jar"/>
<property name="jboss510.available.file" value="${jboss510.client}/jboss-client.jar"/>
<property name="jboss600.available.file" value="${jboss600.client}/jboss-client.jar"/>
<available property="jboss423.available" file="${jboss423.available.file}"/>
- <available property="jboss424.available" file="${jboss424.available.file}"/>
<available property="jboss500.available" file="${jboss500.available.file}"/>
<available property="jboss501.available" file="${jboss501.available.file}"/>
<available property="jboss510.available" file="${jboss510.available.file}"/>
Modified: stack/metro/trunk/src/main/distro/build.xml
===================================================================
--- stack/metro/trunk/src/main/distro/build.xml 2009-03-04 12:56:38 UTC (rev 9482)
+++ stack/metro/trunk/src/main/distro/build.xml 2009-03-04 13:07:02 UTC (rev 9483)
@@ -49,7 +49,6 @@
<condition property="jbossws.integration.jboss42" value="true">
<or>
<equals arg1="${jbossws.integration.target}" arg2="jboss423"/>
- <equals arg1="${jbossws.integration.target}" arg2="jboss424"/>
</or>
</condition>
<condition property="jbossws.integration.jboss50" value="true">
Modified: stack/metro/trunk/src/main/scripts/assembly-deploy-artifacts.xml
===================================================================
--- stack/metro/trunk/src/main/scripts/assembly-deploy-artifacts.xml 2009-03-04 12:56:38 UTC (rev 9482)
+++ stack/metro/trunk/src/main/scripts/assembly-deploy-artifacts.xml 2009-03-04 13:07:02 UTC (rev 9483)
@@ -88,16 +88,6 @@
</dependencySet>
<dependencySet>
<outputDirectory>lib</outputDirectory>
- <outputFileNameMapping>jbossws-jboss424.${module.extension}</outputFileNameMapping>
- <useStrictFiltering>true</useStrictFiltering>
- <scope>runtime</scope>
- <unpack>false</unpack>
- <includes>
- <include>org.jboss.ws:jbossws-jboss424x:jar</include>
- </includes>
- </dependencySet>
- <dependencySet>
- <outputDirectory>lib</outputDirectory>
<outputFileNameMapping>jbossws-jboss501.${module.extension}</outputFileNameMapping>
<useStrictFiltering>true</useStrictFiltering>
<scope>runtime</scope>
More information about the jbossws-commits
mailing list