Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
69 commits
Select commit Hold shift + click to select a range
45accfc
Updated upgrade instructions for v0.11.0.
Feb 9, 2017
164e6a6
Use slf4j instead of log4j.
Feb 9, 2017
5b67ca7
Latest SIF AU datamodel.
Feb 9, 2017
b948397
Added dependency for slf4j instead of log4j.
Feb 9, 2017
2bd251a
Latest pre-build library versions.
Feb 9, 2017
9ff6095
Set infrastructure version to 3.1 in sample XML.
Feb 9, 2017
3c74fc8
Updated documentation to latest HITS2 version.
Feb 21, 2017
79fbf70
Added Fingerprint element to data model.
Mar 21, 2017
86ce2c3
Updated to point to new deployment of HITS.
Mar 21, 2017
d985972
Enable payload debug.
Mar 21, 2017
89ca42d
Point to new HITS environment.
Mar 21, 2017
84e4aa4
updated to latest environment ID.
Mar 21, 2017
397cfe2
Updated namespace to 3.2.1.
Mar 21, 2017
3e3b9fa
Updated some tests.
Mar 21, 2017
3dbc3bc
Added new target for 3.2.1 since structure of XSD dependencies changed.
Mar 21, 2017
b16f292
Latest SIF 3.2.1 XSDs
Mar 21, 2017
03ad50d
Latest onfrastructure data model.
Mar 21, 2017
6f3597d
Updated SQLite db example.
Mar 21, 2017
348d00f
Updated Create Scripts to include Fingerprint column.
Mar 21, 2017
ea776bc
SQL Fix to add fingerprint to existing installations.
Mar 21, 2017
2cdd5fa
Latest library version.
Mar 21, 2017
c956fa7
Updated upgrade instructions.
Mar 21, 2017
7d41faa
Updated to use SIF 3.2.1 and AU 3.4.2 (demo only) libraries.
Mar 21, 2017
09501c1
Refreshed to 3.2.1 infrastructure.
Mar 21, 2017
8cec631
Changes to include fingerprint management.
Mar 21, 2017
020b746
Latest AU Datamodel Library.
Mar 21, 2017
6e75348
Minor changes to test-run the new infrastructure and fingerprint.
Mar 21, 2017
98f8b01
Use latest AU Data Model in Demo.
Mar 21, 2017
0abe471
Updated namespaces in temaplates.
Mar 21, 2017
30c2de9
Added more details to upgrade instructions.
Mar 21, 2017
8244cb6
Updated release notes with latest changes.
Mar 23, 2017
52e5373
Added jettison library to dependency to ensure correct version is used.
Mar 23, 2017
8cc9272
Initial submission.
Apr 13, 2017
35126a9
Added setup for two new tables.
Apr 13, 2017
8cc25e7
Added AuthenticationType enumeration.
Apr 13, 2017
7be9c7f
Updated tests.
Apr 13, 2017
ad6cdf9
Updated javadoc for new classes.
Apr 13, 2017
f5d2cdd
Updated DB Structure.
Apr 13, 2017
e885f22
New table scripts.
Apr 13, 2017
c83c2f0
Updated table scripts.
Apr 13, 2017
fa845a4
Updated release notes.
Apr 13, 2017
0acf78a
Latest library versions.
Apr 13, 2017
7d6444a
Updated SIF AU Library.
Apr 13, 2017
53bc053
No longer tie down authentication method via enumeration.
May 4, 2017
18d5107
New classes required for make authentication more flexible.
May 4, 2017
d86a4ff
Added new parameter to constructor.
May 4, 2017
2b5db67
Replaced BearerSecurityFactory with more generic SecurityServiceFactory.
May 4, 2017
b60d8e4
Extend SecurityServiceInfo.
May 4, 2017
0ac0054
Set new Security Configuration as not mutable (read-only).
May 4, 2017
d78c86e
Various changes to use new security approach.
May 4, 2017
561e967
Moved tests to SIF3Demo project due to build dependencies.
May 4, 2017
5ff3f3f
Various changes due to refactoring of Authentication Approach.
May 4, 2017
e348665
Various changes due to refactoring of Authentication Approach.
May 4, 2017
699cf88
Use new SecurityServiceFactory rather than BearerSecurityFactory.
May 4, 2017
e757891
Fixed error in SQL Scripts.
May 4, 2017
c98944b
initial.
May 4, 2017
48b749f
Updated release notes.
May 4, 2017
2c6bf03
Updated Readme.
May 4, 2017
4f04fb8
Latest version of pre-build libraries.
May 4, 2017
9179c24
Removed security service property. Now it is in a database.
May 4, 2017
7a8ce5b
Updated RicOne Use Case documentation to reflect the latest version of
May 4, 2017
e535606
Changes imposed with latest Security Service implementation.
May 4, 2017
99641cb
Test Cases.
May 4, 2017
12a6707
Changed to call new constructor.
May 4, 2017
4b412a3
Added "ignore" file.
May 4, 2017
045b1d2
Modified a test case.
May 4, 2017
3d5bca4
Added to "ignore"
May 4, 2017
059a2bc
Fixed infrastructure version.
May 9, 2017
b328ff8
Create README.md
joerghuber May 9, 2017
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
See the [wiki associated with this repository](https://github.com/Access4Learning/sif3-framework-java/wiki) for information on:

* contributing to this framework
* the Java coding style to be used and
* the structure of the SIF 3 Framework repositories
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
ALTER TABLE SIF3_SESSION ADD FINGERPRINT VARCHAR(255) NULL;

-- Upgarding 3.0.1 to 3.2.1
update SIF3_SESSION
set ENVIRONMENT_XML=REPLACE(ENVIRONMENT_XML,'http://www.sifassociation.org/infrastructure/3.0.1','http://www.sifassociation.org/infrastructure/3.2.1');

-- Upgarding 3.1 to 3.2.1
update SIF3_SESSION
set ENVIRONMENT_XML=REPLACE(ENVIRONMENT_XML,'http://www.sifassociation.org/infrastructure/3.1','http://www.sifassociation.org/infrastructure/3.2.1');

Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
ALTER TABLE SIF3_SESSION ADD FINGERPRINT VARCHAR(255) NULL;

-- Upgarding 3.0.1 to 3.2.1
update SIF3_SESSION
set ENVIRONMENT_XML=REPLACE(ENVIRONMENT_XML,'http://www.sifassociation.org/infrastructure/3.0.1','http://www.sifassociation.org/infrastructure/3.2.1');

-- Upgarding 3.1 to 3.2.1
update SIF3_SESSION
set ENVIRONMENT_XML=REPLACE(ENVIRONMENT_XML,'http://www.sifassociation.org/infrastructure/3.1','http://www.sifassociation.org/infrastructure/3.2.1');

Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
ALTER TABLE SIF3_SESSION ADD FINGERPRINT VARCHAR(255) NULL AFTER ENVIRONMENT_ID;

-- Upgarding 3.0.1 to 3.2.1
update SIF3_SESSION
set ENVIRONMENT_XML=REPLACE(ENVIRONMENT_XML,'http://www.sifassociation.org/infrastructure/3.0.1','http://www.sifassociation.org/infrastructure/3.2.1');

-- Upgarding 3.1 to 3.2.1
update SIF3_SESSION
set ENVIRONMENT_XML=REPLACE(ENVIRONMENT_XML,'http://www.sifassociation.org/infrastructure/3.1','http://www.sifassociation.org/infrastructure/3.2.1');
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
ALTER TABLE SIF3_SESSION ADD (FINGERPRINT VARCHAR2(255) NULL);

-- Upgarding 3.0.1 to 3.2.1
update SIF3_SESSION
set ENVIRONMENT_XML=REPLACE(ENVIRONMENT_XML,'http://www.sifassociation.org/infrastructure/3.0.1','http://www.sifassociation.org/infrastructure/3.2.1');

-- Upgarding 3.1 to 3.2.1
update SIF3_SESSION
set ENVIRONMENT_XML=REPLACE(ENVIRONMENT_XML,'http://www.sifassociation.org/infrastructure/3.1','http://www.sifassociation.org/infrastructure/3.2.1');

Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
ALTER TABLE SIF3_SESSION ADD FINGERPRINT VARCHAR(255) NULL;

-- Upgarding 3.0.1 to 3.2.1
update SIF3_SESSION
set ENVIRONMENT_XML=REPLACE(ENVIRONMENT_XML,'http://www.sifassociation.org/infrastructure/3.0.1','http://www.sifassociation.org/infrastructure/3.2.1');

-- Upgarding 3.1 to 3.2.1
update SIF3_SESSION
set ENVIRONMENT_XML=REPLACE(ENVIRONMENT_XML,'http://www.sifassociation.org/infrastructure/3.1','http://www.sifassociation.org/infrastructure/3.2.1');


Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
-- -----------------------------------------------------
-- Table SIF3_EXT_SECURITY_SERVICE
-- -----------------------------------------------------
CREATE TABLE IF NOT EXISTS SIF3_EXT_SECURITY_SERVICE (
EXT_SECURITY_SERVICE_ID INTEGER NOT NULL,
AUTH_METHOD VARCHAR(20) NULL,
ADAPTER_TYPE VARCHAR(20) NULL,
HTTP_HEADER_VALUE VARCHAR(20) NULL,
XML_VALUE VARCHAR(20) NULL,
TWO_PHASE INTEGER NOT NULL DEFAULT 0,
IMPLEMENTATION_CLASS VARCHAR(256) NULL,
PRIMARY KEY (EXT_SECURITY_SERVICE_ID));

CREATE UNIQUE INDEX UQ_AUTH_METH_ADAP ON SIF3_EXT_SECURITY_SERVICE (AUTH_METHOD ASC, ADAPTER_TYPE ASC);

-- -----------------------------------------------------
-- Table SIF3_SEC_SERVICE_PARAM
-- -----------------------------------------------------
CREATE TABLE IF NOT EXISTS SIF3_SEC_SERVICE_PARAM (
SEC_SERVICE_PARAM_ID INTEGER NOT NULL,
EXT_SECURITY_SERVICE_ID INTEGER NOT NULL,
PARAM_NAME VARCHAR(45) NULL,
PARAM_VALUE VARCHAR(256) NULL,
PRIMARY KEY (SEC_SERVICE_PARAM_ID),
CONSTRAINT FK_SEC_SVC_PARAM_TO_SEC_SVC
FOREIGN KEY (EXT_SECURITY_SERVICE_ID)
REFERENCES SIF3_EXT_SECURITY_SERVICE (EXT_SECURITY_SERVICE_ID)
ON DELETE NO ACTION
ON UPDATE NO ACTION);

CREATE INDEX IDX_EXT_SEC_SVC ON SIF3_SEC_SERVICE_PARAM (EXT_SECURITY_SERVICE_ID ASC);
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
-- -----------------------------------------------------
-- Table SIF3_EXT_SECURITY_SERVICE
-- -----------------------------------------------------
CREATE TABLE IF NOT EXISTS SIF3_EXT_SECURITY_SERVICE (
EXT_SECURITY_SERVICE_ID INT NOT NULL,
AUTH_METHOD VARCHAR(20) NULL,
ADAPTER_TYPE VARCHAR(20) NULL,
HTTP_HEADER_VALUE VARCHAR(20) NULL,
XML_VALUE VARCHAR(20) NULL,
TWO_PHASE BIT DEFAULT (0) NOT NULL,
IMPLEMENTATION_CLASS VARCHAR(256) NULL,
PRIMARY KEY (EXT_SECURITY_SERVICE_ID));

CREATE UNIQUE INDEX UQ_AUTH_METH_ADAP ON SIF3_EXT_SECURITY_SERVICE (AUTH_METHOD ASC, ADAPTER_TYPE ASC);

-- -----------------------------------------------------
-- Table SIF3_SEC_SERVICE_PARAM
-- -----------------------------------------------------
CREATE TABLE IF NOT EXISTS SIF3_SEC_SERVICE_PARAM (
SEC_SERVICE_PARAM_ID INT NOT NULL,
EXT_SECURITY_SERVICE_ID INT NOT NULL,
PARAM_NAME VARCHAR(45) NULL,
PARAM_VALUE VARCHAR(256) NULL,
PRIMARY KEY (SEC_SERVICE_PARAM_ID),
CONSTRAINT FK_SEC_SVC_PARAM_TO_SEC_SVC
FOREIGN KEY (EXT_SECURITY_SERVICE_ID)
REFERENCES SIF3_EXT_SECURITY_SERVICE (EXT_SECURITY_SERVICE_ID)
ON DELETE NO ACTION
ON UPDATE NO ACTION);

CREATE INDEX IDX_EXT_SEC_SVC ON SIF3_SEC_SERVICE_PARAM (EXT_SECURITY_SERVICE_ID ASC);
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
-- -----------------------------------------------------
-- Table SIF3_EXT_SECURITY_SERVICE
-- -----------------------------------------------------
CREATE TABLE IF NOT EXISTS SIF3_EXT_SECURITY_SERVICE (
EXT_SECURITY_SERVICE_ID INT NOT NULL,
AUTH_METHOD VARCHAR(20) NULL,
ADAPTER_TYPE VARCHAR(20) NULL,
HTTP_HEADER_VALUE VARCHAR(20) NULL,
XML_VALUE VARCHAR(20) NULL,
TWO_PHASE TINYINT(1) NOT NULL DEFAULT 0,
IMPLEMENTATION_CLASS VARCHAR(256) NULL,
PRIMARY KEY (EXT_SECURITY_SERVICE_ID))
ENGINE = InnoDB;

CREATE UNIQUE INDEX UQ_AUTH_METH_ADAP ON SIF3_EXT_SECURITY_SERVICE (AUTH_METHOD ASC, ADAPTER_TYPE ASC);

-- -----------------------------------------------------
-- Table SIF3_SEC_SERVICE_PARAM
-- -----------------------------------------------------
CREATE TABLE IF NOT EXISTS SIF3_SEC_SERVICE_PARAM (
SEC_SERVICE_PARAM_ID INT NOT NULL,
EXT_SECURITY_SERVICE_ID INT NOT NULL,
PARAM_NAME VARCHAR(45) NULL,
PARAM_VALUE VARCHAR(256) NULL,
PRIMARY KEY (SEC_SERVICE_PARAM_ID),
CONSTRAINT FK_SEC_SVC_PARAM_TO_SEC_SVC
FOREIGN KEY (EXT_SECURITY_SERVICE_ID)
REFERENCES SIF3_EXT_SECURITY_SERVICE (EXT_SECURITY_SERVICE_ID)
ON DELETE NO ACTION
ON UPDATE NO ACTION)
ENGINE = InnoDB;

CREATE INDEX IDX_EXT_SEC_SVC ON SIF3_SEC_SERVICE_PARAM (EXT_SECURITY_SERVICE_ID ASC);
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
-- -----------------------------------------------------
-- Table SIF3_EXT_SECURITY_SERVICE
-- -----------------------------------------------------
CREATE TABLE SIF3_EXT_SECURITY_SERVICE (
EXT_SECURITY_SERVICE_ID INT NOT NULL,
AUTH_METHOD VARCHAR2(20) NULL,
ADAPTER_TYPE VARCHAR2(20) NULL,
HTTP_HEADER_VALUE VARCHAR2(20) NULL,
XML_VALUE VARCHAR2(20) NULL,
TWO_PHASE CHAR DEFAULT 'N' NOT NULL,
IMPLEMENTATION_CLASS VARCHAR2(256) NULL,
PRIMARY KEY (EXT_SECURITY_SERVICE_ID));

CREATE UNIQUE INDEX UQ_AUTH_METH_ADAP ON SIF3_EXT_SECURITY_SERVICE (AUTH_METHOD ASC, ADAPTER_TYPE ASC);

-- -----------------------------------------------------
-- Table SIF3_SEC_SERVICE_PARAM
-- -----------------------------------------------------
CREATE TABLE SIF3_SEC_SERVICE_PARAM (
SEC_SERVICE_PARAM_ID INT NOT NULL,
EXT_SECURITY_SERVICE_ID INT NOT NULL,
PARAM_NAME VARCHAR2(45) NULL,
PARAM_VALUE VARCHAR2(256) NULL,
PRIMARY KEY (SEC_SERVICE_PARAM_ID));

ALTER TABLE SIF3_SEC_SERVICE_PARAM
ADD CONSTRAINT FK_SEC_SVC_PARAM_TO_SEC_SVC
FOREIGN KEY (EXT_SECURITY_SERVICE_ID)
REFERENCES SIF3_EXT_SECURITY_SERVICE (EXT_SECURITY_SERVICE_ID);

CREATE INDEX IDX_EXT_SEC_SVC ON SIF3_SEC_SERVICE_PARAM (EXT_SECURITY_SERVICE_ID ASC);
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
-- -----------------------------------------------------
-- Table SIF3_EXT_SECURITY_SERVICE
-- -----------------------------------------------------
CREATE TABLE SIF3_EXT_SECURITY_SERVICE (
EXT_SECURITY_SERVICE_ID INT NOT NULL,
AUTH_METHOD VARCHAR(20) NULL,
ADAPTER_TYPE VARCHAR(20) NULL,
HTTP_HEADER_VALUE VARCHAR(20) NULL,
XML_VALUE VARCHAR(20) NULL,
TWO_PHASE BOOLEAN DEFAULT 0 NOT NULL,
IMPLEMENTATION_CLASS VARCHAR(256) NULL,
PRIMARY KEY (EXT_SECURITY_SERVICE_ID));

CREATE UNIQUE INDEX UQ_AUTH_METH_ADAP ON SIF3_EXT_SECURITY_SERVICE (AUTH_METHOD ASC, ADAPTER_TYPE ASC);

-- -----------------------------------------------------
-- Table SIF3_SEC_SERVICE_PARAM
-- -----------------------------------------------------
CREATE TABLE SIF3_SEC_SERVICE_PARAM (
SEC_SERVICE_PARAM_ID INT NOT NULL,
EXT_SECURITY_SERVICE_ID INT NOT NULL,
PARAM_NAME VARCHAR(45) NULL,
PARAM_VALUE VARCHAR(256) NULL,
PRIMARY KEY (SEC_SERVICE_PARAM_ID));

ALTER TABLE SIF3_SEC_SERVICE_PARAM
ADD CONSTRAINT FK_SEC_SVC_PARAM_TO_SEC_SVC
FOREIGN KEY (EXT_SECURITY_SERVICE_ID)
REFERENCES SIF3_EXT_SECURITY_SERVICE (EXT_SECURITY_SERVICE_ID);

CREATE INDEX IDX_EXT_SEC_SVC ON SIF3_SEC_SERVICE_PARAM (EXT_SECURITY_SERVICE_ID ASC);
32 changes: 32 additions & 0 deletions SIF3InfraREST/DB/DDL/SIF3InfrastructureERM_DDL_SQLite.sql
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ CREATE TABLE IF NOT EXISTS SIF3_SESSION (
PASSWORD VARCHAR(100) NULL ,
SESSION_TOKEN VARCHAR(200) NULL ,
ENVIRONMENT_ID VARCHAR(36) NULL ,
FINGERPRINT VARCHAR(255) NULL ,
SECURITY_TOKEN VARCHAR(1000) NULL,
SECURITY_TOKEN_EXPIRY DATETIME NULL,
ADAPTER_TYPE VARCHAR(20) NULL ,
Expand Down Expand Up @@ -123,4 +124,35 @@ CREATE INDEX APPKEY_USERTK_IDX ON SIF3_APP_TEMPLATE (APPLICATION_KEY ASC, USER_T

CREATE INDEX IDX_APP_TMPLT_TO_ENV_TMPLT ON SIF3_APP_TEMPLATE (ENV_TEMPLATE_ID ASC) ;

-- -----------------------------------------------------
-- Table SIF3_EXT_SECURITY_SERVICE
-- -----------------------------------------------------
CREATE TABLE IF NOT EXISTS SIF3_EXT_SECURITY_SERVICE (
EXT_SECURITY_SERVICE_ID INTEGER NOT NULL,
AUTH_METHOD VARCHAR(20) NULL,
ADAPTER_TYPE VARCHAR(20) NULL,
HTTP_HEADER_VALUE VARCHAR(20) NULL,
XML_VALUE VARCHAR(20) NULL,
TWO_PHASE INTEGER NOT NULL DEFAULT 0,
IMPLEMENTATION_CLASS VARCHAR(256) NULL,
PRIMARY KEY (EXT_SECURITY_SERVICE_ID));

CREATE UNIQUE INDEX UQ_AUTH_METH_ADAP ON SIF3_EXT_SECURITY_SERVICE (AUTH_METHOD ASC, ADAPTER_TYPE ASC);

-- -----------------------------------------------------
-- Table SIF3_SEC_SERVICE_PARAM
-- -----------------------------------------------------
CREATE TABLE IF NOT EXISTS SIF3_SEC_SERVICE_PARAM (
SEC_SERVICE_PARAM_ID INTEGER NOT NULL,
EXT_SECURITY_SERVICE_ID INTEGER NOT NULL,
PARAM_NAME VARCHAR(45) NULL,
PARAM_VALUE VARCHAR(256) NULL,
PRIMARY KEY (SEC_SERVICE_PARAM_ID),
CONSTRAINT FK_SEC_SVC_PARAM_TO_SEC_SVC
FOREIGN KEY (EXT_SECURITY_SERVICE_ID)
REFERENCES SIF3_EXT_SECURITY_SERVICE (EXT_SECURITY_SERVICE_ID)
ON DELETE NO ACTION
ON UPDATE NO ACTION);

CREATE INDEX IDX_EXT_SEC_SVC ON SIF3_SEC_SERVICE_PARAM (EXT_SECURITY_SERVICE_ID ASC);

54 changes: 37 additions & 17 deletions SIF3InfraREST/DB/DDL/SIF3InfrastructureERM_DDL_mssql.sql
Original file line number Diff line number Diff line change
@@ -1,11 +1,8 @@
USE SIF3_INFRA ;

-- -----------------------------------------------------

-- Table SIF3_SESSION

-- -----------------------------------------------------

CREATE TABLE SIF3_SESSION
(
SESSION_ID INT NOT NULL IDENTITY ,
Expand All @@ -17,6 +14,7 @@ CREATE TABLE SIF3_SESSION
PASSWORD VARCHAR(100) NULL ,
SESSION_TOKEN VARCHAR(200) NULL ,
ENVIRONMENT_ID VARCHAR(36) NULL ,
FINGERPRINT VARCHAR(255) NULL ,
SECURITY_TOKEN VARCHAR(1000) NULL,
SECURITY_TOKEN_EXPIRY DATETIME NULL,
ADAPTER_TYPE VARCHAR(20) NULL,
Expand All @@ -25,7 +23,7 @@ CREATE TABLE SIF3_SESSION
CREATED DATETIME NULL ,
LAST_ACCESSED DATETIME NULL ,
PRIMARY KEY (SESSION_ID)
)
);

CREATE INDEX SOL_APP_KEY_IDX ON SIF3_SESSION (SOLUTION_ID ASC, APPLICATION_KEY ASC, ADAPTER_TYPE ASC) ;
CREATE INDEX SESSION_TK_IDX ON SIF3_SESSION (SESSION_TOKEN ASC) ;
Expand Down Expand Up @@ -57,7 +55,7 @@ CREATE TABLE SIF3_QUEUE
LAST_ACCESSED DATETIME NULL ,
LAST_MODIFIED DATETIME NULL ,
PRIMARY KEY (QUEUE_ID)
)
);

CREATE INDEX IDX_QUEUE_ENVID ON SIF3_QUEUE (ENVIRONMENT_ID ASC, ADAPTER_TYPE ASC) ;
CREATE INDEX IDX_QUEUE_ZONE ON SIF3_QUEUE (ENVIRONMENT_ID ASC, ADAPTER_TYPE ASC, ZONE_ID ASC) ;
Expand All @@ -66,8 +64,6 @@ CREATE INDEX IDX_QUEUE_ZONE_CTX_SVC ON SIF3_QUEUE (ENVIRONMENT_ID ASC, ADAPTER_T
-- -----------------------------------------------------
-- Table SIF3_SUBSCRIPTION
-- -----------------------------------------------------


CREATE TABLE SIF3_SUBSCRIPTION
(
SUBSCRIPTION_ID VARCHAR(36) NOT NULL ,
Expand All @@ -85,15 +81,11 @@ CREATE TABLE SIF3_SUBSCRIPTION
REFERENCES SIF3_QUEUE (QUEUE_ID )
ON DELETE NO ACTION
ON UPDATE NO ACTION
)

);

CREATE INDEX IDX_SUBSCR_QUEUEID ON SIF3_SUBSCRIPTION (QUEUE_ID ASC, ADAPTER_TYPE ASC) ;

CREATE INDEX IDX_SUBSCR_SERVICE ON SIF3_SUBSCRIPTION (SERVICE_NAME ASC, SERVICE_TYPE ASC) ;

CREATE INDEX FK_SUBSCR_QUEUE ON SIF3_SUBSCRIPTION (QUEUE_ID ASC) ;

CREATE INDEX IDK_SUBSCR_ZONE_CTX_SVC ON SIF3_SUBSCRIPTION (ZONE_ID ASC, CONTEXT_ID ASC, SERVICE_NAME ASC, SERVICE_TYPE ASC) ;

-- -----------------------------------------------------
Expand All @@ -105,9 +97,7 @@ CREATE TABLE SIF3_ENV_TEMPLATE
ENV_TEMPLATE_ID VARCHAR(50) NOT NULL ,
TEMPLATE_FILE_NAME VARCHAR(100) NOT NULL ,
PRIMARY KEY (ENV_TEMPLATE_ID)
)


);

-- -----------------------------------------------------
-- Table SIF3_APP_TEMPLATE
Expand All @@ -128,14 +118,44 @@ CREATE TABLE SIF3_APP_TEMPLATE
REFERENCES SIF3_ENV_TEMPLATE (ENV_TEMPLATE_ID )
ON DELETE NO ACTION
ON UPDATE NO ACTION
)

);

CREATE INDEX SOL_APPKEY_IDX ON SIF3_APP_TEMPLATE (SOLUTION_ID ASC, APPLICATION_KEY ASC) ;
CREATE INDEX APPKEY_IDX ON SIF3_APP_TEMPLATE (APPLICATION_KEY ASC) ;
CREATE INDEX SOL_APPKEY_USERTK_IDX ON SIF3_APP_TEMPLATE (SOLUTION_ID ASC, APPLICATION_KEY ASC, USER_TOKEN ASC) ;
CREATE INDEX APPKEY_USERTK_IDX ON SIF3_APP_TEMPLATE (APPLICATION_KEY ASC, USER_TOKEN ASC) ;
CREATE INDEX IDX_APP_TMPLT_TO_ENV_TMPLT ON SIF3_APP_TEMPLATE (ENV_TEMPLATE_ID ASC) ;

-- -----------------------------------------------------
-- Table SIF3_EXT_SECURITY_SERVICE
-- -----------------------------------------------------
CREATE TABLE IF NOT EXISTS SIF3_EXT_SECURITY_SERVICE (
EXT_SECURITY_SERVICE_ID INT NOT NULL,
AUTH_METHOD VARCHAR(20) NULL,
ADAPTER_TYPE VARCHAR(20) NULL,
HTTP_HEADER_VALUE VARCHAR(20) NULL,
XML_VALUE VARCHAR(20) NULL,
TWO_PHASE BIT DEFAULT (0) NOT NULL,
IMPLEMENTATION_CLASS VARCHAR(256) NULL,
PRIMARY KEY (EXT_SECURITY_SERVICE_ID)
);

CREATE UNIQUE INDEX UQ_AUTH_METH_ADAP ON SIF3_EXT_SECURITY_SERVICE (AUTH_METHOD ASC, ADAPTER_TYPE ASC);

-- -----------------------------------------------------
-- Table SIF3_SEC_SERVICE_PARAM
-- -----------------------------------------------------
CREATE TABLE IF NOT EXISTS SIF3_SEC_SERVICE_PARAM (
SEC_SERVICE_PARAM_ID INT NOT NULL,
EXT_SECURITY_SERVICE_ID INT NOT NULL,
PARAM_NAME VARCHAR(45) NULL,
PARAM_VALUE VARCHAR(256) NULL,
PRIMARY KEY (SEC_SERVICE_PARAM_ID),
CONSTRAINT FK_SEC_SVC_PARAM_TO_SEC_SVC
FOREIGN KEY (EXT_SECURITY_SERVICE_ID)
REFERENCES SIF3_EXT_SECURITY_SERVICE (EXT_SECURITY_SERVICE_ID)
ON DELETE NO ACTION
ON UPDATE NO ACTION
);

CREATE INDEX IDX_EXT_SEC_SVC ON SIF3_SEC_SERVICE_PARAM (EXT_SECURITY_SERVICE_ID ASC);
Loading