myfaces-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sc...@apache.org
Subject svn commit: r265774 - /myfaces/build/tags/1_0_10/build.xml
Date Thu, 01 Sep 2005 19:38:07 GMT
Author: schof
Date: Thu Sep  1 12:38:04 2005
New Revision: 265774

URL: http://svn.apache.org/viewcvs?rev=265774&view=rev
Log:
fixed a problem with skip.sandbox option

Modified:
    myfaces/build/tags/1_0_10/build.xml

Modified: myfaces/build/tags/1_0_10/build.xml
URL: http://svn.apache.org/viewcvs/myfaces/build/tags/1_0_10/build.xml?rev=265774&r1=265773&r2=265774&view=diff
==============================================================================
--- myfaces/build/tags/1_0_10/build.xml (original)
+++ myfaces/build/tags/1_0_10/build.xml Thu Sep  1 12:38:04 2005
@@ -240,7 +240,7 @@
         <pathelement location="${jsf-api.jar}"/>
         <pathelement location="${jsf-impl.jar}"/>
         <pathelement location="${tomahawk.jar}"/>
-    	<pathelement location="${sandbox.jar}"/>
+        <pathelement location="${sandbox.jar}"/>
 
       <!-- this is harmless if not used -->
       <!--
@@ -251,8 +251,8 @@
 
     </path>
 
-	<path id="test.classpath">
-	    <path refid="compile.classpath"/>
+    <path id="test.classpath">
+        <path refid="compile.classpath"/>
         <pathelement location="${junit.jar}"/>
         <pathelement location="${easymock.jar}"/>
         <pathelement location="${easymock-classextension.jar}"/>
@@ -348,23 +348,23 @@
             usetimestamp="true" ignoreerrors="true"
             src="http://www.ibiblio.org/maven/xjavadoc/jars/xjavadoc-1.1.jar"/>
 
-		<get dest="${lib.dir}/junit.jar"
-			usetimestamp="true" ignoreerrors="true"
-			src="http://www.ibiblio.org/maven/junit/jars/junit-3.8.1.jar"/>
-
-		<get dest="${lib.dir}/easymock.jar"
-			usetimestamp="true" ignoreerrors="true"
-			src="http://www.ibiblio.org/maven/easymock/jars/easymock-1.1.jar"/>
-
-		<get dest="${lib.dir}/easymock-classextension.jar"
-			usetimestamp="true" ignoreerrors="true"
-			src="http://www.ibiblio.org/maven/easymock/jars/easymockclassextension-1.1.jar"/>
-
-    	    <get dest="${lib.dir}/cglib.jar"
-			usetimestamp="true" ignoreerrors="true"
-			src="http://www.ibiblio.org/maven/cglib/jars/cglib-2.1_2.jar"/>
+        <get dest="${lib.dir}/junit.jar"
+            usetimestamp="true" ignoreerrors="true"
+            src="http://www.ibiblio.org/maven/junit/jars/junit-3.8.1.jar"/>
+
+        <get dest="${lib.dir}/easymock.jar"
+            usetimestamp="true" ignoreerrors="true"
+            src="http://www.ibiblio.org/maven/easymock/jars/easymock-1.1.jar"/>
+
+        <get dest="${lib.dir}/easymock-classextension.jar"
+            usetimestamp="true" ignoreerrors="true"
+            src="http://www.ibiblio.org/maven/easymock/jars/easymockclassextension-1.1.jar"/>
 
-    		<get dest="${lib.dir}/asm.jar"
+            <get dest="${lib.dir}/cglib.jar"
+            usetimestamp="true" ignoreerrors="true"
+            src="http://www.ibiblio.org/maven/cglib/jars/cglib-2.1_2.jar"/>
+
+            <get dest="${lib.dir}/asm.jar"
               usetimestamp="true" ignoreerrors="true"
               src="http://www.ibiblio.org/maven/asm/jars/asm-1.5.3.jar"/>
 
@@ -471,22 +471,22 @@
         </javac>
     </target>
 
-	<!--
-	For the use of caching in the included resources it is needed to update
-	the property lastModified from a properties.file. It is used in Used in the resources URL,
-	to enable caching the resources on the client
-	-->
-	<target name="compile" depends="compile-base" if="update.lastmodified">
-	     <tstamp>
-	        <format property="lastModified" pattern="yyyy-MM-dd HH:mm:ss Z"/>
-	     </tstamp>
-	     <copy todir="${classes.dir}" filtering="on" overwrite="true">
-	         <fileset dir="${jar.fileset2.dir}" includes="**/*.properties"/>
-	         <filterset>
-	            <filter token="lastModified" value="${lastModified}"/>
-	         </filterset>
-	     </copy>
-	</target>
+    <!--
+    For the use of caching in the included resources it is needed to update
+    the property lastModified from a properties.file. It is used in Used in the resources
URL,
+    to enable caching the resources on the client
+    -->
+    <target name="compile" depends="compile-base" if="update.lastmodified">
+         <tstamp>
+            <format property="lastModified" pattern="yyyy-MM-dd HH:mm:ss Z"/>
+         </tstamp>
+         <copy todir="${classes.dir}" filtering="on" overwrite="true">
+             <fileset dir="${jar.fileset2.dir}" includes="**/*.properties"/>
+             <filterset>
+                <filter token="lastModified" value="${lastModified}"/>
+             </filterset>
+         </copy>
+    </target>
 
     <!--
     Run unit tests for all subprojects that have them
@@ -512,27 +512,27 @@
                debug="${javac.debug}"
                classpathref="test.classpath">
         </javac>
-    	    <junit printsummary="yes" fork="yes" haltonfailure="no">
-    	      <classpath>
-    	        <path refid="test.classpath"/>
-    	        <pathelement location="${classes.dir}"/>
-    	        <pathelement location="${test.classes.dir}"/>
-    	      </classpath>
+            <junit printsummary="yes" fork="yes" haltonfailure="no">
+              <classpath>
+                <path refid="test.classpath"/>
+                <pathelement location="${classes.dir}"/>
+                <pathelement location="${test.classes.dir}"/>
+              </classpath>
 
           <formatter type="xml" />
 
-    	      <batchtest fork="yes" todir="${test.reports.dir}/xml">
-    	        <fileset dir="${test.classes.dir}">
-    	          <include name="**/**Test.class" />
-    	        </fileset>
-    	      </batchtest>
+              <batchtest fork="yes" todir="${test.reports.dir}/xml">
+                <fileset dir="${test.classes.dir}">
+                  <include name="**/**Test.class" />
+                </fileset>
+              </batchtest>
         </junit>
-	<junitreport todir="${test.reports.dir}/html">
-    	  <fileset dir="${test.reports.dir}/xml">
-	    <include name="TEST-*.xml"/>
-    	  </fileset>
-	  <report format="frames" todir="${test.reports.dir}/html"/>
-	</junitreport>
+    <junitreport todir="${test.reports.dir}/html">
+          <fileset dir="${test.reports.dir}/xml">
+        <include name="TEST-*.xml"/>
+          </fileset>
+      <report format="frames" todir="${test.reports.dir}/html"/>
+    </junitreport>
     </target>
 
     <!--
@@ -700,7 +700,7 @@
             <format property="TODAY" pattern="yyyy-MM-dd HH:mm z"/>
         </tstamp>
 
-    	<ant target="merge-sandbox"/>
+        <ant target="merge-sandbox"/>
 
         <!-- build the jar -->
         <jar destfile="${dist.dir}/myfaces-all.jar">
@@ -719,23 +719,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">
-                <include name="**" unless="skip.sandbox"/>
+            <fileset dir="../">
+                <include name="sandbox/build/temp/classes/**" unless="skip.sandbox"/>
             </fileset>
 
             <!-- 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">
-                <include name="**" unless="skip.sandbox"/>
+            <zipfileset dir="../" prefix="META-INF">
+                <include name="sandbox/build/temp/tlds/**" unless="skip.sandbox"/>
             </zipfileset>
 
             <!-- additional resources -->
             <zipfileset file="${dist.dir}/temp/faces-config.xml" prefix="META-INF/"/>
             <fileset dir="../impl/src/java" excludes="**/*.java **/package.html"/>
             <fileset dir="../tomahawk/src/java" excludes="**/*.java **/*.properties"/>
-            <fileset dir="../sandbox/src/java">
-                <include name="**" unless="skip.sandbox"/>
+            <fileset dir="../">
+                <include name="sandbox/src/java/**" unless="skip.sandbox"/>
                 <exclude name="**/*.java"/>
             </fileset>
         </jar>
@@ -743,33 +743,33 @@
     </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="&lt;/faces-config&gt;" 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="\&lt;\?xml .+&lt;faces-config xmlns=&quot;http://java.sun.com/JSF/Configuration&quot;\&gt;"
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>
+        <!-- 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="&lt;/faces-config&gt;" 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="\&lt;\?xml .+&lt;faces-config xmlns=&quot;http://java.sun.com/JSF/Configuration&quot;\&gt;"
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>
     </target>
 
     <target name="webapp" if="examples.lib.dir">
@@ -891,13 +891,13 @@
             <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">
-                <include name="**" unless="skip.sandbox"/>
+            <tarfileset prefix="${src.release.bundle}/src/sandbox" dir="../">
+                <include name="sandbox/src/java/**" unless="skip.sandbox"/>
             </tarfileset>
             <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="../examples/sandbox">
-                <include name="**" unless="skip.sandbox"/>
+            <tarfileset prefix="${src.release.bundle}/src/examples/sandbox" dir="../">
+                <include name="examples/sandbox/**" unless="skip.sandbox"/>
             </tarfileset>
             <tarfileset prefix="${src.release.bundle}/src/examples/simple" dir="../examples/simple"/>
             <tarfileset prefix="${src.release.bundle}/src/examples/tiles" dir="../examples/tiles"/>
@@ -905,13 +905,13 @@
             <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">
-                <include name="**" unless="skip.sandbox"/>
+            <tarfileset prefix="${src.release.bundle}/javadoc/sandbox" dir="../">
+                <include name="sandbox/build/temp/javadoc/**" unless="skip.sandbox"/>
             </tarfileset>
             <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">
-                <include name="**" unless="skip.sandbox"/>
+            <tarfileset prefix="${src.release.bundle}/tlddoc/sandbox" dir="../">
+                <include name="sandbox/build/temp/tlddoc/**" unless="skip.sandbox"/>
             </tarfileset>
         </tar>
         <zip destfile="${src.bundle.zip}" compress="true" excludes="classes/**,lib/**">
@@ -920,13 +920,13 @@
             <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">
-                <include name="**" unless="skip.sandbox"/>
+            <zipfileset prefix="${src.release.bundle}/src/sandbox" dir="../">
+                <include name="sandbox/src/java/**" unless="skip.sandbox"/>
             </zipfileset>
             <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="../examples/sandbox">
-                <include name="**" unless="skip.sandbox"/>
+            <zipfileset prefix="${src.release.bundle}/src/examples/sandbox" dir="../">
+                <include name="examples/sandbox/**" unless="skip.sandbox"/>
             </zipfileset>
             <zipfileset prefix="${src.release.bundle}/src/examples/simple" dir="../examples/simple"/>
             <zipfileset prefix="${src.release.bundle}/src/examples/tiles" dir="../examples/tiles"/>
@@ -934,13 +934,13 @@
             <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">
-                <include name="**" unless="skip.sandbox"/>
+            <zipfileset prefix="${src.release.bundle}/javadoc/sandbox" dir="../">
+                <include name="sandbox/build/temp/javadoc/**" unless="skip.sandbox"/>
             </zipfileset>
             <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">
-                <include name="**" unless="skip.sandbox"/>
+            <zipfileset prefix="${src.release.bundle}/tlddoc/sandbox" dir="../">
+                <include name="sandbox/build/temp/tlddoc/**" unless="skip.sandbox"/>
             </zipfileset>
         </zip>
         <ant target="sign">
@@ -957,19 +957,19 @@
             <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="../sandbox/build/dist">
-                <include name="**" unless="skip.sandbox"/>
+            <tarfileset prefix="${bin.release.bundle}" dir="../">
+                <include name="sandbox/build/dist/**" unless="skip.sandbox"/>
             </tarfileset>
             <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">
-                <include name="**" unless="skip.sandbox"/>
+            <tarfileset prefix="${bin.release.bundle}/javadoc/sandbox" dir="../">
+                <include name="sandbox/build/temp/javadoc/**" unless="skip.sandbox"/>
             </tarfileset>
             <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">
-                <include name="**" unless="skip.sandbox"/>
+            <tarfileset prefix="${bin.release.bundle}/tlddoc/sandbox" dir="../">
+                <include name="sandbox/build/temp/tlddoc/**" unless="skip.sandbox"/>
             </tarfileset>
         </tar>
         <zip destfile="${bin.bundle.zip}" compress="true">
@@ -978,19 +978,19 @@
             <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">
-                <include name="**" unless="skip.sandbox"/>
+            <zipfileset prefix="${bin.release.bundle}" dir="../">
+                <include name="sandbox/build/dist/**" unless="skip.sandbox"/>
             </zipfileset>
             <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">
-                <include name="**" unless="skip.sandbox"/>
+            <zipfileset prefix="${bin.release.bundle}/javadoc/sandbox" dir="../">
+                <include name="sandbox/build/temp/javadoc/**" unless="skip.sandbox"/>
             </zipfileset>
             <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="../sandbox/build/temp/tlddoc">
-                <include name="**" unless="skip.sandbox"/>
+            <zipfileset prefix="${bin.release.bundle}/tlddoc/sandbox" dir="../">
+                <include name="sandbox/build/temp/tlddoc/**" unless="skip.sandbox"/>
             </zipfileset>
         </zip>
 



Mime
View raw message