Author: bdaw Date: 2009-11-19 10:29:00 -0500 (Thu, 19 Nov 2009) New Revision: 1041 Modified: migration/idm/trunk/picketlink-idm-docs/ReferenceGuide/en/ReferenceGuide.xml migration/idm/trunk/picketlink-idm-hibernate/src/main/resources/mappings/HibernateIdentityObject.hbm.xml migration/idm/trunk/picketlink-idm-hibernate/src/main/resources/mappings/HibernateIdentityObjectAttribute.hbm.xml migration/idm/trunk/picketlink-idm-hibernate/src/main/resources/mappings/HibernateIdentityObjectCredential.hbm.xml migration/idm/trunk/picketlink-idm-hibernate/src/main/resources/mappings/HibernateIdentityObjectRelationship.hbm.xml migration/idm/trunk/picketlink-idm-hibernate/src/main/resources/mappings/HibernateIdentityObjectRelationshipName.hbm.xml migration/idm/trunk/picketlink-idm-hibernate/src/main/resources/mappings/HibernateRealm.hbm.xml migration/idm/trunk/picketlink-idm-hibernate/src/main/resources/sybase-mappings/HibernateIdentityObject.hbm.xml migration/idm/trunk/picketlink-idm-hibernate/src/main/resources/sybase-mappings/HibernateIdentityObjectAttribute.hbm.xml migration/idm/trunk/picketlink-idm-hibernate/src/main/resources/sybase-mappings/HibernateIdentityObjectCredential.hbm.xml migration/idm/trunk/picketlink-idm-hibernate/src/main/resources/sybase-mappings/HibernateIdentityObjectRelationship.hbm.xml migration/idm/trunk/picketlink-idm-hibernate/src/main/resources/sybase-mappings/HibernateIdentityObjectRelationshipName.hbm.xml migration/idm/trunk/picketlink-idm-hibernate/src/main/resources/sybase-mappings/HibernateRealm.hbm.xml migration/idm/trunk/picketlink-idm-testsuite/src/test/resources/test-identity-config-openldapds.xml Log: mappings update Modified: migration/idm/trunk/picketlink-idm-docs/ReferenceGuide/en/ReferenceGuide.xml =================================================================== --- migration/idm/trunk/picketlink-idm-docs/ReferenceGuide/en/ReferenceGuide.xml 2009-11-19 15:07:00 UTC (rev 1040) +++ migration/idm/trunk/picketlink-idm-docs/ReferenceGuide/en/ReferenceGuide.xml 2009-11-19 15:29:00 UTC (rev 1041) @@ -14,7 +14,7 @@ xmlns:xi="http://www.w3.org/2001/XInclude"/> <releaseinfo> - 1.0.0.Beta4 + 1.0.0.CR1 </releaseinfo> Modified: migration/idm/trunk/picketlink-idm-hibernate/src/main/resources/mappings/HibernateIdentityObject.hbm.xml =================================================================== --- migration/idm/trunk/picketlink-idm-hibernate/src/main/resources/mappings/HibernateIdentityObject.hbm.xml 2009-11-19 15:07:00 UTC (rev 1040) +++ migration/idm/trunk/picketlink-idm-hibernate/src/main/resources/mappings/HibernateIdentityObject.hbm.xml 2009-11-19 15:29:00 UTC (rev 1041) @@ -14,7 +14,7 @@ <set name="attributes" inverse="true" cascade="all, delete-orphan" - lazy="true" + lazy="extra" fetch="subselect"> <cache usage="read-write"/> <key> @@ -25,7 +25,7 @@ <set name="credentials" inverse="true" cascade="all, delete-orphan" - lazy="true" + lazy="extra" fetch="subselect"> <cache usage="read-write"/> <key> @@ -35,7 +35,7 @@ </set> <set name="fromRelationships" inverse="true" - lazy="true" + lazy="extra" fetch="subselect"> <cache usage="read-write"/> <key> @@ -63,7 +63,7 @@ <map name="properties" table="jbid_io_props" cascade="all, delete-orphan" - lazy="true" + lazy="extra" fetch="subselect"> <cache usage="read-write"/> <key column="PROP_ID"/> @@ -83,7 +83,7 @@ </many-to-one> <set name="toRelationships" inverse="true" - lazy="true" + lazy="extra" fetch="subselect"> <cache usage="read-write"/> <key> Modified: migration/idm/trunk/picketlink-idm-hibernate/src/main/resources/mappings/HibernateIdentityObjectAttribute.hbm.xml =================================================================== --- migration/idm/trunk/picketlink-idm-hibernate/src/main/resources/mappings/HibernateIdentityObjectAttribute.hbm.xml 2009-11-19 15:07:00 UTC (rev 1040) +++ migration/idm/trunk/picketlink-idm-hibernate/src/main/resources/mappings/HibernateIdentityObjectAttribute.hbm.xml 2009-11-19 15:29:00 UTC (rev 1041) @@ -35,7 +35,7 @@ table="jbid_io_attr_text_values" cascade="all, delete-orphan" access="field" - lazy="true" + lazy="extra" fetch="subselect"> <cache usage="read-write"/> <key column="TEXT_ATTR_VALUE_ID"/> Modified: migration/idm/trunk/picketlink-idm-hibernate/src/main/resources/mappings/HibernateIdentityObjectCredential.hbm.xml =================================================================== --- migration/idm/trunk/picketlink-idm-hibernate/src/main/resources/mappings/HibernateIdentityObjectCredential.hbm.xml 2009-11-19 15:07:00 UTC (rev 1040) +++ migration/idm/trunk/picketlink-idm-hibernate/src/main/resources/mappings/HibernateIdentityObjectCredential.hbm.xml 2009-11-19 15:29:00 UTC (rev 1041) @@ -33,7 +33,7 @@ <map name="properties" table="jbid_io_creden_props" cascade="all, delete-orphan" - lazy="true" + lazy="extra" fetch="subselect"> <cache usage="read-write"/> <key column="PROP_ID"/> Modified: migration/idm/trunk/picketlink-idm-hibernate/src/main/resources/mappings/HibernateIdentityObjectRelationship.hbm.xml =================================================================== --- migration/idm/trunk/picketlink-idm-hibernate/src/main/resources/mappings/HibernateIdentityObjectRelationship.hbm.xml 2009-11-19 15:07:00 UTC (rev 1040) +++ migration/idm/trunk/picketlink-idm-hibernate/src/main/resources/mappings/HibernateIdentityObjectRelationship.hbm.xml 2009-11-19 15:29:00 UTC (rev 1041) @@ -50,7 +50,7 @@ table="jbid_io_rel_props" cascade="all, delete-orphan" fetch="subselect" - lazy="true"> + lazy="extra"> <cache usage="read-write"/> <key column="PROP_ID"/> <map-key type="string" Modified: migration/idm/trunk/picketlink-idm-hibernate/src/main/resources/mappings/HibernateIdentityObjectRelationshipName.hbm.xml =================================================================== --- migration/idm/trunk/picketlink-idm-hibernate/src/main/resources/mappings/HibernateIdentityObjectRelationshipName.hbm.xml 2009-11-19 15:07:00 UTC (rev 1040) +++ migration/idm/trunk/picketlink-idm-hibernate/src/main/resources/mappings/HibernateIdentityObjectRelationshipName.hbm.xml 2009-11-19 15:29:00 UTC (rev 1041) @@ -24,7 +24,7 @@ <map name="properties" table="jbid_io_rel_name_props" cascade="all, delete-orphan" - lazy="true" + lazy="extra" fetch="subselect"> <cache usage="read-write"/> <key column="PROP_ID"/> Modified: migration/idm/trunk/picketlink-idm-hibernate/src/main/resources/mappings/HibernateRealm.hbm.xml =================================================================== --- migration/idm/trunk/picketlink-idm-hibernate/src/main/resources/mappings/HibernateRealm.hbm.xml 2009-11-19 15:07:00 UTC (rev 1040) +++ migration/idm/trunk/picketlink-idm-hibernate/src/main/resources/mappings/HibernateRealm.hbm.xml 2009-11-19 15:29:00 UTC (rev 1041) @@ -23,7 +23,7 @@ table="jbid_real_props" cascade="all, delete-orphan" fetch="subselect" - lazy="true"> + lazy="extra"> <cache usage="read-write"/> <key column="PROP_ID"/> <map-key type="string" Modified: migration/idm/trunk/picketlink-idm-hibernate/src/main/resources/sybase-mappings/HibernateIdentityObject.hbm.xml =================================================================== --- migration/idm/trunk/picketlink-idm-hibernate/src/main/resources/sybase-mappings/HibernateIdentityObject.hbm.xml 2009-11-19 15:07:00 UTC (rev 1040) +++ migration/idm/trunk/picketlink-idm-hibernate/src/main/resources/sybase-mappings/HibernateIdentityObject.hbm.xml 2009-11-19 15:29:00 UTC (rev 1041) @@ -14,7 +14,7 @@ <set name="attributes" inverse="true" cascade="all, delete-orphan" - lazy="true" + lazy="extra" fetch="subselect"> <cache usage="read-write"/> <key> @@ -25,7 +25,7 @@ <set name="credentials" inverse="true" cascade="all, delete-orphan" - lazy="true" + lazy="extra" fetch="subselect"> <cache usage="read-write"/> <key> @@ -35,7 +35,7 @@ </set> <set name="fromRelationships" inverse="true" - lazy="true" + lazy="extra" fetch="subselect"> <cache usage="read-write"/> <key> @@ -63,7 +63,7 @@ <map name="properties" table="jbid_io_props" cascade="all, delete-orphan" - lazy="true" + lazy="extra" fetch="subselect"> <cache usage="read-write"/> <key column="PROP_ID"/> @@ -83,7 +83,7 @@ </many-to-one> <set name="toRelationships" inverse="true" - lazy="true" + lazy="extra" fetch="subselect"> <cache usage="read-write"/> <key> Modified: migration/idm/trunk/picketlink-idm-hibernate/src/main/resources/sybase-mappings/HibernateIdentityObjectAttribute.hbm.xml =================================================================== --- migration/idm/trunk/picketlink-idm-hibernate/src/main/resources/sybase-mappings/HibernateIdentityObjectAttribute.hbm.xml 2009-11-19 15:07:00 UTC (rev 1040) +++ migration/idm/trunk/picketlink-idm-hibernate/src/main/resources/sybase-mappings/HibernateIdentityObjectAttribute.hbm.xml 2009-11-19 15:29:00 UTC (rev 1041) @@ -35,7 +35,7 @@ table="jbid_io_attr_text_values" cascade="all, delete-orphan" access="field" - lazy="true" + lazy="extra" fetch="subselect"> <cache usage="read-write"/> <key column="TEXT_ATTR_VALUE_ID"/> Modified: migration/idm/trunk/picketlink-idm-hibernate/src/main/resources/sybase-mappings/HibernateIdentityObjectCredential.hbm.xml =================================================================== --- migration/idm/trunk/picketlink-idm-hibernate/src/main/resources/sybase-mappings/HibernateIdentityObjectCredential.hbm.xml 2009-11-19 15:07:00 UTC (rev 1040) +++ migration/idm/trunk/picketlink-idm-hibernate/src/main/resources/sybase-mappings/HibernateIdentityObjectCredential.hbm.xml 2009-11-19 15:29:00 UTC (rev 1041) @@ -33,7 +33,7 @@ <map name="properties" table="jbid_io_creden_props" cascade="all, delete-orphan" - lazy="true" + lazy="extra" fetch="subselect"> <cache usage="read-write"/> <key column="PROP_ID"/> Modified: migration/idm/trunk/picketlink-idm-hibernate/src/main/resources/sybase-mappings/HibernateIdentityObjectRelationship.hbm.xml =================================================================== --- migration/idm/trunk/picketlink-idm-hibernate/src/main/resources/sybase-mappings/HibernateIdentityObjectRelationship.hbm.xml 2009-11-19 15:07:00 UTC (rev 1040) +++ migration/idm/trunk/picketlink-idm-hibernate/src/main/resources/sybase-mappings/HibernateIdentityObjectRelationship.hbm.xml 2009-11-19 15:29:00 UTC (rev 1041) @@ -50,7 +50,7 @@ table="jbid_io_rel_props" cascade="all, delete-orphan" fetch="subselect" - lazy="true"> + lazy="extra"> <cache usage="read-write"/> <key column="PROP_ID"/> <map-key type="string" Modified: migration/idm/trunk/picketlink-idm-hibernate/src/main/resources/sybase-mappings/HibernateIdentityObjectRelationshipName.hbm.xml =================================================================== --- migration/idm/trunk/picketlink-idm-hibernate/src/main/resources/sybase-mappings/HibernateIdentityObjectRelationshipName.hbm.xml 2009-11-19 15:07:00 UTC (rev 1040) +++ migration/idm/trunk/picketlink-idm-hibernate/src/main/resources/sybase-mappings/HibernateIdentityObjectRelationshipName.hbm.xml 2009-11-19 15:29:00 UTC (rev 1041) @@ -24,7 +24,7 @@ <map name="properties" table="jbid_io_rel_name_props" cascade="all, delete-orphan" - lazy="true" + lazy="extra" fetch="subselect"> <cache usage="read-write"/> <key column="PROP_ID"/> Modified: migration/idm/trunk/picketlink-idm-hibernate/src/main/resources/sybase-mappings/HibernateRealm.hbm.xml =================================================================== --- migration/idm/trunk/picketlink-idm-hibernate/src/main/resources/sybase-mappings/HibernateRealm.hbm.xml 2009-11-19 15:07:00 UTC (rev 1040) +++ migration/idm/trunk/picketlink-idm-hibernate/src/main/resources/sybase-mappings/HibernateRealm.hbm.xml 2009-11-19 15:29:00 UTC (rev 1041) @@ -23,7 +23,7 @@ table="jbid_real_props" cascade="all, delete-orphan" fetch="subselect" - lazy="true"> + lazy="extra"> <cache usage="read-write"/> <key column="PROP_ID"/> <map-key type="string" Modified: migration/idm/trunk/picketlink-idm-testsuite/src/test/resources/test-identity-config-openldapds.xml =================================================================== --- migration/idm/trunk/picketlink-idm-testsuite/src/test/resources/test-identity-config-openldapds.xml 2009-11-19 15:07:00 UTC (rev 1040) +++ migration/idm/trunk/picketlink-idm-testsuite/src/test/resources/test-identity-config-openldapds.xml 2009-11-19 15:29:00 UTC (rev 1041) @@ -173,34 +173,6 @@ <identity-object-type> <name>USER</name> <relationships> - <!--<relationship>--> - <!--<relationship-type-ref>JBOSS_IDENTITY_ROLE</relationship-type-ref>--> - <!--<identity-object-type-ref>ORGANIZATION</identity-object-type-ref>--> - <!--</relationship>--> - <!--<relationship>--> - <!--<relationship-type-ref>JBOSS_IDENTITY_ROLE</relationship-type-ref>--> - <!--<identity-object-type-ref>COMMUNITY</identity-object-type-ref>--> - <!--</relationship>--> - <!--<relationship>--> - <!--<relationship-type-ref>JBOSS_IDENTITY_ROLE</relationship-type-ref>--> - <!--<identity-object-type-ref>OFFICE</identity-object-type-ref>--> - <!--</relationship>--> - <!--<relationship>--> - <!--<relationship-type-ref>JBOSS_IDENTITY_ROLE</relationship-type-ref>--> - <!--<identity-object-type-ref>SECURITY</identity-object-type-ref>--> - <!--</relationship>--> - <!--<relationship>--> - <!--<relationship-type-ref>JBOSS_IDENTITY_ROLE</relationship-type-ref>--> - <!--<identity-object-type-ref>ORGANIZATION_UNIT</identity-object-type-ref>--> - <!--</relationship>--> - <!--<relationship>--> - <!--<relationship-type-ref>JBOSS_IDENTITY_ROLE</relationship-type-ref>--> - <!--<identity-object-type-ref>PROJECT</identity-object-type-ref>--> - <!--</relationship>--> - <!--<relationship>--> - <!--<relationship-type-ref>JBOSS_IDENTITY_ROLE</relationship-type-ref>--> - <!--<identity-object-type-ref>PEOPLE</identity-object-type-ref>--> - <!--</relationship>--> </relationships> <credentials> <credential-type>PASSWORD</credential-type>