<property name="app.name" value="Mir"/>
<property name="deploy.home" value="../${app.name}"/>
- <!-- If you want to use the very good jikes compiler, uncomment this -->
+ <!-- don't use unless your Jikes is >= v1.17 and you know what you are doing -->
<!-- <property name="build.compiler" value="jikes"/>-->
<pathelement path="${deploy.home}"/>
<pathelement path="${deploy.classes}"/>
<pathelement path="source"/>
+ <pathelement path="etc/extrasource"/>
<fileset dir="lib">
<include name="*.jar"/>
</fileset>
<target name="prepare">
<mkdir dir="${deploy.home}"/>
+ <mkdir dir="${deploy.webinf}"/>
+ <mkdir dir="${deploy.classes}"/>
+ <mkdir dir="${deploy.webinf}/log"/>
+
<copy todir="${deploy.home}">
<fileset dir="web"/>
</copy>
- <mkdir dir="${deploy.home}/templates"/>
- <copy todir="${deploy.home}/templates">
+
+ <copy todir="${deploy.webinf}/etc">
+ <fileset dir="etc" excludes="bundles/** web.xml"/>
+ </copy>
+ <copy todir="${deploy.classes}/bundles">
+ <fileset dir="etc/bundles"/>
+ </copy>
+ <copy todir="${deploy.webinf}" file="etc/web.xml"/>
+
+ <copy todir="${deploy.webinf}/templates">
<fileset dir="templates"/>
</copy>
- <mkdir dir="${deploy.home}/src"/>
- <copy todir="${deploy.home}/src">
- <fileset dir="source"/>
+
+ <copy todir="${deploy.classes}/bundles">
+ <fileset dir="bundles"/>
</copy>
- <mkdir dir="${deploy.home}/WEB-INF"/>
- <copy file="etc/web.xml" tofile="${deploy.home}/WEB-INF/web.xml"/>
- <mkdir dir="${deploy.classes}"/>
- <mkdir dir="${deploy.home}/WEB-INF/lib"/>
<copy todir="${deploy.home}/WEB-INF/lib">
<fileset dir="lib">
<exclude name="ant.jar"/>
<exclude name="xerces.jar"/>
+ <exclude name="servlet-2.2.jar"/>
</fileset>
</copy>
- <mkdir dir="${javadoc.home}"/>
- <mkdir dir="${deploy.home}/log"/>
-
</target>
<target name="clean">
<delete dir="${deploy.classes}"/>
- <mkdir dir="${deploy.classes}"/>
+ <mkdir dir="${deploy.classes}"/>
</target>
<srcfileset
dir="source"
includes="**/*.java"/>
+<!-- ML: now why can't this be added?
+ <srcfileset
+ dir="etc/extrasource"
+ includes="**/*.java"/> -->
<srcfileset
dir="lib"
includes="*.jar"/>
dir="${deploy.classes}"
includes="**/*.class"/>
</dependset>
- <javac srcdir="source" destdir="${deploy.classes}"
+ <javac destdir="${deploy.classes}"
debug="on" optimize="off" deprecation="on">
+ <src path="source"/>
+ <src path="etc/extrasource"/>
<classpath refid="project.class.path"/>
</javac>
- <copy todir="${deploy.classes}">
- <fileset dir="source" includes="**/*.properties"/>
- </copy>
- <copy todir="${deploy.home}">
- <fileset dir="source" includes="**/content-types.properties"/>
- <fileset dir="source" includes="**/server.xml"/>
- </copy>
- <copy todir="${deploy.classes}/bundles">
- <fileset dir="bundles" includes="**/*.properties"/>
- </copy>
</target>
<target name="perms">
- <exec executable="./perms.sh"/>
+ <exec executable="./perms.sh"/>
</target>