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/09/27 04:42:04 UTC
svn commit: r291807 - /myfaces/build/trunk/build.xml
Author: schof
Date: Mon Sep 26 19:42:01 2005
New Revision: 291807
URL: http://svn.apache.org/viewcvs?rev=291807&view=rev
Log:
initial attempt at cleaning up sandbox situation
Modified:
myfaces/build/trunk/build.xml
Modified: myfaces/build/trunk/build.xml
URL: http://svn.apache.org/viewcvs/myfaces/build/trunk/build.xml?rev=291807&r1=291806&r2=291807&view=diff
==============================================================================
--- myfaces/build/trunk/build.xml (original)
+++ myfaces/build/trunk/build.xml Mon Sep 26 19:42:01 2005
@@ -99,13 +99,13 @@
easymock.jar The path to the JAR file for EasyMock
[Version 1.0 or later]
-
+
easymock-classextension.jar The path to the JAR file for EasyMock
[Version 1.0 or later]
-
+
cglib.jar The path to the JAR file for CGLib used by EasyMock
[Version 2.1.2 or later]
-
+
asm.jar The path to the JAR file for ASM used by EasyMock
[Version 1.5.3 or later]
@@ -290,7 +290,7 @@
<pathelement location="${cglib.jar}"/>
<pathelement location="${asm.jar}"/>
</path>
-
+
<path id="cactus.classpath">
<path refid="test.classpath"/>
<pathelement location="${lib.dir}/aspectjrt.jar"/>
@@ -498,21 +498,11 @@
<ant target="subproject">
<property name="subproject" value="tomahawk"/>
</ant>
-
- <ant target="subproject-sandbox"/>
-
<ant target="subproject">
- <property name="subproject" value="examples"/>
+ <property name="subproject" value="sandbox"/>
</ant>
- </target>
-
- <!--
- Sandbox stuff needs to be in its own target b/c it is not used in
- official release builds.
- -->
- <target name="subproject-sandbox" unless="skip.sandbox">
<ant target="subproject">
- <property name="subproject" value="sandbox"/>
+ <property name="subproject" value="examples"/>
</ant>
</target>
@@ -558,7 +548,7 @@
<!--
Run unit tests for all subprojects that have them
-->
- <target name="unit-test-all" depends="download-dependencies"
+ <target name="unit-test-all" depends="download-dependencies"
description="Run all JUnit tests in all subproject">
<ant target="project">
<property name="target" value="unit-test"/>
@@ -653,7 +643,7 @@
<!--
Run unit tests for all subprojects that have them
-->
- <target name="cactus-test-all"
+ <target name="cactus-test-all"
description="Run all Cactus tests in all subproject">
<ant target="project">
<property name="target" value="cactus-test"/>
@@ -676,7 +666,7 @@
<property name="cargo.logging" value="high"/>
<property name="cargo.servlet.port" value="${tomcat5x.container.port}"/>
<war warFile="${cactus.dir}/cactus-app.war" context="${cactus.web.context}"/>
- </configuration>
+ </configuration>
</cargo-tomcat5x>
<copy file="${build.dir}/cactus.properties" todir="${cactus.classes.dir}"/>
<junit printsummary="yes" fork="yes" haltonfailure="no">
@@ -888,114 +878,23 @@
<fileset dir="${build.dir}/../api/build/temp/classes"/>
<fileset dir="${build.dir}/../impl/build/temp/classes"/>
<fileset dir="${build.dir}/../tomahawk/build/temp/classes"/>
- <fileset dir="${build.dir}/../sandbox/build/temp/classes/">
- <include name="**" unless="skip.sandbox"/>
- </fileset>
+ <fileset dir="${build.dir}/../sandbox/build/temp/classes/"/>
<!-- tlds -->
<zipfileset dir="${build.dir}/../impl/build/temp/tlds" prefix="META-INF/"/>
<zipfileset dir="${build.dir}/../tomahawk/build/temp/tlds" prefix="META-INF/"/>
- <zipfileset dir="${build.dir}/../sandbox/build/temp/tlds" prefix="META-INF">
- <include name="**" unless="skip.sandbox"/>
- </zipfileset>
- <zipfileset dir="${dist.dir}/temp" prefix="META-INF/">
- <include name="myfaces_all.tld" unless="skip.sandbox"/>
- </zipfileset>
-
+<!--
+ <zipfileset dir="${build.dir}/../sandbox/build/temp/tlds" prefix="META-INF"/>
+-->
<!-- additional resources -->
- <zipfileset dir="${dist.dir}/temp" prefix="META-INF/">
- <include name="faces-config.xml" unless="skip.sandbox"/>
- </zipfileset>
- <zipfileset dir="${build.dir}/../tomahawk/conf" prefix="META-INF/">
- <include name="faces-config.xml" if="skip.sandbox"/>
- </zipfileset>
+ <zipfileset dir="${build.dir}/../tomahawk/conf/faces-config.xml" prefix="META-INF/"/>
<fileset dir="${build.dir}/../impl/src/java" excludes="**/*.java **/package.html"/>
<fileset dir="${build.dir}/../tomahawk/src/java" excludes="**/*.java **/*.properties"/>
- <fileset dir="${build.dir}/../sandbox/src/java">
- <include name="**" unless="skip.sandbox"/>
- <exclude name="**/*.java"/>
- </fileset>
+ <fileset dir="${build.dir}/../sandbox/src/java" excludes="**/*.java"/>
</jar>
</target>
- <target name="merge-sandbox" unless="skip.sandbox">
- <!-- Hack to concatenate tomahawk & sandbox's faces-config.xml files -->
- <mkdir dir="${dist.dir}/temp"/>
- <copy file="../tomahawk/conf/faces-config.xml"
- tofile="${dist.dir}/temp/faces-config.xml.1"
- overwrite="true">
- <filterchain>
- <!--tailfilter lines="-1" skip="3"/-->
- <replacestring from="</faces-config>" to=""/>
- </filterchain>
- </copy>
- <copy file="../sandbox/conf/faces-config.xml"
- tofile="${dist.dir}/temp/faces-config.xml.2"
- overwrite="true">
- <filterchain>
- <headfilter lines="-1" skip="24"/>
- <!--tokenfilter>
- <replaceregex pattern="\<\?xml .+<faces-config xmlns="http://java.sun.com/JSF/Configuration"\>" replace="" flags="m"/>
- </tokenfilter-->
- </filterchain>
- </copy>
- <move file="${dist.dir}/temp/faces-config.xml.2"
- tofile="${dist.dir}/temp/faces-config.xml"
- overwrite="true">
- <filterchain>
- <concatfilter prepend="${dist.dir}/temp/faces-config.xml.1"/>
- </filterchain>
- </move>
-
- <!-- Make a concatenated version of tomahawk & sandbox's tld files -->
- <copy file="../sandbox/tld/myfaces_sandbox.tld"
- tofile="${dist.dir}/temp/myfaces_all.tld.1"
- overwrite="true">
- <filterchain>
- <replacestring
- from="<uri>http://myfaces.apache.org/sandbox</uri>"
- to="<uri>http://myfaces.apache.org/all</uri>"/>
- <replacestring
- from="</taglib>"
- to=""/>
- </filterchain>
- </copy>
- <copy file="../tomahawk/tld/tomahawk.tld"
- tofile="${dist.dir}/temp/myfaces_all.tld.2"
- overwrite="true">
- <filterchain>
- <headfilter lines="-1" skip="86"/>
- </filterchain>
- </copy>
- <move file="${dist.dir}/temp/myfaces_all.tld.2"
- tofile="${dist.dir}/temp/myfaces_all.tld.3"
- overwrite="true">
- <filterchain>
- <concatfilter prepend="${dist.dir}/temp/myfaces_all.tld.1"/>
- </filterchain>
- </move>
- <move file="${dist.dir}/temp/myfaces_all.tld.3"
- tofile="${dist.dir}/temp/myfaces_all.tld.4"
- overwrite="true">
- <filterchain>
- <replacestring
- from="SYSTEM "entities"
- to="SYSTEM "../../../sandbox/tld/entities"/>
- </filterchain>
- </move>
- <xslt basedir="../sandbox/tld/"
- in="${dist.dir}/temp/myfaces_all.tld.4"
- out="${dist.dir}/temp/myfaces_all.tld"
- style="../sandbox/tld/misc/resolve_entities.xsl"
- extension=".tld">
- <xmlcatalog>
- <dtd publicid="-//Sun Microsystems, Inc.//DTD JSP Tag Library 1.2//EN"
- location="../sandbox/tld/misc/web-jsptaglibrary_1_2.dtd"/>
- </xmlcatalog>
- </xslt>
- </target>
-
<target name="webapp" if="examples.lib.dir">
<mkdir dir="${dist.dir}"/>
@@ -1010,7 +909,7 @@
<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-lang.jar}" todir="${examples.lib.dir}"/>
+ <copy file="${commons-lang.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}"/>
@@ -1047,15 +946,6 @@
<property name="web.xml.file" value="${subproject.dir}/conf/basic-web.xml"/>
</ant>
- <ant target="war-sandbox" dir="${subproject.dir}/build"/>
-
- </target>
-
- <!--
- Sandbox stuff needs to be in its own target b/c it is not used in
- official release builds.
- -->
- <target name="war-sandbox" unless="skip.sandbox">
<ant target="war" dir="${subproject.dir}/build" >
<property name="war.file" value="${dist.dir}/sandbox.war"/>
<property name="web.dir" value="${subproject.dir}/sandbox"/>
@@ -1063,6 +953,7 @@
<property name="src.dir" value="${subproject.dir}/sandbox/src/java"/>
<property name="web.xml.file" value="${subproject.dir}/conf/web.xml"/>
</ant>
+
</target>
<target name="war">
@@ -1096,8 +987,6 @@
-->
<target name="dist" depends="jar, javadoc, tlddoc, webapp"/>
-
-
<!--
Builds release distribution files. Can only be run from current/build.
-->
@@ -1116,28 +1005,20 @@
<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="../">
- <include name="sandbox/src/java/**" unless="skip.sandbox"/>
- </tarfileset>
+ <tarfileset prefix="${src.release.bundle}/src/sandbox" dir="../sandbox/src/java/"/>
<tarfileset prefix="${src.release.bundle}/src/examples/blank" dir="../examples/blank"/>
<tarfileset prefix="${src.release.bundle}/src/examples/conf" dir="../examples/conf"/>
- <tarfileset prefix="${src.release.bundle}/src/examples/sandbox" dir="../">
- <include name="examples/sandbox/**" unless="skip.sandbox"/>
- </tarfileset>
+ <tarfileset prefix="${src.release.bundle}/src/examples/sandbox" dir="../examples/sandbox"/>
<tarfileset prefix="${src.release.bundle}/src/examples/simple" dir="../examples/simple"/>
<tarfileset prefix="${src.release.bundle}/src/examples/tiles" dir="../examples/tiles"/>
<tarfileset prefix="${src.release.bundle}/src/examples/wap" dir="../examples/wap"/>
<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="../">
- <include name="sandbox/build/temp/javadoc/**" unless="skip.sandbox"/>
- </tarfileset>
+ <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="../">
- <include name="sandbox/build/temp/tlddoc/**" unless="skip.sandbox"/>
- </tarfileset>
+ <tarfileset prefix="${src.release.bundle}/tlddoc/sandbox" dir="../sandbox/build/temp/tlddoc"/>
</tar>
<zip destfile="${src.bundle.zip}" compress="true" excludes="classes/**,lib/**">
<zipfileset prefix="${src.release.bundle}" dir="." includes="*.txt"/>
@@ -1145,28 +1026,20 @@
<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="../">
- <include name="sandbox/src/java/**" unless="skip.sandbox"/>
- </zipfileset>
+ <zipfileset prefix="${src.release.bundle}/src/sandbox" dir="../sandbox/src/java"/>
<zipfileset prefix="${src.release.bundle}/src/examples/blank" dir="../examples/blank"/>
<zipfileset prefix="${src.release.bundle}/src/examples/conf" dir="../examples/conf"/>
- <zipfileset prefix="${src.release.bundle}/src/examples/sandbox" dir="../">
- <include name="examples/sandbox/**" unless="skip.sandbox"/>
- </zipfileset>
+ <zipfileset prefix="${src.release.bundle}/src/examples/sandbox" dir="../examples/sandbox"/>
<zipfileset prefix="${src.release.bundle}/src/examples/simple" dir="../examples/simple"/>
<zipfileset prefix="${src.release.bundle}/src/examples/tiles" dir="../examples/tiles"/>
<zipfileset prefix="${src.release.bundle}/src/examples/wap" dir="../examples/wap"/>
<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="../">
- <include name="sandbox/build/temp/javadoc/**" unless="skip.sandbox"/>
- </zipfileset>
+ <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="../">
- <include name="sandbox/build/temp/tlddoc/**" unless="skip.sandbox"/>
- </zipfileset>
+ <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}"/>
@@ -1182,20 +1055,14 @@
<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="../">
- <include name="sandbox/build/dist/**" unless="skip.sandbox"/>
- </tarfileset>
+ <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="../">
- <include name="sandbox/build/temp/javadoc/**" unless="skip.sandbox"/>
- </tarfileset>
+ <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="../">
- <include name="sandbox/build/temp/tlddoc/**" unless="skip.sandbox"/>
- </tarfileset>
+ <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"/>
@@ -1203,20 +1070,14 @@
<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="../">
- <include name="sandbox/build/dist/**" unless="skip.sandbox"/>
- </zipfileset>
+ <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="../">
- <include name="sandbox/build/temp/javadoc/**" unless="skip.sandbox"/>
- </zipfileset>
+ <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/sandbox" dir="../">
- <include name="sandbox/build/temp/tlddoc/**" unless="skip.sandbox"/>
- </zipfileset>
+ <zipfileset prefix="${bin.release.bundle}/tlddoc/sandbox" dir="../sandbox/build/temp/tlddoc"/>
</zip>
<ant target="sign">