svn commit: r111197 - in forrest/branches/forrest_06_branch: . src/core src/core/targets

[cr...@apache.org]

Author: crossley
Date: Tue Dec  7 18:54:21 2004
New Revision: 111197

URL: http://svn.apache.org/viewcvs?view=rev&rev=111197
Log:
Change Ant build property name "version" to "forrest.version"
to prevent collisions with other build systems when using the
Ant "import" task.

Modified:
   forrest/branches/forrest_06_branch/build.xml
   forrest/branches/forrest_06_branch/src/core/forrest.build.xml
   forrest/branches/forrest_06_branch/src/core/targets/context.xml
   forrest/branches/forrest_06_branch/src/core/targets/skins.xml
   forrest/branches/forrest_06_branch/status.xml

Modified: forrest/branches/forrest_06_branch/build.xml
Url: http://svn.apache.org/viewcvs/forrest/branches/forrest_06_branch/build.xml?view=diff&rev=111197&p1=forrest/branches/forrest_06_branch/build.xml&r1=111196&p2=forrest/branches/forrest_06_branch/build.xml&r2=111197
==============================================================================
--- forrest/branches/forrest_06_branch/build.xml	(original)
+++ forrest/branches/forrest_06_branch/build.xml	Tue Dec  7 18:54:21 2004
@@ -34,7 +34,7 @@
 
     <property name="name"                  value="apache-forrest"/>
     <property name="packages"              value="${xgump.module.project.packages}"/>
-    <property name="version"
+    <property name="forrest.version"
       value="${xgump.module.project.version.major}.${xgump.module.project.version.minor}${xgump.module.project.version.tag}"/>
 
     <property name="java.dir"              location="src/java"/>
@@ -65,7 +65,7 @@
       Project Name ${ant.project.name}
       Java Version ${ant.java.version}      
       Timestamp ${DSTAMP}${TSTAMP}
-      This is: ${name} ${version}
+      This is: ${name} ${forrest.version}
 
       --------------------------------------------------------------
     </echo>
@@ -105,11 +105,11 @@
 
   <target name="release-dist" depends="init, dist-clean, dist-shbat" 
     description="Makes release distributions">
-    <property name="release-name-bin" value="${name}-${version}"/>
+    <property name="release-name-bin" value="${name}-${forrest.version}"/>
     <zip
       file="${dist.dir}/${release-name-bin}.zip" >
       <zipfileset dir="${dist-shbat.dir}" prefix="${release-name-bin}"/>
-      <zipfileset dir="etc"  prefix="${release-name-bin}" includes="RELEASE-NOTES-${version}.txt"/>
+      <zipfileset dir="etc"  prefix="${release-name-bin}" includes="RELEASE-NOTES-${forrest.version}.txt"/>
     </zip>
     <tar longfile="gnu" compression="gzip"
       destfile="${dist.dir}/${release-name-bin}.tar.gz" >
@@ -126,7 +126,7 @@
         <include name="**/ant"/>
         <include name="**/forrest"/>
       </tarfileset>
-      <tarfileset prefix="${release-name-bin}" dir="etc" includes="RELEASE-NOTES-${version}.txt"/>
+      <tarfileset prefix="${release-name-bin}" dir="etc" includes="RELEASE-NOTES-${forrest.version}.txt"/>
     </tar>
   </target>
 

Modified: forrest/branches/forrest_06_branch/src/core/forrest.build.xml
Url: http://svn.apache.org/viewcvs/forrest/branches/forrest_06_branch/src/core/forrest.build.xml?view=diff&rev=111197&p1=forrest/branches/forrest_06_branch/src/core/forrest.build.xml&r1=111196&p2=forrest/branches/forrest_06_branch/src/core/forrest.build.xml&r2=111197
==============================================================================
--- forrest/branches/forrest_06_branch/src/core/forrest.build.xml	(original)
+++ forrest/branches/forrest_06_branch/src/core/forrest.build.xml	Tue Dec  7 18:54:21 2004
@@ -26,7 +26,7 @@
 
 <project default="site" basedir="." name="forrest">
 
-  <property name="version" value="0.6"/>
+  <property name="forrest.version" value="0.6"/>
   
   <property name="forrest.root-dir"           location="${forrest.home}/../.."/>     
   
@@ -235,7 +235,7 @@
       to be used later by Cocoon. -->
     <echo file="${project.temp-dir}/build-info.xml">&lt;info>
   &lt;project-skin>${project.skin}&lt;/project-skin>
-  &lt;forrest-version>${version}&lt;/forrest-version>
+  &lt;forrest-version>${forrest.version}&lt;/forrest-version>
 &lt;/info>
     </echo>
   </target>

Modified: forrest/branches/forrest_06_branch/src/core/targets/context.xml
Url: http://svn.apache.org/viewcvs/forrest/branches/forrest_06_branch/src/core/targets/context.xml?view=diff&rev=111197&p1=forrest/branches/forrest_06_branch/src/core/targets/context.xml&r1=111196&p2=forrest/branches/forrest_06_branch/src/core/targets/context.xml&r2=111197
==============================================================================
--- forrest/branches/forrest_06_branch/src/core/targets/context.xml	(original)
+++ forrest/branches/forrest_06_branch/src/core/targets/context.xml	Tue Dec  7 18:54:21 2004
@@ -73,15 +73,15 @@
     <copy toDir="${project.webapp}/WEB-INF" filtering="false"
       overwrite="true" failonerror="false">
       <fileset dir="${conf-dir}">
-        <exclude name="*-${version}.xconf"/>
+        <exclude name="*-${forrest.version}.xconf"/>
       </fileset>
     </copy>
     <copy toDir="${project.webapp}/WEB-INF" filtering="false" overwrite="true"
       failonerror="false">
       <fileset dir="${conf-dir}">
-        <include name="*-${version}.*"/>
+        <include name="*-${forrest.version}.*"/>
       </fileset>
-      <mapper type="glob" from="*-${version}.xconf" to="*.xconf"/>
+      <mapper type="glob" from="*-${forrest.version}.xconf" to="*.xconf"/>
     </copy>
    </target>
 

Modified: forrest/branches/forrest_06_branch/src/core/targets/skins.xml
Url: http://svn.apache.org/viewcvs/forrest/branches/forrest_06_branch/src/core/targets/skins.xml?view=diff&rev=111197&p1=forrest/branches/forrest_06_branch/src/core/targets/skins.xml&r1=111196&p2=forrest/branches/forrest_06_branch/src/core/targets/skins.xml&r2=111197
==============================================================================
--- forrest/branches/forrest_06_branch/src/core/targets/skins.xml	(original)
+++ forrest/branches/forrest_06_branch/src/core/targets/skins.xml	Tue Dec  7 18:54:21 2004
@@ -37,7 +37,7 @@
   <target name="package-skin" description="Make a package of an existing skin" depends="init-props">
     <input message="Which skin do you want to package?"
            addproperty="skin-name"/>
-    <zip destfile="${forrest.skins-dir}/${skin-name}-${version}.zip"
+    <zip destfile="${forrest.skins-dir}/${skin-name}-${forrest.version}.zip"
        basedir="${forrest.skins-dir}/"
        includes="${skin-name}/**"/>
   </target>
@@ -114,11 +114,11 @@
           style="${forrest.home}/var/skinlist2fetch.xsl"
           force="true">
       <param name="skin-name" expression="${project.skin}"/>      
-      <param name="forrest-version" expression="${version}"/>   
+      <param name="forrest-version" expression="${forrest.version}"/>   
     </xslt>  
     <ant antfile="${project.temp-dir}/skinlist2fetchbuild.xml"/>
       </sequential>
     </for>
   </target>    
   
-</project>
\ No newline at end of file
+</project>

Modified: forrest/branches/forrest_06_branch/status.xml
Url: http://svn.apache.org/viewcvs/forrest/branches/forrest_06_branch/status.xml?view=diff&rev=111197&p1=forrest/branches/forrest_06_branch/status.xml&r1=111196&p2=forrest/branches/forrest_06_branch/status.xml&r2=111197
==============================================================================
--- forrest/branches/forrest_06_branch/status.xml	(original)
+++ forrest/branches/forrest_06_branch/status.xml	Tue Dec  7 18:54:21 2004
@@ -44,6 +44,11 @@
 
   <changes>
     <release version="0.6.1" date="not released yet">
+      <action dev="DC" type="fix" context="build">
+        Change Ant build property name "version" to "forrest.version"
+        to prevent collisions with other build systems when using the
+        Ant "import" task.
+      </action>
       <action dev="DB" type="fix" context="core" fixes-bug="FOR-330" due-to="Gary Feldman">
         Fixed quotes in forrest.bat so forrest can be in a directory with spaces.
       </action>