[jbossws-commits] JBossWS SVN: r6823 - in stack/native/branches/tdiesler/trunk: modules/client and 9 other directories.
jbossws-commits at lists.jboss.org
jbossws-commits at lists.jboss.org
Wed Apr 30 18:09:01 EDT 2008
Author: thomas.diesler at jboss.com
Date: 2008-04-30 18:09:00 -0400 (Wed, 30 Apr 2008)
New Revision: 6823
Added:
stack/native/branches/tdiesler/trunk/modules/client/pom.xml
stack/native/branches/tdiesler/trunk/modules/core/src/main/resources/jbossws-native-config.xml
stack/native/branches/tdiesler/trunk/modules/core/src/main/scripts/
stack/native/branches/tdiesler/trunk/modules/core/src/main/scripts/antrun-beans-config.xml
stack/native/branches/tdiesler/trunk/src/main/distro/JBossORG-EULA.txt
stack/native/branches/tdiesler/trunk/src/main/distro/ant.properties
stack/native/branches/tdiesler/trunk/src/main/distro/build-deploy.xml
stack/native/branches/tdiesler/trunk/src/main/distro/build-setup.xml
stack/native/branches/tdiesler/trunk/src/main/distro/build.xml
stack/native/branches/tdiesler/trunk/src/main/distro/jbossws-default-deploy.conf
stack/native/branches/tdiesler/trunk/src/main/distro/jbossws-deploy-macros.xml
stack/native/branches/tdiesler/trunk/src/main/scripts/
stack/native/branches/tdiesler/trunk/src/main/scripts/assembly-bin-dist.xml
stack/native/branches/tdiesler/trunk/src/main/scripts/assembly-deploy-artifacts.xml
stack/native/branches/tdiesler/trunk/target.properties
Removed:
stack/native/branches/tdiesler/trunk/src/main/distro/ant.properties.example
stack/native/branches/tdiesler/trunk/src/main/distro/bin-dist-build.xml
stack/native/branches/tdiesler/trunk/src/main/etc/JBossORG-EULA.txt
stack/native/branches/tdiesler/trunk/src/main/etc/component-info.xml
stack/native/branches/tdiesler/trunk/src/main/etc/default.mf
stack/native/branches/tdiesler/trunk/src/main/etc/log4j.properties
stack/native/branches/tdiesler/trunk/src/main/resources/
Modified:
stack/native/branches/tdiesler/trunk/ant.properties.example
stack/native/branches/tdiesler/trunk/build.xml
stack/native/branches/tdiesler/trunk/modules/client/
stack/native/branches/tdiesler/trunk/modules/core/pom.xml
stack/native/branches/tdiesler/trunk/modules/embedded/target/jbossws-native-embedded-3.0.2-SNAPSHOT-sources.jar
stack/native/branches/tdiesler/trunk/modules/embedded/target/jbossws-native-embedded-3.0.2-SNAPSHOT.jar
stack/native/branches/tdiesler/trunk/pom.xml
Log:
Modified: stack/native/branches/tdiesler/trunk/ant.properties.example
===================================================================
--- stack/native/branches/tdiesler/trunk/ant.properties.example 2008-04-30 20:55:41 UTC (rev 6822)
+++ stack/native/branches/tdiesler/trunk/ant.properties.example 2008-04-30 22:09:00 UTC (rev 6823)
@@ -4,42 +4,14 @@
# $Id$
# Optional JBoss Home
-#jboss421.home=/home/tdiesler/svn/jbossas/tags/JBoss_4_2_1_GA/build/output/jboss-4.2.1.GA
#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 server under test. This can be [jboss421|jboss422|jboss423|jboss500|jboss501]
-jbossws.integration.target=jboss500
-
-# The JBoss server instance
+# The JBoss settings
jboss.server.instance=default
-jboss.bind.address=localhost
-# JBoss JMX invoker authentication
-#jmx.authentication.username=admin
-#jmx.authentication.password=admin
-
-# JBoss Repository
-#jboss.repository=file:/home/tdiesler/svn/jboss.local.repository
-jboss.repository=http://repository.jboss.org
-
# JBossWS Release
jbossws.portal.content=/home/tdiesler/svn/jbossws/portal-content
-jboss.local.repository=/home/tdiesler/svn/jboss.local.repository
-
-# Force thirdparty HTTP get
-#force.thirdparty.get=true
-
-# JDK settings
-#java.home.jdk16=/usr/java/jdk1.6
-
-# Endpoint servlet used by test descriptors
-endpoint.servlet=org.jboss.wsf.stack.jbws.EndpointServlet
-
-# Java Compiler options
-javac.debug=yes
-javac.deprecation=yes
-javac.fail.onerror=yes
-javac.verbose=no
+jboss.local.repository=/home/tdiesler/svn/jboss.local.repository
\ No newline at end of file
Modified: stack/native/branches/tdiesler/trunk/build.xml
===================================================================
--- stack/native/branches/tdiesler/trunk/build.xml 2008-04-30 20:55:41 UTC (rev 6822)
+++ stack/native/branches/tdiesler/trunk/build.xml 2008-04-30 22:09:00 UTC (rev 6823)
@@ -11,457 +11,79 @@
<!-- $Id$ -->
-<!--
- The JBossWS project is organised like this
+<project basedir="." name="JBossWS-Metro">
- +~~~~~~~~~~~~~~~~~+ +~~~~~~~~~~~~~~~~~+ +~~~~+
- Target Container: | AS-5.0 | | AS-4.2 | | |
- +~~~~~~~~~~~~~~~~~+ +~~~~~~~~~~~~~~~~~+ | |
- +~~~~~~~~~~~~~~~~~+ +~~~~~~~~~~~~~~~~~+ | |
- Container Integration: | jbossws-jboss50 | | jbossws-jboss42 | | |
- +~~~~~~~~~~~~~~~~~+ +~~~~~~~~~~~~~~~~~+ | |
- +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~+ | |
- WS Framework: | jbossws-spi, jbossws-framework, jbossws-common | | |
- +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~+ | |
- +~~~~~~~~~~~~~~~~~+ +~~~~~~~~~~~~~~~~~+ +~~~~~~~~~~~~~~~~~+ | |
- WS Stack Integration: | jbossws-native | | jbossws-metro | | jbossws-cxf | | |
- +~~~~~~~~~~~~~~~~~+ +~~~~~~~~~~~~~~~~~+ +~~~~~~~~~~~~~~~~~+ | |
- +~~~~~~~~~~~~~~~~~+ +~~~~~~~~~~~~~~~~~+ +~~~~~~~~~~~~~~~~~+ | |
- WS Stack: | jbossws-core | | Sun Metro | | Apache CXF | | |
- +~~~~~~~~~~~~~~~~~+ +~~~~~~~~~~~~~~~~~+ +~~~~~~~~~~~~~~~~~+ | |
- WS-* Extensions: +~+ +~+ +~+ +~+ +~+ +~+ | |
- | | | | | | | | | | | | | |
- | | | | | | | | | | | | | |
- | | | | | | | | | | | | | |
- | | | | | | | | | | | | | |
- | | | | | | | | | | | | | |
- +~+ +~+ +~+ +~+ +~+ +~+ +~~~~+
- JAXWS Testsuite
-
-
- Typically you would build, deploy, test one of the WS stacks against one of the supported target containers.
- Here we explain first the manual procedure. Further down you find instruction on how to do this using our
- automated Hudson QA environment.
-
- Working with JBossWS-Native
- ~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
- To run the general JAXWS samples against our native WS stack on JBoss-5.0 you would run the sequence below.
- This is also the required sequence before any SVN commit. If one of the tests fails, please complain loudly.
-
- cd stack/native/trunk
- ant deploy-jboss500
- ant tests-smoke
+ <!-- ================================================================== -->
+ <!-- Setup -->
+ <!-- ================================================================== -->
- To run the collection of provider sample tests, you would run
+ <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"/>
- ant -Dtest=jaxws/samples/provider test
-
- To run a single specific test, you would run
+ <property name="deploy.artifacts.dir" value="${stack.output.dir}/deploy-artifacts"/>
- ant -Dtest=org.jboss.test.ws.jaxws.samples.provider.ProviderPayloadTestCase one-test
-
- This can be done in debug mode as well
+ <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"/>
- ant -Ddebug=true -Dtest=org.jboss.test.ws.jaxws.samples.provider.ProviderPayloadTestCase one-test
-
- Working with the Hudson QA environment
- ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+ <property name="jbossws.default.deploy.conf" value="${stack.distro.dir}/jbossws-default-deploy.conf"/>
+ <property name="target.properties.file" value="${basedir}/target.properties"/>
- The Hudson QA environment helps you to test any supported stack against any supported target container.
- To setup Hudson on your local box, you would run
-
- cd framework/trunk
- ant hudson-setup
- ant hudson-start
-
- When you hit http://localhost:8180/hudson you should be able to
-
- 1. login
- 2. build a target container
- 3. run a testsuite against the target container
-
- Publicly, Hudson is available at http://jbws.dyndns.org:8180/hudson/
-
- Have fun + good luck
- The JBossWS Team
--->
-
-<project default="main" basedir="." name="JBossWS-Native">
-
- <property name="core.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-tests/build-testsuite.xml"/>
- <import file="${basedir}/ant-import/jbossws-deploy-macros.xml"/>
-
- <property name="core.src.dir" value="${core.dir}/src/main"/>
- <property name="core.etc.dir" value="${core.src.dir}/etc"/>
- <property name="core.distro.dir" value="${core.src.dir}/distro"/>
- <property name="core.java.dir" value="${core.src.dir}/java"/>
- <property name="core.resources.dir" value="${core.src.dir}/resources"/>
- <property name="core.output.dir" value="${core.dir}/output"/>
- <property name="core.output.apidocs.dir" value="${core.output.dir}/apidocs"/>
- <property name="core.output.deploy.dir" value="${core.output.dir}/deploy"/>
- <property name="core.output.etc.dir" value="${core.output.dir}/etc"/>
- <property name="core.output.classes.dir" value="${core.output.dir}/classes"/>
- <property name="core.output.classes14.dir" value="${core.output.dir}/classes14"/>
- <property name="core.output.lib.dir" value="${core.output.dir}/lib"/>
- <property name="core.output.resources.dir" value="${core.output.dir}/resources"/>
-
- <property name="deploy.artifacts.dir" value="${core.output.deploy.dir}-artifacts"/>
- <property name="deploy.structure.jboss42" value="${core.output.deploy.dir}-jboss42"/>
- <property name="deploy.structure.jboss50" value="${core.output.deploy.dir}-jboss50"/>
- <property name="jbossws.default.deploy.conf" value="${core.dir}/ant-import/jbossws-default-deploy.conf"/>
-
- <target name="init" depends="prepare,thirdparty">
- </target>
-
<!-- ================================================================== -->
- <!-- Compile -->
+ <!-- Initialization -->
<!-- ================================================================== -->
- <!--
- | 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="init">
+ <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}"/>
- <!-- Compile interfaces with jdk1.4 -->
- <mkdir dir="${core.output.classes14.dir}"/>
- <javac srcdir="${core.java.dir}" destdir="${core.output.classes14.dir}" encoding="utf-8" debug="${javac.debug}" verbose="${javac.verbose}"
- deprecation="${javac.deprecation}" failonerror="${javac.fail.onerror}" source="1.4" target="1.4">
- <include name="javax/xml/rpc/**"/>
- <include name="javax/xml/soap/**"/>
- <classpath refid="thirdparty.classpath"/>
- </javac>
-
- <!-- Compile core classes with jdk1.5 -->
- <mkdir dir="${core.output.classes.dir}"/>
- <javac srcdir="${core.java.dir}" sourcepath="" destdir="${core.output.classes.dir}" encoding="utf-8" debug="${javac.debug}" verbose="${javac.verbose}"
- deprecation="${javac.deprecation}" failonerror="${javac.fail.onerror}" source="1.5" target="1.5">
- <include name="javax/annotation/**"/>
- <include name="javax/xml/ws/**"/>
- <include name="javax/jws/**"/>
- <include name="org/jboss/annotation/**"/>
- <include name="org/jboss/ws/**"/>
- <include name="org/jboss/wsf/stack/jbws/**"/>
- <classpath path="${core.output.classes14.dir}"/>
- <classpath refid="thirdparty.classpath"/>
- </javac>
-
- <copy todir="${core.output.classes.dir}">
- <fileset dir="${core.java.dir}">
- <include name="**/*.xml"/>
- </fileset>
- </copy>
+ <fail message="jbossws.integration.target not set" unless="jbossws.integration.target"/>
+ <property name="deploy.structure" value="${stack.output.dir}/deploy-${jbossws.integration.target}"/>
</target>
- <!-- Compile etc files (manifests and such) -->
- <target name="compile-etc" depends="init">
- <mkdir dir="${core.output.etc.dir}"/>
- <copy todir="${core.output.etc.dir}" filtering="yes">
- <fileset dir="${core.etc.dir}"/>
- <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="${core.dir}/version.properties"/>
- </filterset>
- </copy>
- </target>
+ <!-- ================================================================== -->
+ <!-- Distribution -->
+ <!-- ================================================================== -->
- <!-- Compile resource files -->
- <target name="compile42-resources">
+ <target name="prepare-deploy" depends="prepare">
- <unzip dest="${core.output.dir}/resources/jbossws-jboss422" src="${thirdparty.dir}/jbossws-jboss422-resources.zip"/>
- <unzip dest="${core.output.dir}/resources/jbossws-jboss423" src="${thirdparty.dir}/jbossws-jboss423-resources.zip"/>
-
- <!-- Concat jbossws-jboss422-beans.xml -->
- <concat destfile="${core.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="${core.resources.dir}/jbossws-native-config.xml"/>
- <fileset file="${core.output.resources.dir}/jbossws-jboss422/jbossws-jboss42-config.xml"/>
- <footer trimleading="yes">
- </deployment> </footer>
- </concat>
-
- <!-- Concat jbossws-jboss423-beans.xml -->
- <concat destfile="${core.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="${core.resources.dir}/jbossws-native-config.xml"/>
- <fileset file="${core.output.resources.dir}/jbossws-jboss423/jbossws-jboss42-config.xml"/>
- <footer trimleading="yes">
- </deployment> </footer>
- </concat>
-
+ <delete dir="${deploy.artifacts.dir}"/>
+ <exec dir="${basedir}" executable="mvn" failonerror="true">
+ <arg value="package"/>
+ <arg value="assembly:directory"/>
+ </exec>
</target>
- <target name="compile50-resources">
+ <target name="build-bin-dist" depends="prepare-deploy" description="Build the binary distribution">
- <unzip dest="${core.output.resources.dir}/jbossws-jboss500" src="${thirdparty.dir}/jbossws-jboss500-resources.zip"/>
- <unzip dest="${core.output.resources.dir}/jbossws-jboss501" src="${thirdparty.dir}/jbossws-jboss501-resources.zip"/>
+ <echo message="*************************************"/>
+ <echo message="* mvn -P bindist assembly:directory *"/>
+ <echo message="*************************************"/>
- <!-- Concat jbossws-jboss500-beans.xml -->
- <concat destfile="${core.output.resources.dir}/jbossws-jboss500/jbossws-jboss500-beans.xml">
- <header trimleading="yes">
- <deployment xmlns="urn:jboss:bean-deployer:2.0"> </header>
- <fileset file="${core.resources.dir}/jbossws-native-config.xml"/>
- <footer trimleading="yes">
- </deployment> </footer>
- </concat>
-
- <!-- Concat jbossws-jboss501-beans.xml -->
- <concat destfile="${core.output.resources.dir}/jbossws-jboss501/jbossws-jboss501-beans.xml">
- <header trimleading="yes">
- <deployment xmlns="urn:jboss:bean-deployer:2.0"> </header>
- <fileset file="${core.resources.dir}/jbossws-native-config.xml"/>
- <footer trimleading="yes">
- </deployment> </footer>
- </concat>
+ <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>
- <target name="compile-resources" depends="init, compile42-resources, compile50-resources">
- <mkdir dir="${core.output.resources.dir}"/>
- <copy todir="${core.output.resources.dir}">
- <fileset dir="${core.resources.dir}/standard-config">
- <include name="standard-*-config.xml"/>
- </fileset>
- </copy>
-
- </target>
-
<!-- ================================================================== -->
- <!-- Archives -->
+ <!-- Miscellaneous -->
<!-- ================================================================== -->
- <!--
- | Build all jar files.
- -->
- <target name="jars" depends="compile" description="Builds all jar files.">
+ <target name="clean" depends="prepare" description="Cleans up most generated files.">
- <!-- Build jboss-jaxrpc.jar -->
- <mkdir dir="${core.output.lib.dir}"/>
- <jar jarfile="${core.output.lib.dir}/jboss-jaxrpc.jar" manifest="${core.output.etc.dir}/default.mf">
- <fileset dir="${core.output.classes14.dir}">
- <include name="javax/xml/rpc/**"/>
- </fileset>
- </jar>
+ <echo message="*************************************"/>
+ <echo message="* mvn clean *"/>
+ <echo message="*************************************"/>
- <!-- Build jboss-saaj.jar -->
- <mkdir dir="${core.output.lib.dir}"/>
- <jar jarfile="${core.output.lib.dir}/jboss-saaj.jar" manifest="${core.output.etc.dir}/default.mf">
- <fileset dir="${core.output.classes14.dir}">
- <include name="javax/xml/soap/**"/>
- </fileset>
- <metainf dir="${core.resources.dir}/jboss-saaj.jar/META-INF"/>
- </jar>
-
- <!-- Build jboss-jaxws.jar -->
- <mkdir dir="${core.output.lib.dir}"/>
- <jar jarfile="${core.output.lib.dir}/jboss-jaxws.jar" manifest="${core.output.etc.dir}/default.mf">
- <fileset dir="${core.output.classes.dir}">
- <include name="javax/annotation/**"/>
- <include name="javax/jws/**"/>
- <include name="javax/xml/ws/**"/>
- <exclude name="javax/xml/ws/**/*21.class"/>
- <exclude name="javax/xml/ws/Action.class"/>
- <exclude name="javax/xml/ws/EndpointReference.class"/>
- <exclude name="javax/xml/ws/FaultAction.class"/>
- <exclude name="javax/xml/ws/RespectBinding.class"/>
- <exclude name="javax/xml/ws/RespectBindingFeature.class"/>
- <exclude name="javax/xml/ws/WebServiceFeature.class"/>
- <exclude name="javax/xml/ws/spi/WebServiceFeatureAnnotation.class"/>
- <exclude name="javax/xml/ws/soap/MTOMFeature.class"/>
- <exclude name="javax/xml/ws/soap/AddressingFeature.class"/>
- <exclude name="javax/xml/ws/addressing/**"/>
- <exclude name="javax/xml/ws/soap/Addressing.class"/>
- <exclude name="javax/xml/ws/soap/MTOM.class"/>
- <exclude name="javax/xml/ws/soap/MTOMFeature.class"/>
- <exclude name="javax/xml/ws/wsaddressing/**"/>
- </fileset>
- <metainf dir="${core.resources.dir}/jboss-jaxws.jar/META-INF"/>
- </jar>
-
- <!-- Build jboss-jaxws-ext.jar -->
- <mkdir dir="${core.output.lib.dir}"/>
- <jar jarfile="${core.output.lib.dir}/jboss-jaxws-ext.jar" manifest="${core.output.etc.dir}/default.mf">
- <fileset dir="${core.output.classes.dir}">
- <!-- JAX-WS 2.1 extensions -->
- <include name="javax/xml/ws/**/*21.class"/>
- <include name="javax/xml/ws/Action.class"/>
- <include name="javax/xml/ws/EndpointReference.class"/>
- <include name="javax/xml/ws/FaultAction.class"/>
- <include name="javax/xml/ws/RespectBinding.class"/>
- <include name="javax/xml/ws/RespectBindingFeature.class"/>
- <include name="javax/xml/ws/WebServiceFeature.class"/>
- <include name="javax/xml/ws/soap/MTOMFeature.class"/>
- <include name="javax/xml/ws/soap/AddressingFeature.class"/>
- <include name="javax/xml/ws/spi/WebServiceFeatureAnnotation.class"/>
- <include name="javax/xml/ws/addressing/**"/>
- <include name="javax/xml/ws/soap/Addressing.class"/>
- <include name="javax/xml/ws/soap/MTOM.class"/>
- <include name="javax/xml/ws/soap/MTOMFeature.class"/>
- <include name="javax/xml/ws/wsaddressing/**"/>
- </fileset>
- <metainf dir="${core.resources.dir}/jboss-jaxws-ext.jar/META-INF"/>
- </jar>
-
- <!-- Build jbossws-core.jar -->
- <mkdir dir="${core.output.lib.dir}"/>
- <jar jarfile="${core.output.lib.dir}/jbossws-core.jar" manifest="${core.output.etc.dir}/default.mf">
- <fileset dir="${core.output.classes.dir}">
- <include name="org/jboss/annotation/**"/>
- <include name="org/jboss/wsf/stack/jbws/*"/>
- <include name="org/jboss/ws/**"/>
- <exclude name="org/jboss/wsf/stack/jbws/embedded/**"/>
- </fileset>
- <fileset dir="${core.resources.dir}">
- <include name="schema/**"/>
- <include name="dtd/**"/>
- </fileset>
- <metainf dir="${core.resources.dir}/jbossws-core.jar/META-INF"/>
- </jar>
-
- <!-- Build jbossws-embedded.jar -->
- <mkdir dir="${core.output.lib.dir}"/>
- <jar jarfile="${core.output.lib.dir}/jbossws-embedded.jar" manifest="${core.output.etc.dir}/default.mf">
- <fileset dir="${core.output.classes.dir}">
- <include name="org/jboss/wsf/stack/jbws/embedded/**"/>
- </fileset>
- <metainf dir="${core.resources.dir}/jbossws-embedded.jar/META-INF"/>
- </jar>
-
- <!-- Build jbossws-client.jar -->
- <jar jarfile="${core.output.lib.dir}/jbossws-client.jar" manifest="${core.output.etc.dir}/default.mf">
- <fileset dir="${core.output.classes.dir}">
- <include name="org/jboss/wsf/**"/>
- <include name="org/jboss/ws/**"/>
- <exclude name="org/jboss/wsf/stack/jbws/embedded/**"/>
-
- <!-- JAX-WS 2.1 extensions -->
- <include name="javax/xml/ws/**/*21.class"/>
- <include name="javax/xml/ws/Action.class"/>
- <include name="javax/xml/ws/EndpointReference.class"/>
- <include name="javax/xml/ws/FaultAction.class"/>
- <include name="javax/xml/ws/RespectBinding.class"/>
- <include name="javax/xml/ws/RespectBindingFeature.class"/>
- <include name="javax/xml/ws/WebServiceFeature.class"/>
- <include name="javax/xml/ws/soap/MTOMFeature.class"/>
- <include name="javax/xml/ws/soap/AddressingFeature.class"/>
- <include name="javax/xml/ws/spi/WebServiceFeatureAnnotation.class"/>
- <include name="javax/xml/ws/addressing/**"/>
- <include name="javax/xml/ws/soap/Addressing.class"/>
- <include name="javax/xml/ws/soap/MTOM.class"/>
- <include name="javax/xml/ws/soap/MTOMFeature.class"/>
- <include name="javax/xml/ws/wsaddressing/**"/>
- </fileset>
- <fileset dir="${core.resources.dir}">
- <include name="schema/**"/>
- <include name="dtd/**"/>
- </fileset>
- <fileset dir="${core.etc.dir}">
- <include name="log4j.properties"/>
- <include name="ws*.bat"/>
- <include name="ws*.sh"/>
- </fileset>
- <metainf dir="${core.resources.dir}/jbossws-core.jar/META-INF"/>
- <metainf dir="${core.resources.dir}/standard-config"/>
- </jar>
-
- <!-- Build jbossws-context.war -->
- <copy todir="${core.output.resources.dir}/jbossws-context.war" overwrite="true" filtering="true">
- <fileset dir="${core.resources.dir}/jbossws-context.war"/>
- <filterset>
- <filter token="build.id" value="${build.id}"/>
- <filter token="implementation.version" value="jbossws-${version.id}"/>
- <filtersfile file="${core.dir}/version.properties"/>
- </filterset>
- </copy>
- <war warfile="${core.output.lib.dir}/jbossws-context.war" webxml="${core.output.resources.dir}/jbossws-context.war/WEB-INF/web.xml"
- manifest="${core.output.etc.dir}/default.mf">
- <fileset dir="${core.output.resources.dir}/jbossws-context.war">
- <include name="index.html"/>
- <include name="styles.css"/>
- </fileset>
- <webinf dir="${core.output.resources.dir}/jbossws-context.war/WEB-INF">
- <include name="jboss-web.xml"/>
- </webinf>
- </war>
-
- <!-- Build jbossws-core-scripts.zip -->
- <zip zipfile="${core.output.lib.dir}/jbossws-core-scripts.zip">
- <fileset dir="${core.output.etc.dir}">
- <include name="wsrunclient.bat"/>
- <include name="wstools.bat"/>
- </fileset>
- <zipfileset dir="${core.output.etc.dir}" filemode="755">
- <include name="wsrunclient.sh"/>
- <include name="wstools.sh"/>
- </zipfileset>
- </zip>
-
- <!-- Build jbossws-core-src.zip -->
- <zip zipfile="${core.output.lib.dir}/jbossws-core-src.zip">
- <fileset dir="${core.java.dir}"/>
- </zip>
-
+ <exec dir="${basedir}" executable="mvn" failonerror="true">
+ <arg value="clean"/>
+ </exec>
</target>
- <!-- ================================================================== -->
- <!-- Documentation -->
- <!-- ================================================================== -->
-
- <!-- Generate the JavaDoc -->
- <target name="javadoc" depends="init" description="Generate the Javadoc" if="javadoc">
-
- <mkdir dir="${core.output.apidocs.dir}"/>
- <javadoc destdir="${core.output.apidocs.dir}" author="true" version="true" use="true" windowtitle="JBossWS API">
- <classpath refid="thirdparty.classpath"/>
- <packageset dir="${core.java.dir}" defaultexcludes="yes">
- <include name="org/jboss/ws/**"/>
- </packageset>
- <doctitle><![CDATA[<h1>JBossWS Native</h1>]]>
- </doctitle>
- <tag name="todo" scope="all" description="To do:"/>
- <group title="Core" packages="org.jboss.ws.core*"/>
- <group title="Metadata" packages="org.jboss.ws.metadata*"/>
- <group title="Integration" packages="org.jboss.ws.integration*"/>
- <group title="Extensions" packages="org.jboss.ws.extensions*"/>
- <group title="Tools" packages="org.jboss.ws.tools*"/>
- </javadoc>
- </target>
-
- <target name="clean" depends="prepare" description="Cleans up most generated files.">
- <delete dir="${core.output.dir}"/>
- </target>
-
- <target name="clobber" depends="clean" description="Cleans up all generated files.">
- <delete dir="${core.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">
- </target>
-
</project>
Property changes on: stack/native/branches/tdiesler/trunk/modules/client
___________________________________________________________________
Name: svn:ignore
+ target
Added: stack/native/branches/tdiesler/trunk/modules/client/pom.xml
===================================================================
--- stack/native/branches/tdiesler/trunk/modules/client/pom.xml (rev 0)
+++ stack/native/branches/tdiesler/trunk/modules/client/pom.xml 2008-04-30 22:09:00 UTC (rev 6823)
@@ -0,0 +1,16 @@
+<project 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/maven-v4_0_0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+
+ <name>JBoss Web Services - Stack Native Client</name>
+ <artifactId>jbossws-native-client</artifactId>
+ <packaging>jar</packaging>
+
+ <!-- Parent -->
+ <parent>
+ <groupId>org.jboss.ws.native</groupId>
+ <artifactId>jbossws-native</artifactId>
+ <version>3.0.2-SNAPSHOT</version>
+ </parent>
+
+</project>
Property changes on: stack/native/branches/tdiesler/trunk/modules/client/pom.xml
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Modified: stack/native/branches/tdiesler/trunk/modules/core/pom.xml
===================================================================
--- stack/native/branches/tdiesler/trunk/modules/core/pom.xml 2008-04-30 20:55:41 UTC (rev 6822)
+++ stack/native/branches/tdiesler/trunk/modules/core/pom.xml 2008-04-30 22:09:00 UTC (rev 6823)
@@ -17,6 +17,14 @@
<dependencies>
<!-- jbossws dependencies -->
<dependency>
+ <groupId>org.jboss.ws</groupId>
+ <artifactId>jbossws-common</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.ws</groupId>
+ <artifactId>jbossws-spi</artifactId>
+ </dependency>
+ <dependency>
<groupId>org.jboss.ws.native</groupId>
<artifactId>jbossws-native-jaxws-ext</artifactId>
<version>${project.version}</version>
@@ -107,6 +115,10 @@
<artifactId>wstx-lgpl</artifactId>
</dependency>
<dependency>
+ <groupId>wsdl4j</groupId>
+ <artifactId>wsdl4j</artifactId>
+ </dependency>
+ <dependency>
<groupId>xalan</groupId>
<artifactId>xalan</artifactId>
</dependency>
@@ -116,4 +128,76 @@
</dependency>
</dependencies>
+ <!-- Build -->
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-dependency-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>copy-dependencies</id>
+ <phase>package</phase>
+ <goals>
+ <goal>unpack</goal>
+ </goals>
+ <configuration>
+ <artifactItems>org.jboss.ws:jbossws-jboss*:zip:resources</artifactItems>
+ <artifactItems>
+ <artifactItem>
+ <groupId>org.jboss.ws</groupId>
+ <artifactId>jbossws-jboss422</artifactId>
+ <version>${jbossws.jboss422.version}</version>
+ <classifier>resources</classifier>
+ <type>zip</type>
+ <outputDirectory>${project.build.directory}/resources/jbossws-jboss422</outputDirectory>
+ </artifactItem>
+ <artifactItem>
+ <groupId>org.jboss.ws</groupId>
+ <artifactId>jbossws-jboss423</artifactId>
+ <version>${jbossws.jboss423.version}</version>
+ <classifier>resources</classifier>
+ <type>zip</type>
+ <outputDirectory>${project.build.directory}/resources/jbossws-jboss423</outputDirectory>
+ </artifactItem>
+ <artifactItem>
+ <groupId>org.jboss.ws</groupId>
+ <artifactId>jbossws-jboss500</artifactId>
+ <version>${jbossws.jboss500.version}</version>
+ <classifier>resources</classifier>
+ <type>zip</type>
+ <outputDirectory>${project.build.directory}/resources/jbossws-jboss500</outputDirectory>
+ </artifactItem>
+ <artifactItem>
+ <groupId>org.jboss.ws</groupId>
+ <artifactId>jbossws-jboss501</artifactId>
+ <version>${jbossws.jboss501.version}</version>
+ <classifier>resources</classifier>
+ <type>zip</type>
+ <outputDirectory>${project.build.directory}/resources/jbossws-jboss501</outputDirectory>
+ </artifactItem>
+ </artifactItems>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <!-- http://jira.codehaus.org/browse/MANTRUN-89 -->
+ <plugin>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <executions>
+ <execution>
+ <phase>package</phase>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ <configuration>
+ <tasks>
+ <ant antfile="src/main/scripts/antrun-beans-config.xml"/>
+ </tasks>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+
</project>
Copied: stack/native/branches/tdiesler/trunk/modules/core/src/main/resources/jbossws-native-config.xml (from rev 6821, stack/native/branches/tdiesler/trunk/src/main/resources/jbossws-native-config.xml)
===================================================================
--- stack/native/branches/tdiesler/trunk/modules/core/src/main/resources/jbossws-native-config.xml (rev 0)
+++ stack/native/branches/tdiesler/trunk/modules/core/src/main/resources/jbossws-native-config.xml 2008-04-30 22:09:00 UTC (rev 6823)
@@ -0,0 +1,171 @@
+
+<!-- An abstraction of server configuration aspects. -->
+<bean name="WSServerConfig" class="org.jboss.wsf.stack.jbws.NativeServerConfig">
+ <property name="mbeanServer"><inject bean="WSMBeanServerLocator" property="mbeanServer"/></property>
+
+ <!--
+ The WSDL, that is a required deployment artifact for an endpoint, has a <soap:address>
+ element which points to the location of the endpoint. JBoss supports rewriting of that SOAP address.
+
+ If the content of <soap:address> is a valid URL, JBossWS will not rewrite it unless 'modifySOAPAddress' is true.
+ If the content of <soap:address> is not a valid URL, JBossWS will rewrite it using the attribute values given below.
+
+ If 'webServiceHost' is not set, JBossWS uses requesters protocol host when rewriting the <soap:address>.
+ -->
+ <property name="webServiceHost">${jboss.bind.address}</property>
+ <property name="modifySOAPAddress">true</property>
+
+ <!--
+ Set these properties to explicitly define the ports that will be used for rewriting the SOAP address.
+ Otherwise the ports will be identified by querying the list of installed connectors.
+ If multiple connectors are found the port of the first connector is used.
+ <property name="webServiceSecurePort">8443</property>
+ <property name="webServicePort">8080</property>
+ -->
+</bean>
+
+ <!-- A subscription manager for WS-Eventing -->
+<bean name="WSSubscriptionManager" class="org.jboss.ws.extensions.eventing.mgmt.SubscriptionManager">
+ <property name="bindAddress">${jboss.bind.address}</property>
+</bean>
+
+ <!-- Installed Record Processors-->
+<bean name="WSMemoryBufferRecorder" class="org.jboss.wsf.framework.management.recording.MemoryBufferRecorder">
+ <property name="recording">false</property>
+</bean>
+
+<bean name="WSLogRecorder" class="org.jboss.wsf.framework.management.recording.LogRecorder">
+ <property name="recording">false</property>
+</bean>
+
+ <bean name="StackRequestHandlerFactory" class="org.jboss.wsf.stack.jbws.RequestHandlerFactoryImpl"/>
+
+ <!--
+ *********************************************************************************************************************
+ The stack specific deployment aspects
+ -->
+<bean name="WSNativeContextPropertiesDeploymentAspect" class="org.jboss.wsf.framework.deployment.ContextPropertiesDeploymentAspect">
+ <property name="provides">ContextProperties, StackDescriptor</property>
+ <property name="contextProperties">
+ <map keyClass="java.lang.String" valueClass="java.lang.String">
+ <entry><key>org.jboss.ws.webapp.ServletClass</key><value>org.jboss.wsf.stack.jbws.EndpointServlet</value></entry>
+ </map>
+ </property>
+</bean>
+
+<bean name="WSNativeEagerInitializeDeploymentAspect" class="org.jboss.wsf.stack.jbws.EagerInitializeDeploymentAspect">
+ <property name="requires">UnifiedMetaDataModel</property>
+ <property name="provides">InitializedMetaDataModel</property>
+</bean>
+
+<bean name="WSNativeEndpointHandlerDeploymentAspect" class="org.jboss.wsf.framework.deployment.EndpointHandlerDeploymentAspect">
+ <property name="requires">ContainerEndpointHandler, ContainerMetaData</property>
+ <property name="provides">StackEndpointHandler</property>
+</bean>
+
+<bean name="WSNativeEndpointRecordProcessorDeploymentAspect" class="org.jboss.wsf.framework.deployment.EndpointRecordProcessorDeploymentAspect">
+ <property name="mbeanServer"><inject bean="WSMBeanServerLocator" property="mbeanServer"/></property>
+ <property name="requires">RegisteredEndpoint</property>
+ <property name="provides">EndpointRecordProcessors</property>
+ <property name="processors">
+ <list class="java.util.ArrayList" elementClass="org.jboss.wsf.spi.management.recording.RecordProcessor">
+ <inject bean="WSMemoryBufferRecorder"/>
+ <inject bean="WSLogRecorder"/>
+ </list>
+ </property>
+</bean>
+
+<bean name="WSNativeEventingDeploymentAspect" class="org.jboss.wsf.stack.jbws.EventingDeploymentAspect">
+ <property name="requires">UnifiedMetaDataModel</property>
+</bean>
+
+<bean name="WSNativePublishContractDeploymentAspect" class="org.jboss.wsf.stack.jbws.PublishContractDeploymentAspect">
+ <property name="requires">UnifiedMetaDataModel, JAXBIntros</property>
+ <property name="provides">PublishedContract</property>
+</bean>
+
+<bean name="WSNativeServiceEndpointInvokerDeploymentAspect" class="org.jboss.wsf.stack.jbws.ServiceEndpointInvokerDeploymentAspect">
+ <property name="requires">UnifiedMetaDataModel</property>
+</bean>
+
+<bean name="WSNativeRMDeploymentAspect" class="org.jboss.ws.extensions.wsrm.server.RMDeploymentAspect">
+ <property name="requires">StackEndpointHandler, UnifiedMetaDataModel</property>
+</bean>
+
+<bean name="WSNativeUnifiedMetaDataDeploymentAspect" class="org.jboss.wsf.stack.jbws.UnifiedMetaDataDeploymentAspect">
+ <property name="requires">RuntimeLoader, ContainerMetaData, URLPattern, VFSRoot, JAXBIntros</property>
+ <property name="provides">UnifiedMetaDataModel</property>
+</bean>
+
+<bean name="WSJAXBIntroDeploymentAspect" class="org.jboss.wsf.stack.jbws.JAXBIntroDeploymentAspect">
+ <property name="provides">JAXBIntros</property>
+</bean>
+
+ <!--
+ *********************************************************************************************************************
+ Deployment aspect installers
+ -->
+
+<bean name="WSNativeDeploymentAspectInstallerJSE" class="org.jboss.wsf.framework.deployment.DeploymentAspectInstaller">
+ <property name="manager"><inject bean="WSDeploymentAspectManagerJSE"/></property>
+ <property name="sortAspectsOnCreate">true</property>
+ <property name="aspects">
+ <set class="java.util.HashSet" elementClass="org.jboss.wsf.spi.deployment.DeploymentAspect">
+ <!-- phase 1-->
+ <inject bean="WSNativeContextPropertiesDeploymentAspect"/>
+
+ <!-- phase 2 -->
+ <inject bean="WSNativeEndpointHandlerDeploymentAspect"/>
+ <inject bean="WSNativeEndpointRecordProcessorDeploymentAspect"/>
+ <inject bean="WSNativeEventingDeploymentAspect"/>
+ <inject bean="WSNativePublishContractDeploymentAspect"/>
+ <inject bean="WSNativeServiceEndpointInvokerDeploymentAspect"/>
+ <inject bean="WSNativeRMDeploymentAspect"/>
+ <inject bean="WSNativeUnifiedMetaDataDeploymentAspect"/>
+ <inject bean="WSNativeEagerInitializeDeploymentAspect"/>
+ <inject bean="WSJAXBIntroDeploymentAspect"/>
+ </set>
+ </property>
+ <depends>WSDeploymentAspectInstallerJSE</depends>
+</bean>
+
+<bean name="WSNativeDeploymentAspectInstallerEJB" class="org.jboss.wsf.framework.deployment.DeploymentAspectInstaller">
+ <property name="manager"><inject bean="WSDeploymentAspectManagerEJB"/></property>
+ <property name="sortAspectsOnCreate">true</property>
+ <property name="aspects">
+ <set class="java.util.HashSet" elementClass="org.jboss.wsf.spi.deployment.DeploymentAspect">
+ <inject bean="WSNativeContextPropertiesDeploymentAspect"/>
+ <inject bean="WSNativeEagerInitializeDeploymentAspect"/>
+ <inject bean="WSNativeEndpointHandlerDeploymentAspect"/>
+ <inject bean="WSNativeEndpointRecordProcessorDeploymentAspect"/>
+ <inject bean="WSNativeEventingDeploymentAspect"/>
+ <inject bean="WSNativePublishContractDeploymentAspect"/>
+ <inject bean="WSNativeServiceEndpointInvokerDeploymentAspect"/>
+ <inject bean="WSNativeRMDeploymentAspect"/>
+ <inject bean="WSNativeUnifiedMetaDataDeploymentAspect"/>
+ <inject bean="WSJAXBIntroDeploymentAspect"/>
+ </set>
+ </property>
+ <depends>WSDeploymentAspectInstallerEJB</depends>
+</bean>
+
+<bean name="WSNativeDeploymentAspectInstallerEndpointAPI" class="org.jboss.wsf.framework.deployment.DeploymentAspectInstaller">
+ <property name="manager"><inject bean="WSDeploymentAspectManagerEndpointAPI"/></property>
+ <property name="sortAspectsOnCreate">true</property>
+ <property name="aspects">
+ <set class="java.util.HashSet" elementClass="org.jboss.wsf.spi.deployment.DeploymentAspect">
+ <inject bean="WSNativeContextPropertiesDeploymentAspect"/>
+ <inject bean="WSNativeEagerInitializeDeploymentAspect"/>
+ <inject bean="WSNativeEndpointHandlerDeploymentAspect"/>
+ <inject bean="WSNativeEndpointRecordProcessorDeploymentAspect"/>
+ <inject bean="WSNativeEventingDeploymentAspect"/>
+ <inject bean="WSNativePublishContractDeploymentAspect"/>
+ <inject bean="WSNativeServiceEndpointInvokerDeploymentAspect"/>
+ <inject bean="WSNativeRMDeploymentAspect"/>
+ <inject bean="WSNativeUnifiedMetaDataDeploymentAspect"/>
+ <inject bean="WSJAXBIntroDeploymentAspect"/>
+ </set>
+ </property>
+ <depends>WSDeploymentAspectInstallerEndpointAPI</depends>
+</bean>
+
Added: stack/native/branches/tdiesler/trunk/modules/core/src/main/scripts/antrun-beans-config.xml
===================================================================
--- stack/native/branches/tdiesler/trunk/modules/core/src/main/scripts/antrun-beans-config.xml (rev 0)
+++ stack/native/branches/tdiesler/trunk/modules/core/src/main/scripts/antrun-beans-config.xml 2008-04-30 22:09:00 UTC (rev 6823)
@@ -0,0 +1,78 @@
+<?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 default="main">
+
+ <property name="project.resources.directory" value="${basedir}/src/main/resources"/>
+ <property name="project.build.directory" value="${basedir}/target"/>
+ <property name="project.build.resources.directory" value="${project.build.directory}/resources"/>
+
+ <property name="thirdparty.dir" value="${project.build.directory}/thirdparty"/>
+
+ <!-- ================================================================== -->
+ <!-- Initialization -->
+ <!-- ================================================================== -->
+
+ <target name="init">
+ </target>
+
+ <!-- Compile resource files -->
+ <target name="main" depends="init">
+
+ <!-- Concat jbossws-jboss422/jbossws.beans -->
+ <echo message="Concat jbossws-jboss422/jbossws.beans"/>
+ <concat destfile="${project.build.resources.directory}/jbossws-jboss422/jbossws.beans/META-INF/jboss-beans.xml">
+ <header trimleading="yes">
+ <deployment xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="urn:jboss:bean-deployer bean-deployer_1_0.xsd"
+ xmlns="urn:jboss:bean-deployer"> </header>
+ <fileset file="${project.resources.directory}/jbossws-native-config.xml"/>
+ <fileset file="${project.build.resources.directory}/jbossws-jboss422/jbossws-jboss42-config.xml"/>
+ <footer trimleading="yes">
+ </deployment> </footer>
+ </concat>
+
+ <!-- Concat jbossws-jboss423/jbossws.beans -->
+ <echo message="Concat jbossws-jboss423/jbossws.beans"/>
+ <concat destfile="${project.build.resources.directory}/jbossws-jboss423/jbossws.beans/META-INF/jboss-beans.xml">
+ <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-native-config.xml"/>
+ <fileset file="${project.build.resources.directory}/jbossws-jboss423/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">
+ <header trimleading="yes">
+ <deployment xmlns="urn:jboss:bean-deployer:2.0"> </header>
+ <fileset file="${project.resources.directory}/jbossws-native-config.xml"/>
+ <footer trimleading="yes">
+ </deployment> </footer>
+ </concat>
+
+ <!-- Concat jbossws-jboss501/jbossws.beans -->
+ <echo message="Concat jbossws-jboss501/jbossws.beans"/>
+ <concat destfile="${project.build.resources.directory}/jbossws-jboss501/jbossws.beans/META-INF/jboss-beans.xml">
+ <header trimleading="yes">
+ <deployment xmlns="urn:jboss:bean-deployer:2.0"> </header>
+ <fileset file="${project.resources.directory}/jbossws-native-config.xml"/>
+ <footer trimleading="yes">
+ </deployment> </footer>
+ </concat>
+
+ </target>
+
+</project>
Property changes on: stack/native/branches/tdiesler/trunk/modules/core/src/main/scripts/antrun-beans-config.xml
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Modified: stack/native/branches/tdiesler/trunk/modules/embedded/target/jbossws-native-embedded-3.0.2-SNAPSHOT-sources.jar
===================================================================
(Binary files differ)
Modified: stack/native/branches/tdiesler/trunk/modules/embedded/target/jbossws-native-embedded-3.0.2-SNAPSHOT.jar
===================================================================
(Binary files differ)
Modified: stack/native/branches/tdiesler/trunk/pom.xml
===================================================================
--- stack/native/branches/tdiesler/trunk/pom.xml 2008-04-30 20:55:41 UTC (rev 6822)
+++ stack/native/branches/tdiesler/trunk/pom.xml 2008-04-30 22:09:00 UTC (rev 6823)
@@ -36,7 +36,9 @@
<module>modules/jaxws</module>
<module>modules/jaxws-ext</module>
<module>modules/core</module>
+ <module>modules/client</module>
<module>modules/embedded</module>
+ <module>modules/management</module>
</modules>
<!-- Properties -->
@@ -61,6 +63,7 @@
<sun.jaxws.version>2.1.3</sun.jaxws.version>
<woodstox.version>3.1.1</woodstox.version>
<wscommons.policy.version>1.0</wscommons.policy.version>
+ <wsdl4j.version>1.6.1</wsdl4j.version>
<xmlsec.version>1.3.0</xmlsec.version>
<xalan.version>2.7.0</xalan.version>
</properties>
@@ -222,11 +225,20 @@
<groupId>com.sun.xml.ws</groupId>
<artifactId>jaxws-tools</artifactId>
<version>${sun.jaxws.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>com.sun.xml.ws</groupId>
+ <artifactId>jaxws-rt</artifactId>
+ <version>${sun.jaxws.version}</version>
<exclusions>
<exclusion>
- <groupId>com.sun.xml.ws</groupId>
- <artifactId>jaxws-rt</artifactId>
+ <groupId>javax.xml.ws</groupId>
+ <artifactId>jaxws-api</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>com.sun.xml.messaging.saaj</groupId>
+ <artifactId>saaj-impl</artifactId>
+ </exclusion>
</exclusions>
</dependency>
<dependency>
@@ -271,6 +283,11 @@
<version>${woodstox.version}</version>
</dependency>
<dependency>
+ <groupId>wsdl4j</groupId>
+ <artifactId>wsdl4j</artifactId>
+ <version>${wsdl4j.version}</version>
+ </dependency>
+ <dependency>
<groupId>xalan</groupId>
<artifactId>xalan</artifactId>
<version>${xalan.version}</version>
@@ -288,6 +305,11 @@
<dependency>
<groupId>org.jboss.ws</groupId>
<artifactId>jbossws-framework</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.ws</groupId>
+ <artifactId>jbossws-framework</artifactId>
<classifier>scripts</classifier>
<scope>provided</scope>
<type>zip</type>
Copied: stack/native/branches/tdiesler/trunk/src/main/distro/JBossORG-EULA.txt (from rev 6821, stack/native/branches/tdiesler/trunk/src/main/etc/JBossORG-EULA.txt)
===================================================================
--- stack/native/branches/tdiesler/trunk/src/main/distro/JBossORG-EULA.txt (rev 0)
+++ stack/native/branches/tdiesler/trunk/src/main/distro/JBossORG-EULA.txt 2008-04-30 22:09:00 UTC (rev 6823)
@@ -0,0 +1,107 @@
+LICENSE AGREEMENT
+JBOSS(r)
+
+This License Agreement governs the use of the Software Packages and any updates to the Software
+Packages, regardless of the delivery mechanism. Each Software Package is a collective work
+under U.S. Copyright Law. Subject to the following terms, Red Hat, Inc. ("Red Hat") grants to
+the user ("Client") a license to the applicable collective work(s) pursuant to the
+GNU Lesser General Public License v. 2.1 except for the following Software Packages:
+(a) JBoss Portal Forums and JBoss Transactions JTS, each of which is licensed pursuant to the
+GNU General Public License v.2;
+
+(b) JBoss Rules, which is licensed pursuant to the Apache License v.2.0;
+
+(c) an optional download for JBoss Cache for the Berkeley DB for Java database, which is licensed under the
+(open source) Sleepycat License (if Client does not wish to use the open source version of this database,
+it may purchase a license from Sleepycat Software);
+
+and (d) the BPEL extension for JBoss jBPM, which is licensed under the Common Public License v.1,
+and, pursuant to the OASIS BPEL4WS standard, requires parties wishing to redistribute to enter various
+royalty-free patent licenses.
+
+Each of the foregoing licenses is available at http://www.opensource.org/licenses/index.php.
+
+1. The Software. "Software Packages" refer to the various software modules that are created and made available
+for distribution by the JBoss.org open source community at http://www.jboss.org. Each of the Software Packages
+may be comprised of hundreds of software components. The end user license agreement for each component is located in
+the component's source code. With the exception of certain image files identified in Section 2 below,
+the license terms for the components permit Client to copy, modify, and redistribute the component,
+in both source code and binary code forms. This agreement does not limit Client's rights under,
+or grant Client rights that supersede, the license terms of any particular component.
+
+2. Intellectual Property Rights. The Software Packages are owned by Red Hat and others and are protected under copyright
+and other laws. Title to the Software Packages and any component, or to any copy, modification, or merged portion shall
+remain with the aforementioned, subject to the applicable license. The "JBoss" trademark, "Red Hat" trademark, the
+individual Software Package trademarks, and the "Shadowman" logo are registered trademarks of Red Hat and its affiliates
+in the U.S. and other countries. This agreement permits Client to distribute unmodified copies of the Software Packages
+using the Red Hat trademarks that Red Hat has inserted in the Software Packages on the condition that Client follows Red Hat's
+trademark guidelines for those trademarks located at http://www.redhat.com/about/corporate/trademark/. Client must abide by
+these trademark guidelines when distributing the Software Packages, regardless of whether the Software Packages have been modified.
+If Client modifies the Software Packages, then Client must replace all Red Hat trademarks and logos identified at
+http://www.jboss.com/company/logos, unless a separate agreement with Red Hat is executed or other permission granted.
+Merely deleting the files containing the Red Hat trademarks may corrupt the Software Packages.
+
+3. Limited Warranty. Except as specifically stated in this Paragraph 3 or a license for a particular
+component, to the maximum extent permitted under applicable law, the Software Packages and the
+components are provided and licensed "as is" without warranty of any kind, expressed or implied,
+including the implied warranties of merchantability, non-infringement or fitness for a particular purpose.
+Red Hat warrants that the media on which Software Packages may be furnished will be free from defects in
+materials and manufacture under normal use for a period of 30 days from the date of delivery to Client.
+Red Hat does not warrant that the functions contained in the Software Packages will meet Client's requirements
+or that the operation of the Software Packages will be entirely error free or appear precisely as described
+in the accompanying documentation. This warranty extends only to the party that purchases the Services
+pertaining to the Software Packages from Red Hat or a Red Hat authorized distributor.
+
+4. Limitation of Remedies and Liability. To the maximum extent permitted by applicable law, the remedies
+described below are accepted by Client as its only remedies. Red Hat's entire liability, and Client's
+exclusive remedies, shall be: If the Software media is defective, Client may return it within 30 days of
+delivery along with a copy of Client's payment receipt and Red Hat, at its option, will replace it or
+refund the money paid by Client for the Software. To the maximum extent permitted by applicable law,
+Red Hat or any Red Hat authorized dealer will not be liable to Client for any incidental or consequential
+damages, including lost profits or lost savings arising out of the use or inability to use the Software,
+even if Red Hat or such dealer has been advised of the possibility of such damages. In no event shall
+Red Hat's liability under this agreement exceed the amount that Client paid to Red Hat under this
+Agreement during the twelve months preceding the action.
+
+5. Export Control. As required by U.S. law, Client represents and warrants that it:
+(a) understands that the Software Packages are subject to export controls under the
+U.S. Commerce Department's Export Administration Regulations ("EAR");
+
+(b) is not located in a prohibited destination country under the EAR or U.S. sanctions regulations
+(currently Cuba, Iran, Iraq, Libya, North Korea, Sudan and Syria);
+
+(c) will not export, re-export, or transfer the Software Packages to any prohibited destination, entity,
+or individual without the necessary export license(s) or authorizations(s) from the U.S. Government;
+
+(d) will not use or transfer the Software Packages for use in any sensitive nuclear, chemical or
+biological weapons, or missile technology end-uses unless authorized by the U.S. Government by
+regulation or specific license;
+
+(e) understands and agrees that if it is in the United States and exports or transfers the Software
+Packages to eligible end users, it will, as required by EAR Section 740.17(e), submit semi-annual
+reports to the Commerce Department's Bureau of Industry & Security (BIS), which include the name and
+address (including country) of each transferee;
+
+and (f) understands that countries other than the United States may restrict the import, use, or
+export of encryption products and that it shall be solely responsible for compliance with any such
+import, use, or export restrictions.
+
+6. Third Party Programs. Red Hat may distribute third party software programs with the Software Packages
+that are not part of the Software Packages and which Client must install separately. These third party
+programs are subject to their own license terms. The license terms either accompany the programs or
+can be viewed at http://www.redhat.com/licenses/. If Client does not agree to abide by the applicable
+license terms for such programs, then Client may not install them. If Client wishes to install the programs
+on more than one system or transfer the programs to another party, then Client must contact the licensor
+of the programs.
+
+7. General. If any provision of this agreement is held to be unenforceable, that shall not affect the
+enforceability of the remaining provisions. This License Agreement shall be governed by the laws of the
+State of North Carolina and of the United States, without regard to any conflict of laws provisions,
+except that the United Nations Convention on the International Sale of Goods shall not apply.
+
+Copyright 2006 Red Hat, Inc. All rights reserved.
+"JBoss" and the JBoss logo are registered trademarks of Red Hat, Inc.
+All other trademarks are the property of their respective owners.
+
+ Page 1 of 1 18 October 2006
+
Added: stack/native/branches/tdiesler/trunk/src/main/distro/ant.properties
===================================================================
--- stack/native/branches/tdiesler/trunk/src/main/distro/ant.properties (rev 0)
+++ stack/native/branches/tdiesler/trunk/src/main/distro/ant.properties 2008-04-30 22:09:00 UTC (rev 6823)
@@ -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/native/branches/tdiesler/trunk/src/main/distro/ant.properties.example
===================================================================
--- stack/native/branches/tdiesler/trunk/src/main/distro/ant.properties.example 2008-04-30 20:55:41 UTC (rev 6822)
+++ stack/native/branches/tdiesler/trunk/src/main/distro/ant.properties.example 2008-04-30 22:09:00 UTC (rev 6823)
@@ -1,32 +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
-jboss421.home=@jboss421.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 [jboss421|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/native/branches/tdiesler/trunk/src/main/distro/bin-dist-build.xml
===================================================================
--- stack/native/branches/tdiesler/trunk/src/main/distro/bin-dist-build.xml 2008-04-30 20:55:41 UTC (rev 6822)
+++ stack/native/branches/tdiesler/trunk/src/main/distro/bin-dist-build.xml 2008-04-30 22:09:00 UTC (rev 6823)
@@ -1,188 +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-Native">
-
- <!-- ================================================================== -->
- <!-- 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="jboss421.lib" value="${jboss421.home}/lib"/>
- <property name="jboss421.client" value="${jboss421.home}/client"/>
- <property name="jboss421.server" value="${jboss421.home}/server/${jboss.server.instance}"/>
- <property name="jboss421.server.lib" value="${jboss421.server}/lib"/>
- <property name="jboss421.server.deploy" value="${jboss421.server}/deploy"/>
-
- <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="jboss.server.instance.${jboss.server.instance}" value="true"/>
-
- <property name="jboss421.available.file" value="${jboss421.client}/jboss-client.jar"/>
- <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="jboss421.available" file="${jboss421.available.file}"/>
- <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"/>
- <import file="${basedir}/build/build-project-gen.xml"/>
-
- <!-- ================================================================== -->
- <!-- Initialization -->
- <!-- ================================================================== -->
-
- <target name="prepare">
-
- <!-- Define jboss.home -->
- <condition property="jboss.home" value="${jboss500.home}">
- <equals arg1="${jbossws.integration.target}" arg2="jboss50"/>
- </condition>
- <condition property="jboss.home" value="${jboss422.home}">
- <equals arg1="${jbossws.integration.target}" arg2="jboss42"/>
- </condition>
- <condition property="jboss.home" value="${jboss423.home}">
- <equals arg1="${jbossws.integration.target}" arg2="jboss43"/>
- </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}/jbossws-common.jar"/>
- <pathelement location="${thirdparty.dir}/jbossws-spi.jar"/>
- <pathelement location="${thirdparty.dir}/jboss-jaxrpc.jar"/>
- <pathelement location="${thirdparty.dir}/jboss-jaxws.jar"/>
- <pathelement location="${thirdparty.dir}/jboss-saaj.jar"/>
- <pathelement location="${thirdparty.dir}/jbossws-core.jar"/>
- <pathelement location="${thirdparty.dir}/jbossws-client.jar"/>
- </path>
-
- <path id="tests.extra.classpath">
- <pathelement location="${thirdparty.dir}/policy.jar"/>
- <pathelement location="${thirdparty.dir}/jaxws-tools.jar"/>
- <pathelement location="${thirdparty.dir}/wstx.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/native/branches/tdiesler/trunk/src/main/distro/build-deploy.xml
===================================================================
--- stack/native/branches/tdiesler/trunk/src/main/distro/build-deploy.xml (rev 0)
+++ stack/native/branches/tdiesler/trunk/src/main/distro/build-deploy.xml 2008-04-30 22:09:00 UTC (rev 6823)
@@ -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-native42" 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-native50" 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/native/branches/tdiesler/trunk/src/main/distro/build-deploy.xml
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: stack/native/branches/tdiesler/trunk/src/main/distro/build-setup.xml
===================================================================
--- stack/native/branches/tdiesler/trunk/src/main/distro/build-setup.xml (rev 0)
+++ stack/native/branches/tdiesler/trunk/src/main/distro/build-setup.xml 2008-04-30 22:09:00 UTC (rev 6823)
@@ -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/native/branches/tdiesler/trunk/src/main/distro/build-setup.xml
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: stack/native/branches/tdiesler/trunk/src/main/distro/build.xml
===================================================================
--- stack/native/branches/tdiesler/trunk/src/main/distro/build.xml (rev 0)
+++ stack/native/branches/tdiesler/trunk/src/main/distro/build.xml 2008-04-30 22:09:00 UTC (rev 6823)
@@ -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/native/branches/tdiesler/trunk/src/main/distro/build.xml
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: stack/native/branches/tdiesler/trunk/src/main/distro/jbossws-default-deploy.conf
===================================================================
--- stack/native/branches/tdiesler/trunk/src/main/distro/jbossws-default-deploy.conf (rev 0)
+++ stack/native/branches/tdiesler/trunk/src/main/distro/jbossws-default-deploy.conf 2008-04-30 22:09:00 UTC (rev 6823)
@@ -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/native/branches/tdiesler/trunk/src/main/distro/jbossws-deploy-macros.xml
===================================================================
--- stack/native/branches/tdiesler/trunk/src/main/distro/jbossws-deploy-macros.xml (rev 0)
+++ stack/native/branches/tdiesler/trunk/src/main/distro/jbossws-deploy-macros.xml 2008-04-30 22:09:00 UTC (rev 6823)
@@ -0,0 +1,388 @@
+<?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"/>
+ <include name="**/wsrunclient.bat"/>
+ <include name="**/wsrunclient.sh"/>
+ <include name="**/wstools.bat"/>
+ <include name="**/wstools.sh"/>
+ </patternset>
+
+ <patternset id="jbossws.client.patternset">
+ <include name="**/FastInfoset.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="**/jbossws-common.jar"/>
+ <include name="**/jbossws-framework.jar"/>
+ <include name="**/jbossws-native-client.jar"/>
+ <include name="**/jbossws-native-core.jar"/>
+ <include name="**/jbossws-native-jaxrpc.jar"/>
+ <include name="**/jbossws-native-jaxws.jar"/>
+ <include name="**/jbossws-native-jaxws-ext.jar"/>
+ <include name="**/jbossws-native-saaj.jar"/>
+ <include name="**/jbossws-spi.jar"/>
+ <include name="**/jettison.jar"/>
+ <include name="**/policy.jar"/>
+ <include name="**/stax-api.jar"/>
+ <include name="**/stax-ex.jar"/>
+ <include name="**/streambuffer.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="**/jbossws-native-jaxrpc.jar"/>
+ <include name="**/jbossws-native-jaxws.jar"/>
+ <include name="**/jbossws-native-jaxws-ext.jar"/>
+ <include name="**/jbossws-native-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-native-jaxrpc.jar"/>
+ <include name="**/jbossws-native-jaxws.jar"/>
+ <include name="**/jbossws-native-jaxws-ext.jar"/>
+ <include name="**/jbossws-native-saaj.jar"/>
+ <include name="**/jbossws-spi.jar"/>
+ </patternset>
+
+ <patternset id="jbossws.service.lib.patternset">
+ <include name="**/FastInfoset.jar"/>
+ <include name="**/jboss-jaxb-intros.jar"/>
+ <include name="**/jbossws-native-client.jar"/>
+ <include name="**/jbossws-native-core.jar"/>
+ <include name="**/jettison.jar"/>
+ <include name="**/policy.jar"/>
+ <include name="**/wsdl4j.jar"/>
+ <include name="**/xmlsec.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-native42-sar">
+ <attribute name="thirdpartydir"/>
+ <attribute name="resourcesdir"/>
+ <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"/>
+ <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" overwrite="true">
+ <fileset dir="@{thirdpartydir}">
+ <include name="**/jbossws-context.war"/>
+ </fileset>
+ </unzip>
+ <copy todir="@{targetdir}/jbossws.beans/META-INF" flatten="true" overwrite="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="@{thirdpartydir}">
+ <include name="**/standard-jaxrpc-*-config.xml"/>
+ <include name="**/standard-jaxws-*-config.xml"/>
+ </fileset>
+ <fileset dir="@{resourcesdir}/jbossws-@{jbossid}/jbossws-jboss42.sar/META-INF"/>
+ </copy>
+ </sequential>
+ </macrodef>
+
+ <macrodef name="macro-deploy-jbossws-native50-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-native-management.war" overwrite="true">
+ <fileset dir="@{thirdpartydir}">
+ <include name="**/jbossws-native-management.war"/>
+ </fileset>
+ </unzip>
+ <copy todir="@{targetdir}/META-INF" flatten="true" overwrite="true">
+ <fileset dir="@{thirdpartydir}">
+ <include name="**/standard-jaxrpc-*-config.xml"/>
+ <include name="**/standard-jaxws-*-config.xml"/>
+ <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-native42" 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-native42-sar targetdir="${installserver}/deploy/jbossws.sar" thirdpartydir="${thirdpartydir}" resourcesdir="${resourcesdir}"
+ jbossid="${jbossid}"/>
+ </target>
+
+ <target name="deploy-jbossws-native50" 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-native50-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/native/branches/tdiesler/trunk/src/main/distro/jbossws-deploy-macros.xml
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Deleted: stack/native/branches/tdiesler/trunk/src/main/etc/JBossORG-EULA.txt
===================================================================
--- stack/native/branches/tdiesler/trunk/src/main/etc/JBossORG-EULA.txt 2008-04-30 20:55:41 UTC (rev 6822)
+++ stack/native/branches/tdiesler/trunk/src/main/etc/JBossORG-EULA.txt 2008-04-30 22:09:00 UTC (rev 6823)
@@ -1,107 +0,0 @@
-LICENSE AGREEMENT
-JBOSS(r)
-
-This License Agreement governs the use of the Software Packages and any updates to the Software
-Packages, regardless of the delivery mechanism. Each Software Package is a collective work
-under U.S. Copyright Law. Subject to the following terms, Red Hat, Inc. ("Red Hat") grants to
-the user ("Client") a license to the applicable collective work(s) pursuant to the
-GNU Lesser General Public License v. 2.1 except for the following Software Packages:
-(a) JBoss Portal Forums and JBoss Transactions JTS, each of which is licensed pursuant to the
-GNU General Public License v.2;
-
-(b) JBoss Rules, which is licensed pursuant to the Apache License v.2.0;
-
-(c) an optional download for JBoss Cache for the Berkeley DB for Java database, which is licensed under the
-(open source) Sleepycat License (if Client does not wish to use the open source version of this database,
-it may purchase a license from Sleepycat Software);
-
-and (d) the BPEL extension for JBoss jBPM, which is licensed under the Common Public License v.1,
-and, pursuant to the OASIS BPEL4WS standard, requires parties wishing to redistribute to enter various
-royalty-free patent licenses.
-
-Each of the foregoing licenses is available at http://www.opensource.org/licenses/index.php.
-
-1. The Software. "Software Packages" refer to the various software modules that are created and made available
-for distribution by the JBoss.org open source community at http://www.jboss.org. Each of the Software Packages
-may be comprised of hundreds of software components. The end user license agreement for each component is located in
-the component's source code. With the exception of certain image files identified in Section 2 below,
-the license terms for the components permit Client to copy, modify, and redistribute the component,
-in both source code and binary code forms. This agreement does not limit Client's rights under,
-or grant Client rights that supersede, the license terms of any particular component.
-
-2. Intellectual Property Rights. The Software Packages are owned by Red Hat and others and are protected under copyright
-and other laws. Title to the Software Packages and any component, or to any copy, modification, or merged portion shall
-remain with the aforementioned, subject to the applicable license. The "JBoss" trademark, "Red Hat" trademark, the
-individual Software Package trademarks, and the "Shadowman" logo are registered trademarks of Red Hat and its affiliates
-in the U.S. and other countries. This agreement permits Client to distribute unmodified copies of the Software Packages
-using the Red Hat trademarks that Red Hat has inserted in the Software Packages on the condition that Client follows Red Hat's
-trademark guidelines for those trademarks located at http://www.redhat.com/about/corporate/trademark/. Client must abide by
-these trademark guidelines when distributing the Software Packages, regardless of whether the Software Packages have been modified.
-If Client modifies the Software Packages, then Client must replace all Red Hat trademarks and logos identified at
-http://www.jboss.com/company/logos, unless a separate agreement with Red Hat is executed or other permission granted.
-Merely deleting the files containing the Red Hat trademarks may corrupt the Software Packages.
-
-3. Limited Warranty. Except as specifically stated in this Paragraph 3 or a license for a particular
-component, to the maximum extent permitted under applicable law, the Software Packages and the
-components are provided and licensed "as is" without warranty of any kind, expressed or implied,
-including the implied warranties of merchantability, non-infringement or fitness for a particular purpose.
-Red Hat warrants that the media on which Software Packages may be furnished will be free from defects in
-materials and manufacture under normal use for a period of 30 days from the date of delivery to Client.
-Red Hat does not warrant that the functions contained in the Software Packages will meet Client's requirements
-or that the operation of the Software Packages will be entirely error free or appear precisely as described
-in the accompanying documentation. This warranty extends only to the party that purchases the Services
-pertaining to the Software Packages from Red Hat or a Red Hat authorized distributor.
-
-4. Limitation of Remedies and Liability. To the maximum extent permitted by applicable law, the remedies
-described below are accepted by Client as its only remedies. Red Hat's entire liability, and Client's
-exclusive remedies, shall be: If the Software media is defective, Client may return it within 30 days of
-delivery along with a copy of Client's payment receipt and Red Hat, at its option, will replace it or
-refund the money paid by Client for the Software. To the maximum extent permitted by applicable law,
-Red Hat or any Red Hat authorized dealer will not be liable to Client for any incidental or consequential
-damages, including lost profits or lost savings arising out of the use or inability to use the Software,
-even if Red Hat or such dealer has been advised of the possibility of such damages. In no event shall
-Red Hat's liability under this agreement exceed the amount that Client paid to Red Hat under this
-Agreement during the twelve months preceding the action.
-
-5. Export Control. As required by U.S. law, Client represents and warrants that it:
-(a) understands that the Software Packages are subject to export controls under the
-U.S. Commerce Department's Export Administration Regulations ("EAR");
-
-(b) is not located in a prohibited destination country under the EAR or U.S. sanctions regulations
-(currently Cuba, Iran, Iraq, Libya, North Korea, Sudan and Syria);
-
-(c) will not export, re-export, or transfer the Software Packages to any prohibited destination, entity,
-or individual without the necessary export license(s) or authorizations(s) from the U.S. Government;
-
-(d) will not use or transfer the Software Packages for use in any sensitive nuclear, chemical or
-biological weapons, or missile technology end-uses unless authorized by the U.S. Government by
-regulation or specific license;
-
-(e) understands and agrees that if it is in the United States and exports or transfers the Software
-Packages to eligible end users, it will, as required by EAR Section 740.17(e), submit semi-annual
-reports to the Commerce Department's Bureau of Industry & Security (BIS), which include the name and
-address (including country) of each transferee;
-
-and (f) understands that countries other than the United States may restrict the import, use, or
-export of encryption products and that it shall be solely responsible for compliance with any such
-import, use, or export restrictions.
-
-6. Third Party Programs. Red Hat may distribute third party software programs with the Software Packages
-that are not part of the Software Packages and which Client must install separately. These third party
-programs are subject to their own license terms. The license terms either accompany the programs or
-can be viewed at http://www.redhat.com/licenses/. If Client does not agree to abide by the applicable
-license terms for such programs, then Client may not install them. If Client wishes to install the programs
-on more than one system or transfer the programs to another party, then Client must contact the licensor
-of the programs.
-
-7. General. If any provision of this agreement is held to be unenforceable, that shall not affect the
-enforceability of the remaining provisions. This License Agreement shall be governed by the laws of the
-State of North Carolina and of the United States, without regard to any conflict of laws provisions,
-except that the United Nations Convention on the International Sale of Goods shall not apply.
-
-Copyright 2006 Red Hat, Inc. All rights reserved.
-"JBoss" and the JBoss logo are registered trademarks of Red Hat, Inc.
-All other trademarks are the property of their respective owners.
-
- Page 1 of 1 18 October 2006
-
Deleted: stack/native/branches/tdiesler/trunk/src/main/etc/component-info.xml
===================================================================
--- stack/native/branches/tdiesler/trunk/src/main/etc/component-info.xml 2008-04-30 20:55:41 UTC (rev 6822)
+++ stack/native/branches/tdiesler/trunk/src/main/etc/component-info.xml 2008-04-30 22:09:00 UTC (rev 6823)
@@ -1,93 +0,0 @@
-<project name="jboss/jbossws">
-
- <component id="jboss/jbossws"
- description="JBossWS an implementation of J2EE Web Services"
- version="@repository.id@"
- licenseType="lgpl">
-
- <artifact id="jbossws-client.jar"/>
- <artifact id="jbossws-core.jar"/>
- <artifact id="jboss-jaxrpc.jar"/>
- <artifact id="jboss-jaxws.jar"/>
- <artifact id="jboss-jaxws-ext.jar"/>
- <artifact id="jboss-saaj.jar"/>
- <artifact id="jbossws-core-src.zip"/>
- <artifact id="jbossws-context.war"/>
- <artifact id="standard-jaxrpc-client-config.xml"/>
- <artifact id="standard-jaxrpc-endpoint-config.xml"/>
- <artifact id="standard-jaxws-client-config.xml"/>
- <artifact id="standard-jaxws-endpoint-config.xml"/>
- <artifact id="jbossws-native42-beans.xml"/>
- <artifact id="jbossws-native50-beans.xml"/>
- <artifact id="jbossws-deploy-macros.xml"/>
- <artifact id="jbossws-deploy.conf"/>
- <artifact id="wsrunclient.bat"/>
- <artifact id="wsrunclient.sh"/>
- <artifact id="wstools.bat"/>
- <artifact id="wstools.sh"/>
-
- <import componentref="jboss/jbossxb">
- <compatible version="@jboss-jbossxb-jboss42@"/>
- <compatible version="@jboss-jbossxb-jboss42 at -brew"/>
- <compatible version="@jboss-jbossxb-jboss50@"/>
- <compatible version="@jboss-jbossxb-jboss50 at -brew"/>
- </import>
- <import componentref="jboss/remoting">
- <compatible version="@jboss-remoting-jboss42@"/>
- <compatible version="@jboss-remoting-jboss42 at -brew"/>
- <compatible version="@jboss-remoting-jboss50@"/>
- <compatible version="@jboss-remoting-jboss50 at -brew"/>
- </import>
-
- <import componentref="jboss/jaxbintros">
- <compatible version="@jboss-jaxbintros@"/>
- </import>
- <import componentref="jboss/jbossws-common">
- <compatible version="@jbossws-common@"/>
- </import>
- <import componentref="jboss/jbossws-framework">
- <compatible version="@jbossws-framework@"/>
- </import>
- <import componentref="jboss/jbossws-spi">
- <compatible version="@jbossws-spi@"/>
- </import>
-
- <import componentref="apache-xmlsec">
- <compatible version="@apache-xmlsec@"/>
- <compatible version="@apache-xmlsec at -brew"/>
- </import>
- <import componentref="ibm-wsdl4j">
- <compatible version="@ibm-wsdl4j@"/>
- <compatible version="@ibm-wsdl4j at -brew"/>
- </import>
- <import componentref="stax-api">
- <compatible version="@stax-api@"/>
- </import>
- <import componentref="sun-fi">
- <compatible version="@sun-fi@"/>
- </import>
- <import componentref="sun-jaxb">
- <compatible version="@sun-jaxb@"/>
- </import>
- <import componentref="sun-jaxws">
- <compatible version="@sun-jaxws@"/>
- </import>
- <import componentref="woodstox">
- <compatible version="@woodstox@"/>
- <compatible version="@woodstox at -brew"/>
- </import>
- <import componentref="wscommons-policy">
- <compatible version="@wscommons-policy@"/>
- </import>
-
- <export>
- <include input="jbossws-core.jar"/>
- <include input="jboss-jaxrpc.jar"/>
- <include input="jboss-jaxws.jar"/>
- <include input="jboss-jaxws-ext.jar"/>
- <include input="jboss-saaj.jar"/>
- </export>
-
- </component>
-
-</project>
Deleted: stack/native/branches/tdiesler/trunk/src/main/etc/default.mf
===================================================================
--- stack/native/branches/tdiesler/trunk/src/main/etc/default.mf 2008-04-30 20:55:41 UTC (rev 6822)
+++ stack/native/branches/tdiesler/trunk/src/main/etc/default.mf 2008-04-30 22:09:00 UTC (rev 6823)
@@ -1,13 +0,0 @@
-Manifest-Version: 1.2
-Created-By: @java.vm.version@ (@java.vm.vendor@)
-Specification-Title: @specification.title@
-Specification-Version: @specification.version@
-Specification-Vendor: @specification.vendor@
-Implementation-Title: @implementation.title@
-Implementation-URL: @implementation.url@
-Implementation-Version: @implementation.version@ (build=@build.id@)
-Implementation-Vendor: @implementation.vendor@
-Implementation-Vendor-Id: @implementation.vendor.id@
-Class-Path: jbossws-spi.jar jbossws-common.jar jbossws-framework.jar jboss-jaxrpc.jar jboss-jaxws.jar jboss-saaj.jar
- activation.jar commons-logging.jar concurrent.jar javassist.jar jaxb-api.jar jaxb-impl.jar
- mail.jar jboss-remoting.jar jboss-xml-binding.jar policy.jar stax-api.jar wsdl4j.jar
Deleted: stack/native/branches/tdiesler/trunk/src/main/etc/log4j.properties
===================================================================
--- stack/native/branches/tdiesler/trunk/src/main/etc/log4j.properties 2008-04-30 20:55:41 UTC (rev 6822)
+++ stack/native/branches/tdiesler/trunk/src/main/etc/log4j.properties 2008-04-30 22:09:00 UTC (rev 6823)
@@ -1,15 +0,0 @@
-
-#
-# The default JAX-WS tools logging config
-# Should be shipped with jbossws-client.jar
-#
-# @author Heiko.Braun at jboss.com
-#
-
-log4j.rootLogger=debug, stdout
-
-log4j.appender.stdout=org.apache.log4j.ConsoleAppender
-log4j.appender.stdout.layout=org.apache.log4j.PatternLayout
-
-# Pattern to output the caller's file name and line number.
-log4j.appender.stdout.layout.ConversionPattern=%5p [%t] (%F:%L) - %m%n
Added: stack/native/branches/tdiesler/trunk/src/main/scripts/assembly-bin-dist.xml
===================================================================
--- stack/native/branches/tdiesler/trunk/src/main/scripts/assembly-bin-dist.xml (rev 0)
+++ stack/native/branches/tdiesler/trunk/src/main/scripts/assembly-bin-dist.xml 2008-04-30 22:09:00 UTC (rev 6823)
@@ -0,0 +1,92 @@
+<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 etc -->
+ <fileSet>
+ <directory>modules/testsuite/metro-tests/src/test</directory>
+ <outputDirectory>tests</outputDirectory>
+ <includes>
+ <include>etc/**</include>
+ </includes>
+ </fileSet>
+ <!-- test excludes -->
+ <fileSet>
+ <directory>modules/testsuite</directory>
+ <outputDirectory>tests/resources</outputDirectory>
+ <includes>
+ <include>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
Property changes on: stack/native/branches/tdiesler/trunk/src/main/scripts/assembly-bin-dist.xml
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: stack/native/branches/tdiesler/trunk/src/main/scripts/assembly-deploy-artifacts.xml
===================================================================
--- stack/native/branches/tdiesler/trunk/src/main/scripts/assembly-deploy-artifacts.xml (rev 0)
+++ stack/native/branches/tdiesler/trunk/src/main/scripts/assembly-deploy-artifacts.xml 2008-04-30 22:09:00 UTC (rev 6823)
@@ -0,0 +1,150 @@
+<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-framework:jar</include>
+ <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.native:jbossws-native-client</include>
+ </includes>
+ <binaries>
+ <outputDirectory>lib</outputDirectory>
+ <outputFileNameMapping>${module.artifactId}.${module.extension}</outputFileNameMapping>
+ <unpack>false</unpack>
+ </binaries>
+ </moduleSet>
+ <moduleSet>
+ <includes>
+ <include>org.jboss.ws.native:jbossws-native-core</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>*:jaxb-api:jar</include>
+ <include>*:jaxb-impl:jar</include>
+ <include>*:jaxb-xjc:jar</include>
+ <include>*:jaxws-tools:jar</include>
+ <include>*:jaxws-rt:jar</include>
+ <include>*:jboss-jaxb-intros:jar</include>
+ <include>*:jbossws-common:jar</include>
+ <include>*:jbossws-native-jaxrpc:jar</include>
+ <include>*:jbossws-native-jaxws:jar</include>
+ <include>*:jbossws-native-jaxws-ext:jar</include>
+ <include>*:jbossws-native-saaj:jar</include>
+ <include>*:jbossws-spi:jar</include>
+ <include>*:jettison:jar</include>
+ <include>*:policy:jar</include>
+ <include>*:stax-api:jar</include>
+ <include>*:stax-ex:jar</include>
+ <include>*:streambuffer:jar</include>
+ <include>*:wsdl4j:jar</include>
+ <include>*:xmlsec:jar</include>
+ </includes>
+ </dependencySet>
+ <dependencySet>
+ <outputFileNameMapping>wstx.jar</outputFileNameMapping>
+ <useStrictFiltering>true</useStrictFiltering>
+ <includes>
+ <include>*:wstx-lgpl:jar</include>
+ </includes>
+ </dependencySet>
+ </dependencySets>
+ </binaries>
+ </moduleSet>
+ <moduleSet>
+ <includes>
+ <include>org.jboss.ws.native:jbossws-native-management</include>
+ </includes>
+ <binaries>
+ <outputDirectory>lib</outputDirectory>
+ <outputFileNameMapping>${module.artifactId}.${module.extension}</outputFileNameMapping>
+ <includeDependencies>false</includeDependencies>
+ <unpack>false</unpack>
+ </binaries>
+ </moduleSet>
+ </moduleSets>
+
+ <fileSets>
+ <!-- bin -->
+ <fileSet>
+ <directory>src/main/etc</directory>
+ <outputDirectory>bin</outputDirectory>
+ <includes>
+ <include>wsrunclient.*</include>
+ <include>wstools.*</include>
+ </includes>
+ </fileSet>
+
+ <!-- resources -->
+ <fileSet>
+ <directory>modules/client/src/main/resources</directory>
+ <outputDirectory>resources</outputDirectory>
+ <includes>
+ <include>standard-jaxrpc-*-config.xml</include>
+ <include>standard-jaxws-*-config.xml</include>
+ </includes>
+ </fileSet>
+ <fileSet>
+ <directory>modules/core/target/resources</directory>
+ <outputDirectory>resources</outputDirectory>
+ <includes>
+ <include>jbossws-*/**</include>
+ </includes>
+ </fileSet>
+ </fileSets>
+
+</assembly>
\ No newline at end of file
Property changes on: stack/native/branches/tdiesler/trunk/src/main/scripts/assembly-deploy-artifacts.xml
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: stack/native/branches/tdiesler/trunk/target.properties
===================================================================
--- stack/native/branches/tdiesler/trunk/target.properties (rev 0)
+++ stack/native/branches/tdiesler/trunk/target.properties 2008-04-30 22:09:00 UTC (rev 6823)
@@ -0,0 +1 @@
+jbossws.integration.target=jboss422
\ No newline at end of file
More information about the jbossws-commits
mailing list