Merge lp:~james-page/ubuntu/natty/groovy/fix-661230 into lp:ubuntu/natty/groovy

[James Page]

Sync groovy from debain testing and apply Ubuntu specific change to fix FTBFS with ant 1.8 (default ant in Ubuntu)

[lp:~james-page/ubuntu/natty/groovy/fix-661230]

19. By James Page on 2011-02-24

Fixed package maintainer

=== added file '.pc/.quilt_patches'
--- .pc/.quilt_patches	1970-01-01 00:00:00 +0000
+++ .pc/.quilt_patches	2011-02-24 17:57:34 +0000
@@ -0,0 +1,1 @@
+debian/patches
 
=== added file '.pc/.quilt_series'
--- .pc/.quilt_series	1970-01-01 00:00:00 +0000
+++ .pc/.quilt_series	2011-02-24 17:57:34 +0000
@@ -0,0 +1,1 @@
+series
 
=== added directory '.pc/0001-start-scripts.patch'
=== added directory '.pc/0001-start-scripts.patch/src'
=== added directory '.pc/0001-start-scripts.patch/src/bin'
=== added file '.pc/0001-start-scripts.patch/src/bin/startGroovy'
--- .pc/0001-start-scripts.patch/src/bin/startGroovy	1970-01-01 00:00:00 +0000
+++ .pc/0001-start-scripts.patch/src/bin/startGroovy	2011-02-24 17:57:34 +0000
@@ -0,0 +1,271 @@
+# -*- mode:sh -*-
+
+##############################################################################
+##                                                                          ##
+##  Groovy JVM Bootstrap for UN*X                                           ##
+##                                                                          ##
+##############################################################################
+
+##
+## $Revision: 19979 $
+## $Date: 2010-05-08 13:15:13 +0200 (Sa, 08. Mai 2010) $
+##
+
+PROGNAME=`basename "$0"`
+
+#DIRNAME=`dirname "$0"`
+
+SCRIPT_PATH="$0"
+
+# Use the maximum available, or set MAX_FD != -1 to use that value.
+MAX_FD="maximum"
+
+warn ( ) {
+    echo "${PROGNAME}: $*"
+}
+
+die ( ) {
+    warn "$*"
+    exit 1
+}
+
+earlyInit ( ) {
+    return
+}
+
+lateInit ( ) {
+    return
+}
+
+GROOVY_STARTUP="$HOME/.groovy/startup"
+if [ -r "$GROOVY_STARTUP" ] ; then
+    . "$GROOVY_STARTUP"
+fi
+
+earlyInit
+
+# OS specific support (must be 'true' or 'false').
+cygwin=false
+msys=false
+darwin=false
+case "`uname`" in
+  CYGWIN* )
+    cygwin=true
+    ;; 
+  Darwin* )
+    darwin=true
+    ;;
+  MINGW* )
+    msys=true
+    ;;
+esac
+
+if [ "$1" = "-cp" -o "$1" = "-classpath" -o "$1" = "--classpath" ] ; then
+    CP=$2
+    shift 2
+fi
+
+# Attempt to set JAVA_HOME if it's not already set.
+if [ -z "$JAVA_HOME" ] ; then
+    if $darwin ; then 
+        [ -z "$JAVA_HOME" -a -d "/Library/Java/Home" ] && export JAVA_HOME="/Library/Java/Home"
+        [ -z "$JAVA_HOME" -a -d "/System/Library/Frameworks/JavaVM.framework/Home" ] && export JAVA_HOME="/System/Library/Frameworks/JavaVM.framework/Home"
+    else
+        javaExecutable="`which javac`"
+        [ -z "$javaExecutable" -o "`expr \"$javaExecutable\" : '\([^ ]*\)'`" = "no" ] && die "JAVA_HOME not set and cannot find javac to deduce location, please set JAVA_HOME."
+        # readlink(1) is not available as standard on Solaris 10.
+        readLink=`which readlink`
+        [ `expr "$readLink" : '\([^ ]*\)'` = "no" ] && die "JAVA_HOME not set and readlink not available, please set JAVA_HOME."
+        javaExecutable="`readlink -f \"$javaExecutable\"`"
+        javaHome="`dirname \"$javaExecutable\"`"
+        javaHome=`expr "$javaHome" : '\(.*\)/bin'`
+        JAVA_HOME="$javaHome"
+        export JAVA_HOME
+
+    fi
+fi
+
+# For Cygwin, ensure paths are in UNIX format before anything is touched.
+if $cygwin ; then
+    [ -n "$GROOVY_HOME" ] && GROOVY_HOME=`cygpath --unix "$GROOVY_HOME"`
+    [ -n "$JAVACMD" ] && JAVACMD=`cygpath --unix "$JAVACMD"`
+    [ -n "$JAVA_HOME" ] && JAVA_HOME=`cygpath --unix "$JAVA_HOME"`
+    [ -n "$CP" ] && CP=`cygpath --path --unix "$CP"`
+else
+    if [ -n "$GROOVY_HOME" -a `expr "$GROOVY_HOME":'\/$'` ] ; then
+        GROOVY_HOME=`echo $GROOVY_HOME | sed -e 's/\/$//'`
+    fi
+fi
+
+#  For MSYS, ensure paths are in appropriate format.
+if $msys
+then
+    [ -n "$JAVA_HOME" ] && JAVA_HOME=`( cd "$JAVA_HOME" ; pwd )`
+fi
+
+# Attempt to set GROOVY_HOME if it is not already set.
+if [ -z "$GROOVY_HOME" -o ! -d "$GROOVY_HOME" ] ; then
+    # Resolve links: $0 may be a link to groovy's home.
+    PRG="$0"
+    # Need this for relative symlinks.
+    while [ -h "$PRG" ] ; do
+        ls=`ls -ld "$PRG"`
+        link=`expr "$ls" : '.*-> \(.*\)$'`
+        if expr "$link" : '/.*' > /dev/null; then
+            PRG="$link"
+        else
+            PRG=`dirname "$PRG"`"/$link"
+        fi
+    done
+    SAVED="`pwd`"
+    cd "`dirname \"$PRG\"`/.."
+    GROOVY_HOME="`pwd -P`"
+    cd "$SAVED"
+fi
+
+# Set the default Groovy config if no specific one is mentioned.
+if [ -z "$GROOVY_CONF" ] ; then
+    GROOVY_CONF="$GROOVY_HOME/conf/groovy-starter.conf"
+fi
+STARTER_CLASSPATH="$GROOVY_HOME/lib/@GROOVYJAR@"
+
+# Create the final classpath. Setting a classpath using the -cp or -classpath option means not to use the
+# global classpath. Groovy behaves then the same as the java interpreter
+if [ -n "$CP" ] ; then
+    CP="$CP":.
+elif [ -n "$CLASSPATH" ] ; then
+    CP="$CLASSPATH":.
+else
+    CP=.
+fi
+
+# Determine the Java command to use to start the JVM.
+if [ -z "$JAVACMD" ] ; then
+    if [ -n "$JAVA_HOME" ] ; then
+        if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
+            # IBM's JDK on AIX uses strange locations for the executables
+            JAVACMD="$JAVA_HOME/jre/sh/java"
+        else
+            JAVACMD="$JAVA_HOME/bin/java"
+        fi
+    else
+        JAVACMD="java"
+    fi
+fi
+if [ ! -x "$JAVACMD" ] ; then
+    die "JAVA_HOME is not defined correctly, can not execute: $JAVACMD"
+fi
+if [ -z "$JAVA_HOME" ] ; then
+    warn "JAVA_HOME environment variable is not set"
+fi
+
+# Increase the maximum file descriptors if we can.
+if [ "$cygwin" = "false" -a "$darwin" = "false" ] ; then
+    MAX_FD_LIMIT=`ulimit -H -n`
+    if [ $? -eq 0 ] ; then
+        if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then
+            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 businessSystem maximum file descriptor limit: $MAX_FD_LIMIT"
+    fi
+fi
+
+# Setup Profiler
+useprofiler=false
+if [ "$PROFILER" != "" ] ; then
+    if [ -r "$PROFILER" ] ; then
+        . $PROFILER
+        useprofiler=true
+    else
+        die "Profiler file not found: $PROFILER"
+    fi
+fi
+
+# For Darwin, use classes.jar for TOOLS_JAR
+TOOLS_JAR="$JAVA_HOME/lib/tools.jar"
+#if $darwin; then
+#    TOOLS_JAR="/System/Library/Frameworks/JavaVM.framework/Versions/CurrentJDK/Classes/classes.jar"
+#fi
+
+# For Darwin, add GROOVY_APP_NAME to the JAVA_OPTS as -Xdock:name
+if $darwin; then
+    JAVA_OPTS="$JAVA_OPTS -Xdock:name=$GROOVY_APP_NAME -Xdock:icon=$GROOVY_HOME/bin/groovy.icns"
+fi
+
+# For Cygwin, switch paths to Windows format before running java
+if $cygwin ; then
+    GROOVY_HOME=`cygpath --mixed "$GROOVY_HOME"`
+    JAVA_HOME=`cygpath --mixed "$JAVA_HOME"`
+    GROOVY_CONF=`cygpath --mixed "$GROOVY_CONF"`
+    CP=`cygpath --path --mixed "$CP"`    
+    TOOLS_JAR=`cygpath --mixed "$TOOLS_JAR"`
+    STARTER_CLASSPATH=`cygpath --path --mixed "$STARTER_CLASSPATH"`
+
+    # We build the pattern for arguments to be converted via cygpath
+    ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null`
+    SEP=""
+    for dir in $ROOTDIRSRAW ; do
+        ROOTDIRS="$ROOTDIRS$SEP$dir"
+        SEP="|"
+    done
+    OURCYGPATTERN="(^($ROOTDIRS))"
+    # Add a user-defined pattern to the cygpath arguments
+    if [ "$GROOVY_CYGPATTERN" != "" ] ; then
+        OURCYGPATTERN="$OURCYGPATTERN|($GROOVY_CYGPATTERN)"
+    fi
+    # Now convert the arguments - kludge to limit ourselves to /bin/sh
+    i=0
+    for arg in "$@" ; do
+        CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -`
+        if [ $CHECK -ne 0 ] ; then
+            eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"`
+        else
+            eval `echo args$i`="\"$arg\""
+        fi
+        i=`expr $i + 1`
+    done
+    case $i in
+        0) set -- ;;
+        1) set -- "$args0" ;;
+        2) set -- "$args0" "$args1" ;;
+        3) set -- "$args0" "$args1" "$args2" ;;
+        4) set -- "$args0" "$args1" "$args2" "$args3" ;;
+        5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
+        6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
+        7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
+        8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
+        9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
+    esac
+
+fi
+
+startGroovy ( ) {
+    CLASS=$1
+    shift
+    # Start the Profiler or the JVM
+    if $useprofiler ; then
+        runProfiler
+    else
+        exec "$JAVACMD" $JAVA_OPTS \
+            -classpath "$STARTER_CLASSPATH" \
+            -Dscript.name="$SCRIPT_PATH" \
+            -Dprogram.name="$PROGNAME" \
+            -Dgroovy.starter.conf="$GROOVY_CONF" \
+            -Dgroovy.home="$GROOVY_HOME" \
+            -Dtools.jar="$TOOLS_JAR" \
+            $STARTER_MAIN_CLASS \
+            --main $CLASS \
+            --conf "$GROOVY_CONF" \
+            --classpath "$CP" \
+            "$@"
+    fi
+}
+
+STARTER_MAIN_CLASS=org.codehaus.groovy.tools.GroovyStarter
+
+lateInit
 
=== added directory '.pc/0002-ant-build.diff.patch'
=== added file '.pc/0002-ant-build.diff.patch/build.xml'
--- .pc/0002-ant-build.diff.patch/build.xml	1970-01-01 00:00:00 +0000
+++ .pc/0002-ant-build.diff.patch/build.xml	2011-02-24 17:57:34 +0000
@@ -0,0 +1,902 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+Ant build script for Groovy.
+
+Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
+compliance with the License. You may obtain a copy of the License at
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software distributed under the License is
+distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+implied. See the License for the specific language governing permissions and limitations under the License.
+
+This work is copyright by the author(s) and is part of a greater work collectively copyright by Codehaus on
+behalf of the Groovy community. See the NOTICE.txt file distributed with this work for additional information.
+
+Author : Russel Winder
+Author : Paul King
+$Revision: 20245 $ ($LastChangedBy: paulk $)
+$Date: 2010-06-07 02:45:33 +0200 (Mo, 07. Jun 2010) $
+-->
+
+<project name="Groovy" default="createJars" basedir=".">
+
+    <property file="local.build.properties"/>
+    <property file="build.properties"/>
+    <property name="ant.requiredVersion" value="1.6.5"/>
+
+    <!-- config/ant/build-maven.xml imports config/ant/build-setup.xml where all the paths are defined. -->
+    <import file="config/ant/build-maven.xml"/>
+    <import file="config/ant/build-checkstyle.xml"/>
+    <import file="config/ant/build-cobertura.xml"/>
+
+    <condition property="_skipTests_">
+        <or>
+            <equals arg1="${test}" arg2="false"/>
+            <istrue value="${skipTests}"/>
+        </or>
+    </condition>
+
+    <condition property="_skipExamples_">
+        <istrue value="${skipExamples}"/>
+    </condition>
+
+    <condition property="_skipDocs_">
+        <istrue value="${skipDocs}"/>
+    </condition>
+
+    <condition property="_skipOsgi_">
+        <istrue value="${skipOsgi}"/>
+    </condition>
+
+    <condition property="_skipFetch_">
+        <istrue value="${skipFetch}"/>
+    </condition>
+
+    <condition property="_skipEmbeddable_">
+        <istrue value="${skipEmbeddable}"/>
+    </condition>
+
+    <condition property="_forceServerSettings_">
+        <istrue value="${forceServerSettings}"/>
+    </condition>
+
+    <condition property="groovy.build.vm4">
+        <contains string="${ant.java.version}" substring="1.4"/>
+    </condition>
+
+    <condition property="groovy.build.vm6">
+        <contains string="${ant.java.version}" substring="1.6"/>
+    </condition>
+
+    <presetdef name="javac">
+        <javac memoryMaximumSize="500m"/>
+    </presetdef>
+
+    <target name="-initCoverage">
+        <condition property="_forceCoverage_">
+            <and>
+                <not>
+                    <istrue value="${skipTests}"/>
+                </not>
+                <istrue value="${forceCoverage}"/>
+            </and>
+        </condition>
+    </target>
+
+    <target name="ensureGrammars" description="Ensure all the Antlr generated files are up to date.">
+        <mkdir dir="${groovyParserDirectory}"/>
+        <antlr target="${antlrDirectory}/groovy.g" outputdirectory="${groovyParserDirectory}">
+            <classpath refid="compilePath"/>
+        </antlr>
+        <antlr target="${javaParserDirectory}/java.g" outputdirectory="${javaParserDirectory}">
+            <classpath refid="compilePath"/>
+        </antlr>
+    </target>
+
+    <target name="-init" depends="-fetchDependencies"/>
+
+    <target name="-banner">
+        <echo message="Java Runtime Environment version: ${java.version}"/>
+        <echo message="Java Runtime Environment vendor: ${java.vendor}"/>
+        <echo message="Ant version: ${ant.version}"/>
+        <echo message="Operating system name: ${os.name}"/>
+        <echo message="Operating system architecture: ${os.arch}"/>
+        <echo message="Operating system version: ${os.version}"/>
+        <echo message="Base directory: ${basedir}"/>
+        <echo message="Java Home: ${java.home}"/>
+    </target>
+
+    <target name="-jvm14BuildWarning" if="groovy.build.vm4">
+        <fail>Aborting!
+
+================================================
+  ERROR: You must build Groovy with a 1.5+ JDK
+================================================
+        </fail>
+    </target>
+
+    <target name="-checkAntVersion" depends="-excludeLegacyAntVersion"
+            description="Check that we are running on the required version of Ant."/>
+
+    <target name="-excludeLegacyAntVersion">
+        <!-- antversion didn't exist in early versions of ant so we have
+             a legacy check to provide a nicer error message in this case -->
+        <fail message="You are using ant ${ant.version}, please build using ant ${ant.requiredVersion}+">
+            <condition>
+                <or>
+                    <contains string="${ant.version}" substring="1.1"></contains>
+                    <contains string="${ant.version}" substring="1.2"></contains>
+                    <contains string="${ant.version}" substring="1.3"></contains>
+                    <contains string="${ant.version}" substring="1.4"></contains>
+                    <contains string="${ant.version}" substring="1.5"></contains>
+                    <and>
+                        <contains string="${ant.version}" substring="1.6"></contains>
+                        <not>
+                            <contains string="${ant.version}" substring="${ant.requiredVersion}"></contains>
+                        </not>
+                    </and>
+                </or>
+            </condition>
+        </fail>
+    </target>
+
+    <!-- add back in if we make 1.7+ minimal required version for build again
+        <target name="-ensureRequiredAntVersion">
+           <fail message="You are using ant ${ant.version}, please install using ant ${ant.requiredVersion}+"/>
+               <condition><not><antversion atleast="${ant.requiredVersion}"/></not></condition>
+           </fail>
+        </target>
+    -->
+
+    <target name="compileMain" depends="stagedcompile"
+            description="Compile the Java and Groovy code in the main source.">
+    </target>
+
+    <target name="stagedcompile" depends="-init,ensureGrammars,-jvm14BuildWarning" unless="uber">
+        <mkdir dir="${mainClassesDirectory}"/>
+        <mkdir dir="${toolsClassesDirectory}"/>
+        <mkdir dir="${mainClassesDirectory}/META-INF"/>
+
+        <javac srcdir="${mainSourceDirectory}" includeantruntime="false" destdir="${mainClassesDirectory}"
+               deprecation="on" debug="yes" source="1.5" target="1.5" fork="true" classpathref="compilePath">
+            <exclude name="groovy/ui/**/*.java"/>
+        </javac>
+        <java classname="org.codehaus.groovy.tools.DgmConverter"
+              fork="yes"
+              failonerror="true">
+            <classpath refid="compilePath"/>
+            <classpath path="${mainClassesDirectory}"/>
+        </java>
+        <antcall inheritrefs="true" target="-stagedcompile-groovy"/>
+        <antcall target="-includeResources"/>
+    </target>
+
+    <target name="-stagedcompile-groovy" depends="-initGroovyc">
+        <groovyc srcdir="${mainSourceDirectory}" destdir="${mainClassesDirectory}" fork="true"
+                 memorymaximumsize="${groovycMain_mx}">
+            <classpath>
+                <pathelement path="${mainClassesDirectory}"/>
+                <path refid="compilePath"/>
+            </classpath>
+            <javac deprecation="on" debug="yes" source="1.5" target="1.5"/>
+        </groovyc>
+    </target>
+
+    <property name="vm5GroovySourceFiles" value="**/*.groovy"/>
+    <property name="vm5JavaSourceFiles" value="**/*.java"/>
+    <property name="vm6GroovySourceFiles" value="groovy/**/vm6/*Test.groovy,org/codehaus/groovy/**/vm6/*Test.groovy"/>
+
+    <target name="-initGroovyc">
+        <path id="groovyMainClasses">
+            <pathelement path="${mainClassesDirectory}"/>
+            <path refid="compilePath"/>
+        </path>
+        <taskdef name="groovyc" classname="org.codehaus.groovy.ant.Groovyc" classpathref="groovyMainClasses"/>
+    </target>
+
+    <target name="compileTest" depends="compileMain,compileTestOnly"
+            description="Compile the Java and Groovy code in the test source."/>
+
+    <target name="-cleanTest">
+        <delete dir="${testClassesDirectory}"/>
+    </target>
+
+    <target name="compileTestOnly" unless="_skipTests_">
+        <mkdir dir="${testClassesDirectory}"/>
+        <antcall inheritrefs="true" target="-compileTest"/>
+    </target>
+
+    <target name="-compileTest" depends="-initGroovyc,-compileTest_vm6">
+        <groovyc srcdir="${testSourceDirectory}"
+                 destdir="${testClassesDirectory}"
+                 includes="${vm5GroovySourceFiles},${vm5JavaSourceFiles}"
+                 excludes="${vm6GroovySourceFiles}"
+                 fork="true"
+                 memorymaximumsize="${groovycTest_mx}">
+            <classpath>
+                <pathelement path="${testClassesDirectory}"/>
+                <path refid="groovyMainClasses"/>
+                <path refid="testLibPath"/>
+            </classpath>
+            <javac source="1.5" target="1.5" nowarn="on"/>
+        </groovyc>
+    </target>
+
+    <target name="-compileTest_vm6" if="groovy.build.vm6">
+        <groovyc srcdir="${testSourceDirectory}"
+                 destdir="${testClassesDirectory}"
+                 includes="${vm6GroovySourceFiles}"
+                 fork="true"
+                 memorymaximumsize="${groovycTest_mx}">
+            <classpath>
+                <pathelement path="${testClassesDirectory}"/>
+                <path refid="groovyMainClasses"/>
+                <path refid="testLibPath"/>
+            </classpath>
+            <!-- currently not needed, add in if/when required -->
+            <!--<javac source="1.5" target="1.5" nowarn="on"/>-->
+        </groovyc>
+    </target>
+
+    <target name="compileExamples" depends="-init,-initGroovyc,compileMain,-includeExamplesResources"
+            unless="_skipExamples_"
+            description="Compile the Java and Groovy code in the examples source directory.">
+        <mkdir dir="${examplesClassesDirectory}"/>
+        <echo message="Compiling example code."/>
+
+        <groovyc srcdir="${examplesSourceDirectory}/webapps/groovlet-examples/WEB-INF/groovy"
+                 destdir="${examplesClassesDirectory}"
+                 fork="true"
+                 memorymaximumsize="${groovycExamples_mx}">
+            <classpath>
+                <pathelement path="${mainClassesDirectory}"/>
+                <path refid="compilePath"/>
+                <path refid="examplesPath"/>
+            </classpath>
+        </groovyc>
+        <javac srcdir="${examplesSourceDirectory}"
+               destdir="${examplesClassesDirectory}"
+               source="1.5"
+               target="1.5"
+               fork="true">
+            <classpath>
+                <pathelement path="${mainClassesDirectory}"/>
+                <pathelement path="${examplesClassesDirectory}"/>
+                <path refid="compilePath"/>
+                <path refid="examplesPath"/>
+            </classpath>
+        </javac>
+        <groovyc srcdir="${examplesSourceDirectory}"
+                 destdir="${examplesClassesDirectory}"
+                 fork="true"
+                 memorymaximumsize="${groovycExamples_mx}"
+                 excludes="webapps/groovlet-examples/WEB-INF/groovy/**/*.groovy,org/codehaus/groovy/grails/compiler/injection/**/*.java">
+            <classpath>
+                <pathelement path="${mainClassesDirectory}"/>
+                <pathelement path="${examplesClassesDirectory}"/>
+                <path refid="compilePath"/>
+                <path refid="examplesPath"/>
+            </classpath>
+            <javac source="1.5" target="1.5"/>
+        </groovyc>
+
+    </target>
+
+    <target name="-initializeReports">
+        <mkdir dir="${reportsDirectory}"/>
+    </target>
+
+    <condition property="_shouldBeHeadless_">
+        <or>
+            <istrue value="${java.awt.headless}"/>
+            <!--<os name="Mac OS X"/>-->
+        </or>
+    </condition>
+
+    <target name="-testInit" depends="-initHeadless">
+        <property name="headlessArg" value=""/>
+        <property name="junitJvmArgs"
+                  value="-Xms${groovyJUnit_ms} -XX:PermSize=${groovyJUnit_permSize} -XX:MaxPermSize=${groovyJUnit_maxPermSize} ${headlessArg} -Dgroovy.testdb.props=${groovy.testdb.props} -DjavadocAssertion.src.dir=./src/main"/>
+    </target>
+
+    <target name="-initHeadless" if="_shouldBeHeadless_">
+        <property name="headlessArg" value="-Djava.awt.headless=true"/>
+        <echo message="Setting headless mode ..."/>
+    </target>
+
+    <target name="test"
+            depends="-banner,-checkAntVersion,-initializeReports,compileTest,-coverageInstrument,-testInit,-testOne,-testAll,-reportTestFailed"
+            description="Compile and test all the classes (or just one class if testCase property is defined)."/>
+
+    <target name="clean-test" depends="clean,test"
+            description="Clean and compile and test all the classes (or just one class if testCase property is defined)."/>
+
+    <condition property="_testOne_">
+        <and>
+            <not>
+                <istrue value="${_skipTests_}"/>
+            </not>
+            <isset property="testCase"/>
+        </and>
+    </condition>
+
+    <target name="-testOne" if="_testOne_" depends="-initGroovyc">
+        <mkdir dir="${junitRawDirectory}"/>
+        <junit printsummary="true" fork="true" includeantruntime="false" failureproperty="testFailed"
+               maxmemory="${groovyJUnit_mx}" dir="${basedir}">
+            <sysproperty key="apple.awt.UIElement" value="true"/>
+            <!-- keeps the dock from showing the AWT startup -->
+            <jvmarg line="${junitJvmArgs}"/>
+            <test name="${testCase}" todir="${junitRawDirectory}"/>
+            <formatter type="brief" usefile="false"/>
+            <classpath>
+                <pathelement path="${instrumentedClassesDirectory}"/>
+                <pathelement path="src/test"/>
+                <path refid="groovyMainClasses"/>
+                <path refid="testLibPath"/>
+                <pathelement path="${testClassesDirectory}"/>
+                <path refid="coberturaPath"/>
+            </classpath>
+            <assertions>
+                <enable/>
+            </assertions>
+        </junit>
+    </target>
+
+    <condition property="_testAll_">
+        <and>
+            <not>
+                <istrue value="${_skipTests_}"/>
+            </not>
+            <not>
+                <isset property="_testOne_"/>
+            </not>
+        </and>
+    </condition>
+
+    <target name="-collectOptionalTests">
+        <condition property="networkTests.fileset.includes" value="groovy/grape/*Test.class" else="-nothing-">
+            <istrue value="${junit.network}"/>
+        </condition>
+        <fileset id="optionalTests.fileset" dir="${testClassesDirectory}" includes="${networkTests.fileset.includes}"/>
+    </target>
+
+    <target name="-collect15tests" unless="groovy.build.vm6">
+        <fileset id="ubertests.fileset" dir="${testClassesDirectory}" includes="UberTest*.class" excludes="Uber*VM6.class"/>
+    </target>
+
+    <target name="-collect16tests" if="groovy.build.vm6">
+        <fileset id="ubertests.fileset" dir="${testClassesDirectory}" includes="UberTest*.class"/>
+    </target>
+
+    <target name="-testAll" if="_testAll_" depends="-collect15tests,-collect16tests,-collectOptionalTests,-initGroovyc">
+        <mkdir dir="${junitRawDirectory}"/>
+        <junit printsummary="true" fork="true" includeantruntime="false" failureproperty="testFailed"
+               maxmemory="${groovyJUnit_mx}" dir="${basedir}">
+            <jvmarg line="${junitJvmArgs}"/>
+            <sysproperty key="apple.awt.UIElement" value="true"/>
+            <!-- keeps the dock from showing the AWT startup -->
+            <formatter type="xml"/>
+            <formatter type="plain" unless="noTextReports"/>
+            <batchtest todir="${junitRawDirectory}">
+                <fileset refid="ubertests.fileset"/>
+                <fileset refid="optionalTests.fileset"/>
+            </batchtest>
+            <classpath>
+                <pathelement path="${instrumentedClassesDirectory}"/>
+                <pathelement path="src/test"/>
+                <path refid="groovyMainClasses"/>
+                <path refid="testLibPath"/>
+                <pathelement path="${testClassesDirectory}"/>
+                <path refid="coberturaPath"/>
+            </classpath>
+            <assertions>
+                <enable/>
+            </assertions>
+        </junit>
+        <mkdir dir="${junitReportsDirectory}"/>
+        <junitreport tofile="${junitRawDirectory}/Results.xml">
+            <fileset dir="${junitRawDirectory}" includes="TEST-*.xml"/>
+            <report format="frames" todir="${junitReportsDirectory}"/>
+        </junitreport>
+    </target>
+
+    <target name="-reportTestFailed" depends="-coverageReport" if="testFailed">
+        <fail message="Test failed, not processing further targets."/>
+    </target>
+
+    <target name="-coverageInstrument" depends="-initCoverage,-coberturaInit" if="_forceCoverage_">
+        <mkdir dir="${instrumentedClassesDirectory}"/>
+        <coberturaInstrument classesDirectory="${mainClassesDirectory}"/>
+    </target>
+
+    <target name="-coverageReport" depends="-initCoverage" if="_forceCoverage_">
+        <coberturaReport reportDirectory="${reportsDirectory}/cobertura" sourceDirectory="${mainSourceDirectory}"/>
+    </target>
+
+    <target name="-actuallyCreateJars"
+            depends="-makeManifest,-initializeJars,-createBaseJar,-createEmbeddableJar"
+            unless="testFailed"/>
+
+    <target name="-makeManifest">
+        <mkdir dir="${mainClassesDirectory}/META-INF"/>
+        <copy todir="${mainClassesDirectory}/META-INF" file="LICENSE.txt"/>
+        <makeManifest file="${mainClassesDirectory}/META-INF/MANIFEST.MF"/>
+    </target>
+
+    <macrodef name="makeManifest">
+        <attribute name="file"/>
+        <attribute name="bundleEnvironment" default="J2SE-1.5"/>
+        <sequential>
+            <manifest file="@{file}">
+                <attribute name="Built-By" value="${user.name}"/>
+                <attribute name="Extension-Name" value="groovy"/>
+                <attribute name="Specification-Title" value="Groovy: a powerful, dynamic language for the JVM"/>
+                <attribute name="Specification-Version" value="${groovyVersion}"/>
+                <attribute name="Specification-Vendor" value="The Codehaus"/>
+                <attribute name="Implementation-Title" value="Groovy: a powerful, dynamic language for the JVM"/>
+                <attribute name="Implementation-Version" value="${groovyVersion}"/>
+                <attribute name="Implementation-Vendor" value="The Codehaus"/>
+                <attribute name="Bundle-ManifestVersion" value="2"/>
+                <attribute name="Bundle-Name" value="Groovy Runtime"/>
+                <attribute name="Bundle-Description" value="Groovy Runtime"/>
+                <attribute name="Bundle-Version" value="${groovyBundleVersion}"/>
+                <attribute name="Bundle-Vendor" value="The Codehaus"/>
+                <attribute name="Bundle-ClassPath" value="."/>
+                <attribute name="Bundle-RequiredExecutionEnvironment" value="@{bundleEnvironment}"/>
+                <attribute name="Eclipse-BuddyPolicy" value="dependent"/>
+                <attribute name="Eclipse-LazyStart" value="true"/>
+                <attribute name="DynamicImport-Package" value="*"/>
+            </manifest>
+        </sequential>
+    </macrodef>
+
+    <target name="-includeResources" depends="-includeGroovyDocTemplates">
+        <copy todir="${mainClassesDirectory}">
+            <fileset dir="${mainSourceDirectory}">
+                <include name="META-INF/services/*"/>
+                <include name="groovy/grape/*.xml"/>
+                <include name="groovy/ui/*.properties"/>
+                <include name="groovy/ui/**/*.png"/>
+                <include name="groovy/inspect/swingui/AstBrowserProperties.groovy"/>
+                <include name="org/codehaus/groovy/tools/shell/**/*.properties"/>
+                <include name="org/codehaus/groovy/tools/groovydoc/**/*.properties"/>
+                <include name="org/codehaus/groovy/tools/shell/**/*.xml"/>
+                <include name="org/codehaus/groovy/antlib.xml"/>
+            </fileset>
+        </copy>
+        <antcall target="-includeReleaseInfo"/>
+    </target>
+
+    <target name="-includeReleaseInfo">
+        <copy file="${mainSourceDirectory}/META-INF/groovy-release-info.properties"
+              todir="${mainClassesDirectory}/META-INF" overwrite="true">
+        </copy>
+        <tstamp>
+            <format property="release.date" pattern="dd-MMM-yyyy"/>
+            <format property="release.time" pattern="hh:mm aa"/>
+        </tstamp>
+        <replace file="${mainClassesDirectory}/META-INF/groovy-release-info.properties">
+            <replacefilter token="##ImplementationVersion##" value="${groovyVersion}"/>
+            <replacefilter token="##BundleVersion##" value="${groovyBundleVersion}"/>
+            <replacefilter token="##BuildDate##" value="${release.date}"/>
+            <replacefilter token="##BuildTime##" value="${release.time}"/>
+        </replace>
+    </target>
+
+    <target name="-includeExamplesResources" depends="-includeGroovyDocTemplates">
+        <copy todir="${examplesClassesDirectory}">
+            <fileset dir="${examplesSourceDirectory}">
+                <include name="/swing/binding/caricature/resources/*.gif"/>
+            </fileset>
+        </copy>
+    </target>
+
+    <target name="-includeGroovyDocTemplates">
+        <copy todir="${mainClassesDirectory}">
+            <fileset dir="${mainSourceDirectory}">
+                <include name="org/codehaus/groovy/tools/groovydoc/gstringTemplates/*/*.*"/>
+            </fileset>
+            <fileset dir="${toolsSourceDirectory}">
+                <include name="org/codehaus/groovy/tools/groovy.ico"/>
+            </fileset>
+        </copy>
+    </target>
+
+    <target name="-initializeJars" depends="test" unless="_skipDocs_">
+        <delete dir="${targetDistDirectory}" quiet="true"/>
+        <mkdir dir="${targetDistDirectory}"/>
+    </target>
+
+    <target name="-createBaseJar" unless="testFailed">
+        <jar destfile="${targetDistDirectory}/groovy.jar" basedir="${mainClassesDirectory}"
+             excludes="*.groovy" manifest="${mainClassesDirectory}/META-INF/MANIFEST.MF"/>
+        <jar destfile="${targetDistDirectory}/groovy-${groovyVersion}-sources.jar" basedir="${mainSourceDirectory}"/>
+    </target>
+
+    <target name="-jarjarInit" unless="_skipEmbeddable_">
+        <taskdef name="jarjar" classname="com.tonicsystems.jarjar.JarJarTask" classpathref="toolsPath"/>
+    </target>
+
+    <target name="-createEmbeddableJar" depends="-jarjarInit,-actuallyCreateEmbeddableJar" unless="testFailed"/>
+
+    <target name="-actuallyCreateEmbeddableJar" unless="_skipEmbeddable_">
+        <delete dir="${stagingDirectory}" quiet="true"/>
+        <mkdir dir="${stagingDirectory}"/>
+        <unzip dest="${stagingDirectory}">
+            <fileset dir="${runtimeLibDirectory}">
+                <include name="antlr*.jar"/>
+                <include name="asm*.jar"/>
+                <exclude name="asm-attr*.jar"/>
+                <exclude name="asm-util*.jar"/>
+                <exclude name="asm-analysis*.jar"/>
+            </fileset>
+        </unzip>
+        <unzip dest="${stagingDirectory}">
+            <fileset dir="${targetDistDirectory}">
+                <include name="groovy.jar"/>
+            </fileset>
+        </unzip>
+        <copy toDir="${stagingDirectory}/META-INF">
+            <fileset dir="${basedir}/config/build">
+                <include name="*LICENSE.txt"/>
+            </fileset>
+        </copy>
+        <!-- add commons-cli -->
+        <unzip dest="${stagingDirectory}">
+            <patternset>
+                <!-- no need for the manifest file, we have our own -->
+                <exclude name="META-INF/MANIFEST.MF"/>
+            </patternset>
+            <globmapper from="META-INF/LICENSE.txt" to="META-INF/CLI-LICENSE.txt"/>
+            <fileset dir="${runtimeLibDirectory}">
+                <include name="commons-cli-*.jar"/>
+            </fileset>
+        </unzip>
+        <makeManifest file="${stagingDirectory}/META-INF/MANIFEST.MF"/>
+        <!-- TODO try to make use of jarjar keep ability -->
+        <jarjar jarfile="${targetDistDirectory}/groovy-all.jar"
+                manifest="${stagingDirectory}/META-INF/MANIFEST.MF">
+            <fileset dir="${stagingDirectory}"
+                     excludes="groovy/util/CliBuilder*.class,groovy/util/OptionAccessor*.class,org/codehaus/groovy/tools/shell/util/HelpFormatter*.class"/>
+            <rule pattern="antlr.**" result="groovyjarjarantlr.@1"/>
+            <rule pattern="org.objectweb.**" result="groovyjarjarasm.@1"/>
+            <rule pattern="org.apache.commons.cli.**" result="groovyjarjarcommonscli.@1"/>
+        </jarjar>
+        <jar destfile="${targetDistDirectory}/groovy-all.jar" update="true"
+             basedir="${stagingDirectory}"
+             includes="groovy/util/CliBuilder*.class,groovy/util/OptionAccessor*.class,org/codehaus/groovy/tools/shell/util/HelpFormatter*.class"/>
+
+        <copy file="${targetDistDirectory}/groovy-${groovyVersion}-sources.jar"
+              tofile="${targetDistDirectory}/groovy-all-${groovyVersion}-sources.jar"/>
+        <delete dir="${stagingDirectory}" quiet="true"/>
+    </target>
+
+    <target name="createJars" depends="-checkAntVersion,test,-actuallyCreateJars"
+            description="Build Groovy and create the jarfiles."/>
+
+    <target name="updateJarsForOsgi" unless="_skipOsgi_">
+        <taskdef resource="aQute/bnd/ant/taskdef.properties" classpathref="toolsPath"/>
+        <copy todir="${targetDistDirectory}">
+            <fileset dir="config/bnd" includes="groovy*.bnd"/>
+            <filterset>
+                <filter token="GROOVY_BUNDLE_VERSION" value="${groovyBundleVersion}"/>
+            </filterset>
+        </copy>
+        <property name="jarsToWrap" value="groovy.jar,groovy-all.jar"/>
+        <property name="runtimeJars" refid="runtimePath"/>
+        <bndwrap definitions="${targetDistDirectory}" output="${targetDistDirectory}" failok="true"
+                 classpath="${runtimeJars}">
+            <fileset dir="${targetDistDirectory}" includes="${jarsToWrap}"/>
+        </bndwrap>
+        <delete dir="${targetDistDirectory}" includes="${jarsToWrap}"/>
+        <move todir="${targetDistDirectory}">
+            <fileset dir="${targetDistDirectory}" includes="groovy*.bar"/>
+            <globmapper from="groovy*.bar" to="groovy*-${groovyVersion}.jar"/>
+        </move>
+        <delete dir="${targetDistDirectory}" includes="groovy*.bnd"/>
+    </target>
+
+    <target name="skipOsgi" if="_skipOsgi_">
+        <move todir="${targetDistDirectory}">
+            <fileset dir="${targetDistDirectory}" includes="groovy*.jar"/>
+            <globmapper from="groovy*.jar" to="groovy*-${groovyVersion}.jar"/>
+        </move>
+    </target>
+
+    <target name="install" depends="createJars,updateJarsForOsgi,skipOsgi" unless="testFailed"
+            description="Create an installation hierarchy in target/install.">
+
+        <!--
+        FIXME: It's not really a good idea to delete stuff, as it tends to negate Ant's (or other tools)
+               ability to run faster incremental builds.
+        -->
+        <delete dir="${installDirectory}" quiet="true"/>
+        <mkdir dir="${installDirectory}"/>
+
+        <!-- Install license files -->
+        <copy todir="${installDirectory}">
+            <fileset dir="${basedir}">
+                <include name="LICENSE.txt"/>
+                <include name="NOTICE.txt"/>
+            </fileset>
+        </copy>
+        <unzip dest="${installDirectory}">
+            <patternset>
+                <include name="META-INF/*-LICENSE.txt"/>
+            </patternset>
+            <mapper type="flatten"/>
+            <fileset file="${targetDistDirectory}/groovy-all-${groovyVersion}.jar"/>
+        </unzip>
+        <fixcrlf srcdir="${installDirectory}" eol="crlf" includes="*.txt"/>
+
+        <!-- Install generated artifacts and runtime dependencies -->
+        <mkdir dir="${installDirectory}/lib"/>
+        <copy todir="${installDirectory}/lib">
+            <fileset dir="${targetDistDirectory}" includes="groovy-${groovyVersion}.jar"/>
+            <fileset dir="${runtimeLibDirectory}" includes="*.jar"/>
+        </copy>
+
+        <!-- Install the embeddable bits -->
+        <mkdir dir="${installDirectory}/embeddable"/>
+        <copy todir="${installDirectory}/embeddable">
+            <fileset dir="${targetDistDirectory}" includes="groovy-all-${groovyVersion}.jar"/>
+        </copy>
+
+        <!-- Install configuration files -->
+        <mkdir dir="${installDirectory}/conf"/>
+        <copy toDir="${installDirectory}/conf">
+            <fileset dir="${sourceDirectory}/conf" includes="*"/>
+        </copy>
+
+        <!-- Install scripts -->
+        <mkdir dir="${installDirectory}/bin"/>
+        <copy toDir="${installDirectory}/bin">
+            <fileset dir="${sourceDirectory}/bin" includes="*"/>
+            <filterset>
+                <filter token="GROOVYJAR" value="groovy-${groovyVersion}.jar"/>
+            </filterset>
+        </copy>
+        <!-- icon -->
+        <copy todir="${installDirectory}/bin" flatten="true">
+            <fileset dir="${toolsSourceDirectory}">
+                <include name="org/codehaus/groovy/tools/groovy.ico"/>
+            </fileset>
+        </copy>
+
+        <!-- Tweak scripts for platform compatibility -->
+        <fixcrlf srcdir="${installDirectory}/bin" eol="lf" excludes="*.bat, *.icns"/>
+        <fixcrlf srcdir="${installDirectory}/bin" eol="crlf" includes="*.bat"/>
+        <chmod perm="ugo+x">
+            <fileset dir="${installDirectory}/bin" includes="*,*.*"/>
+        </chmod>
+    </target>
+
+    <target name="checkstyle" depends="-init,-initializeReports,-checkstyleInit"
+            description="Create the code style reports.">
+        <checkAndReport
+                reportDirectory="${reportsDirectory}/checkstyle"
+                sourceDirectory="${mainSourceDirectory}"
+                excludes="org/codehaus/groovy/antlr/parser/*,org/codehaus/groovy/antlr/java/*,org/codehaus/groovy/syntax/Types.java">
+            <path>
+                <pathelement path="${mainClassesDirectory}"/>
+                <path refid="testLibPath"/>
+            </path>
+        </checkAndReport>
+    </target>
+
+    <target name="-compileTools" depends="-initGroovyc,compileMain">
+        <groovyc srcdir="${toolsSourceDirectory}" destdir="${toolsClassesDirectory}" fork="true">
+            <classpath>
+                <path refid="toolsPath"/>
+                <pathelement path="${mainClassesDirectory}"/>
+                <path refid="compilePath"/>
+            </classpath>
+        </groovyc>
+        <copy todir="${toolsClassesDirectory}">
+            <fileset dir="${toolsSourceDirectory}">
+                <include name="**/*.html"/>
+            </fileset>
+        </copy>
+    </target>
+
+    <target name="cruiseReportExtras">
+        <mkdir dir="${cruiseReportRootDirectory}"/>
+        <copy todir="${cruiseReportRootDirectory}">
+            <fileset dir="cruise/html"/>
+        </copy>
+    </target>
+
+    <target name="cruiseInit">
+        <property name="noTextReports" value="true"/>
+        <property name="forceCoverage" value="true"/>
+        <delete dir="${reportsDirectory}" quiet="true" failonerror="false"/>
+        <delete dir="${junitRawDirectory}" quiet="true" failonerror="false"/>
+    </target>
+
+    <target name="cruise" depends="cruiseInit,fulldist,cruiseReportExtras"/>
+
+    <target name="-docInit">
+        <mkdir dir="${docsDirectory}"/>
+        <property name="docFooter" value="Copyright &amp;copy; 2003-2010 The Codehaus. All rights reserved."/>
+        <property name="title" value="Groovy ${groovyVersion}"/>
+    </target>
+
+    <target name="doc" depends="javadoc, groovydoc" description="Create the documentation."/>
+
+    <target name="javadoc" depends="-fetchDependencies,-docInit,-jvm14BuildWarning,ensureGrammars"
+            unless="_skipDocs_" description="Create the javadoc documentation.">
+        <javadoc destdir="${docsDirectory}/api" author="true" version="true"
+                 windowtitle="${title}" doctitle="${title}"
+                 encoding="ISO-8859-1" useexternalfile="true" source="1.5"
+                 footer="${docFooter}"
+                 overview="src/main/overviewj.html"
+                 maxmemory="${javaDoc_mx}"
+                >
+            <classpath>
+                <path path="${mainClassesDirectory}"/>
+                <path refid="compilePath"/>
+            </classpath>
+            <fileset dir="${mainSourceDirectory}" includes="**/*.java"/>
+            <link href="http://java.sun.com/javase/6/docs/api"/>
+            <link href="http://www.dpml.net/api/ant/1.7.0"/>
+            <link href="http://junit.sourceforge.net/junit3.8.1/javadoc"/>
+            <link href="http://java.sun.com/j2ee/1.4/docs/api"/>
+            <link href="http://www.antlr2.org/javadoc"/>
+            <link href="http://commons.apache.org/cli/api-release"/>
+        </javadoc>
+        <mkdir dir="${targetDistDirectory}"/>
+        <jar basedir="${docsDirectory}/api" destfile="${targetDistDirectory}/groovy-${groovyVersion}-javadoc.jar"/>
+        <copy toFile="${targetDistDirectory}/groovy-all-${groovyVersion}-javadoc.jar">
+            <fileset file="${targetDistDirectory}/groovy-${groovyVersion}-javadoc.jar"/>
+        </copy>
+    </target>
+
+    <target name="groovydoc" depends="-fetchDependencies" unless="_skipDocs_">
+        <path id="groovydocpath">
+            <path path="${mainClassesDirectory}"/>
+            <path refid="runtimePath"/>
+        </path>
+        <antforked target="realgroovydoc" maxmemory="${groovyDoc_mx}" classpathref="groovydocpath"/>
+    </target>
+
+    <target name="realgroovydoc" depends="-fetchDependencies,-docInit,-includeGroovyDocTemplates,docGDK">
+        <taskdef name="groovydoc" classname="org.codehaus.groovy.ant.Groovydoc">
+            <classpath>
+                <path path="${mainClassesDirectory}"/>
+                <path refid="compilePath"/>
+            </classpath>
+        </taskdef>
+        <groovydoc
+                destdir="${docsDirectory}/gapi"
+                sourcepath="${mainSourceDirectory}"
+                packagenames="**.*"
+                use="true"
+                windowtitle="${title}"
+                doctitle="${title}"
+                header="${title}"
+                footer="${docFooter}"
+                overview="src/main/overview.html">
+            <link packages="javax.servlet.,javax.management." href="http://java.sun.com/j2ee/1.4/docs/api"/>
+            <link packages="java.,org.xml.,javax.,org.xml." href="http://java.sun.com/javase/6/docs/api"/>
+            <link packages="org.apache.ant.,org.apache.tools.ant." href="http://www.dpml.net/api/ant/1.7.0"/>
+            <link packages="org.junit.,junit." href="http://junit.sourceforge.net/junit3.8.1/javadoc"/>
+            <link packages="org.apache.commons.cli." href="http://commons.apache.org/cli/api-release"/>
+            <link packages="antlr." href="http://www.antlr2.org/javadoc"/>
+        </groovydoc>
+    </target>
+
+    <target name="docGDK" depends="-fetchDependencies,-compileTools" description="Create the GDK documentation">
+        <java classname="org.codehaus.groovy.tools.DocGenerator" fork="yes" failonerror="true">
+            <classpath>
+                <pathelement path="${toolsClassesDirectory}"/>
+                <path refid="toolsPath"/>
+                <pathelement path="${mainClassesDirectory}"/>
+            </classpath>
+            <arg value="org.codehaus.groovy.runtime.DefaultGroovyMethods"/>
+            <arg value="org.codehaus.groovy.runtime.SqlGroovyMethods"/>
+            <arg value="org.codehaus.groovy.runtime.SwingGroovyMethods"/>
+            <arg value="org.codehaus.groovy.runtime.XmlGroovyMethods"/>
+            <arg value="org.codehaus.groovy.runtime.EncodingGroovyMethods"/>
+            <arg value="org.codehaus.groovy.runtime.DateGroovyMethods"/>
+            <arg value="org.codehaus.groovy.runtime.DefaultGroovyStaticMethods"/>
+            <arg value="org.codehaus.groovy.vmplugin.v5.PluginDefaultGroovyMethods"/>
+            <arg value="org.codehaus.groovy.vmplugin.v6.PluginDefaultGroovyMethods"/>
+        </java>
+        <copy todir="target/html/groovy-jdk" file="src/tools/org/codehaus/groovy/tools/groovy.ico"/>
+        <copy todir="target/html/groovy-jdk" file="src/tools/org/codehaus/groovy/tools/stylesheet.css"/>
+    </target>
+
+    <target name="clean" description="Clean up build artifacts.">
+        <delete dir="${targetDirectory}" quiet="true"/>
+        <delete file="cobertura.ser" quiet="true" failonerror="false"/>
+        <delete quiet="true">
+            <fileset dir="." includes="**/*~"/>
+            <fileset dir="${groovyParserDirectory}" includes="Groovy*.*"/>
+            <fileset dir="${javaParserDirectory}"
+                     includes="JavaLexer.java,JavaRecognizer.java,JavaTokenTypes.java,JavaTokenTypes.txt,*.smap"/>
+        </delete>
+    </target>
+
+    <target name="deploy" depends="-mavenDeployInit,install,doc,-deployDefault,-deployFromServer"
+            description="Deploy jars to maven repository."/>
+
+    <target name="-deployDefault" unless="_forceServerSettings_">
+        <mavenDeploy version="${groovyVersion}" prefix="groovy"/>
+        <mavenDeploy version="${groovyVersion}" prefix="groovy-all"/>
+    </target>
+
+    <target name="-deployFromServer" if="_forceServerSettings_">
+        <copy tofile="target/settings.xml">
+            <fileset file="config/maven/settings.xml"/>
+            <filterset>
+                <filter token="groovy.deploy.username" value="${groovy.deploy.username}"/>
+                <filter token="groovy.deploy.password" value="${groovy.deploy.password}"/>
+            </filterset>
+        </copy>
+        <mavenDeploySettings version="${groovyVersion}" prefix="groovy" settings="target/settings.xml"/>
+        <mavenDeploySettings version="${groovyVersion}" prefix="groovy-all" settings="target/settings.xml"/>
+        <delete file="target/settings.xml"/>
+    </target>
+
+    <target name="installRepo" depends="-mavenInit,install,doc"
+            description="Deploy artifacts to local maven repository.">
+        <mavenInstallRepo version="${groovyVersion}" prefix="groovy"/>
+        <mavenInstallRepo version="${groovyVersion}" prefix="groovy-all"/>
+    </target>
+
+    <target name="quality" depends="install,checkstyle" description="install plus checkstyle"/>
+
+    <target name="release" depends="deploy,compileExamples" description="deploy plus compileExamples"/>
+
+    <target name="fulldist" depends="dist,compileExamples,checkstyle" description="dist plus examples plus checkstyle"/>
+
+    <target name="dist" depends="install,doc" description="Create everything needed for a distribution.">
+        <zip destfile="${targetDistDirectory}/groovy-binary-${groovyVersion}.zip"
+             comment="The Groovy ${groovyVersion} binary distribution.">
+
+            <!-- Make unix scripts executable -->
+            <zipfileset dir="${installDirectory}" prefix="groovy-${groovyVersion}" filemode="775">
+                <include name="bin/*"/>
+                <exclude name="bin/*.*"/>
+                <exclude name="bin/startGroovy*"/>
+            </zipfileset>
+
+            <!-- Include the other scripts as is -->
+            <zipfileset dir="${installDirectory}" prefix="groovy-${groovyVersion}">
+                <include name="bin/*.*"/>
+                <include name="bin/startGroovy*"/>
+            </zipfileset>
+
+            <!-- Include everything else as is too -->
+            <zipfileset dir="${installDirectory}" prefix="groovy-${groovyVersion}">
+                <exclude name="bin/**"/>
+                <include name="**"/>
+            </zipfileset>
+        </zip>
+
+        <zip destfile="${targetDistDirectory}/groovy-docs-${groovyVersion}.zip"
+             comment="The Groovy ${groovyVersion} documentation distribution.">
+            <zipfileset dir="${wikiPdfDirectory}" includes="wiki-snapshot.pdf" prefix="groovy-${groovyVersion}/pdf"/>
+            <zipfileset dir="${docsDirectory}" prefix="groovy-${groovyVersion}/html"/>
+        </zip>
+
+        <zip destfile="${targetDistDirectory}/groovy-src-${groovyVersion}.zip"
+             comment="The Groovy ${groovyVersion} source distribution.">
+            <zipfileset dir="${basedir}" prefix="groovy-${groovyVersion}">
+                <!-- Exclude generated bits as well as any other bits that shouldn't make it in -->
+                <exclude name="${targetDirectory}/**"/>
+                <exclude name="classes/**"/>
+                <exclude name="cruise/**"/>
+                <exclude name=".clover/*"/>
+                <exclude name="local.build.properties"/>
+                <exclude name="cobertura.ser"/>
+                <exclude name="junitvmwatcher*.properties"/>
+            </zipfileset>
+        </zip>
+    </target>
+
+</project>
 
=== added directory '.pc/0002-ant-build.diff.patch/config'
=== added directory '.pc/0002-ant-build.diff.patch/config/ant'
=== added file '.pc/0002-ant-build.diff.patch/config/ant/build-setup.xml'
--- .pc/0002-ant-build.diff.patch/config/ant/build-setup.xml	1970-01-01 00:00:00 +0000
+++ .pc/0002-ant-build.diff.patch/config/ant/build-setup.xml	2011-02-24 17:57:34 +0000
@@ -0,0 +1,78 @@
+<?xml version="1.0"?>
+
+<!--
+Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
+compliance with the License. You may obtain a copy of the License at
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software distributed under the License is
+distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+implied. See the License for the specific language governing permissions and limitations under the License.
+
+This work is copyright by the author(s) and is part of a greater work collectively copyright by the
+Groovy community. See the NOTICE.txt file distributed with this work for additional information.
+
+Author : Paul King
+$Revision: 5519 $ ($LastChangedBy: paulk $)
+$Date: 2007-03-11 19:14:07 +1000 (Sun, 11 Mar 2007) $
+-->
+
+<project name="build-setup" default="" basedir="../..">
+
+    <property name="bootstrapDirectory" location="bootstrap"/>
+    <property name="sourceDirectory" value="src"/>
+    <property name="wikiPdfDirectory" value="src"/>
+    <property name="mainSourceDirectory" location="${sourceDirectory}/main"/>
+    <property name="testSourceDirectory" value="${sourceDirectory}/test"/>
+    <property name="toolsSourceDirectory" location="${sourceDirectory}/tools"/>
+    <property name="examplesSourceDirectory" location="${sourceDirectory}/examples"/>
+    
+    <property name="targetDirectory" value="target"/>
+    <property name="installDirectory" value="${targetDirectory}/install"/>
+    <property name="cruiseReportRootDirectory" value="${targetDirectory}/root"/>
+    <property name="stagingDirectory" value="${targetDirectory}/staging"/>
+    <property name="docsDirectory" value="${targetDirectory}/html"/>
+    <property name="mainClassesDirectory" value="${targetDirectory}/classes"/>
+    <property name="testClassesDirectory" value="${targetDirectory}/test-classes"/>
+    <property name="toolsClassesDirectory" value="${targetDirectory}/tools-classes"/>
+    <property name="mainStubsDirectory" value="${targetDirectory}/stubs"/>
+    <property name="testStubsDirectory" value="${targetDirectory}/test-stubs"/>
+
+    <property name="examplesClassesDirectory" value="${targetDirectory}/examples-classes"/>
+    <property name="instrumentedClassesDirectory" value="${targetDirectory}/instrumented-classes"/>
+    <property name="reportsDirectory" value="${targetDirectory}/reports"/>
+    <property name="targetLibDirectory" value="${targetDirectory}/lib"/>
+    <property name="targetDistDirectory" value="${targetDirectory}/dist"/>
+    
+    <property name="antlrDirectory" value="${mainSourceDirectory}/org/codehaus/groovy/antlr"/>
+    <property name="groovyParserDirectory" value="${antlrDirectory}/parser"/>
+    <property name="javaParserDirectory" value="${antlrDirectory}/java"/>
+
+    <property name="compileLibDirectory" value="${targetLibDirectory}/compile"/>
+    <property name="testLibDirectory" value="${targetLibDirectory}/test"/>
+    <property name="runtimeLibDirectory" value="${targetLibDirectory}/runtime"/>
+    <property name="toolsLibDirectory" value="${targetLibDirectory}/tools"/>
+    <property name="examplesLibDirectory" value="${targetLibDirectory}/examples"/>
+    <property name="extrasLibDirectory" value="${targetLibDirectory}/extras"/>
+    <property name="junitRawDirectory" value="${targetDirectory}/test-reports"/>
+    <property name="junitReportsDirectory" value="${reportsDirectory}/junit"/>
+    <property name="relativePathToRealBasedir" value="."/>
+
+    <macrodef name="antforked">
+        <attribute name="target"/>
+        <attribute name="maxmemory" default="256m"/>
+        <attribute name="classpathref" default="runtimePath"/>
+        <sequential>
+            <java classname="org.apache.tools.ant.launch.Launcher" fork="true" maxmemory="@{maxmemory}" failonerror="true">
+                <classpath refid="@{classpathref}"/>
+                <jvmarg value="-Duser.home=${user.home}" />
+                <arg value="@{target}"/>
+                <arg value="-DskipFetch=${skipFetch}"/>
+                <arg value="-DruntimeLibDirectory=${runtimeLibDirectory}"/>
+                <arg value="-DtoolsLibDirectory=${toolsLibDirectory}" />
+            </java>
+        </sequential>
+    </macrodef>
+    
+</project>
 
=== added directory '.pc/0003-disable-bnd.diff.patch'
=== added file '.pc/0003-disable-bnd.diff.patch/build.xml'
--- .pc/0003-disable-bnd.diff.patch/build.xml	1970-01-01 00:00:00 +0000
+++ .pc/0003-disable-bnd.diff.patch/build.xml	2011-02-24 17:57:34 +0000
@@ -0,0 +1,910 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+Ant build script for Groovy.
+
+Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
+compliance with the License. You may obtain a copy of the License at
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software distributed under the License is
+distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+implied. See the License for the specific language governing permissions and limitations under the License.
+
+This work is copyright by the author(s) and is part of a greater work collectively copyright by Codehaus on
+behalf of the Groovy community. See the NOTICE.txt file distributed with this work for additional information.
+
+Author : Russel Winder
+Author : Paul King
+$Revision: 20245 $ ($LastChangedBy: paulk $)
+$Date: 2010-06-07 02:45:33 +0200 (Mo, 07. Jun 2010) $
+-->
+
+<project name="Groovy" default="createJars" basedir=".">
+
+    <property file="local.build.properties"/>
+    <property file="build.properties"/>
+    <property name="ant.requiredVersion" value="1.6.5"/>
+
+    <!-- config/ant/build-maven.xml imports config/ant/build-setup.xml where all the paths are defined. -->
+    <import file="config/ant/build-setup.xml"/>
+    <import file="config/ant/build-checkstyle.xml"/>
+    <import file="config/ant/build-cobertura.xml"/>
+
+    <path id="compilePath">
+        <path path="${java.class.path}" />
+    </path>
+    <path id="toolsPath">
+        <path path="${java.class.path}" />
+    </path>
+
+    <condition property="_skipTests_">
+        <or>
+            <equals arg1="${test}" arg2="false"/>
+            <istrue value="${skipTests}"/>
+        </or>
+    </condition>
+
+    <condition property="_skipExamples_">
+        <istrue value="${skipExamples}"/>
+    </condition>
+
+    <condition property="_skipDocs_">
+        <istrue value="${skipDocs}"/>
+    </condition>
+
+    <condition property="_skipOsgi_">
+        <istrue value="${skipOsgi}"/>
+    </condition>
+
+    <condition property="_skipFetch_">
+        <istrue value="${skipFetch}"/>
+    </condition>
+
+    <condition property="_skipEmbeddable_">
+        <istrue value="${skipEmbeddable}"/>
+    </condition>
+
+    <condition property="_forceServerSettings_">
+        <istrue value="${forceServerSettings}"/>
+    </condition>
+
+    <condition property="groovy.build.vm4">
+        <contains string="${ant.java.version}" substring="1.4"/>
+    </condition>
+
+    <condition property="groovy.build.vm6">
+        <contains string="${ant.java.version}" substring="1.6"/>
+    </condition>
+
+    <presetdef name="javac">
+        <javac memoryMaximumSize="500m"/>
+    </presetdef>
+
+    <target name="-initCoverage">
+        <condition property="_forceCoverage_">
+            <and>
+                <not>
+                    <istrue value="${skipTests}"/>
+                </not>
+                <istrue value="${forceCoverage}"/>
+            </and>
+        </condition>
+    </target>
+
+    <target name="ensureGrammars" description="Ensure all the Antlr generated files are up to date.">
+        <mkdir dir="${groovyParserDirectory}"/>
+        <antlr target="${antlrDirectory}/groovy.g" outputdirectory="${groovyParserDirectory}">
+            <classpath refid="compilePath"/>
+        </antlr>
+        <antlr target="${javaParserDirectory}/java.g" outputdirectory="${javaParserDirectory}">
+            <classpath refid="compilePath"/>
+        </antlr>
+    </target>
+
+    <target name="-init">
+        <xslt in="pom.xml" out="${targetDirectory}/groovy-all.pom" style="config/maven/groovy-all.xsl"/>
+    </target>
+
+    <target name="-banner">
+        <echo message="Java Runtime Environment version: ${java.version}"/>
+        <echo message="Java Runtime Environment vendor: ${java.vendor}"/>
+        <echo message="Ant version: ${ant.version}"/>
+        <echo message="Operating system name: ${os.name}"/>
+        <echo message="Operating system architecture: ${os.arch}"/>
+        <echo message="Operating system version: ${os.version}"/>
+        <echo message="Base directory: ${basedir}"/>
+        <echo message="Java Home: ${java.home}"/>
+    </target>
+
+    <target name="-jvm14BuildWarning" if="groovy.build.vm4">
+        <fail>Aborting!
+
+================================================
+  ERROR: You must build Groovy with a 1.5+ JDK
+================================================
+        </fail>
+    </target>
+
+    <target name="-checkAntVersion" depends="-excludeLegacyAntVersion"
+            description="Check that we are running on the required version of Ant."/>
+
+    <target name="-excludeLegacyAntVersion">
+        <!-- antversion didn't exist in early versions of ant so we have
+             a legacy check to provide a nicer error message in this case -->
+        <fail message="You are using ant ${ant.version}, please build using ant ${ant.requiredVersion}+">
+            <condition>
+                <or>
+                    <contains string="${ant.version}" substring="1.1"></contains>
+                    <contains string="${ant.version}" substring="1.2"></contains>
+                    <contains string="${ant.version}" substring="1.3"></contains>
+                    <contains string="${ant.version}" substring="1.4"></contains>
+                    <contains string="${ant.version}" substring="1.5"></contains>
+                    <and>
+                        <contains string="${ant.version}" substring="1.6"></contains>
+                        <not>
+                            <contains string="${ant.version}" substring="${ant.requiredVersion}"></contains>
+                        </not>
+                    </and>
+                </or>
+            </condition>
+        </fail>
+    </target>
+
+    <!-- add back in if we make 1.7+ minimal required version for build again
+        <target name="-ensureRequiredAntVersion">
+           <fail message="You are using ant ${ant.version}, please install using ant ${ant.requiredVersion}+"/>
+               <condition><not><antversion atleast="${ant.requiredVersion}"/></not></condition>
+           </fail>
+        </target>
+    -->
+
+    <target name="compileMain" depends="stagedcompile"
+            description="Compile the Java and Groovy code in the main source.">
+    </target>
+
+    <target name="stagedcompile" depends="-init,ensureGrammars,-jvm14BuildWarning" unless="uber">
+        <mkdir dir="${mainClassesDirectory}"/>
+        <mkdir dir="${toolsClassesDirectory}"/>
+        <mkdir dir="${mainClassesDirectory}/META-INF"/>
+
+        <javac srcdir="${mainSourceDirectory}" includeantruntime="false" destdir="${mainClassesDirectory}"
+               deprecation="on" debug="yes" source="1.5" target="1.5" fork="true" classpathref="compilePath">
+            <exclude name="groovy/ui/**/*.java"/>
+        </javac>
+        <java classname="org.codehaus.groovy.tools.DgmConverter"
+              fork="yes"
+              failonerror="true">
+            <classpath refid="compilePath"/>
+            <classpath path="${mainClassesDirectory}"/>
+        </java>
+        <antcall inheritrefs="true" target="-stagedcompile-groovy"/>
+        <antcall target="-includeResources"/>
+    </target>
+
+    <target name="-stagedcompile-groovy" depends="-initGroovyc">
+        <groovyc srcdir="${mainSourceDirectory}" destdir="${mainClassesDirectory}" fork="true"
+                 memorymaximumsize="${groovycMain_mx}">
+            <classpath>
+                <pathelement path="${mainClassesDirectory}"/>
+                <path refid="compilePath"/>
+            </classpath>
+            <javac deprecation="on" debug="yes" source="1.5" target="1.5"/>
+        </groovyc>
+    </target>
+
+    <property name="vm5GroovySourceFiles" value="**/*.groovy"/>
+    <property name="vm5JavaSourceFiles" value="**/*.java"/>
+    <property name="vm6GroovySourceFiles" value="groovy/**/vm6/*Test.groovy,org/codehaus/groovy/**/vm6/*Test.groovy"/>
+
+    <target name="-initGroovyc">
+        <path id="groovyMainClasses">
+            <pathelement path="${mainClassesDirectory}"/>
+            <path refid="compilePath"/>
+        </path>
+        <taskdef name="groovyc" classname="org.codehaus.groovy.ant.Groovyc" classpathref="groovyMainClasses"/>
+    </target>
+
+    <target name="compileTest" depends="compileMain,compileTestOnly"
+            description="Compile the Java and Groovy code in the test source."/>
+
+    <target name="-cleanTest">
+        <delete dir="${testClassesDirectory}"/>
+    </target>
+
+    <target name="compileTestOnly" unless="_skipTests_">
+        <mkdir dir="${testClassesDirectory}"/>
+        <antcall inheritrefs="true" target="-compileTest"/>
+    </target>
+
+    <target name="-compileTest" depends="-initGroovyc,-compileTest_vm6">
+        <groovyc srcdir="${testSourceDirectory}"
+                 destdir="${testClassesDirectory}"
+                 includes="${vm5GroovySourceFiles},${vm5JavaSourceFiles}"
+                 excludes="${vm6GroovySourceFiles}"
+                 fork="true"
+                 memorymaximumsize="${groovycTest_mx}">
+            <classpath>
+                <pathelement path="${testClassesDirectory}"/>
+                <path refid="groovyMainClasses"/>
+                <path refid="testLibPath"/>
+            </classpath>
+            <javac source="1.5" target="1.5" nowarn="on"/>
+        </groovyc>
+    </target>
+
+    <target name="-compileTest_vm6" if="groovy.build.vm6">
+        <groovyc srcdir="${testSourceDirectory}"
+                 destdir="${testClassesDirectory}"
+                 includes="${vm6GroovySourceFiles}"
+                 fork="true"
+                 memorymaximumsize="${groovycTest_mx}">
+            <classpath>
+                <pathelement path="${testClassesDirectory}"/>
+                <path refid="groovyMainClasses"/>
+                <path refid="testLibPath"/>
+            </classpath>
+            <!-- currently not needed, add in if/when required -->
+            <!--<javac source="1.5" target="1.5" nowarn="on"/>-->
+        </groovyc>
+    </target>
+
+    <target name="compileExamples" depends="-init,-initGroovyc,compileMain,-includeExamplesResources"
+            unless="_skipExamples_"
+            description="Compile the Java and Groovy code in the examples source directory.">
+        <mkdir dir="${examplesClassesDirectory}"/>
+        <echo message="Compiling example code."/>
+
+        <groovyc srcdir="${examplesSourceDirectory}/webapps/groovlet-examples/WEB-INF/groovy"
+                 destdir="${examplesClassesDirectory}"
+                 fork="true"
+                 memorymaximumsize="${groovycExamples_mx}">
+            <classpath>
+                <pathelement path="${mainClassesDirectory}"/>
+                <path refid="compilePath"/>
+                <path refid="examplesPath"/>
+            </classpath>
+        </groovyc>
+        <javac srcdir="${examplesSourceDirectory}"
+               destdir="${examplesClassesDirectory}"
+               source="1.5"
+               target="1.5"
+               fork="true">
+            <classpath>
+                <pathelement path="${mainClassesDirectory}"/>
+                <pathelement path="${examplesClassesDirectory}"/>
+                <path refid="compilePath"/>
+                <path refid="examplesPath"/>
+            </classpath>
+        </javac>
+        <groovyc srcdir="${examplesSourceDirectory}"
+                 destdir="${examplesClassesDirectory}"
+                 fork="true"
+                 memorymaximumsize="${groovycExamples_mx}"
+                 excludes="webapps/groovlet-examples/WEB-INF/groovy/**/*.groovy,org/codehaus/groovy/grails/compiler/injection/**/*.java">
+            <classpath>
+                <pathelement path="${mainClassesDirectory}"/>
+                <pathelement path="${examplesClassesDirectory}"/>
+                <path refid="compilePath"/>
+                <path refid="examplesPath"/>
+            </classpath>
+            <javac source="1.5" target="1.5"/>
+        </groovyc>
+
+    </target>
+
+    <target name="-initializeReports">
+        <mkdir dir="${reportsDirectory}"/>
+    </target>
+
+    <condition property="_shouldBeHeadless_">
+        <or>
+            <istrue value="${java.awt.headless}"/>
+            <!--<os name="Mac OS X"/>-->
+        </or>
+    </condition>
+
+    <target name="-testInit" depends="-initHeadless">
+        <property name="headlessArg" value=""/>
+        <property name="junitJvmArgs"
+                  value="-Xms${groovyJUnit_ms} -XX:PermSize=${groovyJUnit_permSize} -XX:MaxPermSize=${groovyJUnit_maxPermSize} ${headlessArg} -Dgroovy.testdb.props=${groovy.testdb.props} -DjavadocAssertion.src.dir=./src/main"/>
+    </target>
+
+    <target name="-initHeadless" if="_shouldBeHeadless_">
+        <property name="headlessArg" value="-Djava.awt.headless=true"/>
+        <echo message="Setting headless mode ..."/>
+    </target>
+
+    <target name="test"
+            depends="-banner,-checkAntVersion,-initializeReports,compileTest,-coverageInstrument,-testInit,-testOne,-testAll,-reportTestFailed"
+            description="Compile and test all the classes (or just one class if testCase property is defined)."/>
+
+    <target name="clean-test" depends="clean,test"
+            description="Clean and compile and test all the classes (or just one class if testCase property is defined)."/>
+
+    <condition property="_testOne_">
+        <and>
+            <not>
+                <istrue value="${_skipTests_}"/>
+            </not>
+            <isset property="testCase"/>
+        </and>
+    </condition>
+
+    <target name="-testOne" if="_testOne_" depends="-initGroovyc">
+        <mkdir dir="${junitRawDirectory}"/>
+        <junit printsummary="true" fork="true" includeantruntime="false" failureproperty="testFailed"
+               maxmemory="${groovyJUnit_mx}" dir="${basedir}">
+            <sysproperty key="apple.awt.UIElement" value="true"/>
+            <!-- keeps the dock from showing the AWT startup -->
+            <jvmarg line="${junitJvmArgs}"/>
+            <test name="${testCase}" todir="${junitRawDirectory}"/>
+            <formatter type="brief" usefile="false"/>
+            <classpath>
+                <pathelement path="${instrumentedClassesDirectory}"/>
+                <pathelement path="src/test"/>
+                <path refid="groovyMainClasses"/>
+                <path refid="testLibPath"/>
+                <pathelement path="${testClassesDirectory}"/>
+                <path refid="coberturaPath"/>
+            </classpath>
+            <assertions>
+                <enable/>
+            </assertions>
+        </junit>
+    </target>
+
+    <condition property="_testAll_">
+        <and>
+            <not>
+                <istrue value="${_skipTests_}"/>
+            </not>
+            <not>
+                <isset property="_testOne_"/>
+            </not>
+        </and>
+    </condition>
+
+    <target name="-collectOptionalTests">
+        <condition property="networkTests.fileset.includes" value="groovy/grape/*Test.class" else="-nothing-">
+            <istrue value="${junit.network}"/>
+        </condition>
+        <fileset id="optionalTests.fileset" dir="${testClassesDirectory}" includes="${networkTests.fileset.includes}"/>
+    </target>
+
+    <target name="-collect15tests" unless="groovy.build.vm6">
+        <fileset id="ubertests.fileset" dir="${testClassesDirectory}" includes="UberTest*.class" excludes="Uber*VM6.class"/>
+    </target>
+
+    <target name="-collect16tests" if="groovy.build.vm6">
+        <fileset id="ubertests.fileset" dir="${testClassesDirectory}" includes="UberTest*.class"/>
+    </target>
+
+    <target name="-testAll" if="_testAll_" depends="-collect15tests,-collect16tests,-collectOptionalTests,-initGroovyc">
+        <mkdir dir="${junitRawDirectory}"/>
+        <junit printsummary="true" fork="true" includeantruntime="false" failureproperty="testFailed"
+               maxmemory="${groovyJUnit_mx}" dir="${basedir}">
+            <jvmarg line="${junitJvmArgs}"/>
+            <sysproperty key="apple.awt.UIElement" value="true"/>
+            <!-- keeps the dock from showing the AWT startup -->
+            <formatter type="xml"/>
+            <formatter type="plain" unless="noTextReports"/>
+            <batchtest todir="${junitRawDirectory}">
+                <fileset refid="ubertests.fileset"/>
+                <fileset refid="optionalTests.fileset"/>
+            </batchtest>
+            <classpath>
+                <pathelement path="${instrumentedClassesDirectory}"/>
+                <pathelement path="src/test"/>
+                <path refid="groovyMainClasses"/>
+                <path refid="testLibPath"/>
+                <pathelement path="${testClassesDirectory}"/>
+                <path refid="coberturaPath"/>
+            </classpath>
+            <assertions>
+                <enable/>
+            </assertions>
+        </junit>
+        <mkdir dir="${junitReportsDirectory}"/>
+        <junitreport tofile="${junitRawDirectory}/Results.xml">
+            <fileset dir="${junitRawDirectory}" includes="TEST-*.xml"/>
+            <report format="frames" todir="${junitReportsDirectory}"/>
+        </junitreport>
+    </target>
+
+    <target name="-reportTestFailed" depends="-coverageReport" if="testFailed">
+        <fail message="Test failed, not processing further targets."/>
+    </target>
+
+    <target name="-coverageInstrument" if="_forceCoverage_">
+        <mkdir dir="${instrumentedClassesDirectory}"/>
+        <!--coberturaInstrument classesDirectory="${mainClassesDirectory}"/-->
+    </target>
+
+    <target name="-coverageReport" depends="-initCoverage" if="_forceCoverage_">
+        <!--coberturaReport reportDirectory="${reportsDirectory}/cobertura" sourceDirectory="${mainSourceDirectory}"/-->
+    </target>
+
+    <target name="-actuallyCreateJars"
+            depends="-makeManifest,-initializeJars,-createBaseJar,-createEmbeddableJar"
+            unless="testFailed"/>
+
+    <target name="-makeManifest">
+        <mkdir dir="${mainClassesDirectory}/META-INF"/>
+        <copy todir="${mainClassesDirectory}/META-INF" file="LICENSE.txt"/>
+        <makeManifest file="${mainClassesDirectory}/META-INF/MANIFEST.MF"/>
+    </target>
+
+    <macrodef name="makeManifest">
+        <attribute name="file"/>
+        <attribute name="bundleEnvironment" default="J2SE-1.5"/>
+        <sequential>
+            <manifest file="@{file}">
+                <attribute name="Built-By" value="${user.name}"/>
+                <attribute name="Extension-Name" value="groovy"/>
+                <attribute name="Specification-Title" value="Groovy: a powerful, dynamic language for the JVM"/>
+                <attribute name="Specification-Version" value="${groovyVersion}"/>
+                <attribute name="Specification-Vendor" value="The Codehaus"/>
+                <attribute name="Implementation-Title" value="Groovy: a powerful, dynamic language for the JVM"/>
+                <attribute name="Implementation-Version" value="${groovyVersion}"/>
+                <attribute name="Implementation-Vendor" value="The Codehaus"/>
+                <attribute name="Bundle-ManifestVersion" value="2"/>
+                <attribute name="Bundle-Name" value="Groovy Runtime"/>
+                <attribute name="Bundle-Description" value="Groovy Runtime"/>
+                <attribute name="Bundle-Version" value="${groovyBundleVersion}"/>
+                <attribute name="Bundle-Vendor" value="The Codehaus"/>
+                <attribute name="Bundle-ClassPath" value="."/>
+                <attribute name="Bundle-RequiredExecutionEnvironment" value="@{bundleEnvironment}"/>
+                <attribute name="Eclipse-BuddyPolicy" value="dependent"/>
+                <attribute name="Eclipse-LazyStart" value="true"/>
+                <attribute name="DynamicImport-Package" value="*"/>
+            </manifest>
+        </sequential>
+    </macrodef>
+
+    <target name="-includeResources" depends="-includeGroovyDocTemplates">
+        <copy todir="${mainClassesDirectory}">
+            <fileset dir="${mainSourceDirectory}">
+                <include name="META-INF/services/*"/>
+                <include name="groovy/grape/*.xml"/>
+                <include name="groovy/ui/*.properties"/>
+                <include name="groovy/ui/**/*.png"/>
+                <include name="groovy/inspect/swingui/AstBrowserProperties.groovy"/>
+                <include name="org/codehaus/groovy/tools/shell/**/*.properties"/>
+                <include name="org/codehaus/groovy/tools/groovydoc/**/*.properties"/>
+                <include name="org/codehaus/groovy/tools/shell/**/*.xml"/>
+                <include name="org/codehaus/groovy/antlib.xml"/>
+            </fileset>
+        </copy>
+        <antcall target="-includeReleaseInfo"/>
+    </target>
+
+    <target name="-includeReleaseInfo">
+        <copy file="${mainSourceDirectory}/META-INF/groovy-release-info.properties"
+              todir="${mainClassesDirectory}/META-INF" overwrite="true">
+        </copy>
+        <tstamp>
+            <format property="release.date" pattern="dd-MMM-yyyy"/>
+            <format property="release.time" pattern="hh:mm aa"/>
+        </tstamp>
+        <replace file="${mainClassesDirectory}/META-INF/groovy-release-info.properties">
+            <replacefilter token="##ImplementationVersion##" value="${groovyVersion}"/>
+            <replacefilter token="##BundleVersion##" value="${groovyBundleVersion}"/>
+            <replacefilter token="##BuildDate##" value="${release.date}"/>
+            <replacefilter token="##BuildTime##" value="${release.time}"/>
+        </replace>
+    </target>
+
+    <target name="-includeExamplesResources" depends="-includeGroovyDocTemplates">
+        <copy todir="${examplesClassesDirectory}">
+            <fileset dir="${examplesSourceDirectory}">
+                <include name="/swing/binding/caricature/resources/*.gif"/>
+            </fileset>
+        </copy>
+    </target>
+
+    <target name="-includeGroovyDocTemplates">
+        <copy todir="${mainClassesDirectory}">
+            <fileset dir="${mainSourceDirectory}">
+                <include name="org/codehaus/groovy/tools/groovydoc/gstringTemplates/*/*.*"/>
+            </fileset>
+            <fileset dir="${toolsSourceDirectory}">
+                <include name="org/codehaus/groovy/tools/groovy.ico"/>
+            </fileset>
+        </copy>
+    </target>
+
+    <target name="-initializeJars" depends="test" unless="_skipDocs_">
+        <delete dir="${targetDistDirectory}" quiet="true"/>
+        <mkdir dir="${targetDistDirectory}"/>
+    </target>
+
+    <target name="-createBaseJar" unless="testFailed">
+        <jar destfile="${targetDistDirectory}/groovy.jar" basedir="${mainClassesDirectory}"
+             excludes="*.groovy" manifest="${mainClassesDirectory}/META-INF/MANIFEST.MF"/>
+        <jar destfile="${targetDistDirectory}/groovy-${groovyVersion}-sources.jar" basedir="${mainSourceDirectory}"/>
+    </target>
+
+    <target name="-jarjarInit" unless="_skipEmbeddable_">
+        <taskdef name="jarjar" classname="com.tonicsystems.jarjar.JarJarTask" classpathref="toolsPath"/>
+    </target>
+
+    <target name="-createEmbeddableJar" depends="-jarjarInit,-actuallyCreateEmbeddableJar" unless="testFailed"/>
+
+    <target name="-actuallyCreateEmbeddableJar" unless="_skipEmbeddable_">
+        <delete dir="${stagingDirectory}" quiet="true"/>
+        <mkdir dir="${stagingDirectory}"/>
+        <unzip dest="${stagingDirectory}">
+            <fileset dir="/usr/share/java">
+                <include name="antlr.jar"/>
+                <include name="asm3.jar"/>
+                <include name="asm3-commons.jar"/>
+                <include name="asm3-tree.jar"/>
+                <include name="asm3-xml.jar"/>
+            </fileset>
+        </unzip>
+        <unzip dest="${stagingDirectory}">
+            <fileset dir="${targetDistDirectory}">
+                <include name="groovy.jar"/>
+            </fileset>
+        </unzip>
+        <copy toDir="${stagingDirectory}/META-INF">
+            <fileset dir="${basedir}/config/build">
+                <include name="*LICENSE.txt"/>
+            </fileset>
+        </copy>
+        <!-- add commons-cli -->
+        <unzip dest="${stagingDirectory}">
+            <patternset>
+                <!-- no need for the manifest file, we have our own -->
+                <exclude name="META-INF/MANIFEST.MF"/>
+            </patternset>
+            <globmapper from="META-INF/LICENSE.txt" to="META-INF/CLI-LICENSE.txt"/>
+            <fileset dir="/usr/share/java">
+                <include name="commons-cli.jar"/>
+            </fileset>
+        </unzip>
+        <makeManifest file="${stagingDirectory}/META-INF/MANIFEST.MF"/>
+        <!-- TODO try to make use of jarjar keep ability -->
+        <jarjar jarfile="${targetDistDirectory}/groovy-all.jar"
+                manifest="${stagingDirectory}/META-INF/MANIFEST.MF">
+            <fileset dir="${stagingDirectory}"
+                     excludes="groovy/util/CliBuilder*.class,groovy/util/OptionAccessor*.class,org/codehaus/groovy/tools/shell/util/HelpFormatter*.class"/>
+            <rule pattern="antlr.**" result="groovyjarjarantlr.@1"/>
+            <rule pattern="org.objectweb.**" result="groovyjarjarasm.@1"/>
+            <rule pattern="org.apache.commons.cli.**" result="groovyjarjarcommonscli.@1"/>
+        </jarjar>
+        <jar destfile="${targetDistDirectory}/groovy-all.jar" update="true"
+             basedir="${stagingDirectory}"
+             includes="groovy/util/CliBuilder*.class,groovy/util/OptionAccessor*.class,org/codehaus/groovy/tools/shell/util/HelpFormatter*.class"/>
+
+        <copy file="${targetDistDirectory}/groovy-${groovyVersion}-sources.jar"
+              tofile="${targetDistDirectory}/groovy-all-${groovyVersion}-sources.jar"/>
+        <delete dir="${stagingDirectory}" quiet="true"/>
+    </target>
+
+    <target name="createJars" depends="-checkAntVersion,test,-actuallyCreateJars"
+            description="Build Groovy and create the jarfiles."/>
+
+    <target name="updateJarsForOsgi" unless="_skipOsgi_">
+        <taskdef resource="aQute/bnd/ant/taskdef.properties" classpath="/usr/share/java/bnd.jar"/>
+        <copy todir="${targetDistDirectory}">
+            <fileset dir="config/bnd" includes="groovy*.bnd"/>
+            <filterset>
+                <filter token="GROOVY_BUNDLE_VERSION" value="${groovyBundleVersion}"/>
+            </filterset>
+        </copy>
+        <property name="jarsToWrap" value="groovy.jar,groovy-all.jar"/>
+        <property name="runtimeJars" refid="runtimePath"/>
+        <bndwrap definitions="${targetDistDirectory}" output="${targetDistDirectory}" failok="true"
+                 classpath="${runtimeJars}">
+            <fileset dir="${targetDistDirectory}" includes="${jarsToWrap}"/>
+        </bndwrap>
+        <delete dir="${targetDistDirectory}" includes="${jarsToWrap}"/>
+        <move todir="${targetDistDirectory}">
+            <fileset dir="${targetDistDirectory}" includes="groovy*.bar"/>
+            <globmapper from="groovy*.bar" to="groovy*-${groovyVersion}.jar"/>
+        </move>
+        <delete dir="${targetDistDirectory}" includes="groovy*.bnd"/>
+    </target>
+
+    <target name="skipOsgi" if="_skipOsgi_">
+        <move todir="${targetDistDirectory}">
+            <fileset dir="${targetDistDirectory}" includes="groovy*.jar"/>
+            <globmapper from="groovy*.jar" to="groovy*-${groovyVersion}.jar"/>
+        </move>
+    </target>
+
+    <target name="install" depends="createJars,updateJarsForOsgi,skipOsgi" unless="testFailed"
+            description="Create an installation hierarchy in target/install.">
+
+        <!--
+        FIXME: It's not really a good idea to delete stuff, as it tends to negate Ant's (or other tools)
+               ability to run faster incremental builds.
+        -->
+        <delete dir="${installDirectory}" quiet="true"/>
+        <mkdir dir="${installDirectory}"/>
+
+        <!-- Install license files -->
+        <copy todir="${installDirectory}">
+            <fileset dir="${basedir}">
+                <include name="LICENSE.txt"/>
+                <include name="NOTICE.txt"/>
+            </fileset>
+        </copy>
+        <unzip dest="${installDirectory}">
+            <patternset>
+                <include name="META-INF/*-LICENSE.txt"/>
+            </patternset>
+            <mapper type="flatten"/>
+            <fileset file="${targetDistDirectory}/groovy-all-${groovyVersion}.jar"/>
+        </unzip>
+        <fixcrlf srcdir="${installDirectory}" eol="crlf" includes="*.txt"/>
+
+        <!-- Install generated artifacts and runtime dependencies -->
+        <mkdir dir="${installDirectory}/lib"/>
+        <copy todir="${installDirectory}/lib">
+            <fileset dir="${targetDistDirectory}" includes="groovy-${groovyVersion}.jar"/>
+        </copy>
+
+        <!-- Install the embeddable bits -->
+        <mkdir dir="${installDirectory}/embeddable"/>
+        <copy todir="${installDirectory}/embeddable">
+            <fileset dir="${targetDistDirectory}" includes="groovy-all-${groovyVersion}.jar"/>
+        </copy>
+
+        <!-- Install configuration files -->
+        <mkdir dir="${installDirectory}/conf"/>
+        <copy toDir="${installDirectory}/conf">
+            <fileset dir="${sourceDirectory}/conf" includes="*"/>
+        </copy>
+
+        <!-- Install scripts -->
+        <mkdir dir="${installDirectory}/bin"/>
+        <copy toDir="${installDirectory}/bin">
+            <fileset dir="${sourceDirectory}/bin" includes="*"/>
+            <filterset>
+                <filter token="GROOVYJAR" value="groovy-${groovyVersion}.jar"/>
+            </filterset>
+        </copy>
+        <!-- icon -->
+        <copy todir="${installDirectory}/bin" flatten="true">
+            <fileset dir="${toolsSourceDirectory}">
+                <include name="org/codehaus/groovy/tools/groovy.ico"/>
+            </fileset>
+        </copy>
+
+        <!-- Tweak scripts for platform compatibility -->
+        <fixcrlf srcdir="${installDirectory}/bin" eol="lf" excludes="*.bat, *.icns"/>
+        <fixcrlf srcdir="${installDirectory}/bin" eol="crlf" includes="*.bat"/>
+        <chmod perm="ugo+x">
+            <fileset dir="${installDirectory}/bin" includes="*,*.*"/>
+        </chmod>
+    </target>
+
+    <target name="checkstyle" depends="-init,-initializeReports"
+            description="Create the code style reports.">
+        <checkAndReport
+                reportDirectory="${reportsDirectory}/checkstyle"
+                sourceDirectory="${mainSourceDirectory}"
+                excludes="org/codehaus/groovy/antlr/parser/*,org/codehaus/groovy/antlr/java/*,org/codehaus/groovy/syntax/Types.java">
+            <path>
+                <pathelement path="${mainClassesDirectory}"/>
+                <path refid="testLibPath"/>
+            </path>
+        </checkAndReport>
+    </target>
+
+    <target name="-compileTools" depends="-initGroovyc,compileMain">
+        <groovyc srcdir="${toolsSourceDirectory}" destdir="${toolsClassesDirectory}" fork="true">
+            <classpath>
+                <path refid="toolsPath"/>
+                <pathelement path="${mainClassesDirectory}"/>
+                <path refid="compilePath"/>
+            </classpath>
+        </groovyc>
+        <copy todir="${toolsClassesDirectory}">
+            <fileset dir="${toolsSourceDirectory}">
+                <include name="**/*.html"/>
+            </fileset>
+        </copy>
+    </target>
+
+    <target name="cruiseReportExtras">
+        <mkdir dir="${cruiseReportRootDirectory}"/>
+        <copy todir="${cruiseReportRootDirectory}">
+            <fileset dir="cruise/html"/>
+        </copy>
+    </target>
+
+    <target name="cruiseInit">
+        <property name="noTextReports" value="true"/>
+        <property name="forceCoverage" value="true"/>
+        <delete dir="${reportsDirectory}" quiet="true" failonerror="false"/>
+        <delete dir="${junitRawDirectory}" quiet="true" failonerror="false"/>
+    </target>
+
+    <target name="cruise" depends="cruiseInit,fulldist,cruiseReportExtras"/>
+
+    <target name="-docInit">
+        <mkdir dir="${docsDirectory}"/>
+        <property name="docFooter" value="Copyright &amp;copy; 2003-2010 The Codehaus. All rights reserved."/>
+        <property name="title" value="Groovy ${groovyVersion}"/>
+    </target>
+
+    <target name="doc" depends="javadoc, groovydoc" description="Create the documentation."/>
+
+    <target name="javadoc" depends="-docInit,-jvm14BuildWarning,ensureGrammars"
+            unless="_skipDocs_" description="Create the javadoc documentation.">
+        <javadoc destdir="${docsDirectory}/api" author="true" version="true"
+                 windowtitle="${title}" doctitle="${title}"
+                 encoding="ISO-8859-1" useexternalfile="true" source="1.5"
+                 footer="${docFooter}"
+                 overview="src/main/overviewj.html"
+                 maxmemory="${javaDoc_mx}"
+                >
+            <classpath>
+                <path path="${mainClassesDirectory}"/>
+                <path refid="compilePath"/>
+            </classpath>
+            <fileset dir="${mainSourceDirectory}" includes="**/*.java"/>
+            <link href="http://java.sun.com/javase/6/docs/api"/>
+            <link href="http://www.dpml.net/api/ant/1.7.0"/>
+            <link href="http://junit.sourceforge.net/junit3.8.1/javadoc"/>
+            <link href="http://java.sun.com/j2ee/1.4/docs/api"/>
+            <link href="http://www.antlr2.org/javadoc"/>
+            <link href="http://commons.apache.org/cli/api-release"/>
+        </javadoc>
+        <mkdir dir="${targetDistDirectory}"/>
+        <jar basedir="${docsDirectory}/api" destfile="${targetDistDirectory}/groovy-${groovyVersion}-javadoc.jar"/>
+        <copy toFile="${targetDistDirectory}/groovy-all-${groovyVersion}-javadoc.jar">
+            <fileset file="${targetDistDirectory}/groovy-${groovyVersion}-javadoc.jar"/>
+        </copy>
+    </target>
+
+    <target name="groovydoc">
+        <path id="groovydocpath">
+            <path path="${mainClassesDirectory}"/>
+            <path refid="compilePath"/>
+        </path>
+        <antforked target="realgroovydoc" maxmemory="${groovyDoc_mx}" classpathref="groovydocpath"/>
+    </target>
+
+    <target name="realgroovydoc" depends="-docInit,-includeGroovyDocTemplates,docGDK">
+        <taskdef name="groovydoc" classname="org.codehaus.groovy.ant.Groovydoc">
+            <classpath>
+                <path path="${mainClassesDirectory}"/>
+                <path refid="compilePath"/>
+            </classpath>
+        </taskdef>
+        <groovydoc
+                destdir="${docsDirectory}/gapi"
+                sourcepath="${mainSourceDirectory}"
+                packagenames="**.*"
+                use="true"
+                windowtitle="${title}"
+                doctitle="${title}"
+                header="${title}"
+                footer="${docFooter}"
+                overview="src/main/overview.html">
+            <link packages="javax.servlet.,javax.management." href="http://java.sun.com/j2ee/1.4/docs/api"/>
+            <link packages="java.,org.xml.,javax.,org.xml." href="http://java.sun.com/javase/6/docs/api"/>
+            <link packages="org.apache.ant.,org.apache.tools.ant." href="http://www.dpml.net/api/ant/1.7.0"/>
+            <link packages="org.junit.,junit." href="http://junit.sourceforge.net/junit3.8.1/javadoc"/>
+            <link packages="org.apache.commons.cli." href="http://commons.apache.org/cli/api-release"/>
+            <link packages="antlr." href="http://www.antlr2.org/javadoc"/>
+        </groovydoc>
+    </target>
+
+    <target name="docGDK" depends="-compileTools" description="Create the GDK documentation">
+        <java classname="org.codehaus.groovy.tools.DocGenerator" fork="yes" failonerror="true">
+            <classpath>
+                <pathelement path="${toolsClassesDirectory}"/>
+                <path refid="toolsPath"/>
+                <pathelement path="${mainClassesDirectory}"/>
+            </classpath>
+            <arg value="org.codehaus.groovy.runtime.DefaultGroovyMethods"/>
+            <arg value="org.codehaus.groovy.runtime.SqlGroovyMethods"/>
+            <arg value="org.codehaus.groovy.runtime.SwingGroovyMethods"/>
+            <arg value="org.codehaus.groovy.runtime.XmlGroovyMethods"/>
+            <arg value="org.codehaus.groovy.runtime.EncodingGroovyMethods"/>
+            <arg value="org.codehaus.groovy.runtime.DateGroovyMethods"/>
+            <arg value="org.codehaus.groovy.runtime.DefaultGroovyStaticMethods"/>
+            <arg value="org.codehaus.groovy.vmplugin.v5.PluginDefaultGroovyMethods"/>
+            <arg value="org.codehaus.groovy.vmplugin.v6.PluginDefaultGroovyMethods"/>
+        </java>
+        <copy todir="target/html/groovy-jdk" file="src/tools/org/codehaus/groovy/tools/groovy.ico"/>
+        <copy todir="target/html/groovy-jdk" file="src/tools/org/codehaus/groovy/tools/stylesheet.css"/>
+    </target>
+
+    <target name="clean" description="Clean up build artifacts.">
+        <delete dir="${targetDirectory}" quiet="true"/>
+        <delete file="cobertura.ser" quiet="true" failonerror="false"/>
+        <delete quiet="true">
+            <fileset dir="." includes="**/*~"/>
+            <fileset dir="${groovyParserDirectory}" includes="Groovy*.*"/>
+            <fileset dir="${javaParserDirectory}"
+                     includes="JavaLexer.java,JavaRecognizer.java,JavaTokenTypes.java,JavaTokenTypes.txt,*.smap"/>
+        </delete>
+    </target>
+
+    <target name="deploy" depends="install,doc"
+            description="Deploy jars to maven repository."/>
+
+    <target name="-deployDefault" unless="_forceServerSettings_">
+        <mavenDeploy version="${groovyVersion}" prefix="groovy"/>
+        <mavenDeploy version="${groovyVersion}" prefix="groovy-all"/>
+    </target>
+
+    <target name="-deployFromServer" if="_forceServerSettings_">
+        <copy tofile="target/settings.xml">
+            <fileset file="config/maven/settings.xml"/>
+            <filterset>
+                <filter token="groovy.deploy.username" value="${groovy.deploy.username}"/>
+                <filter token="groovy.deploy.password" value="${groovy.deploy.password}"/>
+            </filterset>
+        </copy>
+        <mavenDeploySettings version="${groovyVersion}" prefix="groovy" settings="target/settings.xml"/>
+        <mavenDeploySettings version="${groovyVersion}" prefix="groovy-all" settings="target/settings.xml"/>
+        <delete file="target/settings.xml"/>
+    </target>
+
+    <target name="installRepo" depends="install,doc"
+            description="Deploy artifacts to local maven repository.">
+        <mavenInstallRepo version="${groovyVersion}" prefix="groovy"/>
+        <mavenInstallRepo version="${groovyVersion}" prefix="groovy-all"/>
+    </target>
+
+    <target name="quality" depends="install,checkstyle" description="install plus checkstyle"/>
+
+    <target name="release" depends="deploy,compileExamples" description="deploy plus compileExamples"/>
+
+    <target name="fulldist" depends="dist,compileExamples,checkstyle" description="dist plus examples plus checkstyle"/>
+
+    <target name="dist" depends="install,doc" description="Create everything needed for a distribution.">
+        <zip destfile="${targetDistDirectory}/groovy-binary-${groovyVersion}.zip"
+             comment="The Groovy ${groovyVersion} binary distribution.">
+
+            <!-- Make unix scripts executable -->
+            <zipfileset dir="${installDirectory}" prefix="groovy-${groovyVersion}" filemode="775">
+                <include name="bin/*"/>
+                <exclude name="bin/*.*"/>
+                <exclude name="bin/startGroovy*"/>
+            </zipfileset>
+
+            <!-- Include the other scripts as is -->
+            <zipfileset dir="${installDirectory}" prefix="groovy-${groovyVersion}">
+                <include name="bin/*.*"/>
+                <include name="bin/startGroovy*"/>
+            </zipfileset>
+
+            <!-- Include everything else as is too -->
+            <zipfileset dir="${installDirectory}" prefix="groovy-${groovyVersion}">
+                <exclude name="bin/**"/>
+                <include name="**"/>
+            </zipfileset>
+        </zip>
+
+        <zip destfile="${targetDistDirectory}/groovy-docs-${groovyVersion}.zip"
+             comment="The Groovy ${groovyVersion} documentation distribution.">
+            <zipfileset dir="${wikiPdfDirectory}" includes="wiki-snapshot.pdf" prefix="groovy-${groovyVersion}/pdf"/>
+            <zipfileset dir="${docsDirectory}" prefix="groovy-${groovyVersion}/html"/>
+        </zip>
+
+        <zip destfile="${targetDistDirectory}/groovy-src-${groovyVersion}.zip"
+             comment="The Groovy ${groovyVersion} source distribution.">
+            <zipfileset dir="${basedir}" prefix="groovy-${groovyVersion}">
+                <!-- Exclude generated bits as well as any other bits that shouldn't make it in -->
+                <exclude name="${targetDirectory}/**"/>
+                <exclude name="classes/**"/>
+                <exclude name="cruise/**"/>
+                <exclude name=".clover/*"/>
+                <exclude name="local.build.properties"/>
+                <exclude name="cobertura.ser"/>
+                <exclude name="junitvmwatcher*.properties"/>
+            </zipfileset>
+        </zip>
+    </target>
+
+</project>
 
=== removed directory '.pc/ant-build.diff'
=== removed file '.pc/ant-build.diff/build.xml'
--- .pc/ant-build.diff/build.xml	2010-02-26 16:39:51 +0000
+++ .pc/ant-build.diff/build.xml	1970-01-01 00:00:00 +0000
@@ -1,865 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!--
-Ant build script for Groovy.
-
-Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
-compliance with the License. You may obtain a copy of the License at
-
-http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software distributed under the License is
-distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-implied. See the License for the specific language governing permissions and limitations under the License.
-
-This work is copyright by the author(s) and is part of a greater work collectively copyright by Codehaus on
-behalf of the Groovy community. See the NOTICE.txt file distributed with this work for additional information.
-
-Author : Russel Winder
-Author : Paul King
-$Revision: 18555 $ ($LastChangedBy: paulk $)
-$Date: 2009-12-08 14:08:59 +0100 (Di, 08. Dez 2009) $
--->
-
-<project name="Groovy" default="createJars" basedir=".">
-
-    <property file="local.build.properties"/>
-    <property file="build.properties"/>
-    <property name="ant.requiredVersion" value="1.6.5"/>
-
-    <!-- config/ant/build-maven.xml imports config/ant/build-setup.xml where all the paths are defined. -->
-    <import file="config/ant/build-maven.xml"/>
-    <import file="config/ant/build-checkstyle.xml"/>
-    <import file="config/ant/build-cobertura.xml"/>
-
-    <condition property="_skipTests_">
-        <or>
-            <equals arg1="${test}" arg2="false"/>
-            <istrue value="${skipTests}"/>
-        </or>
-    </condition>
-
-    <condition property="_skipExamples_">
-        <istrue value="${skipExamples}"/>
-    </condition>
-
-    <condition property="_skipOsgi_">
-        <istrue value="${skipOsgi}"/>
-    </condition>
-
-    <condition property="_skipFetch_">
-        <istrue value="${skipFetch}"/>
-    </condition>
-
-    <condition property="_skipEmbeddable_">
-        <istrue value="${skipEmbeddable}"/>
-    </condition>
-
-    <condition property="groovy.build.vm4">
-        <contains string="${ant.java.version}" substring="1.4"/>
-    </condition>
-
-    <condition property="groovy.build.vm6">
-        <contains string="${ant.java.version}" substring="1.6"/>
-    </condition>
-
-    <presetdef name="javac">
-        <javac memoryMaximumSize="500m"/>
-    </presetdef>
-
-    <target name="-initCoverage">
-        <condition property="_forceCoverage_">
-            <and>
-                <not>
-                    <istrue value="${skipTests}"/>
-                </not>
-                <istrue value="${forceCoverage}"/>
-            </and>
-        </condition>
-    </target>
-
-    <target name="ensureGrammars" description="Ensure all the Antlr generated files are up to date.">
-        <mkdir dir="${groovyParserDirectory}"/>
-        <antlr target="${antlrDirectory}/groovy.g" outputdirectory="${groovyParserDirectory}">
-            <classpath refid="compilePath"/>
-        </antlr>
-        <antlr target="${javaParserDirectory}/java.g" outputdirectory="${javaParserDirectory}">
-            <classpath refid="compilePath"/>
-        </antlr>
-    </target>
-
-    <target name="updatePolicy">
-        <move file="security/groovy.policy" tofile="security/groovy.policy.template"/>
-        <copy tofile="security/groovy.policy">
-            <fileset file="security/groovy.policy.template"/>
-            <filterset>
-                <filter token="relativePathToRealBasedir" value="${relativePathToRealBasedir}"/>
-            </filterset>
-        </copy>
-    </target>
-
-    <target name="-init" depends="-fetchDependencies"/>
-
-    <target name="-banner">
-        <echo message="Java Runtime Environment version: ${java.version}"/>
-        <echo message="Java Runtime Environment vendor: ${java.vendor}"/>
-        <echo message="Ant version: ${ant.version}"/>
-        <echo message="Operating system name: ${os.name}"/>
-        <echo message="Operating system architecture: ${os.arch}"/>
-        <echo message="Operating system version: ${os.version}"/>
-        <echo message="Base directory: ${basedir}"/>
-        <echo message="Java Home: ${java.home}"/>
-    </target>
-
-    <target name="-jvm14BuildWarning" if="groovy.build.vm4">
-        <fail>Aborting!
-
-================================================
-  ERROR: You must build Groovy with a 1.5+ JDK
-================================================
-        </fail>
-    </target>
-
-    <target name="-checkAntVersion" depends="-excludeLegacyAntVersion"
-            description="Check that we are running on the required version of Ant."/>
-
-    <target name="-excludeLegacyAntVersion">
-        <!-- antversion didn't exist in early versions of ant so we have
-             a legacy check to provide a nicer error message in this case -->
-        <fail message="You are using ant ${ant.version}, please build using ant ${ant.requiredVersion}+">
-            <condition>
-                <or>
-                    <contains string="${ant.version}" substring="1.1"></contains>
-                    <contains string="${ant.version}" substring="1.2"></contains>
-                    <contains string="${ant.version}" substring="1.3"></contains>
-                    <contains string="${ant.version}" substring="1.4"></contains>
-                    <contains string="${ant.version}" substring="1.5"></contains>
-                    <and>
-                        <contains string="${ant.version}" substring="1.6"></contains>
-                        <not>
-                            <contains string="${ant.version}" substring="${ant.requiredVersion}"></contains>
-                        </not>
-                    </and>
-                </or>
-            </condition>
-        </fail>
-    </target>
-
-    <!-- add back in if we make 1.7+ minimal required version for build again
-        <target name="-ensureRequiredAntVersion">
-           <fail message="You are using ant ${ant.version}, please install using ant ${ant.requiredVersion}+"/>
-               <condition><not><antversion atleast="${ant.requiredVersion}"/></not></condition>
-           </fail>
-        </target>
-    -->
-
-    <target name="dgmConvert" depends="stagedcompile">
-        <java classname="org.codehaus.groovy.tools.DgmConverter"
-              fork="yes"
-              failonerror="true">
-            <classpath refid="compilePath"/>
-            <classpath path="${mainClassesDirectory}"/>
-        </java>
-    </target>
-
-    <target name="compileMain" depends="stagedcompile,dgmConvert"
-            description="Compile the Java and Groovy code in the main source.">
-    </target>
-
-    <target name="stagedcompile" depends="-init,ensureGrammars,-jvm14BuildWarning" unless="uber">
-        <mkdir dir="${mainClassesDirectory}"/>
-        <mkdir dir="${toolsClassesDirectory}"/>
-
-        <javac srcdir="${mainSourceDirectory}" includeantruntime="false" destdir="${mainClassesDirectory}"
-               deprecation="on" debug="yes" source="1.5" target="1.5" fork="true" classpathref="compilePath">
-            <exclude name="groovy/ui/**/*.java"/>
-        </javac>
-        <antcall inheritrefs="true" target="-stagedcompile-groovy"/>
-        <antcall target="-includeResources"/>
-    </target>
-
-    <target name="-stagedcompile-groovy" depends="-initGroovyc">
-        <groovyc srcdir="${mainSourceDirectory}" destdir="${mainClassesDirectory}" fork="true" memorymaximumsize="${groovycMain_mx}">
-            <classpath>
-                <pathelement path="${mainClassesDirectory}"/>
-                <path refid="compilePath"/>
-            </classpath>
-            <javac deprecation="on" debug="yes" source="1.5" target="1.5"/>
-        </groovyc>
-    </target>
-
-    <property name="vm5GroovySourceFiles" value="**/*.groovy"/>
-    <property name="vm5JavaSourceFiles" value="**/*.java"/>
-    <property name="vm6GroovySourceFiles" value="groovy/**/vm6/*Test.groovy"/>
-
-    <target name="-initGroovyc">
-        <path id="groovyMainClasses">
-            <pathelement path="${mainClassesDirectory}"/>
-            <path refid="compilePath"/>
-        </path>
-        <taskdef name="groovyc" classname="org.codehaus.groovy.ant.Groovyc" classpathref="groovyMainClasses"/>
-    </target>
-
-    <target name="compileTest" depends="compileMain,compileTestOnly"
-            description="Compile the Java and Groovy code in the test source."/>
-
-    <target name="-cleanTest">
-        <delete dir="${testClassesDirectory}"/>
-    </target>
-
-    <target name="compileTestOnly" unless="_skipTests_">
-        <mkdir dir="${testClassesDirectory}"/>
-        <antcall inheritrefs="true" target="-compileTest"/>
-    </target>
-
-    <target name="-compileTest" depends="-initGroovyc,-compileTest_vm6">
-        <groovyc srcdir="${testSourceDirectory}"
-                 destdir="${testClassesDirectory}"
-                 includes="${vm5GroovySourceFiles},${vm5JavaSourceFiles}"
-                 excludes="${vm6GroovySourceFiles}"
-                 fork="true"
-                 memorymaximumsize="${groovycTest_mx}">
-            <classpath>
-                <pathelement path="${testClassesDirectory}"/>
-                <path refid="groovyMainClasses"/>
-                <path refid="testLibPath"/>
-            </classpath>
-            <javac source="1.5" target="1.5" nowarn="on"/>
-        </groovyc>
-    </target>
-
-    <target name="-compileTest_vm6" if="groovy.build.vm6">
-        <groovyc srcdir="${testSourceDirectory}"
-                 destdir="${testClassesDirectory}"
-                 includes="${vm6GroovySourceFiles}"
-                 fork="true"
-                 memorymaximumsize="${groovycTest_mx}">
-            <classpath>
-                <pathelement path="${testClassesDirectory}"/>
-                <path refid="groovyMainClasses"/>
-                <path refid="testLibPath"/>
-            </classpath>
-            <!-- currently not needed, add in if/when required -->
-            <!--<javac source="1.5" target="1.5" nowarn="on"/>-->
-        </groovyc>
-    </target>
-
-    <target name="compileExamples" depends="-init,-initGroovyc,compileMain,-includeExamplesResources" unless="_skipExamples_"
-            description="Compile the Java and Groovy code in the examples source directory.">
-        <mkdir dir="${examplesClassesDirectory}"/>
-        <echo message="Compiling example code."/>
-
-        <groovyc srcdir="${examplesSourceDirectory}/webapps/groovlet-examples/WEB-INF/groovy"
-                 destdir="${examplesClassesDirectory}"
-                 fork="true"
-                 memorymaximumsize="${groovycExamples_mx}">
-            <classpath>
-                <pathelement path="${mainClassesDirectory}"/>
-                <path refid="compilePath"/>
-                <path refid="examplesPath"/>
-            </classpath>
-        </groovyc>
-        <javac srcdir="${examplesSourceDirectory}"
-                destdir="${examplesClassesDirectory}"
-                source="1.5"
-                target="1.5"
-                fork="true">
-            <classpath>
-                <pathelement path="${mainClassesDirectory}"/>
-                <pathelement path="${examplesClassesDirectory}"/>
-                <path refid="compilePath"/>
-                <path refid="examplesPath"/>
-            </classpath>
-        </javac>
-        <groovyc srcdir="${examplesSourceDirectory}"
-                destdir="${examplesClassesDirectory}"
-                 fork="true"
-                 memorymaximumsize="${groovycExamples_mx}"
-                 excludes="webapps/groovlet-examples/WEB-INF/groovy/**/*.groovy,org/codehaus/groovy/grails/compiler/injection/**/*.java">
-            <classpath>
-                <pathelement path="${mainClassesDirectory}"/>
-                <pathelement path="${examplesClassesDirectory}"/>
-                <path refid="compilePath"/>
-                <path refid="examplesPath"/>
-            </classpath>
-            <javac source="1.5" target="1.5"/>
-        </groovyc>
-
-    </target>
-
-    <target name="-initializeReports">
-        <mkdir dir="${reportsDirectory}"/>
-    </target>
-
-    <condition property="_shouldBeHeadless_">
-        <or>
-            <istrue value="${java.awt.headless}"/>
-            <!--<os name="Mac OS X"/>-->
-        </or>
-    </condition>
-
-    <target name="-testInit" depends="-initHeadless">
-        <property name="headlessArg" value=""/>
-        <property name="junitJvmArgs"
-                  value="-Xms${groovyJUnit_ms} -XX:PermSize=${groovyJUnit_permSize} -XX:MaxPermSize=${groovyJUnit_maxPermSize} ${headlessArg} -Dgroovy.testdb.props=${groovy.testdb.props}"/>
-    </target>
-
-    <target name="-initHeadless" if="_shouldBeHeadless_">
-        <property name="headlessArg" value="-Djava.awt.headless=true"/>
-        <echo message="Setting headless mode ..."/>
-    </target>
-
-    <target name="test"
-            depends="-banner,-checkAntVersion,-initializeReports,compileTest,-coverageInstrument,-testInit,-testOne,-testAll,-reportTestFailed"
-            description="Compile and test all the classes (or just one class if testCase property is defined)."/>
-
-    <target name="clean-test" depends="clean,test"
-            description="Clean and compile and test all the classes (or just one class if testCase property is defined)."/>
-
-    <condition property="_testOne_">
-        <and>
-            <not>
-                <istrue value="${_skipTests_}"/>
-            </not>
-            <isset property="testCase"/>
-        </and>
-    </condition>
-
-    <target name="-testOne" if="_testOne_" depends="-initGroovyc">
-        <mkdir dir="${junitRawDirectory}"/>
-        <junit printsummary="true" fork="true" includeantruntime="false" failureproperty="testFailed" maxmemory="${groovyJUnit_mx}" dir="${basedir}">
-            <sysproperty key="apple.awt.UIElement" value="true"/>
-            <!-- keeps the dock from showing the AWT startup -->
-            <jvmarg line="${junitJvmArgs}"/>
-            <test name="${testCase}" todir="${junitRawDirectory}"/>
-            <formatter type="brief" usefile="false"/>
-            <classpath>
-                <pathelement path="${instrumentedClassesDirectory}"/>
-                <pathelement path="src/test"/>
-                <path refid="groovyMainClasses"/>
-                <path refid="testLibPath"/>
-                <pathelement path="${testClassesDirectory}"/>
-                <path refid="coberturaPath"/>
-            </classpath>
-            <assertions>
-                <enable/>
-            </assertions>
-        </junit>
-    </target>
-
-    <condition property="_testAll_">
-        <and>
-            <not>
-                <istrue value="${_skipTests_}"/>
-            </not>
-            <not>
-                <isset property="_testOne_"/>
-            </not>
-        </and>
-    </condition>
-
-    <target name="-collectOptionalTests">
-        <condition property="networkTests.fileset.includes" value="groovy/grape/*Test.class" else="-nothing-">
-            <istrue value="${junit.network}"/>
-        </condition>
-        <fileset id="optionalTests.fileset" dir="${testClassesDirectory}" includes="${networkTests.fileset.includes}"/>
-    </target>
-
-    <target name="-collect15tests" unless="groovy.build.vm6">
-        <fileset id="ubertests.fileset" dir="${testClassesDirectory}" includes="UberTest*.class" excludes="Uber*VM6.class,groovy/grape/*Test.class"/>
-    </target>
-
-    <target name="-collect16tests" if="groovy.build.vm6">
-        <fileset id="ubertests.fileset" dir="${testClassesDirectory}" includes="UberTest*.class" excludes="groovy/grape/*Test.class"/>
-    </target>
-
-    <target name="-testAll" if="_testAll_" depends="-collect15tests,-collect16tests,-collectOptionalTests,-initGroovyc">
-        <mkdir dir="${junitRawDirectory}"/>
-        <junit printsummary="true" fork="true" includeantruntime="false" failureproperty="testFailed" maxmemory="${groovyJUnit_mx}" dir="${basedir}">
-            <jvmarg line="${junitJvmArgs}"/>
-            <sysproperty key="apple.awt.UIElement" value="true"/>
-            <!-- keeps the dock from showing the AWT startup -->
-            <formatter type="xml"/>
-            <formatter type="plain" unless="noTextReports"/>
-            <batchtest todir="${junitRawDirectory}">
-                <fileset refid="ubertests.fileset"/>
-                <fileset refid="optionalTests.fileset"/>
-            </batchtest>
-            <classpath>
-                <pathelement path="${instrumentedClassesDirectory}"/>
-                <pathelement path="src/test"/>
-                <path refid="groovyMainClasses"/>
-                <path refid="testLibPath"/>
-                <pathelement path="${testClassesDirectory}"/>
-                <path refid="coberturaPath"/>
-            </classpath>
-            <assertions>
-                <enable/>
-            </assertions>
-        </junit>
-        <mkdir dir="${junitReportsDirectory}"/>
-        <junitreport tofile="${junitRawDirectory}/Results.xml">
-            <fileset dir="${junitRawDirectory}" includes="TEST-*.xml"/>
-            <report format="frames" todir="${junitReportsDirectory}"/>
-        </junitreport>
-    </target>
-
-    <target name="-reportTestFailed" depends="-coverageReport" if="testFailed">
-        <fail message="Test failed, not processing further targets."/>
-    </target>
-
-    <target name="-coverageInstrument" depends="-initCoverage,-coberturaInit" if="_forceCoverage_">
-        <mkdir dir="${instrumentedClassesDirectory}"/>
-        <coberturaInstrument classesDirectory="${mainClassesDirectory}"/>
-    </target>
-
-    <target name="-coverageReport" depends="-initCoverage" if="_forceCoverage_">
-        <coberturaReport reportDirectory="${reportsDirectory}/cobertura" sourceDirectory="${mainSourceDirectory}"/>
-    </target>
-
-    <target name="-actuallyCreateJars"
-            depends="-makeManifest,-initializeJars,-createBaseJar,-createEmbeddableJar"
-            unless="testFailed"/>
-
-    <target name="-makeManifest">
-        <mkdir dir="${mainClassesDirectory}/META-INF"/>
-        <copy todir="${mainClassesDirectory}/META-INF" file="LICENSE.txt"/>
-    	<makeManifest file="${mainClassesDirectory}/META-INF/MANIFEST.MF"/>
-	</target>
-
-    <macrodef name="makeManifest">
-    	<attribute name="file"/>
-    	<attribute name="bundleEnvironment" default="J2SE-1.5"/>
-        <sequential>
-            <manifest file="@{file}">
-                <attribute name="Built-By" value="${user.name}"/>
-                <attribute name="Extension-Name" value="groovy"/>
-                <attribute name="Specification-Title" value="Groovy: a powerful, dynamic language for the JVM"/>
-                <attribute name="Specification-Version" value="${groovyVersion}"/>
-                <attribute name="Specification-Vendor" value="The Codehaus"/>
-                <attribute name="Implementation-Title" value="Groovy: a powerful, dynamic language for the JVM"/>
-                <attribute name="Implementation-Version" value="${groovyVersion}"/>
-                <attribute name="Implementation-Vendor" value="The Codehaus"/>
-                <attribute name="Bundle-ManifestVersion" value="2" />
-                <attribute name="Bundle-Name" value="Groovy Runtime" />
-                <attribute name="Bundle-Description" value="Groovy Runtime" />
-                <attribute name="Bundle-Version" value="${groovyBundleVersion}" />
-                <attribute name="Bundle-Vendor" value="The Codehaus" />
-                <attribute name="Bundle-ClassPath" value="." />
-                <attribute name="Bundle-RequiredExecutionEnvironment" value="@{bundleEnvironment}" />
-                <attribute name="Eclipse-BuddyPolicy" value="dependent"/>
-                <attribute name="Eclipse-LazyStart" value="true"/>
-                <attribute name="DynamicImport-Package" value="*"/>
-            </manifest>
-        </sequential>
-    </macrodef>
-
-    <target name="-includeResources" depends="-includeGroovyDocTemplates">
-        <copy todir="${mainClassesDirectory}">
-            <fileset dir="${mainSourceDirectory}">
-                <include name="META-INF/services/*"/>
-                <include name="groovy/grape/*.xml"/>
-                <include name="groovy/ui/*.properties"/>
-                <include name="groovy/ui/**/*.png"/>
-                <include name="groovy/inspect/swingui/AstBrowserProperties.groovy"/>
-                <include name="org/codehaus/groovy/tools/shell/**/*.properties"/>
-                <include name="org/codehaus/groovy/tools/shell/**/*.xml"/>
-                <include name="org/codehaus/groovy/antlib.xml"/>
-            </fileset>
-        </copy>
-    	<antcall target="-includeReleaseInfo"/>
-    </target>
-
-    <target name="-includeReleaseInfo">
-        <copy file="${mainSourceDirectory}/META-INF/groovy-release-info.properties" 
-            todir="${mainClassesDirectory}/META-INF" overwrite="true">
-        </copy>
-    	<tstamp>
-    	    <format property="release.date" pattern="dd-MMM-yyyy"/>
-    	    <format property="release.time" pattern="hh:mm aa"/>
-    	</tstamp>
-        <replace file="${mainClassesDirectory}/META-INF/groovy-release-info.properties">
-          <replacefilter token="##ImplementationVersion##" value="${groovyVersion}"/>   
-          <replacefilter token="##BundleVersion##" value="${groovyBundleVersion}"/>
-          <replacefilter token="##BuildDate##" value="${release.date}"/>
-          <replacefilter token="##BuildTime##" value="${release.time}"/>
-        </replace>
-    </target>
-
-    <target name="-includeExamplesResources" depends="-includeGroovyDocTemplates">
-        <copy todir="${examplesClassesDirectory}">
-            <fileset dir="${examplesSourceDirectory}">
-                <include name="/swing/binding/caricature/resources/*.gif"/>
-            </fileset>
-        </copy>
-    </target>
-
-    <target name="-includeGroovyDocTemplates">
-        <copy todir="${mainClassesDirectory}">
-            <fileset dir="${mainSourceDirectory}">
-                <include name="org/codehaus/groovy/tools/groovydoc/gstringTemplates/**/*.*"/>
-            </fileset>
-            <fileset dir="${toolsSourceDirectory}">
-                <include name="org/codehaus/groovy/tools/groovy.ico"/>
-            </fileset>
-        </copy>
-    </target>
-
-    <target name="-initializeJars" depends="test">
-        <delete dir="${targetDistDirectory}" quiet="true"/>
-        <mkdir dir="${targetDistDirectory}"/>
-    </target>
-
-    <target name="-createBaseJar" unless="testFailed">
-        <jar destfile="${targetDistDirectory}/groovy.jar" basedir="${mainClassesDirectory}"
-             excludes="*.groovy" manifest="${mainClassesDirectory}/META-INF/MANIFEST.MF"/>
-        <jar destfile="${targetDistDirectory}/groovy-${groovyVersion}-sources.jar" basedir="${mainSourceDirectory}"/>
-    </target>
-
-    <target name="-jarjarInit" unless="_skipEmbeddable_">
-        <taskdef name="jarjar" classname="com.tonicsystems.jarjar.JarJarTask" classpathref="toolsPath"/>
-    </target>
-
-    <target name="-createEmbeddableJar" depends="-jarjarInit,-actuallyCreateEmbeddableJar" unless="testFailed"/>
-
-    <target name="-actuallyCreateEmbeddableJar" unless="_skipEmbeddable_">
-        <delete dir="${stagingDirectory}" quiet="true"/>
-        <mkdir dir="${stagingDirectory}"/>
-        <unzip dest="${stagingDirectory}">
-            <fileset dir="${runtimeLibDirectory}">
-                <include name="antlr*.jar"/>
-                <include name="asm*.jar"/>
-                <exclude name="asm-attr*.jar"/>
-                <exclude name="asm-util*.jar"/>
-                <exclude name="asm-analysis*.jar"/>
-            </fileset>
-        </unzip>
-        <unzip dest="${stagingDirectory}">
-            <fileset dir="${targetDistDirectory}">
-                <include name="groovy.jar"/>
-            </fileset>
-        </unzip>
-        <copy toDir="${stagingDirectory}/META-INF">
-            <fileset dir="${basedir}/config/build">
-                <include name="*LICENSE.txt"/>
-            </fileset>
-        </copy>
-        <!-- add commons-cli -->
-        <unzip dest="${stagingDirectory}">
-            <patternset>
-                <!-- no need for the manifest file, we have our own -->
-                <exclude name="META-INF/MANIFEST.MF"/>
-            </patternset>
-            <globmapper from="META-INF/LICENSE.txt" to="META-INF/CLI-LICENSE.txt"/>
-            <fileset dir="${runtimeLibDirectory}">
-                <include name="commons-cli-*.jar"/>
-            </fileset>
-        </unzip>
-        <makeManifest file="${stagingDirectory}/META-INF/MANIFEST.MF" />
-        <!-- TODO try to make use of jarjar keep ability -->
-        <jarjar jarfile="${targetDistDirectory}/groovy-all.jar"
-                manifest="${stagingDirectory}/META-INF/MANIFEST.MF">
-            <fileset dir="${stagingDirectory}" excludes="groovy/util/CliBuilder*.class,groovy/util/OptionAccessor*.class,org/codehaus/groovy/tools/shell/util/HelpFormatter*.class"/>
-            <rule pattern="antlr.**" result="groovyjarjarantlr.@1"/>
-            <rule pattern="org.objectweb.**" result="groovyjarjarasm.@1"/>
-            <rule pattern="org.apache.commons.cli.**" result="groovyjarjarcommonscli.@1"/>
-        </jarjar>
-        <jar destfile="${targetDistDirectory}/groovy-all.jar" update="true"
-             basedir="${stagingDirectory}" includes="groovy/util/CliBuilder*.class,groovy/util/OptionAccessor*.class,org/codehaus/groovy/tools/shell/util/HelpFormatter*.class"/>
-
-        <copy file="${targetDistDirectory}/groovy-${groovyVersion}-sources.jar"
-              tofile="${targetDistDirectory}/groovy-all-${groovyVersion}-sources.jar"/>
-        <delete dir="${stagingDirectory}" quiet="true"/>
-    </target>
-    
-    <target name="createJars" depends="-checkAntVersion,test,-actuallyCreateJars"
-            description="Build Groovy and create the jarfiles."/>
-
-    <target name="updateJarsForOsgi" unless="_skipOsgi_">
-        <taskdef resource="aQute/bnd/ant/taskdef.properties" classpathref="toolsPath"/>
-        <copy todir="${targetDistDirectory}">
-            <fileset dir="config/bnd" includes="groovy*.bnd"/>
-            <filterset>
-                <filter token="GROOVY_BUNDLE_VERSION" value="${groovyBundleVersion}"/>
-            </filterset>
-        </copy>
-        <property name="jarsToWrap" value="groovy.jar,groovy-all.jar" />
-        <bndwrap definitions="${targetDistDirectory}" output="${targetDistDirectory}" failok="true">
-            <fileset dir="${targetDistDirectory}" includes="${jarsToWrap}"/>
-        </bndwrap>
-        <delete dir="${targetDistDirectory}" includes="${jarsToWrap}"/>
-        <move todir="${targetDistDirectory}">
-            <fileset dir="${targetDistDirectory}" includes="groovy*.bar"/>
-            <globmapper from="groovy*.bar" to="groovy*-${groovyVersion}.jar"/>
-        </move>
-        <delete dir="${targetDistDirectory}" includes="groovy*.bnd"/>
-    </target>
-
-    <target name="skipOsgi" if="_skipOsgi_">
-        <move todir="${targetDistDirectory}">
-            <fileset dir="${targetDistDirectory}" includes="groovy*.jar"/>
-            <globmapper from="groovy*.jar" to="groovy*-${groovyVersion}.jar"/>
-        </move>
-    </target>
-
-    <target name="install" depends="createJars,updateJarsForOsgi,skipOsgi" unless="testFailed"
-            description="Create an installation hierarchy in target/install.">
-
-        <!--
-        FIXME: It's not really a good idea to delete stuff, as it tends to negate Ant's (or other tools)
-               ability to run faster incremental builds.
-        -->
-        <delete dir="${installDirectory}" quiet="true"/>
-        <mkdir dir="${installDirectory}"/>
-
-        <!-- Install license files -->
-        <copy todir="${installDirectory}">
-            <fileset dir="${basedir}">
-                <include name="LICENSE.txt"/>
-                <include name="NOTICE.txt"/>
-            </fileset>
-        </copy>
-        <unzip dest="${installDirectory}">
-            <patternset>
-                <include name="META-INF/*-LICENSE.txt"/>
-            </patternset>
-            <mapper type="flatten"/>
-            <fileset file="${targetDistDirectory}/groovy-all-${groovyVersion}.jar"/>
-        </unzip>
-        <fixcrlf srcdir="${installDirectory}" eol="crlf" includes="*.txt"/>
-
-        <!-- Install generated artifacts and runtime dependencies -->
-        <mkdir dir="${installDirectory}/lib"/>
-        <copy todir="${installDirectory}/lib">
-            <fileset dir="${targetDistDirectory}" includes="groovy-${groovyVersion}.jar"/>
-            <fileset dir="${runtimeLibDirectory}" includes="*.jar"/>
-        </copy>
-
-        <!-- Install the embeddable bits -->
-        <mkdir dir="${installDirectory}/embeddable"/>
-        <copy todir="${installDirectory}/embeddable">
-            <fileset dir="${targetDistDirectory}" includes="groovy-all-${groovyVersion}.jar"/>
-        </copy>
-
-        <!-- Install configuration files -->
-        <mkdir dir="${installDirectory}/conf"/>
-        <copy toDir="${installDirectory}/conf">
-            <fileset dir="${sourceDirectory}/conf" includes="*"/>
-        </copy>
-
-        <!-- Install scripts -->
-        <mkdir dir="${installDirectory}/bin"/>
-        <copy toDir="${installDirectory}/bin">
-            <fileset dir="${sourceDirectory}/bin" includes="*"/>
-            <filterset>
-                <filter token="GROOVYJAR" value="groovy-${groovyVersion}.jar"/>
-            </filterset>
-        </copy>
-
-        <!-- Tweak scripts for platform compatibility -->
-        <fixcrlf srcdir="${installDirectory}/bin" eol="lf" excludes="*.bat"/>
-        <fixcrlf srcdir="${installDirectory}/bin" eol="crlf" includes="*.bat"/>
-        <chmod perm="ugo+x">
-            <fileset dir="${installDirectory}/bin" includes="*,*.*"/>
-        </chmod>
-    </target>
-
-    <target name="checkstyle" depends="-init,-initializeReports,-checkstyleInit"
-            description="Create the code style reports.">
-        <checkAndReport
-                reportDirectory="${reportsDirectory}/checkstyle"
-                sourceDirectory="${mainSourceDirectory}"
-                excludes="org/codehaus/groovy/antlr/parser/*,org/codehaus/groovy/antlr/java/*,org/codehaus/groovy/syntax/Types.java">
-            <path>
-                <pathelement path="${mainClassesDirectory}"/>
-                <path refid="testLibPath"/>
-            </path>
-        </checkAndReport>
-    </target>
-
-    <target name="-compileTools" depends="-initGroovyc,compileMain">
-        <groovyc srcdir="${toolsSourceDirectory}" destdir="${toolsClassesDirectory}" fork="true">
-            <classpath>
-                <path refid="toolsPath"/>
-                <pathelement path="${mainClassesDirectory}"/>
-                <path refid="compilePath"/>
-            </classpath>
-        </groovyc>
-        <copy todir="${toolsClassesDirectory}">
-            <fileset dir="${toolsSourceDirectory}">
-                <include name="**/*.html"/>
-            </fileset>
-        </copy>
-    </target>
-
-    <target name="cruiseReportExtras">
-        <mkdir dir="${cruiseReportRootDirectory}"/>
-        <copy todir="${cruiseReportRootDirectory}">
-            <fileset dir="cruise/html"/>
-        </copy>
-    </target>
-
-    <target name="cruiseInit">
-        <property name="noTextReports" value="true"/>
-        <property name="forceCoverage" value="true"/>
-        <delete dir="${reportsDirectory}" quiet="true" failonerror="false"/>
-        <delete dir="${junitRawDirectory}" quiet="true" failonerror="false"/>
-    </target>
-
-    <target name="cruise" depends="cruiseInit,fulldist,cruiseReportExtras"/>
-
-    <target name="-docInit">
-        <mkdir dir="${docsDirectory}"/>
-        <property name="docFooter" value="Copyright &amp;copy; 2003-2009 The Codehaus. All rights reserved."/>
-        <property name="title" value="Groovy ${groovyVersion}"/>
-    </target>
-
-    <target name="doc" depends="javadoc, groovydoc" description="Create the documentation."/>
-
-   <target name="javadoc" depends="-fetchDependencies,-docInit,-jvm14BuildWarning,ensureGrammars"
-            description="Create the javadoc documentation.">
-        <javadoc destdir="${docsDirectory}/api" author="true" version="true"
-                 windowtitle="${title}" doctitle="${title}"
-                 encoding="ISO-8859-1" useexternalfile="true" source="1.5"
-                 footer="${docFooter}"
-                 maxmemory="${javaDoc_mx}"
-                 >
-            <classpath>
-                <path path="${mainClassesDirectory}"/>
-                <path refid="compilePath"/>
-            </classpath>
-            <fileset dir="${mainSourceDirectory}" includes="**/*.java"/>
-            <link href="http://java.sun.com/j2se/1.5.0/docs/api"/>
-            <link href="http://www.dpml.net/api/ant/1.7.0"/>
-            <link href="http://junit.sourceforge.net/junit3.8.1/javadoc/"/>
-            <link href="http://java.sun.com/j2ee/1.4/docs/api"/>
-            <link href="http://www.antlr2.org/javadoc"/>
-        </javadoc>
-        <mkdir dir="${targetDistDirectory}"/>
-        <jar basedir="${docsDirectory}/api" destfile="${targetDistDirectory}/groovy-${groovyVersion}-javadoc.jar"/>
-        <copy toFile="${targetDistDirectory}/groovy-all-${groovyVersion}-javadoc.jar">
-            <fileset file="${targetDistDirectory}/groovy-${groovyVersion}-javadoc.jar"/>
-        </copy>
-    </target>
-
-    <target name="groovydoc" depends="-fetchDependencies">
-        <path id="groovydocpath">
-            <path path="${mainClassesDirectory}"/>
-            <path refid="runtimePath"/>
-            <path path="${java.class.path}"/>
-        </path>
-        <antforked target="realgroovydoc" maxmemory="${groovyDoc_mx}" classpathref="groovydocpath"/>
-    </target>
-
-    <target name="realgroovydoc" depends="-fetchDependencies,-docInit,-includeGroovyDocTemplates,docGDK">
-        <taskdef name="groovydoc" classname="org.codehaus.groovy.ant.Groovydoc">
-            <classpath>
-                <path path="${mainClassesDirectory}"/>
-                <path refid="compilePath"/>
-            </classpath>
-        </taskdef>
-        <groovydoc
-                destdir="${docsDirectory}/gapi"
-                sourcepath="${mainSourceDirectory}"
-                packagenames="**.*"
-                use="true"
-                windowtitle="${title}"
-                doctitle="${title}"
-                header="${title}"
-                footer="${docFooter}"
-                overview="src/main/overview.html"
-                private="false">
-            <link packages="java.,org.xml.,javax.,org.xml." href="http://java.sun.com/j2se/1.5.0/docs/api"/>
-            <link packages="org.apache.ant.,org.apache.tools.ant." href="http://www.dpml.net/api/ant/1.7.0"/>
-            <link packages="org.junit.,junit.framework." href="http://junit.sourceforge.net/junit3.8.1/javadoc/"/>
-            <link packages="antlr." href="http://www.antlr2.org/javadoc/"/>
-            <link packages="javax.servlet.,javax.management." href="http://java.sun.com/j2ee/1.4/docs/api"/>
-            <link packages="groovy.,org.codehaus.groovy." href="http://groovy.codehaus.org/gapi/"/>
-        </groovydoc>
-    </target>
-
-    <target name="docGDK" depends="-fetchDependencies,-compileTools" description="Create the GDK documentation">
-        <java classname="org.codehaus.groovy.tools.DocGenerator" fork="yes" failonerror="true">
-            <classpath>
-                <pathelement path="${toolsClassesDirectory}"/>
-                <path refid="toolsPath"/>
-                <pathelement path="${mainClassesDirectory}"/>
-            </classpath>
-            <arg value="org.codehaus.groovy.runtime.DefaultGroovyMethods"/>
-            <arg value="org.codehaus.groovy.runtime.DefaultGroovyStaticMethods"/>
-            <arg value="org.codehaus.groovy.vmplugin.v5.PluginDefaultGroovyMethods"/>
-        </java>
-        <copy todir="target/html/groovy-jdk" file="src/tools/org/codehaus/groovy/tools/groovy.ico"/>
-        <copy todir="target/html/groovy-jdk" file="src/tools/org/codehaus/groovy/tools/stylesheet.css"/>
-    </target>
-
-    <target name="clean" description="Clean up build artifacts.">
-        <delete dir="${targetDirectory}" quiet="true"/>
-        <delete file="cobertura.ser" quiet="true" failonerror="false"/>
-        <delete quiet="true">
-            <fileset dir="." includes="**/*~"/>
-            <fileset dir="${groovyParserDirectory}" includes="Groovy*.*"/>
-            <fileset dir="${javaParserDirectory}" includes="JavaLexer.java,JavaRecognizer.java,JavaTokenTypes.java,JavaTokenTypes.txt,*.smap"/>
-        </delete>
-    </target>
-
-    <target name="deploy" depends="-mavenDeployInit,install,doc"
-            description="Deploy jars to maven repository.">
-        <mavenDeploy version="${groovyVersion}" prefix="groovy"/>
-        <mavenDeploy version="${groovyVersion}" prefix="groovy-all"/>
-    </target>
-
-    <target name="installRepo" depends="-mavenInit,install,doc"
-            description="Deploy artifacts to local maven repository.">
-        <mavenInstallRepo version="${groovyVersion}" prefix="groovy"/>
-        <mavenInstallRepo version="${groovyVersion}" prefix="groovy-all"/>
-    </target>
-
-    <target name="fulldist" depends="dist,compileExamples,checkstyle" description="dist plus examples plus checkstyle"/>
-
-    <target name="dist" depends="install,doc" description="Create everything needed for a distribution.">
-        <zip destfile="${targetDistDirectory}/groovy-binary-${groovyVersion}.zip"
-             comment="The Groovy ${groovyVersion} binary distribution.">
-
-            <!-- Make unix scripts executable -->
-            <zipfileset dir="${installDirectory}" prefix="groovy-${groovyVersion}" filemode="775">
-                <include name="bin/*"/>
-                <exclude name="bin/*.*"/>
-                <exclude name="bin/startGroovy*"/>
-            </zipfileset>
-
-            <!-- Include the other scripts as is -->
-            <zipfileset dir="${installDirectory}" prefix="groovy-${groovyVersion}">
-                <include name="bin/*.*"/>
-                <include name="bin/startGroovy*"/>
-            </zipfileset>
-
-            <!-- Include everything else as is too -->
-            <zipfileset dir="${installDirectory}" prefix="groovy-${groovyVersion}">
-                <exclude name="bin/**"/>
-                <include name="**"/>
-            </zipfileset>
-        </zip>
-
-        <zip destfile="${targetDistDirectory}/groovy-docs-${groovyVersion}.zip"
-             comment="The Groovy ${groovyVersion} documentation distribution.">
-            <zipfileset dir="${wikiPdfDirectory}" includes="wiki-snapshot.pdf" prefix="groovy-${groovyVersion}/pdf"/>
-            <zipfileset dir="${docsDirectory}" prefix="groovy-${groovyVersion}/html"/>
-        </zip>
-
-        <zip destfile="${targetDistDirectory}/groovy-src-${groovyVersion}.zip"
-             comment="The Groovy ${groovyVersion} source distribution.">
-            <zipfileset dir="${basedir}" prefix="groovy-${groovyVersion}">
-                <!-- Exclude generated bits as well as any other bits that shouldn't make it in -->
-                <exclude name="${targetDirectory}/**"/>
-                <exclude name="classes/**"/>
-                <exclude name="cruise/**"/>
-                <exclude name=".clover/*"/>
-                <exclude name="local.build.properties"/>
-                <exclude name="cobertura.ser"/>
-                <exclude name="junitvmwatcher*.properties"/>
-            </zipfileset>
-        </zip>
-    </target>
-
-</project>
 
=== removed directory '.pc/ant-build.diff/config'
=== removed directory '.pc/ant-build.diff/config/ant'
=== removed file '.pc/ant-build.diff/config/ant/build-setup.xml'
--- .pc/ant-build.diff/config/ant/build-setup.xml	2010-02-26 16:39:51 +0000
+++ .pc/ant-build.diff/config/ant/build-setup.xml	1970-01-01 00:00:00 +0000
@@ -1,78 +0,0 @@
-<?xml version="1.0"?>
-
-<!--
-Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
-compliance with the License. You may obtain a copy of the License at
-
-http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software distributed under the License is
-distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-implied. See the License for the specific language governing permissions and limitations under the License.
-
-This work is copyright by the author(s) and is part of a greater work collectively copyright by the
-Groovy community. See the NOTICE.txt file distributed with this work for additional information.
-
-Author : Paul King
-$Revision: 5519 $ ($LastChangedBy: paulk $)
-$Date: 2007-03-11 19:14:07 +1000 (Sun, 11 Mar 2007) $
--->
-
-<project name="build-setup" default="" basedir="../..">
-
-    <property name="bootstrapDirectory" location="bootstrap"/>
-    <property name="sourceDirectory" value="src"/>
-    <property name="wikiPdfDirectory" value="src"/>
-    <property name="mainSourceDirectory" location="${sourceDirectory}/main"/>
-    <property name="testSourceDirectory" value="${sourceDirectory}/test"/>
-    <property name="toolsSourceDirectory" location="${sourceDirectory}/tools"/>
-    <property name="examplesSourceDirectory" location="${sourceDirectory}/examples"/>
-    
-    <property name="targetDirectory" value="target"/>
-    <property name="installDirectory" value="${targetDirectory}/install"/>
-    <property name="cruiseReportRootDirectory" value="${targetDirectory}/root"/>
-    <property name="stagingDirectory" value="${targetDirectory}/staging"/>
-    <property name="docsDirectory" value="${targetDirectory}/html"/>
-    <property name="mainClassesDirectory" value="${targetDirectory}/classes"/>
-    <property name="testClassesDirectory" value="${targetDirectory}/test-classes"/>
-    <property name="toolsClassesDirectory" value="${targetDirectory}/tools-classes"/>
-    <property name="mainStubsDirectory" value="${targetDirectory}/stubs"/>
-    <property name="testStubsDirectory" value="${targetDirectory}/test-stubs"/>
-
-    <property name="examplesClassesDirectory" value="${targetDirectory}/examples-classes"/>
-    <property name="instrumentedClassesDirectory" value="${targetDirectory}/instrumented-classes"/>
-    <property name="reportsDirectory" value="${targetDirectory}/reports"/>
-    <property name="targetLibDirectory" value="${targetDirectory}/lib"/>
-    <property name="targetDistDirectory" value="${targetDirectory}/dist"/>
-    
-    <property name="antlrDirectory" value="${mainSourceDirectory}/org/codehaus/groovy/antlr"/>
-    <property name="groovyParserDirectory" value="${antlrDirectory}/parser"/>
-    <property name="javaParserDirectory" value="${antlrDirectory}/java"/>
-
-    <property name="compileLibDirectory" value="${targetLibDirectory}/compile"/>
-    <property name="testLibDirectory" value="${targetLibDirectory}/test"/>
-    <property name="runtimeLibDirectory" value="${targetLibDirectory}/runtime"/>
-    <property name="toolsLibDirectory" value="${targetLibDirectory}/tools"/>
-    <property name="examplesLibDirectory" value="${targetLibDirectory}/examples"/>
-    <property name="extrasLibDirectory" value="${targetLibDirectory}/extras"/>
-    <property name="junitRawDirectory" value="${targetDirectory}/test-reports"/>
-    <property name="junitReportsDirectory" value="${reportsDirectory}/junit"/>
-    <property name="relativePathToRealBasedir" value="."/>
-
-    <macrodef name="antforked">
-        <attribute name="target"/>
-        <attribute name="maxmemory" default="256m"/>
-        <attribute name="classpathref" default="runtimePath"/>
-        <sequential>
-            <java classname="org.apache.tools.ant.launch.Launcher" fork="true" maxmemory="@{maxmemory}" failonerror="true">
-                <classpath refid="@{classpathref}"/>
-                <jvmarg value="-Duser.home=${user.home}" />
-                <arg value="@{target}"/>
-                <arg value="-DskipFetch=${skipFetch}"/>
-                <arg value="-DruntimeLibDirectory=${runtimeLibDirectory}"/>
-                <arg value="-DtoolsLibDirectory=${toolsLibDirectory}" />
-            </java>
-        </sequential>
-    </macrodef>
-    
-</project>
 
=== modified file '.pc/applied-patches'
--- .pc/applied-patches	2010-02-26 16:39:51 +0000
+++ .pc/applied-patches	2011-02-24 17:57:34 +0000
@@ -1,3 +1,3 @@
-start-scripts.patch
-ant-build.diff
-disable-bnd.diff
+0001-start-scripts.patch
+0002-ant-build.diff.patch
+0003-disable-bnd.diff.patch
 
=== removed directory '.pc/disable-bnd.diff'
=== removed file '.pc/disable-bnd.diff/build.xml'
--- .pc/disable-bnd.diff/build.xml	2010-02-26 16:39:51 +0000
+++ .pc/disable-bnd.diff/build.xml	1970-01-01 00:00:00 +0000
@@ -1,872 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!--
-Ant build script for Groovy.
-
-Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
-compliance with the License. You may obtain a copy of the License at
-
-http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software distributed under the License is
-distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-implied. See the License for the specific language governing permissions and limitations under the License.
-
-This work is copyright by the author(s) and is part of a greater work collectively copyright by Codehaus on
-behalf of the Groovy community. See the NOTICE.txt file distributed with this work for additional information.
-
-Author : Russel Winder
-Author : Paul King
-$Revision: 18555 $ ($LastChangedBy: paulk $)
-$Date: 2009-12-08 14:08:59 +0100 (Di, 08. Dez 2009) $
--->
-
-<project name="Groovy" default="createJars" basedir=".">
-
-    <property file="local.build.properties"/>
-    <property file="build.properties"/>
-    <property name="ant.requiredVersion" value="1.6.5"/>
-
-    <!-- config/ant/build-maven.xml imports config/ant/build-setup.xml where all the paths are defined. -->
-    <import file="config/ant/build-setup.xml"/>
-    <import file="config/ant/build-checkstyle.xml"/>
-    <import file="config/ant/build-cobertura.xml"/>
-
-    <path id="compilePath">
-        <path path="${java.class.path}" />
-    </path>
-    <path id="toolsPath">
-        <path path="${java.class.path}" />
-    </path>
-
-    <condition property="_skipTests_">
-        <or>
-            <equals arg1="${test}" arg2="false"/>
-            <istrue value="${skipTests}"/>
-        </or>
-    </condition>
-
-    <condition property="_skipExamples_">
-        <istrue value="${skipExamples}"/>
-    </condition>
-
-    <condition property="_skipOsgi_">
-        <istrue value="${skipOsgi}"/>
-    </condition>
-
-    <condition property="_skipFetch_">
-        <istrue value="${skipFetch}"/>
-    </condition>
-
-    <condition property="_skipEmbeddable_">
-        <istrue value="${skipEmbeddable}"/>
-    </condition>
-
-    <condition property="groovy.build.vm4">
-        <contains string="${ant.java.version}" substring="1.4"/>
-    </condition>
-
-    <condition property="groovy.build.vm6">
-        <contains string="${ant.java.version}" substring="1.6"/>
-    </condition>
-
-    <presetdef name="javac">
-        <javac memoryMaximumSize="500m"/>
-    </presetdef>
-
-    <target name="-initCoverage">
-        <condition property="_forceCoverage_">
-            <and>
-                <not>
-                    <istrue value="${skipTests}"/>
-                </not>
-                <istrue value="${forceCoverage}"/>
-            </and>
-        </condition>
-    </target>
-
-    <target name="ensureGrammars" description="Ensure all the Antlr generated files are up to date.">
-        <mkdir dir="${groovyParserDirectory}"/>
-        <antlr target="${antlrDirectory}/groovy.g" outputdirectory="${groovyParserDirectory}">
-            <classpath refid="compilePath"/>
-        </antlr>
-        <antlr target="${javaParserDirectory}/java.g" outputdirectory="${javaParserDirectory}">
-            <classpath refid="compilePath"/>
-        </antlr>
-    </target>
-
-    <target name="updatePolicy">
-        <move file="security/groovy.policy" tofile="security/groovy.policy.template"/>
-        <copy tofile="security/groovy.policy">
-            <fileset file="security/groovy.policy.template"/>
-            <filterset>
-                <filter token="relativePathToRealBasedir" value="${relativePathToRealBasedir}"/>
-            </filterset>
-        </copy>
-    </target>
-
-    <target name="-init">
-        <xslt in="pom.xml" out="${targetDirectory}/groovy-all.pom" style="config/maven/groovy-all.xsl"/>
-    </target>
-
-    <target name="-banner">
-        <echo message="Java Runtime Environment version: ${java.version}"/>
-        <echo message="Java Runtime Environment vendor: ${java.vendor}"/>
-        <echo message="Ant version: ${ant.version}"/>
-        <echo message="Operating system name: ${os.name}"/>
-        <echo message="Operating system architecture: ${os.arch}"/>
-        <echo message="Operating system version: ${os.version}"/>
-        <echo message="Base directory: ${basedir}"/>
-        <echo message="Java Home: ${java.home}"/>
-    </target>
-
-    <target name="-jvm14BuildWarning" if="groovy.build.vm4">
-        <fail>Aborting!
-
-================================================
-  ERROR: You must build Groovy with a 1.5+ JDK
-================================================
-        </fail>
-    </target>
-
-    <target name="-checkAntVersion" depends="-excludeLegacyAntVersion"
-            description="Check that we are running on the required version of Ant."/>
-
-    <target name="-excludeLegacyAntVersion">
-        <!-- antversion didn't exist in early versions of ant so we have
-             a legacy check to provide a nicer error message in this case -->
-        <fail message="You are using ant ${ant.version}, please build using ant ${ant.requiredVersion}+">
-            <condition>
-                <or>
-                    <contains string="${ant.version}" substring="1.1"></contains>
-                    <contains string="${ant.version}" substring="1.2"></contains>
-                    <contains string="${ant.version}" substring="1.3"></contains>
-                    <contains string="${ant.version}" substring="1.4"></contains>
-                    <contains string="${ant.version}" substring="1.5"></contains>
-                    <and>
-                        <contains string="${ant.version}" substring="1.6"></contains>
-                        <not>
-                            <contains string="${ant.version}" substring="${ant.requiredVersion}"></contains>
-                        </not>
-                    </and>
-                </or>
-            </condition>
-        </fail>
-    </target>
-
-    <!-- add back in if we make 1.7+ minimal required version for build again
-        <target name="-ensureRequiredAntVersion">
-           <fail message="You are using ant ${ant.version}, please install using ant ${ant.requiredVersion}+"/>
-               <condition><not><antversion atleast="${ant.requiredVersion}"/></not></condition>
-           </fail>
-        </target>
-    -->
-
-    <target name="dgmConvert" depends="stagedcompile">
-        <java classname="org.codehaus.groovy.tools.DgmConverter"
-              fork="yes"
-              failonerror="true">
-            <classpath refid="compilePath"/>
-            <classpath path="${mainClassesDirectory}"/>
-        </java>
-    </target>
-
-    <target name="compileMain" depends="stagedcompile,dgmConvert"
-            description="Compile the Java and Groovy code in the main source.">
-    </target>
-
-    <target name="stagedcompile" depends="-init,ensureGrammars,-jvm14BuildWarning" unless="uber">
-        <mkdir dir="${mainClassesDirectory}"/>
-        <mkdir dir="${toolsClassesDirectory}"/>
-
-        <javac srcdir="${mainSourceDirectory}" includeantruntime="false" destdir="${mainClassesDirectory}"
-               deprecation="on" debug="yes" source="1.5" target="1.5" fork="true" classpathref="compilePath">
-            <exclude name="groovy/ui/**/*.java"/>
-        </javac>
-        <antcall inheritrefs="true" target="-stagedcompile-groovy"/>
-        <antcall target="-includeResources"/>
-    </target>
-
-    <target name="-stagedcompile-groovy" depends="-initGroovyc">
-        <groovyc srcdir="${mainSourceDirectory}" destdir="${mainClassesDirectory}" fork="true" memorymaximumsize="${groovycMain_mx}">
-            <classpath>
-                <pathelement path="${mainClassesDirectory}"/>
-                <path refid="compilePath"/>
-            </classpath>
-            <javac deprecation="on" debug="yes" source="1.5" target="1.5"/>
-        </groovyc>
-    </target>
-
-    <property name="vm5GroovySourceFiles" value="**/*.groovy"/>
-    <property name="vm5JavaSourceFiles" value="**/*.java"/>
-    <property name="vm6GroovySourceFiles" value="groovy/**/vm6/*Test.groovy"/>
-
-    <target name="-initGroovyc">
-        <path id="groovyMainClasses">
-            <pathelement path="${mainClassesDirectory}"/>
-            <path refid="compilePath"/>
-        </path>
-        <taskdef name="groovyc" classname="org.codehaus.groovy.ant.Groovyc" classpathref="groovyMainClasses"/>
-    </target>
-
-    <target name="compileTest" depends="compileMain,compileTestOnly"
-            description="Compile the Java and Groovy code in the test source."/>
-
-    <target name="-cleanTest">
-        <delete dir="${testClassesDirectory}"/>
-    </target>
-
-    <target name="compileTestOnly" unless="_skipTests_">
-        <mkdir dir="${testClassesDirectory}"/>
-        <antcall inheritrefs="true" target="-compileTest"/>
-    </target>
-
-    <target name="-compileTest" depends="-initGroovyc,-compileTest_vm6">
-        <groovyc srcdir="${testSourceDirectory}"
-                 destdir="${testClassesDirectory}"
-                 includes="${vm5GroovySourceFiles},${vm5JavaSourceFiles}"
-                 excludes="${vm6GroovySourceFiles}"
-                 fork="true"
-                 memorymaximumsize="${groovycTest_mx}">
-            <classpath>
-                <pathelement path="${testClassesDirectory}"/>
-                <path refid="groovyMainClasses"/>
-                <path refid="testLibPath"/>
-            </classpath>
-            <javac source="1.5" target="1.5" nowarn="on"/>
-        </groovyc>
-    </target>
-
-    <target name="-compileTest_vm6" if="groovy.build.vm6">
-        <groovyc srcdir="${testSourceDirectory}"
-                 destdir="${testClassesDirectory}"
-                 includes="${vm6GroovySourceFiles}"
-                 fork="true"
-                 memorymaximumsize="${groovycTest_mx}">
-            <classpath>
-                <pathelement path="${testClassesDirectory}"/>
-                <path refid="groovyMainClasses"/>
-                <path refid="testLibPath"/>
-            </classpath>
-            <!-- currently not needed, add in if/when required -->
-            <!--<javac source="1.5" target="1.5" nowarn="on"/>-->
-        </groovyc>
-    </target>
-
-    <target name="compileExamples" depends="-init,-initGroovyc,compileMain,-includeExamplesResources" unless="_skipExamples_"
-            description="Compile the Java and Groovy code in the examples source directory.">
-        <mkdir dir="${examplesClassesDirectory}"/>
-        <echo message="Compiling example code."/>
-
-        <groovyc srcdir="${examplesSourceDirectory}/webapps/groovlet-examples/WEB-INF/groovy"
-                 destdir="${examplesClassesDirectory}"
-                 fork="true"
-                 memorymaximumsize="${groovycExamples_mx}">
-            <classpath>
-                <pathelement path="${mainClassesDirectory}"/>
-                <path refid="compilePath"/>
-                <path refid="examplesPath"/>
-            </classpath>
-        </groovyc>
-        <javac srcdir="${examplesSourceDirectory}"
-                destdir="${examplesClassesDirectory}"
-                source="1.5"
-                target="1.5"
-                fork="true">
-            <classpath>
-                <pathelement path="${mainClassesDirectory}"/>
-                <pathelement path="${examplesClassesDirectory}"/>
-                <path refid="compilePath"/>
-                <path refid="examplesPath"/>
-            </classpath>
-        </javac>
-        <groovyc srcdir="${examplesSourceDirectory}"
-                destdir="${examplesClassesDirectory}"
-                 fork="true"
-                 memorymaximumsize="${groovycExamples_mx}"
-                 excludes="webapps/groovlet-examples/WEB-INF/groovy/**/*.groovy,org/codehaus/groovy/grails/compiler/injection/**/*.java">
-            <classpath>
-                <pathelement path="${mainClassesDirectory}"/>
-                <pathelement path="${examplesClassesDirectory}"/>
-                <path refid="compilePath"/>
-                <path refid="examplesPath"/>
-            </classpath>
-            <javac source="1.5" target="1.5"/>
-        </groovyc>
-
-    </target>
-
-    <target name="-initializeReports">
-        <mkdir dir="${reportsDirectory}"/>
-    </target>
-
-    <condition property="_shouldBeHeadless_">
-        <or>
-            <istrue value="${java.awt.headless}"/>
-            <!--<os name="Mac OS X"/>-->
-        </or>
-    </condition>
-
-    <target name="-testInit" depends="-initHeadless">
-        <property name="headlessArg" value=""/>
-        <property name="junitJvmArgs"
-                  value="-Xms${groovyJUnit_ms} -XX:PermSize=${groovyJUnit_permSize} -XX:MaxPermSize=${groovyJUnit_maxPermSize} ${headlessArg} -Dgroovy.testdb.props=${groovy.testdb.props}"/>
-    </target>
-
-    <target name="-initHeadless" if="_shouldBeHeadless_">
-        <property name="headlessArg" value="-Djava.awt.headless=true"/>
-        <echo message="Setting headless mode ..."/>
-    </target>
-
-    <target name="test"
-            depends="-banner,-checkAntVersion,-initializeReports,compileTest,-coverageInstrument,-testInit,-testOne,-testAll,-reportTestFailed"
-            description="Compile and test all the classes (or just one class if testCase property is defined)."/>
-
-    <target name="clean-test" depends="clean,test"
-            description="Clean and compile and test all the classes (or just one class if testCase property is defined)."/>
-
-    <condition property="_testOne_">
-        <and>
-            <not>
-                <istrue value="${_skipTests_}"/>
-            </not>
-            <isset property="testCase"/>
-        </and>
-    </condition>
-
-    <target name="-testOne" if="_testOne_" depends="-initGroovyc">
-        <mkdir dir="${junitRawDirectory}"/>
-        <junit printsummary="true" fork="true" includeantruntime="false" failureproperty="testFailed" maxmemory="${groovyJUnit_mx}" dir="${basedir}">
-            <sysproperty key="apple.awt.UIElement" value="true"/>
-            <!-- keeps the dock from showing the AWT startup -->
-            <jvmarg line="${junitJvmArgs}"/>
-            <test name="${testCase}" todir="${junitRawDirectory}"/>
-            <formatter type="brief" usefile="false"/>
-            <classpath>
-                <pathelement path="${instrumentedClassesDirectory}"/>
-                <pathelement path="src/test"/>
-                <path refid="groovyMainClasses"/>
-                <path refid="testLibPath"/>
-                <pathelement path="${testClassesDirectory}"/>
-                <path refid="coberturaPath"/>
-            </classpath>
-            <assertions>
-                <enable/>
-            </assertions>
-        </junit>
-    </target>
-
-    <condition property="_testAll_">
-        <and>
-            <not>
-                <istrue value="${_skipTests_}"/>
-            </not>
-            <not>
-                <isset property="_testOne_"/>
-            </not>
-        </and>
-    </condition>
-
-    <target name="-collectOptionalTests">
-        <condition property="networkTests.fileset.includes" value="groovy/grape/*Test.class" else="-nothing-">
-            <istrue value="${junit.network}"/>
-        </condition>
-        <fileset id="optionalTests.fileset" dir="${testClassesDirectory}" includes="${networkTests.fileset.includes}"/>
-    </target>
-
-    <target name="-collect15tests" unless="groovy.build.vm6">
-        <fileset id="ubertests.fileset" dir="${testClassesDirectory}" includes="UberTest*.class" excludes="Uber*VM6.class,groovy/grape/*Test.class"/>
-    </target>
-
-    <target name="-collect16tests" if="groovy.build.vm6">
-        <fileset id="ubertests.fileset" dir="${testClassesDirectory}" includes="UberTest*.class" excludes="groovy/grape/*Test.class"/>
-    </target>
-
-    <target name="-testAll" if="_testAll_" depends="-collect15tests,-collect16tests,-collectOptionalTests,-initGroovyc">
-        <mkdir dir="${junitRawDirectory}"/>
-        <junit printsummary="true" fork="true" includeantruntime="false" failureproperty="testFailed" maxmemory="${groovyJUnit_mx}" dir="${basedir}">
-            <jvmarg line="${junitJvmArgs}"/>
-            <sysproperty key="apple.awt.UIElement" value="true"/>
-            <!-- keeps the dock from showing the AWT startup -->
-            <formatter type="xml"/>
-            <formatter type="plain" unless="noTextReports"/>
-            <batchtest todir="${junitRawDirectory}">
-                <fileset refid="ubertests.fileset"/>
-                <fileset refid="optionalTests.fileset"/>
-            </batchtest>
-            <classpath>
-                <pathelement path="${instrumentedClassesDirectory}"/>
-                <pathelement path="src/test"/>
-                <path refid="groovyMainClasses"/>
-                <path refid="testLibPath"/>
-                <pathelement path="${testClassesDirectory}"/>
-                <path refid="coberturaPath"/>
-            </classpath>
-            <assertions>
-                <enable/>
-            </assertions>
-        </junit>
-        <mkdir dir="${junitReportsDirectory}"/>
-        <junitreport tofile="${junitRawDirectory}/Results.xml">
-            <fileset dir="${junitRawDirectory}" includes="TEST-*.xml"/>
-            <report format="frames" todir="${junitReportsDirectory}"/>
-        </junitreport>
-    </target>
-
-    <target name="-reportTestFailed" depends="-coverageReport" if="testFailed">
-        <fail message="Test failed, not processing further targets."/>
-    </target>
-
-    <target name="-coverageInstrument" if="_forceCoverage_">
-        <mkdir dir="${instrumentedClassesDirectory}"/>
-        <!--coberturaInstrument classesDirectory="${mainClassesDirectory}"/-->
-    </target>
-
-    <target name="-coverageReport" depends="-initCoverage" if="_forceCoverage_">
-        <!--coberturaReport reportDirectory="${reportsDirectory}/cobertura" sourceDirectory="${mainSourceDirectory}"/-->
-    </target>
-
-    <target name="-actuallyCreateJars"
-            depends="-makeManifest,-initializeJars,-createBaseJar,-createEmbeddableJar"
-            unless="testFailed"/>
-
-    <target name="-makeManifest">
-        <mkdir dir="${mainClassesDirectory}/META-INF"/>
-        <copy todir="${mainClassesDirectory}/META-INF" file="LICENSE.txt"/>
-    	<makeManifest file="${mainClassesDirectory}/META-INF/MANIFEST.MF"/>
-	</target>
-
-    <macrodef name="makeManifest">
-    	<attribute name="file"/>
-    	<attribute name="bundleEnvironment" default="J2SE-1.5"/>
-        <sequential>
-            <manifest file="@{file}">
-                <attribute name="Built-By" value="${user.name}"/>
-                <attribute name="Extension-Name" value="groovy"/>
-                <attribute name="Specification-Title" value="Groovy: a powerful, dynamic language for the JVM"/>
-                <attribute name="Specification-Version" value="${groovyVersion}"/>
-                <attribute name="Specification-Vendor" value="The Codehaus"/>
-                <attribute name="Implementation-Title" value="Groovy: a powerful, dynamic language for the JVM"/>
-                <attribute name="Implementation-Version" value="${groovyVersion}"/>
-                <attribute name="Implementation-Vendor" value="The Codehaus"/>
-                <attribute name="Bundle-ManifestVersion" value="2" />
-                <attribute name="Bundle-Name" value="Groovy Runtime" />
-                <attribute name="Bundle-Description" value="Groovy Runtime" />
-                <attribute name="Bundle-Version" value="${groovyBundleVersion}" />
-                <attribute name="Bundle-Vendor" value="The Codehaus" />
-                <attribute name="Bundle-ClassPath" value="." />
-                <attribute name="Bundle-RequiredExecutionEnvironment" value="@{bundleEnvironment}" />
-                <attribute name="Eclipse-BuddyPolicy" value="dependent"/>
-                <attribute name="Eclipse-LazyStart" value="true"/>
-                <attribute name="DynamicImport-Package" value="*"/>
-            </manifest>
-        </sequential>
-    </macrodef>
-
-    <target name="-includeResources" depends="-includeGroovyDocTemplates">
-        <copy todir="${mainClassesDirectory}">
-            <fileset dir="${mainSourceDirectory}">
-                <include name="META-INF/services/*"/>
-                <include name="groovy/grape/*.xml"/>
-                <include name="groovy/ui/*.properties"/>
-                <include name="groovy/ui/**/*.png"/>
-                <include name="groovy/inspect/swingui/AstBrowserProperties.groovy"/>
-                <include name="org/codehaus/groovy/tools/shell/**/*.properties"/>
-                <include name="org/codehaus/groovy/tools/shell/**/*.xml"/>
-                <include name="org/codehaus/groovy/antlib.xml"/>
-            </fileset>
-        </copy>
-    	<antcall target="-includeReleaseInfo"/>
-    </target>
-
-    <target name="-includeReleaseInfo">
-        <copy file="${mainSourceDirectory}/META-INF/groovy-release-info.properties" 
-            todir="${mainClassesDirectory}/META-INF" overwrite="true">
-        </copy>
-    	<tstamp>
-    	    <format property="release.date" pattern="dd-MMM-yyyy"/>
-    	    <format property="release.time" pattern="hh:mm aa"/>
-    	</tstamp>
-        <replace file="${mainClassesDirectory}/META-INF/groovy-release-info.properties">
-          <replacefilter token="##ImplementationVersion##" value="${groovyVersion}"/>   
-          <replacefilter token="##BundleVersion##" value="${groovyBundleVersion}"/>
-          <replacefilter token="##BuildDate##" value="${release.date}"/>
-          <replacefilter token="##BuildTime##" value="${release.time}"/>
-        </replace>
-    </target>
-
-    <target name="-includeExamplesResources" depends="-includeGroovyDocTemplates">
-        <copy todir="${examplesClassesDirectory}">
-            <fileset dir="${examplesSourceDirectory}">
-                <include name="/swing/binding/caricature/resources/*.gif"/>
-            </fileset>
-        </copy>
-    </target>
-
-    <target name="-includeGroovyDocTemplates">
-        <copy todir="${mainClassesDirectory}">
-            <fileset dir="${mainSourceDirectory}">
-                <include name="org/codehaus/groovy/tools/groovydoc/gstringTemplates/**/*.*"/>
-            </fileset>
-            <fileset dir="${toolsSourceDirectory}">
-                <include name="org/codehaus/groovy/tools/groovy.ico"/>
-            </fileset>
-        </copy>
-    </target>
-
-    <target name="-initializeJars" depends="test">
-        <delete dir="${targetDistDirectory}" quiet="true"/>
-        <mkdir dir="${targetDistDirectory}"/>
-    </target>
-
-    <target name="-createBaseJar" unless="testFailed">
-        <jar destfile="${targetDistDirectory}/groovy.jar" basedir="${mainClassesDirectory}"
-             excludes="*.groovy" manifest="${mainClassesDirectory}/META-INF/MANIFEST.MF"/>
-        <jar destfile="${targetDistDirectory}/groovy-${groovyVersion}-sources.jar" basedir="${mainSourceDirectory}"/>
-    </target>
-
-    <target name="-jarjarInit" unless="_skipEmbeddable_">
-        <taskdef name="jarjar" classname="com.tonicsystems.jarjar.JarJarTask" classpathref="toolsPath"/>
-    </target>
-
-    <target name="-createEmbeddableJar" depends="-jarjarInit,-actuallyCreateEmbeddableJar" unless="testFailed"/>
-
-    <target name="-actuallyCreateEmbeddableJar" unless="_skipEmbeddable_">
-        <delete dir="${stagingDirectory}" quiet="true"/>
-        <mkdir dir="${stagingDirectory}"/>
-        <unzip dest="${stagingDirectory}">
-            <fileset dir="/usr/share/java">
-                <include name="antlr.jar"/>
-                <include name="asm3.jar"/>
-                <include name="asm3-commons.jar"/>
-                <include name="asm3-tree.jar"/>
-                <include name="asm3-xml.jar"/>
-            </fileset>
-        </unzip>
-        <unzip dest="${stagingDirectory}">
-            <fileset dir="${targetDistDirectory}">
-                <include name="groovy.jar"/>
-            </fileset>
-        </unzip>
-        <copy toDir="${stagingDirectory}/META-INF">
-            <fileset dir="${basedir}/config/build">
-                <include name="*LICENSE.txt"/>
-            </fileset>
-        </copy>
-        <!-- add commons-cli -->
-        <unzip dest="${stagingDirectory}">
-            <patternset>
-                <!-- no need for the manifest file, we have our own -->
-                <exclude name="META-INF/MANIFEST.MF"/>
-            </patternset>
-            <globmapper from="META-INF/LICENSE.txt" to="META-INF/CLI-LICENSE.txt"/>
-            <fileset dir="/usr/share/java">
-                <include name="commons-cli.jar"/>
-            </fileset>
-        </unzip>
-        <makeManifest file="${stagingDirectory}/META-INF/MANIFEST.MF" />
-        <!-- TODO try to make use of jarjar keep ability -->
-        <jarjar jarfile="${targetDistDirectory}/groovy-all.jar"
-                manifest="${stagingDirectory}/META-INF/MANIFEST.MF">
-            <fileset dir="${stagingDirectory}" excludes="groovy/util/CliBuilder*.class,groovy/util/OptionAccessor*.class,org/codehaus/groovy/tools/shell/util/HelpFormatter*.class"/>
-            <rule pattern="antlr.**" result="groovyjarjarantlr.@1"/>
-            <rule pattern="org.objectweb.**" result="groovyjarjarasm.@1"/>
-            <rule pattern="org.apache.commons.cli.**" result="groovyjarjarcommonscli.@1"/>
-        </jarjar>
-        <jar destfile="${targetDistDirectory}/groovy-all.jar" update="true"
-             basedir="${stagingDirectory}" includes="groovy/util/CliBuilder*.class,groovy/util/OptionAccessor*.class,org/codehaus/groovy/tools/shell/util/HelpFormatter*.class"/>
-
-        <copy file="${targetDistDirectory}/groovy-${groovyVersion}-sources.jar"
-              tofile="${targetDistDirectory}/groovy-all-${groovyVersion}-sources.jar"/>
-        <delete dir="${stagingDirectory}" quiet="true"/>
-    </target>
-    
-    <target name="createJars" depends="-checkAntVersion,test,-actuallyCreateJars"
-            description="Build Groovy and create the jarfiles."/>
-
-    <target name="updateJarsForOsgi" unless="_skipOsgi_">
-        <taskdef resource="aQute/bnd/ant/taskdef.properties" classpath="/usr/share/java/bnd.jar"/>
-        <copy todir="${targetDistDirectory}">
-            <fileset dir="config/bnd" includes="groovy*.bnd"/>
-            <filterset>
-                <filter token="GROOVY_BUNDLE_VERSION" value="${groovyBundleVersion}"/>
-            </filterset>
-        </copy>
-        <property name="jarsToWrap" value="groovy.jar,groovy-all.jar" />
-        <bndwrap definitions="${targetDistDirectory}" output="${targetDistDirectory}" failok="true">
-            <fileset dir="${targetDistDirectory}" includes="${jarsToWrap}"/>
-        </bndwrap>
-        <delete dir="${targetDistDirectory}" includes="${jarsToWrap}"/>
-        <move todir="${targetDistDirectory}">
-            <fileset dir="${targetDistDirectory}" includes="groovy*.bar"/>
-            <globmapper from="groovy*.bar" to="groovy*-${groovyVersion}.jar"/>
-        </move>
-        <delete dir="${targetDistDirectory}" includes="groovy*.bnd"/>
-    </target>
-
-    <target name="skipOsgi" if="_skipOsgi_">
-        <move todir="${targetDistDirectory}">
-            <fileset dir="${targetDistDirectory}" includes="groovy*.jar"/>
-            <globmapper from="groovy*.jar" to="groovy*-${groovyVersion}.jar"/>
-        </move>
-    </target>
-
-    <target name="install" depends="createJars,updateJarsForOsgi,skipOsgi" unless="testFailed"
-            description="Create an installation hierarchy in target/install.">
-
-        <!--
-        FIXME: It's not really a good idea to delete stuff, as it tends to negate Ant's (or other tools)
-               ability to run faster incremental builds.
-        -->
-        <delete dir="${installDirectory}" quiet="true"/>
-        <mkdir dir="${installDirectory}"/>
-
-        <!-- Install license files -->
-        <copy todir="${installDirectory}">
-            <fileset dir="${basedir}">
-                <include name="LICENSE.txt"/>
-                <include name="NOTICE.txt"/>
-            </fileset>
-        </copy>
-        <unzip dest="${installDirectory}">
-            <patternset>
-                <include name="META-INF/*-LICENSE.txt"/>
-            </patternset>
-            <mapper type="flatten"/>
-            <fileset file="${targetDistDirectory}/groovy-all-${groovyVersion}.jar"/>
-        </unzip>
-        <fixcrlf srcdir="${installDirectory}" eol="crlf" includes="*.txt"/>
-
-        <!-- Install generated artifacts and runtime dependencies -->
-        <mkdir dir="${installDirectory}/lib"/>
-        <copy todir="${installDirectory}/lib">
-            <fileset dir="${targetDistDirectory}" includes="groovy-${groovyVersion}.jar"/>
-        </copy>
-
-        <!-- Install the embeddable bits -->
-        <mkdir dir="${installDirectory}/embeddable"/>
-        <copy todir="${installDirectory}/embeddable">
-            <fileset dir="${targetDistDirectory}" includes="groovy-all-${groovyVersion}.jar"/>
-        </copy>
-
-        <!-- Install configuration files -->
-        <mkdir dir="${installDirectory}/conf"/>
-        <copy toDir="${installDirectory}/conf">
-            <fileset dir="${sourceDirectory}/conf" includes="*"/>
-        </copy>
-
-        <!-- Install scripts -->
-        <mkdir dir="${installDirectory}/bin"/>
-        <copy toDir="${installDirectory}/bin">
-            <fileset dir="${sourceDirectory}/bin" includes="*"/>
-            <filterset>
-                <filter token="GROOVYJAR" value="groovy-${groovyVersion}.jar"/>
-            </filterset>
-        </copy>
-
-        <!-- Tweak scripts for platform compatibility -->
-        <fixcrlf srcdir="${installDirectory}/bin" eol="lf" excludes="*.bat"/>
-        <fixcrlf srcdir="${installDirectory}/bin" eol="crlf" includes="*.bat"/>
-        <chmod perm="ugo+x">
-            <fileset dir="${installDirectory}/bin" includes="*,*.*"/>
-        </chmod>
-    </target>
-
-    <target name="checkstyle" depends="-init,-initializeReports"
-            description="Create the code style reports.">
-        <checkAndReport
-                reportDirectory="${reportsDirectory}/checkstyle"
-                sourceDirectory="${mainSourceDirectory}"
-                excludes="org/codehaus/groovy/antlr/parser/*,org/codehaus/groovy/antlr/java/*,org/codehaus/groovy/syntax/Types.java">
-            <path>
-                <pathelement path="${mainClassesDirectory}"/>
-                <path refid="testLibPath"/>
-            </path>
-        </checkAndReport>
-    </target>
-
-    <target name="-compileTools" depends="-initGroovyc,compileMain">
-        <groovyc srcdir="${toolsSourceDirectory}" destdir="${toolsClassesDirectory}" fork="true">
-            <classpath>
-                <path refid="toolsPath"/>
-                <pathelement path="${mainClassesDirectory}"/>
-                <path refid="compilePath"/>
-            </classpath>
-        </groovyc>
-        <copy todir="${toolsClassesDirectory}">
-            <fileset dir="${toolsSourceDirectory}">
-                <include name="**/*.html"/>
-            </fileset>
-        </copy>
-    </target>
-
-    <target name="cruiseReportExtras">
-        <mkdir dir="${cruiseReportRootDirectory}"/>
-        <copy todir="${cruiseReportRootDirectory}">
-            <fileset dir="cruise/html"/>
-        </copy>
-    </target>
-
-    <target name="cruiseInit">
-        <property name="noTextReports" value="true"/>
-        <property name="forceCoverage" value="true"/>
-        <delete dir="${reportsDirectory}" quiet="true" failonerror="false"/>
-        <delete dir="${junitRawDirectory}" quiet="true" failonerror="false"/>
-    </target>
-
-    <target name="cruise" depends="cruiseInit,fulldist,cruiseReportExtras"/>
-
-    <target name="-docInit">
-        <mkdir dir="${docsDirectory}"/>
-        <property name="docFooter" value="Copyright &amp;copy; 2003-2009 The Codehaus. All rights reserved."/>
-        <property name="title" value="Groovy ${groovyVersion}"/>
-    </target>
-
-    <target name="doc" depends="javadoc, groovydoc" description="Create the documentation."/>
-
-   <target name="javadoc" depends="-docInit,-jvm14BuildWarning,ensureGrammars"
-            description="Create the javadoc documentation.">
-        <javadoc destdir="${docsDirectory}/api" author="true" version="true"
-                 windowtitle="${title}" doctitle="${title}"
-                 encoding="ISO-8859-1" useexternalfile="true" source="1.5"
-                 footer="${docFooter}"
-                 maxmemory="${javaDoc_mx}"
-                 >
-            <classpath>
-                <path path="${mainClassesDirectory}"/>
-                <path refid="compilePath"/>
-            </classpath>
-            <fileset dir="${mainSourceDirectory}" includes="**/*.java"/>
-            <link href="http://java.sun.com/j2se/1.5.0/docs/api"/>
-            <link href="http://www.dpml.net/api/ant/1.7.0"/>
-            <link href="http://junit.sourceforge.net/junit3.8.1/javadoc/"/>
-            <link href="http://java.sun.com/j2ee/1.4/docs/api"/>
-            <link href="http://www.antlr2.org/javadoc"/>
-        </javadoc>
-        <mkdir dir="${targetDistDirectory}"/>
-        <jar basedir="${docsDirectory}/api" destfile="${targetDistDirectory}/groovy-${groovyVersion}-javadoc.jar"/>
-        <copy toFile="${targetDistDirectory}/groovy-all-${groovyVersion}-javadoc.jar">
-            <fileset file="${targetDistDirectory}/groovy-${groovyVersion}-javadoc.jar"/>
-        </copy>
-    </target>
-
-    <target name="groovydoc">
-        <path id="groovydocpath">
-            <path path="${mainClassesDirectory}"/>
-            <path path="${java.class.path}"/>
-        </path>
-        <antforked target="realgroovydoc" maxmemory="${groovyDoc_mx}" classpathref="groovydocpath"/>
-    </target>
-
-    <target name="realgroovydoc" depends="-docInit,-includeGroovyDocTemplates,docGDK">
-        <taskdef name="groovydoc" classname="org.codehaus.groovy.ant.Groovydoc">
-            <classpath>
-                <path path="${mainClassesDirectory}"/>
-                <path refid="compilePath"/>
-            </classpath>
-        </taskdef>
-        <groovydoc
-                destdir="${docsDirectory}/gapi"
-                sourcepath="${mainSourceDirectory}"
-                packagenames="**.*"
-                use="true"
-                windowtitle="${title}"
-                doctitle="${title}"
-                header="${title}"
-                footer="${docFooter}"
-                overview="src/main/overview.html"
-                private="false">
-            <link packages="java.,org.xml.,javax.,org.xml." href="http://java.sun.com/j2se/1.5.0/docs/api"/>
-            <link packages="org.apache.ant.,org.apache.tools.ant." href="http://www.dpml.net/api/ant/1.7.0"/>
-            <link packages="org.junit.,junit.framework." href="http://junit.sourceforge.net/junit3.8.1/javadoc/"/>
-            <link packages="antlr." href="http://www.antlr2.org/javadoc/"/>
-            <link packages="javax.servlet.,javax.management." href="http://java.sun.com/j2ee/1.4/docs/api"/>
-            <link packages="groovy.,org.codehaus.groovy." href="http://groovy.codehaus.org/gapi/"/>
-        </groovydoc>
-    </target>
-
-    <target name="docGDK" depends="-compileTools" description="Create the GDK documentation">
-        <java classname="org.codehaus.groovy.tools.DocGenerator" fork="yes" failonerror="true">
-            <classpath>
-                <pathelement path="${toolsClassesDirectory}"/>
-                <path refid="toolsPath"/>
-                <pathelement path="${mainClassesDirectory}"/>
-            </classpath>
-            <arg value="org.codehaus.groovy.runtime.DefaultGroovyMethods"/>
-            <arg value="org.codehaus.groovy.runtime.DefaultGroovyStaticMethods"/>
-            <arg value="org.codehaus.groovy.vmplugin.v5.PluginDefaultGroovyMethods"/>
-        </java>
-        <copy todir="target/html/groovy-jdk" file="src/tools/org/codehaus/groovy/tools/groovy.ico"/>
-        <copy todir="target/html/groovy-jdk" file="src/tools/org/codehaus/groovy/tools/stylesheet.css"/>
-    </target>
-
-    <target name="clean" description="Clean up build artifacts.">
-        <delete dir="${targetDirectory}" quiet="true"/>
-        <delete file="cobertura.ser" quiet="true" failonerror="false"/>
-        <delete quiet="true">
-            <fileset dir="." includes="**/*~"/>
-            <fileset dir="${groovyParserDirectory}" includes="Groovy*.*"/>
-            <fileset dir="${javaParserDirectory}" includes="JavaLexer.java,JavaRecognizer.java,JavaTokenTypes.java,JavaTokenTypes.txt,*.smap"/>
-        </delete>
-    </target>
-
-    <target name="deploy" depends="install,doc"
-            description="Deploy jars to maven repository.">
-        <mavenDeploy version="${groovyVersion}" prefix="groovy"/>
-        <mavenDeploy version="${groovyVersion}" prefix="groovy-all"/>
-    </target>
-
-    <target name="installRepo" depends="install,doc"
-            description="Deploy artifacts to local maven repository.">
-        <mavenInstallRepo version="${groovyVersion}" prefix="groovy"/>
-        <mavenInstallRepo version="${groovyVersion}" prefix="groovy-all"/>
-    </target>
-
-    <target name="fulldist" depends="dist,compileExamples,checkstyle" description="dist plus examples plus checkstyle"/>
-
-    <target name="dist" depends="install,doc" description="Create everything needed for a distribution.">
-        <zip destfile="${targetDistDirectory}/groovy-binary-${groovyVersion}.zip"
-             comment="The Groovy ${groovyVersion} binary distribution.">
-
-            <!-- Make unix scripts executable -->
-            <zipfileset dir="${installDirectory}" prefix="groovy-${groovyVersion}" filemode="775">
-                <include name="bin/*"/>
-                <exclude name="bin/*.*"/>
-                <exclude name="bin/startGroovy*"/>
-            </zipfileset>
-
-            <!-- Include the other scripts as is -->
-            <zipfileset dir="${installDirectory}" prefix="groovy-${groovyVersion}">
-                <include name="bin/*.*"/>
-                <include name="bin/startGroovy*"/>
-            </zipfileset>
-
-            <!-- Include everything else as is too -->
-            <zipfileset dir="${installDirectory}" prefix="groovy-${groovyVersion}">
-                <exclude name="bin/**"/>
-                <include name="**"/>
-            </zipfileset>
-        </zip>
-
-        <zip destfile="${targetDistDirectory}/groovy-docs-${groovyVersion}.zip"
-             comment="The Groovy ${groovyVersion} documentation distribution.">
-            <zipfileset dir="${wikiPdfDirectory}" includes="wiki-snapshot.pdf" prefix="groovy-${groovyVersion}/pdf"/>
-            <zipfileset dir="${docsDirectory}" prefix="groovy-${groovyVersion}/html"/>
-        </zip>
-
-        <zip destfile="${targetDistDirectory}/groovy-src-${groovyVersion}.zip"
-             comment="The Groovy ${groovyVersion} source distribution.">
-            <zipfileset dir="${basedir}" prefix="groovy-${groovyVersion}">
-                <!-- Exclude generated bits as well as any other bits that shouldn't make it in -->
-                <exclude name="${targetDirectory}/**"/>
-                <exclude name="classes/**"/>
-                <exclude name="cruise/**"/>
-                <exclude name=".clover/*"/>
-                <exclude name="local.build.properties"/>
-                <exclude name="cobertura.ser"/>
-                <exclude name="junitvmwatcher*.properties"/>
-            </zipfileset>
-        </zip>
-    </target>
-
-</project>
 
=== removed directory '.pc/start-scripts.patch'
=== removed directory '.pc/start-scripts.patch/src'
=== removed directory '.pc/start-scripts.patch/src/bin'
=== removed file '.pc/start-scripts.patch/src/bin/startGroovy'
--- .pc/start-scripts.patch/src/bin/startGroovy	2010-02-26 16:39:51 +0000
+++ .pc/start-scripts.patch/src/bin/startGroovy	1970-01-01 00:00:00 +0000
@@ -1,272 +0,0 @@
-# -*- mode:sh -*-
-
-##############################################################################
-##                                                                          ##
-##  Groovy JVM Bootstrap for UN*X                                           ##
-##                                                                          ##
-##############################################################################
-
-##
-## $Revision: 14460 $
-## $Date: 2008-12-17 12:36:49 +0100 (Mi, 17. Dez 2008) $
-##
-
-PROGNAME=`basename "$0"`
-
-#DIRNAME=`dirname "$0"`
-
-SCRIPT_PATH="$0"
-
-# Use the maximum available, or set MAX_FD != -1 to use that value.
-MAX_FD="maximum"
-
-warn ( ) {
-    echo "${PROGNAME}: $*"
-}
-
-die ( ) {
-    warn "$*"
-    exit 1
-}
-
-earlyInit ( ) {
-    return
-}
-
-lateInit ( ) {
-    return
-}
-
-GROOVY_STARTUP="$HOME/.groovy/startup"
-if [ -r "$GROOVY_STARTUP" ] ; then
-    . "$GROOVY_STARTUP"
-fi
-
-earlyInit
-
-# OS specific support (must be 'true' or 'false').
-cygwin=false
-msys=false
-darwin=false
-case "`uname`" in
-  CYGWIN* )
-    cygwin=true
-    ;; 
-  Darwin* )
-    darwin=true
-    ;;
-  MINGW* )
-    msys=true
-    ;;
-esac
-
-if [ "$1" = "-cp" -o "$1" = "-classpath" ] ; then
-    CP=$2
-    shift 2
-fi
-
-# Attempt to set JAVA_HOME if it's not already set.
-if [ -z "$JAVA_HOME" ] ; then
-    if $darwin ; then 
-        [ -z "$JAVA_HOME" -a -d "/Library/Java/Home" ] && export JAVA_HOME="/Library/Java/Home"
-        [ -z "$JAVA_HOME" -a -d "/System/Library/Frameworks/JavaVM.framework/Home" ] && export JAVA_HOME="/System/Library/Frameworks/JavaVM.framework/Home"
-    else
-        javaExecutable="`which javac`"
-        [ -z "$javaExecutable" -o "`expr \"$javaExecutable\" : '\([^ ]*\)'`" = "no" ] && die "JAVA_HOME not set and cannot find javac to deduce location, please set JAVA_HOME."
-        # readlink(1) is not available as standard on Solaris 10.
-        readLink=`which readlink`
-        [ `expr "$readLink" : '\([^ ]*\)'` = "no" ] && die "JAVA_HOME not set and readlink not available, please set JAVA_HOME."
-        javaExecutable="`readlink -f \"$javaExecutable\"`"
-        javaHome="`dirname \"$javaExecutable\"`"
-        javaHome=`expr "$javaHome" : '\(.*\)/bin'`
-        JAVA_HOME="$javaHome"
-        export JAVA_HOME
-
-    fi
-fi
-
-# For Cygwin, ensure paths are in UNIX format before anything is touched.
-if $cygwin ; then
-    [ -n "$GROOVY_HOME" ] && GROOVY_HOME=`cygpath --unix "$GROOVY_HOME"`
-    [ -n "$JAVACMD" ] && JAVACMD=`cygpath --unix "$JAVACMD"`
-    [ -n "$JAVA_HOME" ] && JAVA_HOME=`cygpath --unix "$JAVA_HOME"`
-    [ -n "$CP" ] && CP=`cygpath --path --unix "$CP"`
-else
-    if [ -n "$GROOVY_HOME" -a `expr "$GROOVY_HOME":'\/$'` ] ; then
-        GROOVY_HOME=`echo $GROOVY_HOME | sed -e 's/\/$//'`
-    fi
-fi
-
-#  For MSYS, ensure paths are in appropriate format.
-if $msys
-then
-    [ -n "$JAVA_HOME" ] && JAVA_HOME=`( cd "$JAVA_HOME" ; pwd )`
-fi
-
-# Attempt to set GROOVY_HOME if it is not already set.
-if [ -z "$GROOVY_HOME" -o ! -d "$GROOVY_HOME" ] ; then
-    # Resolve links: $0 may be a link to groovy's home.
-    PRG="$0"
-    # Need this for relative symlinks.
-    while [ -h "$PRG" ] ; do
-        ls=`ls -ld "$PRG"`
-        link=`expr "$ls" : '.*-> \(.*\)$'`
-        if expr "$link" : '/.*' > /dev/null; then
-            PRG="$link"
-        else
-            PRG=`dirname "$PRG"`"/$link"
-        fi
-    done
-    SAVED="`pwd`"
-    cd "`dirname \"$PRG\"`/.."
-    GROOVY_HOME="`pwd -P`"
-    cd "$SAVED"
-fi
-
-# Set the default Groovy config if no specific one is mentioned.
-if [ -z "$GROOVY_CONF" ] ; then
-    GROOVY_CONF="$GROOVY_HOME/conf/groovy-starter.conf"
-fi
-STARTER_CLASSPATH="$GROOVY_HOME/lib/@GROOVYJAR@"
-
-# Create the final classpath. Setting a classpath using the -cp or -classpath option means not to use the
-# global classpath. Groovy behaves then the same as the java interpreter
-if [ -n "$CP" ] ; then
-    CP="$CP":.
-elif [ -n "$CLASSPATH" ] ; then
-    CP="$CLASSPATH":.
-else
-    CP=.
-fi
-
-# Determine the Java command to use to start the JVM.
-if [ -z "$JAVACMD" ] ; then
-    if [ -n "$JAVA_HOME" ] ; then
-        if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
-            # IBM's JDK on AIX uses strange locations for the executables
-            JAVACMD="$JAVA_HOME/jre/sh/java"
-        else
-            JAVACMD="$JAVA_HOME/bin/java"
-        fi
-    else
-        JAVACMD="java"
-    fi
-fi
-if [ ! -x "$JAVACMD" ] ; then
-    die "JAVA_HOME is not defined correctly, can not execute: $JAVACMD"
-fi
-if [ -z "$JAVA_HOME" ] ; then
-    warn "JAVA_HOME environment variable is not set"
-fi
-
-# Increase the maximum file descriptors if we can.
-if [ "$cygwin" = "false" -a "$darwin" = "false" ] ; then
-    MAX_FD_LIMIT=`ulimit -H -n`
-    if [ $? -eq 0 ] ; then
-        if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then
-            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 businessSystem maximum file descriptor limit: $MAX_FD_LIMIT"
-    fi
-fi
-
-# Setup Profiler
-useprofiler=false
-if [ "$PROFILER" != "" ] ; then
-    if [ -r "$PROFILER" ] ; then
-        . $PROFILER
-        useprofiler=true
-    else
-        die "Profiler file not found: $PROFILER"
-    fi
-fi
-
-# For Darwin, use classes.jar for TOOLS_JAR
-TOOLS_JAR="$JAVA_HOME/lib/tools.jar"
-#if $darwin; then
-#    TOOLS_JAR="/System/Library/Frameworks/JavaVM.framework/Versions/CurrentJDK/Classes/classes.jar"
-#fi
-
-# For Darwin, add GROOVY_APP_NAME to the JAVA_OPTS as -Xdock:name
-if $darwin; then
-    JAVA_OPTS="$JAVA_OPTS -Xdock:name=$GROOVY_APP_NAME"
-# we may also want to set -Xdock:image    
-fi
-
-# For Cygwin, switch paths to Windows format before running java
-if $cygwin ; then
-    GROOVY_HOME=`cygpath --mixed "$GROOVY_HOME"`
-    JAVA_HOME=`cygpath --mixed "$JAVA_HOME"`
-    GROOVY_CONF=`cygpath --mixed "$GROOVY_CONF"`
-    CP=`cygpath --path --mixed "$CP"`    
-    TOOLS_JAR=`cygpath --mixed "$TOOLS_JAR"`
-    STARTER_CLASSPATH=`cygpath --path --mixed "$STARTER_CLASSPATH"`
-
-    # We build the pattern for arguments to be converted via cygpath
-    ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null`
-    SEP=""
-    for dir in $ROOTDIRSRAW ; do
-        ROOTDIRS="$ROOTDIRS$SEP$dir"
-        SEP="|"
-    done
-    OURCYGPATTERN="(^($ROOTDIRS))"
-    # Add a user-defined pattern to the cygpath arguments
-    if [ "$GROOVY_CYGPATTERN" != "" ] ; then
-        OURCYGPATTERN="$OURCYGPATTERN|($GROOVY_CYGPATTERN)"
-    fi
-    # Now convert the arguments - kludge to limit ourselves to /bin/sh
-    i=0
-    for arg in "$@" ; do
-        CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -`
-        if [ $CHECK -ne 0 ] ; then
-            eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"`
-        else
-            eval `echo args$i`="\"$arg\""
-        fi
-        i=`expr $i + 1`
-    done
-    case $i in
-        0) set -- ;;
-        1) set -- "$args0" ;;
-        2) set -- "$args0" "$args1" ;;
-        3) set -- "$args0" "$args1" "$args2" ;;
-        4) set -- "$args0" "$args1" "$args2" "$args3" ;;
-        5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
-        6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
-        7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
-        8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
-        9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
-    esac
-
-fi
-
-startGroovy ( ) {
-    CLASS=$1
-    shift
-    # Start the Profiler or the JVM
-    if $useprofiler ; then
-        runProfiler
-    else
-        exec "$JAVACMD" $JAVA_OPTS \
-            -classpath "$STARTER_CLASSPATH" \
-            -Dscript.name="$SCRIPT_PATH" \
-            -Dprogram.name="$PROGNAME" \
-            -Dgroovy.starter.conf="$GROOVY_CONF" \
-            -Dgroovy.home="$GROOVY_HOME" \
-            -Dtools.jar="$TOOLS_JAR" \
-            $STARTER_MAIN_CLASS \
-            --main $CLASS \
-            --conf "$GROOVY_CONF" \
-            --classpath "$CP" \
-            "$@"
-    fi
-}
-
-STARTER_MAIN_CLASS=org.codehaus.groovy.tools.GroovyStarter
-
-lateInit
 
=== modified file 'build.properties'
--- build.properties	2010-06-09 11:11:04 +0000
+++ build.properties	2011-02-24 17:57:34 +0000
@@ -1,8 +1,6 @@
-groovyVersion = 1.7.0
-groovyBundleVersion = 1.7.0
-
-# uncomment the following line to enable java5 elements in the build
-# groovy.build.vm5=true
+groovyVersion = 1.7.4
+# bundle version format: major('.'minor('.'micro('.'qualifier)?)?)? (first 3 only digits)
+groovyBundleVersion = 1.7.4
 
 #  Many people have reported problems testing UberTestCaseGroovySourceSubPackages, others have no difficulties with the default
 #  values ant junit task uses.  The decision has been taken to provide the values to try and cause the least
 
=== modified file 'build.xml'
--- build.xml	2010-06-09 11:11:04 +0000
+++ build.xml	2011-02-24 17:57:34 +0000
@@ -17,8 +17,8 @@
 
 Author : Russel Winder
 Author : Paul King
-$Revision: 18555 $ ($LastChangedBy: paulk $)
-$Date: 2009-12-08 14:08:59 +0100 (Di, 08. Dez 2009) $
+$Revision: 20245 $ ($LastChangedBy: paulk $)
+$Date: 2010-06-07 02:45:33 +0200 (Mo, 07. Jun 2010) $
 -->
 
 <project name="Groovy" default="createJars" basedir=".">
@@ -50,6 +50,10 @@
         <istrue value="${skipExamples}"/>
     </condition>
 
+    <condition property="_skipDocs_">
+        <istrue value="${skipDocs}"/>
+    </condition>
+
     <condition property="_skipOsgi_">
         <istrue value="${skipOsgi}"/>
     </condition>
@@ -62,6 +66,10 @@
         <istrue value="${skipEmbeddable}"/>
     </condition>
 
+    <condition property="_forceServerSettings_">
+        <istrue value="${forceServerSettings}"/>
+    </condition>
+
     <condition property="groovy.build.vm4">
         <contains string="${ant.java.version}" substring="1.4"/>
     </condition>
@@ -95,16 +103,6 @@
         </antlr>
     </target>
 
-    <target name="updatePolicy">
-        <move file="security/groovy.policy" tofile="security/groovy.policy.template"/>
-        <copy tofile="security/groovy.policy">
-            <fileset file="security/groovy.policy.template"/>
-            <filterset>
-                <filter token="relativePathToRealBasedir" value="${relativePathToRealBasedir}"/>
-            </filterset>
-        </copy>
-    </target>
-
     <target name="-init">
         <xslt in="pom.xml" out="${targetDirectory}/groovy-all.pom" style="config/maven/groovy-all.xsl"/>
     </target>
@@ -162,33 +160,32 @@
         </target>
     -->
 
-    <target name="dgmConvert" depends="stagedcompile">
-        <java classname="org.codehaus.groovy.tools.DgmConverter"
-              fork="yes"
-              failonerror="true">
-            <classpath refid="compilePath"/>
-            <classpath path="${mainClassesDirectory}"/>
-        </java>
-    </target>
-
-    <target name="compileMain" depends="stagedcompile,dgmConvert"
+    <target name="compileMain" depends="stagedcompile"
             description="Compile the Java and Groovy code in the main source.">
     </target>
 
     <target name="stagedcompile" depends="-init,ensureGrammars,-jvm14BuildWarning" unless="uber">
         <mkdir dir="${mainClassesDirectory}"/>
         <mkdir dir="${toolsClassesDirectory}"/>
+        <mkdir dir="${mainClassesDirectory}/META-INF"/>
 
         <javac srcdir="${mainSourceDirectory}" includeantruntime="false" destdir="${mainClassesDirectory}"
                deprecation="on" debug="yes" source="1.5" target="1.5" fork="true" classpathref="compilePath">
             <exclude name="groovy/ui/**/*.java"/>
         </javac>
+        <java classname="org.codehaus.groovy.tools.DgmConverter"
+              fork="yes"
+              failonerror="true">
+            <classpath refid="compilePath"/>
+            <classpath path="${mainClassesDirectory}"/>
+        </java>
         <antcall inheritrefs="true" target="-stagedcompile-groovy"/>
         <antcall target="-includeResources"/>
     </target>
 
     <target name="-stagedcompile-groovy" depends="-initGroovyc">
-        <groovyc srcdir="${mainSourceDirectory}" destdir="${mainClassesDirectory}" fork="true" memorymaximumsize="${groovycMain_mx}">
+        <groovyc srcdir="${mainSourceDirectory}" destdir="${mainClassesDirectory}" fork="true"
+                 memorymaximumsize="${groovycMain_mx}">
             <classpath>
                 <pathelement path="${mainClassesDirectory}"/>
                 <path refid="compilePath"/>
@@ -199,7 +196,7 @@
 
     <property name="vm5GroovySourceFiles" value="**/*.groovy"/>
     <property name="vm5JavaSourceFiles" value="**/*.java"/>
-    <property name="vm6GroovySourceFiles" value="groovy/**/vm6/*Test.groovy"/>
+    <property name="vm6GroovySourceFiles" value="groovy/**/vm6/*Test.groovy,org/codehaus/groovy/**/vm6/*Test.groovy"/>
 
     <target name="-initGroovyc">
         <path id="groovyMainClasses">
@@ -253,7 +250,8 @@
         </groovyc>
     </target>
 
-    <target name="compileExamples" depends="-init,-initGroovyc,compileMain,-includeExamplesResources" unless="_skipExamples_"
+    <target name="compileExamples" depends="-init,-initGroovyc,compileMain,-includeExamplesResources"
+            unless="_skipExamples_"
             description="Compile the Java and Groovy code in the examples source directory.">
         <mkdir dir="${examplesClassesDirectory}"/>
         <echo message="Compiling example code."/>
@@ -269,10 +267,10 @@
             </classpath>
         </groovyc>
         <javac srcdir="${examplesSourceDirectory}"
-                destdir="${examplesClassesDirectory}"
-                source="1.5"
-                target="1.5"
-                fork="true">
+               destdir="${examplesClassesDirectory}"
+               source="1.5"
+               target="1.5"
+               fork="true">
             <classpath>
                 <pathelement path="${mainClassesDirectory}"/>
                 <pathelement path="${examplesClassesDirectory}"/>
@@ -281,7 +279,7 @@
             </classpath>
         </javac>
         <groovyc srcdir="${examplesSourceDirectory}"
-                destdir="${examplesClassesDirectory}"
+                 destdir="${examplesClassesDirectory}"
                  fork="true"
                  memorymaximumsize="${groovycExamples_mx}"
                  excludes="webapps/groovlet-examples/WEB-INF/groovy/**/*.groovy,org/codehaus/groovy/grails/compiler/injection/**/*.java">
@@ -310,7 +308,7 @@
     <target name="-testInit" depends="-initHeadless">
         <property name="headlessArg" value=""/>
         <property name="junitJvmArgs"
-                  value="-Xms${groovyJUnit_ms} -XX:PermSize=${groovyJUnit_permSize} -XX:MaxPermSize=${groovyJUnit_maxPermSize} ${headlessArg} -Dgroovy.testdb.props=${groovy.testdb.props}"/>
+                  value="-Xms${groovyJUnit_ms} -XX:PermSize=${groovyJUnit_permSize} -XX:MaxPermSize=${groovyJUnit_maxPermSize} ${headlessArg} -Dgroovy.testdb.props=${groovy.testdb.props} -DjavadocAssertion.src.dir=./src/main"/>
     </target>
 
     <target name="-initHeadless" if="_shouldBeHeadless_">
@@ -336,7 +334,8 @@
 
     <target name="-testOne" if="_testOne_" depends="-initGroovyc">
         <mkdir dir="${junitRawDirectory}"/>
-        <junit printsummary="true" fork="true" includeantruntime="false" failureproperty="testFailed" maxmemory="${groovyJUnit_mx}" dir="${basedir}">
+        <junit printsummary="true" fork="true" includeantruntime="false" failureproperty="testFailed"
+               maxmemory="${groovyJUnit_mx}" dir="${basedir}">
             <sysproperty key="apple.awt.UIElement" value="true"/>
             <!-- keeps the dock from showing the AWT startup -->
             <jvmarg line="${junitJvmArgs}"/>
@@ -375,16 +374,17 @@
     </target>
 
     <target name="-collect15tests" unless="groovy.build.vm6">
-        <fileset id="ubertests.fileset" dir="${testClassesDirectory}" includes="UberTest*.class" excludes="Uber*VM6.class,groovy/grape/*Test.class"/>
+        <fileset id="ubertests.fileset" dir="${testClassesDirectory}" includes="UberTest*.class" excludes="Uber*VM6.class"/>
     </target>
 
     <target name="-collect16tests" if="groovy.build.vm6">
-        <fileset id="ubertests.fileset" dir="${testClassesDirectory}" includes="UberTest*.class" excludes="groovy/grape/*Test.class"/>
+        <fileset id="ubertests.fileset" dir="${testClassesDirectory}" includes="UberTest*.class"/>
     </target>
 
     <target name="-testAll" if="_testAll_" depends="-collect15tests,-collect16tests,-collectOptionalTests,-initGroovyc">
         <mkdir dir="${junitRawDirectory}"/>
-        <junit printsummary="true" fork="true" includeantruntime="false" failureproperty="testFailed" maxmemory="${groovyJUnit_mx}" dir="${basedir}">
+        <junit printsummary="true" fork="true" includeantruntime="false" failureproperty="testFailed"
+               maxmemory="${groovyJUnit_mx}" dir="${basedir}">
             <jvmarg line="${junitJvmArgs}"/>
             <sysproperty key="apple.awt.UIElement" value="true"/>
             <!-- keeps the dock from showing the AWT startup -->
@@ -433,12 +433,12 @@
     <target name="-makeManifest">
         <mkdir dir="${mainClassesDirectory}/META-INF"/>
         <copy todir="${mainClassesDirectory}/META-INF" file="LICENSE.txt"/>
-    	<makeManifest file="${mainClassesDirectory}/META-INF/MANIFEST.MF"/>
-	</target>
+        <makeManifest file="${mainClassesDirectory}/META-INF/MANIFEST.MF"/>
+    </target>
 
     <macrodef name="makeManifest">
-    	<attribute name="file"/>
-    	<attribute name="bundleEnvironment" default="J2SE-1.5"/>
+        <attribute name="file"/>
+        <attribute name="bundleEnvironment" default="J2SE-1.5"/>
         <sequential>
             <manifest file="@{file}">
                 <attribute name="Built-By" value="${user.name}"/>
@@ -449,13 +449,13 @@
                 <attribute name="Implementation-Title" value="Groovy: a powerful, dynamic language for the JVM"/>
                 <attribute name="Implementation-Version" value="${groovyVersion}"/>
                 <attribute name="Implementation-Vendor" value="The Codehaus"/>
-                <attribute name="Bundle-ManifestVersion" value="2" />
-                <attribute name="Bundle-Name" value="Groovy Runtime" />
-                <attribute name="Bundle-Description" value="Groovy Runtime" />
-                <attribute name="Bundle-Version" value="${groovyBundleVersion}" />
-                <attribute name="Bundle-Vendor" value="The Codehaus" />
-                <attribute name="Bundle-ClassPath" value="." />
-                <attribute name="Bundle-RequiredExecutionEnvironment" value="@{bundleEnvironment}" />
+                <attribute name="Bundle-ManifestVersion" value="2"/>
+                <attribute name="Bundle-Name" value="Groovy Runtime"/>
+                <attribute name="Bundle-Description" value="Groovy Runtime"/>
+                <attribute name="Bundle-Version" value="${groovyBundleVersion}"/>
+                <attribute name="Bundle-Vendor" value="The Codehaus"/>
+                <attribute name="Bundle-ClassPath" value="."/>
+                <attribute name="Bundle-RequiredExecutionEnvironment" value="@{bundleEnvironment}"/>
                 <attribute name="Eclipse-BuddyPolicy" value="dependent"/>
                 <attribute name="Eclipse-LazyStart" value="true"/>
                 <attribute name="DynamicImport-Package" value="*"/>
@@ -472,26 +472,27 @@
                 <include name="groovy/ui/**/*.png"/>
                 <include name="groovy/inspect/swingui/AstBrowserProperties.groovy"/>
                 <include name="org/codehaus/groovy/tools/shell/**/*.properties"/>
+                <include name="org/codehaus/groovy/tools/groovydoc/**/*.properties"/>
                 <include name="org/codehaus/groovy/tools/shell/**/*.xml"/>
                 <include name="org/codehaus/groovy/antlib.xml"/>
             </fileset>
         </copy>
-    	<antcall target="-includeReleaseInfo"/>
+        <antcall target="-includeReleaseInfo"/>
     </target>
 
     <target name="-includeReleaseInfo">
-        <copy file="${mainSourceDirectory}/META-INF/groovy-release-info.properties" 
-            todir="${mainClassesDirectory}/META-INF" overwrite="true">
+        <copy file="${mainSourceDirectory}/META-INF/groovy-release-info.properties"
+              todir="${mainClassesDirectory}/META-INF" overwrite="true">
         </copy>
-    	<tstamp>
-    	    <format property="release.date" pattern="dd-MMM-yyyy"/>
-    	    <format property="release.time" pattern="hh:mm aa"/>
-    	</tstamp>
+        <tstamp>
+            <format property="release.date" pattern="dd-MMM-yyyy"/>
+            <format property="release.time" pattern="hh:mm aa"/>
+        </tstamp>
         <replace file="${mainClassesDirectory}/META-INF/groovy-release-info.properties">
-          <replacefilter token="##ImplementationVersion##" value="${groovyVersion}"/>   
-          <replacefilter token="##BundleVersion##" value="${groovyBundleVersion}"/>
-          <replacefilter token="##BuildDate##" value="${release.date}"/>
-          <replacefilter token="##BuildTime##" value="${release.time}"/>
+            <replacefilter token="##ImplementationVersion##" value="${groovyVersion}"/>
+            <replacefilter token="##BundleVersion##" value="${groovyBundleVersion}"/>
+            <replacefilter token="##BuildDate##" value="${release.date}"/>
+            <replacefilter token="##BuildTime##" value="${release.time}"/>
         </replace>
     </target>
 
@@ -506,7 +507,7 @@
     <target name="-includeGroovyDocTemplates">
         <copy todir="${mainClassesDirectory}">
             <fileset dir="${mainSourceDirectory}">
-                <include name="org/codehaus/groovy/tools/groovydoc/gstringTemplates/**/*.*"/>
+                <include name="org/codehaus/groovy/tools/groovydoc/gstringTemplates/*/*.*"/>
             </fileset>
             <fileset dir="${toolsSourceDirectory}">
                 <include name="org/codehaus/groovy/tools/groovy.ico"/>
@@ -514,7 +515,7 @@
         </copy>
     </target>
 
-    <target name="-initializeJars" depends="test">
+    <target name="-initializeJars" depends="test" unless="_skipDocs_">
         <delete dir="${targetDistDirectory}" quiet="true"/>
         <mkdir dir="${targetDistDirectory}"/>
     </target>
@@ -564,23 +565,25 @@
                 <include name="commons-cli.jar"/>
             </fileset>
         </unzip>
-        <makeManifest file="${stagingDirectory}/META-INF/MANIFEST.MF" />
+        <makeManifest file="${stagingDirectory}/META-INF/MANIFEST.MF"/>
         <!-- TODO try to make use of jarjar keep ability -->
         <jarjar jarfile="${targetDistDirectory}/groovy-all.jar"
                 manifest="${stagingDirectory}/META-INF/MANIFEST.MF">
-            <fileset dir="${stagingDirectory}" excludes="groovy/util/CliBuilder*.class,groovy/util/OptionAccessor*.class,org/codehaus/groovy/tools/shell/util/HelpFormatter*.class"/>
+            <fileset dir="${stagingDirectory}"
+                     excludes="groovy/util/CliBuilder*.class,groovy/util/OptionAccessor*.class,org/codehaus/groovy/tools/shell/util/HelpFormatter*.class"/>
             <rule pattern="antlr.**" result="groovyjarjarantlr.@1"/>
             <rule pattern="org.objectweb.**" result="groovyjarjarasm.@1"/>
             <rule pattern="org.apache.commons.cli.**" result="groovyjarjarcommonscli.@1"/>
         </jarjar>
         <jar destfile="${targetDistDirectory}/groovy-all.jar" update="true"
-             basedir="${stagingDirectory}" includes="groovy/util/CliBuilder*.class,groovy/util/OptionAccessor*.class,org/codehaus/groovy/tools/shell/util/HelpFormatter*.class"/>
+             basedir="${stagingDirectory}"
+             includes="groovy/util/CliBuilder*.class,groovy/util/OptionAccessor*.class,org/codehaus/groovy/tools/shell/util/HelpFormatter*.class"/>
 
         <copy file="${targetDistDirectory}/groovy-${groovyVersion}-sources.jar"
               tofile="${targetDistDirectory}/groovy-all-${groovyVersion}-sources.jar"/>
         <delete dir="${stagingDirectory}" quiet="true"/>
     </target>
-    
+
     <target name="createJars" depends="-checkAntVersion,test,-actuallyCreateJars"
             description="Build Groovy and create the jarfiles."/>
 
@@ -592,8 +595,10 @@
                 <filter token="GROOVY_BUNDLE_VERSION" value="${groovyBundleVersion}"/>
             </filterset>
         </copy>
-        <property name="jarsToWrap" value="groovy.jar,groovy-all.jar" />
-        <bndwrap definitions="${targetDistDirectory}" output="${targetDistDirectory}" failok="true">
+        <property name="jarsToWrap" value="groovy.jar,groovy-all.jar"/>
+        <property name="runtimeJars" refid="runtimePath"/>
+        <bndwrap definitions="${targetDistDirectory}" output="${targetDistDirectory}" failok="true"
+                 classpath="${runtimeJars}">
             <fileset dir="${targetDistDirectory}" includes="${jarsToWrap}"/>
         </bndwrap>
         <delete dir="${targetDistDirectory}" includes="${jarsToWrap}"/>
@@ -663,9 +668,15 @@
                 <filter token="GROOVYJAR" value="groovy-${groovyVersion}.jar"/>
             </filterset>
         </copy>
+        <!-- icon -->
+        <copy todir="${installDirectory}/bin" flatten="true">
+            <fileset dir="${toolsSourceDirectory}">
+                <include name="org/codehaus/groovy/tools/groovy.ico"/>
+            </fileset>
+        </copy>
 
         <!-- Tweak scripts for platform compatibility -->
-        <fixcrlf srcdir="${installDirectory}/bin" eol="lf" excludes="*.bat"/>
+        <fixcrlf srcdir="${installDirectory}/bin" eol="lf" excludes="*.bat, *.icns"/>
         <fixcrlf srcdir="${installDirectory}/bin" eol="crlf" includes="*.bat"/>
         <chmod perm="ugo+x">
             <fileset dir="${installDirectory}/bin" includes="*,*.*"/>
@@ -718,30 +729,32 @@
 
     <target name="-docInit">
         <mkdir dir="${docsDirectory}"/>
-        <property name="docFooter" value="Copyright &amp;copy; 2003-2009 The Codehaus. All rights reserved."/>
+        <property name="docFooter" value="Copyright &amp;copy; 2003-2010 The Codehaus. All rights reserved."/>
         <property name="title" value="Groovy ${groovyVersion}"/>
     </target>
 
     <target name="doc" depends="javadoc, groovydoc" description="Create the documentation."/>
 
-   <target name="javadoc" depends="-docInit,-jvm14BuildWarning,ensureGrammars"
-            description="Create the javadoc documentation.">
+    <target name="javadoc" depends="-docInit,-jvm14BuildWarning,ensureGrammars"
+            unless="_skipDocs_" description="Create the javadoc documentation.">
         <javadoc destdir="${docsDirectory}/api" author="true" version="true"
                  windowtitle="${title}" doctitle="${title}"
                  encoding="ISO-8859-1" useexternalfile="true" source="1.5"
                  footer="${docFooter}"
+                 overview="src/main/overviewj.html"
                  maxmemory="${javaDoc_mx}"
-                 >
+                >
             <classpath>
                 <path path="${mainClassesDirectory}"/>
                 <path refid="compilePath"/>
             </classpath>
             <fileset dir="${mainSourceDirectory}" includes="**/*.java"/>
-            <link href="http://java.sun.com/j2se/1.5.0/docs/api"/>
+            <link href="http://java.sun.com/javase/6/docs/api"/>
             <link href="http://www.dpml.net/api/ant/1.7.0"/>
-            <link href="http://junit.sourceforge.net/junit3.8.1/javadoc/"/>
+            <link href="http://junit.sourceforge.net/junit3.8.1/javadoc"/>
             <link href="http://java.sun.com/j2ee/1.4/docs/api"/>
             <link href="http://www.antlr2.org/javadoc"/>
+            <link href="http://commons.apache.org/cli/api-release"/>
         </javadoc>
         <mkdir dir="${targetDistDirectory}"/>
         <jar basedir="${docsDirectory}/api" destfile="${targetDistDirectory}/groovy-${groovyVersion}-javadoc.jar"/>
@@ -753,7 +766,7 @@
     <target name="groovydoc">
         <path id="groovydocpath">
             <path path="${mainClassesDirectory}"/>
-            <path path="${java.class.path}"/>
+            <path refid="compilePath"/>
         </path>
         <antforked target="realgroovydoc" maxmemory="${groovyDoc_mx}" classpathref="groovydocpath"/>
     </target>
@@ -774,14 +787,13 @@
                 doctitle="${title}"
                 header="${title}"
                 footer="${docFooter}"
-                overview="src/main/overview.html"
-                private="false">
-            <link packages="java.,org.xml.,javax.,org.xml." href="http://java.sun.com/j2se/1.5.0/docs/api"/>
+                overview="src/main/overview.html">
+            <link packages="javax.servlet.,javax.management." href="http://java.sun.com/j2ee/1.4/docs/api"/>
+            <link packages="java.,org.xml.,javax.,org.xml." href="http://java.sun.com/javase/6/docs/api"/>
             <link packages="org.apache.ant.,org.apache.tools.ant." href="http://www.dpml.net/api/ant/1.7.0"/>
-            <link packages="org.junit.,junit.framework." href="http://junit.sourceforge.net/junit3.8.1/javadoc/"/>
-            <link packages="antlr." href="http://www.antlr2.org/javadoc/"/>
-            <link packages="javax.servlet.,javax.management." href="http://java.sun.com/j2ee/1.4/docs/api"/>
-            <link packages="groovy.,org.codehaus.groovy." href="http://groovy.codehaus.org/gapi/"/>
+            <link packages="org.junit.,junit." href="http://junit.sourceforge.net/junit3.8.1/javadoc"/>
+            <link packages="org.apache.commons.cli." href="http://commons.apache.org/cli/api-release"/>
+            <link packages="antlr." href="http://www.antlr2.org/javadoc"/>
         </groovydoc>
     </target>
 
@@ -793,8 +805,14 @@
                 <pathelement path="${mainClassesDirectory}"/>
             </classpath>
             <arg value="org.codehaus.groovy.runtime.DefaultGroovyMethods"/>
+            <arg value="org.codehaus.groovy.runtime.SqlGroovyMethods"/>
+            <arg value="org.codehaus.groovy.runtime.SwingGroovyMethods"/>
+            <arg value="org.codehaus.groovy.runtime.XmlGroovyMethods"/>
+            <arg value="org.codehaus.groovy.runtime.EncodingGroovyMethods"/>
+            <arg value="org.codehaus.groovy.runtime.DateGroovyMethods"/>
             <arg value="org.codehaus.groovy.runtime.DefaultGroovyStaticMethods"/>
             <arg value="org.codehaus.groovy.vmplugin.v5.PluginDefaultGroovyMethods"/>
+            <arg value="org.codehaus.groovy.vmplugin.v6.PluginDefaultGroovyMethods"/>
         </java>
         <copy todir="target/html/groovy-jdk" file="src/tools/org/codehaus/groovy/tools/groovy.ico"/>
         <copy todir="target/html/groovy-jdk" file="src/tools/org/codehaus/groovy/tools/stylesheet.css"/>
@@ -806,22 +824,42 @@
         <delete quiet="true">
             <fileset dir="." includes="**/*~"/>
             <fileset dir="${groovyParserDirectory}" includes="Groovy*.*"/>
-            <fileset dir="${javaParserDirectory}" includes="JavaLexer.java,JavaRecognizer.java,JavaTokenTypes.java,JavaTokenTypes.txt,*.smap"/>
+            <fileset dir="${javaParserDirectory}"
+                     includes="JavaLexer.java,JavaRecognizer.java,JavaTokenTypes.java,JavaTokenTypes.txt,*.smap"/>
         </delete>
     </target>
 
     <target name="deploy" depends="install,doc"
-            description="Deploy jars to maven repository.">
+            description="Deploy jars to maven repository."/>
+
+    <target name="-deployDefault" unless="_forceServerSettings_">
         <mavenDeploy version="${groovyVersion}" prefix="groovy"/>
         <mavenDeploy version="${groovyVersion}" prefix="groovy-all"/>
     </target>
 
+    <target name="-deployFromServer" if="_forceServerSettings_">
+        <copy tofile="target/settings.xml">
+            <fileset file="config/maven/settings.xml"/>
+            <filterset>
+                <filter token="groovy.deploy.username" value="${groovy.deploy.username}"/>
+                <filter token="groovy.deploy.password" value="${groovy.deploy.password}"/>
+            </filterset>
+        </copy>
+        <mavenDeploySettings version="${groovyVersion}" prefix="groovy" settings="target/settings.xml"/>
+        <mavenDeploySettings version="${groovyVersion}" prefix="groovy-all" settings="target/settings.xml"/>
+        <delete file="target/settings.xml"/>
+    </target>
+
     <target name="installRepo" depends="install,doc"
             description="Deploy artifacts to local maven repository.">
         <mavenInstallRepo version="${groovyVersion}" prefix="groovy"/>
         <mavenInstallRepo version="${groovyVersion}" prefix="groovy-all"/>
     </target>
 
+    <target name="quality" depends="install,checkstyle" description="install plus checkstyle"/>
+
+    <target name="release" depends="deploy,compileExamples" description="deploy plus compileExamples"/>
+
     <target name="fulldist" depends="dist,compileExamples,checkstyle" description="dist plus examples plus checkstyle"/>
 
     <target name="dist" depends="install,doc" description="Create everything needed for a distribution.">
 
=== modified file 'config/ant/build-maven.xml'
--- config/ant/build-maven.xml	2010-06-09 11:11:04 +0000
+++ config/ant/build-maven.xml	2011-02-24 17:57:34 +0000
@@ -14,8 +14,8 @@
 Groovy community. See the NOTICE.txt file distributed with this work for additional information.
 
 Author : Paul King
-$Revision: 17603 $ ($LastChangedBy: paulk $)
-$Date: 2009-09-11 14:06:51 +0200 (Fr, 11. Sep 2009) $
+$Revision: 20148 $ ($LastChangedBy: paulk $)
+$Date: 2010-05-28 17:22:26 +0200 (Fr, 28. Mai 2010) $
 -->
 
 <project name="build-maven" default="" basedir="../.." xmlns:artifact="urn:maven-artifact-ant">
@@ -92,7 +92,7 @@
             <fileset dir="${compileLibDirectory}" includes="**/*.jar"/>
         </path>
         <path id="runtimePath">
-	    <fileset dir="${runtimeLibDirectory}" includes="**/*.jar"/>
+            <fileset dir="${runtimeLibDirectory}" includes="**/*.jar"/>
         </path>
         <path id="testLibPath">
             <fileset dir="${testLibDirectory}" includes="**/*.jar"/>
@@ -103,9 +103,6 @@
         <path id="examplesPath">
             <fileset dir="${examplesLibDirectory}" includes="**/*.jar"/>
         </path>
-        <path id="jdk14ExtrasPath">
-            <fileset dir="${extrasLibDirectory}" includes="**/*.jar"/>
-        </path>
     </target>
 
     <target name="-mavenDeployInit" depends="-mavenInit">
@@ -140,6 +137,19 @@
         </sequential>
     </macrodef>
 
+    <macrodef name="mavenDeploySettings">
+        <attribute name="version"/>
+        <attribute name="prefix"/>
+        <attribute name="settings"/>
+        <sequential>
+            <artifact:deploy file="${targetDistDirectory}/@{prefix}-@{version}.jar" settingsFile="@{settings}">
+                <pom refid="@{prefix}.pom"/>
+                <attach file="${targetDistDirectory}/@{prefix}-@{version}-sources.jar" classifier="sources"/>
+                <attach file="${targetDistDirectory}/@{prefix}-@{version}-javadoc.jar" classifier="javadoc"/>
+            </artifact:deploy>
+        </sequential>
+    </macrodef>
+
     <macrodef name="mavenInstallRepo">
         <attribute name="version"/>
         <attribute name="prefix"/>
 
=== removed file 'config/bnd/groovy-all-jdk14.bnd'
--- config/bnd/groovy-all-jdk14.bnd	2009-05-06 14:05:59 +0000
+++ config/bnd/groovy-all-jdk14.bnd	1970-01-01 00:00:00 +0000
@@ -1,4 +0,0 @@
-version= @GROOVY_BUNDLE_VERSION@
--nouses= true
-Export-Package= *;version=${version}
-Import-Package= *;resolution:=optional
 
=== removed file 'config/bnd/groovy-jdk14.bnd'
--- config/bnd/groovy-jdk14.bnd	2009-05-06 14:05:59 +0000
+++ config/bnd/groovy-jdk14.bnd	1970-01-01 00:00:00 +0000
@@ -1,4 +0,0 @@
-version= @GROOVY_BUNDLE_VERSION@
--nouses= true
-Export-Package= *;version=${version}
-Import-Package= antlr, org.objectweb.asm, net.sf.retrotranslator.runtime.java.lang, *;resolution:=optional
 
=== added file 'config/checkstyle/codeHeader.txt'
--- config/checkstyle/codeHeader.txt	1970-01-01 00:00:00 +0000
+++ config/checkstyle/codeHeader.txt	2011-02-24 17:57:34 +0000
@@ -0,0 +1,15 @@
+^/\*$
+^ \* Copyright (\([cC]\) )?\d\d\d\d(-\d\d\d\d)? the original author or authors\.$
+^ \*$
+^ \* Licensed under the Apache License, Version 2\.0 \(the "License"\);$
+^ \* you may not use this file except in compliance with the License\.$
+^ \* You may obtain a copy of the License at$
+^ \*$
+^ \*     http://www\.apache\.org/licenses/LICENSE-2\.0$
+^ \*$
+^ \* Unless required by applicable law or agreed to in writing, software$
+^ \* distributed under the License is distributed on an "AS IS" BASIS,$
+^ \* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied\.$
+^ \* See the License for the specific language governing permissions and$
+^ \* limitations under the License\.$
+^ \*.*
 \ No newline at end of file
 
=== modified file 'config/checkstyle/config.xml'
--- config/checkstyle/config.xml	2009-10-27 15:04:33 +0000
+++ config/checkstyle/config.xml	2011-02-24 17:57:34 +0000
@@ -151,6 +151,9 @@
         <!--</module>-->
         <!-- add below in eventually for consistency -->
         <!--<module name="ArrayTypeStyle"/>-->
+        <module name="RegexpHeader">
+            <property name="headerFile" value="config/checkstyle/codeHeader.txt"/>
+        </module>
     </module>
     <module name="PackageHtml"/>
     <module name="au.com.redhillconsulting.simian.SimianCheck">
 
=== modified file 'config/maven/groovy-tools.pom'
--- config/maven/groovy-tools.pom	2010-06-09 11:11:04 +0000
+++ config/maven/groovy-tools.pom	2011-02-24 17:57:34 +0000
@@ -34,7 +34,7 @@
         <dependency>
             <groupId>net.sourceforge.cobertura</groupId>
             <artifactId>cobertura</artifactId>
-            <version>1.9.3</version>
+            <version>1.9.4.1</version>
             <exclusions>
                 <exclusion>
                     <groupId>asm</groupId>
@@ -60,12 +60,12 @@
         <dependency>
             <groupId>com.thoughtworks.qdox</groupId>
             <artifactId>qdox</artifactId>
-            <version>1.10</version>
+            <version>1.12</version>
         </dependency>
         <dependency>
             <groupId>biz.aQute</groupId>
             <artifactId>bnd</artifactId>
-            <version>0.0.379</version>
+            <version>0.0.401</version>
         </dependency>
     </dependencies>
     <repositories>
 
=== added file 'config/maven/settings.xml'
--- config/maven/settings.xml	1970-01-01 00:00:00 +0000
+++ config/maven/settings.xml	2011-02-24 17:57:34 +0000
@@ -0,0 +1,10 @@
+<?xml version="1.0"?>
+<settings>
+  <servers>
+    <server>
+      <id>codehaus.org</id>
+      <username>@groovy.deploy.username@</username>
+      <password>@groovy.deploy.password@</password>
+    </server>
+  </servers>
+</settings>
 \ No newline at end of file
 
=== modified file 'debian/README.Debian'
--- debian/README.Debian	2009-08-02 23:12:29 +0000
+++ debian/README.Debian	2011-02-24 17:57:34 +0000
@@ -86,3 +86,22 @@
 
  -- Ludovic Claude <[e-mail]>  Fri, 17 Jul 2009 00:33:18 +0100
 
+I have used the same build.xml as before, only adjusted some of the supplied
+patches. The complete doc does fail, but javadoc is just fine.
+
+The jansi jar is needed for the build which I have installed manually.
+Groovy comes with several jars, I am not so sure which one should be
+supplied by this package or if there should be two conflicting ones
+prepared:
+
+target/dist/groovy-all-1.7.3-sources.jar
+target/dist/groovy-all.jar
+target/dist/groovy-1.7.3-javadoc.jar
+target/dist/groovy-all-1.7.3-javadoc.jar
+target/dist/groovy.jar
+target/dist/groovy-1.7.3-sources.jar
+
+Sorry of I could not do more, I am only debugging something else.
+
+ -- Steffen Moeller <[e-mail]>  Wed, 21 Jul 2010 15:37:49 +0200
+
 
=== modified file 'debian/changelog'
--- debian/changelog	2010-12-09 14:11:14 +0000
+++ debian/changelog	2011-02-24 17:57:34 +0000
@@ -1,17 +1,49 @@
-groovy (1.7.0-3ubuntu2) natty; urgency=low
-
-  * Updated debian/rules to include ant-nodeps to fix FTBFS (LP: #687974).
-
- -- James Page <[e-mail]>  Thu, 09 Dec 2010 14:11:14 +0000
-
-groovy (1.7.0-3ubuntu1) maverick; urgency=low
-
-  * Merge from debian testing. Remaining changes:
-    - debian/control, debian/rules: (Build-)Depend on libservlet2.5-java
-      instead of libservlet2.4-java
-    - debian/control: Remove useless runtime dependency on libclassworlds-java