[JM-1291] Renamed/prefixed all Openfire tables with 'of' to prevent conflicts...

[JM-1291] Renamed/prefixed all Openfire tables with 'of' to prevent conflicts with other applications in same database.

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

documentation/docs/plugin-dev-guide.html

@@ -113,10 +113,12 @@ file might look like the following:
             be set with a schema key name (often the same name as the plugin). Database
             schema files for each supported database should then be placed in the <tt>database</tt>
             directory of the plugin. For example, given the key "foo", schema files would be called
-            "foo_mysql.sql", "foo_oracle.sql", etc. The scripts should make an entry into the
-            jiveVersion table using the key so that schema version information can be tracked, e.g.:<br><br>
+            "foo_mysql.sql", "foo_oracle.sql", etc.  We recommend that you prefix your tables with
+            "of" (openfire) to avoid conflicts with possible other applications installed in the same
+            database.  The scripts should make an entry into the ofVersion table using the key so that
+            schema version information can be tracked, e.g.:<br><br>
 
-            <tt>INSERT INTO jiveVersion (name, version) VALUES ('foo', 0);</tt><br><br>
+            <tt>INSERT INTO ofVersion (name, version) VALUES ('foo', 0);</tt><br><br>
     </li>
     <li>databaseVersion -- the database schema version (if a database schema is defined). New plugins
             with a database schema should start at version 0. If future versions of the plugin
@@ -124,9 +126,9 @@ file might look like the following:
             in the <tt>database/upgrade</tt> directory for each version number. For example, the directories
             <tt>database/upgrade/1</tt> and <tt>database/upgrade/2</tt> would contain scripts such as
             "foo_mysql.sql" and "foo_oracle.sql" that contain the relevant database changes for each
-            version. Each script should update version information in the jiveVersion table, e.g.:<br><br>
+            version. Each script should update version information in the ofVersion table, e.g.:<br><br>
 
-            <tt>UPDATE jiveVersion set version=1 where name='foo';</tt><br><br>
+            <tt>UPDATE ofVersion set version=1 where name='foo';</tt><br><br>
 
     </li>
     <li>parentPlugin -- the name of the parent plugin (given as "foo" for the "foo.jar" plugin).

src/database/upgrade/19/openfire_db2.sql

+-- Rename jiveUser to ofUser
+DROP INDEX jiveUsr_cDate_idx;
+ALTER TABLE jiveUser DROP CONSTRAINT jiveUser_pk;
+RENAME jiveUser TO ofUser;
+ALTER TABLE ofUser ADD CONSTRAINT ofUser_pk PRIMARY KEY (username);
+CREATE INDEX ofUser_cDate_idx ON ofUser (creationDate ASC);
+
+-- Rename jiveUserProp to ofUserProp
+ALTER TABLE jiveUserProp DROP CONSTRAINT jiveUsrProp_pk;
+RENAME jiveUserProp TO ofUserProp;
+ALTER TABLE ofUserProp ADD CONSTRAINT ofUserProp_pk PRIMARY KEY (username, name);
+
+-- Rename jiveUserFlag to ofUserFlag
+DROP INDEX jiveUserFlag_sTime_idx;
+DROP INDEX jiveUserFlag_eTime_idx;
+ALTER TABLE jiveUserFlag DROP CONSTRAINT jiveUserFlag_pk;
+RENAME jiveUserFlag TO ofUserFlag;
+ALTER TABLE ofUserFlag ADD CONSTRAINT ofUserFlag_pk PRIMARY KEY (username, name);
+CREATE INDEX ofUserFlag_sTime_idx ON ofUserFlag (startTime ASC);
+CREATE INDEX ofUserFlag_eTime_idx ON ofUserFlag (endTime ASC);
+
+-- Rename jiveGroup to ofGroup
+ALTER TABLE jiveGroup DROP CONSTRAINT jiveGroup_pk;
+RENAME jiveGroup TO ofGroup;
+ALTER TABLE ofGroup ADD CONSTRAINT ofGroup_pk PRIMARY KEY (groupName);
+
+-- Rename jiveGroupProp to ofGroupProp
+ALTER TABLE jiveGroupProp DROP CONSTRAINT jiveGrpProp_pk;
+RENAME jiveGroupProp TO ofGroupProp;
+ALTER TABLE ofGroupProp ADD CONSTRAINT ofGroupProp_pk PRIMARY KEY (groupName, name);
+
+-- Rename jiveGroupUser to ofGroupUser
+ALTER TABLE jiveGroupUser DROP CONSTRAINT jiveGrpUser;
+RENAME jiveGroupUser TO ofGroupUser;
+ALTER TABLE ofGroupUser ADD CONSTRAINT ofGroupUser_pk PRIMARY KEY (groupName, username, administrator);
+
+-- Rename jivePrivate to ofPrivate
+ALTER TABLE jivePrivate DROP CONSTRAINT jivePrivate_pk;
+RENAME jivePrivate TO ofPrivate;
+ALTER TABLE ofPrivate ADD CONSTRAINT ofPrivate_pk PRIMARY KEY (username, name, namespace);
+
+-- Rename jiveOffline to ofOffline
+ALTER TABLE jiveOffline DROP CONSTRAINT jiveOffline_pk;
+RENAME jiveOffline TO ofOffline;
+ALTER TABLE ofOffline ADD CONSTRAINT ofOffline_pk PRIMARY KEY (username, messageID);
+
+-- Rename jivePresence to ofPresence
+ALTER TABLE jivePresence DROP CONSTRAINT jivePresence_pk;
+RENAME jivePresence TO ofPresence;
+ALTER TABLE ofPresence ADD CONSTRAINT ofPresence_pk PRIMARY KEY (username);
+
+-- Rename jiveRoster to ofRoster
+DROP INDEX jiveR_userid_idx;
+DROP INDEX jiveR_jid_idx;
+ALTER TABLE jiveRoster DROP CONSTRAINT jiveRoster_pk;
+RENAME jiveRoster TO ofRoster;
+ALTER TABLE ofRoster ADD CONSTRAINT ofRoster_pk PRIMARY KEY (rosterID);
+CREATE INDEX ofRoster_username_idx ON ofRoster (username ASC);
+CREATE INDEX ofRoster_jid_idx ON ofRoster (jid ASC);
+
+-- Rename jiveRosterGroups to ofRosterGroups
+DROP INDEX jiveRoGrps_rid_idx;
+ALTER TABLE jiveRosterGroups DROP CONSTRAINT jiveRoGrps_pk;
+RENAME jiveRosterGroups TO ofRosterGroups;
+ALTER TABLE ofRosterGroups ADD CONSTRAINT ofRosterGroups_pk PRIMARY KEY (rosterID, rank);
+CREATE INDEX ofRosterGroups_rosterid_idx ON ofRosterGroups (rosterID ASC);
+
+-- Rename jiveVCard to ofVCard
+ALTER TABLE jiveVCard DROP CONSTRAINT jiveVCard_pk;
+RENAME jiveVCard TO ofVCard;
+ALTER TABLE ofVCard ADD CONSTRAINT ofVCard_pk PRIMARY KEY (username);
+
+-- Rename jiveID to ofID
+ALTER TABLE jiveID DROP CONSTRAINT jiveID_pk;
+RENAME jiveID TO ofID;
+ALTER TABLE ofID ADD CONSTRAINT ofID_pk PRIMARY KEY (idType);
+
+-- Rename jiveProperty to ofProperty
+ALTER TABLE jiveProperty DROP CONSTRAINT jiveProperty_pk;
+RENAME jiveProperty TO ofProperty;
+ALTER TABLE ofProperty ADD CONSTRAINT ofProperty_pk PRIMARY KEY (name);
+
+-- Rename jiveVersion to ofVersion
+ALTER TABLE jiveVersion DROP CONSTRAINT jiveVersion_pk;
+RENAME jiveVersion TO ofVersion;
+ALTER TABLE ofVersion ADD CONSTRAINT ofVersion_pk PRIMARY KEY (name);
+
+-- Rename jiveExtComponentConf to ofExtComponentConf
+ALTER TABLE jiveExtComponentConf DROP CONSTRAINT jiveExtCmpConf_pk;
+RENAME jiveExtComponentConf TO ofExtComponentConf;
+ALTER TABLE ofExtComponentConf ADD CONSTRAINT ofExtComponentConf_pk PRIMARY KEY (subdomain);
+
+-- Rename jiveRemoteServerConf to ofRemoteServerConf
+ALTER TABLE jiveRemoteServerConf DROP CONSTRAINT jiveRmSrvConf_pk;
+RENAME jiveRemoteServerConf TO ofRemoteServerConf;
+ALTER TABLE ofRemoteServerConf ADD CONSTRAINT ofRemoteServerConf_pk PRIMARY KEY (xmppDomain);
+
+-- Rename jivePrivacyList to ofPrivacyList
+DROP INDEX jList_default_idx;
+ALTER TABLE jivePrivacyList DROP CONSTRAINT jivePrivacyList_pk;
+RENAME jivePrivacyList TO ofPrivacyList;
+ALTER TABLE ofPrivacyList ADD CONSTRAINT ofPrivacyList_pk PRIMARY KEY (username, name);
+CREATE INDEX ofPrivacyList_default_idx ON ofPrivacyList (username, isDefault);
+
+-- Rename jiveSASLAuthorized to ofSASLAuthorized
+ALTER TABLE jiveSASLAuthorized DROP CONSTRAINT jSASLAuthrizd_pk;
+RENAME jiveSASLAuthorized TO ofSASLAuthorized;
+ALTER TABLE ofSASLAuthorized ADD CONSTRAINT ofSASLAuthorized_pk PRIMARY KEY (username, principal);
+
+-- Rename jiveSecurityAuditLog to ofSecurityAuditLog
+DROP INDEX jiveSecAuditLog_tstamp_idx;
+DROP INDEX jiveSecAuditLog_uname_idx;
+ALTER TABLE jiveSecurityAuditLog DROP CONSTRAINT jiveSecAuditLog_pk;
+RENAME jiveSecurityAuditLog TO ofSecurityAuditLog;
+ALTER TABLE ofSecurityAuditLog ADD CONSTRAINT ofSecurityAuditLog_pk PRIMARY KEY (msgID);
+CREATE INDEX ofSecurityAuditLog_tstamp_idx ON ofSecurityAuditLog (entryStamp);
+CREATE INDEX ofSecurityAuditLog_uname_idx ON ofSecurityAuditLog (username);
+
+-- Rename mucService to ofMucService
+DROP INDEX mucService_serviceid_idx;
+ALTER TABLE mucService DROP CONSTRAINT mucService_pk;
+RENAME mucService TO ofMucService;
+ALTER TABLE ofMucService ADD CONSTRAINT ofMucService_pk PRIMARY KEY (subdomain);
+CREATE INDEX ofMucService_serviceid_idx ON ofMucService(serviceID);
+
+-- Rename mucServiceProp to ofMucServiceProp
+ALTER TABLE mucServiceProp DROP CONSTRAINT mucServiceProp_pk;
+RENAME mucServiceProp TO ofMucServiceProp;
+ALTER TABLE ofMucServiceProp ADD CONSTRAINT ofMucServiceProp_pk PRIMARY KEY (serviceID, name);
+
+-- Rename mucRoom to ofMucRoom
+DROP INDEX mucRm_roomid_idx;
+DROP INDEX mucRm_serviceid_idx;
+ALTER TABLE mucRoom DROP CONSTRAINT mucRoom_pk;
+RENAME mucRoom TO ofMucRoom;
+ALTER TABLE ofMucRoom ADD CONSTRAINT ofMucRoom_pk PRIMARY KEY (serviceID, name);
+CREATE INDEX ofMucRoom_roomid_idx ON ofMucRoom (roomID);
+CREATE INDEX ofMucRoom_serviceid_idx ON ofMucRoom (serviceID);
+
+-- Rename mucRoomProp to ofMucRoomProp
+ALTER TABLE mucRoomProp DROP CONSTRAINT mucRoomProp_pk;
+RENAME mucRoomProp TO ofMucRoomProp;
+ALTER TABLE ofMucRoomProp ADD CONSTRAINT ofMucRoomProp_pk PRIMARY KEY (roomID, name);
+
+-- Rename mucAffiliation to ofMucAffiliation
+ALTER TABLE mucAffiliation DROP CONSTRAINT mucAffiliation_pk;
+RENAME mucAffiliation TO ofMucAffiliation;
+ALTER TABLE ofMucAffiliation ADD CONSTRAINT ofMucAffiliation_pk PRIMARY KEY (roomID, jid);
+
+-- Rename mucMember to ofMucMember
+ALTER TABLE mucMember DROP CONSTRAINT mucMember_pk;
+RENAME mucMember TO ofMucMember;
+ALTER TABLE ofMucMember ADD CONSTRAINT ofMucMember_pk PRIMARY KEY (roomID, jid);
+
+-- Rename mucConversationLog to ofMucConversationLog
+DROP INDEX mucLog_time_idx;
+RENAME mucConversationLog TO ofMucConversationLog;
+CREATE INDEX ofMucConversationLog_time_idx ON ofMucConversationLog (logTime);
+
+-- Rename pubsubNode to ofPubsubNode
+ALTER TABLE pubsubNode DROP CONSTRAINT pubsubNode_pk;
+RENAME pubsubNode TO ofPubsubNode;
+ALTER TABLE ofPubsubNode ADD CONSTRAINT ofPubsubNode_pk PRIMARY KEY (serviceID, nodeID);
+
+-- Rename pubsubNodeJIDs to ofPubsubNodeJIDs
+ALTER TABLE pubsubNodeJIDs DROP CONSTRAINT pubsubJID_pk;
+RENAME pubsubNodeJIDs TO ofPubsubNodeJIDs;
+ALTER TABLE ofPubsubNodeJIDs ADD CONSTRAINT ofPubsubNodeJIDs_pk PRIMARY KEY (serviceID, nodeID, jid);
+
+-- Rename pubsubNodeGroups to ofPubsubNodeGroups
+DROP INDEX pubsubNGrps_idx;
+RENAME pubsubNodeGroups TO ofPubsubNodeGroups;
+CREATE INDEX ofPubsubNodeGroups_idx ON ofPubsubNodeGroups (serviceID, nodeID);
+
+-- Rename pubsubAffiliation to ofPubsubAffiliation
+ALTER TABLE pubsubAffiliation DROP CONSTRAINT pubsubAffil_pk;
+RENAME pubsubAffiliation TO ofPubsubAffiliation;
+ALTER TABLE ofPubsubAffiliation ADD CONSTRAINT ofPubsubAffiliation_pk PRIMARY KEY (serviceID, nodeID, jid);
+
+-- Rename pubsubItem to ofPubsubItem
+ALTER TABLE pubsubItem DROP CONSTRAINT pubsubItem_pk;
+RENAME pubsubItem TO ofPubsubItem;
+ALTER TABLE ofPubsubItem ADD CONSTRAINT ofPubsubItem_pk PRIMARY KEY (serviceID, nodeID, id);
+
+-- Rename pubsubSubscription to ofPubsubSubscription
+ALTER TABLE pubsubSubscription DROP CONSTRAINT pubsubSubs_pk;
+RENAME pubsubSubscription TO ofPubsubSubscription;
+ALTER TABLE ofPubsubSubscription ADD CONSTRAINT ofPubsubSubscription_pk PRIMARY KEY (serviceID, nodeID, id);
+
+-- Rename pubsubDefaultConf to ofPubsubDefaultConf
+ALTER TABLE pubsubDefaultConf DROP CONSTRAINT pubsubDefConf_pk;
+RENAME pubsubDefaultConf TO ofPubsubDefaultConf;
+ALTER TABLE ofPubsubDefaultConf ADD CONSTRAINT ofPubsubDefaultConf_pk PRIMARY KEY (serviceID, leaf);
+
+-- Update version
+UPDATE ofVersion SET version = 19 WHERE name = 'openfire';
\ No newline at end of file

src/database/upgrade/19/openfire_hsqldb.sql

+// Rename jiveUser to ofUser
+DROP INDEX jiveUser_cDate_idx;
+ALTER TABLE jiveUser DROP CONSTRAINT jiveUser_pk;
+ALTER TABLE jiveUser RENAME TO ofUser;
+ALTER TABLE ofUser ADD CONSTRAINT ofUser_pk PRIMARY KEY (username);
+CREATE INDEX ofUser_cDate_idx ON ofUser (creationDate);
+
+// Rename jiveUserProp to ofUserProp
+ALTER TABLE jiveUserProp DROP CONSTRAINT jiveUserProp_pk;
+ALTER TABLE jiveUserProp RENAME TO ofUserProp;
+ALTER TABLE ofUserProp ADD CONSTRAINT ofUserProp_pk PRIMARY KEY (username, name);
+
+// Rename jiveUserFlag to ofUserFlag
+DROP INDEX jiveUserFlag_sTime_idx;
+DROP INDEX jiveUserFlag_eTime_idx;
+ALTER TABLE jiveUserFlag DROP CONSTRAINT jiveUserFlag_pk;
+ALTER TABLE jiveUserFlag RENAME TO ofUserFlag;
+ALTER TABLE ofUserFlag ADD CONSTRAINT ofUserFlag_pk PRIMARY KEY (username, name);
+CREATE INDEX ofUserFlag_sTime_idx ON ofUserFlag (startTime);
+CREATE INDEX ofUserFlag_eTime_idx ON ofUserFlag (endTime);
+
+// Rename jiveGroup to ofGroup
+ALTER TABLE jiveGroup DROP CONSTRAINT jiveGroup_pk;
+ALTER TABLE jiveGroup RENAME TO ofGroup;
+ALTER TABLE ofGroup ADD CONSTRAINT ofGroup_pk PRIMARY KEY (groupName);
+
+// Rename jiveGroupProp to ofGroupProp
+ALTER TABLE jiveGroupProp DROP CONSTRAINT jiveGroupProp_pk;
+ALTER TABLE jiveGroupProp RENAME TO ofGroupProp;
+ALTER TABLE ofGroupProp ADD CONSTRAINT ofGroupProp_pk PRIMARY KEY (groupName, name);
+
+// Rename jiveGroupUser to ofGroupUser
+ALTER TABLE jiveGroupUser DROP CONSTRAINT jiveGroupUser_pk;
+ALTER TABLE jiveGroupUser RENAME TO ofGroupUser;
+ALTER TABLE ofGroupUser ADD CONSTRAINT ofGroupUser_pk PRIMARY KEY (groupName, username, administrator);
+
+// Rename jivePrivate to ofPrivate
+ALTER TABLE jivePrivate DROP CONSTRAINT jivePrivate_pk;
+ALTER TABLE jivePrivate RENAME TO ofPrivate;
+ALTER TABLE ofPrivate ADD CONSTRAINT ofPrivate_pk PRIMARY KEY (username, name, namespace);
+
+// Rename jiveOffline to ofOffline
+ALTER TABLE jiveOffline DROP CONSTRAINT jiveOffline_pk;
+ALTER TABLE jiveOffline RENAME TO ofOffline;
+ALTER TABLE ofOffline ADD CONSTRAINT ofOffline_pk PRIMARY KEY (username, messageID);
+
+// Rename jivePresence to ofPresence
+ALTER TABLE jivePresence DROP CONSTRAINT jivePresence_pk;
+ALTER TABLE jivePresence RENAME TO ofPresence;
+ALTER TABLE ofPresence ADD CONSTRAINT ofPresence_pk PRIMARY KEY (username);
+
+// Rename jiveRoster to ofRoster
+DROP INDEX jiveRoster_username_idx;
+DROP INDEX jiveRoster_jid_idx;
+ALTER TABLE jiveRoster DROP CONSTRAINT jiveRoster_pk;
+ALTER TABLE jiveRoster RENAME TO ofRoster;
+ALTER TABLE ofRoster ADD CONSTRAINT ofRoster_pk PRIMARY KEY (rosterID);
+CREATE INDEX ofRoster_username_idx ON ofRoster (username);
+CREATE INDEX ofRoster_jid_idx ON ofRoster (jid);
+
+// Rename jiveRosterGroups to ofRosterGroups
+DROP INDEX jiveRosterGroup_rosterid_idx;
+ALTER TABLE jiveRosterGroups DROP CONSTRAINT jiveRosterGroups_pk;
+ALTER TABLE jiveRosterGroups RENAME TO ofRosterGroups;
+ALTER TABLE ofRosterGroups ADD CONSTRAINT ofRosterGroups_pk PRIMARY KEY (rosterID, rank);
+CREATE INDEX ofRosterGroup_rosterid_idx ON ofRosterGroups (rosterID);
+
+// Rename jiveVCard to ofVCard
+ALTER TABLE jiveVCard DROP CONSTRAINT jiveVCard_pk;
+ALTER TABLE jiveVCard RENAME TO ofVCard;
+ALTER TABLE ofVCard ADD CONSTRAINT ofVCard_pk PRIMARY KEY (username);
+
+// Rename jiveID to ofID
+ALTER TABLE jiveID DROP CONSTRAINT jiveID_pk;
+ALTER TABLE jiveID RENAME TO ofID;
+ALTER TABLE ofID ADD CONSTRAINT ofID_pk PRIMARY KEY (idType);
+
+// Rename jiveProperty to ofProperty
+ALTER TABLE jiveProperty DROP CONSTRAINT jiveProperty_pk;
+ALTER TABLE jiveProperty RENAME TO ofProperty;
+ALTER TABLE ofProperty ADD CONSTRAINT ofProperty_pk PRIMARY KEY (name);
+
+// Rename jiveVersion to ofVersion
+ALTER TABLE jiveVersion DROP CONSTRAINT jiveVersion_pk;
+ALTER TABLE jiveVersion RENAME TO ofVersion;
+ALTER TABLE ofVersion ADD CONSTRAINT ofVersion_pk PRIMARY KEY (name);
+
+// Rename jiveExtComponentConf to ofExtComponentConf
+ALTER TABLE jiveExtComponentConf DROP CONSTRAINT jiveExtComponentConf_pk;
+ALTER TABLE jiveExtComponentConf RENAME TO ofExtComponentConf;
+ALTER TABLE ofExtComponentConf ADD CONSTRAINT ofExtComponentConf_pk PRIMARY KEY (subdomain);
+
+// Rename jiveRemoteServerConf to ofRemoteServerConf
+ALTER TABLE jiveRemoteServerConf DROP CONSTRAINT jiveRemoteServerConf_pk;
+ALTER TABLE jiveRemoteServerConf RENAME TO ofRemoteServerConf;
+ALTER TABLE ofRemoteServerConf ADD CONSTRAINT ofRemoteServerConf_pk PRIMARY KEY (xmppDomain);
+
+// Rename jivePrivacyList to ofPrivacyList
+DROP INDEX jivePList_default_idx;
+ALTER TABLE jivePrivacyList DROP CONSTRAINT jivePrivacyList_pk;
+ALTER TABLE jivePrivacyList RENAME TO ofPrivacyList;
+ALTER TABLE ofPrivacyList ADD CONSTRAINT ofPrivacyList_pk PRIMARY KEY (username, name);
+CREATE INDEX ofPrivacyList_default_idx ON ofPrivacyList (username, isDefault);
+
+// Rename jiveSASLAuthorized to ofSASLAuthorized
+ALTER TABLE jiveSASLAuthorized DROP CONSTRAINT jiveSASLAuthorized_pk;
+ALTER TABLE jiveSASLAuthorized RENAME TO ofSASLAuthorized;
+ALTER TABLE ofSASLAuthorized ADD CONSTRAINT ofSASLAuthorized_pk PRIMARY KEY (username, principal);
+
+// Rename jiveSecurityAuditLog to ofSecurityAuditLog
+DROP INDEX jiveSecAuditLog_tstamp_idx;
+DROP INDEX jiveSecAuditLog_uname_idx;
+ALTER TABLE jiveSecurityAuditLog DROP CONSTRAINT jiveSecAuditLog_pk;
+ALTER TABLE jiveSecurityAuditLog RENAME TO ofSecurityAuditLog;
+ALTER TABLE ofSecurityAuditLog ADD CONSTRAINT ofSecurityAuditLog_pk PRIMARY KEY (msgID);
+CREATE INDEX ofSecurityAuditLog_tstamp_idx ON ofSecurityAuditLog (entryStamp);
+CREATE INDEX ofSecurityAuditLog_uname_idx ON ofSecurityAuditLog (username);
+
+// Rename mucService to ofMucService
+DROP INDEX mucService_serviceid_idx;
+ALTER TABLE mucService DROP CONSTRAINT mucService_pk;
+ALTER TABLE mucService RENAME TO ofMucService;
+ALTER TABLE ofMucService ADD CONSTRAINT ofMucService_pk PRIMARY KEY (subdomain)
+CREATE INDEX ofMucService_serviceid_idx ON ofMucService(serviceID);
+
+// Rename mucServiceProp to ofMucServiceProp
+ALTER TABLE mucServiceProp DROP CONSTRAINT mucServiceProp_pk;
+ALTER TABLE mucServiceProp RENAME TO ofMucServiceProp;
+ALTER TABLE ofMucServiceProp ADD CONSTRAINT ofMucServiceProp_pk PRIMARY KEY (serviceID, name);
+
+// Rename mucRoom to ofMucRoom
+DROP INDEX mucRoom_roomid_idx;
+DROP INDEX mucRoom_serviceid_idx;
+ALTER TABLE mucRoom DROP CONSTRAINT mucRoom_pk;
+ALTER TABLE mucRoom RENAME TO ofMucRoom;
+ALTER TABLE ofMucRoom ADD CONSTRAINT ofMucRoom_pk PRIMARY KEY (serviceID, name)
+CREATE INDEX ofMucRoom_roomid_idx ON ofMucRoom(roomID);
+CREATE INDEX ofMucRoom_serviceid_idx ON ofMucRoom(serviceID);
+
+// Rename mucRoomProp to ofMucRoomProp
+ALTER TABLE mucRoomProp DROP CONSTRAINT mucRoomProp_pk;
+ALTER TABLE mucRoomProp RENAME TO ofMucRoomProp;
+ALTER TABLE ofMucRoomProp ADD CONSTRAINT ofMucRoomProp_pk PRIMARY KEY (roomID, name);
+
+// Rename mucAffiliation to ofMucAffiliation
+ALTER TABLE mucAffiliation DROP CONSTRAINT mucAffiliation_pk;
+ALTER TABLE mucAffiliation RENAME TO ofMucAffiliation;
+ALTER TABLE ofMucAffiliation ADD CONSTRAINT ofMucAffiliation_pk PRIMARY KEY (roomID, jid);
+
+// Rename mucMember to ofMucMember
+ALTER TABLE mucMember DROP CONSTRAINT mucMember_pk;
+ALTER TABLE mucMember RENAME TO ofMucMember;
+ALTER TABLE ofMucMember ADD CONSTRAINT ofMucMember_pk PRIMARY KEY (roomID, jid);
+
+// Rename mucConversationLog to ofMucConversationLog
+DROP INDEX mucLog_time_idx;
+ALTER TABLE mucConversationLog RENAME TO ofMucConversationLog;
+CREATE INDEX ofMucConversationLog_time_idx ON ofMucConversationLog (logTime);
+
+// Rename pubsubNode to ofPubsubNode
+ALTER TABLE pubsubNode DROP CONSTRAINT pubsubNode_pk;
+ALTER TABLE pubsubNode RENAME TO ofPubsubNode;
+ALTER TABLE ofPubsubNode ADD CONSTRAINT ofPubsubNode_pk PRIMARY KEY (serviceID, nodeID);
+
+// Rename pubsubNodeJIDs to ofPubsubNodeJIDs
+ALTER TABLE pubsubNodeJIDs DROP CONSTRAINT pubsubJID_pk;
+ALTER TABLE pubsubNodeJIDs RENAME TO ofPubsubNodeJIDs;
+ALTER TABLE ofPubsubNodeJIDs ADD CONSTRAINT ofPubsubNodeJIDs_pk PRIMARY KEY (serviceID, nodeID, jid);
+
+// Rename pubsubNodeGroups to ofPubsubNodeGroups
+DROP INDEX pubsubNodeGroups_idx;
+ALTER TABLE pubsubNodeGroups RENAME TO ofPubsubNodeGroups;
+CREATE INDEX ofPubsubNodeGroups_idx ON ofPubsubNodeGroups (serviceID, nodeID);
+
+// Rename pubsubAffiliation to ofPubsubAffiliation
+ALTER TABLE pubsubAffiliation DROP CONSTRAINT pubsubAffil_pk;
+ALTER TABLE pubsubAffiliation RENAME TO ofPubsubAffiliation;
+ALTER TABLE ofPubsubAffiliation ADD CONSTRAINT ofPubsubAffiliation_pk PRIMARY KEY (serviceID, nodeID, jid);
+
+// Rename pubsubItem to ofPubsubItem
+ALTER TABLE pubsubItem DROP CONSTRAINT pubsubItem_pk;
+ALTER TABLE pubsubItem RENAME TO ofPubsubItem;
+ALTER TABLE ofPubsubItem ADD CONSTRAINT ofPubsubItem_pk PRIMARY KEY (serviceID, nodeID, id);
+
+// Rename pubsubSubscription to ofPubsubSubscription
+ALTER TABLE pubsubSubscription DROP CONSTRAINT pubsubSubs_pk;
+ALTER TABLE pubsubSubscription RENAME TO ofPubsubSubscription;
+ALTER TABLE ofPubsubSubscription ADD CONSTRAINT ofPubsubSubscription_pk PRIMARY KEY (serviceID, nodeID, id);
+
+// Rename pubsubDefaultConf to ofPubsubDefaultConf
+ALTER TABLE pubsubDefaultConf DROP CONSTRAINT pubsubDefConf_pk;
+ALTER TABLE pubsubDefaultConf RENAME TO ofPubsubDefaultConf;
+ALTER TABLE ofPubsubDefaultConf ADD CONSTRAINT ofPubsubDefaultConf_pk PRIMARY KEY (serviceID, leaf);
+
+// Update version
+UPDATE ofVersion SET version = 19 WHERE name = 'openfire';
\ No newline at end of file

src/database/upgrade/19/openfire_mysql.sql

+# Rename jiveUser to ofUser
+ALTER TABLE jiveUser DROP INDEX jiveUser_cDate_idx;
+RENAME TABLE jiveUser TO ofUser;
+ALTER TABLE ofUser ADD INDEX ofUser_cDate_idx (creationDate);
+
+# Rename jiveUserProp to ofUserProp
+RENAME TABLE jiveUserProp TO ofUserProp;
+
+# Rename jiveUserFlag to ofUserFlag
+ALTER TABLE jiveUserFlag DROP INDEX jiveUser_sTime_idx;
+ALTER TABLE jiveUserFlag DROP INDEX jiveUser_eTime_idx;
+RENAME TABLE jiveUserFlag TO ofUserFlag;
+ALTER TABLE ofUserFlag ADD INDEX ofUserFlag_sTime_idx (startTime);
+ALTER TABLE ofUserFlag ADD INDEX ofUserFlag_eTime_idx (endTime);
+
+# Rename jiveGroup to ofGroup
+RENAME TABLE jiveGroup TO ofGroup;
+
+# Rename jiveGroupProp to ofGroupProp
+RENAME TABLE jiveGroupProp TO ofGroupProp;
+
+# Rename jiveGroupUser to ofGroupUser
+RENAME TABLE jiveGroupUser TO ofGroupUser;
+
+# Rename jivePrivate to ofPrivate
+RENAME TABLE jivePrivate TO ofPrivate;
+
+# Rename jiveOffline to ofOffline
+RENAME TABLE jiveOffline TO ofOffline;
+
+# Rename jivePresence to ofPresence
+RENAME TABLE jivePresence TO ofPresence;
+
+# Rename jiveRoster to ofRoster
+ALTER TABLE jiveRoster DROP INDEX jiveRoster_unameid_idx;
+ALTER TABLE jiveRoster DROP INDEX jiveRoster_jid_idx;
+RENAME TABLE jiveRoster TO ofRoster;
+ALTER TABLE ofRoster ADD INDEX ofRoster_unameid_idx (username);
+ALTER TABLE ofRoster ADD INDEX ofRoster_jid_idx (jid);
+
+# Rename jiveRosterGroups to ofRosterGroups
+ALTER TABLE jiveRosterGroups DROP INDEX jiveRosterGroup_rosterid_idx;
+RENAME TABLE jiveRosterGroups TO ofRosterGroups;
+ALTER TABLE ofRosterGroups ADD INDEX ofRosterGroup_rosterid_idx (rosterID);
+
+# Rename jiveVCard to ofVCard
+RENAME TABLE jiveVCard TO ofVCard;
+
+# Rename jiveID to ofID
+RENAME TABLE jiveID TO ofID;
+
+# Rename jiveProperty to ofProperty
+RENAME TABLE jiveProperty TO ofProperty;
+
+# Rename jiveVersion to ofVersion
+RENAME TABLE jiveVersion TO ofVersion;
+
+# Rename jiveExtComponentConf to ofExtComponentConf
+RENAME TABLE jiveExtComponentConf TO ofExtComponentConf;
+
+# Rename jiveRemoteServerConf to ofRemoteServerConf
+RENAME TABLE jiveRemoteServerConf TO ofRemoteServerConf;
+
+# Rename jivePrivacyList to ofPrivacyList
+ALTER TABLE jivePrivacyList DROP INDEX jivePList_default_idx;
+RENAME TABLE jivePrivacyList TO ofPrivacyList;
+ALTER TABLE ofPrivacyList ADD INDEX ofPrivacyList_default_idx (username, isDefault);
+
+# Rename jiveSASLAuthorized to ofSASLAuthorized
+RENAME TABLE jiveSASLAuthorized TO ofSASLAuthorized;
+
+# Rename jiveSecurityAuditLog to ofSecurityAuditLog
+ALTER TABLE jiveSecurityAuditLog DROP INDEX jiveSecAuditLog_tstamp_idx;
+ALTER TABLE jiveSecurityAuditLog DROP INDEX jiveSecAuditLog_uname_idx;
+RENAME TABLE jiveSecurityAuditLog TO ofSecurityAuditLog;
+ALTER TABLE ofSecurityAuditLog ADD INDEX ofSecurityAuditLog_tstamp_idx (entryStamp);
+ALTER TABLE ofSecurityAuditLog ADD INDEX ofSecurityAuditLog_uname_idx (username);
+
+# Rename mucService to ofMucService
+ALTER TABLE mucService DROP INDEX mucService_serviceid_idx;
+RENAME TABLE mucService TO ofMucService;
+ALTER TABLE ofMucService ADD INDEX ofMucService_serviceid_idx (serviceID);
+
+# Rename mucServiceProp to ofMucServiceProp
+RENAME TABLE mucServiceProp TO ofMucServiceProp;
+
+# Rename mucRoom to ofMucRoom
+ALTER TABLE mucRoom DROP INDEX mucRoom_roomid_idx;
+ALTER TABLE mucRoom DROP INDEX mucRoom_serviceid_idx;
+RENAME TABLE mucRoom TO ofMucRoom;
+ALTER TABLE ofMucRoom ADD INDEX ofMucRoom_roomid_idx (roomID);
+ALTER TABLE ofMucRoom ADD INDEX ofMucRoom_serviceid_idx (serviceID);
+
+# Rename mucRoomProp to ofMucRoomProp
+RENAME TABLE mucRoomProp TO ofMucRoomProp;
+
+# Rename mucAffiliation to ofMucAffiliation
+RENAME TABLE mucAffiliation TO ofMucAffiliation;
+
+# Rename mucMember to ofMucMember
+RENAME TABLE mucMember TO ofMucMember;
+
+# Rename mucConversationLog to ofMucConversationLog
+ALTER TABLE mucConversationLog DROP INDEX mucLog_time_idx;
+RENAME TABLE mucConversationLog TO ofMucConversationLog;
+ALTER TABLE ofMucConversationLog ADD INDEX ofMucConversationLog_time_idx (logTime);
+
+# Rename pubsubNode to ofPubsubNode
+RENAME TABLE pubsubNode TO ofPubsubNode;
+
+# Rename pubsubNodeJIDs to ofPubsubNodeJIDs
+RENAME TABLE pubsubNodeJIDs TO ofPubsubNodeJIDs;
+
+# Rename pubsubNodeGroups to ofPubsubNodeGroups
+ALTER TABLE pubsubNodeGroups DROP INDEX pubsubNodeGroups_idx;
+RENAME TABLE pubsubNodeGroups TO ofPubsubNodeGroups;
+ALTER TABLE ofPubsubNodeGroups ADD INDEX ofPubsubNodeGroups_idx (serviceID, nodeID);
+
+# Rename pubsubAffiliation to ofPubsubAffiliation
+RENAME TABLE pubsubAffiliation TO ofPubsubAffiliation;
+
+# Rename pubsubItem to ofPubsubItem
+RENAME TABLE pubsubItem TO ofPubsubItem;
+
+# Rename pubsubSubscription to ofPubsubSubscription
+RENAME TABLE pubsubSubscription TO ofPubsubSubscription;
+
+# Rename pubsubDefaultConf to ofPubsubDefaultConf
+RENAME TABLE pubsubDefaultConf TO ofPubsubDefaultConf;
+
+# Update version
+UPDATE ofVersion SET version = 19 WHERE name = 'openfire';

src/database/upgrade/19/openfire_oracle.sql

+-- Rename jiveUser to ofUser
+DROP INDEX jiveUser_cDate_idx;
+ALTER TABLE jiveUser DROP CONSTRAINT jiveUser_pk;
+ALTER TABLE jiveUser RENAME TO ofUser;
+ALTER TABLE ofUser ADD CONSTRAINT ofUser_pk PRIMARY KEY (username);
+CREATE INDEX ofUser_cDate_idx ON ofUser (creationDate ASC);
+
+-- Rename jiveUserProp to ofUserProp
+ALTER TABLE jiveUserProp DROP CONSTRAINT jiveUserProp_pk;
+ALTER TABLE jiveUserProp RENAME TO ofUserProp;
+ALTER TABLE ofUserProp ADD CONSTRAINT ofUserProp_pk PRIMARY KEY (username, name);
+
+-- Rename jiveUserFlag to ofUserFlag
+DROP INDEX jiveUserFlag_sTime_idx;
+DROP INDEX jiveUserFlag_eTime_idx;
+ALTER TABLE jiveUserFlag DROP CONSTRAINT jiveUserFlag_pk;
+ALTER TABLE jiveUserFlag RENAME TO ofUserFlag;
+ALTER TABLE ofUserFlag ADD CONSTRAINT ofUserFlag_pk PRIMARY KEY (username, name);
+CREATE INDEX ofUserFlag_sTime_idx ON ofUserFlag (startTime ASC);
+CREATE INDEX ofUserFlag_eTime_idx ON ofUserFlag (endTime ASC);
+
+-- Rename jiveGroup to ofGroup
+ALTER TABLE jiveGroup DROP CONSTRAINT jiveGroup_pk;
+ALTER TABLE jiveGroup RENAME TO ofGroup;
+ALTER TABLE ofGroup ADD CONSTRAINT ofGroup_pk PRIMARY KEY (groupName);
+
+-- Rename jiveGroupProp to ofGroupProp
+ALTER TABLE jiveGroupProp DROP CONSTRAINT jiveGroupProp_pk;
+ALTER TABLE jiveGroupProp RENAME TO ofGroupProp;
+ALTER TABLE ofGroupProp ADD CONSTRAINT ofGroupProp_pk PRIMARY KEY (groupName, name);
+
+-- Rename jiveGroupUser to ofGroupUser
+ALTER TABLE jiveGroupUser DROP CONSTRAINT jiveGroupUser;
+ALTER TABLE jiveGroupUser RENAME TO ofGroupUser;
+ALTER TABLE ofGroupUser ADD CONSTRAINT ofGroupUser_pk PRIMARY KEY (groupName, username, administrator);
+
+-- Rename jivePrivate to ofPrivate
+ALTER TABLE jivePrivate DROP CONSTRAINT jivePrivate_pk;
+ALTER TABLE jivePrivate RENAME TO ofPrivate;
+ALTER TABLE ofPrivate ADD CONSTRAINT ofPrivate_pk PRIMARY KEY (username, name, namespace);
+
+-- Rename jiveOffline to ofOffline
+ALTER TABLE jiveOffline DROP CONSTRAINT jiveOffline_pk;
+ALTER TABLE jiveOffline RENAME TO ofOffline;
+ALTER TABLE ofOffline ADD CONSTRAINT ofOffline_pk PRIMARY KEY (username, messageID);
+
+-- Rename jivePresence to ofPresence
+ALTER TABLE jivePresence DROP CONSTRAINT jivePresence_pk;
+ALTER TABLE jivePresence RENAME TO ofPresence;
+ALTER TABLE ofPresence ADD CONSTRAINT ofPresence_pk PRIMARY KEY (username);
+
+-- Drop foreign key on jiveRoster from jiveRosterGroups
+ALTER TABLE jiveRosterGroups DROP CONSTRAINT jiveRosterGroups_rosterID_fk;
+
+-- Rename jiveRoster to ofRoster
+DROP INDEX jiveRoster_username_idx;
+DROP INDEX jiveRoster_jid_idx;
+ALTER TABLE jiveRoster DROP CONSTRAINT jiveRoster_pk;
+ALTER TABLE jiveRoster RENAME TO ofRoster;
+ALTER TABLE ofRoster ADD CONSTRAINT ofRoster_pk PRIMARY KEY (rosterID);
+CREATE INDEX ofRoster_username_idx ON ofRoster (username ASC);
+CREATE INDEX ofRoster_jid_idx ON ofRoster (jid ASC);
+
+-- Rename jiveRosterGroups to ofRosterGroups
+DROP INDEX jiveRosterGroup_rosterid_idx;
+ALTER TABLE jiveRosterGroups DROP CONSTRAINT jiveRosterGroups_pk;
+ALTER TABLE jiveRosterGroups RENAME TO ofRosterGroups;
+ALTER TABLE ofRosterGroups ADD CONSTRAINT ofRosterGroups_pk PRIMARY KEY (rosterID, rank);
+CREATE INDEX ofRosterGroup_rosterid_idx ON ofRosterGroups (rosterID ASC);
+
+-- Readd foreign key
+ALTER TABLE ofRosterGroups ADD CONSTRAINT ofRosterGroups_rosterID_fk FOREIGN KEY (rosterID) REFERENCES ofRoster INITIALLY DEFERRED DEFERRABLE;
+
+-- Rename jiveVCard to ofVCard
+ALTER TABLE jiveVCard DROP CONSTRAINT JiveVCard_pk;
+ALTER TABLE jiveVCard RENAME TO ofVCard;
+ALTER TABLE ofVCard ADD CONSTRAINT ofVCard_pk PRIMARY KEY (username);
+
+-- Rename jiveID to ofID
+ALTER TABLE jiveID DROP CONSTRAINT jiveID_pk;
+ALTER TABLE jiveID RENAME TO ofID;
+ALTER TABLE ofID ADD CONSTRAINT ofID_pk PRIMARY KEY (idType);
+
+-- Rename jiveProperty to ofProperty
+ALTER TABLE jiveProperty DROP CONSTRAINT jiveProperty_pk;
+ALTER TABLE jiveProperty RENAME TO ofProperty;
+ALTER TABLE ofProperty ADD CONSTRAINT ofProperty_pk PRIMARY KEY (name);
+
+-- Rename jiveVersion to ofVersion
+ALTER TABLE jiveVersion DROP CONSTRAINT jiveVersion_pk;
+ALTER TABLE jiveVersion RENAME TO ofVersion;
+ALTER TABLE ofVersion ADD CONSTRAINT ofVersion_pk PRIMARY KEY (name);
+
+-- Rename jiveExtComponentConf to ofExtComponentConf
+ALTER TABLE jiveExtComponentConf DROP CONSTRAINT jiveExtComponentConf_pk;
+ALTER TABLE jiveExtComponentConf RENAME TO ofExtComponentConf;
+ALTER TABLE ofExtComponentConf ADD CONSTRAINT ofExtComponentConf_pk PRIMARY KEY (subdomain);
+
+-- Rename jiveRemoteServerConf to ofRemoteServerConf
+ALTER TABLE jiveRemoteServerConf DROP CONSTRAINT jiveRemoteServerConf_pk;
+ALTER TABLE jiveRemoteServerConf RENAME TO ofRemoteServerConf;
+ALTER TABLE ofRemoteServerConf ADD CONSTRAINT ofRemoteServerConf_pk PRIMARY KEY (xmppDomain);
+
+-- Rename jivePrivacyList to ofPrivacyList
+DROP INDEX jivePList_default_idx;
+ALTER TABLE jivePrivacyList DROP CONSTRAINT jivePrivacyList_pk;
+ALTER TABLE jivePrivacyList RENAME TO ofPrivacyList;
+ALTER TABLE ofPrivacyList ADD CONSTRAINT ofPrivacyList_pk PRIMARY KEY (username, name);
+CREATE INDEX ofPrivacyList_default_idx ON ofPrivacyList (username, isDefault);
+
+-- Rename jiveSASLAuthorized to ofSASLAuthorized
+ALTER TABLE jiveSASLAuthorized DROP CONSTRAINT jiveSASLAuthoirzed_pk;
+ALTER TABLE jiveSASLAuthorized RENAME TO ofSASLAuthorized;
+ALTER TABLE ofSASLAuthorized ADD CONSTRAINT ofSASLAuthorized_pk PRIMARY KEY (username, principal);
+
+-- Rename jiveSecurityAuditLog to ofSecurityAuditLog
+DROP INDEX jiveSecAuditLog_tstamp_idx;
+DROP INDEX jiveSecAuditLog_uname_idx;
+ALTER TABLE jiveSecurityAuditLog DROP CONSTRAINT jiveSecAuditLog_pk;
+ALTER TABLE jiveSecurityAuditLog RENAME TO ofSecurityAuditLog;
+ALTER TABLE ofSecurityAuditLog ADD CONSTRAINT ofSecurityAuditLog_pk PRIMARY KEY (msgID);
+CREATE INDEX ofSecurityAuditLog_tstamp_idx ON ofSecurityAuditLog (entryStamp);
+CREATE INDEX ofSecurityAuditLog_uname_idx ON ofSecurityAuditLog (username);
+
+-- Rename mucService to ofMucService
+DROP INDEX mucService_serviceid_idx;
+ALTER TABLE mucService DROP CONSTRAINT mucService_pk;
+ALTER TABLE mucService RENAME TO ofMucService;
+ALTER TABLE ofMucService ADD CONSTRAINT ofMucService_pk PRIMARY KEY (subdomain);
+CREATE INDEX ofMucService_serviceid_idx ON ofMucService(serviceID);
+
+-- Rename mucServiceProp to ofMucServiceProp
+ALTER TABLE mucServiceProp DROP CONSTRAINT mucServiceProp_pk;
+ALTER TABLE mucServiceProp RENAME TO ofMucServiceProp;
+ALTER TABLE ofMucServiceProp ADD CONSTRAINT ofMucServiceProp_pk PRIMARY KEY (serviceID, name);
+
+-- Rename mucRoom to ofMucRoom
+DROP INDEX mucRoom_roomid_idx;
+DROP INDEX mucRm_serviceid_idx;
+ALTER TABLE mucRoom DROP CONSTRAINT mucRoom_pk;
+ALTER TABLE mucRoom RENAME TO ofMucRoom;
+ALTER TABLE ofMucRoom ADD CONSTRAINT ofMucRoom_pk PRIMARY KEY (serviceID, name);
+CREATE INDEX ofMucRoom_roomid_idx ON ofMucRoom (roomID);
+CREATE INDEX ofMucRoom_serviceid_idx ON ofMucRoom (serviceID);
+
+-- Rename mucRoomProp to ofMucRoomProp
+ALTER TABLE mucRoomProp DROP CONSTRAINT mucRoomProp_pk;
+ALTER TABLE mucRoomProp RENAME TO ofMucRoomProp;
+ALTER TABLE ofMucRoomProp ADD CONSTRAINT ofMucRoomProp_pk PRIMARY KEY (roomID, name);
+
+-- Rename mucAffiliation to ofMucAffiliation
+ALTER TABLE mucAffiliation DROP CONSTRAINT mucAffiliation_pk;
+ALTER TABLE mucAffiliation RENAME TO ofMucAffiliation;
+ALTER TABLE ofMucAffiliation ADD CONSTRAINT ofMucAffiliation_pk PRIMARY KEY (roomID, jid);
+
+-- Rename mucMember to ofMucMember
+ALTER TABLE mucMember DROP CONSTRAINT mucMember_pk;
+ALTER TABLE mucMember RENAME TO ofMucMember;
+ALTER TABLE ofMucMember ADD CONSTRAINT ofMucMember_pk PRIMARY KEY (roomID, jid);
+
+-- Rename mucConversationLog to ofMucConversationLog
+DROP INDEX mucLog_time_idx;
+ALTER TABLE mucConversationLog RENAME TO ofMucConversationLog;
+CREATE INDEX ofMucConversationLog_time_idx ON ofMucConversationLog (logTime);
+
+-- Rename pubsubNode to ofPubsubNode
+ALTER TABLE pubsubNode DROP CONSTRAINT pubsubNode_pk;
+ALTER TABLE pubsubNode RENAME TO ofPubsubNode;
+ALTER TABLE ofPubsubNode ADD CONSTRAINT ofPubsubNode_pk PRIMARY KEY (serviceID, nodeID);
+
+-- Rename pubsubNodeJIDs to ofPubsubNodeJIDs
+ALTER TABLE pubsubNodeJIDs DROP CONSTRAINT pubsubJID_pk;
+ALTER TABLE pubsubNodeJIDs RENAME TO ofPubsubNodeJIDs;
+ALTER TABLE ofPubsubNodeJIDs ADD CONSTRAINT ofPubsubNodeJIDs_pk PRIMARY KEY (serviceID, nodeID, jid);
+
+-- Rename pubsubNodeGroups to ofPubsubNodeGroups
+DROP INDEX pubsubNodeGroups_idx;
+ALTER TABLE pubsubNodeGroups RENAME TO ofPubsubNodeGroups;
+CREATE INDEX ofPubsubNodeGroups_idx ON ofPubsubNodeGroups (serviceID, nodeID);
+
+-- Rename pubsubAffiliation to ofPubsubAffiliation
+ALTER TABLE pubsubAffiliation DROP CONSTRAINT pubsubAffil_pk;
+ALTER TABLE pubsubAffiliation RENAME TO ofPubsubAffiliation;
+ALTER TABLE ofPubsubAffiliation ADD CONSTRAINT ofPubsubAffiliation_pk PRIMARY KEY (serviceID, nodeID, jid);
+
+-- Rename pubsubItem to ofPubsubItem
+ALTER TABLE pubsubItem DROP CONSTRAINT pubsubItem_pk;
+ALTER TABLE pubsubItem RENAME TO ofPubsubItem;
+ALTER TABLE ofPubsubItem ADD CONSTRAINT ofPubsubItem_pk PRIMARY KEY (serviceID, nodeID, id);
+
+-- Rename pubsubSubscription to ofPubsubSubscription
+ALTER TABLE pubsubSubscription DROP CONSTRAINT pubsubSubs_pk;
+ALTER TABLE pubsubSubscription RENAME TO ofPubsubSubscription;
+ALTER TABLE ofPubsubSubscription ADD CONSTRAINT ofPubsubSubscription_pk PRIMARY KEY (serviceID, nodeID, id);
+
+-- Rename pubsubDefaultConf to ofPubsubDefaultConf
+ALTER TABLE pubsubDefaultConf DROP CONSTRAINT pubsubDefConf_pk;
+ALTER TABLE pubsubDefaultConf RENAME TO ofPubsubDefaultConf;
+ALTER TABLE ofPubsubDefaultConf ADD CONSTRAINT ofPubsubDefaultConf_pk PRIMARY KEY (serviceID, leaf);
+
+-- Update version
+UPDATE ofVersion SET version = 19 WHERE name = 'openfire';
+
+COMMIT;
\ No newline at end of file

src/database/upgrade/19/openfire_postgresql.sql

+-- Rename jiveUser to ofUser
+DROP INDEX jiveUser_cDate_idx;
+ALTER TABLE jiveUser DROP CONSTRAINT jiveUser_pk;
+ALTER TABLE jiveUser RENAME TO ofUser;
+ALTER TABLE ofUser ADD CONSTRAINT ofUser_pk PRIMARY KEY (username);
+CREATE INDEX ofUser_cDate_idx ON ofUser (creationDate);
+
+-- Rename jiveUserProp to ofUserProp
+ALTER TABLE jiveUserProp DROP CONSTRAINT jiveUserProp_pk;
+ALTER TABLE jiveUserProp RENAME TO ofUserProp;
+ALTER TABLE ofUserProp ADD CONSTRAINT ofUserProp_pk PRIMARY KEY (username, name);
+
+-- Rename jiveUserFlag to ofUserFlag
+DROP INDEX jiveUserFlag_sTime_idx;
+DROP INDEX jiveUserFlag_eTime_idx;
+ALTER TABLE jiveUserFlag DROP CONSTRAINT jiveUserFlag_pk;
+ALTER TABLE jiveUserFlag RENAME TO ofUserFlag;
+ALTER TABLE ofUserFlag ADD CONSTRAINT ofUserFlag_pk PRIMARY KEY (username, name);
+CREATE INDEX ofUserFlag_sTime_idx ON ofUserFlag (startTime);
+CREATE INDEX ofUserFlag_eTime_idx ON ofUserFlag (endTime);
+
+-- Rename jiveGroup to ofGroup
+ALTER TABLE jiveGroup DROP CONSTRAINT jiveGroup_pk;
+ALTER TABLE jiveGroup RENAME TO ofGroup;
+ALTER TABLE ofGroup ADD CONSTRAINT ofGroup_pk PRIMARY KEY (groupName);
+
+-- Rename jiveGroupProp to ofGroupProp
+ALTER TABLE jiveGroupProp DROP CONSTRAINT jiveGroupProp_pk;
+ALTER TABLE jiveGroupProp RENAME TO ofGroupProp;
+ALTER TABLE ofGroupProp ADD CONSTRAINT ofGroupProp_pk PRIMARY KEY (groupName, name);
+
+-- Rename jiveGroupUser to ofGroupUser
+ALTER TABLE jiveGroupUser DROP CONSTRAINT jiveGroupUser_pk;
+ALTER TABLE jiveGroupUser RENAME TO ofGroupUser;
+ALTER TABLE ofGroupUser ADD CONSTRAINT ofGroupUser_pk PRIMARY KEY (groupName, username, administrator);
+
+-- Rename jivePrivate to ofPrivate
+ALTER TABLE jivePrivate DROP CONSTRAINT jivePrivate_pk;
+ALTER TABLE jivePrivate RENAME TO ofPrivate;
+ALTER TABLE ofPrivate ADD CONSTRAINT ofPrivate_pk PRIMARY KEY (username, name, namespace);
+
+-- Rename jiveOffline to ofOffline
+ALTER TABLE jiveOffline DROP CONSTRAINT jiveOffline_pk;
+ALTER TABLE jiveOffline RENAME TO ofOffline;
+ALTER TABLE ofOffline ADD CONSTRAINT ofOffline_pk PRIMARY KEY (username, messageID);
+
+-- Rename jivePresence to ofPresence
+ALTER TABLE jivePresence DROP CONSTRAINT jivePresence_pk;
+ALTER TABLE jivePresence RENAME TO ofPresence;
+ALTER TABLE ofPresence ADD CONSTRAINT ofPresence_pk PRIMARY KEY (username);
+
+-- Drop foreign key on jiveRoster from jiveRosterGroups
+ALTER TABLE jiveRosterGroups DROP CONSTRAINT jiveRosterGroups_rosterID_fk;
+
+-- Rename jiveRoster to ofRoster
+DROP INDEX jiveRoster_username_idx;
+DROP INDEX jiveRoster_jid_idx;
+ALTER TABLE jiveRoster DROP CONSTRAINT jiveRoster_pk;
+ALTER TABLE jiveRoster RENAME TO ofRoster;
+ALTER TABLE ofRoster ADD CONSTRAINT ofRoster_pk PRIMARY KEY (rosterID);
+CREATE INDEX ofRoster_username_idx ON ofRoster (username);
+CREATE INDEX ofRoster_jid_idx ON ofRoster (jid);
+
+-- Rename jiveRosterGroups to ofRosterGroups
+DROP INDEX jiveRosterGroups_rosterID_idx;
+ALTER TABLE jiveRosterGroups DROP CONSTRAINT jiveRosterGroups_pk;
+ALTER TABLE jiveRosterGroups RENAME TO ofRosterGroups;
+ALTER TABLE ofRosterGroups ADD CONSTRAINT ofRosterGroups_pk PRIMARY KEY (rosterID, rank);
+CREATE INDEX ofRosterGroups_rosterID_idx ON ofRosterGroups (rosterID);
+
+-- Readd foreign key
+ALTER TABLE ofRosterGroups ADD CONSTRAINT ofRosterGroups_rosterID_fk FOREIGN KEY (rosterID) REFERENCES ofRoster INITIALLY DEFERRED DEFERRABLE;
+
+-- Rename jiveVCard to ofVCard
+ALTER TABLE jiveVCard DROP CONSTRAINT jiveVCard_pk;
+ALTER TABLE jiveVCard RENAME TO ofVCard;
+ALTER TABLE ofVCard ADD CONSTRAINT ofVCard_pk PRIMARY KEY (username);
+
+-- Rename jiveID to ofID
+ALTER TABLE jiveID DROP CONSTRAINT jiveID_pk;
+ALTER TABLE jiveID RENAME TO ofID;
+ALTER TABLE ofID ADD CONSTRAINT ofID_pk PRIMARY KEY (idType);
+
+-- Rename jiveProperty to ofProperty
+ALTER TABLE jiveProperty DROP CONSTRAINT jiveProperty_pk;
+ALTER TABLE jiveProperty RENAME TO ofProperty;
+ALTER TABLE ofProperty ADD CONSTRAINT ofProperty_pk PRIMARY KEY (name);
+
+-- Rename jiveVersion to ofVersion
+ALTER TABLE jiveVersion DROP CONSTRAINT jiveVersion_pk;
+ALTER TABLE jiveVersion RENAME TO ofVersion;
+ALTER TABLE ofVersion ADD CONSTRAINT ofVersion_pk PRIMARY KEY (name);
+
+-- Rename jiveExtComponentConf to ofExtComponentConf
+ALTER TABLE jiveExtComponentConf DROP CONSTRAINT jiveExtComponentConf_pk;
+ALTER TABLE jiveExtComponentConf RENAME TO ofExtComponentConf;
+ALTER TABLE ofExtComponentConf ADD CONSTRAINT ofExtComponentConf_pk PRIMARY KEY (subdomain);
+
+-- Rename jiveRemoteServerConf to ofRemoteServerConf
+ALTER TABLE jiveRemoteServerConf DROP CONSTRAINT jiveRemoteServerConf_pk;
+ALTER TABLE jiveRemoteServerConf RENAME TO ofRemoteServerConf;
+ALTER TABLE ofRemoteServerConf ADD CONSTRAINT ofRemoteServerConf_pk PRIMARY KEY (xmppDomain);
+
+-- Rename jivePrivacyList to ofPrivacyList
+DROP INDEX jivePList_default_idx;
+ALTER TABLE jivePrivacyList DROP CONSTRAINT jivePrivacyList_pk;
+ALTER TABLE jivePrivacyList RENAME TO ofPrivacyList;
+ALTER TABLE ofPrivacyList ADD CONSTRAINT ofPrivacyList_pk PRIMARY KEY (username, name);
+CREATE INDEX ofPrivacyList_default_idx ON ofPrivacyList (username, isDefault);
+
+-- Rename jiveSASLAuthorized to ofSASLAuthorized
+ALTER TABLE jiveSASLAuthorized DROP CONSTRAINT jiveSASLAuthoirzed_pk;
+ALTER TABLE jiveSASLAuthorized RENAME TO ofSASLAuthorized;
+ALTER TABLE ofSASLAuthorized ADD CONSTRAINT ofSASLAuthorized_pk PRIMARY KEY (username, principal);
+
+-- Rename jiveSecurityAuditLog to ofSecurityAuditLog
+DROP INDEX jiveSecAuditLog_tstamp_idx;
+DROP INDEX jiveSecAuditLog_uname_idx;
+ALTER TABLE jiveSecurityAuditLog DROP CONSTRAINT jiveSecAuditLog_pk;
+ALTER TABLE jiveSecurityAuditLog RENAME TO ofSecurityAuditLog;
+ALTER TABLE ofSecurityAuditLog ADD CONSTRAINT ofSecurityAuditLog_pk PRIMARY KEY (msgID);
+CREATE INDEX ofSecurityAuditLog_tstamp_idx ON ofSecurityAuditLog (entryStamp);
+CREATE INDEX ofSecurityAuditLog_uname_idx ON ofSecurityAuditLog (username);
+
+-- Rename mucService to ofMucService
+DROP INDEX mucService_serviceid_idx;
+ALTER TABLE mucService DROP CONSTRAINT mucService_pk;
+ALTER TABLE mucService RENAME TO ofMucService;
+ALTER TABLE ofMucService ADD CONSTRAINT ofMucService_pk PRIMARY KEY (subdomain);
+CREATE INDEX ofMucService_serviceid_idx ON ofMucService(serviceID);
+
+-- Rename mucServiceProp to ofMucServiceProp
+ALTER TABLE mucServiceProp DROP CONSTRAINT mucServiceProp_pk;
+ALTER TABLE mucServiceProp RENAME TO ofMucServiceProp;
+ALTER TABLE ofMucServiceProp ADD CONSTRAINT ofMucServiceProp_pk PRIMARY KEY (serviceID, name);
+
+-- Rename mucRoom to ofMucRoom
+DROP INDEX mucRoom_roomID_idx;
+DROP INDEX mucRoom_serviceID_idx;
+ALTER TABLE mucRoom DROP CONSTRAINT mucRoom__pk;
+ALTER TABLE mucRoom RENAME TO ofMucRoom;
+ALTER TABLE ofMucRoom ADD CONSTRAINT ofMucRoom_pk PRIMARY KEY (serviceID, name);
+CREATE INDEX ofMucRoom_roomid_idx ON ofMucRoom(roomID);
+CREATE INDEX ofMucRoom_serviceid_idx ON ofMucRoom(serviceID);
+
+-- Rename mucRoomProp to ofMucRoomProp
+ALTER TABLE mucRoomProp DROP CONSTRAINT mucRoomProp_pk;
+ALTER TABLE mucRoomProp RENAME TO ofMucRoomProp;
+ALTER TABLE ofMucRoomProp ADD CONSTRAINT ofMucRoomProp_pk PRIMARY KEY (roomID, name);
+
+-- Rename mucAffiliation to ofMucAffiliation
+ALTER TABLE mucAffiliation DROP CONSTRAINT mucAffiliation__pk;
+ALTER TABLE mucAffiliation RENAME TO ofMucAffiliation;
+ALTER TABLE ofMucAffiliation ADD CONSTRAINT ofMucAffiliation_pk PRIMARY KEY (roomID,jid);
+
+-- Rename mucMember to ofMucMember
+ALTER TABLE mucMember DROP CONSTRAINT mucMember__pk;
+ALTER TABLE mucMember RENAME TO ofMucMember;
+ALTER TABLE ofMucMember ADD CONSTRAINT ofMucMember_pk PRIMARY KEY (roomID,jid);
+
+-- Rename mucConversationLog to ofMucConversationLog
+DROP INDEX mucLog_time_idx;
+ALTER TABLE mucConversationLog RENAME TO ofMucConversationLog;
+CREATE INDEX ofMucConversationLog_time_idx ON ofMucConversationLog (logTime);
+
+-- Rename pubsubNode to ofPubsubNode
+ALTER TABLE pubsubNode DROP CONSTRAINT pubsubNode_pk;
+ALTER TABLE pubsubNode RENAME TO ofPubsubNode;
+ALTER TABLE ofPubsubNode ADD CONSTRAINT ofPubsubNode_pk PRIMARY KEY (serviceID, nodeID);
+
+-- Rename pubsubNodeJIDs to ofPubsubNodeJIDs
+ALTER TABLE pubsubNodeJIDs DROP CONSTRAINT pubsubJID_pk;
+ALTER TABLE pubsubNodeJIDs RENAME TO ofPubsubNodeJIDs;
+ALTER TABLE ofPubsubNodeJIDs ADD CONSTRAINT ofPubsubNodeJIDs_pk PRIMARY KEY (serviceID, nodeID, jid);
+
+-- Rename pubsubNodeGroups to ofPubsubNodeGroups
+DROP INDEX pubsubNodeGroups_idx;
+ALTER TABLE pubsubNodeGroups RENAME TO ofPubsubNodeGroups;
+CREATE INDEX ofPubsubNodeGroups_idx ON ofPubsubNodeGroups (serviceID, nodeID);
+
+-- Rename pubsubAffiliation to ofPubsubAffiliation
+ALTER TABLE pubsubAffiliation DROP CONSTRAINT pubsubAffil_pk;
+ALTER TABLE pubsubAffiliation RENAME TO ofPubsubAffiliation;
+ALTER TABLE ofPubsubAffiliation ADD CONSTRAINT ofPubsubAffiliation_pk PRIMARY KEY (serviceID, nodeID, jid);
+
+-- Rename pubsubItem to ofPubsubItem
+ALTER TABLE pubsubItem DROP CONSTRAINT pubsubItem_pk;
+ALTER TABLE pubsubItem RENAME TO ofPubsubItem;
+ALTER TABLE ofPubsubItem ADD CONSTRAINT ofPubsubItem_pk PRIMARY KEY (serviceID, nodeID, id);
+
+-- Rename pubsubSubscription to ofPubsubSubscription
+ALTER TABLE pubsubSubscription DROP CONSTRAINT pubsubSubs_pk;
+ALTER TABLE pubsubSubscription RENAME TO ofPubsubSubscription;
+ALTER TABLE ofPubsubSubscription ADD CONSTRAINT ofPubsubSubscription_pk PRIMARY KEY (serviceID, nodeID, id);
+
+-- Rename pubsubDefaultConf to ofPubsubDefaultConf
+ALTER TABLE pubsubDefaultConf DROP CONSTRAINT pubsubDefConf_pk;
+ALTER TABLE pubsubDefaultConf RENAME TO ofPubsubDefaultConf;
+ALTER TABLE ofPubsubDefaultConf ADD CONSTRAINT ofPubsubDefaultConf_pk PRIMARY KEY (serviceID, leaf);
+
+-- Update version
+UPDATE ofVersion SET version = 19 WHERE name = 'openfire';

src/database/upgrade/19/openfire_sqlserver.sql

+/* Rename jiveUser to ofUser */
+DROP INDEX jiveUser.jiveUser_cDate_idx;
+ALTER TABLE jiveUser DROP CONSTRAINT jiveUser_pk;
+sp_rename 'jiveUser', 'ofUser';
+ALTER TABLE ofUser ADD CONSTRAINT ofUser_pk PRIMARY KEY (username);
+CREATE INDEX ofUser_cDate_idx ON ofUser (creationDate ASC);
+
+/* Rename jiveUserProp to ofUserProp */
+ALTER TABLE jiveUserProp DROP CONSTRAINT jiveUserProp_pk;
+sp_rename 'jiveUserProp', 'ofUserProp';
+ALTER TABLE ofUserProp ADD CONSTRAINT ofUserProp_pk PRIMARY KEY (username, name);
+
+/* Rename jiveUserFlag to ofUserFlag */
+DROP INDEX jiveUserFlag.jiveUserFlag_sTime_idx;
+DROP INDEX jiveUserFlag.jiveUserFlag_eTime_idx;
+ALTER TABLE jiveUserFlag DROP CONSTRAINT jiveUserFlag_pk;
+sp_rename 'jiveUserFlag', 'ofUserFlag';
+ALTER TABLE ofUserFlag ADD CONSTRAINT ofUserFlag_pk PRIMARY KEY (username, name);
+CREATE INDEX ofUserFlag_sTime_idx ON ofUserFlag (startTime ASC);
+CREATE INDEX ofUserFlag_eTime_idx ON ofUserFlag (endTime ASC);
+
+/* Rename jiveGroup to ofGroup */
+ALTER TABLE jiveGroup DROP CONSTRAINT group_pk;
+sp_rename 'jiveGroup', 'ofGroup';
+ALTER TABLE ofGroup ADD CONSTRAINT ofGroup_pk PRIMARY KEY (groupName);
+
+/* Rename jiveGroupProp to ofGroupProp */
+ALTER TABLE jiveGroupProp DROP CONSTRAINT jiveGroupProp_pk;
+sp_rename 'jiveGroupProp', 'ofGroupProp';
+ALTER TABLE ofGroupProp ADD CONSTRAINT ofGroupProp_pk PRIMARY KEY (groupName, name);
+
+/* Rename jiveGroupUser to ofGroupUser */
+ALTER TABLE jiveGroupUser DROP CONSTRAINT jiveGroupUser_pk;
+sp_rename 'jiveGroupUser', 'ofGroupUser';
+ALTER TABLE ofGroupUser ADD CONSTRAINT ofGroupUser_pk PRIMARY KEY (groupName, username, administrator);
+
+/* Rename jivePrivate to ofPrivate */
+ALTER TABLE jivePrivate DROP CONSTRAINT JivePrivate_pk;
+sp_rename 'jivePrivate', 'ofPrivate';
+ALTER TABLE ofPrivate ADD CONSTRAINT ofPrivate_pk PRIMARY KEY (username, name, namespace);
+
+/* Rename jiveOffline to ofOffline */
+ALTER TABLE jiveOffline DROP CONSTRAINT jiveOffline_pk;
+sp_rename 'jiveOffline', 'ofOffline';
+ALTER TABLE ofOffline ADD CONSTRAINT ofOffline_pk PRIMARY KEY (username, messageID);
+
+/* Rename jivePresence to ofPresence */
+ALTER TABLE jivePresence DROP CONSTRAINT jivePresence_pk;
+sp_rename 'jivePresence', 'ofPresence';
+ALTER TABLE ofPresence ADD CONSTRAINT ofPresence_pk PRIMARY KEY (username);
+
+/* Drop foreign key on jiveRoster from jiveRosterGroups */
+ALTER TABLE jiveRosterGroups DROP CONSTRAINT jiveRosterGroups_rosterID_fk;
+
+/* Rename jiveRoster to ofRoster */
+DROP INDEX jiveRoster.jiveRoster_username_idx;
+DROP INDEX jiveRoster.jiveRoster_jid_idx;
+ALTER TABLE jiveRoster DROP CONSTRAINT jiveRoster_pk;
+sp_rename 'jiveRoster', 'ofRoster';
+ALTER TABLE ofUserFlag ADD CONSTRAINT ofRoster_pk PRIMARY KEY (rosterID);
+CREATE INDEX ofRoster_username_idx ON ofRoster (username ASC);
+CREATE INDEX ofRoster_jid_idx ON ofRoster (jid ASC);
+
+/* Rename jiveRosterGroups to ofRosterGroups */
+DROP INDEX jiveRosterGroups.jiveRosterGroups_rosterid_idx;
+ALTER TABLE jiveRosterGroups DROP CONSTRAINT jiveRosterGroups_pk;
+sp_rename 'jiveRosterGroups', 'ofRosterGroups';
+ALTER TABLE ofRosterGroups ADD CONSTRAINT ofRosterGroups_pk PRIMARY KEY (rosterID, rank);
+CREATE INDEX ofRosterGroups_rosterid_idx ON ofRosterGroups (rosterID ASC);
+
+/* Readd foreign key */
+ALTER TABLE ofRosterGroups ADD CONSTRAINT ofRosterGroups_rosterID_fk FOREIGN KEY (rosterID) REFERENCES ofRoster;
+
+/* Rename jiveVCard to ofVCard */
+ALTER TABLE jiveVCard DROP CONSTRAINT JiveVCard_pk;
+sp_rename 'jiveVCard', 'ofVCard';
+ALTER TABLE ofVCard ADD CONSTRAINT ofVCard_pk PRIMARY KEY (username);
+
+/* Rename jiveID to ofID */
+ALTER TABLE jiveID DROP CONSTRAINT jiveID_pk;
+sp_rename 'jiveID', 'ofID';
+ALTER TABLE ofID ADD CONSTRAINT ofID_pk PRIMARY KEY (idType);
+
+/* Rename jiveProperty to ofProperty */
+ALTER TABLE jiveProperty DROP CONSTRAINT jiveProperty_pk;
+sp_rename 'jiveProperty', 'ofProperty';
+ALTER TABLE ofProperty ADD CONSTRAINT ofProperty_pk PRIMARY KEY (name);
+
+/* Rename jiveVersion to ofVersion */
+ALTER TABLE jiveVersion DROP CONSTRAINT jiveVersion_pk;
+sp_rename 'jiveVersion', 'ofVersion';
+ALTER TABLE ofVersion ADD CONSTRAINT ofVersion_pk PRIMARY KEY (name);
+
+/* Rename jiveExtComponentConf to ofExtComponentConf */
+ALTER TABLE jiveExtComponentConf DROP CONSTRAINT jiveExtComponentConf_pk;
+sp_rename 'jiveExtComponentConf', 'ofExtComponentConf';
+ALTER TABLE ofExtComponentConf ADD CONSTRAINT ofExtComponentConf_pk PRIMARY KEY (subdomain);
+
+/* Rename jiveRemoteServerConf to ofRemoteServerConf */
+ALTER TABLE jiveRemoteServerConf DROP CONSTRAINT jiveRemoteServerConf_pk;
+sp_rename 'jiveRemoteServerConf', 'ofRemoteServerConf';
+ALTER TABLE ofRemoteServerConf ADD CONSTRAINT ofRemoteServerConf_pk PRIMARY KEY (xmppDomain);
+
+/* Rename jivePrivacyList to ofPrivacyList */
+DROP INDEX jivePrivacyList.jivePList_default_idx;
+ALTER TABLE jivePrivacyList DROP CONSTRAINT jivePrivacyList_pk;
+sp_rename 'jivePrivacyList', 'ofPrivacyList';
+ALTER TABLE ofPrivacyList ADD CONSTRAINT ofPrivacyList_pk PRIMARY KEY (username, name);
+CREATE INDEX ofPrivacyList_default_idx ON ofPrivacyList (username, isDefault);
+
+/* Rename jiveSASLAuthorized to ofSASLAuthorized */
+ALTER TABLE jiveSASLAuthorized DROP CONSTRAINT jiveSASLAuthoirzed_pk;
+sp_rename 'jiveSASLAuthorized', 'ofSASLAuthorized';
+ALTER TABLE ofSASLAuthorized ADD CONSTRAINT ofSASLAuthorized_pk PRIMARY KEY (username, principal);
+
+/* Rename jiveSecurityAuditLog to ofSecurityAuditLog */
+DROP INDEX jiveSecurityAuditLog.jiveSecAuditLog_tstamp_idx;
+DROP INDEX jiveSecurityAuditLog.jiveSecAuditLog_uname_idx;
+ALTER TABLE jiveSecurityAuditLog DROP CONSTRAINT jiveSecAuditLog_pk;
+sp_rename 'jiveSecurityAuditLog', 'ofSecurityAuditLog';
+ALTER TABLE ofSecurityAuditLog ADD CONSTRAINT ofSecurityAuditLog_pk PRIMARY KEY (msgID);
+CREATE INDEX ofSecurityAuditLog_tstamp_idx ON ofSecurityAuditLog (entryStamp);
+CREATE INDEX ofSecurityAuditLog_uname_idx ON ofSecurityAuditLog (username);
+
+/* Rename mucService to ofMucService */
+DROP INDEX mucService.mucService_serviceid_idx;
+ALTER TABLE mucService DROP CONSTRAINT mucService_pk;
+sp_rename 'mucService', 'ofMucService';
+ALTER TABLE ofMucService ADD CONSTRAINT ofMucService_pk PRIMARY KEY (subdomain);
+CREATE INDEX ofMucService_serviceid_idx ON ofMucService(serviceID);
+
+/* Rename mucServiceProp to ofMucServiceProp */
+ALTER TABLE mucServiceProp DROP CONSTRAINT mucServiceProp_pk;
+sp_rename 'mucServiceProp', 'ofMucServiceProp';
+ALTER TABLE ofMucServiceProp ADD CONSTRAINT ofMucServiceProp_pk PRIMARY KEY (serviceID, name);
+
+/* Rename mucRoom to ofMucRoom */
+DROP INDEX mucRoom.mucRoom_roomID_idx;
+DROP INDEX mucRoom.mucRoom_serviceID_idx;
+ALTER TABLE mucRoom DROP CONSTRAINT mucRoom__pk;
+sp_rename 'mucRoom', 'ofMucRoom';
+ALTER TABLE ofMucRoom ADD CONSTRAINT ofMucRoom_pk PRIMARY KEY (serviceID, name);
+CREATE INDEX ofMucRoom_roomid_idx on ofMucRoom(roomID);
+CREATE INDEX ofMucRoom_serviceid_idx on ofMucRoom(serviceID);
+
+/* Rename mucRoomProp to ofMucRoomProp */
+ALTER TABLE mucRoomProp DROP CONSTRAINT mucRoomProp_pk;
+sp_rename 'mucRoomProp', 'ofMucRoomProp';
+ALTER TABLE ofMucRoomProp ADD CONSTRAINT ofMucRoomProp_pk PRIMARY KEY (roomID, name);
+
+/* Rename mucAffiliation to ofMucAffiliation */
+ALTER TABLE mucAffiliation DROP CONSTRAINT mucAffiliation__pk;
+sp_rename 'mucAffiliation', 'ofMucAffiliation';
+ALTER TABLE ofMucAffiliation ADD CONSTRAINT ofMucAffiliation__pk PRIMARY KEY (roomID,jid);
+
+/* Rename mucMember to ofMucMember */
+ALTER TABLE mucMember DROP CONSTRAINT mucMember__pk;
+sp_rename 'mucMember', 'ofMucMember';
+ALTER TABLE ofMucMember ADD CONSTRAINT ofMucMember_pk PRIMARY KEY (roomID,jid);
+
+/* Rename mucConversationLog to ofMucConversationLog */
+DROP INDEX mucConversationLog.mucLog_time_idx;
+sp_rename 'mucConversationLog', 'ofMucConversationLog';
+CREATE INDEX ofMucConversationLog_time_idx ON ofMucConversationLog (logTime);
+
+/* Rename pubsubNode to ofPubsubNode */
+ALTER TABLE pubsubNode DROP CONSTRAINT pubsubNode_pk;
+sp_rename 'pubsubNode', 'ofPubsubNode';
+ALTER TABLE ofPubsubNode ADD CONSTRAINT ofPubsubNode_pk PRIMARY KEY (serviceID, nodeID);
+
+/* Rename pubsubNodeJIDs to ofPubsubNodeJIDs */
+ALTER TABLE pubsubNodeJIDs DROP CONSTRAINT pubsubJID_pk;
+sp_rename 'pubsubNodeJIDs', 'ofPubsubNodeJIDs';
+ALTER TABLE ofPubsubNodeJIDs ADD CONSTRAINT ofPubsubNodeJIDs_pk PRIMARY KEY (serviceID, nodeID, jid);
+
+/* Rename pubsubNodeGroups to ofPubsubNodeGroups */
+DROP INDEX pubsubNodeGroups.pubsubNodeGroups_idx;
+sp_rename 'pubsubNodeGroups', 'ofPubsubNodeGroups';
+CREATE INDEX ofPubsubNodeGroups_idx ON ofPubsubNodeGroups (serviceID, nodeID);
+
+/* Rename pubsubAffiliation to ofPubsubAffiliation */
+ALTER TABLE pubsubAffiliation DROP CONSTRAINT pubsubAffil_pk;
+sp_rename 'pubsubAffiliation', 'ofPubsubAffiliation';
+ALTER TABLE ofPubsubAffiliation ADD CONSTRAINT ofPubsubAffiliation_pk PRIMARY KEY (serviceID, nodeID, jid);
+
+/* Rename pubsubItem to ofPubsubItem */
+ALTER TABLE pubsubItem DROP CONSTRAINT pubsubItem_pk;
+sp_rename 'pubsubItem', 'ofPubsubItem';
+ALTER TABLE ofPubsubItem ADD CONSTRAINT ofPubsubItem_pk PRIMARY KEY (serviceID, nodeID, id);
+
+/* Rename pubsubSubscription to ofPubsubSubscription */
+ALTER TABLE pubsubSubscription DROP CONSTRAINT pubsubSubs_pk;
+sp_rename 'pubsubSubscription', 'ofPubsubSubscription';
+ALTER TABLE ofPubsubSubscription ADD CONSTRAINT ofPubsubSubscription_pk PRIMARY KEY (serviceID, nodeID, id);
+
+/* Rename pubsubDefaultConf to ofPubsubDefaultConf */
+ALTER TABLE pubsubDefaultConf DROP CONSTRAINT pubsubDefConf_pk;
+sp_rename 'pubsubDefaultConf', 'ofPubsubDefaultConf';
+ALTER TABLE ofPubsubDefaultConf ADD CONSTRAINT ofPubsubDefaultConf_pk PRIMARY KEY (serviceID, leaf);
+
+/* Update version */
+UPDATE ofVersion SET version = 19 WHERE name = 'openfire';

src/database/upgrade/19/openfire_sybase.sql

+/* Rename jiveUser to ofUser */
+DROP INDEX jiveUser.jiveUser_cDate_idx;
+ALTER TABLE jiveUser DROP CONSTRAINT jiveUser_pk;
+sp_rename 'jiveUser', 'ofUser';
+ALTER TABLE ofUser ADD CONSTRAINT ofUser_pk PRIMARY KEY (username);
+CREATE INDEX ofUser_cDate_idx ON ofUser (creationDate ASC);
+
+/* Rename jiveUserProp to ofUserProp */
+ALTER TABLE jiveUserProp DROP CONSTRAINT jiveUserProp_pk;
+sp_rename 'jiveUserProp', 'ofUserProp';
+ALTER TABLE ofUserProp ADD CONSTRAINT ofUserProp_pk PRIMARY KEY (username, name);
+
+/* Rename jiveUserFlag to ofUserFlag */
+DROP INDEX jiveUserFlag.jiveUserFlag_sTime_idx;
+DROP INDEX jiveUserFlag.jiveUserFlag_eTime_idx;
+ALTER TABLE jiveUserFlag DROP CONSTRAINT jiveUserFlag_pk;
+sp_rename 'jiveUserFlag', 'ofUserFlag';
+ALTER TABLE ofUserFlag ADD CONSTRAINT ofUserFlag_pk PRIMARY KEY (username, name);
+CREATE INDEX ofUserFlag_sTime_idx ON ofUserFlag (startTime ASC);
+CREATE INDEX ofUserFlag_eTime_idx ON ofUserFlag (endTime ASC);
+
+/* Rename jiveGroup to ofGroup */
+ALTER TABLE jiveGroup DROP CONSTRAINT group_pk;
+sp_rename 'jiveGroup', 'ofGroup';
+ALTER TABLE ofGroup ADD CONSTRAINT ofGroup_pk PRIMARY KEY (groupName);
+
+/* Rename jiveGroupProp to ofGroupProp */
+ALTER TABLE jiveGroupProp DROP CONSTRAINT jiveGroupProp_pk;
+sp_rename 'jiveGroupProp', 'ofGroupProp';
+ALTER TABLE ofGroupProp ADD CONSTRAINT ofGroupProp_pk PRIMARY KEY (groupName, name);
+
+/* Rename jiveGroupUser to ofGroupUser */
+ALTER TABLE jiveGroupUser DROP CONSTRAINT jiveGroupUser_pk;
+sp_rename 'jiveGroupUser', 'ofGroupUser';
+ALTER TABLE ofGroupUser ADD CONSTRAINT ofGroupUser_pk PRIMARY KEY (groupName, username, administrator);
+
+/* Rename jivePrivate to ofPrivate */
+ALTER TABLE jivePrivate DROP CONSTRAINT JivePrivate_pk;
+sp_rename 'jivePrivate', 'ofPrivate';
+ALTER TABLE ofPrivate ADD CONSTRAINT ofPrivate_pk PRIMARY KEY (username, name, namespace);
+
+/* Rename jiveOffline to ofOffline */
+ALTER TABLE jiveOffline DROP CONSTRAINT jiveOffline_pk;
+sp_rename 'jiveOffline', 'ofOffline';
+ALTER TABLE ofOffline ADD CONSTRAINT ofOffline_pk PRIMARY KEY (username, messageID);
+
+/* Rename jivePresence to ofPresence */
+ALTER TABLE jivePresence DROP CONSTRAINT jivePresence_pk;
+sp_rename 'jivePresence', 'ofPresence';
+ALTER TABLE ofPresence ADD CONSTRAINT ofPresence_pk PRIMARY KEY (username);
+
+/* Drop foreign key on jiveRoster from jiveRosterGroups */
+ALTER TABLE jiveRosterGroups DROP CONSTRAINT jiveRosterGroups_rosterID_fk;
+
+/* Rename jiveRoster to ofRoster */
+DROP INDEX jiveRoster.jiveRoster_username_idx;
+ALTER TABLE jiveRoster DROP CONSTRAINT jiveRoster_pk;
+sp_rename 'jiveRoster', 'ofRoster';
+ALTER TABLE ofRoster ADD CONSTRAINT ofRoster_pk PRIMARY KEY (rosterID);
+CREATE INDEX ofRoster_username_idx ON ofRoster (username ASC);
+CREATE INDEX ofRoster_jid_idx ON ofRoster (jid ASC);
+
+/* Rename jiveRosterGroups to ofRosterGroups */
+DROP INDEX jiveRosterGroups.jiveRosterGroups_rosterid_idx;
+ALTER TABLE jiveRosterGroups DROP CONSTRAINT jiveUser_pk;
+sp_rename 'jiveRosterGroups', 'ofRosterGroups';
+ALTER TABLE ofRosterGroups ADD CONSTRAINT ofRosterGroups_pk PRIMARY KEY (rosterID, rank);
+CREATE INDEX ofRosterGroups_rosterid_idx ON ofRosterGroups (rosterID ASC);
+
+/* Readd foreign key */
+ALTER TABLE ofRosterGroups ADD CONSTRAINT ofRosterGroups_rosterID_fk FOREIGN KEY (rosterID) REFERENCES ofRoster;
+
+/* Rename jiveVCard to ofVCard */
+ALTER TABLE jiveVCard DROP CONSTRAINT JiveVCard_pk;
+sp_rename 'jiveVCard', 'ofVCard';
+ALTER TABLE ofVCard ADD CONSTRAINT ofVCard_pk PRIMARY KEY (username);
+
+/* Rename jiveID to ofID */
+ALTER TABLE jiveID DROP CONSTRAINT jiveID_pk;
+sp_rename 'jiveID', 'ofID';
+ALTER TABLE ofID ADD CONSTRAINT ofID_pk PRIMARY KEY (idType);
+
+/* Rename jiveProperty to ofProperty */
+ALTER TABLE jiveProperty DROP CONSTRAINT jiveProperty_pk;
+sp_rename 'jiveProperty', 'ofProperty';
+ALTER TABLE ofProperty ADD CONSTRAINT ofProperty_pk PRIMARY KEY (name);
+
+/* Rename jiveVersion to ofVersion */
+ALTER TABLE jiveVersion DROP CONSTRAINT jiveVersion_pk;
+sp_rename 'jiveVersion', 'ofVersion';
+ALTER TABLE ofVersion ADD CONSTRAINT ofVersion_pk PRIMARY KEY (name);
+
+/* Rename jiveExtComponentConf to ofExtComponentConf */
+ALTER TABLE jiveExtComponentConf DROP CONSTRAINT jiveExtComponentConf_pk;
+sp_rename 'jiveExtComponentConf', 'ofExtComponentConf';
+ALTER TABLE ofExtComponentConf ADD CONSTRAINT ofExtComponentConf_pk PRIMARY KEY (subdomain);
+
+/* Rename jiveRemoteServerConf to ofRemoteServerConf */
+ALTER TABLE jiveRemoteServerConf DROP CONSTRAINT jiveRemoteServerConf_pk;
+sp_rename 'jiveRemoteServerConf', 'ofRemoteServerConf';
+ALTER TABLE ofRemoteServerConf ADD CONSTRAINT ofRemoteServerConf_pk PRIMARY KEY (xmppDomain);
+
+/* Rename jivePrivacyList to ofPrivacyList */
+DROP INDEX jivePrivacyList.jivePList_default_idx;
+ALTER TABLE jivePrivacyList DROP CONSTRAINT jivePrivacyList_pk;
+sp_rename 'jivePrivacyList', 'ofPrivacyList';
+ALTER TABLE ofPrivacyList ADD CONSTRAINT ofPrivacyList_pk PRIMARY KEY (username, name);
+CREATE INDEX ofPrivacyList_default_idx ON ofPrivacyList (username, isDefault);
+
+/* Rename jiveSASLAuthorized to ofSASLAuthorized */
+ALTER TABLE jiveSASLAuthorized DROP CONSTRAINT jiveSASLAuthoirzed_pk;
+sp_rename 'jiveSASLAuthorized', 'ofSASLAuthorized';
+ALTER TABLE ofSASLAuthorized ADD CONSTRAINT ofSASLAuthorized_pk PRIMARY KEY (username, principal);
+
+/* Rename jiveSecurityAuditLog to ofSecurityAuditLog */
+DROP INDEX jiveSecurityAuditLog.jiveSecAuditLog_tstamp_idx;
+DROP INDEX jiveSecurityAuditLog.jiveSecAuditLog_uname_idx;
+ALTER TABLE jiveSecurityAuditLog DROP CONSTRAINT jiveSecAuditLog_pk;
+sp_rename 'jiveSecurityAuditLog', 'ofSecurityAuditLog';
+ALTER TABLE ofSecurityAuditLog ADD CONSTRAINT ofSecurityAuditLog_pk PRIMARY KEY (msgID);
+CREATE INDEX ofSecurityAuditLog_tstamp_idx ON ofSecurityAuditLog (entryStamp);
+CREATE INDEX ofSecurityAuditLog_uname_idx ON ofecurityAuditLog (username);
+
+/* Rename mucService to ofMucService */
+DROP INDEX mucService.mucService_serviceid_idx;
+ALTER TABLE mucService DROP CONSTRAINT mucService_pk;
+sp_rename 'mucService', 'ofMucService';
+ALTER TABLE ofMucService ADD CONSTRAINT ofMucService_pk PRIMARY KEY (subdomain);
+CREATE INDEX ofMucService_serviceid_idx ON ofMucService(serviceID);
+
+/* Rename mucServiceProp to ofMucServiceProp */
+ALTER TABLE mucServiceProp DROP CONSTRAINT mucServiceProp_pk;
+sp_rename 'mucServiceProp', 'ofMucServiceProp';
+ALTER TABLE ofMucServiceProp ADD CONSTRAINT ofMucServiceProp_pk PRIMARY KEY (serviceID, name);
+
+/* Rename mucRoom to ofMucRoom */
+DROP INDEX mucRoom.mucRoom_roomID_idx;
+DROP INDEX mucRoom.mucRoom_serviceID_idx;
+ALTER TABLE mucRoom DROP CONSTRAINT mucRoom__pk;
+sp_rename 'mucRoom', 'ofMucRoom';
+ALTER TABLE ofMucRoom ADD CONSTRAINT ofMucRoom_pk PRIMARY KEY (serviceID, name);
+CREATE INDEX ofMucRoom_roomid_idx on ofMucRoom(roomID);
+CREATE INDEX ofMucRoom_serviceid_idx on ofMucRoom(sericeID);
+
+/* Rename mucRoomProp to ofMucRoomProp */
+ALTER TABLE mucRoomProp DROP CONSTRAINT mucRoomProp_pk;
+sp_rename 'mucRoomProp', 'ofMucRoomProp';
+ALTER TABLE ofMucRoomProp ADD CONSTRAINT ofMucRoomProp_pk PRIMARY KEY (roomID, name);
+
+/* Rename mucAffiliation to ofMucAffiliation */
+ALTER TABLE mucAffiliation DROP CONSTRAINT mucAffiliation__pk;
+sp_rename 'mucAffiliation', 'ofMucAffiliation';
+ALTER TABLE ofMucAffiliation ADD CONSTRAINT ofMucAffiliation_pk PRIMARY KEY (roomID,jid);
+
+/* Rename mucMember to ofMucMember */
+ALTER TABLE mucMember DROP CONSTRAINT mucMember__pk;
+sp_rename 'mucMember', 'ofMucMember';
+ALTER TABLE ofMucMember ADD CONSTRAINT ofMucMember_pk PRIMARY KEY (roomID,jid);
+
+/* Rename mucConversationLog to ofMucConversationLog */
+DROP INDEX mucConversationLog.mucLog_time_idx;
+sp_rename 'mucConversationLog', 'ofMucConversationLog';
+CREATE INDEX ofMucConversationLog_time_idx ON ofMucConversationLog (logTime);
+
+/* Rename pubsubNode to ofPubsubNode */
+ALTER TABLE pubsubNode DROP CONSTRAINT pubsubNode_pk;
+sp_rename 'pubsubNode', 'ofPubsubNode';
+ALTER TABLE ofPubsubNode ADD CONSTRAINT ofPubsubNode_pk PRIMARY KEY (serviceID, nodeID);
+
+/* Rename pubsubNodeJIDs to ofPubsubNodeJIDs */
+ALTER TABLE pubsubNodeJIDs DROP CONSTRAINT pubsubJID_pk;
+sp_rename 'pubsubNodeJIDs', 'ofPubsubNodeJIDs';
+ALTER TABLE ofPubsubNodeJIDs ADD CONSTRAINT ofPubsubNodeJIDs_pk PRIMARY KEY (serviceID, nodeID, jid);
+
+/* Rename pubsubNodeGroups to ofPubsubNodeGroups */
+DROP INDEX pubsubNodeGroups.pubsubNodeGroups_idx;
+sp_rename 'pubsubNodeGroups', 'ofPubsubNodeGroups';
+CREATE INDEX ofPubsubNodeGroups_idx ON ofPubsubNodeGroups (serviceID, nodeID);
+
+/* Rename pubsubAffiliation to ofPubsubAffiliation */
+ALTER TABLE pubsubAffiliation DROP CONSTRAINT pubsubAffil_pk;
+sp_rename 'pubsubAffiliation', 'ofPubsubAffiliation';
+ALTER TABLE ofPubsubAffiliation ADD CONSTRAINT ofPubsubAffiliation_pk PRIMARY KEY (serviceID, nodeID, jid);
+
+/* Rename pubsubItem to ofPubsubItem */
+ALTER TABLE pubsubItem DROP CONSTRAINT pubsubItem_pk;
+sp_rename 'pubsubItem', 'ofPubsubItem';
+ALTER TABLE ofPubsubItem ADD CONSTRAINT ofPubsubItem_pk PRIMARY KEY (serviceID, nodeID, id);
+
+/* Rename pubsubSubscription to ofPubsubSubscription */
+ALTER TABLE pubsubSubscription DROP CONSTRAINT pubsubSubs_pk;
+sp_rename 'pubsubSubscription', 'ofPubsubSubscription';
+ALTER TABLE ofPubsubSubscription ADD CONSTRAINT ofPubsubSubscription_pk PRIMARY KEY (serviceID, nodeID, id);
+
+/* Rename pubsubDefaultConf to ofPubsubDefaultConf */
+ALTER TABLE pubsubDefaultConf DROP CONSTRAINT pubsubDefConf_pk;
+sp_rename 'pubsubDefaultConf', 'ofPubsubDefaultConf';
+ALTER TABLE ofPubsubDefaultConf ADD CONSTRAINT ofPubsubDefaultConf_pk PRIMARY KEY (serviceID, leaf);
+
+/* Update version */
+UPDATE ofVersion SET version = 19 WHERE name = 'openfire';

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

@@ -23,7 +23,7 @@ import java.util.Arrays;
 
 /**
  * Manages database schemas for Openfire and Openfire plugins. The manager uses the
- * jiveVersion database table to figure out which database schema is currently installed
+ * ofVersion database table to figure out which database schema is currently installed
  * and then attempts to automatically apply database schema changes as necessary.<p>
  *
  * Running database schemas automatically requires appropriate database permissions.
@@ -37,9 +37,9 @@ import java.util.Arrays;
 public class SchemaManager {
 
     private static final String CHECK_VERSION_OLD =
-            "SELECT minorVersion FROM jiveVersion";
+            "SELECT minorVersion FROM ofVersion";
     private static final String CHECK_VERSION =
-            "SELECT version FROM jiveVersion WHERE name=?";
+            "SELECT version FROM ofVersion WHERE name=?";
 
     /**
      * Current Openfire database schema version.
@@ -62,7 +62,7 @@ public class SchemaManager {
      *      or updated successfully.
      */
     public boolean checkOpenfireSchema(Connection con) {
-        // Change 'wildfire' to 'openfire' in jiveVersion table (update to new name)
+        // Change 'wildfire' to 'openfire' in ofVersion table (update to new name)
         updateToOpenfire(con);
         try {
             return checkSchema(con, "openfire", DATABASE_VERSION,
@@ -295,7 +295,7 @@ public class SchemaManager {
     private void updateToOpenfire(Connection con){
         PreparedStatement pstmt = null;
         try {
-            pstmt = con.prepareStatement("UPDATE jiveVersion SET name='openfire' WHERE name='wildfire'");
+            pstmt = con.prepareStatement("UPDATE ofVersion SET name='openfire' WHERE name='wildfire'");
             pstmt.executeUpdate();
         }
         catch (Exception ex) {

src/java/org/jivesoftware/database/SequenceManager.java

@@ -46,13 +46,13 @@ import java.util.concurrent.ConcurrentHashMap;
 public class SequenceManager {
 
     private static final String CREATE_ID =
-            "INSERT INTO jiveID (id, idType) VALUES (1, ?)";
+            "INSERT INTO ofID (id, idType) VALUES (1, ?)";
 
     private static final String LOAD_ID =
-            "SELECT id FROM jiveID WHERE idType=?";
+            "SELECT id FROM ofID WHERE idType=?";
 
     private static final String UPDATE_ID =
-            "UPDATE jiveID SET id=? WHERE idType=? AND id=?";
+            "UPDATE ofID SET id=? WHERE idType=? AND id=?";
 
     // Statically startup a sequence manager for each of the sequence counters.
     private static Map<Integer, SequenceManager> managers = new ConcurrentHashMap<Integer, SequenceManager>();

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

@@ -49,20 +49,20 @@ 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, stanza) " +
+        "INSERT INTO ofOffline (username, messageID, creationDate, messageSize, stanza) " +
         "VALUES (?, ?, ?, ?, ?)";
     private static final String LOAD_OFFLINE =
-        "SELECT stanza, creationDate FROM jiveOffline WHERE username=?";
+        "SELECT stanza, creationDate FROM ofOffline WHERE username=?";
     private static final String LOAD_OFFLINE_MESSAGE =
-        "SELECT stanza FROM jiveOffline WHERE username=? AND creationDate=?";
+        "SELECT stanza FROM ofOffline WHERE username=? AND creationDate=?";
     private static final String SELECT_SIZE_OFFLINE =
-        "SELECT SUM(messageSize) FROM jiveOffline WHERE username=?";
+        "SELECT SUM(messageSize) FROM ofOffline WHERE username=?";
     private static final String SELECT_SIZE_ALL_OFFLINE =
-        "SELECT SUM(messageSize) FROM jiveOffline";
+        "SELECT SUM(messageSize) FROM ofOffline";
     private static final String DELETE_OFFLINE =
-        "DELETE FROM jiveOffline WHERE username=?";
+        "DELETE FROM ofOffline WHERE username=?";
     private static final String DELETE_OFFLINE_MESSAGE =
-        "DELETE FROM jiveOffline WHERE username=? AND creationDate=?";
+        "DELETE FROM ofOffline WHERE username=? AND creationDate=?";
 
     private Cache<String, Integer> sizeCache;
     private FastDateFormat dateFormat;

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

@@ -41,18 +41,18 @@ import java.util.concurrent.LinkedBlockingQueue;
 public class PrivateStorage extends BasicModule implements UserEventListener {
 
     private static final String LOAD_PRIVATE =
-        "SELECT privateData FROM jivePrivate WHERE username=? AND namespace=?";
+        "SELECT privateData FROM ofPrivate WHERE username=? AND namespace=?";
     private static final String INSERT_PRIVATE =
-        "INSERT INTO jivePrivate (privateData,name,username,namespace) VALUES (?,?,?,?)";
+        "INSERT INTO ofPrivate (privateData,name,username,namespace) VALUES (?,?,?,?)";
     private static final String UPDATE_PRIVATE =
-        "UPDATE jivePrivate SET privateData=?, name=? WHERE username=? AND namespace=?";
+        "UPDATE ofPrivate SET privateData=?, name=? WHERE username=? AND namespace=?";
     private static final String DELETE_PRIVATES =
-        "DELETE FROM jivePrivate WHERE username=?";
+        "DELETE FROM ofPrivate WHERE username=?";
 
     // Currently no delete supported, we can detect an add of an empty element and
     // use that to signal a delete but that optimization doesn't seem necessary.
     // private static final String DELETE_PRIVATE =
-    //     "DELETE FROM jivePrivate WHERE userID=? AND name=? AND namespace=?";
+    //     "DELETE FROM ofPrivate WHERE userID=? AND name=? AND namespace=?";
 
     private boolean enabled = JiveGlobals.getBooleanProperty("xmpp.privateStorageEnabled", true);
 

src/java/org/jivesoftware/openfire/XMPPServer.java

@@ -725,7 +725,7 @@ public class XMPPServer {
         java.sql.Connection conn = null;
         try {
             conn = DbConnectionManager.getConnection();
-            PreparedStatement stmt = conn.prepareStatement("SELECT count(*) FROM jiveID");
+            PreparedStatement stmt = conn.prepareStatement("SELECT count(*) FROM ofID");
             ResultSet rs = stmt.executeQuery();
             rs.next();
             rs.close();

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

@@ -20,7 +20,7 @@ import org.jivesoftware.openfire.XMPPServer;
 import java.sql.*;
 
 /**
- * Default AuthProvider implementation. It authenticates against the <tt>jiveUser</tt>
+ * Default AuthProvider implementation. It authenticates against the <tt>ofUser</tt>
  * database table and supports plain text and digest authentication.
  *
  * Because each call to authenticate() makes a database connection, the
@@ -31,9 +31,9 @@ import java.sql.*;
 public class DefaultAuthProvider implements AuthProvider {
 
     private static final String LOAD_PASSWORD =
-            "SELECT plainPassword,encryptedPassword FROM jiveUser WHERE username=?";
+            "SELECT plainPassword,encryptedPassword FROM ofUser WHERE username=?";
     private static final String UPDATE_PASSWORD =
-            "UPDATE jiveUser SET plainPassword=?, encryptedPassword=? WHERE username=?";
+            "UPDATE ofUser SET plainPassword=?, encryptedPassword=? WHERE username=?";
 
     /**
      * Constructs a new DefaultAuthProvider.

src/java/org/jivesoftware/openfire/component/ExternalComponentManager.java

@@ -40,13 +40,13 @@ import java.util.concurrent.CopyOnWriteArrayList;
 public class ExternalComponentManager {
 
     private static final String ADD_CONFIGURATION =
-        "INSERT INTO jiveExtComponentConf (subdomain,secret,permission) VALUES (?,?,?)";
+        "INSERT INTO ofExtComponentConf (subdomain,secret,permission) VALUES (?,?,?)";
     private static final String DELETE_CONFIGURATION =
-        "DELETE FROM jiveExtComponentConf WHERE subdomain=?";
+        "DELETE FROM ofExtComponentConf WHERE subdomain=?";
     private static final String LOAD_CONFIGURATION =
-        "SELECT secret,permission FROM jiveExtComponentConf where subdomain=?";
+        "SELECT secret,permission FROM ofExtComponentConf where subdomain=?";
     private static final String LOAD_CONFIGURATIONS =
-        "SELECT subdomain,secret FROM jiveExtComponentConf where permission=?";
+        "SELECT subdomain,secret FROM ofExtComponentConf where permission=?";
 
     /**
      * List of listeners that will be notified when vCards are created, updated or deleted.

src/plugins/packetFilter/src/database/upgrade/2/packetfilter_mysql.sql

+# Rename pfRules to ofPfRules
+RENAME TABLE pfRules TO ofPfRules;
+
+UPDATE ofVersion set version=2 where name='packetfilter';
\ No newline at end of file