Author: rjung
Date: Wed Mar 26 05:01:11 2008
New Revision: 641273
URL: http://svn.apache.org/viewvc?rev=641273&view=rev
Log:
Fix build.xml for ant build of the new sandbox:
- remove some trailing white space
- server/lib -> lib
- catalina.build -> cluster.build
- use my own build.properties
- remove dependdency on commons-logging, commons-modeler and jmx
- get catalina.home from properties file
- look for dependencies in catalina.home and catalina.extras
instead of cluster.build
- add tomcat-juli as dependency
- set cluster.build and cluster.dist as local sub directories
- add javac source and target version and set via property file
Added:
tomcat/sandbox/tomcat-oacc/trunk/build.properties.default (with props)
Modified:
tomcat/sandbox/tomcat-oacc/trunk/build.xml
Added: tomcat/sandbox/tomcat-oacc/trunk/build.properties.default
URL:
http://svn.apache.org/viewvc/tomcat/sandbox/tomcat-oacc/trunk/build.properties.default?rev=641273&view=auto
==============================================================================
--- tomcat/sandbox/tomcat-oacc/trunk/build.properties.default (added)
+++ tomcat/sandbox/tomcat-oacc/trunk/build.properties.default Wed Mar 26
05:01:11 2008
@@ -0,0 +1,45 @@
+# -----------------------------------------------------------------------------
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+# -----------------------------------------------------------------------------
+# build.properties.sample
+#
+# This is an example "build.properties" file, used to customize building
+# Tomcat cluster 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 cluster source directory, and customize it as needed.
+#
+# $Id$
+# -----------------------------------------------------------------------------
+
+# ----- Directories to look for dependencies -----
+# We need some jar files from Tomcat to compile against.
+# Usually they are either in the lib subdirectory of an
+# installed Tomcat, or in the lib subdirectory of your
+# Tomcat build directory. Don't add the /lib to the
+# path, we'll do that in build.xml automatically.
+#
+catalina.home=C:/Programme/apache-tomcat-6.0.14
+#catalina.home=../trunk/output/build
+#
+# 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
+
+compile.source=1.5
+compile.target=1.5
+compile.debug=true
Propchange: tomcat/sandbox/tomcat-oacc/trunk/build.properties.default
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: tomcat/sandbox/tomcat-oacc/trunk/build.properties.default
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Modified: tomcat/sandbox/tomcat-oacc/trunk/build.xml
URL:
http://svn.apache.org/viewvc/tomcat/sandbox/tomcat-oacc/trunk/build.xml?rev=641273&r1=641272&r2=641273&view=diff
==============================================================================
--- tomcat/sandbox/tomcat-oacc/trunk/build.xml (original)
+++ tomcat/sandbox/tomcat-oacc/trunk/build.xml Wed Mar 26 05:01:11 2008
@@ -20,24 +20,19 @@
<!-- ===================== Initialize Property Values =================== -->
- <property file="../../../build.properties" />
- <property file="../../../build/build.properties" />
- <property file="../../../build/build.properties.default" />
+ <property file="build.properties" />
+ <property file="build.properties.default" />
<!-- Build Defaults -->
- <property name="catalina.home" location="../.."/>
- <property name="catalina.build" location="../../../build/build"/>
- <property name="cluster.build"
value="${catalina.home}/modules/cluster/build"/>
- <property name="cluster.dist"
value="${catalina.home}/modules/cluster/dist"/>
+ <property name="cluster.build" value="build"/>
+ <property name="cluster.dist" value="dist"/>
<!-- Construct Catalina classpath -->
<path id="cluster.classpath">
- <pathelement location="${catalina.build}/server/lib/catalina.jar"/>
- <pathelement location="${catalina.build}/server/lib/tomcat-util.jar"/>
- <pathelement location="${commons-modeler.jar}"/>
- <pathelement location="${commons-logging.jar}"/>
- <pathelement location="${jmx.jar}"/>
- <pathelement location="${catalina.build}/common/lib/servlet-api.jar"/>
+ <pathelement location="${catalina.home}/lib/catalina.jar"/>
+ <pathelement location="${catalina.home}/lib/tomcat-coyote.jar"/>
+ <pathelement location="${catalina.extras}/tomcat-juli.jar"/>
+ <pathelement location="${catalina.home}/lib/servlet-api.jar"/>
</path>
<!-- Source path -->
@@ -50,7 +45,7 @@
<target name="flags">
<!-- JDK flags -->
<available property="jdk.1.2.present" classname="java.util.HashMap" />
- <available property="jdk.1.3.present"
+ <available property="jdk.1.3.present"
classname="java.lang.reflect.Proxy" />
<available property="jdk.1.4.present" classname="java.nio.Buffer" />
</target>
@@ -82,8 +77,8 @@
<!-- =================== BUILD: Create Directories ====================== -->
<target name="build-prepare">
- <mkdir dir="${catalina.build}"/>
- <mkdir dir="${catalina.build}/classes"/>
+ <mkdir dir="${cluster.build}"/>
+ <mkdir dir="${cluster.build}/classes"/>
<mkdir dir="${cluster.dist}"/>
</target>
@@ -91,45 +86,47 @@
<!-- ================ BUILD: Compile Catalina Components ================ -->
-
+
<target name="build-catalina-cluster" depends="build-prepare">
<!-- Compile internal server components -->
- <javac srcdir="${basedir}/src/share" destdir="${catalina.build}/classes"
+ <javac srcdir="${basedir}/src/share" destdir="${cluster.build}/classes"
debug="${compile.debug}" deprecation="${compile.deprecation}"
optimize="${compile.optimize}"
- excludes="**/CVS/**"
+ excludes="**/CVS/**"
+ source="${compile.source}"
+ target="${compile.target}"
>
<classpath refid="cluster.classpath" />
</javac>
<copy
file="${basedir}/src/share/org/apache/catalina/cluster/LocalStrings.properties"
-
tofile="${catalina.build}/classes/org/apache/catalina/cluster/LocalStrings.properties"/>
+
tofile="${cluster.build}/classes/org/apache/catalina/cluster/LocalStrings.properties"/>
<copy
file="${basedir}/src/share/org/apache/catalina/cluster/session/LocalStrings.properties"
-
tofile="${catalina.build}/classes/org/apache/catalina/cluster/session/LocalStrings.properties"/>
+
tofile="${cluster.build}/classes/org/apache/catalina/cluster/session/LocalStrings.properties"/>
<copy
file="${basedir}/src/share/org/apache/catalina/cluster/tcp/LocalStrings.properties"
-
tofile="${catalina.build}/classes/org/apache/catalina/cluster/tcp/LocalStrings.properties"/>
+
tofile="${cluster.build}/classes/org/apache/catalina/cluster/tcp/LocalStrings.properties"/>
<copy
file="${basedir}/src/share/org/apache/catalina/cluster/tcp/DataSenders.properties"
-
tofile="${catalina.build}/classes/org/apache/catalina/cluster/tcp/DataSenders.properties"/>
+
tofile="${cluster.build}/classes/org/apache/catalina/cluster/tcp/DataSenders.properties"/>
<copy
file="${basedir}/src/share/org/apache/catalina/cluster/session/mbeans-descriptors.xml"
-
tofile="${catalina.build}/classes/org/apache/catalina/cluster/session/mbeans-descriptors.xml"/>
+
tofile="${cluster.build}/classes/org/apache/catalina/cluster/session/mbeans-descriptors.xml"/>
<copy
file="${basedir}/src/share/org/apache/catalina/cluster/tcp/mbeans-descriptors.xml"
-
tofile="${catalina.build}/classes/org/apache/catalina/cluster/tcp/mbeans-descriptors.xml"/>
+
tofile="${cluster.build}/classes/org/apache/catalina/cluster/tcp/mbeans-descriptors.xml"/>
<copy
file="${basedir}/src/share/org/apache/catalina/cluster/mcast/LocalStrings.properties"
-
tofile="${catalina.build}/classes/org/apache/catalina/cluster/mcast/LocalStrings.properties"/>
+
tofile="${cluster.build}/classes/org/apache/catalina/cluster/mcast/LocalStrings.properties"/>
<copy
file="${basedir}/src/share/org/apache/catalina/cluster/mcast/mbeans-descriptors.xml"
-
tofile="${catalina.build}/classes/org/apache/catalina/cluster/mcast/mbeans-descriptors.xml"/>
+
tofile="${cluster.build}/classes/org/apache/catalina/cluster/mcast/mbeans-descriptors.xml"/>
<copy
file="${basedir}/src/share/org/apache/catalina/cluster/authenticator/mbeans-descriptors.xml"
-
tofile="${catalina.build}/classes/org/apache/catalina/cluster/authenticator/mbeans-descriptors.xml"/>
+
tofile="${cluster.build}/classes/org/apache/catalina/cluster/authenticator/mbeans-descriptors.xml"/>
</target>
<!-- ================ BUILD: Create Catalina Javadocs =================== -->
<target name="javadoc">
- <delete dir="${catalina.build}/javadoc"/>
- <mkdir dir="${catalina.build}/javadoc"/>
+ <delete dir="${cluster.build}/javadoc"/>
+ <mkdir dir="${cluster.build}/javadoc"/>
<javadoc packagenames="org.apache.catalina.*,org.apache.naming.*"
classpathref="catalina.classpath"
sourcepathref="javadoc.sourcepath"
- destdir="${catalina.build}/javadoc"
+ destdir="${cluster.build}/javadoc"
author="true"
version="true"
windowtitle="Catalina Internal API Documentation"
@@ -141,7 +138,7 @@
<!-- ======================= BUILD: Clean Directory ===================== -->
<target name="build-clean">
- <delete dir="${catalina.build}"/>
+ <delete dir="${cluster.build}"/>
</target>
@@ -152,9 +149,9 @@
<!-- ================ DIST: Create Distribution ========================= -->
<target name="dist" depends="build-catalina-cluster">
-
+
<jar destfile="${cluster.dist}/catalina-cluster.jar"
- basedir="${catalina.build}/classes">
+ basedir="${cluster.build}/classes">
<include name="org/apache/catalina/cluster/**" />
<exclude name="**/package.html" />
<exclude name="**/LocalStrings_*" />
@@ -162,9 +159,9 @@
</target>
<target name="copy" depends="dist" >
- <copy file="${cluster.dist}/catalina-cluster.jar"
todir="${catalina.build}/server/lib" />
+ <copy file="${cluster.dist}/catalina-cluster.jar"
todir="${catalina.build}/lib" />
</target>
-
+
<!-- ======================== DIST: Clean Directory ===================== -->
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
