Allow running tests from mvn

git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/batik/trunk@1805886 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/batik-test-old/pom.xml b/batik-test-old/pom.xml
index 4a9c6cc..31d6534 100644
--- a/batik-test-old/pom.xml
+++ b/batik-test-old/pom.xml
@@ -39,33 +39,57 @@
       <groupId>${project.groupId}</groupId>
       <artifactId>batik-test</artifactId>
       <version>${project.version}</version>
+      <scope>test</scope>
     </dependency>
      <dependency>
       <groupId>${project.groupId}</groupId>
       <artifactId>batik-util</artifactId>
       <version>${project.version}</version>
       <type>test-jar</type>
+      <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>${project.groupId}</groupId>
       <artifactId>batik-test-swing</artifactId>
       <version>${project.version}</version>
+      <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>${project.groupId}</groupId>
       <artifactId>batik-test-svg</artifactId>
       <version>${project.version}</version>
+      <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>${project.groupId}</groupId>
       <artifactId>batik-all</artifactId>
       <version>${project.version}</version>
+      <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>
       <version>${junit.version}</version>
-      <!-- <scope>test</scope> -->
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.mozilla</groupId>
+      <artifactId>rhino</artifactId>
+      <version>${rhino.version}</version>
+      <optional>true</optional>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+        <groupId>org.apache.xmlgraphics</groupId>
+        <artifactId>fop</artifactId>
+        <version>${xmlgraphics.commons.version}</version>
+        <scope>test</scope>
+    </dependency>
+    <dependency>
+        <groupId>xerces</groupId>
+        <artifactId>xercesImpl</artifactId>
+        <version>2.9.1</version>
+        <scope>test</scope>
     </dependency>
   </dependencies>
 
@@ -75,10 +99,21 @@
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-compiler-plugin</artifactId>
       </plugin>
+      <plugin>
+        <artifactId>maven-surefire-plugin</artifactId>
+        <version>${surefire.version}</version><!--$NO-MVN-MAN-VER$-->
+        <configuration>
+          <includes>
+            <include>**/*TestCase.java</include>
+          </includes>
+          <redirectTestOutputToFile>true</redirectTestOutputToFile>
+          <workingDirectory>..</workingDirectory>
+        </configuration>
+      </plugin>
     </plugins>
     <resources>
       <resource>
-        <directory>src/main/resources</directory>
+        <directory>../test-resources</directory>
       </resource>
       <resource>
         <directory>${basedir}/..</directory>
diff --git a/batik-test-old/src/main/java/org/apache/batik/anim/dom/SystemIdTest.java b/batik-test-old/src/test/java/org/apache/batik/anim/dom/SystemIdTest.java
similarity index 100%
rename from batik-test-old/src/main/java/org/apache/batik/anim/dom/SystemIdTest.java
rename to batik-test-old/src/test/java/org/apache/batik/anim/dom/SystemIdTest.java
diff --git a/batik-test-old/src/main/java/org/apache/batik/apps/rasterizer/MainTest.java b/batik-test-old/src/test/java/org/apache/batik/apps/rasterizer/MainTest.java
similarity index 100%
rename from batik-test-old/src/main/java/org/apache/batik/apps/rasterizer/MainTest.java
rename to batik-test-old/src/test/java/org/apache/batik/apps/rasterizer/MainTest.java
diff --git a/batik-test-old/src/main/java/org/apache/batik/apps/rasterizer/SVGConverterTest.java b/batik-test-old/src/test/java/org/apache/batik/apps/rasterizer/SVGConverterTest.java
similarity index 100%
rename from batik-test-old/src/main/java/org/apache/batik/apps/rasterizer/SVGConverterTest.java
rename to batik-test-old/src/test/java/org/apache/batik/apps/rasterizer/SVGConverterTest.java
diff --git a/batik-test-old/src/main/java/org/apache/batik/bridge/EcmaLoadTest.java b/batik-test-old/src/test/java/org/apache/batik/bridge/EcmaLoadTest.java
similarity index 100%
rename from batik-test-old/src/main/java/org/apache/batik/bridge/EcmaLoadTest.java
rename to batik-test-old/src/test/java/org/apache/batik/bridge/EcmaLoadTest.java
diff --git a/batik-test-old/src/main/java/org/apache/batik/bridge/EcmaNoLoadTest.java b/batik-test-old/src/test/java/org/apache/batik/bridge/EcmaNoLoadTest.java
similarity index 100%
rename from batik-test-old/src/main/java/org/apache/batik/bridge/EcmaNoLoadTest.java
rename to batik-test-old/src/test/java/org/apache/batik/bridge/EcmaNoLoadTest.java
diff --git a/batik-test-old/src/main/java/org/apache/batik/bridge/ExternalResourcesTest.java b/batik-test-old/src/test/java/org/apache/batik/bridge/ExternalResourcesTest.java
similarity index 100%
rename from batik-test-old/src/main/java/org/apache/batik/bridge/ExternalResourcesTest.java
rename to batik-test-old/src/test/java/org/apache/batik/bridge/ExternalResourcesTest.java
diff --git a/batik-test-old/src/main/java/org/apache/batik/bridge/JarLoadTest.java b/batik-test-old/src/test/java/org/apache/batik/bridge/JarLoadTest.java
similarity index 100%
rename from batik-test-old/src/main/java/org/apache/batik/bridge/JarLoadTest.java
rename to batik-test-old/src/test/java/org/apache/batik/bridge/JarLoadTest.java
diff --git a/batik-test-old/src/main/java/org/apache/batik/bridge/JarNoLoadTest.java b/batik-test-old/src/test/java/org/apache/batik/bridge/JarNoLoadTest.java
similarity index 100%
rename from batik-test-old/src/main/java/org/apache/batik/bridge/JarNoLoadTest.java
rename to batik-test-old/src/test/java/org/apache/batik/bridge/JarNoLoadTest.java
diff --git a/batik-test-old/src/main/java/org/apache/batik/bridge/ScriptSelfTest.java b/batik-test-old/src/test/java/org/apache/batik/bridge/ScriptSelfTest.java
similarity index 100%
rename from batik-test-old/src/main/java/org/apache/batik/bridge/ScriptSelfTest.java
rename to batik-test-old/src/test/java/org/apache/batik/bridge/ScriptSelfTest.java
diff --git a/batik-test-old/src/main/java/org/apache/batik/css/dom/EcmaScriptCSSDOMTest.java b/batik-test-old/src/test/java/org/apache/batik/css/dom/EcmaScriptCSSDOMTest.java
similarity index 100%
rename from batik-test-old/src/main/java/org/apache/batik/css/dom/EcmaScriptCSSDOMTest.java
rename to batik-test-old/src/test/java/org/apache/batik/css/dom/EcmaScriptCSSDOMTest.java
diff --git a/batik-test-old/src/main/java/org/apache/batik/css/engine/value/PropertyManagerTest.java b/batik-test-old/src/test/java/org/apache/batik/css/engine/value/PropertyManagerTest.java
similarity index 100%
rename from batik-test-old/src/main/java/org/apache/batik/css/engine/value/PropertyManagerTest.java
rename to batik-test-old/src/test/java/org/apache/batik/css/engine/value/PropertyManagerTest.java
diff --git a/batik-test-old/src/main/java/org/apache/batik/dom/AppendChildTest.java b/batik-test-old/src/test/java/org/apache/batik/dom/AppendChildTest.java
similarity index 100%
rename from batik-test-old/src/main/java/org/apache/batik/dom/AppendChildTest.java
rename to batik-test-old/src/test/java/org/apache/batik/dom/AppendChildTest.java
diff --git a/batik-test-old/src/main/java/org/apache/batik/dom/AttrIsIdTest.java b/batik-test-old/src/test/java/org/apache/batik/dom/AttrIsIdTest.java
similarity index 100%
rename from batik-test-old/src/main/java/org/apache/batik/dom/AttrIsIdTest.java
rename to batik-test-old/src/test/java/org/apache/batik/dom/AttrIsIdTest.java
diff --git a/batik-test-old/src/main/java/org/apache/batik/dom/CloneElementTest.java b/batik-test-old/src/test/java/org/apache/batik/dom/CloneElementTest.java
similarity index 100%
rename from batik-test-old/src/main/java/org/apache/batik/dom/CloneElementTest.java
rename to batik-test-old/src/test/java/org/apache/batik/dom/CloneElementTest.java
diff --git a/batik-test-old/src/main/java/org/apache/batik/dom/DOM3Test.java b/batik-test-old/src/test/java/org/apache/batik/dom/DOM3Test.java
similarity index 100%
rename from batik-test-old/src/main/java/org/apache/batik/dom/DOM3Test.java
rename to batik-test-old/src/test/java/org/apache/batik/dom/DOM3Test.java
diff --git a/batik-test-old/src/main/java/org/apache/batik/dom/DOMUtilitiesCharacterEscaping.java b/batik-test-old/src/test/java/org/apache/batik/dom/DOMUtilitiesCharacterEscaping.java
similarity index 100%
rename from batik-test-old/src/main/java/org/apache/batik/dom/DOMUtilitiesCharacterEscaping.java
rename to batik-test-old/src/test/java/org/apache/batik/dom/DOMUtilitiesCharacterEscaping.java
diff --git a/batik-test-old/src/main/java/org/apache/batik/dom/DocumentAdoptNodeTest.java b/batik-test-old/src/test/java/org/apache/batik/dom/DocumentAdoptNodeTest.java
similarity index 100%
rename from batik-test-old/src/main/java/org/apache/batik/dom/DocumentAdoptNodeTest.java
rename to batik-test-old/src/test/java/org/apache/batik/dom/DocumentAdoptNodeTest.java
diff --git a/batik-test-old/src/main/java/org/apache/batik/dom/DocumentNormalizeDocumentTest.java b/batik-test-old/src/test/java/org/apache/batik/dom/DocumentNormalizeDocumentTest.java
similarity index 100%
rename from batik-test-old/src/main/java/org/apache/batik/dom/DocumentNormalizeDocumentTest.java
rename to batik-test-old/src/test/java/org/apache/batik/dom/DocumentNormalizeDocumentTest.java
diff --git a/batik-test-old/src/main/java/org/apache/batik/dom/DocumentRenameNodeTest.java b/batik-test-old/src/test/java/org/apache/batik/dom/DocumentRenameNodeTest.java
similarity index 100%
rename from batik-test-old/src/main/java/org/apache/batik/dom/DocumentRenameNodeTest.java
rename to batik-test-old/src/test/java/org/apache/batik/dom/DocumentRenameNodeTest.java
diff --git a/batik-test-old/src/main/java/org/apache/batik/dom/EcmaScriptDOMTest.java b/batik-test-old/src/test/java/org/apache/batik/dom/EcmaScriptDOMTest.java
similarity index 100%
rename from batik-test-old/src/main/java/org/apache/batik/dom/EcmaScriptDOMTest.java
rename to batik-test-old/src/test/java/org/apache/batik/dom/EcmaScriptDOMTest.java
diff --git a/batik-test-old/src/main/java/org/apache/batik/dom/ElementSetIdAttributeNSTest.java b/batik-test-old/src/test/java/org/apache/batik/dom/ElementSetIdAttributeNSTest.java
similarity index 100%
rename from batik-test-old/src/main/java/org/apache/batik/dom/ElementSetIdAttributeNSTest.java
rename to batik-test-old/src/test/java/org/apache/batik/dom/ElementSetIdAttributeNSTest.java
diff --git a/batik-test-old/src/main/java/org/apache/batik/dom/ElementTraversalTest.java b/batik-test-old/src/test/java/org/apache/batik/dom/ElementTraversalTest.java
similarity index 100%
rename from batik-test-old/src/main/java/org/apache/batik/dom/ElementTraversalTest.java
rename to batik-test-old/src/test/java/org/apache/batik/dom/ElementTraversalTest.java
diff --git a/batik-test-old/src/main/java/org/apache/batik/dom/EventTargetAddEventListenerNSTest.java b/batik-test-old/src/test/java/org/apache/batik/dom/EventTargetAddEventListenerNSTest.java
similarity index 100%
rename from batik-test-old/src/main/java/org/apache/batik/dom/EventTargetAddEventListenerNSTest.java
rename to batik-test-old/src/test/java/org/apache/batik/dom/EventTargetAddEventListenerNSTest.java
diff --git a/batik-test-old/src/main/java/org/apache/batik/dom/GetElementsByTagNameNSTest.java b/batik-test-old/src/test/java/org/apache/batik/dom/GetElementsByTagNameNSTest.java
similarity index 100%
rename from batik-test-old/src/main/java/org/apache/batik/dom/GetElementsByTagNameNSTest.java
rename to batik-test-old/src/test/java/org/apache/batik/dom/GetElementsByTagNameNSTest.java
diff --git a/batik-test-old/src/main/java/org/apache/batik/dom/HasChildNodesTest.java b/batik-test-old/src/test/java/org/apache/batik/dom/HasChildNodesTest.java
similarity index 100%
rename from batik-test-old/src/main/java/org/apache/batik/dom/HasChildNodesTest.java
rename to batik-test-old/src/test/java/org/apache/batik/dom/HasChildNodesTest.java
diff --git a/batik-test-old/src/main/java/org/apache/batik/dom/NodeBaseURITest.java b/batik-test-old/src/test/java/org/apache/batik/dom/NodeBaseURITest.java
similarity index 100%
rename from batik-test-old/src/main/java/org/apache/batik/dom/NodeBaseURITest.java
rename to batik-test-old/src/test/java/org/apache/batik/dom/NodeBaseURITest.java
diff --git a/batik-test-old/src/main/java/org/apache/batik/dom/NodeCompareDocumentPositionTest.java b/batik-test-old/src/test/java/org/apache/batik/dom/NodeCompareDocumentPositionTest.java
similarity index 100%
rename from batik-test-old/src/main/java/org/apache/batik/dom/NodeCompareDocumentPositionTest.java
rename to batik-test-old/src/test/java/org/apache/batik/dom/NodeCompareDocumentPositionTest.java
diff --git a/batik-test-old/src/main/java/org/apache/batik/dom/NodeGetUserDataTest.java b/batik-test-old/src/test/java/org/apache/batik/dom/NodeGetUserDataTest.java
similarity index 100%
rename from batik-test-old/src/main/java/org/apache/batik/dom/NodeGetUserDataTest.java
rename to batik-test-old/src/test/java/org/apache/batik/dom/NodeGetUserDataTest.java
diff --git a/batik-test-old/src/main/java/org/apache/batik/dom/NodeTextContentTest.java b/batik-test-old/src/test/java/org/apache/batik/dom/NodeTextContentTest.java
similarity index 100%
rename from batik-test-old/src/main/java/org/apache/batik/dom/NodeTextContentTest.java
rename to batik-test-old/src/test/java/org/apache/batik/dom/NodeTextContentTest.java
diff --git a/batik-test-old/src/main/java/org/apache/batik/dom/NullNamespaceTest.java b/batik-test-old/src/test/java/org/apache/batik/dom/NullNamespaceTest.java
similarity index 100%
rename from batik-test-old/src/main/java/org/apache/batik/dom/NullNamespaceTest.java
rename to batik-test-old/src/test/java/org/apache/batik/dom/NullNamespaceTest.java
diff --git a/batik-test-old/src/main/java/org/apache/batik/dom/RemoveAttributeTest.java b/batik-test-old/src/test/java/org/apache/batik/dom/RemoveAttributeTest.java
similarity index 100%
rename from batik-test-old/src/main/java/org/apache/batik/dom/RemoveAttributeTest.java
rename to batik-test-old/src/test/java/org/apache/batik/dom/RemoveAttributeTest.java
diff --git a/batik-test-old/src/main/java/org/apache/batik/dom/ReplaceChildTest.java b/batik-test-old/src/test/java/org/apache/batik/dom/ReplaceChildTest.java
similarity index 100%
rename from batik-test-old/src/main/java/org/apache/batik/dom/ReplaceChildTest.java
rename to batik-test-old/src/test/java/org/apache/batik/dom/ReplaceChildTest.java
diff --git a/batik-test-old/src/main/java/org/apache/batik/dom/SerializationTest.java b/batik-test-old/src/test/java/org/apache/batik/dom/SerializationTest.java
similarity index 100%
rename from batik-test-old/src/main/java/org/apache/batik/dom/SerializationTest.java
rename to batik-test-old/src/test/java/org/apache/batik/dom/SerializationTest.java
diff --git a/batik-test-old/src/main/java/org/apache/batik/dom/SetAttributeTest.java b/batik-test-old/src/test/java/org/apache/batik/dom/SetAttributeTest.java
similarity index 100%
rename from batik-test-old/src/main/java/org/apache/batik/dom/SetAttributeTest.java
rename to batik-test-old/src/test/java/org/apache/batik/dom/SetAttributeTest.java
diff --git a/batik-test-old/src/main/java/org/apache/batik/dom/TextReplaceWholeTextTest.java b/batik-test-old/src/test/java/org/apache/batik/dom/TextReplaceWholeTextTest.java
similarity index 100%
rename from batik-test-old/src/main/java/org/apache/batik/dom/TextReplaceWholeTextTest.java
rename to batik-test-old/src/test/java/org/apache/batik/dom/TextReplaceWholeTextTest.java
diff --git a/batik-test-old/src/main/java/org/apache/batik/dom/TextWholeTextTest.java b/batik-test-old/src/test/java/org/apache/batik/dom/TextWholeTextTest.java
similarity index 100%
rename from batik-test-old/src/main/java/org/apache/batik/dom/TextWholeTextTest.java
rename to batik-test-old/src/test/java/org/apache/batik/dom/TextWholeTextTest.java
diff --git a/batik-test-old/src/main/java/org/apache/batik/dom/svg/CloneNodeTest.java b/batik-test-old/src/test/java/org/apache/batik/dom/svg/CloneNodeTest.java
similarity index 100%
rename from batik-test-old/src/main/java/org/apache/batik/dom/svg/CloneNodeTest.java
rename to batik-test-old/src/test/java/org/apache/batik/dom/svg/CloneNodeTest.java
diff --git a/batik-test-old/src/main/java/org/apache/batik/dom/svg/EcmaScriptSVGDOMTest.java b/batik-test-old/src/test/java/org/apache/batik/dom/svg/EcmaScriptSVGDOMTest.java
similarity index 100%
rename from batik-test-old/src/main/java/org/apache/batik/dom/svg/EcmaScriptSVGDOMTest.java
rename to batik-test-old/src/test/java/org/apache/batik/dom/svg/EcmaScriptSVGDOMTest.java
diff --git a/batik-test-old/src/main/java/org/apache/batik/dom/svg/ImportNodeTest.java b/batik-test-old/src/test/java/org/apache/batik/dom/svg/ImportNodeTest.java
similarity index 100%
rename from batik-test-old/src/main/java/org/apache/batik/dom/svg/ImportNodeTest.java
rename to batik-test-old/src/test/java/org/apache/batik/dom/svg/ImportNodeTest.java
diff --git a/batik-test-old/src/main/java/org/apache/batik/ext/awt/geom/Messages.java b/batik-test-old/src/test/java/org/apache/batik/ext/awt/geom/Messages.java
similarity index 100%
rename from batik-test-old/src/main/java/org/apache/batik/ext/awt/geom/Messages.java
rename to batik-test-old/src/test/java/org/apache/batik/ext/awt/geom/Messages.java
diff --git a/batik-test-old/src/main/java/org/apache/batik/ext/awt/geom/RectListManagerTest.java b/batik-test-old/src/test/java/org/apache/batik/ext/awt/geom/RectListManagerTest.java
similarity index 100%
rename from batik-test-old/src/main/java/org/apache/batik/ext/awt/geom/RectListManagerTest.java
rename to batik-test-old/src/test/java/org/apache/batik/ext/awt/geom/RectListManagerTest.java
diff --git a/batik-test-old/src/main/java/org/apache/batik/ext/awt/image/codec/Messages.java b/batik-test-old/src/test/java/org/apache/batik/ext/awt/image/codec/Messages.java
similarity index 100%
rename from batik-test-old/src/main/java/org/apache/batik/ext/awt/image/codec/Messages.java
rename to batik-test-old/src/test/java/org/apache/batik/ext/awt/image/codec/Messages.java
diff --git a/batik-test-old/src/main/java/org/apache/batik/ext/awt/image/codec/png/Base64PNGEncoderTest.java b/batik-test-old/src/test/java/org/apache/batik/ext/awt/image/codec/png/Base64PNGEncoderTest.java
similarity index 100%
rename from batik-test-old/src/main/java/org/apache/batik/ext/awt/image/codec/png/Base64PNGEncoderTest.java
rename to batik-test-old/src/test/java/org/apache/batik/ext/awt/image/codec/png/Base64PNGEncoderTest.java
diff --git a/batik-test-old/src/main/java/org/apache/batik/ext/awt/image/codec/png/PNGEncoderTest.java b/batik-test-old/src/test/java/org/apache/batik/ext/awt/image/codec/png/PNGEncoderTest.java
similarity index 100%
rename from batik-test-old/src/main/java/org/apache/batik/ext/awt/image/codec/png/PNGEncoderTest.java
rename to batik-test-old/src/test/java/org/apache/batik/ext/awt/image/codec/png/PNGEncoderTest.java
diff --git a/batik-test-old/src/main/java/org/apache/batik/gvt/Messages.java b/batik-test-old/src/test/java/org/apache/batik/gvt/Messages.java
similarity index 100%
rename from batik-test-old/src/main/java/org/apache/batik/gvt/Messages.java
rename to batik-test-old/src/test/java/org/apache/batik/gvt/Messages.java
diff --git a/batik-test-old/src/main/java/org/apache/batik/gvt/TextSelectionTest.java b/batik-test-old/src/test/java/org/apache/batik/gvt/TextSelectionTest.java
similarity index 100%
rename from batik-test-old/src/main/java/org/apache/batik/gvt/TextSelectionTest.java
rename to batik-test-old/src/test/java/org/apache/batik/gvt/TextSelectionTest.java
diff --git a/batik-test-old/src/main/java/org/apache/batik/parser/LengthParserFailureTest.java b/batik-test-old/src/test/java/org/apache/batik/parser/LengthParserFailureTest.java
similarity index 100%
rename from batik-test-old/src/main/java/org/apache/batik/parser/LengthParserFailureTest.java
rename to batik-test-old/src/test/java/org/apache/batik/parser/LengthParserFailureTest.java
diff --git a/batik-test-old/src/main/java/org/apache/batik/parser/LengthParserTest.java b/batik-test-old/src/test/java/org/apache/batik/parser/LengthParserTest.java
similarity index 100%
rename from batik-test-old/src/main/java/org/apache/batik/parser/LengthParserTest.java
rename to batik-test-old/src/test/java/org/apache/batik/parser/LengthParserTest.java
diff --git a/batik-test-old/src/main/java/org/apache/batik/parser/PathParserFailureTest.java b/batik-test-old/src/test/java/org/apache/batik/parser/PathParserFailureTest.java
similarity index 100%
rename from batik-test-old/src/main/java/org/apache/batik/parser/PathParserFailureTest.java
rename to batik-test-old/src/test/java/org/apache/batik/parser/PathParserFailureTest.java
diff --git a/batik-test-old/src/main/java/org/apache/batik/parser/PathParserTest.java b/batik-test-old/src/test/java/org/apache/batik/parser/PathParserTest.java
similarity index 100%
rename from batik-test-old/src/main/java/org/apache/batik/parser/PathParserTest.java
rename to batik-test-old/src/test/java/org/apache/batik/parser/PathParserTest.java
diff --git a/batik-test-old/src/main/java/org/apache/batik/parser/TransformListParserTest.java b/batik-test-old/src/test/java/org/apache/batik/parser/TransformListParserTest.java
similarity index 100%
rename from batik-test-old/src/main/java/org/apache/batik/parser/TransformListParserTest.java
rename to batik-test-old/src/test/java/org/apache/batik/parser/TransformListParserTest.java
diff --git a/batik-test-old/src/main/java/org/apache/batik/script/rhino/ScriptSelfTest.java b/batik-test-old/src/test/java/org/apache/batik/script/rhino/ScriptSelfTest.java
similarity index 100%
rename from batik-test-old/src/main/java/org/apache/batik/script/rhino/ScriptSelfTest.java
rename to batik-test-old/src/test/java/org/apache/batik/script/rhino/ScriptSelfTest.java
diff --git a/batik-test-old/src/main/java/org/apache/batik/svggen/ATransform.java b/batik-test-old/src/test/java/org/apache/batik/svggen/ATransform.java
similarity index 100%
rename from batik-test-old/src/main/java/org/apache/batik/svggen/ATransform.java
rename to batik-test-old/src/test/java/org/apache/batik/svggen/ATransform.java
diff --git a/batik-test-old/src/main/java/org/apache/batik/svggen/AttributedCharacterIterator.java b/batik-test-old/src/test/java/org/apache/batik/svggen/AttributedCharacterIterator.java
similarity index 100%
rename from batik-test-old/src/main/java/org/apache/batik/svggen/AttributedCharacterIterator.java
rename to batik-test-old/src/test/java/org/apache/batik/svggen/AttributedCharacterIterator.java
diff --git a/batik-test-old/src/main/java/org/apache/batik/svggen/BEExample.java b/batik-test-old/src/test/java/org/apache/batik/svggen/BEExample.java
similarity index 100%
rename from batik-test-old/src/main/java/org/apache/batik/svggen/BEExample.java
rename to batik-test-old/src/test/java/org/apache/batik/svggen/BEExample.java
diff --git a/batik-test-old/src/main/java/org/apache/batik/svggen/BStroke.java b/batik-test-old/src/test/java/org/apache/batik/svggen/BStroke.java
similarity index 100%
rename from batik-test-old/src/main/java/org/apache/batik/svggen/BStroke.java
rename to batik-test-old/src/test/java/org/apache/batik/svggen/BStroke.java
diff --git a/batik-test-old/src/main/java/org/apache/batik/svggen/BasicShapes.java b/batik-test-old/src/test/java/org/apache/batik/svggen/BasicShapes.java
similarity index 100%
rename from batik-test-old/src/main/java/org/apache/batik/svggen/BasicShapes.java
rename to batik-test-old/src/test/java/org/apache/batik/svggen/BasicShapes.java
diff --git a/batik-test-old/src/main/java/org/apache/batik/svggen/BasicShapes2.java b/batik-test-old/src/test/java/org/apache/batik/svggen/BasicShapes2.java
similarity index 100%
rename from batik-test-old/src/main/java/org/apache/batik/svggen/BasicShapes2.java
rename to batik-test-old/src/test/java/org/apache/batik/svggen/BasicShapes2.java
diff --git a/batik-test-old/src/main/java/org/apache/batik/svggen/Bug17965.java b/batik-test-old/src/test/java/org/apache/batik/svggen/Bug17965.java
similarity index 100%
rename from batik-test-old/src/main/java/org/apache/batik/svggen/Bug17965.java
rename to batik-test-old/src/test/java/org/apache/batik/svggen/Bug17965.java
diff --git a/batik-test-old/src/main/java/org/apache/batik/svggen/Bug21259.java b/batik-test-old/src/test/java/org/apache/batik/svggen/Bug21259.java
similarity index 100%
rename from batik-test-old/src/main/java/org/apache/batik/svggen/Bug21259.java
rename to batik-test-old/src/test/java/org/apache/batik/svggen/Bug21259.java
diff --git a/batik-test-old/src/main/java/org/apache/batik/svggen/Bug4389.java b/batik-test-old/src/test/java/org/apache/batik/svggen/Bug4389.java
similarity index 100%
rename from batik-test-old/src/main/java/org/apache/batik/svggen/Bug4389.java
rename to batik-test-old/src/test/java/org/apache/batik/svggen/Bug4389.java
diff --git a/batik-test-old/src/main/java/org/apache/batik/svggen/Bug4945.java b/batik-test-old/src/test/java/org/apache/batik/svggen/Bug4945.java
similarity index 100%
rename from batik-test-old/src/main/java/org/apache/batik/svggen/Bug4945.java
rename to batik-test-old/src/test/java/org/apache/batik/svggen/Bug4945.java
diff --git a/batik-test-old/src/main/java/org/apache/batik/svggen/Bug6535.java b/batik-test-old/src/test/java/org/apache/batik/svggen/Bug6535.java
similarity index 100%
rename from batik-test-old/src/main/java/org/apache/batik/svggen/Bug6535.java
rename to batik-test-old/src/test/java/org/apache/batik/svggen/Bug6535.java
diff --git a/batik-test-old/src/main/java/org/apache/batik/svggen/Clip.java b/batik-test-old/src/test/java/org/apache/batik/svggen/Clip.java
similarity index 100%
rename from batik-test-old/src/main/java/org/apache/batik/svggen/Clip.java
rename to batik-test-old/src/test/java/org/apache/batik/svggen/Clip.java
diff --git a/batik-test-old/src/main/java/org/apache/batik/svggen/Color1.java b/batik-test-old/src/test/java/org/apache/batik/svggen/Color1.java
similarity index 100%
rename from batik-test-old/src/main/java/org/apache/batik/svggen/Color1.java
rename to batik-test-old/src/test/java/org/apache/batik/svggen/Color1.java
diff --git a/batik-test-old/src/main/java/org/apache/batik/svggen/Color2.java b/batik-test-old/src/test/java/org/apache/batik/svggen/Color2.java
similarity index 100%
rename from batik-test-old/src/main/java/org/apache/batik/svggen/Color2.java
rename to batik-test-old/src/test/java/org/apache/batik/svggen/Color2.java
diff --git a/batik-test-old/src/main/java/org/apache/batik/svggen/DoubleString.java b/batik-test-old/src/test/java/org/apache/batik/svggen/DoubleString.java
similarity index 100%
rename from batik-test-old/src/main/java/org/apache/batik/svggen/DoubleString.java
rename to batik-test-old/src/test/java/org/apache/batik/svggen/DoubleString.java
diff --git a/batik-test-old/src/main/java/org/apache/batik/svggen/DoubleStringPerformanceTest.java b/batik-test-old/src/test/java/org/apache/batik/svggen/DoubleStringPerformanceTest.java
similarity index 100%
rename from batik-test-old/src/main/java/org/apache/batik/svggen/DoubleStringPerformanceTest.java
rename to batik-test-old/src/test/java/org/apache/batik/svggen/DoubleStringPerformanceTest.java
diff --git a/batik-test-old/src/main/java/org/apache/batik/svggen/DrawImage.java b/batik-test-old/src/test/java/org/apache/batik/svggen/DrawImage.java
similarity index 100%
rename from batik-test-old/src/main/java/org/apache/batik/svggen/DrawImage.java
rename to batik-test-old/src/test/java/org/apache/batik/svggen/DrawImage.java
diff --git a/batik-test-old/src/main/java/org/apache/batik/svggen/Font1.java b/batik-test-old/src/test/java/org/apache/batik/svggen/Font1.java
similarity index 100%
rename from batik-test-old/src/main/java/org/apache/batik/svggen/Font1.java
rename to batik-test-old/src/test/java/org/apache/batik/svggen/Font1.java
diff --git a/batik-test-old/src/main/java/org/apache/batik/svggen/Font2.java b/batik-test-old/src/test/java/org/apache/batik/svggen/Font2.java
similarity index 100%
rename from batik-test-old/src/main/java/org/apache/batik/svggen/Font2.java
rename to batik-test-old/src/test/java/org/apache/batik/svggen/Font2.java
diff --git a/batik-test-old/src/main/java/org/apache/batik/svggen/GVector.java b/batik-test-old/src/test/java/org/apache/batik/svggen/GVector.java
similarity index 100%
rename from batik-test-old/src/main/java/org/apache/batik/svggen/GVector.java
rename to batik-test-old/src/test/java/org/apache/batik/svggen/GVector.java
diff --git a/batik-test-old/src/main/java/org/apache/batik/svggen/GeneratorContext.java b/batik-test-old/src/test/java/org/apache/batik/svggen/GeneratorContext.java
similarity index 100%
rename from batik-test-old/src/main/java/org/apache/batik/svggen/GeneratorContext.java
rename to batik-test-old/src/test/java/org/apache/batik/svggen/GeneratorContext.java
diff --git a/batik-test-old/src/main/java/org/apache/batik/svggen/GetRootTest.java b/batik-test-old/src/test/java/org/apache/batik/svggen/GetRootTest.java
similarity index 100%
rename from batik-test-old/src/main/java/org/apache/batik/svggen/GetRootTest.java
rename to batik-test-old/src/test/java/org/apache/batik/svggen/GetRootTest.java
diff --git a/batik-test-old/src/main/java/org/apache/batik/svggen/Gradient.java b/batik-test-old/src/test/java/org/apache/batik/svggen/Gradient.java
similarity index 100%
rename from batik-test-old/src/main/java/org/apache/batik/svggen/Gradient.java
rename to batik-test-old/src/test/java/org/apache/batik/svggen/Gradient.java
diff --git a/batik-test-old/src/main/java/org/apache/batik/svggen/GraphicObjects.java b/batik-test-old/src/test/java/org/apache/batik/svggen/GraphicObjects.java
similarity index 100%
rename from batik-test-old/src/main/java/org/apache/batik/svggen/GraphicObjects.java
rename to batik-test-old/src/test/java/org/apache/batik/svggen/GraphicObjects.java
diff --git a/batik-test-old/src/main/java/org/apache/batik/svggen/IdentityTest.java b/batik-test-old/src/test/java/org/apache/batik/svggen/IdentityTest.java
similarity index 100%
rename from batik-test-old/src/main/java/org/apache/batik/svggen/IdentityTest.java
rename to batik-test-old/src/test/java/org/apache/batik/svggen/IdentityTest.java
diff --git a/batik-test-old/src/main/java/org/apache/batik/svggen/JPainterCompare.java b/batik-test-old/src/test/java/org/apache/batik/svggen/JPainterCompare.java
similarity index 100%
rename from batik-test-old/src/main/java/org/apache/batik/svggen/JPainterCompare.java
rename to batik-test-old/src/test/java/org/apache/batik/svggen/JPainterCompare.java
diff --git a/batik-test-old/src/main/java/org/apache/batik/svggen/JPainterComponent.java b/batik-test-old/src/test/java/org/apache/batik/svggen/JPainterComponent.java
similarity index 100%
rename from batik-test-old/src/main/java/org/apache/batik/svggen/JPainterComponent.java
rename to batik-test-old/src/test/java/org/apache/batik/svggen/JPainterComponent.java
diff --git a/batik-test-old/src/main/java/org/apache/batik/svggen/Lookup.java b/batik-test-old/src/test/java/org/apache/batik/svggen/Lookup.java
similarity index 100%
rename from batik-test-old/src/main/java/org/apache/batik/svggen/Lookup.java
rename to batik-test-old/src/test/java/org/apache/batik/svggen/Lookup.java
diff --git a/batik-test-old/src/main/java/org/apache/batik/svggen/Messages.java b/batik-test-old/src/test/java/org/apache/batik/svggen/Messages.java
similarity index 100%
rename from batik-test-old/src/main/java/org/apache/batik/svggen/Messages.java
rename to batik-test-old/src/test/java/org/apache/batik/svggen/Messages.java
diff --git a/batik-test-old/src/main/java/org/apache/batik/svggen/NegativeLengths.java b/batik-test-old/src/test/java/org/apache/batik/svggen/NegativeLengths.java
similarity index 100%
rename from batik-test-old/src/main/java/org/apache/batik/svggen/NegativeLengths.java
rename to batik-test-old/src/test/java/org/apache/batik/svggen/NegativeLengths.java
diff --git a/batik-test-old/src/main/java/org/apache/batik/svggen/Painter.java b/batik-test-old/src/test/java/org/apache/batik/svggen/Painter.java
similarity index 100%
rename from batik-test-old/src/main/java/org/apache/batik/svggen/Painter.java
rename to batik-test-old/src/test/java/org/apache/batik/svggen/Painter.java
diff --git a/batik-test-old/src/main/java/org/apache/batik/svggen/Paints.java b/batik-test-old/src/test/java/org/apache/batik/svggen/Paints.java
similarity index 100%
rename from batik-test-old/src/main/java/org/apache/batik/svggen/Paints.java
rename to batik-test-old/src/test/java/org/apache/batik/svggen/Paints.java
diff --git a/batik-test-old/src/main/java/org/apache/batik/svggen/RHints.java b/batik-test-old/src/test/java/org/apache/batik/svggen/RHints.java
similarity index 100%
rename from batik-test-old/src/main/java/org/apache/batik/svggen/RHints.java
rename to batik-test-old/src/test/java/org/apache/batik/svggen/RHints.java
diff --git a/batik-test-old/src/main/java/org/apache/batik/svggen/Rescale.java b/batik-test-old/src/test/java/org/apache/batik/svggen/Rescale.java
similarity index 100%
rename from batik-test-old/src/main/java/org/apache/batik/svggen/Rescale.java
rename to batik-test-old/src/test/java/org/apache/batik/svggen/Rescale.java
diff --git a/batik-test-old/src/main/java/org/apache/batik/svggen/SVGAccuracyTest.java b/batik-test-old/src/test/java/org/apache/batik/svggen/SVGAccuracyTest.java
similarity index 100%
rename from batik-test-old/src/main/java/org/apache/batik/svggen/SVGAccuracyTest.java
rename to batik-test-old/src/test/java/org/apache/batik/svggen/SVGAccuracyTest.java
diff --git a/batik-test-old/src/main/java/org/apache/batik/svggen/SVGAccuracyTestValidator.java b/batik-test-old/src/test/java/org/apache/batik/svggen/SVGAccuracyTestValidator.java
similarity index 100%
rename from batik-test-old/src/main/java/org/apache/batik/svggen/SVGAccuracyTestValidator.java
rename to batik-test-old/src/test/java/org/apache/batik/svggen/SVGAccuracyTestValidator.java
diff --git a/batik-test-old/src/main/java/org/apache/batik/svggen/SVGGeneratorTests.java b/batik-test-old/src/test/java/org/apache/batik/svggen/SVGGeneratorTests.java
similarity index 100%
rename from batik-test-old/src/main/java/org/apache/batik/svggen/SVGGeneratorTests.java
rename to batik-test-old/src/test/java/org/apache/batik/svggen/SVGGeneratorTests.java
diff --git a/batik-test-old/src/main/java/org/apache/batik/svggen/ShearTest.java b/batik-test-old/src/test/java/org/apache/batik/svggen/ShearTest.java
similarity index 100%
rename from batik-test-old/src/main/java/org/apache/batik/svggen/ShearTest.java
rename to batik-test-old/src/test/java/org/apache/batik/svggen/ShearTest.java
diff --git a/batik-test-old/src/main/java/org/apache/batik/svggen/ShowGraphics2DOutput.java b/batik-test-old/src/test/java/org/apache/batik/svggen/ShowGraphics2DOutput.java
similarity index 100%
rename from batik-test-old/src/main/java/org/apache/batik/svggen/ShowGraphics2DOutput.java
rename to batik-test-old/src/test/java/org/apache/batik/svggen/ShowGraphics2DOutput.java
diff --git a/batik-test-old/src/main/java/org/apache/batik/svggen/TextSpacePreserve.java b/batik-test-old/src/test/java/org/apache/batik/svggen/TextSpacePreserve.java
similarity index 100%
rename from batik-test-old/src/main/java/org/apache/batik/svggen/TextSpacePreserve.java
rename to batik-test-old/src/test/java/org/apache/batik/svggen/TextSpacePreserve.java
diff --git a/batik-test-old/src/main/java/org/apache/batik/svggen/Texture.java b/batik-test-old/src/test/java/org/apache/batik/svggen/Texture.java
similarity index 100%
rename from batik-test-old/src/main/java/org/apache/batik/svggen/Texture.java
rename to batik-test-old/src/test/java/org/apache/batik/svggen/Texture.java
diff --git a/batik-test-old/src/main/java/org/apache/batik/svggen/TransformCollapse.java b/batik-test-old/src/test/java/org/apache/batik/svggen/TransformCollapse.java
similarity index 100%
rename from batik-test-old/src/main/java/org/apache/batik/svggen/TransformCollapse.java
rename to batik-test-old/src/test/java/org/apache/batik/svggen/TransformCollapse.java
diff --git a/batik-test-old/src/main/java/org/apache/batik/swing/JSVGInterruptTest.java b/batik-test-old/src/test/java/org/apache/batik/swing/JSVGInterruptTest.java
similarity index 100%
rename from batik-test-old/src/main/java/org/apache/batik/swing/JSVGInterruptTest.java
rename to batik-test-old/src/test/java/org/apache/batik/swing/JSVGInterruptTest.java
diff --git a/batik-test-old/src/main/java/org/apache/batik/swing/JSVGMemoryLeakTest.java b/batik-test-old/src/test/java/org/apache/batik/swing/JSVGMemoryLeakTest.java
similarity index 100%
rename from batik-test-old/src/main/java/org/apache/batik/swing/JSVGMemoryLeakTest.java
rename to batik-test-old/src/test/java/org/apache/batik/swing/JSVGMemoryLeakTest.java
diff --git a/batik-test-old/src/main/java/org/apache/batik/swing/NullSetSVGDocumentTest.java b/batik-test-old/src/test/java/org/apache/batik/swing/NullSetSVGDocumentTest.java
similarity index 100%
rename from batik-test-old/src/main/java/org/apache/batik/swing/NullSetSVGDocumentTest.java
rename to batik-test-old/src/test/java/org/apache/batik/swing/NullSetSVGDocumentTest.java
diff --git a/batik-test-old/src/main/java/org/apache/batik/swing/NullURITest.java b/batik-test-old/src/test/java/org/apache/batik/swing/NullURITest.java
similarity index 100%
rename from batik-test-old/src/main/java/org/apache/batik/swing/NullURITest.java
rename to batik-test-old/src/test/java/org/apache/batik/swing/NullURITest.java
diff --git a/batik-test-old/src/main/java/org/apache/batik/swing/SetSVGDocumentTest.java b/batik-test-old/src/test/java/org/apache/batik/swing/SetSVGDocumentTest.java
similarity index 100%
rename from batik-test-old/src/main/java/org/apache/batik/swing/SetSVGDocumentTest.java
rename to batik-test-old/src/test/java/org/apache/batik/swing/SetSVGDocumentTest.java
diff --git a/batik-test-old/src/main/java/org/apache/batik/test/MemoryLeakTest.java b/batik-test-old/src/test/java/org/apache/batik/test/MemoryLeakTest.java
similarity index 100%
rename from batik-test-old/src/main/java/org/apache/batik/test/MemoryLeakTest.java
rename to batik-test-old/src/test/java/org/apache/batik/test/MemoryLeakTest.java
diff --git a/batik-test-old/src/main/java/org/apache/batik/test/MemoryLeakTestValidator.java b/batik-test-old/src/test/java/org/apache/batik/test/MemoryLeakTestValidator.java
similarity index 100%
rename from batik-test-old/src/main/java/org/apache/batik/test/MemoryLeakTestValidator.java
rename to batik-test-old/src/test/java/org/apache/batik/test/MemoryLeakTestValidator.java
diff --git a/batik-test-old/src/main/java/org/apache/batik/test/xml/JUnitRunnerTestCase.java b/batik-test-old/src/test/java/org/apache/batik/test/xml/JUnitRunnerTestCase.java
similarity index 100%
rename from batik-test-old/src/main/java/org/apache/batik/test/xml/JUnitRunnerTestCase.java
rename to batik-test-old/src/test/java/org/apache/batik/test/xml/JUnitRunnerTestCase.java
diff --git a/batik-test-old/src/main/java/org/apache/batik/transcoder/TranscoderInputTest.java b/batik-test-old/src/test/java/org/apache/batik/transcoder/TranscoderInputTest.java
similarity index 100%
rename from batik-test-old/src/main/java/org/apache/batik/transcoder/TranscoderInputTest.java
rename to batik-test-old/src/test/java/org/apache/batik/transcoder/TranscoderInputTest.java
diff --git a/batik-test-old/src/main/java/org/apache/batik/transcoder/image/AOITest.java b/batik-test-old/src/test/java/org/apache/batik/transcoder/image/AOITest.java
similarity index 100%
rename from batik-test-old/src/main/java/org/apache/batik/transcoder/image/AOITest.java
rename to batik-test-old/src/test/java/org/apache/batik/transcoder/image/AOITest.java
diff --git a/batik-test-old/src/main/java/org/apache/batik/transcoder/image/AbstractImageTranscoderTest.java b/batik-test-old/src/test/java/org/apache/batik/transcoder/image/AbstractImageTranscoderTest.java
similarity index 100%
rename from batik-test-old/src/main/java/org/apache/batik/transcoder/image/AbstractImageTranscoderTest.java
rename to batik-test-old/src/test/java/org/apache/batik/transcoder/image/AbstractImageTranscoderTest.java
diff --git a/batik-test-old/src/main/java/org/apache/batik/transcoder/image/AlternateStylesheetTest.java b/batik-test-old/src/test/java/org/apache/batik/transcoder/image/AlternateStylesheetTest.java
similarity index 100%
rename from batik-test-old/src/main/java/org/apache/batik/transcoder/image/AlternateStylesheetTest.java
rename to batik-test-old/src/test/java/org/apache/batik/transcoder/image/AlternateStylesheetTest.java
diff --git a/batik-test-old/src/main/java/org/apache/batik/transcoder/image/BackgroundColorTest.java b/batik-test-old/src/test/java/org/apache/batik/transcoder/image/BackgroundColorTest.java
similarity index 100%
rename from batik-test-old/src/main/java/org/apache/batik/transcoder/image/BackgroundColorTest.java
rename to batik-test-old/src/test/java/org/apache/batik/transcoder/image/BackgroundColorTest.java
diff --git a/batik-test-old/src/main/java/org/apache/batik/transcoder/image/DOMTest.java b/batik-test-old/src/test/java/org/apache/batik/transcoder/image/DOMTest.java
similarity index 100%
rename from batik-test-old/src/main/java/org/apache/batik/transcoder/image/DOMTest.java
rename to batik-test-old/src/test/java/org/apache/batik/transcoder/image/DOMTest.java
diff --git a/batik-test-old/src/main/java/org/apache/batik/transcoder/image/DefaultFontFamilyTest.java b/batik-test-old/src/test/java/org/apache/batik/transcoder/image/DefaultFontFamilyTest.java
similarity index 100%
rename from batik-test-old/src/main/java/org/apache/batik/transcoder/image/DefaultFontFamilyTest.java
rename to batik-test-old/src/test/java/org/apache/batik/transcoder/image/DefaultFontFamilyTest.java
diff --git a/batik-test-old/src/main/java/org/apache/batik/transcoder/image/DimensionTest.java b/batik-test-old/src/test/java/org/apache/batik/transcoder/image/DimensionTest.java
similarity index 100%
rename from batik-test-old/src/main/java/org/apache/batik/transcoder/image/DimensionTest.java
rename to batik-test-old/src/test/java/org/apache/batik/transcoder/image/DimensionTest.java
diff --git a/batik-test-old/src/main/java/org/apache/batik/transcoder/image/GenericDocumentTest.java b/batik-test-old/src/test/java/org/apache/batik/transcoder/image/GenericDocumentTest.java
similarity index 100%
rename from batik-test-old/src/main/java/org/apache/batik/transcoder/image/GenericDocumentTest.java
rename to batik-test-old/src/test/java/org/apache/batik/transcoder/image/GenericDocumentTest.java
diff --git a/batik-test-old/src/main/java/org/apache/batik/transcoder/image/InputStreamTest.java b/batik-test-old/src/test/java/org/apache/batik/transcoder/image/InputStreamTest.java
similarity index 100%
rename from batik-test-old/src/main/java/org/apache/batik/transcoder/image/InputStreamTest.java
rename to batik-test-old/src/test/java/org/apache/batik/transcoder/image/InputStreamTest.java
diff --git a/batik-test-old/src/main/java/org/apache/batik/transcoder/image/LanguageTest.java b/batik-test-old/src/test/java/org/apache/batik/transcoder/image/LanguageTest.java
similarity index 100%
rename from batik-test-old/src/main/java/org/apache/batik/transcoder/image/LanguageTest.java
rename to batik-test-old/src/test/java/org/apache/batik/transcoder/image/LanguageTest.java
diff --git a/batik-test-old/src/main/java/org/apache/batik/transcoder/image/MaxDimensionTest.java b/batik-test-old/src/test/java/org/apache/batik/transcoder/image/MaxDimensionTest.java
similarity index 100%
rename from batik-test-old/src/main/java/org/apache/batik/transcoder/image/MaxDimensionTest.java
rename to batik-test-old/src/test/java/org/apache/batik/transcoder/image/MaxDimensionTest.java
diff --git a/batik-test-old/src/main/java/org/apache/batik/transcoder/image/MediaTest.java b/batik-test-old/src/test/java/org/apache/batik/transcoder/image/MediaTest.java
similarity index 100%
rename from batik-test-old/src/main/java/org/apache/batik/transcoder/image/MediaTest.java
rename to batik-test-old/src/test/java/org/apache/batik/transcoder/image/MediaTest.java
diff --git a/batik-test-old/src/main/java/org/apache/batik/transcoder/image/Messages.java b/batik-test-old/src/test/java/org/apache/batik/transcoder/image/Messages.java
similarity index 100%
rename from batik-test-old/src/main/java/org/apache/batik/transcoder/image/Messages.java
rename to batik-test-old/src/test/java/org/apache/batik/transcoder/image/Messages.java
diff --git a/batik-test-old/src/main/java/org/apache/batik/transcoder/image/ParametrizedDOMTest.java b/batik-test-old/src/test/java/org/apache/batik/transcoder/image/ParametrizedDOMTest.java
similarity index 100%
rename from batik-test-old/src/main/java/org/apache/batik/transcoder/image/ParametrizedDOMTest.java
rename to batik-test-old/src/test/java/org/apache/batik/transcoder/image/ParametrizedDOMTest.java
diff --git a/batik-test-old/src/main/java/org/apache/batik/transcoder/image/PixelToMMTest.java b/batik-test-old/src/test/java/org/apache/batik/transcoder/image/PixelToMMTest.java
similarity index 100%
rename from batik-test-old/src/main/java/org/apache/batik/transcoder/image/PixelToMMTest.java
rename to batik-test-old/src/test/java/org/apache/batik/transcoder/image/PixelToMMTest.java
diff --git a/batik-test-old/src/main/java/org/apache/batik/transcoder/image/ReaderTest.java b/batik-test-old/src/test/java/org/apache/batik/transcoder/image/ReaderTest.java
similarity index 100%
rename from batik-test-old/src/main/java/org/apache/batik/transcoder/image/ReaderTest.java
rename to batik-test-old/src/test/java/org/apache/batik/transcoder/image/ReaderTest.java
diff --git a/batik-test-old/src/main/java/org/apache/batik/transcoder/image/URITest.java b/batik-test-old/src/test/java/org/apache/batik/transcoder/image/URITest.java
similarity index 100%
rename from batik-test-old/src/main/java/org/apache/batik/transcoder/image/URITest.java
rename to batik-test-old/src/test/java/org/apache/batik/transcoder/image/URITest.java
diff --git a/batik-test-old/src/main/java/org/apache/batik/transcoder/wmf/Messages.java b/batik-test-old/src/test/java/org/apache/batik/transcoder/wmf/Messages.java
similarity index 100%
rename from batik-test-old/src/main/java/org/apache/batik/transcoder/wmf/Messages.java
rename to batik-test-old/src/test/java/org/apache/batik/transcoder/wmf/Messages.java
diff --git a/batik-test-old/src/main/java/org/apache/batik/transcoder/wmf/WMFAccuracyTest.java b/batik-test-old/src/test/java/org/apache/batik/transcoder/wmf/WMFAccuracyTest.java
similarity index 100%
rename from batik-test-old/src/main/java/org/apache/batik/transcoder/wmf/WMFAccuracyTest.java
rename to batik-test-old/src/test/java/org/apache/batik/transcoder/wmf/WMFAccuracyTest.java
diff --git a/batik-test-old/src/main/java/org/apache/batik/util/ApplicationSecurityEnforcerTest.java b/batik-test-old/src/test/java/org/apache/batik/util/ApplicationSecurityEnforcerTest.java
similarity index 100%
rename from batik-test-old/src/main/java/org/apache/batik/util/ApplicationSecurityEnforcerTest.java
rename to batik-test-old/src/test/java/org/apache/batik/util/ApplicationSecurityEnforcerTest.java
diff --git a/build.xml b/build.xml
index 7bd4dcc..668f454 100644
--- a/build.xml
+++ b/build.xml
@@ -101,7 +101,7 @@
     <property name="src"                value="sources"/>
     <property name="src-internal-codec" value="sources-internal-codec"/>
     <property name="resources"          value="resources"/>
-    <property name="testsrc"            value="batik-test-old/src/main/java"/>
+    <property name="testsrc"            value="batik-test-old/src/test/java"/>
     <property name="testresources"      value="test-resources"/>
     <property name="dest"               value="classes"/>
     <property name="dest-internal-codec" value="classes-internal-codec"/>
diff --git a/pom.xml b/pom.xml
index 8f22d85..3b4a144 100644
--- a/pom.xml
+++ b/pom.xml
@@ -98,6 +98,8 @@
     <module>batik-util</module>
     <module>batik-ttf2svg</module>
     <module>batik-xml</module>
+    
+    <module>batik-test-old</module>
 <!--
     <module>batik-test-svg</module>
     <module>batik-test-swing</module>