forrest-svn mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From nicola...@apache.org
Subject svn commit: rev 35732 - in forrest/trunk: . src/core src/core/context/skins/crust src/core/context/skins/pelt-dev src/core/context/skins/tigris src/documentation/content/xdocs/docs src/java/org/apache/forrest/conf src/java/org/apache/forrest/skinconf
Date Thu, 05 Aug 2004 09:21:11 GMT
Author: nicolaken
Date: Thu Aug  5 02:21:09 2004
New Revision: 35732

Added:
   forrest/trunk/src/core/context/skins/crust/
      - copied from rev 35731, forrest/trunk/src/core/context/skins/book-tab/
   forrest/trunk/src/core/context/skins/pelt-dev/
      - copied from rev 35731, forrest/trunk/src/core/context/skins/css-style-dev/
   forrest/trunk/src/core/context/skins/tigris/
      - copied from rev 35731, forrest/trunk/src/core/context/skins/tigris-style-1_1/
Removed:
   forrest/trunk/src/java/org/apache/forrest/skinconf/
Modified:
   forrest/trunk/src/core/forrest.build.xml
   forrest/trunk/src/documentation/content/xdocs/docs/upgrading_06.xml
   forrest/trunk/src/java/org/apache/forrest/conf/ForrestConfModule.java
   forrest/trunk/status.xml
Log:
book-tab -> crust
tigris-style-1-1 -> tigris

Modified: forrest/trunk/src/core/forrest.build.xml
==============================================================================
--- forrest/trunk/src/core/forrest.build.xml	(original)
+++ forrest/trunk/src/core/forrest.build.xml	Thu Aug  5 02:21:09 2004
@@ -145,41 +145,41 @@
     <!-- 
     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 
+        krysalis-site => crust
+        forrest-site => crust
+        forrest-css => crust
+        avalon-tigris => tigris
+        tigris-style => tigris
         
     This must be kept in sync with ForrestConfModule.java/aliasSkinProperties()
     -->
     <if>
         <equals arg1="${project.skin}" arg2="krysalis-site"/>
         <then>
-            <property name="project.new-skin-name" value="book-tab"/>
+            <property name="project.new-skin-name" value="crust"/>
         </then>
         <elseif>
             <equals arg1="${project.skin}" arg2="forrest-site"/>
             <then>
-                <property name="project.new-skin-name" value="book-tab"/>
+                <property name="project.new-skin-name" value="crust"/>
             </then>
         </elseif>
         <elseif>
             <equals arg1="${project.skin}" arg2="forrest-css"/>
             <then>
-                <property name="project.new-skin-name" value="book-tab"/>
+                <property name="project.new-skin-name" value="crust"/>
             </then>
         </elseif>
         <elseif>
             <equals arg1="${project.skin}" arg2="avalon-tigris"/>
             <then>
-                <property name="project.new-skin-name" value="tigris-style-1_1"/>
+                <property name="project.new-skin-name" value="tigris"/>
             </then>
         </elseif>
         <elseif>
             <equals arg1="${project.skin}" arg2="tigris-style"/>
             <then>
-                <property name="project.new-skin-name" value="tigris-style-1_1"/>
+                <property name="project.new-skin-name" value="tigris"/>
             </then>
         </elseif>
     </if>

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	Thu Aug  5 02:21:09
2004
@@ -238,15 +238,15 @@
       <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>
+        <tr><td>krysalis-site</td><td>crust</td></tr>
+        <tr><td>tigris-style</td><td>tigris</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>
+        <tr><td>forrest-site</td><td>crust</td></tr>
+        <tr><td>forrest-css</td><td>crust</td></tr>
+        <tr><td>avalon-tigris</td><td>tigris</td></tr>
       </table>
     </section>
 

Modified: forrest/trunk/src/java/org/apache/forrest/conf/ForrestConfModule.java
==============================================================================
--- forrest/trunk/src/java/org/apache/forrest/conf/ForrestConfModule.java	(original)
+++ forrest/trunk/src/java/org/apache/forrest/conf/ForrestConfModule.java	Thu Aug  5 02:21:09
2004
@@ -169,11 +169,11 @@
 		if (skinName.equals("krysalis-site") || skinName.equals("forrest-site")
 				|| skinName.equals("forrest-css")) {
 			props.remove("project.skin");
-			props.setProperty("project.skin", "book-tab");
+			props.setProperty("project.skin", "crust");
 		} else if (skinName.equals("avalon-tigris")
 				|| skinName.equals("tigris-style")) {
 			props.remove("project.skin");
-			props.setProperty("project.skin", "tigris-style-1_1");
+			props.setProperty("project.skin", "tigris");
 		}
 	}
 

Modified: forrest/trunk/status.xml
==============================================================================
--- forrest/trunk/status.xml	(original)
+++ forrest/trunk/status.xml	Thu Aug  5 02:21:09 2004
@@ -64,7 +64,7 @@
       </action>
       <action dev="DB" type="remove" context="skins" fixes-bug="FOR-181">
         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
+        renamed to crust and tigris-style renamed to tigris.  Aliases
         set in place for backward-compatibility.
       </action>
       <action dev="AG" type="update" context="core">

Mime
View raw message