vgritsenko 2003/08/07 10:47:28
Modified: . build.sh build.bat build.xml
Log:
ZAP TABS!
Remove -emacs option.
Revision Changes Path
1.4 +2 -2 xml-xindice/build.sh
Index: build.sh
===================================================================
RCS file: /home/cvs/xml-xindice/build.sh,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- build.sh 1 Aug 2003 18:21:18 -0000 1.3
+++ build.sh 7 Aug 2003 17:47:28 -0000 1.4
@@ -18,7 +18,7 @@
export CP
unset CLASSPATH
-$PWD/tools/bin/ant -logger org.apache.tools.ant.NoBannerLogger -emacs $@
+$PWD/tools/bin/ant -logger org.apache.tools.ant.NoBannerLogger $@
CLASSPATH=$CP
export CLASSPATH
1.3 +2 -2 xml-xindice/build.bat
Index: build.bat
===================================================================
RCS file: /home/cvs/xml-xindice/build.bat,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- build.bat 1 Aug 2003 18:21:18 -0000 1.2
+++ build.bat 7 Aug 2003 17:47:28 -0000 1.3
@@ -30,7 +30,7 @@
rem ----- Set endorsed library path to be used by Ant
set OLD_ANT_OPTS=%ANT_OPTS%
-call %ANT_HOME%\bin\ant -logger org.apache.tools.ant.NoBannerLogger -emacs
%1 %2 %3 %4 %5 %6 %7 %8 %9
+call %ANT_HOME%\bin\ant -logger org.apache.tools.ant.NoBannerLogger %1 %2 %3
%4 %5 %6 %7 %8 %9
rem ----- Restore ANT_OPTS
set ANT_OPTS=%OLD_ANT_OPTS%
1.55 +43 -44 xml-xindice/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/xml-xindice/build.xml,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -r1.54 -r1.55
--- build.xml 7 Aug 2003 02:40:51 -0000 1.54
+++ build.xml 7 Aug 2003 17:47:28 -0000 1.55
@@ -57,7 +57,7 @@
<property name="src.build.dir" value="${build.dir}/classes"/>
<property name="test.build.dir" value="${build.dir}/classes-tests"/>
<property name="test.report.dir" value="${build.dir}/test-reports"/>
- <property name="reports.dir" value="${build.dir}/reports"/>
+ <property name="reports.dir" value="${build.dir}/reports"/>
<property name="api.dir" value="${build.dir}/api"/>
<property name="dist.dir" value="dist"/>
<property name="javadoc.pkgs" value="org.apache.xindice.*"/>
@@ -183,11 +183,11 @@
<target name="test-unit" depends="test-build, test-validate">
<junit fork="yes" printsummary="yes" haltonfailure="no">
- <!-- to show debug logging on screen comment this line
and uncomment the next block -->
+ <!-- to show debug logging on screen comment this line and
uncomment the next block -->
<jvmarg
value="-Dorg.apache.commons.logging.Log=org.apache.commons.logging.impl.NoOpLog"/>
-
- <!--
- <jvmarg
value="-Dorg.apache.commons.logging.Log=org.apache.commons.logging.impl.SimpleLog"/>
+
+ <!--
+ <jvmarg
value="-Dorg.apache.commons.logging.Log=org.apache.commons.logging.impl.SimpleLog"/>
<jvmarg
value="-Dorg.apache.commons.logging.simplelog.defaultlog=debug"/>
<formatter type="plain" usefile="no"/>
-->
@@ -204,17 +204,19 @@
<target name="test-embed-binary" depends="test-build, test-validate">
<junit fork="yes" printsummary="yes" haltonfailure="no">
- <!-- to show debug logging on screen comment this line
and uncomment the next block -->
+ <!-- to show debug logging on screen comment this line and
uncomment the next block -->
<jvmarg
value="-Dorg.apache.commons.logging.Log=org.apache.commons.logging.impl.NoOpLog"/>
-
- <!--
- <jvmarg
value="-Dorg.apache.commons.logging.Log=org.apache.commons.logging.impl.SimpleLog"/>
+
+ <!--
+ <jvmarg
value="-Dorg.apache.commons.logging.Log=org.apache.commons.logging.impl.SimpleLog"/>
<jvmarg
value="-Dorg.apache.commons.logging.simplelog.defaultlog=debug"/>
<formatter type="plain" usefile="no"/>
-->
<test
name="org.apache.xindice.client.xmldb.resources.BinaryResourceTest"
outfile="${test.report.dir}/org.apache.xindice.client.xmldb.resources.BinaryResourceTest"/>
+
<formatter type="xml"/>
+
<classpath>
<path refid="project.class.path"/>
<pathelement location="${test.build.dir}"/>
@@ -227,11 +229,11 @@
<jvmarg
value="-DPropertyManager.file=${test.dir}/config/test-configuration.props"/>
<jvmarg value="-Dxindice.home=${basedir}"/>
- <!-- to show debug logging on screen comment this line
and uncomment the next block -->
+ <!-- to show debug logging on screen comment this line and
uncomment the next block -->
<jvmarg
value="-Dorg.apache.commons.logging.Log=org.apache.commons.logging.impl.NoOpLog"/>
-
- <!--
- <jvmarg
value="-Dorg.apache.commons.logging.Log=org.apache.commons.logging.impl.SimpleLog"/>
+
+ <!--
+ <jvmarg
value="-Dorg.apache.commons.logging.Log=org.apache.commons.logging.impl.SimpleLog"/>
<jvmarg
value="-Dorg.apache.commons.logging.simplelog.defaultlog=debug"/>
<formatter type="plain" usefile="no"/>
-->
@@ -240,9 +242,7 @@
<path refid="project.class.path"/>
<pathelement location="${test.build.dir}"/>
</classpath>
-
- <formatter type="xml"/>
-
+ <formatter type="xml"/>
<test name="org.apache.xindice.IntegrationEmbedTests"
outfile="${test.report.dir}/org.apache.xindice.IntegrationEmbedTests"/>
</junit>
</target>
@@ -258,11 +258,11 @@
<jvmarg
value="-Dtest.xmlrpc.service-location=${test.xmlrpc.service-location}"/>
<jvmarg value="-Dtest.xmlrpc.driver=${test.xmlrpc.driver}"/>
- <!-- to show debug logging on screen comment this line
and uncomment the next block -->
+ <!-- to show debug logging on screen comment this line and
uncomment the next block -->
<jvmarg
value="-Dorg.apache.commons.logging.Log=org.apache.commons.logging.impl.NoOpLog"/>
-
- <!--
- <jvmarg
value="-Dorg.apache.commons.logging.Log=org.apache.commons.logging.impl.SimpleLog"/>
+
+ <!--
+ <jvmarg
value="-Dorg.apache.commons.logging.Log=org.apache.commons.logging.impl.SimpleLog"/>
<jvmarg
value="-Dorg.apache.commons.logging.simplelog.defaultlog=debug"/>
<formatter type="plain" usefile="no"/>
-->
@@ -283,11 +283,11 @@
<jvmarg
value="-DPropertyManager.file=${test.dir}/config/test-configuration.props"/>
<jvmarg value="-Dxindice.home=${basedir}"/>
- <!-- to show debug logging on screen comment this line
and uncomment the next block -->
+ <!-- to show debug logging on screen comment this line and
uncomment the next block -->
<jvmarg
value="-Dorg.apache.commons.logging.Log=org.apache.commons.logging.impl.NoOpLog"/>
-
- <!--
- <jvmarg
value="-Dorg.apache.commons.logging.Log=org.apache.commons.logging.impl.SimpleLog"/>
+
+ <!--
+ <jvmarg
value="-Dorg.apache.commons.logging.Log=org.apache.commons.logging.impl.SimpleLog"/>
<jvmarg
value="-Dorg.apache.commons.logging.simplelog.defaultlog=debug"/>
<formatter type="plain" usefile="no"/>
-->
@@ -297,7 +297,7 @@
<pathelement location="${test.build.dir}"/>
</classpath>
- <formatter type="xml"/>
+ <formatter type="xml"/>
<test name="org.apache.xindice.IntegrationManagedTests"
outfile="${test.report.dir}/org.apache.xindice.IntegrationManagedTests.xml"/>
</junit>
@@ -325,22 +325,21 @@
depends="test-unit, test-embed-binary, test-integration-embed,
test-integration-xmlrpc, test-integration-managed">
</target>
+ <target name="test" depends="test-all">
+ <junitreport todir="${test.report.dir}">
+ <fileset dir="${test.report.dir}">
+ <include name="*.xml"/>
+ </fileset>
+ <report format="frames" todir="${reports.dir}/test"/>
+ </junitreport>
+ </target>
+
<target name="test-clean">
<delete dir="${test.build.dir}"/>
</target>
- <!-- reports -->
-
- <target name="reports" depends="test-report" description="Generate all
project reports"/>
-
- <target name="test-report" depends="test-all">
- <junitreport todir="${test.report.dir}">
- <fileset dir="${test.report.dir}">
- <include name="*.xml"/>
- </fileset>
- <report format="frames" todir="${reports.dir}/test"/>
- </junitreport>
- </target>
+ <!-- reports -->
+ <target name="reports" depends="test" description="Generate all project
reports"/>
<!-- ===================================================================
-->
<!-- Build the Xindice archives (jar and war)
-->
@@ -394,12 +393,12 @@
<target name="tomcat-deploy" depends="war-release" description="Deployes
the Xindice webapp into the Tomcat installation">
<copy file="${dist.dir}/${project.filename}-${project.version}.xml"
todir="${tomcat.home}/webapps"/>
<copy file="${dist.dir}/${project.filename}-${project.version}.war"
todir="${tomcat.home}/webapps"/>
- <!-- todo currently try to test the use of the xindice-1.1b.xml file
for the
- Tomcat installation.
- <unjar src="${dist.dir}/${project.filename}-${project.version}.war"
- dest="${tomcat.home}/webapps/${webapp.name}"
- overwrite="true"/>
--->
+ <!-- TODO: Currently try to test the use of the xindice-1.1b.xml
file for the
+ Tomcat installation.
+ <unjar src="${dist.dir}/${project.filename}-${project.version}.war"
+ dest="${tomcat.home}/webapps/${webapp.name}"
+ overwrite="true"/>
+ -->
</target>
<target name="tomcat-clean" description="Removes the deployed Xindice
webapp from the Tomcat installation">
<delete dir="${tomcat.home}/webapps/${webapp.name}"/>
