remm 2003/11/20 10:41:53
Modified: webapps/balancer build.xml
Removed: webapps/balancer/docs/javadoc allclasses-frame.html
allclasses-noframe.html constant-values.html
deprecated-list.html help-doc.html index-all.html
index.html overview-frame.html
overview-summary.html overview-tree.html
package-list packages.html serialized-form.html
stylesheet.css
webapps/balancer/docs/javadoc/org/apache/webapp/balancer
AcceptEverythingRule.html BalancerFilter.html
BaseRule.html CharacterEncodingRule.html
CompositeRule.html PermissiveCompositeRule.html
RemoteAddressRule.html RequestAttributeRule.html
RequestHeaderRule.html RequestParameterRule.html
Rule.html RuleChain.html RulesParser.html
SessionAttributeRule.html URLStringMatchRule.html
UserRoleRule.html package-frame.html
package-summary.html package-tree.html
package-use.html
webapps/balancer/docs/javadoc/org/apache/webapp/balancer/class-use
AcceptEverythingRule.html BalancerFilter.html
BaseRule.html CharacterEncodingRule.html
CompositeRule.html PermissiveCompositeRule.html
RemoteAddressRule.html RequestAttributeRule.html
RequestHeaderRule.html RequestParameterRule.html
Rule.html RuleChain.html RulesParser.html
SessionAttributeRule.html URLStringMatchRule.html
UserRoleRule.html
webapps/balancer/docs/javadoc/org/apache/webapp/balancer/rules
AcceptEverythingRule.html BaseRule.html
CharacterEncodingRule.html RemoteAddressRule.html
RequestAttributeRule.html RequestHeaderRule.html
RequestParameterRule.html SessionAttributeRule.html
URLStringMatchRule.html UserRoleRule.html
package-frame.html package-summary.html
package-tree.html package-use.html
webapps/balancer/docs/javadoc/org/apache/webapp/balancer/rules/class-use
AcceptEverythingRule.html BaseRule.html
CharacterEncodingRule.html RemoteAddressRule.html
RequestAttributeRule.html RequestHeaderRule.html
RequestParameterRule.html SessionAttributeRule.html
URLStringMatchRule.html UserRoleRule.html
webapps/balancer/docs/javadoc/src-html/org/apache/webapp/balancer
AcceptEverythingRule.html BalancerFilter.html
BaseRule.html CharacterEncodingRule.html
CompositeRule.html PermissiveCompositeRule.html
RemoteAddressRule.html RequestAttributeRule.html
RequestHeaderRule.html RequestParameterRule.html
Rule.html RuleChain.html RulesParser.html
SessionAttributeRule.html URLStringMatchRule.html
UserRoleRule.html
webapps/balancer/docs/javadoc/src-html/org/apache/webapp/balancer/rules
AcceptEverythingRule.html BaseRule.html
CharacterEncodingRule.html RemoteAddressRule.html
RequestAttributeRule.html RequestHeaderRule.html
RequestParameterRule.html SessionAttributeRule.html
URLStringMatchRule.html UserRoleRule.html
webapps/balancer/src/org/apache/webapp/balancer
BalancerFilter.java Rule.java RuleChain.java
RulesParser.java overview.html package.html
webapps/balancer/src/org/apache/webapp/balancer/rules
AcceptEverythingRule.java BaseRule.java
CharacterEncodingRule.java RemoteAddressRule.java
RequestAttributeRule.java RequestHeaderRule.java
RequestParameterRule.java SessionAttributeRule.java
URLStringMatchRule.java UserRoleRule.java
package.html
Log:
- Reformat webapp (part 1).
Revision Changes Path
1.2 +86 -99 jakarta-tomcat-catalina/webapps/balancer/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/jakarta-tomcat-catalina/webapps/balancer/build.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- build.xml 20 Nov 2003 18:17:23 -0000 1.1
+++ build.xml 20 Nov 2003 18:41:52 -0000 1.2
@@ -5,123 +5,110 @@
@author Yoav Shapira
-->
-<project name="balancer" default="compile" basedir=".">
- <!-- The balancer version -->
- <property name="version" value="1.0" />
+<project name="balancer" default="build-main" basedir=".">
- <!-- Source directory -->
- <property name="src" value="src" />
- <!-- The build directory -->
- <property name="build" value="build" />
+ <!-- ===================== Initialize Property Values =================== -->
- <!-- Classes directory -->
- <property name="classes" value="build/classes" />
+ <!-- See "build.properties.sample" 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"/>
+ <property file="${user.home}/build.properties"/>
+
+ <property name="build.compiler" value="classic"/>
+ <property name="webapps.build" value="../build"/>
+ <property name="webapps.dist" value="../dist"/>
+ <property name="webapp.name" value="balancer"/>
+
+ <!-- Dependent JARs and files -->
+ <property name="servlet-api.jar"
value="${api.home}/jsr154/dist/lib/servlet-api.jar"/>
+ <property name="jsp-api.jar" value="${api.home}/jsr152/dist/lib/jsp-api.jar"/>
- <!-- Docs directory -->
- <property name="docs" value="docs" />
+ <!-- Compilation classpath -->
+ <path id="balancer.classpath">
+ <!-- Required by Digester -->
+ <pathelement location="${commons-beanutils.jar}"/>
+ <pathelement location="${commons-collections.jar}"/>
+ <pathelement location="${commons-digester.jar}"/>
+ <pathelement location="${servlet-api.jar}"/>
+ <pathelement location="${commons-logging-api.jar}" />
+ </path>
- <!-- Library directory contains libraries for compilation -->
- <property name="lib" value="lib" />
- <!-- Location for JavaDoc files -->
- <property name="javadocDir" value="${docs}/javadoc" />
+ <!-- =================== BUILD: Create Directories ====================== -->
+ <target name="build-prepare">
+ <mkdir dir="${webapps.build}"/>
+ <mkdir dir="${webapps.build}/${webapp.name}"/>
+ <mkdir dir="${webapps.build}/${webapp.name}/images"/>
+ <mkdir dir="${webapps.build}/${webapp.name}/WEB-INF"/>
+ <mkdir dir="${webapps.build}/${webapp.name}/WEB-INF/classes"/>
+ </target>
- <!-- ProjectViewer jar file name -->
- <property name="jarFileName" value="balancer.jar" />
-
- <!-- ProjectViewer war file name -->
- <property name="warFileName" value="balancer.war" />
- <!-- Debug property for compiling -->
- <property name="debug" value="true" />
+ <!-- ================ BUILD: Copy Static Files ========================== -->
+ <target name="build-static" depends="build-prepare">
+ <copy todir="${webapps.build}/${webapp.name}">
+ <fileset dir=".">
+ <exclude name="build.*"/>
+ </fileset>
+ </copy>
+ </target>
+
- <!-- Deprecation property for compiling -->
- <property name="deprecation" value="false" />
+ <!-- ================= BUILD: Compile Server Components ================= -->
+ <target name="build-main" depends="build-static">
+
+ <javac srcdir="WEB-INF/classes"
+ destdir="${webapps.build}/${webapp.name}/WEB-INF/classes"
+ debug="${compile.debug}" deprecation="${compile.deprecation}"
+ optimize="${compile.optimize}"
+ excludes="**/CVS/**">
+ <classpath refid="balancer.classpath" />
+ </javac>
- <!-- clean target: removes build directory and files. -->
- <target name="clean">
- <delete dir="${build}" />
</target>
- <!-- Compilation classpath -->
- <path id="compilePath">
- <pathelement location="${lib}/servlet.jar" />
- <!-- Required by Digester -->
- <pathelement location="${lib}/commons-beanutils.jar" />
- <pathelement location="${lib}/commons-collections.jar" />
- <pathelement location="${lib}/commons-digester.jar" />
- <pathelement location="${lib}/commons-logging-api.jar" />
- </path>
+ <!-- ==================== BUILD: Rebuild Everything ===================== -->
+ <target name="all" depends="build-clean,build-main"
+ description="Clean and build balancer webapp"/>
- <!-- Ignore environment CLASSPATH -->
- <property name="build.sysclasspath" value="ignore" />
- <!-- compile target: compiles MDD files. -->
- <target name="compile">
- <mkdir dir="${build}" />
- <mkdir dir="${classes}" />
-
- <javac srcdir="${src}"
- destdir="${classes}"
- classpathref="compilePath"
- includes="**/*.java"
- debug="${debug}"
- deprecation="${deprecation}" />
- </target>
-
- <!-- Create the jar file. -->
- <target name="createJar" depends="compile">
- <jar destfile="${build}/${jarFileName}">
- <fileset dir="${classes}">
- <include name="**/*.class"/>
- </fileset>
- </jar>
+ <!-- ======================= BUILD: Clean Directory ===================== -->
+ <target name="build-clean">
+ <delete dir="${webapps.build}/${webapp.name}"/>
</target>
- <!-- Create the WAR file. -->
- <target name="createWar" depends="createJar">
- <war destfile="${build}/${warFileName}"
- webxml="${basedir}/WEB-INF/web.xml">
- <!-- Our jar -->
- <lib dir="${build}">
- <include name="${jarFileName}" />
- </lib>
-
- <!-- Other jars -->
- <lib dir="${lib}">
- <exclude name="servlet.jar" />
- </lib>
-
- <!-- Include the rules configuration file -->
- <zipfileset dir="${basedir}/WEB-INF/config"
- prefix="WEB-INF/config">
- <include name="rules.xml" />
- </zipfileset>
- </war>
- </target>
-
- <!-- dist target: creates the WAR distribution. -->
- <target name="dist" depends="createWar,javadoc">
- <delete file="${ant.project.name}-${version}.zip" />
- <zip destfile="${ant.project.name}-${version}.zip"
- basedir="${basedir}" />
- </target>
-
- <!-- Creates and publishes JavaDocs for MDD Project Viewer -->
- <target name="javadoc">
- <javadoc sourcepath="${src}"
- classpathref="compilePath"
- packagenames="*"
- destdir="${javadocDir}"
- author="true"
- version="true"
- use="true"
- overview="${src}/org/apache/webapp/balancer/overview.html"
- windowtitle="Balancer Webapp Documentation"
- additionalparam="-breakiterator -linksource" />
+
+ <!-- ======================= DIST: Create Directories =================== -->
+ <target name="dist-prepare">
+ <mkdir dir="${webapps.dist}"/>
</target>
+
+
+ <!-- ======================= DIST: Create Distribution Files ============ -->
+ <target name="dist" depends="build-main,dist-prepare"
+ description="Create balancer webapp binary distribution">
+ <jar jarfile="${webapps.dist}/${webapp.name}.war"
+ basedir="${webapps.build}/${webapp.name}" includes="**"/>
+ </target>
+
+
+ <!-- ======================= DIST: Clean Directory ====================== -->
+ <target name="dist-clean">
+ <deltree dir="${dist.dir}/${webapp.name}"/>
+ </target>
+
+
+ <!-- ====================== Convenient Synonyms ========================= -->
+ <target name="clean" depends="build-clean,dist-clean"
+ description="Clean build and dist directories"/>
+
+
+
+
</project>
<!-- End build.xml -->
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]