Pubsub fixes, improved compatability of pubsub database tables: JM-639, JM-640, JM-641.

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

src/database/upgrade/8/wildfire_db2.sql

+-- $Revision:  $
+-- $Date:  $
+
+-- Drop old columns of pubSubNode
+ALTER TABLE pubsubNode DROP COLUMN contacts;
+ALTER TABLE pubsubNode DROP COLUMN rosterGroups;
+ALTER TABLE pubsubNode DROP COLUMN replyRooms;
+ALTER TABLE pubsubNode DROP COLUMN replyTo;
+ALTER TABLE pubsubNode DROP COLUMN associationTrusted;
+
+-- Add new pubsub tables
+CREATE TABLE pubsubNodeJIDs (
+  serviceID           VARCHAR(100)  NOT NULL,
+  nodeID              VARCHAR(100)  NOT NULL,
+  jid                 VARCHAR(1024) NOT NULL,
+  associationType     VARCHAR(20)   NOT NULL,
+  CONSTRAINT pubsubJID_pk PRIMARY KEY (serviceID, nodeID, jid)
+);
+
+CREATE TABLE pubsubNodeGroups (
+  serviceID           VARCHAR(100)  NOT NULL,
+  nodeID              VARCHAR(100)  NOT NULL,
+  rosterGroup         VARCHAR(100)  NOT NULL
+);
+CREATE INDEX pubsubNodeGroups_idx ON pubsubNodeGroups (serviceID, nodeID);
+
+UPDATE jiveVersion set version=8 where name = 'wildfire';

src/database/upgrade/8/wildfire_hsqldb.sql

+// $Revision:  $
+// $Date:  $
+
+// Drop old columns of pubSubNode
+ALTER TABLE pubsubNode DROP COLUMN contacts;
+ALTER TABLE pubsubNode DROP COLUMN rosterGroups;
+ALTER TABLE pubsubNode DROP COLUMN replyRooms;
+ALTER TABLE pubsubNode DROP COLUMN replyTo;
+ALTER TABLE pubsubNode DROP COLUMN associationTrusted;
+
+// Add new pubsub tables
+CREATE TABLE pubsubNodeJIDs (
+  serviceID           VARCHAR(100)  NOT NULL,
+  nodeID              VARCHAR(100)  NOT NULL,
+  jid                 VARCHAR(1024) NOT NULL,
+  associationType     VARCHAR(20)   NOT NULL,
+  CONSTRAINT pubsubJID_pk PRIMARY KEY (serviceID, nodeID, jid)
+);
+
+CREATE TABLE pubsubNodeGroups (
+  serviceID           VARCHAR(100)  NOT NULL,
+  nodeID              VARCHAR(100)  NOT NULL,
+  rosterGroup         VARCHAR(100)  NOT NULL
+);
+CREATE INDEX pubsubNodeGroups_idx ON pubsubNodeGroups (serviceID, nodeID);
+
+UPDATE jiveVersion set version=8 where name = 'wildfire';

src/database/upgrade/8/wildfire_mysql.sql

+# $Revision:  $
+# $Date:  $
+
+# Drop old columns of pubSubNode
+ALTER TABLE pubsubNode DROP COLUMN contacts;
+ALTER TABLE pubsubNode DROP COLUMN rosterGroups;
+ALTER TABLE pubsubNode DROP COLUMN replyRooms;
+ALTER TABLE pubsubNode DROP COLUMN replyTo;
+ALTER TABLE pubsubNode DROP COLUMN associationTrusted;
+
+# Add new pubsub tables
+CREATE TABLE pubsubNodeJIDs (
+  serviceID           VARCHAR(100)  NOT NULL,
+  nodeID              VARCHAR(100)  NOT NULL,
+  jid                 VARCHAR(255)  NOT NULL,
+  associationType     VARCHAR(20)   NOT NULL,
+  PRIMARY KEY (serviceID, nodeID, jid(70))
+);
+
+CREATE TABLE pubsubNodeGroups (
+  serviceID           VARCHAR(100)  NOT NULL,
+  nodeID              VARCHAR(100)  NOT NULL,
+  rosterGroup         VARCHAR(100)   NOT NULL,
+  INDEX pubsubNodeGroups_idx (serviceID, nodeID)
+);
+
+UPDATE jiveVersion set version=8 where name = 'wildfire';

src/database/upgrade/8/wildfire_oracle.sql

+REM // $Revision:  $
+REM // $Date:  $
+
+REM // Drop old columns of pubSubNode
+ALTER TABLE pubsubNode DROP COLUMN contacts;
+ALTER TABLE pubsubNode DROP COLUMN rosterGroups;
+ALTER TABLE pubsubNode DROP COLUMN replyRooms;
+ALTER TABLE pubsubNode DROP COLUMN replyTo;
+ALTER TABLE pubsubNode DROP COLUMN associationTrusted;
+
+REM // Add new pubsub tables
+CREATE TABLE pubsubNodeJIDs (
+  serviceID           VARCHAR2(100)  NOT NULL,
+  nodeID              VARCHAR2(100)  NOT NULL,
+  jid                 VARCHAR2(1024) NOT NULL,
+  associationType     VARCHAR2(20)   NOT NULL,
+  CONSTRAINT pubsubJID_pk PRIMARY KEY (serviceID, nodeID, jid)
+);
+
+CREATE TABLE pubsubNodeGroups (
+  serviceID           VARCHAR2(100)  NOT NULL,
+  nodeID              VARCHAR2(100)  NOT NULL,
+  rosterGroup         VARCHAR2(100)  NOT NULL
+);
+CREATE INDEX pubsubNodeGroups_idx ON pubsubNodeGroups (serviceID, nodeID);
+
+UPDATE jiveVersion set version=8 where name = 'wildfire';

src/database/upgrade/8/wildfire_postgresql.sql

+-- $Revision:  $
+-- $Date:  $
+
+-- Drop old columns of pubSubNode
+ALTER TABLE pubsubNode DROP COLUMN contacts;
+ALTER TABLE pubsubNode DROP COLUMN rosterGroups;
+ALTER TABLE pubsubNode DROP COLUMN replyRooms;
+ALTER TABLE pubsubNode DROP COLUMN replyTo;
+ALTER TABLE pubsubNode DROP COLUMN associationTrusted;
+
+-- Add new pubsub tables
+CREATE TABLE pubsubNodeJIDs (
+  serviceID           VARCHAR(100)  NOT NULL,
+  nodeID              VARCHAR(100)  NOT NULL,
+  jid                 VARCHAR(1024) NOT NULL,
+  associationType     VARCHAR(20)   NOT NULL,
+  CONSTRAINT pubsubJID_pk PRIMARY KEY (serviceID, nodeID, jid)
+);
+
+CREATE TABLE pubsubNodeGroups (
+  serviceID           VARCHAR(100)  NOT NULL,
+  nodeID              VARCHAR(100)  NOT NULL,
+  rosterGroup         VARCHAR(100)  NOT NULL
+);
+CREATE INDEX pubsubNodeGroups_idx ON pubsubNodeGroups (serviceID, nodeID);
+
+UPDATE jiveVersion set version=8 where name = 'wildfire';

src/database/upgrade/8/wildfire_sqlserver.sql

+/* $Revision:  $           */
+/* $Date:  $               */
+
+/* Drop old columns of pubSubNode */
+ALTER TABLE pubsubNode DROP COLUMN contacts;
+ALTER TABLE pubsubNode DROP COLUMN rosterGroups;
+ALTER TABLE pubsubNode DROP COLUMN replyRooms;
+ALTER TABLE pubsubNode DROP COLUMN replyTo;
+ALTER TABLE pubsubNode DROP COLUMN associationTrusted;
+
+/* Reduce columns size to avoid warnings */
+ALTER TABLE pubsubNode ALTER COLUMN creator NVARCHAR(255)  NOT NULL;
+
+/* Reduce columns size to avoid warnings */
+ALTER TABLE pubsubAffiliation DROP CONSTRAINT pubsubAffil_pk;
+ALTER TABLE pubsubAffiliation ALTER COLUMN jid NVARCHAR(250) NOT NULL;
+ALTER TABLE pubsubAffiliation ADD CONSTRAINT pubsubAffil_pk PRIMARY KEY (serviceID, nodeID, jid);
+
+/* Add new pubsub tables */
+CREATE TABLE pubsubNodeJIDs (
+  serviceID           NVARCHAR(100)  NOT NULL,
+  nodeID              NVARCHAR(100)  NOT NULL,
+  jid                 NVARCHAR(250) NOT NULL,
+  associationType     NVARCHAR(20)   NOT NULL,
+  CONSTRAINT pubsubJID_pk PRIMARY KEY (serviceID, nodeID, jid)
+);
+
+CREATE TABLE pubsubNodeGroups (
+  serviceID           NVARCHAR(100)  NOT NULL,
+  nodeID              NVARCHAR(100)  NOT NULL,
+  rosterGroup         NVARCHAR(100)  NOT NULL
+);
+CREATE INDEX pubsubNodeGroups_idx ON pubsubNodeGroups (serviceID, nodeID);
+
+UPDATE jiveVersion set version=8 where name = 'wildfire';

src/database/upgrade/8/wildfire_sybase.sql

+/* $Revision:  $ */
+/* $Date:  $ */
+
+/* Drop old columns of pubSubNode */
+ALTER TABLE pubsubNode DROP COLUMN contacts;
+ALTER TABLE pubsubNode DROP COLUMN rosterGroups;
+ALTER TABLE pubsubNode DROP COLUMN replyRooms;
+ALTER TABLE pubsubNode DROP COLUMN replyTo;
+ALTER TABLE pubsubNode DROP COLUMN associationTrusted;
+
+/* Add new pubsub tables */
+CREATE TABLE pubsubNodeJIDs (
+  serviceID           NVARCHAR(100)  NOT NULL,
+  nodeID              NVARCHAR(100)  NOT NULL,
+  jid                 NVARCHAR(1024) NOT NULL,
+  associationType     NVARCHAR(20)   NOT NULL,
+  CONSTRAINT pubsubJID_pk PRIMARY KEY (serviceID, nodeID, jid)
+);
+
+CREATE TABLE pubsubNodeGroups (
+  serviceID           NVARCHAR(100)  NOT NULL,
+  nodeID              NVARCHAR(100)  NOT NULL,
+  rosterGroup         NVARCHAR(100)  NOT NULL
+);
+CREATE INDEX pubsubNodeGroups_idx ON pubsubNodeGroups (serviceID, nodeID);
+
+UPDATE jiveVersion set version=8 where name = 'wildfire';

src/database/wildfire_db2.sql

@@ -224,8 +224,6 @@ CREATE TABLE pubsubNode (
   publisherModel      VARCHAR(15)   NOT NULL,
   subscriptionEnabled INTEGER       NOT NULL,
   configSubscription  INTEGER       NOT NULL,
-  contacts            VARCHAR(4000) NULL,
-  rosterGroups        VARCHAR(4000) NULL,
   accessModel         VARCHAR(10)   NOT NULL,
   payloadType         VARCHAR(100)  NULL,
   bodyXSLT            VARCHAR(100)  NULL,
@@ -235,14 +233,26 @@ CREATE TABLE pubsubNode (
   language            VARCHAR(255)  NULL,
   name                VARCHAR(50)   NULL,
   replyPolicy         VARCHAR(15)   NULL,
-  replyRooms          VARCHAR(4000) NULL,
-  replyTo             VARCHAR(1024) NULL,
   associationPolicy   VARCHAR(15)   NULL,
-  associationTrusted  VARCHAR(4000) NULL,
   maxLeafNodes        INTEGER       NULL,
   CONSTRAINT pubsubNode_pk PRIMARY KEY (serviceID, nodeID)
 );
 
+CREATE TABLE pubsubNodeJIDs (
+  serviceID           VARCHAR(100)  NOT NULL,
+  nodeID              VARCHAR(100)  NOT NULL,
+  jid                 VARCHAR(1024) NOT NULL,
+  associationType     VARCHAR(20)   NOT NULL,
+  CONSTRAINT pubsubJID_pk PRIMARY KEY (serviceID, nodeID, jid)
+);
+
+CREATE TABLE pubsubNodeGroups (
+  serviceID           VARCHAR(100)  NOT NULL,
+  nodeID              VARCHAR(100)  NOT NULL,
+  rosterGroup         VARCHAR(100)  NOT NULL
+);
+CREATE INDEX pubsubNodeGroups_idx ON pubsubNodeGroups (serviceID, nodeID);
+
 CREATE TABLE pubsubAffiliation (
   serviceID           VARCHAR(100)  NOT NULL,
   nodeID              VARCHAR(100)  NOT NULL,

src/database/wildfire_hsqldb.sql

@@ -223,8 +223,6 @@ CREATE TABLE pubsubNode (
   publisherModel      VARCHAR(15)   NOT NULL,
   subscriptionEnabled INTEGER       NOT NULL,
   configSubscription  INTEGER       NOT NULL,
-  contacts            VARCHAR(4000) NULL,
-  rosterGroups        VARCHAR(4000) NULL,
   accessModel         VARCHAR(10)   NOT NULL,
   payloadType         VARCHAR(100)  NULL,
   bodyXSLT            VARCHAR(100)  NULL,
@@ -234,14 +232,26 @@ CREATE TABLE pubsubNode (
   language            VARCHAR(255)  NULL,
   name                VARCHAR(50)   NULL,
   replyPolicy         VARCHAR(15)   NULL,
-  replyRooms          VARCHAR(4000) NULL,
-  replyTo             VARCHAR(1024) NULL,
   associationPolicy   VARCHAR(15)   NULL,
-  associationTrusted  VARCHAR(4000) NULL,
   maxLeafNodes        INTEGER       NULL,
   CONSTRAINT pubsubNode_pk PRIMARY KEY (serviceID, nodeID)
 );
 
+CREATE TABLE pubsubNodeJIDs (
+  serviceID           VARCHAR(100)  NOT NULL,
+  nodeID              VARCHAR(100)  NOT NULL,
+  jid                 VARCHAR(1024) NOT NULL,
+  associationType     VARCHAR(20)   NOT NULL,
+  CONSTRAINT pubsubJID_pk PRIMARY KEY (serviceID, nodeID, jid)
+);
+
+CREATE TABLE pubsubNodeGroups (
+  serviceID           VARCHAR(100)  NOT NULL,
+  nodeID              VARCHAR(100)  NOT NULL,
+  rosterGroup         VARCHAR(100)  NOT NULL
+);
+CREATE INDEX pubsubNodeGroups_idx ON pubsubNodeGroups (serviceID, nodeID);
+
 CREATE TABLE pubsubAffiliation (
   serviceID           VARCHAR(100)  NOT NULL,
   nodeID              VARCHAR(100)  NOT NULL,

src/database/wildfire_mysql.sql

@@ -211,29 +211,39 @@ CREATE TABLE pubsubNode (
   publisherModel      VARCHAR(15)   NOT NULL,
   subscriptionEnabled TINYINT       NOT NULL,
   configSubscription  TINYINT       NOT NULL,
-  contacts            VARCHAR(4000) NULL,
-  rosterGroups        VARCHAR(4000) NULL,
   accessModel         VARCHAR(10)   NOT NULL,
   payloadType         VARCHAR(100)  NULL,
   bodyXSLT            VARCHAR(100)  NULL,
   dataformXSLT        VARCHAR(100)  NULL,
-  creator             VARCHAR(1024) NOT NULL,
+  creator             VARCHAR(255) NOT NULL,
   description         VARCHAR(255)  NULL,
   language            VARCHAR(255)  NULL,
   name                VARCHAR(50)   NULL,
   replyPolicy         VARCHAR(15)   NULL,
-  replyRooms          VARCHAR(4000) NULL,
-  replyTo             VARCHAR(1024) NULL,
   associationPolicy   VARCHAR(15)   NULL,
-  associationTrusted  VARCHAR(4000) NULL,
   maxLeafNodes        INTEGER       NULL,
   PRIMARY KEY (serviceID, nodeID)
 );
 
+CREATE TABLE pubsubNodeJIDs (
+  serviceID           VARCHAR(100)  NOT NULL,
+  nodeID              VARCHAR(100)  NOT NULL,
+  jid                 VARCHAR(255)  NOT NULL,
+  associationType     VARCHAR(20)   NOT NULL,
+  PRIMARY KEY (serviceID, nodeID, jid(70))
+);
+
+CREATE TABLE pubsubNodeGroups (
+  serviceID           VARCHAR(100)  NOT NULL,
+  nodeID              VARCHAR(100)  NOT NULL,
+  rosterGroup         VARCHAR(100)   NOT NULL,
+  INDEX pubsubNodeGroups_idx (serviceID, nodeID)
+);
+
 CREATE TABLE pubsubAffiliation (
   serviceID           VARCHAR(100)  NOT NULL,
   nodeID              VARCHAR(100)  NOT NULL,
-  jid                 VARCHAR(1024) NOT NULL,
+  jid                 VARCHAR(255) NOT NULL,
   affiliation         VARCHAR(10)   NOT NULL,
   PRIMARY KEY (serviceID, nodeID, jid(70))
 );
@@ -242,7 +252,7 @@ CREATE TABLE pubsubItem (
   serviceID           VARCHAR(100)  NOT NULL,
   nodeID              VARCHAR(100)  NOT NULL,
   id                  VARCHAR(100)  NOT NULL,
-  jid                 VARCHAR(1024) NOT NULL,
+  jid                 VARCHAR(255) NOT NULL,
   creationDate        CHAR(15)      NOT NULL,
   payload             TEXT          NULL,
   PRIMARY KEY (serviceID, nodeID, id)
@@ -252,15 +262,15 @@ CREATE TABLE pubsubSubscription (
   serviceID           VARCHAR(100)  NOT NULL,
   nodeID              VARCHAR(100)  NOT NULL,
   id                  VARCHAR(100)  NOT NULL,
-  jid                 VARCHAR(1024) NOT NULL,
-  owner               VARCHAR(1024) NOT NULL,
+  jid                 VARCHAR(255) NOT NULL,
+  owner               VARCHAR(255) NOT NULL,
   state               VARCHAR(15)   NOT NULL,
   deliver             TINYINT       NOT NULL,
   digest              TINYINT       NOT NULL,
   digest_frequency    TINYINT       NOT NULL,
   expire              CHAR(15)      NULL,
   includeBody         TINYINT       NOT NULL,
-  showValues          VARCHAR(30)   NOT NULL,
+  showValues          VARCHAR(30)   NULL,
   subscriptionType    VARCHAR(10)   NOT NULL,
   subscriptionDepth   TINYINT       NOT NULL,
   keyword             VARCHAR(200)  NULL,

src/database/wildfire_oracle.sql

@@ -217,8 +217,6 @@ CREATE TABLE pubsubNode (
   publisherModel      VARCHAR2(15)   NOT NULL,
   subscriptionEnabled INTEGER        NOT NULL,
   configSubscription  INTEGER        NOT NULL,
-  contacts            VARCHAR2(4000) NULL,
-  rosterGroups        VARCHAR2(4000) NULL,
   accessModel         VARCHAR2(10)   NOT NULL,
   payloadType         VARCHAR2(100)  NULL,
   bodyXSLT            VARCHAR2(100)  NULL,
@@ -228,14 +226,26 @@ CREATE TABLE pubsubNode (
   language            VARCHAR2(255)  NULL,
   name                VARCHAR2(50)   NULL,
   replyPolicy         VARCHAR2(15)   NULL,
-  replyRooms          VARCHAR2(4000) NULL,
-  replyTo             VARCHAR2(1024) NULL,
   associationPolicy   VARCHAR2(15)   NULL,
-  associationTrusted  VARCHAR2(4000) NULL,
   maxLeafNodes        INTEGER        NULL,
   CONSTRAINT pubsubNode_pk PRIMARY KEY (serviceID, nodeID)
 );
 
+CREATE TABLE pubsubNodeJIDs (
+  serviceID           VARCHAR2(100)  NOT NULL,
+  nodeID              VARCHAR2(100)  NOT NULL,
+  jid                 VARCHAR2(1024) NOT NULL,
+  associationType     VARCHAR2(20)   NOT NULL,
+  CONSTRAINT pubsubJID_pk PRIMARY KEY (serviceID, nodeID, jid)
+);
+
+CREATE TABLE pubsubNodeGroups (
+  serviceID           VARCHAR2(100)  NOT NULL,
+  nodeID              VARCHAR2(100)  NOT NULL,
+  rosterGroup         VARCHAR2(100)  NOT NULL
+);
+CREATE INDEX pubsubNodeGroups_idx ON pubsubNodeGroups (serviceID, nodeID);
+
 CREATE TABLE pubsubAffiliation (
   serviceID           VARCHAR2(100)  NOT NULL,
   nodeID              VARCHAR2(100)  NOT NULL,

src/database/wildfire_postgresql.sql

@@ -226,8 +226,6 @@ CREATE TABLE pubsubNode (
   publisherModel      VARCHAR(15)   NOT NULL,
   subscriptionEnabled INTEGER       NOT NULL,
   configSubscription  INTEGER       NOT NULL,
-  contacts            VARCHAR(4000) NULL,
-  rosterGroups        VARCHAR(4000) NULL,
   accessModel         VARCHAR(10)   NOT NULL,
   payloadType         VARCHAR(100)  NULL,
   bodyXSLT            VARCHAR(100)  NULL,
@@ -237,14 +235,26 @@ CREATE TABLE pubsubNode (
   language            VARCHAR(255)  NULL,
   name                VARCHAR(50)   NULL,
   replyPolicy         VARCHAR(15)   NULL,
-  replyRooms          VARCHAR(4000) NULL,
-  replyTo             VARCHAR(1024) NULL,
   associationPolicy   VARCHAR(15)   NULL,
-  associationTrusted  VARCHAR(4000) NULL,
   maxLeafNodes        INTEGER       NULL,
   CONSTRAINT pubsubNode_pk PRIMARY KEY (serviceID, nodeID)
 );
 
+CREATE TABLE pubsubNodeJIDs (
+  serviceID           VARCHAR(100)  NOT NULL,
+  nodeID              VARCHAR(100)  NOT NULL,
+  jid                 VARCHAR(1024) NOT NULL,
+  associationType     VARCHAR(20)   NOT NULL,
+  CONSTRAINT pubsubJID_pk PRIMARY KEY (serviceID, nodeID, jid)
+);
+
+CREATE TABLE pubsubNodeGroups (
+  serviceID           VARCHAR(100)  NOT NULL,
+  nodeID              VARCHAR(100)  NOT NULL,
+  rosterGroup         VARCHAR(100)  NOT NULL
+);
+CREATE INDEX pubsubNodeGroups_idx ON pubsubNodeGroups (serviceID, nodeID);
+
 CREATE TABLE pubsubAffiliation (
   serviceID           VARCHAR(100)  NOT NULL,
   nodeID              VARCHAR(100)  NOT NULL,

src/database/wildfire_sqlserver.sql

@@ -224,29 +224,39 @@ CREATE TABLE pubsubNode (
   publisherModel      NVARCHAR(15)   NOT NULL,
   subscriptionEnabled INT            NOT NULL,
   configSubscription  INT            NOT NULL,
-  contacts            NVARCHAR(4000) NULL,
-  rosterGroups        NVARCHAR(4000) NULL,
   accessModel         NVARCHAR(10)   NOT NULL,
   payloadType         NVARCHAR(100)  NULL,
   bodyXSLT            NVARCHAR(100)  NULL,
   dataformXSLT        NVARCHAR(100)  NULL,
-  creator             NVARCHAR(1024) NOT NULL,
+  creator             NVARCHAR(255)  NOT NULL,
   description         NVARCHAR(255)  NULL,
   language            NVARCHAR(255)  NULL,
   name                NVARCHAR(50)   NULL,
   replyPolicy         NVARCHAR(15)   NULL,
-  replyRooms          NVARCHAR(4000) NULL,
-  replyTo             NVARCHAR(1024) NULL,
   associationPolicy   NVARCHAR(15)   NULL,
-  associationTrusted  NVARCHAR(4000) NULL,
   maxLeafNodes        INT            NULL,
   CONSTRAINT pubsubNode_pk PRIMARY KEY (serviceID, nodeID)
 );
 
+CREATE TABLE pubsubNodeJIDs (
+  serviceID           NVARCHAR(100)  NOT NULL,
+  nodeID              NVARCHAR(100)  NOT NULL,
+  jid                 NVARCHAR(250) NOT NULL,
+  associationType     NVARCHAR(20)   NOT NULL,
+  CONSTRAINT pubsubJID_pk PRIMARY KEY (serviceID, nodeID, jid)
+);
+
+CREATE TABLE pubsubNodeGroups (
+  serviceID           NVARCHAR(100)  NOT NULL,
+  nodeID              NVARCHAR(100)  NOT NULL,
+  rosterGroup         NVARCHAR(100)  NOT NULL
+);
+CREATE INDEX pubsubNodeGroups_idx ON pubsubNodeGroups (serviceID, nodeID);
+
 CREATE TABLE pubsubAffiliation (
   serviceID           NVARCHAR(100)  NOT NULL,
   nodeID              NVARCHAR(100)  NOT NULL,
-  jid                 NVARCHAR(1024) NOT NULL,
+  jid                 NVARCHAR(250)  NOT NULL,
   affiliation         NVARCHAR(10)   NOT NULL,
   CONSTRAINT pubsubAffil_pk PRIMARY KEY (serviceID, nodeID, jid)
 );

src/database/wildfire_sybase.sql

@@ -224,8 +224,6 @@ CREATE TABLE pubsubNode (
   publisherModel      NVARCHAR(15)   NOT NULL,
   subscriptionEnabled INT            NOT NULL,
   configSubscription  INT            NOT NULL,
-  contacts            NVARCHAR(4000) NULL,
-  rosterGroups        NVARCHAR(4000) NULL,
   accessModel         NVARCHAR(10)   NOT NULL,
   payloadType         NVARCHAR(100)  NULL,
   bodyXSLT            NVARCHAR(100)  NULL,
@@ -235,14 +233,26 @@ CREATE TABLE pubsubNode (
   language            NVARCHAR(255)  NULL,
   name                NVARCHAR(50)   NULL,
   replyPolicy         NVARCHAR(15)   NULL,
-  replyRooms          NVARCHAR(4000) NULL,
-  replyTo             NVARCHAR(1024) NULL,
   associationPolicy   NVARCHAR(15)   NULL,
-  associationTrusted  NVARCHAR(4000) NULL,
   maxLeafNodes        INT            NULL,
   CONSTRAINT pubsubNode_pk PRIMARY KEY (serviceID, nodeID)
 );
 
+CREATE TABLE pubsubNodeJIDs (
+  serviceID           NVARCHAR(100)  NOT NULL,
+  nodeID              NVARCHAR(100)  NOT NULL,
+  jid                 NVARCHAR(1024) NOT NULL,
+  associationType     NVARCHAR(20)   NOT NULL,
+  CONSTRAINT pubsubJID_pk PRIMARY KEY (serviceID, nodeID, jid)
+);
+
+CREATE TABLE pubsubNodeGroups (
+  serviceID           NVARCHAR(100)  NOT NULL,
+  nodeID              NVARCHAR(100)  NOT NULL,
+  rosterGroup         NVARCHAR(100)  NOT NULL
+);
+CREATE INDEX pubsubNodeGroups_idx ON pubsubNodeGroups (serviceID, nodeID);
+
 CREATE TABLE pubsubAffiliation (
   serviceID           NVARCHAR(100)  NOT NULL,
   nodeID              NVARCHAR(100)  NOT NULL,

src/java/org/jivesoftware/database/DbConnectionManager.java

@@ -41,7 +41,7 @@ public class DbConnectionManager {
     /**
      * Database schema version.
      */
-    private static final int DATABASE_VERSION = 7;
+    private static final int DATABASE_VERSION = 8;
 
 
     private static ConnectionProvider connectionProvider;

src/java/org/jivesoftware/wildfire/pubsub/CollectionNode.java

@@ -73,7 +73,7 @@ public class CollectionNode extends Node {
             associationTrusted = new ArrayList<JID>();
             for (String value : field.getValues()) {
                 try {
-                    associationTrusted.add(new JID(value));
+                    addAssociationTrusted(new JID(value));
                 }
                 catch (Exception e) {
                     // Do nothing
@@ -276,7 +276,18 @@ public class CollectionNode extends Node {
      * @return the users that are allowed to associate leaf nodes with this collection node.
      */
     public Collection<JID> getAssociationTrusted() {
-        return associationTrusted;
+        return Collections.unmodifiableCollection(associationTrusted);
+    }
+
+    /**
+     * Adds a new trusted user that is allowed to associate leaf nodes with this collection node.
+     * The new user is not going to be added to the database. Instead it is just kept in memory.
+     *
+     * @param user the new trusted user that is allowed to associate leaf nodes with this
+     *        collection node.
+     */
+    void addAssociationTrusted(JID user) {
+        associationTrusted.add(user);
     }
 
     /**

src/java/org/jivesoftware/wildfire/pubsub/LeafNode.java

@@ -435,7 +435,8 @@ public class LeafNode extends Node {
         synchronized (publishedItems) {
             if (publishedItems.size() > 1) {
                 // Remove all items except the last one
-                toDelete = publishedItems.subList(0, publishedItems.size() - 1);
+                toDelete = new ArrayList<PublishedItem>(
+                        publishedItems.subList(0, publishedItems.size() - 1));
                 // Remove items to delete from memory
                 publishedItems.removeAll(toDelete);
                 // Update fast look up cache of published items

src/java/org/jivesoftware/wildfire/pubsub/Node.java

@@ -562,7 +562,7 @@ public abstract class Node {
                     // Get the new list of roster group(s) allowed to subscribe and retrieve items
                     rosterGroupsAllowed = new ArrayList<String>();
                     for (String value : field.getValues()) {
-                        rosterGroupsAllowed.add(value);
+                        addAllowedRosterGroup(value);
                     }
                 }
                 else if ("pubsub#contact".equals(field.getVariable())) {
@@ -570,7 +570,7 @@ public abstract class Node {
                     contacts = new ArrayList<JID>();
                     for (String value : field.getValues()) {
                         try {
-                            contacts.add(new JID(value));
+                            addContact(new JID(value));
                         }
                         catch (Exception e) {
                             // Do nothing
@@ -600,7 +600,7 @@ public abstract class Node {
                     replyRooms = new ArrayList<JID>();
                     for (String value : field.getValues()) {
                         try {
-                            replyRooms.add(new JID(value));
+                            addReplyRoom(new JID(value));
                         }
                         catch (Exception e) {
                             // Do nothing
@@ -612,7 +612,7 @@ public abstract class Node {
                     replyTo = new ArrayList<JID>();
                     for (String value : field.getValues()) {
                         try {
-                            replyTo.add(new JID(value));
+                            addReplyTo(new JID(value));
                         }
                         catch (Exception e) {
                             // Do nothing
@@ -1312,15 +1312,34 @@ public abstract class Node {
      * @return the roster group(s) allowed to subscribe and retrieve items.
      */
     public Collection<String> getRosterGroupsAllowed() {
-        return rosterGroupsAllowed;
+        return Collections.unmodifiableCollection(rosterGroupsAllowed);
+    }
+
+    /**
+     * Adds a new roster group that is allowed to subscribe and retrieve items.
+     * The new roster group is not going to be added to the database. Instead it is just
+     * kept in memory.
+     *
+     * @param groupName the new roster group that is allowed to subscribe and retrieve items.
+     */
+    void addAllowedRosterGroup(String groupName) {
+        rosterGroupsAllowed.add(groupName);
     }
 
     public Collection<JID> getReplyRooms() {
-        return replyRooms;
+        return Collections.unmodifiableCollection(replyRooms);
+    }
+
+    void addReplyRoom(JID roomJID) {
+        replyRooms.add(roomJID);
     }
 
     public Collection<JID> getReplyTo() {
-        return replyTo;
+        return Collections.unmodifiableCollection(replyTo);
+    }
+
+    void addReplyTo(JID entity) {
+        replyTo.add(entity);
     }
 
     /**
@@ -1410,7 +1429,16 @@ public abstract class Node {
      * @return the JIDs of those to contact with questions.
      */
     public Collection<JID> getContacts() {
-        return contacts;
+        return Collections.unmodifiableCollection(contacts);
+    }
+
+    /**
+     * Adds a new user as a candidate to answer questions about the node.
+     *
+     * @param user the JID of the new user.
+     */
+    void addContact(JID user) {
+        contacts.add(user);
     }
 
     /**

src/java/org/jivesoftware/wildfire/pubsub/PubSubEngine.java

@@ -246,6 +246,7 @@ public class PubSubEngine {
             // Process ad-hoc command
             IQ reply = manager.process(iq);
             router.route(reply);
+            return true;
         }
         return false;
     }

src/java/org/jivesoftware/wildfire/pubsub/PubSubPersistenceManager.java

@@ -39,31 +39,45 @@ public class PubSubPersistenceManager {
             "SELECT nodeID, leaf, creationDate, modificationDate, parent, deliverPayloads, " +
             "maxPayloadSize, persistItems, maxItems, notifyConfigChanges, notifyDelete, " +
             "notifyRetract, presenceBased, sendItemSubscribe, publisherModel, " +
-            "subscriptionEnabled, configSubscription, contacts, rosterGroups, accessModel, " +
-            "payloadType, bodyXSLT, dataformXSLT, creator, description, language, name, " +
-            "replyPolicy, replyRooms, replyTo, associationPolicy, associationTrusted, " +
-            "maxLeafNodes FROM pubsubNode WHERE serviceID=? ORDER BY nodeID";
+            "subscriptionEnabled, configSubscription, accessModel, payloadType, " +
+            "bodyXSLT, dataformXSLT, creator, description, language, name, " +
+            "replyPolicy, associationPolicy, maxLeafNodes FROM pubsubNode " +
+            "WHERE serviceID=? ORDER BY nodeID";
     private static final String UPDATE_NODE =
             "UPDATE pubsubNode SET modificationDate=?, parent=?, deliverPayloads=?, " +
             "maxPayloadSize=?, persistItems=?, maxItems=?, " +
             "notifyConfigChanges=?, notifyDelete=?, notifyRetract=?, presenceBased=?, " +
             "sendItemSubscribe=?, publisherModel=?, subscriptionEnabled=?, configSubscription=?, " +
-            "contacts=?, rosterGroups=?, accessModel=?, payloadType=?, bodyXSLT=?, " +
-            "dataformXSLT=?, description=?, language=?, name=?, replyPolicy=?, replyRooms=?, " +
-            "replyTo=?, associationPolicy=?, associationTrusted=?, maxLeafNodes=? " +
+            "accessModel=?, payloadType=?, bodyXSLT=?, dataformXSLT=?, description=?, " +
+            "language=?, name=?, replyPolicy=?, associationPolicy=?, maxLeafNodes=? " +
             "WHERE serviceID=? AND nodeID=?";
     private static final String ADD_NODE =
             "INSERT INTO pubsubNode (serviceID, nodeID, leaf, creationDate, modificationDate, " +
             "parent, deliverPayloads, maxPayloadSize, persistItems, maxItems, " +
             "notifyConfigChanges, notifyDelete, notifyRetract, presenceBased, " +
             "sendItemSubscribe, publisherModel, subscriptionEnabled, configSubscription, " +
-            "accessModel, contacts, rosterGroups, payloadType, bodyXSLT, dataformXSLT, " +
-            "creator, description, language, name, replyPolicy, replyRooms, replyTo, " +
-            "associationPolicy, associationTrusted, maxLeafNodes) " +
-            "VALUES (?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)";
+            "accessModel, payloadType, bodyXSLT, dataformXSLT, creator, description, " +
+            "language, name, replyPolicy, associationPolicy, maxLeafNodes) " +
+            "VALUES (?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)";
     private static final String DELETE_NODE =
             "DELETE FROM pubsubNode WHERE serviceID=? AND nodeID=?";
 
+    private static final String LOAD_NODES_JIDS =
+            "SELECT nodeID, jid, associationType FROM pubsubNodeJIDs WHERE serviceID=?";
+    private static final String ADD_NODE_JIDS =
+            "INSERT INTO pubsubNodeJIDs (serviceID, nodeID, jid, associationType) " +
+            "VALUES (?,?,?,?)";
+    private static final String DELETE_NODE_JIDS =
+            "DELETE FROM pubsubNodeJIDs WHERE serviceID=? AND nodeID=?";
+
+    private static final String LOAD_NODES_GROUPS =
+            "SELECT nodeID, rosterGroup FROM pubsubNodeGroups WHERE serviceID=?";
+    private static final String ADD_NODE_GROUPS =
+            "INSERT INTO pubsubNodeGroups (serviceID, nodeID, rosterGroup) " +
+            "VALUES (?,?,?)";
+    private static final String DELETE_NODE_GROUPS =
+            "DELETE FROM pubsubNodeGroups WHERE serviceID=? AND nodeID=?";
+
     private static final String LOAD_AFFILIATIONS =
             "SELECT nodeID,jid,affiliation FROM pubsubAffiliation WHERE serviceID=? " +
             "ORDER BY nodeID";
@@ -148,8 +162,9 @@ public class PubSubPersistenceManager {
     public static void createNode(PubSubService service, Node node) {
         Connection con = null;
         PreparedStatement pstmt = null;
+        boolean abortTransaction = false;
         try {
-            con = DbConnectionManager.getConnection();
+            con = DbConnectionManager.getTransactionConnection();
             pstmt = con.prepareStatement(ADD_NODE);
             pstmt.setString(1, service.getServiceID());
             pstmt.setString(2, encodeNodeID(node.getNodeID()));
@@ -177,43 +192,40 @@ public class PubSubPersistenceManager {
             pstmt.setInt(17, (node.isSubscriptionEnabled() ? 1 : 0));
             pstmt.setInt(18, (node.isSubscriptionConfigurationRequired() ? 1 : 0));
             pstmt.setString(19, node.getAccessModel().getName());
-            pstmt.setString(20, encodeJIDs(node.getContacts()));
-            pstmt.setString(21, encodeGroups(node.getRosterGroupsAllowed()));
-            pstmt.setString(22, node.getPayloadType());
-            pstmt.setString(23, node.getBodyXSLT());
-            pstmt.setString(24, node.getDataformXSLT());
-            pstmt.setString(25, node.getCreator().toString());
-            pstmt.setString(26, node.getDescription());
-            pstmt.setString(27, node.getLanguage());
-            pstmt.setString(28, node.getName());
+            pstmt.setString(20, node.getPayloadType());
+            pstmt.setString(21, node.getBodyXSLT());
+            pstmt.setString(22, node.getDataformXSLT());
+            pstmt.setString(23, node.getCreator().toString());
+            pstmt.setString(24, node.getDescription());
+            pstmt.setString(25, node.getLanguage());
+            pstmt.setString(26, node.getName());
             if (node.getReplyPolicy() != null) {
-                pstmt.setString(29, node.getReplyPolicy().name());
+                pstmt.setString(27, node.getReplyPolicy().name());
             }
             else {
-                pstmt.setString(29, null);
+                pstmt.setString(27, null);
             }
-            pstmt.setString(30, encodeJIDs(node.getReplyRooms()));
-            pstmt.setString(31, encodeJIDs(node.getReplyTo()));
             if (node.isCollectionNode()) {
-                pstmt.setString(32, ((CollectionNode)node).getAssociationPolicy().name());
-                pstmt.setString(33, encodeJIDs(((CollectionNode)node).getAssociationTrusted()));
-                pstmt.setInt(34, ((CollectionNode)node).getMaxLeafNodes());
+                pstmt.setString(28, ((CollectionNode)node).getAssociationPolicy().name());
+                pstmt.setInt(29, ((CollectionNode)node).getMaxLeafNodes());
             }
             else {
-                pstmt.setString(32, null);
-                pstmt.setString(33, null);
-                pstmt.setInt(34, 0);
+                pstmt.setString(28, null);
+                pstmt.setInt(29, 0);
             }
             pstmt.executeUpdate();
+
+            // Save associated JIDs and roster groups
+            saveAssociatedElements(con, node, service);
         }
         catch (SQLException sqle) {
             Log.error(sqle);
+            abortTransaction = true;
         }
         finally {
             try {if (pstmt != null) {pstmt.close();}}
             catch (Exception e) {Log.error(e);}
-            try {if (con != null) {con.close();}}
-            catch (Exception e) {Log.error(e);}
+            DbConnectionManager.closeTransactionConnection(con, abortTransaction);
         }
     }
 
@@ -226,8 +238,9 @@ public class PubSubPersistenceManager {
     public static void updateNode(PubSubService service, Node node) {
         Connection con = null;
         PreparedStatement pstmt = null;
+        boolean abortTransaction = false;
         try {
-            con = DbConnectionManager.getConnection();
+            con = DbConnectionManager.getTransactionConnection();
             pstmt = con.prepareStatement(UPDATE_NODE);
             pstmt.setString(1, StringUtils.dateToMillis(node.getModificationDate()));
             pstmt.setString(2, node.getParent() != null ? encodeNodeID(node.getParent().getNodeID()) : null);
@@ -250,45 +263,107 @@ public class PubSubPersistenceManager {
             pstmt.setString(12, node.getPublisherModel().getName());
             pstmt.setInt(13, (node.isSubscriptionEnabled() ? 1 : 0));
             pstmt.setInt(14, (node.isSubscriptionConfigurationRequired() ? 1 : 0));
-            pstmt.setString(15, encodeJIDs(node.getContacts()));
-            pstmt.setString(16, encodeGroups(node.getRosterGroupsAllowed()));
-            pstmt.setString(17, node.getAccessModel().getName());
-            pstmt.setString(18, node.getPayloadType());
-            pstmt.setString(19, node.getBodyXSLT());
-            pstmt.setString(20, node.getDataformXSLT());
-            pstmt.setString(21, node.getDescription());
-            pstmt.setString(22, node.getLanguage());
-            pstmt.setString(23, node.getName());
+            pstmt.setString(15, node.getAccessModel().getName());
+            pstmt.setString(16, node.getPayloadType());
+            pstmt.setString(17, node.getBodyXSLT());
+            pstmt.setString(18, node.getDataformXSLT());
+            pstmt.setString(19, node.getDescription());
+            pstmt.setString(20, node.getLanguage());
+            pstmt.setString(21, node.getName());
             if (node.getReplyPolicy() != null) {
-                pstmt.setString(24, node.getReplyPolicy().name());
+                pstmt.setString(22, node.getReplyPolicy().name());
             }
             else {
-                pstmt.setString(24, null);
+                pstmt.setString(22, null);
             }
-            pstmt.setString(25, encodeJIDs(node.getReplyRooms()));
-            pstmt.setString(26, encodeJIDs(node.getReplyTo()));
             if (node.isCollectionNode()) {
-                pstmt.setString(27, ((CollectionNode) node).getAssociationPolicy().name());
-                pstmt.setString(28, encodeJIDs(((CollectionNode) node).getAssociationTrusted()));
-                pstmt.setInt(29, ((CollectionNode) node).getMaxLeafNodes());
+                pstmt.setString(23, ((CollectionNode) node).getAssociationPolicy().name());
+                pstmt.setInt(24, ((CollectionNode) node).getMaxLeafNodes());
             }
             else {
-                pstmt.setString(27, null);
-                pstmt.setString(28, null);
-                pstmt.setInt(29, 0);
+                pstmt.setString(23, null);
+                pstmt.setInt(24, 0);
             }
-            pstmt.setString(30, service.getServiceID());
-            pstmt.setString(31, encodeNodeID(node.getNodeID()));
+            pstmt.setString(25, service.getServiceID());
+            pstmt.setString(26, encodeNodeID(node.getNodeID()));
+            pstmt.executeUpdate();
+
+            // Remove existing JIDs associated with the the node
+            pstmt = con.prepareStatement(DELETE_NODE_JIDS);
+            pstmt.setString(1, service.getServiceID());
+            pstmt.setString(2, encodeNodeID(node.getNodeID()));
             pstmt.executeUpdate();
+            pstmt.close();
+
+            // Remove roster groups associated with the the node being deleted
+            pstmt = con.prepareStatement(DELETE_NODE_GROUPS);
+            pstmt.setString(1, service.getServiceID());
+            pstmt.setString(2, encodeNodeID(node.getNodeID()));
+            pstmt.executeUpdate();
+            pstmt.close();
+            pstmt = null;
+
+            // Save associated JIDs and roster groups
+            saveAssociatedElements(con, node, service);
         }
         catch (SQLException sqle) {
             Log.error(sqle);
+            abortTransaction = true;
         }
         finally {
             try {if (pstmt != null) {pstmt.close();}}
             catch (Exception e) {Log.error(e);}
-            try {if (con != null) {con.close();}}
-            catch (Exception e) {Log.error(e);}
+            DbConnectionManager.closeTransactionConnection(con, abortTransaction);
+        }
+    }
+
+    private static void saveAssociatedElements(Connection con, Node node,
+            PubSubService service) throws SQLException {
+        // Add new JIDs associated with the the node
+        PreparedStatement pstmt = con.prepareStatement(ADD_NODE_JIDS);
+        try {
+            for (JID jid : node.getContacts()) {
+                pstmt.setString(1, service.getServiceID());
+                pstmt.setString(2, encodeNodeID(node.getNodeID()));
+                pstmt.setString(3, jid.toString());
+                pstmt.setString(4, "contacts");
+                pstmt.executeUpdate();
+            }
+            for (JID jid : node.getReplyRooms()) {
+                pstmt.setString(1, service.getServiceID());
+                pstmt.setString(2, encodeNodeID(node.getNodeID()));
+                pstmt.setString(3, jid.toString());
+                pstmt.setString(4, "replyRooms");
+                pstmt.executeUpdate();
+            }
+            for (JID jid : node.getReplyTo()) {
+                pstmt.setString(1, service.getServiceID());
+                pstmt.setString(2, encodeNodeID(node.getNodeID()));
+                pstmt.setString(3, jid.toString());
+                pstmt.setString(4, "replyTo");
+                pstmt.executeUpdate();
+            }
+            if (node.isCollectionNode()) {
+                for (JID jid : ((CollectionNode) node).getAssociationTrusted()) {
+                    pstmt.setString(1, service.getServiceID());
+                    pstmt.setString(2, encodeNodeID(node.getNodeID()));
+                    pstmt.setString(3, jid.toString());
+                    pstmt.setString(4, "associationTrusted");
+                    pstmt.executeUpdate();
+                }
+            }
+            pstmt.close();
+            // Add new roster groups associated with the the node
+            pstmt = con.prepareStatement(ADD_NODE_GROUPS);
+            for (String groupName : node.getRosterGroupsAllowed()) {
+                pstmt.setString(1, service.getServiceID());
+                pstmt.setString(2, encodeNodeID(node.getNodeID()));
+                pstmt.setString(3, groupName);
+                pstmt.executeUpdate();
+            }
+        }
+        finally {
+            pstmt.close();
         }
     }
 
@@ -312,6 +387,20 @@ public class PubSubPersistenceManager {
             pstmt.executeUpdate();
             pstmt.close();
 
+            // Remove JIDs associated with the the node being deleted
+            pstmt = con.prepareStatement(DELETE_NODE_JIDS);
+            pstmt.setString(1, service.getServiceID());
+            pstmt.setString(2, encodeNodeID(node.getNodeID()));
+            pstmt.executeUpdate();
+            pstmt.close();
+
+            // Remove roster groups associated with the the node being deleted
+            pstmt = con.prepareStatement(DELETE_NODE_GROUPS);
+            pstmt.setString(1, service.getServiceID());
+            pstmt.setString(2, encodeNodeID(node.getNodeID()));
+            pstmt.executeUpdate();
+            pstmt.close();
+
             // Remove published items of the node being deleted
             pstmt = con.prepareStatement(DELETE_ITEMS);
             pstmt.setString(1, service.getServiceID());
@@ -366,6 +455,28 @@ public class PubSubPersistenceManager {
             rs.close();
             pstmt.close();
 
+            // Get JIDs associated with all nodes
+            pstmt = con.prepareStatement(LOAD_NODES_JIDS);
+            pstmt.setString(1, service.getServiceID());
+            rs = pstmt.executeQuery();
+            // Add to each node the associated JIDs
+            while(rs.next()) {
+                loadAssociatedJIDs(nodes, rs);
+            }
+            rs.close();
+            pstmt.close();
+
+            // Get roster groups associateds with all nodes
+            pstmt = con.prepareStatement(LOAD_NODES_GROUPS);
+            pstmt.setString(1, service.getServiceID());
+            rs = pstmt.executeQuery();
+            // Add to each node the associated Groups
+            while(rs.next()) {
+                loadAssociatedGroups(nodes, rs);
+            }
+            rs.close();
+            pstmt.close();
+
             // Get affiliations of all nodes
             pstmt = con.prepareStatement(LOAD_AFFILIATIONS);
             pstmt.setString(1, service.getServiceID());
@@ -425,7 +536,7 @@ public class PubSubPersistenceManager {
             String nodeID = decodeNodeID(rs.getString(1));
             boolean leaf = rs.getInt(2) == 1;
             String parent = decodeNodeID(rs.getString(5));
-            JID creator = new JID(rs.getString(24));
+            JID creator = new JID(rs.getString(22));
             CollectionNode parentNode = null;
             if (parent != null) {
                 // Check if the parent has already been loaded
@@ -461,25 +572,20 @@ public class PubSubPersistenceManager {
             node.setPublisherModel(PublisherModel.valueOf(rs.getString(15)));
             node.setSubscriptionEnabled(rs.getInt(16) == 1);
             node.setSubscriptionConfigurationRequired(rs.getInt(17) == 1);
-            node.setContacts(decodeJIDs(rs.getString(18)));
-            node.setRosterGroupsAllowed(decodeGroups(rs.getString(19)));
-            node.setAccessModel(AccessModel.valueOf(rs.getString(20)));
-            node.setPayloadType(rs.getString(21));
-            node.setBodyXSLT(rs.getString(22));
-            node.setDataformXSLT(rs.getString(23));
-            node.setDescription(rs.getString(25));
-            node.setLanguage(rs.getString(26));
-            node.setName(rs.getString(27));
-            if (rs.getString(28) != null) {
-                node.setReplyPolicy(Node.ItemReplyPolicy.valueOf(rs.getString(28)));
-            }
-            node.setReplyRooms(decodeJIDs(rs.getString(29)));
-            node.setReplyTo(decodeJIDs(rs.getString(30)));
+            node.setAccessModel(AccessModel.valueOf(rs.getString(18)));
+            node.setPayloadType(rs.getString(19));
+            node.setBodyXSLT(rs.getString(20));
+            node.setDataformXSLT(rs.getString(21));
+            node.setDescription(rs.getString(23));
+            node.setLanguage(rs.getString(24));
+            node.setName(rs.getString(25));
+            if (rs.getString(26) != null) {
+                node.setReplyPolicy(Node.ItemReplyPolicy.valueOf(rs.getString(26)));
+            }
             if (!leaf) {
                 ((CollectionNode) node).setAssociationPolicy(
-                        CollectionNode.LeafNodeAssociationPolicy.valueOf(rs.getString(31)));
-                ((CollectionNode) node).setAssociationTrusted(decodeJIDs(rs.getString(32)));
-                ((CollectionNode) node).setMaxLeafNodes(rs.getInt(33));
+                        CollectionNode.LeafNodeAssociationPolicy.valueOf(rs.getString(27)));
+                ((CollectionNode) node).setMaxLeafNodes(rs.getInt(28));
             }
 
             // Add the load to the list of loaded nodes
@@ -490,6 +596,49 @@ public class PubSubPersistenceManager {
         }
     }
 
+    private static void loadAssociatedJIDs(Map<String, Node> nodes, ResultSet rs) {
+        try {
+            String nodeID = decodeNodeID(rs.getString(1));
+            Node node = nodes.get(nodeID);
+            if (node == null) {
+                Log.warn("JID associated to a non-existent node: " + nodeID);
+                return;
+            }
+            JID jid = new JID(rs.getString(2));
+            String associationType = rs.getString(3);
+            if ("contacts".equals(associationType)) {
+                node.addContact(jid);
+            }
+            else if ("replyRooms".equals(associationType)) {
+                node.addReplyRoom(jid);
+            }
+            else if ("replyTo".equals(associationType)) {
+                node.addReplyTo(jid);
+            }
+            else if ("associationTrusted".equals(associationType)) {
+                ((CollectionNode) node).addAssociationTrusted(jid);
+            }
+        }
+        catch (Exception ex) {
+            Log.error(ex);
+        }
+    }
+
+    private static void loadAssociatedGroups(Map<String, Node> nodes, ResultSet rs) {
+        try {
+            String nodeID = decodeNodeID(rs.getString(1));
+            Node node = nodes.get(nodeID);
+            if (node == null) {
+                Log.warn("Roster Group associated to a non-existent node: " + nodeID);
+                return;
+            }
+            node.addAllowedRosterGroup(rs.getString(2));
+        }
+        catch (SQLException ex) {
+            Log.error(ex);
+        }
+    }
+
     private static void loadAffiliations(Map<String, Node> nodes, ResultSet rs) {
         try {
             String nodeID = decodeNodeID(rs.getString(1));
@@ -1188,49 +1337,6 @@ public class PubSubPersistenceManager {
         return node;
     }*/
 
-    private static String encodeJIDs(Collection<JID> jids) {
-        StringBuilder sb = new StringBuilder(90);
-        for (JID jid : jids) {
-            sb.append(jid.toString()).append(",");
-        }
-        if (!jids.isEmpty()) {
-            sb.setLength(sb.length()-1);
-        }
-        return sb.toString();
-    }
-
-    private static Collection<JID> decodeJIDs(String jids) {
-        if (jids == null) {
-            return Collections.emptyList();
-        }
-        Collection<JID> decodedJIDs = new ArrayList<JID>();
-        StringTokenizer tokenizer = new StringTokenizer(jids, ",");
-        while (tokenizer.hasMoreTokens()) {
-            decodedJIDs.add(new JID(tokenizer.nextToken()));
-        }
-        return decodedJIDs;
-    }
-
-    private static String encodeGroups(Collection<String> groups) {
-        StringBuilder sb = new StringBuilder(90);
-        for (String group : groups) {
-            sb.append(group).append("\u2008");
-        }
-        if (!groups.isEmpty()) {
-            sb.setLength(sb.length()-1);
-        }
-        return sb.toString();
-    }
-
-    private static Collection<String> decodeGroups(String groups) {
-        Collection<String> decodedGroups = new ArrayList<String>();
-        StringTokenizer tokenizer = new StringTokenizer(groups, "\u2008");
-        while (tokenizer.hasMoreTokens()) {
-            decodedGroups.add(tokenizer.nextToken());
-        }
-        return decodedGroups;
-    }
-
     private static String encodeWithComma(Collection<String> strings) {
         StringBuilder sb = new StringBuilder(90);
         for (String group : strings) {
@@ -1239,12 +1345,16 @@ public class PubSubPersistenceManager {
         if (!strings.isEmpty()) {
             sb.setLength(sb.length()-1);
         }
+        else {
+            // Add a blank so an empty string is never replaced with NULL (oracle...arggg!!!)
+            sb.append(" ");
+        }
         return sb.toString();
     }
 
     private static Collection<String> decodeWithComma(String strings) {
         Collection<String> decodedStrings = new ArrayList<String>();
-        StringTokenizer tokenizer = new StringTokenizer(strings, ",");
+        StringTokenizer tokenizer = new StringTokenizer(strings.trim(), ",");
         while (tokenizer.hasMoreTokens()) {
             decodedStrings.add(tokenizer.nextToken());
         }