ozeigermann 2004/02/05 03:29:14
Modified: testsuite Tag: SLIDE_2_0_RELEASE_BRANCH build.xml
. Tag: SLIDE_2_0_RELEASE_BRANCH build.xml
Log:
Fixed build error reported by GUMP
Revision Changes Path
No revision
No revision
1.5.2.1 +48 -46 jakarta-slide/testsuite/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/jakarta-slide/testsuite/build.xml,v
retrieving revision 1.5
retrieving revision 1.5.2.1
diff -u -r1.5 -r1.5.2.1
--- build.xml 26 Nov 2003 10:45:09 -0000 1.5
+++ build.xml 5 Feb 2004 11:29:13 -0000 1.5.2.1
@@ -3,8 +3,10 @@
<property name="src" value="${basedir}/testsuite/junit/src" />
<property name="debug" value="${basedir}/testsuite/junit/debug" />
<property name="lib" value="${basedir}/lib" />
- <property name="slideclientlib" value="${basedir}/../dist/client/lib" />
+ <property name="slideclientlib" value="${basedir}/../webdavclient/dist/lib" />
+ <property name="slideclientextlib" value="${basedir}/../webdavclient/lib" />
<property name="dist" value="${basedir}/dist" />
+ <property name="client.jar" value="jakarta-slide-webdavlib-2.0b1.jar" />
<!-- =============================================================== -->
<target name="compile">
@@ -22,7 +24,7 @@
</javac>
<copy todir="${debug}" >
<fileset dir="${src}" excludes="**/*.java,**/CVS/**/*" />
- </copy>
+ </copy>
</target>
<!-- =============================================================== -->
@@ -44,9 +46,9 @@
<!-- =============================================================== -->
<target name="make">
- <copy todir="${lib}" file="${slideclientlib}/slide-webdavlib.jar"
overwrite="yes" />
- <copy todir="${lib}" file="${slideclientlib}/commons-httpclient.jar"
overwrite="yes" />
- <antcall target="compile" />
+ <copy todir="${lib}" file="${slideclientlib}/${client.jar}" overwrite="yes" />
+ <copy todir="${lib}" file="${slideclientextlib}/commons-httpclient.jar"
overwrite="yes" />
+ <antcall target="compile" />
<antcall target="makejar" />
</target>
@@ -59,27 +61,27 @@
</target>
<!-- =============================================================== -->
<target name="functional-test" description="Run the functional tests">
- <property name="xdav.home" value="${basedir}" />
- <property name="xdav.host" value="localhost" />
- <property name="xdav.port" value="8888" />
- <property name="xdav.user" value="guest" />
- <property name="xdav.password" value="guest" />
- <property name="xdav.workdb" value="xdavtest" />
- <property name="xdav.workhost" value="localhost" />
- <property name="xdav.globalVariableDomainName" value="localhost" />
- <property name="xdav.globalVariableServerName" value="slide" />
- <property name="xdav.globalVariableIterationCount" value="1" />
+ <property name="xdav.home" value="${basedir}" />
+ <property name="xdav.host" value="localhost" />
+ <property name="xdav.port" value="8888" />
+ <property name="xdav.user" value="guest" />
+ <property name="xdav.password" value="guest" />
+ <property name="xdav.workdb" value="xdavtest" />
+ <property name="xdav.workhost" value="localhost" />
+ <property name="xdav.globalVariableDomainName" value="localhost" />
+ <property name="xdav.globalVariableServerName" value="slide" />
+ <property name="xdav.globalVariableIterationCount" value="1" />
<property name="xdav.globalVariableIterationCountSmall" value="5" />
<property name="xdav.globalVariablePerformanceIterations" value="5" />
<property name="xdav.globalVariableUsers" value="1" />
- <property name="xdav.globalVariableGroup" value="group" />
+ <property name="xdav.globalVariableGroup" value="group" />
<property name="xdav.globalVariableCollection" value="files" />
<!-- Depend on $DAV_AUTH, assume none for now -->
- <property name="xdav.globalVariableRootUserPath"
- value="/${xdav.globalVariableServerName}/unauthenticated" />
- <property name="xdav.globalVariableUserPath"
- value="${xdav.globalVariableRootUserPath}" />
+ <property name="xdav.globalVariableRootUserPath"
+ value="/${xdav.globalVariableServerName}/unauthenticated" />
+ <property name="xdav.globalVariableUserPath"
+ value="${xdav.globalVariableRootUserPath}" />
<property name="tprocessor.exclude" value="-exclude *multi-user\\copy*
-exclude *ACL* -exclude *groupFunctional*" />
@@ -89,32 +91,32 @@
<sysproperty key="xdav.port" value="${xdav.port}" />
<sysproperty key="xdav.user" value="${xdav.user}" />
<sysproperty key="xdav.password" value="${xdav.password}" />
- <sysproperty key="xdav.workdb" value="${xdav.workdb}" />
- <sysproperty key="xdav.workhost" value="${xdav.workhost}" />
- <sysproperty key="xdav.globalVariableDomainName"
- value="${xdav.globalVariableDomainName}" />
- <sysproperty key="xdav.globalVariableServerName"
- value="${xdav.globalVariableServerName}" />
- <sysproperty key="xdav.globalVariableIterationCount"
- value="${xdav.globalVariableIterationCount}" />
- <sysproperty key="xdav.globalVariableIterationCountSmall"
+ <sysproperty key="xdav.workdb" value="${xdav.workdb}" />
+ <sysproperty key="xdav.workhost" value="${xdav.workhost}" />
+ <sysproperty key="xdav.globalVariableDomainName"
+ value="${xdav.globalVariableDomainName}" />
+ <sysproperty key="xdav.globalVariableServerName"
+ value="${xdav.globalVariableServerName}" />
+ <sysproperty key="xdav.globalVariableIterationCount"
+ value="${xdav.globalVariableIterationCount}" />
+ <sysproperty key="xdav.globalVariableIterationCountSmall"
value="${xdav.globalVariableIterationCountSmall}" />
- <sysproperty key="xdav.globalVariablePerformanceIterations"
- value="${xdav.globalVariablePerformanceIterations}" />
- <sysproperty key="xdav.globalVariableUsers"
- value="${xdav.globalVariableUsers}" />
- <sysproperty key="xdav.globalVariableGroupsColl"
- value="groups" />
- <sysproperty key="xdav.globalVariableRolesColl"
- value="roles" />
- <sysproperty key="xdav.globalVariableGroup"
- value="${xdav.globalVariableGroup}" />
- <sysproperty key="xdav.globalVariableCollection"
- value="${xdav.globalVariableCollection}" />
- <sysproperty key="xdav.globalVariableRootUserPath"
- value="${xdav.globalVariableRootUserPath}" />
- <sysproperty key="xdav.globalVariableUserPath"
- value="${xdav.globalVariableUserPath}" />
+ <sysproperty key="xdav.globalVariablePerformanceIterations"
+ value="${xdav.globalVariablePerformanceIterations}" />
+ <sysproperty key="xdav.globalVariableUsers"
+ value="${xdav.globalVariableUsers}" />
+ <sysproperty key="xdav.globalVariableGroupsColl"
+ value="groups" />
+ <sysproperty key="xdav.globalVariableRolesColl"
+ value="roles" />
+ <sysproperty key="xdav.globalVariableGroup"
+ value="${xdav.globalVariableGroup}" />
+ <sysproperty key="xdav.globalVariableCollection"
+ value="${xdav.globalVariableCollection}" />
+ <sysproperty key="xdav.globalVariableRootUserPath"
+ value="${xdav.globalVariableRootUserPath}" />
+ <sysproperty key="xdav.globalVariableUserPath"
+ value="${xdav.globalVariableUserPath}" />
<sysproperty key="xdav.urlencoding" value="UTF-8" />
<sysproperty key="httpclient.authentication.premptive" value="true" />
<arg line="${tprocessor.exclude} *cases\\functional*" />
@@ -132,4 +134,4 @@
<antcall target="dist" />
</target>
-</project>
\ No newline at end of file
+</project>
No revision
No revision
1.191.2.2 +1 -0 jakarta-slide/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/jakarta-slide/build.xml,v
retrieving revision 1.191.2.1
retrieving revision 1.191.2.2
diff -u -r1.191.2.1 -r1.191.2.2
--- build.xml 29 Jan 2004 12:54:58 -0000 1.191.2.1
+++ build.xml 5 Feb 2004 11:29:13 -0000 1.191.2.2
@@ -547,6 +547,7 @@
<mkdir dir="${testsuite.dist}"/>
</target>
<target name="testsuite-dist" depends="testsuite-dist-prepare">
+ <ant dir="webdavclient"/>
<ant dir="testsuite"/>
<copy todir="${testsuite.dist}">
<fileset dir="${basedir}/testsuite"
excludes="**/dist/**,**/CVS/**,**/testCasesResults.xml,**/testErrorsReport.txt"/>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
