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/04/21 11:56:32 UTC
[5/7] syncope git commit: [SYNCOPE-822] Verified it works on all
supported DBMS
http://git-wip-us.apache.org/repos/asf/syncope/blob/0d745d43/core/persistence-jpa/src/main/resources/META-INF/spring-orm.xml
----------------------------------------------------------------------
diff --git a/core/persistence-jpa/src/main/resources/META-INF/spring-orm.xml b/core/persistence-jpa/src/main/resources/META-INF/spring-orm.xml
index 1d67501..c0033a5 100644
--- a/core/persistence-jpa/src/main/resources/META-INF/spring-orm.xml
+++ b/core/persistence-jpa/src/main/resources/META-INF/spring-orm.xml
@@ -40,23 +40,23 @@ under the License.
<table>
<unique-constraint>
<column-name>booleanValue</column-name>
- <column-name>schema_key</column-name>
+ <column-name>schema_id</column-name>
</unique-constraint>
<unique-constraint>
<column-name>dateValue</column-name>
- <column-name>schema_key</column-name>
+ <column-name>schema_id</column-name>
</unique-constraint>
<unique-constraint>
<column-name>stringValue</column-name>
- <column-name>schema_key</column-name>
+ <column-name>schema_id</column-name>
</unique-constraint>
<unique-constraint>
<column-name>doubleValue</column-name>
- <column-name>schema_key</column-name>
+ <column-name>schema_id</column-name>
</unique-constraint>
<unique-constraint>
<column-name>longValue</column-name>
- <column-name>schema_key</column-name>
+ <column-name>schema_id</column-name>
</unique-constraint>
</table>
</entity>
@@ -64,23 +64,23 @@ under the License.
<table>
<unique-constraint>
<column-name>booleanValue</column-name>
- <column-name>schema_key</column-name>
+ <column-name>schema_id</column-name>
</unique-constraint>
<unique-constraint>
<column-name>dateValue</column-name>
- <column-name>schema_key</column-name>
+ <column-name>schema_id</column-name>
</unique-constraint>
<unique-constraint>
<column-name>stringValue</column-name>
- <column-name>schema_key</column-name>
+ <column-name>schema_id</column-name>
</unique-constraint>
<unique-constraint>
<column-name>doubleValue</column-name>
- <column-name>schema_key</column-name>
+ <column-name>schema_id</column-name>
</unique-constraint>
<unique-constraint>
<column-name>longValue</column-name>
- <column-name>schema_key</column-name>
+ <column-name>schema_id</column-name>
</unique-constraint>
</table>
</entity>
@@ -88,23 +88,23 @@ under the License.
<table>
<unique-constraint>
<column-name>booleanValue</column-name>
- <column-name>schema_key</column-name>
+ <column-name>schema_id</column-name>
</unique-constraint>
<unique-constraint>
<column-name>dateValue</column-name>
- <column-name>schema_key</column-name>
+ <column-name>schema_id</column-name>
</unique-constraint>
<unique-constraint>
<column-name>stringValue</column-name>
- <column-name>schema_key</column-name>
+ <column-name>schema_id</column-name>
</unique-constraint>
<unique-constraint>
<column-name>doubleValue</column-name>
- <column-name>schema_key</column-name>
+ <column-name>schema_id</column-name>
</unique-constraint>
<unique-constraint>
<column-name>longValue</column-name>
- <column-name>schema_key</column-name>
+ <column-name>schema_id</column-name>
</unique-constraint>
</table>
</entity>
@@ -112,23 +112,23 @@ under the License.
<table>
<unique-constraint>
<column-name>booleanValue</column-name>
- <column-name>schema_key</column-name>
+ <column-name>schema_id</column-name>
</unique-constraint>
<unique-constraint>
<column-name>dateValue</column-name>
- <column-name>schema_key</column-name>
+ <column-name>schema_id</column-name>
</unique-constraint>
<unique-constraint>
<column-name>stringValue</column-name>
- <column-name>schema_key</column-name>
+ <column-name>schema_id</column-name>
</unique-constraint>
<unique-constraint>
<column-name>doubleValue</column-name>
- <column-name>schema_key</column-name>
+ <column-name>schema_id</column-name>
</unique-constraint>
<unique-constraint>
<column-name>longValue</column-name>
- <column-name>schema_key</column-name>
+ <column-name>schema_id</column-name>
</unique-constraint>
</table>
</entity>
http://git-wip-us.apache.org/repos/asf/syncope/blob/0d745d43/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 e6b345b..a497a36 100644
--- a/core/persistence-jpa/src/main/resources/domains/MasterContent.xml
+++ b/core/persistence-jpa/src/main/resources/domains/MasterContent.xml
@@ -18,130 +18,130 @@ specific language governing permissions and limitations
under the License.
-->
<dataset>
- <Realm key="ea696a4f-e77a-4ef1-be67-8f8093bc8686" name="/"/>
+ <Realm id="ea696a4f-e77a-4ef1-be67-8f8093bc8686" name="/"/>
- <SyncopeConf key="cd64d66f-6fff-4008-b966-a06b1cc1436d"/>
+ <SyncopeConf id="cd64d66f-6fff-4008-b966-a06b1cc1436d"/>
- <PlainSchema key="password.cipher.algorithm" type="String"
+ <PlainSchema id="password.cipher.algorithm" type="String"
mandatoryCondition="true" multivalue="0" uniqueConstraint="0" readonly="0"/>
- <CPlainAttr key="56db89b9-119e-4923-a16e-f42823b90c66"
- owner_key="cd64d66f-6fff-4008-b966-a06b1cc1436d" schema_key="password.cipher.algorithm"/>
- <CPlainAttrValue key="870323e8-8db6-4a64-b512-15f9fa094905"
- attribute_key="56db89b9-119e-4923-a16e-f42823b90c66" stringValue="SHA1"/>
+ <CPlainAttr id="56db89b9-119e-4923-a16e-f42823b90c66"
+ owner_id="cd64d66f-6fff-4008-b966-a06b1cc1436d" schema_id="password.cipher.algorithm"/>
+ <CPlainAttrValue id="870323e8-8db6-4a64-b512-15f9fa094905"
+ attribute_id="56db89b9-119e-4923-a16e-f42823b90c66" stringValue="SHA1"/>
<!-- notificationjob.cronExpression:
+ 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 key="notificationjob.cronExpression" type="String"
+ <PlainSchema id="notificationjob.cronExpression" type="String"
mandatoryCondition="false" multivalue="0" uniqueConstraint="0" readonly="0"/>
- <CPlainAttr key="abd5a2d2-25ee-48b7-b5ca-76813b54a6f2"
- owner_key="cd64d66f-6fff-4008-b966-a06b1cc1436d" schema_key="notificationjob.cronExpression"/>
- <CPlainAttrValue key="4828ea70-d151-4c16-b344-2d07b1956bee"
- attribute_key="abd5a2d2-25ee-48b7-b5ca-76813b54a6f2" stringValue=""/>
+ <CPlainAttr id="abd5a2d2-25ee-48b7-b5ca-76813b54a6f2"
+ owner_id="cd64d66f-6fff-4008-b966-a06b1cc1436d" schema_id="notificationjob.cronExpression"/>
+ <CPlainAttrValue id="4828ea70-d151-4c16-b344-2d07b1956bee"
+ attribute_id="abd5a2d2-25ee-48b7-b5ca-76813b54a6f2" stringValue=""/>
- <PlainSchema key="notification.maxRetries" type="Long"
+ <PlainSchema id="notification.maxRetries" type="Long"
mandatoryCondition="true" multivalue="0" uniqueConstraint="0" readonly="0"/>
- <CPlainAttr key="0523d7e6-af13-4e1e-9edb-e35971aacee7"
- owner_key="cd64d66f-6fff-4008-b966-a06b1cc1436d" schema_key="notification.maxRetries"/>
- <CPlainAttrValue key="010e2bdc-0094-4918-bac3-d0d5ea17b54a"
- attribute_key="0523d7e6-af13-4e1e-9edb-e35971aacee7" longValue="3"/>
+ <CPlainAttr id="0523d7e6-af13-4e1e-9edb-e35971aacee7"
+ owner_id="cd64d66f-6fff-4008-b966-a06b1cc1436d" schema_id="notification.maxRetries"/>
+ <CPlainAttrValue id="010e2bdc-0094-4918-bac3-d0d5ea17b54a"
+ attribute_id="0523d7e6-af13-4e1e-9edb-e35971aacee7" longValue="3"/>
- <PlainSchema key="token.length" type="Long"
+ <PlainSchema id="token.length" type="Long"
mandatoryCondition="true" multivalue="0" uniqueConstraint="0" readonly="0"/>
- <CPlainAttr key="58977caa-dcf7-4ae3-8591-7e3d0a395200"
- owner_key="cd64d66f-6fff-4008-b966-a06b1cc1436d" schema_key="token.length"/>
- <CPlainAttrValue key="372e28e0-3af1-4774-b668-81aa84903b75"
- attribute_key="58977caa-dcf7-4ae3-8591-7e3d0a395200" longValue="256"/>
+ <CPlainAttr id="58977caa-dcf7-4ae3-8591-7e3d0a395200"
+ owner_id="cd64d66f-6fff-4008-b966-a06b1cc1436d" schema_id="token.length"/>
+ <CPlainAttrValue id="372e28e0-3af1-4774-b668-81aa84903b75"
+ attribute_id="58977caa-dcf7-4ae3-8591-7e3d0a395200" longValue="256"/>
- <PlainSchema key="token.expireTime" type="Long"
+ <PlainSchema id="token.expireTime" type="Long"
mandatoryCondition="true" multivalue="0" uniqueConstraint="0" readonly="0"/>
- <CPlainAttr key="01f69abd-df85-4e1b-bb88-ad570594e045"
- owner_key="cd64d66f-6fff-4008-b966-a06b1cc1436d" schema_key="token.expireTime"/>
- <CPlainAttrValue key="963970cf-4af6-46bb-875b-a1b758ac8d05"
- attribute_key="01f69abd-df85-4e1b-bb88-ad570594e045" longValue="60"/>
+ <CPlainAttr id="01f69abd-df85-4e1b-bb88-ad570594e045"
+ owner_id="cd64d66f-6fff-4008-b966-a06b1cc1436d" schema_id="token.expireTime"/>
+ <CPlainAttrValue id="963970cf-4af6-46bb-875b-a1b758ac8d05"
+ attribute_id="01f69abd-df85-4e1b-bb88-ad570594e045" longValue="60"/>
- <PlainSchema key="selfRegistration.allowed" type="Boolean"
+ <PlainSchema id="selfRegistration.allowed" type="Boolean"
mandatoryCondition="true" multivalue="0" uniqueConstraint="0" readonly="0"/>
- <CPlainAttr key="7b19cefa-d606-477c-8431-c9464f53fe8b"
- owner_key="cd64d66f-6fff-4008-b966-a06b1cc1436d" schema_key="selfRegistration.allowed"/>
- <CPlainAttrValue key="c8b9a0f1-0168-4e2a-95b8-4819fc70e620"
- attribute_key="7b19cefa-d606-477c-8431-c9464f53fe8b" booleanValue="1"/>
+ <CPlainAttr id="7b19cefa-d606-477c-8431-c9464f53fe8b"
+ owner_id="cd64d66f-6fff-4008-b966-a06b1cc1436d" schema_id="selfRegistration.allowed"/>
+ <CPlainAttrValue id="c8b9a0f1-0168-4e2a-95b8-4819fc70e620"
+ attribute_id="7b19cefa-d606-477c-8431-c9464f53fe8b" booleanValue="1"/>
- <PlainSchema key="passwordReset.allowed" type="Boolean"
+ <PlainSchema id="passwordReset.allowed" type="Boolean"
mandatoryCondition="true" multivalue="0" uniqueConstraint="0" readonly="0"/>
- <CPlainAttr key="dc35cc97-6ed9-4bb2-bb3b-509f4cd8f3d3"
- owner_key="cd64d66f-6fff-4008-b966-a06b1cc1436d" schema_key="passwordReset.allowed"/>
- <CPlainAttrValue key="b1ecea41-ab7c-4dd3-9e3e-b6baf0f98046"
- attribute_key="dc35cc97-6ed9-4bb2-bb3b-509f4cd8f3d3" booleanValue="1"/>
+ <CPlainAttr id="dc35cc97-6ed9-4bb2-bb3b-509f4cd8f3d3"
+ owner_id="cd64d66f-6fff-4008-b966-a06b1cc1436d" schema_id="passwordReset.allowed"/>
+ <CPlainAttrValue id="b1ecea41-ab7c-4dd3-9e3e-b6baf0f98046"
+ attribute_id="dc35cc97-6ed9-4bb2-bb3b-509f4cd8f3d3" booleanValue="1"/>
- <PlainSchema key="passwordReset.securityQuestion" type="Boolean"
+ <PlainSchema id="passwordReset.securityQuestion" type="Boolean"
mandatoryCondition="true" multivalue="0" uniqueConstraint="0" readonly="0"/>
- <CPlainAttr key="e5a712ad-53fd-4102-ba55-fb45caed5f7b"
- owner_key="cd64d66f-6fff-4008-b966-a06b1cc1436d" schema_key="passwordReset.securityQuestion"/>
- <CPlainAttrValue key="b5e8e79d-8039-4318-9698-fe5e181ebe98"
- attribute_key="e5a712ad-53fd-4102-ba55-fb45caed5f7b" booleanValue="1"/>
-
- <PlainSchema key="authentication.statuses" type="String" multivalue="1" uniqueConstraint="0" readonly="0"/>
- <CPlainAttr key="888ae8e1-a295-4ee2-a15e-31dbf6dfc3f9"
- owner_key="cd64d66f-6fff-4008-b966-a06b1cc1436d" schema_key="authentication.statuses"/>
- <CPlainAttrValue key="4b8e7d2b-f527-43a3-a2e2-5530dcab2f52"
- attribute_key="888ae8e1-a295-4ee2-a15e-31dbf6dfc3f9" stringValue="created"/>
- <CPlainAttrValue key="f0c89f2c-ea87-4c95-a1cf-142bf6e6f523"
- attribute_key="888ae8e1-a295-4ee2-a15e-31dbf6dfc3f9" stringValue="active"/>
+ <CPlainAttr id="e5a712ad-53fd-4102-ba55-fb45caed5f7b"
+ owner_id="cd64d66f-6fff-4008-b966-a06b1cc1436d" schema_id="passwordReset.securityQuestion"/>
+ <CPlainAttrValue id="b5e8e79d-8039-4318-9698-fe5e181ebe98"
+ attribute_id="e5a712ad-53fd-4102-ba55-fb45caed5f7b" booleanValue="1"/>
+
+ <PlainSchema id="authentication.statuses" type="String" multivalue="1" uniqueConstraint="0" readonly="0"/>
+ <CPlainAttr id="888ae8e1-a295-4ee2-a15e-31dbf6dfc3f9"
+ owner_id="cd64d66f-6fff-4008-b966-a06b1cc1436d" schema_id="authentication.statuses"/>
+ <CPlainAttrValue id="4b8e7d2b-f527-43a3-a2e2-5530dcab2f52"
+ attribute_id="888ae8e1-a295-4ee2-a15e-31dbf6dfc3f9" stringValue="created"/>
+ <CPlainAttrValue id="f0c89f2c-ea87-4c95-a1cf-142bf6e6f523"
+ attribute_id="888ae8e1-a295-4ee2-a15e-31dbf6dfc3f9" stringValue="active"/>
<!-- Save user login date upon successful authentication -->
- <PlainSchema key="log.lastlogindate" type="Boolean"
+ <PlainSchema id="log.lastlogindate" type="Boolean"
mandatoryCondition="true" multivalue="0" uniqueConstraint="0" readonly="0"/>
- <CPlainAttr key="9891c0a7-27ee-4215-9eea-ca32e580b4e4"
- owner_key="cd64d66f-6fff-4008-b966-a06b1cc1436d" schema_key="log.lastlogindate"/>
- <CPlainAttrValue key="162dd874-0417-4bb9-9724-db1ff2952dd1"
- attribute_key="9891c0a7-27ee-4215-9eea-ca32e580b4e4" booleanValue="1"/>
+ <CPlainAttr id="9891c0a7-27ee-4215-9eea-ca32e580b4e4"
+ owner_id="cd64d66f-6fff-4008-b966-a06b1cc1436d" schema_id="log.lastlogindate"/>
+ <CPlainAttrValue id="162dd874-0417-4bb9-9724-db1ff2952dd1"
+ attribute_id="9891c0a7-27ee-4215-9eea-ca32e580b4e4" booleanValue="1"/>
- <PlainSchema key="tasks.interruptMaxRetries" type="Long"
+ <PlainSchema id="tasks.interruptMaxRetries" type="Long"
mandatoryCondition="true" multivalue="0" uniqueConstraint="0" readonly="0"/>
- <CPlainAttr key="c2b9ca96-c6ef-433d-8287-0e0cfd0ad0db"
- owner_key="cd64d66f-6fff-4008-b966-a06b1cc1436d" schema_key="tasks.interruptMaxRetries"/>
- <CPlainAttrValue key="5dc3f4e3-ff9f-4558-a9ac-15336b63a2ad"
- attribute_key="c2b9ca96-c6ef-433d-8287-0e0cfd0ad0db" longValue="20"/>
+ <CPlainAttr id="c2b9ca96-c6ef-433d-8287-0e0cfd0ad0db"
+ owner_id="cd64d66f-6fff-4008-b966-a06b1cc1436d" schema_id="tasks.interruptMaxRetries"/>
+ <CPlainAttrValue id="5dc3f4e3-ff9f-4558-a9ac-15336b63a2ad"
+ attribute_id="c2b9ca96-c6ef-433d-8287-0e0cfd0ad0db" longValue="20"/>
<!-- Return hashed password values when reading users -->
- <PlainSchema key="return.password.value" type="Boolean"
+ <PlainSchema id="return.password.value" type="Boolean"
mandatoryCondition="false" multivalue="0" uniqueConstraint="0" readonly="0"/>
- <CPlainAttr key="bcfd7efc-0605-4b5e-b4bb-85c1d5f6493a"
- owner_key="cd64d66f-6fff-4008-b966-a06b1cc1436d" schema_key="return.password.value"/>
- <CPlainAttrValue key="e5fa94db-b524-4309-908d-8198d0b3f779"
- attribute_key="bcfd7efc-0605-4b5e-b4bb-85c1d5f6493a" booleanValue="0"/>
+ <CPlainAttr id="bcfd7efc-0605-4b5e-b4bb-85c1d5f6493a"
+ owner_id="cd64d66f-6fff-4008-b966-a06b1cc1436d" schema_id="return.password.value"/>
+ <CPlainAttrValue id="e5fa94db-b524-4309-908d-8198d0b3f779"
+ attribute_id="bcfd7efc-0605-4b5e-b4bb-85c1d5f6493a" booleanValue="0"/>
<!-- For usage with admin console -->
- <PlainSchema key="admin.user.layout" type="String"
+ <PlainSchema id="admin.user.layout" type="String"
mandatoryCondition="false" multivalue="1" uniqueConstraint="0" readonly="0"/>
- <PlainSchema key="self.user.layout" type="String"
+ <PlainSchema id="self.user.layout" type="String"
mandatoryCondition="false" multivalue="1" uniqueConstraint="0" readonly="0"/>
- <PlainSchema key="admin.group.layout" type="String"
+ <PlainSchema id="admin.group.layout" type="String"
mandatoryCondition="false" multivalue="1" uniqueConstraint="0" readonly="0"/>
- <PlainSchema key="self.group.layout" type="String"
+ <PlainSchema id="self.group.layout" type="String"
mandatoryCondition="false" multivalue="1" uniqueConstraint="0" readonly="0"/>
- <PlainSchema key="admin.membership.layout" type="String"
+ <PlainSchema id="admin.membership.layout" type="String"
mandatoryCondition="false" multivalue="1" uniqueConstraint="0" readonly="0"/>
- <PlainSchema key="self.membership.layout" type="String"
+ <PlainSchema id="self.membership.layout" type="String"
mandatoryCondition="false" multivalue="1" uniqueConstraint="0" readonly="0"/>
- <AnyType key="USER" kind="USER"/>
- <AnyTypeClass key="BaseUser"/>
- <AnyType_AnyTypeClass anyType_key="USER" anyTypeClass_key="BaseUser"/>
+ <AnyType id="USER" kind="USER"/>
+ <AnyTypeClass id="BaseUser"/>
+ <AnyType_AnyTypeClass anyType_id="USER" anyTypeClass_id="BaseUser"/>
- <AnyType key="GROUP" kind="GROUP"/>
- <AnyTypeClass key="BaseGroup"/>
- <AnyType_AnyTypeClass anyType_key="GROUP" anyTypeClass_key="BaseGroup"/>
+ <AnyType id="GROUP" kind="GROUP"/>
+ <AnyTypeClass id="BaseGroup"/>
+ <AnyType_AnyTypeClass anyType_id="GROUP" anyTypeClass_id="BaseGroup"/>
<!-- Actual plain schemas -->
- <PlainSchema key="email" type="String" anyTypeClass_key="BaseUser"
+ <PlainSchema id="email" type="String" anyTypeClass_id="BaseUser"
mandatoryCondition="false" multivalue="0" uniqueConstraint="0" readonly="0"
validatorClass="org.apache.syncope.core.persistence.jpa.attrvalue.validation.EmailAddressValidator"/>
<!-- Password reset notifications -->
- <MailTemplate key="requestPasswordReset"
+ <MailTemplate id="requestPasswordReset"
textTemplate="Hi,
a password reset was request for ${user.getUsername()}.
@@ -165,7 +165,7 @@ a password reset was request for ${user.getUsername()}.</p>
<p>Best regards.</p>
</body>
</html>"/>
- <MailTemplate key="confirmPasswordReset"
+ <MailTemplate id="confirmPasswordReset"
textTemplate="Hi,
we are happy to inform you that the password request was execute successfully for your account.
@@ -179,21 +179,21 @@ we are happy to inform you that the password request was execute successfully fo
</body>
</html>"/>
- <Notification key="e00945b5-1184-4d43-8e45-4318a8dcdfd4" active="1" recipientAttrName="email" recipientAttrType="UserPlainSchema" selfAsRecipient="1"
- sender="admin@syncope.apache.org" subject="Password Reset request" template_key="requestPasswordReset"
+ <Notification id="e00945b5-1184-4d43-8e45-4318a8dcdfd4" active="1" recipientAttrName="email" recipientAttrType="UserPlainSchema" selfAsRecipient="1"
+ sender="admin@syncope.apache.org" subject="Password Reset request" template_id="requestPasswordReset"
traceLevel="FAILURES"/>
- <AnyAbout key="a328f2e6-25e9-4cc1-badf-7425d7be4b39" anyType_key="USER" notification_key="e00945b5-1184-4d43-8e45-4318a8dcdfd4" filter="token!=$null"/>
- <Notification_events notification_key="e00945b5-1184-4d43-8e45-4318a8dcdfd4" event="[CUSTOM]:[]:[]:[requestPasswordReset]:[SUCCESS]"/>
+ <AnyAbout id="a328f2e6-25e9-4cc1-badf-7425d7be4b39" anyType_id="USER" notification_id="e00945b5-1184-4d43-8e45-4318a8dcdfd4" filter="token!=$null"/>
+ <Notification_events notification_id="e00945b5-1184-4d43-8e45-4318a8dcdfd4" event="[CUSTOM]:[]:[]:[requestPasswordReset]:[SUCCESS]"/>
- <Notification key="bef0c250-e8a7-4848-bb63-2564fc409ce2" active="1" recipientAttrName="email" recipientAttrType="UserPlainSchema" selfAsRecipient="1"
- sender="admin@syncope.apache.org" subject="Password Reset successful" template_key="confirmPasswordReset"
+ <Notification id="bef0c250-e8a7-4848-bb63-2564fc409ce2" active="1" recipientAttrName="email" recipientAttrType="UserPlainSchema" selfAsRecipient="1"
+ sender="admin@syncope.apache.org" subject="Password Reset successful" template_id="confirmPasswordReset"
traceLevel="FAILURES"/>
- <Notification_events notification_key="bef0c250-e8a7-4848-bb63-2564fc409ce2" event="[CUSTOM]:[]:[]:[confirmPasswordReset]:[SUCCESS]"/>
+ <Notification_events notification_id="bef0c250-e8a7-4848-bb63-2564fc409ce2" event="[CUSTOM]:[]:[]:[confirmPasswordReset]:[SUCCESS]"/>
- <ReportTemplate key="empty"/>
+ <ReportTemplate id="empty"/>
- <Report key="c3520ad9-179f-49e7-b315-d684d216dd97" name="reconciliation" active="1" template_key="empty"/>
- <ReportletConfInstance key="d6c2b475-4860-4eb1-8fde-618299c2a97c" report_key="c3520ad9-179f-49e7-b315-d684d216dd97"
- serializedInstance='{"@class":"org.apache.syncope.common.lib.report.ReconciliationReportletConf","name":"dashboardReconciliationReportlet","userMatchingCond":null,"groupMatchingCond":null,"anyObjectMatchingCond":null,"features":["key","username","groupName"]}'/>
+ <Report id="c3520ad9-179f-49e7-b315-d684d216dd97" name="reconciliation" active="1" template_id="empty"/>
+ <ReportletConfInstance id="d6c2b475-4860-4eb1-8fde-618299c2a97c" report_id="c3520ad9-179f-49e7-b315-d684d216dd97"
+ serializedInstance='{"@class":"org.apache.syncope.common.lib.report.ReconciliationReportletConf","name":"dashboardReconciliationReportlet","userMatchingCond":null,"groupMatchingCond":null,"anyObjectMatchingCond":null,"features":["id","username","groupName"]}'/>
</dataset>
http://git-wip-us.apache.org/repos/asf/syncope/blob/0d745d43/core/persistence-jpa/src/main/resources/indexes.xml
----------------------------------------------------------------------
diff --git a/core/persistence-jpa/src/main/resources/indexes.xml b/core/persistence-jpa/src/main/resources/indexes.xml
index b9bb332..4d2ffcb 100644
--- a/core/persistence-jpa/src/main/resources/indexes.xml
+++ b/core/persistence-jpa/src/main/resources/indexes.xml
@@ -45,24 +45,24 @@ under the License.
<entry key="CPlainAttrValue_doublevalueIndex">CREATE INDEX CAttrValue_doublevalueIndex ON CPlainAttrValue(doublevalue)</entry>
<entry key="CPlainAttrValue_booleanvalueIndex">CREATE INDEX CAttrValue_booleanvalueIndex ON CPlainAttrValue(booleanvalue)</entry>
- <entry key="UMembership_GroupIndex">CREATE INDEX UMembership_GroupIndex ON UMembership(group_key)</entry>
- <entry key="UMembership_UserIndex">CREATE INDEX UMembership_UserIndex ON UMembership(user_key)</entry>
- <entry key="AMembership_GroupIndex">CREATE INDEX AMembership_GroupIndex ON AMembership(group_key)</entry>
- <entry key="AMembership_AnyObjectIndex">CREATE INDEX AMembership_AnyObjectIndex ON AMembership(anyObject_key)</entry>
+ <entry key="UMembership_GroupIndex">CREATE INDEX UMembership_GroupIndex ON UMembership(group_id)</entry>
+ <entry key="UMembership_UserIndex">CREATE INDEX UMembership_UserIndex ON UMembership(user_id)</entry>
+ <entry key="AMembership_GroupIndex">CREATE INDEX AMembership_GroupIndex ON AMembership(group_id)</entry>
+ <entry key="AMembership_AnyObjectIndex">CREATE INDEX AMembership_AnyObjectIndex ON AMembership(anyObject_id)</entry>
- <entry key="URelationship_RightIndex">CREATE INDEX URelationship_RightIndex ON URelationship(anyObject_key)</entry>
- <entry key="URelationship_LeftIndex">CREATE INDEX URelationship_LeftIndex ON URelationship(user_key)</entry>
- <entry key="ARelationship_RightIndex">CREATE INDEX ARelationship_RightIndex ON ARelationship(right_anyObject_key)</entry>
- <entry key="ARelationship_AnyObjectIndex">CREATE INDEX ARelationship_AnyObjectIndex ON ARelationship(left_anyObject_key)</entry>
+ <entry key="URelationship_RightIndex">CREATE INDEX URelationship_RightIndex ON URelationship(anyObject_id)</entry>
+ <entry key="URelationship_LeftIndex">CREATE INDEX URelationship_LeftIndex ON URelationship(user_id)</entry>
+ <entry key="ARelationship_RightIndex">CREATE INDEX ARelationship_RightIndex ON ARelationship(right_anyObject_id)</entry>
+ <entry key="ARelationship_AnyObjectIndex">CREATE INDEX ARelationship_AnyObjectIndex ON ARelationship(left_anyObject_id)</entry>
- <entry key="UPlainAttrValue_attrIndex">CREATE INDEX UPlainAttrValue_attrIndex on UPlainAttrValue(attribute_key)</entry>
- <entry key="GPlainAttrValue_attrIndex">CREATE INDEX GPlainAttrValue_attrIndex on GPlainAttrValue(attribute_key)</entry>
- <entry key="APlainAttrValue_attrIndex">CREATE INDEX APlainAttrValue_attrIndex on APlainAttrValue(attribute_key)</entry>
- <entry key="CPlainAttrValue_attrIndex">CREATE INDEX CPlainAttrValue_attrIndex on CPlainAttrValue(attribute_key)</entry>
+ <entry key="UPlainAttrValue_attrIndex">CREATE INDEX UPlainAttrValue_attrIndex on UPlainAttrValue(attribute_id)</entry>
+ <entry key="GPlainAttrValue_attrIndex">CREATE INDEX GPlainAttrValue_attrIndex on GPlainAttrValue(attribute_id)</entry>
+ <entry key="APlainAttrValue_attrIndex">CREATE INDEX APlainAttrValue_attrIndex on APlainAttrValue(attribute_id)</entry>
+ <entry key="CPlainAttrValue_attrIndex">CREATE INDEX CPlainAttrValue_attrIndex on CPlainAttrValue(attribute_id)</entry>
- <entry key="UPlainAttr_owner_key_index">CREATE INDEX UPlainAttr_owner_key_index on UPlainAttr(owner_key)</entry>
- <entry key="GPlainAttr_owner_key_index">CREATE INDEX GPlainAttr_owner_key_index on GPlainAttr(owner_key)</entry>
- <entry key="APlainAttr_owner_key_index">CREATE INDEX APlainAttr_owner_key_index on APlainAttr(owner_key)</entry>
+ <entry key="UPlainAttr_owner_idindex">CREATE INDEX UPlainAttr_owner_idindex on UPlainAttr(owner_id)</entry>
+ <entry key="GPlainAttr_owner_idindex">CREATE INDEX GPlainAttr_owner_idindex on GPlainAttr(owner_id)</entry>
+ <entry key="APlainAttr_owner_idindex">CREATE INDEX APlainAttr_owner_idindex on APlainAttr(owner_id)</entry>
<entry key="Task_executedIndex">CREATE INDEX Task_executedIndex ON Task(executed)</entry>
</properties>
http://git-wip-us.apache.org/repos/asf/syncope/blob/0d745d43/core/persistence-jpa/src/main/resources/views.xml
----------------------------------------------------------------------
diff --git a/core/persistence-jpa/src/main/resources/views.xml b/core/persistence-jpa/src/main/resources/views.xml
index 31eb379..59ec334 100644
--- a/core/persistence-jpa/src/main/resources/views.xml
+++ b/core/persistence-jpa/src/main/resources/views.xml
@@ -25,225 +25,225 @@ under the License.
<entry key="user_search">
CREATE VIEW user_search AS
- SELECT u.key as any_key, u.* FROM SyncopeUser u
+ SELECT u.id as any_id, u.* FROM SyncopeUser u
</entry>
<entry key="user_search_unique_attr">
CREATE VIEW user_search_unique_attr AS
- SELECT ua.owner_key AS any_key,
- ua.schema_key AS schema_key,
+ 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_key = ua.key
+ WHERE uav.attribute_id = ua.id
</entry>
<entry key="user_search_attr">
CREATE VIEW user_search_attr AS
- SELECT ua.owner_key AS any_key,
- ua.schema_key AS schema_key,
+ 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_key = ua.key
+ WHERE uav.attribute_id = ua.id
</entry>
<entry key="user_search_null_attr">
CREATE VIEW user_search_null_attr AS
- SELECT u.key AS any_key,
- PlainSchema.key AS schema_key,
+ 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.key = ua.schema_key AND ua.owner_key = u.key)
- WHERE ua.key IS NULL
+ 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
- SELECT m.user_key AS any_key, m.anyObject_key AS right_any_key, m.type_key AS type
+ SELECT m.user_id AS any_id, m.anyObject_id AS right_any_id, m.type_id AS type
FROM URelationship m
</entry>
<entry key="user_search_umembership">
CREATE VIEW user_search_umembership AS
- SELECT m.user_key AS any_key, g.key AS group_key, g.name AS group_name
+ 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_key = g.key
+ WHERE m.group_id = g.id
</entry>
<entry key="user_search_udyngmemb">
CREATE VIEW user_search_udyngmemb AS
- SELECT ds.user_key AS any_key, d.group_key AS group_key
+ SELECT ds.user_id AS any_id, d.group_id AS group_id
FROM UDynGroupMembership d, UDynGroupMembership_User ds
- WHERE d.key = ds.uDynGroupMembership_key
+ WHERE d.id = ds.uDynGroupMembership_id
</entry>
<entry key="user_search_role">
CREATE VIEW user_search_role AS
- SELECT ss.user_key AS any_key, ss.role_key AS role_key
+ SELECT ss.user_id AS any_id, ss.role_id AS role_id
FROM SyncopeUser_SyncopeRole ss
</entry>
<entry key="user_search_dynrmemb">
CREATE VIEW user_search_dynrmemb AS
- SELECT ds.user_key AS any_key, d.role_key AS role_key
+ SELECT ds.user_id AS any_id, d.role_id AS role_id
FROM DynRoleMembership d, DynRoleMembership_User ds
- WHERE d.key = ds.dynRoleMembership_key
+ WHERE d.id = ds.dynRoleMembership_id
</entry>
<entry key="user_search_resource">
CREATE VIEW user_search_resource AS
- SELECT st.user_key AS any_key, st.resource_key AS resource_key
+ SELECT st.user_id AS any_id, st.resource_id AS resource_id
FROM SyncopeUser_ExternalResource st
</entry>
<entry key="user_search_group_res">
CREATE VIEW user_search_group_res AS
- SELECT m.user_key AS any_key, st.resource_key AS resource_key
+ SELECT m.user_id AS any_id, st.resource_id AS resource_id
FROM UMembership m, SyncopeGroup r, SyncopeGroup_ExternalResource st
- WHERE m.group_key = r.key AND st.group_key = r.key
+ WHERE m.group_id = r.id AND st.group_id = r.id
</entry>
<!-- anyObject -->
<entry key="anyObject_search">
CREATE VIEW anyObject_search AS
- SELECT a.key as any_key, a.* FROM AnyObject a
+ SELECT a.id as any_id, a.* FROM AnyObject a
</entry>
<entry key="anyObject_search_unique_attr">
CREATE VIEW anyObject_search_unique_attr AS
- SELECT ua.owner_key AS any_key,
- ua.schema_key AS schema_key,
+ 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 APlainAttrUniqueValue uav, APlainAttr ua
- WHERE uav.attribute_key = ua.key
+ WHERE uav.attribute_id = ua.id
</entry>
<entry key="anyObject_search_attr">
CREATE VIEW anyObject_search_attr AS
- SELECT ua.owner_key AS any_key,
- ua.schema_key AS schema_key,
+ 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 APlainAttrValue uav, APlainAttr ua
- WHERE uav.attribute_key = ua.key
+ WHERE uav.attribute_id = ua.id
</entry>
<entry key="anyObject_search_null_attr">
CREATE VIEW anyObject_search_null_attr AS
- SELECT u.key AS any_key,
- PlainSchema.key AS schema_key,
+ 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.key = ua.schema_key AND ua.owner_key = u.key)
- WHERE ua.key IS NULL
+ 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
- SELECT m.left_anyObject_key AS any_key, m.right_anyObject_key AS right_any_key, m.type_key AS type
+ SELECT m.left_anyObject_id AS any_id, m.right_anyObject_id AS right_any_id, m.type_id AS type
FROM ARelationship m
</entry>
<entry key="anyObject_search_amembership">
CREATE VIEW anyObject_search_amembership AS
- SELECT m.anyObject_key AS any_key, g.key AS group_key, g.name AS group_name
+ SELECT m.anyObject_id AS any_id, g.id AS group_id, g.name AS group_name
FROM AMembership m, SyncopeGroup g
- WHERE m.group_key = g.key
+ WHERE m.group_id = g.id
</entry>
<entry key="anyObject_search_adyngmemb">
CREATE VIEW anyObject_search_adyngmemb AS
- SELECT ds.anyObject_key AS any_key, d.group_key AS group_key
+ SELECT ds.anyObject_id AS any_id, d.group_id AS group_id
FROM ADynGroupMembership d, ADynGroupMembership_AnyObject ds
- WHERE d.key = ds.aDynGroupMembership_key
+ WHERE d.id = ds.aDynGroupMembership_id
</entry>
<entry key="anyObject_search_resource">
CREATE VIEW anyObject_search_resource AS
- SELECT st.anyObject_key AS any_key, st.resource_key AS resource_key
+ SELECT st.anyObject_id AS any_id, st.resource_id AS resource_id
FROM AnyObject_ExternalResource st
</entry>
<entry key="anyObject_search_group_res">
CREATE VIEW anyObject_search_group_res AS
- SELECT m.anyObject_key AS any_key, st.resource_key AS resource_key
+ SELECT m.anyObject_id AS any_id, st.resource_id AS resource_id
FROM AMembership m, SyncopeGroup r, SyncopeGroup_ExternalResource st
- WHERE m.group_key = r.key AND st.group_key = r.key
+ WHERE m.group_id = r.id AND st.group_id = r.id
</entry>
<!-- group -->
<entry key="group_search">
CREATE VIEW group_search AS
- SELECT r.key as any_key, r.* FROM SyncopeGroup r
+ SELECT r.id as any_id, r.* FROM SyncopeGroup r
</entry>
<entry key="group_search_unique_attr">
CREATE VIEW group_search_unique_attr AS
- SELECT ua.owner_key AS any_key,
- ua.schema_key AS schema_key,
+ 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 GPlainAttrUniqueValue uav, GPlainAttr ua
- WHERE uav.attribute_key = ua.key
+ WHERE uav.attribute_id = ua.id
</entry>
<entry key="group_search_attr">
CREATE VIEW group_search_attr AS
- SELECT ua.owner_key AS any_key,
- ua.schema_key AS schema_key,
+ 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 GPlainAttrValue uav, GPlainAttr ua
- WHERE uav.attribute_key = ua.key
+ WHERE uav.attribute_id = ua.id
</entry>
<entry key="group_search_null_attr">
CREATE VIEW group_search_null_attr AS
- SELECT u.key AS any_key,
- PlainSchema.key AS schema_key,
+ 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.key = ua.schema_key AND ua.owner_key = u.key)
- WHERE ua.key IS NULL
+ 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
- SELECT st.group_key AS any_key, st.resource_key AS resource_key
+ SELECT st.group_id AS any_id, st.resource_id AS resource_id
FROM SyncopeGroup_ExternalResource st
</entry>
http://git-wip-us.apache.org/repos/asf/syncope/blob/0d745d43/core/persistence-jpa/src/test/java/org/apache/syncope/core/persistence/jpa/inner/AnySearchTest.java
----------------------------------------------------------------------
diff --git a/core/persistence-jpa/src/test/java/org/apache/syncope/core/persistence/jpa/inner/AnySearchTest.java b/core/persistence-jpa/src/test/java/org/apache/syncope/core/persistence/jpa/inner/AnySearchTest.java
index fe7118e..09e3b5a 100644
--- a/core/persistence-jpa/src/test/java/org/apache/syncope/core/persistence/jpa/inner/AnySearchTest.java
+++ b/core/persistence-jpa/src/test/java/org/apache/syncope/core/persistence/jpa/inner/AnySearchTest.java
@@ -302,7 +302,7 @@ public class AnySearchTest extends AbstractTest {
usernameLeafCond.setExpression("%ini");
AnyCond idRightCond = new AnyCond(AnyCond.Type.LT);
- idRightCond.setSchema("key");
+ idRightCond.setSchema("id");
idRightCond.setExpression("2");
SearchCond searchCondition = SearchCond.getAndCond(
@@ -322,13 +322,13 @@ public class AnySearchTest extends AbstractTest {
groupNameLeafCond.setSchema("name");
groupNameLeafCond.setExpression("root");
- AnyCond keyRightCond = new AnyCond(AnyCond.Type.EQ);
- keyRightCond.setSchema("key");
- keyRightCond.setExpression("37d15e4c-cdc1-460b-a591-8505c8133806");
+ AnyCond idRightCond = new AnyCond(AnyCond.Type.EQ);
+ idRightCond.setSchema("id");
+ idRightCond.setExpression("37d15e4c-cdc1-460b-a591-8505c8133806");
SearchCond searchCondition = SearchCond.getAndCond(
SearchCond.getLeafCond(groupNameLeafCond),
- SearchCond.getLeafCond(keyRightCond));
+ SearchCond.getLeafCond(idRightCond));
assertTrue(searchCondition.isValid());
@@ -361,11 +361,11 @@ public class AnySearchTest extends AbstractTest {
@Test
public void searchByKey() {
- AnyCond keyLeafCond = new AnyCond(AnyCond.Type.EQ);
- keyLeafCond.setSchema("key");
- keyLeafCond.setExpression("74cd8ece-715a-44a4-a736-e17b46c4e7e6");
+ AnyCond idLeafCond = new AnyCond(AnyCond.Type.EQ);
+ idLeafCond.setSchema("id");
+ idLeafCond.setExpression("74cd8ece-715a-44a4-a736-e17b46c4e7e6");
- SearchCond searchCondition = SearchCond.getLeafCond(keyLeafCond);
+ SearchCond searchCondition = SearchCond.getLeafCond(idLeafCond);
assertTrue(searchCondition.isValid());
List<User> users = searchDAO.search(searchCondition, AnyTypeKind.USER);
@@ -547,7 +547,7 @@ public class AnySearchTest extends AbstractTest {
@Test
public void issue242() {
AnyCond cond = new AnyCond(AttributeCond.Type.LIKE);
- cond.setSchema("key");
+ cond.setSchema("id");
cond.setExpression("test%");
SearchCond searchCondition = SearchCond.getLeafCond(cond);
http://git-wip-us.apache.org/repos/asf/syncope/blob/0d745d43/core/persistence-jpa/src/test/java/org/apache/syncope/core/persistence/jpa/inner/DomainTest.java
----------------------------------------------------------------------
diff --git a/core/persistence-jpa/src/test/java/org/apache/syncope/core/persistence/jpa/inner/DomainTest.java b/core/persistence-jpa/src/test/java/org/apache/syncope/core/persistence/jpa/inner/DomainTest.java
index 2924d34..0a0a73e 100644
--- a/core/persistence-jpa/src/test/java/org/apache/syncope/core/persistence/jpa/inner/DomainTest.java
+++ b/core/persistence-jpa/src/test/java/org/apache/syncope/core/persistence/jpa/inner/DomainTest.java
@@ -79,10 +79,10 @@ public class DomainTest extends AbstractTest {
Domain actual = domainDAO.save(domain);
assertNotNull(actual);
- String key = actual.getKey();
- assertNotNull(domainDAO.find(key));
+ String id = actual.getKey();
+ assertNotNull(domainDAO.find(id));
- domainDAO.delete(key);
- assertNull(domainDAO.find(key));
+ domainDAO.delete(id);
+ assertNull(domainDAO.find(id));
}
}
http://git-wip-us.apache.org/repos/asf/syncope/blob/0d745d43/core/persistence-jpa/src/test/java/org/apache/syncope/core/persistence/jpa/inner/RealmTest.java
----------------------------------------------------------------------
diff --git a/core/persistence-jpa/src/test/java/org/apache/syncope/core/persistence/jpa/inner/RealmTest.java b/core/persistence-jpa/src/test/java/org/apache/syncope/core/persistence/jpa/inner/RealmTest.java
index 63620cb..d8d853a 100644
--- a/core/persistence-jpa/src/test/java/org/apache/syncope/core/persistence/jpa/inner/RealmTest.java
+++ b/core/persistence-jpa/src/test/java/org/apache/syncope/core/persistence/jpa/inner/RealmTest.java
@@ -171,10 +171,10 @@ public class RealmTest extends AbstractTest {
Realm actual = realmDAO.save(realm);
assertNotNull(actual);
- String key = actual.getKey();
- assertNotNull(realmDAO.find(key));
+ String id = actual.getKey();
+ assertNotNull(realmDAO.find(id));
- realmDAO.delete(key);
- assertNull(realmDAO.find(key));
+ realmDAO.delete(id);
+ assertNull(realmDAO.find(id));
}
}