Commit c54f57b1 authored by Daniel Henninger's avatar Daniel Henninger Committed by dhenninger

Ported changes from 3.5.0 branch.


git-svn-id: http://svn.igniterealtime.org/svn/repos/openfire/trunk@10090 b35dd754-fafc-0310-a699-88a17e54d16e
parent d65b8ea9
...@@ -168,7 +168,7 @@ CREATE TABLE jiveSASLAuthorized ( ...@@ -168,7 +168,7 @@ CREATE TABLE jiveSASLAuthorized (
CREATE TABLE jiveSecurityAuditLog ( CREATE TABLE jiveSecurityAuditLog (
msgID INTEGER NOT NULL, msgID INTEGER NOT NULL,
username VARCHAR(64) NOT NULL, username VARCHAR(64) NOT NULL,
entryStamp INTEGER NOT NULL, entryStamp BIGINT NOT NULL,
summary VARCHAR(255) NOT NULL, summary VARCHAR(255) NOT NULL,
node VARCHAR(255) NOT NULL, node VARCHAR(255) NOT NULL,
details TEXT, details TEXT,
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
CREATE TABLE jiveSecurityAuditLog ( CREATE TABLE jiveSecurityAuditLog (
msgID INTEGER NOT NULL, msgID INTEGER NOT NULL,
username VARCHAR(64) NOT NULL, username VARCHAR(64) NOT NULL,
entryStamp INTEGER NOT NULL, entryStamp BIGINT NOT NULL,
summary VARCHAR(255) NOT NULL, summary VARCHAR(255) NOT NULL,
node VARCHAR(255) NOT NULL, node VARCHAR(255) NOT NULL,
details TEXT, details TEXT,
......
...@@ -167,8 +167,8 @@ ...@@ -167,8 +167,8 @@
} }
// Set page vars // Set page vars
componentEnabled = ExternalComponentManager.isServiceEnabled();
if (errors.size() == 0) { if (errors.size() == 0) {
componentEnabled = ExternalComponentManager.isServiceEnabled();
port = ExternalComponentManager.getServicePort(); port = ExternalComponentManager.getServicePort();
defaultSecret = ExternalComponentManager.getDefaultSecret(); defaultSecret = ExternalComponentManager.getDefaultSecret();
permissionFilter = ExternalComponentManager.getPermissionPolicy().toString(); permissionFilter = ExternalComponentManager.getPermissionPolicy().toString();
......
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