Changed column name "naturalRoomName" to "naturalName".

git-svn-id: http://svn.igniterealtime.org/svn/repos/messenger/trunk@230 b35dd754-fafc-0310-a699-88a17e54d16e

src/database/messenger_db2.sql

@@ -150,7 +150,7 @@ CREATE TABLE mucRoom (
   creationDate        CHAR(15)      NOT NULL,
   modificationDate    CHAR(15)      NOT NULL,
   name                VARCHAR(50)   NOT NULL,
-  naturalRoomName     VARCHAR(255)  NOT NULL,
+  naturalName         VARCHAR(255)  NOT NULL,
   description         VARCHAR(255),
   canChangeSubject    INTEGER       NOT NULL,
   maxUsers            INTEGER       NOT NULL,

src/database/messenger_hsqldb.sql

@@ -152,7 +152,7 @@ CREATE TABLE mucRoom (
   creationDate        CHAR(15)      NOT NULL,
   modificationDate    CHAR(15)      NOT NULL,
   name                VARCHAR(50)   NOT NULL,
-  naturalRoomName     VARCHAR(255)  NOT NULL,
+  naturalName         VARCHAR(255)  NOT NULL,
   description         VARCHAR(255),
   canChangeSubject    INTEGER       NOT NULL,
   maxUsers            INTEGER       NOT NULL,

src/database/messenger_mysql.sql

@@ -137,7 +137,7 @@ CREATE TABLE mucRoom (
   creationDate        CHAR(15)      NOT NULL,
   modificationDate    CHAR(15)      NOT NULL,
   name                VARCHAR(50)   NOT NULL,
-  naturalRoomName     VARCHAR(255)  NOT NULL,
+  naturalName         VARCHAR(255)  NOT NULL,
   description         VARCHAR(255),
   canChangeSubject    TINYINT       NOT NULL,
   maxUsers            INTEGER       NOT NULL,

src/database/messenger_oracle.sql

@@ -172,7 +172,7 @@ CREATE TABLE mucRoom(
   creationDate        CHAR(15)      NOT NULL,
   modificationDate    CHAR(15)      NOT NULL,
   name                VARCHAR2(50)  NOT NULL,
-  naturalRoomName     VARCHAR2(255) NOT NULL,
+  naturalName         VARCHAR2(255) NOT NULL,
   description         VARCHAR2(255),
   canChangeSubject    INTEGER       NOT NULL,
   maxUsers            INTEGER       NOT NULL,

src/database/messenger_postgresql.sql

@@ -174,7 +174,7 @@ CREATE TABLE mucRoom (
   creationDate        CHAR(15)      NOT NULL,
   modificationDate    CHAR(15)      NOT NULL,
   name                VARCHAR(50)   NOT NULL,
-  naturalRoomName     VARCHAR(255)  NOT NULL,
+  naturalName         VARCHAR(255)  NOT NULL,
   description         VARCHAR(255),
   canChangeSubject    INTEGER       NOT NULL,
   maxUsers            INTEGER       NOT NULL,

src/database/messenger_sqlserver_2000.sql

@@ -174,7 +174,7 @@ CREATE TABLE mucRoom (
   creationDate        CHAR(15)      NOT NULL,
   modificationDate    CHAR(15)      NOT NULL,
   name                NVARCHAR(50)  NOT NULL,
-  naturalRoomName     NVARCHAR(255) NOT NULL,
+  naturalName         NVARCHAR(255) NOT NULL,
   description         NVARCHAR(255),
   canChangeSubject    INT           NOT NULL,
   maxUsers            INT           NOT NULL,

src/database/upgrade/1.1_to_2.0/messenger_db2.sql

@@ -17,7 +17,7 @@ CREATE TABLE mucRoom (
   creationDate        CHAR(15)      NOT NULL,
   modificationDate    CHAR(15)      NOT NULL,
   name                VARCHAR(50)   NOT NULL,
-  naturalRoomName     VARCHAR(255)  NOT NULL,
+  naturalName         VARCHAR(255)  NOT NULL,
   description         VARCHAR(255),
   canChangeSubject    INTEGER       NOT NULL,
   maxUsers            INTEGER       NOT NULL,

src/database/upgrade/1.1_to_2.0/messenger_hsqldb.sql

@@ -17,7 +17,7 @@ CREATE TABLE mucRoom (
   creationDate        CHAR(15)      NOT NULL,
   modificationDate    CHAR(15)      NOT NULL,
   name                VARCHAR(50)   NOT NULL,
-  naturalRoomName     VARCHAR(255)  NOT NULL,
+  naturalName         VARCHAR(255)  NOT NULL,
   description         VARCHAR(255),
   canChangeSubject    INTEGER       NOT NULL,
   maxUsers            INTEGER       NOT NULL,

src/database/upgrade/1.1_to_2.0/messenger_mysql.sql

@@ -17,7 +17,7 @@ CREATE TABLE mucRoom (
   creationDate        CHAR(15)      NOT NULL,
   modificationDate    CHAR(15)      NOT NULL,
   name                VARCHAR(50)   NOT NULL,
-  naturalRoomName     VARCHAR(255)  NOT NULL,
+  naturalName         VARCHAR(255)  NOT NULL,
   description         VARCHAR(255),
   canChangeSubject    TINYINT       NOT NULL,
   maxUsers            INTEGER       NOT NULL,

src/database/upgrade/1.1_to_2.0/messenger_oracle.sql

@@ -17,7 +17,7 @@ CREATE TABLE mucRoom(
   creationDate        CHAR(15)      NOT NULL,
   modificationDate    CHAR(15)      NOT NULL,
   name                VARCHAR2(50)  NOT NULL,
-  naturalRoomName     VARCHAR2(255) NOT NULL,
+  naturalName         VARCHAR2(255) NOT NULL,
   description         VARCHAR2(255),
   canChangeSubject    INTEGER       NOT NULL,
   maxUsers            INTEGER       NOT NULL,

src/database/upgrade/1.1_to_2.0/messenger_postgresql.sql

@@ -17,7 +17,7 @@ CREATE TABLE mucRoom (
   creationDate        CHAR(15)      NOT NULL,
   modificationDate    CHAR(15)      NOT NULL,
   name                VARCHAR(50)   NOT NULL,
-  naturalRoomName     VARCHAR(255)  NOT NULL,
+  naturalName         VARCHAR(255)  NOT NULL,
   description         VARCHAR(255),
   canChangeSubject    INTEGER       NOT NULL,
   maxUsers            INTEGER       NOT NULL,

src/database/upgrade/1.1_to_2.0/messenger_sqlserver_2000.sql

@@ -17,7 +17,7 @@ CREATE TABLE mucRoom (
   creationDate        CHAR(15)      NOT NULL,
   modificationDate    CHAR(15)      NOT NULL,
   name                NVARCHAR(50)  NOT NULL,
-  naturalRoomName     NVARCHAR(255) NOT NULL,
+  naturalName         NVARCHAR(255) NOT NULL,
   description         NVARCHAR(255),
   canChangeSubject    INT           NOT NULL,
   maxUsers            INT           NOT NULL,

src/java/org/jivesoftware/messenger/muc/spi/MUCPersistenceManager.java

@@ -41,14 +41,14 @@ import org.jivesoftware.util.StringUtils;
 public class MUCPersistenceManager {
 
     private static final String LOAD_ROOM_SURROGATES =
-        "SELECT roomID, name, naturalRoomName, description, canChangeSubject, maxUsers, " +
+        "SELECT roomID, name, naturalName, description, canChangeSubject, maxUsers, " +
         "moderated, invitationRequired, canInvite, " +
         "password, canDiscoverJID, logEnabled, subject, rolesToBroadcast " +
         "FROM mucRoom WHERE inMemory=0 and publicRoom=1";
     private static final String GET_RESERVED_NAME =
         "SELECT nickname FROM mucMember WHERE roomID=? AND jid=?";
     private static final String LOAD_ROOM =
-        "SELECT roomID, naturalRoomName, description, canChangeSubject, maxUsers, " +
+        "SELECT roomID, naturalName, description, canChangeSubject, maxUsers, " +
         "publicRoom, moderated, invitationRequired, canInvite, password, " +
         "canDiscoverJID, logEnabled, subject, rolesToBroadcast " +
         "FROM mucRoom WHERE name=?";
@@ -57,12 +57,12 @@ public class MUCPersistenceManager {
     private static final String LOAD_MEMBERS =
         "SELECT jid, nickname FROM mucMember WHERE roomID=?";
     private static final String UPDATE_ROOM = 
-        "UPDATE mucRoom SET modificationDate=?, naturalRoomName=?, description=?, " +
+        "UPDATE mucRoom SET modificationDate=?, naturalName=?, description=?, " +
         "canChangeSubject=?, maxUsers=?, publicRoom=?, moderated=?, invitationRequired=?, " +
         "canInvite=?, password=?, canDiscoverJID=?, logEnabled=?, rolesToBroadcast=?, " +
         "inMemory=? WHERE roomID=?";
     private static final String ADD_ROOM = 
-        "INSERT INTO mucRoom (roomID, creationDate, modificationDate, name, naturalRoomName, " +
+        "INSERT INTO mucRoom (roomID, creationDate, modificationDate, name, naturalName, " +
         "description, canChangeSubject, maxUsers, publicRoom, moderated, invitationRequired, " +
         "canInvite, password, canDiscoverJID, logEnabled, subject, rolesToBroadcast, " +
         "lastActiveDate, inMemory) VALUES (?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)";