JBossWS SVN: r7902 - in stack/metro/trunk: modules/management and 5 other directories.
by jbossws-commits＠lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2008-07-24 06:23:23 -0400 (Thu, 24 Jul 2008)
New Revision: 7902
Added:
stack/metro/trunk/modules/testsuite/test-excludes-jboss424.txt
Modified:
stack/metro/trunk/build.xml
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
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:
adding support for AS 4.2.4 branch too
Modified: stack/metro/trunk/build.xml
===================================================================
--- stack/metro/trunk/build.xml 2008-07-24 09:35:30 UTC (rev 7901)
+++ stack/metro/trunk/build.xml 2008-07-24 10:23:23 UTC (rev 7902)
@@ -46,15 +46,15 @@
<arg value="help:effective-settings"/>
</exec>
<xmlproperty file="${stack.output.dir}/effective-settings.xml" keeproot="false"/>
- <condition property="jboss421.home" value="${profiles.profile.properties.jboss421.home}">
- <isset property="profiles.profile.properties.jboss421.home"/>
- </condition>
<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>
+ <condition property="jboss424.home" value="${profiles.profile.properties.jboss424.home}">
+ <isset property="profiles.profile.properties.jboss424.home"/>
+ </condition>
<condition property="jboss500.home" value="${profiles.profile.properties.jboss500.home}">
<isset property="profiles.profile.properties.jboss500.home"/>
</condition>
@@ -64,16 +64,16 @@
<!-- Loads the properties from the user profile -->
<xmlproperty file="${basedir}/profiles.xml" keeproot="false"/>
- <property name="jboss421.home" value="${profiles.profile.properties.jboss421.home}"/>
<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}"/>
<property name="jboss501.home" value="${profiles.profile.properties.jboss501.home}"/>
<echo/>
- <echo message="jboss421.home=${jboss421.home}"/>
<echo message="jboss422.home=${jboss422.home}"/>
<echo message="jboss423.home=${jboss423.home}"/>
+ <echo message="jboss424.home=${jboss424.home}"/>
<echo message="jboss500.home=${jboss500.home}"/>
<echo message="jboss501.home=${jboss501.home}"/>
</target>
Modified: stack/metro/trunk/modules/management/pom.xml
===================================================================
--- stack/metro/trunk/modules/management/pom.xml 2008-07-24 09:35:30 UTC (rev 7901)
+++ stack/metro/trunk/modules/management/pom.xml 2008-07-24 10:23:23 UTC (rev 7902)
@@ -37,12 +37,17 @@
</dependency>
<dependency>
<groupId>org.jboss.ws</groupId>
- <artifactId>jbossws-jboss423x</artifactId>
+ <artifactId>jbossws-jboss423</artifactId>
<scope>runtime</scope>
</dependency>
- <!-- JBWS-2263
<dependency>
<groupId>org.jboss.ws</groupId>
+ <artifactId>jbossws-jboss424x</artifactId>
+ <scope>runtime</scope>
+ </dependency>
+ <!-- [JBWS-2263]
+ <dependency>
+ <groupId>org.jboss.ws</groupId>
<artifactId>jbossws-jboss500CR1</artifactId>
<scope>runtime</scope>
</dependency>
Modified: stack/metro/trunk/modules/server/pom.xml
===================================================================
--- stack/metro/trunk/modules/server/pom.xml 2008-07-24 09:35:30 UTC (rev 7901)
+++ stack/metro/trunk/modules/server/pom.xml 2008-07-24 10:23:23 UTC (rev 7902)
@@ -39,11 +39,18 @@
</dependency>
<dependency>
<groupId>org.jboss.ws</groupId>
- <artifactId>jbossws-jboss423x</artifactId>
+ <artifactId>jbossws-jboss423</artifactId>
<version>${jbossws.jboss423.version}</version>
<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,7 +168,7 @@
</artifactItem>
<artifactItem>
<groupId>org.jboss.ws</groupId>
- <artifactId>jbossws-jboss423x</artifactId>
+ <artifactId>jbossws-jboss423</artifactId>
<version>${jbossws.jboss423.version}</version>
<classifier>resources</classifier>
<type>zip</type>
@@ -169,6 +176,14 @@
</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-jboss500CR1</artifactId>
<version>${jbossws.jboss500.version}</version>
<classifier>resources</classifier>
@@ -201,6 +216,7 @@
<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"/>
</tasks>
</configuration>
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 2008-07-24 09:35:30 UTC (rev 7901)
+++ stack/metro/trunk/modules/server/src/main/scripts/antrun-beans-config.xml 2008-07-24 10:23:23 UTC (rev 7902)
@@ -53,6 +53,18 @@
</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 2008-07-24 09:35:30 UTC (rev 7901)
+++ stack/metro/trunk/modules/testsuite/pom.xml 2008-07-24 10:23:23 UTC (rev 7902)
@@ -333,7 +333,7 @@
<profile>
<id>jboss423</id>
<properties>
- <jboss.version>4.2.3-SNAPSHOT</jboss.version>
+ <jboss.version>4.2.3.GA</jboss.version>
<jbossws.integration.target>jboss423</jbossws.integration.target>
</properties>
<dependencies>
@@ -349,7 +349,7 @@
</dependency>
<dependency>
<groupId>org.jboss.ws</groupId>
- <artifactId>jbossws-jboss423x</artifactId>
+ <artifactId>jbossws-jboss423</artifactId>
</dependency>
</dependencies>
<build>
@@ -372,6 +372,51 @@
</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
-->
Added: stack/metro/trunk/modules/testsuite/test-excludes-jboss424.txt
===================================================================
--- stack/metro/trunk/modules/testsuite/test-excludes-jboss424.txt (rev 0)
+++ stack/metro/trunk/modules/testsuite/test-excludes-jboss424.txt 2008-07-24 10:23:23 UTC (rev 7902)
@@ -0,0 +1,62 @@
+#
+# $Id: test-excludes-jboss424.txt 7836 2008-07-16 17:21:11Z darran.lofthouse(a)jboss.com $
+#
+
+# EJB3/Injection excludes
+org/jboss/test/ws/jaxws/samples/webserviceref/**
+
+# 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-1841] WebServiceRef injection from DD doesn't work
+org/jboss/test/ws/jaxws/jbws1841/**
+
+# [JBWS-2127] Cannot generate WSDL for binding "http://www.w3.org/2003/05/soap/bindings/HTTP/"
+org/jboss/test/ws/jaxws/binding/**
+
+# [JBWS-2128] DefaultHttpContext is not a supported context.
+org/jboss/test/ws/jaxws/endpoint/**
+
+# [JBWS-2129] Wrapper class is not found
+org/jboss/test/ws/jaxws/handlerscope/**
+org/jboss/test/ws/jaxws/holder/**
+org/jboss/test/ws/jaxws/jbws1283/**
+org/jboss/test/ws/jaxws/jbws1357/**
+org/jboss/test/ws/jaxws/jbws1422/**
+org/jboss/test/ws/jaxws/jbws1505/**
+org/jboss/test/ws/jaxws/jbws1529/**
+org/jboss/test/ws/jaxws/jbws1566/**
+org/jboss/test/ws/jaxws/jbws1694/**
+org/jboss/test/ws/jaxws/jbws1733/**
+org/jboss/test/ws/jaxws/jbws1762/**
+org/jboss/test/ws/jaxws/jbws1797/**
+org/jboss/test/ws/jaxws/jbws1799/**
+org/jboss/test/ws/jaxws/jbws1822/**
+org/jboss/test/ws/jaxws/jbws1845/**
+org/jboss/test/ws/jaxws/jbws1872/**
+org/jboss/test/ws/jaxws/jbws1904/**
+org/jboss/test/ws/jaxws/jbws1969/**
+org/jboss/test/ws/jaxws/jbws2000/**
+org/jboss/test/ws/jaxws/jbws2250/**
+org/jboss/test/ws/jaxws/jbws860/**
+org/jboss/test/ws/jaxws/webfault/**
+
+# [JBWS-2131] NoSuchElementException during wsdl generation at deploy
+org/jboss/test/ws/jaxws/jbws1702/**
+
+# [JBWS-2132] IllegalArgumentException: protocol = http host = null
+org/jboss/test/ws/jaxws/jbws1798/**
+org/jboss/test/ws/jaxws/jbws1843/**
+org/jboss/test/ws/jaxws/jbws2009/**
+
+# [JBWS-2247] Write test for JBWS-1190 from scratch using MessageContext properties
+org/jboss/test/ws/jaxws/jbws1190/**
+
+# [JBWS-2249] NPE while creating endpoint
+org/jboss/test/ws/jaxws/jbws1807/**
+
+# [JBWS-981] @WebContext defined virtual hosts only being fixed for JBoss 5
+org/jboss/test/ws/jaxws/jbws981/JBWS981TestCase.*
\ No newline at end of file
Property changes on: stack/metro/trunk/modules/testsuite/test-excludes-jboss424.txt
___________________________________________________________________
Name: svn:executable
+ *
Modified: stack/metro/trunk/pom.xml
===================================================================
--- stack/metro/trunk/pom.xml 2008-07-24 09:35:30 UTC (rev 7901)
+++ stack/metro/trunk/pom.xml 2008-07-24 10:23:23 UTC (rev 7902)
@@ -52,6 +52,7 @@
<jbossws.spi.version>1.0.5-SNAPSHOT</jbossws.spi.version>
<jbossws.jboss422.version>3.0.2.GA</jbossws.jboss422.version>
<jbossws.jboss423.version>3.0.2.GA</jbossws.jboss423.version>
+ <jbossws.jboss424.version>3.0.3-SNAPSHOT</jbossws.jboss424.version>
<jbossws.jboss500.version>3.0.2.GA</jbossws.jboss500.version>
<jbossws.jboss501.version>3.0.3-SNAPSHOT</jbossws.jboss501.version>
<jboss.common.version>1.2.1.GA</jboss.common.version>
@@ -108,18 +109,30 @@
</dependency>
<dependency>
<groupId>org.jboss.ws</groupId>
- <artifactId>jbossws-jboss423x</artifactId>
+ <artifactId>jbossws-jboss423</artifactId>
<version>${jbossws.jboss423.version}</version>
</dependency>
<dependency>
<groupId>org.jboss.ws</groupId>
- <artifactId>jbossws-jboss423x</artifactId>
+ <artifactId>jbossws-jboss423</artifactId>
<version>${jbossws.jboss423.version}</version>
<classifier>resources</classifier>
<type>zip</type>
</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-jboss500CR1</artifactId>
<version>${jbossws.jboss500.version}</version>
</dependency>
@@ -396,6 +409,18 @@
</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 2008-07-24 09:35:30 UTC (rev 7901)
+++ stack/metro/trunk/profiles.xml.example 2008-07-24 10:23:23 UTC (rev 7902)
@@ -11,13 +11,13 @@
</property>
</activation>
<properties>
- <jboss421.home>/home/tdiesler/svn/jbossas/tags/JBoss_4_2_1_GA/build/output/jboss-4.2.1.GA</jboss421.home>
<jboss422.home>/home/tdiesler/svn/jbossas/tags/JBoss_4_2_2_GA/build/output/jboss-4.2.2.GA</jboss422.home>
<jboss423.home>/home/tdiesler/svn/jbossas/tags/JBoss_4_2_3_GA/build/output/jboss-4.2.3.GA</jboss423.home>
+ <jboss424.home>/home/tdiesler/svn/jbossas/branches/Branch_4_2/build/output/jboss-4.2.4.GA</jboss424.home>
<jboss500.home>/home/tdiesler/svn/jbossas/tags/JBoss_5_0_0_CR1/build/output/jboss-5.0.0.CR1</jboss500.home>
<jboss501.home>/home/tdiesler/svn/jbossas/trunk/build/output/jboss-5.0.0.CR2</jboss501.home>
</properties>
</profile>
</profiles>
-</profilesXml>
\ No newline at end of file
+</profilesXml>
Modified: stack/metro/trunk/src/main/distro/ant.properties
===================================================================
--- stack/metro/trunk/src/main/distro/ant.properties 2008-07-24 09:35:30 UTC (rev 7901)
+++ stack/metro/trunk/src/main/distro/ant.properties 2008-07-24 10:23:23 UTC (rev 7902)
@@ -6,6 +6,7 @@
# Optional JBoss Home
jboss422.home=(a)jboss422.home@
jboss423.home=(a)jboss423.home@
+jboss424.home=(a)jboss424.home@
jboss500.home=(a)jboss500.home@
jboss501.home=(a)jboss501.home@
Modified: stack/metro/trunk/src/main/distro/build-deploy.xml
===================================================================
--- stack/metro/trunk/src/main/distro/build-deploy.xml 2008-07-24 09:35:30 UTC (rev 7901)
+++ stack/metro/trunk/src/main/distro/build-deploy.xml 2008-07-24 10:23:23 UTC (rev 7902)
@@ -77,6 +77,30 @@
</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.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 2008-07-24 09:35:30 UTC (rev 7901)
+++ stack/metro/trunk/src/main/distro/build-setup.xml 2008-07-24 10:23:23 UTC (rev 7902)
@@ -34,6 +34,12 @@
<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}"/>
@@ -50,11 +56,13 @@
<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"/>
<property name="jboss501.available.file" value="${jboss501.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}"/>
<available property="jboss501.available" file="${jboss501.available.file}"/>
Modified: stack/metro/trunk/src/main/distro/build.xml
===================================================================
--- stack/metro/trunk/src/main/distro/build.xml 2008-07-24 09:35:30 UTC (rev 7901)
+++ stack/metro/trunk/src/main/distro/build.xml 2008-07-24 10:23:23 UTC (rev 7902)
@@ -51,6 +51,7 @@
<or>
<equals arg1="${jbossws.integration.target}" arg2="jboss422"/>
<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 2008-07-24 09:35:30 UTC (rev 7901)
+++ stack/metro/trunk/src/main/scripts/assembly-deploy-artifacts.xml 2008-07-24 10:23:23 UTC (rev 7902)
@@ -82,17 +82,18 @@
<includes>
<include>*:jbossws-framework:jar</include>
<include>*:jbossws-jboss422:jar</include>
+ <include>*:jbossws-jboss423:jar</include>
<include>*:juddi-service:sar</include>
</includes>
</dependencySet>
<dependencySet>
<outputDirectory>lib</outputDirectory>
- <outputFileNameMapping>jbossws-jboss423.${module.extension}</outputFileNameMapping>
+ <outputFileNameMapping>jbossws-jboss424.${module.extension}</outputFileNameMapping>
<useStrictFiltering>true</useStrictFiltering>
<scope>runtime</scope>
<unpack>false</unpack>
<includes>
- <include>*:jbossws-jboss423x:jar</include>
+ <include>*:jbossws-jboss424x:jar</include>
</includes>
</dependencySet>
<!-- JBWS-2263 -->
16 years, 5 months
JBossWS SVN: r7901 - in stack/native/trunk: modules/management and 1 other directory.
by jbossws-commits＠lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2008-07-24 05:35:30 -0400 (Thu, 24 Jul 2008)
New Revision: 7901
Modified:
stack/native/trunk/modules/management/pom.xml
stack/native/trunk/pom.xml
Log:
switch to 424 integration snapshot
Modified: stack/native/trunk/modules/management/pom.xml
===================================================================
--- stack/native/trunk/modules/management/pom.xml 2008-07-24 09:26:34 UTC (rev 7900)
+++ stack/native/trunk/modules/management/pom.xml 2008-07-24 09:35:30 UTC (rev 7901)
@@ -45,6 +45,7 @@
<artifactId>jbossws-jboss424x</artifactId>
<scope>runtime</scope>
</dependency>
+ <!-- [JBWS-2263] -->
<!--dependency>
<groupId>org.jboss.ws</groupId>
<artifactId>jbossws-jboss500CR1</artifactId>
Modified: stack/native/trunk/pom.xml
===================================================================
--- stack/native/trunk/pom.xml 2008-07-24 09:26:34 UTC (rev 7900)
+++ stack/native/trunk/pom.xml 2008-07-24 09:35:30 UTC (rev 7901)
@@ -56,7 +56,7 @@
<jbossws.spi.version>1.0.5-SNAPSHOT</jbossws.spi.version>
<jbossws.jboss422.version>3.0.2.GA</jbossws.jboss422.version>
<jbossws.jboss423.version>3.0.2.GA</jbossws.jboss423.version>
- <jbossws.jboss424.version>3.0.2.GA</jbossws.jboss424.version>
+ <jbossws.jboss424.version>3.0.3-SNAPSHOT</jbossws.jboss424.version>
<jbossws.jboss500.version>3.0.2.GA</jbossws.jboss500.version>
<jbossws.jboss501.version>3.0.3-SNAPSHOT</jbossws.jboss501.version>
<codehaus.jettison.version>1.0-RC2</codehaus.jettison.version>
16 years, 5 months
JBossWS SVN: r7900 - container/jboss42/tags.
by jbossws-commits＠lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2008-07-24 05:26:34 -0400 (Thu, 24 Jul 2008)
New Revision: 7900
Removed:
container/jboss42/tags/jbossws-jboss424x-3.0.2.GA/
Log:
jboss42/trunk supersedes this tag
16 years, 5 months
JBossWS SVN: r7898 - stack/native/trunk/modules/resources/src/main/resources/resources.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2008-07-23 15:52:02 -0400 (Wed, 23 Jul 2008)
New Revision: 7898
Modified:
stack/native/trunk/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml
Log:
[JBWS-2263] Do not overwrite jbossws-jboss lib on client dir too
Modified: stack/native/trunk/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml
===================================================================
--- stack/native/trunk/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml 2008-07-23 14:13:20 UTC (rev 7897)
+++ stack/native/trunk/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml 2008-07-23 19:52:02 UTC (rev 7898)
@@ -158,7 +158,7 @@
<!-- Deploy Client -->
<!-- ================================================================== -->
- <macrodef name="macro-deploy-jbossws-client">
+ <macrodef name="macro-deploy-jbossws-client42">
<attribute name="thirdpartydir"/>
<attribute name="targetdir"/>
<attribute name="jbossid"/>
@@ -172,6 +172,22 @@
</copy>
</sequential>
</macrodef>
+
+ <macrodef name="macro-deploy-jbossws-client50">
+ <attribute name="thirdpartydir"/>
+ <attribute name="targetdir"/>
+ <attribute name="jbossid"/>
+ <sequential>
+ <mkdir dir="@{targetdir}"/>
+ <copy todir="@{targetdir}" flatten="true" overwrite="true">
+ <fileset dir="@{thirdpartydir}">
+ <patternset refid="jbossws.client.patternset"/>
+ <!-- JBWS-2263 -->
+ <!-- <include name="**/jbossws-(a){jbossid}.jar"/> -->
+ </fileset>
+ </copy>
+ </sequential>
+ </macrodef>
<!-- ================================================================== -->
<!-- Deploy Server Lib -->
@@ -355,7 +371,7 @@
<target name="deploy-jbossws-native42" depends="check-parameters,deploy-jbossws-endorsed">
<macro-deploy-jbossws-bin targetdir="${installserver}/../../bin" artifactsdir="${artifactsdir}"/>
- <macro-deploy-jbossws-client targetdir="${installserver}/../../client" thirdpartydir="${thirdpartydir}" jbossid="${jbossid}"/>
+ <macro-deploy-jbossws-client42 targetdir="${installserver}/../../client" thirdpartydir="${thirdpartydir}" jbossid="${jbossid}"/>
<macro-deploy-jbossws-lib42 targetdir="${installserver}/../../lib" thirdpartydir="${thirdpartydir}"/>
<macro-deploy-jbossws-server-lib42 targetdir="${installserver}/lib" thirdpartydir="${thirdpartydir}" jbossid="${jbossid}"/>
<macro-deploy-jbossws-sar42 targetdir="${installserver}/deploy/jbossws.sar" artifactsdir="${artifactsdir}" thirdpartydir="${thirdpartydir}" jbossid="${jbossid}"/>
@@ -364,7 +380,7 @@
<target name="deploy-jbossws-native50" depends="check-parameters,deploy-jbossws-endorsed">
<macro-deploy-jbossws-bin targetdir="${installserver}/../../bin" artifactsdir="${artifactsdir}"/>
- <macro-deploy-jbossws-client targetdir="${installserver}/../../client" thirdpartydir="${thirdpartydir}" jbossid="${jbossid}"/>
+ <macro-deploy-jbossws-client50 targetdir="${installserver}/../../client" thirdpartydir="${thirdpartydir}" jbossid="${jbossid}"/>
<macro-deploy-jbossws-lib50 targetdir="${installserver}/../../lib" thirdpartydir="${thirdpartydir}"/>
<macro-deploy-jbossws-server-lib50 targetdir="${installserver}/lib" thirdpartydir="${thirdpartydir}" jbossid="${jbossid}"/>
<macro-deploy-jbossws-sar50 targetdir="${installserver}/deploy/jbossws.sar" artifactsdir="${artifactsdir}" thirdpartydir="${thirdpartydir}" jbossid="${jbossid}"/>
16 years, 5 months
JBossWS SVN: r7897 - stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/main/java/org/jboss/wsf/stack/jbws.
by jbossws-commits＠lists.jboss.org
Author: darran.lofthouse(a)jboss.com
Date: 2008-07-23 10:13:20 -0400 (Wed, 23 Jul 2008)
New Revision: 7897
Modified:
stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/main/java/org/jboss/wsf/stack/jbws/RequestHandlerImpl.java
Log:
[JBPAPP-988] Reduce logging level in RequestHandlerImpl when IOException thrown closing output stream.
Modified: stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/main/java/org/jboss/wsf/stack/jbws/RequestHandlerImpl.java
===================================================================
--- stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/main/java/org/jboss/wsf/stack/jbws/RequestHandlerImpl.java 2008-07-23 14:07:19 UTC (rev 7896)
+++ stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/main/java/org/jboss/wsf/stack/jbws/RequestHandlerImpl.java 2008-07-23 14:13:20 UTC (rev 7897)
@@ -156,7 +156,14 @@
}
catch (IOException ioex)
{
- log.error("Cannot close output stream");
+ if (log.isTraceEnabled() == true)
+ {
+ log.trace("Cannot close output stream", ioex);
+ }
+ else
+ {
+ log.debug("Cannot close output stream");
+ }
}
}
}
@@ -204,7 +211,14 @@
}
catch (IOException ioex)
{
- log.error("Cannot close output stream");
+ if (log.isTraceEnabled() == true)
+ {
+ log.trace("Cannot close output stream", ioex);
+ }
+ else
+ {
+ log.debug("Cannot close output stream");
+ }
}
}
}
16 years, 5 months
JBossWS SVN: r7896 - stack/native/trunk/modules/core/src/main/java/org/jboss/wsf/stack/jbws.
by jbossws-commits＠lists.jboss.org
Author: darran.lofthouse(a)jboss.com
Date: 2008-07-23 10:07:19 -0400 (Wed, 23 Jul 2008)
New Revision: 7896
Modified:
stack/native/trunk/modules/core/src/main/java/org/jboss/wsf/stack/jbws/RequestHandlerImpl.java
Log:
[JBWS-2261] Reduce logging level in RequestHandlerImpl when IOException thrown closing output stream.
Modified: stack/native/trunk/modules/core/src/main/java/org/jboss/wsf/stack/jbws/RequestHandlerImpl.java
===================================================================
--- stack/native/trunk/modules/core/src/main/java/org/jboss/wsf/stack/jbws/RequestHandlerImpl.java 2008-07-23 14:01:47 UTC (rev 7895)
+++ stack/native/trunk/modules/core/src/main/java/org/jboss/wsf/stack/jbws/RequestHandlerImpl.java 2008-07-23 14:07:19 UTC (rev 7896)
@@ -44,7 +44,6 @@
import javax.xml.namespace.QName;
import javax.xml.rpc.JAXRPCException;
import javax.xml.soap.MimeHeaders;
-import javax.xml.soap.SOAPBodyElement;
import javax.xml.soap.SOAPEnvelope;
import javax.xml.soap.SOAPException;
import javax.xml.soap.SOAPMessage;
@@ -167,7 +166,14 @@
}
catch (IOException ioex)
{
- log.error("Cannot close output stream");
+ if (log.isTraceEnabled() == true)
+ {
+ log.trace("Cannot close output stream", ioex);
+ }
+ else
+ {
+ log.debug("Cannot close output stream");
+ }
}
}
}
@@ -191,7 +197,7 @@
ClassLoader classLoader = endpoint.getService().getDeployment().getRuntimeClassLoader();
if (classLoader == null)
throw new IllegalStateException("Deployment has no classloader associated");
-
+
// Set the thread context class loader
ClassLoader ctxClassLoader = Thread.currentThread().getContextClassLoader();
Thread.currentThread().setContextClassLoader(classLoader);
@@ -208,14 +214,21 @@
{
// Reset the thread context class loader
Thread.currentThread().setContextClassLoader(ctxClassLoader);
-
+
try
{
out.close();
}
catch (IOException ioex)
{
- log.error("Cannot close output stream");
+ if (log.isTraceEnabled() == true)
+ {
+ log.trace("Cannot close output stream", ioex);
+ }
+ else
+ {
+ log.debug("Cannot close output stream");
+ }
}
}
}
@@ -229,7 +242,7 @@
throw new IllegalStateException("Cannot obtain endpoint meta data");
Type type = sepMetaData.getType();
-
+
// Build the message context
CommonMessageContext msgContext;
if (type == EndpointMetaData.Type.JAXRPC)
@@ -251,12 +264,12 @@
if (invContext instanceof ServletRequestContext)
{
ServletRequestContext reqContext = (ServletRequestContext)invContext;
-
+
ServletContext servletContext = reqContext.getServletContext();
HttpServletRequest httpRequest = reqContext.getHttpServletRequest();
httpResponse = reqContext.getHttpServletResponse();
headerSource = new ServletHeaderSource(httpRequest, httpResponse);
-
+
if (type == EndpointMetaData.Type.JAXRPC)
{
msgContext.put(MessageContextJAXRPC.SERVLET_CONTEXT, servletContext);
@@ -314,7 +327,7 @@
}
}
- Map<String, Object> rmResCtx = (Map<String, Object>)msgContext.get(RMConstant.RESPONSE_CONTEXT);
+ Map<String, Object> rmResCtx = (Map<String, Object>)msgContext.get(RMConstant.RESPONSE_CONTEXT);
boolean isWsrmMessage = rmResCtx != null;
boolean isWsrmOneWay = isWsrmMessage && (Boolean)rmResCtx.get(RMConstant.ONE_WAY_OPERATION);
if ((outStream != null) && (isWsrmOneWay == false)) // RM hack
@@ -328,7 +341,7 @@
{
// Cleanup outbound attachments
- CommonMessageContext.cleanupAttachments( MessageContextAssociation.peekMessageContext() );
+ CommonMessageContext.cleanupAttachments(MessageContextAssociation.peekMessageContext());
// Reset the message context association
MessageContextAssociation.popMessageContext();
@@ -344,7 +357,7 @@
CommonMessageContext msgContext = MessageContextAssociation.peekMessageContext();
EndpointMetaData epMetaData = msgContext.getEndpointMetaData();
MessageAbstraction resMessage = msgContext.getMessageAbstraction();
-
+
String wsaTo = null;
// Get the destination from the AddressingProperties
@@ -370,7 +383,7 @@
SOAPMessage soapMessage = (SOAPMessage)resMessage;
if (soapMessage.getAttachments().hasNext())
throw new IllegalStateException("Attachments not supported with FastInfoset");
-
+
SOAPEnvelope soapEnv = soapMessage.getSOAPPart().getEnvelope();
DOMDocumentSerializer serializer = new DOMDocumentSerializer();
serializer.setOutputStream(output);
@@ -382,7 +395,7 @@
SOAPMessage soapMessage = (SOAPMessage)resMessage;
if (soapMessage.getAttachments().hasNext())
throw new IllegalStateException("Attachments not supported with JSON");
-
+
SOAPBodyImpl soapBody = (SOAPBodyImpl)soapMessage.getSOAPBody();
BadgerFishDOMDocumentSerializer serializer = new BadgerFishDOMDocumentSerializer(output);
serializer.serialize(soapBody.getBodyElement());
@@ -397,8 +410,7 @@
/**
* Handle a request to this web service endpoint
*/
- private MessageAbstraction processRequest(Endpoint ep, MimeHeaderSource headerSource, InvocationContext reqContext, InputStream inputStream)
- throws BindingException
+ private MessageAbstraction processRequest(Endpoint ep, MimeHeaderSource headerSource, InvocationContext reqContext, InputStream inputStream) throws BindingException
{
CommonMessageContext msgContext = MessageContextAssociation.peekMessageContext();
@@ -524,11 +536,11 @@
private long initRequestMetrics(Endpoint endpoint)
{
long beginTime = 0;
-
+
EndpointMetrics metrics = endpoint.getEndpointMetrics();
if (metrics != null)
beginTime = metrics.processRequestMessage();
-
+
return beginTime;
}
@@ -584,7 +596,7 @@
String epAddress = endpoint.getAddress();
if (epAddress == null)
throw new IllegalArgumentException("Invalid endpoint address: " + epAddress);
-
+
URL wsdlUrl = new URL(epAddress + "?wsdl");
InputStream inStream = wsdlUrl.openStream();
IOUtils.copyStream(outStream, inStream);
@@ -608,7 +620,7 @@
ServletRequestContext reqContext = (ServletRequestContext)context;
HttpServletRequest req = reqContext.getHttpServletRequest();
-
+
// For the base document the resourcePath should be null
String resPath = (String)req.getParameter("resource");
URL reqURL = new URL(req.getRequestURL().toString());
@@ -619,7 +631,7 @@
if (ServerConfig.UNDEFINED_HOSTNAME.equals(serverConfig.getWebServiceHost()) == false)
wsdlHost = serverConfig.getWebServiceHost();
-
+
log.debug("WSDL request, using host: " + wsdlHost);
WSDLRequestHandler wsdlRequestHandler = new WSDLRequestHandler(epMetaData);
16 years, 5 months
JBossWS SVN: r7895 - in stack/metro/trunk: modules/resources/src/main/resources/resources and 3 other directories.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2008-07-23 10:01:47 -0400 (Wed, 23 Jul 2008)
New Revision: 7895
Modified:
stack/metro/trunk/modules/management/pom.xml
stack/metro/trunk/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml
stack/metro/trunk/modules/testsuite/pom.xml
stack/metro/trunk/src/main/distro/build-deploy.xml
stack/metro/trunk/src/main/scripts/assembly-deploy-artifacts.xml
Log:
[JBWS-2263] Fixing container integration for AS5
Modified: stack/metro/trunk/modules/management/pom.xml
===================================================================
--- stack/metro/trunk/modules/management/pom.xml 2008-07-23 13:54:12 UTC (rev 7894)
+++ stack/metro/trunk/modules/management/pom.xml 2008-07-23 14:01:47 UTC (rev 7895)
@@ -40,6 +40,7 @@
<artifactId>jbossws-jboss423x</artifactId>
<scope>runtime</scope>
</dependency>
+ <!-- JBWS-2263
<dependency>
<groupId>org.jboss.ws</groupId>
<artifactId>jbossws-jboss500CR1</artifactId>
@@ -61,7 +62,7 @@
<artifactId>jbossws-jboss500x</artifactId>
<classifier>container</classifier>
<scope>runtime</scope>
- </dependency>
+ </dependency> -->
<dependency>
<groupId>org.jboss.jaxr</groupId>
<artifactId>juddi-service</artifactId>
Modified: stack/metro/trunk/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml
===================================================================
--- stack/metro/trunk/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml 2008-07-23 13:54:12 UTC (rev 7894)
+++ stack/metro/trunk/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml 2008-07-23 14:01:47 UTC (rev 7895)
@@ -174,7 +174,7 @@
<!-- Deploy Client -->
<!-- ================================================================== -->
- <macrodef name="macro-deploy-jbossws-client">
+ <macrodef name="macro-deploy-jbossws-client42">
<attribute name="thirdpartydir"/>
<attribute name="targetdir"/>
<attribute name="jbossid"/>
@@ -188,6 +188,22 @@
</copy>
</sequential>
</macrodef>
+
+ <macrodef name="macro-deploy-jbossws-client50">
+ <attribute name="thirdpartydir"/>
+ <attribute name="targetdir"/>
+ <attribute name="jbossid"/>
+ <sequential>
+ <mkdir dir="@{targetdir}"/>
+ <copy todir="@{targetdir}" flatten="true" overwrite="true">
+ <fileset dir="@{thirdpartydir}">
+ <patternset refid="jbossws.client.patternset"/>
+ <!-- JBWS-2263 -->
+ <!-- <include name="**/jbossws-(a){jbossid}.jar"/> -->
+ </fileset>
+ </copy>
+ </sequential>
+ </macrodef>
<!-- ================================================================== -->
<!-- Deploy Server Lib -->
@@ -315,14 +331,16 @@
<fileset dir="@{thirdpartydir}">
<include name="**/jbossws-common.jar"/>
<include name="**/jbossws-framework.jar"/>
- <include name="**/jbossws-(a){jbossid}.jar"/>
+ <!-- JBWS-2263 -->
+ <!-- <include name="**/jbossws-(a){jbossid}.jar"/> -->
</fileset>
</copy>
- <copy todir="@{targetdir}/META-INF" flatten="true" overwrite="true">
+ <!-- JBWS-2263 -->
+ <!-- <copy todir="@{targetdir}/META-INF" flatten="true" overwrite="true">
<fileset dir="@{artifactsdir}/resources/jbossws-@{jbossid}">
<include name="**/jbossws-deployer-beans.xml"/>
</fileset>
- </copy>
+ </copy> -->
</sequential>
</macrodef>
@@ -330,7 +348,8 @@
<!-- Deploy Deploy -->
<!-- ================================================================== -->
- <macrodef name="macro-deploy-jbossws-deploy50">
+ <!-- JBWS-2263 -->
+ <!-- <macrodef name="macro-deploy-jbossws-deploy50">
<attribute name="thirdpartydir"/>
<attribute name="targetdir"/>
<attribute name="jbossid"/>
@@ -349,7 +368,7 @@
<delete file="@{targetdir}/jbossws-(a){jbossid}-container.jar"/>
<delete dir="@{targetdir}/META-INF"/>
</sequential>
- </macrodef>
+ </macrodef> -->
<!-- ================================================================== -->
<!-- Deploy JBossWS -->
@@ -360,7 +379,7 @@
<target name="deploy-jbossws-metro42" depends="check-parameters,deploy-jbossws-endorsed">
<macro-deploy-jbossws-bin targetdir="${installserver}/../../bin" artifactsdir="${artifactsdir}"/>
- <macro-deploy-jbossws-client targetdir="${installserver}/../../client" thirdpartydir="${thirdpartydir}" jbossid="${jbossid}"/>
+ <macro-deploy-jbossws-client42 targetdir="${installserver}/../../client" thirdpartydir="${thirdpartydir}" jbossid="${jbossid}"/>
<macro-deploy-jbossws-lib42 targetdir="${installserver}/../../lib" thirdpartydir="${thirdpartydir}"/>
<macro-deploy-jbossws-server-lib42 targetdir="${installserver}/lib" thirdpartydir="${thirdpartydir}" jbossid="${jbossid}"/>
<macro-deploy-jbossws-sar42 targetdir="${installserver}/deploy/jbossws.sar" artifactsdir="${artifactsdir}" thirdpartydir="${thirdpartydir}" jbossid="${jbossid}"/>
@@ -369,12 +388,13 @@
<target name="deploy-jbossws-metro50" depends="check-parameters,deploy-jbossws-endorsed">
<macro-deploy-jbossws-bin targetdir="${installserver}/../../bin" artifactsdir="${artifactsdir}"/>
- <macro-deploy-jbossws-client targetdir="${installserver}/../../client" thirdpartydir="${thirdpartydir}" jbossid="${jbossid}"/>
+ <macro-deploy-jbossws-client50 targetdir="${installserver}/../../client" thirdpartydir="${thirdpartydir}" jbossid="${jbossid}"/>
<macro-deploy-jbossws-lib50 targetdir="${installserver}/../../lib" thirdpartydir="${thirdpartydir}"/>
<macro-deploy-jbossws-server-lib50 targetdir="${installserver}/lib" thirdpartydir="${thirdpartydir}" jbossid="${jbossid}"/>
<macro-deploy-jbossws-sar50 targetdir="${installserver}/deploy/jbossws.sar" artifactsdir="${artifactsdir}" thirdpartydir="${thirdpartydir}" jbossid="${jbossid}"/>
<macro-deploy-jbossws-deployers50 targetdir="${installserver}/deployers/jbossws.deployer/" artifactsdir="${artifactsdir}" thirdpartydir="${thirdpartydir}" jbossid="${jbossid}"/>
- <macro-deploy-jbossws-deploy50 targetdir="${installserver}/deploy" thirdpartydir="${thirdpartydir}" jbossid="${jbossid}"/>
+ <!-- JBWS-2263 -->
+ <!-- <macro-deploy-jbossws-deploy50 targetdir="${installserver}/deploy" thirdpartydir="${thirdpartydir}" jbossid="${jbossid}"/> -->
<macro-deploy-juddi-sar targetdir="${installserver}/deploy/juddi-service.sar" thirdpartydir="${thirdpartydir}"/>
</target>
@@ -392,7 +412,7 @@
<!-- Undeploy JBossWS -->
<!-- ================================================================== -->
- <macrodef name="macro-undeploy-jbossws">
+ <macrodef name="macro-undeploy-jbossws42">
<attribute name="defaultconf"/>
<attribute name="targetdir"/>
<sequential>
@@ -427,5 +447,42 @@
</sequential>
</macrodef>
+
+ <macrodef name="macro-undeploy-jbossws50">
+ <attribute name="defaultconf"/>
+ <attribute name="targetdir"/>
+ <sequential>
+ <loadfile property="jbossws.deploy.conf" srcfile="@{targetdir}/jbossws-deploy.conf" failonerror="false"/>
+ <loadfile property="jbossws.deploy.conf" srcfile="@{defaultconf}" failonerror="false"/>
+
+ <property name="jboss.server.home" value="@{targetdir}/../.."/>
+ <property name="jboss.home" value="${jboss.server.home}/../.."/>
+ <available property="jboss.undeploy.client" file="${jboss.home}/client"/>
+ <fail message="Cannot find ${jboss.home}/client" unless="jboss.undeploy.client"/>
+
+ <!-- JBWS-2263 -->
+ <!-- delete stale container integration jars -->
+ <!-- <delete>
+ <fileset dir="${jboss.server.home}">
+ <include name="**/jbossws-jboss*.jar"/>
+ </fileset>
+ <fileset dir="${jboss.home}/client">
+ <include name="jbossws-jboss*.jar"/>
+ </fileset>
+ </delete> -->
+
+ <!-- delete content of last deployment -->
+ <delete>
+ <fileset dir="${jboss.home}" includes="${jbossws.deploy.conf}"/>
+ </delete>
+
+ <!-- delete jbossws.sar -->
+ <delete dir="@{targetdir}"/>
+
+ <!-- delete juddi-service.sar -->
+ <delete dir="@{targetdir}/../juddi-service.sar"/>
+
+ </sequential>
+ </macrodef>
</project>
Modified: stack/metro/trunk/modules/testsuite/pom.xml
===================================================================
--- stack/metro/trunk/modules/testsuite/pom.xml 2008-07-23 13:54:12 UTC (rev 7894)
+++ stack/metro/trunk/modules/testsuite/pom.xml 2008-07-23 14:01:47 UTC (rev 7895)
@@ -383,8 +383,9 @@
</properties>
<dependencies>
<dependency>
- <groupId>org.jboss.ws</groupId>
- <artifactId>jbossws-jboss500CR1</artifactId>
+ <groupId>org.jboss.jbossas</groupId>
+ <artifactId>jboss-as-webservices</artifactId>
+ <version>${jboss.version}</version>
</dependency>
<dependency>
<groupId>org.hibernate</groupId>
@@ -436,8 +437,9 @@
</properties>
<dependencies>
<dependency>
- <groupId>org.jboss.ws</groupId>
- <artifactId>jbossws-jboss500x</artifactId>
+ <groupId>org.jboss.jbossas</groupId>
+ <artifactId>jboss-as-webservices</artifactId>
+ <version>${jboss.version}</version>
</dependency>
<dependency>
<groupId>org.hibernate</groupId>
Modified: stack/metro/trunk/src/main/distro/build-deploy.xml
===================================================================
--- stack/metro/trunk/src/main/distro/build-deploy.xml 2008-07-23 13:54:12 UTC (rev 7894)
+++ stack/metro/trunk/src/main/distro/build-deploy.xml 2008-07-23 14:01:47 UTC (rev 7895)
@@ -49,7 +49,7 @@
<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-jbossws targetdir="${jboss422.server.deploy}/jbossws.sar" defaultconf="${jbossws.default.deploy.conf}"/>
+ <macro-undeploy-jbossws42 targetdir="${jboss422.server.deploy}/jbossws.sar" defaultconf="${jbossws.default.deploy.conf}"/>
</target>
<!-- ================================================================== -->
@@ -73,7 +73,7 @@
<target name="undeploy-jboss423" depends="target-jboss423,init" description="Remove jbossws from jboss423">
<fail message="Not available: ${jboss423.available.file}" unless="jboss423.available"/>
- <macro-undeploy-jbossws targetdir="${jboss423.server.deploy}/jbossws.sar" defaultconf="${jbossws.default.deploy.conf}"/>
+ <macro-undeploy-jbossws42 targetdir="${jboss423.server.deploy}/jbossws.sar" defaultconf="${jbossws.default.deploy.conf}"/>
</target>
<!-- ================================================================== -->
@@ -112,7 +112,7 @@
<target name="undeploy-jboss500" depends="target-jboss500,init" description="Remove jbossws from jboss500">
<fail message="Not available: ${jboss500.available.file}" unless="jboss500.available"/>
- <macro-undeploy-jbossws targetdir="${jboss500.server.deploy}/jbossws.sar" defaultconf="${jbossws.default.deploy.conf}"/>
+ <macro-undeploy-jbossws50 targetdir="${jboss500.server.deploy}/jbossws.sar" defaultconf="${jbossws.default.deploy.conf}"/>
<!-- [JBWS-2177] Test clients fail with xml-apis.jar in lib/endorsed -->
<delete file="${jboss500.home}/lib/endorsed/xml-apis.jar"/>
<!-- wsconsume will fail with a LinkageError too -->
@@ -140,7 +140,7 @@
<target name="undeploy-jboss501" depends="target-jboss501,init" description="Remove jbossws from jboss501">
<fail message="Not available: ${jboss501.available.file}" unless="jboss501.available"/>
- <macro-undeploy-jbossws targetdir="${jboss501.server.deploy}/jbossws.sar" defaultconf="${jbossws.default.deploy.conf}"/>
+ <macro-undeploy-jbossws50 targetdir="${jboss501.server.deploy}/jbossws.sar" defaultconf="${jbossws.default.deploy.conf}"/>
</target>
<!-- ================================================================== -->
Modified: stack/metro/trunk/src/main/scripts/assembly-deploy-artifacts.xml
===================================================================
--- stack/metro/trunk/src/main/scripts/assembly-deploy-artifacts.xml 2008-07-23 13:54:12 UTC (rev 7894)
+++ stack/metro/trunk/src/main/scripts/assembly-deploy-artifacts.xml 2008-07-23 14:01:47 UTC (rev 7895)
@@ -95,7 +95,8 @@
<include>*:jbossws-jboss423x:jar</include>
</includes>
</dependencySet>
- <dependencySet>
+ <!-- JBWS-2263 -->
+ <!-- <dependencySet>
<outputDirectory>lib</outputDirectory>
<outputFileNameMapping>jbossws-jboss500.${module.extension}</outputFileNameMapping>
<useStrictFiltering>true</useStrictFiltering>
@@ -135,6 +136,7 @@
<include>*:jbossws-jboss500x:jar:container</include>
</includes>
</dependencySet>
+ -->
</dependencySets>
</binaries>
</moduleSet>
16 years, 5 months
JBossWS SVN: r7894 - in stack/cxf/trunk: modules/resources/src/main/resources/resources and 3 other directories.
by jbossws-commits＠lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2008-07-23 09:54:12 -0400 (Wed, 23 Jul 2008)
New Revision: 7894
Modified:
stack/cxf/trunk/modules/management/pom.xml
stack/cxf/trunk/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml
stack/cxf/trunk/modules/testsuite/pom.xml
stack/cxf/trunk/src/main/distro/build-deploy.xml
stack/cxf/trunk/src/main/scripts/assembly-deploy-artifacts.xml
Log:
[JBWS-2263] container integration lives in AS codebase, don't replace it
Modified: stack/cxf/trunk/modules/management/pom.xml
===================================================================
--- stack/cxf/trunk/modules/management/pom.xml 2008-07-23 13:04:47 UTC (rev 7893)
+++ stack/cxf/trunk/modules/management/pom.xml 2008-07-23 13:54:12 UTC (rev 7894)
@@ -40,7 +40,8 @@
<artifactId>jbossws-jboss423x</artifactId>
<scope>runtime</scope>
</dependency>
- <dependency>
+ <!-- [JBWS-2263] -->
+ <!--dependency>
<groupId>org.jboss.ws</groupId>
<artifactId>jbossws-jboss500CR1</artifactId>
<scope>runtime</scope>
@@ -61,7 +62,7 @@
<artifactId>jbossws-jboss500x</artifactId>
<classifier>container</classifier>
<scope>runtime</scope>
- </dependency>
+ </dependency-->
<dependency>
<groupId>jboss.jaxr</groupId>
<artifactId>juddi-service</artifactId>
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 2008-07-23 13:04:47 UTC (rev 7893)
+++ stack/cxf/trunk/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml 2008-07-23 13:54:12 UTC (rev 7894)
@@ -164,7 +164,7 @@
<!-- Deploy Client -->
<!-- ================================================================== -->
- <macrodef name="macro-deploy-jbossws-client">
+ <macrodef name="macro-deploy-jbossws-client42">
<attribute name="thirdpartydir"/>
<attribute name="targetdir"/>
<attribute name="jbossid"/>
@@ -179,6 +179,22 @@
</sequential>
</macrodef>
+ <macrodef name="macro-deploy-jbossws-client50">
+ <attribute name="thirdpartydir"/>
+ <attribute name="targetdir"/>
+ <attribute name="jbossid"/>
+ <sequential>
+ <mkdir dir="@{targetdir}"/>
+ <copy todir="@{targetdir}" flatten="true" overwrite="true">
+ <fileset dir="@{thirdpartydir}">
+ <patternset refid="jbossws.client.patternset"/>
+ <!-- [JBWS-2263] -->
+ <!--include name="**/jbossws-(a){jbossid}.jar"/-->
+ </fileset>
+ </copy>
+ </sequential>
+ </macrodef>
+
<!-- ================================================================== -->
<!-- Deploy Server Lib -->
<!-- ================================================================== -->
@@ -291,14 +307,16 @@
<fileset dir="@{thirdpartydir}">
<include name="**/jbossws-common.jar"/>
<include name="**/jbossws-framework.jar"/>
- <include name="**/jbossws-(a){jbossid}.jar"/>
+ <!-- [JBWS-2263] -->
+ <!--include name="**/jbossws-(a){jbossid}.jar"/-->
</fileset>
</copy>
- <copy todir="@{targetdir}/META-INF" flatten="true" overwrite="true">
+ <!-- [JBWS-2263] -->
+ <!--copy todir="@{targetdir}/META-INF" flatten="true" overwrite="true">
<fileset dir="@{artifactsdir}/resources/jbossws-@{jbossid}">
<include name="**/jbossws-deployer-beans.xml"/>
</fileset>
- </copy>
+ </copy-->
</sequential>
</macrodef>
@@ -306,7 +324,8 @@
<!-- Deploy Deploy -->
<!-- ================================================================== -->
- <macrodef name="macro-deploy-jbossws-deploy50">
+ <!-- [JBWS-2263] -->
+ <!--macrodef name="macro-deploy-jbossws-deploy50">
<attribute name="thirdpartydir"/>
<attribute name="targetdir"/>
<attribute name="jbossid"/>
@@ -325,7 +344,7 @@
<delete file="@{targetdir}/jbossws-(a){jbossid}-container.jar"/>
<delete dir="@{targetdir}/META-INF"/>
</sequential>
- </macrodef>
+ </macrodef-->
<!-- ================================================================== -->
<!-- Deploy JBossWS -->
@@ -336,7 +355,7 @@
<target name="deploy-jbossws-cxf42" depends="check-parameters,deploy-jbossws-endorsed">
<macro-deploy-jbossws-bin targetdir="${installserver}/../../bin" artifactsdir="${artifactsdir}"/>
- <macro-deploy-jbossws-client targetdir="${installserver}/../../client" thirdpartydir="${thirdpartydir}" jbossid="${jbossid}"/>
+ <macro-deploy-jbossws-client42 targetdir="${installserver}/../../client" thirdpartydir="${thirdpartydir}" jbossid="${jbossid}"/>
<macro-deploy-jbossws-lib42 targetdir="${installserver}/../../lib" thirdpartydir="${thirdpartydir}"/>
<macro-deploy-jbossws-server-lib42 targetdir="${installserver}/lib" thirdpartydir="${thirdpartydir}" jbossid="${jbossid}"/>
<macro-deploy-jbossws-cxf42-sar targetdir="${installserver}/deploy/jbossws.sar" artifactsdir="${artifactsdir}" thirdpartydir="${thirdpartydir}" jbossid="${jbossid}"/>
@@ -344,12 +363,13 @@
<target name="deploy-jbossws-cxf50" depends="check-parameters,deploy-jbossws-endorsed">
<macro-deploy-jbossws-bin targetdir="${installserver}/../../bin" artifactsdir="${artifactsdir}"/>
- <macro-deploy-jbossws-client targetdir="${installserver}/../../client" thirdpartydir="${thirdpartydir}" jbossid="${jbossid}"/>
+ <macro-deploy-jbossws-client50 targetdir="${installserver}/../../client" thirdpartydir="${thirdpartydir}" jbossid="${jbossid}"/>
<macro-deploy-jbossws-lib50 targetdir="${installserver}/../../lib" thirdpartydir="${thirdpartydir}"/>
<macro-deploy-jbossws-server-lib50 targetdir="${installserver}/lib" thirdpartydir="${thirdpartydir}" jbossid="${jbossid}"/>
<macro-deploy-jbossws-cxf50-sar targetdir="${installserver}/deploy/jbossws.sar" artifactsdir="${artifactsdir}" thirdpartydir="${thirdpartydir}" jbossid="${jbossid}"/>
<macro-deploy-jbossws-deployers50 targetdir="${installserver}/deployers/jbossws.deployer/" artifactsdir="${artifactsdir}" thirdpartydir="${thirdpartydir}" jbossid="${jbossid}"/>
- <macro-deploy-jbossws-deploy50 targetdir="${installserver}/deploy" thirdpartydir="${thirdpartydir}" jbossid="${jbossid}"/>
+ <!-- [JBWS-2263] -->
+ <!--macro-deploy-jbossws-deploy50 targetdir="${installserver}/deploy" thirdpartydir="${thirdpartydir}" jbossid="${jbossid}"/-->
</target>
<target name="deploy-jbossws-endorsed" if="HAVE_JDK_1.6">
@@ -366,7 +386,7 @@
<!-- Undeploy JBossWS -->
<!-- ================================================================== -->
- <macrodef name="macro-undeploy-jbossws">
+ <macrodef name="macro-undeploy-jbossws42">
<attribute name="defaultconf"/>
<attribute name="targetdir"/>
<sequential>
@@ -399,4 +419,38 @@
</sequential>
</macrodef>
+ <macrodef name="macro-undeploy-jbossws50">
+ <attribute name="defaultconf"/>
+ <attribute name="targetdir"/>
+ <sequential>
+ <loadfile property="jbossws.deploy.conf" srcfile="@{targetdir}/jbossws-deploy.conf" failonerror="false"/>
+ <loadfile property="jbossws.deploy.conf" srcfile="@{defaultconf}" failonerror="false"/>
+
+ <property name="jboss.server.home" value="@{targetdir}/../.."/>
+ <property name="jboss.home" value="${jboss.server.home}/../.."/>
+ <available property="jboss.undeploy.client" file="${jboss.home}/client"/>
+ <fail message="Cannot find ${jboss.home}/client" unless="jboss.undeploy.client"/>
+
+ <!-- [JBWS-2263] -->
+ <!-- delete stale container integration jars -->
+ <!--delete>
+ <fileset dir="${jboss.server.home}">
+ <include name="**/jbossws-jboss*.jar"/>
+ </fileset>
+ <fileset dir="${jboss.home}/client">
+ <include name="jbossws-jboss*.jar"/>
+ </fileset>
+ </delete-->
+
+ <!-- delete content of last deployment -->
+ <delete>
+ <fileset dir="${jboss.home}" includes="${jbossws.deploy.conf}"/>
+ </delete>
+
+ <!-- delete jbossws.sar -->
+ <delete dir="@{targetdir}"/>
+
+ </sequential>
+ </macrodef>
+
</project>
Modified: stack/cxf/trunk/modules/testsuite/pom.xml
===================================================================
--- stack/cxf/trunk/modules/testsuite/pom.xml 2008-07-23 13:04:47 UTC (rev 7893)
+++ stack/cxf/trunk/modules/testsuite/pom.xml 2008-07-23 13:54:12 UTC (rev 7894)
@@ -333,8 +333,9 @@
</properties>
<dependencies>
<dependency>
- <groupId>org.jboss.ws</groupId>
- <artifactId>jbossws-jboss500CR1</artifactId>
+ <groupId>org.jboss.jbossas</groupId>
+ <artifactId>jboss-as-webservices</artifactId>
+ <version>${jboss.version}</version>
</dependency>
<dependency>
<groupId>org.hibernate</groupId>
@@ -391,8 +392,9 @@
</properties>
<dependencies>
<dependency>
- <groupId>org.jboss.ws</groupId>
- <artifactId>jbossws-jboss500x</artifactId>
+ <groupId>org.jboss.jbossas</groupId>
+ <artifactId>jboss-as-webservices</artifactId>
+ <version>${jboss.version}</version>
</dependency>
<dependency>
<groupId>org.jboss.jbossas</groupId>
Modified: stack/cxf/trunk/src/main/distro/build-deploy.xml
===================================================================
--- stack/cxf/trunk/src/main/distro/build-deploy.xml 2008-07-23 13:04:47 UTC (rev 7893)
+++ stack/cxf/trunk/src/main/distro/build-deploy.xml 2008-07-23 13:54:12 UTC (rev 7894)
@@ -47,7 +47,7 @@
<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-jbossws targetdir="${jboss422.server.deploy}/jbossws.sar" defaultconf="${jbossws.default.deploy.conf}"/>
+ <macro-undeploy-jbossws42 targetdir="${jboss422.server.deploy}/jbossws.sar" defaultconf="${jbossws.default.deploy.conf}"/>
</target>
<!-- ================================================================== -->
@@ -69,7 +69,7 @@
<target name="undeploy-jboss423" depends="target-jboss423,init" description="Remove jbossws from jboss423">
<fail message="Not available: ${jboss423.available.file}" unless="jboss423.available"/>
- <macro-undeploy-jbossws targetdir="${jboss423.server.deploy}/jbossws.sar" defaultconf="${jbossws.default.deploy.conf}"/>
+ <macro-undeploy-jbossws42 targetdir="${jboss423.server.deploy}/jbossws.sar" defaultconf="${jbossws.default.deploy.conf}"/>
</target>
<!-- ================================================================== -->
@@ -106,7 +106,7 @@
<target name="undeploy-jboss500" depends="target-jboss500,init" description="Remove jbossws from jboss500">
<fail message="Not available: ${jboss500.available.file}" unless="jboss500.available"/>
- <macro-undeploy-jbossws targetdir="${jboss500.server.deploy}/jbossws.sar" defaultconf="${jbossws.default.deploy.conf}"/>
+ <macro-undeploy-jbossws50 targetdir="${jboss500.server.deploy}/jbossws.sar" defaultconf="${jbossws.default.deploy.conf}"/>
<!-- [JBWS-2177] Test clients fail with xml-apis.jar in lib/endorsed -->
<delete file="${jboss500.home}/lib/endorsed/xml-apis.jar"/>
</target>
@@ -130,7 +130,7 @@
<target name="undeploy-jboss501" depends="target-jboss501,init" description="Remove jbossws from jboss501">
<fail message="Not available: ${jboss501.available.file}" unless="jboss501.available"/>
- <macro-undeploy-jbossws targetdir="${jboss501.server.deploy}/jbossws.sar" defaultconf="${jbossws.default.deploy.conf}"/>
+ <macro-undeploy-jbossws50 targetdir="${jboss501.server.deploy}/jbossws.sar" defaultconf="${jbossws.default.deploy.conf}"/>
</target>
<!-- ================================================================== -->
Modified: stack/cxf/trunk/src/main/scripts/assembly-deploy-artifacts.xml
===================================================================
--- stack/cxf/trunk/src/main/scripts/assembly-deploy-artifacts.xml 2008-07-23 13:04:47 UTC (rev 7893)
+++ stack/cxf/trunk/src/main/scripts/assembly-deploy-artifacts.xml 2008-07-23 13:54:12 UTC (rev 7894)
@@ -91,7 +91,7 @@
<include>*:jbossws-jboss423x:jar</include>
</includes>
</dependencySet>
- <dependencySet>
+ <!--dependencySet>
<outputDirectory>lib</outputDirectory>
<outputFileNameMapping>jbossws-jboss500.${module.extension}</outputFileNameMapping>
<useStrictFiltering>true</useStrictFiltering>
@@ -130,7 +130,7 @@
<includes>
<include>*:jbossws-jboss500x:jar:container</include>
</includes>
- </dependencySet>
+ </dependencySet-->
</dependencySets>
</binaries>
</moduleSet>
16 years, 5 months
JBossWS SVN: r7893 - stack/native/trunk/modules/testsuite.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2008-07-23 09:04:47 -0400 (Wed, 23 Jul 2008)
New Revision: 7893
Modified:
stack/native/trunk/modules/testsuite/pom.xml
Log:
[JBWS-2263] Using container integration artifact from the AS sources
Modified: stack/native/trunk/modules/testsuite/pom.xml
===================================================================
--- stack/native/trunk/modules/testsuite/pom.xml 2008-07-23 10:56:20 UTC (rev 7892)
+++ stack/native/trunk/modules/testsuite/pom.xml 2008-07-23 13:04:47 UTC (rev 7893)
@@ -407,8 +407,9 @@
</properties>
<dependencies>
<dependency>
- <groupId>org.jboss.ws</groupId>
- <artifactId>jbossws-jboss500CR1</artifactId>
+ <groupId>org.jboss.jbossas</groupId>
+ <artifactId>jboss-as-webservices</artifactId>
+ <version>${jboss.version}</version>
</dependency>
<dependency>
<groupId>org.hibernate</groupId>
@@ -460,8 +461,9 @@
</properties>
<dependencies>
<dependency>
- <groupId>org.jboss.ws</groupId>
- <artifactId>jbossws-jboss500x</artifactId>
+ <groupId>org.jboss.jbossas</groupId>
+ <artifactId>jboss-as-webservices</artifactId>
+ <version>${jboss.version}</version>
</dependency>
<dependency>
<groupId>org.hibernate</groupId>
16 years, 5 months