Skip to content

Commit

Permalink
Pull request #854: change versions to 4.5.1
Browse files Browse the repository at this point in the history
Merge in MC/connect from ROCKSOLID-13093-change-versions to 4.5.x

* commit '8b24045790024126161bb82654d74b088da6a038':
  change versions to 4.5.1
  • Loading branch information
lmillergithub authored and Peter Ladesma committed Jul 17, 2024
2 parents 5c4cd4e + 8b24045 commit bbeea45
Show file tree
Hide file tree
Showing 68 changed files with 441 additions and 439 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<name>TEST Plugin</name>
<author>Mirth Corporation</author>
<pluginVersion>@mirthversion</pluginVersion>
<mirthVersion>4.5.0</mirthVersion>
<mirthVersion>4.5.1</mirthVersion>
<url>http://www.mirthcorp.com</url>
<description>Fake plugin.xml to test shared library loading</description>
<serverClasses>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<name>TEST Plugin</name>
<author>Mirth Corporation</author>
<pluginVersion>@mirthversion</pluginVersion>
<mirthVersion>4.5.0</mirthVersion>
<mirthVersion>4.5.1</mirthVersion>
<url>http://www.mirthcorp.com</url>
<description>Fake plugin.xml to test shared library loading</description>
<serverClasses>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<name>TEST Plugin</name>
<author>Mirth Corporation</author>
<pluginVersion>@mirthversion</pluginVersion>
<mirthVersion>4.5.0</mirthVersion>
<mirthVersion>4.5.1</mirthVersion>
<url>http://www.mirthcorp.com</url>
<description>Fake plugin.xml to test shared library loading</description>
<serverClasses>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<name>TEST Plugin</name>
<author>Mirth Corporation</author>
<pluginVersion>@mirthversion</pluginVersion>
<mirthVersion>4.5.0</mirthVersion>
<mirthVersion>4.5.1</mirthVersion>
<url>http://www.mirthcorp.com</url>
<description>Fake plugin.xml to test shared library loading</description>
<serverClasses>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<name>TEST Plugin</name>
<author>Mirth Corporation</author>
<pluginVersion>@mirthversion</pluginVersion>
<mirthVersion>4.5.0</mirthVersion>
<mirthVersion>4.5.1</mirthVersion>
<url>http://www.mirthcorp.com</url>
<description>Fake plugin.xml to test shared library loading</description>
<serverClasses>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<name>TEST Plugin</name>
<author>Mirth Corporation</author>
<pluginVersion>@mirthversion</pluginVersion>
<mirthVersion>4.5.0</mirthVersion>
<mirthVersion>4.5.1</mirthVersion>
<url>http://www.mirthcorp.com</url>
<description>Fake plugin.xml to test shared library loading</description>
<serverClasses>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<name>TEST Plugin</name>
<author>Mirth Corporation</author>
<pluginVersion>@mirthversion</pluginVersion>
<mirthVersion>4.5.0</mirthVersion>
<mirthVersion>4.5.1</mirthVersion>
<url>http://www.mirthcorp.com</url>
<description>Fake plugin.xml to test shared library loading</description>
<serverClasses>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<name>TEST Plugin</name>
<author>Mirth Corporation</author>
<pluginVersion>@mirthversion</pluginVersion>
<mirthVersion>4.5.0</mirthVersion>
<mirthVersion>4.5.1</mirthVersion>
<url>http://www.mirthcorp.com</url>
<description>Fake plugin.xml to test shared library loading</description>
<serverClasses>
Expand Down
2 changes: 1 addition & 1 deletion server/conf/mirth.properties
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ password.reuseperiod = 0
password.reuselimit = 0

# Only used for migration purposes, do not modify
version = 4.5.0
version = 4.5.1

# keystore
keystore.path = ${dir.appdata}/keystore.jks
Expand Down
244 changes: 122 additions & 122 deletions server/dbconf/derby/derby-database.sql
Original file line number Diff line number Diff line change
@@ -1,122 +1,122 @@
CREATE TABLE SCHEMA_INFO
(VERSION VARCHAR(40));

CREATE TABLE EVENT
(ID INTEGER GENERATED ALWAYS AS IDENTITY (START WITH 1) NOT NULL PRIMARY KEY,
DATE_CREATED TIMESTAMP DEFAULT NULL,
NAME CLOB NOT NULL,
EVENT_LEVEL VARCHAR(40) NOT NULL,
OUTCOME VARCHAR(40),
ATTRIBUTES CLOB,
USER_ID INTEGER NOT NULL,
IP_ADDRESS VARCHAR(40),
SERVER_ID CHARACTER VARYING(36));

CREATE TABLE CHANNEL
(ID VARCHAR(36) NOT NULL PRIMARY KEY,
NAME VARCHAR(40) NOT NULL,
REVISION INTEGER,
CHANNEL CLOB);

CREATE TABLE SCRIPT
(GROUP_ID VARCHAR(40) NOT NULL,
ID VARCHAR(40) NOT NULL,
SCRIPT CLOB);

ALTER TABLE SCRIPT ADD PRIMARY KEY (GROUP_ID, ID);

CREATE TABLE PERSON
(ID INTEGER GENERATED ALWAYS AS IDENTITY (START WITH 1) NOT NULL PRIMARY KEY,
USERNAME VARCHAR(40) NOT NULL,
FIRSTNAME VARCHAR(40),
LASTNAME VARCHAR(40),
ORGANIZATION VARCHAR(255),
INDUSTRY VARCHAR(255),
EMAIL VARCHAR(255),
PHONENUMBER VARCHAR(40),
DESCRIPTION VARCHAR(255),
LAST_LOGIN TIMESTAMP DEFAULT NULL,
GRACE_PERIOD_START TIMESTAMP DEFAULT NULL,
STRIKE_COUNT INTEGER,
LAST_STRIKE_TIME TIMESTAMP DEFAULT NULL,
LOGGED_IN SMALLINT NOT NULL,
ROLE VARCHAR(40),
COUNTRY VARCHAR(40),
STATETERRITORY VARCHAR(40),
USERCONSENT BOOLEAN NOT NULL DEFAULT false
);

CREATE TABLE PERSON_PREFERENCE
(PERSON_ID INTEGER NOT NULL,
NAME VARCHAR(255) NOT NULL,
VALUE CLOB,
CONSTRAINT PERSON_ID_PERSON_PREF_FK FOREIGN KEY(PERSON_ID) REFERENCES PERSON(ID) ON DELETE CASCADE);

CREATE INDEX PERSON_PREFERENCE_INDEX1 ON PERSON_PREFERENCE(PERSON_ID);

CREATE TABLE PERSON_PASSWORD
(PERSON_ID INTEGER NOT NULL,
PASSWORD VARCHAR(255) NOT NULL,
PASSWORD_DATE TIMESTAMP DEFAULT NULL,
CONSTRAINT PERSON_ID_PP_FK FOREIGN KEY(PERSON_ID) REFERENCES PERSON(ID) ON DELETE CASCADE);

CREATE TABLE ALERT (
ID VARCHAR(36) NOT NULL PRIMARY KEY,
NAME VARCHAR(255) NOT NULL UNIQUE,
ALERT CLOB NOT NULL
);

CREATE TABLE CODE_TEMPLATE_LIBRARY
(ID VARCHAR(255) NOT NULL PRIMARY KEY,
NAME VARCHAR(255) NOT NULL UNIQUE,
REVISION INTEGER,
LIBRARY CLOB);

CREATE TABLE CODE_TEMPLATE
(ID VARCHAR(255) NOT NULL PRIMARY KEY,
NAME VARCHAR(255) NOT NULL,
REVISION INTEGER,
CODE_TEMPLATE CLOB);

CREATE TABLE CONFIGURATION
(CATEGORY VARCHAR(255) NOT NULL,
NAME VARCHAR(255) NOT NULL,
VALUE CLOB);

ALTER TABLE CONFIGURATION ADD PRIMARY KEY (CATEGORY, NAME);

CREATE TABLE CHANNEL_GROUP
(ID VARCHAR(255) NOT NULL PRIMARY KEY,
NAME VARCHAR(255) NOT NULL UNIQUE,
REVISION INTEGER,
CHANNEL_GROUP CLOB);

CREATE TABLE DEBUGGER_USAGE
(ID INTEGER GENERATED ALWAYS AS IDENTITY (START WITH 1) NOT NULL PRIMARY KEY,
SERVER_ID VARCHAR(50) NOT NULL,
DUPP_COUNT INTEGER,
ATTACH_BATCH_COUNT INTEGER,
SOURCE_CONNECTOR_COUNT INTEGER,
SOURCE_FILTER_TRANS_COUNT INTEGER,
DESTINATION_FILTER_TRANS_COUNT INTEGER,
DESTINATION_CONNECTOR_COUNT INTEGER,
RESPONSE_COUNT INTEGER,
INVOCATION_COUNT INTEGER);

INSERT INTO PERSON (USERNAME, LOGGED_IN) VALUES('admin', 0);

INSERT INTO PERSON_PASSWORD (PERSON_ID, PASSWORD) VALUES(1, 'b8cA3mDkavInMc2JBYa6/C3EGxDp7ppqh7FsoXx0x8+3LWK3Ed3ELg==');

INSERT INTO SCHEMA_INFO (VERSION) VALUES ('4.5.0');

INSERT INTO CONFIGURATION (CATEGORY, NAME, VALUE) VALUES ('core', 'stats.enabled', '1');

INSERT INTO CONFIGURATION (CATEGORY, NAME, VALUE) VALUES ('core', 'server.resetglobalvariables', '1');

INSERT INTO CONFIGURATION (CATEGORY, NAME, VALUE) VALUES ('core', 'smtp.timeout', '5000');

INSERT INTO CONFIGURATION (CATEGORY, NAME, VALUE) VALUES ('core', 'smtp.auth', '0');

INSERT INTO CONFIGURATION (CATEGORY, NAME, VALUE) VALUES ('core', 'smtp.secure', '0');

INSERT INTO CONFIGURATION (CATEGORY, NAME, VALUE) VALUES ('core', 'server.queuebuffersize', '1000');
CREATE TABLE SCHEMA_INFO
(VERSION VARCHAR(40));

CREATE TABLE EVENT
(ID INTEGER GENERATED ALWAYS AS IDENTITY (START WITH 1) NOT NULL PRIMARY KEY,
DATE_CREATED TIMESTAMP DEFAULT NULL,
NAME CLOB NOT NULL,
EVENT_LEVEL VARCHAR(40) NOT NULL,
OUTCOME VARCHAR(40),
ATTRIBUTES CLOB,
USER_ID INTEGER NOT NULL,
IP_ADDRESS VARCHAR(40),
SERVER_ID CHARACTER VARYING(36));

CREATE TABLE CHANNEL
(ID VARCHAR(36) NOT NULL PRIMARY KEY,
NAME VARCHAR(40) NOT NULL,
REVISION INTEGER,
CHANNEL CLOB);

CREATE TABLE SCRIPT
(GROUP_ID VARCHAR(40) NOT NULL,
ID VARCHAR(40) NOT NULL,
SCRIPT CLOB);

ALTER TABLE SCRIPT ADD PRIMARY KEY (GROUP_ID, ID);

CREATE TABLE PERSON
(ID INTEGER GENERATED ALWAYS AS IDENTITY (START WITH 1) NOT NULL PRIMARY KEY,
USERNAME VARCHAR(40) NOT NULL,
FIRSTNAME VARCHAR(40),
LASTNAME VARCHAR(40),
ORGANIZATION VARCHAR(255),
INDUSTRY VARCHAR(255),
EMAIL VARCHAR(255),
PHONENUMBER VARCHAR(40),
DESCRIPTION VARCHAR(255),
LAST_LOGIN TIMESTAMP DEFAULT NULL,
GRACE_PERIOD_START TIMESTAMP DEFAULT NULL,
STRIKE_COUNT INTEGER,
LAST_STRIKE_TIME TIMESTAMP DEFAULT NULL,
LOGGED_IN SMALLINT NOT NULL,
ROLE VARCHAR(40),
COUNTRY VARCHAR(40),
STATETERRITORY VARCHAR(40),
USERCONSENT BOOLEAN NOT NULL DEFAULT false
);

CREATE TABLE PERSON_PREFERENCE
(PERSON_ID INTEGER NOT NULL,
NAME VARCHAR(255) NOT NULL,
VALUE CLOB,
CONSTRAINT PERSON_ID_PERSON_PREF_FK FOREIGN KEY(PERSON_ID) REFERENCES PERSON(ID) ON DELETE CASCADE);

CREATE INDEX PERSON_PREFERENCE_INDEX1 ON PERSON_PREFERENCE(PERSON_ID);

CREATE TABLE PERSON_PASSWORD
(PERSON_ID INTEGER NOT NULL,
PASSWORD VARCHAR(255) NOT NULL,
PASSWORD_DATE TIMESTAMP DEFAULT NULL,
CONSTRAINT PERSON_ID_PP_FK FOREIGN KEY(PERSON_ID) REFERENCES PERSON(ID) ON DELETE CASCADE);

CREATE TABLE ALERT (
ID VARCHAR(36) NOT NULL PRIMARY KEY,
NAME VARCHAR(255) NOT NULL UNIQUE,
ALERT CLOB NOT NULL
);

CREATE TABLE CODE_TEMPLATE_LIBRARY
(ID VARCHAR(255) NOT NULL PRIMARY KEY,
NAME VARCHAR(255) NOT NULL UNIQUE,
REVISION INTEGER,
LIBRARY CLOB);

CREATE TABLE CODE_TEMPLATE
(ID VARCHAR(255) NOT NULL PRIMARY KEY,
NAME VARCHAR(255) NOT NULL,
REVISION INTEGER,
CODE_TEMPLATE CLOB);

CREATE TABLE CONFIGURATION
(CATEGORY VARCHAR(255) NOT NULL,
NAME VARCHAR(255) NOT NULL,
VALUE CLOB);

ALTER TABLE CONFIGURATION ADD PRIMARY KEY (CATEGORY, NAME);

CREATE TABLE CHANNEL_GROUP
(ID VARCHAR(255) NOT NULL PRIMARY KEY,
NAME VARCHAR(255) NOT NULL UNIQUE,
REVISION INTEGER,
CHANNEL_GROUP CLOB);

CREATE TABLE DEBUGGER_USAGE
(ID INTEGER GENERATED ALWAYS AS IDENTITY (START WITH 1) NOT NULL PRIMARY KEY,
SERVER_ID VARCHAR(50) NOT NULL,
DUPP_COUNT INTEGER,
ATTACH_BATCH_COUNT INTEGER,
SOURCE_CONNECTOR_COUNT INTEGER,
SOURCE_FILTER_TRANS_COUNT INTEGER,
DESTINATION_FILTER_TRANS_COUNT INTEGER,
DESTINATION_CONNECTOR_COUNT INTEGER,
RESPONSE_COUNT INTEGER,
INVOCATION_COUNT INTEGER);

INSERT INTO PERSON (USERNAME, LOGGED_IN) VALUES('admin', 0);

INSERT INTO PERSON_PASSWORD (PERSON_ID, PASSWORD) VALUES(1, 'b8cA3mDkavInMc2JBYa6/C3EGxDp7ppqh7FsoXx0x8+3LWK3Ed3ELg==');

INSERT INTO SCHEMA_INFO (VERSION) VALUES ('4.5.1');

INSERT INTO CONFIGURATION (CATEGORY, NAME, VALUE) VALUES ('core', 'stats.enabled', '1');

INSERT INTO CONFIGURATION (CATEGORY, NAME, VALUE) VALUES ('core', 'server.resetglobalvariables', '1');

INSERT INTO CONFIGURATION (CATEGORY, NAME, VALUE) VALUES ('core', 'smtp.timeout', '5000');

INSERT INTO CONFIGURATION (CATEGORY, NAME, VALUE) VALUES ('core', 'smtp.auth', '0');

INSERT INTO CONFIGURATION (CATEGORY, NAME, VALUE) VALUES ('core', 'smtp.secure', '0');

INSERT INTO CONFIGURATION (CATEGORY, NAME, VALUE) VALUES ('core', 'server.queuebuffersize', '1000');
2 changes: 1 addition & 1 deletion server/dbconf/mysql/mysql-database.sql
Original file line number Diff line number Diff line change
Expand Up @@ -113,7 +113,7 @@ INSERT INTO PERSON (USERNAME, LOGGED_IN) VALUES('admin', FALSE);

INSERT INTO PERSON_PASSWORD (PERSON_ID, PASSWORD) VALUES(1, 'b8cA3mDkavInMc2JBYa6/C3EGxDp7ppqh7FsoXx0x8+3LWK3Ed3ELg==');

INSERT INTO SCHEMA_INFO (VERSION) VALUES ('4.5.0');
INSERT INTO SCHEMA_INFO (VERSION) VALUES ('4.5.1');

INSERT INTO CONFIGURATION (CATEGORY, NAME, VALUE) VALUES ('core', 'stats.enabled', '1');

Expand Down
Loading

0 comments on commit bbeea45

Please sign in to comment.