Several DB changes. JM-1058

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

documentation/docs/database-guide.html

@@ -298,7 +298,7 @@ Key)<br>
       </td>
     </tr>
     <tr>
-      <td style="vertical-align: top;">message<br>
+      <td style="vertical-align: top;">stanza<br>
 
       </td>
       <td style="vertical-align: top;">TEXT<br>
@@ -350,7 +350,7 @@ Key)<br>
       <td>Namespace of the private entry (Primary Key)</td>
     </tr>
     <tr>
-      <td>value</td>
+      <td>privateData</td>
       <td>TEXT</td>
 
       <td>n/a</td>
@@ -385,7 +385,7 @@ Key)<br>
       <td>User Name (Primary Key)</td>
     </tr>
     <tr>
-      <td>password</td>
+      <td>plainPassword</td>
       <td>VARCHAR</td>
       <td>32</td>
       <td>Plain-text password data</td>
@@ -676,7 +676,7 @@ roster)</th>
       <td>User Name (Primary Key)</td>
     </tr>
     <tr>
-        <td>value</td>
+        <td>vcard</td>
         <td>TEXT</td>
 
         <td>n/a</td>
@@ -812,7 +812,7 @@ roster)</th>
     </tr>
 
     <tr class="primary-key">
-      <td>domain</td>
+      <td>xmppDomain</td>
       <td>VARCHAR</td>
       <td>255</td>
       <td>Domain of the external component (Primary Key)</td>
@@ -941,7 +941,7 @@ roster)</th>
       <td>Flag indicating whether occupants can invite other users</td>
     </tr>
     <tr>
-      <td>password</td>
+      <td>roomPassword</td>
 
       <td>VARCHAR</td>
       <td>50</td>

src/database/openfire_db2.sql

@@ -3,7 +3,7 @@
 
 CREATE TABLE jiveUser (
   username              VARCHAR(64)     NOT NULL,
-  password              VARCHAR(32),
+  plainPassword         VARCHAR(32),
   encryptedPassword     VARCHAR(255),
   name                  VARCHAR(100),
   email                 VARCHAR(100),
@@ -26,7 +26,7 @@ CREATE TABLE jivePrivate (
   username              VARCHAR(64)     NOT NULL,
   name                  VARCHAR(100)    NOT NULL,
   namespace             VARCHAR(200)    NOT NULL,
-  value                 VARCHAR(2000)   NOT NULL,
+  privateData           VARCHAR(2000)   NOT NULL,
   CONSTRAINT jivePrivate_pk PRIMARY KEY (username, name, namespace)
 );
 
@@ -36,7 +36,7 @@ CREATE TABLE jiveOffline (
   messageID             INTEGER         NOT NULL,
   creationDate          CHAR(15)        NOT NULL,
   messageSize           INTEGER         NOT NULL,
-  message               VARCHAR(2000)   NOT NULL,
+  stanza                VARCHAR(2000)   NOT NULL,
   CONSTRAINT jiveOffline_pk PRIMARY KEY (username, messageID)
 );
 
@@ -71,7 +71,7 @@ CREATE INDEX jiveRoGrps_rid_idx ON jiveRosterGroups (rosterID ASC);
 
 CREATE TABLE jiveVCard (
   username              VARCHAR(64)     NOT NULL,
-  value                 VARCHAR(2000)   NOT NULL,
+  vcard                 VARCHAR(2000)   NOT NULL,
   CONSTRAINT jiveVCard_pk PRIMARY KEY (username)
 );
 
@@ -129,10 +129,10 @@ CREATE TABLE jiveExtComponentConf (
 
 
 CREATE TABLE jiveRemoteServerConf (
-  domain                VARCHAR(255)    NOT NULL,
+  xmppDomain            VARCHAR(255)    NOT NULL,
   remotePort            INTEGER,
   permission            VARCHAR(10)     NOT NULL,
-  CONSTRAINT jiveRmSrvConf_pk PRIMARY KEY (domain)
+  CONSTRAINT jiveRmSrvConf_pk PRIMARY KEY (xmppDomain)
 );
 
 
@@ -169,7 +169,7 @@ CREATE TABLE mucRoom (
   moderated           INTEGER       NOT NULL,
   membersOnly         INTEGER       NOT NULL,
   canInvite           INTEGER       NOT NULL,
-  password            VARCHAR(50),
+  roomPassword        VARCHAR(50),
   canDiscoverJID      INTEGER       NOT NULL,
   logEnabled          INTEGER       NOT NULL,
   subject             VARCHAR(100),
@@ -342,7 +342,7 @@ INSERT INTO jiveID (idType, id) VALUES (18, 1);
 INSERT INTO jiveID (idType, id) VALUES (19, 1);
 INSERT INTO jiveID (idType, id) VALUES (23, 1);
 
-INSERT INTO jiveVersion (name, version) VALUES ('openfire', 12);
+INSERT INTO jiveVersion (name, version) VALUES ('openfire', 13);
 
 -- Entry for admin user
 INSERT INTO jiveUser (username, password, name, email, creationDate, modificationDate)

src/database/openfire_hsqldb.sql

@@ -3,7 +3,7 @@
 
 CREATE TABLE jiveUser (
   username              VARCHAR(64)     NOT NULL,
-  password              VARCHAR(32),
+  plainPassword         VARCHAR(32),
   encryptedPassword     VARCHAR(255),
   name                  VARCHAR(100),
   email                 VARCHAR(100),
@@ -26,7 +26,7 @@ CREATE TABLE jivePrivate (
   username              VARCHAR(64)     NOT NULL,
   name                  VARCHAR(100)    NOT NULL,
   namespace             VARCHAR(200)    NOT NULL,
-  value                 LONGVARCHAR     NOT NULL,
+  privateData           LONGVARCHAR     NOT NULL,
   CONSTRAINT jivePrivate_pk PRIMARY KEY (username, name, namespace)
 );
 
@@ -36,7 +36,7 @@ CREATE TABLE jiveOffline (
   messageID             BIGINT          NOT NULL,
   creationDate          VARCHAR(15)     NOT NULL,
   messageSize           INTEGER         NOT NULL,
-  message               LONGVARCHAR     NOT NULL,
+  stanza                LONGVARCHAR     NOT NULL,
   CONSTRAINT jiveOffline_pk PRIMARY KEY (username, messageID)
 );
 
@@ -71,7 +71,7 @@ CREATE INDEX jiveRosterGroup_rosterid_idx ON jiveRosterGroups (rosterID);
 
 CREATE TABLE jiveVCard (
   username              VARCHAR(64)     NOT NULL,
-  value                 LONGVARCHAR     NOT NULL,
+  vcard                 LONGVARCHAR     NOT NULL,
   CONSTRAINT jiveVCard_pk PRIMARY KEY (username)
 );
 
@@ -127,10 +127,10 @@ CREATE TABLE jiveExtComponentConf (
 );
 
 CREATE TABLE jiveRemoteServerConf (
-  domain                VARCHAR(255)    NOT NULL,
+  xmppDomain            VARCHAR(255)    NOT NULL,
   remotePort            INTEGER,
   permission            VARCHAR(10)     NOT NULL,
-  CONSTRAINT jiveRemoteServerConf_pk PRIMARY KEY (domain)
+  CONSTRAINT jiveRemoteServerConf_pk PRIMARY KEY (xmppDomain)
 );
 
 CREATE TABLE jivePrivacyList (
@@ -165,7 +165,7 @@ CREATE TABLE mucRoom (
   moderated           INTEGER       NOT NULL,
   membersOnly         INTEGER       NOT NULL,
   canInvite           INTEGER       NOT NULL,
-  password            VARCHAR(50)   NULL,
+  roomPassword        VARCHAR(50)   NULL,
   canDiscoverJID      INTEGER       NOT NULL,
   logEnabled          INTEGER       NOT NULL,
   subject             VARCHAR(100)  NULL,
@@ -329,7 +329,7 @@ INSERT INTO jiveID (idType, id) VALUES (18, 1);
 INSERT INTO jiveID (idType, id) VALUES (19, 1);
 INSERT INTO jiveID (idType, id) VALUES (23, 1);
 
-INSERT INTO jiveVersion (name, version) VALUES ('openfire', 12);
+INSERT INTO jiveVersion (name, version) VALUES ('openfire', 13);
 
 // Entry for admin user
 INSERT INTO jiveUser (username, password, name, email, creationDate, modificationDate)

src/database/openfire_mysql.sql

@@ -3,7 +3,7 @@
 
 CREATE TABLE jiveUser (
   username              VARCHAR(64)     NOT NULL,
-  password              VARCHAR(32),
+  plainPassword         VARCHAR(32),
   encryptedPassword     VARCHAR(255),
   name                  VARCHAR(100),
   email                 VARCHAR(100),
@@ -44,7 +44,7 @@ CREATE TABLE jivePrivate (
   username              VARCHAR(64)     NOT NULL,
   name                  VARCHAR(100)    NOT NULL,
   namespace             VARCHAR(200)    NOT NULL,
-  value                 TEXT            NOT NULL,
+  privateData           TEXT            NOT NULL,
   PRIMARY KEY (username, name, namespace(100))
 );
 
@@ -53,7 +53,7 @@ CREATE TABLE jiveOffline (
   messageID             BIGINT          NOT NULL,
   creationDate          CHAR(15)        NOT NULL,
   messageSize           INTEGER         NOT NULL,
-  message               TEXT            NOT NULL,
+  stanza                TEXT            NOT NULL,
   PRIMARY KEY (username, messageID)
 );
 
@@ -86,7 +86,7 @@ CREATE TABLE jiveRosterGroups (
 
 CREATE TABLE jiveVCard (
   username              VARCHAR(64)     NOT NULL,
-  value                 TEXT            NOT NULL,
+  vcard                 MEDIUMTEXT      NOT NULL,
   PRIMARY KEY (username)
 );
 
@@ -117,10 +117,10 @@ CREATE TABLE jiveExtComponentConf (
 );
 
 CREATE TABLE jiveRemoteServerConf (
-  domain                VARCHAR(255)    NOT NULL,
+  xmppDomain            VARCHAR(255)    NOT NULL,
   remotePort            INTEGER,
   permission            VARCHAR(10)     NOT NULL,
-  PRIMARY KEY (domain)
+  PRIMARY KEY (xmppDomain)
 );
 
 CREATE TABLE jivePrivacyList (
@@ -155,7 +155,7 @@ CREATE TABLE mucRoom (
   moderated           TINYINT       NOT NULL,
   membersOnly         TINYINT       NOT NULL,
   canInvite           TINYINT       NOT NULL,
-  password            VARCHAR(50)   NULL,
+  roomPassword        VARCHAR(50)   NULL,
   canDiscoverJID      TINYINT       NOT NULL,
   logEnabled          TINYINT       NOT NULL,
   subject             VARCHAR(100)  NULL,
@@ -265,9 +265,9 @@ CREATE TABLE pubsubItem (
   serviceID           VARCHAR(100)  NOT NULL,
   nodeID              VARCHAR(100)  NOT NULL,
   id                  VARCHAR(100)  NOT NULL,
-  jid                 VARCHAR(255) NOT NULL,
+  jid                 VARCHAR(255)  NOT NULL,
   creationDate        CHAR(15)      NOT NULL,
-  payload             TEXT          NULL,
+  payload             MEDIUMTEXT    NULL,
   PRIMARY KEY (serviceID, nodeID, id)
 );
 
@@ -318,7 +318,7 @@ INSERT INTO jiveID (idType, id) VALUES (18, 1);
 INSERT INTO jiveID (idType, id) VALUES (19, 1);
 INSERT INTO jiveID (idType, id) VALUES (23, 1);
 
-INSERT INTO jiveVersion (name, version) VALUES ('openfire', 12);
+INSERT INTO jiveVersion (name, version) VALUES ('openfire', 13);
 
 # Entry for admin user
 INSERT INTO jiveUser (username, password, name, email, creationDate, modificationDate)

src/database/openfire_oracle.sql

@@ -3,7 +3,7 @@
 
 CREATE TABLE jiveUser (
   username              VARCHAR2(64)     NOT NULL,
-  password              VARCHAR2(32),
+  plainPassword         VARCHAR2(32),
   encryptedPassword     VARCHAR2(255),
   name                  VARCHAR2(100),
   email                 VARCHAR2(100),
@@ -26,7 +26,7 @@ CREATE TABLE jivePrivate (
   username              VARCHAR2(64)    NOT NULL,
   name                  VARCHAR2(100)   NOT NULL,
   namespace             VARCHAR2(200)   NOT NULL,
-  value                 LONG            NOT NULL,
+  privateData           LONG            NOT NULL,
   CONSTRAINT jivePrivate_pk PRIMARY KEY (username, name, namespace)
 );
 
@@ -36,7 +36,7 @@ CREATE TABLE jiveOffline (
   messageID             INTEGER         NOT NULL,
   creationDate          CHAR(15)        NOT NULL,
   messageSize           INTEGER         NOT NULL,
-  message               LONG            NOT NULL,
+  stanza                LONG            NOT NULL,
   CONSTRAINT jiveOffline_pk PRIMARY KEY (username, messageID)
 );
 
@@ -74,7 +74,7 @@ ALTER TABLE jiveRosterGroups ADD CONSTRAINT jiveRosterGroups_rosterID_fk FOREIGN
 
 CREATE TABLE jiveVCard (
   username              VARCHAR2(64)    NOT NULL,
-  value                 LONG            NOT NULL,
+  vcard                 LONG            NOT NULL,
   CONSTRAINT JiveVCard_pk PRIMARY KEY (username)
 );
 
@@ -124,10 +124,10 @@ CREATE TABLE jiveExtComponentConf (
 );
 
 CREATE TABLE jiveRemoteServerConf (
-  domain                VARCHAR2(255)    NOT NULL,
+  xmppDomain            VARCHAR2(255)    NOT NULL,
   remotePort            INTEGER,
   permission            VARCHAR2(10)     NOT NULL,
-  CONSTRAINT jiveRemoteServerConf_pk PRIMARY KEY (domain)
+  CONSTRAINT jiveRemoteServerConf_pk PRIMARY KEY (xmppDomain)
 );
 
 CREATE TABLE jivePrivacyList (
@@ -162,7 +162,7 @@ CREATE TABLE mucRoom(
   moderated           INTEGER       NOT NULL,
   membersOnly         INTEGER       NOT NULL,
   canInvite           INTEGER       NOT NULL,
-  password            VARCHAR2(50)  NULL,
+  roomPassword        VARCHAR2(50)  NULL,
   canDiscoverJID      INTEGER       NOT NULL,
   logEnabled          INTEGER       NOT NULL,
   subject             VARCHAR2(100) NULL,
@@ -325,7 +325,7 @@ INSERT INTO jiveID (idType, id) VALUES (18, 1);
 INSERT INTO jiveID (idType, id) VALUES (19, 1);
 INSERT INTO jiveID (idType, id) VALUES (23, 1);
 
-INSERT INTO jiveVersion (name, version) VALUES ('openfire', 12);
+INSERT INTO jiveVersion (name, version) VALUES ('openfire', 13);
 
 -- Entry for admin user
 INSERT INTO jiveUser (username, password, name, email, creationDate, modificationDate)

src/database/openfire_postgresql.sql

@@ -5,7 +5,7 @@
 
 CREATE TABLE jiveUser (
   username              VARCHAR(64)     NOT NULL,
-  password              VARCHAR(32),
+  plainPassword         VARCHAR(32),
   encryptedPassword     VARCHAR(255),
   name                  VARCHAR(100),
   email                 VARCHAR(100),
@@ -28,7 +28,7 @@ CREATE TABLE jivePrivate (
   username              VARCHAR(64)     NOT NULL,
   name                  VARCHAR(100)    NOT NULL,
   namespace             VARCHAR(200)    NOT NULL,
-  value                 TEXT            NOT NULL,
+  privateData           TEXT            NOT NULL,
   CONSTRAINT jivePrivate_pk PRIMARY KEY (username, name, namespace)
 );
 
@@ -38,7 +38,7 @@ CREATE TABLE jiveOffline (
   messageID             INTEGER         NOT NULL,
   creationDate          CHAR(15)        NOT NULL,
   messageSize           INTEGER         NOT NULL,
-  message               TEXT            NOT NULL,
+  stanza                TEXT            NOT NULL,
   CONSTRAINT jiveOffline_pk PRIMARY KEY (username, messageID)
 );
 
@@ -76,7 +76,7 @@ ALTER TABLE jiveRosterGroups ADD CONSTRAINT jiveRosterGroups_rosterID_fk FOREIGN
 
 CREATE TABLE jiveVCard (
   username              VARCHAR(64)     NOT NULL,
-  value                 TEXT            NOT NULL,
+  vcard                 TEXT            NOT NULL,
   CONSTRAINT jiveVCard_pk PRIMARY KEY (username)
 );
 
@@ -132,10 +132,10 @@ CREATE TABLE jiveExtComponentConf (
 );
 
 CREATE TABLE jiveRemoteServerConf (
-  domain                VARCHAR(255)    NOT NULL,
+  xmppDomain            VARCHAR(255)    NOT NULL,
   remotePort            INTEGER,
   permission            VARCHAR(10)     NOT NULL,
-  CONSTRAINT jiveRemoteServerConf_pk PRIMARY KEY (domain)
+  CONSTRAINT jiveRemoteServerConf_pk PRIMARY KEY (xmppDomain)
 );
 
 CREATE TABLE jivePrivacyList (
@@ -170,7 +170,7 @@ CREATE TABLE mucRoom (
   moderated           INTEGER       NOT NULL,
   membersOnly         INTEGER       NOT NULL,
   canInvite           INTEGER       NOT NULL,
-  password            VARCHAR(50)   NULL,
+  roomPassword        VARCHAR(50)   NULL,
   canDiscoverJID      INTEGER       NOT NULL,
   logEnabled          INTEGER       NOT NULL,
   subject             VARCHAR(100)  NULL,
@@ -334,7 +334,7 @@ INSERT INTO jiveID (idType, id) VALUES (18, 1);
 INSERT INTO jiveID (idType, id) VALUES (19, 1);
 INSERT INTO jiveID (idType, id) VALUES (23, 1);
 
-INSERT INTO jiveVersion (name, version) VALUES ('openfire', 12);
+INSERT INTO jiveVersion (name, version) VALUES ('openfire', 13);
 
 -- Entry for admin user
 INSERT INTO jiveUser (username, password, name, email, creationDate, modificationDate)

src/database/openfire_sqlserver.sql

@@ -3,7 +3,7 @@
 
 CREATE TABLE jiveUser (
   username              NVARCHAR(64)    NOT NULL,
-  password              NVARCHAR(32),
+  plainPassword         NVARCHAR(32),
   encryptedPassword     NVARCHAR(255),
   name                  NVARCHAR(100),
   email                 VARCHAR(100),
@@ -26,7 +26,7 @@ CREATE TABLE jivePrivate (
   username              NVARCHAR(64)    NOT NULL,
   name                  NVARCHAR(100)   NOT NULL,
   namespace             NVARCHAR(200)   NOT NULL,
-  value                 NTEXT           NOT NULL,
+  privateData           NTEXT           NOT NULL,
   CONSTRAINT JivePrivate_pk PRIMARY KEY (username, name, namespace)
 );
 
@@ -36,7 +36,7 @@ CREATE TABLE jiveOffline (
   messageID             INTEGER         NOT NULL,
   creationDate          CHAR(15)        NOT NULL,
   messageSize           INTEGER         NOT NULL,
-  message               NTEXT           NOT NULL,
+  stanza                NTEXT           NOT NULL,
   CONSTRAINT jiveOffline_pk PRIMARY KEY (username, messageID)
 );
 
@@ -74,7 +74,7 @@ ALTER TABLE jiveRosterGroups ADD CONSTRAINT jiveRosterGroups_rosterID_fk FOREIGN
 
 CREATE TABLE jiveVCard (
   username              NVARCHAR(64)    NOT NULL,
-  value                 NTEXT           NOT NULL,
+  vcard                 NTEXT           NOT NULL,
   CONSTRAINT JiveVCard_pk PRIMARY KEY (username)
 );
 
@@ -130,10 +130,10 @@ CREATE TABLE jiveExtComponentConf (
 );
 
 CREATE TABLE jiveRemoteServerConf (
-  domain                NVARCHAR(255)    NOT NULL,
+  xmppDomain            NVARCHAR(255)    NOT NULL,
   remotePort            INTEGER,
   permission            NVARCHAR(10)     NOT NULL,
-  CONSTRAINT jiveRemoteServerConf_pk PRIMARY KEY (domain)
+  CONSTRAINT jiveRemoteServerConf_pk PRIMARY KEY (xmppDomain)
 );
 
 CREATE TABLE jivePrivacyList (
@@ -168,7 +168,7 @@ CREATE TABLE mucRoom (
   moderated           INT           NOT NULL,
   membersOnly         INT           NOT NULL,
   canInvite           INT           NOT NULL,
-  password            NVARCHAR(50)  NULL,
+  roomPassword        NVARCHAR(50)  NULL,
   canDiscoverJID      INT           NOT NULL,
   logEnabled          INT           NOT NULL,
   subject             NVARCHAR(100) NULL,
@@ -332,7 +332,7 @@ INSERT INTO jiveID (idType, id) VALUES (18, 1);
 INSERT INTO jiveID (idType, id) VALUES (19, 1);
 INSERT INTO jiveID (idType, id) VALUES (23, 1);
 
-INSERT INTO jiveVersion (name, version) VALUES ('openfire', 12);
+INSERT INTO jiveVersion (name, version) VALUES ('openfire', 13);
 
 /* Entry for admin user */
 INSERT INTO jiveUser (username, password, name, email, creationDate, modificationDate)

src/database/openfire_sybase.sql

@@ -3,7 +3,7 @@
 
 CREATE TABLE jiveUser (
   username              NVARCHAR(64)    NOT NULL,
-  password              NVARCHAR(32)    NULL,
+  plainPassword         NVARCHAR(32)    NULL,
   encryptedPassword     NVARCHAR(255)   NULL,
   name                  NVARCHAR(100)   NULL,
   email                 VARCHAR(100)    NULL,
@@ -26,7 +26,7 @@ CREATE TABLE jivePrivate (
   username              NVARCHAR(64)    NOT NULL,
   name                  NVARCHAR(100)   NOT NULL,
   namespace             NVARCHAR(200)   NOT NULL,
-  value                 TEXT            NOT NULL,
+  privateData           TEXT            NOT NULL,
   CONSTRAINT JivePrivate_pk PRIMARY KEY (username, name, namespace)
 );
 
@@ -36,7 +36,7 @@ CREATE TABLE jiveOffline (
   messageID             INTEGER         NOT NULL,
   creationDate          CHAR(15)        NOT NULL,
   messageSize           INTEGER         NOT NULL,
-  message               TEXT            NOT NULL,
+  stanza                TEXT            NOT NULL,
   CONSTRAINT jiveOffline_pk PRIMARY KEY (username, messageID)
 );
  
@@ -74,7 +74,7 @@ ALTER TABLE jiveRosterGroups ADD CONSTRAINT jiveRosterGroups_rosterID_fk FOREIGN
 
 CREATE TABLE jiveVCard (
   username              NVARCHAR(64)    NOT NULL,
-  value                 TEXT            NOT NULL,
+  vcard                 TEXT            NOT NULL,
   CONSTRAINT JiveVCard_pk PRIMARY KEY (username)
 );
 
@@ -130,10 +130,10 @@ CREATE TABLE jiveExtComponentConf (
 );
 
 CREATE TABLE jiveRemoteServerConf (
-  domain                NVARCHAR(255)    NOT NULL,
+  xmppDomain            NVARCHAR(255)    NOT NULL,
   remotePort            INTEGER          NULL,
   permission            NVARCHAR(10)     NOT NULL,
-  CONSTRAINT jiveRemoteServerConf_pk PRIMARY KEY (domain)
+  CONSTRAINT jiveRemoteServerConf_pk PRIMARY KEY (xmppDomain)
 );
 
 CREATE TABLE jivePrivacyList (
@@ -168,7 +168,7 @@ CREATE TABLE mucRoom (
   moderated           INT           NOT NULL,
   membersOnly         INT           NOT NULL,
   canInvite           INT           NOT NULL,
-  password            NVARCHAR(50)  NULL,
+  roomPassword        NVARCHAR(50)  NULL,
   canDiscoverJID      INT           NOT NULL,
   logEnabled          INT           NOT NULL,
   subject             NVARCHAR(100) NULL,
@@ -332,7 +332,7 @@ INSERT INTO jiveID (idType, id) VALUES (18, 1);
 INSERT INTO jiveID (idType, id) VALUES (19, 1);
 INSERT INTO jiveID (idType, id) VALUES (23, 1);
 
-INSERT INTO jiveVersion (name, version) VALUES ('openfire', 12);
+INSERT INTO jiveVersion (name, version) VALUES ('openfire', 13);
 
 /* Entry for admin user */
 INSERT INTO jiveUser (username, password, name, email, creationDate, modificationDate)

src/database/upgrade/13/openfire_db2.sql

+-- $Revision:  $
+-- $Date:  $
+
+-- Rename column
+CREATE TABLE jiveRemoteServerConf2 (
+  xmppDomain            VARCHAR(255)    NOT NULL,
+  remotePort            INTEGER,
+  permission            VARCHAR(10)     NOT NULL,
+);
+
+INSERT INTO jiveRemoteServerConf2 (xmppDomain, remotePort, permission)
+SELECT domain, remotePort, permission FROM jiveRemoteServerConf;
+
+DROP TABLE jiveRemoteServerConf;
+RENAME TABLE jiveRemoteServerConf2 TO jiveRemoteServerConf;
+ALTER TABLE jiveRemoteServerConf ADD CONSTRAINT jiveRmSrvConf_pk PRIMARY KEY xmppDomain;
+
+-- Rename column
+CREATE TABLE jiveOffline2 (
+  username              VARCHAR(64)     NOT NULL,
+  messageID             INTEGER         NOT NULL,
+  creationDate          CHAR(15)        NOT NULL,
+  messageSize           INTEGER         NOT NULL,
+  stanza                VARCHAR(2000)   NOT NULL,
+);
+
+INSERT INTO jiveOffline2 (username, messageID, creationDate, messageSize, stanza)
+SELECT username, messageID, creationDate, messageSize, message FROM jiveOffline;
+
+DROP TABLE jiveOffline;
+RENAME TABLE jiveOffline2 TO jiveOffline;
+ALTER TABLE jiveOffline ADD CONSTRAINT jiveOffline_pk PRIMARY KEY (username, messageID);
+
+-- Rename column
+CREATE TABLE jiveVCard2 (
+  username              VARCHAR(64)     NOT NULL,
+  vcard                 VARCHAR(2000)   NOT NULL,
+);
+
+INSERT INTO jiveVCard2 (username, vcard)
+SELECT username, value FROM jiveVCard;
+
+DROP TABLE jiveVCard;
+RENAME TABLE jiveVCard2 TO jiveVCard;
+ALTER TABLE jiveVCard ADD CONSTRAINT jiveVCard_pk PRIMARY KEY (username);
+
+-- Rename column
+CREATE TABLE jivePrivate2 (
+  username              VARCHAR(64)     NOT NULL,
+  name                  VARCHAR(100)    NOT NULL,
+  namespace             VARCHAR(200)    NOT NULL,
+  privateData           VARCHAR(2000)   NOT NULL,
+);
+
+-- Rename column
+CREATE TABLE jiveVCard2 (
+  username              VARCHAR(64)     NOT NULL,
+  vcard                 VARCHAR(2000)   NOT NULL,
+);
+
+INSERT INTO jiveVCard2 (username, vcard)
+SELECT username, value FROM jiveVCard;
+
+DROP TABLE jiveVCard;
+RENAME TABLE jiveVCard2 TO jiveVCard;
+ALTER TABLE jiveVCard ADD CONSTRAINT jiveVCard_pk PRIMARY KEY (username);
+
+-- Rename column
+CREATE TABLE jiveUser2 (
+  username              VARCHAR(64)     NOT NULL,
+  plainPassword         VARCHAR(32),
+  encryptedPassword     VARCHAR(255),
+  name                  VARCHAR(100),
+  email                 VARCHAR(100),
+  creationDate          CHAR(15)        NOT NULL,
+  modificationDate      CHAR(15)        NOT NULL,
+);
+
+INSERT INTO jiveUser2 (username, plainPassword, encryptedPassword, name, email, creationDate, modificationDate)
+SELECT username, password, encryptedPassword, name, email, creationDate, modificationDate FROM jiveUser;
+
+DROP TABLE jiveUser;
+RENAME TABLE jiveUser2 TO jiveUser;
+ALTER TABLE jiveUser ADD CONSTRAINT jiveUser_pk PRIMARY KEY (username);
+CREATE INDEX jiveUsr_cDate_idx ON jiveUser (creationDate ASC);
+
+-- Rename column
+CREATE TABLE mucRoom2 (
+  roomID              INTEGER       NOT NULL,
+  creationDate        CHAR(15)      NOT NULL,
+  modificationDate    CHAR(15)      NOT NULL,
+  name                VARCHAR(50)   NOT NULL,
+  naturalName         VARCHAR(255)  NOT NULL,
+  description         VARCHAR(255),
+  lockedDate          CHAR(15)      NOT NULL,
+  emptyDate           CHAR(15),
+  canChangeSubject    INTEGER       NOT NULL,
+  maxUsers            INTEGER       NOT NULL,
+  publicRoom          INTEGER       NOT NULL,
+  moderated           INTEGER       NOT NULL,
+  membersOnly         INTEGER       NOT NULL,
+  canInvite           INTEGER       NOT NULL,
+  roomPassword        VARCHAR(50),
+  canDiscoverJID      INTEGER       NOT NULL,
+  logEnabled          INTEGER       NOT NULL,
+  subject             VARCHAR(100),
+  rolesToBroadcast    INTEGER       NOT NULL,
+  useReservedNick     INTEGER       NOT NULL,
+  canChangeNick       INTEGER       NOT NULL,
+  canRegister         INTEGER       NOT NULL,
+);
+
+INSERT INTO mucRoom2 (roomID, creationDate, modificationDate, name, naturalName, description, lockedDate, emptyDate, canChangeSubject, maxUsers, publicRoom, moderated, membersOnly, canInvite, roomPassword, canDiscoverJID, logEnabled, subject, rolesToBroadcast, useReservedNick, canChangeNick, canRegister)
+SELECT roomID, creationDate, modificationDate, name, naturalName, description, lockedDate, emptyDate, canChangeSubject, maxUsers, publicRoom, moderated, membersOnly, canInvite, password, canDiscoverJID, logEnabled, subject, rolesToBroadcast, useReservedNick, canChangeNick, canRegister FROM mucRoom;
+
+DROP TABLE mucRoom;
+RENAME TABLE mucRoom2 TO mucRoom;
+ALTER TABLE mucRoom ADD CONSTRAINT mucRoom_pk PRIMARY KEY (name);
+CREATE INDEX mucRm_roomid_idx ON mucRoom (roomID);
+
+UPDATE jiveVersion set version=13 where name = 'openfire';
+
+

src/database/upgrade/13/openfire_hsqldb.sql

+ALTER TABLE jiveRemoteServerConf ALTER COLUMN domain RENAME TO xmppDomain;
+
+ALTER TABLE jiveOffline ALTER COLUMN message RENAME TO stanza;
+
+ALTER TABLE jiveVCard ALTER COLUMN value RENAME TO vcard;
+
+ALTER TABLE jivePrivate ALTER COLUMN value RENAME TO privateData;
+
+ALTER TABLE jiveUser ALTER COLUMN password RENAME TO plainPassword;
+
+ALTER TABLE mucRoom ALTER COLUMN password RENAME TO roomPassword;
+
+UPDATE jiveVersion set version=13 where name = 'openfire';
\ No newline at end of file

src/database/upgrade/13/openfire_mysql.sql

+# $Revision:  $
+# $Date:  $
+
+ALTER TABLE pubsubItem CHANGE payload payload MEDIUMTEXT;
+
+ALTER TABLE jiveRemoteServerConf CHANGE domain xmppDomain VARCHAR(255) NOT NULL;
+
+ALTER TABLE jiveOffline CHANGE message stanza TEXT NOT NULL;
+
+ALTER TABLE jiveVCard CHANGE value vcard MEDIUMTEXT NOT NULL;
+
+ALTER TABLE jivePrivate CHANGE value privateData TEXT NOT NULL;
+
+ALTER TABLE jiveUser CHANGE password plainPassword VARCHAR(32);
+
+ALTER TABLE mucRoom CHANGE password roomPassword VARCHAR(50);
+
+UPDATE jiveVersion set version=13 where name = 'openfire';
\ No newline at end of file

src/database/upgrade/13/openfire_oracle.sql

+-- $Revision:  $
+-- $Date:  $
+
+ALTER TABLE jiveRemoteServerConf RENAME COLUMN domain TO xmppDomain;
+
+ALTER TABLE jiveOffline RENAME COLUMN message TO stanza;
+
+ALTER TABLE jiveVCard RENAME COLUMN value TO vcard;
+
+ALTER TABLE jivePrivate RENAME COLUMN value TO privateData;
+
+ALTER TABLE jiveUser RENAME COLUMN password TO plainPassword;
+
+ALTER TABLE mucRoom RENAME COLUMN password TO roomPassword;
+
+UPDATE jiveVersion set version=13 where name = 'openfire';

src/database/upgrade/13/openfire_postgresql.sql

+-- $Revision:  $
+-- $Date:  $
+
+ALTER TABLE jiveRemoteServerConf RENAME COLUMN domain TO xmppDomain;
+
+ALTER TABLE jiveOffline RENAME COLUMN message TO stanza;
+
+ALTER TABLE jiveVCard RENAME COLUMN value TO vcard;
+
+ALTER TABLE jivePrivate RENAME COLUMN value TO privateData;
+
+ALTER TABLE jiveUser RENAME COLUMN password TO plainPassword;
+
+ALTER TABLE mucRoom RENAME COLUMN password TO roomPassword;
+
+UPDATE jiveVersion set version=13 where name = 'openfire';

src/database/upgrade/13/openfire_sqlserver.sql

+/* $Revision:  $  */
+/* $Date:  $      */
+
+sp_rename 'jiveRemoteServerConf.domain', 'xmppDomain';
+
+sp_rename 'jiveOffline.message', 'stanza';
+
+sp_rename 'jiveVCard.value', 'vcard';
+
+sp_rename 'jivePrivate.value', 'privateData';
+
+sp_rename 'jiveUser.password', 'plainPassword';
+
+sp_rename 'mucRoom.password', 'roomPassword';
+
+UPDATE jiveVersion set version=13 where name = 'openfire';

src/database/upgrade/13/openfire_sybase.sql

+/* $Revision:  $ */
+/* $Date:  $ */
+
+sp_rename 'jiveRemoteServerConf.domain', 'xmppDomain';
+
+sp_rename 'jiveOffline.message', 'stanza';
+
+sp_rename 'jiveVCard.value', 'vcard';
+
+sp_rename 'jivePrivate.value', 'privateData';
+
+sp_rename 'jiveUser.password', 'plainPassword';
+
+sp_rename 'mucRoom.password', 'roomPassword';
+
+UPDATE jiveVersion set version=13 where name = 'openfire';

src/java/org/jivesoftware/database/SchemaManager.java

@@ -44,7 +44,7 @@ public class SchemaManager {
     /**
      * Current Openfire database schema version.
      */
-    private static final int DATABASE_VERSION = 12;
+    private static final int DATABASE_VERSION = 13;
 
     /**
      * Creates a new Schema manager.

src/java/org/jivesoftware/openfire/OfflineMessageStore.java

@@ -49,12 +49,12 @@ import java.util.regex.Pattern;
 public class OfflineMessageStore extends BasicModule implements UserEventListener {
 
     private static final String INSERT_OFFLINE =
-        "INSERT INTO jiveOffline (username, messageID, creationDate, messageSize, message) " +
+        "INSERT INTO jiveOffline (username, messageID, creationDate, messageSize, stanza) " +
         "VALUES (?, ?, ?, ?, ?)";
     private static final String LOAD_OFFLINE =
-        "SELECT message, creationDate FROM jiveOffline WHERE username=?";
+        "SELECT stanza, creationDate FROM jiveOffline WHERE username=?";
     private static final String LOAD_OFFLINE_MESSAGE =
-        "SELECT message FROM jiveOffline WHERE username=? AND creationDate=?";
+        "SELECT stanza FROM jiveOffline WHERE username=? AND creationDate=?";
     private static final String SELECT_SIZE_OFFLINE =
         "SELECT SUM(messageSize) FROM jiveOffline WHERE username=?";
     private static final String SELECT_SIZE_ALL_OFFLINE =

src/java/org/jivesoftware/openfire/PrivateStorage.java

@@ -41,11 +41,11 @@ import java.util.concurrent.LinkedBlockingQueue;
 public class PrivateStorage extends BasicModule implements UserEventListener {
 
     private static final String LOAD_PRIVATE =
-        "SELECT value FROM jivePrivate WHERE username=? AND namespace=?";
+        "SELECT privateData FROM jivePrivate WHERE username=? AND namespace=?";
     private static final String INSERT_PRIVATE =
-        "INSERT INTO jivePrivate (value,name,username,namespace) VALUES (?,?,?,?)";
+        "INSERT INTO jivePrivate (privateData,name,username,namespace) VALUES (?,?,?,?)";
     private static final String UPDATE_PRIVATE =
-        "UPDATE jivePrivate SET value=?, name=? WHERE username=? AND namespace=?";
+        "UPDATE jivePrivate SET privateData=?, name=? WHERE username=? AND namespace=?";
     private static final String DELETE_PRIVATES =
         "DELETE FROM jivePrivate WHERE username=?";
 

src/java/org/jivesoftware/openfire/auth/DefaultAuthProvider.java

@@ -31,9 +31,9 @@ import java.sql.*;
 public class DefaultAuthProvider implements AuthProvider {
 
     private static final String LOAD_PASSWORD =
-            "SELECT password,encryptedPassword FROM jiveUser WHERE username=?";
+            "SELECT plainPassword,encryptedPassword FROM jiveUser WHERE username=?";
     private static final String UPDATE_PASSWORD =
-            "UPDATE jiveUser SET password=?, encryptedPassword=? WHERE username=?";
+            "UPDATE jiveUser SET plainPassword=?, encryptedPassword=? WHERE username=?";
 
     /**
      * Constructs a new DefaultAuthProvider.

src/java/org/jivesoftware/openfire/handler/IQPrivateHandler.java

@@ -11,13 +11,18 @@
 
 package org.jivesoftware.openfire.handler;
 
-import org.jivesoftware.openfire.disco.ServerFeaturesProvider;
-import org.jivesoftware.openfire.*;
+import org.dom4j.Element;
+import org.jivesoftware.openfire.IQHandlerInfo;
+import org.jivesoftware.openfire.PacketException;
+import org.jivesoftware.openfire.PrivateStorage;
+import org.jivesoftware.openfire.XMPPServer;
 import org.jivesoftware.openfire.auth.UnauthorizedException;
+import org.jivesoftware.openfire.disco.ServerFeaturesProvider;
+import org.xmpp.packet.IQ;
+
 import java.util.ArrayList;
 import java.util.Iterator;
-import org.dom4j.Element;
-import org.xmpp.packet.IQ;
+import java.util.List;
 
 /**
  * Implements the TYPE_IQ jabber:iq:private protocol. Clients
@@ -56,7 +61,7 @@ public class IQPrivateHandler extends IQHandler implements ServerFeaturesProvide
     }
 
     public IQ handleIQ(IQ packet) throws UnauthorizedException, PacketException {
-        IQ replyPacket = null;
+        IQ replyPacket;
         Element child = packet.getChildElement();
         Element dataElement = (Element) child.elementIterator().next();
 
@@ -92,8 +97,8 @@ public class IQPrivateHandler extends IQHandler implements ServerFeaturesProvide
         return info;
     }
 
-    public Iterator getFeatures() {
-        ArrayList features = new ArrayList();
+    public Iterator<String> getFeatures() {
+        List<String> features = new ArrayList<String>();
         features.add("jabber:iq:private");
         return features.iterator();
     }

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

@@ -43,7 +43,7 @@ public class MUCPersistenceManager {
     private static final String LOAD_ROOM =
         "SELECT roomID, creationDate, modificationDate, naturalName, description, lockedDate, " +
         "emptyDate, canChangeSubject, maxUsers, publicRoom, moderated, membersOnly, canInvite, " +
-        "password, canDiscoverJID, logEnabled, subject, rolesToBroadcast, useReservedNick, " +
+        "roomPassword, canDiscoverJID, logEnabled, subject, rolesToBroadcast, useReservedNick, " +
         "canChangeNick, canRegister FROM mucRoom WHERE name=?";
     private static final String LOAD_AFFILIATIONS =
         "SELECT jid, affiliation FROM mucAffiliation WHERE roomID=?";
@@ -55,7 +55,7 @@ public class MUCPersistenceManager {
     private static final String LOAD_ALL_ROOMS =
         "SELECT roomID, creationDate, modificationDate, name, naturalName, description, " +
         "lockedDate, emptyDate, canChangeSubject, maxUsers, publicRoom, moderated, membersOnly, " +
-        "canInvite, password, canDiscoverJID, logEnabled, subject, rolesToBroadcast, " +
+        "canInvite, roomPassword, canDiscoverJID, logEnabled, subject, rolesToBroadcast, " +
         "useReservedNick, canChangeNick, canRegister " +
         "FROM mucRoom WHERE emptyDate IS NULL or emptyDate > ?";
     private static final String LOAD_ALL_AFFILIATIONS =
@@ -68,12 +68,12 @@ public class MUCPersistenceManager {
     private static final String UPDATE_ROOM =
         "UPDATE mucRoom SET modificationDate=?, naturalName=?, description=?, " +
         "canChangeSubject=?, maxUsers=?, publicRoom=?, moderated=?, membersOnly=?, " +
-        "canInvite=?, password=?, canDiscoverJID=?, logEnabled=?, rolesToBroadcast=?, " +
+        "canInvite=?, roomPassword=?, canDiscoverJID=?, logEnabled=?, rolesToBroadcast=?, " +
         "useReservedNick=?, canChangeNick=?, canRegister=? WHERE roomID=?";
     private static final String ADD_ROOM = 
         "INSERT INTO mucRoom (roomID, creationDate, modificationDate, name, naturalName, " +
         "description, lockedDate, emptyDate, canChangeSubject, maxUsers, publicRoom, moderated, " +
-        "membersOnly, canInvite, password, canDiscoverJID, logEnabled, subject, " +
+        "membersOnly, canInvite, roomPassword, canDiscoverJID, logEnabled, subject, " +
         "rolesToBroadcast, useReservedNick, canChangeNick, canRegister) VALUES (?,?,?,?,?,?,?,?," +
             "?,?,?,?,?,?,?,?,?,?,?,?,?,?)";
     private static final String UPDATE_SUBJECT =

src/java/org/jivesoftware/openfire/server/RemoteServerManager.java

@@ -36,13 +36,13 @@ import java.util.Collection;
 public class RemoteServerManager {
 
     private static final String ADD_CONFIGURATION =
-        "INSERT INTO jiveRemoteServerConf (domain,remotePort,permission) VALUES (?,?,?)";
+        "INSERT INTO jiveRemoteServerConf (xmppDomain,remotePort,permission) VALUES (?,?,?)";
     private static final String DELETE_CONFIGURATION =
-        "DELETE FROM jiveRemoteServerConf WHERE domain=?";
+        "DELETE FROM jiveRemoteServerConf WHERE xmppDomain=?";
     private static final String LOAD_CONFIGURATION =
-        "SELECT remotePort,permission FROM jiveRemoteServerConf where domain=?";
+        "SELECT remotePort,permission FROM jiveRemoteServerConf where xmppDomain=?";
     private static final String LOAD_CONFIGURATIONS =
-        "SELECT domain,remotePort FROM jiveRemoteServerConf where permission=?";
+        "SELECT xmppDomain,remotePort FROM jiveRemoteServerConf where permission=?";
 
     private static Cache configurationsCache;
 

src/java/org/jivesoftware/openfire/user/DefaultUserProvider.java

@@ -46,7 +46,7 @@ public class DefaultUserProvider implements UserProvider {
     private static final String ALL_USERS =
             "SELECT username FROM jiveUser ORDER BY username";
     private static final String INSERT_USER =
-            "INSERT INTO jiveUser (username,password,encryptedPassword,name,email,creationDate,modificationDate) " +
+            "INSERT INTO jiveUser (username,plainPassword,encryptedPassword,name,email,creationDate,modificationDate) " +
             "VALUES (?,?,?,?,?,?,?)";
     private static final String DELETE_USER_PROPS =
             "DELETE FROM jiveUserProp WHERE username=?";

src/java/org/jivesoftware/openfire/vcard/DefaultVCardProvider.java

@@ -35,13 +35,13 @@ import java.util.concurrent.LinkedBlockingQueue;
 public class DefaultVCardProvider implements VCardProvider {
 
     private static final String LOAD_PROPERTIES =
-        "SELECT value FROM jiveVCard WHERE username=?";
+        "SELECT vcard FROM jiveVCard WHERE username=?";
     private static final String DELETE_PROPERTIES =
         "DELETE FROM jiveVCard WHERE username=?";
     private static final String UPDATE_PROPERTIES =
-        "UPDATE jiveVCard SET value=? WHERE username=?";
+        "UPDATE jiveVCard SET vcard=? WHERE username=?";
     private static final String INSERT_PROPERTY =
-        "INSERT INTO jiveVCard (username, value) VALUES (?, ?)";
+        "INSERT INTO jiveVCard (username, vcard) VALUES (?, ?)";
 
     /**
      * Pool of SAX Readers. SAXReader is not thread safe so we need to have a pool of readers.