Author: mes
Date: 2010-07-22 17:40:11 -0700 (Thu, 22 Jul 2010)
New Revision: 21006
Removed:
corelibs/trunk/ding/build.xml
corelibs/trunk/ding/lib/
corelibs/trunk/ding/resources/
corelibs/trunk/equations/tests/
corelibs/trunk/render.immed/tests/
corelibs/trunk/render.stateful/tests/
corelibs/trunk/task/test/
corelibs/trunk/util.intr/tests/
Modified:
corelibs/trunk/pom.xml
Log:
cleaned up leftover files and redirected test output
Deleted: corelibs/trunk/ding/build.xml
===================================================================
--- corelibs/trunk/ding/build.xml 2010-07-23 00:28:12 UTC (rev 21005)
+++ corelibs/trunk/ding/build.xml 2010-07-23 00:40:11 UTC (rev 21006)
@@ -1,165 +0,0 @@
-
-<project name="ding" default="all" basedir=".">
-
- <!--
=================================================================== -->
- <!-- Initialization target
-->
- <!--
=================================================================== -->
- <target name="init">
- <tstamp />
- <property name="name" value="ding" />
- <property name="version" value="1.2.0" />
-
- <echo message="Building ${name} version ${version} ..." />
-
- <!-- Inheritable properties -->
- <property name="debug" value="on" />
- <property name="optimize" value="off" />
- <property name="deprecation" value="on" />
- <property name="fork" value="false" />
- <property name="locale" value="en_US" />
- <property name="encoding" value="UTF-8" />
-
- <!-- Define the directories -->
- <property name="root.dir" value="." />
- <property name="lib.dir" value="${root.dir}/lib" />
- <property name="src.dir" value="${root.dir}/src" />
- <property name="tests.dir" value="${root.dir}/tests" />
- <property name="build.dir" value="${root.dir}/build" />
- <property name="javadoc.dir" value="${root.dir}/API" />
- <property name="log.dir" value="${build.dir}/logs" />
- <property name="junit.report.dir"
value="${log.dir}/junit-reports" />
-
- <!-- Define the relevant files -->
- <property name="project.jar" value="${name}.jar" />
- <property name="test.jar" value="${name}-tests.jar" />
-
- <!-- Define the class path - Defaults to everything in the
lib.dir -->
- <path id="project.class.path">
- <fileset dir="${lib.dir}">
- <include name="**/*.jar" />
- </fileset>
- </path>
-
- <!-- Define the junit class path - It needs to find what we
just built -->
- <path id="junit.class.path">
- <fileset dir="${root.dir}">
- <include name="*.jar" />
- </fileset>
- <fileset dir="${lib.dir}">
- <include name="*.jar" />
- </fileset>
- </path>
-
- <!-- Make sure tests is in the right place -->
- <condition property="tests.ok">
- <and>
- <available file="${tests.dir}" />
- </and>
- </condition>
-
- </target>
-
- <!--
=================================================================== -->
- <!-- Compiles the project
-->
- <!--
=================================================================== -->
- <target name="compile" depends="init">
- <mkdir dir="${build.dir}" />
- <mkdir dir="${log.dir}" />
- <javac srcdir="${src.dir}" classpathref="project.class.path"
destdir="${build.dir}" debug="${debug}" deprecation="${deprecation}"
optimize="${optimize}" source="1.5" target="1.5" fork="${fork}"
encoding="${encoding}">
- <!--
- <compilerarg line="-Xlint:all -Xlint:-path"/>
--->
- </javac>
- <echo message="Successfully ran compile task!" />
- </target>
-
-
- <!--
=================================================================== -->
- <!-- Creates the project jar file
-->
- <!--
=================================================================== -->
- <target name="jar" depends="compile">
- <copy todir="${build.dir}/resources/images/">
- <fileset dir="${root.dir}/resources/images/">
- <include name="**"/>
- </fileset>
- </copy>
- <mkdir dir="${lib.dir}" />
- <jar destfile="${project.jar}">
- <fileset dir="${build.dir}" includes="**" />
- </jar>
- <echo message="Successfully ran jar task!" />
- </target>
-
- <!--
=================================================================== -->
- <!-- Compiles the tests
-->
- <!-- Note that this compilation occurs AFTER the distribution jar has
-->
- <!-- been created, so that the tests aren't distributed.
-->
- <!--
=================================================================== -->
- <target name="compile-tests" depends="jar" if="tests.ok">
- <javac srcdir="${tests.dir}" classpathref="project.class.path"
destdir="${build.dir}" debug="${debug}" deprecation="${deprecation}"
optimize="${optimize}" fork="${fork}">
- <compilerarg line="-Xlint:all -Xlint:-path" />
- </javac>
- <echo message="Successfully ran compile-tests task!" />
- </target>
-
- <!--
=================================================================== -->
- <!-- Creates the project-tests.jar file
-->
- <!--
=================================================================== -->
- <target name="jar-tests" depends="compile-tests" if="tests.ok">
- <jar jarfile="${test.jar}" basedir="${build.dir}">
- </jar>
- <echo message="Successfully ran jar-tests task!" />
- </target>
-
-
-
- <!--
=================================================================== -->
- <!-- Runs the unit tests.
-->
- <!--
=================================================================== -->
- <target name="test" depends="jar-tests" if="tests.ok">
- <junit printsummary="yes" haltonfailure="no" maxmemory="256m">
- <classpath refid="junit.class.path" />
- <formatter type="plain" usefile="true" />
- <formatter type="xml" usefile="true" />
- <batchtest fork="yes" todir="${log.dir}"
failureProperty="junit.test.failure" errorProperty="junit.test.failure">
- <fileset dir="${tests.dir}"
includes="**/*Test.java" excludes="**/AllTests.java" />
- </batchtest>
- </junit>
- <mkdir dir="${junit.report.dir}" />
- <junitreport todir="${junit.report.dir}">
- <fileset dir="${log.dir}">
- <include name="TEST-*.xml" />
- </fileset>
- <report format="frames" todir="${junit.report.dir}" />
- </junitreport>
- <fail message="TEST FAILURE!!! Details:
${junit.report.dir}/index.html" if="junit.test.failure" />
- <echo message="Successfully ran test task!" />
- </target>
-
- <!--
=================================================================== -->
- <!-- Creates the API documentation
-->
- <!--
=================================================================== -->
- <target name="docs" depends="init">
- <mkdir dir="${javadoc.dir}" />
- <javadoc Locale="${locale}" sourcepath="${src.dir}"
destdir="${javadoc.dir}" packagenames="*" classpathref="project.class.path"
author="true" version="true" use="true" splitindex="true" noindex="false"
windowtitle="${name} API" package="true" doctitle="${name}" />
- <echo message="Successfully ran docs task!" />
- </target>
-
- <!--
=================================================================== -->
- <!-- Do everything
-->
- <!--
=================================================================== -->
- <target name="all" depends="jar,docs,test" />
-
- <!--
=================================================================== -->
- <!-- Clean up, get back to original state
-->
- <!--
=================================================================== -->
- <target name="clean" depends="init">
- <delete dir="${build.dir}" />
- <delete dir="${javadoc.dir}" />
- <delete file="${project.jar}" />
- <delete file="${test.jar}" />
- <echo message="Successfully ran clean task!" />
- </target>
-
-</project>
-
Modified: corelibs/trunk/pom.xml
===================================================================
--- corelibs/trunk/pom.xml 2010-07-23 00:28:12 UTC (rev 21005)
+++ corelibs/trunk/pom.xml 2010-07-23 00:40:11 UTC (rev 21006)
@@ -51,6 +51,7 @@
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
<argLine>-Xmx256m</argLine>
+
<redirectTestOutputToFile>true</redirectTestOutputToFile>
</configuration>
</plugin>
</plugins>
--
You received this message because you are subscribed to the Google Groups
"cytoscape-cvs" group.
To post to this group, send email to [email protected].
To unsubscribe from this group, send email to
[email protected].
For more options, visit this group at
http://groups.google.com/group/cytoscape-cvs?hl=en.
