kevinross 2003/07/09 09:36:38
Modified: . build.xml
Log:
In addition to the following:
1. changed test port to be 8888, so we can use the jetty standalone for
testing.
2. added 'test-all' target to ease testing.
PR: 21402
Patch Submitted by: Kevin O'Neill ([EMAIL PROTECTED])
Reviewed by: Kevin Ross
Added a new driver whos database instance is managed externally.
Unlike the embeded driver if the database is not available the driver will
fail to load. It's designed specifically for use in environments where there
an
external process is managing the lifecycle of the database.
The patch also includes some updates to database to prevent a registration
race condition (outlined in an earlier email). This has some flow on effects
in
the embeded driver.
Revision Changes Path
1.45 +31 -3 xml-xindice/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/xml-xindice/build.xml,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -r1.44 -r1.45
--- build.xml 8 Jul 2003 14:53:07 -0000 1.44
+++ build.xml 9 Jul 2003 16:36:37 -0000 1.45
@@ -55,7 +55,7 @@
<property name="tomcat.home" value="${ENVIRONMENT.TOMCAT_HOME}"/>
<!-- Testing properties -->
<property name="test.xmlrpc.driver" value="xerces"/>
- <property name="test.xmlrpc.hostport" value="localhost:8080"/>
+ <property name="test.xmlrpc.hostport" value="localhost:8888"/>
<property name="test.xmlrpc.service-location" value="/Xindice/"/>
<!-- Compilation properties -->
<property name="compile.debug" value="on"/>
@@ -161,12 +161,13 @@
</classpath>
</javac>
</target>
+ <target name="test-all" depends="test-unit, test-embed-binary,
test-integration-embed, test-integration-xmlrpc, test-integration-managed"/>
<target name="test-unit" depends="test-build, test-validate">
<junit fork="yes" printsummary="yes" haltonfailure="no">
<jvmarg
value="-Dorg.apache.commons.logging.Log=org.apache.commons.logging.impl.SimpleLog"/>
<jvmarg
value="-Dorg.apache.commons.logging.simplelog.defaultlog=info"/>
<test name="org.apache.xindice.UnitTests"/>
- <formatter type="plain" usefile="no"/>
+ <formatter type="plain" usefile="no"/>
<classpath>
<path refid="project.class.path"/>
<pathelement location="${test.build.dir}"/>
@@ -249,6 +250,33 @@
<pathelement location="${test.build.dir}"/>
</classpath>
</java>
+ </target>
+ <target name="test-integration-managed" depends="test-build,
test-validate">
+ <java classname="junit.textui.TestRunner" fork="yes">
+ <arg line="-class
org.apache.xindice.IntegrationManagedTests"/>
+ <jvmarg
value="-DPropertyManager.file=${test.dir}/config/test-configuration.props"/>
+ <jvmarg value="-Dxindice.home=${basedir}"/>
+ <jvmarg
value="-Dorg.apache.commons.logging.Log=org.apache.commons.logging.impl.SimpleLog"/>
+ <jvmarg
value="-Dorg.apache.commons.logging.simplelog.defaultlog=info"/>
+ <classpath>
+ <path refid="project.class.path"/>
+ <pathelement location="${test.build.dir}"/>
+ </classpath>
+ </java>
+ <!--
+ <junit fork="yes" printsummary="yes" haltonfailure="no">
+ <jvmarg
value="-DPropertyManager.file=${test.dir}/config/test-configuration.props" />
+ <jvmarg value="-Dxindice.home=${basedir}" />
+ <jvmarg
value="-Dorg.apache.commons.logging.Log=org.apache.commons.logging.impl.SimpleLog"
/>
+ <jvmarg
value="-Dorg.apache.commons.logging.simplelog.defaultlog=debug" />
+ <test name="org.apache.xindice.IntegrationEmbedTests" />
+ <formatter type="plain" usefile="no" />
+ <classpath>
+ <path refid="project.class.path"/>
+ <pathelement location="${test.build.dir}"/>
+ </classpath>
+ </junit>
+-->
</target>
<target name="test-validate">
<taskdef name="testClassValidator"
classname="junitx.ant.TestClassValidatorTask">
