svn commit: r1169518 - in /commons/proper/bsf/trunk: build-properties.xml build.xml src/main/ src/main/java/ src/main/java/org/ src/org/ src/test/ src/test/java/ src/test/java/org/ test/

[sebb]

Author: sebb
Date: Sun Sep 11 20:07:09 2011
New Revision: 1169518

URL: http://svn.apache.org/viewvc?rev=1169518&view=rev
Log:
Move files to Maven standard layout

Added:
    commons/proper/bsf/trunk/src/main/
    commons/proper/bsf/trunk/src/main/java/
    commons/proper/bsf/trunk/src/main/java/org/
      - copied from r1169444, commons/proper/bsf/trunk/src/org/
    commons/proper/bsf/trunk/src/test/
    commons/proper/bsf/trunk/src/test/java/
    commons/proper/bsf/trunk/src/test/java/org/
      - copied from r1169444, commons/proper/bsf/trunk/test/org/
Modified:
    commons/proper/bsf/trunk/build-properties.xml
    commons/proper/bsf/trunk/build.xml
    commons/proper/bsf/trunk/src/org/
    commons/proper/bsf/trunk/test/

Modified: commons/proper/bsf/trunk/build-properties.xml
URL: 
http://svn.apache.org/viewvc/commons/proper/bsf/trunk/build-properties.xml?rev=1169518&r1=1169517&r2=1169518&view=diff
==============================================================================
--- commons/proper/bsf/trunk/build-properties.xml (original)
+++ commons/proper/bsf/trunk/build-properties.xml Sun Sep 11 20:07:09 2011
@@ -53,11 +53,11 @@
 
     <property name="source.level" value="1.3" />
 
-    <property name="src.dir" value="src"/>
+    <property name="src.dir" value="src/main/java"/>
 
     <property name="templ.path" location="src/site/xdoc/stylesheets"/>
 
-    <property name="tests.dir" value="test"/>
+    <property name="tests.dir" value="src/test/java"/>
 
     <property name="velocity.props" 
location="${site.src}/velocity.properties"/>
 </project>

Modified: commons/proper/bsf/trunk/build.xml
URL: 
http://svn.apache.org/viewvc/commons/proper/bsf/trunk/build.xml?rev=1169518&r1=1169517&r2=1169518&view=diff
==============================================================================
--- commons/proper/bsf/trunk/build.xml (original)
+++ commons/proper/bsf/trunk/build.xml Sun Sep 11 20:07:09 2011
@@ -387,7 +387,14 @@ Copyright:
        <!-- 
=================================================================== -->
        <target name="compile-test" if="junit.present" depends="compile">
                <mkdir dir="${build.tests}" />
-               <javac srcdir="${tests.dir}" destdir="${build.tests}" 
classpath="${build.dest}" source="${source.level}" />
+               <javac srcdir="${tests.dir}" destdir="${build.tests}" 
source="${source.level}">
+            <classpath>
+                <fileset dir="lib">
+                    <include name="junit*.jar"/>
+                </fileset>
+                <pathelement location="${build.dest}" />
+            </classpath>
+           </javac>
        </target>
 
        <!-- 
=================================================================== -->