You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@syncope.apache.org by il...@apache.org on 2019/01/21 13:33:26 UTC
[syncope] branch 2_0_X updated: Aligning files for Docker core image
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 b776727 Aligning files for Docker core image
b776727 is described below
commit b7767270354c344d83c08224fdc89d1339c0022b
Author: Francesco Chicchiriccò <il...@apache.org>
AuthorDate: Mon Jan 21 14:28:52 2019 +0100
Aligning files for Docker core image
---
.../main/resources/provisioning.properties.mariadb | 2 +
.../main/resources/provisioning.properties.mssql | 2 +
.../main/resources/provisioning.properties.mysql | 2 +
.../resources/provisioning.properties.postgresql | 2 +
docker/core/src/main/resources/views.xml.mariadb | 58 +---------------------
docker/core/src/main/resources/views.xml.mssql | 56 ---------------------
docker/core/src/main/resources/views.xml.mysql | 58 +---------------------
.../core/src/main/resources/views.xml.postgresql | 56 ---------------------
8 files changed, 10 insertions(+), 226 deletions(-)
diff --git a/docker/core/src/main/resources/provisioning.properties.mariadb b/docker/core/src/main/resources/provisioning.properties.mariadb
index cc042e7..8f17c5a 100644
--- a/docker/core/src/main/resources/provisioning.properties.mariadb
+++ b/docker/core/src/main/resources/provisioning.properties.mariadb
@@ -25,6 +25,8 @@ userProvisioningManager=org.apache.syncope.core.provisioning.java.DefaultUserPro
groupProvisioningManager=org.apache.syncope.core.provisioning.java.DefaultGroupProvisioningManager
anyObjectProvisioningManager=org.apache.syncope.core.provisioning.java.DefaultAnyObjectProvisioningManager
virAttrCache=org.apache.syncope.core.provisioning.java.cache.MemoryVirAttrCache
+notificationManager=org.apache.syncope.core.provisioning.java.notification.DefaultNotificationManager
+auditManager=org.apache.syncope.core.provisioning.java.DefaultAuditManager
quartz.jobstore=org.quartz.impl.jdbcjobstore.StdJDBCDelegate
quartz.sql=tables_mariadb.sql
diff --git a/docker/core/src/main/resources/provisioning.properties.mssql b/docker/core/src/main/resources/provisioning.properties.mssql
index 1a21fef..3529791 100644
--- a/docker/core/src/main/resources/provisioning.properties.mssql
+++ b/docker/core/src/main/resources/provisioning.properties.mssql
@@ -25,6 +25,8 @@ userProvisioningManager=org.apache.syncope.core.provisioning.java.DefaultUserPro
groupProvisioningManager=org.apache.syncope.core.provisioning.java.DefaultGroupProvisioningManager
anyObjectProvisioningManager=org.apache.syncope.core.provisioning.java.DefaultAnyObjectProvisioningManager
virAttrCache=org.apache.syncope.core.provisioning.java.cache.MemoryVirAttrCache
+notificationManager=org.apache.syncope.core.provisioning.java.notification.DefaultNotificationManager
+auditManager=org.apache.syncope.core.provisioning.java.DefaultAuditManager
quartz.jobstore=org.quartz.impl.jdbcjobstore.MSSQLDelegate
quartz.sql=tables_sqlServer.sql
diff --git a/docker/core/src/main/resources/provisioning.properties.mysql b/docker/core/src/main/resources/provisioning.properties.mysql
index 3883cb5..191693c 100644
--- a/docker/core/src/main/resources/provisioning.properties.mysql
+++ b/docker/core/src/main/resources/provisioning.properties.mysql
@@ -25,6 +25,8 @@ userProvisioningManager=org.apache.syncope.core.provisioning.java.DefaultUserPro
groupProvisioningManager=org.apache.syncope.core.provisioning.java.DefaultGroupProvisioningManager
anyObjectProvisioningManager=org.apache.syncope.core.provisioning.java.DefaultAnyObjectProvisioningManager
virAttrCache=org.apache.syncope.core.provisioning.java.cache.MemoryVirAttrCache
+notificationManager=org.apache.syncope.core.provisioning.java.notification.DefaultNotificationManager
+auditManager=org.apache.syncope.core.provisioning.java.DefaultAuditManager
quartz.jobstore=org.quartz.impl.jdbcjobstore.StdJDBCDelegate
quartz.sql=tables_mysql_innodb.sql
diff --git a/docker/core/src/main/resources/provisioning.properties.postgresql b/docker/core/src/main/resources/provisioning.properties.postgresql
index 29aca0d..220105e 100644
--- a/docker/core/src/main/resources/provisioning.properties.postgresql
+++ b/docker/core/src/main/resources/provisioning.properties.postgresql
@@ -25,6 +25,8 @@ userProvisioningManager=org.apache.syncope.core.provisioning.java.DefaultUserPro
groupProvisioningManager=org.apache.syncope.core.provisioning.java.DefaultGroupProvisioningManager
anyObjectProvisioningManager=org.apache.syncope.core.provisioning.java.DefaultAnyObjectProvisioningManager
virAttrCache=org.apache.syncope.core.provisioning.java.cache.MemoryVirAttrCache
+notificationManager=org.apache.syncope.core.provisioning.java.notification.DefaultNotificationManager
+auditManager=org.apache.syncope.core.provisioning.java.DefaultAuditManager
quartz.jobstore=org.quartz.impl.jdbcjobstore.PostgreSQLDelegate
quartz.sql=tables_postgres.sql
diff --git a/docker/core/src/main/resources/views.xml.mariadb b/docker/core/src/main/resources/views.xml.mariadb
index e8e9a21..255f795 100644
--- a/docker/core/src/main/resources/views.xml.mariadb
+++ b/docker/core/src/main/resources/views.xml.mariadb
@@ -78,20 +78,6 @@ under the License.
FROM UPlainAttrValue uav, UPlainAttr ua
WHERE uav.attribute_id = ua.id
</entry>
- <entry key="user_search_null_attr">
- 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
- </entry>
<entry key="user_search_urelationship">
CREATE VIEW user_search_urelationship AS
@@ -111,20 +97,6 @@ under the License.
SELECT ss.user_id AS any_id, ss.role_id AS role_id
FROM SyncopeUser_SyncopeRole ss
</entry>
- <entry key="user_search_priv">
- 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
- </entry>
- <entry key="user_search_dynpriv">
- CREATE VIEW user_search_dynpriv AS
-
- SELECT any_id, privilege_id
- FROM DynRoleMembers drm, SyncopeRole_Privilege rp
- WHERE drm.role_id = rp.role_id
- </entry>
<entry key="user_search_resource">
CREATE VIEW user_search_resource AS
@@ -171,20 +143,6 @@ under the License.
FROM APlainAttrValue uav, APlainAttr ua
WHERE uav.attribute_id = ua.id
</entry>
- <entry key="anyObject_search_null_attr">
- CREATE VIEW anyObject_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 AnyObject u CROSS JOIN PlainSchema
- LEFT OUTER JOIN APlainAttr ua ON (PlainSchema.id = ua.schema_id AND ua.owner_id = u.id)
- WHERE ua.id IS NULL
- </entry>
<entry key="anyObject_search_arelationship">
CREATE VIEW anyObject_search_arelationship AS
@@ -244,20 +202,6 @@ under the License.
FROM GPlainAttrValue uav, GPlainAttr ua
WHERE uav.attribute_id = ua.id
</entry>
- <entry key="group_search_null_attr">
- CREATE VIEW group_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 SyncopeGroup u CROSS JOIN PlainSchema
- LEFT OUTER JOIN GPlainAttr ua ON (PlainSchema.id = ua.schema_id AND ua.owner_id = u.id)
- WHERE ua.id IS NULL
- </entry>
<entry key="group_search_resource">
CREATE VIEW group_search_resource AS
@@ -265,4 +209,4 @@ under the License.
FROM SyncopeGroup_ExternalResource st
</entry>
-</properties>
\ No newline at end of file
+</properties>
diff --git a/docker/core/src/main/resources/views.xml.mssql b/docker/core/src/main/resources/views.xml.mssql
index ab6be98..255f795 100644
--- a/docker/core/src/main/resources/views.xml.mssql
+++ b/docker/core/src/main/resources/views.xml.mssql
@@ -78,20 +78,6 @@ under the License.
FROM UPlainAttrValue uav, UPlainAttr ua
WHERE uav.attribute_id = ua.id
</entry>
- <entry key="user_search_null_attr">
- CREATE VIEW user_search_null_attr AS
-
- SELECT u.id AS any_id,
- PlainSchema.id AS schema_id,
- NULL AS booleanvalue,
- CAST (NULL AS DATETIME2) datevalue,
- CAST (NULL AS FLOAT) doublevalue,
- CAST (NULL AS BIGINT) longvalue,
- CAST (NULL AS VARCHAR(255)) 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
- </entry>
<entry key="user_search_urelationship">
CREATE VIEW user_search_urelationship AS
@@ -111,20 +97,6 @@ under the License.
SELECT ss.user_id AS any_id, ss.role_id AS role_id
FROM SyncopeUser_SyncopeRole ss
</entry>
- <entry key="user_search_priv">
- 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
- </entry>
- <entry key="user_search_dynpriv">
- CREATE VIEW user_search_dynpriv AS
-
- SELECT any_id, privilege_id
- FROM DynRoleMembers drm, SyncopeRole_Privilege rp
- WHERE drm.role_id = rp.role_id
- </entry>
<entry key="user_search_resource">
CREATE VIEW user_search_resource AS
@@ -171,20 +143,6 @@ under the License.
FROM APlainAttrValue uav, APlainAttr ua
WHERE uav.attribute_id = ua.id
</entry>
- <entry key="anyObject_search_null_attr">
- CREATE VIEW anyObject_search_null_attr AS
-
- SELECT u.id AS any_id,
- PlainSchema.id AS schema_id,
- NULL AS booleanvalue,
- CAST (NULL AS DATETIME2) datevalue,
- CAST (NULL AS FLOAT) doublevalue,
- CAST (NULL AS BIGINT) longvalue,
- CAST (NULL AS VARCHAR(255)) AS stringvalue
- FROM AnyObject u CROSS JOIN PlainSchema
- LEFT OUTER JOIN APlainAttr ua ON (PlainSchema.id = ua.schema_id AND ua.owner_id = u.id)
- WHERE ua.id IS NULL
- </entry>
<entry key="anyObject_search_arelationship">
CREATE VIEW anyObject_search_arelationship AS
@@ -244,20 +202,6 @@ under the License.
FROM GPlainAttrValue uav, GPlainAttr ua
WHERE uav.attribute_id = ua.id
</entry>
- <entry key="group_search_null_attr">
- CREATE VIEW group_search_null_attr AS
-
- SELECT u.id AS any_id,
- PlainSchema.id AS schema_id,
- NULL AS booleanvalue,
- CAST (NULL AS DATETIME2) datevalue,
- CAST (NULL AS FLOAT) doublevalue,
- CAST (NULL AS BIGINT) longvalue,
- CAST (NULL AS VARCHAR(255)) AS stringvalue
- FROM SyncopeGroup u CROSS JOIN PlainSchema
- LEFT OUTER JOIN GPlainAttr ua ON (PlainSchema.id = ua.schema_id AND ua.owner_id = u.id)
- WHERE ua.id IS NULL
- </entry>
<entry key="group_search_resource">
CREATE VIEW group_search_resource AS
diff --git a/docker/core/src/main/resources/views.xml.mysql b/docker/core/src/main/resources/views.xml.mysql
index e8e9a21..255f795 100644
--- a/docker/core/src/main/resources/views.xml.mysql
+++ b/docker/core/src/main/resources/views.xml.mysql
@@ -78,20 +78,6 @@ under the License.
FROM UPlainAttrValue uav, UPlainAttr ua
WHERE uav.attribute_id = ua.id
</entry>
- <entry key="user_search_null_attr">
- 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
- </entry>
<entry key="user_search_urelationship">
CREATE VIEW user_search_urelationship AS
@@ -111,20 +97,6 @@ under the License.
SELECT ss.user_id AS any_id, ss.role_id AS role_id
FROM SyncopeUser_SyncopeRole ss
</entry>
- <entry key="user_search_priv">
- 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
- </entry>
- <entry key="user_search_dynpriv">
- CREATE VIEW user_search_dynpriv AS
-
- SELECT any_id, privilege_id
- FROM DynRoleMembers drm, SyncopeRole_Privilege rp
- WHERE drm.role_id = rp.role_id
- </entry>
<entry key="user_search_resource">
CREATE VIEW user_search_resource AS
@@ -171,20 +143,6 @@ under the License.
FROM APlainAttrValue uav, APlainAttr ua
WHERE uav.attribute_id = ua.id
</entry>
- <entry key="anyObject_search_null_attr">
- CREATE VIEW anyObject_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 AnyObject u CROSS JOIN PlainSchema
- LEFT OUTER JOIN APlainAttr ua ON (PlainSchema.id = ua.schema_id AND ua.owner_id = u.id)
- WHERE ua.id IS NULL
- </entry>
<entry key="anyObject_search_arelationship">
CREATE VIEW anyObject_search_arelationship AS
@@ -244,20 +202,6 @@ under the License.
FROM GPlainAttrValue uav, GPlainAttr ua
WHERE uav.attribute_id = ua.id
</entry>
- <entry key="group_search_null_attr">
- CREATE VIEW group_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 SyncopeGroup u CROSS JOIN PlainSchema
- LEFT OUTER JOIN GPlainAttr ua ON (PlainSchema.id = ua.schema_id AND ua.owner_id = u.id)
- WHERE ua.id IS NULL
- </entry>
<entry key="group_search_resource">
CREATE VIEW group_search_resource AS
@@ -265,4 +209,4 @@ under the License.
FROM SyncopeGroup_ExternalResource st
</entry>
-</properties>
\ No newline at end of file
+</properties>
diff --git a/docker/core/src/main/resources/views.xml.postgresql b/docker/core/src/main/resources/views.xml.postgresql
index b6664c0..255f795 100644
--- a/docker/core/src/main/resources/views.xml.postgresql
+++ b/docker/core/src/main/resources/views.xml.postgresql
@@ -78,20 +78,6 @@ under the License.
FROM UPlainAttrValue uav, UPlainAttr ua
WHERE uav.attribute_id = ua.id
</entry>
- <entry key="user_search_null_attr">
- CREATE VIEW user_search_null_attr AS
-
- SELECT u.id AS any_id,
- PlainSchema.id AS schema_id,
- NULL::int4 AS booleanvalue,
- NULL::timestamp AS datevalue,
- NULL::float8 AS doublevalue,
- NULL::int8 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
- </entry>
<entry key="user_search_urelationship">
CREATE VIEW user_search_urelationship AS
@@ -111,20 +97,6 @@ under the License.
SELECT ss.user_id AS any_id, ss.role_id AS role_id
FROM SyncopeUser_SyncopeRole ss
</entry>
- <entry key="user_search_priv">
- 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
- </entry>
- <entry key="user_search_dynpriv">
- CREATE VIEW user_search_dynpriv AS
-
- SELECT any_id, privilege_id
- FROM DynRoleMembers drm, SyncopeRole_Privilege rp
- WHERE drm.role_id = rp.role_id
- </entry>
<entry key="user_search_resource">
CREATE VIEW user_search_resource AS
@@ -171,20 +143,6 @@ under the License.
FROM APlainAttrValue uav, APlainAttr ua
WHERE uav.attribute_id = ua.id
</entry>
- <entry key="anyObject_search_null_attr">
- CREATE VIEW anyObject_search_null_attr AS
-
- SELECT u.id AS any_id,
- PlainSchema.id AS schema_id,
- NULL::int4 AS booleanvalue,
- NULL::timestamp AS datevalue,
- NULL::float8 AS doublevalue,
- NULL::int8 AS longvalue,
- NULL AS stringvalue
- FROM AnyObject u CROSS JOIN PlainSchema
- LEFT OUTER JOIN APlainAttr ua ON (PlainSchema.id = ua.schema_id AND ua.owner_id = u.id)
- WHERE ua.id IS NULL
- </entry>
<entry key="anyObject_search_arelationship">
CREATE VIEW anyObject_search_arelationship AS
@@ -244,20 +202,6 @@ under the License.
FROM GPlainAttrValue uav, GPlainAttr ua
WHERE uav.attribute_id = ua.id
</entry>
- <entry key="group_search_null_attr">
- CREATE VIEW group_search_null_attr AS
-
- SELECT u.id AS any_id,
- PlainSchema.id AS schema_id,
- NULL::int4 AS booleanvalue,
- NULL::timestamp AS datevalue,
- NULL::float8 AS doublevalue,
- NULL::int8 AS longvalue,
- NULL AS stringvalue
- FROM SyncopeGroup u CROSS JOIN PlainSchema
- LEFT OUTER JOIN GPlainAttr ua ON (PlainSchema.id = ua.schema_id AND ua.owner_id = u.id)
- WHERE ua.id IS NULL
- </entry>
<entry key="group_search_resource">
CREATE VIEW group_search_resource AS