forrest-svn mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From nicola...@apache.org
Subject svn commit: rev 43426 - in forrest/trunk/src: core java/org/apache/forrest/conf
Date Mon, 06 Sep 2004 20:53:32 GMT
Author: nicolaken
Date: Mon Sep  6 13:53:31 2004
New Revision: 43426

Modified:
   forrest/trunk/src/core/forrest.build.xml
   forrest/trunk/src/java/org/apache/forrest/conf/ForrestConfUtils.java
Log:
switching back to krysalis-site in a similar manner to forrest-site, urging to upgrade to
pelt

Modified: forrest/trunk/src/core/forrest.build.xml
==============================================================================
--- forrest/trunk/src/core/forrest.build.xml	(original)
+++ forrest/trunk/src/core/forrest.build.xml	Mon Sep  6 13:53:31 2004
@@ -143,7 +143,8 @@
     <!-- 
     Skin aliasing for backwards compatability
         0.5 => 0.6
-        krysalis-site => crust
+        krysalis-site => ... warn about future removal
+        crust => ... warn about future removal
         forrest-site => ... warn about future removal
         forrest-css => pelt
         avalon-tigris => tigris
@@ -152,36 +153,44 @@
     This must be kept in sync with ForrestConfModule.java/aliasSkinProperties()
     -->
     <if>
-        <equals arg1="${project.skin}" arg2="krysalis-site"/>
+        <equals arg1="${project.skin}" arg2="forrest-css"/>
         <then>
-            <property name="project.new-skin-name" value="crust"/>
+            <property name="project.new-skin-name" value="pelt"/>
         </then>
-        <!-- temporarily bring back forrest-site
         <elseif>
-            <equals arg1="${project.skin}" arg2="forrest-site"/>
+            <equals arg1="${project.skin}" arg2="avalon-tigris"/>
             <then>
-                <property name="project.new-skin-name" value="crust"/>
+                <property name="project.new-skin-name" value="tigris"/>
             </then>
         </elseif>
-        -->
         <elseif>
-            <equals arg1="${project.skin}" arg2="forrest-css"/>
+            <equals arg1="${project.skin}" arg2="tigris-style"/>
             <then>
-                <property name="project.new-skin-name" value="pelt"/>
+                <property name="project.new-skin-name" value="tigris"/>
             </then>
         </elseif>
         <elseif>
-            <equals arg1="${project.skin}" arg2="avalon-tigris"/>
+            <equals arg1="${project.skin}" arg2="crust"/>
             <then>
-                <property name="project.new-skin-name" value="tigris"/>
+                <property name="project.new-skin-name" value="krysalis-site"/>
             </then>
         </elseif>
+        <!-- temporarily bring back krysalis-site
         <elseif>
-            <equals arg1="${project.skin}" arg2="tigris-style"/>
+            <equals arg1="${project.skin}" arg2="krysalis-site"/>
             <then>
-                <property name="project.new-skin-name" value="tigris"/>
+                <property name="project.new-skin-name" value="pelt"/>
+            </then>
+        </elseif>
+        -->
+        <!-- temporarily bring back forrest-site
+        <elseif>
+            <equals arg1="${project.skin}" arg2="forrest-site"/>
+            <then>
+                <property name="project.new-skin-name" value="crust"/>
             </then>
         </elseif>
+        -->        
     </if>
     <if>
         <isset property="project.new-skin-name"/>
@@ -204,12 +213,17 @@
         </then>
     </if>
     <if>
-      <equals arg1="${project.skin}" arg2="forrest-site"/>
+      <or>
+          <equals arg1="${project.skin}" arg2="forrest-site"/>
+          <equals arg1="${project.skin}" arg2="krysalis-site"/>
+          <equals arg1="${project.skin}" arg2="crust"/>
+      </or>
       <then>
 <echo>
 -- Warning --
 Using skin "${project.skin}" which is deprecated.
-Please migrate to one of the new skins listed in forrest.properties
+Please migrate to one of the new skins listed in forrest.properties.
+The skin that most likely resembles these ones is called 'pelt'.
 </echo>
       </then>
     </if>

Modified: forrest/trunk/src/java/org/apache/forrest/conf/ForrestConfUtils.java
==============================================================================
--- forrest/trunk/src/java/org/apache/forrest/conf/ForrestConfUtils.java	(original)
+++ forrest/trunk/src/java/org/apache/forrest/conf/ForrestConfUtils.java	Mon Sep  6 13:53:31
2004
@@ -97,8 +97,8 @@
      */
     public static void aliasSkinProperties(AntProperties props) {
         String skinName = props.getProperty("project.skin");
-        if (skinName.equals("krysalis-site")) {
-            setSkinToUse(props, "crust");
+        if (skinName.equals("crust")) {
+            setSkinToUse(props, "krysalis-site");
         } else if (skinName.equals("avalon-tigris")
                         || skinName.equals("tigris-style")) {
             setSkinToUse(props, "tigris");

Mime
View raw message