[CONF] Apache Syncope > [DISCUSS] Apache Syncope 3.0 Architecture
Title: Message Title There's 1 new edit on this page [DISCUSS] Apache Syncope 3.0 Architecture Francesco Chicchiricco edited this page Here's what changed: Info This page contains topics supporting ongoing discussion at d...@syncope.apache.org. Compared to 2.1, a major architectural refactoring is proposed, with the following objectives: ... Go to page history View page Stop watching space • Manage notifications This message was sent by Atlassian Confluence 6.9.0
[CONF] Apache Syncope > [DISCUSS] Apache Syncope 3.0 Architecture
Title: Message Title There's 1 new edit on this page [DISCUSS] Apache Syncope 3.0 Architecture Francesco Chicchiricco edited this page Here's what changed: ... introduce a new, flexible UI for web access (Weblogin), which will replace the existing login forms for Admin Console and Enduser UI adapt to the configured Access Management features, i.e. if a given deployment supports a certain SAML 2.0 IdP or OpenID Connect Provider, then the login form will adapt accordingly if a given deployment requires MFA, the login form will handle the flow introduce a new component (APIGW), which will provide API gateway features introduce a new component (Keymaster) with purpose of coordinating all the other components, centralizing common configuration required by all domains; this will allow to go beyond the current multi-tenancy approach which requires a pre-existing Master domain and the need to handle off-line each domain's configuration split the existing features set into three subsets, so that any given deployment will pick only what required: idrepo - everything needed to manage identities as a repository: mainly, CRUD operations on Users, Groups and Any Objects idm - the provisioning features required to propagate, push and pull identities back and forth to External Resources am - the authentication and authorization features - mostly to build on top of existing libraries Drawio border true viewerToolbar true fitWindow false diagramName Apache Syncope 3.0 Architecture simpleViewer false width diagramWidth 1232 revision 3 Discussion items CLI was deliberately not included in the diagram above: since its introduction in 2.0, no usage at all was reported - maintenance cost does not appear worthwhile Enduser UI is currently implemented as AngularJS + Wicket application - but the AngularJS code appears somehow "disconnected" from the rest, and it has always been quite troublesome to troubleshoot - proposal is to rebuild as a pure Wicket application, maximizing re-use of components already working in Admin Console Keymaster shall be based on existing Open Source products as Apache Zookeper or Consul whilst in 2.1 all applications are built as Java EE, it could be the case to switch to a more microservice-friendly approach: if so, shall we base on Spring Boot PRO easy to migrate (being the current code Spring-based) widely adopted (status quo) can be easily converted to WAR, allowing traditional deployment in existing environments CONS not real microservice, mostly an embedded Tomcat Eclipse Microprofile PRO promising approach, lot of rumors and buzz around microservice native CONS major rewrite needed in case Spring and / or CXF cannot be re-used different implementations available, not as stable and widespread as their Java EE counterparts Go to page history View page Stop watching space • Manage notifications This message was sent by Atlassian Confluence 6.9.0
[CONF] Apache Syncope > [DISCUSS] Apache Syncope 3.0 Architecture
Title: Message Title There's 1 new edit on this page [DISCUSS] Apache Syncope 3.0 Architecture Francesco Chicchiricco edited this page Here's what changed: ... introduce a new, flexible UI for web access (Weblogin), which will replace the existing login forms for Admin Console and Enduser UI adapt to the configured Access Management features, i.e. if a given deployment supports a certain SAML 2.0 IdP or OpenID Connect Provider, then the login form will adapt accordingly if a given deployment requires MFA, the login form will handle the flow introduce a new component (APIGW), which will provide API gateway features introduce a new component (Keymaster) with purpose of coordinating all the other components, centralizing common configuration required by all domains; this will allow to go beyond the current multi-tenancy approach which requires a pre-existing Master domain and the need to handle off-line each domain's configuration split the existing features set into three subsets, so that any given deployment will pick only what required: idrepo - everything needed to manage identities as a repository: mainly, CRUD operations on Users, Groups and Any Objects idm - the provisioning features required to propagate, push and pull identities back and forth to External Resources am - the authentication and authorization features - mostly to build on top of existing libraries Drawio border true viewerToolbar true fitWindow false diagramName Apache Syncope 3.0 Architecture simpleViewer false width diagramWidth 10031232 revision 23 Go to page history View page Stop watching space • Manage notifications This message was sent by Atlassian Confluence 6.9.0
[CONF] Apache Syncope > [DISCUSS] Apache Syncope 3.0 Architecture
Title: Message Title There's 1 new edit on this page [DISCUSS] Apache Syncope 3.0 Architecture Francesco Chicchiricco edited this page Here's what changed: Compared to 2.1, a major architectural refactoring is proposed, with the following objectives: introduce a new, flexible UI for web access (Weblogin), which will replace the existing login forms for Admin Console and Enduser UI adapt to the configured Access Management features, i.e. if a given deployment supports a certain SAML 2.0 IdP or OpenID Connect Provider, then the login form will adapt accordingly if a given deployment requires MFA, the login form will handle the flow introduce a new component (Keymaster) with purpose of coordinating all the other components, centralizing common configuration required by all domains; this will allow to go beyond the current multi-tenancy approach which requires a pre-existing Master domain and the need to handle off-line each domain's configuration split the features set into three subsets, so that any given deployment will pick only what required: idrepo - everything needed to manage identities as a repository: mainly, CRUD operations on Users, Groups and Any Objects idm - the provisioning features required to propagate, push and pull identities back and forth to External Resources am - the authentication and authorization features - mostly to build on top of existing libraries Drawio border true viewerToolbar true fitWindow false diagramName Apache Syncope 3.0 Architecture simpleViewer false width diagramWidth 1003 revision 12 Go to page history View page Stop watching space • Manage notifications This message was sent by Atlassian Confluence 6.9.0
[CONF] Apache Syncope > Roadmap
Title: Message Title There's 1 new edit on this page Roadmap Francesco Chicchiricco edited this page Here's what changed: ... Table of Contents maxLevel 2 style decimal 2.1.0 (Fusion) Issues See updated list on project's JIRA. [SYNCOPE-129] Delegation [SYNCOPE-152] Support SCIM REST API [SYNCOPE-534] OAuth 2.0 Service Provider [SYNCOPE-699] Apache Shiro integration [SYNCOPE-956] Allow for scripted customizations [SYNCOPE-957] Multiaccount 3.0.0 (Maggiore) Issues See updated list on project's JIRA. [SYNCOPE-161] Pluggable authentication modules [SYNCOPE-162] PDC-based authentication [SYNCOPE-163] Authentication chain [SYNCOPE-165] One-time password [SYNCOPE-167] Resource access policies [SYNCOPE-957] Multiaccount [SYNCOPE-129] Delegation [SYNCOPE-534] OAuth 2.0 Service Provider 4.0.0 (Notturno) Issues See updated list on project's JIRA. ... Go to page history View page Stop watching space • Manage notifications This message was sent by Atlassian Confluence 6.9.0
[syncope] branch 2_1_X updated: Upgrading modernizer-maven-plugin
This is an automated email from the ASF dual-hosted git repository. ilgrosso pushed a commit to branch 2_1_X in repository https://gitbox.apache.org/repos/asf/syncope.git The following commit(s) were added to refs/heads/2_1_X by this push: new 442faf5 Upgrading modernizer-maven-plugin 442faf5 is described below commit 442faf5688b5443e53c8aba2de0d2299ca89c11e Author: Francesco Chicchiriccò AuthorDate: Mon Dec 3 14:50:56 2018 +0100 Upgrading modernizer-maven-plugin --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 25df74d..e26fd18 100644 --- a/pom.xml +++ b/pom.xml @@ -2072,7 +2072,7 @@ under the License. org.gaul modernizer-maven-plugin -1.7.0 +1.7.1 ${targetJdk}
[syncope] branch master updated: Upgrading modernizer-maven-plugin
This is an automated email from the ASF dual-hosted git repository. ilgrosso pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/syncope.git The following commit(s) were added to refs/heads/master by this push: new 2aee00d Upgrading modernizer-maven-plugin 2aee00d is described below commit 2aee00d9e85b718d122778725c684b9733922785 Author: Francesco Chicchiriccò AuthorDate: Mon Dec 3 14:50:56 2018 +0100 Upgrading modernizer-maven-plugin --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 019bd2f..7d26aab 100644 --- a/pom.xml +++ b/pom.xml @@ -2072,7 +2072,7 @@ under the License. org.gaul modernizer-maven-plugin -1.7.0 +1.7.1 ${targetJdk}
[syncope] branch 2_0_X updated: Excluding transitive dependencies for wicket-bootstrap-core to avoid conflicts with wicket deps
This is an automated email from the ASF dual-hosted git repository. ilgrosso pushed a commit to branch 2_0_X in repository https://gitbox.apache.org/repos/asf/syncope.git The following commit(s) were added to refs/heads/2_0_X by this push: new 6c8654e Excluding transitive dependencies for wicket-bootstrap-core to avoid conflicts with wicket deps 6c8654e is described below commit 6c8654eef45a57a43bb811ec592a59ba3a599326 Author: Francesco Chicchiriccò AuthorDate: Mon Dec 3 14:20:22 2018 +0100 Excluding transitive dependencies for wicket-bootstrap-core to avoid conflicts with wicket deps --- pom.xml | 10 ++ 1 file changed, 10 insertions(+) diff --git a/pom.xml b/pom.xml index bafe152..75d86b9 100644 --- a/pom.xml +++ b/pom.xml @@ -1360,6 +1360,16 @@ under the License. de.agilecoders.wicket wicket-bootstrap-core ${wicket-bootstrap.version} + + +org.apache.wicket +wicket-request + + +org.apache.wicket +wicket-util + + de.agilecoders.wicket
[syncope] 01/01: [SYNCOPE-1400] Adding support for MySQL 8 via OpenJPA 3.0.1 + [SYNCOPE-1401] Adding support for MySQL with JSON type
This is an automated email from the ASF dual-hosted git repository. ilgrosso pushed a commit to branch SYNCOPE-1400_SYNCOPE-1401 in repository https://gitbox.apache.org/repos/asf/syncope.git commit 25dfcc05994b11fe4b33cb8458b2bd57cd93e4d9 Author: Francesco Chicchiriccò AuthorDate: Mon Dec 3 13:18:36 2018 +0100 [SYNCOPE-1400] Adding support for MySQL 8 via OpenJPA 3.0.1 + [SYNCOPE-1401] Adding support for MySQL with JSON type --- core/persistence-jpa-json/pom.xml | 129 ++--- ...AJSONAnyDAO.java => AbstractJPAJSONAnyDAO.java} | 81 ++ .../jpa/dao/AbstractJPAJSONAnySearchDAO.java | 125 + .../core/persistence/jpa/dao/MyJPAJSONAnyDAO.java | 120 ...nySearchDAO.java => MyJPAJSONAnySearchDAO.java} | 131 ++--- .../core/persistence/jpa/dao/PGJPAJSONAnyDAO.java | 305 ++--- .../persistence/jpa/dao/PGJPAJSONAnySearchDAO.java | 110 +--- .../jpa/entity/JPAJSONEntityFactory.java | 3 +- .../jpa/entity/MyJPAJSONEntityFactory.java | 37 +++ .../main/resources/META-INF/spring-orm-myjson.xml | 137 + .../resources/myjson}/domains/Master.properties| 10 +- .../src/main/resources/myjson/indexes.xml | 58 .../main/resources/myjson/persistence.properties | 23 +- .../src/main/resources/myjson/views.xml| 181 .../{pgjsonb => }/domains/MasterContent.xml| 0 .../core/persistence/jpa/dao/JPAAnySearchDAO.java | 4 + .../main/resources/audit/audit_mysql_innodb.sql| 2 +- .../core/persistence/jpa/inner/AnyTypeTest.java| 2 + fit/core-reference/pom.xml | 168 +++- .../{mysql => myjson}/domains/Master.properties| 10 +- .../{mysql => myjson}/provisioning.properties | 2 +- .../main/resources/mysql/domains/Master.properties | 8 +- .../main/resources/mysql/provisioning.properties | 2 +- pom.xml| 5 +- 24 files changed, 1035 insertions(+), 618 deletions(-) diff --git a/core/persistence-jpa-json/pom.xml b/core/persistence-jpa-json/pom.xml index dfd7bb2..0331a27 100644 --- a/core/persistence-jpa-json/pom.xml +++ b/core/persistence-jpa-json/pom.xml @@ -227,10 +227,6 @@ under the License. true -src/test/resources/pgjsonb -true - - src/main/resources true @@ -243,62 +239,119 @@ under the License. - sqlgen - - -true - + mysql + + + mysql + mysql-connector-java + ${jdbc.mysql.version} + test + + + clean verify -org.apache.openjpa -openjpa-maven-plugin -true +org.codehaus.mojo +build-helper-maven-plugin -sqlgen -process-classes +add-test-source +generate-test-sources - sql + add-test-source + + + ${basedir}/../persistence-jpa/src/test/java + + - - - - - - - schemagen - - -true - + - -clean verify - - -org.apache.openjpa -openjpa-maven-plugin -true +org.apache.maven.plugins +maven-surefire-plugin + + true + + + +org.apache.maven.plugins +maven-failsafe-plugin + + +**/*Test.java + + multitenancy,plainAttrTable + + + + +io.fabric8 +docker-maven-plugin + + + + mysql/mysql-server:${docker.mysql.version} + +--skip-log-bin --server-id=1 + + password + syncope + syncope + syncope + + + 3306:3306 + + + MySQL init process done. Ready for start up. + 3 + + + + + -schemagen -process-classes +start-mysql +pre-integration-test + + start + + + +
[syncope] branch SYNCOPE-1400_SYNCOPE-1401 created (now 25dfcc0)
This is an automated email from the ASF dual-hosted git repository. ilgrosso pushed a change to branch SYNCOPE-1400_SYNCOPE-1401 in repository https://gitbox.apache.org/repos/asf/syncope.git. at 25dfcc0 [SYNCOPE-1400] Adding support for MySQL 8 via OpenJPA 3.0.1 + [SYNCOPE-1401] Adding support for MySQL with JSON type This branch includes the following new commits: new 25dfcc0 [SYNCOPE-1400] Adding support for MySQL 8 via OpenJPA 3.0.1 + [SYNCOPE-1401] Adding support for MySQL with JSON type The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference.
[syncope] 01/03: [SYNCOPE-1406] Flowable local directory was changed by SYNCOPE-1369
This is an automated email from the ASF dual-hosted git repository. ilgrosso pushed a commit to branch 2_1_X in repository https://gitbox.apache.org/repos/asf/syncope.git commit 09e9ec99cd1dba9917927cbd39f8a5f5ded8dbe8 Author: Francesco Chicchiriccò AuthorDate: Mon Dec 3 12:59:03 2018 +0100 [SYNCOPE-1406] Flowable local directory was changed by SYNCOPE-1369 --- deb/core/pom.xml | 12 ++-- 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/deb/core/pom.xml b/deb/core/pom.xml index 9c0f0af..45f8f71 100644 --- a/deb/core/pom.xml +++ b/deb/core/pom.xml @@ -160,19 +160,19 @@ under the License. true - ${basedir}/../../core/workflow-flowable/src/main/resources + ${basedir}/../../core/provisioning-java/src/main/resources - workflow.properties - userWorkflow.bpmn20.xml + mail.properties + connid.properties ${project.build.directory}/etc true - ${basedir}/../../core/provisioning-java/src/main/resources + ${basedir}/../../ext/flowable/flowable-bpmn/src/main/resources - mail.properties - connid.properties + workflow.properties + userWorkflow.bpmn20.xml ${project.build.directory}/etc true
[syncope] 01/03: [SYNCOPE-1406] Flowable local directory was changed by SYNCOPE-1369
This is an automated email from the ASF dual-hosted git repository. ilgrosso pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/syncope.git commit 34de818e2d7b55c3a50150283cbe320df307d526 Author: Francesco Chicchiriccò AuthorDate: Mon Dec 3 12:59:03 2018 +0100 [SYNCOPE-1406] Flowable local directory was changed by SYNCOPE-1369 --- deb/core/pom.xml | 12 ++-- 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/deb/core/pom.xml b/deb/core/pom.xml index 910cc30..b815ce0 100644 --- a/deb/core/pom.xml +++ b/deb/core/pom.xml @@ -160,19 +160,19 @@ under the License. true - ${basedir}/../../core/workflow-flowable/src/main/resources + ${basedir}/../../core/provisioning-java/src/main/resources - workflow.properties - userWorkflow.bpmn20.xml + mail.properties + connid.properties ${project.build.directory}/etc true - ${basedir}/../../core/provisioning-java/src/main/resources + ${basedir}/../../ext/flowable/flowable-bpmn/src/main/resources - mail.properties - connid.properties + workflow.properties + userWorkflow.bpmn20.xml ${project.build.directory}/etc true
[syncope] 02/03: Aligning DB versions
This is an automated email from the ASF dual-hosted git repository. ilgrosso pushed a commit to branch 2_1_X in repository https://gitbox.apache.org/repos/asf/syncope.git commit f1d7cf66676ccad0f0f446ea3e9ba697629313d8 Author: Francesco Chicchiriccò AuthorDate: Mon Dec 3 12:59:57 2018 +0100 Aligning DB versions --- docker/src/main/resources/docker-compose/docker-compose-mariadb.yml| 2 +- docker/src/main/resources/docker-compose/docker-compose-postgresql.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/docker/src/main/resources/docker-compose/docker-compose-mariadb.yml b/docker/src/main/resources/docker-compose/docker-compose-mariadb.yml index 65851bb..3f15b25 100644 --- a/docker/src/main/resources/docker-compose/docker-compose-mariadb.yml +++ b/docker/src/main/resources/docker-compose/docker-compose-mariadb.yml @@ -21,7 +21,7 @@ version: '3.3' services: db: - image: mariadb:10.3.7 + image: mariadb:10.4 restart: always environment: MYSQL_ROOT_PASSWORD: password diff --git a/docker/src/main/resources/docker-compose/docker-compose-postgresql.yml b/docker/src/main/resources/docker-compose/docker-compose-postgresql.yml index 9eb7ba7..5e36ec0 100644 --- a/docker/src/main/resources/docker-compose/docker-compose-postgresql.yml +++ b/docker/src/main/resources/docker-compose/docker-compose-postgresql.yml @@ -21,7 +21,7 @@ version: '3.3' services: db: - image: postgres:latest + image: postgres:11.1 restart: always environment: POSTGRES_DB: syncope
[syncope] branch 2_0_X updated: [SYNCOPE-1405] Managing views.xml depending on the actual DBMS
This is an automated email from the ASF dual-hosted git repository. ilgrosso pushed a commit to branch 2_0_X in repository https://gitbox.apache.org/repos/asf/syncope.git The following commit(s) were added to refs/heads/2_0_X by this push: new e291d60 [SYNCOPE-1405] Managing views.xml depending on the actual DBMS e291d60 is described below commit e291d602925959e81cb821916bfa9a29030f515c Author: Francesco Chicchiriccò AuthorDate: Mon Dec 3 13:00:28 2018 +0100 [SYNCOPE-1405] Managing views.xml depending on the actual DBMS --- docker/core/src/main/resources/Dockerfile | 1 + docker/core/src/main/resources/startup.sh | 6 +- docker/core/src/main/resources/views.xml.mariadb | 268 + docker/core/src/main/resources/views.xml.mssql | 268 + docker/core/src/main/resources/views.xml.mysql | 268 + .../core/src/main/resources/views.xml.postgresql | 268 + 6 files changed, 1077 insertions(+), 2 deletions(-) diff --git a/docker/core/src/main/resources/Dockerfile b/docker/core/src/main/resources/Dockerfile index ae5f045..656019f 100644 --- a/docker/core/src/main/resources/Dockerfile +++ b/docker/core/src/main/resources/Dockerfile @@ -25,6 +25,7 @@ COPY *.jar /tmp/ COPY *.deb /tmp/ COPY provisioning.properties.* /etc/apache-syncope/ +COPY views.xml.* /etc/apache-syncope/ COPY *.properties /etc/apache-syncope/ COPY Master.properties.* /etc/apache-syncope/domains/ diff --git a/docker/core/src/main/resources/startup.sh b/docker/core/src/main/resources/startup.sh index 4d70229..8c11ad9 100755 --- a/docker/core/src/main/resources/startup.sh +++ b/docker/core/src/main/resources/startup.sh @@ -18,11 +18,13 @@ # under the License. cd /etc/apache-syncope -rm provisioning.properties +rm -f provisioning.properties ln -s provisioning.properties.$DBMS provisioning.properties +rm -f views.xml +ln -s views.xml.$DBMS views.xml cd domains -rm Master.properties +rm -f Master.properties ln -s Master.properties.$DBMS Master.properties /etc/init.d/tomcat8 start diff --git a/docker/core/src/main/resources/views.xml.mariadb b/docker/core/src/main/resources/views.xml.mariadb new file mode 100644 index 000..e8e9a21 --- /dev/null +++ b/docker/core/src/main/resources/views.xml.mariadb @@ -0,0 +1,268 @@ + + +http://java.sun.com/dtd/properties.dtd;> + + + +CREATE TABLE UDynGroupMembers( +any_id CHAR(36), +group_id CHAR(36), +UNIQUE(any_id, group_id)) + + +CREATE TABLE ADynGroupMembers( +anyType_id VARCHAR(255), +any_id CHAR(36), +group_id CHAR(36), +UNIQUE(anyType_id, any_id, group_id)) + + +CREATE TABLE DynRoleMembers( +any_id CHAR(36), +role_id VARCHAR(255), +UNIQUE(any_id, role_id)) + + +CREATE TABLE DynRealmMembers( +any_id CHAR(36), +dynRealm_id VARCHAR(255), +UNIQUE(any_id, dynRealm_id)) + + + + +CREATE VIEW user_search AS + +SELECT u.id as any_id, u.* FROM SyncopeUser u + + +CREATE VIEW user_search_unique_attr AS + +SELECT ua.owner_id AS any_id, +ua.schema_id AS schema_id, +uav.booleanvalue AS booleanvalue, +uav.datevalue AS datevalue, +uav.doublevalue AS doublevalue, +uav.longvalue AS longvalue, +uav.stringvalue AS stringvalue +FROM UPlainAttrUniqueValue uav, UPlainAttr ua +WHERE uav.attribute_id = ua.id + + +CREATE VIEW user_search_attr AS + +SELECT ua.owner_id AS any_id, +ua.schema_id AS schema_id, +uav.booleanvalue AS booleanvalue, +uav.datevalue AS datevalue, +uav.doublevalue AS doublevalue, +uav.longvalue AS longvalue, +uav.stringvalue AS stringvalue +FROM UPlainAttrValue uav, UPlainAttr ua +WHERE uav.attribute_id = ua.id + + +CREATE VIEW user_search_null_attr AS + +SELECT u.id AS any_id, +PlainSchema.id AS schema_id, +NULL AS booleanvalue, +NULL AS datevalue, +NULL AS doublevalue, +NULL AS longvalue, +NULL AS stringvalue +FROM SyncopeUser u CROSS JOIN PlainSchema +LEFT OUTER JOIN UPlainAttr ua ON (PlainSchema.id = ua.schema_id AND ua.owner_id = u.id) +WHERE ua.id IS NULL + + +CREATE VIEW user_search_urelationship AS + +SELECT m.user_id AS any_id, m.anyObject_id AS right_any_id, m.type_id AS type +FROM URelationship m + + +CREATE VIEW user_search_umembership AS + +SELECT m.user_id AS any_id, g.id AS group_id, g.name AS group_name +FROM UMembership m, SyncopeGroup g +WHERE m.group_id = g.id + + +CREATE VIEW user_search_role AS + +SELECT ss.user_id AS any_id, ss.role_id AS role_id +FROM SyncopeUser_SyncopeRole ss + + +CREATE VIEW user_search_priv AS + +SELECT ss.user_id AS any_id, sp.privilege_id AS privilege_id +FROM SyncopeUser_SyncopeRole ss, SyncopeRole_Privilege sp +WHERE ss.role_id = sp.role_id + + +CREATE VIEW user_search_dynpriv AS + +SELECT any_id,
[syncope] 02/03: Aligning DB versions
This is an automated email from the ASF dual-hosted git repository. ilgrosso pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/syncope.git commit 8a35832197036b8b96f4d21f6890fb5e7f2cbb6c Author: Francesco Chicchiriccò AuthorDate: Mon Dec 3 12:59:57 2018 +0100 Aligning DB versions --- docker/src/main/resources/docker-compose/docker-compose-mariadb.yml| 2 +- docker/src/main/resources/docker-compose/docker-compose-postgresql.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/docker/src/main/resources/docker-compose/docker-compose-mariadb.yml b/docker/src/main/resources/docker-compose/docker-compose-mariadb.yml index 65851bb..3f15b25 100644 --- a/docker/src/main/resources/docker-compose/docker-compose-mariadb.yml +++ b/docker/src/main/resources/docker-compose/docker-compose-mariadb.yml @@ -21,7 +21,7 @@ version: '3.3' services: db: - image: mariadb:10.3.7 + image: mariadb:10.4 restart: always environment: MYSQL_ROOT_PASSWORD: password diff --git a/docker/src/main/resources/docker-compose/docker-compose-postgresql.yml b/docker/src/main/resources/docker-compose/docker-compose-postgresql.yml index 9eb7ba7..5e36ec0 100644 --- a/docker/src/main/resources/docker-compose/docker-compose-postgresql.yml +++ b/docker/src/main/resources/docker-compose/docker-compose-postgresql.yml @@ -21,7 +21,7 @@ version: '3.3' services: db: - image: postgres:latest + image: postgres:11.1 restart: always environment: POSTGRES_DB: syncope
[syncope] 03/03: [SYNCOPE-1405] Managing views.xml depending on the actual DBMS
This is an automated email from the ASF dual-hosted git repository. ilgrosso pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/syncope.git commit 569b1b322f0364bc865902d595846a613f393b7a Author: Francesco Chicchiriccò AuthorDate: Mon Dec 3 13:00:28 2018 +0100 [SYNCOPE-1405] Managing views.xml depending on the actual DBMS --- docker/core/src/main/resources/Dockerfile | 1 + docker/core/src/main/resources/startup.sh | 6 +- docker/core/src/main/resources/views.xml.mariadb | 268 + docker/core/src/main/resources/views.xml.mssql | 268 + docker/core/src/main/resources/views.xml.mysql | 268 + .../core/src/main/resources/views.xml.postgresql | 268 + 6 files changed, 1077 insertions(+), 2 deletions(-) diff --git a/docker/core/src/main/resources/Dockerfile b/docker/core/src/main/resources/Dockerfile index ae5f045..656019f 100644 --- a/docker/core/src/main/resources/Dockerfile +++ b/docker/core/src/main/resources/Dockerfile @@ -25,6 +25,7 @@ COPY *.jar /tmp/ COPY *.deb /tmp/ COPY provisioning.properties.* /etc/apache-syncope/ +COPY views.xml.* /etc/apache-syncope/ COPY *.properties /etc/apache-syncope/ COPY Master.properties.* /etc/apache-syncope/domains/ diff --git a/docker/core/src/main/resources/startup.sh b/docker/core/src/main/resources/startup.sh index 4d70229..8c11ad9 100755 --- a/docker/core/src/main/resources/startup.sh +++ b/docker/core/src/main/resources/startup.sh @@ -18,11 +18,13 @@ # under the License. cd /etc/apache-syncope -rm provisioning.properties +rm -f provisioning.properties ln -s provisioning.properties.$DBMS provisioning.properties +rm -f views.xml +ln -s views.xml.$DBMS views.xml cd domains -rm Master.properties +rm -f Master.properties ln -s Master.properties.$DBMS Master.properties /etc/init.d/tomcat8 start diff --git a/docker/core/src/main/resources/views.xml.mariadb b/docker/core/src/main/resources/views.xml.mariadb new file mode 100644 index 000..e8e9a21 --- /dev/null +++ b/docker/core/src/main/resources/views.xml.mariadb @@ -0,0 +1,268 @@ + + +http://java.sun.com/dtd/properties.dtd;> + + + +CREATE TABLE UDynGroupMembers( +any_id CHAR(36), +group_id CHAR(36), +UNIQUE(any_id, group_id)) + + +CREATE TABLE ADynGroupMembers( +anyType_id VARCHAR(255), +any_id CHAR(36), +group_id CHAR(36), +UNIQUE(anyType_id, any_id, group_id)) + + +CREATE TABLE DynRoleMembers( +any_id CHAR(36), +role_id VARCHAR(255), +UNIQUE(any_id, role_id)) + + +CREATE TABLE DynRealmMembers( +any_id CHAR(36), +dynRealm_id VARCHAR(255), +UNIQUE(any_id, dynRealm_id)) + + + + +CREATE VIEW user_search AS + +SELECT u.id as any_id, u.* FROM SyncopeUser u + + +CREATE VIEW user_search_unique_attr AS + +SELECT ua.owner_id AS any_id, +ua.schema_id AS schema_id, +uav.booleanvalue AS booleanvalue, +uav.datevalue AS datevalue, +uav.doublevalue AS doublevalue, +uav.longvalue AS longvalue, +uav.stringvalue AS stringvalue +FROM UPlainAttrUniqueValue uav, UPlainAttr ua +WHERE uav.attribute_id = ua.id + + +CREATE VIEW user_search_attr AS + +SELECT ua.owner_id AS any_id, +ua.schema_id AS schema_id, +uav.booleanvalue AS booleanvalue, +uav.datevalue AS datevalue, +uav.doublevalue AS doublevalue, +uav.longvalue AS longvalue, +uav.stringvalue AS stringvalue +FROM UPlainAttrValue uav, UPlainAttr ua +WHERE uav.attribute_id = ua.id + + +CREATE VIEW user_search_null_attr AS + +SELECT u.id AS any_id, +PlainSchema.id AS schema_id, +NULL AS booleanvalue, +NULL AS datevalue, +NULL AS doublevalue, +NULL AS longvalue, +NULL AS stringvalue +FROM SyncopeUser u CROSS JOIN PlainSchema +LEFT OUTER JOIN UPlainAttr ua ON (PlainSchema.id = ua.schema_id AND ua.owner_id = u.id) +WHERE ua.id IS NULL + + +CREATE VIEW user_search_urelationship AS + +SELECT m.user_id AS any_id, m.anyObject_id AS right_any_id, m.type_id AS type +FROM URelationship m + + +CREATE VIEW user_search_umembership AS + +SELECT m.user_id AS any_id, g.id AS group_id, g.name AS group_name +FROM UMembership m, SyncopeGroup g +WHERE m.group_id = g.id + + +CREATE VIEW user_search_role AS + +SELECT ss.user_id AS any_id, ss.role_id AS role_id +FROM SyncopeUser_SyncopeRole ss + + +CREATE VIEW user_search_priv AS + +SELECT ss.user_id AS any_id, sp.privilege_id AS privilege_id +FROM SyncopeUser_SyncopeRole ss, SyncopeRole_Privilege sp +WHERE ss.role_id = sp.role_id + + +CREATE VIEW user_search_dynpriv AS + +SELECT any_id, privilege_id +FROM DynRoleMembers drm, SyncopeRole_Privilege rp +WHERE drm.role_id = rp.role_id + + +CREATE VIEW user_search_resource AS + +SELECT st.user_id AS
[syncope] branch master updated (2bbea2d -> 569b1b3)
This is an automated email from the ASF dual-hosted git repository. ilgrosso pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/syncope.git. from 2bbea2d Upgrading pdfbox new 34de818 [SYNCOPE-1406] Flowable local directory was changed by SYNCOPE-1369 new 8a35832 Aligning DB versions new 569b1b3 [SYNCOPE-1405] Managing views.xml depending on the actual DBMS The 3 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: deb/core/pom.xml | 12 ++-- docker/core/src/main/resources/Dockerfile| 1 + docker/core/src/main/resources/startup.sh| 6 -- .../core/src/main/resources/views.xml.mariadb| 0 .../core/src/main/resources/views.xml.mssql | 0 .../core/src/main/resources/views.xml.mysql | 0 .../core/src/main/resources/views.xml.postgresql | 0 .../main/resources/docker-compose/docker-compose-mariadb.yml | 2 +- .../resources/docker-compose/docker-compose-postgresql.yml | 2 +- 9 files changed, 13 insertions(+), 10 deletions(-) copy core/persistence-jpa/src/main/resources/views.xml => docker/core/src/main/resources/views.xml.mariadb (100%) copy fit/core-reference/src/main/resources/sqlserver/views.xml => docker/core/src/main/resources/views.xml.mssql (100%) copy core/persistence-jpa/src/main/resources/views.xml => docker/core/src/main/resources/views.xml.mysql (100%) copy fit/core-reference/src/main/resources/postgres/views.xml => docker/core/src/main/resources/views.xml.postgresql (100%)
[syncope] branch 2_1_X updated (77fd2ab -> 18561b7)
This is an automated email from the ASF dual-hosted git repository. ilgrosso pushed a change to branch 2_1_X in repository https://gitbox.apache.org/repos/asf/syncope.git. from 77fd2ab Upgrading pdfbox new 09e9ec9 [SYNCOPE-1406] Flowable local directory was changed by SYNCOPE-1369 new f1d7cf6 Aligning DB versions new 18561b7 [SYNCOPE-1405] Managing views.xml depending on the actual DBMS The 3 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: deb/core/pom.xml | 12 ++-- docker/core/src/main/resources/Dockerfile| 1 + docker/core/src/main/resources/startup.sh| 6 -- .../core/src/main/resources/views.xml.mariadb| 0 .../core/src/main/resources/views.xml.mssql | 0 .../core/src/main/resources/views.xml.mysql | 0 .../core/src/main/resources/views.xml.postgresql | 0 .../main/resources/docker-compose/docker-compose-mariadb.yml | 2 +- .../resources/docker-compose/docker-compose-postgresql.yml | 2 +- 9 files changed, 13 insertions(+), 10 deletions(-) copy core/persistence-jpa/src/main/resources/views.xml => docker/core/src/main/resources/views.xml.mariadb (100%) copy fit/core-reference/src/main/resources/sqlserver/views.xml => docker/core/src/main/resources/views.xml.mssql (100%) copy core/persistence-jpa/src/main/resources/views.xml => docker/core/src/main/resources/views.xml.mysql (100%) copy fit/core-reference/src/main/resources/postgres/views.xml => docker/core/src/main/resources/views.xml.postgresql (100%)