You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@avalon.apache.org by co...@apache.org on 2002/04/17 09:30:56 UTC
cvs commit: jakarta-avalon-apps/ftpserver build.xml
colus 02/04/17 00:30:56
Modified: ftpserver build.xml
Log:
Use sar task.
Revision Changes Path
1.31 +44 -48 jakarta-avalon-apps/ftpserver/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/jakarta-avalon-apps/ftpserver/build.xml,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- build.xml 28 Mar 2002 11:47:40 -0000 1.30
+++ build.xml 17 Apr 2002 07:30:56 -0000 1.31
@@ -8,7 +8,7 @@
==============================================================================
-->
-<project default="main" basedir=".">
+<project name="FTP Server" default="main" basedir=".">
<!--
Give user a chance to override without editing this file
@@ -48,7 +48,7 @@
<property name="install.lib.dir" value="${install.dir}/lib"/>
<property name="install.data.dir" value="${install.dir}/conf"/>
<property name="install.doc.dir" value="${install.dir}/docs"/>
-
+
<!--
===================================================================
@@ -62,7 +62,7 @@
<property name="build.javadocs" value="${build.dir}/javadocs"/>
<property name="build.docs" value="${build.dir}/docs"/>
<property name="build.xdocs" value="${build.dir}/xdocs"/>
- <property name="build.context" value="${build.dir}/documentation"/>
+ <property name="build.context" value="${build.dir}/documentation"/>
<!--
===================================================================
@@ -73,13 +73,13 @@
<property name="java.dir" value="${src.dir}/java"/>
<property name="manifest.dir" value="${src.dir}/manifest"/>
<property name="conf.dir" value="${src.dir}/conf"/>
- <property name="tools.dir" location="../../jakarta-avalon/tools"/>
+ <property name="tools.dir" location="../../jakarta-avalon/tools"/>
<property name="docs.dir" value="docs"/>
<property name="javadocs.dir" value="${docs.dir}/api"/>
<property name="xdocs.dir" value="${src.dir}/xdocs"/>
- <property name="context.dir" value="../../jakarta-avalon/src/documentation"/>
+ <property name="context.dir" value="../../jakarta-avalon/src/documentation"/>
<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.name" value="${Name}-${version}"/>
<property name="dist.base" value="distributions"/>
@@ -89,7 +89,7 @@
<pathelement path="../../build/classes" />
<fileset dir="lib">
<include name="*.jar" />
- </fileset>
+ </fileset>
</path>
<path id="test.path">
@@ -103,6 +103,10 @@
<fileset dir="${tools.dir}/ext"/>
</path>
+ <taskdef name="sar" classname="org.apache.avalon.phoenix.tools.tasks.Sar">
+ <classpath refid="project.class.path" />
+ </taskdef>
+
<!--
===================================================================
Help on usage
@@ -157,7 +161,7 @@
Prepares the build directory
===================================================================
-->
-
+
<!-- Setup the filters -->
<target name="setup-filters">
@@ -184,8 +188,8 @@
<filter token="LOGKIT_BASE" value="${logkit.base}"/>
<filter token="TESTLET_BASE" value="${testlet.base}"/>
</target>
-
-
+
+
<!--===============================================-->
<!-- compile all java files and copy all resources -->
<!--===============================================-->
@@ -203,14 +207,14 @@
<rmic base="${build.classes}" classpathref="project.class.path" classname="org.apache.avalon.ftpserver.remote.RemoteHandler" />
<rmic base="${build.classes}" classpathref="project.class.path" classname="org.apache.avalon.ftpserver.remote.FtpConfig" />
- <rmic base="${build.classes}" classpathref="project.class.path" classname="org.apache.avalon.ftpserver.remote.ConnectionService" />
+ <rmic base="${build.classes}" classpathref="project.class.path" classname="org.apache.avalon.ftpserver.remote.ConnectionService" />
<rmic base="${build.classes}" classpathref="project.class.path" classname="org.apache.avalon.ftpserver.remote.FtpStatistics" />
<rmic base="${build.classes}" classpathref="project.class.path" classname="org.apache.avalon.ftpserver.remote.IpRestrictor" />
<rmic base="${build.classes}" classpathref="project.class.path" classname="org.apache.avalon.ftpserver.remote.UserManager" />
<rmic base="${build.classes}" classpathref="project.class.path" classname="org.apache.avalon.ftpserver.gui.remote.FtpConnectionObserverAdapter" />
<rmic base="${build.classes}" classpathref="project.class.path" classname="org.apache.avalon.ftpserver.gui.remote.FtpFileListenerAdapter" />
<rmic base="${build.classes}" classpathref="project.class.path" classname="org.apache.avalon.ftpserver.gui.remote.FtpStatisticsListenerAdapter" />
- <rmic base="${build.classes}" classpathref="project.class.path" classname="org.apache.avalon.ftpserver.gui.remote.SpyConnectionAdapter" />
+ <rmic base="${build.classes}" classpathref="project.class.path" classname="org.apache.avalon.ftpserver.gui.remote.SpyConnectionAdapter" />
<copy todir="${build.classes}">
<fileset dir="${java.dir}">
@@ -225,12 +229,12 @@
<!--==============================-->
<!-- create all jar files -->
<!--==============================-->
- <target name="main" depends="sars" description="Default target to generate build products minus docs"/>
+ <target name="main" depends="sars" description="Default target to generate build products minus docs"/>
<target name="all" depends="compile" description="Generates all the FtpServer jar/bar/sar files"/>
<target name="sars" depends="compile">
<mkdir dir="${build.lib}"/>
-
+
<!-- remote admin jar file -->
<jar jarfile="${build.lib}/ftp-admin.jar" manifest="${manifest.dir}/ftp-admin.mf">
<fileset dir="${build.classes}">
@@ -240,39 +244,31 @@
<include name="**/usermanager/User.class"/>
<include name="**/usermanager/UserManagerInterface.class"/>
<include name="**/ip/IpRestrictorInterface.class"/>
- <include name="**/util/*"/>
+ <include name="**/util/*"/>
</fileset>
- </jar>
+ </jar>
<!-- jar file -->
<jar jarfile="${build.lib}/${jar.name}.jar"
manifest="${manifest.dir}/${jar.name}.mf">
- <fileset dir="${build.classes}" excludes="**/gui/*"/>
+ <fileset dir="${build.classes}" excludes="**/gui/*"/>
</jar>
<!-- sar file -->
- <jar jarfile="${build.lib}/${jar.name}.sar">
+ <sar sarfile="${build.lib}/${jar.name}.sar"
+ config="${conf.dir}/ftp-config.xml"
+ environment="${conf.dir}/ftp-environment.xml"
+ assembly="${conf.dir}/ftp-assembly.xml" >
- <zipfileset dir="${build.lib}/" prefix="SAR-INF/lib">
+ <lib dir="${build.lib}/">
<include name="${jar.name}.jar"/>
- </zipfileset>
+ </lib>
- <zipfileset dir="lib/" prefix="SAR-INF/lib">
+ <lib dir="lib">
<include name="cornerstone.jar"/>
- </zipfileset>
+ </lib>
- <zipfileset dir="${conf.dir}" fullpath="SAR-INF/assembly.xml">
- <include name="ftp-assembly.xml"/>
- </zipfileset>
-
- <zipfileset dir="${conf.dir}" fullpath="SAR-INF/environment.xml">
- <include name="ftp-environment.xml"/>
- </zipfileset>
-
- <zipfileset dir="${conf.dir}" fullpath="SAR-INF/config.xml">
- <include name="ftp-config.xml"/>
- </zipfileset>
- </jar>
+ </sar>
<mkdir dir="dist"/>
@@ -364,21 +360,21 @@
<fileset dir="${build.docs}">
<include name="**"/>
</fileset>
- </copy>
-
+ </copy>
+
</target>
-
- <target name="site" depends="docs" description=" Places Docs ready for hosting on website">
-
- <mkdir dir="../site/docs/apps/ftpserver"/>
+
+ <target name="site" depends="docs" description=" Places Docs ready for hosting on website">
+
+ <mkdir dir="../site/docs/apps/ftpserver"/>
<copy todir="../site/docs/apps/ftpserver">
<fileset dir="docs">
<include name="**"/>
</fileset>
- </copy>
-
- </target>
-
+ </copy>
+
+ </target>
+
<target name="printerdocs" depends="javadocs">
@@ -464,7 +460,7 @@
===================================================================
-->
<target name="install" depends="main,check-phoenix" description="Installs FtpServer into Phoenix">
- <echo message="Installing ${jar.name}.sar to ${install.dir}" />
+ <echo message="Installing ${jar.name}.sar to ${install.dir}" />
<delete file="${installvar.dir}/${jar.name}-install.log" />
<delete file="${install.dir}/${jar.name}/SAR-INF/lib/${jar.name}.jar" />
<delete dir="${install.dir}/${jar.name}" />
@@ -473,7 +469,7 @@
<include name="${jar.name}.sar"/>
</fileset>
</copy>
- <echo message="Installed" />
+ <echo message="Installed" />
</target>
<target name="check-phoenix" unless="phoenix.apps">
@@ -486,9 +482,9 @@
</target>
<target name="admintest" depends="main" description="Launches the Swing Admin test client">
- <java classname="org.apache.avalon.ftpserver.gui.FtpAdminFrame" fork="true">
+ <java classname="org.apache.avalon.ftpserver.gui.FtpAdminFrame" fork="true">
<classpath refid="test.path"/>
- </java>
+ </java>
</target>
--
To unsubscribe, e-mail: <ma...@jakarta.apache.org>
For additional commands, e-mail: <ma...@jakarta.apache.org>