You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@roller.apache.org by gm...@apache.org on 2014/07/23 14:08:19 UTC
svn commit: r1612822 - in /roller/trunk/app/src/main:
java/org/apache/roller/weblogger/business/startup/
java/org/apache/roller/weblogger/util/
resources/org/apache/roller/weblogger/pojos/ resources/sql/
Author: gmazza
Date: Wed Jul 23 12:08:18 2014
New Revision: 1612822
URL: http://svn.apache.org/r1612822
Log:
Rename rolleruser to roller_user to make consistent with the other 'roller_ ...'-named tables.
Modified:
roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/startup/DatabaseInstaller.java
roller/trunk/app/src/main/java/org/apache/roller/weblogger/util/PasswordUtility.java
roller/trunk/app/src/main/resources/org/apache/roller/weblogger/pojos/User.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/java/org/apache/roller/weblogger/business/startup/DatabaseInstaller.java
URL: http://svn.apache.org/viewvc/roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/startup/DatabaseInstaller.java?rev=1612822&r1=1612821&r2=1612822&view=diff
==============================================================================
--- roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/startup/DatabaseInstaller.java (original)
+++ roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/startup/DatabaseInstaller.java Wed Jul 23 12:08:18 2014
@@ -73,7 +73,8 @@ public class DatabaseInstaller {
con = db.getConnection();
// just check for a couple key Roller tables
- if (tableExists(con, "rolleruser") && tableExists(con, "userrole")) {
+ // roller_user table called rolleruser before Roller 5.1
+ if (tableExists(con, "userrole") && (tableExists(con, "roller_user") || tableExists(con, "rolleruser"))) {
return false;
}
Modified: roller/trunk/app/src/main/java/org/apache/roller/weblogger/util/PasswordUtility.java
URL: http://svn.apache.org/viewvc/roller/trunk/app/src/main/java/org/apache/roller/weblogger/util/PasswordUtility.java?rev=1612822&r1=1612821&r2=1612822&view=diff
==============================================================================
--- roller/trunk/app/src/main/java/org/apache/roller/weblogger/util/PasswordUtility.java (original)
+++ roller/trunk/app/src/main/java/org/apache/roller/weblogger/util/PasswordUtility.java Wed Jul 23 12:08:18 2014
@@ -145,7 +145,7 @@ public class PasswordUtility
{
Properties newprops = new Properties();
PreparedStatement userquery = con.prepareStatement(
- "select username,passphrase from rolleruser");
+ "select username,passphrase from roller_user");
ResultSet users = userquery.executeQuery();
while (users.next())
{
@@ -165,9 +165,9 @@ public class PasswordUtility
Connection con, String algorithm) throws Exception
{
PreparedStatement userQuery = con
- .prepareStatement("select username,passphrase from rolleruser");
+ .prepareStatement("select username,passphrase from roller_user");
PreparedStatement userUpdate = con
- .prepareStatement("update rolleruser set passphrase=? where username=?");
+ .prepareStatement("update roller_user set passphrase=? where username=?");
Properties props = new Properties();
ResultSet users = userQuery.executeQuery();
@@ -191,13 +191,13 @@ public class PasswordUtility
}
/**
- * Restore passwords in rolleruser and turn OFF encryption flag in rollerconfig
+ * Restore passwords in roller_user and turn OFF encryption flag in rollerconfig
*/
private static void encryptionOff(
Connection con, String fileName) throws Exception
{
PreparedStatement userUpdate = con
- .prepareStatement("update rolleruser set passphrase=? where username=?");
+ .prepareStatement("update roller_user set passphrase=? where username=?");
Properties props = new Properties();
props.load(new FileInputStream(fileName));
@@ -221,7 +221,7 @@ public class PasswordUtility
throws Exception
{
PreparedStatement userUpdate =
- con.prepareStatement("update rolleruser set passphrase=? where username=?");
+ con.prepareStatement("update roller_user set passphrase=? where username=?");
String newPassword = Utilities.encodePassword(password, algorithm);
userUpdate.setString(1, newPassword);
@@ -237,7 +237,7 @@ public class PasswordUtility
// Find userid of specified user
String userid;
PreparedStatement userQuery = con.prepareStatement(
- "select id from rolleruser where username=?");
+ "select id from roller_user where username=?");
userQuery.setString(1, userName);
ResultSet userRS = userQuery.executeQuery();
if (!userRS.next()) {
@@ -275,7 +275,7 @@ public class PasswordUtility
// Find userid of specified user
String userid;
PreparedStatement userQuery = con.prepareStatement(
- "select id from rolleruser where username=?");
+ "select id from roller_user where username=?");
userQuery.setString(1, userName);
ResultSet userRS = userQuery.executeQuery();
if (!userRS.next())
Modified: roller/trunk/app/src/main/resources/org/apache/roller/weblogger/pojos/User.orm.xml
URL: http://svn.apache.org/viewvc/roller/trunk/app/src/main/resources/org/apache/roller/weblogger/pojos/User.orm.xml?rev=1612822&r1=1612821&r2=1612822&view=diff
==============================================================================
--- roller/trunk/app/src/main/resources/org/apache/roller/weblogger/pojos/User.orm.xml (original)
+++ roller/trunk/app/src/main/resources/org/apache/roller/weblogger/pojos/User.orm.xml Wed Jul 23 12:08:18 2014
@@ -5,7 +5,7 @@
<package>org.apache.roller.weblogger.pojos</package>
<entity metadata-complete="true" name="User" class="org.apache.roller.weblogger.pojos.User"
access="PROPERTY">
- <table name="rolleruser"/>
+ <table name="roller_user"/>
<named-query name="User.getAll">
<query>SELECT u FROM User u</query>
</named-query>
@@ -18,9 +18,6 @@
<named-query name="User.getByEnabled&EndDateOrderByStartDateDesc">
<query>SELECT u FROM User u WHERE u.enabled = ?1 AND u.dateCreated < ?2 ORDER BY u.dateCreated DESC</query>
</named-query>
- <named-query name="User.getByEnabled&EndDate&StartDate">
- <query>SELECT u FROM User u WHERE u.enabled = ?1 AND u.dateCreated < ?2 AND u.dateCreated > ?3</query>
- </named-query>
<named-query name="User.getByEnabled&EndDate&StartDateOrderByStartDateDesc">
<query>SELECT u FROM User u WHERE u.enabled = ?1 AND u.dateCreated < ?2 AND u.dateCreated > ?3 ORDER BY u.dateCreated DESC</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=1612822&r1=1612821&r2=1612822&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 Wed Jul 23 12:08:18 2014
@@ -6,6 +6,7 @@ DON'T RUN THIS, IT'S NOT A DATABASE CREA
#renameTable('website' 'weblog')
#renameTable('folder' 'bookmark_folder')
+#renameTable('rolleruser' 'roller_user')
create table custom_template_rendition (
id varchar(48) not null primary key,
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=1612822&r1=1612821&r2=1612822&view=diff
==============================================================================
--- roller/trunk/app/src/main/resources/sql/createdb.vm (original)
+++ roller/trunk/app/src/main/resources/sql/createdb.vm Wed Jul 23 12:08:18 2014
@@ -9,7 +9,7 @@ DON'T RUN THIS, IT'S NOT A DATABASE CREA
-- *****************************************************
-- Create the tables and indices
-create table rolleruser (
+create table roller_user (
id varchar(48) not null primary key,
username varchar(255) not null,
passphrase varchar(255) not null,
@@ -22,7 +22,7 @@ create table rolleruser (
timezone varchar(50),
isenabled $db.BOOLEAN_SQL_TYPE_TRUE not null
);
-alter table rolleruser add constraint ru_username_uq unique ( username$!db.INDEXSIZE );
+alter table roller_user add constraint ru_username_uq unique ( username$!db.INDEXSIZE );
create table userrole (
id varchar(48) not null primary key,
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=1612822&r1=1612821&r2=1612822&view=diff
==============================================================================
--- roller/trunk/app/src/main/resources/sql/droptables.sql (original)
+++ roller/trunk/app/src/main/resources/sql/droptables.sql Wed Jul 23 12:08:18 2014
@@ -34,7 +34,7 @@ drop table pingqueueentry;
drop table autoping;
drop table pingtarget;
drop table bookmark;
-drop table folder;
+drop table bookmark_folder;
drop table roller_userattribute;
drop table roller_mediafiletag;
drop table roller_mediafile;
@@ -49,14 +49,14 @@ drop table roller_weblogentrytagagg;
drop table entryattribute;
drop table weblogentry;
drop table weblogcategory;
-drop table webpage;
+drop table weblog_custom_template;
drop table custom_template_rendition;
-- core platform tables
drop table roller_permission;
-drop table website;
+drop table weblog;
drop table userrole;
-drop table rolleruser;
+drop table roller_user;
-- oauth tables
drop table roller_oauthconsumer;