Mailing-List: contact svn-help@forrest.apache.org; run by ezmlm
Precedence: bulk
Reply-To: "Forrest Developers List" <dev@forrest.apache.org>
Date: 28 Jul 2004 20:26:28 -0000
Message-ID: <20040728202628.31263.qmail@minotaur.apache.org>
From: brondsem@apache.org
To: svn@forrest.apache.org
Subject: svn commit: rev 30864 - in forrest/trunk: . src/core src/core/context
 src/core/context/skins/avalon-tigris src/core/context/skins/book-tab
 src/core/context/skins/forrest-site src/core/context/skins/krysalis-site
 src/core/context/skins/tigris-style src/core/context/skins/tigris-style-1_1
 src/core/fresh-site src/core/var src/documentation/content/xdocs/docs

Author: brondsem
Date: Wed Jul 28 13:26:27 2004
New Revision: 30864

Added:
   forrest/trunk/src/core/context/skins/book-tab/
      - copied from rev 30772, forrest/trunk/src/core/context/skins/krysalis-site/
   forrest/trunk/src/core/context/skins/tigris-style-1_1/
      - copied from rev 30772, forrest/trunk/src/core/context/skins/tigris-style/
Removed:
   forrest/trunk/src/core/context/skins/avalon-tigris/
   forrest/trunk/src/core/context/skins/forrest-site/
   forrest/trunk/src/core/context/skins/krysalis-site/
   forrest/trunk/src/core/context/skins/tigris-style/
Modified:
   forrest/trunk/forrest.properties
   forrest/trunk/src/core/context/default-forrest.properties
   forrest/trunk/src/core/forrest.build.xml
   forrest/trunk/src/core/fresh-site/forrest.properties
   forrest/trunk/src/core/var/skinlist2fetch.xsl
   forrest/trunk/src/documentation/content/xdocs/docs/upgrading_06.xml
   forrest/trunk/status.xml
Log:
renamed and deleted skins; set aliases in place

Modified: forrest/trunk/forrest.properties
==============================================================================
--- forrest/trunk/forrest.properties	(original)
+++ forrest/trunk/forrest.properties	Wed Jul 28 13:26:27 2004
@@ -18,11 +18,8 @@
 
 project.name=forrest
 
-# current skin
-#project.skin=forrest-site
-# skins under development
-#project.skin=krysalis-site
-#project.skin=tigris-style
+#project.skin=book-tab
+#project.skin=tigris-style-1_1
 #project.skin=css-style-dev
 
 project.bugtracking-url=http://issues.cocoondev.org/jira/secure/ViewIssue.jspa?key=

Modified: forrest/trunk/src/core/context/default-forrest.properties
==============================================================================
--- forrest/trunk/src/core/context/default-forrest.properties	(original)
+++ forrest/trunk/src/core/context/default-forrest.properties	Wed Jul 28 13:26:27 2004
@@ -23,9 +23,9 @@
 project.name=my-project
 
 # Specifies name of Forrest skin to use
-project.skin=forrest-site
-#project.skin=avalon-tigris
-#project.skin=krysalis-site
+project.skin=book-tab
+#project.skin=tigris-style-1_1
+#project.skin=css-style-dev
 
 # comma seperated list, file:/// is supported
 forrest.skins.descriptors=http://forrest.apache.org/skins/skins.xml

Modified: forrest/trunk/src/core/forrest.build.xml
==============================================================================
--- forrest/trunk/src/core/forrest.build.xml	(original)
+++ forrest/trunk/src/core/forrest.build.xml	Wed Jul 28 13:26:27 2004
@@ -142,6 +142,56 @@
     <property name="forrest.basic.jvmargs" value="-Dproject.home=&quot;${project.home}&quot; -Dforrest.home=&quot;${forrest.home}&quot;"/>
     <echo>forrest.basic.jvmargs:${forrest.basic.jvmargs}</echo>
 
+    <!-- 
+    Skin aliasing for backwards compatability
+        0.5 => 0.6
+        krysalis-site => book-tab
+        forrest-site => book-tab
+        forrest-css => book-tab
+        avalon-tigris => tigris-style-1_1
+        tigris-style => tigris-style-1_1 
+    -->
+    <if>
+        <equals arg1="${project.skin}" arg2="krysalis-site"/>
+        <then>
+            <property name="project.new-skin-name" value="book-tab"/>
+        </then>
+        <elseif>
+            <equals arg1="${project.skin}" arg2="forrest-site"/>
+            <then>
+                <property name="project.new-skin-name" value="book-tab"/>
+            </then>
+        </elseif>
+        <elseif>
+            <equals arg1="${project.skin}" arg2="forrest-css"/>
+            <then>
+                <property name="project.new-skin-name" value="book-tab"/>
+            </then>
+        </elseif>
+        <elseif>
+            <equals arg1="${project.skin}" arg2="avalon-tigris"/>
+            <then>
+                <property name="project.new-skin-name" value="tigris-style-1_1"/>
+            </then>
+        </elseif>
+        <elseif>
+            <equals arg1="${project.skin}" arg2="tigris-style"/>
+            <then>
+                <property name="project.new-skin-name" value="tigris-style-1_1"/>
+            </then>
+        </elseif>
+    </if>
+    <if>
+        <isset property="project.new-skin-name"/>
+        <then>
+<echo>
+-- Warning --
+skin ${project.skin} no longer exists, using ${project.new-skin-name} instead.  Please update forrest.properties
+</echo>
+            <var name="project.skin" value="${project.new-skin-name}"/>
+        </then>
+    </if>
+
     <!-- echo settings in -Dforrest.echo=true mode -->
     <antcall target="echo-settings" />
   </target>

Modified: forrest/trunk/src/core/fresh-site/forrest.properties
==============================================================================
--- forrest/trunk/src/core/fresh-site/forrest.properties	(original)
+++ forrest/trunk/src/core/fresh-site/forrest.properties	Wed Jul 28 13:26:27 2004
@@ -24,9 +24,9 @@
 #project.name=my-project
 
 # Specifies name of Forrest skin to use
-#project.skin=forrest-site
-#project.skin=krysalis-site
-#project.skin=tigris-style
+#project.skin=book-tab
+#project.skin=tigris-style-1_1
+#project.skin=css-style-dev
 
 # comma seperated list, file:/// is supported
 #forrest.skins.descriptors=http://forrest.apache.org/skins/skins.xml,file:///c:/myskins/skins.xml

Modified: forrest/trunk/src/core/var/skinlist2fetch.xsl
==============================================================================
--- forrest/trunk/src/core/var/skinlist2fetch.xsl	(original)
+++ forrest/trunk/src/core/var/skinlist2fetch.xsl	Wed Jul 28 13:26:27 2004
@@ -22,42 +22,50 @@
 
    <xsl:template match="skins">
       <project default="fetchskin">
-      
-         <target name="fetchskin" depends="fetch-versioned-skin, fetch-unversioned-skin, final-check"/>
-
-         <target name="fetch-versioned-skin">
-            <echo>Trying to get "<xsl:value-of select="$skin-name" />" skin version 
-                  <xsl:value-of select="$forrest-version" />...</echo>
-            <get verbose="true" usetimestamp="true" ignoreerrors="true">
-               <xsl:attribute name="src"><xsl:value-of select="skin[@name=$skin-name]/@url" /><xsl:value-of select="$skin-name" />-<xsl:value-of select="$forrest-version" />.zip</xsl:attribute>
-               <xsl:attribute name="dest">${forrest.home}/context/skins/<xsl:value-of select="$skin-name" />.zip</xsl:attribute>
-            </get>
-            <available property="versioned-skin.present">
-               <xsl:attribute name="file">${forrest.home}/context/skins/<xsl:value-of select="$skin-name" />.zip</xsl:attribute>
-            </available>
-         </target>
-
-         <target name="fetch-unversioned-skin" unless="versioned-skin.present">
-            <echo>Versioned skin unavailable, trying to get versionless skin...</echo>
-            <get verbose="true" usetimestamp="true" ignoreerrors="true">
-               <xsl:attribute name="src"><xsl:value-of select="skin[@name=$skin-name]/@url" /><xsl:value-of select="$skin-name" />.zip</xsl:attribute>
-               <xsl:attribute name="dest">${forrest.home}/context/skins/<xsl:value-of select="$skin-name" />.zip</xsl:attribute>
-            </get>
-         </target>
-
-         <target name="final-check">
-            <available property="skin.present">
-               <xsl:attribute name="file">${forrest.home}/context/skins/<xsl:value-of select="$skin-name" />.zip</xsl:attribute>
-            </available>
-            <fail unless="skin.present">
-              Unable to download the 
-              "<xsl:value-of select="$skin-name" />" skin from 
-              <xsl:value-of select="skin[@name=$skin-name]/@url" />. 
-              In case the reason is the network connection, you can try 
-              installing the package manually by placing the file in the 
-              skins directory.</fail>
-            <echo>Skin "<xsl:value-of select="$skin-name" />" correctly installed.</echo>
-         </target>
+        <xsl:choose>
+         <xsl:when test="skin[@name=$skin-name]/@url">
+             <target name="fetchskin" depends="fetch-versioned-skin, fetch-unversioned-skin, final-check"/>
+    
+             <target name="fetch-versioned-skin">
+                <echo>Trying to get "<xsl:value-of select="$skin-name" />" skin version 
+                      <xsl:value-of select="$forrest-version" />...</echo>
+                <get verbose="true" usetimestamp="true" ignoreerrors="true">
+                   <xsl:attribute name="src"><xsl:value-of select="skin[@name=$skin-name]/@url" /><xsl:value-of select="$skin-name" />-<xsl:value-of select="$forrest-version" />.zip</xsl:attribute>
+                   <xsl:attribute name="dest">${forrest.home}/context/skins/<xsl:value-of select="$skin-name" />.zip</xsl:attribute>
+                </get>
+                <available property="versioned-skin.present">
+                   <xsl:attribute name="file">${forrest.home}/context/skins/<xsl:value-of select="$skin-name" />.zip</xsl:attribute>
+                </available>
+             </target>
+    
+             <target name="fetch-unversioned-skin" unless="versioned-skin.present">
+                <echo>Versioned skin unavailable, trying to get versionless skin...</echo>
+                <get verbose="true" usetimestamp="true" ignoreerrors="true">
+                   <xsl:attribute name="src"><xsl:value-of select="skin[@name=$skin-name]/@url" /><xsl:value-of select="$skin-name" />.zip</xsl:attribute>
+                   <xsl:attribute name="dest">${forrest.home}/context/skins/<xsl:value-of select="$skin-name" />.zip</xsl:attribute>
+                </get>
+             </target>
+    
+             <target name="final-check">
+                <available property="skin.present">
+                   <xsl:attribute name="file">${forrest.home}/context/skins/<xsl:value-of select="$skin-name" />.zip</xsl:attribute>
+                </available>
+                <fail unless="skin.present">
+                  Unable to download the 
+                  "<xsl:value-of select="$skin-name" />" skin from 
+                  <xsl:value-of select="skin[@name=$skin-name]/@url" />. 
+                  In case the reason is the network connection, you can try 
+                  installing the package manually by placing the file in the 
+                  skins directory.</fail>
+                <echo>Skin "<xsl:value-of select="$skin-name" />" correctly installed.</echo>
+             </target>
+        </xsl:when>
+        <xsl:otherwise>
+            <target name="fetchskin">
+                <fail>There is no "<xsl:value-of select="$skin-name" />" skin available.</fail>
+            </target>
+        </xsl:otherwise>
+        </xsl:choose>
       </project>
    </xsl:template>
 

Modified: forrest/trunk/src/documentation/content/xdocs/docs/upgrading_06.xml
==============================================================================
--- forrest/trunk/src/documentation/content/xdocs/docs/upgrading_06.xml	(original)
+++ forrest/trunk/src/documentation/content/xdocs/docs/upgrading_06.xml	Wed Jul 28 13:26:27 2004
@@ -184,6 +184,23 @@
       </p>
     </section>
 
+    <section id="skin-names">
+      <title>Skins renamed and deleted</title>
+      <p>These skins were renamed; old names still work but may not in future releases.</p>
+      <table>
+        <tr><th>0.5 Name</th><th>0.6 Name</th></tr>
+        <tr><td>krysalis-site</td><td>book-tab</td></tr>
+        <tr><td>tigris-style</td><td>tigris-style-1_1</td></tr>
+      </table>
+      <p>Deleted skins; old names still work but may not in future releases.</p>
+      <table>
+        <tr><th>0.5 Name</th><th>0.6 Alias</th></tr>
+        <tr><td>forrest-site</td><td>book-tab</td></tr>
+        <tr><td>forrest-css</td><td>book-tab</td></tr>
+        <tr><td>avalon-tigris</td><td>tigris-style-1_1</td></tr>
+      </table>
+    </section>
+
     <section>
       <title>To be continued...</title>
       <p>...as more issues are discovered/remembered :)  Please send feedback

Modified: forrest/trunk/status.xml
==============================================================================
--- forrest/trunk/status.xml	(original)
+++ forrest/trunk/status.xml	Wed Jul 28 13:26:27 2004
@@ -51,7 +51,9 @@
         <link href="site:upgrading_06">upgrading to v0.6</link>
       </action>
       <action dev="DB" type="remove" context="skins">
-        Skin 'forrest-css' deleted.
+        Skins forrest-css, forrest-site and avalon-tigris deleted; krysalis-site
+        renamed to book-tab and tigris-style renamed to tigris-style-1_1.  Aliases
+        set in place for backward-compatibility.
       </action>
       <action dev="AG" type="update" context="core">
         Updated Ant 1.6.2.