Further Ivy/Ant cleanup

This change removes the top-level build.xml and some other Ivy/Ant
configuration entries.

Change-Id: I56fb1621a66ef190a72cfe1f9eb277bb878db4b5

1 files changed, 0 insertions, 107 deletions

diff --git a/common.xml b/common.xml
index d61a98bc3c..fcada4e662 100644
--- a/common.xml
+++ b/common.xml
@@ -13,114 +13,7 @@
     <ivy:resolve log="download-only" file="${vaadin.basedir}/ivy-taskdefs.xml" conf="taskdefs" />
     <ivy:cachepath pathid="taskdefs.classpath" conf="taskdefs" />
     <taskdef uri="antlib:net.sf.antcontrib" resource="net/sf/antcontrib/antlib.xml" classpathref="taskdefs.classpath" />
-    <!-- ant contrib for Maven integration -->
-    <taskdef resource="org/apache/maven/artifact/ant/antlib.xml" uri="antlib:org.apache.maven.artifact.ant" classpathref="taskdefs.classpath" />
 
-    <!-- FIXME These are not available in other files -->
-    <filterset begintoken="@" endtoken="@" id="filter-vaadin.version">
-        <filter token="version" value="${vaadin.version}" />
-    </filterset>
-
-    <union id="empty.reference" />
-
-
-    <target name="compile" description="Compiles the module" depends="dependencies, directories" if="src-exists">
-        <fail unless="module.name" message="No module name given" />
-
-        <javac srcdir="${src}" destdir="${classes}" source="${vaadin.java.version}" target="${vaadin.java.version}" debug="true" encoding="UTF-8" includeantruntime="false">
-            <classpath refid="classpath.compile.dependencies" />
-            <classpath refid="classpath.compile.custom" />
-        </javac>
-        <copy todir="${classes}">
-            <fileset dir="${src}" includes="${extra.classes}" />
-        </copy>
-    </target>
-
-    <target name="directories">
-        <property name="result.dir" location="result" />
-        <property name="src" location="${result.dir}/../src" />
-        <property name="classes" location="${result.dir}/classes" />
-        <available file="${src}" type="dir" property="src-exists" />
-        <mkdir dir="${classes}" />
-    </target>
-
-    <target name="test.run" depends="test.compile">
-        <fail unless="module.name" message="No module name given" />
-
-        <property name="result.dir" location="result" />
-        <property name="classes" location="${result.dir}/classes" />
-        <property name="test.src" location="${result.dir}/../tests/src" />
-        <property name="test.classes" location="${result.dir}/tests/classes" />
-
-        <!-- Ensure report dir is empty before running tests -->
-        <property name="report.dir" location="${result.dir}/reports" />
-        <delete dir="${report.dir}" />
-        <mkdir dir="${report.dir}" />
-
-        <junit showoutput="no" printsummary="no" fork="yes">
-            <formatter type="xml" />
-            <jvmarg value="-ea" />
-            <classpath location="${test.classes}" />
-            <classpath location="${classes}" />
-            <classpath refid="classpath.compile.custom" />
-            <classpath refid="classpath.test.dependencies" />
-
-            <batchtest fork="yes" todir="${report.dir}">
-                <fileset dir="${test.src}">
-                    <include name="**/*Test.java" />
-                    <include name="**/*Tests.java" />
-                </fileset>
-            </batchtest>
-        </junit>
-    </target>
-
-    <target name="test.compile" description="Compiles tests" depends="compile, dependencies.test">
-        <fail unless="module.name" message="No module name given" />
-        <property name="result.dir" location="result" />
-        <property name="base.dir" location="${result.dir}/.." />
-        <property name="test.src" location="${base.dir}/tests/src" />
-        <property name="test.resources" location="${base.dir}/tests/resources" />
-        <property name="test.classes" location="${result.dir}/tests/classes" />
-        <property name="classes" location="${result.dir}/classes" />
-
-        <mkdir dir="${test.classes}" />
-
-        <javac srcdir="${test.src}" destdir="${test.classes}" source="${vaadin.java.version}" target="${vaadin.java.version}" debug="true" encoding="UTF-8" includeantruntime="false">
-            <classpath refid="classpath.test.dependencies" />
-            <classpath location="${classes}" />
-            <classpath refid="classpath.test.custom" />
-        </javac>
-
-        <!-- Copy resources -->
-        <copy todir="${test.classes}" failonerror="false">
-            <fileset dir="${test.resources}" />
-            <!-- include html templates used in declarative tests -->
-            <fileset dir="${test.src}">
-                <include name="**/*.html" />
-            </fileset>
-        </copy>
-    </target>
-
-    <target name="dependencies" description="Resolves dependencies needed by this module">
-        <property name='conf' value="build, build-provided" />
-        <ivy:resolve log="download-only" resolveid="common" conf="${conf}" />
-        <ivy:cachepath pathid="classpath.compile.dependencies" conf="${conf}" />
-    </target>
-
-    <target name="dependencies.test" description="Resolves dependencies needed by test">
-        <ivy:resolve log="download-only" resolveid="common" conf="test" />
-        <ivy:cachepath pathid="classpath.test.dependencies" conf="test" />
-    </target>
-
-    <target name="remove-test-reports">
-        <fail unless="result.dir" message="No result.dir parameter given" />
-        <delete dir="${result.dir}/reports" />
-    </target>
-
-    <target name="clean" depends="remove-test-reports">
-        <fail unless="result.dir" message="No result.dir parameter given" />
-        <delete dir="${result.dir}" />
-    </target>
 
     <!-- Checkstyle conf -->
     <property name="cs.dir" location="${vaadin.basedir}/checkstyle" />