Fixed way code was being commented.

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

2_6_branch/src/database/upgrade/1/wildfire_oracle.sql

-REM // $Revision: 795 $
-REM // $Date: 2005-01-06 07:44:42 -0300 (Thu, 06 Jan 2005) $
+-- $Revision: 795 $
+-- $Date: 2005-01-06 07:44:42 -0300 (Thu, 06 Jan 2005) $
 
-REM // jiveGroup: Recreate table from scratch
+-- jiveGroup: Recreate table from scratch
 DROP TABLE jiveGroup;
 CREATE TABLE jiveGroup (
   groupName             VARCHAR2(50)    NOT NULL,
@@ -10,7 +10,7 @@ CREATE TABLE jiveGroup (
 );
 
 
-REM // jiveGroupProp: Recreate table from scratch
+-- jiveGroupProp: Recreate table from scratch
 DROP TABLE jiveGroupProp;
 CREATE TABLE jiveGroupProp (
   groupName             VARCHAR(50)     NOT NULL,
@@ -20,7 +20,7 @@ CREATE TABLE jiveGroupProp (
 );
 
 
-REM // jiveGroupUser: Recreate table from scratch
+-- jiveGroupUser: Recreate table from scratch
 DROP TABLE jiveGroupUser;
 CREATE TABLE jiveGroupUser (
   groupName             VARCHAR(50)     NOT NULL,
@@ -30,28 +30,28 @@ CREATE TABLE jiveGroupUser (
 );
 
 
-REM // mucRoom: Add new columns: "lockedDate" and "emptyDate". Rename column "invitationRequired" to "membersOnly". Delete columns: "lastActiveDate" and "inMemory".
+-- mucRoom: Add new columns: "lockedDate" and "emptyDate". Rename column "invitationRequired" to "membersOnly". Delete columns: "lastActiveDate" and "inMemory".
 ALTER TABLE mucRoom ADD lockedDate CHAR(15) NOT NULL;
 ALTER TABLE mucRoom ADD emptyDate CHAR(15) NULL;
 ALTER TABLE mucRoom RENAME COLUMN invitationRequired TO membersOnly;
 ALTER TABLE mucRoom DROP COLUMN lastActiveDate;
 ALTER TABLE mucRoom DROP COLUMN inMemory;
 
-REM // mucMember: Add new columns
+-- mucMember: Add new columns
 ALTER TABLE mucMember ADD firstName VARCHAR2(100) NULL;
 ALTER TABLE mucMember ADD lastName  VARCHAR2(100) NULL;
 ALTER TABLE mucMember ADD url VARCHAR2(100) NULL;
 ALTER TABLE mucMember ADD email VARCHAR2(100) NULL;
 ALTER TABLE mucMember ADD faqentry VARCHAR2(100) NULL;
 
-REM // mucConversationLog: Add new index
+-- mucConversationLog: Add new index
 CREATE INDEX mucLog_time_idx ON mucConversationLog (time);
 
-REM // Deletes no longer needed entries
+-- Deletes no longer needed entries
 DELETE FROM jiveID where idType = 3;
 DELETE FROM jiveID where idType = 4;
 
-REM // Add jiveVersion table
+-- Add jiveVersion table
 CREATE TABLE jiveVersion (
   majorVersion  INTEGER  NOT NULL,
   minorVersion  INTEGER  NOT NULL

2_6_branch/src/database/upgrade/2/wildfire_oracle.sql

-REM // $Revision: 1650 $
-REM // $Date: 2005-07-20 00:18:17 -0300 (Wed, 20 Jul 2005) $
+-- $Revision: 1650 $
+-- $Date: 2005-07-20 00:18:17 -0300 (Wed, 20 Jul 2005) $
 
-REM // Update jiveVersion to JM 2.2
+-- Update jiveVersion to JM 2.2
 UPDATE jiveVersion SET majorVersion=2, minorVersion=2;
 
-REM // jiveExtComponentConf: Create new table
+-- jiveExtComponentConf: Create new table
 CREATE TABLE jiveExtComponentConf (
   subdomain             VARCHAR2(255)    NOT NULL,
   secret                VARCHAR2(255),
@@ -12,7 +12,7 @@ CREATE TABLE jiveExtComponentConf (
   CONSTRAINT jiveExtComponentConf_pk PRIMARY KEY (subdomain)
 );
 
-REM // jiveRemoteServerConf: Create new table
+-- jiveRemoteServerConf: Create new table
 CREATE TABLE jiveRemoteServerConf (
   domain                VARCHAR2(255)    NOT NULL,
   remotePort            INTEGER,
@@ -20,7 +20,7 @@ CREATE TABLE jiveRemoteServerConf (
   CONSTRAINT jiveRemoteServerConf_pk PRIMARY KEY (domain)
 );
 
-REM // mucRoomProp: Create new table
+-- mucRoomProp: Create new table
 CREATE TABLE mucRoomProp (
   roomID                INT             NOT NULL,
   name                  VARCHAR2(100)   NOT NULL,
@@ -28,7 +28,7 @@ CREATE TABLE mucRoomProp (
   CONSTRAINT mucRoomProp_pk PRIMARY KEY (roomID, name)
 );
 
-REM // mucRoom: Add new columns: "useReservedNick", "canChangeNick" and "canRegister".
+-- mucRoom: Add new columns: "useReservedNick", "canChangeNick" and "canRegister".
 ALTER TABLE mucRoom ADD useReservedNick INTEGER NULL;
 ALTER TABLE mucRoom ADD canChangeNick INTEGER NULL;
 ALTER TABLE mucRoom ADD canRegister INTEGER NULL;
@@ -37,7 +37,7 @@ ALTER TABLE mucRoom MODIFY useReservedNick INTEGER NOT NULL;
 ALTER TABLE mucRoom MODIFY canChangeNick INTEGER NOT NULL;
 ALTER TABLE mucRoom MODIFY canRegister INTEGER NOT NULL;
 
-REM // jiveVCard: Recreate table from scratch
+-- jiveVCard: Recreate table from scratch
 DROP TABLE jiveVCard;
 CREATE TABLE jiveVCard (
   username              VARCHAR2(32)    NOT NULL,

2_6_branch/src/database/upgrade/4/wildfire_oracle.sql

-REM // $Revision: 795 $
-REM // $Date: 2005-01-06 07:44:42 -0300 (Thu, 06 Jan 2005) $
+-- $Revision: 795 $
+-- $Date: 2005-01-06 07:44:42 -0300 (Thu, 06 Jan 2005) $
 
-REM // Update jiveVersion to JM 2.4
+-- Update jiveVersion to JM 2.4
 UPDATE jiveVersion SET majorVersion=2, minorVersion=4;
 
-REM // jiveGroupUser: Alter length of username column
+-- jiveGroupUser: Alter length of username column
 ALTER TABLE jiveGroupUser MODIFY username VARCHAR2(100) NOT NULL;

2_6_branch/src/database/upgrade/5/wildfire_oracle.sql

-REM // $Revision:  $
-REM // $Date:  $
+-- $Revision:  $
+-- $Date:  $
 
-REM // Update jiveVersion to Wildfire 2.5
+-- Update jiveVersion to Wildfire 2.5
 UPDATE jiveVersion SET majorVersion=2, minorVersion=5;
 
-REM // jivePrivacyList: Create new table
+-- jivePrivacyList: Create new table
 CREATE TABLE jivePrivacyList (
   username              VARCHAR2(32)    NOT NULL,
   name                  VARCHAR2(100)   NOT NULL,

2_6_branch/src/database/upgrade/6/wildfire_oracle.sql

-REM // $Revision: 795 $
-REM // $Date: 2005-01-06 07:44:42 -0300 (Thu, 06 Jan 2005) $
+-- $Revision: 795 $
+-- $Date: 2005-01-06 07:44:42 -0300 (Thu, 06 Jan 2005) $
 
-REM // Update the jiveVersion table to new definition.
+-- Update the jiveVersion table to new definition.
 DROP TABLE jiveVersion;
 CREATE TABLE jiveVersion (
   name     VARCHAR2(50)  NOT NULL,
@@ -10,6 +10,6 @@ CREATE TABLE jiveVersion (
 );
 INSERT INTO jiveVersion (name, version) VALUES ('wildfire', 6);
 
-REM // Make password column accept null, add encrypted password column.
+-- Make password column accept null, add encrypted password column.
 ALTER TABLE jiveUser MODIFY password VARCHAR2(32) NULL;
 ALTER TABLE jiveUser ADD encryptedPassword VARCHAR(255);
\ No newline at end of file

2_6_branch/src/database/upgrade/7/wildfire_oracle.sql

-REM // $Revision:  $
-REM // $Date:  $
+-- $Revision:  $
+-- $Date:  $
 
-REM // Create PubSub Tables
+-- Create PubSub Tables
 
 CREATE TABLE pubsubNode (
   serviceID           VARCHAR2(100)  NOT NULL,

2_6_branch/src/database/upgrade/8/wildfire_oracle.sql

-REM // $Revision:  $
-REM // $Date:  $
+-- $Revision:  $
+-- $Date:  $
 
-REM // Drop old columns of pubSubNode
+-- 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
+-- Add new pubsub tables
 CREATE TABLE pubsubNodeJIDs (
   serviceID           VARCHAR2(100)  NOT NULL,
   nodeID              VARCHAR2(100)  NOT NULL,

2_6_branch/src/database/wildfire_oracle.sql

-REM // $Revision: 1650 $
-REM // $Date: 2005-07-20 00:18:17 -0300 (Wed, 20 Jul 2005) $
+-- $Revision: 1650 $
+-- $Date: 2005-07-20 00:18:17 -0300 (Wed, 20 Jul 2005) $
 
 CREATE TABLE jiveUser (
   username              VARCHAR2(32)     NOT NULL,
@@ -131,7 +131,7 @@ CREATE TABLE jivePrivacyList (
 );
 CREATE INDEX jivePList_default_idx ON jivePrivacyList (username, isDefault);
 
-REM // MUC Tables
+-- MUC Tables
 
 CREATE TABLE mucRoom(
   roomID              INT           NOT NULL,
@@ -196,7 +196,7 @@ CREATE TABLE mucConversationLog (
 );
 CREATE INDEX mucLog_time_idx ON mucConversationLog (time);
 
-REM // PubSub Tables
+-- PubSub Tables
 
 CREATE TABLE pubsubNode (
   serviceID           VARCHAR2(100)  NOT NULL,
@@ -305,7 +305,7 @@ CREATE TABLE pubsubDefaultConf (
   CONSTRAINT pubsubDefConf_pk PRIMARY KEY (serviceID, leaf)
 );
 
-REM // Finally, insert default table values.
+-- Finally, insert default table values.
 
 INSERT INTO jiveID (idType, id) VALUES (18, 1);
 INSERT INTO jiveID (idType, id) VALUES (19, 1);
@@ -313,6 +313,6 @@ INSERT INTO jiveID (idType, id) VALUES (23, 1);
 
 INSERT INTO jiveVersion (name, version) VALUES ('wildfire', 7);
 
-REM // Entry for admin user
+-- Entry for admin user
 INSERT INTO jiveUser (username, password, name, email, creationDate, modificationDate)
     VALUES ('admin', 'admin', 'Administrator', 'admin@example.com', '0', '0');
\ No newline at end of file