From e0d010e5ef1b43ebb8a4f1ea5ac8fc00e8ce6180 Mon Sep 17 00:00:00 2001 From: Steve Sarandos Date: Tue, 25 Aug 2015 15:47:01 -0400 Subject: [PATCH] User's widget definitions weren't being synched. Updating hsql for new changes --- CONTRIBUTING.md | 3 +- .../owf/grails/filters/SecurityFilters.groovy | 4 + prodDb.script | 73 +++++++++++++++---- 3 files changed, 65 insertions(+), 15 deletions(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 1649e0c1..76faa343 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -11,8 +11,9 @@ * Code should follow existing code standards i.e. line spacing, indenting, and naming conventions. * Rebase commits for easier readability for code reviews * When submitting your pull request, please be detailed in the description. At the minimum the request should contain the following: - * Summary of the changes done (including changes to licenses) + * A detailed description of new features or changes to the codebase (including changes to licenses) * Screen shots of any new UI features + * Any testing information that's pertinent (browsers, environments, etc.) * A point of contact for technical discussions * At the minimum please ensure that your code builds and passes the automated tests. It would be helpful if new features included new tests. * The better documented your code is, the quicker the Ozone team will be able to process your request. Use javadocs or jsdocs as appropriate at the tops of files, functions, and methods diff --git a/grails-app/conf/ozone/owf/grails/filters/SecurityFilters.groovy b/grails-app/conf/ozone/owf/grails/filters/SecurityFilters.groovy index abf50db9..bed65a24 100644 --- a/grails-app/conf/ozone/owf/grails/filters/SecurityFilters.groovy +++ b/grails-app/conf/ozone/owf/grails/filters/SecurityFilters.groovy @@ -223,6 +223,10 @@ class SecurityFilters { .executeUpdate() } session["savedUserGroups"] = true + + if (groupsToRemove.size() > 0 || groupsToCreate.size() > 0) { + accountService.sync(personInDB, true) + } } catch (Exception e) { // Chew. We don't want the exception bubbling back. diff --git a/prodDb.script b/prodDb.script index c027f1f3..d525d88d 100644 --- a/prodDb.script +++ b/prodDb.script @@ -29,6 +29,7 @@ CREATE MEMORY TABLE APPLICATION_CONFIGURATION(ID BIGINT GENERATED BY DEFAULT AS CREATE INDEX FKFC9C0477666C6D2 ON APPLICATION_CONFIGURATION(CREATED_BY_ID) CREATE INDEX FKFC9C047E31CB353 ON APPLICATION_CONFIGURATION(EDITED_BY_ID) CREATE INDEX APP_CONFIG_GROUP_NAME_IDX ON APPLICATION_CONFIGURATION(GROUP_NAME) +CREATE MEMORY TABLE PERSON_ROLE(PERSON_AUTHORITIES_ID BIGINT,ROLE_ID BIGINT,CONSTRAINT FKE6A16B2070B353 FOREIGN KEY(ROLE_ID) REFERENCES ROLE(ID),CONSTRAINT FKE6A16B20664DE391 FOREIGN KEY(PERSON_AUTHORITIES_ID) REFERENCES PERSON(ID)) ALTER TABLE DASHBOARD ADD CONSTRAINT FKC18AEA948656347D FOREIGN KEY(USER_ID) REFERENCES PERSON(ID) ALTER TABLE DASHBOARD ADD CONSTRAINT FKC18AEA94372CC5A FOREIGN KEY(CREATED_BY_ID) REFERENCES PERSON(ID) ALTER TABLE DASHBOARD ADD CONSTRAINT FKC18AEA947028B8DB FOREIGN KEY(EDITED_BY_ID) REFERENCES PERSON(ID) @@ -36,12 +37,12 @@ ALTER TABLE DASHBOARD ADD CONSTRAINT FKC18AEA946B3A1281 FOREIGN KEY(STACK_ID) RE ALTER TABLE OWF_GROUP_PEOPLE ADD CONSTRAINT FK2811370C1F5E0B3 FOREIGN KEY(PERSON_ID) REFERENCES PERSON(ID) ALTER TABLE PERSON_WIDGET_DEFINITION ADD CONSTRAINT FK6F5C17C4293A835C FOREIGN KEY(WIDGET_DEFINITION_ID) REFERENCES WIDGET_DEFINITION(ID) ALTER TABLE TAG_LINKS ADD CONSTRAINT FK7C35D6D45A3B441D FOREIGN KEY(TAG_ID) REFERENCES TAGS(ID) -ALTER TABLE DASHBOARD ALTER COLUMN ID RESTART WITH 324 -ALTER TABLE DOMAIN_MAPPING ALTER COLUMN ID RESTART WITH 350 +ALTER TABLE DASHBOARD ALTER COLUMN ID RESTART WITH 331 +ALTER TABLE DOMAIN_MAPPING ALTER COLUMN ID RESTART WITH 367 ALTER TABLE OWF_GROUP ALTER COLUMN ID RESTART WITH 195 ALTER TABLE PERSON ALTER COLUMN ID RESTART WITH 29 -ALTER TABLE PERSON_WIDGET_DEFINITION ALTER COLUMN ID RESTART WITH 198 -ALTER TABLE PREFERENCE ALTER COLUMN ID RESTART WITH 150 +ALTER TABLE PERSON_WIDGET_DEFINITION ALTER COLUMN ID RESTART WITH 214 +ALTER TABLE PREFERENCE ALTER COLUMN ID RESTART WITH 155 ALTER TABLE REQUESTMAP ALTER COLUMN ID RESTART WITH 4 ALTER TABLE ROLE ALTER COLUMN ID RESTART WITH 28 ALTER TABLE TAG_LINKS ALTER COLUMN ID RESTART WITH 317 @@ -217,6 +218,13 @@ INSERT INTO DASHBOARD VALUES(4,0,FALSE,4,'976cbf75-5537-410f-88a3-375c5cf970bc', INSERT INTO DASHBOARD VALUES(320,1,FALSE,1,'3f59855b-d93e-dc03-c6ba-f4c33ea0177f',FALSE,'Watch List',NULL,'This page demonstrates how intents work using company stock information.',NULL,NULL,NULL,NULL,'{"xtype":"container","cls":"vbox ","layout":{"type":"vbox","align":"stretch"},"items":[{"xtype":"container","cls":"hbox top","layout":{"type":"hbox","align":"stretch"},"items":[{"xtype":"fitpane","cls":"left","flex":1,"htmlText":"50%","items":[],"widgets":[{"widgetGuid":"fe137961-039d-e7a5-7050-d6eed7ac4782","uniqueId":"ecbe0bd5-7781-d859-2dbc-13f86be406a7","dashboardGuid":"3f59855b-d93e-dc03-c6ba-f4c33ea0177f","paneGuid":"16ec8b84-a631-4e7c-d9cc-883635abd6ef","intentConfig":null,"launchData":null,"name":"NYSE Widget","active":true,"x":0,"y":34,"zIndex":0,"minimized":false,"maximized":false,"pinned":false,"collapsed":false,"columnPos":0,"buttonId":null,"buttonOpened":false,"region":"none","statePosition":1,"singleton":false,"floatingWidget":false,"height":538,"width":798,"background":false,"columnOrder":""}],"paneType":"fitpane","defaultSettings":{}},{"xtype":"dashboardsplitter"},{"xtype":"fitpane","cls":"right","flex":1,"htmlText":"50%","items":[],"paneType":"fitpane","widgets":[{"widgetGuid":"cd5e77f8-cb28-8574-0a8a-a535bd2c7de4","uniqueId":"66e7148e-3cd3-72ff-6a24-6143ac618b80","dashboardGuid":"3f59855b-d93e-dc03-c6ba-f4c33ea0177f","paneGuid":"443dfdc0-7165-cb7d-dd9c-f08fbe36bdb1","intentConfig":null,"launchData":null,"name":"HTML Viewer","active":false,"x":802,"y":34,"zIndex":0,"minimized":false,"maximized":false,"pinned":false,"collapsed":false,"columnPos":0,"buttonId":null,"buttonOpened":false,"region":"none","statePosition":1,"singleton":false,"floatingWidget":false,"height":538,"width":798,"background":false,"columnOrder":""}],"defaultSettings":{}}],"flex":1},{"xtype":"dashboardsplitter"},{"xtype":"fitpane","cls":"bottom","flex":1,"htmlText":"50%","items":[],"paneType":"fitpane","widgets":[{"widgetGuid":"92078ac9-6f21-2f5f-6afc-bdc8c915c66d","uniqueId":"b17f186c-0d31-2077-1c3b-2a43dbf83738","dashboardGuid":"3f59855b-d93e-dc03-c6ba-f4c33ea0177f","paneGuid":"410cd0ee-cbdd-f225-582e-6aaa92e058f2","intentConfig":null,"launchData":null,"name":"Stock Chart","active":false,"x":0,"y":576,"zIndex":0,"minimized":false,"maximized":false,"pinned":false,"collapsed":false,"columnPos":0,"buttonId":null,"buttonOpened":false,"region":"none","statePosition":1,"singleton":false,"floatingWidget":false,"height":539,"width":1600,"background":false,"columnOrder":""}],"defaultSettings":{}}],"height":"100%"}',FALSE,1,NULL,NULL,TRUE,NULL) INSERT INTO DASHBOARD VALUES(321,1,FALSE,0,'c62ce95c-d16d-4ffe-afae-c46fa64a689b',FALSE,'Sample',NULL,'',NULL,NULL,NULL,NULL,'{"xtype":"desktoppane","flex":1,"height":"100%","items":[],"paneType":"desktoppane","widgets":[{"widgetGuid":"eb5435cf-4021-4f2a-ba69-dde451d12551","uniqueId":"17580ea1-02fc-8ca7-e794-b5644f7dc21d","dashboardGuid":"905968f7-f94d-1c9b-431c-a05dc7bb68d1","paneGuid":"f3712dc1-6e90-2469-8cb3-5b499937cac8","name":"Channel Shouter","active":false,"x":549,"y":7,"minimized":false,"maximized":false,"pinned":false,"collapsed":false,"columnPos":0,"buttonId":null,"buttonOpened":false,"region":"none","statePosition":2,"intentConfig":null,"launchData":null,"singleton":false,"floatingWidget":false,"background":false,"zIndex":19120,"height":250,"width":295},{"widgetGuid":"ec5435cf-4021-4f2a-ba69-dde451d12551","uniqueId":"9bdc8e96-f311-4a0b-c5b9-23ae5d768297","dashboardGuid":"905968f7-f94d-1c9b-431c-a05dc7bb68d1","paneGuid":"f3712dc1-6e90-2469-8cb3-5b499937cac8","name":"Channel Listener","active":true,"x":4,"y":5,"minimized":false,"maximized":false,"pinned":false,"collapsed":false,"columnPos":0,"buttonId":null,"buttonOpened":false,"region":"none","statePosition":1,"intentConfig":null,"launchData":null,"singleton":false,"floatingWidget":false,"background":false,"zIndex":19130,"height":383,"width":540}],"defaultSettings":{"widgetStates":{"ec5435cf-4021-4f2a-ba69-dde451d12551":{"x":4,"y":5,"height":383,"width":540,"timestamp":1348064185725},"eb5435cf-4021-4f2a-ba69-dde451d12551":{"x":549,"y":7,"height":250,"width":295,"timestamp":1348064183912}}}}',FALSE,2,NULL,NULL,TRUE,NULL) INSERT INTO DASHBOARD VALUES(323,1,FALSE,2,'7f2f6d45-263a-7aeb-d841-3637678ce559',FALSE,'Contacts',NULL,'This page demonstrates how intents work by sending addresses to a map.',NULL,NULL,NULL,NULL,'{"xtype":"container","cls":"hbox ","layout":{"type":"hbox","align":"stretch"},"items":[{"xtype":"accordionpane","cls":"left","htmlText":"25%","items":[],"widgets":[{"universalName":"org.owfgoss.owf.examples.ContactsManager","widgetGuid":"92448ba5-7f2b-982a-629e-9d621268b5e9","uniqueId":"208c64f4-14ed-b31b-98b1-15408cc1620e","dashboardGuid":"f935e19e-09a1-451e-8b3d-0fb77537da7d","paneGuid":"5c478b1d-ba1f-ef67-087c-c03b8dbc7bff","intentConfig":null,"launchData":null,"name":"Contacts Manager","active":false,"x":0,"y":34,"zIndex":0,"minimized":false,"maximized":false,"pinned":false,"collapsed":false,"columnPos":0,"buttonId":null,"buttonOpened":false,"region":"none","statePosition":1,"singleton":false,"floatingWidget":false,"height":448,"width":419},{"universalName":"org.owfgoss.owf.examples.GetDirections","widgetGuid":"302c35c9-9ed8-d0b6-251c-ea1ed4d0c86b","uniqueId":"1929bfaf-ed08-47f3-c231-cd2e9d59e341","dashboardGuid":"f935e19e-09a1-451e-8b3d-0fb77537da7d","paneGuid":"5c478b1d-ba1f-ef67-087c-c03b8dbc7bff","intentConfig":{},"launchData":null,"name":"Directions","active":false,"x":0,"y":482,"zIndex":0,"minimized":false,"maximized":false,"pinned":false,"collapsed":false,"columnPos":0,"buttonId":null,"buttonOpened":false,"region":"none","statePosition":2,"singleton":false,"floatingWidget":false,"height":447,"width":419}],"paneType":"accordionpane","defaultSettings":{"widgetStates":{"302c35c9-9ed8-d0b6-251c-ea1ed4d0c86b":{"timestamp":1354747263559},"d182002b-3de2-eb24-77be-95a7d08aa85b":{"timestamp":1354745224627},"92448ba5-7f2b-982a-629e-9d621268b5e9":{"timestamp":1354747263555}}},"flex":0.25},{"xtype":"dashboardsplitter"},{"xtype":"tabbedpane","cls":"right","htmlText":"75%","items":[],"paneType":"tabbedpane","widgets":[{"universalName":"org.owfgoss.owf.examples.GoogleMaps","widgetGuid":"d182002b-3de2-eb24-77be-95a7d08aa85b","uniqueId":"570f3364-e21a-8f96-d8e5-f61d81196ebc","dashboardGuid":"f935e19e-09a1-451e-8b3d-0fb77537da7d","paneGuid":"a25052e4-cd5d-51c0-a440-81327fc1d955","intentConfig":null,"launchData":null,"name":"Google Maps","active":true,"x":423,"y":62,"zIndex":0,"minimized":false,"maximized":false,"pinned":false,"collapsed":false,"columnPos":0,"buttonId":null,"buttonOpened":false,"region":"none","statePosition":1,"singleton":false,"floatingWidget":false,"height":867,"width":1257}],"defaultSettings":{"widgetStates":{"d182002b-3de2-eb24-77be-95a7d08aa85b":{"timestamp":1354747263599},"b87c4a3e-aa1e-499e-ba10-510f35388bb6":{"timestamp":1354746772856},"ec5435cf-4021-4f2a-ba69-dde451d12551":{"timestamp":1354746684155},"eb5435cf-4021-4f2a-ba69-dde451d12551":{"timestamp":1354746684154},"d6ce3375-6e89-45ab-a7be-b6cf3abb0e8c":{"timestamp":1354747222261},"eb81c029-a5b6-4107-885c-5e04b4770767":{"timestamp":1354747222264},"c3f3c8e0-e7aa-41c3-a655-aca3c940f828":{"timestamp":1354746826290}}},"flex":0.75}],"flex":1}',FALSE,1,NULL,NULL,TRUE,NULL) +INSERT INTO DASHBOARD VALUES(324,1,FALSE,1,'ee6fa82e-bc8e-4d80-9a97-433332960449',FALSE,'Apps',1,'Administer the Apps in the system.',NULL,'2015-08-26 12:38:51.266000000',NULL,'2015-08-26 12:38:51.266000000','{"defaultSettings":{},"widgets":[{"universalName":"org.ozoneplatform.owf.admin.appmanagement","widgetGuid":"391dd2af-a207-41a3-8e51-2b20ec3e7241","uniqueId":"b2eab02c-256f-4efc-9596-9096ead12e7e","dashboardGuid":"ee6fa82e-bc8e-4d80-9a97-433332960449","paneGuid":"1d379a43-a2d3-d31a-fdf7-e435d2a49940","intentConfig":null,"launchData":null,"name":"Apps","active":true,"x":0,"y":33,"zIndex":0,"minimized":false,"maximized":false,"pinned":false,"collapsed":false,"columnPos":0,"buttonId":null,"buttonOpened":false,"region":"none","statePosition":1,"singleton":false,"floatingWidget":false,"height":908,"width":1920}],"height":"100%","items":[],"xtype":"fitpane","flex":1,"paneType":"fitpane"}',FALSE,0,NULL,'themes/common/images/adm-tools/Stacks64.png',TRUE,FALSE) +INSERT INTO DASHBOARD VALUES(325,0,FALSE,2,'978c8fea-f5bf-46ad-8bc4-707c15376745',FALSE,'App Components',1,'Administer the App Components in the system.',NULL,'2015-08-26 12:38:51.380000000',NULL,'2015-08-26 12:38:51.380000000','{"defaultSettings":{},"widgets":[{"region":"none","universalName":"org.ozoneplatform.owf.admin.appcomponentmanagement","buttonOpened":false,"zIndex":0,"minimized":false,"floatingWidget":false,"singleton":false,"width":1554,"buttonId":null,"intentConfig":null,"paneGuid":"49762ea2-42cc-9e76-b6be-c60bd7ae9c03","dashboardGuid":"2fc20999-01a6-4275-83f4-f7c68d03d938","collapsed":false,"uniqueId":"1b2c90ea-3b2b-4342-b7d5-7842f16da344","maximized":false,"height":973,"statePosition":1,"pinned":false,"name":"App Components","widgetGuid":"48edfe94-4291-4991-a648-c19a903a663b","launchData":null,"active":false,"y":33,"columnPos":0,"x":0}],"height":"100%","items":[],"xtype":"fitpane","flex":1,"paneType":"fitpane"}',FALSE,0,NULL,'themes/common/images/adm-tools/Widgets64.png',TRUE,FALSE) +INSERT INTO DASHBOARD VALUES(326,0,FALSE,3,'ce1fa2bb-b075-4873-8117-2b54419a6822',FALSE,'Users and Groups',1,'Administer the Users and Groups in the system.',NULL,'2015-08-26 12:38:51.432000000',NULL,'2015-08-26 12:38:51.432000000','{"cls":"hbox ","items":[{"defaultSettings":{"widgetStates":{"101f119e-b56a-4e16-8219-11048c020038":{"timestamp":1377274970150,"height":440,"width":581,"y":199,"x":94}}},"widgets":[{"region":"none","universalName":"org.ozoneplatform.owf.admin.usermanagement","buttonOpened":false,"zIndex":0,"minimized":false,"floatingWidget":false,"singleton":false,"width":775,"buttonId":null,"intentConfig":null,"paneGuid":"7f3657f1-b391-4ab5-f6be-e4393ea5d72d","dashboardGuid":"94bf7ed8-bed9-45ad-933b-4d85584cb483","collapsed":false,"uniqueId":"f6518c25-bf47-41bd-901e-60f5768913d6","maximized":false,"height":973,"statePosition":1,"pinned":false,"name":"Users","widgetGuid":"38070c45-5f6a-4460-810c-6e3496495ec4","launchData":null,"active":true,"y":33,"columnPos":0,"x":0}],"cls":"left","htmlText":"50%","items":[],"xtype":"fitpane","flex":1,"paneType":"fitpane"},{"xtype":"dashboardsplitter"},{"defaultSettings":{"widgetStates":{"d6ce3375-6e89-45ab-a7be-b6cf3abb0e8c":{"timestamp":1377274968504,"height":440,"width":581,"y":0,"x":0}}},"widgets":[{"region":"none","universalName":"org.ozoneplatform.owf.admin.groupmanagement","buttonOpened":false,"zIndex":0,"minimized":false,"floatingWidget":false,"singleton":false,"width":775,"buttonId":null,"intentConfig":null,"paneGuid":"e9746a83-a610-6b01-43c4-d543278729b4","dashboardGuid":"94bf7ed8-bed9-45ad-933b-4d85584cb483","collapsed":false,"uniqueId":"65b1409b-b46a-4f93-953d-9d032ae48359","maximized":false,"height":973,"statePosition":1,"pinned":false,"name":"Groups","widgetGuid":"53a2a879-442c-4012-9215-a17604dedff7","launchData":null,"active":true,"y":33,"columnPos":0,"x":779}],"cls":"right","htmlText":"50%","items":[],"xtype":"fitpane","flex":1,"paneType":"fitpane"}],"layout":{"align":"stretch","type":"hbox"},"xtype":"container","flex":1}',FALSE,0,NULL,'themes/common/images/adm-tools/Groups64.png',TRUE,FALSE) +INSERT INTO DASHBOARD VALUES(327,0,FALSE,4,'09f05042-a8ad-4b6b-b709-a4bed57a6af1',FALSE,'Configuration',1,'Administer the system configuration.',NULL,'2015-08-26 12:38:51.490000000',NULL,'2015-08-26 12:38:51.490000000','{"defaultSettings":{},"widgets":[{"region":"none","universalName":"org.ozoneplatform.owf.admin.configuration","buttonOpened":false,"zIndex":0,"minimized":false,"floatingWidget":false,"singleton":false,"width":1554,"buttonId":null,"intentConfig":null,"paneGuid":"7cd8017a-f948-7728-0e20-5b5c2182a432","dashboardGuid":"976cbf75-5537-410f-88a3-375c5cf970bc","collapsed":false,"uniqueId":"6add9a2b-931c-4b8e-8195-7ac74f667b47","maximized":false,"height":973,"statePosition":1,"pinned":false,"name":"Configuration","widgetGuid":"af180bfc-3924-4111-93de-ad6e9bfc060e","launchData":null,"active":false,"y":33,"columnPos":0,"x":0}],"height":"100%","items":[],"xtype":"fitpane","flex":1,"paneType":"fitpane"}',FALSE,0,NULL,'themes/common/images/adm-tools/Configuration64.png',TRUE,FALSE) +INSERT INTO DASHBOARD VALUES(328,0,FALSE,1,'e9887641-8717-4cc0-8d62-bca7093f7fab',FALSE,'Watch List',1,'This page demonstrates how intents work using company stock information.',NULL,'2015-08-26 12:38:51.539000000',NULL,'2015-08-26 12:38:51.539000000','{"height":"100%","cls":"vbox ","items":[{"cls":"hbox top","items":[{"defaultSettings":{},"widgets":[{"region":"none","buttonOpened":false,"zIndex":0,"minimized":false,"floatingWidget":false,"intentConfig":null,"uniqueId":"b9a6c83d-f638-402b-a425-39e9d8c738a9","height":538,"pinned":false,"name":"NYSE Widget","launchData":null,"widgetGuid":"fe137961-039d-e7a5-7050-d6eed7ac4782","columnPos":0,"columnOrder":"","singleton":false,"width":798,"buttonId":null,"paneGuid":"16ec8b84-a631-4e7c-d9cc-883635abd6ef","dashboardGuid":"3f59855b-d93e-dc03-c6ba-f4c33ea0177f","collapsed":false,"maximized":false,"statePosition":1,"background":false,"active":true,"y":34,"x":0}],"cls":"left","htmlText":"50%","items":[],"xtype":"fitpane","flex":1,"paneType":"fitpane"},{"xtype":"dashboardsplitter"},{"defaultSettings":{},"widgets":[{"region":"none","buttonOpened":false,"zIndex":0,"minimized":false,"floatingWidget":false,"intentConfig":null,"uniqueId":"7cc94b09-6860-4cec-9607-aaf9f4c4d247","height":538,"pinned":false,"name":"HTML Viewer","launchData":null,"widgetGuid":"cd5e77f8-cb28-8574-0a8a-a535bd2c7de4","columnPos":0,"columnOrder":"","singleton":false,"width":798,"buttonId":null,"paneGuid":"443dfdc0-7165-cb7d-dd9c-f08fbe36bdb1","dashboardGuid":"3f59855b-d93e-dc03-c6ba-f4c33ea0177f","collapsed":false,"maximized":false,"statePosition":1,"background":false,"active":false,"y":34,"x":802}],"cls":"right","htmlText":"50%","items":[],"xtype":"fitpane","flex":1,"paneType":"fitpane"}],"layout":{"align":"stretch","type":"hbox"},"xtype":"container","flex":1},{"xtype":"dashboardsplitter"},{"defaultSettings":{},"widgets":[{"region":"none","buttonOpened":false,"zIndex":0,"minimized":false,"floatingWidget":false,"intentConfig":null,"uniqueId":"a70f5b5c-9e05-4892-b07a-f9e995a4095a","height":539,"pinned":false,"name":"Stock Chart","launchData":null,"widgetGuid":"92078ac9-6f21-2f5f-6afc-bdc8c915c66d","columnPos":0,"columnOrder":"","singleton":false,"width":1600,"buttonId":null,"paneGuid":"410cd0ee-cbdd-f225-582e-6aaa92e058f2","dashboardGuid":"3f59855b-d93e-dc03-c6ba-f4c33ea0177f","collapsed":false,"maximized":false,"statePosition":1,"background":false,"active":false,"y":576,"x":0}],"cls":"bottom","htmlText":"50%","items":[],"xtype":"fitpane","flex":1,"paneType":"fitpane"}],"layout":{"align":"stretch","type":"vbox"},"xtype":"container"}',FALSE,1,NULL,NULL,TRUE,FALSE) +INSERT INTO DASHBOARD VALUES(329,0,FALSE,2,'e4e7a6d8-9472-4069-aac5-1efc19b0fdd6',FALSE,'Contacts',1,'This page demonstrates how intents work by sending addresses to a map.',NULL,'2015-08-26 12:38:51.604000000',NULL,'2015-08-26 12:38:51.604000000','{"cls":"hbox ","items":[{"defaultSettings":{"widgetStates":{"92448ba5-7f2b-982a-629e-9d621268b5e9":{"timestamp":1354747263555},"302c35c9-9ed8-d0b6-251c-ea1ed4d0c86b":{"timestamp":1354747263559},"d182002b-3de2-eb24-77be-95a7d08aa85b":{"timestamp":1354745224627}}},"widgets":[{"region":"none","universalName":"org.owfgoss.owf.examples.ContactsManager","buttonOpened":false,"zIndex":0,"minimized":false,"floatingWidget":false,"singleton":false,"width":419,"buttonId":null,"intentConfig":null,"paneGuid":"5c478b1d-ba1f-ef67-087c-c03b8dbc7bff","dashboardGuid":"f935e19e-09a1-451e-8b3d-0fb77537da7d","collapsed":false,"uniqueId":"2113e3d2-a7b7-4464-8717-c1b821d076b7","maximized":false,"height":448,"statePosition":1,"pinned":false,"name":"Contacts Manager","widgetGuid":"92448ba5-7f2b-982a-629e-9d621268b5e9","launchData":null,"active":false,"y":34,"columnPos":0,"x":0},{"region":"none","universalName":"org.owfgoss.owf.examples.GetDirections","buttonOpened":false,"zIndex":0,"minimized":false,"floatingWidget":false,"singleton":false,"width":419,"buttonId":null,"intentConfig":{},"paneGuid":"5c478b1d-ba1f-ef67-087c-c03b8dbc7bff","dashboardGuid":"f935e19e-09a1-451e-8b3d-0fb77537da7d","collapsed":false,"uniqueId":"07f35652-7195-4452-a849-e9cfac4ea61b","maximized":false,"height":447,"statePosition":2,"pinned":false,"name":"Directions","widgetGuid":"302c35c9-9ed8-d0b6-251c-ea1ed4d0c86b","launchData":null,"active":false,"y":482,"columnPos":0,"x":0}],"cls":"left","htmlText":"25%","items":[],"xtype":"accordionpane","flex":0.25,"paneType":"accordionpane"},{"xtype":"dashboardsplitter"},{"defaultSettings":{"widgetStates":{"eb81c029-a5b6-4107-885c-5e04b4770767":{"timestamp":1354747222264},"b87c4a3e-aa1e-499e-ba10-510f35388bb6":{"timestamp":1354746772856},"c3f3c8e0-e7aa-41c3-a655-aca3c940f828":{"timestamp":1354746826290},"eb5435cf-4021-4f2a-ba69-dde451d12551":{"timestamp":1354746684154},"ec5435cf-4021-4f2a-ba69-dde451d12551":{"timestamp":1354746684155},"d182002b-3de2-eb24-77be-95a7d08aa85b":{"timestamp":1354747263599},"d6ce3375-6e89-45ab-a7be-b6cf3abb0e8c":{"timestamp":1354747222261}}},"widgets":[{"region":"none","universalName":"org.owfgoss.owf.examples.GoogleMaps","buttonOpened":false,"zIndex":0,"minimized":false,"floatingWidget":false,"singleton":false,"width":1257,"buttonId":null,"intentConfig":null,"paneGuid":"a25052e4-cd5d-51c0-a440-81327fc1d955","dashboardGuid":"f935e19e-09a1-451e-8b3d-0fb77537da7d","collapsed":false,"uniqueId":"9df60441-eb3b-475c-94d0-2fc58b8e584e","maximized":false,"height":867,"statePosition":1,"pinned":false,"name":"Google Maps","widgetGuid":"d182002b-3de2-eb24-77be-95a7d08aa85b","launchData":null,"active":true,"y":62,"columnPos":0,"x":423}],"cls":"right","htmlText":"75%","items":[],"xtype":"tabbedpane","flex":0.75,"paneType":"tabbedpane"}],"layout":{"align":"stretch","type":"hbox"},"xtype":"container","flex":1}',FALSE,1,NULL,NULL,TRUE,FALSE) +INSERT INTO DASHBOARD VALUES(330,1,FALSE,0,'da07d146-a1f3-4c92-9874-4375cbfbb9f5',TRUE,'Sample',1,NULL,NULL,'2015-08-26 12:38:51.743000000',NULL,'2015-08-26 12:38:51.743000000','{"defaultSettings":{"widgetStates":{"eb5435cf-4021-4f2a-ba69-dde451d12551":{"timestamp":1348064183912,"height":250,"width":295,"y":7,"x":549},"ec5435cf-4021-4f2a-ba69-dde451d12551":{"timestamp":1348064185725,"height":383,"width":540,"y":5,"x":4}}},"widgets":[{"region":"none","buttonOpened":false,"zIndex":19120,"minimized":false,"floatingWidget":false,"singleton":false,"width":295,"buttonId":null,"intentConfig":null,"paneGuid":"f3712dc1-6e90-2469-8cb3-5b499937cac8","dashboardGuid":"905968f7-f94d-1c9b-431c-a05dc7bb68d1","uniqueId":"af9f28c2-e2d0-4edc-be68-d39086487b45","collapsed":false,"maximized":false,"height":250,"statePosition":2,"pinned":false,"background":false,"name":"Channel Shouter","launchData":null,"widgetGuid":"eb5435cf-4021-4f2a-ba69-dde451d12551","active":false,"y":7,"columnPos":0,"x":549},{"region":"none","buttonOpened":false,"zIndex":19130,"minimized":false,"floatingWidget":false,"singleton":false,"width":540,"buttonId":null,"intentConfig":null,"paneGuid":"f3712dc1-6e90-2469-8cb3-5b499937cac8","dashboardGuid":"905968f7-f94d-1c9b-431c-a05dc7bb68d1","uniqueId":"5c2dc3dd-ba69-420d-be5c-7ec823a032eb","collapsed":false,"maximized":false,"height":383,"statePosition":1,"pinned":false,"background":false,"name":"Channel Listener","launchData":null,"widgetGuid":"ec5435cf-4021-4f2a-ba69-dde451d12551","active":true,"y":5,"columnPos":0,"x":4}],"height":"100%","items":[],"xtype":"desktoppane","flex":1,"paneType":"desktoppane"}',FALSE,2,NULL,NULL,TRUE,FALSE) INSERT INTO DOMAIN_MAPPING VALUES(5,0,1,'dashboard','owns',3,'group') INSERT INTO DOMAIN_MAPPING VALUES(6,0,2,'dashboard','owns',3,'group') INSERT INTO DOMAIN_MAPPING VALUES(7,0,3,'dashboard','owns',3,'group') @@ -248,18 +256,35 @@ INSERT INTO DOMAIN_MAPPING VALUES(346,0,181,'widget_definition','owns',193,'grou INSERT INTO DOMAIN_MAPPING VALUES(347,0,182,'widget_definition','owns',193,'group') INSERT INTO DOMAIN_MAPPING VALUES(348,0,183,'widget_definition','owns',193,'group') INSERT INTO DOMAIN_MAPPING VALUES(349,0,321,'dashboard','owns',194,'group') +INSERT INTO DOMAIN_MAPPING VALUES(350,0,191,'widget_definition','owns',2,'group') +INSERT INTO DOMAIN_MAPPING VALUES(351,0,190,'widget_definition','owns',2,'group') +INSERT INTO DOMAIN_MAPPING VALUES(352,0,187,'widget_definition','owns',2,'group') +INSERT INTO DOMAIN_MAPPING VALUES(353,0,186,'widget_definition','owns',2,'group') +INSERT INTO DOMAIN_MAPPING VALUES(354,0,189,'widget_definition','owns',2,'group') +INSERT INTO DOMAIN_MAPPING VALUES(355,0,188,'widget_definition','owns',2,'group') +INSERT INTO DOMAIN_MAPPING VALUES(356,0,195,'widget_definition','owns',2,'group') +INSERT INTO DOMAIN_MAPPING VALUES(357,0,194,'widget_definition','owns',2,'group') +INSERT INTO DOMAIN_MAPPING VALUES(358,0,193,'widget_definition','owns',2,'group') +INSERT INTO DOMAIN_MAPPING VALUES(359,0,192,'widget_definition','owns',2,'group') +INSERT INTO DOMAIN_MAPPING VALUES(360,0,1,'dashboard','cloneOf',324,'dashboard') +INSERT INTO DOMAIN_MAPPING VALUES(361,0,2,'dashboard','cloneOf',325,'dashboard') +INSERT INTO DOMAIN_MAPPING VALUES(362,0,3,'dashboard','cloneOf',326,'dashboard') +INSERT INTO DOMAIN_MAPPING VALUES(363,0,4,'dashboard','cloneOf',327,'dashboard') +INSERT INTO DOMAIN_MAPPING VALUES(364,0,320,'dashboard','cloneOf',328,'dashboard') +INSERT INTO DOMAIN_MAPPING VALUES(365,0,323,'dashboard','cloneOf',329,'dashboard') +INSERT INTO DOMAIN_MAPPING VALUES(366,0,321,'dashboard','cloneOf',330,'dashboard') INSERT INTO OWF_GROUP VALUES(2,0,TRUE,'OWF Administrators',NULL,'OWF Administrators','active','OWF Administrators',FALSE) -INSERT INTO OWF_GROUP VALUES(3,0,FALSE,'',NULL,'9e05a814-c1a4-4db1-a672-bccae0f0b311','active','9e05a814-c1a4-4db1-a672-bccae0f0b311',TRUE) +INSERT INTO OWF_GROUP VALUES(3,1,FALSE,'',NULL,'9e05a814-c1a4-4db1-a672-bccae0f0b311','active','9e05a814-c1a4-4db1-a672-bccae0f0b311',TRUE) INSERT INTO OWF_GROUP VALUES(4,0,FALSE,'TestGroup1','testgroup1@group1.com','TestGroup1','active','TestGroup1',FALSE) INSERT INTO OWF_GROUP VALUES(5,0,FALSE,'TestGroup2','testgroup2@group2.com','TestGroup2','active','TestGroup2',FALSE) INSERT INTO OWF_GROUP VALUES(192,0,TRUE,'OWF Users',NULL,'OWF Users','active','OWF Users',FALSE) -INSERT INTO OWF_GROUP VALUES(193,0,FALSE,NULL,NULL,'ce86a612-c355-486e-9c9e-5252553cc58f','active',NULL,TRUE) -INSERT INTO OWF_GROUP VALUES(194,0,FALSE,'',NULL,'df51cb9b-f3d8-412e-af33-d064f81fb6c0','active',NULL,TRUE) +INSERT INTO OWF_GROUP VALUES(193,1,FALSE,NULL,NULL,'ce86a612-c355-486e-9c9e-5252553cc58f','active',NULL,TRUE) +INSERT INTO OWF_GROUP VALUES(194,1,FALSE,'',NULL,'df51cb9b-f3d8-412e-af33-d064f81fb6c0','active',NULL,TRUE) INSERT INTO OWF_GROUP_PEOPLE VALUES(4,1) INSERT INTO OWF_GROUP_PEOPLE VALUES(4,2) INSERT INTO OWF_GROUP_PEOPLE VALUES(5,1) INSERT INTO OWF_GROUP_PEOPLE VALUES(5,2) -INSERT INTO PERSON VALUES(1,0,'Test Administrator 1','testAdmin1@ozone3.test',FALSE,TRUE,NULL,NULL,'Test Admin 1','testAdmin1',NULL,TRUE) +INSERT INTO PERSON VALUES(1,3,'Test Administrator 1','testAdmin1@ozone3.test',FALSE,TRUE,'2015-08-26 12:38:47.079000000','2015-08-26 12:38:47.066000000','Test Admin 1','testAdmin1',NULL,FALSE) INSERT INTO PERSON VALUES(2,0,'Test User 1','testUser1@ozone3.test',FALSE,TRUE,NULL,NULL,'Test User 1','testUser1',NULL,TRUE) INSERT INTO PERSON VALUES(3,0,'Test User 2','testUser1@ozone3.test',FALSE,TRUE,NULL,NULL,'Test User 2','testUser2',NULL,TRUE) INSERT INTO PERSON VALUES(28,0,NULL,NULL,FALSE,TRUE,NULL,NULL,'DEFAULT_USER','DEFAULT_USER',NULL,FALSE) @@ -275,12 +300,33 @@ INSERT INTO PERSON_WIDGET_DEFINITION VALUES(75,0,3,14,TRUE,20,FALSE,FALSE,NULL,F INSERT INTO PERSON_WIDGET_DEFINITION VALUES(87,0,28,10,TRUE,16,FALSE,FALSE,NULL,FALSE,TRUE) INSERT INTO PERSON_WIDGET_DEFINITION VALUES(88,0,28,11,TRUE,17,FALSE,FALSE,NULL,FALSE,TRUE) INSERT INTO PERSON_WIDGET_DEFINITION VALUES(91,0,28,14,TRUE,20,FALSE,FALSE,NULL,FALSE,TRUE) +INSERT INTO PERSON_WIDGET_DEFINITION VALUES(198,0,1,14,TRUE,178,TRUE,FALSE,NULL,FALSE,FALSE) +INSERT INTO PERSON_WIDGET_DEFINITION VALUES(199,0,1,15,TRUE,179,TRUE,FALSE,NULL,FALSE,FALSE) +INSERT INTO PERSON_WIDGET_DEFINITION VALUES(200,0,1,16,TRUE,180,TRUE,FALSE,NULL,FALSE,FALSE) +INSERT INTO PERSON_WIDGET_DEFINITION VALUES(201,0,1,17,TRUE,181,TRUE,FALSE,NULL,FALSE,FALSE) +INSERT INTO PERSON_WIDGET_DEFINITION VALUES(202,0,1,18,TRUE,182,TRUE,FALSE,NULL,FALSE,FALSE) +INSERT INTO PERSON_WIDGET_DEFINITION VALUES(203,0,1,19,TRUE,183,TRUE,FALSE,NULL,FALSE,FALSE) +INSERT INTO PERSON_WIDGET_DEFINITION VALUES(204,0,1,20,TRUE,186,TRUE,FALSE,NULL,FALSE,FALSE) +INSERT INTO PERSON_WIDGET_DEFINITION VALUES(205,0,1,21,TRUE,187,TRUE,FALSE,NULL,FALSE,FALSE) +INSERT INTO PERSON_WIDGET_DEFINITION VALUES(206,0,1,22,TRUE,188,TRUE,FALSE,NULL,FALSE,FALSE) +INSERT INTO PERSON_WIDGET_DEFINITION VALUES(207,0,1,23,TRUE,189,TRUE,FALSE,NULL,FALSE,FALSE) +INSERT INTO PERSON_WIDGET_DEFINITION VALUES(208,0,1,24,TRUE,190,TRUE,FALSE,NULL,FALSE,FALSE) +INSERT INTO PERSON_WIDGET_DEFINITION VALUES(209,0,1,25,TRUE,191,TRUE,FALSE,NULL,FALSE,FALSE) +INSERT INTO PERSON_WIDGET_DEFINITION VALUES(210,0,1,26,TRUE,192,TRUE,FALSE,NULL,FALSE,FALSE) +INSERT INTO PERSON_WIDGET_DEFINITION VALUES(211,0,1,27,TRUE,193,TRUE,FALSE,NULL,FALSE,FALSE) +INSERT INTO PERSON_WIDGET_DEFINITION VALUES(212,0,1,28,TRUE,194,TRUE,FALSE,NULL,FALSE,FALSE) +INSERT INTO PERSON_WIDGET_DEFINITION VALUES(213,0,1,29,TRUE,195,TRUE,FALSE,NULL,FALSE,FALSE) INSERT INTO PREFERENCE VALUES(144,0,'foo.bar.0','test path entry 0',2,'foovalue') INSERT INTO PREFERENCE VALUES(145,0,'foo.bar.1','test path entry 1',2,'foovalue') INSERT INTO PREFERENCE VALUES(146,0,'foo.bar.0','test path entry 0',3,'foovalue') INSERT INTO PREFERENCE VALUES(147,0,'foo.bar.1','test path entry 1',3,'foovalue') INSERT INTO PREFERENCE VALUES(148,0,'foo.bar.0','test path entry 0',1,'foovalue') INSERT INTO PREFERENCE VALUES(149,0,'foo.bar.1','test path entry 1',1,'foovalue') +INSERT INTO PREFERENCE VALUES(150,0,'owf.admin.UserEditCopy','guid_to_launch',1,'a9bf8e71-692d-44e3-a465-5337ce5e725e') +INSERT INTO PREFERENCE VALUES(151,0,'owf.admin.WidgetEditCopy','guid_to_launch',1,'679294b3-ccc3-4ace-a061-e3f27ed86451') +INSERT INTO PREFERENCE VALUES(152,0,'owf.admin.GroupEditCopy','guid_to_launch',1,'dc5c2062-aaa8-452b-897f-60b4b55ab564') +INSERT INTO PREFERENCE VALUES(153,0,'owf.admin.DashboardEditCopy','guid_to_launch',1,'2445afb9-eb3f-4b79-acf8-6b12180921c3') +INSERT INTO PREFERENCE VALUES(154,0,'owf.admin.StackEditCopy','guid_to_launch',1,'72c382a3-89e7-4abf-94db-18db7779e1df') INSERT INTO ROLE VALUES(26,2,'ROLE_USER','User Role') INSERT INTO ROLE VALUES(27,1,'ROLE_ADMIN','Admin Role') INSERT INTO ROLE_PEOPLE VALUES(26,2) @@ -385,15 +431,12 @@ INSERT INTO WIDGET_DEF_INTENT_DATA_TYPES VALUES(303,308) INSERT INTO WIDGET_DEF_INTENT_DATA_TYPES VALUES(306,309) INSERT INTO WIDGET_DEF_INTENT_DATA_TYPES VALUES(305,310) INSERT INTO WIDGET_DEF_INTENT_DATA_TYPES VALUES(305,311) -INSERT INTO STACK VALUES(0,1,'Administration','This application collects the administrative components into a common set of application pages for managing system resources. These pages can be used to create, modify, update, and delete Apps, App Components, Users and Groups, and system configuration settings.','ef8b5d6f-4b16-4743-9a57-31683c94b616','themes/common/images/admin/64x64_admin_app.png',NULL,5,NULL,TRUE,NULL) -INSERT INTO STACK VALUES(1,0,'Investments','Sample app containing example investment pages.','investments',NULL,NULL,6,NULL,TRUE,NULL) -INSERT INTO STACK VALUES(2,0,'Sample',NULL,'908d934d-9d53-406c-8143-90b406fb508f',NULL,NULL,2,NULL,TRUE,NULL) +INSERT INTO STACK VALUES(0,2,'Administration','This application collects the administrative components into a common set of application pages for managing system resources. These pages can be used to create, modify, update, and delete Apps, App Components, Users and Groups, and system configuration settings.','ef8b5d6f-4b16-4743-9a57-31683c94b616','themes/common/images/admin/64x64_admin_app.png',NULL,5,NULL,TRUE,3) +INSERT INTO STACK VALUES(1,1,'Investments','Sample app containing example investment pages.','investments',NULL,NULL,6,NULL,TRUE,193) +INSERT INTO STACK VALUES(2,1,'Sample',NULL,'908d934d-9d53-406c-8143-90b406fb508f',NULL,NULL,2,NULL,TRUE,194) INSERT INTO STACK_GROUPS VALUES(2,0) -INSERT INTO STACK_GROUPS VALUES(3,0) INSERT INTO STACK_GROUPS VALUES(192,1) INSERT INTO STACK_GROUPS VALUES(192,2) -INSERT INTO STACK_GROUPS VALUES(193,1) -INSERT INTO STACK_GROUPS VALUES(194,2) INSERT INTO APPLICATION_CONFIGURATION VALUES(0,0,NULL,NULL,NULL,NULL,'owf.enable.cef.logging','true',' ',NULL,'Boolean','AUDITING',NULL,TRUE,1,NULL) INSERT INTO APPLICATION_CONFIGURATION VALUES(1,0,NULL,NULL,NULL,NULL,'owf.enable.cef.object.access.logging','false',' ',NULL,'Boolean','AUDITING',NULL,TRUE,2,NULL) INSERT INTO APPLICATION_CONFIGURATION VALUES(2,0,NULL,NULL,NULL,NULL,'owf.enable.cef.log.sweep','true',' ',NULL,'Boolean','AUDITING',NULL,TRUE,3,NULL) @@ -414,3 +457,5 @@ INSERT INTO APPLICATION_CONFIGURATION VALUES(16,0,NULL,NULL,NULL,NULL,'owf.custo INSERT INTO APPLICATION_CONFIGURATION VALUES(17,0,NULL,NULL,NULL,NULL,'owf.custom.css',NULL,' ',NULL,'String','BRANDING','Custom Header and Footer',TRUE,5,NULL) INSERT INTO APPLICATION_CONFIGURATION VALUES(18,0,NULL,NULL,NULL,NULL,'owf.custom.jss',NULL,' ',NULL,'String','BRANDING','Custom Header and Footer',TRUE,6,NULL) INSERT INTO APPLICATION_CONFIGURATION VALUES(19,0,NULL,NULL,NULL,NULL,'free.warning.content',NULL,' ',NULL,'String','BRANDING',NULL,TRUE,1,NULL) +INSERT INTO PERSON_ROLE VALUES(1,27) +INSERT INTO PERSON_ROLE VALUES(1,26)