Author: rjung
Date: Thu Mar 27 14:16:08 2008
New Revision: 641984
URL: http://svn.apache.org/viewvc?rev=641984&view=rev
Log:
Build file adjustments.
Modified:
tomcat/sandbox/tomcat-oacc/trunk/build.properties.default
tomcat/sandbox/tomcat-oacc/trunk/build.xml
tomcat/sandbox/tomcat-oacc/trunk/docs/build.xml
tomcat/sandbox/tomcat-oacc/trunk/test/build.xml
Modified: tomcat/sandbox/tomcat-oacc/trunk/build.properties.default
URL:
http://svn.apache.org/viewvc/tomcat/sandbox/tomcat-oacc/trunk/build.properties.default?rev=641984&r1=641983&r2=641984&view=diff
==============================================================================
--- tomcat/sandbox/tomcat-oacc/trunk/build.properties.default (original)
+++ tomcat/sandbox/tomcat-oacc/trunk/build.properties.default Thu Mar 27
14:16:08 2008
@@ -32,13 +32,17 @@
# path, we'll do that in build.xml automatically.
#
catalina.home=C:/Programme/apache-tomcat-6.0.14
-#catalina.home=../trunk/output/build
+#catalina.home=/usr/local/apache-tomcat-6.0.14
#
# We also need to know, where the tomcat-juli.jar is.
# This should be the full path including any sub directories.
#
-catalina.extras=C:/Programme/apache-tomcat-6.0.14/extras
-#catalina.extras=../trunk/output/extras
+catalina.extras=C:/Programme/apache-tomcat-6.0.14/bin
+#catalina.extras=/usr/local/apache-tomcat-6.0.14/bin
+
+# Only needed if you want to run the test suite
+junit.jar=C:/Programme/junit-4.4/junit-4.4.jar
+junit.jar=/usr/local/junit-4.4/junit-4.4.jar
compile.source=1.5
compile.target=1.5
Modified: tomcat/sandbox/tomcat-oacc/trunk/build.xml
URL:
http://svn.apache.org/viewvc/tomcat/sandbox/tomcat-oacc/trunk/build.xml?rev=641984&r1=641983&r2=641984&view=diff
==============================================================================
--- tomcat/sandbox/tomcat-oacc/trunk/build.xml (original)
+++ tomcat/sandbox/tomcat-oacc/trunk/build.xml Thu Mar 27 14:16:08 2008
@@ -162,12 +162,12 @@
<!-- ================ DIST: Create Distribution ========================= -->
<target name="dist" depends="build-all,dist-prepare">
- <jar destfile="${oacc.dist}/lib/catalina-oacc.jar"
+ <jar destfile="${oacc.dist}/lib/apache-tomcat-oacc.jar"
basedir="${oacc.build}/classes">
<include name="org/apache/catalina/cluster/**" />
<exclude name="**/package.html" />
</jar>
- <jar destfile="${oacc.dist}/lib/catalina-sso.jar"
+ <jar destfile="${oacc.dist}/lib/apache-tomcat-sso.jar"
basedir="${oacc.build}/classes">
<include name="org/apache/catalina/authenticator/**" />
<exclude name="**/package.html" />
@@ -176,7 +176,7 @@
</target>
<target name="copy" depends="dist" >
- <copy file="${oacc.dist}/lib/catalina-oacc.jar"
todir="${catalina.home}/lib" />
+ <copy file="${oacc.dist}/lib/apache-tomcat-oacc.jar"
todir="${catalina.home}/lib" />
</target>
<!-- ======================= DIST: Clean Directory ====================== -->
Modified: tomcat/sandbox/tomcat-oacc/trunk/docs/build.xml
URL:
http://svn.apache.org/viewvc/tomcat/sandbox/tomcat-oacc/trunk/docs/build.xml?rev=641984&r1=641983&r2=641984&view=diff
==============================================================================
--- tomcat/sandbox/tomcat-oacc/trunk/docs/build.xml (original)
+++ tomcat/sandbox/tomcat-oacc/trunk/docs/build.xml Thu Mar 27 14:16:08 2008
@@ -20,9 +20,8 @@
<!-- ===================== Initialize Property Values =================== -->
- <!-- See "build.properties.sample" in the top level directory for all -->
+ <!-- See "build.properties.default" in the top level directory for all
-->
<!-- property values you must customize for successful building!!! -->
- <property file="build.properties"/>
<property file="../build.properties"/>
<property file="../build.properties.default"/>
Modified: tomcat/sandbox/tomcat-oacc/trunk/test/build.xml
URL:
http://svn.apache.org/viewvc/tomcat/sandbox/tomcat-oacc/trunk/test/build.xml?rev=641984&r1=641983&r2=641984&view=diff
==============================================================================
--- tomcat/sandbox/tomcat-oacc/trunk/test/build.xml (original)
+++ tomcat/sandbox/tomcat-oacc/trunk/test/build.xml Thu Mar 27 14:16:08 2008
@@ -16,7 +16,7 @@
limitations under the License.
-->
<!-- @author Peter Rossbach -->
-<project name="Tomcat: Cluster Testcases" basedir="." default="test">
+<project name="Tomcat: OACC Testcases" basedir="." default="test">
<property file="../build.properties" />
<property file="../build.properties.default" />
<property name="test.report.logs" value="logs/reports" />
@@ -24,7 +24,6 @@
<property name="compile.optimize" value="true" />
<property name="compile.debug" value="true" />
- <property name="compile.source" value="1.5" />
<property name="compile.deprecation" value="true" />
<property name="compile.nowarn" value="off" />
<property name="compile.encoding" value="UTF-8" />
@@ -40,6 +39,7 @@
<pathelement location="${catalina.home}/lib/servlet-api.jar"/>
<pathelement location="${oacc.dist}/lib/catalina-oacc.jar"/>
<pathelement location="${oacc.dist}/lib/catalina-sso.jar"/>
+ <pathelement location="${junit.jar}"/>
</path>
@@ -49,7 +49,7 @@
<target name="info" description="Shows a information about this ant
script">
<echo>
- This ant script implements some testcases to verify the
key functions of tomcat clustering module.
+ This ant script implements some testcases to verify the
key functions of tomcat OACC module.
You find this script at: ${ant.file}
</echo>
</target>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
