You are viewing a plain text version of this content. The canonical link for it is here.
Posted to slide-dev@jakarta.apache.org by oz...@apache.org on 2004/01/12 12:38:13 UTC
cvs commit: jakarta-slide build.xml
ozeigermann 2004/01/12 03:38:13
Modified: . build.xml
Log:
Adated to removed source code parts
Revision Changes Path
1.186 +8 -318 jakarta-slide/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/jakarta-slide/build.xml,v
retrieving revision 1.185
retrieving revision 1.186
diff -u -r1.185 -r1.186
--- build.xml 3 Dec 2003 12:04:20 -0000 1.185
+++ build.xml 12 Jan 2004 11:38:13 -0000 1.186
@@ -18,7 +18,7 @@
<!-- Project Properties -->
<!-- =================================================================== -->
<property name="name" value="Jakarta-Slide"/>
- <property name="year" value="2002"/>
+ <property name="year" value="2004"/>
<property name="version" value="2.0.0"/>
<property name="project" value="jakarta-slide"/>
<property name="final.name" value="${project}-${version}"/>
@@ -39,17 +39,12 @@
<property name="ant.jar" value="${ant.lib}/ant.jar"/>
<property name="junit.lib" value="./lib"/>
<property name="junit.jar" value="${junit.lib}/junit.jar"/>
- <property name="jndi.lib" value="./lib"/>
- <property name="jndi.jar" value="${jndi.lib}/jndi.jar"/>
<property name="jta.lib" value="./lib"/>
<property name="jta.jar" value="${jta.lib}/jta.jar"/>
<property name="jdbc20ext.lib" value="./lib"/>
<property name="jdbc20ext.jar" value="${jdbc20ext.lib}/jdbc2_0-stdext.jar"/>
<property name="log4j.lib" value="./lib"/>
<property name="log4j.jar" value="${log4j.lib}/log4j.jar"/>
- <property name="hsqldb.lib" value="./lib"/>
- <property name="hsqldb.jar" value="${hsqldb.lib}/hsqldb.jar"/>
- <property name="hsqldb.license" value="./lib/hsqldb.license"/>
<property name="antlr.jar" value="./lib/antlr.jar"/>
<property name="antlr-tools.jar" value="./lib/antlr-tools.jar"/>
<property name="commons-dbcp.lib" value="./lib"/>
@@ -62,12 +57,6 @@
<property name="naming.jar" value="${catalina.dist}/common/lib/naming-common.jar"/>
<property name="resources.jar" value="${catalina.dist}/common/lib/naming-resources.jar"/>
<property name="catalina.jar" value="${catalina.dist}/server/lib/catalina.jar"/>
- <property name="struts.lib" value="../jakarta-struts/dist/lib"/>
- <property name="struts.jar" value="${struts.lib}/struts.jar"/>
- <property name="jstl.lib" value="../jakarta-taglibs/dist/standard"/>
- <property name="jstl.jar" value="${jstl.lib}/jstl.jar"/>
- <property name="taglibs-standard.lib" value="../jakarta-taglibs/dist/standard"/>
- <property name="taglibs-standard.jar" value="${taglibs-standard.lib}/standard.jar"/>
<property name="commons-httpclient.jar" value="lib/commons-httpclient.jar"/>
<property name="commons-logging.jar" value="lib/commons-logging.jar"/>
<property name="commons-collections.jar" value="lib/commons-collections.jar"/>
@@ -121,15 +110,6 @@
<pathelement location="${jmx.jar}"/>
<pathelement location="${commons-collections.jar}"/>
</path>
- <path id="manager.classpath">
- <pathelement location="${xmlapi.jar}"/>
- <pathelement location="${jaxp.jar}"/>
- <pathelement location="${servlet.jar}"/>
- <pathelement location="${jdom.jar}"/>
- <pathelement location="${jta.jar}"/>
- <pathelement location="${slide.build}/classes"/>
- <pathelement location="${struts.jar}"/>
- </path>
<path id="stores.classpath">
<pathelement location="${xmlapi.jar}"/>
<pathelement location="${jaxp.jar}"/>
@@ -146,7 +126,6 @@
<pathelement location="${jaxp.jar}"/>
<pathelement location="${jmx.jar}"/>
<pathelement location="${xmlapi.jar}"/>
- <pathelement location="${jndi.jar}"/>
<pathelement location="${slide.build}/classes"/>
<pathelement location="${log4j.jar}"/>
<pathelement location="${servlet.jar}"/>
@@ -172,29 +151,6 @@
<pathelement location="${antlr.jar}"/>
<pathelement location="${antlr-tools.jar}"/>
</path>
- <path id="examples.classpath">
- <pathelement location="${xmlapi.jar}"/>
- <pathelement location="${jaxp.jar}"/>
- <pathelement location="${servlet.jar}"/>
- <pathelement location="${jta.jar}"/>
- <pathelement location="${slide.build}/classes"/>
- </path>
- <path id="taglib.classpath">
- <pathelement location="${servlet.jar}"/>
- <pathelement location="${struts.jar}"/>
- <pathelement location="${jstl.jar}"/>
- <pathelement location="${taglibs-standard.jar}"/>
- <pathelement location="${jta.jar}"/>
- <pathelement location="${slide.build}/classes"/>
- </path>
- <path id="admin.classpath">
- <pathelement location="${jaxp.jar}"/>
- <pathelement location="${jta.jar}"/>
- <pathelement location="${servlet.jar}"/>
- <pathelement location="${struts.jar}"/>
- <pathelement location="${slide.build}/classes"/>
- <pathelement location="${xmlapi.jar}"/>
- </path>
<!-- =================================================================== -->
<!-- Test Execution Defaults -->
<!-- =================================================================== -->
@@ -227,7 +183,6 @@
<available property="dom.present" classname="org.w3c.dom.Document" classpath="${xmlapi.jar}"/>
<available property="sax.present" classname="org.xml.sax.helpers.DefaultHandler" classpath="${xmlapi.jar}"/>
<available property="jta.present" classname="javax.transaction.UserTransaction" classpath="${jta.jar}"/>
- <available property="jmx.present" classname="javax.management.MBeanServer" classpath="${jmx.jar}"/>
<available property="modeler.present" classname="org.apache.commons.modeler.Registry" classpath="${commons-modeler.jar}"/>
<available property="antlr.present" classname="antlr.Parser" classpath="${antlr.jar}"/>
<available property="antlr-tools.present" classname="antlr.Tool" classpath="${antlr-tools.jar}"/>
@@ -240,10 +195,6 @@
<available property="catalina.jaxp.present" file="jaxp.jar" filepath="${catalina.dist}/server/lib"/>
<available property="xsl.present" classname="org.apache.tools.ant.taskdefs.optional.TraXLiaison"/>
<available property="jdom.present" classname="org.jdom.Element" classpath="${jdom.jar}"/>
- <available property="struts.present" classname="org.apache.struts.action.ActionError" classpath="${struts.jar}"/>
- <available property="jstl.present" classname="javax.servlet.jsp.jstl.fmt.LocaleSupport" classpath="${jstl.jar}"/>
- <available property="taglibs-standard.present" classname="org.apache.taglibs.standard.lang.support.ExpressionEvaluator" classpath="${taglibs-standard.jar}"/>
- <available property="jndi.present" classname="javax.naming.Context" classpath="${jndi.jar}"/>
<available property="ant.present" classname="org.apache.tools.ant.Task" classpath="${ant.jar}"/>
<available property="naming.present" classname="org.apache.naming.NamingEntry" classpath="${naming.jar}"/>
<available property="resources.present" classname="org.apache.naming.resources.Resource" classpath="${resources.jar}"/>
@@ -286,16 +237,11 @@
<echo message="Optional libraries:"/>
<echo message=" JAXP 1.1 ${jaxp11.present}"/>
<echo message=" JDBC 2.0 optional package ${jdbc20ext.present}"/>
- <echo message=" JMX ${jmx.present}"/>
<echo message=" Commons-Modeler ${modeler.present}"/>
<echo message=" Ant ${ant.present}"/>
<echo message=" Ant <style>-task ${xsl.present}"/>
<echo message=" JUnit ${junit.present}"/>
<echo message=" Log4J ${log4j.present}"/>
- <echo message=" JNDI ${jndi.present}"/>
- <echo message=" Struts (1.0 or later) ${struts.present}"/>
- <echo message=" JSTL 1.0 ${jstl.present}"/>
- <echo message=" Standard Taglib (1.0 or later)${taglibs-standard.present}"/>
<echo message=" Tomcat (4.1 or later) ${catalina.present}"/>
<echo message=" Tomcat naming.jar ${naming.present}"/>
<echo message=" Tomcat resources.jar ${resources.present}"/>
@@ -310,15 +256,10 @@
<echo message=" Commons-Httpclient jar ${commons-httpclient.jar}"/>
<echo message=" ANTLR jar ${antlr.jar}"/>
<echo message=" JDBC 2.0 optional package jar ${jdbc20ext.jar}"/>
- <echo message=" JMX jar ${jmx.jar}"/>
<echo message=" Commons-Modeler jar ${commons-modeler.jar}"/>
<echo message=" Ant jar ${ant.jar}"/>
<echo message=" JUnit jar ${junit.jar}"/>
<echo message=" Log4J jar ${log4j.jar}"/>
- <echo message=" JNDI jar ${jndi.jar}"/>
- <echo message=" Struts jar ${struts.jar}"/>
- <echo message=" JSTL jar ${jstl.jar}"/>
- <echo message=" Standard Taglib jar ${taglibs-standard.jar}"/>
<echo message=" Tomcat 4 dist directory ${catalina.dist}"/>
<echo message=" Tomcat 4 catalina.jar ${catalina.jar}"/>
<echo message=" Tomcat 4 resources.jar ${resources.jar}"/>
@@ -349,7 +290,6 @@
<target name="prepare" depends="detect">
<mkdir dir="${slide.build}"/>
<mkdir dir="${slide.build}/classes"/>
- <mkdir dir="${slide.build}/examples"/>
<mkdir dir="${slide.build}/tests"/>
<mkdir dir="${slide.build}/lib"/>
<mkdir dir="${slide.build}/doc"/>
@@ -373,7 +313,7 @@
<!-- =================================================================== -->
<!-- Build Slide -->
<!-- =================================================================== -->
- <target name="main" depends="util">
+ <target name="main" depends="util" description="Builds Slide's Core">
<echo message="Building Slide Core API"/>
<javac srcdir="src/share" destdir="${slide.build}/classes" debug="${compile.debug}" deprecation="${compile.deprecation}" optimize="${compile.optimize}" excludes="**/CVS/**,**/webdav/**,**/manager/**,**/package.html">
<classpath refid="main.classpath"/>
@@ -571,19 +511,6 @@
<copy todir="${webdavclient.dist}/lib" file="${xmlapi.jar}"/>
</target>
<!-- =================================================================== -->
- <!-- Build some examples -->
- <!-- =================================================================== -->
- <target name="examples" depends="main">
- <javac srcdir="src/examples" destdir="${slide.build}/examples" debug="${compile.debug}" deprecation="${compile.deprecation}" optimize="${compile.optimize}" includes="**/**" excludes="**,**/CVS/**,**/*.xml,**/*.txt">
- <classpath refid="examples.classpath"/>
- </javac>
- <copy todir="${slide.build}/examples">
- <fileset dir="src/examples">
- <exclude name="**/CVS/**"/>
- </fileset>
- </copy>
- </target>
- <!-- =================================================================== -->
<!-- Build some tests -->
<!-- =================================================================== -->
<target name="tests" depends="main, webdav-client-dist" if="junit.present">
@@ -628,7 +555,6 @@
<mkdir dir="${slide.dist}/server"/>
<mkdir dir="${slide.dist}/slide/webapp"/>
<mkdir dir="${slide.dist}/slide/lib"/>
- <mkdir dir="${slide.dist}/slide/examples"/>
<mkdir dir="${slide.dist}/slide/tests"/>
<mkdir dir="${slide.dist}/doc"/>
<mkdir dir="${slide.dist}/slide/wrappers"/>
@@ -636,7 +562,7 @@
<!-- =================================================================== -->
<!-- Build a Slide distribution -->
<!-- =================================================================== -->
- <target name="dist" depends="main,examples,tests,prepare-dist,doc,javadoc,dist-xml" description="Make distribution of core components">
+ <target name="dist" depends="main,tests,prepare-dist,doc,javadoc,dist-xml" description="Make distribution of core components">
<copy file="src/etc/MANIFEST.MF" tofile="${slide.build}/classes/MANIFEST.MF"/>
<replace file="${slide.build}/classes/MANIFEST.MF" token="$$VERSION$$" value="${version}"/>
<copy todir="${slide.build}/classes">
@@ -648,8 +574,7 @@
</fileset>
</copy>
<echo message="Building Slide main JAR file"/>
- <jar jarfile="${slide.dist}/slide/lib/slide-kernel.jar" basedir="${slide.build}/classes" manifest="${slide.build}/classes/MANIFEST.MF" includes="LICENSE,README,CHANGELOG,org/apache/slide/**,org/apache/util/**" excludes="org/apache/slide/webdav/**,org/apache/slide/manager/**,
- org/apache/slide/taglib/**,org/apache/slide/admin/**"/>
+ <jar jarfile="${slide.dist}/slide/lib/slide-kernel.jar" basedir="${slide.build}/classes" manifest="${slide.build}/classes/MANIFEST.MF" includes="LICENSE,README,CHANGELOG,org/apache/slide/**,org/apache/util/**" excludes="org/apache/slide/webdav/**"/>
<echo message="Building Slide Standard Stores JAR file"/>
<jar jarfile="${slide.dist}/slide/lib/slide-stores.jar" basedir="${slide.build}/classes" manifest="${slide.build}/classes/MANIFEST.MF" includes="LICENSE,README,CHANGELOG,slidestore/**,org/apache/slide/store/impl/**,org/apache/slide/store/util/**,org/apache/slide/store/txfile/**"/>
<echo message="Building Default Roles JAR file"/>
@@ -668,10 +593,6 @@
<include name="RELEASE-INFO"/>
</fileset>
</copy>
- <echo message="Copying examples"/>
- <copy todir="${slide.dist}/slide/examples">
- <fileset dir="${slide.build}/examples"/>
- </copy>
<echo message="Copying tests"/>
<copy todir="${slide.dist}/slide/tests">
<fileset dir="${slide.build}/tests"/>
@@ -693,13 +614,6 @@
<!-- =================================================================== -->
<target name="webapp-dist" depends="dist">
<filter token="AUTH" value="${authenticate}"/>
- <copy todir="${slide.dist}/slide/conf" filtering="true" overwrite="yes">
- <fileset dir="src/conf/webapp">
- <include name="web.xml"/>
- <include name="slide.properties"/>
- <include name="log4j.properties"/>
- </fileset>
- </copy>
<war warfile="${webapp.dist}/slide.war" webxml="${slide.dist}/slide/conf/web.xml">
<fileset dir="src/conf/webapp">
<include name="**/Domain.xml"/>
@@ -708,9 +622,6 @@
<exclude name="antlr*.jar"/>
<exclude name="slide-taglib*.jar"/>
</lib>
- <classes dir="${slide.dist}/slide/conf">
- <include name="log4j.properties"/>
- </classes>
</war>
<war warfile="${webapp.dist}/slide-doc.war" webxml="src/conf/webapp/webdoc.xml">
<fileset dir="${slide.dist}/doc">
@@ -718,204 +629,16 @@
</war>
</target>
<!-- =================================================================== -->
- <!-- Slide Tag Library targets -->
- <!-- =================================================================== -->
- <!-- Prepare tag libraries -->
- <target name="taglib-prepare" depends="prepare,main">
- <mkdir dir="${slide.build}/doc/taglib-javadoc"/>
- </target>
- <!-- Build common tag library classes -->
- <target name="taglib-common-compile" depends="taglib-prepare">
- <echo message="Compiling common tag library classes..."/>
- <javac srcdir="src/taglib/common" destdir="${slide.build}/classes" debug="${compile.debug}" deprecation="${compile.deprecation}" optimize="${compile.optimize}" excludes="**/CVS/**,**/package.html">
- <classpath refid="taglib.classpath"/>
- </javac>
- </target>
- <!-- Build common tag library classes JAR file -->
- <target name="taglib-common-jar" depends="prepare-dist,taglib-common-compile">
- <echo message="Building tag libraries common JAR..."/>
- <copy file="src/etc/MANIFEST.MF" tofile="${slide.build}/classes/MANIFEST.MF"/>
- <replace file="${slide.build}/classes/MANIFEST.MF" token="$$VERSION$$" value="${version}"/>
- <jar jarfile="${slide.dist}/slide/lib/slide-taglib-common.jar" basedir="${slide.build}/classes" manifest="${slide.build}/classes/MANIFEST.MF" includes="**/taglib/bean/*.*,**/taglib/tag/*.*,**/taglib/util/*.*" excludes="**/struts/**"/>
- </target>
- <!-- Build JSTL based tag library classes -->
- <target name="taglib-jstl-compile" depends="taglib-common-compile" if="jstl.present">
- <echo message="Compiling JSTL based tag library classes..."/>
- <javac srcdir="src/taglib/jstl" destdir="${slide.build}/classes" debug="${compile.debug}" deprecation="${compile.deprecation}" optimize="${compile.optimize}" excludes="**/CVS/**,**/package.html">
- <classpath refid="taglib.classpath"/>
- </javac>
- </target>
- <!-- Make JSTL based tag library distribution -->
- <target name="taglib-jstl-jar" depends="prepare-dist,taglib-jstl-compile" if="jstl.present">
- <echo message="Building the JSTL based tag library JAR..."/>
- <copy file="src/etc/MANIFEST.MF" tofile="${slide.build}/classes/MANIFEST.MF"/>
- <replace file="${slide.build}/classes/MANIFEST.MF" token="$$VERSION$$" value="${version}"/>
- <jar jarfile="${slide.dist}/slide/lib/slide-taglib-jstl.jar" basedir="${slide.build}/classes" manifest="${slide.build}/classes/MANIFEST.MF" includes="**/taglib/tag/jstl/*.*" excludes="**/bean/*.*,**/tag/*.*,**/struts/*.*">
- <metainf dir="src/taglib" includes="slide-jstl.tld"/>
- </jar>
- </target>
- <!-- Build Struts based tag library classes -->
- <target name="taglib-struts-compile" depends="taglib-common-compile" if="struts.present">
- <echo message="Compiling Struts based tag library classes..."/>
- <javac srcdir="src/taglib/struts" destdir="${slide.build}/classes" debug="${compile.debug}" deprecation="${compile.deprecation}" optimize="${compile.optimize}" excludes="**/CVS/**,**/package.html">
- <classpath refid="taglib.classpath"/>
- </javac>
- </target>
- <!-- Make Struts based tag library distribution -->
- <target name="taglib-struts-jar" depends="prepare-dist,taglib-struts-compile" if="struts.present">
- <echo message="Building the Struts based tag library JAR..."/>
- <copy file="src/etc/MANIFEST.MF" tofile="${slide.build}/classes/MANIFEST.MF"/>
- <replace file="${slide.build}/classes/MANIFEST.MF" token="$$VERSION$$" value="${version}"/>
- <jar jarfile="${slide.dist}/slide/lib/slide-taglib-struts.jar" basedir="${slide.build}/classes" manifest="${slide.build}/classes/MANIFEST.MF" includes="**/taglib/tag/struts/*.*" excludes="**/bean/*.*,**/tag/*.*,**/jstl/*.*">
- <metainf dir="src/taglib" includes="slide-struts.tld"/>
- </jar>
- </target>
- <!-- Generate JavaDocs for the tag library components -->
- <target name="taglib-javadoc" unless="skip.javadoc" depends="taglib-prepare">
- <echo message="Generating the tag libraries API documentation..."/>
- <property name="copyright" value=""/>
- <javadoc destdir="${slide.build}/doc/taglib-javadoc" doctitle="Slide ${version} Tag Library API Documentation" windowtitle="Slide ${version} Tag Library API Documentation" package="true" noindex="false" author="true" version="true" packagenames="org.apache.slide.taglib.*">
- <sourcepath>
- <pathelement location="src/taglib/common"/>
- <pathelement location="src/taglib/jstl"/>
- <pathelement location="src/taglib/struts"/>
- <pathelement location="src/taglib/jstl"/>
- </sourcepath>
- <classpath refid="taglib.classpath"/>
- </javadoc>
- </target>
- <!-- Make tag libraries distribution -->
- <target name="taglib-dist" depends="taglib-common-jar,taglib-jstl-jar,taglib-struts-jar,taglib-javadoc" description="Build the Slide tag library JARs">
- <copy todir="${slide.dist}/doc/taglib-javadoc">
- <fileset dir="${slide.build}/doc/taglib-javadoc"/>
- </copy>
- </target>
- <!-- =================================================================== -->
- <!-- Tag Libraries Examples Web Application -->
- <!-- =================================================================== -->
- <!-- Prepare taglib examples web-app -->
- <target name="taglib-examples-dist-prepare" depends="taglib-common-jar">
- <mkdir dir="${slide.build}/webapps/slide-taglib-examples"/>
- <copy todir="${slide.build}/webapps/slide-taglib-examples">
- <fileset dir="web/taglib-examples"/>
- </copy>
- <copy todir="${slide.build}/webapps/slide-taglib-examples">
- <fileset dir="web/taglib-examples">
- <include name="*.jsp"/>
- </fileset>
- <mapper type="glob" from="*.jsp" to="*.txt"/>
- </copy>
- <mkdir dir="${slide.build}/webapps/slide-taglib-examples/WEB-INF/lib"/>
- <copy file="${slide.dist}/slide/lib/slide-taglib-common.jar" todir="${slide.build}/webapps/slide-taglib-examples/WEB-INF/lib"/>
- </target>
- <!-- Prepare JSTL portion of the taglib examples web-app -->
- <target name="taglib-examples-dist-jstl-prepare" depends="taglib-examples-dist-prepare,taglib-jstl-jar" if="jstl.present">
- <copy file="${slide.dist}/slide/lib/slide-taglib-jstl.jar" todir="${slide.build}/webapps/slide-taglib-examples/WEB-INF/lib"/>
- <copy file="${jstl.jar}" todir="${slide.build}/webapps/slide-taglib-examples/WEB-INF/lib"/>
- <copy file="src/taglib/slide-jstl.tld" todir="${slide.build}/webapps/slide-taglib-examples/WEB-INF"/>
- </target>
- <!-- Prepare Struts portion of the taglib examples web-app -->
- <target name="taglib-examples-dist-struts-prepare" depends="taglib-examples-dist-prepare,taglib-struts-jar" if="struts.present">
- <copy file="${slide.dist}/slide/lib/slide-taglib-struts.jar" todir="${slide.build}/webapps/slide-taglib-examples/WEB-INF/lib"/>
- <copy file="${struts.jar}" todir="${slide.build}/webapps/slide-taglib-examples/WEB-INF/lib"/>
- <copy file="src/taglib/slide-struts.tld" todir="${slide.build}/webapps/slide-taglib-examples/WEB-INF"/>
- <copy todir="${slide.build}/webapps/slide-taglib-examples/WEB-INF">
- <fileset dir="${struts.lib}">
- <include name="struts-bean.tld"/>
- <include name="struts-html.tld"/>
- <include name="struts-logic.tld"/>
- <include name="struts-template.tld"/>
- </fileset>
- </copy>
- </target>
- <!-- Make taglib examples webapp distribution -->
- <target name="taglib-examples-dist" depends="taglib-examples-dist-jstl-prepare,taglib-examples-dist-struts-prepare" description="Build the Tag Libraries Examples Webapp">
- <echo message="Building Tag Libraries Examples Webapp..."/>
- <jar jarfile="${webapp.dist}/slide-taglib-examples.war" basedir="${slide.build}/webapps/slide-taglib-examples">
- </jar>
- </target>
- <!-- =================================================================== -->
- <!-- Administration Web Application -->
- <!-- =================================================================== -->
- <!-- Prepare build of the admin-webapp -->
- <target name="admin-compile-prepare" depends="prepare" if="struts.present">
- <mkdir dir="${slide.build}/webapps/slide-admin"/>
- <mkdir dir="${slide.build}/webapps/slide-admin"/>
- <mkdir dir="${slide.build}/webapps/slide-admin/WEB-INF/lib"/>
- <mkdir dir="${slide.build}/doc/admin-javadoc"/>
- </target>
- <!-- Build the admin-webapp -->
- <target name="admin-compile" depends="main,admin-compile-prepare,taglib-common-compile" if="struts.present">
- <echo message="Compiling admin web-app classes..."/>
- <javac srcdir="src/admin" destdir="${slide.build}/classes" debug="${compile.debug}" deprecation="${compile.deprecation}" optimize="${compile.optimize}" excludes="**/CVS/**,**/package.html">
- <classpath refid="admin.classpath"/>
- </javac>
- </target>
- <!-- Prepare distribution of the admin-webapp -->
- <target name="admin-dist-prepare" depends="taglib-common-jar,taglib-struts-jar,admin-compile" if="struts.present">
- <copy todir="${slide.build}/webapps/slide-admin">
- <fileset dir="web/admin"/>
- </copy>
- <jar jarfile="${slide.build}/webapps/slide-admin/WEB-INF/lib/slide-admin.jar" basedir="${slide.build}/classes" includes="org/apache/slide/admin/**"/>
- <copy file="${slide.dist}/slide/lib/slide-taglib-common.jar" todir="${slide.build}/webapps/slide-admin/WEB-INF/lib"/>
- <copy file="${slide.dist}/slide/lib/slide-taglib-struts.jar" todir="${slide.build}/webapps/slide-admin/WEB-INF/lib"/>
- <copy file="${struts.jar}" todir="${slide.build}/webapps/slide-admin/WEB-INF/lib"/>
- <copy file="src/taglib/slide-struts.tld" todir="${slide.build}/webapps/slide-admin/WEB-INF"/>
- <copy todir="${slide.build}/webapps/slide-admin/WEB-INF">
- <fileset dir="${struts.lib}">
- <include name="struts-bean.tld"/>
- <include name="struts-html.tld"/>
- <include name="struts-logic.tld"/>
- </fileset>
- </copy>
- </target>
- <!-- Generate JavaDocs for the admin-webapp -->
- <target name="admin-javadoc" unless="skip.javadoc" depends="admin-compile-prepare">
- <echo message="Generating API documentation of the Admin Webapp..."/>
- <property name="copyright" value=""/>
- <javadoc destdir="${slide.build}/doc/admin-javadoc" doctitle="Slide ${version} Admin Webapp API Documentation" windowtitle="Slide Admin Webapp API Documentation" package="true" noindex="false" author="true" version="true" packagenames="org.apache.slide.admin.*">
- <sourcepath>
- <pathelement location="src/admin"/>
- </sourcepath>
- <classpath refid="admin.classpath"/>
- </javadoc>
- </target>
- <!-- Make admin-webapp distribution -->
- <target name="admin-dist" depends="admin-dist-prepare" if="struts.present" description="Build the Adminstration Webapp (Struts required)">
- <echo message="Building Admin Webapp Archive..."/>
- <jar jarfile="${webapp.dist}/slide-admin.war" basedir="${slide.build}/webapps/slide-admin">
- </jar>
- </target>
- <!-- =================================================================== -->
- <!-- Build an Avalon wrapper -->
+ <!-- Build wrappers -->
<!-- =================================================================== -->
<target name="wrappers" depends="main">
<javac srcdir="src/wrappers" destdir="${slide.build}/classes" debug="${compile.debug}" deprecation="${compile.deprecation}" optimize="${compile.optimize}" includes="**" excludes="**/CVS/**">
<classpath refid="wrappers.classpath"/>
<exclude name="**/catalina/**" unless="catalina.present"/>
<exclude name="**/log4j/**" unless="log4j.present"/>
- <exclude name="**/jndi/**" unless="catalina.present"/>
- <exclude name="**/jmx/**" unless="jmx.present"/>
</javac>
</target>
<!-- =================================================================== -->
- <!-- Build JNDI related components -->
- <!-- This target requires the JNDI libraries -->
- <!-- =================================================================== -->
- <target name="jndi-wrapper" depends="wrappers" if="catalina.present">
- <jar jarfile="${slide.dist}/slide/wrappers/slide-jndiwrapper.jar" basedir="${slide.build}/classes" manifest="${slide.build}/classes/MANIFEST.MF" includes="LICENSE,README,CHANGELOG,**/wrappers/jndi/**"/>
- </target>
- <!-- =================================================================== -->
- <!-- Build JMX related components -->
- <!-- This target requires the JMX libraries -->
- <!-- =================================================================== -->
- <target name="jmx-wrapper" depends="wrappers" if="jmx.present">
- <copy file="src/wrappers/wrappers/jmx/mbeans-descriptors.xml" tofile="${slide.build}/classes/wrappers/jmx/mbeans-descriptors.xml"/>
- <jar jarfile="${slide.dist}/slide/wrappers/slide-jmxwrapper.jar" basedir="${slide.build}/classes" manifest="${slide.build}/classes/MANIFEST.MF">
- <include name="wrappers/jmx/**"/>
- </jar>
- </target>
- <!-- =================================================================== -->
<!-- Build Catalina related components -->
<!-- This target requires Tomcat 4.0 -->
<!-- =================================================================== -->
@@ -957,7 +680,7 @@
<!-- Build Catalina-based dedicated CMS -->
<!-- This target requires Tomcat 4.0 -->
<!-- =================================================================== -->
- <target name="catalina-dist" depends="catalina-wrapper, jndi-wrapper, jmx-wrapper" if="catalina.present">
+ <target name="catalina-dist" depends="catalina-wrapper" if="catalina.present">
<copy todir="${slide.dist}/server">
<fileset dir="${catalina.dist}">
<exclude name="webapps/**"/>
@@ -983,37 +706,12 @@
</fileset>
</copy>
<copy file="${slide.dist}/slide/wrappers/slide-catalinawrapper.jar" tofile="${slide.dist}/server/server/lib/slide-catalinawrapper.jar"/>
- <copy file="${slide.dist}/slide/wrappers/slide-jndiwrapper.jar" tofile="${slide.dist}/server/server/lib/slide-jndiwrapper.jar"/>
- <copy file="${slide.dist}/slide/wrappers/slide-jmxwrapper.jar" tofile="${slide.dist}/server/server/lib/slide-jmxwrapper.jar"/>
- <copy file="src/wrappers/wrappers/catalina/server.xml" tofile="${slide.dist}/server/conf/server.xml" overwrite="yes"/>
- <copy todir="${slide.dist}/server/conf">
- <fileset dir="src/wrappers/wrappers/catalina/conf">
- </fileset>
- </copy>
<mkdir dir="${slide.dist}/server/webapps"/>
<mkdir dir="${slide.dist}/server/logs"/>
<mkdir dir="${slide.dist}/server/work"/>
<mkdir dir="${slide.dist}/server/blank"/>
<mkdir dir="${slide.dist}/server/slide"/>
<mkdir dir="${slide.dist}/server/temp"/>
- <!-- Welcome web application -->
- <war warfile="${slide.dist}/server/slide/slide-welcome.war" webxml="src/wrappers/wrappers/catalina/root/WEB-INF/web.xml" basedir="src/wrappers/wrappers/catalina/root">
- <zipfileset dir="${struts.lib}" prefix="WEB-INF">
- <include name="struts-bean.tld"/>
- <include name="struts-html.tld"/>
- <include name="struts-logic.tld"/>
- </zipfileset>
- <zipfileset dir="src/taglib" prefix="WEB-INF">
- <include name="slide-struts.tld"/>
- </zipfileset>
- <zipfileset dir="${slide.dist}/slide/lib" prefix="WEB-INF/lib">
- <include name="slide-taglib-struts.jar"/>
- <include name="slide-taglib-common.jar"/>
- </zipfileset>
- <zipfileset dir="${struts.lib}" prefix="WEB-INF/lib">
- <include name="struts.jar"/>
- </zipfileset>
- </war>
<!-- Catalina documentation -->
<war warfile="${slide.dist}/server/webapps/tomcat-doc.war" webxml="${catalina.dist}/webapps/tomcat-docs/WEB-INF/web.xml">
<zipfileset dir="${catalina.dist}/webapps/tomcat-docs">
@@ -1021,14 +719,6 @@
</war>
<!-- Slide documentation -->
<copy file="${slide.dist}/slide/webapp/slide-doc.war" tofile="${slide.dist}/server/webapps/slide-doc.war"/>
- <!-- WebDAV view of the server -->
- <war warfile="${slide.dist}/server/slide/slide-webdav.war" webxml="src/wrappers/wrappers/catalina/web.xml">
- </war>
- <!-- Slide manager -->
- <copy file="${slide.dist}/slide/webapp/slide-admin.war" tofile="${slide.dist}/server/slide/slide-admin.war"/>
- <!-- hSQL DB -->
- <copy file="${hsqldb.jar}" tofile="${slide.dist}/server/common/lib/hsqldb.jar"/>
- <copy file="${hsqldb.license}" tofile="${slide.dist}/server/common/lib/hsqldb.license"/>
</target>
<!-- =================================================================== -->
<!-- Testsuite build, distribution & package -->
@@ -1050,8 +740,8 @@
<!-- =================================================================== -->
<!-- Full distribution -->
<!-- =================================================================== -->
- <target name="full-dist" depends="dist, webdav-client-dist, webapp-dist,admin-dist,catalina-wrapper,
- catalina-dist, log4j-wrapper, jndi-wrapper,jmx-wrapper, testsuite-dist" description="Make a full distribution (with all optional components)"/>
+ <target name="full-dist" depends="dist, webdav-client-dist, webapp-dist,catalina-wrapper,
+ catalina-dist, log4j-wrapper, testsuite-dist" description="Make a full distribution (with all optional components)"/>
<!-- =================================================================== -->
<!-- Packages the distribution with ZIP -->
<!-- =================================================================== -->
---------------------------------------------------------------------
To unsubscribe, e-mail: slide-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: slide-dev-help@jakarta.apache.org