proyal 2003/02/10 12:42:03
Modified: sevak build.xml
Log:
Patch from Greg Steuck <[EMAIL PROTECTED]> to include the
xinfo for SevakDeployer in the jar
Revision Changes Path
1.24 +42 -32 avalon-apps/sevak/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/avalon-apps/sevak/build.xml,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- build.xml 6 Feb 2003 16:41:58 -0000 1.23
+++ build.xml 10 Feb 2003 20:42:02 -0000 1.24
@@ -24,16 +24,16 @@
<property name="build.dir" value="build"/>
<property name="build.lib" value="${build.dir}/lib"/>
<property name="build.metagenerate" value="${build.dir}/metagenerate"/>
- <property name="build.src" value="${build.dir}/src"/>
+ <property name="build.src" value="${build.dir}/src"/>
<property name="build.classes" value="${build.dir}/classes"/>
- <property name="build.javadocs" value="${build.dir}/javadocs"/>
+ <property name="build.javadocs" value="${build.dir}/javadocs"/>
<property name="build.docs" value="${build.dir}/docs"/>
- <property name="build.context" value="${build.dir}/documentation"/>
+ <property name="build.context" value="${build.dir}/documentation"/>
<property name="build.xdocs" value="${build.context}/content/xdocs"/>
-
+
<!-- Sevak specific properties for building -->
<property name="build.reports" value="${build.dir}/reports"/>
- <property name="build.demoClasses" value="${build.dir}/demoClasses"/>
+ <property name="build.demoClasses" value="${build.dir}/demoClasses"/>
<property name="build.demoMetagenerate" value="${build.dir}/demoMetagenerate"/>
@@ -43,11 +43,11 @@
<property name="manifest.dir" value="${src.dir}/manifest"/>
<property name="conf.dir" value="${src.dir}/conf"/>
<property name="context.dir" value="../../avalon/src/documentation"/>
- <property name="xdocs.dir" value="${src.dir}/xdocs"/>
+ <property name="xdocs.dir" value="${src.dir}/xdocs"/>
<property name="tools.dir" location="../../avalon/tools"/>
-
+
<property name="junit.jar" value="${tools.dir}/lib/junit-3.7.jar"/>
- <property name="tools.jar" value="${java.home}/../lib/tools.jar"/>
+ <property name="tools.jar" value="${java.home}/../lib/tools.jar"/>
<property name="dist.base" value="dist"/>
<property name="do.checkstyle" value="true"/>
@@ -55,8 +55,8 @@
<property name="test.dir" value="${src.dir}/test"/>
<property name="demo.dir" value="${src.dir}/demo"/>
<property name="java.demo.dir" value="${demo.dir}/java"/>
- <property name="conf.demo.dir" value="${demo.dir}/conf"/>
-
+ <property name="conf.demo.dir" value="${demo.dir}/conf"/>
+
<property name="tomcat.jars.dir" value="${lib.dir}/tomcat-jars"/>
<property name="jo.jars.dir" value="${lib.dir}/jo-jars"/>
<property name="jetty.jars.dir" value="${lib.dir}/jetty-jars"/>
@@ -67,16 +67,16 @@
<pathelement path="${build.classes}" />
<fileset dir="../common/lib">
<include name="*.jar" />
- </fileset>
+ </fileset>
<fileset dir="${tomcat.jars.dir}">
<include name="*.jar" />
- </fileset>
+ </fileset>
<fileset dir="${jo.jars.dir}">
<include name="*.jar" />
- </fileset>
+ </fileset>
<fileset dir="${jetty.jars.dir}">
<include name="*.jar" />
- </fileset>
+ </fileset>
</path>
<path id="tools.class.path">
@@ -92,7 +92,7 @@
</fileset>
<pathelement path="${build.lib}/sevak-api.jar"/>
</path>
-
+
<!-- Setup the filters -->
<target name="setup-filters">
<filter token="Name" value="Avalon Apps - ${Name}"/>
@@ -116,28 +116,28 @@
<filter token="PHOENIX_BASE" value="${phoenix.base}"/>
<filter token="CORNERSTONE_BASE" value="${cornerstone.base}"/>
<filter token="LOGKIT_BASE" value="${logkit.base}"/>
- <filter token="TESTLET_BASE" value="${testlet.base}"/>
-
+ <filter token="TESTLET_BASE" value="${testlet.base}"/>
+
</target>
<!-- checking for avalon-framework.jar too here -->
<target name="checkFrameworkClass">
- <available classname="org.apache.avalon.framework.logger.Logger"
classpathref="project.class.path" property="framework.present"/>
+ <available classname="org.apache.avalon.framework.logger.Logger"
classpathref="project.class.path" property="framework.present"/>
</target>
<target name="checkFramework" depends="checkFrameworkClass"
unless="framework.present">
<echo>**********************************</echo>
<echo>***** Please set the ******</echo>
<echo>****${avalon-framework.jar} ******</echo>
- <echo>**********************************</echo>
+ <echo>**********************************</echo>
<fail message="Framework needed. See above."/>
</target>
-
+
<!-- prepare -->
<target name="prepare">
-
+
<available classpathref="project.class.path"
classname="org.apache.catalina.Engine" property="catalina.present"/>
<available classpathref="project.class.path"
classname="com.tagtraum.jo.JoServletService" property="jo.present"/>
<available classpathref="project.class.path"
classname="org.mortbay.jetty.Server" property="jetty.present"/>
@@ -177,10 +177,17 @@
<classpath refid="project.class.path" />
</taskdef>
+ <mkdir dir="${build.metagenerate}/deployer"/>
<mkdir dir="${build.metagenerate}/catalina"/>
<mkdir dir="${build.metagenerate}/jo"/>
<mkdir dir="${build.metagenerate}/jetty"/>
+ <generatemeta dest="${build.metagenerate}/deployer">
+ <fileset dir="${java.dir}">
+ <include name="org/apache/avalon/apps/sevak/blocks/deployer/**/*.java" />
+ </fileset>
+ </generatemeta>
+
<generatemeta dest="${build.metagenerate}/catalina">
<fileset dir="${java.dir}">
<include name="org/apache/avalon/apps/sevak/blocks/catalina/**/*.java" />
@@ -211,6 +218,9 @@
<include name="org/apache/avalon/apps/sevak/*"/>
<include name="org/apache/avalon/apps/sevak/blocks/deployer/*"/>
</fileset>
+ <fileset dir="${build.metagenerate}/deployer">
+ <include name="org/apache/avalon/apps/sevak/blocks/deployer/*.xinfo"/>
+ </fileset>
</jar>
<jar jarfile="${build.lib}/sevak-catalina.jar">
@@ -242,7 +252,7 @@
</target>
-
+
<target name="compile-demo" depends="jars" description="Compiles the Demo Block">
<delete dir="${build.demoClasses}"/>
<delete dir="${build.demoMetaGenerate}"/>
@@ -309,9 +319,9 @@
</target>
- <target name="main" depends="jars" description="Default target to generate build
products minus docs"/>
- <target name="all" depends="main,docs" description="Generate build products
including docs" />
-
+ <target name="main" depends="jars" description="Default target to generate build
products minus docs"/>
+ <target name="all" depends="main,docs" description="Generate build products
including docs" />
+
<!-- CheckStyle tasks-->
<target name="checkstyle" if="do.checkstyle" description="Checkstyle">
@@ -365,7 +375,7 @@
</target>
-
+
<!-- Completely build all dists -->
<target name="dist" description="Generates the distribution">
@@ -421,18 +431,18 @@
<include name="common/lib/cornerstone.jar"/>
<include name="common/lib/phoenix-*"/>
<include name="common/lib/excalibur-i18n*"/>
- </tarfileset>
+ </tarfileset>
</tar>
<gzip zipfile="${dist.base}/${dist.name}-src.tar.gz"
src="${dist.base}/${dist.name}-src.tar"/>
<delete file="${dist.base}/${dist.name}-src.tar"/>
-
+
<delete dir="${dist.name}" />
</target>
- <!-- Creates all the .sar files -->
+ <!-- Creates all the .sar files -->
<target name="bin-dist" depends="all" >
<!-- bin.dist.dir usually set before this target is called -->
@@ -469,14 +479,14 @@
<include name="build.xml"/>
</fileset>
</copy>
-
+
<mkdir dir="${src.dist.dir}/lib"/>
<copy todir="${src.dist.dir}/lib">
<fileset dir="lib">
<include name="**"/>
</fileset>
</copy>
-
+
<fixcrlf srcdir="${src.dist.src}/java" includes="**/*.java" eol="lf"/>
<chmod dir="${src.dist.dir}" perm="go-rwx" />
@@ -498,7 +508,7 @@
</delete>
</target>
-
+
<!--
==========================================================================================
DOCUMENTATION GENERATION
==========================================================================================
-->
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
