[jbossws-commits] JBossWS SVN: r6638 - in stack/cxf/branches/tdiesler/trunk: modules/testsuite and 5 other directories.

Author: thomas.diesler(a)jboss.com Date: 2008-04-23 15:39:06 -0400 (Wed, 23 Apr 2008) New Revision: 6638 Added: stack/cxf/branches/tdiesler/trunk/modules/testsuite/cxf-tests/src/scripts/cxf-jars-jaxws.xml stack/cxf/branches/tdiesler/trunk/modules/testsuite/cxf-tests/src/scripts/cxf-samples-jaxws.xml stack/cxf/branches/tdiesler/trunk/src/main/distro/JBossORG-EULA.txt Removed: stack/cxf/branches/tdiesler/trunk/modules/testsuite/cxf-tests/src/scripts/cxf-jars-jaxws.xml stack/cxf/branches/tdiesler/trunk/modules/testsuite/cxf-tests/src/scripts/cxf-samples-jaxws.xml stack/cxf/branches/tdiesler/trunk/src/main/etc/ stack/cxf/branches/tdiesler/trunk/version.properties Modified: stack/cxf/branches/tdiesler/trunk/build.xml stack/cxf/branches/tdiesler/trunk/modules/testsuite/framework-tests/src/test/etc/log4j.xml stack/cxf/branches/tdiesler/trunk/modules/testsuite/pom.xml stack/cxf/branches/tdiesler/trunk/pom.xml stack/cxf/branches/tdiesler/trunk/profiles-example.xml stack/cxf/branches/tdiesler/trunk/src/main/distro/build-setup.xml stack/cxf/branches/tdiesler/trunk/src/main/distro/build.xml stack/cxf/branches/tdiesler/trunk/src/main/scripts/assembly-bin-dist.xml Log: bin-dist ok Modified: stack/cxf/branches/tdiesler/trunk/build.xml =================================================================== --- stack/cxf/branches/tdiesler/trunk/build.xml 2008-04-23 16:23:11 UTC (rev 6637) +++ stack/cxf/branches/tdiesler/trunk/build.xml 2008-04-23 19:39:06 UTC (rev 6638) @@ -11,7 +11,7 @@ <!-- $Id$ --> -<project default="main" basedir="." name="JBossWS-CXF"> +<project basedir="." name="JBossWS-CXF"> <!-- Load ant.properties --> <available property="ant.properties.available" file="${basedir}/ant.properties"/> @@ -24,13 +24,12 @@ <property name="cxf.dir" value="${basedir}"/> <property name="cxf.distro.dir" value="${cxf.dir}/src/main/distro"/> + <property name="cxf.output.dir" value="${cxf.dir}/target"/> <property name="cxf.modules.dir" value="${cxf.dir}/modules"/> <property name="cxf.management.dir" value="${cxf.modules.dir}/management"/> <property name="cxf.client.dir" value="${cxf.modules.dir}/client"/> <property name="cxf.server.dir" value="${cxf.modules.dir}/server"/> - <property name="cxf.output.dir" value="${cxf.dir}/target"/> - <property name="deploy.artifacts.dir" value="${cxf.output.dir}/deploy-artifacts"/> <property name="deploy.structure.jboss42" value="${cxf.output.dir}/deploy-jboss422"/> <property name="deploy.structure.jboss50" value="${cxf.output.dir}/deploy-jboss500"/> @@ -52,29 +51,19 @@ </target> <!-- ================================================================== --> - <!-- Compile --> + <!-- Distribution --> <!-- ================================================================== --> - <!-- - | 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" description="Compile all source files."/> - - <!-- ================================================================== --> - <!-- Archives --> - <!-- ================================================================== --> - - <!-- - | Build all jar files. - --> - <target name="jars" depends="compile" description="Builds all jar files."> + <target name="build-bin-dist" depends="prepare" description="Build the binary distribution"> + + <echo message="*************************************"/> + <echo message="* mvn -P bindist assembly:directory *"/> + <echo message="*************************************"/> + + <delete dir="${cxf.output.dir}/jbossws-cxf-dist"/> <exec dir="${basedir}" executable="mvn" failonerror="true"> - <arg value="package"/> + <arg value="-P bindist"/> + <arg value="assembly:directory"/> </exec> </target> @@ -83,6 +72,11 @@ <!-- ================================================================== --> <target name="prepare-deploy" depends="prepare"> + + <echo message="*************************************************"/> + <echo message="* mvn -Denv=${jbossws.integration.target} package assembly:directory *"/> + <echo message="*************************************************"/> + <delete dir="${deploy.artifacts.dir}"/> <exec dir="${basedir}" executable="mvn" failonerror="true"> <arg value="-Denv=${jbossws.integration.target}"/> @@ -92,15 +86,14 @@ </target> <target name="clean" depends="prepare" description="Cleans up most generated files."> + + <echo message="*************************************"/> + <echo message="* mvn clean *"/> + <echo message="*************************************"/> + <exec dir="${basedir}" executable="mvn" failonerror="true"> <arg value="clean"/> </exec> </target> - <target name="main" description="Executes the default target (most)." depends="most"/> - - <target name="most" description="Builds almost everything." depends="jars"/> - - <target name="all" description="Create a distribution zip file" depends="most"/> - </project> Deleted: stack/cxf/branches/tdiesler/trunk/modules/testsuite/cxf-tests/src/scripts/cxf-jars-jaxws.xml =================================================================== --- stack/cxf/branches/tdiesler/trunk/modules/testsuite/cxf-tests/src/scripts/cxf-jars-jaxws.xml 2008-04-23 16:23:11 UTC (rev 6637) +++ stack/cxf/branches/tdiesler/trunk/modules/testsuite/cxf-tests/src/scripts/cxf-jars-jaxws.xml 2008-04-23 19:39:06 UTC (rev 6638) @@ -1,63 +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$ --> - -<project> - - <description>JBossWS test archive builder</description> - - <!-- ============================================================================== --> - <!-- Building --> - <!-- --> - <!-- Where to create your tests --> - <!-- http://www.jboss.com/index.html?module=bb&op=viewtopic&p=4144172#... --> - <!-- --> - <!-- ============================================================================== --> - - <target name="build-jars-jaxws" description="Build the deployments."> - - <mkdir dir="${tests.output.dir}/test-libs"/> - - <!-- jaxws-cxf-descriptor --> - <war warfile="${tests.output.dir}/test-libs/jaxws-cxf-descriptor.war" webxml="${tests.output.dir}/test-resources/jaxws/cxf/descriptor/WEB-INF/web.xml"> - <classes dir="${tests.output.dir}/test-classes"> - <include name="org/jboss/test/ws/jaxws/cxf/descriptor/DescriptorEndpointImpl.class"/> - </classes> - <webinf dir="${tests.output.dir}/test-resources/jaxws/cxf/descriptor/WEB-INF"> - <include name="jbossws-cxf.xml"/> - </webinf> - </war> - - <!-- jaxws-cxf-wsrm-basic-doc --> - <war warfile="${tests.output.dir}/test-libs/jaxws-cxf-wsrm-basic-doc.war" webxml="${tests.output.dir}/test-resources/jaxws/cxf/wsrm/basic-doc/WEB-INF/web.xml"> - <classes dir="${tests.output.dir}/test-classes"> - <include name="org/jboss/test/ws/jaxws/cxf/wsrm/BasicDocEndpointImpl.class"/> - <include name="org/jboss/test/ws/jaxws/cxf/wsrm/BasicDocEndpoint.class"/> - </classes> - <webinf dir="${tests.output.dir}/test-resources/jaxws/cxf/wsrm/basic-doc/WEB-INF"> - <include name="jbossws-cxf.xml"/> - </webinf> - </war> - - <!-- jaxws-cxf-wsrm-basic-rpc --> - <war warfile="${tests.output.dir}/test-libs/jaxws-cxf-wsrm-basic-rpc.war" webxml="${tests.output.dir}/test-resources/jaxws/cxf/wsrm/basic-rpc/WEB-INF/web.xml"> - <classes dir="${tests.output.dir}/test-classes"> - <include name="org/jboss/test/ws/jaxws/cxf/wsrm/BasicRPCEndpointImpl.class"/> - <include name="org/jboss/test/ws/jaxws/cxf/wsrm/BasicRPCEndpoint.class"/> - </classes> - <webinf dir="${tests.output.dir}/test-resources/jaxws/cxf/wsrm/basic-rpc/WEB-INF"> - <include name="jbossws-cxf.xml"/> - </webinf> - </war> - - <!-- Please add alphabetically --> - - </target> - -</project> Added: stack/cxf/branches/tdiesler/trunk/modules/testsuite/cxf-tests/src/scripts/cxf-jars-jaxws.xml =================================================================== --- stack/cxf/branches/tdiesler/trunk/modules/testsuite/cxf-tests/src/scripts/cxf-jars-jaxws.xml (rev 0) +++ stack/cxf/branches/tdiesler/trunk/modules/testsuite/cxf-tests/src/scripts/cxf-jars-jaxws.xml 2008-04-23 19:39:06 UTC (rev 6638) @@ -0,0 +1,63 @@ +<?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> + + <description>JBossWS test archive builder</description> + + <!-- ============================================================================== --> + <!-- Building --> + <!-- --> + <!-- Where to create your tests --> + <!-- http://www.jboss.com/index.html?module=bb&op=viewtopic&p=4144172#... --> + <!-- --> + <!-- ============================================================================== --> + + <target name="build-jars-jaxws" description="Build the deployments."> + + <mkdir dir="${tests.output.dir}/test-libs"/> + + <!-- jaxws-cxf-descriptor --> + <war warfile="${tests.output.dir}/test-libs/jaxws-cxf-descriptor.war" webxml="${tests.output.dir}/test-resources/jaxws/cxf/descriptor/WEB-INF/web.xml"> + <classes dir="${tests.output.dir}/test-classes"> + <include name="org/jboss/test/ws/jaxws/cxf/descriptor/DescriptorEndpointImpl.class"/> + </classes> + <webinf dir="${tests.output.dir}/test-resources/jaxws/cxf/descriptor/WEB-INF"> + <include name="jbossws-cxf.xml"/> + </webinf> + </war> + + <!-- jaxws-cxf-wsrm-basic-doc --> + <war warfile="${tests.output.dir}/test-libs/jaxws-cxf-wsrm-basic-doc.war" webxml="${tests.output.dir}/test-resources/jaxws/cxf/wsrm/basic-doc/WEB-INF/web.xml"> + <classes dir="${tests.output.dir}/test-classes"> + <include name="org/jboss/test/ws/jaxws/cxf/wsrm/BasicDocEndpointImpl.class"/> + <include name="org/jboss/test/ws/jaxws/cxf/wsrm/BasicDocEndpoint.class"/> + </classes> + <webinf dir="${tests.output.dir}/test-resources/jaxws/cxf/wsrm/basic-doc/WEB-INF"> + <include name="jbossws-cxf.xml"/> + </webinf> + </war> + + <!-- jaxws-cxf-wsrm-basic-rpc --> + <war warfile="${tests.output.dir}/test-libs/jaxws-cxf-wsrm-basic-rpc.war" webxml="${tests.output.dir}/test-resources/jaxws/cxf/wsrm/basic-rpc/WEB-INF/web.xml"> + <classes dir="${tests.output.dir}/test-classes"> + <include name="org/jboss/test/ws/jaxws/cxf/wsrm/BasicRPCEndpointImpl.class"/> + <include name="org/jboss/test/ws/jaxws/cxf/wsrm/BasicRPCEndpoint.class"/> + </classes> + <webinf dir="${tests.output.dir}/test-resources/jaxws/cxf/wsrm/basic-rpc/WEB-INF"> + <include name="jbossws-cxf.xml"/> + </webinf> + </war> + + <!-- Please add alphabetically --> + + </target> + +</project> Deleted: stack/cxf/branches/tdiesler/trunk/modules/testsuite/cxf-tests/src/scripts/cxf-samples-jaxws.xml =================================================================== --- stack/cxf/branches/tdiesler/trunk/modules/testsuite/cxf-tests/src/scripts/cxf-samples-jaxws.xml 2008-04-23 16:23:11 UTC (rev 6637) +++ stack/cxf/branches/tdiesler/trunk/modules/testsuite/cxf-tests/src/scripts/cxf-samples-jaxws.xml 2008-04-23 19:39:06 UTC (rev 6638) @@ -1,40 +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$ --> - -<project> - - <!-- ================================================================== --> - <!-- Building --> - <!-- ================================================================== --> - - <target name="build-samples-jaxws" description="Build the jaxws samples deployments"> - - <mkdir dir="${tests.output.dir}/test-libs"/> - - <!-- jaxws-samples-wsrm --> - <war - warfile="${tests.output.dir}/test-libs/jaxws-samples-wsrm.war" - webxml="${tests.output.dir}/test-resources/jaxws/samples/wsrm/WEB-INF/web.xml"> - <classes dir="${tests.output.dir}/test-classes"> - <include name="org/jboss/test/ws/jaxws/samples/wsrm/service/**"/> - </classes> - <webinf dir="${tests.output.dir}/test-resources/jaxws/samples/wsrm/WEB-INF"> - <include name="jbossws-cxf.xml"/> - </webinf> - <zipfileset - dir="${tests.output.dir}/test-resources/jaxws/samples/wsrm/WEB-INF/wsdl" - prefix="WEB-INF/wsdl"/> - </war> - - <!-- Please add alphabetically --> - - </target> - -</project> Added: stack/cxf/branches/tdiesler/trunk/modules/testsuite/cxf-tests/src/scripts/cxf-samples-jaxws.xml =================================================================== --- stack/cxf/branches/tdiesler/trunk/modules/testsuite/cxf-tests/src/scripts/cxf-samples-jaxws.xml (rev 0) +++ stack/cxf/branches/tdiesler/trunk/modules/testsuite/cxf-tests/src/scripts/cxf-samples-jaxws.xml 2008-04-23 19:39:06 UTC (rev 6638) @@ -0,0 +1,56 @@ +<?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> + + <!-- ================================================================== --> + <!-- Building --> + <!-- ================================================================== --> + + <target name="build-samples-jaxws" description="Build the jaxws samples deployments"> + + <mkdir dir="${tests.output.dir}/test-libs"/> + + <!-- jaxws-samples-wsa --> + <war + warfile="${tests.output.dir}/test-libs/jaxws-samples-wsa.war" + webxml="${tests.output.dir}/test-resources/jaxws/samples/wsa/WEB-INF/web.xml"> + <classes dir="${tests.output.dir}/test-classes"> + <include name="org/jboss/test/ws/jaxws/samples/wsa/Service*.class"/> + <include name="org/jboss/test/ws/jaxws/samples/wsa/jaxws/*.class"/> + </classes> + <webinf dir="${tests.output.dir}/test-resources/jaxws/samples/wsa/WEB-INF"> + <include name="jbossws-cxf.xml"/> + </webinf> + <zipfileset + dir="${tests.output.dir}/test-resources/jaxws/samples/wsa/WEB-INF/wsdl" + prefix="WEB-INF/wsdl"/> + </war> + + <!-- jaxws-samples-wsrm --> + <war + warfile="${tests.output.dir}/test-libs/jaxws-samples-wsrm.war" + webxml="${tests.output.dir}/test-resources/jaxws/samples/wsrm/WEB-INF/web.xml"> + <classes dir="${tests.output.dir}/test-classes"> + <include name="org/jboss/test/ws/jaxws/samples/wsrm/service/**"/> + </classes> + <webinf dir="${tests.output.dir}/test-resources/jaxws/samples/wsrm/WEB-INF"> + <include name="jbossws-cxf.xml"/> + </webinf> + <zipfileset + dir="${tests.output.dir}/test-resources/jaxws/samples/wsrm/WEB-INF/wsdl" + prefix="WEB-INF/wsdl"/> + </war> + + <!-- Please add alphabetically --> + + </target> + +</project> Modified: stack/cxf/branches/tdiesler/trunk/modules/testsuite/framework-tests/src/test/etc/log4j.xml =================================================================== --- stack/cxf/branches/tdiesler/trunk/modules/testsuite/framework-tests/src/test/etc/log4j.xml 2008-04-23 16:23:11 UTC (rev 6637) +++ stack/cxf/branches/tdiesler/trunk/modules/testsuite/framework-tests/src/test/etc/log4j.xml 2008-04-23 19:39:06 UTC (rev 6638) @@ -22,7 +22,7 @@ <!-- A time/date based rolling appender --> <appender name="FILE" class="org.jboss.logging.appender.DailyRollingFileAppender"> - <param name="File" value="${jbossws.test.log}/test.log"/> + <param name="File" value="${build.testlog}/test.log"/> <param name="Append" value="true"/> <!-- Rollover at midnight each day --> Modified: stack/cxf/branches/tdiesler/trunk/modules/testsuite/pom.xml =================================================================== --- stack/cxf/branches/tdiesler/trunk/modules/testsuite/pom.xml 2008-04-23 16:23:11 UTC (rev 6637) +++ stack/cxf/branches/tdiesler/trunk/modules/testsuite/pom.xml 2008-04-23 19:39:06 UTC (rev 6638) @@ -119,15 +119,15 @@ </property> <property> <name>jboss.home</name> - <value>${jboss422.home}</value> + <value>${jboss.home}</value> </property> <property> <name>jbossws.integration.target</name> <value>${jbossws.integration.target}</value> </property> <property> - <name>jbossws.test.log</name> - <value>${project.build.directory}</value> + <name>build.testlog</name> + <value>${project.build.directory}/test-log</value> </property> <property> <name>test.archive.directory</name> Modified: stack/cxf/branches/tdiesler/trunk/pom.xml =================================================================== --- stack/cxf/branches/tdiesler/trunk/pom.xml 2008-04-23 16:23:11 UTC (rev 6637) +++ stack/cxf/branches/tdiesler/trunk/pom.xml 2008-04-23 19:39:06 UTC (rev 6638) @@ -21,7 +21,6 @@ <module>modules/management</module> <module>modules/server</module> <module>modules/client</module> - <!--module>modules/testsuite</module--> </modules> <!-- Properties --> @@ -214,6 +213,7 @@ <artifactId>maven-antrun-plugin</artifactId> <executions> <execution> + <id>validate-jboss-home</id> <phase>validate</phase> <goals> <goal>run</goal> @@ -236,29 +236,67 @@ <finalName>deploy-artifacts</finalName> <ignoreDirFormatExtensions>true</ignoreDirFormatExtensions> <appendAssemblyId>false</appendAssemblyId> + <!-- + Cannot bind to lifecycle with multiple modules + http://jira.codehaus.org/browse/MASSEMBLY-319 + <executions> + <execution> + <id>build-deploy-artifacts</id> + <phase>package</phase> + <goals> + <goal>directory-inline</goal> + </goals> + </execution> + </executions--> <descriptors> <descriptor>src/main/scripts/assembly-deploy-artifacts.xml</descriptor> </descriptors> </configuration> </plugin> - <!-- - <plugin> - <artifactId>maven-assembly-plugin</artifactId> - <configuration> - <finalName>jbossws-cxf-dist</finalName> - <ignoreDirFormatExtensions>true</ignoreDirFormatExtensions> - <appendAssemblyId>false</appendAssemblyId> - <descriptors> - <descriptor>src/main/scripts/assembly-bin-dist.xml</descriptor> - </descriptors> - </configuration> - </plugin--> </plugins> </build> <!-- Profiles --> <profiles> + <!-- + Name: alltests + Descr: Executes the testsuite + --> <profile> + <id>alltests</id> + <modules> + <module>modules/testsuite</module> + </modules> + </profile> + + <!-- + Name: bindist + Descr: Build the binary distribution + --> + <profile> + <id>bindist</id> + <build> + <plugins> + <plugin> + <artifactId>maven-assembly-plugin</artifactId> + <configuration> + <finalName>jbossws-cxf-dist</finalName> + <ignoreDirFormatExtensions>true</ignoreDirFormatExtensions> + <appendAssemblyId>false</appendAssemblyId> + <descriptors> + <descriptor>src/main/scripts/assembly-bin-dist.xml</descriptor> + </descriptors> + </configuration> + </plugin> + </plugins> + </build> + </profile> + + <!-- + Name: jboss422-user-profile + Descr: JBoss-4.2.2 specific options + --> + <profile> <id>jboss422-user-profile</id> <activation> <property> Modified: stack/cxf/branches/tdiesler/trunk/profiles-example.xml =================================================================== --- stack/cxf/branches/tdiesler/trunk/profiles-example.xml 2008-04-23 16:23:11 UTC (rev 6637) +++ stack/cxf/branches/tdiesler/trunk/profiles-example.xml 2008-04-23 19:39:06 UTC (rev 6638) @@ -4,7 +4,7 @@ <!-- This profile can also be defined in ~/.m2/settings.xml --> <profile> - <id>user-profile-jboss</id> + <id>jboss-home-profile</id> <activation> <activeByDefault>true</activeByDefault> </activation> Copied: stack/cxf/branches/tdiesler/trunk/src/main/distro/JBossORG-EULA.txt (from rev 6632, stack/cxf/branches/tdiesler/trunk/src/main/etc/JBossORG-EULA.txt) =================================================================== --- stack/cxf/branches/tdiesler/trunk/src/main/distro/JBossORG-EULA.txt (rev 0) +++ stack/cxf/branches/tdiesler/trunk/src/main/distro/JBossORG-EULA.txt 2008-04-23 19:39:06 UTC (rev 6638) @@ -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 + Modified: stack/cxf/branches/tdiesler/trunk/src/main/distro/build-setup.xml =================================================================== --- stack/cxf/branches/tdiesler/trunk/src/main/distro/build-setup.xml 2008-04-23 16:23:11 UTC (rev 6637) +++ stack/cxf/branches/tdiesler/trunk/src/main/distro/build-setup.xml 2008-04-23 19:39:06 UTC (rev 6638) @@ -28,13 +28,13 @@ <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}"/> @@ -59,6 +59,19 @@ <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="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> + <!-- ================================================================== --> <!-- Initialization --> <!-- ================================================================== --> Modified: stack/cxf/branches/tdiesler/trunk/src/main/distro/build.xml =================================================================== --- stack/cxf/branches/tdiesler/trunk/src/main/distro/build.xml 2008-04-23 16:23:11 UTC (rev 6637) +++ stack/cxf/branches/tdiesler/trunk/src/main/distro/build.xml 2008-04-23 19:39:06 UTC (rev 6638) @@ -13,6 +13,11 @@ <project default="main" basedir="." name="JBossWS-CXF"> + <!-- Load ant.properties --> + <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"/> + <!-- ================================================================== --> <!-- Setup --> <!-- ================================================================== --> @@ -24,125 +29,32 @@ <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="deploy.structure.jboss42" value="${basedir}/output/deploy-jboss422"/> + <property name="deploy.structure.jboss50" value="${basedir}/output/deploy-jboss500"/> <property name="jbossws.default.deploy.conf" value="${build.dir}/jbossws-default-deploy.conf"/> - <property file="${basedir}/ant.properties"/> - <property file="${basedir}/version.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"/> - <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"/> + <!-- Define excludesfile --> + <property name="excludesfile" value="${tests.dir}/resources/test-excludes-${jbossws.integration.target}.txt"/> - <property name="jboss423.lib" value="${jboss423.home}/lib"/> - <property name="jboss423.client" value="${jboss423.home}/client"/> - <property name="jboss423.server" value="${jboss423.home}/server/${jboss.server.instance}"/> - <property name="jboss423.server.lib" value="${jboss423.server}/lib"/> - <property name="jboss423.server.deploy" value="${jboss423.server}/deploy"/> - - <property name="jboss500.lib" value="${jboss500.home}/lib"/> - <property name="jboss500.client" value="${jboss500.home}/client"/> - <property name="jboss500.server" value="${jboss500.home}/server/${jboss.server.instance}"/> - <property name="jboss500.server.lib" value="${jboss500.server}/lib"/> - <property name="jboss500.server.deploy" value="${jboss500.server}/deploy"/> - <property name="jboss500.server.deployers" value="${jboss500.server}/deployers"/> - - <property name="jboss501.lib" value="${jboss501.home}/lib"/> - <property name="jboss501.client" value="${jboss501.home}/client"/> - <property name="jboss501.server" value="${jboss501.home}/server/${jboss.server.instance}"/> - <property name="jboss501.server.lib" value="${jboss501.server}/lib"/> - <property name="jboss501.server.deploy" value="${jboss501.server}/deploy"/> - <property name="jboss501.server.deployers" value="${jboss501.server}/deployers"/> - - <property name="jbossws.integration.${jbossws.integration.target}" value="true"/> - - <property name="jboss422.available.file" value="${jboss422.client}/jboss-client.jar"/> - <property name="jboss423.available.file" value="${jboss423.client}/jboss-client.jar"/> - <property name="jboss500.available.file" value="${jboss500.client}/jboss-client.jar"/> - <property name="jboss501.available.file" value="${jboss501.client}/jboss-client.jar"/> - - <available property="jboss422.available" file="${jboss422.available.file}"/> - <available property="jboss423.available" file="${jboss423.available.file}"/> - <available property="jboss500.available" file="${jboss500.available.file}"/> - <available property="jboss501.available" file="${jboss501.available.file}"/> - - <condition property="jbossws.integration.jboss42" value="true"> - <or> - <equals arg1="${jbossws.integration.target}" arg2="jboss422"/> - <equals arg1="${jbossws.integration.target}" arg2="jboss423"/> - </or> - </condition> - <condition property="jbossws.integration.jboss50" value="true"> - <or> - <equals arg1="${jbossws.integration.target}" arg2="jboss500"/> - <equals arg1="${jbossws.integration.target}" arg2="jboss501"/> - </or> - </condition> - - <!-- JDK Detection --> - <available classname="java.lang.Enum" property="HAVE_JDK_1.5"/> - <available classname="java.io.Console" property="HAVE_JDK_1.6"/> - - <fail message="JDK1.5 or above is required" unless="HAVE_JDK_1.5"/> - - <import file="${basedir}/build/build-deploy.xml"/> - <import file="${basedir}/build/jbossws-deploy-macros.xml"/> - <import file="${basedir}/tests/ant-import/build-testsuite.xml"/> - <!-- ================================================================== --> <!-- Initialization --> <!-- ================================================================== --> - <target name="prepare"> - - <!-- Define jboss.home --> - <condition property="jboss.home" value="${jboss500.home}"> - <equals arg1="${jbossws.integration.target}" arg2="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="jboss42"/> - </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}/cxf-${cxf.version}.jar"/> - <pathelement location="${thirdparty.dir}/geronimo-javamail_${cxf.geronimo.javamail}.jar"/> - <pathelement location="${thirdparty.dir}/geronimo-ws-metadata_${cxf.geronimo.ws.metadata}.jar"/> - <pathelement location="${thirdparty.dir}/jaxb-api.jar"/> - <pathelement location="${thirdparty.dir}/jaxws-api-${cxf.jaxws.api}.jar"/> - <pathelement location="${thirdparty.dir}/jdom-${cxf.jdom}.jar"/> - <pathelement location="${thirdparty.dir}/neethi-${cxf.neethi}.jar"/> - <pathelement location="${thirdparty.dir}/saaj-api-${cxf.saaj}.jar"/> - <pathelement location="${thirdparty.dir}/saaj-impl-${cxf.saaj}.jar"/> - <pathelement location="${thirdparty.dir}/spring-beans-${cxf.spring}.jar"/> - <pathelement location="${thirdparty.dir}/spring-context-${cxf.spring}.jar"/> - <pathelement location="${thirdparty.dir}/spring-core-${cxf.spring}.jar"/> - <pathelement location="${thirdparty.dir}/wsdl4j.jar"/> - <pathelement location="${thirdparty.dir}/wstx-${cxf.wstx}.jar"/> - <pathelement location="${thirdparty.dir}/xml-resolver-${cxf.xml.resolver}.jar"/> - <pathelement location="${thirdparty.dir}/XmlSchema-${cxf.xmlschema}.jar"/> + <fileset dir="${thirdparty.dir}"/> </path> <path id="tests.extra.classpath"> - <pathelement location="${thirdparty.dir}/jbossws-cxf-client.jar"/> - <pathelement location="${thirdparty.dir}/jbossws-framework.jar"/> - <pathelement location="${thirdparty.dir}/jaxws-tools.jar"/> </path> + <property name="jbossws.test.log" value="${tests.output.dir}"/> </target> <!-- ================================================================== --> Modified: stack/cxf/branches/tdiesler/trunk/src/main/scripts/assembly-bin-dist.xml =================================================================== --- stack/cxf/branches/tdiesler/trunk/src/main/scripts/assembly-bin-dist.xml 2008-04-23 16:23:11 UTC (rev 6637) +++ stack/cxf/branches/tdiesler/trunk/src/main/scripts/assembly-bin-dist.xml 2008-04-23 19:39:06 UTC (rev 6638) @@ -12,9 +12,15 @@ <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>build.xml</include> <include>ant.properties</include> </includes> </fileSet> @@ -25,10 +31,45 @@ <filtered>true</filtered> <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> + <!-- tests --> + <fileSet> + <directory>modules/testsuite/framework-tests/src/test</directory> + <outputDirectory>tests</outputDirectory> + <includes> + <include>ant-import/**</include> + <include>etc/**</include> + <include>java/org/jboss/test/ws/jaxws/samples/**</include> + <include>resources/jaxws/samples/**</include> + </includes> + </fileSet> + <fileSet> + <directory>modules/testsuite/cxf-tests/src/test/resources</directory> + <outputDirectory>tests/resources</outputDirectory> + <includes> + <include>test-excludes-*.txt</include> + </includes> + </fileSet> </fileSets> </assembly> \ No newline at end of file Deleted: stack/cxf/branches/tdiesler/trunk/version.properties =================================================================== --- stack/cxf/branches/tdiesler/trunk/version.properties 2008-04-23 16:23:11 UTC (rev 6637) +++ stack/cxf/branches/tdiesler/trunk/version.properties 2008-04-23 19:39:06 UTC (rev 6638) @@ -1,9 +0,0 @@ - -# $Id: version.properties 2928 2007-04-26 10:53:56Z thomas.diesler(a)jboss.com $ - -# Apache CXF versions -cxf.geronimo.javamail=1.4_spec -cxf.geronimo.ws.metadata=2.0_spec - -# Thirdparty library versions -jbossws-jboss42=4.2.1.GA