You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lenya.apache.org by an...@apache.org on 2006/05/17 16:44:15 UTC
svn commit: r407269 - in /lenya/trunk/src: impl/test/
impl/test/anteater/tests.xml impl/test/webtest/config.xml
impl/test/webtest/tests.xml targets/ide-build.xml
targets/properties-build.xml targets/test-build.xml test/
Author: andreas
Date: Wed May 17 07:44:15 2006
New Revision: 407269
URL: http://svn.apache.org/viewcvs?rev=407269&view=rev
Log:
Moved tests to impl/test, fixed test classpath
Added:
lenya/trunk/src/impl/test/
- copied from r407247, lenya/trunk/src/test/
Removed:
lenya/trunk/src/test/
Modified:
lenya/trunk/src/impl/test/anteater/tests.xml
lenya/trunk/src/impl/test/webtest/config.xml
lenya/trunk/src/impl/test/webtest/tests.xml
lenya/trunk/src/targets/ide-build.xml
lenya/trunk/src/targets/properties-build.xml
lenya/trunk/src/targets/test-build.xml
Modified: lenya/trunk/src/impl/test/anteater/tests.xml
URL: http://svn.apache.org/viewcvs/lenya/trunk/src/impl/test/anteater/tests.xml?rev=407269&r1=407247&r2=407269&view=diff
==============================================================================
--- lenya/trunk/src/impl/test/anteater/tests.xml (original)
+++ lenya/trunk/src/impl/test/anteater/tests.xml Wed May 17 07:44:15 2006
@@ -15,7 +15,7 @@
limitations under the License.
-->
-<!-- $Id: tests.xml,v 1.4 2004/03/13 12:44:37 gregor Exp $ -->
+<!-- $Id$ -->
<!DOCTYPE project [
<!ENTITY default SYSTEM "../../webapp/lenya/pubs/default/test/anteater/tests.xml">
Modified: lenya/trunk/src/impl/test/webtest/config.xml
URL: http://svn.apache.org/viewcvs/lenya/trunk/src/impl/test/webtest/config.xml?rev=407269&r1=407247&r2=407269&view=diff
==============================================================================
--- lenya/trunk/src/impl/test/webtest/config.xml (original)
+++ lenya/trunk/src/impl/test/webtest/config.xml Wed May 17 07:44:15 2006
@@ -15,7 +15,7 @@
limitations under the License.
-->
-<!-- $Id: config.xml,v 1.2 2004/03/13 12:44:37 gregor Exp $ -->
+<!-- $Id$ -->
<config
host="localhost"
Modified: lenya/trunk/src/impl/test/webtest/tests.xml
URL: http://svn.apache.org/viewcvs/lenya/trunk/src/impl/test/webtest/tests.xml?rev=407269&r1=407247&r2=407269&view=diff
==============================================================================
--- lenya/trunk/src/impl/test/webtest/tests.xml (original)
+++ lenya/trunk/src/impl/test/webtest/tests.xml Wed May 17 07:44:15 2006
@@ -15,7 +15,7 @@
limitations under the License.
-->
-<!-- $Id: tests.xml,v 1.2 2004/03/13 12:44:37 gregor Exp $ -->
+<!-- $Id$ -->
<!DOCTYPE project [
<!ENTITY default SYSTEM "../../webapp/lenya/pubs/default/test/webtest/tests.xml">
Modified: lenya/trunk/src/targets/ide-build.xml
URL: http://svn.apache.org/viewcvs/lenya/trunk/src/targets/ide-build.xml?rev=407269&r1=407268&r2=407269&view=diff
==============================================================================
--- lenya/trunk/src/targets/ide-build.xml (original)
+++ lenya/trunk/src/targets/ide-build.xml Wed May 17 07:44:15 2006
@@ -33,10 +33,14 @@
<!-- prepare the various paths that will form the project -->
<path id="srcs">
- <!-- main source dir -->
- <pathelement path="${src.java.dir}"/>
- <!-- test source dir -->
- <pathelement path="${src.test.dir}"/>
+ <!-- API source dirs -->
+ <pathelement path="${src.java.api.dir}"/>
+ <pathelement path="${src.test.api.dir}"/>
+
+ <!-- implementation source dirs -->
+ <pathelement path="${src.java.impl.dir}"/>
+ <pathelement path="${src.test.impl.dir}"/>
+
<dirset dir="src/pubs">
<include name="*/java/src"/>
<include name="*/java/test"/>
Modified: lenya/trunk/src/targets/properties-build.xml
URL: http://svn.apache.org/viewcvs/lenya/trunk/src/targets/properties-build.xml?rev=407269&r1=407268&r2=407269&view=diff
==============================================================================
--- lenya/trunk/src/targets/properties-build.xml (original)
+++ lenya/trunk/src/targets/properties-build.xml Wed May 17 07:44:15 2006
@@ -108,12 +108,14 @@
directory and packed up as tar.gz file, along with the sources etc.
-->
<property name="src.dist-src.dir" value="./src/dist-src"/>
+
<!-- Our own source code tree is here -->
<property name="src.java.api.dir" value="./src/java"/>
<property name="src.java.impl.dir" value="./src/impl/java"/>
<!-- This is where the source of the tests are located -->
- <property name="src.test.dir" value="src/test"/>
+ <property name="src.test.api.dir" value="src/test"/>
+ <property name="src.test.impl.dir" value="src/test"/>
<!-- Publication-specific entities are here -->
<property name="src.entities.dir" value="resources/entities"/>
Modified: lenya/trunk/src/targets/test-build.xml
URL: http://svn.apache.org/viewcvs/lenya/trunk/src/targets/test-build.xml?rev=407269&r1=407268&r2=407269&view=diff
==============================================================================
--- lenya/trunk/src/targets/test-build.xml (original)
+++ lenya/trunk/src/targets/test-build.xml Wed May 17 07:44:15 2006
@@ -75,12 +75,17 @@
<!-- Copy test files to build test dir -->
<copy todir="${build.java.test}" filtering="on">
- <fileset dir="${src.test.dir}"/>
+ <fileset dir="${src.test.impl.dir}"/>
</copy>
<copyJavaSources pubsrootdirs="${pubs.root.dirs}" javadir="java/test" builddir="${build.java.test}" />
<copyJavaSources pubsrootdirs="${modules.root.dirs}" javadir="java/test" builddir="${build.java.test}" />
+ <path id="classpath.test">
+ <path refid="classpath"/>
+ <fileset dir="${build.webapp}/WEB-INF/lib" includes="lenya-*.jar"/>
+ </path>
+
<!-- Compile tests -->
<javac srcdir="${build.java.test}"
destdir="${build.test}"
@@ -91,10 +96,7 @@
target="${target.vm}"
fork="true"
source="1.4">
- <classpath refid="classpath"/>
- <classpath>
- <pathelement path="${build.webapp}/WEB-INF/classes" />
- </classpath>
+ <classpath refid="classpath.test"/>
</javac>
<!-- Copy test resources -->
@@ -171,7 +173,7 @@
<include name="*.jar"/>
<include name="endorsed/*.jar"/>
</fileset>
- <pathelement path="${src.test.dir}"/>
+ <pathelement path="${src.test.impl.dir}"/>
</classpath>
<test name="org.apache.lenya.ac.impl.IdentityTest" todir="${junit.dir}"/>
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@lenya.apache.org
For additional commands, e-mail: commits-help@lenya.apache.org