svn commit: rev 37368 - in forrest/trunk/src: core java/org/apache/forrest/conf

[cr...@apache.org]

Author: crossley
Date: Thu Sep  2 03:37:07 2004
New Revision: 37368

Modified:
   forrest/trunk/src/core/forrest.build.xml
   forrest/trunk/src/java/org/apache/forrest/conf/ForrestConfUtils.java
Log:
resurrect the old forrest-ste skin to enable deprecation


Modified: forrest/trunk/src/core/forrest.build.xml
==============================================================================
--- forrest/trunk/src/core/forrest.build.xml	(original)
+++ forrest/trunk/src/core/forrest.build.xml	Thu Sep  2 03:37:07 2004
@@ -144,7 +144,7 @@
     Skin aliasing for backwards compatability
         0.5 => 0.6
         krysalis-site => crust
-        forrest-site => crust
+        forrest-site => ... warn about future removal
         forrest-css => crust
         avalon-tigris => tigris
         tigris-style => tigris
@@ -156,12 +156,14 @@
         <then>
             <property name="project.new-skin-name" value="crust"/>
         </then>
+        <!-- temporarily bring back forrest-site
         <elseif>
             <equals arg1="${project.skin}" arg2="forrest-site"/>
             <then>
                 <property name="project.new-skin-name" value="crust"/>
             </then>
         </elseif>
+        -->
         <elseif>
             <equals arg1="${project.skin}" arg2="forrest-css"/>
             <then>
@@ -186,10 +188,20 @@
         <then>
 <echo>
 -- Warning --
-skin ${project.skin} no longer exists, using ${project.new-skin-name} instead.  Please update forrest.properties
+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>
+    <if>
+      <equals arg1="${project.skin}" arg2="forrest-site"/>
+      <then>
+<echo>
+-- Warning --
+Using skin "${project.skin}" which is deprecated.
+Please migrate to one of the new skins listed in forrest.properties
+</echo>
+      </then>
     </if>
 
     <!-- echo settings in -Dforrest.echo=true mode -->

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	Thu Sep  2 03:37:07 2004
@@ -98,7 +98,7 @@
     public static void aliasSkinProperties(AntProperties props) {
         // AntProperties.setProperty doesn't let you override, so we have to remove the property then add it again
         String skinName = props.getProperty("project.skin");
-        if (skinName.equals("krysalis-site") || skinName.equals("forrest-site")
+        if (skinName.equals("krysalis-site")
                         || skinName.equals("forrest-css")) {
             props.remove("project.skin");
             props.setProperty("project.skin", "crust");
@@ -109,4 +109,4 @@
         }
     }
 
-}
\ No newline at end of file
+}