svn commit: r915169 - in /tomcat/jk/trunk/jkstatus: build.properties.default build.xml

[rj...@apache.org]

Author: rjung
Date: Tue Feb 23 03:58:29 2010
New Revision: 915169

URL: http://svn.apache.org/viewvc?rev=915169&view=rev
Log:
Clean up ant build for jkstatus inside jk.

Added:
    tomcat/jk/trunk/jkstatus/build.properties.default
Modified:
    tomcat/jk/trunk/jkstatus/build.xml

Added: tomcat/jk/trunk/jkstatus/build.properties.default
URL: http://svn.apache.org/viewvc/tomcat/jk/trunk/jkstatus/build.properties.default?rev=915169&view=auto
==============================================================================
--- tomcat/jk/trunk/jkstatus/build.properties.default (added)
+++ tomcat/jk/trunk/jkstatus/build.properties.default Tue Feb 23 03:58:29 2010
@@ -0,0 +1,22 @@
+# -----------------------------------------------------------------------------
+# build.properties.default
+#
+# This is an example "build.properties" file, used to customize building Tomcat
+# for your local environment.  It defines the location of all external
+# modules that Tomcat depends on.  Copy this file to "build.properties"
+# in the top-level source directory, and customize it as needed.
+#
+# $Id: build.properties.default 892628 2009-12-20 18:01:53Z markt $
+# -----------------------------------------------------------------------------
+
+# ----- Compile Control Flags -----
+compile.debug=on
+compile.deprecation=off
+compile.optimize=off
+
+# ----- Path to Tomcat installation -----
+catalina.build=/usr/local/share/tomcat-5.5
+
+# ----- Some version dependent jar file names -----
+commons-modeler.jar=commons-modeler-2.0.1.jar
+commons-logging.jar=commons-logging-api-1.1.1.jar

Modified: tomcat/jk/trunk/jkstatus/build.xml
URL: http://svn.apache.org/viewvc/tomcat/jk/trunk/jkstatus/build.xml?rev=915169&r1=915168&r2=915169&view=diff
==============================================================================
--- tomcat/jk/trunk/jkstatus/build.xml (original)
+++ tomcat/jk/trunk/jkstatus/build.xml Tue Feb 23 03:58:29 2010
@@ -20,22 +20,20 @@
 
   <!-- ===================== Initialize Property Values =================== -->
 
-  <property file="../../../build/build.properties" />
-  <property file="../../../build/build.properties.default" />
+  <property file="build.properties" />
+  <property file="build.properties.default" />
 
   <!-- Build Defaults -->
-  <property name="jtc.home"  location="../.."/>
-  <property name="catalina.build" location="../../../build/build"/>
-  <property name="jk.build"  value="${jtc.home}/jk/jkstatus/build"/>
-  <property name="jk.dist"   value="${jtc.home}/jk/jkstatus/dist"/>
+  <property name="jk.build"  value="build"/>
+  <property name="jk.dist"   value="dist"/>
 
     <!-- Construct Catalina classpath -->
   <path id="jtc.classpath">
     <pathelement location="${catalina.build}/server/lib/catalina.jar"/>
     <pathelement location="${catalina.build}/server/lib/catalina-ant.jar"/>
     <pathelement location="${catalina.build}/server/lib/tomcat-util.jar"/>
-    <pathelement location="${commons-modeler.jar}"/>
-    <pathelement location="${commons-logging.jar}"/>
+    <pathelement location="${catalina.build}/server/lib/${commons-modeler.jar}"/>
+    <pathelement location="${catalina.build}/bin/${commons-logging.jar}"/>
     <pathelement location="${jmx.jar}"/>
     <pathelement location="${ant.home}/lib/ant.jar"/>
       <pathelement location="${catalina.build}/common/lib/servlet-api.jar"/>



---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org