[jbossws-commits] JBossWS SVN: r6637 - in stack/cxf/branches/tdiesler/trunk: src/main/distro and 1 other directory.

Author: thomas.diesler(a)jboss.com Date: 2008-04-23 12:23:11 -0400 (Wed, 23 Apr 2008) New Revision: 6637 Added: stack/cxf/branches/tdiesler/trunk/src/main/distro/build-setup.xml Removed: stack/cxf/branches/tdiesler/trunk/ant-import/ stack/cxf/branches/tdiesler/trunk/build.bat stack/cxf/branches/tdiesler/trunk/build.sh stack/cxf/branches/tdiesler/trunk/tools/ Modified: stack/cxf/branches/tdiesler/trunk/ant.properties.example stack/cxf/branches/tdiesler/trunk/build.xml stack/cxf/branches/tdiesler/trunk/src/main/distro/build-deploy.xml stack/cxf/branches/tdiesler/trunk/src/main/distro/jbossws-deploy-macros.xml Log: Cleanup ant stuff Modified: stack/cxf/branches/tdiesler/trunk/ant.properties.example =================================================================== --- stack/cxf/branches/tdiesler/trunk/ant.properties.example 2008-04-23 16:06:36 UTC (rev 6636) +++ stack/cxf/branches/tdiesler/trunk/ant.properties.example 2008-04-23 16:23:11 UTC (rev 6637) @@ -14,31 +14,7 @@ # 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.cxf.CXFServletExt - -# Java Compiler options -javac.debug=yes -javac.deprecation=no -javac.fail.onerror=yes -javac.verbose=no +jboss.local.repository=/home/tdiesler/svn/jboss.local.repository \ No newline at end of file Deleted: stack/cxf/branches/tdiesler/trunk/build.bat =================================================================== --- stack/cxf/branches/tdiesler/trunk/build.bat 2008-04-23 16:06:36 UTC (rev 6636) +++ stack/cxf/branches/tdiesler/trunk/build.bat 2008-04-23 16:23:11 UTC (rev 6637) @@ -1,101 +0,0 @@ -@echo off - -REM ====================================================================== -REM -REM This is the main entry point for the build system. -REM -REM Users should be sure to execute this file rather than 'ant' to ensure -REM the correct version is being used with the correct configuration. -REM -REM ====================================================================== -REM -REM $Id: build.bat 61858 2007-03-29 17:19:26Z dimitris(a)jboss.org $ - -REM ****************************************************** -REM Ignore the ANT_HOME variable: we want to use *our* -REM ANT version and associated JARs. -REM ****************************************************** -REM Ignore the users classpath, cause it might mess -REM things up -REM ****************************************************** - -SETLOCAL - -set NOPAUSE=true -set CLASSPATH= -set ANT_HOME= - -set ANT_OPTS=-Xmx256m -Dbuild.script=build.bat - -REM -REM - "for" loops have been unrolled for compatibility -REM with some WIN32 systems. -REM ****************************************************** - -set NAMES=tools\ant -set SUBFOLDERS=..;..\..;..\..\..;..\..\..\.. - -REM ****************************************************** -REM ********Save the command line arguments*************** -REM ****************************************************** -set BUILD_ARGS=%1 -if ""%1""=="""" goto completedArgs -shift -:processArg -if ""%1""=="""" goto completedArgs -set BUILD_ARGS=%BUILD_ARGS% %1 -shift -goto processArg - -:completedArgs - -REM ****************************************************** -REM ****************************************************** - -SET EXECUTED=FALSE -for %%i in (%NAMES%) do call :subLoop %%i %BUILD_ARGS% - -goto :EOF - -REM ****************************************************** -REM ********* Search for names in the subfolders ********* -REM ****************************************************** - -:subLoop -for %%j in (%SUBFOLDERS%) do call :testIfExists %%j\%1\bin\ant.bat %BUILD_ARGS% - -goto :EOF - -REM ****************************************************** -REM ************ Test if ANT Batch file exists *********** -REM ****************************************************** - -:testIfExists -if exist %1 call :BatchFound %1 %BUILD_ARGS% - -goto :EOF - -REM ****************************************************** -REM ************** Batch file has been found ************* -REM ****************************************************** - -:BatchFound -if (%EXECUTED%)==(FALSE) call :ExecuteBatch %1 %BUILD_ARGS% -set EXECUTED=TRUE - -goto :EOF - -REM ****************************************************** -REM ************* Execute Batch file only once *********** -REM ****************************************************** - -:ExecuteBatch -echo Calling %1 %BUILD_ARGS% - -REM set ENDORSED= -call %1 %BUILD_ARGS% - -:end - -if "%NOPAUSE%" == "" pause - Deleted: stack/cxf/branches/tdiesler/trunk/build.sh =================================================================== --- stack/cxf/branches/tdiesler/trunk/build.sh 2008-04-23 16:06:36 UTC (rev 6636) +++ stack/cxf/branches/tdiesler/trunk/build.sh 2008-04-23 16:23:11 UTC (rev 6637) @@ -1,169 +0,0 @@ -#!/bin/sh -### ====================================================================== ### -## ## -## This is the main entry point for the build system. ## -## ## -## Users should be sure to execute this file rather than 'ant' to ensure ## -## the correct version is being used with the correct configuration. ## -## ## -## NOTE: Uncomment the JDK6 property if you are running JDK 1.6 ## -## ## -### ====================================================================== ### - -# $Id: build.sh 60589 2007-02-16 16:37:13Z jfrederic.clere(a)jboss.com $ - -PROGNAME=`basename $0` -DIRNAME=`dirname $0` -GREP="grep" -ROOT="/" - -# Ignore user's ANT_HOME if it is set -ANT_HOME="" - -# the default search path for ant -ANT_SEARCH_PATH="tools/ant" - -# the default build file name -ANT_BUILD_FILE="build.xml" - -# the default arguments -ANT_OPTIONS="--noconfig -find $ANT_BUILD_FILE" - -# Use the maximum available, or set MAX_FD != -1 to use that -MAX_FD="maximum" - -# OS specific support (must be 'true' or 'false'). -cygwin=false; -darwin=false; -case "`uname`" in - CYGWIN*) - cygwin=true - ;; - - Darwin*) - darwin=true - ;; -esac - -# -# Helper to complain. -# -die() { - echo "${PROGNAME}: $*" - exit 1 -} - -# -# Helper to complain. -# -warn() { - echo "${PROGNAME}: $*" -} - -# -# Helper to source a file if it exists. -# -maybe_source() { - for file in $*; do - if [ -f "$file" ]; then - . $file - fi - done -} - -search() { - search="$*" - for d in $search; do - ANT_HOME="`pwd`/$d" - ANT="$ANT_HOME/bin/ant" - if [ -x "$ANT" ]; then - # found one - echo $ANT_HOME - break - fi - done -} - -# -# Main function. -# -main() { - # if there is a build config file. then source it - maybe_source "$DIRNAME/build.conf" - - # Increase the maximum file descriptors if we can - if [ $cygwin = "false" ]; then - MAX_FD_LIMIT=`ulimit -H -n` - if [ $? -eq 0 ]; then - if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ]; then - # use the system max - MAX_FD="$MAX_FD_LIMIT" - fi - - ulimit -n $MAX_FD - if [ $? -ne 0 ]; then - warn "Could not set maximum file descriptor limit: $MAX_FD" - fi - else - warn "Could not query system maximum file descriptor limit: $MAX_FD_LIMIT" - fi - fi - - # try the search path - ANT_HOME=`search $ANT_SEARCH_PATH` - - # try looking up to root - if [ "x$ANT_HOME" = "x" ]; then - target="build" - _cwd=`pwd` - - while [ "x$ANT_HOME" = "x" ] && [ "$cwd" != "$ROOT" ]; do - cd .. - cwd=`pwd` - ANT_HOME=`search $ANT_SEARCH_PATH` - done - - # make sure we get back - cd $_cwd - - if [ "$cwd" != "$ROOT" ]; then - found="true" - fi - - # complain if we did not find anything - if [ "$found" != "true" ]; then - die "Could not locate Ant; check \$ANT or \$ANT_HOME." - fi - fi - - # make sure we have one - ANT=$ANT_HOME/bin/ant - if [ ! -x "$ANT" ]; then - die "Ant file is not executable: $ANT" - fi - - # Set the max memory to 256m - ANT_OPTS=-Xmx256m - - # Endorse JAXB, JAXWS API - ANT_OPTS="$ANT_OPTS -Djava.endorsed.dirs=$ANT_HOME/endorsed" - - # setup some build properties - ANT_OPTS="$ANT_OPTS -Dbuild.script=$0" - - # change to the directory where the script lives so users are not forced - # to be in the same directory as build.xml - cd $DIRNAME - - # export some stuff for ant - export ANT ANT_HOME ANT_OPTS - - # run ant - $ANT $ANT_OPTIONS "$@" -} - -## -## Bootstrap -## - -main "$@" Modified: stack/cxf/branches/tdiesler/trunk/build.xml =================================================================== --- stack/cxf/branches/tdiesler/trunk/build.xml 2008-04-23 16:06:36 UTC (rev 6636) +++ stack/cxf/branches/tdiesler/trunk/build.xml 2008-04-23 16:23:11 UTC (rev 6637) @@ -13,35 +13,34 @@ <project default="main" basedir="." name="JBossWS-CXF"> - <property name="cxf.dir" value="${basedir}"/> + <!-- 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"/> - <import file="${basedir}/ant-import/build-setup.xml"/> - <import file="${basedir}/ant-import/build-deploy.xml"/> - <import file="${basedir}/ant-import/jbossws-deploy-macros.xml"/> - <!-- ================================================================== --> <!-- Setup --> <!-- ================================================================== --> + <property name="cxf.dir" value="${basedir}"/> + <property name="cxf.distro.dir" value="${cxf.dir}/src/main/distro"/> <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.src.dir" value="${cxf.dir}/src/main"/> - <property name="cxf.etc.dir" value="${cxf.src.dir}/etc"/> - <property name="cxf.distro.dir" value="${cxf.src.dir}/distro"/> - <property name="cxf.java.dir" value="${cxf.src.dir}/java"/> - <property name="cxf.resources.dir" value="${cxf.src.dir}/resources"/> <property name="cxf.output.dir" value="${cxf.dir}/target"/> - <property name="cxf.output.etc.dir" value="${cxf.output.dir}/etc"/> - <property name="cxf.output.resources.dir" value="${cxf.output.dir}/resources"/> <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-jboss50"/> - <property name="jbossws.default.deploy.conf" value="${cxf.dir}/ant-import/jbossws-default-deploy.conf"/> + <property name="deploy.structure.jboss50" value="${cxf.output.dir}/deploy-jboss500"/> + <import file="${cxf.distro.dir}/build-setup.xml"/> + <import file="${cxf.distro.dir}/build-deploy.xml"/> + <import file="${cxf.distro.dir}/jbossws-deploy-macros.xml"/> + + <property name="jbossws.default.deploy.conf" value="${cxf.distro.dir}/jbossws-default-deploy.conf"/> + <!-- ================================================================== --> <!-- Initialization --> <!-- ================================================================== --> Modified: stack/cxf/branches/tdiesler/trunk/src/main/distro/build-deploy.xml =================================================================== --- stack/cxf/branches/tdiesler/trunk/src/main/distro/build-deploy.xml 2008-04-23 16:06:36 UTC (rev 6636) +++ stack/cxf/branches/tdiesler/trunk/src/main/distro/build-deploy.xml 2008-04-23 16:23:11 UTC (rev 6637) @@ -17,13 +17,12 @@ <!-- Prepare Deployment Structure JBoss-4.2.x --> <!-- ================================================================== --> - <target name="deploy-structure-jboss42" depends="prepare"> + <target name="deploy-structure-jboss42" depends="prepare-deploy"> <delete dir="${deploy.structure.jboss42}"/> - <exec dir="${basedir}" executable="mvn" failonerror="true"> - <arg value="-Denv=jboss422"/> - <arg value="package"/> - <arg value="assembly:directory"/> - </exec> + <antcall target="deploy-jbossws-cxf42" inheritall="false"> + <param name="installserver" value="${deploy.structure.jboss42}/server/${jboss.server.instance}"/> + <param name="artifactsdir" value="${deploy.artifacts.dir}"/> + </antcall> <macro-create-deploy-conf deploystructure="${deploy.structure.jboss42}"/> </target> Added: stack/cxf/branches/tdiesler/trunk/src/main/distro/build-setup.xml =================================================================== --- stack/cxf/branches/tdiesler/trunk/src/main/distro/build-setup.xml (rev 0) +++ stack/cxf/branches/tdiesler/trunk/src/main/distro/build-setup.xml 2008-04-23 16:23:11 UTC (rev 6637) @@ -0,0 +1,72 @@ +<?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"> + <tstamp> + <format property="build.id" pattern="yyyyMMddHHmm"/> + </tstamp> + </target> + +</project> \ No newline at end of file Property changes on: stack/cxf/branches/tdiesler/trunk/src/main/distro/build-setup.xml ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Modified: stack/cxf/branches/tdiesler/trunk/src/main/distro/jbossws-deploy-macros.xml =================================================================== --- stack/cxf/branches/tdiesler/trunk/src/main/distro/jbossws-deploy-macros.xml 2008-04-23 16:06:36 UTC (rev 6636) +++ stack/cxf/branches/tdiesler/trunk/src/main/distro/jbossws-deploy-macros.xml 2008-04-23 16:23:11 UTC (rev 6637) @@ -92,12 +92,12 @@ <!-- ================================================================== --> <macrodef name="macro-deploy-jbossws-bin"> - <attribute name="thirdpartydir"/> + <attribute name="artifactsdir"/> <attribute name="targetdir"/> <sequential> <mkdir dir="@{targetdir}"/> <copy todir="@{targetdir}" flatten="true" overwrite="true"> - <fileset dir="@{thirdpartydir}"> + <fileset dir="@{artifactsdir}/bin"> <patternset refid="jbossws.bin.patternset"/> </fileset> </copy> @@ -195,15 +195,13 @@ <!-- ================================================================== --> <macrodef name="macro-deploy-jbossws-cxf42-sar"> - <attribute name="thirdpartydir"/> - <attribute name="resourcesdir"/> + <attribute name="artifactsdir"/> <attribute name="targetdir"/> <sequential> <mkdir dir="@{targetdir}"/> <copy todir="@{targetdir}" flatten="true"> - <fileset dir="@{thirdpartydir}"> + <fileset dir="@{artifactsdir}/lib"> <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"/> @@ -211,21 +209,20 @@ </fileset> </copy> <unzip dest=&quot;(a){targetdir}/jbossws-management.war&quot;&gt; - <fileset dir="@{thirdpartydir}"> - <include name="**/jbossws-cxf-management*.war"/> + <fileset dir="@{artifactsdir}/lib"> + <include name="**/jbossws-cxf-management.war"/> </fileset> </unzip> - <copy todir=&quot;(a){targetdir}/jbossws.beans/META-INF&quot; flatten="true"> - <fileset dir="@{thirdpartydir}"> - <include name="**/jbossws-cxf42-beans.xml"/> + <copy todir=&quot;(a){targetdir}/jbossws.beans&quot;&gt; + <fileset dir="@{artifactsdir}/resources/jbossws-beans42"> + <include name="META-INF/**"/> </fileset> </copy> - <move file=&quot;(a){targetdir}/jbossws.beans/META-INF/jbossws-cxf42-beans.xml&quot; tofile=&quot;(a){targetdir}/jbossws.beans/META-INF/jboss-beans.xml&quot;/&gt; <copy todir="@{targetdir}/META-INF"> - <fileset dir=&quot;(a){thirdpartydir}/resources/jbossws-cxf.sar/META-INF&quot;/&gt; + <fileset dir=&quot;(a){artifactsdir}/resources/jbossws-cxf.sar/META-INF&quot;/&gt; </copy> <copy todir="@{targetdir}/META-INF"> - <fileset dir="@{resourcesdir}/META-INF"/> + <fileset dir=&quot;(a){artifactsdir}/resources/jbossws-jboss42.sar/META-INF&quot;/&gt; </copy> </sequential> </macrodef> @@ -246,7 +243,7 @@ <include name="**/jbossws-cxf-context*.war"/> </fileset> </unzip> - <copy todir=&quot;(a){targetdir}/jbossws.beans/META-INF&quot; flatten="true"> + <copy todir=&quot;(a){targetdir}/jbossws.beans/META-INF&quot;&gt; <fileset dir="@{thirdpartydir}"> <include name="**/jbossws-cxf50-beans.xml"/> </fileset> @@ -266,11 +263,11 @@ <available classname="java.io.Console" property="HAVE_JDK_1.6"/> <target name="deploy-jbossws-cxf42" depends="deploy-jbossws-endorsed"> - <macro-deploy-jbossws-bin targetdir="${installserver}/../../bin" thirdpartydir="${thirdpartydir}"/> - <macro-deploy-jbossws-lib42 targetdir="${installserver}/../../lib" thirdpartydir="${thirdpartydir}"/> - <macro-deploy-jbossws-client targetdir="${installserver}/../../client" thirdpartydir="${thirdpartydir}"/> - <macro-deploy-jbossws-server-lib targetdir="${installserver}/lib" thirdpartydir="${thirdpartydir}"/> - <macro-deploy-jbossws-cxf42-sar targetdir="${installserver}/deploy/jbossws.sar" thirdpartydir="${thirdpartydir}" resourcesdir="${resourcesdir}"/> + <macro-deploy-jbossws-bin targetdir="${installserver}/../../bin" artifactsdir="${artifactsdir}"/> + <macro-deploy-jbossws-lib42 targetdir="${installserver}/../../lib" thirdpartydir="${artifactsdir}/lib"/> + <macro-deploy-jbossws-client targetdir="${installserver}/../../client" thirdpartydir="${artifactsdir}/lib"/> + <macro-deploy-jbossws-server-lib targetdir="${installserver}/lib" thirdpartydir="${artifactsdir}/lib"/> + <macro-deploy-jbossws-cxf42-sar targetdir="${installserver}/deploy/jbossws.sar" artifactsdir="${artifactsdir}"/> </target> <target name="deploy-jbossws-cxf50" depends="deploy-jbossws-endorsed">