Author: gmazza
Date: Sat May 31 15:13:14 2014
New Revision: 1598882
URL: http://svn.apache.org/r1598882
Log:
ROL-2000 Standardize ROL_ prefix back to ROLLER_ for two tables.
Modified:
roller/trunk/app/src/main/resources/org/apache/roller/weblogger/pojos/WeblogThemeAssoc.orm.xml
roller/trunk/app/src/main/resources/org/apache/roller/weblogger/pojos/WeblogThemeTemplateCode.orm.xml
roller/trunk/app/src/main/resources/sql/500-to-510-migration.vm
roller/trunk/app/src/main/resources/sql/createdb.vm
roller/trunk/app/src/main/resources/sql/droptables.sql
Modified:
roller/trunk/app/src/main/resources/org/apache/roller/weblogger/pojos/WeblogThemeAssoc.orm.xml
URL:
http://svn.apache.org/viewvc/roller/trunk/app/src/main/resources/org/apache/roller/weblogger/pojos/WeblogThemeAssoc.orm.xml?rev=1598882&r1=1598881&r2=1598882&view=diff
==============================================================================
---
roller/trunk/app/src/main/resources/org/apache/roller/weblogger/pojos/WeblogThemeAssoc.orm.xml
(original)
+++
roller/trunk/app/src/main/resources/org/apache/roller/weblogger/pojos/WeblogThemeAssoc.orm.xml
Sat May 31 15:13:14 2014
@@ -6,7 +6,7 @@
<package>org.apache.roller.weblogger.pojos</package>
<entity metadata-complete="true" name="WeblogThemeAssoc"
class="org.apache.roller.weblogger.pojos.WeblogThemeAssoc"
access="PROPERTY">
- <table name="rol_weblogtheme"/>
+ <table name="roller_weblogtheme"/>
<named-query name="WeblogThemeAssoc.getThemeAssocByType">
<query>SELECT a FROM WeblogThemeAssoc a WHERE a.weblog = ?1 AND
a.type =?2</query>
</named-query>
Modified:
roller/trunk/app/src/main/resources/org/apache/roller/weblogger/pojos/WeblogThemeTemplateCode.orm.xml
URL:
http://svn.apache.org/viewvc/roller/trunk/app/src/main/resources/org/apache/roller/weblogger/pojos/WeblogThemeTemplateCode.orm.xml?rev=1598882&r1=1598881&r2=1598882&view=diff
==============================================================================
---
roller/trunk/app/src/main/resources/org/apache/roller/weblogger/pojos/WeblogThemeTemplateCode.orm.xml
(original)
+++
roller/trunk/app/src/main/resources/org/apache/roller/weblogger/pojos/WeblogThemeTemplateCode.orm.xml
Sat May 31 15:13:14 2014
@@ -6,7 +6,7 @@
<package>org.apache.roller.weblogger.pojos</package>
<entity metadata-complete="true" name="WeblogThemeTemplateCode"
class="org.apache.roller.weblogger.pojos.WeblogThemeTemplateCode"
access="PROPERTY">
- <table name="rol_templatecode"/>
+ <table name="roller_templatecode"/>
<named-query name="WeblogThemeTemplateCode.getTemplateCodeByType">
<query>SELECT c FROM WeblogThemeTemplateCode c WHERE c.templateId
= ?1 AND c.type =?2</query>
</named-query>
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=1598882&r1=1598881&r2=1598882&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 Sat May 31
15:13:14 2014
@@ -4,7 +4,7 @@
DON'T RUN THIS, IT'S NOT A DATABASE CREATION SCRIPT!!!
**#
-create table rol_weblogtheme (
+create table roller_weblogtheme (
id varchar(48) not null primary key,
weblogid varchar(48) not null,
name varchar(255) not null,
@@ -12,7 +12,7 @@ create table rol_weblogtheme (
#columnNotNullWithDefault('type' 'varchar(16)' 'standard')
);
-create table rol_templatecode (
+create table roller_templatecode (
id varchar(48) not null primary key,
templateid varchar(48) not null,
template $db.TEXT_SQL_TYPE not null,
Modified: roller/trunk/app/src/main/resources/sql/createdb.vm
URL:
http://svn.apache.org/viewvc/roller/trunk/app/src/main/resources/sql/createdb.vm?rev=1598882&r1=1598881&r2=1598882&view=diff
==============================================================================
--- roller/trunk/app/src/main/resources/sql/createdb.vm (original)
+++ roller/trunk/app/src/main/resources/sql/createdb.vm Sat May 31 15:13:14 2014
@@ -143,7 +143,7 @@ alter table website add constraint ws_ha
-- create index ws_handle_idx on website(handle);
-create table rol_weblogtheme (
+create table roller_weblogtheme (
id varchar(48) not null primary key,
weblogid varchar(48) not null,
name varchar(255) not null,
@@ -151,7 +151,7 @@ create table rol_weblogtheme (
#columnNotNullWithDefault('type' 'varchar(16)' 'standard')
);
-create table rol_templatecode (
+create table roller_templatecode (
id varchar(48) not null primary key,
templateid varchar(48) not null,
template $db.TEXT_SQL_TYPE not null,
Modified: roller/trunk/app/src/main/resources/sql/droptables.sql
URL:
http://svn.apache.org/viewvc/roller/trunk/app/src/main/resources/sql/droptables.sql?rev=1598882&r1=1598881&r2=1598882&view=diff
==============================================================================
--- roller/trunk/app/src/main/resources/sql/droptables.sql (original)
+++ roller/trunk/app/src/main/resources/sql/droptables.sql Sat May 31 15:13:14
2014
@@ -50,8 +50,8 @@ drop table entryattribute;
drop table weblogentry;
drop table weblogcategory;
drop table webpage;
-drop table rol_weblogtheme;
-drop table rol_templatecode;
+drop table roller_weblogtheme;
+drop table roller_templatecode;
-- core platform tables
drop table roller_permission;
