Author: rjung Date: Wed Mar 26 06:48:03 2008 New Revision: 641307 URL: http://svn.apache.org/viewvc?rev=641307&view=rev Log: Rename vars and jars from cluster to oacc.
Modified: tomcat/sandbox/tomcat-oacc/trunk/build.xml Modified: tomcat/sandbox/tomcat-oacc/trunk/build.xml URL: http://svn.apache.org/viewvc/tomcat/sandbox/tomcat-oacc/trunk/build.xml?rev=641307&r1=641306&r2=641307&view=diff ============================================================================== --- tomcat/sandbox/tomcat-oacc/trunk/build.xml (original) +++ tomcat/sandbox/tomcat-oacc/trunk/build.xml Wed Mar 26 06:48:03 2008 @@ -24,11 +24,11 @@ <property file="build.properties.default" /> <!-- Build Defaults --> - <property name="cluster.build" value="build"/> - <property name="cluster.dist" value="dist"/> + <property name="oacc.build" value="build"/> + <property name="oacc.dist" value="dist"/> <!-- Construct Catalina classpath --> - <path id="cluster.classpath"> + <path id="oacc.classpath"> <pathelement location="${catalina.home}/lib/catalina.jar"/> <pathelement location="${catalina.home}/lib/tomcat-coyote.jar"/> <pathelement location="${catalina.extras}/tomcat-juli.jar"/> @@ -77,9 +77,9 @@ <!-- =================== BUILD: Create Directories ====================== --> <target name="build-prepare"> - <mkdir dir="${cluster.build}"/> - <mkdir dir="${cluster.build}/classes"/> - <mkdir dir="${cluster.dist}"/> + <mkdir dir="${oacc.build}"/> + <mkdir dir="${oacc.build}/classes"/> + <mkdir dir="${oacc.dist}"/> </target> @@ -87,46 +87,46 @@ <!-- ================ BUILD: Compile Catalina Components ================ --> - <target name="build-catalina-cluster" depends="build-prepare"> + <target name="build-oacc" depends="build-prepare"> <!-- Compile internal server components --> - <javac srcdir="${basedir}/src/share" destdir="${cluster.build}/classes" + <javac srcdir="${basedir}/src/share" destdir="${oacc.build}/classes" debug="${compile.debug}" deprecation="${compile.deprecation}" optimize="${compile.optimize}" excludes="**/CVS/**" source="${compile.source}" target="${compile.target}" > - <classpath refid="cluster.classpath" /> + <classpath refid="oacc.classpath" /> </javac> <copy file="${basedir}/src/share/org/apache/catalina/cluster/LocalStrings.properties" - tofile="${cluster.build}/classes/org/apache/catalina/cluster/LocalStrings.properties"/> + tofile="${oacc.build}/classes/org/apache/catalina/cluster/LocalStrings.properties"/> <copy file="${basedir}/src/share/org/apache/catalina/cluster/session/LocalStrings.properties" - tofile="${cluster.build}/classes/org/apache/catalina/cluster/session/LocalStrings.properties"/> + tofile="${oacc.build}/classes/org/apache/catalina/cluster/session/LocalStrings.properties"/> <copy file="${basedir}/src/share/org/apache/catalina/cluster/tcp/LocalStrings.properties" - tofile="${cluster.build}/classes/org/apache/catalina/cluster/tcp/LocalStrings.properties"/> + tofile="${oacc.build}/classes/org/apache/catalina/cluster/tcp/LocalStrings.properties"/> <copy file="${basedir}/src/share/org/apache/catalina/cluster/tcp/DataSenders.properties" - tofile="${cluster.build}/classes/org/apache/catalina/cluster/tcp/DataSenders.properties"/> + tofile="${oacc.build}/classes/org/apache/catalina/cluster/tcp/DataSenders.properties"/> <copy file="${basedir}/src/share/org/apache/catalina/cluster/session/mbeans-descriptors.xml" - tofile="${cluster.build}/classes/org/apache/catalina/cluster/session/mbeans-descriptors.xml"/> + tofile="${oacc.build}/classes/org/apache/catalina/cluster/session/mbeans-descriptors.xml"/> <copy file="${basedir}/src/share/org/apache/catalina/cluster/tcp/mbeans-descriptors.xml" - tofile="${cluster.build}/classes/org/apache/catalina/cluster/tcp/mbeans-descriptors.xml"/> + tofile="${oacc.build}/classes/org/apache/catalina/cluster/tcp/mbeans-descriptors.xml"/> <copy file="${basedir}/src/share/org/apache/catalina/cluster/mcast/LocalStrings.properties" - tofile="${cluster.build}/classes/org/apache/catalina/cluster/mcast/LocalStrings.properties"/> + tofile="${oacc.build}/classes/org/apache/catalina/cluster/mcast/LocalStrings.properties"/> <copy file="${basedir}/src/share/org/apache/catalina/cluster/mcast/mbeans-descriptors.xml" - tofile="${cluster.build}/classes/org/apache/catalina/cluster/mcast/mbeans-descriptors.xml"/> + tofile="${oacc.build}/classes/org/apache/catalina/cluster/mcast/mbeans-descriptors.xml"/> <copy file="${basedir}/src/share/org/apache/catalina/cluster/authenticator/mbeans-descriptors.xml" - tofile="${cluster.build}/classes/org/apache/catalina/cluster/authenticator/mbeans-descriptors.xml"/> + tofile="${oacc.build}/classes/org/apache/catalina/cluster/authenticator/mbeans-descriptors.xml"/> </target> <!-- ================ BUILD: Create Catalina Javadocs =================== --> <target name="javadoc"> - <delete dir="${cluster.build}/javadoc"/> - <mkdir dir="${cluster.build}/javadoc"/> + <delete dir="${oacc.build}/javadoc"/> + <mkdir dir="${oacc.build}/javadoc"/> <javadoc packagenames="org.apache.catalina.*,org.apache.naming.*" classpathref="catalina.classpath" sourcepathref="javadoc.sourcepath" - destdir="${cluster.build}/javadoc" + destdir="${oacc.build}/javadoc" author="true" version="true" windowtitle="Catalina Internal API Documentation" @@ -138,7 +138,7 @@ <!-- ======================= BUILD: Clean Directory ===================== --> <target name="build-clean"> - <delete dir="${cluster.build}"/> + <delete dir="${oacc.build}"/> </target> @@ -148,16 +148,16 @@ <!-- ================ DIST: Create Distribution ========================= --> - <target name="dist" depends="build-catalina-cluster"> + <target name="dist" depends="build-oacc"> - <jar destfile="${cluster.dist}/catalina-cluster.jar" - basedir="${cluster.build}/classes"> + <jar destfile="${oacc.dist}/catalina-oacc.jar" + basedir="${oacc.build}/classes"> <include name="org/apache/catalina/cluster/**" /> <exclude name="**/package.html" /> <exclude name="**/LocalStrings_*" /> </jar> - <jar destfile="${cluster.dist}/catalina-sso.jar" - basedir="${cluster.build}/classes"> + <jar destfile="${oacc.dist}/catalina-sso.jar" + basedir="${oacc.build}/classes"> <include name="org/apache/catalina/authenticator/**" /> <exclude name="**/package.html" /> <exclude name="**/LocalStrings_*" /> @@ -165,7 +165,7 @@ </target> <target name="copy" depends="dist" > - <copy file="${cluster.dist}/catalina-cluster.jar" todir="${catalina.build}/lib" /> + <copy file="${oacc.dist}/catalina-oacc.jar" todir="${catalina.build}/lib" /> </target> <!-- ======================== DIST: Clean Directory ===================== --> --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]