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/29 20:21:56 UTC
svn commit: r202408 - in /myfaces: build/trunk/build.xml current/
Author: schof
Date: Wed Jun 29 11:21:54 2005
New Revision: 202408
URL: http://svn.apache.org/viewcvs?rev=202408&view=rev
Log:
additional examples fix
Modified:
myfaces/build/trunk/build.xml
myfaces/current/ (props changed)
Modified: myfaces/build/trunk/build.xml
URL: http://svn.apache.org/viewcvs/myfaces/build/trunk/build.xml?rev=202408&r1=202407&r2=202408&view=diff
==============================================================================
--- myfaces/build/trunk/build.xml (original)
+++ myfaces/build/trunk/build.xml Wed Jun 29 11:21:54 2005
@@ -114,6 +114,12 @@
of myfaces-impl.jar but the RI can be used
as well.
+ sandbox.jar The path to the JAR file for the MyFaces
+ sandbox package. Needed in order to
+ compile the examples subproject. This
+ should be a reference to a locally built
+ copy.
+
tomahawk.jar The path to the JAR file for the MyFaces
tomahawk package. Needed in order to
compile the examples subproject. This
@@ -153,7 +159,8 @@
<property name="jsf-api.jar" location="${basedir}/../../api/build/dist/myfaces-api.jar"/>
<property name="jsf-impl.jar" location="${basedir}/../../impl/build/dist/myfaces-impl.jar"/>
<property name="tomahawk.jar" location="${basedir}/../../tomahawk/build/dist/tomahawk.jar"/>
-
+ <property name="sandbox.jar" location="${basedir}/../../sandbox/build/dist/sandbox.jar"/>
+
<!-- ========== Initialization Properties ================================= -->
@@ -415,6 +422,9 @@
<property name="subproject" value="tomahawk"/>
</ant>
<ant target="subproject">
+ <property name="subproject" value="sandbox"/>
+ </ant>
+ <ant target="subproject">
<property name="subproject" value="examples"/>
</ant>
</target>
@@ -586,11 +596,11 @@
Create distribution files for all subprojects
-->
<target name="dist-all">
- <!-- ******************* TEMPROARILY COMMENTED OUT: RESTORE WHEN DONE TESTING *******************-->
+ <!-- ******************* TEMPROARILY COMMENTED OUT: RESTORE WHEN DONE TESTING *******************
<ant target="project">
<property name="target" value="dist"/>
</ant>
-
+-->
<!-- create the myfaces-all.jar which contains everything -->
<mkdir dir="${dist.dir}"/>
@@ -616,15 +626,23 @@
<fileset dir="../api/build/temp/classes"/>
<fileset dir="../impl/build/temp/classes"/>
<fileset dir="../tomahawk/build/temp/classes"/>
+ <fileset dir="../sandbox/build/temp/classes"/>
<!-- tlds -->
<zipfileset dir="../impl/build/temp/tlds" prefix="META-INF/"/>
<zipfileset dir="../tomahawk/build/temp/tlds" prefix="META-INF/"/>
+ <zipfileset dir="../sandbox/build/temp/tlds" prefix="META-INF/"/>
+
+ <!-- additional resources -->
<zipfileset dir="../tomahawk/conf" includes="*.xml" prefix="META-INF/"/>
+ <fileset dir="../impl/src/java" excludes="**/*.java **/package.html"/>
+ <fileset dir="../tomahawk/src/java" excludes="**/*.java"/>
+ <fileset dir="../sandbox/src/java" excludes="**/*.java "/>
<!-- properties -->
+ <!--
<fileset dir="../impl/src/java" includes="**/*.properties"/>
-
+ -->
</jar>
</target>
@@ -653,12 +671,14 @@
<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}"/>
+ <copy file="${sandbox.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"/>
+ <property name="web.xml.file" value="${subproject.dir}/conf/web.xml"/>
</ant>
<ant target="war" dir="${subproject.dir}/build">
@@ -666,6 +686,7 @@
<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"/>
+ <property name="web.xml.file" value="${subproject.dir}/conf/basic-web.xml"/>
</ant>
<ant target="war" dir="${subproject.dir}/build">
@@ -673,6 +694,7 @@
<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"/>
+ <property name="web.xml.file" value="${subproject.dir}/conf/basic-web.xml"/>
</ant>
<ant target="war" dir="${subproject.dir}/build">
@@ -680,8 +702,17 @@
<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"/>
+ <property name="web.xml.file" value="${subproject.dir}/conf/basic-web.xml"/>
</ant>
+ <ant target="war" dir="${subproject.dir}/build">
+ <property name="war.file" value="${dist.dir}/sandbox.war"/>
+ <property name="web.dir" value="${subproject.dir}/sandbox"/>
+ <property name="classes.dir" value="${temp.dir}/sandbox/classes"/>
+ <property name="src.dir" value="${subproject.dir}/sandbox/src/java"/>
+ <property name="web.xml.file" value="${subproject.dir}/conf/basic-web.xml"/>
+ </ant>
+
</target>
<target name="war">
@@ -695,12 +726,12 @@
classpathref="compile.classpath">
</javac>
- <war warfile="${war.file}" webxml="${subproject.dir}/conf/web.xml">
+ <war warfile="${war.file}" webxml="${web.xml.file}">
<fileset dir="${web.dir}">
<exclude name="src/**"/>
<exclude name="WEB-INF/classes/**"/>
<exclude name="WEB-INF/lib/**"/>
- <exclude name="WEB-INF/web.xml"/>
+ <exclude name="WEB-INF/web*.xml"/>
</fileset>
<classes dir="${web.dir}/src/java">
<include name="**/*.properties"/>
@@ -736,11 +767,14 @@
<tarfileset prefix="${src.release.bundle}/src/impl" dir="../impl/src/java"/>
<tarfileset prefix="${src.release.bundle}/src/share" dir="../share/src/java"/>
<tarfileset prefix="${src.release.bundle}/src/tomahawk" dir="../tomahawk/src/java"/>
+ <tarfileset prefix="${src.release.bundle}/src/sandbox" dir="../sandbox/src/java"/>
<tarfileset prefix="${src.release.bundle}/javadoc/api" dir="../api/build/temp/javadoc"/>
<tarfileset prefix="${src.release.bundle}/javadoc/impl" dir="../impl/build/temp/javadoc"/>
<tarfileset prefix="${src.release.bundle}/javadoc/tomahawk" dir="../tomahawk/build/temp/javadoc"/>
+ <tarfileset prefix="${src.release.bundle}/javadoc/sandbox" dir="../sandbox/build/temp/javadoc"/>
<tarfileset prefix="${src.release.bundle}/tlddoc/core" dir="../impl/build/temp/tlddoc"/>
<tarfileset prefix="${src.release.bundle}/tlddoc/tomahawk" dir="../tomahawk/build/temp/tlddoc"/>
+ <tarfileset prefix="${src.release.bundle}/tlddoc/sandbox" dir="../sandbox/build/temp/tlddoc"/>
</tar>
<zip destfile="${src.bundle.zip}" compress="true">
<zipfileset prefix="${src.release.bundle}" dir="." includes="*.txt"/>
@@ -748,11 +782,14 @@
<zipfileset prefix="${src.release.bundle}/src/impl" dir="../impl/src/java"/>
<zipfileset prefix="${src.release.bundle}/src/share" dir="../share/src/java"/>
<zipfileset prefix="${src.release.bundle}/src/tomahawk" dir="../tomahawk/src/java"/>
+ <zipfileset prefix="${src.release.bundle}/src/sandbox" dir="../sandbox/src/java"/>
<zipfileset prefix="${src.release.bundle}/javadoc/api" dir="../api/build/temp/javadoc"/>
<zipfileset prefix="${src.release.bundle}/javadoc/impl" dir="../impl/build/temp/javadoc"/>
<zipfileset prefix="${src.release.bundle}/javadoc/tomahawk" dir="../tomahawk/build/temp/javadoc"/>
+ <zipfileset prefix="${src.release.bundle}/javadoc/sandbox" dir="../sandbox/build/temp/javadoc"/>
<zipfileset prefix="${src.release.bundle}/tlddoc/core" dir="../impl/build/temp/tlddoc"/>
<zipfileset prefix="${src.release.bundle}/tlddoc/tomahawk" dir="../tomahawk/build/temp/tlddoc"/>
+ <zipfileset prefix="${src.release.bundle}/tlddoc/sandbox" dir="../sandbox/build/temp/tlddoc"/>
</zip>
<ant target="sign">
<property name="release.bundle.tgz" value="${src.bundle.tgz}"/>
@@ -766,23 +803,29 @@
<tarfileset prefix="${bin.release.bundle}" dir="." includes="*.txt"/>
<tarfileset prefix="${bin.release.bundle}" dir="../api/build/dist"/>
<tarfileset prefix="${bin.release.bundle}" dir="../impl/build/dist"/>
- <tarfileset prefix="${bin.release.bundle}" dir="../tomahawk/build/dist"/>
+ <tarfileset prefix="${bin.release.bundle}" dir="../tomahawk/build/dist"/>
+ <tarfileset prefix="${bin.release.bundle}" dir="../sandbox/build/dist"/>
<tarfileset prefix="${bin.release.bundle}/javadoc/api" dir="../api/build/temp/javadoc"/>
<tarfileset prefix="${bin.release.bundle}/javadoc/impl" dir="../impl/build/temp/javadoc"/>
<tarfileset prefix="${bin.release.bundle}/javadoc/tomahawk" dir="../tomahawk/build/temp/javadoc"/>
+ <tarfileset prefix="${bin.release.bundle}/javadoc/sandbox" dir="../sandbox/build/temp/javadoc"/>
<tarfileset prefix="${bin.release.bundle}/tlddoc/core" dir="../impl/build/temp/tlddoc"/>
<tarfileset prefix="${bin.release.bundle}/tlddoc/tomahawk" dir="../tomahawk/build/temp/tlddoc"/>
+ <tarfileset prefix="${bin.release.bundle}/tlddoc/sandbox" dir="../sandbox/build/temp/tlddoc"/>
</tar>
<zip destfile="${bin.bundle.zip}" compress="true">
<zipfileset prefix="${bin.release.bundle}" dir="." includes="*.txt"/>
<zipfileset prefix="${bin.release.bundle}" dir="../api/build/dist"/>
<zipfileset prefix="${bin.release.bundle}" dir="../impl/build/dist"/>
<zipfileset prefix="${bin.release.bundle}" dir="../tomahawk/build/dist"/>
+ <zipfileset prefix="${bin.release.bundle}" dir="../sandbox/build/dist"/>
<zipfileset prefix="${bin.release.bundle}/javadoc/api" dir="../api/build/temp/javadoc"/>
<zipfileset prefix="${bin.release.bundle}/javadoc/impl" dir="../impl/build/temp/javadoc"/>
<zipfileset prefix="${bin.release.bundle}/javadoc/tomahawk" dir="../tomahawk/build/temp/javadoc"/>
+ <zipfileset prefix="${bin.release.bundle}/javadoc/sandbox" dir="../sandbox/build/temp/javadoc"/>
<zipfileset prefix="${bin.release.bundle}/tlddoc/core" dir="../impl/build/temp/tlddoc"/>
- <zipfileset prefix="${bin.release.bundle}/tlddoc/tomahawk" dir="../tomahawk/build/temp/tlddoc"/>
+ <zipfileset prefix="${bin.release.bundle}/tlddoc/tomahawk" dir="../tomahawk/build/temp/tlddoc"/>
+ <zipfileset prefix="${bin.release.bundle}/tlddoc/sandbox" dir="../sandbox/build/temp/tlddoc"/>
</zip>
<ant target="sign">
<property name="release.bundle.tgz" value="${bin.bundle.tgz}"/>
Propchange: myfaces/current/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Wed Jun 29 11:21:54 2005
@@ -2,3 +2,4 @@
*.jpx
*.local
*.library
+classes