[jbossws-commits] JBossWS SVN: r6745 - in stack/metro/branches/tdiesler/trunk: src/main and 2 other directories.
jbossws-commits at lists.jboss.org
jbossws-commits at lists.jboss.org
Tue Apr 29 06:29:17 EDT 2008
Author: thomas.diesler at jboss.com
Date: 2008-04-29 06:29:17 -0400 (Tue, 29 Apr 2008)
New Revision: 6745
Added:
stack/metro/branches/tdiesler/trunk/ant.properties.example
stack/metro/branches/tdiesler/trunk/src/main/distro/ant.properties
stack/metro/branches/tdiesler/trunk/src/main/distro/build-deploy.xml
stack/metro/branches/tdiesler/trunk/src/main/distro/build-setup.xml
stack/metro/branches/tdiesler/trunk/src/main/distro/build.xml
stack/metro/branches/tdiesler/trunk/src/main/distro/jbossws-default-deploy.conf
stack/metro/branches/tdiesler/trunk/src/main/distro/jbossws-deploy-macros.xml
stack/metro/branches/tdiesler/trunk/src/main/scripts/
stack/metro/branches/tdiesler/trunk/src/main/scripts/assembly-bin-dist.xml
stack/metro/branches/tdiesler/trunk/src/main/scripts/assembly-deploy-artifacts.xml
Removed:
stack/metro/branches/tdiesler/trunk/src/main/distro/ant.properties.example
stack/metro/branches/tdiesler/trunk/src/main/distro/bin-dist-build.xml
stack/metro/branches/tdiesler/trunk/src/main/scripts/assembly-bin-dist.xml
stack/metro/branches/tdiesler/trunk/src/main/scripts/assembly-deploy-artifacts.xml
Modified:
stack/metro/branches/tdiesler/trunk/
stack/metro/branches/tdiesler/trunk/build.xml
Log:
Property changes on: stack/metro/branches/tdiesler/trunk
___________________________________________________________________
Name: svn:ignore
- .settings
target
+ .settings
target
ant.properties
Added: stack/metro/branches/tdiesler/trunk/ant.properties.example
===================================================================
--- stack/metro/branches/tdiesler/trunk/ant.properties.example (rev 0)
+++ stack/metro/branches/tdiesler/trunk/ant.properties.example 2008-04-29 10:29:17 UTC (rev 6745)
@@ -0,0 +1,17 @@
+#
+# A sample ant properties file
+#
+# $Id: ant.properties.example 3995 2007-07-26 08:52:45Z thomas.diesler at jboss.com $
+
+# Optional JBoss Home
+#jboss422.home=/home/tdiesler/svn/jbossas/tags/JBoss_4_2_2_GA/build/output/jboss-4.2.2.GA
+#jboss423.home=/home/tdiesler/svn/jbossas/branches/Branch_4_2/build/output/jboss-4.2.3.GA
+#jboss500.home=/home/tdiesler/svn/jbossas/tags/JBoss_5_0_0_Beta4/build/output/jboss-5.0.0.Beta4
+#jboss501.home=/home/tdiesler/svn/jbossas/trunk/build/output/jboss-5.0.0.CR1
+
+# The JBoss settings
+jboss.server.instance=default
+
+# JBossWS Release
+jbossws.portal.content=/home/tdiesler/svn/jbossws/portal-content
+jboss.local.repository=/home/tdiesler/svn/jboss.local.repository
\ No newline at end of file
Modified: stack/metro/branches/tdiesler/trunk/build.xml
===================================================================
--- stack/metro/branches/tdiesler/trunk/build.xml 2008-04-29 10:08:29 UTC (rev 6744)
+++ stack/metro/branches/tdiesler/trunk/build.xml 2008-04-29 10:29:17 UTC (rev 6745)
@@ -11,247 +11,68 @@
<!-- $Id$ -->
-<project default="main" basedir="." name="JBossWS-Metro">
+<project basedir="." name="JBossWS-Metro">
- <property name="stack.dir" value="${basedir}"/>
-
- <import file="${basedir}/ant-import/build-setup.xml"/>
- <import file="${basedir}/ant-import/build-bin-dist.xml"/>
- <import file="${basedir}/ant-import/build-prepare-deploy.xml"/>
- <import file="${basedir}/ant-import/build-deploy.xml"/>
- <import file="${basedir}/ant-import/build-release.xml"/>
- <import file="${basedir}/ant-import/build-thirdparty.xml"/>
- <import file="${basedir}/ant-import/jbossws-deploy-macros.xml"/>
-
<!-- ================================================================== -->
<!-- Setup -->
<!-- ================================================================== -->
+
+ <property name="stack.dir" value="${basedir}"/>
+ <property name="stack.distro.dir" value="${stack.dir}/src/main/distro"/>
+ <property name="stack.output.dir" value="${stack.dir}/target"/>
+ <property name="stack.modules.dir" value="${stack.dir}/modules"/>
+ <property name="stack.management.dir" value="${stack.modules.dir}/management"/>
+ <property name="stack.client.dir" value="${stack.modules.dir}/client"/>
+ <property name="stack.server.dir" value="${stack.modules.dir}/server"/>
- <property name="stack.src.dir" value="${stack.dir}/src/main"/>
- <property name="stack.distro.dir" value="${stack.src.dir}/distro"/>
- <property name="stack.etc.dir" value="${stack.src.dir}/etc"/>
- <property name="stack.java.dir" value="${stack.src.dir}/java"/>
- <property name="stack.resources.dir" value="${stack.src.dir}/resources"/>
- <property name="stack.output.dir" value="${stack.dir}/output"/>
- <property name="stack.output.apidocs.dir" value="${stack.output.dir}/apidocs"/>
- <property name="stack.output.classes.dir" value="${stack.output.dir}/classes"/>
- <property name="stack.output.deploy.dir" value="${stack.output.dir}/deploy"/>
- <property name="stack.output.etc.dir" value="${stack.output.dir}/etc"/>
- <property name="stack.output.lib.dir" value="${stack.output.dir}/lib"/>
- <property name="stack.output.resources.dir" value="${stack.output.dir}/resources"/>
+ <property name="deploy.artifacts.dir" value="${stack.output.dir}/deploy-artifacts"/>
- <property name="deploy.artifacts.dir" value="${stack.output.deploy.dir}-artifacts"/>
- <property name="deploy.structure.jboss42" value="${stack.output.deploy.dir}-jboss42"/>
- <property name="deploy.structure.jboss50" value="${stack.output.deploy.dir}-jboss50"/>
- <property name="jbossws.default.deploy.conf" value="${stack.dir}/ant-import/jbossws-default-deploy.conf"/>
+ <import file="${stack.distro.dir}/build-setup.xml"/>
+ <import file="${stack.distro.dir}/build-deploy.xml"/>
+ <import file="${stack.distro.dir}/jbossws-deploy-macros.xml"/>
- <import file="${basedir}/ant-import-tests/build-testsuite.xml"/>
+ <property name="jbossws.default.deploy.conf" value="${stack.distro.dir}/jbossws-default-deploy.conf"/>
+ <property name="target.properties.file" value="${basedir}/target.properties"/>
<!-- ================================================================== -->
<!-- Initialization -->
<!-- ================================================================== -->
- <target name="init" depends="prepare,thirdparty">
- </target>
-
- <!-- ================================================================== -->
- <!-- Compile -->
- <!-- ================================================================== -->
-
- <!--
- | Compile everything.
- |
- | This target should depend on other compile-* targets for each
- | different type of compile that needs to be performed, short of
- | documentation compiles.
- -->
-
- <target name="compile" depends="init,compile-classes,compile-etc,compile-resources" description="Compile all source files."/>
-
- <!-- Compile java sources -->
- <target name="compile-classes" depends="compile-classes-metro"/>
- <target name="compile-classes-metro" depends="init">
- <mkdir dir="${stack.output.classes.dir}"/>
- <javac srcdir="${stack.java.dir}" sourcepath="" destdir="${stack.output.classes.dir}" encoding="utf-8" debug="${javac.debug}" verbose="${javac.verbose}"
- deprecation="${javac.deprecation}" failonerror="${javac.fail.onerror}">
- <include name="org/jboss/wsf/stack/metro/**"/>
- <classpath refid="stack.integration.classpath"/>
- </javac>
- </target>
-
- <!-- Compile etc files (manifests and such) -->
- <target name="compile-etc" depends="init">
- <mkdir dir="${stack.output.etc.dir}"/>
- <copy todir="${stack.output.etc.dir}" filtering="yes" overwrite="true">
- <fileset dir="${stack.etc.dir}">
- <include name="component-info.xml"/>
- <include name="default.mf"/>
- </fileset>
- <filterset>
- <filter token="java.vm.version" value="${java.vm.version}"/>
- <filter token="java.vm.vendor" value="${java.vm.vendor}"/>
- <filter token="build.id" value="${build.id}"/>
- <filter token="implementation.version" value="jbossws-${version.id}"/>
- <filtersfile file="${stack.dir}/version.properties"/>
- </filterset>
- </copy>
- </target>
-
- <!-- Compile resource files -->
-
- <!-- Compile resource files -->
- <target name="compile42-resources" if="jbossws.integration.jboss42">
+ <target name="init" depends="prepare">
+ <xmlproperty file="${stack.dir}/pom.xml"/>
+ <property name="version.id" value="${project.version}"/>
+
+ <echo message="version.id=${version.id}"/>
+ <echo message="integration.target=${jbossws.integration.target}"/>
- <unzip dest="${stack.output.dir}/resources/jbossws-jboss422" src="${thirdparty.dir}/jbossws-jboss422-resources.zip"/>
- <unzip dest="${stack.output.dir}/resources/jbossws-jboss423" src="${thirdparty.dir}/jbossws-jboss423-resources.zip"/>
-
- <!-- Concat jbossws-jboss422-beans.xml -->
- <concat destfile="${stack.output.resources.dir}/jbossws-jboss422/jbossws-jboss422-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="${stack.resources.dir}/jbossws-metro-config.xml"/>
- <fileset file="${stack.output.resources.dir}/jbossws-jboss422/jbossws-jboss42-config.xml"/>
- <footer trimleading="yes">
- </deployment> </footer>
- </concat>
-
- <!-- Concat jbossws-jboss423-beans.xml -->
- <concat destfile="${stack.output.resources.dir}/jbossws-jboss423/jbossws-jboss423-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="${stack.resources.dir}/jbossws-metro-config.xml"/>
- <fileset file="${stack.output.resources.dir}/jbossws-jboss423/jbossws-jboss42-config.xml"/>
- <footer trimleading="yes">
- </deployment> </footer>
- </concat>
-
+ <fail message="jbossws.integration.target not set" unless="jbossws.integration.target"/>
+ <property name="deploy.structure" value="${stack.output.dir}/deploy-${jbossws.integration.target}"/>
</target>
- <target name="compile50-resources" if="jbossws.integration.jboss50">
-
- <unzip dest="${stack.output.resources.dir}/jbossws-jboss500" src="${thirdparty.dir}/jbossws-jboss500-resources.zip"/>
- <unzip dest="${stack.output.resources.dir}/jbossws-jboss501" src="${thirdparty.dir}/jbossws-jboss501-resources.zip"/>
-
- <!-- Concat jbossws-jboss500-beans.xml -->
- <concat destfile="${stack.output.resources.dir}/jbossws-jboss500/jbossws-jboss500-beans.xml">
- <header trimleading="yes">
- <deployment xmlns="urn:jboss:bean-deployer:2.0"> </header>
- <fileset file="${stack.resources.dir}/jbossws-metro-config.xml"/>
- <footer trimleading="yes">
- </deployment> </footer>
- </concat>
-
- <!-- Concat jbossws-jboss501-beans.xml -->
- <concat destfile="${stack.output.resources.dir}/jbossws-jboss501/jbossws-jboss501-beans.xml">
- <header trimleading="yes">
- <deployment xmlns="urn:jboss:bean-deployer:2.0"> </header>
- <fileset file="${stack.resources.dir}/jbossws-metro-config.xml"/>
- <footer trimleading="yes">
- </deployment> </footer>
- </concat>
- </target>
-
- <target name="compile-resources" depends="init, compile42-resources, compile50-resources">
-
- <copy todir="${stack.output.resources.dir}">
- <fileset dir="${stack.resources.dir}">
- <include name="jbossws-metro.jar/**"/>
- <include name="jbossws-stack.sar/**"/>
- </fileset>
- </copy>
- </target>
-
<!-- ================================================================== -->
- <!-- Archives -->
+ <!-- Distribution -->
<!-- ================================================================== -->
- <!--
- | Build all jar files.
- -->
- <target name="jars" depends="compile" description="Builds all jar files.">
+ <target name="prepare-deploy" depends="prepare">
- <!-- Build jbossws-metro.jar -->
- <mkdir dir="${stack.output.lib.dir}"/>
- <jar jarfile="${stack.output.lib.dir}/jbossws-metro.jar" manifest="${stack.output.etc.dir}/default.mf">
- <fileset dir="${stack.output.classes.dir}">
- <include name="org/jboss/wsf/stack/metro/injection/**"/>
- <include name="org/jboss/wsf/stack/metro/client/**"/>
- <include name="org/jboss/wsf/stack/metro/metadata/**"/>
- <include name="org/jboss/wsf/stack/metro/log/**"/>
- <include name="org/jboss/wsf/stack/metro/*"/>
- </fileset>
- <metainf dir="${stack.resources.dir}/jbossws-metro.jar/META-INF"/>
- </jar>
-
- <!-- jbossws-metro-client.jar -->
- <jar jarfile="${stack.output.lib.dir}/jbossws-metro-client.jar" manifest="${stack.output.etc.dir}/default.mf">
- <fileset dir="${stack.output.classes.dir}">
- <include name="org/jboss/wsf/stack/metro/client/**"/>
- <include name="org/jboss/wsf/stack/metro/tools/**"/>
- </fileset>
- <metainf dir="${stack.resources.dir}/jbossws-metro-client.jar/META-INF"/>
- </jar>
-
- <!-- Build jbossws-context.war -->
- <copy todir="${stack.output.resources.dir}/jbossws-context.war" overwrite="true" filtering="true">
- <fileset dir="${stack.resources.dir}/jbossws-context.war"/>
- <filterset>
- <filter token="build.id" value="${build.id}"/>
- <filter token="implementation.version" value="jbossws-${version.id}"/>
- <filtersfile file="${stack.dir}/version.properties"/>
- </filterset>
- </copy>
- <war warfile="${stack.output.lib.dir}/jbossws-context.war" webxml="${stack.output.resources.dir}/jbossws-context.war/WEB-INF/web.xml"
- manifest="${stack.output.etc.dir}/default.mf">
- <fileset dir="${stack.output.resources.dir}/jbossws-context.war">
- <include name="index.html"/>
- <include name="styles.css"/>
- </fileset>
- <webinf dir="${stack.output.resources.dir}/jbossws-context.war/WEB-INF">
- <include name="jboss-web.xml"/>
- </webinf>
- </war>
-
- <!-- Build jbossws-metro-src.zip -->
- <zip zipfile="${stack.output.lib.dir}/jbossws-metro-src.zip">
- <fileset dir="${stack.java.dir}"/>
- </zip>
+ <delete dir="${deploy.artifacts.dir}"/>
+ <exec dir="${basedir}" executable="mvn" failonerror="true">
+ <arg value="package"/>
+ <arg value="assembly:directory"/>
+ </exec>
</target>
- <!-- Generate the JavaDoc -->
- <target name="javadoc" depends="init" description="Generate the Javadoc" if="javadoc">
+ <target name="build-bin-dist" depends="prepare-deploy" description="Build the binary distribution">
- <!-- expand the metro sources -->
- <mkdir dir="${stack.output.dir}/thirdparty-sources"/>
- <unzip src="${thirdparty.dir}/jaxws-ri-src.jar" dest="${stack.output.dir}/thirdparty-sources"/>
+ <echo message="*************************************"/>
+ <echo message="* mvn -P bindist assembly:directory *"/>
+ <echo message="*************************************"/>
- <mkdir dir="${stack.output.apidocs.dir}"/>
- <javadoc destdir="${stack.output.apidocs.dir}" author="true" version="true" use="true" windowtitle="JBossWS API">
- <classpath>
- <pathelement path="${metro50.integration.classpath}"/>
- <pathelement path="${stack.integration.classpath}"/>
- </classpath>
-
- <packageset dir="${stack.java.dir}" defaultexcludes="yes">
- <include name="org/jboss/wsf/**"/>
- </packageset>
- <packageset dir="${stack.output.dir}/thirdparty-sources" defaultexcludes="yes">
- <include name="com/sun/**"/>
- </packageset>
-
- <doctitle><![CDATA[<h1>JBoss Web Service Framework ${version.id} - Stack integration Sun-RI</h1>]]>
- </doctitle>
- <tag name="todo" scope="all" description="To do:"/>
-
-
- <!--group title="Native SOAP stack" packages="org.jboss.ws,org.jboss.ws.core*, org.jboss.ws.metadata*, org.jboss.ws.extensions*, org.jboss.ws.tools*, org.jboss.ws.annotation*, org.jboss.ws.jaxrpc*, org.jboss.ws.soap*"/-->
- <group title="Stack integration" packages="org.jboss.wsf.stack*"/>
- <group title="SPI" packages="org.jboss.wsf.spi*, org.jboss.ws.integration*"/>
- <group title="Container integration" packages="org.jboss.wsf.container*"/>
-
- </javadoc>
+ <delete dir="${stack.output.dir}/jbossws-metro-dist"/>
+ <exec dir="${basedir}" executable="mvn" failonerror="true">
+ <arg value="-P bindist"/>
+ <arg value="assembly:directory"/>
+ </exec>
</target>
<!-- ================================================================== -->
@@ -259,17 +80,14 @@
<!-- ================================================================== -->
<target name="clean" depends="prepare" description="Cleans up most generated files.">
- <delete dir="${stack.output.dir}"/>
+
+ <echo message="*************************************"/>
+ <echo message="* mvn clean *"/>
+ <echo message="*************************************"/>
+
+ <exec dir="${basedir}" executable="mvn" failonerror="true">
+ <arg value="clean"/>
+ </exec>
</target>
- <target name="clobber" depends="clean" description="Cleans up all generated files.">
- <delete dir="${stack.dir}/thirdparty"/>
- </target>
-
- <target name="main" description="Executes the default target (most)." depends="most"/>
-
- <target name="most" description="Builds almost everything." depends="jars,tests-main"/>
-
- <target name="all" description="Create a distribution zip file" depends="most,build-bin-dist"/>
-
</project>
Added: stack/metro/branches/tdiesler/trunk/src/main/distro/ant.properties
===================================================================
--- stack/metro/branches/tdiesler/trunk/src/main/distro/ant.properties (rev 0)
+++ stack/metro/branches/tdiesler/trunk/src/main/distro/ant.properties 2008-04-29 10:29:17 UTC (rev 6745)
@@ -0,0 +1,28 @@
+#
+# A sample ant properties file
+#
+# $Id: ant.properties.example 3137 2007-05-18 13:41:57Z thomas.diesler at jboss.com $
+
+# Optional JBoss Home
+jboss422.home=@jboss422.home@
+jboss423.home=@jboss423.home@
+jboss500.home=@jboss500.home@
+jboss501.home=@jboss501.home@
+
+# The JBoss settings
+jboss.server.instance=default
+jboss.bind.address=localhost
+
+# JBoss Repository
+#jboss.repository=file:/home/tdiesler/svn/jboss.local.repository
+jboss.repository=http://repository.jboss.org
+
+# JBoss JMX invoker authentication
+#jmx.authentication.username=admin
+#jmx.authentication.password=admin
+
+# Java Compiler options
+javac.debug=yes
+javac.deprecation=no
+javac.fail.onerror=yes
+javac.verbose=no
Deleted: stack/metro/branches/tdiesler/trunk/src/main/distro/ant.properties.example
===================================================================
--- stack/metro/branches/tdiesler/trunk/src/main/distro/ant.properties.example 2008-04-29 10:08:29 UTC (rev 6744)
+++ stack/metro/branches/tdiesler/trunk/src/main/distro/ant.properties.example 2008-04-29 10:29:17 UTC (rev 6745)
@@ -1,31 +0,0 @@
-#
-# A sample ant properties file
-#
-# $Id: ant.properties.example 3137 2007-05-18 13:41:57Z thomas.diesler at jboss.com $
-
-# Optional JBoss Home
-jboss422.home=@jboss422.home@
-jboss423.home=@jboss423.home@
-jboss500.home=@jboss500.home@
-jboss501.home=@jboss501.home@
-
-# The JBoss server under test. This can be [jboss422|jboss423|jboss500|jboss501]
-jbossws.integration.target=jboss422
-
-# The JBoss settings
-jboss.server.instance=default
-jboss.bind.address=localhost
-
-# JBoss Repository
-#jboss.repository=file:/home/tdiesler/svn/jboss.local.repository
-jboss.repository=http://repository.jboss.org
-
-# JBoss JMX invoker authentication
-#jmx.authentication.username=admin
-#jmx.authentication.password=admin
-
-# Java Compiler options
-javac.debug=yes
-javac.deprecation=no
-javac.fail.onerror=yes
-javac.verbose=no
Deleted: stack/metro/branches/tdiesler/trunk/src/main/distro/bin-dist-build.xml
===================================================================
--- stack/metro/branches/tdiesler/trunk/src/main/distro/bin-dist-build.xml 2008-04-29 10:08:29 UTC (rev 6744)
+++ stack/metro/branches/tdiesler/trunk/src/main/distro/bin-dist-build.xml 2008-04-29 10:29:17 UTC (rev 6745)
@@ -1,195 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!-- ====================================================================== -->
-<!-- -->
-<!-- JBoss, the OpenSource J2EE webOS -->
-<!-- -->
-<!-- Distributable under LGPL license. -->
-<!-- See terms of license at http://www.gnu.org. -->
-<!-- -->
-<!-- ====================================================================== -->
-
-<!-- $Id: bin-dist-build.xml 4081 2007-08-02 09:23:17Z thomas.diesler at jboss.com $ -->
-
-<project default="main" basedir="." name="JBossWS-Metro">
-
- <!-- ================================================================== -->
- <!-- Setup -->
- <!-- ================================================================== -->
-
- <property name="build.dir" value="${basedir}/build"/>
- <property name="docs.dir" value="${basedir}/docs"/>
- <property name="thirdparty.dir" value="${basedir}/deploy/lib"/>
- <property name="tests.dir" value="${basedir}/tests"/>
- <property name="tests.output.dir" value="${basedir}/output"/>
-
- <property name="deploy.artifacts.dir" value="${basedir}/deploy"/>
- <property name="deploy.structure.jboss42" value="${basedir}/output/deploy-jboss42"/>
- <property name="deploy.structure.jboss50" value="${basedir}/output/deploy-jboss50"/>
- <property name="jbossws.default.deploy.conf" value="${build.dir}/jbossws-default-deploy.conf"/>
-
- <property file="${basedir}/ant.properties"/>
- <property file="${basedir}/version.properties"/>
-
- <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}"/>
- <property name="jboss423.server.lib" value="${jboss423.server}/lib"/>
- <property name="jboss423.server.deploy" value="${jboss423.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}"/>
- <property name="jboss500.server.lib" value="${jboss500.server}/lib"/>
- <property name="jboss500.server.deploy" value="${jboss500.server}/deploy"/>
- <property name="jboss500.server.deployers" value="${jboss500.server}/deployers"/>
-
- <property name="jboss501.lib" value="${jboss501.home}/lib"/>
- <property name="jboss501.client" value="${jboss501.home}/client"/>
- <property name="jboss501.server" value="${jboss501.home}/server/${jboss.server.instance}"/>
- <property name="jboss501.server.lib" value="${jboss501.server}/lib"/>
- <property name="jboss501.server.deploy" value="${jboss501.server}/deploy"/>
- <property name="jboss501.server.deployers" value="${jboss501.server}/deployers"/>
-
- <property name="jbossws.integration.${jbossws.integration.target}" value="true"/>
-
- <property name="jboss422.available.file" value="${jboss422.client}/jboss-client.jar"/>
- <property name="jboss423.available.file" value="${jboss423.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="jboss500.available" file="${jboss500.available.file}"/>
- <available property="jboss501.available" file="${jboss501.available.file}"/>
-
- <condition property="jbossws.integration.jboss42" value="true">
- <or>
- <equals arg1="${jbossws.integration.target}" arg2="jboss421"/>
- <equals arg1="${jbossws.integration.target}" arg2="jboss422"/>
- <equals arg1="${jbossws.integration.target}" arg2="jboss423"/>
- </or>
- </condition>
- <condition property="jbossws.integration.jboss50" value="true">
- <or>
- <equals arg1="${jbossws.integration.target}" arg2="jboss500"/>
- <equals arg1="${jbossws.integration.target}" arg2="jboss501"/>
- </or>
- </condition>
-
- <!-- JDK Detection -->
- <available classname="java.lang.Enum" property="HAVE_JDK_1.5"/>
- <available classname="java.io.Console" property="HAVE_JDK_1.6"/>
-
- <fail message="JDK1.5 or above is required" unless="HAVE_JDK_1.5"/>
-
- <import file="${basedir}/build/build-deploy.xml"/>
- <import file="${basedir}/build/jbossws-deploy-macros.xml"/>
- <import file="${basedir}/tests/ant-import/build-testsuite.xml"/>
-
- <!-- ================================================================== -->
- <!-- Initialization -->
- <!-- ================================================================== -->
-
- <target name="prepare">
-
- <!-- Define jboss.home -->
- <condition property="jboss.home" value="${jboss500.home}">
- <equals arg1="${jbossws.integration.target}" arg2="jboss500"/>
- </condition>
- <condition property="jboss.home" value="${jboss422.home}">
- <equals arg1="${jbossws.integration.target}" arg2="jboss422"/>
- </condition>
- <condition property="jboss.home" value="${jboss423.home}">
- <equals arg1="${jbossws.integration.target}" arg2="jboss423"/>
- </condition>
-
- <!-- Define excludesfile -->
- <property name="excludesfile" value="${tests.dir}/resources/test-excludes-${jbossws.integration.target}.txt"/>
-
- </target>
-
- <target name="tests-init" depends="prepare,tests-classpath">
-
- <path id="ws.stack.classpath">
- <pathelement location="${thirdparty.dir}/FastInfoset.jar"/>
- <pathelement location="${thirdparty.dir}/http.jar"/>
- <pathelement location="${thirdparty.dir}/jaxrpc-api.jar"/>
- <pathelement location="${thirdparty.dir}/jaxws-api.jar"/>
- <pathelement location="${thirdparty.dir}/jaxws-rt.jar"/>
- <pathelement location="${thirdparty.dir}/jaxws-tools.jar"/>
- <pathelement location="${thirdparty.dir}/jbossws-common.jar"/>
- <pathelement location="${thirdparty.dir}/jbossws-spi.jar"/>
- <pathelement location="${thirdparty.dir}/jboss-wsit-rt.jar"/>
- <pathelement location="${thirdparty.dir}/jboss-wsit-tools.jar"/>
- <pathelement location="${thirdparty.dir}/jsr173_api.jar"/>
- <pathelement location="${thirdparty.dir}/jsr181-api.jar"/>
- <pathelement location="${thirdparty.dir}/jsr250-api.jar"/>
- <pathelement location="${thirdparty.dir}/mimepull.jar"/>
- <pathelement location="${thirdparty.dir}/saaj-api.jar"/>
- <pathelement location="${thirdparty.dir}/saaj-impl.jar"/>
- <pathelement location="${thirdparty.dir}/sjsxp.jar"/>
- <pathelement location="${thirdparty.dir}/stax-ex.jar"/>
- <pathelement location="${thirdparty.dir}/streambuffer.jar"/>
- <pathelement location="${thirdparty.dir}/wsit-resolver.jar"/>
- <pathelement location="${thirdparty.dir}/wstx.jar"/>
- <pathelement location="${thirdparty.dir}/wsdl4j.jar"/>
- <pathelement location="${thirdparty.dir}/xws-security.jar"/>
- </path>
-
- <path id="tests.extra.classpath">
- <pathelement location="${thirdparty.dir}/jbossws-metro-client.jar"/>
- <pathelement location="${thirdparty.dir}/jbossws-framework.jar"/>
- <pathelement location="${thirdparty.dir}/jaxws-tools.jar"/>
- </path>
-
- </target>
-
- <!-- ================================================================== -->
- <!-- Compile -->
- <!-- ================================================================== -->
-
- <target name="tests-compile" depends="tests-init" description="Compile sources">
- <macro-compile-classes srcdir="${tests.dir}/java" excludesfile="${excludesfile}"/>
- </target>
-
- <!-- ================================================================== -->
- <!-- Building -->
- <!-- ================================================================== -->
-
- <!-- Copy resources -->
- <target name="tests-copy-resources" depends="tests-init">
- <macro-copy-resources srcdir="${tests.dir}"/>
- </target>
-
- <target name="tests-jars" depends="tests-compile,tests-copy-resources">
- <ant antfile="${tests.dir}/ant-import/build-samples-jaxws.xml" target="build-samples-jaxws" inheritall="true"/>
- </target>
-
- <target name="tests-main" depends="tests-jars" description="Build the test deployments."/>
-
- <!-- dummy targets -->
- <target name="prepare-deploy" depends="prepare"/>
-
- <!-- ================================================================== -->
- <!-- Miscellaneous -->
- <!-- ================================================================== -->
-
- <target name="clean" depends="prepare" description="Cleans up most generated files.">
- <delete dir="${tests.output.dir}"/>
- </target>
-
- <target name="clobber" depends="clean" description="Cleans up all generated files.">
- </target>
-
- <target name="main" depends="most" description="Executes the default target (most)."/>
-
- <target name="most" depends="tests-main" description="Builds almost everything."/>
-
-</project>
\ No newline at end of file
Added: stack/metro/branches/tdiesler/trunk/src/main/distro/build-deploy.xml
===================================================================
--- stack/metro/branches/tdiesler/trunk/src/main/distro/build-deploy.xml (rev 0)
+++ stack/metro/branches/tdiesler/trunk/src/main/distro/build-deploy.xml 2008-04-29 10:29:17 UTC (rev 6745)
@@ -0,0 +1,147 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!-- ====================================================================== -->
+<!-- -->
+<!-- JBoss, the OpenSource J2EE webOS -->
+<!-- -->
+<!-- Distributable under LGPL license. -->
+<!-- See terms of license at http://www.gnu.org. -->
+<!-- -->
+<!-- ====================================================================== -->
+
+<!-- $Id$ -->
+
+<project>
+
+ <!-- ================================================================== -->
+ <!-- Prepare Deployment Structure JBoss-4.2.x -->
+ <!-- ================================================================== -->
+
+ <target name="deploy-structure-jboss42" depends="prepare-deploy">
+ <delete dir="${deploy.structure}"/>
+ <antcall target="deploy-jbossws-metro42" inheritall="false">
+ <param name="installserver" value="${deploy.structure}/server/${jboss.server.instance}"/>
+ <param name="jbossid" value="${jbossws.integration.target}"/>
+ <param name="artifactsdir" value="${deploy.artifacts.dir}"/>
+ </antcall>
+ <macro-create-deploy-conf deploystructure="${deploy.structure}"/>
+ </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-jbossws targetdir="${jboss422.server.deploy}/jbossws.sar" defaultconf="${jbossws.default.deploy.conf}"/>
+ </target>
+
+ <!-- ================================================================== -->
+ <!-- Deployment JBoss423 -->
+ <!-- ================================================================== -->
+
+ <target name="target-jboss423">
+ <property name="jbossws.integration.target" value="jboss423"/>
+ <echo message="jbossws.integration.target=${jbossws.integration.target}" file="${target.properties.file}"/>
+ </target>
+
+ <target name="deploy-jboss423" depends="undeploy-jboss423,deploy-structure-jboss42" description="Deploy jbossws to jboss423">
+ <fail message="Not available: ${jboss423.available.file}" unless="jboss423.available"/>
+ <copy todir="${jboss423.home}" overwrite="true">
+ <fileset dir="${deploy.structure}"/>
+ </copy>
+ <chmod dir="${jboss423.home}/bin" perm="+x" includes="*.sh"/>
+ </target>
+
+ <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}"/>
+ </target>
+
+ <!-- ================================================================== -->
+ <!-- Prepare Deployment Structure JBoss-4.2.x -->
+ <!-- ================================================================== -->
+
+ <target name="deploy-structure-jboss50" depends="prepare-deploy">
+ <delete dir="${deploy.structure}"/>
+ <antcall target="deploy-jbossws-metro50" inheritall="false">
+ <param name="installserver" value="${deploy.structure}/server/${jboss.server.instance}"/>
+ <param name="jbossid" value="${jbossws.integration.target}"/>
+ <param name="artifactsdir" value="${deploy.artifacts.dir}"/>
+ </antcall>
+ <macro-create-deploy-conf deploystructure="${deploy.structure}"/>
+ </target>
+
+ <!-- ================================================================== -->
+ <!-- Deployment JBoss500 -->
+ <!-- ================================================================== -->
+
+ <target name="target-jboss500">
+ <property name="jbossws.integration.target" value="jboss500"/>
+ <echo message="jbossws.integration.target=${jbossws.integration.target}" file="${target.properties.file}"/>
+ </target>
+
+ <target name="deploy-jboss500" depends="undeploy-jboss500,deploy-structure-jboss50" description="Deploy jbossws to jboss500">
+ <fail message="Not available: ${jboss500.available.file}" unless="jboss500.available"/>
+ <copy todir="${jboss500.home}" overwrite="true">
+ <fileset dir="${deploy.structure}"/>
+ </copy>
+ <chmod dir="${jboss500.home}/bin" perm="+x" includes="*.sh"/>
+ </target>
+
+ <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}"/>
+ </target>
+
+ <!-- ================================================================== -->
+ <!-- Deployment JBoss501 -->
+ <!-- ================================================================== -->
+
+ <target name="target-jboss501">
+ <property name="jbossws.integration.target" value="jboss501"/>
+ <echo message="jbossws.integration.target=${jbossws.integration.target}" file="${target.properties.file}"/>
+ </target>
+
+ <target name="deploy-jboss501" depends="undeploy-jboss501,deploy-structure-jboss50" description="Deploy jbossws to jboss501">
+ <fail message="Not available: ${jboss501.available.file}" unless="jboss501.available"/>
+ <copy todir="${jboss501.home}" overwrite="true">
+ <fileset dir="${deploy.structure}"/>
+ </copy>
+ <chmod dir="${jboss501.home}/bin" perm="+x" includes="*.sh"/>
+ </target>
+
+ <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}"/>
+ </target>
+
+ <!-- ================================================================== -->
+ <!-- Create jbossws-deploy.conf -->
+ <!-- ================================================================== -->
+
+ <macrodef name="macro-create-deploy-conf">
+ <attribute name="deploystructure"/>
+ <sequential>
+ <fileset id="jbossws.deploy.fileset" dir="@{deploystructure}" excludes="**/jbossws.sar/**"/>
+ <property name="jbossws.deploy.fileset" refid="jbossws.deploy.fileset"/>
+ <property name="jbossws.sar.dir" value="@{deploystructure}/server/${jboss.server.instance}/deploy/jbossws.sar"/>
+ <echo file="${jbossws.sar.dir}/jbossws-deploy.conf" message="${jbossws.deploy.fileset}"/>
+ <replace file="${jbossws.sar.dir}/jbossws-deploy.conf" token=";" value=" "/>
+ </sequential>
+ </macrodef>
+
+</project>
Property changes on: stack/metro/branches/tdiesler/trunk/src/main/distro/build-deploy.xml
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: stack/metro/branches/tdiesler/trunk/src/main/distro/build-setup.xml
===================================================================
--- stack/metro/branches/tdiesler/trunk/src/main/distro/build-setup.xml (rev 0)
+++ stack/metro/branches/tdiesler/trunk/src/main/distro/build-setup.xml 2008-04-29 10:29:17 UTC (rev 6745)
@@ -0,0 +1,75 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!-- ====================================================================== -->
+<!-- -->
+<!-- JBoss, the OpenSource J2EE webOS -->
+<!-- -->
+<!-- Distributable under LGPL license. -->
+<!-- See terms of license at http://www.gnu.org. -->
+<!-- -->
+<!-- ====================================================================== -->
+
+<!-- $Id$ -->
+
+<project>
+
+ <!-- ================================================================== -->
+ <!-- Setup -->
+ <!-- ================================================================== -->
+
+ <!-- Check if ant.properties is available -->
+ <available property="ant.properties.available" file="${basedir}/ant.properties"/>
+ <fail message="Cannot find ant.properties. Did you copy/edit ant.properties.example?" unless="ant.properties.available"/>
+ <property file="${basedir}/ant.properties"/>
+
+ <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}"/>
+ <property name="jboss423.server.lib" value="${jboss423.server}/lib"/>
+ <property name="jboss423.server.deploy" value="${jboss423.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}"/>
+ <property name="jboss500.server.lib" value="${jboss500.server}/lib"/>
+ <property name="jboss500.server.deploy" value="${jboss500.server}/deploy"/>
+ <property name="jboss500.server.deployers" value="${jboss500.server}/deployers"/>
+
+ <property name="jboss501.lib" value="${jboss501.home}/lib"/>
+ <property name="jboss501.client" value="${jboss501.home}/client"/>
+ <property name="jboss501.server" value="${jboss501.home}/server/${jboss.server.instance}"/>
+ <property name="jboss501.server.lib" value="${jboss501.server}/lib"/>
+ <property name="jboss501.server.deploy" value="${jboss501.server}/deploy"/>
+ <property name="jboss501.server.deployers" value="${jboss501.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="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="jboss500.available" file="${jboss500.available.file}"/>
+ <available property="jboss501.available" file="${jboss501.available.file}"/>
+
+ <!-- ================================================================== -->
+ <!-- Initialization -->
+ <!-- ================================================================== -->
+
+ <target name="prepare">
+
+ <!-- Load jbossws.integration.target properties -->
+ <property file="${target.properties.file}"/>
+
+ <tstamp>
+ <format property="build.id" pattern="yyyyMMddHHmm"/>
+ </tstamp>
+ </target>
+
+</project>
\ No newline at end of file
Property changes on: stack/metro/branches/tdiesler/trunk/src/main/distro/build-setup.xml
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: stack/metro/branches/tdiesler/trunk/src/main/distro/build.xml
===================================================================
--- stack/metro/branches/tdiesler/trunk/src/main/distro/build.xml (rev 0)
+++ stack/metro/branches/tdiesler/trunk/src/main/distro/build.xml 2008-04-29 10:29:17 UTC (rev 6745)
@@ -0,0 +1,108 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!-- ====================================================================== -->
+<!-- -->
+<!-- JBoss, the OpenSource J2EE webOS -->
+<!-- -->
+<!-- Distributable under LGPL license. -->
+<!-- See terms of license at http://www.gnu.org. -->
+<!-- -->
+<!-- ====================================================================== -->
+
+<!-- $Id$ -->
+
+<project basedir="." name="JBossWS-CXF">
+
+ <!-- ================================================================== -->
+ <!-- Setup -->
+ <!-- ================================================================== -->
+
+ <property name="build.dir" value="${basedir}/build"/>
+ <property name="docs.dir" value="${basedir}/docs"/>
+ <property name="output.dir" value="${basedir}/output"/>
+ <property name="thirdparty.dir" value="${basedir}/deploy/lib"/>
+ <property name="tests.dir" value="${basedir}/tests"/>
+ <property name="tests.output.dir" value="${output.dir}"/>
+
+ <property name="deploy.artifacts.dir" value="${basedir}/deploy"/>
+ <property name="jbossws.default.deploy.conf" value="${build.dir}/jbossws-default-deploy.conf"/>
+ <property name="target.properties.file" value="${basedir}/target.properties"/>
+
+ <import file="${build.dir}/build-setup.xml"/>
+ <import file="${build.dir}/build-deploy.xml"/>
+ <import file="${build.dir}/jbossws-deploy-macros.xml"/>
+ <import file="${tests.dir}/ant-import/build-testsuite.xml"/>
+
+ <!-- ================================================================== -->
+ <!-- Initialization -->
+ <!-- ================================================================== -->
+
+ <target name="init" depends="prepare">
+
+ <fail message="jbossws.integration.target not set" unless="jbossws.integration.target"/>
+ <echo message="integration.target=${jbossws.integration.target}"/>
+
+ <condition property="jbossws.integration.jboss42" value="true">
+ <or>
+ <equals arg1="${jbossws.integration.target}" arg2="jboss422"/>
+ <equals arg1="${jbossws.integration.target}" arg2="jboss423"/>
+ </or>
+ </condition>
+ <condition property="jbossws.integration.jboss50" value="true">
+ <or>
+ <equals arg1="${jbossws.integration.target}" arg2="jboss500"/>
+ <equals arg1="${jbossws.integration.target}" arg2="jboss501"/>
+ </or>
+ </condition>
+
+ <property name="deploy.structure" value="${output.dir}/deploy-${jbossws.integration.target}"/>
+ <property name="excludesfile" value="${tests.dir}/resources/test-excludes-${jbossws.integration.target}.txt"/>
+ </target>
+
+ <target name="tests-init" depends="init,tests-classpath">
+
+ <path id="ws.stack.classpath">
+ <fileset dir="${thirdparty.dir}"/>
+ </path>
+
+ <path id="tests.extra.classpath">
+ </path>
+
+ <property name="jbossws.test.log" value="${tests.output.dir}"/>
+ </target>
+
+ <!-- ================================================================== -->
+ <!-- Compile -->
+ <!-- ================================================================== -->
+
+ <target name="tests-compile" depends="tests-init" description="Compile sources">
+ <macro-compile-classes srcdir="${tests.dir}/java" excludesfile="${excludesfile}"/>
+ </target>
+
+ <!-- ================================================================== -->
+ <!-- Building -->
+ <!-- ================================================================== -->
+
+ <!-- Copy resources -->
+ <target name="tests-copy-resources" depends="tests-init">
+ <macro-copy-resources srcdir="${tests.dir}"/>
+ </target>
+
+ <target name="tests-jars" depends="tests-compile,tests-copy-resources">
+ <ant antfile="${tests.dir}/ant-import/build-samples-jaxws.xml" target="build-samples-jaxws" inheritall="true"/>
+ </target>
+
+ <target name="tests-main" depends="tests-jars" description="Build the test deployments."/>
+
+ <!-- dummy targets -->
+ <target name="prepare-deploy" depends="init"/>
+
+ <!-- ================================================================== -->
+ <!-- Miscellaneous -->
+ <!-- ================================================================== -->
+
+ <target name="clean" depends="prepare" description="Cleans up most generated files.">
+ <delete dir="${tests.output.dir}"/>
+ </target>
+
+</project>
\ No newline at end of file
Property changes on: stack/metro/branches/tdiesler/trunk/src/main/distro/build.xml
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: stack/metro/branches/tdiesler/trunk/src/main/distro/jbossws-default-deploy.conf
===================================================================
--- stack/metro/branches/tdiesler/trunk/src/main/distro/jbossws-default-deploy.conf (rev 0)
+++ stack/metro/branches/tdiesler/trunk/src/main/distro/jbossws-default-deploy.conf 2008-04-29 10:29:17 UTC (rev 6745)
@@ -0,0 +1 @@
+bin/wsconsume.bat bin/wsconsume.sh bin/wsprovide.bat bin/wsprovide.sh bin/wsrunclient.bat bin/wsrunclient.sh bin/wstools.bat bin/wstools.sh client/jaxb-api.jar client/jaxb-impl.jar client/jaxb-xjc.jar client/jaxws-rt.jar client/jaxws-tools.jar client/jboss-jaxrpc.jar client/jboss-jaxws-ext.jar client/jboss-jaxws.jar client/jboss-saaj.jar client/jbossws-client.jar client/jbossws-common.jar client/jbossws-framework.jar client/jbossws-spi.jar client/policy.jar client/stax-ex.jar client/streambuffer.jar client/wsdl4j.jar lib/jaxb-api.jar lib/jaxb-impl.jar server/default/lib/jboss-jaxrpc.jar server/default/lib/jboss-jaxws-ext.jar server/default/lib/jboss-jaxws.jar server/default/lib/jboss-saaj.jar server/default/lib/jbossws-common.jar server/default/lib/jbossws-framework.jar server/default/lib/jbossws-spi.jar server/default/deploy/jbossws.sar
\ No newline at end of file
Added: stack/metro/branches/tdiesler/trunk/src/main/distro/jbossws-deploy-macros.xml
===================================================================
--- stack/metro/branches/tdiesler/trunk/src/main/distro/jbossws-deploy-macros.xml (rev 0)
+++ stack/metro/branches/tdiesler/trunk/src/main/distro/jbossws-deploy-macros.xml 2008-04-29 10:29:17 UTC (rev 6745)
@@ -0,0 +1,398 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!-- ====================================================================== -->
+<!-- -->
+<!-- JBoss, the OpenSource J2EE webOS -->
+<!-- -->
+<!-- Distributable under LGPL license. -->
+<!-- See terms of license at http://www.gnu.org. -->
+<!-- -->
+<!-- ====================================================================== -->
+
+<!-- $Id$ -->
+
+<project>
+
+ <!--
+ These patterns should be common for all supported containers.
+ All jars must also be declared in component-info.xml to ensure
+ that the AS build uses the same version.
+ -->
+ <patternset id="jbossws.bin.patternset">
+ <include name="**/wsconsume.bat"/>
+ <include name="**/wsconsume.sh"/>
+ <include name="**/wsprovide.bat"/>
+ <include name="**/wsprovide.sh"/>
+ </patternset>
+
+ <patternset id="jbossws.client.patternset">
+ <include name="**/jbossws-common.jar"/>
+ <include name="**/jbossws-framework.jar"/>
+ <include name="**/jbossws-metro-client.jar"/>
+ <include name="**/jbossws-spi.jar"/>
+ <include name="**/jaxb-api.jar"/>
+ <include name="**/jaxb-impl.jar"/>
+ <include name="**/jaxb-xjc.jar"/>
+ <include name="**/jaxws-tools.jar"/>
+ <include name="**/jaxws-rt.jar"/>
+ <include name="**/jaxws-api.jar"/>
+ <include name="**/jboss-wsit-rt.jar"/>
+ <include name="**/jboss-wsit-tools.jar"/>
+ <include name="**/streambuffer.jar"/>
+ <include name="**/stax-api.jar"/>
+ <include name="**/stax-ex.jar"/>
+ <include name="**/jsr181-api.jar"/>
+ <include name="**/saaj-api.jar"/>
+ <include name="**/saaj-impl.jar"/>
+ <include name="**/stax-api.jar"/>
+ <include name="**/wsdl4j.jar"/>
+ <include name="**/wstx.jar"/>
+ </patternset>
+
+ <patternset id="jbossws.lib.patternset">
+ <include name="**/nothing-to-deploy"/>
+ </patternset>
+
+ <patternset id="jbossws.lib.endorsed.patternset">
+ <include name="**/jboss-jaxrpc.jar"/>
+ <include name="**/jboss-jaxws.jar"/>
+ <include name="**/jboss-jaxws-ext.jar"/>
+ <include name="**/jboss-saaj.jar"/>
+ <include name="**/jaxb-api.jar"/>
+ </patternset>
+
+ <patternset id="jbossws.server.lib.patternset">
+ <include name="**/jbossws-common.jar"/>
+ <include name="**/jbossws-framework.jar"/>
+ <include name="**/jbossws-spi.jar"/>
+ <include name="**/jaxws-api.jar"/>
+ <include name="**/jsr181-api.jar"/>
+ <include name="**/saaj-api.jar"/>
+ <include name="**/stax-api.jar"/>
+ </patternset>
+
+ <patternset id="jbossws.service.lib.patternset">
+ <include name="**/FastInfoset.jar"/>
+ <include name="**/http.jar"/>
+ <include name="**/jaxb-api.jar"/>
+ <include name="**/jaxb-impl.jar"/>
+ <include name="**/jaxrpc-api.jar"/>
+ <include name="**/jaxws-api.jar"/>
+ <include name="**/jaxws-local-transport.jar"/>
+ <include name="**/jaxws-rt.jar"/>
+ <include name="**/jaxws-tools.jar"/>
+ <include name="**/jboss-wsit-rt.jar"/>
+ <include name="**/jboss-wsit-tools.jar"/>
+ <include name="**/jbossws-metro.jar"/>
+ <include name="**/jsr181-api.jar"/>
+ <include name="**/jsr173_api.jar"/>
+ <include name="**/jsr250-api.jar"/>
+ <include name="**/mimepull.jar"/>
+ <include name="**/saaj-api.jar"/>
+ <include name="**/saaj-impl.jar"/>
+ <include name="**/sjsxp.jar"/>
+ <include name="**/stax-ex.jar"/>
+ <include name="**/stax-utils.jar"/>
+ <include name="**/streambuffer.jar"/>
+ <include name="**/txnannprocessor.jar"/>
+ <include name="**/wsdl4j.jar"/>
+ <include name="**/wsit-resolver.jar"/>
+ <include name="**/wstx.jar"/>
+ <include name="**/xmldsig.jar"/>
+ <include name="**/xmlsec.jar"/>
+ <include name="**/xws-security.jar"/>
+ </patternset>
+
+ <!-- ================================================================== -->
+ <!-- Deploy Bin -->
+ <!-- ================================================================== -->
+
+ <macrodef name="macro-deploy-jbossws-bin">
+ <attribute name="thirdpartydir"/>
+ <attribute name="targetdir"/>
+ <sequential>
+ <mkdir dir="@{targetdir}"/>
+ <copy todir="@{targetdir}" flatten="true" overwrite="true">
+ <fileset dir="@{thirdpartydir}">
+ <patternset refid="jbossws.bin.patternset"/>
+ </fileset>
+ </copy>
+ </sequential>
+ </macrodef>
+
+ <!-- ================================================================== -->
+ <!-- Deploy Lib -->
+ <!-- ================================================================== -->
+
+ <macrodef name="macro-deploy-jbossws-lib42">
+ <attribute name="thirdpartydir"/>
+ <attribute name="targetdir"/>
+ <sequential>
+ <mkdir dir="@{targetdir}"/>
+ <copy todir="@{targetdir}" flatten="true" overwrite="true">
+ <fileset dir="@{thirdpartydir}">
+ <patternset refid="jbossws.lib.patternset"/>
+ </fileset>
+ </copy>
+ </sequential>
+ </macrodef>
+
+ <macrodef name="macro-deploy-jbossws-lib50">
+ <attribute name="thirdpartydir"/>
+ <attribute name="targetdir"/>
+ <sequential>
+ <mkdir dir="@{targetdir}"/>
+ <copy todir="@{targetdir}" flatten="true" overwrite="true">
+ <fileset dir="@{thirdpartydir}">
+ <patternset refid="jbossws.lib.patternset"/>
+ <include name="**/jaxb-api.jar"/>
+ <include name="**/jaxb-impl.jar"/>
+ <include name="**/stax-api.jar"/>
+ <include name="**/wstx.jar"/>
+ </fileset>
+ </copy>
+ </sequential>
+ </macrodef>
+
+ <!-- ================================================================== -->
+ <!-- Deploy Deployers -->
+ <!-- ================================================================== -->
+
+ <macrodef name="macro-deploy-jbossws-deployers50">
+ <attribute name="thirdpartydir"/>
+ <attribute name="targetdir"/>
+ <attribute name="jbossid"/>
+ <sequential>
+ <mkdir dir="@{targetdir}"/>
+ <copy todir="@{targetdir}" flatten="true" overwrite="true">
+ <fileset dir="@{thirdpartydir}">
+ <include name="**/jbossws-common.jar"/>
+ <include name="**/jbossws-framework.jar"/>
+ <include name="**/jbossws-@{jbossid}.jar"/>
+ </fileset>
+ </copy>
+ <copy todir="@{targetdir}/META-INF" flatten="true" overwrite="true">
+ <fileset dir="@{thirdpartydir}">
+ <include name="**/jbossws-deployer-beans.xml"/>
+ </fileset>
+ </copy>
+ </sequential>
+ </macrodef>
+
+ <!-- ================================================================== -->
+ <!-- Deploy Deploy -->
+ <!-- ================================================================== -->
+
+ <macrodef name="macro-deploy-jbossws-deploy50">
+ <attribute name="thirdpartydir"/>
+ <attribute name="targetdir"/>
+ <attribute name="jbossid"/>
+ <sequential>
+ <mkdir dir="@{targetdir}"/>
+ <copy todir="@{targetdir}" flatten="true" overwrite="true">
+ <fileset dir="@{thirdpartydir}">
+ <include name="**/jbossws-@{jbossid}-container.jar"/>
+ </fileset>
+ </copy>
+ </sequential>
+ </macrodef>
+
+ <!-- ================================================================== -->
+ <!-- Deploy Lib Endorsed -->
+ <!-- ================================================================== -->
+
+ <macrodef name="macro-deploy-jbossws-endorsed">
+ <attribute name="thirdpartydir"/>
+ <attribute name="targetdir"/>
+ <sequential>
+ <mkdir dir="@{targetdir}"/>
+ <copy todir="@{targetdir}" flatten="true" overwrite="true">
+ <fileset dir="@{thirdpartydir}">
+ <patternset refid="jbossws.lib.endorsed.patternset"/>
+ </fileset>
+ </copy>
+ </sequential>
+ </macrodef>
+
+ <!-- ================================================================== -->
+ <!-- Deploy Client -->
+ <!-- ================================================================== -->
+
+ <macrodef name="macro-deploy-jbossws-client">
+ <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"/>
+ <include name="**/jbossws-@{jbossid}.jar"/>
+ </fileset>
+ </copy>
+ </sequential>
+ </macrodef>
+
+ <!-- ================================================================== -->
+ <!-- Deploy Server Lib -->
+ <!-- ================================================================== -->
+
+ <macrodef name="macro-deploy-jbossws-server-lib42">
+ <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.server.lib.patternset"/>
+ <include name="**/jbossws-@{jbossid}.jar"/>
+ </fileset>
+ </copy>
+ </sequential>
+ </macrodef>
+
+ <macrodef name="macro-deploy-jbossws-server-lib50">
+ <attribute name="thirdpartydir"/>
+ <attribute name="targetdir"/>
+ <sequential>
+ <mkdir dir="@{targetdir}"/>
+ <copy todir="@{targetdir}" flatten="true" overwrite="true">
+ <fileset dir="@{thirdpartydir}">
+ <patternset refid="jbossws.server.lib.patternset"/>
+ </fileset>
+ </copy>
+ </sequential>
+ </macrodef>
+
+ <!-- ================================================================== -->
+ <!-- Deploy JBossWS Service -->
+ <!-- ================================================================== -->
+
+ <macrodef name="macro-deploy-jbossws-metro42-sar">
+ <attribute name="thirdpartydir"/>
+ <attribute name="resourcesdir"/>
+ <attribute name="targetdir"/>
+ <attribute name="jbossid"/>
+ <sequential>
+ <mkdir dir="@{targetdir}"/>
+ <copy todir="@{targetdir}" flatten="true">
+ <fileset dir="@{thirdpartydir}">
+ <patternset refid="jbossws.service.lib.patternset"/>
+ <include name="**/jbossws-deploy.conf"/>
+ <include name="**/jaxb-api.jar"/>
+ <include name="**/jaxb-impl.jar"/>
+ <include name="**/stax-api.jar"/>
+ <include name="**/wstx.jar"/>
+ </fileset>
+ </copy>
+ <unzip dest="@{targetdir}/jbossws-context.war">
+ <fileset dir="@{thirdpartydir}">
+ <include name="**/jbossws-context.war"/>
+ </fileset>
+ </unzip>
+ <copy todir="@{targetdir}/jbossws.beans/META-INF" flatten="true">
+ <fileset dir="@{thirdpartydir}">
+ <include name="**/jbossws-@{jbossid}-beans.xml"/>
+ </fileset>
+ </copy>
+ <move file="@{targetdir}/jbossws.beans/META-INF/jbossws-@{jbossid}-beans.xml" tofile="@{targetdir}/jbossws.beans/META-INF/jboss-beans.xml"/>
+ <copy todir="@{targetdir}/META-INF" flatten="true" overwrite="true">
+ <fileset dir="@{resourcesdir}/jbossws-@{jbossid}/jbossws-jboss42.sar/META-INF"/>
+ </copy>
+ </sequential>
+ </macrodef>
+
+ <macrodef name="macro-deploy-jbossws-metro50-sar">
+ <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.service.lib.patternset"/>
+ <include name="**/jbossws-deploy.conf"/>
+ </fileset>
+ </copy>
+ <unzip dest="@{targetdir}/jbossws-context.war" overwrite="true">
+ <fileset dir="@{thirdpartydir}">
+ <include name="**/jbossws-context.war"/>
+ </fileset>
+ </unzip>
+ <copy todir="@{targetdir}/META-INF" flatten="true" overwrite="true">
+ <fileset dir="@{thirdpartydir}">
+ <include name="**/jbossws-@{jbossid}-beans.xml"/>
+ </fileset>
+ </copy>
+ </sequential>
+ </macrodef>
+
+ <!-- ================================================================== -->
+ <!-- Deploy JBossWS -->
+ <!-- ================================================================== -->
+
+ <!-- JDK Detection -->
+ <available classname="java.io.Console" property="HAVE_JDK_1.6"/>
+
+ <target name="deploy-jbossws-metro42" depends="deploy-jbossws-endorsed">
+ <macro-deploy-jbossws-bin targetdir="${installserver}/../../bin" thirdpartydir="${thirdpartydir}"/>
+ <macro-deploy-jbossws-client 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-metro42-sar targetdir="${installserver}/deploy/jbossws.sar" thirdpartydir="${thirdpartydir}" resourcesdir="${resourcesdir}"
+ jbossid="${jbossid}"/>
+ </target>
+
+ <target name="deploy-jbossws-metro50" depends="deploy-jbossws-endorsed">
+ <macro-deploy-jbossws-bin targetdir="${installserver}/../../bin" thirdpartydir="${thirdpartydir}"/>
+ <macro-deploy-jbossws-client 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}"/>
+ <macro-deploy-jbossws-metro50-sar targetdir="${installserver}/deploy/jbossws.sar" thirdpartydir="${thirdpartydir}" jbossid="${jbossid}"/>
+ <macro-deploy-jbossws-deployers50 targetdir="${installserver}/deployers/jbossws.deployer/" thirdpartydir="${thirdpartydir}" jbossid="${jbossid}"/>
+ <macro-deploy-jbossws-deploy50 targetdir="${installserver}/deploy" thirdpartydir="${thirdpartydir}" jbossid="${jbossid}"/>
+ </target>
+
+ <target name="deploy-jbossws-endorsed" if="HAVE_JDK_1.6">
+ <macro-deploy-jbossws-endorsed targetdir="${installserver}/../../lib/endorsed" thirdpartydir="${thirdpartydir}"/>
+ </target>
+
+ <!-- ================================================================== -->
+ <!-- Undeploy JBossWS -->
+ <!-- ================================================================== -->
+
+ <macrodef name="macro-undeploy-jbossws">
+ <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"/>
+
+ <!-- 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>
\ No newline at end of file
Property changes on: stack/metro/branches/tdiesler/trunk/src/main/distro/jbossws-deploy-macros.xml
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Copied: stack/metro/branches/tdiesler/trunk/src/main/scripts (from rev 6729, stack/cxf/trunk/src/main/scripts)
Deleted: stack/metro/branches/tdiesler/trunk/src/main/scripts/assembly-bin-dist.xml
===================================================================
--- stack/cxf/trunk/src/main/scripts/assembly-bin-dist.xml 2008-04-28 20:23:02 UTC (rev 6729)
+++ stack/metro/branches/tdiesler/trunk/src/main/scripts/assembly-bin-dist.xml 2008-04-29 10:29:17 UTC (rev 6745)
@@ -1,85 +0,0 @@
-<assembly xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/assembly-1.1.0-SNAPSHOT.xsd">
-
- <id>binary-distribution</id>
- <formats>
- <format>dir</format>
- </formats>
- <includeBaseDirectory>false</includeBaseDirectory>
-
- <fileSets>
- <!-- root -->
- <fileSet>
- <directory>src/main/distro</directory>
- <outputDirectory>/</outputDirectory>
- <includes>
- <include>build.xml</include>
- </includes>
- </fileSet>
- <fileSet>
- <directory>src/main/distro</directory>
- <outputDirectory>/</outputDirectory>
- <filtered>true</filtered>
- <includes>
- <include>ant.properties</include>
- </includes>
- </fileSet>
- <!-- build -->
- <fileSet>
- <directory>src/main/distro</directory>
- <outputDirectory>build</outputDirectory>
- <includes>
- <include>build-deploy.xml</include>
- <include>build-setup.xml</include>
- <include>jbossws-default-deploy.conf</include>
- <include>jbossws-deploy-macros.xml</include>
- </includes>
- </fileSet>
- <!-- docs -->
- <fileSet>
- <directory>src/main/distro</directory>
- <outputDirectory>docs</outputDirectory>
- <filtered>true</filtered>
- <includes>
- <include>Install.txt</include>
- <include>ReleaseNotes.txt</include>
- <include>JBossORG-EULA.txt</include>
- </includes>
- </fileSet>
- <!-- deploy -->
- <fileSet>
- <directory>target/deploy-artifacts</directory>
- <outputDirectory>deploy</outputDirectory>
- </fileSet>
- <!-- test excludes -->
- <fileSet>
- <directory>modules/testsuite/cxf-tests/src/test</directory>
- <outputDirectory>tests</outputDirectory>
- <includes>
- <include>etc/**</include>
- <include>resources/test-excludes-*.txt</include>
- </includes>
- </fileSet>
- </fileSets>
-
- <!-- framework tests -->
- <dependencySets>
- <dependencySet>
- <outputDirectory>tests</outputDirectory>
- <useStrictFiltering>true</useStrictFiltering>
- <scope>provided</scope>
- <unpack>true</unpack>
- <includes>
- <include>*:jbossws-framework:zip:testsuite</include>
- </includes>
- <unpackOptions>
- <includes>
- <include>ant-import/**</include>
- <include>java/org/jboss/test/ws/jaxws/samples/**</include>
- <include>resources/jaxws/samples/**</include>
- </includes>
- </unpackOptions>
- </dependencySet>
- </dependencySets>
-
-</assembly>
\ No newline at end of file
Copied: stack/metro/branches/tdiesler/trunk/src/main/scripts/assembly-bin-dist.xml (from rev 6744, stack/cxf/trunk/src/main/scripts/assembly-bin-dist.xml)
===================================================================
--- stack/metro/branches/tdiesler/trunk/src/main/scripts/assembly-bin-dist.xml (rev 0)
+++ stack/metro/branches/tdiesler/trunk/src/main/scripts/assembly-bin-dist.xml 2008-04-29 10:29:17 UTC (rev 6745)
@@ -0,0 +1,85 @@
+<assembly xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/assembly-1.1.0-SNAPSHOT.xsd">
+
+ <id>binary-distribution</id>
+ <formats>
+ <format>dir</format>
+ </formats>
+ <includeBaseDirectory>false</includeBaseDirectory>
+
+ <fileSets>
+ <!-- root -->
+ <fileSet>
+ <directory>src/main/distro</directory>
+ <outputDirectory>/</outputDirectory>
+ <includes>
+ <include>build.xml</include>
+ </includes>
+ </fileSet>
+ <fileSet>
+ <directory>src/main/distro</directory>
+ <outputDirectory>/</outputDirectory>
+ <filtered>true</filtered>
+ <includes>
+ <include>ant.properties</include>
+ </includes>
+ </fileSet>
+ <!-- build -->
+ <fileSet>
+ <directory>src/main/distro</directory>
+ <outputDirectory>build</outputDirectory>
+ <includes>
+ <include>build-deploy.xml</include>
+ <include>build-setup.xml</include>
+ <include>jbossws-default-deploy.conf</include>
+ <include>jbossws-deploy-macros.xml</include>
+ </includes>
+ </fileSet>
+ <!-- docs -->
+ <fileSet>
+ <directory>src/main/distro</directory>
+ <outputDirectory>docs</outputDirectory>
+ <filtered>true</filtered>
+ <includes>
+ <include>Install.txt</include>
+ <include>ReleaseNotes.txt</include>
+ <include>JBossORG-EULA.txt</include>
+ </includes>
+ </fileSet>
+ <!-- deploy -->
+ <fileSet>
+ <directory>target/deploy-artifacts</directory>
+ <outputDirectory>deploy</outputDirectory>
+ </fileSet>
+ <!-- test excludes -->
+ <fileSet>
+ <directory>modules/testsuite/cxf-tests/src/test</directory>
+ <outputDirectory>tests</outputDirectory>
+ <includes>
+ <include>etc/**</include>
+ <include>resources/test-excludes-*.txt</include>
+ </includes>
+ </fileSet>
+ </fileSets>
+
+ <!-- framework tests -->
+ <dependencySets>
+ <dependencySet>
+ <outputDirectory>tests</outputDirectory>
+ <useStrictFiltering>true</useStrictFiltering>
+ <scope>provided</scope>
+ <unpack>true</unpack>
+ <includes>
+ <include>*:jbossws-framework:zip:testsuite</include>
+ </includes>
+ <unpackOptions>
+ <includes>
+ <include>ant-import/**</include>
+ <include>java/org/jboss/test/ws/jaxws/samples/**</include>
+ <include>resources/jaxws/samples/**</include>
+ </includes>
+ </unpackOptions>
+ </dependencySet>
+ </dependencySets>
+
+</assembly>
\ No newline at end of file
Deleted: stack/metro/branches/tdiesler/trunk/src/main/scripts/assembly-deploy-artifacts.xml
===================================================================
--- stack/cxf/trunk/src/main/scripts/assembly-deploy-artifacts.xml 2008-04-28 20:23:02 UTC (rev 6729)
+++ stack/metro/branches/tdiesler/trunk/src/main/scripts/assembly-deploy-artifacts.xml 2008-04-29 10:29:17 UTC (rev 6745)
@@ -1,123 +0,0 @@
-<assembly xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/assembly-1.1.0-SNAPSHOT.xsd">
-
- <id>deploy-artifacts</id>
- <formats>
- <format>dir</format>
- </formats>
- <includeBaseDirectory>false</includeBaseDirectory>
-
- <dependencySets>
-
- <!-- bin -->
- <dependencySet>
- <outputDirectory>bin</outputDirectory>
- <useStrictFiltering>true</useStrictFiltering>
- <scope>provided</scope>
- <unpack>true</unpack>
- <includes>
- <include>*:jbossws-framework:zip:scripts</include>
- </includes>
- </dependencySet>
-
- <!-- lib -->
- <dependencySet>
- <outputDirectory>lib</outputDirectory>
- <outputFileNameMapping>${artifact.artifactId}.${artifact.extension}</outputFileNameMapping>
- <useStrictFiltering>true</useStrictFiltering>
- <scope>provided</scope>
- <unpack>false</unpack>
- <includes>
- <include>*:jbossws-jboss422:jar:*</include>
- <include>*:jbossws-jboss423:jar:*</include>
- <include>*:jbossws-jboss500:jar:*</include>
- <include>*:jbossws-jboss501:jar:*</include>
- </includes>
- </dependencySet>
- <dependencySet>
- <outputDirectory>lib</outputDirectory>
- <outputFileNameMapping>${artifact.artifactId}-${artifact.classifier}.${artifact.extension}</outputFileNameMapping>
- <useStrictFiltering>true</useStrictFiltering>
- <scope>provided</scope>
- <unpack>false</unpack>
- <includes>
- <include>*:jbossws-jboss500:jar:container</include>
- <include>*:jbossws-jboss501:jar:container</include>
- </includes>
- </dependencySet>
- </dependencySets>
-
- <!-- lib -->
- <moduleSets>
- <moduleSet>
- <includes>
- <include>org.jboss.ws:jbossws-cxf-client</include>
- <include>org.jboss.ws:jbossws-cxf-server</include>
- </includes>
- <binaries>
- <outputDirectory>lib</outputDirectory>
- <outputFileNameMapping>${module.artifactId}.${module.extension}</outputFileNameMapping>
- <unpack>false</unpack>
- <dependencySets>
- <dependencySet>
- <outputFileNameMapping>${module.artifactId}.${module.extension}</outputFileNameMapping>
- <useStrictFiltering>true</useStrictFiltering>
- <includes>
- <include>*:cxf-*</include>
- <include>*:geronimo-javamail*</include>
- <include>*:geronimo-ws-metadata*</include>
- <include>*:jaxb-api:jar</include>
- <include>*:jaxb-impl:jar</include>
- <include>*:jaxb-xjc:jar</include>
- <include>*:jaxrpc-api:jar</include>
- <include>*:jaxws-api:jar</include>
- <include>*:jbossws-common:jar</include>
- <include>*:jbossws-framework:jar</include>
- <include>*:jbossws-spi:jar</include>
- <include>*:neethi:jar</include>
- <include>*:saaj-api:jar</include>
- <include>*:saaj-impl:jar</include>
- <include>*:spring-beans:jar</include>
- <include>*:spring-context:jar</include>
- <include>*:spring-core:jar</include>
- <include>*:stax-api:jar</include>
- <include>*:wsdl4j:jar</include>
- <include>*:xml-resolver:jar</include>
- <include>*:XmlSchema:jar</include>
- </includes>
- </dependencySet>
- <dependencySet>
- <outputFileNameMapping>wstx.jar</outputFileNameMapping>
- <useStrictFiltering>true</useStrictFiltering>
- <includes>
- <include>*:wstx-asl:jar</include>
- </includes>
- </dependencySet>
- </dependencySets>
- </binaries>
- </moduleSet>
- <moduleSet>
- <includes>
- <include>org.jboss.ws:jbossws-cxf-management</include>
- </includes>
- <binaries>
- <outputDirectory>lib</outputDirectory>
- <outputFileNameMapping>${module.artifactId}.${module.extension}</outputFileNameMapping>
- <includeDependencies>false</includeDependencies>
- <unpack>false</unpack>
- </binaries>
- </moduleSet>
- </moduleSets>
-
- <!-- resources -->
- <fileSets>
- <fileSet>
- <directory>modules/server/target/resources</directory>
- <outputDirectory>resources</outputDirectory>
- <includes>
- <include>jbossws-*/**</include>
- </includes>
- </fileSet>
- </fileSets>
-
-</assembly>
\ No newline at end of file
Copied: stack/metro/branches/tdiesler/trunk/src/main/scripts/assembly-deploy-artifacts.xml (from rev 6744, stack/cxf/trunk/src/main/scripts/assembly-deploy-artifacts.xml)
===================================================================
--- stack/metro/branches/tdiesler/trunk/src/main/scripts/assembly-deploy-artifacts.xml (rev 0)
+++ stack/metro/branches/tdiesler/trunk/src/main/scripts/assembly-deploy-artifacts.xml 2008-04-29 10:29:17 UTC (rev 6745)
@@ -0,0 +1,127 @@
+<assembly xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/assembly-1.1.0-SNAPSHOT.xsd">
+
+ <id>deploy-artifacts</id>
+ <formats>
+ <format>dir</format>
+ </formats>
+ <includeBaseDirectory>false</includeBaseDirectory>
+
+ <dependencySets>
+
+ <!-- bin -->
+ <dependencySet>
+ <outputDirectory>bin</outputDirectory>
+ <useStrictFiltering>true</useStrictFiltering>
+ <scope>provided</scope>
+ <unpack>true</unpack>
+ <includes>
+ <include>*:jbossws-framework:zip:scripts</include>
+ </includes>
+ </dependencySet>
+
+ <!-- lib -->
+ <dependencySet>
+ <outputDirectory>lib</outputDirectory>
+ <outputFileNameMapping>${artifact.artifactId}.${artifact.extension}</outputFileNameMapping>
+ <useStrictFiltering>true</useStrictFiltering>
+ <scope>provided</scope>
+ <unpack>false</unpack>
+ <includes>
+ <include>*:jbossws-jboss422:jar:*</include>
+ <include>*:jbossws-jboss423:jar:*</include>
+ <include>*:jbossws-jboss500:jar:*</include>
+ <include>*:jbossws-jboss501:jar:*</include>
+ </includes>
+ </dependencySet>
+ <dependencySet>
+ <outputDirectory>lib</outputDirectory>
+ <outputFileNameMapping>${artifact.artifactId}-${artifact.classifier}.${artifact.extension}</outputFileNameMapping>
+ <useStrictFiltering>true</useStrictFiltering>
+ <scope>provided</scope>
+ <unpack>false</unpack>
+ <includes>
+ <include>*:jbossws-jboss500:jar:container</include>
+ <include>*:jbossws-jboss501:jar:container</include>
+ </includes>
+ </dependencySet>
+ </dependencySets>
+
+ <!-- lib -->
+ <moduleSets>
+ <moduleSet>
+ <includes>
+ <include>org.jboss.ws:jbossws-metro-client</include>
+ <include>org.jboss.ws:jbossws-metro-server</include>
+ </includes>
+ <binaries>
+ <outputDirectory>lib</outputDirectory>
+ <outputFileNameMapping>${module.artifactId}.${module.extension}</outputFileNameMapping>
+ <unpack>false</unpack>
+ <dependencySets>
+ <dependencySet>
+ <outputFileNameMapping>${module.artifactId}.${module.extension}</outputFileNameMapping>
+ <useStrictFiltering>true</useStrictFiltering>
+ <includes>
+ <include>*:FastInfoset:jar</include>
+ <include>*:http:jar</include>
+ <include>*:jaxb-api:jar</include>
+ <include>*:jaxb-impl:jar</include>
+ <include>*:jaxb-xjc:jar</include>
+ <include>*:jaxrpc-api:jar</include>
+ <include>*:jaxws-local-transport:jar</include>
+ <include>*:jaxws-rt:jar</include>
+ <include>*:jaxws-tools:jar</include>
+ <include>*:jaxws-api:jar</include>
+ <include>*:jboss-wsit-rt:jar</include>
+ <include>*:jboss-wsit-tools:jar</include>
+ <include>*:streambuffer:jar</include>
+ <include>*:stax-api:jar</include>
+ <include>*:stax-ex:jar</include>
+ <include>*:jsr181-api:jar</include>
+ <include>*:jsr173_api:jar</include>
+ <include>*:jsr250-api:jar</include>
+ <include>*:mimepull:jar</include>
+ <include>*:saaj-api:jar</include>
+ <include>*:saaj-impl:jar</include>
+ <include>*:sjsxp:jar</include>
+ <include>*:stax-api:jar</include>
+ <include>*:stax-ex:jar</include>
+ <include>*:stax-utils:jar</include>
+ <include>*:streambuffer:jar</include>
+ <include>*:txnannprocessor:jar</include>
+ <include>*:wsdl4j:jar</include>
+ <include>*:wstx:jar</include>
+ <include>*:xmldsig:jar</include>
+ <include>*:xmlsec:jar</include>
+ <include>*:xws-security:jar</include>
+ </includes>
+ </dependencySet>
+ </dependencySets>
+ </binaries>
+ </moduleSet>
+ <moduleSet>
+ <includes>
+ <include>org.jboss.ws:jbossws-metro-management</include>
+ </includes>
+ <binaries>
+ <outputDirectory>lib</outputDirectory>
+ <outputFileNameMapping>${module.artifactId}.${module.extension}</outputFileNameMapping>
+ <includeDependencies>false</includeDependencies>
+ <unpack>false</unpack>
+ </binaries>
+ </moduleSet>
+ </moduleSets>
+
+ <!-- resources -->
+ <fileSets>
+ <fileSet>
+ <directory>modules/server/target/resources</directory>
+ <outputDirectory>resources</outputDirectory>
+ <includes>
+ <include>jbossws-*/**</include>
+ </includes>
+ </fileSet>
+ </fileSets>
+
+</assembly>
\ No newline at end of file
More information about the jbossws-commits
mailing list