You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by sc...@apache.org on 2005/06/28 16:02:43 UTC
svn commit: r202191 - /myfaces/build/trunk/build.xml
Author: schof
Date: Tue Jun 28 07:02:41 2005
New Revision: 202191
URL: http://svn.apache.org/viewcvs?rev=202191&view=rev
Log:
more progress on building the examples
Modified:
myfaces/build/trunk/build.xml
Modified: myfaces/build/trunk/build.xml
URL: http://svn.apache.org/viewcvs/myfaces/build/trunk/build.xml?rev=202191&r1=202190&r2=202191&view=diff
==============================================================================
--- myfaces/build/trunk/build.xml (original)
+++ myfaces/build/trunk/build.xml Tue Jun 28 07:02:41 2005
@@ -120,18 +120,20 @@
should be a reference to a locally built
copy.
-->
+
+ <!-- Default values for unspecified properties -->
+ <property name="javac.debug" value="on"/>
+ <property name="javac.optimize" value="off"/>
+ <property name="share.src.dir" location="${basedir}/../../share/src/java"/>
+
<property file="../build.properties"/>
<property file="../manfiest.properties"/>
<!-- Load local and user build preferences -->
<property file="build.local.properties"/>
+ <property file="../../build/build.local.properties"/>
<property file="${user.home}/build.properties"/>
- <!-- Default values for unspecified properties -->
- <property name="javac.debug" value="on"/>
- <property name="javac.optimize" value="off"/>
- <property name="share.src.dir" location="${basedir}/../share/src/java"/>
-
<!--
Default values for unspecified subproject properties (keeps build from crashing
if subproject doesn't need/specify them)
@@ -384,6 +386,7 @@
<property name="jsf-impl.jar" location="${basedir}/../impl/build/dist/myfaces-impl.jar"/>
<property name="api.classes.dir" location="${basedir}/../api/build/temp/classes/"/>
<property name="tomahawk.jar" location="${basedir}/../tomahawk/build/dist/tomahawk.jar"/>
+ <property name="share.src.dir" location="${basedir}/../share/src/java"/>
<property file="${basedir}/../${subproject}/build.properties"/>
<property file="${basedir}/../${subproject}/manifest.properties"/>
</ant>
@@ -402,6 +405,9 @@
<ant target="subproject">
<property name="subproject" value="tomahawk"/>
</ant>
+ <ant target="subproject">
+ <property name="subproject" value="examples"/>
+ </ant>
</target>
<!--
@@ -416,7 +422,7 @@
<!--
Compile current subproject
-->
- <target name="compile">
+ <target name="compile" if="src.dir">
<!--
<property name="cp" refid="compile.classpath"/>
<echo message="cp = ${cp}"/>
@@ -440,10 +446,12 @@
<!--
Examples subproject needs to be handled specially
-->
+ <!--
<ant target="subproject">
<property name="subproject" value="examples"/>
<property name="target" value="clean"/>
</ant>
+ -->
</target>
<!--
@@ -466,7 +474,7 @@
<!--
Jar current subproject.
-->
- <target name="jar" depends="compile,resolve-tld-entities">
+ <target name="jar" depends="compile,resolve-tld-entities" if="jar.file">
<mkdir dir="${dist.dir}"/>
@@ -587,62 +595,86 @@
<!--
Examples subproject needs to be handled specially
-->
+ <!--
<ant target="subproject">
<property name="subproject" value="examples"/>
<property name="target" value="dist-examples"/>
</ant>
+ -->
</target>
- <!--
- Create distribution files for examples subproject (requires its own task since its a bit different)
- -->
- <target name="dist-examples">
- <property name="example.name" value="simple"/>
- <property name="examples.lib" value="build/temp/lib"/>
- <mkdir dir="${examples.lib}"/>
- <copy file="${commons-beanutils.jar}" todir="${examples.lib}"/>
- <copy file="${commons-codec.jar}" todir="${examples.lib}"/>
- <copy file="${commons-collections.jar}" todir="${examples.lib}"/>
- <copy file="${commons-digester.jar}" todir="${examples.lib}"/>
- <copy file="${commons-el.jar}" todir="${examples.lib}"/>
- <copy file="${commons-fileupload.jar}" todir="${examples.lib}"/>
- <copy file="${commons-logging.jar}" todir="${examples.lib}"/>
- <copy file="${commons-validator.jar}" todir="${examples.lib}"/>
- <copy file="${jakarta-oro.jar}" todir="${examples.lib}"/>
- <copy file="${jsp.jar}" todir="${examples.lib}"/>
- <copy file="${jstl.jar}" todir="${examples.lib}"/>
- <copy file="${portlet-api.jar}" todir="${examples.lib}"/>
- <copy file="${servlet-api.jar}" todir="${examples.lib}"/>
- <copy file="${struts.jar}" todir="${examples.lib}"/>
- <copy file="${tlddoc.jar}" todir="${examples.lib}"/>
+ <target name="webapp" if="examples.lib.dir">
+
+ <mkdir dir="${dist.dir}"/>
+ <mkdir dir="${examples.lib.dir}"/>
+
<!--
- <copy file="${xdoclet.jar}" todir="${examples.lib}"/>
- <copy file="${xjavadoc.jar}" todir="${examples.lib}"/>
+ Set up the lib dir containing all of the jar files needed to be included in the WAR
-->
+ <copy file="${commons-beanutils.jar}" todir="${examples.lib.dir}"/>
+ <copy file="${commons-codec.jar}" todir="${examples.lib.dir}"/>
+ <copy file="${commons-collections.jar}" todir="${examples.lib.dir}"/>
+ <copy file="${commons-digester.jar}" todir="${examples.lib.dir}"/>
+ <copy file="${commons-el.jar}" todir="${examples.lib.dir}"/>
+ <copy file="${commons-fileupload.jar}" todir="${examples.lib.dir}"/>
+ <copy file="${commons-logging.jar}" todir="${examples.lib.dir}"/>
+ <copy file="${commons-validator.jar}" todir="${examples.lib.dir}"/>
+ <copy file="${jakarta-oro.jar}" todir="${examples.lib.dir}"/>
+ <copy file="${jsp.jar}" todir="${examples.lib.dir}"/>
+ <copy file="${jstl.jar}" todir="${examples.lib.dir}"/>
+ <copy file="${portlet-api.jar}" todir="${examples.lib.dir}"/>
+ <copy file="${servlet-api.jar}" todir="${examples.lib.dir}"/>
+ <copy file="${struts.jar}" todir="${examples.lib.dir}"/>
+ <copy file="${tlddoc.jar}" todir="${examples.lib.dir}"/>
+
<!-- these jars are built/provided locally -->
- <copy file="${jsf-api.jar}" todir="${examples.lib}"/>
- <copy file="${jsf-impl.jar}" todir="${examples.lib}"/>
- <copy file="${tomahawk.jar}" todir="${examples.lib}"/>
-
- <ant target="war" antfile="build/build.xml">
- <property name="src.dir" value="${example.name}/src/java"/>
- <property name="classes.dir" value="build/temp/${example.name}/classes"/>
- <property name="dist.dir" value="build/dist/${example.name}"/>
- <property name="jar.file" value="${example.name}.jar"/>
- <property name="jar.include.pattern" value="**/*"/>
- <property name="war.file" value="build/dist/${example.name}.war"/>
- <property name="web.dir" value="${example.name}"/>
-<!--
- <property name="jar.fileset2.dir" value="${example.name}/src/java"/>
- <property name="jar.fileset2.inc.pat" value="**/*.properties"/>
- <property name="jar.fileset2.exc.pat" value="nothing"/>
--->
+ <copy file="${jsf-api.jar}" todir="${examples.lib.dir}"/>
+ <copy file="${jsf-impl.jar}" todir="${examples.lib.dir}"/>
+ <copy file="${tomahawk.jar}" todir="${examples.lib.dir}"/>
+
+ <ant target="war" dir="${subproject.dir}/build">
+ <property name="war.file" value="${dist.dir}/simple.war"/>
+ <property name="web.dir" value="${subproject.dir}/simple"/>
+ <property name="classes.dir" value="${temp.dir}/simple/classes"/>
+ <property name="src.dir" value="${subproject.dir}/simple/src/java"/>
+ </ant>
+
+ <ant target="war" dir="${subproject.dir}/build">
+ <property name="war.file" value="${dist.dir}/standard.war"/>
+ <property name="web.dir" value="${subproject.dir}/standard"/>
+ <property name="classes.dir" value="${temp.dir}/standard/classes"/>
+ <property name="src.dir" value="${subproject.dir}/standard/src/java"/>
+ </ant>
+
+ <ant target="war" dir="${subproject.dir}/build">
+ <property name="war.file" value="${dist.dir}/blank.war"/>
+ <property name="web.dir" value="${subproject.dir}/blank"/>
+ <property name="classes.dir" value="${temp.dir}/blank/classes"/>
+ <property name="src.dir" value="${subproject.dir}/blank/src/java"/>
+ </ant>
+
+ <ant target="war" dir="${subproject.dir}/build">
+ <property name="war.file" value="${dist.dir}/tiles.war"/>
+ <property name="web.dir" value="${subproject.dir}/tiles"/>
+ <property name="classes.dir" value="${temp.dir}/tiles/classes"/>
+ <property name="src.dir" value="${subproject.dir}/tiles/src/java"/>
</ant>
+
</target>
-
- <target name="war" depends="jar">
- <war warfile="${war.file}" webxml="${web.dir}/WEB-INF/web.xml">
+
+ <target name="war">
+
+ <!-- compile sample code -->
+ <mkdir dir="${classes.dir}"/>
+ <javac srcdir="${src.dir}"
+ destdir="${classes.dir}"
+ optimize="${javac.optimize}"
+ debug="${javac.debug}"
+ classpathref="compile.classpath">
+ </javac>
+
+ <war warfile="${war.file}" webxml="${subproject.dir}/conf/web.xml">
<fileset dir="${web.dir}">
<exclude name="src/**"/>
<exclude name="WEB-INF/classes/**"/>
@@ -652,14 +684,17 @@
<classes dir="${web.dir}/src/java">
<include name="**/*.properties"/>
</classes>
- <lib dir="${examples.lib}"/>
+ <classes dir="${classes.dir}"/>
+ <lib dir="${examples.lib.dir}"/>
+ <!--
<lib dir="${dist.dir}" />
- </war>
+ -->
+ </war>
</target>
<!--
Create distribution files for current project
-->
- <target name="dist" depends="jar, javadoc"/>
+ <target name="dist" depends="jar, javadoc, webapp"/>
</project>