SF.net SVN: xmlunit:[294] trunk/xmlunit

[<bo...@us...>]

Revision: 294
          http://xmlunit.svn.sourceforge.net/xmlunit/?rev=294&view=rev
Author:   bodewig
Date:     2009-04-22 05:29:46 +0000 (Wed, 22 Apr 2009)

Log Message:
-----------
move sources into a new directory structure, preparing for XMLUnit 2.x development

Modified Paths:
--------------
    trunk/xmlunit/build.xml
    trunk/xmlunit/xmlunit.nant.build

Added Paths:
-----------
    trunk/xmlunit/src/main/legacy-java/
    trunk/xmlunit/src/main/legacy-net/
    trunk/xmlunit/src/tests/legacy-java/
    trunk/xmlunit/src/tests/legacy-net/

Removed Paths:
-------------
    trunk/xmlunit/src/csharp/
    trunk/xmlunit/src/java/
    trunk/xmlunit/tests/csharp/
    trunk/xmlunit/tests/java/

Modified: trunk/xmlunit/build.xml
===================================================================
--- trunk/xmlunit/build.xml	2009-04-22 05:21:57 UTC (rev 293)
+++ trunk/xmlunit/build.xml	2009-04-22 05:29:46 UTC (rev 294)
@@ -40,8 +40,8 @@
   <property name="xmlunit.version" value="1.3alpha"/>
 
   <!-- some locations -->
-  <property name="src.dir" value="src"/>
-  <property name="test.dir" value="tests"/>
+  <property name="src.dir" value="src/main"/>
+  <property name="test.dir" value="src/tests"/>
   <property name="build.dir" location="build"/>
   <property name="lib.dir" value="${build.dir}/lib"/>
   <property name="out.dir" value="${build.dir}/classes"/>
@@ -104,7 +104,7 @@
 
   <target name="compile" depends="-init"
     description="compiles sources and tests">
-    <javac srcdir="${src.dir}/java" destdir="${out.dir}"
+    <javac srcdir="${src.dir}/legacy-java" destdir="${out.dir}"
       debug="${javac.debug}" target="${javac.target}" source="${javac.source}">
       <classpath>
         <pathelement location="${xmlxsl.lib}"/>
@@ -114,7 +114,7 @@
       <exclude name="**/jaxp13/**" unless="jaxp13+"/>
       <exclude name="**/*XPathRegexAssert.java" unless="regexp.present"/>
     </javac>
-    <javac srcdir="${test.dir}/java" destdir="${test.out.dir}"
+    <javac srcdir="${test.dir}/legacy-java" destdir="${test.out.dir}"
       debug="${javac.debug}" target="${javac.target}" source="${javac.source}">
       <classpath>
         <pathelement location="${out.dir}"/>
@@ -150,7 +150,7 @@
       </classpath>
       <formatter type="xml"/>
       <batchtest todir="${test.report.dir}">
-        <fileset dir="${test.dir}/java">
+        <fileset dir="${test.dir}/legacy-java">
           <include name="**/test_*.java"/>
           <exclude name="**/jaxp13/**" unless="jaxp13+.impl"/>
         </fileset>
@@ -175,12 +175,12 @@
     description="creates the API documentation">
     <delete includeEmptyDirs="true" dir="${docs.dir}/api"/>
     <javadoc destdir="${docs.dir}/api"
-      overview="${src.dir}/java/overview.html"
+      overview="${src.dir}/legacy-java/overview.html"
       windowtitle="XMLUnit Documentation"
       footer="&lt;p&gt;&lt;a href=&quot;http://xmlunit.sourceforge.net/&quot;&gt;XMLUnit&lt;/a&gt; is hosted by sourceforge.net&lt;/p&gt;">
       <group title="XMLUnit v${xmlunit.version}"
         packages="org.custommonkey.xmlunit*"/>
-      <fileset dir="${src.dir}/java">
+      <fileset dir="${src.dir}/legacy-java">
         <include name="org/custommonkey/**/*.java"/>
       </fileset>
       <classpath>


Property changes on: trunk/xmlunit/src/main/legacy-java
___________________________________________________________________
Added: svn:mergeinfo
   + 


Property changes on: trunk/xmlunit/src/main/legacy-net
___________________________________________________________________
Added: svn:mergeinfo
   + 


Property changes on: trunk/xmlunit/src/tests/legacy-java
___________________________________________________________________
Added: svn:mergeinfo
   + 


Property changes on: trunk/xmlunit/src/tests/legacy-net
___________________________________________________________________
Added: svn:mergeinfo
   + 

Modified: trunk/xmlunit/xmlunit.nant.build
===================================================================
--- trunk/xmlunit/xmlunit.nant.build	2009-04-22 05:21:57 UTC (rev 293)
+++ trunk/xmlunit/xmlunit.nant.build	2009-04-22 05:29:46 UTC (rev 294)
@@ -2,8 +2,8 @@
   <property name="project.version" value="0.4" overwrite="false"/>
   <property name="base.dir" value="${project::get-base-directory()}"
     overwrite="false"/>
-  <property name="src.dir" value="${base.dir}/src/csharp" overwrite="false"/>
-  <property name="tests.src.dir" value="${base.dir}/tests/csharp"
+  <property name="src.dir" value="${base.dir}/src/main/legacy-net" overwrite="false"/>
+  <property name="tests.src.dir" value="${base.dir}/src/tests/legacy-net"
     overwrite="false"/>
   <property name="bin.dir" value="${base.dir}/bin" overwrite="false"/>
   <property name="csc.verbose" value="false" overwrite="false"/>


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.