Unverified Commit 66b3cb97 authored by akrherz's avatar akrherz

ensure all files end with line feed

command form this time was
git ls-files  '*.jsp' | while read f; do tail -n1 $f | read -r _ || echo >> $f; done
parent 42f2cd51
...@@ -8,4 +8,4 @@ ...@@ -8,4 +8,4 @@
</parent> </parent>
<artifactId>dbutil</artifactId> <artifactId>dbutil</artifactId>
<name>Database Utilities</name> <name>Database Utilities</name>
</project> </project>
\ No newline at end of file
...@@ -55,4 +55,4 @@ ...@@ -55,4 +55,4 @@
</div> </div>
</body> </body>
</html> </html>
\ No newline at end of file
...@@ -83,4 +83,4 @@ This process is similar to the RPM except that step 3 is replaced with:<br> ...@@ -83,4 +83,4 @@ This process is similar to the RPM except that step 3 is replaced with:<br>
</div> </div>
</body> </body>
</html> </html>
\ No newline at end of file
...@@ -17,4 +17,4 @@ ...@@ -17,4 +17,4 @@
</resource> </resource>
</resources> </resources>
</build> </build>
</project> </project>
\ No newline at end of file
...@@ -33,4 +33,4 @@ ...@@ -33,4 +33,4 @@
<outputDirectory>src</outputDirectory> <outputDirectory>src</outputDirectory>
</fileSet> </fileSet>
</fileSets> </fileSets>
</assembly> </assembly>
\ No newline at end of file
...@@ -51,4 +51,4 @@ CREATE TABLE jiveVersion ( ...@@ -51,4 +51,4 @@ CREATE TABLE jiveVersion (
majorVersion INTEGER NOT NULL, majorVersion INTEGER NOT NULL,
minorVersion INTEGER NOT NULL minorVersion INTEGER NOT NULL
); );
INSERT INTO jiveVersion (majorVersion, minorVersion) VALUES (2, 1); INSERT INTO jiveVersion (majorVersion, minorVersion) VALUES (2, 1);
\ No newline at end of file
...@@ -52,4 +52,4 @@ CREATE TABLE jiveVersion ( ...@@ -52,4 +52,4 @@ CREATE TABLE jiveVersion (
majorVersion INTEGER NOT NULL, majorVersion INTEGER NOT NULL,
minorVersion INTEGER NOT NULL minorVersion INTEGER NOT NULL
); );
INSERT INTO jiveVersion (majorVersion, minorVersion) VALUES (2, 1); INSERT INTO jiveVersion (majorVersion, minorVersion) VALUES (2, 1);
\ No newline at end of file
...@@ -52,4 +52,4 @@ CREATE TABLE jiveVersion ( ...@@ -52,4 +52,4 @@ CREATE TABLE jiveVersion (
majorVersion INTEGER NOT NULL, majorVersion INTEGER NOT NULL,
minorVersion INTEGER NOT NULL minorVersion INTEGER NOT NULL
); );
INSERT INTO jiveVersion (majorVersion, minorVersion) VALUES (2, 1); INSERT INTO jiveVersion (majorVersion, minorVersion) VALUES (2, 1);
\ No newline at end of file
...@@ -56,4 +56,4 @@ CREATE TABLE jiveVersion ( ...@@ -56,4 +56,4 @@ CREATE TABLE jiveVersion (
); );
INSERT INTO jiveVersion (majorVersion, minorVersion) VALUES (2, 1); INSERT INTO jiveVersion (majorVersion, minorVersion) VALUES (2, 1);
commit; commit;
\ No newline at end of file
...@@ -54,4 +54,4 @@ CREATE TABLE jiveVersion ( ...@@ -54,4 +54,4 @@ CREATE TABLE jiveVersion (
majorVersion INTEGER NOT NULL, majorVersion INTEGER NOT NULL,
minorVersion INTEGER NOT NULL minorVersion INTEGER NOT NULL
); );
INSERT INTO jiveVersion (majorVersion, minorVersion) VALUES (2, 1); INSERT INTO jiveVersion (majorVersion, minorVersion) VALUES (2, 1);
\ No newline at end of file
...@@ -6,4 +6,4 @@ CREATE TABLE jivePresence ( ...@@ -6,4 +6,4 @@ CREATE TABLE jivePresence (
CONSTRAINT jivePresence_pk PRIMARY KEY (username) CONSTRAINT jivePresence_pk PRIMARY KEY (username)
); );
UPDATE jiveVersion set version=11 where name = 'openfire'; UPDATE jiveVersion set version=11 where name = 'openfire';
\ No newline at end of file
...@@ -5,4 +5,4 @@ CREATE TABLE jivePresence ( ...@@ -5,4 +5,4 @@ CREATE TABLE jivePresence (
CONSTRAINT jivePresence_pk PRIMARY KEY (username) CONSTRAINT jivePresence_pk PRIMARY KEY (username)
); );
UPDATE jiveVersion set version=11 where name = 'openfire'; UPDATE jiveVersion set version=11 where name = 'openfire';
\ No newline at end of file
...@@ -6,4 +6,4 @@ CREATE TABLE jivePresence ( ...@@ -6,4 +6,4 @@ CREATE TABLE jivePresence (
PRIMARY KEY (username) PRIMARY KEY (username)
); );
UPDATE jiveVersion set version=11 where name = 'openfire'; UPDATE jiveVersion set version=11 where name = 'openfire';
\ No newline at end of file
...@@ -15,4 +15,4 @@ DROP TABLE mucConversationLog; ...@@ -15,4 +15,4 @@ DROP TABLE mucConversationLog;
RENAME TABLE mucConversationLog2 TO mucConversationLog; RENAME TABLE mucConversationLog2 TO mucConversationLog;
CREATE INDEX mucLog_logtime_idx ON mucConversationLog (logTime); CREATE INDEX mucLog_logtime_idx ON mucConversationLog (logTime);
UPDATE jiveVersion set version=12 where name = 'openfire'; UPDATE jiveVersion set version=12 where name = 'openfire';
\ No newline at end of file
ALTER TABLE mucConversationLog ALTER COLUMN time RENAME TO logTime; ALTER TABLE mucConversationLog ALTER COLUMN time RENAME TO logTime;
UPDATE jiveVersion set version=12 where name = 'openfire'; UPDATE jiveVersion set version=12 where name = 'openfire';
\ No newline at end of file
ALTER TABLE mucConversationLog CHANGE time logTime CHAR(15) NOT NULL; ALTER TABLE mucConversationLog CHANGE time logTime CHAR(15) NOT NULL;
UPDATE jiveVersion set version=12 where name = 'openfire'; UPDATE jiveVersion set version=12 where name = 'openfire';
\ No newline at end of file
...@@ -10,4 +10,4 @@ ALTER TABLE jiveUser ALTER COLUMN password RENAME TO plainPassword; ...@@ -10,4 +10,4 @@ ALTER TABLE jiveUser ALTER COLUMN password RENAME TO plainPassword;
ALTER TABLE mucRoom ALTER COLUMN password RENAME TO roomPassword; ALTER TABLE mucRoom ALTER COLUMN password RENAME TO roomPassword;
UPDATE jiveVersion set version=13 where name = 'openfire'; UPDATE jiveVersion set version=13 where name = 'openfire';
\ No newline at end of file
...@@ -13,4 +13,4 @@ ALTER TABLE jiveUser CHANGE password plainPassword VARCHAR(32); ...@@ -13,4 +13,4 @@ ALTER TABLE jiveUser CHANGE password plainPassword VARCHAR(32);
ALTER TABLE mucRoom CHANGE password roomPassword VARCHAR(50); ALTER TABLE mucRoom CHANGE password roomPassword VARCHAR(50);
UPDATE jiveVersion set version=13 where name = 'openfire'; UPDATE jiveVersion set version=13 where name = 'openfire';
\ No newline at end of file
-- jiveRoster: Add new index -- jiveRoster: Add new index
CREATE INDEX jiveR_jid_idx ON jiveRoster (jid ASC); CREATE INDEX jiveR_jid_idx ON jiveRoster (jid ASC);
UPDATE jiveVersion set version=14 where name = 'openfire'; UPDATE jiveVersion set version=14 where name = 'openfire';
\ No newline at end of file
// jiveRoster: Add new index // jiveRoster: Add new index
CREATE INDEX jiveRoster_jid_idx ON jiveRoster (jid); CREATE INDEX jiveRoster_jid_idx ON jiveRoster (jid);
UPDATE jiveVersion set version=14 where name = 'openfire'; UPDATE jiveVersion set version=14 where name = 'openfire';
\ No newline at end of file
...@@ -3,4 +3,4 @@ CREATE INDEX jiveRoster_jid_idx ON jiveRoster (jid ASC); ...@@ -3,4 +3,4 @@ CREATE INDEX jiveRoster_jid_idx ON jiveRoster (jid ASC);
UPDATE jiveVersion set version=14 where name = 'openfire'; UPDATE jiveVersion set version=14 where name = 'openfire';
commit; commit;
\ No newline at end of file
/* jiveRoster: Add new index */ /* jiveRoster: Add new index */
CREATE INDEX jiveRoster_jid_idx ON jiveRoster (jid ASC); CREATE INDEX jiveRoster_jid_idx ON jiveRoster (jid ASC);
UPDATE jiveVersion set version=14 where name = 'openfire'; UPDATE jiveVersion set version=14 where name = 'openfire';
\ No newline at end of file
...@@ -9,4 +9,4 @@ CREATE TABLE jiveUserFlag ( ...@@ -9,4 +9,4 @@ CREATE TABLE jiveUserFlag (
CREATE INDEX jiveUserFlag_sTime_idx ON jiveUserFlag (startTime ASC); CREATE INDEX jiveUserFlag_sTime_idx ON jiveUserFlag (startTime ASC);
CREATE INDEX jiveUserFlag_eTime_idx ON jiveUserFlag (endTime ASC); CREATE INDEX jiveUserFlag_eTime_idx ON jiveUserFlag (endTime ASC);
UPDATE jiveVersion set version=15 where name = 'openfire'; UPDATE jiveVersion set version=15 where name = 'openfire';
\ No newline at end of file
...@@ -9,4 +9,4 @@ CREATE TABLE jiveUserFlag ( ...@@ -9,4 +9,4 @@ CREATE TABLE jiveUserFlag (
CREATE INDEX jiveUserFlag_sTime_idx ON jiveUserFlag (startTime); CREATE INDEX jiveUserFlag_sTime_idx ON jiveUserFlag (startTime);
CREATE INDEX jiveUserFlag_eTime_idx ON jiveUserFlag (endTime); CREATE INDEX jiveUserFlag_eTime_idx ON jiveUserFlag (endTime);
UPDATE jiveVersion set version=15 where name = 'openfire'; UPDATE jiveVersion set version=15 where name = 'openfire';
\ No newline at end of file
...@@ -9,4 +9,4 @@ CREATE TABLE jiveUserFlag ( ...@@ -9,4 +9,4 @@ CREATE TABLE jiveUserFlag (
INDEX jiveUser_eTime_idx (endTime) INDEX jiveUser_eTime_idx (endTime)
); );
UPDATE jiveVersion set version=15 where name = 'openfire'; UPDATE jiveVersion set version=15 where name = 'openfire';
\ No newline at end of file
...@@ -11,4 +11,4 @@ CREATE INDEX jiveUserFlag_eTime_idx ON jiveUserFlag (endTime ASC); ...@@ -11,4 +11,4 @@ CREATE INDEX jiveUserFlag_eTime_idx ON jiveUserFlag (endTime ASC);
UPDATE jiveVersion set version=15 where name = 'openfire'; UPDATE jiveVersion set version=15 where name = 'openfire';
commit; commit;
\ No newline at end of file
...@@ -9,4 +9,4 @@ CREATE TABLE jiveUserFlag ( ...@@ -9,4 +9,4 @@ CREATE TABLE jiveUserFlag (
CREATE INDEX jiveUserFlag_sTime_idx ON jiveUserFlag (startTime ASC); CREATE INDEX jiveUserFlag_sTime_idx ON jiveUserFlag (startTime ASC);
CREATE INDEX jiveUserFlag_eTime_idx ON jiveUserFlag (endTime ASC); CREATE INDEX jiveUserFlag_eTime_idx ON jiveUserFlag (endTime ASC);
UPDATE jiveVersion set version=15 where name = 'openfire'; UPDATE jiveVersion set version=15 where name = 'openfire';
\ No newline at end of file
...@@ -9,4 +9,4 @@ CREATE TABLE jiveUserFlag ( ...@@ -9,4 +9,4 @@ CREATE TABLE jiveUserFlag (
CREATE INDEX jiveUserFlag_sTime_idx ON jiveUserFlag (startTime ASC); CREATE INDEX jiveUserFlag_sTime_idx ON jiveUserFlag (startTime ASC);
CREATE INDEX jiveUserFlag_eTime_idx ON jiveUserFlag (endTime ASC); CREATE INDEX jiveUserFlag_eTime_idx ON jiveUserFlag (endTime ASC);
UPDATE jiveVersion set version=15 where name = 'openfire'; UPDATE jiveVersion set version=15 where name = 'openfire';
\ No newline at end of file
...@@ -11,4 +11,4 @@ CREATE TABLE jiveSecurityAuditLog ( ...@@ -11,4 +11,4 @@ CREATE TABLE jiveSecurityAuditLog (
CREATE INDEX jiveSecAuditLog_tstamp_idx ON jiveSecurityAuditLog (entryStamp); CREATE INDEX jiveSecAuditLog_tstamp_idx ON jiveSecurityAuditLog (entryStamp);
CREATE INDEX jiveSecAuditLog_uname_idx ON jiveSecurityAuditLog (username); CREATE INDEX jiveSecAuditLog_uname_idx ON jiveSecurityAuditLog (username);
UPDATE jiveVersion set version=16 where name = 'openfire'; UPDATE jiveVersion set version=16 where name = 'openfire';
\ No newline at end of file
...@@ -11,4 +11,4 @@ CREATE TABLE jiveSecurityAuditLog ( ...@@ -11,4 +11,4 @@ CREATE TABLE jiveSecurityAuditLog (
CREATE INDEX jiveSecAuditLog_tstamp_idx ON jiveSecurityAuditLog (entryStamp); CREATE INDEX jiveSecAuditLog_tstamp_idx ON jiveSecurityAuditLog (entryStamp);
CREATE INDEX jiveSecAuditLog_uname_idx ON jiveSecurityAuditLog (username); CREATE INDEX jiveSecAuditLog_uname_idx ON jiveSecurityAuditLog (username);
UPDATE jiveVersion set version=16 where name = 'openfire'; UPDATE jiveVersion set version=16 where name = 'openfire';
\ No newline at end of file
...@@ -11,4 +11,4 @@ CREATE TABLE jiveSecurityAuditLog ( ...@@ -11,4 +11,4 @@ CREATE TABLE jiveSecurityAuditLog (
INDEX jiveSecAuditLog_uname_idx (username) INDEX jiveSecAuditLog_uname_idx (username)
); );
UPDATE jiveVersion set version=16 where name = 'openfire'; UPDATE jiveVersion set version=16 where name = 'openfire';
\ No newline at end of file
...@@ -13,4 +13,4 @@ CREATE INDEX jiveSecAuditLog_uname_idx ON jiveSecurityAuditLog (username); ...@@ -13,4 +13,4 @@ CREATE INDEX jiveSecAuditLog_uname_idx ON jiveSecurityAuditLog (username);
UPDATE jiveVersion set version=16 where name = 'openfire'; UPDATE jiveVersion set version=16 where name = 'openfire';
commit; commit;
\ No newline at end of file
...@@ -11,4 +11,4 @@ CREATE TABLE jiveSecurityAuditLog ( ...@@ -11,4 +11,4 @@ CREATE TABLE jiveSecurityAuditLog (
CREATE INDEX jiveSecAuditLog_tstamp_idx ON jiveSecurityAuditLog (entryStamp); CREATE INDEX jiveSecAuditLog_tstamp_idx ON jiveSecurityAuditLog (entryStamp);
CREATE INDEX jiveSecAuditLog_uname_idx ON jiveSecurityAuditLog (username); CREATE INDEX jiveSecAuditLog_uname_idx ON jiveSecurityAuditLog (username);
UPDATE jiveVersion set version=16 where name = 'openfire'; UPDATE jiveVersion set version=16 where name = 'openfire';
\ No newline at end of file
...@@ -11,4 +11,4 @@ CREATE TABLE jiveSecurityAuditLog ( ...@@ -11,4 +11,4 @@ CREATE TABLE jiveSecurityAuditLog (
CREATE INDEX jiveSecAuditLog_tstamp_idx ON jiveSecurityAuditLog (entryStamp); CREATE INDEX jiveSecAuditLog_tstamp_idx ON jiveSecurityAuditLog (entryStamp);
CREATE INDEX jiveSecAuditLog_uname_idx ON jiveSecurityAuditLog (username); CREATE INDEX jiveSecAuditLog_uname_idx ON jiveSecurityAuditLog (username);
UPDATE jiveVersion set version=16 where name = 'openfire'; UPDATE jiveVersion set version=16 where name = 'openfire';
\ No newline at end of file
...@@ -2,4 +2,4 @@ ...@@ -2,4 +2,4 @@
ALTER TABLE mucService ADD COLUMN isHidden INTEGER DEFAULT 0 NOT NULL; ALTER TABLE mucService ADD COLUMN isHidden INTEGER DEFAULT 0 NOT NULL;
UPDATE jiveVersion set version=18 where name = 'openfire'; UPDATE jiveVersion set version=18 where name = 'openfire';
\ No newline at end of file
...@@ -2,4 +2,4 @@ ...@@ -2,4 +2,4 @@
ALTER TABLE mucService ADD COLUMN isHidden INTEGER DEFAULT 0 NOT NULL; ALTER TABLE mucService ADD COLUMN isHidden INTEGER DEFAULT 0 NOT NULL;
UPDATE jiveVersion set version=18 where name = 'openfire'; UPDATE jiveVersion set version=18 where name = 'openfire';
\ No newline at end of file
...@@ -2,4 +2,4 @@ ...@@ -2,4 +2,4 @@
ALTER TABLE mucService ADD COLUMN isHidden TINYINT NOT NULL DEFAULT 0; ALTER TABLE mucService ADD COLUMN isHidden TINYINT NOT NULL DEFAULT 0;
UPDATE jiveVersion set version=18 where name = 'openfire'; UPDATE jiveVersion set version=18 where name = 'openfire';
\ No newline at end of file
...@@ -4,4 +4,4 @@ ALTER TABLE mucService ADD isHidden INTEGER DEFAULT 0 NOT NULL; ...@@ -4,4 +4,4 @@ ALTER TABLE mucService ADD isHidden INTEGER DEFAULT 0 NOT NULL;
UPDATE jiveVersion set version=18 where name = 'openfire'; UPDATE jiveVersion set version=18 where name = 'openfire';
commit; commit;
\ No newline at end of file
...@@ -2,4 +2,4 @@ ...@@ -2,4 +2,4 @@
ALTER TABLE mucService ADD isHidden INT DEFAULT 0 NOT NULL; ALTER TABLE mucService ADD isHidden INT DEFAULT 0 NOT NULL;
UPDATE jiveVersion set version=18 where name = 'openfire'; UPDATE jiveVersion set version=18 where name = 'openfire';
\ No newline at end of file
...@@ -2,4 +2,4 @@ ...@@ -2,4 +2,4 @@
ALTER TABLE mucService ADD COLUMN isHidden INT DEFAULT 0 NOT NULL; ALTER TABLE mucService ADD COLUMN isHidden INT DEFAULT 0 NOT NULL;
UPDATE jiveVersion set version=18 where name = 'openfire'; UPDATE jiveVersion set version=18 where name = 'openfire';
\ No newline at end of file
...@@ -193,4 +193,4 @@ ALTER TABLE pubsubDefaultConf RENAME TO ofPubsubDefaultConf; ...@@ -193,4 +193,4 @@ ALTER TABLE pubsubDefaultConf RENAME TO ofPubsubDefaultConf;
ALTER TABLE ofPubsubDefaultConf ADD CONSTRAINT ofPubsubDefaultConf_pk PRIMARY KEY (serviceID, leaf); ALTER TABLE ofPubsubDefaultConf ADD CONSTRAINT ofPubsubDefaultConf_pk PRIMARY KEY (serviceID, leaf);
// Update version // Update version
UPDATE ofVersion SET version = 19 WHERE name = 'openfire'; UPDATE ofVersion SET version = 19 WHERE name = 'openfire';
\ No newline at end of file
...@@ -201,4 +201,4 @@ ALTER TABLE ofPubsubDefaultConf ADD CONSTRAINT ofPubsubDefaultConf_pk PRIMARY KE ...@@ -201,4 +201,4 @@ ALTER TABLE ofPubsubDefaultConf ADD CONSTRAINT ofPubsubDefaultConf_pk PRIMARY KE
-- Update version -- Update version
UPDATE ofVersion SET version = 19 WHERE name = 'openfire'; UPDATE ofVersion SET version = 19 WHERE name = 'openfire';
COMMIT; COMMIT;
\ No newline at end of file
...@@ -39,4 +39,4 @@ CREATE TABLE jiveVCard ( ...@@ -39,4 +39,4 @@ CREATE TABLE jiveVCard (
username VARCHAR(32) NOT NULL, username VARCHAR(32) NOT NULL,
value TEXT NOT NULL, value TEXT NOT NULL,
PRIMARY KEY (username) PRIMARY KEY (username)
); );
\ No newline at end of file
...@@ -43,4 +43,4 @@ CREATE TABLE jiveVCard ( ...@@ -43,4 +43,4 @@ CREATE TABLE jiveVCard (
CONSTRAINT JiveVCard_pk PRIMARY KEY (username) CONSTRAINT JiveVCard_pk PRIMARY KEY (username)
); );
commit; commit;
\ No newline at end of file
...@@ -2,4 +2,4 @@ ...@@ -2,4 +2,4 @@
ALTER TABLE ofExtComponentConf ADD COLUMN wildcard INTEGER DEFAULT 0 NOT NULL; ALTER TABLE ofExtComponentConf ADD COLUMN wildcard INTEGER DEFAULT 0 NOT NULL;
-- Update version -- Update version
UPDATE ofVersion SET version = 20 WHERE name = 'openfire'; UPDATE ofVersion SET version = 20 WHERE name = 'openfire';
\ No newline at end of file
...@@ -2,4 +2,4 @@ ...@@ -2,4 +2,4 @@
ALTER TABLE ofExtComponentConf ADD COLUMN wildcard INTEGER DEFAULT 0 NOT NULL; ALTER TABLE ofExtComponentConf ADD COLUMN wildcard INTEGER DEFAULT 0 NOT NULL;
// Update version // Update version
UPDATE ofVersion SET version = 20 WHERE name = 'openfire'; UPDATE ofVersion SET version = 20 WHERE name = 'openfire';
\ No newline at end of file
...@@ -4,4 +4,4 @@ ALTER TABLE ofExtComponentConf ADD wildcard INTEGER DEFAULT 0 NOT NULL; ...@@ -4,4 +4,4 @@ ALTER TABLE ofExtComponentConf ADD wildcard INTEGER DEFAULT 0 NOT NULL;
-- Update version -- Update version
UPDATE ofVersion SET version = 20 WHERE name = 'openfire'; UPDATE ofVersion SET version = 20 WHERE name = 'openfire';
COMMIT; COMMIT;
\ No newline at end of file
ALTER TABLE ofMucRoom ADD COLUMN allowpm INTEGER NULL; ALTER TABLE ofMucRoom ADD COLUMN allowpm INTEGER NULL;
UPDATE ofVersion SET version = 23 WHERE name = 'openfire'; UPDATE ofVersion SET version = 23 WHERE name = 'openfire';
\ No newline at end of file
ALTER TABLE ofMucConversationLog ADD COLUMN stanza LONGVARCHAR NULL; ALTER TABLE ofMucConversationLog ADD COLUMN stanza LONGVARCHAR NULL;
ALTER TABLE ofMucConversationLog ADD COLUMN messageID BIGINT NULL; ALTER TABLE ofMucConversationLog ADD COLUMN messageID BIGINT NULL;
UPDATE ofVersion SET version = 24 WHERE name = 'openfire'; UPDATE ofVersion SET version = 24 WHERE name = 'openfire';
\ No newline at end of file
ALTER TABLE ofMucConversationLog ADD COLUMN stanza TEXT NULL; ALTER TABLE ofMucConversationLog ADD COLUMN stanza TEXT NULL;
ALTER TABLE ofMucConversationLog ADD COLUMN messageID BIGINT NULL; ALTER TABLE ofMucConversationLog ADD COLUMN messageID BIGINT NULL;
UPDATE ofVersion SET version = 24 WHERE name = 'openfire'; UPDATE ofVersion SET version = 24 WHERE name = 'openfire';
\ No newline at end of file
ALTER TABLE ofMucConversationLog ADD COLUMN stanza TEXT NULL; ALTER TABLE ofMucConversationLog ADD COLUMN stanza TEXT NULL;
ALTER TABLE ofMucConversationLog ADD COLUMN messageID INTEGER NULL; ALTER TABLE ofMucConversationLog ADD COLUMN messageID INTEGER NULL;
UPDATE ofVersion SET version = 24 WHERE name = 'openfire'; UPDATE ofVersion SET version = 24 WHERE name = 'openfire';
\ No newline at end of file
ALTER TABLE ofMucConversationLog ADD COLUMN stanza TEXT NULL; ALTER TABLE ofMucConversationLog ADD COLUMN stanza TEXT NULL;
ALTER TABLE ofMucConversationLog ADD COLUMN messageID INT NULL; ALTER TABLE ofMucConversationLog ADD COLUMN messageID INT NULL;
UPDATE ofVersion SET version = 24 WHERE name = 'openfire'; UPDATE ofVersion SET version = 24 WHERE name = 'openfire';
\ No newline at end of file
CREATE INDEX ofMucConvLog_msg_id ON ofMucConversationLog (messageID); CREATE INDEX ofMucConvLog_msg_id ON ofMucConversationLog (messageID);
UPDATE ofVersion SET version = 25 WHERE name = 'openfire'; UPDATE ofVersion SET version = 25 WHERE name = 'openfire';
\ No newline at end of file
ALTER TABLE ofMucConversationLog ADD INDEX ofMucConvLog_msg_id (messageID); ALTER TABLE ofMucConversationLog ADD INDEX ofMucConvLog_msg_id (messageID);
UPDATE ofVersion SET version = 25 WHERE name = 'openfire'; UPDATE ofVersion SET version = 25 WHERE name = 'openfire';
\ No newline at end of file
CREATE INDEX ofMucConvLog_msg_id ON ofMucConversationLog (messageID); CREATE INDEX ofMucConvLog_msg_id ON ofMucConversationLog (messageID);
UPDATE ofVersion SET version = 25 WHERE name = 'openfire'; UPDATE ofVersion SET version = 25 WHERE name = 'openfire';
\ No newline at end of file
CREATE INDEX ofMucConvLog_msg_id ON ofMucConversationLog (messageID); CREATE INDEX ofMucConvLog_msg_id ON ofMucConversationLog (messageID);
UPDATE ofVersion SET version = 25 WHERE name = 'openfire'; UPDATE ofVersion SET version = 25 WHERE name = 'openfire';
\ No newline at end of file
CREATE INDEX ofMucConvLog_msg_id ON ofMucConversationLog (messageID); CREATE INDEX ofMucConvLog_msg_id ON ofMucConversationLog (messageID);
UPDATE ofVersion SET version = 25 WHERE name = 'openfire'; UPDATE ofVersion SET version = 25 WHERE name = 'openfire';
\ No newline at end of file
CREATE INDEX ofMucConvLog_msg_id ON ofMucConversationLog (messageID); CREATE INDEX ofMucConvLog_msg_id ON ofMucConversationLog (messageID);
UPDATE ofVersion SET version = 25 WHERE name = 'openfire'; UPDATE ofVersion SET version = 25 WHERE name = 'openfire';
\ No newline at end of file
ALTER TABLE ofProperty ALTER TABLE ofProperty
ADD encrypted INTEGER; ADD encrypted INTEGER;
UPDATE ofVersion SET version = 26 WHERE name = 'openfire'; UPDATE ofVersion SET version = 26 WHERE name = 'openfire';
\ No newline at end of file
ALTER TABLE ofProperty ALTER TABLE ofProperty
ADD encrypted INTEGER; ADD encrypted INTEGER;
UPDATE ofVersion SET version = 26 WHERE name = 'openfire'; UPDATE ofVersion SET version = 26 WHERE name = 'openfire';
\ No newline at end of file
ALTER TABLE ofProperty ALTER TABLE ofProperty
ADD encrypted INTEGER; ADD encrypted INTEGER;
UPDATE ofVersion SET version = 26 WHERE name = 'openfire'; UPDATE ofVersion SET version = 26 WHERE name = 'openfire';
\ No newline at end of file
ALTER TABLE ofProperty ALTER TABLE ofProperty
ADD encrypted INTEGER; ADD encrypted INTEGER;
UPDATE ofVersion SET version = 26 WHERE name = 'openfire'; UPDATE ofVersion SET version = 26 WHERE name = 'openfire';
\ No newline at end of file
ALTER TABLE ofProperty ALTER TABLE ofProperty
ADD encrypted INTEGER; ADD encrypted INTEGER;
UPDATE ofVersion SET version = 26 WHERE name = 'openfire'; UPDATE ofVersion SET version = 26 WHERE name = 'openfire';
\ No newline at end of file
ALTER TABLE ofProperty ALTER TABLE ofProperty
ADD encrypted INTEGER; ADD encrypted INTEGER;
UPDATE ofVersion SET version = 26 WHERE name = 'openfire'; UPDATE ofVersion SET version = 26 WHERE name = 'openfire';
\ No newline at end of file
ALTER TABLE ofProperty ALTER TABLE ofProperty
ADD encrypted INTEGER; ADD encrypted INTEGER;
UPDATE ofVersion SET version = 26 WHERE name = 'openfire'; UPDATE ofVersion SET version = 26 WHERE name = 'openfire';
\ No newline at end of file
...@@ -3,4 +3,4 @@ ...@@ -3,4 +3,4 @@
UPDATE jiveVersion SET majorVersion=2, minorVersion=4; UPDATE jiveVersion SET majorVersion=2, minorVersion=4;
-- jiveGroupUser: Alter length of username column -- jiveGroupUser: Alter length of username column
ALTER TABLE jiveGroupUser ALTER COLUMN username SET DATA TYPE VARCHAR(100); ALTER TABLE jiveGroupUser ALTER COLUMN username SET DATA TYPE VARCHAR(100);
\ No newline at end of file
...@@ -5,4 +5,4 @@ UPDATE jiveVersion SET majorVersion=2, minorVersion=4; ...@@ -5,4 +5,4 @@ UPDATE jiveVersion SET majorVersion=2, minorVersion=4;
-- jiveGroupUser: Alter length of username column -- jiveGroupUser: Alter length of username column
ALTER TABLE jiveGroupUser MODIFY username VARCHAR2(100) NOT NULL; ALTER TABLE jiveGroupUser MODIFY username VARCHAR2(100) NOT NULL;
commit; commit;
\ No newline at end of file
...@@ -3,4 +3,4 @@ ...@@ -3,4 +3,4 @@
UPDATE jiveVersion SET majorVersion=2, minorVersion=4; UPDATE jiveVersion SET majorVersion=2, minorVersion=4;
-- jiveGroupUser: Alter length of username column -- jiveGroupUser: Alter length of username column
ALTER TABLE jiveGroupUser ALTER COLUMN username TYPE VARCHAR(100) NOT NULL; ALTER TABLE jiveGroupUser ALTER COLUMN username TYPE VARCHAR(100) NOT NULL;
\ No newline at end of file
...@@ -10,4 +10,4 @@ CREATE TABLE jivePrivacyList ( ...@@ -10,4 +10,4 @@ CREATE TABLE jivePrivacyList (
list LONGVARCHAR NOT NULL, list LONGVARCHAR NOT NULL,
CONSTRAINT jivePrivacyList_pk PRIMARY KEY (username, name) CONSTRAINT jivePrivacyList_pk PRIMARY KEY (username, name)
); );
CREATE INDEX jivePList_default_idx ON jivePrivacyList (username, isDefault); CREATE INDEX jivePList_default_idx ON jivePrivacyList (username, isDefault);
\ No newline at end of file
...@@ -10,4 +10,4 @@ CREATE TABLE jivePrivacyList ( ...@@ -10,4 +10,4 @@ CREATE TABLE jivePrivacyList (
list TEXT NOT NULL, list TEXT NOT NULL,
PRIMARY KEY (username, name), PRIMARY KEY (username, name),
INDEX jivePList_default_idx (username, isDefault) INDEX jivePList_default_idx (username, isDefault)
); );
\ No newline at end of file
...@@ -12,4 +12,4 @@ CREATE TABLE jivePrivacyList ( ...@@ -12,4 +12,4 @@ CREATE TABLE jivePrivacyList (
); );
CREATE INDEX jivePList_default_idx ON jivePrivacyList (username, isDefault); CREATE INDEX jivePList_default_idx ON jivePrivacyList (username, isDefault);
commit; commit;
\ No newline at end of file
...@@ -10,4 +10,4 @@ INSERT INTO jiveVersion (name, version) VALUES ('openfire', 6); ...@@ -10,4 +10,4 @@ INSERT INTO jiveVersion (name, version) VALUES ('openfire', 6);
-- Make password column accept null, add encrypted password column. -- Make password column accept null, add encrypted password column.
ALTER TABLE jiveUser ALTER COLUMN password SET DATA TYPE VARCHAR(32); ALTER TABLE jiveUser ALTER COLUMN password SET DATA TYPE VARCHAR(32);
ALTER TABLE jiveUser ADD COLUMN encryptedPassword VARCHAR(255); ALTER TABLE jiveUser ADD COLUMN encryptedPassword VARCHAR(255);
\ No newline at end of file
...@@ -10,4 +10,4 @@ INSERT INTO jiveVersion (name, version) VALUES ('openfire', 6); ...@@ -10,4 +10,4 @@ INSERT INTO jiveVersion (name, version) VALUES ('openfire', 6);
// Make password column accept null, add encrypted password column. // Make password column accept null, add encrypted password column.
ALTER TABLE jiveUser ALTER COLUMN password VARCHAR(32); ALTER TABLE jiveUser ALTER COLUMN password VARCHAR(32);
ALTER TABLE jiveUser ADD COLUMN encryptedPassword VARCHAR(255) BEFORE name; ALTER TABLE jiveUser ADD COLUMN encryptedPassword VARCHAR(255) BEFORE name;
\ No newline at end of file
...@@ -10,4 +10,4 @@ INSERT INTO jiveVersion (name, version) VALUES ('openfire', 6); ...@@ -10,4 +10,4 @@ INSERT INTO jiveVersion (name, version) VALUES ('openfire', 6);
# Make password column accept null, add encrypted password column. # Make password column accept null, add encrypted password column.
ALTER TABLE jiveUser MODIFY password VARCHAR(32) NULL; ALTER TABLE jiveUser MODIFY password VARCHAR(32) NULL;
ALTER TABLE jiveUser ADD COLUMN encryptedPassword VARCHAR(255) NULL AFTER password; ALTER TABLE jiveUser ADD COLUMN encryptedPassword VARCHAR(255) NULL AFTER password;
\ No newline at end of file
...@@ -12,4 +12,4 @@ INSERT INTO jiveVersion (name, version) VALUES ('openfire', 6); ...@@ -12,4 +12,4 @@ INSERT INTO jiveVersion (name, version) VALUES ('openfire', 6);
ALTER TABLE jiveUser MODIFY password VARCHAR2(32) NULL; ALTER TABLE jiveUser MODIFY password VARCHAR2(32) NULL;
ALTER TABLE jiveUser ADD encryptedPassword VARCHAR(255); ALTER TABLE jiveUser ADD encryptedPassword VARCHAR(255);
commit; commit;
\ No newline at end of file
...@@ -10,4 +10,4 @@ INSERT INTO jiveVersion (name, version) VALUES ('openfire', 6); ...@@ -10,4 +10,4 @@ INSERT INTO jiveVersion (name, version) VALUES ('openfire', 6);
/* Make password column accept null, add encrypted password column. */ /* Make password column accept null, add encrypted password column. */
ALTER TABLE jiveUser MODIFY password NVARCHAR(32); ALTER TABLE jiveUser MODIFY password NVARCHAR(32);
ALTER TABLE jiveUser ADD encryptedPassword NVARCHAR(255); ALTER TABLE jiveUser ADD encryptedPassword NVARCHAR(255);
\ No newline at end of file
...@@ -98,4 +98,4 @@ CREATE TABLE pubsubDefaultConf ( ...@@ -98,4 +98,4 @@ CREATE TABLE pubsubDefaultConf (
CONSTRAINT pubsubDefConf_pk PRIMARY KEY (serviceID, leaf) CONSTRAINT pubsubDefConf_pk PRIMARY KEY (serviceID, leaf)
); );
UPDATE jiveVersion set version=7 where name = 'openfire'; UPDATE jiveVersion set version=7 where name = 'openfire';
\ No newline at end of file
...@@ -98,4 +98,4 @@ CREATE TABLE pubsubDefaultConf ( ...@@ -98,4 +98,4 @@ CREATE TABLE pubsubDefaultConf (
CONSTRAINT pubsubDefConf_pk PRIMARY KEY (serviceID, leaf) CONSTRAINT pubsubDefConf_pk PRIMARY KEY (serviceID, leaf)
); );
UPDATE jiveVersion set version=7 where name = 'openfire'; UPDATE jiveVersion set version=7 where name = 'openfire';
\ No newline at end of file
...@@ -98,4 +98,4 @@ CREATE TABLE pubsubDefaultConf ( ...@@ -98,4 +98,4 @@ CREATE TABLE pubsubDefaultConf (
PRIMARY KEY (serviceID, leaf) PRIMARY KEY (serviceID, leaf)
); );
UPDATE jiveVersion set version=7 where name = 'openfire'; UPDATE jiveVersion set version=7 where name = 'openfire';
\ No newline at end of file
...@@ -100,4 +100,4 @@ CREATE TABLE pubsubDefaultConf ( ...@@ -100,4 +100,4 @@ CREATE TABLE pubsubDefaultConf (
UPDATE jiveVersion set version=7 where name = 'openfire'; UPDATE jiveVersion set version=7 where name = 'openfire';
commit; commit;
\ No newline at end of file
...@@ -98,4 +98,4 @@ CREATE TABLE pubsubDefaultConf ( ...@@ -98,4 +98,4 @@ CREATE TABLE pubsubDefaultConf (
CONSTRAINT pubsubDefConf_pk PRIMARY KEY (serviceID, leaf) CONSTRAINT pubsubDefConf_pk PRIMARY KEY (serviceID, leaf)
); );
UPDATE jiveVersion set version=7 where name = 'openfire'; UPDATE jiveVersion set version=7 where name = 'openfire';
\ No newline at end of file
...@@ -98,4 +98,4 @@ CREATE TABLE pubsubDefaultConf ( ...@@ -98,4 +98,4 @@ CREATE TABLE pubsubDefaultConf (
CONSTRAINT pubsubDefConf_pk PRIMARY KEY (serviceID, leaf) CONSTRAINT pubsubDefConf_pk PRIMARY KEY (serviceID, leaf)
); );
UPDATE jiveVersion set version=7 where name = 'openfire'; UPDATE jiveVersion set version=7 where name = 'openfire';
\ No newline at end of file
...@@ -98,4 +98,4 @@ CREATE TABLE pubsubDefaultConf ( ...@@ -98,4 +98,4 @@ CREATE TABLE pubsubDefaultConf (
CONSTRAINT pubsubDefConf_pk PRIMARY KEY (serviceID, leaf) CONSTRAINT pubsubDefConf_pk PRIMARY KEY (serviceID, leaf)
); );
UPDATE jiveVersion set version=7 where name = 'openfire'; UPDATE jiveVersion set version=7 where name = 'openfire';
\ No newline at end of file
...@@ -24,4 +24,4 @@ CREATE INDEX pubsubNodeGroups_idx ON pubsubNodeGroups (serviceID, nodeID); ...@@ -24,4 +24,4 @@ CREATE INDEX pubsubNodeGroups_idx ON pubsubNodeGroups (serviceID, nodeID);
UPDATE jiveVersion set version=8 where name = 'openfire'; UPDATE jiveVersion set version=8 where name = 'openfire';
commit; commit;
\ No newline at end of file
...@@ -10,4 +10,4 @@ ALTER TABLE jivePrivacyList MODIFY username VARCHAR2(64); ...@@ -10,4 +10,4 @@ ALTER TABLE jivePrivacyList MODIFY username VARCHAR2(64);
UPDATE jiveVersion set version=9 where name = 'openfire'; UPDATE jiveVersion set version=9 where name = 'openfire';
commit; commit;
\ No newline at end of file
...@@ -452,4 +452,4 @@ public class AdminConsole { ...@@ -452,4 +452,4 @@ public class AdminConsole {
classLoaders[2] = ClassLoader.getSystemClassLoader(); classLoaders[2] = ClassLoader.getSystemClassLoader();
return classLoaders; return classLoaders;
} }
} }
\ No newline at end of file
...@@ -84,4 +84,4 @@ public class SubSidebarTag extends SidebarTag { ...@@ -84,4 +84,4 @@ public class SubSidebarTag extends SidebarTag {
parent.setSubSidebar(this); parent.setSubSidebar(this);
return EVAL_PAGE; return EVAL_PAGE;
} }
} }
\ No newline at end of file
...@@ -214,4 +214,4 @@ public class SubnavTag extends BodyTagSupport { ...@@ -214,4 +214,4 @@ public class SubnavTag extends BodyTagSupport {
private String clean(String in) { private String clean(String in) {
return (in == null ? "" : StringUtils.replace(in, "'", "\\'")); return (in == null ? "" : StringUtils.replace(in, "'", "\\'"));
} }
} }
\ No newline at end of file
...@@ -208,4 +208,4 @@ public class TabsTag extends BodyTagSupport { ...@@ -208,4 +208,4 @@ public class TabsTag extends BodyTagSupport {
private String clean(String in) { private String clean(String in) {
return (in == null ? "" : StringUtils.replace(in, "'", "\\'")); return (in == null ? "" : StringUtils.replace(in, "'", "\\'"));
} }
} }
\ No newline at end of file
/** /**
* Supporting classes and tags for the admin console. * Supporting classes and tags for the admin console.
*/ */
package org.jivesoftware.admin; package org.jivesoftware.admin;
\ No newline at end of file
...@@ -218,4 +218,4 @@ public class CachedPreparedStatement { ...@@ -218,4 +218,4 @@ public class CachedPreparedStatement {
return "CachedPreparedStatement{ sql=" + toStringSql + '}'; return "CachedPreparedStatement{ sql=" + toStringSql + '}';
} }
} }
\ No newline at end of file
...@@ -75,4 +75,4 @@ public interface ConnectionProvider { ...@@ -75,4 +75,4 @@ public interface ConnectionProvider {
* dangling database connections. * dangling database connections.
*/ */
void destroy(); void destroy();
} }
\ No newline at end of file
...@@ -962,4 +962,4 @@ public class DbConnectionManager { ...@@ -962,4 +962,4 @@ public class DbConnectionManager {
unknown; unknown;
} }
} }
\ No newline at end of file
...@@ -68,4 +68,4 @@ public class DefaultConnectionProviderBeanInfo extends JiveBeanInfo { ...@@ -68,4 +68,4 @@ public class DefaultConnectionProviderBeanInfo extends JiveBeanInfo {
public String getName() { public String getName() {
return "DefaultConnectionProvider"; return "DefaultConnectionProvider";
} }
} }
\ No newline at end of file
...@@ -120,4 +120,4 @@ public class EmbeddedConnectionProvider implements ConnectionProvider { ...@@ -120,4 +120,4 @@ public class EmbeddedConnectionProvider implements ConnectionProvider {
super.finalize(); super.finalize();
destroy(); destroy();
} }
} }
\ No newline at end of file
...@@ -127,4 +127,4 @@ public class JNDIDataSourceProvider implements ConnectionProvider { ...@@ -127,4 +127,4 @@ public class JNDIDataSourceProvider implements ConnectionProvider {
} }
return dataSource.getConnection(); return dataSource.getConnection();
} }
} }
\ No newline at end of file
...@@ -261,4 +261,4 @@ public class SequenceManager { ...@@ -261,4 +261,4 @@ public class SequenceManager {
DbConnectionManager.closeStatement(pstmt); DbConnectionManager.closeStatement(pstmt);
} }
} }
} }
\ No newline at end of file
/** /**
* Database connection code. * Database connection code.
*/ */
package org.jivesoftware.database; package org.jivesoftware.database;
\ No newline at end of file
...@@ -199,4 +199,4 @@ public class Channel<T extends Packet> { ...@@ -199,4 +199,4 @@ public class Channel<T extends Packet> {
public int getQueueSize() { public int getQueueSize() {
return executor.getQueue().size(); return executor.getQueue().size();
} }
} }
\ No newline at end of file
...@@ -35,4 +35,4 @@ public interface ChannelHandler<T extends Packet> { ...@@ -35,4 +35,4 @@ public interface ChannelHandler<T extends Packet> {
* session being shutdown). * session being shutdown).
*/ */
void process( T packet ) throws UnauthorizedException, PacketException; void process( T packet ) throws UnauthorizedException, PacketException;
} }
\ No newline at end of file
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment