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 2016/03/25 15:44:30 UTC
syncope git commit: [SYNCOPE-814] Setting empty AnyTypeClass for GROUP
Repository: syncope
Updated Branches:
refs/heads/master 123bbb83e -> 75900f2d8
[SYNCOPE-814] Setting empty AnyTypeClass for GROUP
Project: http://git-wip-us.apache.org/repos/asf/syncope/repo
Commit: http://git-wip-us.apache.org/repos/asf/syncope/commit/75900f2d
Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/75900f2d
Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/75900f2d
Branch: refs/heads/master
Commit: 75900f2d8f3e91586b918fd3386784680ef6978f
Parents: 123bbb8
Author: Francesco Chicchiriccò <il...@apache.org>
Authored: Fri Mar 25 15:44:12 2016 +0100
Committer: Francesco Chicchiriccò <il...@apache.org>
Committed: Fri Mar 25 15:44:12 2016 +0100
----------------------------------------------------------------------
.../main/resources/domains/MasterContent.xml | 21 +++++++++++---------
1 file changed, 12 insertions(+), 9 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/syncope/blob/75900f2d/core/persistence-jpa/src/main/resources/domains/MasterContent.xml
----------------------------------------------------------------------
diff --git a/core/persistence-jpa/src/main/resources/domains/MasterContent.xml b/core/persistence-jpa/src/main/resources/domains/MasterContent.xml
index f71c409..9a579b1 100644
--- a/core/persistence-jpa/src/main/resources/domains/MasterContent.xml
+++ b/core/persistence-jpa/src/main/resources/domains/MasterContent.xml
@@ -30,14 +30,14 @@ under the License.
<CPlainAttrValue id="1" attribute_id="1" stringValue="SHA1"/>
<!-- notificationjob.cronExpression:
- + not existing: NotificationJob runs according to Notification.DEFAULT_CRON_EXP
+ + not existing: NotificationJob runs according to NotificationJob.DEFAULT_CRON_EXP
+ provided as empty string: NotificationJob disabled
+ provided as non-empty string: NotificationJob runs according to the given value -->
<PlainSchema name="notificationjob.cronExpression" type="String"
mandatoryCondition="false" multivalue="0" uniqueConstraint="0" readonly="0"/>
<CPlainAttr id="2" owner_id="1" schema_name="notificationjob.cronExpression"/>
<CPlainAttrValue id="2" attribute_id="2" stringValue=""/>
-
+
<PlainSchema name="notification.maxRetries" type="Long"
mandatoryCondition="true" multivalue="0" uniqueConstraint="0" readonly="0"/>
<CPlainAttr id="3" owner_id="1" schema_name="notification.maxRetries"/>
@@ -83,18 +83,12 @@ under the License.
mandatoryCondition="true" multivalue="0" uniqueConstraint="0" readonly="0"/>
<CPlainAttr id="12" owner_id="1" schema_name="tasks.interruptMaxRetries"/>
<CPlainAttrValue id="12" attribute_id="12" longValue="20"/>
-
+
<!-- Return hashed password values when reading users -->
<PlainSchema name="return.password.value" type="Boolean"
mandatoryCondition="false" multivalue="0" uniqueConstraint="0" readonly="0"/>
<CPlainAttr id="14" owner_id="1" schema_name="return.password.value"/>
<CPlainAttrValue id="14" attribute_id="14" booleanValue="0"/>
-
- <AnyType name="USER" kind="USER"/>
- <AnyTypeClass name="BaseUser"/>
- <AnyType_AnyTypeClass anyType_name="USER" anyTypeClass_name="BaseUser"/>
-
- <AnyType name="GROUP" kind="GROUP"/>
<!-- For usage with admin console -->
<PlainSchema name="admin.user.layout" type="String"
@@ -109,7 +103,16 @@ under the License.
mandatoryCondition="false" multivalue="1" uniqueConstraint="0" readonly="0"/>
<PlainSchema name="self.membership.layout" type="String"
mandatoryCondition="false" multivalue="1" uniqueConstraint="0" readonly="0"/>
+
+ <AnyType name="USER" kind="USER"/>
+ <AnyTypeClass name="BaseUser"/>
+ <AnyType_AnyTypeClass anyType_name="USER" anyTypeClass_name="BaseUser"/>
+
+ <AnyType name="GROUP" kind="GROUP"/>
+ <AnyTypeClass name="BaseGroup"/>
+ <AnyType_AnyTypeClass anyType_name="GROUP" anyTypeClass_name="BaseGroup"/>
+ <!-- Actual plain schemas -->
<PlainSchema name="email" type="String" anyTypeClass_name="BaseUser"
mandatoryCondition="false" multivalue="0" uniqueConstraint="0" readonly="0"
validatorClass="org.apache.syncope.core.persistence.jpa.attrvalue.validation.EmailAddressValidator"/>