[jbossws-commits] JBossWS SVN: r9344 - in stack/cxf/trunk: modules/management and 5 other directories.
jbossws-commits at lists.jboss.org
jbossws-commits at lists.jboss.org
Mon Feb 23 06:49:10 EST 2009
Author: richard.opalka at jboss.com
Date: 2009-02-23 06:49:09 -0500 (Mon, 23 Feb 2009)
New Revision: 9344
Removed:
stack/cxf/trunk/modules/testsuite/test-excludes-jboss422.txt
Modified:
stack/cxf/trunk/build.xml
stack/cxf/trunk/modules/management/pom.xml
stack/cxf/trunk/modules/server/pom.xml
stack/cxf/trunk/modules/server/src/main/scripts/antrun-beans-config.xml
stack/cxf/trunk/modules/testsuite/pom.xml
stack/cxf/trunk/pom.xml
stack/cxf/trunk/profiles.xml.example
stack/cxf/trunk/src/main/distro/ant.properties.example
stack/cxf/trunk/src/main/distro/build-deploy.xml
stack/cxf/trunk/src/main/distro/build-setup.xml
stack/cxf/trunk/src/main/distro/build.xml
stack/cxf/trunk/src/main/scripts/assembly-deploy-artifacts.xml
Log:
removing AS 422 support
Modified: stack/cxf/trunk/build.xml
===================================================================
--- stack/cxf/trunk/build.xml 2009-02-23 11:17:03 UTC (rev 9343)
+++ stack/cxf/trunk/build.xml 2009-02-23 11:49:09 UTC (rev 9344)
@@ -55,9 +55,6 @@
<arg value="help:effective-settings"/>
</exec>
<xmlproperty file="${stack.output.dir}/effective-settings.xml" keeproot="false"/>
- <condition property="jboss422.home" value="${profiles.profile.properties.jboss422.home}">
- <isset property="profiles.profile.properties.jboss422.home"/>
- </condition>
<condition property="jboss423.home" value="${profiles.profile.properties.jboss423.home}">
<isset property="profiles.profile.properties.jboss423.home"/>
</condition>
@@ -79,7 +76,6 @@
<!-- Loads the properties from the user profile -->
<xmlproperty file="${basedir}/profiles.xml" keeproot="false"/>
- <property name="jboss422.home" value="${profiles.profile.properties.jboss422.home}"/>
<property name="jboss423.home" value="${profiles.profile.properties.jboss423.home}"/>
<property name="jboss424.home" value="${profiles.profile.properties.jboss424.home}"/>
<property name="jboss500.home" value="${profiles.profile.properties.jboss500.home}"/>
@@ -88,7 +84,6 @@
<property name="jboss600.home" value="${profiles.profile.properties.jboss600.home}"/>
<echo/>
- <echo message="jboss422.home=${jboss422.home}"/>
<echo message="jboss423.home=${jboss423.home}"/>
<echo message="jboss424.home=${jboss424.home}"/>
<echo message="jboss500.home=${jboss500.home}"/>
Modified: stack/cxf/trunk/modules/management/pom.xml
===================================================================
--- stack/cxf/trunk/modules/management/pom.xml 2009-02-23 11:17:03 UTC (rev 9343)
+++ stack/cxf/trunk/modules/management/pom.xml 2009-02-23 11:49:09 UTC (rev 9344)
@@ -32,11 +32,6 @@
</dependency>
<dependency>
<groupId>org.jboss.ws</groupId>
- <artifactId>jbossws-jboss422</artifactId>
- <scope>runtime</scope>
- </dependency>
- <dependency>
- <groupId>org.jboss.ws</groupId>
<artifactId>jbossws-jboss423</artifactId>
<scope>runtime</scope>
</dependency>
Modified: stack/cxf/trunk/modules/server/pom.xml
===================================================================
--- stack/cxf/trunk/modules/server/pom.xml 2009-02-23 11:17:03 UTC (rev 9343)
+++ stack/cxf/trunk/modules/server/pom.xml 2009-02-23 11:49:09 UTC (rev 9344)
@@ -28,13 +28,6 @@
</dependency>
<dependency>
<groupId>org.jboss.ws</groupId>
- <artifactId>jbossws-jboss422</artifactId>
- <version>${jbossws.jboss422.version}</version>
- <classifier>resources</classifier>
- <type>zip</type>
- </dependency>
- <dependency>
- <groupId>org.jboss.ws</groupId>
<artifactId>jbossws-jboss423</artifactId>
<version>${jbossws.jboss423.version}</version>
<classifier>resources</classifier>
@@ -211,14 +204,6 @@
<artifactItems>
<artifactItem>
<groupId>org.jboss.ws</groupId>
- <artifactId>jbossws-jboss422</artifactId>
- <version>${jbossws.jboss422.version}</version>
- <classifier>resources</classifier>
- <type>zip</type>
- <outputDirectory>${project.build.directory}/resources/jbossws-jboss422</outputDirectory>
- </artifactItem>
- <artifactItem>
- <groupId>org.jboss.ws</groupId>
<artifactId>jbossws-jboss423</artifactId>
<version>${jbossws.jboss423.version}</version>
<classifier>resources</classifier>
@@ -286,7 +271,6 @@
</goals>
<configuration>
<tasks>
- <property name="jbossws.jboss422.version" value="${jbossws.jboss422.version}"/>
<property name="jbossws.jboss423.version" value="${jbossws.jboss423.version}"/>
<property name="jbossws.jboss424.version" value="${jbossws.jboss424.version}"/>
<ant antfile="src/main/scripts/antrun-beans-config.xml"/>
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 2009-02-23 11:17:03 UTC (rev 9343)
+++ stack/cxf/trunk/modules/server/src/main/scripts/antrun-beans-config.xml 2009-02-23 11:49:09 UTC (rev 9344)
@@ -27,18 +27,6 @@
<!-- Compile resource files -->
<target name="main" depends="init">
- <!-- Concat jbossws-jboss422/jbossws.beans -->
- <echo message="Concat jbossws-jboss422/jbossws.beans"/>
- <concat destfile="${project.build.resources.directory}/jbossws-jboss422/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-cxf-config.xml"/>
- <fileset file="${project.build.resources.directory}/jbossws-jboss422/jbossws-jboss42-config.xml"/>
- <footer trimleading="yes">
- </deployment> </footer>
- </concat>
-
<!-- Concat jbossws-jboss423/jbossws.beans -->
<echo message="Concat jbossws-jboss423/jbossws.beans"/>
<concat destfile="${project.build.resources.directory}/jbossws-jboss423/jbossws.beans/META-INF/jboss-beans.xml">
Modified: stack/cxf/trunk/modules/testsuite/pom.xml
===================================================================
--- stack/cxf/trunk/modules/testsuite/pom.xml 2009-02-23 11:17:03 UTC (rev 9343)
+++ stack/cxf/trunk/modules/testsuite/pom.xml 2009-02-23 11:49:09 UTC (rev 9344)
@@ -276,46 +276,6 @@
</profile>
<!--
- Name: jboss422
- Descr: JBoss-4.2.2 specific options
- -->
- <profile>
- <id>jboss422</id>
- <properties>
- <jboss.version>4.2.2.GA</jboss.version>
- <jbossws.integration.target>jboss422</jbossws.integration.target>
- </properties>
- <dependencies>
- <dependency>
- <groupId>org.jboss.client</groupId>
- <artifactId>jbossall-client</artifactId>
- <version>${jboss.version}</version>
- </dependency>
- <dependency>
- <groupId>org.jboss.ws</groupId>
- <artifactId>jbossws-jboss422</artifactId>
- </dependency>
- </dependencies>
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-compiler-plugin</artifactId>
- <configuration>
- <!-- http://jira.codehaus.org/browse/MCOMPILER-72 -->
- <testExcludeFile>../test-excludes-jboss422.txt</testExcludeFile>
- </configuration>
- </plugin>
- <plugin>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <argLine>${surefire.jvm.args} -Djava.endorsed.dirs=${jboss422.home}/lib/endorsed</argLine>
- </configuration>
- </plugin>
- </plugins>
- </build>
- </profile>
-
- <!--
Name: jboss423
Descr: JBoss-4.2.3 specific options
-->
Deleted: stack/cxf/trunk/modules/testsuite/test-excludes-jboss422.txt
===================================================================
--- stack/cxf/trunk/modules/testsuite/test-excludes-jboss422.txt 2009-02-23 11:17:03 UTC (rev 9343)
+++ stack/cxf/trunk/modules/testsuite/test-excludes-jboss422.txt 2009-02-23 11:49:09 UTC (rev 9344)
@@ -1,98 +0,0 @@
-# EJB3/Injection excludes
-org/jboss/test/ws/jaxws/samples/webserviceref/**
-
-# Exclude endpoints with AS5 @SecurityDomain
-org/jboss/test/ws/jaxws/samples/securityDomain/SecureEndpointAS5Impl.*
-
-# [CXF-1252] Provider PAYLOAD endpoint expects SOAP Envelope
-org/jboss/test/ws/jaxws/samples/httpbinding/**
-org/jboss/test/ws/jaxws/samples/provider/ProviderJAXBTestCase.*
-org/jboss/test/ws/jaxws/samples/provider/ProviderPayloadTestCase.*
-
-# [CXF-1253] CXF does not respect @HandlerChain on client SEI
-org/jboss/test/ws/jaxws/samples/logicalhandler/LogicalHandlerSourceTestCase.*
-org/jboss/test/ws/jaxws/samples/handlerchain/HandlerChainTestCase.*
-
-# [CXF-1510] Cannot handle anonymous bare requests
-org/jboss/test/ws/jaxws/anonymous/**
-
-# [CXF-1511] WrappedMessageContext does not implement SOAPMessageContext
-org/jboss/test/ws/jaxws/binding/**
-
-# [CXF-1513] NPE in JaxWsServiceConfiguration
-org/jboss/test/ws/jaxws/handlerscope/**
-org/jboss/test/ws/jaxws/jbws1694/**
-org/jboss/test/ws/jaxws/jbws1797/**
-
-# [JBWS-2247][CXF-1514] Generated WSDL does not take 'transport-guarantee' in web.xml into account
-org/jboss/test/ws/jaxws/jbws1190/**
-
-# [CXF-1516] Type inheritance with document/literal/wrapped
-org/jboss/test/ws/jaxws/jbws1702/**
-
-# [CXF-1517] HTTP bindings for Provider
-org/jboss/test/ws/jaxws/jbws1807/**
-
-# [CXF-1519] Explicitly set the namespace of a WebFault
-org/jboss/test/ws/jaxws/jbws1904/**
-
-# [CXF-1520] MTOM chunked encoding transfer
-org/jboss/test/ws/jaxws/jbws2000/**
-
-# [CXF-1521] Exception handling with @WebFault annotation
-org/jboss/test/ws/jaxws/webfault/**
-
-# [CXF-1624] XmlSchemaException: Schema name conflict in collection
-org/jboss/test/ws/jaxws/samples/logicalhandler/LogicalHandlerJAXBTestCase.*
-
-# [CXF-2006] RespectBinding feature and not understood required extensibility elements
-org/jboss/test/ws/jaxws/jbws2449/**
-
-# [JBWS-981] @WebContext defined virtual hosts only being fixed for JBoss 5
-org/jboss/test/ws/jaxws/jbws981/JBWS981TestCase.*
-
-# [JBWS-1655] Add support for endpoint address rewriting
-org/jboss/test/ws/jaxws/jbws2150/**
-
-# [JBWS-2115] EJB client vehicle not sufficiently isolated
-org/jboss/test/ws/jaxws/jbws1581/**
-
-# [JBWS-2117] web.xml modified to web.xml.org - Subsequent runs fail
-org/jboss/test/ws/jaxws/jbws1762/**
-
-# [JBWS-2118] context-root in jboss.xml is ignored
-org/jboss/test/ws/jaxws/jbws1813/**
-
-# [JBWS-2119] WebServiceRef injection from DD doesn't work
-org/jboss/test/ws/jaxws/jbws1841/**
-
-# [JBWS-2165] Fix xop tests with maven build
-org/jboss/test/ws/jaxws/samples/xop/**
-
-# [JBWS-2223] wsconsume for cxf build
-org/jboss/test/ws/jaxws/complex/**
-org/jboss/test/ws/jaxws/holder/**
-
-# [JBWS-2227] Investigate why multiple virtual hosts test fails on CXF
-org/jboss/test/ws/jaxws/jbws1178/**
-
-# [JBWS-2240] PortComponent from jboss.xml descriptor is not parsed
-org/jboss/test/ws/jaxws/jbws2241/**
-
-# [JBWS-2307] Stub properties not propagated through service-ref (fixed in AS 5.x and above)
-org/jboss/test/ws/jaxws/jbws2307/JBWS2307TestCase.*
-
-# [JBWS-2330] Failed to deploy service with multiple bindings
-org/jboss/test/ws/jaxws/jbws2278/**
-
-# [JBWS-2480] Soap attachments are dropped on server response
-org/jboss/test/ws/jaxws/jbws1283/**
-
-# [JBWS-2491] Enable JAXWS 2.1 WebServiceContext methods
-org/jboss/test/ws/jaxws/jbws2257/**
-
-# [JBWS-2527] BeanFactory not initialized or already closed (fixed on AS 5.x series only)
-org/jboss/test/ws/jaxws/jbws2527/**
-
-# [JBWS-2533] Fix MTOM/XOP Content Type Testcase failure
-org/jboss/test/ws/jaxws/jbws2419/**
Modified: stack/cxf/trunk/pom.xml
===================================================================
--- stack/cxf/trunk/pom.xml 2009-02-23 11:17:03 UTC (rev 9343)
+++ stack/cxf/trunk/pom.xml 2009-02-23 11:49:09 UTC (rev 9344)
@@ -47,7 +47,6 @@
<jbossws.common.version>1.0.9-SNAPSHOT</jbossws.common.version>
<jbossws.framework.version>3.1.0-SNAPSHOT</jbossws.framework.version>
<jbossws.spi.version>1.1.0-SNAPSHOT</jbossws.spi.version>
- <jbossws.jboss422.version>3.1.0-SNAPSHOT</jbossws.jboss422.version>
<jbossws.jboss423.version>3.1.0-SNAPSHOT</jbossws.jboss423.version>
<jbossws.jboss424.version>3.1.0-SNAPSHOT</jbossws.jboss424.version>
<jbossws.jboss500.version>3.1.0-SNAPSHOT</jbossws.jboss500.version>
@@ -108,18 +107,6 @@
</dependency>
<dependency>
<groupId>org.jboss.ws</groupId>
- <artifactId>jbossws-jboss422</artifactId>
- <version>${jbossws.jboss422.version}</version>
- </dependency>
- <dependency>
- <groupId>org.jboss.ws</groupId>
- <artifactId>jbossws-jboss422</artifactId>
- <version>${jbossws.jboss422.version}</version>
- <classifier>resources</classifier>
- <type>zip</type>
- </dependency>
- <dependency>
- <groupId>org.jboss.ws</groupId>
<artifactId>jbossws-jboss423</artifactId>
<version>${jbossws.jboss423.version}</version>
</dependency>
@@ -544,18 +531,6 @@
</profile>
<!--
- Name: jboss422
- Descr: JBoss-4.2.2 specific options
- -->
- <profile>
- <id>jboss422</id>
- <properties>
- <jbossws.integration.target>jboss422</jbossws.integration.target>
- <jboss.home>${jboss422.home}</jboss.home>
- </properties>
- </profile>
-
- <!--
Name: jboss423
Descr: JBoss-4.2.2 specific options
-->
Modified: stack/cxf/trunk/profiles.xml.example
===================================================================
--- stack/cxf/trunk/profiles.xml.example 2009-02-23 11:17:03 UTC (rev 9343)
+++ stack/cxf/trunk/profiles.xml.example 2009-02-23 11:49:09 UTC (rev 9344)
@@ -11,7 +11,6 @@
</property>
</activation>
<properties>
- <jboss422.home>/home/opalka/svn/jbossas/tags/JBoss_4_2_2_GA/build/output/jboss-4.2.2.GA</jboss422.home>
<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>
Modified: stack/cxf/trunk/src/main/distro/ant.properties.example
===================================================================
--- stack/cxf/trunk/src/main/distro/ant.properties.example 2009-02-23 11:17:03 UTC (rev 9343)
+++ stack/cxf/trunk/src/main/distro/ant.properties.example 2009-02-23 11:49:09 UTC (rev 9344)
@@ -3,7 +3,6 @@
#
# Optional JBoss Home
-jboss422.home=@jboss422.home@
jboss423.home=@jboss423.home@
jboss424.home=@jboss424.home@
jboss500.home=@jboss500.home@
@@ -11,7 +10,7 @@
jboss510.home=@jboss510.home@
jboss600.home=@jboss600.home@
-# The JBoss server under test. This can be [jboss422|jboss423|jboss424|jboss500|jboss501|jboss510|jboss600]
+# The JBoss server under test. This can be [jboss423|jboss424|jboss500|jboss501|jboss510|jboss600]
jbossws.integration.target=jboss500
# The JBoss settings
Modified: stack/cxf/trunk/src/main/distro/build-deploy.xml
===================================================================
--- stack/cxf/trunk/src/main/distro/build-deploy.xml 2009-02-23 11:17:03 UTC (rev 9343)
+++ stack/cxf/trunk/src/main/distro/build-deploy.xml 2009-02-23 11:49:09 UTC (rev 9344)
@@ -27,28 +27,6 @@
</target>
<!-- ================================================================== -->
- <!-- Deployment JBoss422 -->
- <!-- ================================================================== -->
-
- <target name="target-jboss422">
- <property name="jbossws.integration.target" value="jboss422"/>
- <echo message="jbossws.integration.target=${jbossws.integration.target}" file="${target.properties.file}"/>
- </target>
-
- <target name="deploy-jboss422" depends="undeploy-jboss422,deploy-structure-jboss42" description="Deploy jbossws to jboss422">
- <fail message="Not available: ${jboss422.available.file}" unless="jboss422.available"/>
- <copy todir="${jboss422.home}" overwrite="true">
- <fileset dir="${deploy.structure}"/>
- </copy>
- <chmod dir="${jboss422.home}/bin" perm="+x" includes="*.sh"/>
- </target>
-
- <target name="undeploy-jboss422" depends="target-jboss422,init" description="Remove jbossws from jboss422">
- <fail message="Not available: ${jboss422.available.file}" unless="jboss422.available"/>
- <macro-undeploy-jbossws42 targetdir="${jboss422.server.deploy}/jbossws.sar" defaultconf="${jbossws.as4.default.deploy.conf}"/>
- </target>
-
- <!-- ================================================================== -->
<!-- Deployment JBoss423 -->
<!-- ================================================================== -->
Modified: stack/cxf/trunk/src/main/distro/build-setup.xml
===================================================================
--- stack/cxf/trunk/src/main/distro/build-setup.xml 2009-02-23 11:17:03 UTC (rev 9343)
+++ stack/cxf/trunk/src/main/distro/build-setup.xml 2009-02-23 11:49:09 UTC (rev 9344)
@@ -21,12 +21,6 @@
<property file="${target.properties.file}"/>
<property name="jboss.server.instance" value="default"/>
- <property name="jboss422.lib" value="${jboss422.home}/lib"/>
- <property name="jboss422.client" value="${jboss422.home}/client"/>
- <property name="jboss422.server" value="${jboss422.home}/server/${jboss.server.instance}"/>
- <property name="jboss422.server.lib" value="${jboss422.server}/lib"/>
- <property name="jboss422.server.deploy" value="${jboss422.server}/deploy"/>
-
<property name="jboss423.lib" value="${jboss423.home}/lib"/>
<property name="jboss423.client" value="${jboss423.home}/client"/>
<property name="jboss423.server" value="${jboss423.home}/server/${jboss.server.instance}"/>
@@ -67,7 +61,6 @@
<property name="jboss600.server.deploy" value="${jboss600.server}/deploy"/>
<property name="jboss600.server.deployers" value="${jboss600.server}/deployers"/>
- <property name="jboss422.available.file" value="${jboss422.client}/jboss-client.jar"/>
<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"/>
@@ -75,7 +68,6 @@
<property name="jboss510.available.file" value="${jboss510.client}/jboss-client.jar"/>
<property name="jboss600.available.file" value="${jboss600.client}/jboss-client.jar"/>
- <available property="jboss422.available" file="${jboss422.available.file}"/>
<available property="jboss423.available" file="${jboss423.available.file}"/>
<available property="jboss424.available" file="${jboss424.available.file}"/>
<available property="jboss500.available" file="${jboss500.available.file}"/>
Modified: stack/cxf/trunk/src/main/distro/build.xml
===================================================================
--- stack/cxf/trunk/src/main/distro/build.xml 2009-02-23 11:17:03 UTC (rev 9343)
+++ stack/cxf/trunk/src/main/distro/build.xml 2009-02-23 11:49:09 UTC (rev 9344)
@@ -48,7 +48,6 @@
<condition property="jbossws.integration.jboss42" value="true">
<or>
- <equals arg1="${jbossws.integration.target}" arg2="jboss422"/>
<equals arg1="${jbossws.integration.target}" arg2="jboss423"/>
<equals arg1="${jbossws.integration.target}" arg2="jboss424"/>
</or>
Modified: stack/cxf/trunk/src/main/scripts/assembly-deploy-artifacts.xml
===================================================================
--- stack/cxf/trunk/src/main/scripts/assembly-deploy-artifacts.xml 2009-02-23 11:17:03 UTC (rev 9343)
+++ stack/cxf/trunk/src/main/scripts/assembly-deploy-artifacts.xml 2009-02-23 11:49:09 UTC (rev 9344)
@@ -91,7 +91,6 @@
<unpack>false</unpack>
<includes>
<include>org.jboss.ws:jbossws-framework:jar</include>
- <include>org.jboss.ws:jbossws-jboss422:jar</include>
<include>org.jboss.ws:jbossws-jboss423:jar</include>
<include>org.jboss.ws:jbossws-jboss500:jar</include>
<include>org.jboss.jaxr:juddi-service:sar</include>
More information about the jbossws-commits
mailing list