diff --git a/ant-build/build.properties b/ant-build/build.properties
deleted file mode 100644
index 93e9fad60..000000000
--- a/ant-build/build.properties
+++ /dev/null
@@ -1,5 +0,0 @@
-name = struts-core
-fullname = Struts
-version = 2.0.0-SNAPSHOT
-status = integration
-cvs.tag = struts_2_0_0
diff --git a/ant-build/ivy-tasks.properties b/ant-build/ivy-tasks.properties
deleted file mode 100644
index 66df5989d..000000000
--- a/ant-build/ivy-tasks.properties
+++ /dev/null
@@ -1,5 +0,0 @@
-ivy-configure=fr.jayasoft.ivy.ant.IvyConfigure
-ivy-resolve=fr.jayasoft.ivy.ant.IvyResolve
-ivy-retrieve=fr.jayasoft.ivy.ant.IvyRetrieve
-ivy-publish=fr.jayasoft.ivy.ant.IvyPublish
-ivy-report=fr.jayasoft.ivy.ant.IvyReport
diff --git a/ant-build/ivy.xml b/ant-build/ivy.xml
deleted file mode 100644
index 2b2cf1442..000000000
--- a/ant-build/ivy.xml
+++ /dev/null
@@ -1,153 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<?xml-stylesheet type="text/xsl" href="http://www.jayasoft.fr/org/ivyrep/ivy-doc.xsl"?>
-<ivy-module version="1.0">
-    <info organisation="apache" module="struts2"
-          revision="2.0"
-          status="integration"
-          publication="20060323000000">
-        <license name="Apache" url="http://www.apache.org/licenses/LICENSE-2.0.txt"/>
-        <ivyauthor name="apache" url="http://www.apache.org/"/>
-
-        <description homepage="http://struts.apache.org/2.x/">
-            Struts 2 is a Java web-application development framework. It is built specifically with developer
-            productivity and code simplicity in mind. Struts 2 is built on
-            top of XWork, which provides a generic command pattern framework as well as an Inversion of Control
-            container. In addition to these features, Struts 2 provides
-            robust support for building reusable UI templates, such as form controls, UI themes, internationalization,
-            dynamic form parameter mapping to JavaBeans, robust
-            client and server side validation, and much more.
-            <br/>
-        </description>
-    </info>
-    <configurations>
-        <conf name="build" visibility="private"/>
-        <conf name="default"/>
-        <conf name="source"/>
-        <conf name="ajax"/>
-        <conf name="freemarker" deprecated="20060303000000"/>
-        <conf name="velocity"/>
-        <conf name="fileupload"/>
-        <conf name="fileupload-pell" deprecated="20050831000000"/>
-        <conf name="sitemesh"/>
-        <conf name="quickstart"/>
-        <conf name="jasperreports"/>
-        <conf name="jfree"/>
-        <conf name="xslt"/>
-        <conf name="portlet"/>
-        <conf name="spring"/>
-        <conf name="pico"/>
-        <conf name="plexus"/>
-        <conf name="xslt"/>
-        <conf name="tiger"/>
-        <conf name="cewolf"/>
-        <conf name="tiles"/>
-    </configurations>
-    <publications>
-        <artifact name="struts2" type="jar" conf="default"/>
-    </publications>
-    <dependencies>
-        <!-- build -->
-        <dependency org="mockobjects" name="mockobjects-core" rev="0.09" conf="build->*"/>
-        <dependency org="mockobjects" name="mockobjects-jdk1.3" rev="0.09" conf="build->*"/>
-        <dependency org="mockobjects" name="mockobjects-alt-jdk1.3" rev="0.09" conf="build->*"/>
-        <dependency org="mockobjects" name="mockobjects-alt-jdk1.3-j2ee1.3" rev="0.09" conf="build->*"/>
-        <dependency org="mockobjects" name="mockobjects-jdk1.3-j2ee1.3" rev="0.09" conf="build->*"/>
-
-        <dependency org="easymock" name="easymock" rev="2.0" conf="build->*"/>
-        <!--dependency org="easymock" name="easymockclassextension" rev="1.1" conf="build->*"/-->
-
-        <dependency org="clover" name="clover" rev="1.3.11" conf="build->*"/>
-        <dependency org="junit" name="junit" rev="3.8.1" conf="build->*"/>
-        <dependency org="jmock" name="jmock" rev="1.0.1" conf="build->*"/>
-        <dependency org="jmock" name="jmock-cglib" rev="1.0.1" conf="build->*"/>
-        <dependency org="servletapi" name="servletapi" rev="2.4" conf="build->*"/>
-        <dependency org="xdoclet" name="xdoclet" rev="1.2.3" conf="build->*"/>
-        <dependency org="xdoclet" name="xdoclet-web-module" rev="1.2.3" conf="build->*"/>
-        <dependency org="xjavadoc" name="xjavadoc" rev="1.1" conf="build->*"/>
-
-        <!-- default -->
-        <dependency org="opensymphony" name="xwork" rev="2.0+" conf="default->default"/>
-        <dependency org="apache" name="commons-logging" rev="1.0.4" conf="default->default"/>
-        <dependency org="opensymphony" name="xwork" rev="2.0+" conf="source->source"/>
-        <dependency org="freemarker" name="freemarker" rev="2.3.4" conf="default->default"/>
-
-        <!-- ajax -->
-        <dependency org="dwr" name="dwr" rev="1.1-beta-3" conf="ajax->*"/>
-
-        <!-- tiles -->
-        <dependency org="org.apache.struts.tiles" name="tiles-core" rev="0.2-SNAPSHOT" conf="tiles->default"/>
-        <dependency org="commons-digester" name="commons-digester" rev="1.7" conf="tiles->default"/>
-
-        <!-- velocity -->
-        <dependency org="apache" name="velocity" rev="1.4" conf="velocity->*"/>
-        <dependency org="apache" name="velocity-tools" rev="1.1" conf="velocity->view"/>
-        <dependency org="commons-collections" name="commons-collections" rev="2.1.1" conf="velocity->*"/>
-
-        <!-- fileupload -->
-        <dependency org="apache" name="commons-fileupload" rev="1.1" conf="fileupload->default"/>
-        <dependency org="apache" name="commons-io" rev="1.0" conf="fileupload->default" />
-
-        <!-- fileupload-pell -->
-        <dependency org="pell" name="multipartrequest" rev="1.19" conf="fileupload-pell->default"/>
-
-        <!-- sitemesh -->
-        <dependency org="opensymphony" name="sitemesh" rev="2.2.1" conf="sitemesh->default"/>
-
-        <!-- quickstart -->
-        <dependency org="jetty" name="org.mortbay.jetty" rev="5.1.4" conf="quickstart->default"/>
-        <dependency org="ant" name="ant" rev="1.6.5" conf="quickstart->default"/>
-        <dependency org="tomcat" name="jasper-runtime" rev="5.5.12" conf="quickstart->default"/>
-        <dependency org="tomcat" name="jasper-compiler" rev="5.5.12" conf="quickstart->default"/>
-        <dependency org="tomcat" name="jasper-compiler-jdt" rev="5.5.12" conf="quickstart->default"/>
-        <dependency org="commons-el" name="commons-el" rev="1.0" conf="quickstart->default"/>
-        <dependency org="commons-io" name="commons-io" rev="1.0" conf="quickstart->default"/>
-        <dependency org="commons-lang" name="commons-lang" rev="2.1" conf="quickstart->default"/>
-        <dependency org="servletapi" name="servletapi" rev="2.4" conf="quickstart->*" force="true"/>
-        <dependency org="jspapi" name="jsp-api" rev="2.0" conf="quickstart->*"/>
-        <dependency org="log4j" name="log4j" rev="1.2.9" conf="quickstart->*"/>
-        <dependency org="commons-collections" name="commons-collections" rev="2.1.1" conf="quickstart->default"/>
-        <dependency org="xstream" name="xstream" rev="1.1.2" conf="quickstart->default"/>
-
-        <!-- jasperreports -->
-        <dependency org="jasperreports" name="jasperreports" rev="1.2.0" conf="jasperreports->default"/>
-        <dependency org="itext" name="itext" rev="1.3.1" conf="jasperreports->default"/>
-        <dependency org="poi" name="poi" rev="2.5.1" conf="jasperreports->default"/>
-        <dependency org="commons-beanutils" name="commons-beanutils" rev="1.7.0" conf="jasperreports->default"/>
-        <dependency org="commons-digester" name="commons-digester" rev="1.7" conf="jasperreports->default"/>
-        <dependency org="commons-collections" name="commons-collections" rev="2.1.1" conf="jasperreports->default"/>
-
-        <!-- jfree -->
-        <dependency org="jfree" name="jcommon" rev="1.0.0" conf="jfree->default"/>
-        <dependency org="jfree" name="jfreechart" rev="1.0.0" conf="jfree->default"/>
-
-        <!-- xslt -->
-        <dependency org="jfree" name="jcommon" rev="1.0.0" conf="xslt->default"/>
-
-        <!-- portlet -->
-        <dependency org="portlet-api" name="portlet-api" rev="1.0" conf="portlet->default"/>
-
-        <!-- spring -->
-        <dependency org="opensymphony" name="xwork" rev="2.0+" conf="spring->spring"/>
-
-        <!-- pico -->
-        <dependency org="picocontainer" name="picocontainer" rev="1.2-RC-2" conf="pico->*"/>
-        <dependency org="picocontainer" name="picocontainer-gems" rev="1.2-RC-2" conf="pico->*"/>
-        <dependency org="nanocontainer" name="nanocontainer" rev="1.0-RC-3" conf="pico->*"/>
-        <dependency org="nanocontainer" name="nanocontainer-nanowar" rev="1.0-RC-3" conf="pico->*"/>
-
-        <!-- plexus -->
-        <dependency org="org.codehaus.plexus" name="plexus-container-default" rev="1.0-alpha-10-20060215.222714-5" conf="plexus->*"/>
-        <dependency org="org.codehaus.plexus" name="plexus-utils" rev="1.0.4" conf="plexus->*"/>
-        <dependency org="classworlds" name="classworlds" rev="1.1" conf="plexus->*"/>
-
-        <!-- xslt -->
-        <dependency org="w3c" name="dom" rev="3.0" conf="xslt->*"/>
-
-        <!-- tiger -->
-        <dependency org="opensymphony" name="xwork-tiger" rev="2.0+" conf="tiger->*"/>
-
-        <!-- cewolf -->
-        <dependency org="cewolf" name="cewolf" rev="0.12.0" conf="cewolf->*"/>
-
-    </dependencies>
-</ivy-module>
diff --git a/ant-build/ivyconf.properties b/ant-build/ivyconf.properties
deleted file mode 100644
index a923417e7..000000000
--- a/ant-build/ivyconf.properties
+++ /dev/null
@@ -1,2 +0,0 @@
-ivy.retrieve.pattern = lib/[conf]/[artifact].[ext]
-integration.repository = lib/integration
diff --git a/ant-build/ivyconf.xml b/ant-build/ivyconf.xml
deleted file mode 100644
index bfb3097aa..000000000
--- a/ant-build/ivyconf.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<ivyconf>
-    <properties file="ant-build/ivyconf.properties"/>
-    <conf defaultResolver="default" checkUpToDate="true"/>
-    <resolvers>
-        <chain name="default">
-            <filesystem name="integration" checkmodified="true">
-                <ivy pattern="${integration.repository}/[organisation]/[module]/ivy-[revision].xml"/>
-                <artifact pattern="${integration.repository}/[organisation]/[module]/[artifact]-[revision].[ext]"/>
-            </filesystem>
-            <url name="opensymphony" checkmodified="true">
-                <ivy pattern="http://ivyrep.opensymphony.com/[organisation]/[module]/ivy-[revision].xml"/>
-                <artifact
-                        pattern="http://ivyrep.opensymphony.com/[organisation]/[module]/[artifact]-[revision].[type]"/>
-            </url>
-            <url name="contegix">
-                <ivy pattern="http://repository.contegix.com/ivyrep/[organisation]/[module]/ivy-[revision].xml"/>
-                <artifact
-                        pattern="http://repository.contegix.com/ivyrep/[organisation]/[module]/[artifact]-[revision].[type]"/>
-            </url>
-            <ivyrep name="ivyrep"/>
-            <ibiblio name="contegix-maven" root="http://repository.contegix.com/maven"/>
-            <url name="maven">
-                <artifact pattern="http://www.ibiblio.org/maven/[organisation]/jars/[module]-[revision].[type]"/>
-            </url>
-            <!--url name="maven-mirror">
-                <artifact pattern="http://ibiblio.lsu.edu/main/pub/packages/maven/[organisation]/jars/[module]-[revision].[type]"/>
-            </url-->
-        </chain>
-    </resolvers>
-</ivyconf>
diff --git a/ant-build/osbuild.xml b/ant-build/osbuild.xml
deleted file mode 100644
index ea26d5999..000000000
--- a/ant-build/osbuild.xml
+++ /dev/null
@@ -1,463 +0,0 @@
-<project name="common" default="jar" basedir=".">
-    <!--
-    OpenSymphony Common Build
-    =========================
-    TODO (Introduction)
-
-    Layout
-    =========================
-    TODO
-
-    Overriding
-    =========================
-    TODO
-    Example: <target name="compile" depends="myPreCompile,common.compile,myPostCompile"/>
-
-    -->
-    <!-- NOTE: this property is purely here to make a clear distinction in IDEA where the common build is -->
-    <property name="------common-properties-below------" value="Common properties below:"/>
-
-    <property name="compile.version" value="1.3"/>
-    <property name="test.compile.version" value="1.3"/>
-
-    <dirname property="common.dir" file="${ant.file.common}"/>
-    <property file="ant-build/build.properties"/>
-    <property file="ant-build/release.properties"/>
-    <property file="ant-build/ivyrep.properties"/>
-
-    <property name="lib" location="lib"/>
-    <property name="lib.core" value="${lib}/core"/>
-    <property name="lib.build" value="${lib}/build"/>
-    <property name="lib.optional" value="${lib}/optional"/>
-
-    <property name="src" location="core/src"/>
-    <property name="src.java" value="${src}/main/java"/>
-    <property name="src.test" value="${src}/test/java/"/>
-
-    <property name="src.resources" value="${src}/main/resources"/>
-
-    <property name="build" location="build"/>
-    <property name="build.test" value="${build}/test/java"/>
-    <property name="build.java-test" value="${build}/java-test"/>
-    <property name="build.java" value="${build}/java"/>
-    <property name="build.clover" value="${build}/clover"/>
-    <property name="dist" location="dist"/>
-
-    <property name="docs" location="docs"/>
-    <property name="docs.packages" value="org.apache.struts2.*"/>
-
-    <property name="jar.manifest" value="${common.dir}/EMPTY.MF"/>
-    <property name="jar.excludes" value=""/>
-
-    <property name="testcase" value="*"/>
-    <patternset id="src.test.pattern">
-        <exclude name="**/Abstract*.java"/>
-        <include name="**/${testcase}Test.java"/>
-        <include name="**/${testcase}TestCase.java"/>
-
-    </patternset>
-
-    <path id="cp">
-        <fileset dir="lib">
-            <include name="**/*.jar"/>
-            <include name="**/*.zip"/>
-            <exclude name="**/jalopy/**"/>
-        </fileset>
-    </path>
-
-    <path id="junit.cp">
-        <pathelement location="${build.java}"/>
-        <pathelement location="${build.test}"/>
-        <pathelement location="${src.test}/../resources"/>
-        <pathelement location="${build.java-test}"/>
-        <path refid="cp"/>
-    </path>
-
-    <path id="javadoc.path">
-        <path path="${src.java}"/>
-    </path>
-
-    <available property="junit.available" classname="junit.framework.TestCase"/>
-    <available property="clover.available" classname="org.apache.tools.ant.taskdefs.CloverCompilerAdapter"/>
-
-    <target name="init" depends="init-anthill, init-standalone">
-        <tstamp/>
-    </target>
-
-    <!-- in Anthill, the docs should be the Intranet copyDir -->
-    <target name="init-anthill" if="anthill.copyDir">
-        <property name="dist.docs" value="${anthill.copyDir}"/>
-    </target>
-
-    <!-- when building Standalone, the docs should be the normal place -->
-    <target name="init-standalone" unless="anthill.copyDir">
-        <property name="dist.docs" value="${dist}/docs"/>
-    </target>
-
-    <target name="junit-check" depends="init" unless="junit.available">
-        <fail message="Cannot run test cases. Please copy lib/build/junit.jar to ${ant.home}/lib"/>
-    </target>
-
-    <target name="clover-check" depends="init" unless="clover.available">
-        <fail message="Cannot run coverage tests. Please copy lib/build/clover.jar and lib/build/clover.license (if it exists) to ${ant.home}/lib"/>
-    </target>
-
-    <target name="clean">
-        <delete dir="${build}"/>
-        <delete dir="${dist}"/>
-    </target>
-
-    <target name="precompile"/>
-
-    <macrodef name="compile">
-        <attribute name="srcdir"/>
-        <attribute name="destdir"/>
-        <attribute name="classpath" default=""/>
-        <attribute name="classpathref" default="cp"/>
-        <attribute name="includes" default="**/*.java"/>
-        <attribute name="excludes" default=""/>
-        <attribute name="source" default="${compile.version}"/>
-        <attribute name="target" default="${compile.version}"/>
-        <sequential>
-            <mkdir dir="@{destdir}"/>
-            <javac srcdir="@{srcdir}" destdir="@{destdir}" classpath="@{classpath}" classpathref="@{classpathref}"
-                   debug="on" source="@{source}" target="@{target}" excludes="@{excludes}" />
-            <copy filtering="no" todir="@{destdir}">
-                <fileset dir="@{srcdir}">
-                    <exclude name="**/*.java"/>
-                    <exclude name="**/package.html"/>
-                </fileset>
-            </copy>
-        </sequential>
-    </macrodef>
-
-    <target name="compile" depends="init,precompile" description="compile project">
-        <compile srcdir="${src.java}" destdir="${build.java}" excludes="${optional.sources}" />
-        <copy filtering="no" todir="${build.java}"  includeemptydirs="false">
-            <fileset dir="${src.resources}" >
-                <exclude name="java/*"/>
-            </fileset>
-        </copy>
-    </target>
-
-    <target name="jar" depends="compile" description="build the project jar file">
-        <mkdir dir="${build}"/>
-
-        <jar basedir="${build.java}" excludes="${jar.excludes}" jarfile="${build}/${name}-${version}.jar">
-            <manifest>
-                <attribute name="Implementation-Title" value="${fullname}"/>
-                <attribute name="Implementation-Version" value="${version}"/>
-                <attribute name="Implementation-Vendor" value="OpenSymphony"/>
-            </manifest>
-        </jar>
-        <jar basedir="${src.java}" jarfile="${build}/${name}-src-${version}.jar">
-            <manifest>
-                <attribute name="Implementation-Title" value="${fullname}"/>
-                <attribute name="Implementation-Version" value="${version}"/>
-                <attribute name="Implementation-Vendor" value="OpenSymphony"/>
-            </manifest>
-        </jar>
-    </target>
-
-    <target name="src-jar" depends="init" description="build a jar of the project source code">
-        <mkdir dir="${build}"/>
-        <jar basedir="${src.java}" jarfile="${build}/${name}-src-${version}.jar">
-            <manifest>
-                <attribute name="Implementation-Title" value="${fullname}"/>
-                <attribute name="Implementation-Version" value="${version}"/>
-                <attribute name="Implementation-Vendor" value="OpenSymphony"/>
-            </manifest>
-        </jar>
-    </target>
-
-    <target name="test-compile" unless="skip.tests">
-        <compile srcdir="${src.test}" destdir="${build.test}" classpath="${build.java}"
-                 source="${test.compile.version}" target="${test.compile.version}" />
-
-        <taskdef resource="clovertasks"/>
-        <taskdef name="junit" classname="org.apache.tools.ant.taskdefs.optional.junit.JUnitTask"/>
-
-        <mkdir dir="${build.clover}"/>
-        <clover-setup initString="${build.clover}/coverage.db">
-            <statementContext name="logIsDebugEnabled" regexp="[\s]*if[\s]*\([\s]*(log|_log|LOG|_LOG)\.isDebugEnabled.*"/>
-            <statementContext name="logDebug" regexp="[\s]*(log|_log|LOG|_LOG)\.debug[\s]*\(.*"/>
-            <files>
-                <exclude name="${src.test}/**/*.java"/>
-            </files>
-        </clover-setup>
-
-        <!-- compile srcdir="${src.java}" destdir="${build.java-test}" / -->
-    </target>
-
-    <target name="test" depends="junit-check, clover-check, compile, test-compile" description="run tests"
-            unless="skip.tests">
-        <run-junit />
-    </target>
-
-    <macrodef name="run-junit">
-        <attribute name="classpathref" default="junit.cp" />
-        <attribute name="includes" default="**/${testcase}Test.java"/>
-        <attribute name="excludes" default=""/>
-        <sequential>
-          <mkdir dir="${dist.docs}/junit"/>
-          <junit haltonfailure="no" haltonerror="yes" fork="yes" forkmode="once" failureproperty="test.failure">
-              <jvmarg value="-Djava.awt.headless=true"/>
-              <jvmarg value="-Dorg.xml.sax.driver=org.apache.crimson.parser.XMLReaderImpl"/>
-              <classpath>
-                  <path refid="@{classpathref}"/>
-              </classpath>
-
-              <formatter type="plain" useFile="false"/>
-              <formatter type="xml"/>
-                
-                
-              <batchtest todir="${dist.docs}/junit">
-                  <fileset dir="${src.test}">
-                      <exclude name="@{excludes}" />
-                      <patternset refid="src.test.pattern"/>
-                      <include name="@{includes}" />
-                  </fileset>
-              </batchtest>
-          </junit>
-        </sequential>
-    </macrodef>
-
-    <target name="javadocs" description="generate javadocs">
-        <mkdir dir="${dist.docs}/api"/>
-        <javadoc sourcepathref="javadoc.path"
-                 destdir="${dist.docs}/api"
-                 packagenames="${docs.packages}"
-                 classpathref="cp"
-                 author="true"
-                 version="true"
-                 overview="${src.java}/overview.html"
-                 windowTitle="${fullname} API - ${version}"
-                 doctitle="${fullname} API (${version})"
-                 footer="&lt;a href=&quot;http://www.opensymphony.com/${name}/&quot; target=&quot;_top&quot;&gt;${fullname} Project Page&lt;/a&gt;"
-                 use="true"
-                 verbose="false"
-                 source="${compile.version}">
-            <tag name="s.tag" description="s.tag" enabled="false"/>
-            <tag name="s.tagattribute" description="s.tagattribute" enabled="false"/>
-            <link href="http://java.sun.com/j2se/${compile.version}/docs/api/"/>
-            <link href="http://java.sun.com/j2ee/${compile.version}/docs/api/"/>
-        </javadoc>
-        <!-- <copy overwrite="yes" file="${docs}/main.css" tofile="${docs}/api/stylesheet.css"/> -->
-    </target>
-
-    <target name="docs.impl">
-        <copy todir="${dist.docs}">
-            <fileset dir="${docs}"/>
-        </copy>
-    </target>
-
-    <target name="reports" depends="junit.report, clover.report, javadocs"
-            description="generate javadocs and junit and coverage reports"/>
-
-    <target name="docs" depends="reports, docs.impl"/>
-
-    <target name="clover.report" depends="test" description="generate coverage reports" unless="skip.tests">
-        <clover-report>
-            <current outfile="${dist.docs}/clover">
-                <format type="html" filter="logDebug,logIsDebugEnabled"/>
-            </current>
-        </clover-report>
-        <clover-log filter="logDebug,logIsDebugEnabled"/>
-    </target>
-
-    <target name="clover.historical" depends="clover.report" description="generate coverage historical reports"
-            unless="skip.tests">
-        <clover-historypoint historyDir="${build.clover}"/>
-
-        <clover-report>
-            <historical outfile="${dist.docs}/clover" historyDir="${build.clover}">
-                <format type="html" filter="logDebug,logIsDebugEnabled"/>
-            </historical>
-        </clover-report>
-        <clover-log filter="logDebug,logIsDebugEnabled"/>
-    </target>
-
-    <target name="junit.report" depends="test" description="generate junit reports" unless="skip.tests">
-        <junitreport todir="${dist.docs}/junit">
-            <fileset dir="${dist.docs}/junit">
-                <include name="TEST-*.xml"/>
-            </fileset>
-            <report format="frames" todir="${dist.docs}/junit"/>
-        </junitreport>
-
-        <!-- we fail here (instead of in the test target) so that the reports get generated first) -->
-        <fail if="test.failure" message="Tests did not all pass, failing!"/>
-    </target>
-
-    <target name="predist"/>
-
-    <target name="predist.zip"/>
-
-    <target name="dist" depends="jar, docs, predist" description="generate distribution zip file">
-        <copy todir="${dist}">
-            <fileset dir="${build}">
-                <include name="*.jar"/>
-            </fileset>
-        </copy>
-
-        <copy todir="${dist}/src">
-            <fileset dir="${src}"/>
-        </copy>
-
-        <mkdir dir="${dist}/lib"/>
-        <copy todir="${dist}/lib">
-            <fileset dir="${lib}">
-                <exclude name="**/no_dist/**"/>
-            </fileset>
-        </copy>
-
-        <copy todir="${dist}">
-            <fileset dir="${basedir}">
-                <include name="build.*"/>
-                <include name="osbuild.*"/>
-                <include name="ivy.*"/>
-                <include name="pom.*"/>
-                <include name="readme.txt"/>
-                <include name="license.txt"/>
-            </fileset>
-        </copy>
-
-        <!-- give a chance for project builds to do more before the zip is made. -->
-        <antcall target="predist.zip"/>
-
-        <zip destfile="${build}/${name}-${version}.zip">
-					<zipfileset prefix="${name}-${version}" dir="${dist}">
-            <exclude name="docs/clover/**/*"/>
-            <exclude name="docs/junit/**/*"/>
-        	</zipfileset>
-        </zip>
-        
-        <move file="${build}/${name}-${version}.zip" todir="${dist}" />
-    </target>
-
-    <target name="website" depends="javadocs, docs.impl"/>
-
-    <!-- =================================================================== -->
-    <!-- Fix carriage-return line feeds                                      -->
-    <!-- =================================================================== -->
-    <target name="fixcrlf" description="Fixed CR/LF problems">
-        <echo>Running fixcrlf....</echo>
-         <fixcrlf eol="lf" srcdir="${basedir}/core/src"
-                 includes="**/*.sh,
-                      **/*.properties,
-                      **/*.sql,
-                      **/*.script,
-                      **/*.java,
-                      **/*.css,
-                      **/*.js,
-                      **/*.jsp,
-                      **/*.ftl,
-                      **/*.txt,
-                      **/*.vm,
-                      **/*.xml,
-                      **/*.dtd,
-                      **/*.xsl,
-                      **/*.xslt,
-                      **/*.html" />
-        <fixcrlf eol="lf" srcdir="${basedir}/apps"
-                 includes="**/*.sh,
-                      **/*.properties,
-                      **/*.sql,
-                      **/*.script,
-                      **/*.java,
-                      **/*.css,
-                      **/*.js,
-                      **/*.jsp,
-                      **/*.ftl,
-                      **/*.txt,
-                      **/*.vm,
-                      **/*.xml,
-                      **/*.dtd,
-                      **/*.xsl,
-                      **/*.xslt,
-                      **/*.html" />
-    </target>
-
-    <target name="ivyrep" depends="jar, ivyrep.impl"/>
-
-    <target name="ivyrep.impl">
-        <tstamp>
-            <format property="TIME" pattern="yyyyMMddHHmmss"/>
-        </tstamp>
-
-        <!-- make sure we have the latest -->
-        <echo>svn update</echo>
-        <exec executable="svn">
-            <arg value="update"/>
-            <arg line="${ivyrep.path}/opensymphony/${name}"/>
-        </exec>
-
-        <!-- delete the old timestamped builds and commit -->
-        <fileset dir="${ivyrep.path}/opensymphony/${name}" id="filesref">
-            <include name="${name}-${version}-*"/>
-            <include name="ivy-${version}-*"/>
-        </fileset>
-        <pathconvert property="files" refid="filesref" pathsep=" "/>
-        <echo>svn delete: ${files}</echo>
-        <exec executable="svn">
-            <arg value="delete"/>
-            <arg line="${files}"/>
-        </exec>
-
-        <!-- copy over the new build and source -->
-        <copy file="${build}/${name}-${version}.jar"
-              tofile="${ivyrep.path}/opensymphony/${name}/${name}-${version}-${TIME}.jar"/>
-        <copy file="${build}/${name}-src-${version}.jar"
-              tofile="${ivyrep.path}/opensymphony/${name}/${name}-src-${version}-${TIME}.jar"/>
-        <echo>svn add (jar)</echo>
-        <exec executable="svn">
-            <arg value="add"/>
-            <arg value="${ivyrep.path}/opensymphony/${name}/${name}-${version}-${TIME}.jar"/>
-        </exec>
-        <exec executable="svn">
-            <arg value="add"/>
-            <arg value="${ivyrep.path}/opensymphony/${name}/${name}-src-${version}-${TIME}.jar"/>
-        </exec>
-
-        <antcall target="ivyrep.copy-ivy"/>
-        <exec executable="svn">
-            <arg value="add"/>
-            <arg value="${ivyrep.path}/opensymphony/${name}/ivy-${version}-${TIME}.xml"/>
-        </exec>
-
-        <!-- now commit everything -->
-        <echo>svn commit</echo>
-        <exec executable="svn">
-            <arg value="commit"/>
-            <arg value="--username"/>
-            <arg value="${ivyrep.username}"/>
-            <arg value="--password"/>
-            <arg value="${ivyrep.password}"/>
-            <arg value="--non-interactive"/>
-            <arg value="-m"/>
-            <arg value="automatic commit"/>
-            <arg value="${ivyrep.path}/opensymphony/${name}"/>
-        </exec>
-    </target>
-
-    <target name="ivyrep.copy-ivy">
-        <!--
-        Note: Default implementation does not use Ivy itself to generate these files.
-              However, Ivy is really the best way to generate these, so projects that
-              do use Ivy should override this target like so:
-
-              <ivy-deliver deliverpattern="${ivyrep.path}/opensymphony/${name}/[artifact]-[revision].[ext]"
-                           pubrevision="${version}-${TIME}" pubdate="${TIME}"/>
-
-              Over time as more projects adopt Ivy, this may become built in to the
-              common build.
-        -->
-        <copy file="ivy.xml" tofile="${ivyrep.path}/opensymphony/${name}/ivy-${version}-${TIME}.xml">
-            <filterset id="ivy.filter">
-                <filter token="VERSION" value="${version}-${TIME}"/>
-                <filter token="STATUS" value="${status}"/>
-                <filter token="PUBLICATION" value="${TIME}"/>
-            </filterset>
-        </copy>
-    </target>
-</project>