Diff of /tags/1.2.1/dspace-vireo/src/main/config/build.xml [r57] .. [r58]  Maximize  Restore

  Switch to side-by-side view

--- a/tags/1.2.1/dspace-vireo/src/main/config/build.xml
+++ b/tags/1.2.1/dspace-vireo/src/main/config/build.xml
@@ -581,7 +581,7 @@
 	<!-- ============================================================= -->
 	<target name="test_parameters" depends="" description="Establish default parameters for testing">
 		<!-- Default parameters meant which my be superseded by commandline parameters --> 
-		<property name="test.dspace.dir"  value="${basedir}/test/" />
+		<property name="test.dspace.dir"  value="/vireotest/test" />
 		<property name="test.config"      value="${test.dspace.dir}/config/dspace.cfg" />
 		<property name="test.db.driver"   value="org.postgresql.Driver"/>
 		<property name="test.db.url"      value="jdbc:postgresql://localhost:5432/dspacetest"/>
@@ -620,7 +620,7 @@
 					<replaceregex pattern="(\s*log\.dir\s*=).*"  replace="\1 ${test.dspace.dir}/log"/>
 					<replaceregex pattern="(\s*log\.init\.config\s*=).*"  replace="\1 ${test.dspace.dir}/config/log4j.properties"/>
 					<replaceregex pattern="(\s*upload\.temp\.dir\s*=).*"  replace="\1 ${test.dspace.dir}/upload"/>
-					<replaceregex pattern="(\s*report\.dir\s*=).*"  replace="\1 ${test.dspace.dir}/reports"/>					
+					<replaceregex pattern="(\s*reports \.dir\s*=).*"  replace="\1 ${test.dspace.dir}/reports"/>					
 					<replaceregex pattern="(\s*db\.driver\s*=).*"   replace="\1 ${test.db.driver}"/>					
 					<replaceregex pattern="(\s*db\.url\s*=).*"       replace="\1 ${test.db.url}"/>
 					<replaceregex pattern="(\s*db\.username\s*=).*" replace="\1 ${test.db.username}"/>
@@ -642,7 +642,7 @@
 			<param name="search.dir" value="${test.dspace.dir}/search/"/>
 			<param name="log.dir" value="${test.dspace.dir}/log/"/>
 			<param name="upload.temp.dir" value="${test.dspace.dir}/upload/"/>
-			<param name="report.dir" value="${test.dspace.dir}/report/"/>
+			<param name="report.dir" value="${test.dspace.dir}/reports/"/>
 			
 			<!-- We use antcall to perform a fresh install, using this syntax so that we can insert a clean_database into
 			     its dependencies. This allows the script to be run again and again without clearing out the old database. -->
@@ -655,8 +655,8 @@
 		</antcall>
 		
 		<!-- Ensure the war files are contextualized to the test instance -->
-		<move file="test/webapps/xmlui/WEB-INF/web.xml" tofile="test/webapps/xmlui/WEB-INF/web.xml.original"/>
-		<copy file="test/webapps/xmlui/WEB-INF/web.xml.original" tofile="test/webapps/xmlui/WEB-INF/web.xml">
+		<move file="${test.dspace.dir}/webapps/xmlui/WEB-INF/web.xml" tofile="${test.dspace.dir}/webapps/xmlui/WEB-INF/web.xml.original"/>
+		<copy file="${test.dspace.dir}/webapps/xmlui/WEB-INF/web.xml.original" tofile="${test.dspace.dir}/webapps/xmlui/WEB-INF/web.xml">
 			<filterchain>
 				<tokenfilter>
 					<linetokenizer/>
@@ -665,8 +665,8 @@
 			</filterchain>
 		</copy>
 		
-		<move file="test/webapps/oai/WEB-INF/web.xml" tofile="test/webapps/oai/WEB-INF/web.xml.original"/>
-		<copy file="test/webapps/oai/WEB-INF/web.xml.original" tofile="test/webapps/oai/WEB-INF/web.xml">
+		<move file="${test.dspace.dir}/webapps/oai/WEB-INF/web.xml" tofile="${test.dspace.dir}/webapps/oai/WEB-INF/web.xml.original"/>
+		<copy file="${test.dspace.dir}/webapps/oai/WEB-INF/web.xml.original" tofile="${test.dspace.dir}/webapps/oai/WEB-INF/web.xml">
 			<filterchain>
 				<tokenfilter>
 					<linetokenizer/>
@@ -675,8 +675,8 @@
 			</filterchain>
 		</copy>
 		
-		<move file="test/webapps/sword/WEB-INF/web.xml" tofile="test/webapps/sword/WEB-INF/web.xml.original"/>
-		<copy file="test/webapps/sword/WEB-INF/web.xml.original" tofile="test/webapps/sword/WEB-INF/web.xml">
+		<move file="${test.dspace.dir}/webapps/sword/WEB-INF/web.xml" tofile="${test.dspace.dir}/webapps/sword/WEB-INF/web.xml.original"/>
+		<copy file="${test.dspace.dir}/webapps/sword/WEB-INF/web.xml.original" tofile="${test.dspace.dir}/webapps/sword/WEB-INF/web.xml">
 			<filterchain>
 				<tokenfilter>
 					<linetokenizer/>
@@ -777,7 +777,7 @@
 		<java classname="org.dspace.app.xmlui.aspect.vireo.VireoTestRunner" classpathref="class.path" failonerror="true" fork="true">
 			<jvmarg value="-Xmx512m"/>
 			<jvmarg value="-Dfile.encoding=UTF8"/>
-			<arg line="-w http://localhost:8081/xmlui/ -c test/config/dspace.cfg"/>
+			<arg line="-w http://localhost:8081/xmlui/ -c ${test.dspace.dir}/config/dspace.cfg"/>
 		</java>
 		
 		<exec dir="${test.dspace.dir}/bin/" executable="/bin/sh" os="FreeBSD, Linux, Mac OS X, Solaris" failonerror="true">

Get latest updates about Open Source Projects, Conferences and News.

Sign up for the SourceForge newsletter:





No, thanks