svn commit: r1612004 - in /roller/trunk/app/src/main: resources/sql/500-to-510-migration.vm resources/sql/macros.vm webapp/WEB-INF/jsps/editor/CategoryEdit.jsp

[gm...@apache.org]

Author: gmazza
Date: Sun Jul 20 02:20:14 2014
New Revision: 1612004

URL: http://svn.apache.org/r1612004
Log:
ROL-2039 tested 5.0.4 to 5.1-SNAPSHOT upgrade on renamed tables, all look good.

Modified:
    roller/trunk/app/src/main/resources/sql/500-to-510-migration.vm
    roller/trunk/app/src/main/resources/sql/macros.vm
    roller/trunk/app/src/main/webapp/WEB-INF/jsps/editor/CategoryEdit.jsp

Modified: roller/trunk/app/src/main/resources/sql/500-to-510-migration.vm
URL: http://svn.apache.org/viewvc/roller/trunk/app/src/main/resources/sql/500-to-510-migration.vm?rev=1612004&r1=1612003&r2=1612004&view=diff
==============================================================================
--- roller/trunk/app/src/main/resources/sql/500-to-510-migration.vm (original)
+++ roller/trunk/app/src/main/resources/sql/500-to-510-migration.vm Sun Jul 20 02:20:14 2014
@@ -12,13 +12,13 @@ create table custom_template_rendition (
     #columnNotNullWithDefault('type' 'varchar(16)' 'STANDARD')
 );
 
-insert into custom_template_rendition(id, templateid, template, templatelang, contenttype, type)
-select id, id, template, templatelang, outputtype, 'STANDARD' from webpage;
+insert into custom_template_rendition(id, templateid, template, templatelang, type)
+select id, id, template, templatelang, 'STANDARD' from webpage;
 
-#renameTable('webpage', 'weblog_custom_template')
-#dropColumn('weblog_custom_template', 'template')
-#dropColumn('weblog_custom_template', 'templatelang')
-#dropColumn('weblog_custom_template', 'decorator')
+#renameTable('webpage' 'weblog_custom_template')
+#dropColumn('weblog_custom_template' 'template')
+#dropColumn('weblog_custom_template' 'templatelang')
+#dropColumn('weblog_custom_template' 'decorator')
 
 
 #addColumnNull("weblogentry" "search_description"  "varchar(255)")
@@ -34,7 +34,7 @@ delete from weblogcategory where name = 
 -- Removal of custom ping targets
 delete from pingtarget where websiteid is not null;
 #dropIndex("pingtarget" "pt_websiteid_fk")
-#dropColumn("pingtarget", "websiteid")
+#dropColumn("pingtarget" "websiteid")
 
 -- Removal of bookmark subfolders and renaming of former root folder to 'default'
 -- If a folder with name 'default' already exists, rename it by adding its id to it.

Modified: roller/trunk/app/src/main/resources/sql/macros.vm
URL: http://svn.apache.org/viewvc/roller/trunk/app/src/main/resources/sql/macros.vm?rev=1612004&r1=1612003&r2=1612004&view=diff
==============================================================================
--- roller/trunk/app/src/main/resources/sql/macros.vm (original)
+++ roller/trunk/app/src/main/resources/sql/macros.vm Sun Jul 20 02:20:14 2014
@@ -115,12 +115,8 @@ drop index $indexName on $tableName;
 
 
 #macro(dropColumn $tableName $columnName)
-#if ($db.DBTYPE == "DERBY")
--- You should alter table $tableName drop column $columnName;
-#else
 alter table $tableName drop column $columnName;
 #end
-#end
 
 
 #macro(dropTableIfExists $tableName) 

Modified: roller/trunk/app/src/main/webapp/WEB-INF/jsps/editor/CategoryEdit.jsp
URL: http://svn.apache.org/viewvc/roller/trunk/app/src/main/webapp/WEB-INF/jsps/editor/CategoryEdit.jsp?rev=1612004&r1=1612003&r2=1612004&view=diff
==============================================================================
--- roller/trunk/app/src/main/webapp/WEB-INF/jsps/editor/CategoryEdit.jsp (original)
+++ roller/trunk/app/src/main/webapp/WEB-INF/jsps/editor/CategoryEdit.jsp Sun Jul 20 02:20:14 2014
@@ -34,7 +34,7 @@
         </tr>
         
         <tr>
-            <td><s:text name="categoryForm.description" /></td>
+            <td><s:text name="generic.description" /></td>
             <td><s:textarea name="bean.description" rows="5" cols="50" /></td>
         </tr>