* preparing ant tasks for being used in cruisecontrol

 * adding tasks for jslint validation (further config needed) and javadoc
 * modifying junit tasks so that Test*.java and *Test.java files are executed

git-svn-id: http://oryx-editor.googlecode.com/svn/trunk@2014 d672c736-503d-0410-a38a-9366997c882b

Author: schlichting.kai

build.xml

@@ -7,6 +7,7 @@
 
     <!-- Import ANT build scripts of sub projects -->
     <import file="editor/build.xml"/>
+    <import file="editor/test.xml"/>
     <import file="poem-jvm/build.xml"/>
     <import file="stick/build.xml"/>
 

editor/build.xml

@@ -12,12 +12,59 @@
 	<property name="editor-build-root" value="${build-dir}/editor" />
 
     <!-- Targets for oryx javascript documentation ****************************************************** -->
-    <taskdef name="jsdoctoolkit" classname="uk.co.darrenhurley.ant.tasks.JsDocToolkit" classpath="jsdoc-toolkit/jsdoctoolkit-ant-task-1.0.jar;jsdoc-toolkit/jsrun.jar;editor/lib/js.jar"/>
+	<path id="jsdoc.classpath">
+        <fileset file="${editor-src-root}/lib/js.jar" />
+        <fileset file="jsdoc-toolkit/jsrun.jar" />
+        <fileset file="jsdoc-toolkit/jsdoctoolkit-ant-task-1.0.jar" />
+    </path>
+    <taskdef name="jsdoctoolkit" classname="uk.co.darrenhurley.ant.tasks.JsDocToolkit" classpathref="jsdoc.classpath"/>
     <target name="jsdoc-editor">
         <jsdoctoolkit jsdochome="jsdoc-toolkit/" template="jsdoc" outputdir="jsdoc/editor" inputdir="editor/client/scripts" depth="2">
         </jsdoctoolkit>
     </target>
 
+    <!-- Oryx JavaDoc -->
+    <target name="javadoc-editor">
+      <javadoc
+        excludepackagenames="org.test.supercsv.mock"
+          access="public"
+           destdir="javadoc/editor"
+           author="true"
+           version="true"
+           use="true"
+           windowtitle="org.Super.CSV.API"
+       >
+
+        <fileset dir="${editor-src-server}" defaultexcludes="yes">
+            <include name="**/*.java"/>
+        </fileset>
+      </javadoc>
+    </target>
+    
+    <!-- JsLint task,checking javascript- and stencilset-json-files -->
+    <taskdef name="jslint"
+      classname="net.happygiraffe.jslint.ant.JSLintTask"
+      classpath="lib/jslint4java-1.2.1+rhino.jar">
+    </taskdef>
+    <target name="jslint.check_js">
+        <jslint options="browser">
+            <formatter type="plain" />
+            <formatter type="xml" destfile="jslint.xml" />
+            <fileset dir="${editor-src-client}/scripts">
+                <include name="**/*.js"/>
+            </fileset>
+        </jslint>
+    </target>
+    <target name="jslint.check_json">
+        <jslint>
+            <formatter type="plain" />
+            <fileset dir="${editor-src-root}/data/stencilsets">
+                <include name="**/*.json"/>
+            </fileset>
+        </jslint>
+    </target>
+    
+    
 	<!-- Oryx  targets (oryx.war) ****************************************************** -->
 	<target name="build-with-xhtml-test-files-flag">
 		<property name="build-with-xhtml-test-files-flag" value="*.xhtml" />

editor/test.xml

@@ -94,6 +94,7 @@
     </target>
 
 	<target name="test.editor.server.junit.run" depends="test.editor.server.prepare.compile">
+	      <mkdir dir="junit-results"/>
         <junit printsummary="withOutAndErr" haltonfailure="no">
             <classpath>
                 <path refid="test.editor.server.classpath"/>
@@ -103,8 +104,9 @@
 
             <formatter type="xml"/>
 
-            <batchtest>
+            <batchtest todir="junit-results">
                 <fileset dir="build/editor/test/server">
+                    <include name="**/*Test.class"/>
                     <include name="**/Test*.class"/>
                 </fileset>
             </batchtest>

editor/test/server/de/hpi/epc/stepthrough/EPCStepThroughInterpreterTest.java

@@ -19,7 +19,7 @@
 import de.hpi.bpt.process.epc.Function;
 import de.hpi.bpt.process.epc.IFlowObject;
 import de.hpi.epc.AbstractEPCTest;
-import edu.emory.mathcs.backport.java.util.Arrays;
+import java.util.Arrays;
 
 public class EPCStepThroughInterpreterTest extends AbstractEPCTest {
 	EPCStepThroughInterpreter epcST;