diff --git a/smp-webapp/src/main/smp-setup/database-scripts/migration from 3.0.x to 4.0.0/mysql_3.0_to_4.0.sql b/smp-webapp/src/main/smp-setup/database-scripts/migration from 3.0.x to 4.0.0/mysql_3.0_to_4.0.sql
index fe1525d2bff2ae405c6560a5da5a27d6586dd063..1b681b39b38ba05ad09a17191b3801bef6154c05 100644
--- a/smp-webapp/src/main/smp-setup/database-scripts/migration from 3.0.x to 4.0.0/mysql_3.0_to_4.0.sql
+++ b/smp-webapp/src/main/smp-setup/database-scripts/migration from 3.0.x to 4.0.0/mysql_3.0_to_4.0.sql
@@ -34,13 +34,13 @@ INSERT INTO smp_domain(domainId, bdmslSmpId) VALUES('domain1', 'DEFAULT-SMP-ID')
-ALTER TABLE SMP_RESOURCE ADD
+ALTER TABLE smp_service_group ADD
domainId VARCHAR(50)
CHARACTER SET utf8
COLLATE utf8_bin NOT NULL
DEFAULT 'domain1';
-ALTER TABLE SMP_RESOURCE ADD
+ALTER TABLE smp_service_group ADD
CONSTRAINT
FK_srv_group_domain FOREIGN KEY (domainId)
REFERENCES smp_domain (domainId);
@@ -106,4 +106,4 @@ FOR EACH ROW
DELIMITER ;
-commit;
+commit;
\ No newline at end of file
diff --git a/smp-webapp/src/main/smp-setup/database-scripts/migration from 3.0.x to 4.0.0/oracle_3.0_to_4.0.sql b/smp-webapp/src/main/smp-setup/database-scripts/migration from 3.0.x to 4.0.0/oracle_3.0_to_4.0.sql
index 4b939f1a936fb3733bc0e70e06dfa9b08184bd65..c6494b58652dafa6cea9f9c289e8efd53701c607 100644
--- a/smp-webapp/src/main/smp-setup/database-scripts/migration from 3.0.x to 4.0.0/oracle_3.0_to_4.0.sql
+++ b/smp-webapp/src/main/smp-setup/database-scripts/migration from 3.0.x to 4.0.0/oracle_3.0_to_4.0.sql
@@ -23,15 +23,15 @@ CREATE TABLE smp_domain (
INSERT INTO smp_domain(domainId, bdmslSmpId) VALUES('domain1', 'DEFAULT-SMP-ID');
-ALTER TABLE SMP_RESOURCE ADD (
+ALTER TABLE smp_service_group ADD (
domainId VARCHAR(50) DEFAULT 'domain1' NOT NULL
);
-ALTER TABLE SMP_RESOURCE ADD (
+ALTER TABLE smp_service_group ADD (
CONSTRAINT
FK_srv_group_domain FOREIGN KEY (domainId)
REFERENCES smp_domain (domainId)
);
-commit;
+commit;
\ No newline at end of file
diff --git a/smp-webapp/src/main/smp-setup/database-scripts/migration from 4 .1.1 to 4.2/mysql5innoDb-4.1.1_to_4.2.sql b/smp-webapp/src/main/smp-setup/database-scripts/migration from 4 .1.1 to 4.2/mysql5innoDb-4.1.1_to_4.2.sql
index e2044628de26b7c41117e63a38c9206ea259d478..32db7ec2a404576412b46af078927c2cf5c9e27b 100644
--- a/smp-webapp/src/main/smp-setup/database-scripts/migration from 4 .1.1 to 4.2/mysql5innoDb-4.1.1_to_4.2.sql
+++ b/smp-webapp/src/main/smp-setup/database-scripts/migration from 4 .1.1 to 4.2/mysql5innoDb-4.1.1_to_4.2.sql
@@ -123,19 +123,19 @@ alter table SMP_CONFIGURATION_AUD
SET FOREIGN_KEY_CHECKS = 0;
ALTER TABLE SMP_REV_INFO MODIFY COLUMN id bigint not null auto_increment;
-ALTER TABLE SMP_RESOURCE MODIFY COLUMN ID bigint not null auto_increment comment 'Unique ServiceGroup id';
-ALTER TABLE SMP_RESOURCE_DOMAIN MODIFY COLUMN ID bigint not null auto_increment;
-ALTER TABLE SMP_SUBRESOURCE MODIFY COLUMN ID bigint not null auto_increment comment 'Shared primary key with master table SMP_SUBRESOURCE';
+ALTER TABLE SMP_SERVICE_GROUP MODIFY COLUMN ID bigint not null auto_increment comment 'Unique ServiceGroup id';
+ALTER TABLE SMP_SERVICE_GROUP_DOMAIN MODIFY COLUMN ID bigint not null auto_increment;
+ALTER TABLE SMP_SERVICE_METADATA MODIFY COLUMN ID bigint not null auto_increment comment 'Shared primary key with master table SMP_SERVICE_METADATA';
ALTER TABLE SMP_USER MODIFY COLUMN ID bigint not null auto_increment comment 'Unique user id';
SET FOREIGN_KEY_CHECKS = 1;
-- drop sequence tables , because the are not needed anymore!
drop table SMP_DOMAIN_SEQ;
drop table SMP_REVISION_SEQ;
-drop table SMP_RESOURCE_DOMAIN_SEQ;
-drop table SMP_RESOURCE_SEQ;
-drop table SMP_SUBRESOURCE_SEQ;
+drop table SMP_SERVICE_GROUP_DOMAIN_SEQ;
+drop table SMP_SERVICE_GROUP_SEQ;
+drop table SMP_SERVICE_METADATA_SEQ;
drop table SMP_USER_SEQ;
-- set init back-compatible credentials to access tokens
UPDATE SMP_USER set ACCESS_TOKEN_ID = SMP_USER.USERNAME, ACCESS_TOKEN=SMP_USER.PASSWORD;
-commit;
+commit;
\ No newline at end of file
diff --git a/smp-webapp/src/main/smp-setup/database-scripts/migration from 4 .1.1 to 4.2/oracle10g-4.1.1_to_4.2.sql b/smp-webapp/src/main/smp-setup/database-scripts/migration from 4 .1.1 to 4.2/oracle10g-4.1.1_to_4.2.sql
index 6a6737695fe23d7a11408d77548f94e66dfc2a47..f235473574b8f846e1521327d476a43142186636 100644
--- a/smp-webapp/src/main/smp-setup/database-scripts/migration from 4 .1.1 to 4.2/oracle10g-4.1.1_to_4.2.sql
+++ b/smp-webapp/src/main/smp-setup/database-scripts/migration from 4 .1.1 to 4.2/oracle10g-4.1.1_to_4.2.sql
@@ -104,8 +104,8 @@ CREATE TABLE smp_configuration_aud (
-- set option that service group scheme can be also null
-ALTER TABLE SMP_RESOURCE MODIFY (
- IDENTIFIER_SCHEME NULL
+ALTER TABLE smp_service_group MODIFY (
+ participant_scheme NULL
);
-- modify user table
diff --git a/smp-webapp/src/main/smp-setup/database-scripts/migration from 4.0.x to 4.1.0/mysql5innoDb_4.0_to_4.1.sql b/smp-webapp/src/main/smp-setup/database-scripts/migration from 4.0.x to 4.1.0/mysql5innoDb_4.0_to_4.1.sql
index 75647d90030b0153074f98d0971102b4cb7c7660..f33116108d797d16f6c99452138d18c1ed388700 100644
--- a/smp-webapp/src/main/smp-setup/database-scripts/migration from 4.0.x to 4.1.0/mysql5innoDb_4.0_to_4.1.sql
+++ b/smp-webapp/src/main/smp-setup/database-scripts/migration from 4.0.x to 4.1.0/mysql5innoDb_4.0_to_4.1.sql
@@ -3,9 +3,9 @@
-- create backup old tables
-- ---------------------------------------------------------------------------------------------------------
alter table smp_domain rename to SMP_DOMAIN_BCK;
-alter table SMP_RESOURCE_MEMBER rename to SMP_RESOURCE_MEMBER_BCK;
-alter table SMP_RESOURCE rename to SMP_RESOURCE_BCK;
-alter table SMP_SUBRESOURCE rename to SMP_SUBRESOURCE_BCK;
+alter table smp_ownership rename to SMP_OWNERSHIP_BCK;
+alter table smp_service_group rename to SMP_SERVICE_GROUP_BCK;
+alter table smp_service_metadata rename to SMP_SERVICE_METADATA_BCK;
alter table smp_user rename to SMP_USER_BCK;
-- ---------------------------------------------------------------------------------------------------------
@@ -80,13 +80,13 @@ alter table smp_user rename to SMP_USER_BCK;
- create table SMP_RESOURCE_MEMBER (
+ create table SMP_OWNERSHIP (
FK_SG_ID bigint not null,
FK_USER_ID bigint not null,
primary key (FK_SG_ID, FK_USER_ID)
) ENGINE=InnoDB DEFAULT CHARSET=utf8;
- create table SMP_RESOURCE_MEMBER_AUD (
+ create table SMP_OWNERSHIP_AUD (
REV bigint not null,
FK_SG_ID bigint not null,
FK_USER_ID bigint not null,
@@ -107,27 +107,27 @@ alter table smp_user rename to SMP_USER_BCK;
) ENGINE=InnoDB DEFAULT CHARSET=utf8;
- create table SMP_RESOURCE (
+ create table SMP_SERVICE_GROUP (
ID bigint not null auto_increment,
CREATED_ON datetime not null,
LAST_UPDATED_ON datetime not null,
- IDENTIFIER_VALUE varchar(256) CHARACTER SET utf8 COLLATE utf8_bin not null,
- IDENTIFIER_SCHEME varchar(256) CHARACTER SET utf8 COLLATE utf8_bin not null,
+ PARTICIPANT_IDENTIFIER varchar(256) CHARACTER SET utf8 COLLATE utf8_bin not null,
+ PARTICIPANT_SCHEME varchar(256) CHARACTER SET utf8 COLLATE utf8_bin not null,
primary key (ID)
) ENGINE=InnoDB DEFAULT CHARSET=utf8;
- create table SMP_RESOURCE_AUD (
+ create table SMP_SERVICE_GROUP_AUD (
ID bigint not null,
REV bigint not null,
REVTYPE tinyint,
CREATED_ON datetime,
LAST_UPDATED_ON datetime,
- IDENTIFIER_VALUE varchar(256) CHARACTER SET utf8 COLLATE utf8_bin,
- IDENTIFIER_SCHEME varchar(256) CHARACTER SET utf8 COLLATE utf8_bin,
+ PARTICIPANT_IDENTIFIER varchar(256) CHARACTER SET utf8 COLLATE utf8_bin,
+ PARTICIPANT_SCHEME varchar(256) CHARACTER SET utf8 COLLATE utf8_bin,
primary key (ID, REV)
) ENGINE=InnoDB DEFAULT CHARSET=utf8;
- create table SMP_RESOURCE_DOMAIN (
+ create table SMP_SERVICE_GROUP_DOMAIN (
ID bigint not null auto_increment,
CREATED_ON datetime not null,
LAST_UPDATED_ON datetime not null,
@@ -137,7 +137,7 @@ alter table smp_user rename to SMP_USER_BCK;
primary key (ID)
) ENGINE=InnoDB DEFAULT CHARSET=utf8;
- create table SMP_RESOURCE_DOMAIN_AUD (
+ create table SMP_SERVICE_GROUP_DOMAIN_AUD (
ID bigint not null,
REV bigint not null,
REVTYPE tinyint,
@@ -149,44 +149,44 @@ alter table smp_user rename to SMP_USER_BCK;
primary key (ID, REV)
) ENGINE=InnoDB DEFAULT CHARSET=utf8;
- create table SMP_RESOURCE_DOMAIN_SEQ (
+ create table SMP_SERVICE_GROUP_DOMAIN_SEQ (
next_val bigint
) ENGINE=InnoDB DEFAULT CHARSET=utf8;
- create table SMP_RESOURCE_SEQ (
+ create table SMP_SERVICE_GROUP_SEQ (
next_val bigint
) ENGINE=InnoDB DEFAULT CHARSET=utf8;
- create table SMP_SUBRESOURCE (
+ create table SMP_SERVICE_METADATA (
ID bigint not null auto_increment,
CREATED_ON datetime not null,
- IDENTIFIER_VALUE varchar(500) CHARACTER SET utf8 COLLATE utf8_bin not null,
- IDENTIFIER_SCHEME varchar(500) CHARACTER SET utf8 COLLATE utf8_bin,
+ DOCUMENT_IDENTIFIER varchar(500) CHARACTER SET utf8 COLLATE utf8_bin not null,
+ DOCUMENT_SCHEME varchar(500) CHARACTER SET utf8 COLLATE utf8_bin,
LAST_UPDATED_ON datetime not null,
FK_SG_DOM_ID bigint not null,
primary key (ID)
) ENGINE=InnoDB DEFAULT CHARSET=utf8;
- create table SMP_SUBRESOURCE_AUD (
+ create table SMP_SERVICE_METADATA_AUD (
ID bigint not null,
REV bigint not null,
REVTYPE tinyint,
CREATED_ON datetime,
- IDENTIFIER_VALUE varchar(500) CHARACTER SET utf8 COLLATE utf8_bin,
- IDENTIFIER_SCHEME varchar(500) CHARACTER SET utf8 COLLATE utf8_bin,
+ DOCUMENT_IDENTIFIER varchar(500) CHARACTER SET utf8 COLLATE utf8_bin,
+ DOCUMENT_SCHEME varchar(500) CHARACTER SET utf8 COLLATE utf8_bin,
LAST_UPDATED_ON datetime,
FK_SG_DOM_ID bigint,
primary key (ID, REV)
) ENGINE=InnoDB DEFAULT CHARSET=utf8;
- create table SMP_SUBRESOURCE_SEQ (
+ create table SMP_SERVICE_METADATA_SEQ (
next_val bigint
) ENGINE=InnoDB DEFAULT CHARSET=utf8;
- create table SMP_DOCUMENT (
+ create table SMP_SERVICE_METADATA_XML (
ID bigint not null,
CREATED_ON datetime not null,
LAST_UPDATED_ON datetime not null,
@@ -194,7 +194,7 @@ alter table smp_user rename to SMP_USER_BCK;
primary key (ID)
) ENGINE=InnoDB DEFAULT CHARSET=utf8;
- create table SMP_DOCUMENT_AUD (
+ create table SMP_SERVICE_METADATA_XML_AUD (
ID bigint not null,
REV bigint not null,
REVTYPE tinyint,
@@ -272,45 +272,45 @@ INSERT INTO SMP_USER (EMAIL,ACTIVE,CREATED_ON,LAST_UPDATED_ON,USERNAME, PASSWORD
INSERT INTO SMP_CERTIFICATE (ID,CERTIFICATE_ID,CREATED_ON,LAST_UPDATED_ON) SELECT ID ,USERNAME, CREATED_ON, LAST_UPDATED_ON FROM SMP_USER where PASSWORD ='';
-- migrate service groups
-INSERT INTO SMP_RESOURCE ( CREATED_ON, LAST_UPDATED_ON, IDENTIFIER_VALUE, IDENTIFIER_SCHEME)
- select NOW(), NOW(), businessidentifier, businessidentifierscheme from SMP_RESOURCE_BCK;
+INSERT INTO SMP_SERVICE_GROUP ( CREATED_ON, LAST_UPDATED_ON, PARTICIPANT_IDENTIFIER, PARTICIPANT_SCHEME)
+ select NOW(), NOW(), businessidentifier, businessidentifierscheme from SMP_SERVICE_GROUP_BCK;
-- insert extensions
INSERT INTO SMP_SG_EXTENSION (ID, CREATED_ON, LAST_UPDATED_ON, EXTENSION)
- select sg.id, NOW(),NOW(), sgb.extension from SMP_RESOURCE sg INNER JOIN SMP_RESOURCE_BCK sgb
- ON sg.IDENTIFIER_VALUE= sgb.businessidentifier
- and sg.IDENTIFIER_SCHEME= sgb.businessidentifierscheme WHERE sgb.extension != '';
+ select sg.id, NOW(),NOW(), sgb.extension from SMP_SERVICE_GROUP sg INNER JOIN SMP_SERVICE_GROUP_BCK sgb
+ ON sg.PARTICIPANT_IDENTIFIER= sgb.businessidentifier
+ and sg.PARTICIPANT_SCHEME= sgb.businessidentifierscheme WHERE sgb.extension != '';
-- insert service group domains
-INSERT INTO SMP_RESOURCE_DOMAIN ( CREATED_ON, LAST_UPDATED_ON, SML_REGISTERED, FK_DOMAIN_ID, FK_SG_ID )
- select NOW(), NOW(), 0, D.ID, SG.ID from SMP_RESOURCE_BCK SGB INNER JOIN SMP_RESOURCE SG ON
- SGB.businessidentifier = SG.IDENTIFIER_VALUE
- and SGB.businessidentifierscheme = SG.IDENTIFIER_SCHEME
+INSERT INTO SMP_SERVICE_GROUP_DOMAIN ( CREATED_ON, LAST_UPDATED_ON, SML_REGISTERED, FK_DOMAIN_ID, FK_SG_ID )
+ select NOW(), NOW(), 0, D.ID, SG.ID from SMP_SERVICE_GROUP_BCK SGB INNER JOIN SMP_SERVICE_GROUP SG ON
+ SGB.businessidentifier = SG.PARTICIPANT_IDENTIFIER
+ and SGB.businessidentifierscheme = SG.PARTICIPANT_SCHEME
INNER JOIN SMP_DOMAIN D ON
SGB.domainid = D.DOMAIN_CODE;
-- migrate service metadata (on migration there could be only one domain per service group therefore no need for domain)
-INSERT INTO SMP_SUBRESOURCE ( CREATED_ON, LAST_UPDATED_ON, IDENTIFIER_VALUE, IDENTIFIER_SCHEME, FK_SG_DOM_ID)
+INSERT INTO SMP_SERVICE_METADATA ( CREATED_ON, LAST_UPDATED_ON, DOCUMENT_IDENTIFIER, DOCUMENT_SCHEME, FK_SG_DOM_ID)
select NOW(), NOW(), MD.documentidentifier, MD.documentidentifierscheme, SGD.ID
- from SMP_SUBRESOURCE_BCK MD INNER JOIN SMP_RESOURCE SG
- ON MD.businessidentifier = SG.IDENTIFIER_VALUE and MD.businessidentifierscheme = SG.IDENTIFIER_SCHEME
- INNER JOIN SMP_RESOURCE_DOMAIN SGD ON SGD.FK_SG_ID = SG.id;
+ from SMP_SERVICE_METADATA_BCK MD INNER JOIN SMP_SERVICE_GROUP SG
+ ON MD.businessidentifier = SG.PARTICIPANT_IDENTIFIER and MD.businessidentifierscheme = SG.PARTICIPANT_SCHEME
+ INNER JOIN SMP_SERVICE_GROUP_DOMAIN SGD ON SGD.FK_SG_ID = SG.id;
-- update service metadata xml
-INSERT INTO SMP_DOCUMENT ( ID, CREATED_ON, LAST_UPDATED_ON, XML_CONTENT)
+INSERT INTO SMP_SERVICE_METADATA_XML ( ID, CREATED_ON, LAST_UPDATED_ON, XML_CONTENT)
select MD.ID, NOW(), NOW(), MDB.xmlcontent
- from SMP_SUBRESOURCE_BCK MDB, SMP_RESOURCE SG, SMP_RESOURCE_DOMAIN SGD, SMP_SUBRESOURCE MD
- where MDB.businessidentifier = SG.IDENTIFIER_VALUE and MDB.businessidentifierscheme = SG.IDENTIFIER_SCHEME
+ from SMP_SERVICE_METADATA_BCK MDB, SMP_SERVICE_GROUP SG, SMP_SERVICE_GROUP_DOMAIN SGD, SMP_SERVICE_METADATA MD
+ where MDB.businessidentifier = SG.PARTICIPANT_IDENTIFIER and MDB.businessidentifierscheme = SG.PARTICIPANT_SCHEME
and SGD.FK_SG_ID = SG.id -- only one service group domain at migration time
and MD.FK_SG_DOM_ID = SGD.id
- and MDB.documentidentifier = MD.IDENTIFIER_VALUE
- and MDB.documentidentifierscheme = MD.IDENTIFIER_SCHEME;
+ and MDB.documentidentifier = MD.DOCUMENT_IDENTIFIER
+ and MDB.documentidentifierscheme = MD.DOCUMENT_SCHEME;
-- owners
-INSERT INTO SMP_RESOURCE_MEMBER (FK_SG_ID, FK_USER_ID)
- select SG.ID, U.ID FROM SMP_RESOURCE_MEMBER_BCK OB INNER JOIN SMP_RESOURCE SG ON
- OB.businessidentifier = SG.IDENTIFIER_VALUE
- and OB.businessidentifierscheme = SG.IDENTIFIER_SCHEME
+INSERT INTO SMP_OWNERSHIP (FK_SG_ID, FK_USER_ID)
+ select SG.ID, U.ID FROM SMP_OWNERSHIP_BCK OB INNER JOIN SMP_SERVICE_GROUP SG ON
+ OB.businessidentifier = SG.PARTICIPANT_IDENTIFIER
+ and OB.businessidentifierscheme = SG.PARTICIPANT_SCHEME
INNER JOIN SMP_USER U ON OB.USERNAME =U.USERNAME;
@@ -325,15 +325,15 @@ UPDATE SMP_DOMAIN set SML_BLUE_COAT_AUTH=0 where SML_BLUE_COAT_AUTH IS NULL;
-- update sequences and remove auto_increment
-- --------------------------------------------------------------------------------------------------------
alter table SMP_DOMAIN modify column id bigint not null;
- alter table SMP_RESOURCE modify column id bigint not null;
- alter table SMP_RESOURCE_DOMAIN modify column id bigint not null;
- alter table SMP_SUBRESOURCE modify column id bigint not null;
+ alter table SMP_SERVICE_GROUP modify column id bigint not null;
+ alter table SMP_SERVICE_GROUP_DOMAIN modify column id bigint not null;
+ alter table SMP_SERVICE_METADATA modify column id bigint not null;
alter table SMP_USER modify column id bigint not null;
insert into SMP_USER_SEQ select count(id) +1 from SMP_USER;
- insert into SMP_SUBRESOURCE_SEQ select count(id) +1 from SMP_SUBRESOURCE;
- insert into SMP_RESOURCE_SEQ select count(id) +1 from SMP_RESOURCE;
- insert into SMP_RESOURCE_DOMAIN_SEQ select count(id) +1 from SMP_RESOURCE_DOMAIN;
+ insert into SMP_SERVICE_METADATA_SEQ select count(id) +1 from SMP_SERVICE_METADATA;
+ insert into SMP_SERVICE_GROUP_SEQ select count(id) +1 from SMP_SERVICE_GROUP;
+ insert into SMP_SERVICE_GROUP_DOMAIN_SEQ select count(id) +1 from SMP_SERVICE_GROUP_DOMAIN;
insert into SMP_DOMAIN_SEQ select count(id) +1 from SMP_DOMAIN;
insert into SMP_REVISION_SEQ values ( 1 );
-- --------------------------------------------------------------------------------------------------------
@@ -349,16 +349,16 @@ UPDATE SMP_DOMAIN set SML_BLUE_COAT_AUTH=0 where SML_BLUE_COAT_AUTH IS NULL;
alter table SMP_DOMAIN
add constraint UK_likb3jn0nlxlekaws0xx10uqc unique (SML_SUBDOMAIN);
-create index SMP_SG_PART_ID_IDX on SMP_RESOURCE (IDENTIFIER_VALUE);
-create index SMP_SG_PART_SCH_IDX on SMP_RESOURCE (IDENTIFIER_SCHEME);
+create index SMP_SG_PART_ID_IDX on SMP_SERVICE_GROUP (PARTICIPANT_IDENTIFIER);
+create index SMP_SG_PART_SCH_IDX on SMP_SERVICE_GROUP (PARTICIPANT_SCHEME);
- alter table SMP_RESOURCE
- add constraint SMP_SG_UNIQ_PARTC_IDX unique (IDENTIFIER_SCHEME, IDENTIFIER_VALUE);
-create index SMP_SMD_DOC_ID_IDX on SMP_SUBRESOURCE (IDENTIFIER_VALUE);
-create index SMP_SMD_DOC_SCH_IDX on SMP_SUBRESOURCE (IDENTIFIER_SCHEME);
+ alter table SMP_SERVICE_GROUP
+ add constraint SMP_SG_UNIQ_PARTC_IDX unique (PARTICIPANT_SCHEME, PARTICIPANT_IDENTIFIER);
+create index SMP_SMD_DOC_ID_IDX on SMP_SERVICE_METADATA (DOCUMENT_IDENTIFIER);
+create index SMP_SMD_DOC_SCH_IDX on SMP_SERVICE_METADATA (DOCUMENT_SCHEME);
- alter table SMP_SUBRESOURCE
- add constraint SMP_MT_UNIQ_SG_DOC_IDX unique (FK_SG_DOM_ID, IDENTIFIER_VALUE, IDENTIFIER_SCHEME);
+ alter table SMP_SERVICE_METADATA
+ add constraint SMP_MT_UNIQ_SG_DOC_IDX unique (FK_SG_DOM_ID, DOCUMENT_IDENTIFIER, DOCUMENT_SCHEME);
alter table SMP_USER
add constraint UK_rt1f0anklfo05lt0my05fqq6 unique (USERNAME);
@@ -378,57 +378,57 @@ create index SMP_SMD_DOC_SCH_IDX on SMP_SUBRESOURCE (IDENTIFIER_SCHEME);
foreign key (REV)
references SMP_REV_INFO (id);
- alter table SMP_RESOURCE_MEMBER
+ alter table SMP_OWNERSHIP
add constraint FKrnqwq06lbfwciup4rj8nvjpmy
foreign key (FK_USER_ID)
references SMP_USER (ID);
- alter table SMP_RESOURCE_MEMBER
+ alter table SMP_OWNERSHIP
add constraint FKgexq5n6ftsid8ehqljvjh8p4i
foreign key (FK_SG_ID)
- references SMP_RESOURCE (ID);
+ references SMP_SERVICE_GROUP (ID);
- alter table SMP_RESOURCE_MEMBER_AUD
+ alter table SMP_OWNERSHIP_AUD
add constraint FK1lqynlbk8ow1ouxetf5wybk3k
foreign key (REV)
references SMP_REV_INFO (id);
- alter table SMP_RESOURCE_AUD
+ alter table SMP_SERVICE_GROUP_AUD
add constraint FKj3caimhegwyav1scpwrxoslef
foreign key (REV)
references SMP_REV_INFO (id);
- alter table SMP_RESOURCE_DOMAIN
+ alter table SMP_SERVICE_GROUP_DOMAIN
add constraint FKo186xtefda6avl5p1tuqchp3n
foreign key (FK_DOMAIN_ID)
references SMP_DOMAIN (ID);
- alter table SMP_RESOURCE_DOMAIN
+ alter table SMP_SERVICE_GROUP_DOMAIN
add constraint FKgcvhnk2n34d3c6jhni5l3s3x3
foreign key (FK_SG_ID)
- references SMP_RESOURCE (ID);
+ references SMP_SERVICE_GROUP (ID);
- alter table SMP_RESOURCE_DOMAIN_AUD
+ alter table SMP_SERVICE_GROUP_DOMAIN_AUD
add constraint FK6uc9r0eqw16baooxtmqjkih0j
foreign key (REV)
references SMP_REV_INFO (id);
- alter table SMP_SUBRESOURCE
+ alter table SMP_SERVICE_METADATA
add constraint FKfvcml6b8x7kn80m30h8pxs7jl
foreign key (FK_SG_DOM_ID)
- references SMP_RESOURCE_DOMAIN (ID);
+ references SMP_SERVICE_GROUP_DOMAIN (ID);
- alter table SMP_SUBRESOURCE_AUD
+ alter table SMP_SERVICE_METADATA_AUD
add constraint FKbqr9pdnik1qxx2hi0xn4n7f61
foreign key (REV)
references SMP_REV_INFO (id);
- alter table SMP_DOCUMENT
+ alter table SMP_SERVICE_METADATA_XML
add constraint FK4b1x06xlavcgbjnuilgksi7nm
foreign key (ID)
- references SMP_SUBRESOURCE (ID);
+ references SMP_SERVICE_METADATA (ID);
- alter table SMP_DOCUMENT_AUD
+ alter table SMP_SERVICE_METADATA_XML_AUD
add constraint FKevatmlvvwoxfnjxkvmokkencb
foreign key (REV)
references SMP_REV_INFO (id);
@@ -436,7 +436,7 @@ create index SMP_SMD_DOC_SCH_IDX on SMP_SUBRESOURCE (IDENTIFIER_SCHEME);
alter table SMP_SG_EXTENSION
add constraint FKtf0mfonugp2jbkqo2o142chib
foreign key (ID)
- references SMP_RESOURCE (ID);
+ references SMP_SERVICE_GROUP (ID);
alter table SMP_SG_EXTENSION_AUD
add constraint FKmdo9v2422adwyebvl34qa3ap6
@@ -454,9 +454,9 @@ create index SMP_SMD_DOC_SCH_IDX on SMP_SUBRESOURCE (IDENTIFIER_SCHEME);
-- remove backup if migration succeeded- do in manually
-- drop table SMP_DOMAIN_BCK;
--- drop table SMP_RESOURCE_MEMBER_BCK;
--- drop table SMP_SUBRESOURCE_BCK;
--- drop table SMP_RESOURCE_BCK;
+-- drop table SMP_OWNERSHIP_BCK;
+-- drop table SMP_SERVICE_METADATA_BCK;
+-- drop table SMP_SERVICE_GROUP_BCK;
-- drop table SMP_USER_BCK;
diff --git a/smp-webapp/src/main/smp-setup/database-scripts/migration from 4.0.x to 4.1.0/mysql5innoDb_patch-4.1-RC1_to_4.1.sql b/smp-webapp/src/main/smp-setup/database-scripts/migration from 4.0.x to 4.1.0/mysql5innoDb_patch-4.1-RC1_to_4.1.sql
index a788f8d72508f7966e69cda519f64f657f9a3f37..9a49bde61578062b9380ad5603129df2bdaac486 100644
--- a/smp-webapp/src/main/smp-setup/database-scripts/migration from 4.0.x to 4.1.0/mysql5innoDb_patch-4.1-RC1_to_4.1.sql
+++ b/smp-webapp/src/main/smp-setup/database-scripts/migration from 4.0.x to 4.1.0/mysql5innoDb_patch-4.1-RC1_to_4.1.sql
@@ -10,8 +10,8 @@ UPDATE SMP_DOMAIN set SML_BLUE_COAT_AUTH=0 where SML_BLUE_COAT_AUTH IS NULL;
-- fix typo
-ALTER TABLE SMP_RESOURCE_DOMAIN CHANGE COLUMN SML_REGISTRED SML_REGISTERED bit;
-ALTER TABLE SMP_RESOURCE_DOMAIN_AUD CHANGE COLUMN SML_REGISTRED SML_REGISTERED bit;
+ALTER TABLE SMP_SERVICE_GROUP_DOMAIN CHANGE COLUMN SML_REGISTRED SML_REGISTERED bit;
+ALTER TABLE SMP_SERVICE_GROUP_DOMAIN_AUD CHANGE COLUMN SML_REGISTRED SML_REGISTERED bit;
ALTER TABLE SMP_CERTIFICATE CHANGE COLUMN CERTIFICATE_ID CERTIFICATE_ID varchar(1024) CHARACTER SET utf8 COLLATE utf8_bin;
ALTER TABLE SMP_CERTIFICATE CHANGE_AUD COLUMN CERTIFICATE_ID CERTIFICATE_ID varchar(1024) CHARACTER SET utf8 COLLATE utf8_bin;
diff --git a/smp-webapp/src/main/smp-setup/database-scripts/migration from 4.0.x to 4.1.0/oracle10g_4.0_to_4.1.sql b/smp-webapp/src/main/smp-setup/database-scripts/migration from 4.0.x to 4.1.0/oracle10g_4.0_to_4.1.sql
index 70b5ab1b1c12c564e82ea757006ddf77a266116b..497d1e5ce3c75213eb4e8efd765e16d337731698 100644
--- a/smp-webapp/src/main/smp-setup/database-scripts/migration from 4.0.x to 4.1.0/oracle10g_4.0_to_4.1.sql
+++ b/smp-webapp/src/main/smp-setup/database-scripts/migration from 4.0.x to 4.1.0/oracle10g_4.0_to_4.1.sql
@@ -3,9 +3,9 @@
-- create backup old tables
-- ---------------------------------------------------------------------------------------------------------
alter table SMP_DOMAIN rename to SMP_DOMAIN_BCK;
-alter table SMP_RESOURCE_MEMBER rename to SMP_RESOURCE_MEMBER_BCK;
-alter table SMP_RESOURCE rename to SMP_RESOURCE_BCK;
-alter table SMP_SUBRESOURCE rename to SMP_SUBRESOURCE_BCK;
+alter table SMP_OWNERSHIP rename to SMP_OWNERSHIP_BCK;
+alter table SMP_SERVICE_GROUP rename to SMP_SERVICE_GROUP_BCK;
+alter table SMP_SERVICE_METADATA rename to SMP_SERVICE_METADATA_BCK;
alter table SMP_USER rename to SMP_USER_BCK;
-- ---------------------------------------------------------------------------------------------------------
@@ -13,9 +13,9 @@ alter table SMP_USER rename to SMP_USER_BCK;
-- ---------------------------------------------------------------------------------------------------------
create sequence SMP_DOMAIN_SEQ start with 1 increment by 1;
create sequence SMP_REVISION_SEQ start with 1 increment by 1;
-create sequence SMP_RESOURCE_DOMAIN_SEQ start with 1 increment by 1;
-create sequence SMP_RESOURCE_SEQ start with 1 increment by 1;
-create sequence SMP_SUBRESOURCE_SEQ start with 1 increment by 1;
+create sequence SMP_SERVICE_GROUP_DOMAIN_SEQ start with 1 increment by 1;
+create sequence SMP_SERVICE_GROUP_SEQ start with 1 increment by 1;
+create sequence SMP_SERVICE_METADATA_SEQ start with 1 increment by 1;
create sequence SMP_USER_SEQ start with 1 increment by 1;
create table SMP_CERTIFICATE (
@@ -89,13 +89,13 @@ create sequence SMP_USER_SEQ start with 1 increment by 1;
primary key (PROPERTY)
);
- create table SMP_RESOURCE_MEMBER (
+ create table SMP_OWNERSHIP (
FK_SG_ID number(19,0) not null,
FK_USER_ID number(19,0) not null,
primary key (FK_SG_ID, FK_USER_ID)
);
- create table SMP_RESOURCE_MEMBER_AUD (
+ create table SMP_OWNERSHIP_AUD (
REV number(19,0) not null,
FK_SG_ID number(19,0) not null,
FK_USER_ID number(19,0) not null,
@@ -111,27 +111,27 @@ create sequence SMP_USER_SEQ start with 1 increment by 1;
primary key (id)
);
- create table SMP_RESOURCE (
+ create table SMP_SERVICE_GROUP (
ID number(19,0) not null,
CREATED_ON timestamp not null,
LAST_UPDATED_ON timestamp not null,
- IDENTIFIER_VALUE varchar2(256 char) not null,
- IDENTIFIER_SCHEME varchar2(256 char) not null,
+ PARTICIPANT_IDENTIFIER varchar2(256 char) not null,
+ PARTICIPANT_SCHEME varchar2(256 char) not null,
primary key (ID)
);
- create table SMP_RESOURCE_AUD (
+ create table SMP_SERVICE_GROUP_AUD (
ID number(19,0) not null,
REV number(19,0) not null,
REVTYPE number(3,0),
CREATED_ON timestamp,
LAST_UPDATED_ON timestamp,
- IDENTIFIER_VALUE varchar2(256 char),
- IDENTIFIER_SCHEME varchar2(256 char),
+ PARTICIPANT_IDENTIFIER varchar2(256 char),
+ PARTICIPANT_SCHEME varchar2(256 char),
primary key (ID, REV)
);
- create table SMP_RESOURCE_DOMAIN (
+ create table SMP_SERVICE_GROUP_DOMAIN (
ID number(19,0) not null,
CREATED_ON timestamp not null,
LAST_UPDATED_ON timestamp not null,
@@ -141,7 +141,7 @@ create sequence SMP_USER_SEQ start with 1 increment by 1;
primary key (ID)
);
- create table SMP_RESOURCE_DOMAIN_AUD (
+ create table SMP_SERVICE_GROUP_DOMAIN_AUD (
ID number(19,0) not null,
REV number(19,0) not null,
REVTYPE number(3,0),
@@ -153,29 +153,29 @@ create sequence SMP_USER_SEQ start with 1 increment by 1;
primary key (ID, REV)
);
- create table SMP_SUBRESOURCE (
+ create table SMP_SERVICE_METADATA (
ID number(19,0) not null,
CREATED_ON timestamp not null,
- IDENTIFIER_VALUE varchar2(500 char) not null,
- IDENTIFIER_SCHEME varchar2(500 char),
+ DOCUMENT_IDENTIFIER varchar2(500 char) not null,
+ DOCUMENT_SCHEME varchar2(500 char),
LAST_UPDATED_ON timestamp not null,
FK_SG_DOM_ID number(19,0) not null,
primary key (ID)
);
- create table SMP_SUBRESOURCE_AUD (
+ create table SMP_SERVICE_METADATA_AUD (
ID number(19,0) not null,
REV number(19,0) not null,
REVTYPE number(3,0),
CREATED_ON timestamp,
- IDENTIFIER_VALUE varchar2(500 char),
- IDENTIFIER_SCHEME varchar2(500 char),
+ DOCUMENT_IDENTIFIER varchar2(500 char),
+ DOCUMENT_SCHEME varchar2(500 char),
LAST_UPDATED_ON timestamp,
FK_SG_DOM_ID number(19,0),
primary key (ID, REV)
);
- create table SMP_DOCUMENT (
+ create table SMP_SERVICE_METADATA_XML (
ID number(19,0) not null,
CREATED_ON timestamp not null,
LAST_UPDATED_ON timestamp not null,
@@ -183,7 +183,7 @@ create sequence SMP_USER_SEQ start with 1 increment by 1;
primary key (ID)
);
- create table SMP_DOCUMENT_AUD (
+ create table SMP_SERVICE_METADATA_XML_AUD (
ID number(19,0) not null,
REV number(19,0) not null,
REVTYPE number(3,0),
@@ -247,16 +247,16 @@ create sequence SMP_USER_SEQ start with 1 increment by 1;
alter table SMP_DOMAIN
add constraint UK_likb3jn0nlxlekaws0xx10uqc unique (SML_SUBDOMAIN);
-create index SMP_SG_PART_ID_IDX on SMP_RESOURCE (IDENTIFIER_VALUE);
-create index SMP_SG_PART_SCH_IDX on SMP_RESOURCE (IDENTIFIER_SCHEME);
+create index SMP_SG_PART_ID_IDX on SMP_SERVICE_GROUP (PARTICIPANT_IDENTIFIER);
+create index SMP_SG_PART_SCH_IDX on SMP_SERVICE_GROUP (PARTICIPANT_SCHEME);
- alter table SMP_RESOURCE
- add constraint SMP_SG_UNIQ_PARTC_IDX unique (IDENTIFIER_SCHEME, IDENTIFIER_VALUE);
-create index SMP_SMD_DOC_ID_IDX on SMP_SUBRESOURCE (IDENTIFIER_VALUE);
-create index SMP_SMD_DOC_SCH_IDX on SMP_SUBRESOURCE (IDENTIFIER_SCHEME);
+ alter table SMP_SERVICE_GROUP
+ add constraint SMP_SG_UNIQ_PARTC_IDX unique (PARTICIPANT_SCHEME, PARTICIPANT_IDENTIFIER);
+create index SMP_SMD_DOC_ID_IDX on SMP_SERVICE_METADATA (DOCUMENT_IDENTIFIER);
+create index SMP_SMD_DOC_SCH_IDX on SMP_SERVICE_METADATA (DOCUMENT_SCHEME);
- alter table SMP_SUBRESOURCE
- add constraint SMP_MT_UNIQ_SG_DOC_IDX unique (FK_SG_DOM_ID, IDENTIFIER_VALUE, IDENTIFIER_SCHEME);
+ alter table SMP_SERVICE_METADATA
+ add constraint SMP_MT_UNIQ_SG_DOC_IDX unique (FK_SG_DOM_ID, DOCUMENT_IDENTIFIER, DOCUMENT_SCHEME);
alter table SMP_USER
add constraint UK_rt1f0anklfo05lt0my05fqq6 unique (USERNAME);
@@ -276,57 +276,57 @@ create index SMP_SMD_DOC_SCH_IDX on SMP_SUBRESOURCE (IDENTIFIER_SCHEME);
foreign key (REV)
references SMP_REV_INFO;
- alter table SMP_RESOURCE_MEMBER
+ alter table SMP_OWNERSHIP
add constraint FKrnqwq06lbfwciup4rj8nvjpmy
foreign key (FK_USER_ID)
references SMP_USER;
- alter table SMP_RESOURCE_MEMBER
+ alter table SMP_OWNERSHIP
add constraint FKgexq5n6ftsid8ehqljvjh8p4i
foreign key (FK_SG_ID)
- references SMP_RESOURCE;
+ references SMP_SERVICE_GROUP;
- alter table SMP_RESOURCE_MEMBER_AUD
+ alter table SMP_OWNERSHIP_AUD
add constraint FK1lqynlbk8ow1ouxetf5wybk3k
foreign key (REV)
references SMP_REV_INFO;
- alter table SMP_RESOURCE_AUD
+ alter table SMP_SERVICE_GROUP_AUD
add constraint FKj3caimhegwyav1scpwrxoslef
foreign key (REV)
references SMP_REV_INFO;
- alter table SMP_RESOURCE_DOMAIN
+ alter table SMP_SERVICE_GROUP_DOMAIN
add constraint FKo186xtefda6avl5p1tuqchp3n
foreign key (FK_DOMAIN_ID)
references SMP_DOMAIN;
- alter table SMP_RESOURCE_DOMAIN
+ alter table SMP_SERVICE_GROUP_DOMAIN
add constraint FKgcvhnk2n34d3c6jhni5l3s3x3
foreign key (FK_SG_ID)
- references SMP_RESOURCE;
+ references SMP_SERVICE_GROUP;
- alter table SMP_RESOURCE_DOMAIN_AUD
+ alter table SMP_SERVICE_GROUP_DOMAIN_AUD
add constraint FK6uc9r0eqw16baooxtmqjkih0j
foreign key (REV)
references SMP_REV_INFO;
- alter table SMP_SUBRESOURCE
+ alter table SMP_SERVICE_METADATA
add constraint FKfvcml6b8x7kn80m30h8pxs7jl
foreign key (FK_SG_DOM_ID)
- references SMP_RESOURCE_DOMAIN;
+ references SMP_SERVICE_GROUP_DOMAIN;
- alter table SMP_SUBRESOURCE_AUD
+ alter table SMP_SERVICE_METADATA_AUD
add constraint FKbqr9pdnik1qxx2hi0xn4n7f61
foreign key (REV)
references SMP_REV_INFO;
- alter table SMP_DOCUMENT
+ alter table SMP_SERVICE_METADATA_XML
add constraint FK4b1x06xlavcgbjnuilgksi7nm
foreign key (ID)
- references SMP_SUBRESOURCE;
+ references SMP_SERVICE_METADATA;
- alter table SMP_DOCUMENT_AUD
+ alter table SMP_SERVICE_METADATA_XML_AUD
add constraint FKevatmlvvwoxfnjxkvmokkencb
foreign key (REV)
references SMP_REV_INFO;
@@ -334,7 +334,7 @@ create index SMP_SMD_DOC_SCH_IDX on SMP_SUBRESOURCE (IDENTIFIER_SCHEME);
alter table SMP_SG_EXTENSION
add constraint FKtf0mfonugp2jbkqo2o142chib
foreign key (ID)
- references SMP_RESOURCE;
+ references SMP_SERVICE_GROUP;
alter table SMP_SG_EXTENSION_AUD
add constraint FKmdo9v2422adwyebvl34qa3ap6
@@ -366,45 +366,45 @@ INSERT INTO SMP_CERTIFICATE (ID,CERTIFICATE_ID,CREATED_ON,LAST_UPDATED_ON)
SELECT ID ,USERNAME, CREATED_ON, LAST_UPDATED_ON FROM SMP_USER where PASSWORD is null;
-- migrate service groups
-INSERT INTO SMP_RESOURCE ( ID, CREATED_ON, LAST_UPDATED_ON, IDENTIFIER_VALUE, IDENTIFIER_SCHEME)
- select SMP_RESOURCE_SEQ.nextval, sysdate, sysdate, BUSINESSIDENTIFIER, BUSINESSIDENTIFIERSCHEME from SMP_RESOURCE_BCK;
+INSERT INTO SMP_SERVICE_GROUP ( ID, CREATED_ON, LAST_UPDATED_ON, PARTICIPANT_IDENTIFIER, PARTICIPANT_SCHEME)
+ select SMP_SERVICE_GROUP_SEQ.nextval, sysdate, sysdate, BUSINESSIDENTIFIER, BUSINESSIDENTIFIERSCHEME from SMP_SERVICE_GROUP_BCK;
-- insert extensions
INSERT INTO SMP_SG_EXTENSION (ID, CREATED_ON, LAST_UPDATED_ON, EXTENSION)
- select sg.id, sysdate,sysdate, clob_to_blob(sgb.extension) from SMP_RESOURCE sg, SMP_RESOURCE_bck sgb
- where sg.IDENTIFIER_VALUE= sgb.BUSINESSIDENTIFIER
- and sg.IDENTIFIER_SCHEME= sgb.BUSINESSIDENTIFIERSCHEME and sgb.extension is not null;
+ select sg.id, sysdate,sysdate, clob_to_blob(sgb.extension) from SMP_SERVICE_GROUP sg, SMP_SERVICE_GROUP_bck sgb
+ where sg.PARTICIPANT_IDENTIFIER= sgb.BUSINESSIDENTIFIER
+ and sg.PARTICIPANT_SCHEME= sgb.BUSINESSIDENTIFIERSCHEME and sgb.extension is not null;
-- insert service group domains
-INSERT INTO SMP_RESOURCE_DOMAIN (ID, CREATED_ON, LAST_UPDATED_ON, SML_REGISTERED, FK_DOMAIN_ID, FK_SG_ID )
- select SMP_RESOURCE_DOMAIN_SEQ.nextval, sysdate, sysdate, 0, D.ID, SG.ID from SMP_RESOURCE_BCK SGB, SMP_RESOURCE SG, SMP_DOMAIN D WHERE
- SGB.BUSINESSIDENTIFIER = SG.IDENTIFIER_VALUE
- and SGB.BUSINESSIDENTIFIERSCHEME = SG.IDENTIFIER_SCHEME
+INSERT INTO SMP_SERVICE_GROUP_DOMAIN (ID, CREATED_ON, LAST_UPDATED_ON, SML_REGISTERED, FK_DOMAIN_ID, FK_SG_ID )
+ select SMP_SERVICE_GROUP_DOMAIN_SEQ.nextval, sysdate, sysdate, 0, D.ID, SG.ID from SMP_SERVICE_GROUP_BCK SGB, SMP_SERVICE_GROUP SG, SMP_DOMAIN D WHERE
+ SGB.BUSINESSIDENTIFIER = SG.PARTICIPANT_IDENTIFIER
+ and SGB.BUSINESSIDENTIFIERSCHEME = SG.PARTICIPANT_SCHEME
and SGB.DOMAINID = D.DOMAIN_CODE;
-- migrate service metadata (on migration there could be only one domain per service group therefore no need for domain)
-INSERT INTO SMP_SUBRESOURCE ( ID, CREATED_ON, LAST_UPDATED_ON, IDENTIFIER_VALUE, IDENTIFIER_SCHEME, FK_SG_DOM_ID)
- select SMP_SUBRESOURCE_SEQ.nextval, sysdate, sysdate, MD.DOCUMENTIDENTIFIER, MD.DOCUMENTIDENTIFIERSCHEME, SGD.ID
- from SMP_SUBRESOURCE_BCK MD, SMP_RESOURCE SG, SMP_RESOURCE_DOMAIN SGD
- where MD.BUSINESSIDENTIFIER = SG.IDENTIFIER_VALUE and MD.BUSINESSIDENTIFIERSCHEME = SG.IDENTIFIER_SCHEME
+INSERT INTO SMP_SERVICE_METADATA ( ID, CREATED_ON, LAST_UPDATED_ON, DOCUMENT_IDENTIFIER, DOCUMENT_SCHEME, FK_SG_DOM_ID)
+ select SMP_SERVICE_METADATA_SEQ.nextval, sysdate, sysdate, MD.DOCUMENTIDENTIFIER, MD.DOCUMENTIDENTIFIERSCHEME, SGD.ID
+ from SMP_SERVICE_METADATA_BCK MD, SMP_SERVICE_GROUP SG, SMP_SERVICE_GROUP_DOMAIN SGD
+ where MD.BUSINESSIDENTIFIER = SG.PARTICIPANT_IDENTIFIER and MD.BUSINESSIDENTIFIERSCHEME = SG.PARTICIPANT_SCHEME
and SGD.FK_SG_ID = SG.id;
-- update service metadata xml
-INSERT INTO SMP_DOCUMENT ( ID, CREATED_ON, LAST_UPDATED_ON, XML_CONTENT)
+INSERT INTO SMP_SERVICE_METADATA_XML ( ID, CREATED_ON, LAST_UPDATED_ON, XML_CONTENT)
select MD.ID, sysdate, sysdate, clob_to_blob(MDB.XMLCONTENT)
- from SMP_SUBRESOURCE_BCK MDB, SMP_RESOURCE SG, SMP_RESOURCE_DOMAIN SGD, SMP_SUBRESOURCE MD
- where MDB.BUSINESSIDENTIFIER = SG.IDENTIFIER_VALUE and MDB.BUSINESSIDENTIFIERSCHEME = SG.IDENTIFIER_SCHEME
+ from SMP_SERVICE_METADATA_BCK MDB, SMP_SERVICE_GROUP SG, SMP_SERVICE_GROUP_DOMAIN SGD, SMP_SERVICE_METADATA MD
+ where MDB.BUSINESSIDENTIFIER = SG.PARTICIPANT_IDENTIFIER and MDB.BUSINESSIDENTIFIERSCHEME = SG.PARTICIPANT_SCHEME
and SGD.FK_SG_ID = SG.id -- only one service group domain at migration time
and MD.FK_SG_DOM_ID = SGD.id
- and MDB.DOCUMENTIDENTIFIER = MD.IDENTIFIER_VALUE
- and MDB.DOCUMENTIDENTIFIERSCHEME = MD.IDENTIFIER_SCHEME;
+ and MDB.DOCUMENTIDENTIFIER = MD.DOCUMENT_IDENTIFIER
+ and MDB.DOCUMENTIDENTIFIERSCHEME = MD.DOCUMENT_SCHEME;
-- owners
-INSERT INTO SMP_RESOURCE_MEMBER (FK_SG_ID, FK_USER_ID)
- select SG.ID, U.ID FROM SMP_RESOURCE_MEMBER_BCK OB, SMP_RESOURCE SG, SMP_USER U
+INSERT INTO SMP_OWNERSHIP (FK_SG_ID, FK_USER_ID)
+ select SG.ID, U.ID FROM SMP_OWNERSHIP_BCK OB, SMP_SERVICE_GROUP SG, SMP_USER U
WHERE OB.USERNAME =U.USERNAME
- and OB.BUSINESSIDENTIFIER = SG.IDENTIFIER_VALUE
- and OB.BUSINESSIDENTIFIERSCHEME = SG.IDENTIFIER_SCHEME;
+ and OB.BUSINESSIDENTIFIER = SG.PARTICIPANT_IDENTIFIER
+ and OB.BUSINESSIDENTIFIERSCHEME = SG.PARTICIPANT_SCHEME;
-- we do not need certificate DN in USERNAME so remove it from username columns
UPDATE SMP_USER set USERNAME=null where PASSWORD is null;
@@ -412,9 +412,9 @@ drop FUNCTION clob_to_blob
-- remove backup if migration succeeded- do in manually
-- drop table SMP_DOMAIN_BCK;
--- drop table SMP_RESOURCE_MEMBER_BCK;
--- drop table SMP_SUBRESOURCE_BCK;
--- drop table SMP_RESOURCE_BCK;
+-- drop table SMP_OWNERSHIP_BCK;
+-- drop table SMP_SERVICE_METADATA_BCK;
+-- drop table SMP_SERVICE_GROUP_BCK;
-- drop table SMP_USER_BCK;
diff --git a/smp-webapp/src/main/smp-setup/database-scripts/migration from 4.0.x to 4.1.0/oracle10g_patch-4.1-RC1_to_4.1.sql b/smp-webapp/src/main/smp-setup/database-scripts/migration from 4.0.x to 4.1.0/oracle10g_patch-4.1-RC1_to_4.1.sql
index 955bcbd4d1c8e2f4375f905c22e45e1eb33b2d5d..2047557a983de28340c4d33bd12411793274ec80 100644
--- a/smp-webapp/src/main/smp-setup/database-scripts/migration from 4.0.x to 4.1.0/oracle10g_patch-4.1-RC1_to_4.1.sql
+++ b/smp-webapp/src/main/smp-setup/database-scripts/migration from 4.0.x to 4.1.0/oracle10g_patch-4.1-RC1_to_4.1.sql
@@ -10,9 +10,9 @@ ALTER TABLE SMP_DOMAIN_AUD ADD SML_BLUE_COAT_AUTH number(1,0);
UPDATE SMP_DOMAIN set SML_REGISTERED=0 where SML_REGISTERED IS NULL;
UPDATE SMP_DOMAIN set SML_BLUE_COAT_AUTH=1 where SML_BLUE_COAT_AUTH IS NULL;
--- fix typo SMP_RESOURCE_DOMAIN
-ALTER TABLE SMP_RESOURCE_DOMAIN RENAME COLUMN SML_REGISTRED TO SML_REGISTERED;
-ALTER TABLE SMP_RESOURCE_DOMAIN_AUD RENAME COLUMN SML_REGISTRED TO SML_REGISTERED;
+-- fix typo SMP_SERVICE_GROUP_DOMAIN
+ALTER TABLE SMP_SERVICE_GROUP_DOMAIN RENAME COLUMN SML_REGISTRED TO SML_REGISTERED;
+ALTER TABLE SMP_SERVICE_GROUP_DOMAIN_AUD RENAME COLUMN SML_REGISTRED TO SML_REGISTERED;
create table SMP_CONFIGURATION (
PROPERTY varchar2(512 char) not null,
@@ -21,4 +21,4 @@ create table SMP_CONFIGURATION (
LAST_UPDATED_ON timestamp not null,
VALUE varchar2(4000 char),
primary key (PROPERTY)
-);
+);
\ No newline at end of file