Author: bdaw Date: 2009-11-09 08:12:00 -0500 (Mon, 09 Nov 2009) New Revision: 917 Removed: idm/trunk/idm-testsuite/src/test/java/org/jboss/identity/idm/test/HibernateAnnotationsSupport.java idm/trunk/idm-testsuite/src/test/resources/mappings/ Modified: idm/trunk/assembly/src/main/config/hsqldb.hibernate.cfg.xml idm/trunk/assembly/src/main/config/hsqldburl.hibernate.cfg.xml idm/trunk/assembly/src/main/config/mssql.hibernate.cfg.xml idm/trunk/assembly/src/main/config/mysql.hibernate.cfg.xml idm/trunk/assembly/src/main/config/oracle.hibernate.cfg.xml idm/trunk/assembly/src/main/config/postgresql.hibernate.cfg.xml idm/trunk/assembly/src/main/config/sybase.hibernate.cfg.xml idm/trunk/assembly/src/main/files/db/hibernate.cfg/hsqldb.hibernate.cfg.xml idm/trunk/assembly/src/main/files/db/hibernate.cfg/hsqldburl.hibernate.cfg.xml idm/trunk/assembly/src/main/files/db/hibernate.cfg/mssql.hibernate.cfg.xml idm/trunk/assembly/src/main/files/db/hibernate.cfg/mysql.hibernate.cfg.xml idm/trunk/assembly/src/main/files/db/hibernate.cfg/oracle.hibernate.cfg.xml idm/trunk/assembly/src/main/files/db/hibernate.cfg/postgresql.hibernate.cfg.xml idm/trunk/assembly/src/main/files/db/hibernate.cfg/sybase.hibernate.cfg.xml idm/trunk/assembly/src/main/files/jboss/hibernate.cfg/hsqldb.hibernate.cfg.xml idm/trunk/assembly/src/main/files/jboss/hibernate.cfg/mssql.hibernate.cfg.xml idm/trunk/assembly/src/main/files/jboss/hibernate.cfg/mysql.hibernate.cfg.xml idm/trunk/assembly/src/main/files/jboss/hibernate.cfg/oracle.hibernate.cfg.xml idm/trunk/assembly/src/main/files/jboss/hibernate.cfg/postgresql.hibernate.cfg.xml idm/trunk/assembly/src/main/files/jboss/hibernate.cfg/sybase.hibernate.cfg.xml idm/trunk/example/auth/src/main/resources/jboss.idm.hibernate.cfg.xml idm/trunk/example/simple/pom.xml idm/trunk/example/simple/src/test/java/org/jboss/identity/idm/example/InjectSFTestCase.java idm/trunk/example/simple/src/test/resources/example-mixed-config.xml idm/trunk/example/simple/src/test/resources/hibernate-jboss-identity-classes.cfg.xml idm/trunk/example/simple/src/test/resources/hibernate-jboss-identity.cfg.xml idm/trunk/idm-doc/ReferenceGuide/en/ReferenceGuide.xml idm/trunk/idm-hibernate/pom.xml idm/trunk/idm-hibernate/src/main/java/org/jboss/identity/idm/impl/model/hibernate/HibernateIdentityObject.java idm/trunk/idm-hibernate/src/main/java/org/jboss/identity/idm/impl/model/hibernate/HibernateIdentityObjectCredential.java idm/trunk/idm-hibernate/src/main/java/org/jboss/identity/idm/impl/model/hibernate/HibernateIdentityObjectCredentialType.java idm/trunk/idm-hibernate/src/main/java/org/jboss/identity/idm/impl/model/hibernate/HibernateIdentityObjectRelationship.java idm/trunk/idm-hibernate/src/main/java/org/jboss/identity/idm/impl/model/hibernate/HibernateIdentityObjectRelationshipName.java idm/trunk/idm-hibernate/src/main/java/org/jboss/identity/idm/impl/model/hibernate/HibernateIdentityObjectRelationshipType.java idm/trunk/idm-hibernate/src/main/java/org/jboss/identity/idm/impl/model/hibernate/HibernateIdentityObjectType.java idm/trunk/idm-hibernate/src/main/java/org/jboss/identity/idm/impl/model/hibernate/HibernateRealm.java idm/trunk/idm-hibernate/src/main/java/org/jboss/identity/idm/impl/store/hibernate/HibernateIdentityStoreImpl.java idm/trunk/idm-testsuite/src/test/java/org/jboss/identity/idm/impl/HibernateTestSupport.java idm/trunk/idm-testsuite/src/test/java/org/jboss/identity/idm/impl/IdentityTestPOJO.java idm/trunk/idm-testsuite/src/test/resources/datasources/hibernates.xml idm/trunk/idm-testsuite/src/test/resources/hibernate-jboss-identity-classes.cfg.xml idm/trunk/idm-testsuite/src/test/resources/hibernate-jboss-identity.cfg.xml idm/trunk/integration/deployer/src/main/resources/jboss.idm.hibernate.cfg.xml idm/trunk/integration/jboss5/src/main/java/org/jboss/identity/idm/integration/jboss5/IDMService.java idm/trunk/parent/pom.xml idm/trunk/pom.xml Log: - cleanup of hibernate annotations leftovers Modified: idm/trunk/assembly/src/main/config/hsqldb.hibernate.cfg.xml =================================================================== --- idm/trunk/assembly/src/main/config/hsqldb.hibernate.cfg.xml 2009-11-08 22:45:12 UTC (rev 916) +++ idm/trunk/assembly/src/main/config/hsqldb.hibernate.cfg.xml 2009-11-09 13:12:00 UTC (rev 917) @@ -32,21 +32,18 @@ <property name="hibernate.format_sql">true</property> - <!-- Mapping classes --> - <!-- all nessesary mappings are added programatically to the configuration in the store--> - <!-- this is for manual SF creation--> - <mapping class="org.jboss.identity.idm.impl.model.hibernate.HibernateRealm"/> - <mapping class="org.jboss.identity.idm.impl.model.hibernate.HibernateIdentityObject"/> - <mapping class="org.jboss.identity.idm.impl.model.hibernate.HibernateIdentityObjectCredential"/> - <mapping class="org.jboss.identity.idm.impl.model.hibernate.HibernateIdentityObjectCredentialType"/> - <mapping class="org.jboss.identity.idm.impl.model.hibernate.HibernateIdentityObjectAttribute"/> - <mapping class="org.jboss.identity.idm.impl.model.hibernate.HibernateIdentityObjectTextAttribute"/> - <mapping class="org.jboss.identity.idm.impl.model.hibernate.HibernateIdentityObjectBinaryAttribute"/> - <mapping class="org.jboss.identity.idm.impl.model.hibernate.HibernateIdentityObjectBinaryAttributeValue"/> - <mapping class="org.jboss.identity.idm.impl.model.hibernate.HibernateIdentityObjectType"/> - <mapping class="org.jboss.identity.idm.impl.model.hibernate.HibernateIdentityObjectRelationship"/> - <mapping class="org.jboss.identity.idm.impl.model.hibernate.HibernateIdentityObjectRelationshipType"/> - <mapping class="org.jboss.identity.idm.impl.model.hibernate.HibernateIdentityObjectRelationshipName"/> + <!-- Mapping classes --> + <!-- all nessesary mappings are added programatically to the configuration in the store--> + <!-- this is for manual SF creation or when 'addHibernateMappings' is set to false in the store configuration--> + <mapping resource="mappings/HibernateRealm.hbm.xml"/> + <mapping resource="mappings/HibernateIdentityObject.hbm.xml"/> + <mapping resource="mappings/HibernateIdentityObjectCredential.hbm.xml"/> + <mapping resource="mappings/HibernateIdentityObjectCredentialType.hbm.xml"/> + <mapping resource="mappings/HibernateIdentityObjectAttribute.hbm.xml"/> + <mapping resource="mappings/HibernateIdentityObjectType.hbm.xml"/> + <mapping resource="mappings/HibernateIdentityObjectRelationship.hbm.xml"/> + <mapping resource="mappings/HibernateIdentityObjectRelationshipType.hbm.xml"/> + <mapping resource="mappings/HibernateIdentityObjectRelationshipName.hbm.xml"/> </session-factory> Modified: idm/trunk/assembly/src/main/config/hsqldburl.hibernate.cfg.xml =================================================================== --- idm/trunk/assembly/src/main/config/hsqldburl.hibernate.cfg.xml 2009-11-08 22:45:12 UTC (rev 916) +++ idm/trunk/assembly/src/main/config/hsqldburl.hibernate.cfg.xml 2009-11-09 13:12:00 UTC (rev 917) @@ -32,21 +32,18 @@ <property name="hibernate.format_sql">true</property> - <!-- Mapping classes --> - <!-- all nessesary mappings are added programatically to the configuration in the store--> - <!-- this is for manual SF creation--> - <mapping class="org.jboss.identity.idm.impl.model.hibernate.HibernateRealm"/> - <mapping class="org.jboss.identity.idm.impl.model.hibernate.HibernateIdentityObject"/> - <mapping class="org.jboss.identity.idm.impl.model.hibernate.HibernateIdentityObjectCredential"/> - <mapping class="org.jboss.identity.idm.impl.model.hibernate.HibernateIdentityObjectCredentialType"/> - <mapping class="org.jboss.identity.idm.impl.model.hibernate.HibernateIdentityObjectAttribute"/> - <mapping class="org.jboss.identity.idm.impl.model.hibernate.HibernateIdentityObjectTextAttribute"/> - <mapping class="org.jboss.identity.idm.impl.model.hibernate.HibernateIdentityObjectBinaryAttribute"/> - <mapping class="org.jboss.identity.idm.impl.model.hibernate.HibernateIdentityObjectBinaryAttributeValue"/> - <mapping class="org.jboss.identity.idm.impl.model.hibernate.HibernateIdentityObjectType"/> - <mapping class="org.jboss.identity.idm.impl.model.hibernate.HibernateIdentityObjectRelationship"/> - <mapping class="org.jboss.identity.idm.impl.model.hibernate.HibernateIdentityObjectRelationshipType"/> - <mapping class="org.jboss.identity.idm.impl.model.hibernate.HibernateIdentityObjectRelationshipName"/> + <!-- Mapping classes --> + <!-- all nessesary mappings are added programatically to the configuration in the store--> + <!-- this is for manual SF creation or when 'addHibernateMappings' is set to false in the store configuration--> + <mapping resource="mappings/HibernateRealm.hbm.xml"/> + <mapping resource="mappings/HibernateIdentityObject.hbm.xml"/> + <mapping resource="mappings/HibernateIdentityObjectCredential.hbm.xml"/> + <mapping resource="mappings/HibernateIdentityObjectCredentialType.hbm.xml"/> + <mapping resource="mappings/HibernateIdentityObjectAttribute.hbm.xml"/> + <mapping resource="mappings/HibernateIdentityObjectType.hbm.xml"/> + <mapping resource="mappings/HibernateIdentityObjectRelationship.hbm.xml"/> + <mapping resource="mappings/HibernateIdentityObjectRelationshipType.hbm.xml"/> + <mapping resource="mappings/HibernateIdentityObjectRelationshipName.hbm.xml"/> </session-factory> Modified: idm/trunk/assembly/src/main/config/mssql.hibernate.cfg.xml =================================================================== --- idm/trunk/assembly/src/main/config/mssql.hibernate.cfg.xml 2009-11-08 22:45:12 UTC (rev 916) +++ idm/trunk/assembly/src/main/config/mssql.hibernate.cfg.xml 2009-11-09 13:12:00 UTC (rev 917) @@ -31,21 +31,18 @@ <property name="hibernate.dialect">org.hibernate.dialect.SQLServerDialect</property> <property name="hibernate.format_sql">true</property> - <!-- Mapping classes --> - <!-- all nessesary mappings are added programatically to the configuration in the store--> - <!-- this is for manual SF creation--> - <mapping class="org.jboss.identity.idm.impl.model.hibernate.HibernateRealm"/> - <mapping class="org.jboss.identity.idm.impl.model.hibernate.HibernateIdentityObject"/> - <mapping class="org.jboss.identity.idm.impl.model.hibernate.HibernateIdentityObjectCredential"/> - <mapping class="org.jboss.identity.idm.impl.model.hibernate.HibernateIdentityObjectCredentialType"/> - <mapping class="org.jboss.identity.idm.impl.model.hibernate.HibernateIdentityObjectAttribute"/> - <mapping class="org.jboss.identity.idm.impl.model.hibernate.HibernateIdentityObjectTextAttribute"/> - <mapping class="org.jboss.identity.idm.impl.model.hibernate.HibernateIdentityObjectBinaryAttribute"/> - <mapping class="org.jboss.identity.idm.impl.model.hibernate.HibernateIdentityObjectBinaryAttributeValue"/> - <mapping class="org.jboss.identity.idm.impl.model.hibernate.HibernateIdentityObjectType"/> - <mapping class="org.jboss.identity.idm.impl.model.hibernate.HibernateIdentityObjectRelationship"/> - <mapping class="org.jboss.identity.idm.impl.model.hibernate.HibernateIdentityObjectRelationshipType"/> - <mapping class="org.jboss.identity.idm.impl.model.hibernate.HibernateIdentityObjectRelationshipName"/> + <!-- Mapping classes --> + <!-- all nessesary mappings are added programatically to the configuration in the store--> + <!-- this is for manual SF creation or when 'addHibernateMappings' is set to false in the store configuration--> + <mapping resource="mappings/HibernateRealm.hbm.xml"/> + <mapping resource="mappings/HibernateIdentityObject.hbm.xml"/> + <mapping resource="mappings/HibernateIdentityObjectCredential.hbm.xml"/> + <mapping resource="mappings/HibernateIdentityObjectCredentialType.hbm.xml"/> + <mapping resource="mappings/HibernateIdentityObjectAttribute.hbm.xml"/> + <mapping resource="mappings/HibernateIdentityObjectType.hbm.xml"/> + <mapping resource="mappings/HibernateIdentityObjectRelationship.hbm.xml"/> + <mapping resource="mappings/HibernateIdentityObjectRelationshipType.hbm.xml"/> + <mapping resource="mappings/HibernateIdentityObjectRelationshipName.hbm.xml"/> </session-factory> Modified: idm/trunk/assembly/src/main/config/mysql.hibernate.cfg.xml =================================================================== --- idm/trunk/assembly/src/main/config/mysql.hibernate.cfg.xml 2009-11-08 22:45:12 UTC (rev 916) +++ idm/trunk/assembly/src/main/config/mysql.hibernate.cfg.xml 2009-11-09 13:12:00 UTC (rev 917) @@ -31,21 +31,18 @@ <property name="hibernate.dialect">org.hibernate.dialect.MySQLInnoDBDialect</property> <property name="hibernate.format_sql">true</property> - <!-- Mapping classes --> - <!-- all nessesary mappings are added programatically to the configuration in the store--> - <!-- this is for manual SF creation--> - <mapping class="org.jboss.identity.idm.impl.model.hibernate.HibernateRealm"/> - <mapping class="org.jboss.identity.idm.impl.model.hibernate.HibernateIdentityObject"/> - <mapping class="org.jboss.identity.idm.impl.model.hibernate.HibernateIdentityObjectCredential"/> - <mapping class="org.jboss.identity.idm.impl.model.hibernate.HibernateIdentityObjectCredentialType"/> - <mapping class="org.jboss.identity.idm.impl.model.hibernate.HibernateIdentityObjectAttribute"/> - <mapping class="org.jboss.identity.idm.impl.model.hibernate.HibernateIdentityObjectTextAttribute"/> - <mapping class="org.jboss.identity.idm.impl.model.hibernate.HibernateIdentityObjectBinaryAttribute"/> - <mapping class="org.jboss.identity.idm.impl.model.hibernate.HibernateIdentityObjectBinaryAttributeValue"/> - <mapping class="org.jboss.identity.idm.impl.model.hibernate.HibernateIdentityObjectType"/> - <mapping class="org.jboss.identity.idm.impl.model.hibernate.HibernateIdentityObjectRelationship"/> - <mapping class="org.jboss.identity.idm.impl.model.hibernate.HibernateIdentityObjectRelationshipType"/> - <mapping class="org.jboss.identity.idm.impl.model.hibernate.HibernateIdentityObjectRelationshipName"/> + <!-- Mapping classes --> + <!-- all nessesary mappings are added programatically to the configuration in the store--> + <!-- this is for manual SF creation or when 'addHibernateMappings' is set to false in the store configuration--> + <mapping resource="mappings/HibernateRealm.hbm.xml"/> + <mapping resource="mappings/HibernateIdentityObject.hbm.xml"/> + <mapping resource="mappings/HibernateIdentityObjectCredential.hbm.xml"/> + <mapping resource="mappings/HibernateIdentityObjectCredentialType.hbm.xml"/> + <mapping resource="mappings/HibernateIdentityObjectAttribute.hbm.xml"/> + <mapping resource="mappings/HibernateIdentityObjectType.hbm.xml"/> + <mapping resource="mappings/HibernateIdentityObjectRelationship.hbm.xml"/> + <mapping resource="mappings/HibernateIdentityObjectRelationshipType.hbm.xml"/> + <mapping resource="mappings/HibernateIdentityObjectRelationshipName.hbm.xml"/> </session-factory> Modified: idm/trunk/assembly/src/main/config/oracle.hibernate.cfg.xml =================================================================== --- idm/trunk/assembly/src/main/config/oracle.hibernate.cfg.xml 2009-11-08 22:45:12 UTC (rev 916) +++ idm/trunk/assembly/src/main/config/oracle.hibernate.cfg.xml 2009-11-09 13:12:00 UTC (rev 917) @@ -31,21 +31,18 @@ <property name="hibernate.dialect">org.hibernate.dialect.Oracle9Dialect</property> <property name="hibernate.format_sql">true</property> - <!-- Mapping classes --> - <!-- all nessesary mappings are added programatically to the configuration in the store--> - <!-- this is for manual SF creation--> - <mapping class="org.jboss.identity.idm.impl.model.hibernate.HibernateRealm"/> - <mapping class="org.jboss.identity.idm.impl.model.hibernate.HibernateIdentityObject"/> - <mapping class="org.jboss.identity.idm.impl.model.hibernate.HibernateIdentityObjectCredential"/> - <mapping class="org.jboss.identity.idm.impl.model.hibernate.HibernateIdentityObjectCredentialType"/> - <mapping class="org.jboss.identity.idm.impl.model.hibernate.HibernateIdentityObjectAttribute"/> - <mapping class="org.jboss.identity.idm.impl.model.hibernate.HibernateIdentityObjectTextAttribute"/> - <mapping class="org.jboss.identity.idm.impl.model.hibernate.HibernateIdentityObjectBinaryAttribute"/> - <mapping class="org.jboss.identity.idm.impl.model.hibernate.HibernateIdentityObjectBinaryAttributeValue"/> - <mapping class="org.jboss.identity.idm.impl.model.hibernate.HibernateIdentityObjectType"/> - <mapping class="org.jboss.identity.idm.impl.model.hibernate.HibernateIdentityObjectRelationship"/> - <mapping class="org.jboss.identity.idm.impl.model.hibernate.HibernateIdentityObjectRelationshipType"/> - <mapping class="org.jboss.identity.idm.impl.model.hibernate.HibernateIdentityObjectRelationshipName"/> + <!-- Mapping classes --> + <!-- all nessesary mappings are added programatically to the configuration in the store--> + <!-- this is for manual SF creation or when 'addHibernateMappings' is set to false in the store configuration--> + <mapping resource="mappings/HibernateRealm.hbm.xml"/> + <mapping resource="mappings/HibernateIdentityObject.hbm.xml"/> + <mapping resource="mappings/HibernateIdentityObjectCredential.hbm.xml"/> + <mapping resource="mappings/HibernateIdentityObjectCredentialType.hbm.xml"/> + <mapping resource="mappings/HibernateIdentityObjectAttribute.hbm.xml"/> + <mapping resource="mappings/HibernateIdentityObjectType.hbm.xml"/> + <mapping resource="mappings/HibernateIdentityObjectRelationship.hbm.xml"/> + <mapping resource="mappings/HibernateIdentityObjectRelationshipType.hbm.xml"/> + <mapping resource="mappings/HibernateIdentityObjectRelationshipName.hbm.xml"/> </session-factory> Modified: idm/trunk/assembly/src/main/config/postgresql.hibernate.cfg.xml =================================================================== --- idm/trunk/assembly/src/main/config/postgresql.hibernate.cfg.xml 2009-11-08 22:45:12 UTC (rev 916) +++ idm/trunk/assembly/src/main/config/postgresql.hibernate.cfg.xml 2009-11-09 13:12:00 UTC (rev 917) @@ -31,21 +31,18 @@ <property name="hibernate.dialect">org.hibernate.dialect.PostgreSQLDialect</property> <property name="hibernate.format_sql">true</property> - <!-- Mapping classes --> - <!-- all nessesary mappings are added programatically to the configuration in the store--> - <!-- this is for manual SF creation--> - <mapping class="org.jboss.identity.idm.impl.model.hibernate.HibernateRealm"/> - <mapping class="org.jboss.identity.idm.impl.model.hibernate.HibernateIdentityObject"/> - <mapping class="org.jboss.identity.idm.impl.model.hibernate.HibernateIdentityObjectCredential"/> - <mapping class="org.jboss.identity.idm.impl.model.hibernate.HibernateIdentityObjectCredentialType"/> - <mapping class="org.jboss.identity.idm.impl.model.hibernate.HibernateIdentityObjectAttribute"/> - <mapping class="org.jboss.identity.idm.impl.model.hibernate.HibernateIdentityObjectTextAttribute"/> - <mapping class="org.jboss.identity.idm.impl.model.hibernate.HibernateIdentityObjectBinaryAttribute"/> - <mapping class="org.jboss.identity.idm.impl.model.hibernate.HibernateIdentityObjectBinaryAttributeValue"/> - <mapping class="org.jboss.identity.idm.impl.model.hibernate.HibernateIdentityObjectType"/> - <mapping class="org.jboss.identity.idm.impl.model.hibernate.HibernateIdentityObjectRelationship"/> - <mapping class="org.jboss.identity.idm.impl.model.hibernate.HibernateIdentityObjectRelationshipType"/> - <mapping class="org.jboss.identity.idm.impl.model.hibernate.HibernateIdentityObjectRelationshipName"/> + <!-- Mapping classes --> + <!-- all nessesary mappings are added programatically to the configuration in the store--> + <!-- this is for manual SF creation or when 'addHibernateMappings' is set to false in the store configuration--> + <mapping resource="mappings/HibernateRealm.hbm.xml"/> + <mapping resource="mappings/HibernateIdentityObject.hbm.xml"/> + <mapping resource="mappings/HibernateIdentityObjectCredential.hbm.xml"/> + <mapping resource="mappings/HibernateIdentityObjectCredentialType.hbm.xml"/> + <mapping resource="mappings/HibernateIdentityObjectAttribute.hbm.xml"/> + <mapping resource="mappings/HibernateIdentityObjectType.hbm.xml"/> + <mapping resource="mappings/HibernateIdentityObjectRelationship.hbm.xml"/> + <mapping resource="mappings/HibernateIdentityObjectRelationshipType.hbm.xml"/> + <mapping resource="mappings/HibernateIdentityObjectRelationshipName.hbm.xml"/> </session-factory> Modified: idm/trunk/assembly/src/main/config/sybase.hibernate.cfg.xml =================================================================== --- idm/trunk/assembly/src/main/config/sybase.hibernate.cfg.xml 2009-11-08 22:45:12 UTC (rev 916) +++ idm/trunk/assembly/src/main/config/sybase.hibernate.cfg.xml 2009-11-09 13:12:00 UTC (rev 917) @@ -31,21 +31,18 @@ <property name="hibernate.dialect">org.hibernate.dialect.SybaseDialect</property> <property name="hibernate.format_sql">true</property> - <!-- Mapping classes --> - <!-- all nessesary mappings are added programatically to the configuration in the store--> - <!-- this is for manual SF creation--> - <mapping class="org.jboss.identity.idm.impl.model.hibernate.HibernateRealm"/> - <mapping class="org.jboss.identity.idm.impl.model.hibernate.HibernateIdentityObject"/> - <mapping class="org.jboss.identity.idm.impl.model.hibernate.HibernateIdentityObjectCredential"/> - <mapping class="org.jboss.identity.idm.impl.model.hibernate.HibernateIdentityObjectCredentialType"/> - <mapping class="org.jboss.identity.idm.impl.model.hibernate.HibernateIdentityObjectAttribute"/> - <mapping class="org.jboss.identity.idm.impl.model.hibernate.HibernateIdentityObjectTextAttribute"/> - <mapping class="org.jboss.identity.idm.impl.model.hibernate.HibernateIdentityObjectBinaryAttribute"/> - <mapping class="org.jboss.identity.idm.impl.model.hibernate.HibernateIdentityObjectBinaryAttributeValue"/> - <mapping class="org.jboss.identity.idm.impl.model.hibernate.HibernateIdentityObjectType"/> - <mapping class="org.jboss.identity.idm.impl.model.hibernate.HibernateIdentityObjectRelationship"/> - <mapping class="org.jboss.identity.idm.impl.model.hibernate.HibernateIdentityObjectRelationshipType"/> - <mapping class="org.jboss.identity.idm.impl.model.hibernate.HibernateIdentityObjectRelationshipName"/> + <!-- Mapping classes --> + <!-- all nessesary mappings are added programatically to the configuration in the store--> + <!-- this is for manual SF creation or when 'addHibernateMappings' is set to false in the store configuration--> + <mapping resource="mappings/HibernateRealm.hbm.xml"/> + <mapping resource="mappings/HibernateIdentityObject.hbm.xml"/> + <mapping resource="mappings/HibernateIdentityObjectCredential.hbm.xml"/> + <mapping resource="mappings/HibernateIdentityObjectCredentialType.hbm.xml"/> + <mapping resource="mappings/HibernateIdentityObjectAttribute.hbm.xml"/> + <mapping resource="mappings/HibernateIdentityObjectType.hbm.xml"/> + <mapping resource="mappings/HibernateIdentityObjectRelationship.hbm.xml"/> + <mapping resource="mappings/HibernateIdentityObjectRelationshipType.hbm.xml"/> + <mapping resource="mappings/HibernateIdentityObjectRelationshipName.hbm.xml"/> </session-factory> Modified: idm/trunk/assembly/src/main/files/db/hibernate.cfg/hsqldb.hibernate.cfg.xml =================================================================== --- idm/trunk/assembly/src/main/files/db/hibernate.cfg/hsqldb.hibernate.cfg.xml 2009-11-08 22:45:12 UTC (rev 916) +++ idm/trunk/assembly/src/main/files/db/hibernate.cfg/hsqldb.hibernate.cfg.xml 2009-11-09 13:12:00 UTC (rev 917) @@ -42,21 +42,18 @@ <property name=&quot;hibernate.connection.username&quot;&gt;@jdbc.username(a)&lt;/property&gt; <property name=&quot;hibernate.connection.password&quot;&gt;@jdbc.password(a)&lt;/property&gt; - <!-- Mapping classes --> - <!-- all nessesary mappings are added programatically to the configuration in the store--> - <!-- this is for manual SF creation--> - <mapping class="org.jboss.identity.idm.impl.model.hibernate.HibernateRealm"/> - <mapping class="org.jboss.identity.idm.impl.model.hibernate.HibernateIdentityObject"/> - <mapping class="org.jboss.identity.idm.impl.model.hibernate.HibernateIdentityObjectCredential"/> - <mapping class="org.jboss.identity.idm.impl.model.hibernate.HibernateIdentityObjectCredentialType"/> - <mapping class="org.jboss.identity.idm.impl.model.hibernate.HibernateIdentityObjectAttribute"/> - <mapping class="org.jboss.identity.idm.impl.model.hibernate.HibernateIdentityObjectTextAttribute"/> - <mapping class="org.jboss.identity.idm.impl.model.hibernate.HibernateIdentityObjectBinaryAttribute"/> - <mapping class="org.jboss.identity.idm.impl.model.hibernate.HibernateIdentityObjectBinaryAttributeValue"/> - <mapping class="org.jboss.identity.idm.impl.model.hibernate.HibernateIdentityObjectType"/> - <mapping class="org.jboss.identity.idm.impl.model.hibernate.HibernateIdentityObjectRelationship"/> - <mapping class="org.jboss.identity.idm.impl.model.hibernate.HibernateIdentityObjectRelationshipType"/> - <mapping class="org.jboss.identity.idm.impl.model.hibernate.HibernateIdentityObjectRelationshipName"/> + <!-- Mapping classes --> + <!-- all nessesary mappings are added programatically to the configuration in the store--> + <!-- this is for manual SF creation or when 'addHibernateMappings' is set to false in the store configuration--> + <mapping resource="mappings/HibernateRealm.hbm.xml"/> + <mapping resource="mappings/HibernateIdentityObject.hbm.xml"/> + <mapping resource="mappings/HibernateIdentityObjectCredential.hbm.xml"/> + <mapping resource="mappings/HibernateIdentityObjectCredentialType.hbm.xml"/> + <mapping resource="mappings/HibernateIdentityObjectAttribute.hbm.xml"/> + <mapping resource="mappings/HibernateIdentityObjectType.hbm.xml"/> + <mapping resource="mappings/HibernateIdentityObjectRelationship.hbm.xml"/> + <mapping resource="mappings/HibernateIdentityObjectRelationshipType.hbm.xml"/> + <mapping resource="mappings/HibernateIdentityObjectRelationshipName.hbm.xml"/> </session-factory> Modified: idm/trunk/assembly/src/main/files/db/hibernate.cfg/hsqldburl.hibernate.cfg.xml =================================================================== --- idm/trunk/assembly/src/main/files/db/hibernate.cfg/hsqldburl.hibernate.cfg.xml 2009-11-08 22:45:12 UTC (rev 916) +++ idm/trunk/assembly/src/main/files/db/hibernate.cfg/hsqldburl.hibernate.cfg.xml 2009-11-09 13:12:00 UTC (rev 917) @@ -42,21 +42,18 @@ <property name=&quot;hibernate.connection.username&quot;&gt;@jdbc.username(a)&lt;/property&gt; <property name=&quot;hibernate.connection.password&quot;&gt;@jdbc.password(a)&lt;/property&gt; - <!-- Mapping classes --> - <!-- all nessesary mappings are added programatically to the configuration in the store--> - <!-- this is for manual SF creation--> - <mapping class="org.jboss.identity.idm.impl.model.hibernate.HibernateRealm"/> - <mapping class="org.jboss.identity.idm.impl.model.hibernate.HibernateIdentityObject"/> - <mapping class="org.jboss.identity.idm.impl.model.hibernate.HibernateIdentityObjectCredential"/> - <mapping class="org.jboss.identity.idm.impl.model.hibernate.HibernateIdentityObjectCredentialType"/> - <mapping class="org.jboss.identity.idm.impl.model.hibernate.HibernateIdentityObjectAttribute"/> - <mapping class="org.jboss.identity.idm.impl.model.hibernate.HibernateIdentityObjectTextAttribute"/> - <mapping class="org.jboss.identity.idm.impl.model.hibernate.HibernateIdentityObjectBinaryAttribute"/> - <mapping class="org.jboss.identity.idm.impl.model.hibernate.HibernateIdentityObjectBinaryAttributeValue"/> - <mapping class="org.jboss.identity.idm.impl.model.hibernate.HibernateIdentityObjectType"/> - <mapping class="org.jboss.identity.idm.impl.model.hibernate.HibernateIdentityObjectRelationship"/> - <mapping class="org.jboss.identity.idm.impl.model.hibernate.HibernateIdentityObjectRelationshipType"/> - <mapping class="org.jboss.identity.idm.impl.model.hibernate.HibernateIdentityObjectRelationshipName"/> + <!-- Mapping classes --> + <!-- all nessesary mappings are added programatically to the configuration in the store--> + <!-- this is for manual SF creation or when 'addHibernateMappings' is set to false in the store configuration--> + <mapping resource="mappings/HibernateRealm.hbm.xml"/> + <mapping resource="mappings/HibernateIdentityObject.hbm.xml"/> + <mapping resource="mappings/HibernateIdentityObjectCredential.hbm.xml"/> + <mapping resource="mappings/HibernateIdentityObjectCredentialType.hbm.xml"/> + <mapping resource="mappings/HibernateIdentityObjectAttribute.hbm.xml"/> + <mapping resource="mappings/HibernateIdentityObjectType.hbm.xml"/> + <mapping resource="mappings/HibernateIdentityObjectRelationship.hbm.xml"/> + <mapping resource="mappings/HibernateIdentityObjectRelationshipType.hbm.xml"/> + <mapping resource="mappings/HibernateIdentityObjectRelationshipName.hbm.xml"/> </session-factory> Modified: idm/trunk/assembly/src/main/files/db/hibernate.cfg/mssql.hibernate.cfg.xml =================================================================== --- idm/trunk/assembly/src/main/files/db/hibernate.cfg/mssql.hibernate.cfg.xml 2009-11-08 22:45:12 UTC (rev 916) +++ idm/trunk/assembly/src/main/files/db/hibernate.cfg/mssql.hibernate.cfg.xml 2009-11-09 13:12:00 UTC (rev 917) @@ -42,22 +42,18 @@ <property name=&quot;hibernate.connection.username&quot;&gt;@jdbc.username(a)&lt;/property&gt; <property name=&quot;hibernate.connection.password&quot;&gt;@jdbc.password(a)&lt;/property&gt; - <!-- Mapping classes --> - <!-- all nessesary mappings are added programatically to the configuration in the store--> - <!-- this is for manual SF creation--> - <mapping class="org.jboss.identity.idm.impl.model.hibernate.HibernateRealm"/> - <mapping class="org.jboss.identity.idm.impl.model.hibernate.HibernateIdentityObject"/> - <mapping class="org.jboss.identity.idm.impl.model.hibernate.HibernateIdentityObjectCredential"/> - <mapping class="org.jboss.identity.idm.impl.model.hibernate.HibernateIdentityObjectCredentialType"/> - <mapping class="org.jboss.identity.idm.impl.model.hibernate.HibernateIdentityObjectAttribute"/> - <mapping class="org.jboss.identity.idm.impl.model.hibernate.HibernateIdentityObjectTextAttribute"/> - <mapping class="org.jboss.identity.idm.impl.model.hibernate.HibernateIdentityObjectBinaryAttribute"/> - <mapping class="org.jboss.identity.idm.impl.model.hibernate.HibernateIdentityObjectBinaryAttributeValue"/> - <mapping class="org.jboss.identity.idm.impl.model.hibernate.HibernateIdentityObjectType"/> - <mapping class="org.jboss.identity.idm.impl.model.hibernate.HibernateIdentityObjectRelationship"/> - <mapping class="org.jboss.identity.idm.impl.model.hibernate.HibernateIdentityObjectRelationshipType"/> - <mapping class="org.jboss.identity.idm.impl.model.hibernate.HibernateIdentityObjectRelationshipName"/> - + <!-- Mapping classes --> + <!-- all nessesary mappings are added programatically to the configuration in the store--> + <!-- this is for manual SF creation or when 'addHibernateMappings' is set to false in the store configuration--> + <mapping resource="mappings/HibernateRealm.hbm.xml"/> + <mapping resource="mappings/HibernateIdentityObject.hbm.xml"/> + <mapping resource="mappings/HibernateIdentityObjectCredential.hbm.xml"/> + <mapping resource="mappings/HibernateIdentityObjectCredentialType.hbm.xml"/> + <mapping resource="mappings/HibernateIdentityObjectAttribute.hbm.xml"/> + <mapping resource="mappings/HibernateIdentityObjectType.hbm.xml"/> + <mapping resource="mappings/HibernateIdentityObjectRelationship.hbm.xml"/> + <mapping resource="mappings/HibernateIdentityObjectRelationshipType.hbm.xml"/> + <mapping resource="mappings/HibernateIdentityObjectRelationshipName.hbm.xml"/> </session-factory> </hibernate-configuration> Modified: idm/trunk/assembly/src/main/files/db/hibernate.cfg/mysql.hibernate.cfg.xml =================================================================== --- idm/trunk/assembly/src/main/files/db/hibernate.cfg/mysql.hibernate.cfg.xml 2009-11-08 22:45:12 UTC (rev 916) +++ idm/trunk/assembly/src/main/files/db/hibernate.cfg/mysql.hibernate.cfg.xml 2009-11-09 13:12:00 UTC (rev 917) @@ -42,21 +42,18 @@ <property name=&quot;hibernate.connection.username&quot;&gt;@jdbc.username(a)&lt;/property&gt; <property name=&quot;hibernate.connection.password&quot;&gt;@jdbc.password(a)&lt;/property&gt; - <!-- Mapping classes --> - <!-- all nessesary mappings are added programatically to the configuration in the store--> - <!-- this is for manual SF creation--> - <mapping class="org.jboss.identity.idm.impl.model.hibernate.HibernateRealm"/> - <mapping class="org.jboss.identity.idm.impl.model.hibernate.HibernateIdentityObject"/> - <mapping class="org.jboss.identity.idm.impl.model.hibernate.HibernateIdentityObjectCredential"/> - <mapping class="org.jboss.identity.idm.impl.model.hibernate.HibernateIdentityObjectCredentialType"/> - <mapping class="org.jboss.identity.idm.impl.model.hibernate.HibernateIdentityObjectAttribute"/> - <mapping class="org.jboss.identity.idm.impl.model.hibernate.HibernateIdentityObjectTextAttribute"/> - <mapping class="org.jboss.identity.idm.impl.model.hibernate.HibernateIdentityObjectBinaryAttribute"/> - <mapping class="org.jboss.identity.idm.impl.model.hibernate.HibernateIdentityObjectBinaryAttributeValue"/> - <mapping class="org.jboss.identity.idm.impl.model.hibernate.HibernateIdentityObjectType"/> - <mapping class="org.jboss.identity.idm.impl.model.hibernate.HibernateIdentityObjectRelationship"/> - <mapping class="org.jboss.identity.idm.impl.model.hibernate.HibernateIdentityObjectRelationshipType"/> - <mapping class="org.jboss.identity.idm.impl.model.hibernate.HibernateIdentityObjectRelationshipName"/> + <!-- Mapping classes --> + <!-- all nessesary mappings are added programatically to the configuration in the store--> + <!-- this is for manual SF creation or when 'addHibernateMappings' is set to false in the store configuration--> + <mapping resource="mappings/HibernateRealm.hbm.xml"/> + <mapping resource="mappings/HibernateIdentityObject.hbm.xml"/> + <mapping resource="mappings/HibernateIdentityObjectCredential.hbm.xml"/> + <mapping resource="mappings/HibernateIdentityObjectCredentialType.hbm.xml"/> + <mapping resource="mappings/HibernateIdentityObjectAttribute.hbm.xml"/> + <mapping resource="mappings/HibernateIdentityObjectType.hbm.xml"/> + <mapping resource="mappings/HibernateIdentityObjectRelationship.hbm.xml"/> + <mapping resource="mappings/HibernateIdentityObjectRelationshipType.hbm.xml"/> + <mapping resource="mappings/HibernateIdentityObjectRelationshipName.hbm.xml"/> </session-factory> Modified: idm/trunk/assembly/src/main/files/db/hibernate.cfg/oracle.hibernate.cfg.xml =================================================================== --- idm/trunk/assembly/src/main/files/db/hibernate.cfg/oracle.hibernate.cfg.xml 2009-11-08 22:45:12 UTC (rev 916) +++ idm/trunk/assembly/src/main/files/db/hibernate.cfg/oracle.hibernate.cfg.xml 2009-11-09 13:12:00 UTC (rev 917) @@ -42,22 +42,18 @@ <property name=&quot;hibernate.connection.username&quot;&gt;@jdbc.username(a)&lt;/property&gt; <property name=&quot;hibernate.connection.password&quot;&gt;@jdbc.password(a)&lt;/property&gt; - <!-- Mapping classes --> - <!-- all nessesary mappings are added programatically to the configuration in the store--> - <!-- this is for manual SF creation--> - <mapping class="org.jboss.identity.idm.impl.model.hibernate.HibernateRealm"/> - <mapping class="org.jboss.identity.idm.impl.model.hibernate.HibernateIdentityObject"/> - <mapping class="org.jboss.identity.idm.impl.model.hibernate.HibernateIdentityObjectCredential"/> - <mapping class="org.jboss.identity.idm.impl.model.hibernate.HibernateIdentityObjectCredentialType"/> - <mapping class="org.jboss.identity.idm.impl.model.hibernate.HibernateIdentityObjectAttribute"/> - <mapping class="org.jboss.identity.idm.impl.model.hibernate.HibernateIdentityObjectTextAttribute"/> - <mapping class="org.jboss.identity.idm.impl.model.hibernate.HibernateIdentityObjectBinaryAttribute"/> - <mapping class="org.jboss.identity.idm.impl.model.hibernate.HibernateIdentityObjectBinaryAttributeValue"/> - <mapping class="org.jboss.identity.idm.impl.model.hibernate.HibernateIdentityObjectType"/> - <mapping class="org.jboss.identity.idm.impl.model.hibernate.HibernateIdentityObjectRelationship"/> - <mapping class="org.jboss.identity.idm.impl.model.hibernate.HibernateIdentityObjectRelationshipType"/> - <mapping class="org.jboss.identity.idm.impl.model.hibernate.HibernateIdentityObjectRelationshipName"/> - + <!-- Mapping classes --> + <!-- all nessesary mappings are added programatically to the configuration in the store--> + <!-- this is for manual SF creation or when 'addHibernateMappings' is set to false in the store configuration--> + <mapping resource="mappings/HibernateRealm.hbm.xml"/> + <mapping resource="mappings/HibernateIdentityObject.hbm.xml"/> + <mapping resource="mappings/HibernateIdentityObjectCredential.hbm.xml"/> + <mapping resource="mappings/HibernateIdentityObjectCredentialType.hbm.xml"/> + <mapping resource="mappings/HibernateIdentityObjectAttribute.hbm.xml"/> + <mapping resource="mappings/HibernateIdentityObjectType.hbm.xml"/> + <mapping resource="mappings/HibernateIdentityObjectRelationship.hbm.xml"/> + <mapping resource="mappings/HibernateIdentityObjectRelationshipType.hbm.xml"/> + <mapping resource="mappings/HibernateIdentityObjectRelationshipName.hbm.xml"/> </session-factory> </hibernate-configuration> Modified: idm/trunk/assembly/src/main/files/db/hibernate.cfg/postgresql.hibernate.cfg.xml =================================================================== --- idm/trunk/assembly/src/main/files/db/hibernate.cfg/postgresql.hibernate.cfg.xml 2009-11-08 22:45:12 UTC (rev 916) +++ idm/trunk/assembly/src/main/files/db/hibernate.cfg/postgresql.hibernate.cfg.xml 2009-11-09 13:12:00 UTC (rev 917) @@ -42,22 +42,17 @@ <property name=&quot;hibernate.connection.username&quot;&gt;@jdbc.username(a)&lt;/property&gt; <property name=&quot;hibernate.connection.password&quot;&gt;@jdbc.password(a)&lt;/property&gt; - <!-- Mapping classes --> - <!-- all nessesary mappings are added programatically to the configuration in the store--> - <!-- this is for manual SF creation--> - <mapping class="org.jboss.identity.idm.impl.model.hibernate.HibernateRealm"/> - <mapping class="org.jboss.identity.idm.impl.model.hibernate.HibernateIdentityObject"/> - <mapping class="org.jboss.identity.idm.impl.model.hibernate.HibernateIdentityObjectCredential"/> - <mapping class="org.jboss.identity.idm.impl.model.hibernate.HibernateIdentityObjectCredentialType"/> - <mapping class="org.jboss.identity.idm.impl.model.hibernate.HibernateIdentityObjectAttribute"/> - <mapping class="org.jboss.identity.idm.impl.model.hibernate.HibernateIdentityObjectTextAttribute"/> - <mapping class="org.jboss.identity.idm.impl.model.hibernate.HibernateIdentityObjectBinaryAttribute"/> - <mapping class="org.jboss.identity.idm.impl.model.hibernate.HibernateIdentityObjectBinaryAttributeValue"/> - <mapping class="org.jboss.identity.idm.impl.model.hibernate.HibernateIdentityObjectType"/> - <mapping class="org.jboss.identity.idm.impl.model.hibernate.HibernateIdentityObjectRelationship"/> - <mapping class="org.jboss.identity.idm.impl.model.hibernate.HibernateIdentityObjectRelationshipType"/> - <mapping class="org.jboss.identity.idm.impl.model.hibernate.HibernateIdentityObjectRelationshipName"/> - - + <!-- Mapping classes --> + <!-- all nessesary mappings are added programatically to the configuration in the store--> + <!-- this is for manual SF creation or when 'addHibernateMappings' is set to false in the store configuration--> + <mapping resource="mappings/HibernateRealm.hbm.xml"/> + <mapping resource="mappings/HibernateIdentityObject.hbm.xml"/> + <mapping resource="mappings/HibernateIdentityObjectCredential.hbm.xml"/> + <mapping resource="mappings/HibernateIdentityObjectCredentialType.hbm.xml"/> + <mapping resource="mappings/HibernateIdentityObjectAttribute.hbm.xml"/> + <mapping resource="mappings/HibernateIdentityObjectType.hbm.xml"/> + <mapping resource="mappings/HibernateIdentityObjectRelationship.hbm.xml"/> + <mapping resource="mappings/HibernateIdentityObjectRelationshipType.hbm.xml"/> + <mapping resource="mappings/HibernateIdentityObjectRelationshipName.hbm.xml"/> </session-factory> </hibernate-configuration> Modified: idm/trunk/assembly/src/main/files/db/hibernate.cfg/sybase.hibernate.cfg.xml =================================================================== --- idm/trunk/assembly/src/main/files/db/hibernate.cfg/sybase.hibernate.cfg.xml 2009-11-08 22:45:12 UTC (rev 916) +++ idm/trunk/assembly/src/main/files/db/hibernate.cfg/sybase.hibernate.cfg.xml 2009-11-09 13:12:00 UTC (rev 917) @@ -42,22 +42,18 @@ <property name=&quot;hibernate.connection.username&quot;&gt;@jdbc.username(a)&lt;/property&gt; <property name=&quot;hibernate.connection.password&quot;&gt;@jdbc.password(a)&lt;/property&gt; - <!-- Mapping classes --> - <!-- all nessesary mappings are added programatically to the configuration in the store--> - <!-- this is for manual SF creation--> - <mapping class="org.jboss.identity.idm.impl.model.hibernate.HibernateRealm"/> - <mapping class="org.jboss.identity.idm.impl.model.hibernate.HibernateIdentityObject"/> - <mapping class="org.jboss.identity.idm.impl.model.hibernate.HibernateIdentityObjectCredential"/> - <mapping class="org.jboss.identity.idm.impl.model.hibernate.HibernateIdentityObjectCredentialType"/> - <mapping class="org.jboss.identity.idm.impl.model.hibernate.HibernateIdentityObjectAttribute"/> - <mapping class="org.jboss.identity.idm.impl.model.hibernate.HibernateIdentityObjectTextAttribute"/> - <mapping class="org.jboss.identity.idm.impl.model.hibernate.HibernateIdentityObjectBinaryAttribute"/> - <mapping class="org.jboss.identity.idm.impl.model.hibernate.HibernateIdentityObjectBinaryAttributeValue"/> - <mapping class="org.jboss.identity.idm.impl.model.hibernate.HibernateIdentityObjectType"/> - <mapping class="org.jboss.identity.idm.impl.model.hibernate.HibernateIdentityObjectRelationship"/> - <mapping class="org.jboss.identity.idm.impl.model.hibernate.HibernateIdentityObjectRelationshipType"/> - <mapping class="org.jboss.identity.idm.impl.model.hibernate.HibernateIdentityObjectRelationshipName"/> - + <!-- Mapping classes --> + <!-- all nessesary mappings are added programatically to the configuration in the store--> + <!-- this is for manual SF creation or when 'addHibernateMappings' is set to false in the store configuration--> + <mapping resource="mappings/HibernateRealm.hbm.xml"/> + <mapping resource="mappings/HibernateIdentityObject.hbm.xml"/> + <mapping resource="mappings/HibernateIdentityObjectCredential.hbm.xml"/> + <mapping resource="mappings/HibernateIdentityObjectCredentialType.hbm.xml"/> + <mapping resource="mappings/HibernateIdentityObjectAttribute.hbm.xml"/> + <mapping resource="mappings/HibernateIdentityObjectType.hbm.xml"/> + <mapping resource="mappings/HibernateIdentityObjectRelationship.hbm.xml"/> + <mapping resource="mappings/HibernateIdentityObjectRelationshipType.hbm.xml"/> + <mapping resource="mappings/HibernateIdentityObjectRelationshipName.hbm.xml"/> </session-factory> </hibernate-configuration> Modified: idm/trunk/assembly/src/main/files/jboss/hibernate.cfg/hsqldb.hibernate.cfg.xml =================================================================== --- idm/trunk/assembly/src/main/files/jboss/hibernate.cfg/hsqldb.hibernate.cfg.xml 2009-11-08 22:45:12 UTC (rev 916) +++ idm/trunk/assembly/src/main/files/jboss/hibernate.cfg/hsqldb.hibernate.cfg.xml 2009-11-09 13:12:00 UTC (rev 917) @@ -37,22 +37,18 @@ <property name="hibernate.transaction.manager_lookup_class">org.hibernate.transaction.JBossTransactionManagerLookup</property> <property name="jta.UserTransaction">UserTransaction</property> - <!-- Mapping classes --> - <!-- all nessesary mappings are added programatically to the configuration in the store--> - <!-- this is for manual SF creation--> - <mapping class="org.jboss.identity.idm.impl.model.hibernate.HibernateRealm"/> - <mapping class="org.jboss.identity.idm.impl.model.hibernate.HibernateIdentityObject"/> - <mapping class="org.jboss.identity.idm.impl.model.hibernate.HibernateIdentityObjectCredential"/> - <mapping class="org.jboss.identity.idm.impl.model.hibernate.HibernateIdentityObjectCredentialType"/> - <mapping class="org.jboss.identity.idm.impl.model.hibernate.HibernateIdentityObjectAttribute"/> - <mapping class="org.jboss.identity.idm.impl.model.hibernate.HibernateIdentityObjectTextAttribute"/> - <mapping class="org.jboss.identity.idm.impl.model.hibernate.HibernateIdentityObjectBinaryAttribute"/> - <mapping class="org.jboss.identity.idm.impl.model.hibernate.HibernateIdentityObjectBinaryAttributeValue"/> - <mapping class="org.jboss.identity.idm.impl.model.hibernate.HibernateIdentityObjectType"/> - <mapping class="org.jboss.identity.idm.impl.model.hibernate.HibernateIdentityObjectRelationship"/> - <mapping class="org.jboss.identity.idm.impl.model.hibernate.HibernateIdentityObjectRelationshipType"/> - <mapping class="org.jboss.identity.idm.impl.model.hibernate.HibernateIdentityObjectRelationshipName"/> - + <!-- Mapping classes --> + <!-- all nessesary mappings are added programatically to the configuration in the store--> + <!-- this is for manual SF creation or when 'addHibernateMappings' is set to false in the store configuration--> + <mapping resource="mappings/HibernateRealm.hbm.xml"/> + <mapping resource="mappings/HibernateIdentityObject.hbm.xml"/> + <mapping resource="mappings/HibernateIdentityObjectCredential.hbm.xml"/> + <mapping resource="mappings/HibernateIdentityObjectCredentialType.hbm.xml"/> + <mapping resource="mappings/HibernateIdentityObjectAttribute.hbm.xml"/> + <mapping resource="mappings/HibernateIdentityObjectType.hbm.xml"/> + <mapping resource="mappings/HibernateIdentityObjectRelationship.hbm.xml"/> + <mapping resource="mappings/HibernateIdentityObjectRelationshipType.hbm.xml"/> + <mapping resource="mappings/HibernateIdentityObjectRelationshipName.hbm.xml"/> </session-factory> </hibernate-configuration> Modified: idm/trunk/assembly/src/main/files/jboss/hibernate.cfg/mssql.hibernate.cfg.xml =================================================================== --- idm/trunk/assembly/src/main/files/jboss/hibernate.cfg/mssql.hibernate.cfg.xml 2009-11-08 22:45:12 UTC (rev 916) +++ idm/trunk/assembly/src/main/files/jboss/hibernate.cfg/mssql.hibernate.cfg.xml 2009-11-09 13:12:00 UTC (rev 917) @@ -42,22 +42,18 @@ <property name="hibernate.transaction.manager_lookup_class">org.hibernate.transaction.JBossTransactionManagerLookup</property> <property name="jta.UserTransaction">UserTransaction</property> - <!-- Mapping classes --> - <!-- all nessesary mappings are added programatically to the configuration in the store--> - <!-- this is for manual SF creation--> - <mapping class="org.jboss.identity.idm.impl.model.hibernate.HibernateRealm"/> - <mapping class="org.jboss.identity.idm.impl.model.hibernate.HibernateIdentityObject"/> - <mapping class="org.jboss.identity.idm.impl.model.hibernate.HibernateIdentityObjectCredential"/> - <mapping class="org.jboss.identity.idm.impl.model.hibernate.HibernateIdentityObjectCredentialType"/> - <mapping class="org.jboss.identity.idm.impl.model.hibernate.HibernateIdentityObjectAttribute"/> - <mapping class="org.jboss.identity.idm.impl.model.hibernate.HibernateIdentityObjectTextAttribute"/> - <mapping class="org.jboss.identity.idm.impl.model.hibernate.HibernateIdentityObjectBinaryAttribute"/> - <mapping class="org.jboss.identity.idm.impl.model.hibernate.HibernateIdentityObjectBinaryAttributeValue"/> - <mapping class="org.jboss.identity.idm.impl.model.hibernate.HibernateIdentityObjectType"/> - <mapping class="org.jboss.identity.idm.impl.model.hibernate.HibernateIdentityObjectRelationship"/> - <mapping class="org.jboss.identity.idm.impl.model.hibernate.HibernateIdentityObjectRelationshipType"/> - <mapping class="org.jboss.identity.idm.impl.model.hibernate.HibernateIdentityObjectRelationshipName"/> - + <!-- Mapping classes --> + <!-- all nessesary mappings are added programatically to the configuration in the store--> + <!-- this is for manual SF creation or when 'addHibernateMappings' is set to false in the store configuration--> + <mapping resource="mappings/HibernateRealm.hbm.xml"/> + <mapping resource="mappings/HibernateIdentityObject.hbm.xml"/> + <mapping resource="mappings/HibernateIdentityObjectCredential.hbm.xml"/> + <mapping resource="mappings/HibernateIdentityObjectCredentialType.hbm.xml"/> + <mapping resource="mappings/HibernateIdentityObjectAttribute.hbm.xml"/> + <mapping resource="mappings/HibernateIdentityObjectType.hbm.xml"/> + <mapping resource="mappings/HibernateIdentityObjectRelationship.hbm.xml"/> + <mapping resource="mappings/HibernateIdentityObjectRelationshipType.hbm.xml"/> + <mapping resource="mappings/HibernateIdentityObjectRelationshipName.hbm.xml"/> </session-factory> </hibernate-configuration> Modified: idm/trunk/assembly/src/main/files/jboss/hibernate.cfg/mysql.hibernate.cfg.xml =================================================================== --- idm/trunk/assembly/src/main/files/jboss/hibernate.cfg/mysql.hibernate.cfg.xml 2009-11-08 22:45:12 UTC (rev 916) +++ idm/trunk/assembly/src/main/files/jboss/hibernate.cfg/mysql.hibernate.cfg.xml 2009-11-09 13:12:00 UTC (rev 917) @@ -37,22 +37,18 @@ <property name="hibernate.transaction.manager_lookup_class">org.hibernate.transaction.JBossTransactionManagerLookup</property> <property name="jta.UserTransaction">UserTransaction</property> - <!-- Mapping classes --> - <!-- all nessesary mappings are added programatically to the configuration in the store--> - <!-- this is for manual SF creation--> - <mapping class="org.jboss.identity.idm.impl.model.hibernate.HibernateRealm"/> - <mapping class="org.jboss.identity.idm.impl.model.hibernate.HibernateIdentityObject"/> - <mapping class="org.jboss.identity.idm.impl.model.hibernate.HibernateIdentityObjectCredential"/> - <mapping class="org.jboss.identity.idm.impl.model.hibernate.HibernateIdentityObjectCredentialType"/> - <mapping class="org.jboss.identity.idm.impl.model.hibernate.HibernateIdentityObjectAttribute"/> - <mapping class="org.jboss.identity.idm.impl.model.hibernate.HibernateIdentityObjectTextAttribute"/> - <mapping class="org.jboss.identity.idm.impl.model.hibernate.HibernateIdentityObjectBinaryAttribute"/> - <mapping class="org.jboss.identity.idm.impl.model.hibernate.HibernateIdentityObjectBinaryAttributeValue"/> - <mapping class="org.jboss.identity.idm.impl.model.hibernate.HibernateIdentityObjectType"/> - <mapping class="org.jboss.identity.idm.impl.model.hibernate.HibernateIdentityObjectRelationship"/> - <mapping class="org.jboss.identity.idm.impl.model.hibernate.HibernateIdentityObjectRelationshipType"/> - <mapping class="org.jboss.identity.idm.impl.model.hibernate.HibernateIdentityObjectRelationshipName"/> - + <!-- Mapping classes --> + <!-- all nessesary mappings are added programatically to the configuration in the store--> + <!-- this is for manual SF creation or when 'addHibernateMappings' is set to false in the store configuration--> + <mapping resource="mappings/HibernateRealm.hbm.xml"/> + <mapping resource="mappings/HibernateIdentityObject.hbm.xml"/> + <mapping resource="mappings/HibernateIdentityObjectCredential.hbm.xml"/> + <mapping resource="mappings/HibernateIdentityObjectCredentialType.hbm.xml"/> + <mapping resource="mappings/HibernateIdentityObjectAttribute.hbm.xml"/> + <mapping resource="mappings/HibernateIdentityObjectType.hbm.xml"/> + <mapping resource="mappings/HibernateIdentityObjectRelationship.hbm.xml"/> + <mapping resource="mappings/HibernateIdentityObjectRelationshipType.hbm.xml"/> + <mapping resource="mappings/HibernateIdentityObjectRelationshipName.hbm.xml"/> </session-factory> </hibernate-configuration> Modified: idm/trunk/assembly/src/main/files/jboss/hibernate.cfg/oracle.hibernate.cfg.xml =================================================================== --- idm/trunk/assembly/src/main/files/jboss/hibernate.cfg/oracle.hibernate.cfg.xml 2009-11-08 22:45:12 UTC (rev 916) +++ idm/trunk/assembly/src/main/files/jboss/hibernate.cfg/oracle.hibernate.cfg.xml 2009-11-09 13:12:00 UTC (rev 917) @@ -37,22 +37,18 @@ <property name="hibernate.transaction.manager_lookup_class">org.hibernate.transaction.JBossTransactionManagerLookup</property> <property name="jta.UserTransaction">UserTransaction</property> - <!-- Mapping classes --> - <!-- all nessesary mappings are added programatically to the configuration in the store--> - <!-- this is for manual SF creation--> - <mapping class="org.jboss.identity.idm.impl.model.hibernate.HibernateRealm"/> - <mapping class="org.jboss.identity.idm.impl.model.hibernate.HibernateIdentityObject"/> - <mapping class="org.jboss.identity.idm.impl.model.hibernate.HibernateIdentityObjectCredential"/> - <mapping class="org.jboss.identity.idm.impl.model.hibernate.HibernateIdentityObjectCredentialType"/> - <mapping class="org.jboss.identity.idm.impl.model.hibernate.HibernateIdentityObjectAttribute"/> - <mapping class="org.jboss.identity.idm.impl.model.hibernate.HibernateIdentityObjectTextAttribute"/> - <mapping class="org.jboss.identity.idm.impl.model.hibernate.HibernateIdentityObjectBinaryAttribute"/> - <mapping class="org.jboss.identity.idm.impl.model.hibernate.HibernateIdentityObjectBinaryAttributeValue"/> - <mapping class="org.jboss.identity.idm.impl.model.hibernate.HibernateIdentityObjectType"/> - <mapping class="org.jboss.identity.idm.impl.model.hibernate.HibernateIdentityObjectRelationship"/> - <mapping class="org.jboss.identity.idm.impl.model.hibernate.HibernateIdentityObjectRelationshipType"/> - <mapping class="org.jboss.identity.idm.impl.model.hibernate.HibernateIdentityObjectRelationshipName"/> - + <!-- Mapping classes --> + <!-- all nessesary mappings are added programatically to the configuration in the store--> + <!-- this is for manual SF creation or when 'addHibernateMappings' is set to false in the store configuration--> + <mapping resource="mappings/HibernateRealm.hbm.xml"/> + <mapping resource="mappings/HibernateIdentityObject.hbm.xml"/> + <mapping resource="mappings/HibernateIdentityObjectCredential.hbm.xml"/> + <mapping resource="mappings/HibernateIdentityObjectCredentialType.hbm.xml"/> + <mapping resource="mappings/HibernateIdentityObjectAttribute.hbm.xml"/> + <mapping resource="mappings/HibernateIdentityObjectType.hbm.xml"/> + <mapping resource="mappings/HibernateIdentityObjectRelationship.hbm.xml"/> + <mapping resource="mappings/HibernateIdentityObjectRelationshipType.hbm.xml"/> + <mapping resource="mappings/HibernateIdentityObjectRelationshipName.hbm.xml"/> </session-factory> </hibernate-configuration> Modified: idm/trunk/assembly/src/main/files/jboss/hibernate.cfg/postgresql.hibernate.cfg.xml =================================================================== --- idm/trunk/assembly/src/main/files/jboss/hibernate.cfg/postgresql.hibernate.cfg.xml 2009-11-08 22:45:12 UTC (rev 916) +++ idm/trunk/assembly/src/main/files/jboss/hibernate.cfg/postgresql.hibernate.cfg.xml 2009-11-09 13:12:00 UTC (rev 917) @@ -37,22 +37,18 @@ <property name="hibernate.transaction.manager_lookup_class">org.hibernate.transaction.JBossTransactionManagerLookup</property> <property name="jta.UserTransaction">UserTransaction</property> - <!-- Mapping classes --> - <!-- all nessesary mappings are added programatically to the configuration in the store--> - <!-- this is for manual SF creation--> - <mapping class="org.jboss.identity.idm.impl.model.hibernate.HibernateRealm"/> - <mapping class="org.jboss.identity.idm.impl.model.hibernate.HibernateIdentityObject"/> - <mapping class="org.jboss.identity.idm.impl.model.hibernate.HibernateIdentityObjectCredential"/> - <mapping class="org.jboss.identity.idm.impl.model.hibernate.HibernateIdentityObjectCredentialType"/> - <mapping class="org.jboss.identity.idm.impl.model.hibernate.HibernateIdentityObjectAttribute"/> - <mapping class="org.jboss.identity.idm.impl.model.hibernate.HibernateIdentityObjectTextAttribute"/> - <mapping class="org.jboss.identity.idm.impl.model.hibernate.HibernateIdentityObjectBinaryAttribute"/> - <mapping class="org.jboss.identity.idm.impl.model.hibernate.HibernateIdentityObjectBinaryAttributeValue"/> - <mapping class="org.jboss.identity.idm.impl.model.hibernate.HibernateIdentityObjectType"/> - <mapping class="org.jboss.identity.idm.impl.model.hibernate.HibernateIdentityObjectRelationship"/> - <mapping class="org.jboss.identity.idm.impl.model.hibernate.HibernateIdentityObjectRelationshipType"/> - <mapping class="org.jboss.identity.idm.impl.model.hibernate.HibernateIdentityObjectRelationshipName"/> - + <!-- Mapping classes --> + <!-- all nessesary mappings are added programatically to the configuration in the store--> + <!-- this is for manual SF creation or when 'addHibernateMappings' is set to false in the store configuration--> + <mapping resource="mappings/HibernateRealm.hbm.xml"/> + <mapping resource="mappings/HibernateIdentityObject.hbm.xml"/> + <mapping resource="mappings/HibernateIdentityObjectCredential.hbm.xml"/> + <mapping resource="mappings/HibernateIdentityObjectCredentialType.hbm.xml"/> + <mapping resource="mappings/HibernateIdentityObjectAttribute.hbm.xml"/> + <mapping resource="mappings/HibernateIdentityObjectType.hbm.xml"/> + <mapping resource="mappings/HibernateIdentityObjectRelationship.hbm.xml"/> + <mapping resource="mappings/HibernateIdentityObjectRelationshipType.hbm.xml"/> + <mapping resource="mappings/HibernateIdentityObjectRelationshipName.hbm.xml"/> </session-factory> </hibernate-configuration> Modified: idm/trunk/assembly/src/main/files/jboss/hibernate.cfg/sybase.hibernate.cfg.xml =================================================================== --- idm/trunk/assembly/src/main/files/jboss/hibernate.cfg/sybase.hibernate.cfg.xml 2009-11-08 22:45:12 UTC (rev 916) +++ idm/trunk/assembly/src/main/files/jboss/hibernate.cfg/sybase.hibernate.cfg.xml 2009-11-09 13:12:00 UTC (rev 917) @@ -42,22 +42,18 @@ <property name="hibernate.transaction.manager_lookup_class">org.hibernate.transaction.JBossTransactionManagerLookup</property> <property name="jta.UserTransaction">UserTransaction</property> - <!-- Mapping classes --> - <!-- all nessesary mappings are added programatically to the configuration in the store--> - <!-- this is for manual SF creation--> - <mapping class="org.jboss.identity.idm.impl.model.hibernate.HibernateRealm"/> - <mapping class="org.jboss.identity.idm.impl.model.hibernate.HibernateIdentityObject"/> - <mapping class="org.jboss.identity.idm.impl.model.hibernate.HibernateIdentityObjectCredential"/> - <mapping class="org.jboss.identity.idm.impl.model.hibernate.HibernateIdentityObjectCredentialType"/> - <mapping class="org.jboss.identity.idm.impl.model.hibernate.HibernateIdentityObjectAttribute"/> - <mapping class="org.jboss.identity.idm.impl.model.hibernate.HibernateIdentityObjectTextAttribute"/> - <mapping class="org.jboss.identity.idm.impl.model.hibernate.HibernateIdentityObjectBinaryAttribute"/> - <mapping class="org.jboss.identity.idm.impl.model.hibernate.HibernateIdentityObjectBinaryAttributeValue"/> - <mapping class="org.jboss.identity.idm.impl.model.hibernate.HibernateIdentityObjectType"/> - <mapping class="org.jboss.identity.idm.impl.model.hibernate.HibernateIdentityObjectRelationship"/> - <mapping class="org.jboss.identity.idm.impl.model.hibernate.HibernateIdentityObjectRelationshipType"/> - <mapping class="org.jboss.identity.idm.impl.model.hibernate.HibernateIdentityObjectRelationshipName"/> - + <!-- Mapping classes --> + <!-- all nessesary mappings are added programatically to the configuration in the store--> + <!-- this is for manual SF creation or when 'addHibernateMappings' is set to false in the store configuration--> + <mapping resource="mappings/HibernateRealm.hbm.xml"/> + <mapping resource="mappings/HibernateIdentityObject.hbm.xml"/> + <mapping resource="mappings/HibernateIdentityObjectCredential.hbm.xml"/> + <mapping resource="mappings/HibernateIdentityObjectCredentialType.hbm.xml"/> + <mapping resource="mappings/HibernateIdentityObjectAttribute.hbm.xml"/> + <mapping resource="mappings/HibernateIdentityObjectType.hbm.xml"/> + <mapping resource="mappings/HibernateIdentityObjectRelationship.hbm.xml"/> + <mapping resource="mappings/HibernateIdentityObjectRelationshipType.hbm.xml"/> + <mapping resource="mappings/HibernateIdentityObjectRelationshipName.hbm.xml"/> </session-factory> </hibernate-configuration> Modified: idm/trunk/example/auth/src/main/resources/jboss.idm.hibernate.cfg.xml =================================================================== --- idm/trunk/example/auth/src/main/resources/jboss.idm.hibernate.cfg.xml 2009-11-08 22:45:12 UTC (rev 916) +++ idm/trunk/example/auth/src/main/resources/jboss.idm.hibernate.cfg.xml 2009-11-09 13:12:00 UTC (rev 917) @@ -60,20 +60,18 @@ - <!--Mapping classes--> - <!--all nessesary mappings are added programatically to the configuration--> - <mapping class="org.jboss.identity.idm.impl.model.hibernate.HibernateRealm"/> - <mapping class="org.jboss.identity.idm.impl.model.hibernate.HibernateIdentityObject"/> - <mapping class="org.jboss.identity.idm.impl.model.hibernate.HibernateIdentityObjectCredential"/> - <mapping class="org.jboss.identity.idm.impl.model.hibernate.HibernateIdentityObjectCredentialType"/> - <mapping class="org.jboss.identity.idm.impl.model.hibernate.HibernateIdentityObjectAttribute"/> - <mapping class="org.jboss.identity.idm.impl.model.hibernate.HibernateIdentityObjectTextAttribute"/> - <mapping class="org.jboss.identity.idm.impl.model.hibernate.HibernateIdentityObjectBinaryAttribute"/> - <mapping class="org.jboss.identity.idm.impl.model.hibernate.HibernateIdentityObjectBinaryAttributeValue"/> - <mapping class="org.jboss.identity.idm.impl.model.hibernate.HibernateIdentityObjectType"/> - <mapping class="org.jboss.identity.idm.impl.model.hibernate.HibernateIdentityObjectRelationship"/> - <mapping class="org.jboss.identity.idm.impl.model.hibernate.HibernateIdentityObjectRelationshipType"/> - <mapping class="org.jboss.identity.idm.impl.model.hibernate.HibernateIdentityObjectRelationshipName"/> + <!-- Mapping classes --> + <!-- all nessesary mappings are added programatically to the configuration in the store--> + <!-- this is for manual SF creation or when 'addHibernateMappings' is set to false in the store configuration--> + <mapping resource="mappings/HibernateRealm.hbm.xml"/> + <mapping resource="mappings/HibernateIdentityObject.hbm.xml"/> + <mapping resource="mappings/HibernateIdentityObjectCredential.hbm.xml"/> + <mapping resource="mappings/HibernateIdentityObjectCredentialType.hbm.xml"/> + <mapping resource="mappings/HibernateIdentityObjectAttribute.hbm.xml"/> + <mapping resource="mappings/HibernateIdentityObjectType.hbm.xml"/> + <mapping resource="mappings/HibernateIdentityObjectRelationship.hbm.xml"/> + <mapping resource="mappings/HibernateIdentityObjectRelationshipType.hbm.xml"/> + <mapping resource="mappings/HibernateIdentityObjectRelationshipName.hbm.xml"/> </session-factory> </hibernate-configuration> \ No newline at end of file Modified: idm/trunk/example/simple/pom.xml =================================================================== --- idm/trunk/example/simple/pom.xml 2009-11-08 22:45:12 UTC (rev 916) +++ idm/trunk/example/simple/pom.xml 2009-11-09 13:12:00 UTC (rev 917) @@ -55,46 +55,27 @@ <groupId>org.jboss.identity.idm</groupId> <artifactId>idm-core</artifactId> <version>${project.version}</version> + <scope>test</scope> </dependency> <dependency> <groupId>org.jboss.identity.idm</groupId> <artifactId>idm-hibernate</artifactId> <version>${project.version}</version> + <scope>test</scope> </dependency> <dependency> <groupId>org.jboss.identity.idm</groupId> <artifactId>idm-ldap</artifactId> <version>${project.version}</version> + <scope>test</scope> </dependency> <dependency> <groupId>org.jboss.identity.idm</groupId> <artifactId>idm-cache</artifactId> <version>${project.version}</version> - </dependency> - <dependency> - <groupId>net.sf.ehcache</groupId> - <artifactId>ehcache</artifactId> - <version>1.2</version> <scope>test</scope> </dependency> <dependency> - <groupId>org.hibernate</groupId> - <artifactId>hibernate-ehcache</artifactId> - <version>3.3.0.GA</version> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.apache.commons</groupId> - <artifactId>commons-io</artifactId> - <version>1.3.2</version> - <scope>test</scope> - </dependency> - <dependency> - <groupId>apache-collections</groupId> - <artifactId>commons-collections</artifactId> - <version>3.1</version> - </dependency> - <dependency> <groupId>junit</groupId> <artifactId>junit</artifactId> <version>3.8.1</version> @@ -123,13 +104,13 @@ <dependency> <groupId>net.sf.ehcache</groupId> <artifactId>ehcache</artifactId> - <version>1.2</version> + <version>1.2.3</version> <scope>test</scope> </dependency> <dependency> <groupId>org.hibernate</groupId> <artifactId>hibernate-ehcache</artifactId> - <version>3.3.0.GA</version> + <version>3.3.2.GA</version> <scope>test</scope> </dependency> <dependency> Modified: idm/trunk/example/simple/src/test/java/org/jboss/identity/idm/example/InjectSFTestCase.java =================================================================== --- idm/trunk/example/simple/src/test/java/org/jboss/identity/idm/example/InjectSFTestCase.java 2009-11-08 22:45:12 UTC (rev 916) +++ idm/trunk/example/simple/src/test/java/org/jboss/identity/idm/example/InjectSFTestCase.java 2009-11-09 13:12:00 UTC (rev 917) @@ -28,12 +28,11 @@ import org.jboss.identity.idm.api.User; import org.jboss.identity.idm.api.Attribute; import org.jboss.identity.idm.api.AttributeDescription; -import org.jboss.identity.idm.api.Group; import org.jboss.identity.idm.api.cfg.IdentityConfiguration; import org.jboss.identity.idm.impl.configuration.IdentityConfigurationImpl; import org.jboss.identity.idm.impl.api.SimpleAttribute; import org.hibernate.SessionFactory; -import org.hibernate.cfg.AnnotationConfiguration; +import org.hibernate.cfg.Configuration; import java.util.logging.Logger; import java.util.Collection; @@ -72,7 +71,7 @@ IdentityConfiguration identityConfiguration = new IdentityConfigurationImpl(). configure(new File("src/test/resources/example-db-inject-sf-config.xml")); - SessionFactory hibernateSessionFactory = new AnnotationConfiguration().configure("hibernate-jboss-identity-classes.cfg.xml") + SessionFactory hibernateSessionFactory = new Configuration().configure("hibernate-jboss-identity-classes.cfg.xml") .buildSessionFactory(); identityConfiguration.getIdentityConfigurationRegistry().register(hibernateSessionFactory, "registeredSessionFactory1"); Modified: idm/trunk/example/simple/src/test/resources/example-mixed-config.xml =================================================================== --- idm/trunk/example/simple/src/test/resources/example-mixed-config.xml 2009-11-08 22:45:12 UTC (rev 916) +++ idm/trunk/example/simple/src/test/resources/example-mixed-config.xml 2009-11-09 13:12:00 UTC (rev 917) @@ -118,9 +118,13 @@ <options> <option> <name>hibernateConfiguration</name> - <value>hibernate-jboss-identity.cfg.xml</value> + <value>hibernate-jboss-identity-classes.cfg.xml</value> </option> <option> + <name>addHibernateMappings</name> + <value>false</value> + </option> + <option> <name>populateRelationshipTypes</name> <value>true</value> </option> Modified: idm/trunk/example/simple/src/test/resources/hibernate-jboss-identity-classes.cfg.xml =================================================================== --- idm/trunk/example/simple/src/test/resources/hibernate-jboss-identity-classes.cfg.xml 2009-11-08 22:45:12 UTC (rev 916) +++ idm/trunk/example/simple/src/test/resources/hibernate-jboss-identity-classes.cfg.xml 2009-11-09 13:12:00 UTC (rev 917) @@ -46,19 +46,16 @@ <!-- Mapping classes --> <!-- all nessesary mappings are added programatically to the configuration in the store--> - <!-- this is for manual SF creation--> - <mapping class="org.jboss.identity.idm.impl.model.hibernate.HibernateRealm"/> - <mapping class="org.jboss.identity.idm.impl.model.hibernate.HibernateIdentityObject"/> - <mapping class="org.jboss.identity.idm.impl.model.hibernate.HibernateIdentityObjectCredential"/> - <mapping class="org.jboss.identity.idm.impl.model.hibernate.HibernateIdentityObjectCredentialType"/> - <mapping class="org.jboss.identity.idm.impl.model.hibernate.HibernateIdentityObjectAttribute"/> - <mapping class="org.jboss.identity.idm.impl.model.hibernate.HibernateIdentityObjectTextAttribute"/> - <mapping class="org.jboss.identity.idm.impl.model.hibernate.HibernateIdentityObjectBinaryAttribute"/> - <mapping class="org.jboss.identity.idm.impl.model.hibernate.HibernateIdentityObjectBinaryAttributeValue"/> - <mapping class="org.jboss.identity.idm.impl.model.hibernate.HibernateIdentityObjectType"/> - <mapping class="org.jboss.identity.idm.impl.model.hibernate.HibernateIdentityObjectRelationship"/> - <mapping class="org.jboss.identity.idm.impl.model.hibernate.HibernateIdentityObjectRelationshipType"/> - <mapping class="org.jboss.identity.idm.impl.model.hibernate.HibernateIdentityObjectRelationshipName"/> + <!-- this is for manual SF creation or when 'addHibernateMappings' is set to false in the store configuration--> + <mapping resource="mappings/HibernateRealm.hbm.xml"/> + <mapping resource="mappings/HibernateIdentityObject.hbm.xml"/> + <mapping resource="mappings/HibernateIdentityObjectCredential.hbm.xml"/> + <mapping resource="mappings/HibernateIdentityObjectCredentialType.hbm.xml"/> + <mapping resource="mappings/HibernateIdentityObjectAttribute.hbm.xml"/> + <mapping resource="mappings/HibernateIdentityObjectType.hbm.xml"/> + <mapping resource="mappings/HibernateIdentityObjectRelationship.hbm.xml"/> + <mapping resource="mappings/HibernateIdentityObjectRelationshipType.hbm.xml"/> + <mapping resource="mappings/HibernateIdentityObjectRelationshipName.hbm.xml"/> </session-factory> </hibernate-configuration> \ No newline at end of file Modified: idm/trunk/example/simple/src/test/resources/hibernate-jboss-identity.cfg.xml =================================================================== --- idm/trunk/example/simple/src/test/resources/hibernate-jboss-identity.cfg.xml 2009-11-08 22:45:12 UTC (rev 916) +++ idm/trunk/example/simple/src/test/resources/hibernate-jboss-identity.cfg.xml 2009-11-09 13:12:00 UTC (rev 917) @@ -48,18 +48,17 @@ <property name="hibernate.connection.password"></property> <!-- Mapping classes --> - <!-- all nessesary mappings are added programatically to the configuration --> - <!--<mapping class="org.jboss.identity.idm.impl.model.hibernate.HibernateRealm"/>--> - <!--<mapping class="org.jboss.identity.idm.impl.model.hibernate.HibernateIdentityObject"/>--> - <!--<mapping class="org.jboss.identity.idm.impl.model.hibernate.HibernateIdentityObjectCredential"/>--> - <!--<mapping class="org.jboss.identity.idm.impl.model.hibernate.HibernateIdentityObjectCredentialType"/>--> - <!--<mapping class="org.jboss.identity.idm.impl.model.hibernate.HibernateIdentityObjectAttribute"/>--> - <!--<mapping class="org.jboss.identity.idm.impl.model.hibernate.HibernateIdentityObjectTextAttribute"/>--> - <!--<mapping class="org.jboss.identity.idm.impl.model.hibernate.HibernateIdentityObjectBinaryAttribute"/>--> - <!--<mapping class="org.jboss.identity.idm.impl.model.hibernate.HibernateIdentityObjectType"/>--> - <!--<mapping class="org.jboss.identity.idm.impl.model.hibernate.HibernateIdentityObjectRelationship"/>--> - <!--<mapping class="org.jboss.identity.idm.impl.model.hibernate.HibernateIdentityObjectRelationshipType"/>--> - <!--<mapping class="org.jboss.identity.idm.impl.model.hibernate.HibernateIdentityObjectRelationshipName"/>--> + <!-- all nessesary mappings are added programatically to the configuration in the store--> + <!-- this is for manual SF creation or when 'addHibernateMappings' is set to false in the store configuration--> + <!--<mapping resource="mappings/HibernateRealm.hbm.xml"/>--> + <!--<mapping resource="mappings/HibernateIdentityObject.hbm.xml"/>--> + <!--<mapping resource="mappings/HibernateIdentityObjectCredential.hbm.xml"/>--> + <!--<mapping resource="mappings/HibernateIdentityObjectCredentialType.hbm.xml"/>--> + <!--<mapping resource="mappings/HibernateIdentityObjectAttribute.hbm.xml"/>--> + <!--<mapping resource="mappings/HibernateIdentityObjectType.hbm.xml"/>--> + <!--<mapping resource="mappings/HibernateIdentityObjectRelationship.hbm.xml"/>--> + <!--<mapping resource="mappings/HibernateIdentityObjectRelationshipType.hbm.xml"/>--> + <!--<mapping resource="mappings/HibernateIdentityObjectRelationshipName.hbm.xml"/>--> </session-factory> </hibernate-configuration> \ No newline at end of file Modified: idm/trunk/idm-doc/ReferenceGuide/en/ReferenceGuide.xml =================================================================== --- idm/trunk/idm-doc/ReferenceGuide/en/ReferenceGuide.xml 2009-11-08 22:45:12 UTC (rev 916) +++ idm/trunk/idm-doc/ReferenceGuide/en/ReferenceGuide.xml 2009-11-09 13:12:00 UTC (rev 917) @@ -1236,7 +1236,7 @@ </listitem> <listitem> <para> - <emphasis role="bold">addMappedClasses</emphasis> + <emphasis role="bold">addHibernateMappings</emphasis> - of set to true all annotated hibernate model classes will be added to the hibernate configuration before SessionFactory is created</para> </listitem> @@ -1374,7 +1374,7 @@ ]]> </programlisting> <para> - In case 'addMappedClasses' option is not set to true hibernate configuration need to list all + In case 'addHibernateMappings' option is not set to true hibernate configuration need to list all annotated model classes: </para> <programlisting> Modified: idm/trunk/idm-hibernate/pom.xml =================================================================== --- idm/trunk/idm-hibernate/pom.xml 2009-11-08 22:45:12 UTC (rev 916) +++ idm/trunk/idm-hibernate/pom.xml 2009-11-09 13:12:00 UTC (rev 917) @@ -40,11 +40,6 @@ <artifactId>hibernate-core</artifactId> <version>3.3.2.GA</version> </dependency> - <dependency> - <groupId>org.hibernate</groupId> - <artifactId>hibernate-annotations</artifactId> - <version>3.4.0.GA</version> - </dependency> <!--Javassist as Hibernate's bytecode provider--> <dependency> <groupId>javassist</groupId> @@ -71,14 +66,7 @@ <version>1.2.14</version> </dependency> - <dependency> - <groupId>org.jboss.cache</groupId> - <artifactId>jbosscache-core</artifactId> - <version>3.0.2.GA</version> - </dependency> - - <dependency> <groupId>junit</groupId> <artifactId>junit</artifactId> <scope>test</scope> Modified: idm/trunk/idm-hibernate/src/main/java/org/jboss/identity/idm/impl/model/hibernate/HibernateIdentityObject.java =================================================================== --- idm/trunk/idm-hibernate/src/main/java/org/jboss/identity/idm/impl/model/hibernate/HibernateIdentityObject.java 2009-11-08 22:45:12 UTC (rev 916) +++ idm/trunk/idm-hibernate/src/main/java/org/jboss/identity/idm/impl/model/hibernate/HibernateIdentityObject.java 2009-11-09 13:12:00 UTC (rev 917) @@ -28,24 +28,6 @@ import java.util.*; -import javax.persistence.CascadeType; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.JoinTable; -import javax.persistence.ManyToOne; -import javax.persistence.OneToMany; -import javax.persistence.Table; -import javax.persistence.UniqueConstraint; - -import org.hibernate.annotations.Cache; -import org.hibernate.annotations.CacheConcurrencyStrategy; -import org.hibernate.annotations.Cascade; -import org.hibernate.annotations.CollectionOfElements; - /** * @author <a href="mailto:boleslaw.dawidowicz at redhat.com">Boleslaw Dawidowicz</a> * @version : 0.1 $ Modified: idm/trunk/idm-hibernate/src/main/java/org/jboss/identity/idm/impl/model/hibernate/HibernateIdentityObjectCredential.java =================================================================== --- idm/trunk/idm-hibernate/src/main/java/org/jboss/identity/idm/impl/model/hibernate/HibernateIdentityObjectCredential.java 2009-11-08 22:45:12 UTC (rev 916) +++ idm/trunk/idm-hibernate/src/main/java/org/jboss/identity/idm/impl/model/hibernate/HibernateIdentityObjectCredential.java 2009-11-09 13:12:00 UTC (rev 917) @@ -27,22 +27,6 @@ import java.util.HashMap; import java.util.Map; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.JoinTable; -import javax.persistence.Lob; -import javax.persistence.ManyToOne; -import javax.persistence.Table; -import javax.persistence.UniqueConstraint; - -import org.hibernate.annotations.Cache; -import org.hibernate.annotations.CacheConcurrencyStrategy; -import org.hibernate.annotations.CollectionOfElements; - /** * @author <a href="mailto:boleslaw.dawidowicz at redhat.com">Boleslaw Dawidowicz</a> * @version : 0.1 $ Modified: idm/trunk/idm-hibernate/src/main/java/org/jboss/identity/idm/impl/model/hibernate/HibernateIdentityObjectCredentialType.java =================================================================== --- idm/trunk/idm-hibernate/src/main/java/org/jboss/identity/idm/impl/model/hibernate/HibernateIdentityObjectCredentialType.java 2009-11-08 22:45:12 UTC (rev 916) +++ idm/trunk/idm-hibernate/src/main/java/org/jboss/identity/idm/impl/model/hibernate/HibernateIdentityObjectCredentialType.java 2009-11-09 13:12:00 UTC (rev 917) @@ -24,14 +24,6 @@ import org.jboss.identity.idm.spi.model.IdentityObjectCredentialType; -import javax.persistence.Entity; -import javax.persistence.Table; -import javax.persistence.Id; -import javax.persistence.GeneratedValue; -import javax.persistence.Column; -import org.hibernate.annotations.Cache; -import org.hibernate.annotations.CacheConcurrencyStrategy; - /** * @author <a href="mailto:boleslaw.dawidowicz at redhat.com">Boleslaw Dawidowicz</a> * @version : 0.1 $ Modified: idm/trunk/idm-hibernate/src/main/java/org/jboss/identity/idm/impl/model/hibernate/HibernateIdentityObjectRelationship.java =================================================================== --- idm/trunk/idm-hibernate/src/main/java/org/jboss/identity/idm/impl/model/hibernate/HibernateIdentityObjectRelationship.java 2009-11-08 22:45:12 UTC (rev 916) +++ idm/trunk/idm-hibernate/src/main/java/org/jboss/identity/idm/impl/model/hibernate/HibernateIdentityObjectRelationship.java 2009-11-09 13:12:00 UTC (rev 917) @@ -28,21 +28,7 @@ import java.util.HashMap; import java.util.Map; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.JoinTable; -import javax.persistence.ManyToOne; -import javax.persistence.Table; -import javax.persistence.UniqueConstraint; -import org.hibernate.annotations.Cache; -import org.hibernate.annotations.CacheConcurrencyStrategy; -import org.hibernate.annotations.CollectionOfElements; - /** * @author <a href="mailto:boleslaw.dawidowicz at redhat.com">Boleslaw Dawidowicz</a> * @version : 0.1 $ Modified: idm/trunk/idm-hibernate/src/main/java/org/jboss/identity/idm/impl/model/hibernate/HibernateIdentityObjectRelationshipName.java =================================================================== --- idm/trunk/idm-hibernate/src/main/java/org/jboss/identity/idm/impl/model/hibernate/HibernateIdentityObjectRelationshipName.java 2009-11-08 22:45:12 UTC (rev 916) +++ idm/trunk/idm-hibernate/src/main/java/org/jboss/identity/idm/impl/model/hibernate/HibernateIdentityObjectRelationshipName.java 2009-11-09 13:12:00 UTC (rev 917) @@ -25,21 +25,6 @@ import java.util.HashMap; import java.util.Map; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.JoinTable; -import javax.persistence.ManyToOne; -import javax.persistence.Table; -import javax.persistence.UniqueConstraint; - -import org.hibernate.annotations.Cache; -import org.hibernate.annotations.CacheConcurrencyStrategy; -import org.hibernate.annotations.Cascade; -import org.hibernate.annotations.CollectionOfElements; - /** * @author <a href="mailto:boleslaw.dawidowicz at redhat.com">Boleslaw Dawidowicz</a> * @version : 0.1 $ Modified: idm/trunk/idm-hibernate/src/main/java/org/jboss/identity/idm/impl/model/hibernate/HibernateIdentityObjectRelationshipType.java =================================================================== --- idm/trunk/idm-hibernate/src/main/java/org/jboss/identity/idm/impl/model/hibernate/HibernateIdentityObjectRelationshipType.java 2009-11-08 22:45:12 UTC (rev 916) +++ idm/trunk/idm-hibernate/src/main/java/org/jboss/identity/idm/impl/model/hibernate/HibernateIdentityObjectRelationshipType.java 2009-11-09 13:12:00 UTC (rev 917) @@ -24,14 +24,6 @@ import org.jboss.identity.idm.spi.model.IdentityObjectRelationshipType; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.Table; -import org.hibernate.annotations.Cache; -import org.hibernate.annotations.CacheConcurrencyStrategy; - /** * @author <a href="mailto:boleslaw.dawidowicz at redhat.com">Boleslaw Dawidowicz</a> * @version : 0.1 $ Modified: idm/trunk/idm-hibernate/src/main/java/org/jboss/identity/idm/impl/model/hibernate/HibernateIdentityObjectType.java =================================================================== --- idm/trunk/idm-hibernate/src/main/java/org/jboss/identity/idm/impl/model/hibernate/HibernateIdentityObjectType.java 2009-11-08 22:45:12 UTC (rev 916) +++ idm/trunk/idm-hibernate/src/main/java/org/jboss/identity/idm/impl/model/hibernate/HibernateIdentityObjectType.java 2009-11-09 13:12:00 UTC (rev 917) @@ -22,16 +22,6 @@ package org.jboss.identity.idm.impl.model.hibernate; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.Table; -import javax.persistence.NamedQueries; -import javax.persistence.NamedQuery; - -import org.hibernate.annotations.Cache; -import org.hibernate.annotations.CacheConcurrencyStrategy; import org.jboss.identity.idm.spi.model.IdentityObjectType; /** Modified: idm/trunk/idm-hibernate/src/main/java/org/jboss/identity/idm/impl/model/hibernate/HibernateRealm.java =================================================================== --- idm/trunk/idm-hibernate/src/main/java/org/jboss/identity/idm/impl/model/hibernate/HibernateRealm.java 2009-11-08 22:45:12 UTC (rev 916) +++ idm/trunk/idm-hibernate/src/main/java/org/jboss/identity/idm/impl/model/hibernate/HibernateRealm.java 2009-11-09 13:12:00 UTC (rev 917) @@ -25,19 +25,6 @@ import java.util.HashMap; import java.util.Map; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.JoinTable; -import javax.persistence.Table; -import javax.persistence.UniqueConstraint; - -import org.hibernate.annotations.Cache; -import org.hibernate.annotations.CacheConcurrencyStrategy; -import org.hibernate.annotations.CollectionOfElements; - /** * @author <a href="mailto:boleslaw.dawidowicz at redhat.com">Boleslaw Dawidowicz</a> * @version : 0.1 $ Modified: idm/trunk/idm-hibernate/src/main/java/org/jboss/identity/idm/impl/store/hibernate/HibernateIdentityStoreImpl.java =================================================================== --- idm/trunk/idm-hibernate/src/main/java/org/jboss/identity/idm/impl/store/hibernate/HibernateIdentityStoreImpl.java 2009-11-08 22:45:12 UTC (rev 916) +++ idm/trunk/idm-hibernate/src/main/java/org/jboss/identity/idm/impl/store/hibernate/HibernateIdentityStoreImpl.java 2009-11-09 13:12:00 UTC (rev 917) @@ -73,9 +73,8 @@ import org.hibernate.Query; import org.hibernate.Session; import org.hibernate.SessionFactory; -import org.hibernate.cfg.AnnotationConfiguration; +import org.hibernate.cfg.Configuration; import org.hibernate.criterion.Restrictions; -//import javax.persistence.Persistence; /** * @author <a href="mailto:boleslaw.dawidowicz at redhat.com">Boleslaw Dawidowicz</a> @@ -107,7 +106,7 @@ public static final String HIBERNATE_CONFIGURATION = "hibernateConfiguration"; - public static final String ADD_MAPPED_CLASSES = "addMappedClasses"; + public static final String ADD_HIBERNATE_MAPPINGS = "addHibernateMappings"; public static final String HIBERNATE_SESSION_FACTORY_JNDI_NAME = "hibernateSessionFactoryJNDIName"; @@ -380,7 +379,7 @@ String sfRegistryName = configurationContext.getStoreConfigurationMetaData(). getOptionSingleValue(HIBERNATE_SESSION_FACTORY_REGISTRY_NAME); String addMappedClasses = configurationContext.getStoreConfigurationMetaData(). - getOptionSingleValue(ADD_MAPPED_CLASSES); + getOptionSingleValue(ADD_HIBERNATE_MAPPINGS); String hibernateConfiguration = configurationContext.getStoreConfigurationMetaData(). getOptionSingleValue(HIBERNATE_CONFIGURATION); @@ -419,7 +418,7 @@ try { - AnnotationConfiguration config = new AnnotationConfiguration().configure(hibernateConfiguration); + Configuration config = new Configuration().configure(hibernateConfiguration); if (addMappedClasses != null && addMappedClasses.equals("false")) @@ -429,15 +428,17 @@ else { - return config.addAnnotatedClass(HibernateIdentityObject.class) - .addAnnotatedClass(HibernateIdentityObjectAttribute.class) - .addAnnotatedClass(HibernateIdentityObjectCredential.class) - .addAnnotatedClass(HibernateIdentityObjectCredentialType.class) - .addAnnotatedClass(HibernateIdentityObjectRelationship.class) - .addAnnotatedClass(HibernateIdentityObjectRelationshipName.class) - .addAnnotatedClass(HibernateIdentityObjectRelationshipType.class) - .addAnnotatedClass(HibernateIdentityObjectType.class) - .addAnnotatedClass(HibernateRealm.class).buildSessionFactory(); + return config + .addResource("mappings/HibernateIdentityObject.hbm.xml") + .addResource("mappings/HibernateIdentityObjectAttribute.hbm.xml") + .addResource("mappings/HibernateIdentityObjectCredential.hbm.xml") + .addResource("mappings/HibernateIdentityObjectCredentialType.hbm.xml") + .addResource("mappings/HibernateIdentityObjectRelationship.hbm.xml") + .addResource("mappings/HibernateIdentityObjectRelationshipName.hbm.xml") + .addResource("mappings/HibernateIdentityObjectRelationshipType.hbm.xml") + .addResource("mappings/HibernateIdentityObjectType.hbm.xml") + .addResource("mappings/HibernateRealm.hbm.xml") + .buildSessionFactory(); } } catch (Exception e) Modified: idm/trunk/idm-testsuite/src/test/java/org/jboss/identity/idm/impl/HibernateTestSupport.java =================================================================== --- idm/trunk/idm-testsuite/src/test/java/org/jboss/identity/idm/impl/HibernateTestSupport.java 2009-11-08 22:45:12 UTC (rev 916) +++ idm/trunk/idm-testsuite/src/test/java/org/jboss/identity/idm/impl/HibernateTestSupport.java 2009-11-09 13:12:00 UTC (rev 917) @@ -25,7 +25,7 @@ import org.jboss.identity.idm.impl.model.hibernate.HibernateIdentityObjectRelationshipType; import org.jboss.identity.idm.impl.model.hibernate.HibernateIdentityObjectType; import org.hibernate.SessionFactory; -import org.hibernate.cfg.AnnotationConfiguration; +import org.hibernate.cfg.Configuration; import java.util.logging.Logger; import java.sql.Connection; @@ -74,8 +74,7 @@ try { logger.info("Building JPA EntityManager for unit tests"); - //emFactory = (HibernateEntityManagerFactory)Persistence.createEntityManagerFactory(persistenceUnit); - sessionFactory = new AnnotationConfiguration().configure(hibernateConfiguration).buildSessionFactory(); + sessionFactory = new Configuration().configure(hibernateConfiguration).buildSessionFactory(); } catch (Exception ex) { Modified: idm/trunk/idm-testsuite/src/test/java/org/jboss/identity/idm/impl/IdentityTestPOJO.java =================================================================== --- idm/trunk/idm-testsuite/src/test/java/org/jboss/identity/idm/impl/IdentityTestPOJO.java 2009-11-08 22:45:12 UTC (rev 916) +++ idm/trunk/idm-testsuite/src/test/java/org/jboss/identity/idm/impl/IdentityTestPOJO.java 2009-11-09 13:12:00 UTC (rev 917) @@ -22,22 +22,11 @@ package org.jboss.identity.idm.impl; -import org.jboss.identity.idm.impl.model.hibernate.HibernateIdentityObject; -import org.jboss.identity.idm.impl.model.hibernate.HibernateIdentityObjectAttribute; -import org.jboss.identity.idm.impl.model.hibernate.HibernateIdentityObjectCredential; -import org.jboss.identity.idm.impl.model.hibernate.HibernateIdentityObjectCredentialType; -import org.jboss.identity.idm.impl.model.hibernate.HibernateIdentityObjectRelationship; -import org.jboss.identity.idm.impl.model.hibernate.HibernateIdentityObjectRelationshipName; -import org.jboss.identity.idm.impl.model.hibernate.HibernateIdentityObjectRelationshipType; -import org.jboss.identity.idm.impl.model.hibernate.HibernateIdentityObjectType; -import org.jboss.identity.idm.impl.model.hibernate.HibernateRealm; -import org.jboss.identity.idm.test.HibernateAnnotationsSupport; import org.jboss.portal.test.framework.embedded.ConnectionManagerSupport; import org.jboss.portal.test.framework.embedded.DataSourceSupport; import org.jboss.portal.test.framework.embedded.HibernateSupport; import org.jboss.portal.test.framework.embedded.JNDISupport; import org.jboss.portal.test.framework.embedded.TransactionManagerSupport; -import org.jboss.unit.api.pojo.annotations.Parameter; import java.util.LinkedList; import java.util.List; @@ -104,20 +93,6 @@ hibernateSupport.setConfig(hibernateSupportConfig); hibernateSupport.setJNDIName("java:/jbossidentity/HibernateStoreSessionFactory"); -// List<String> annotatedClasses = new LinkedList<String>(); -// annotatedClasses.add(HibernateIdentityObject.class.getName()); -// annotatedClasses.add(HibernateIdentityObjectAttribute.class.getName()); -// annotatedClasses.add(HibernateIdentityObjectBinaryAttribute.class.getName()); -// annotatedClasses.add(HibernateIdentityObjectBinaryAttributeValue.class.getName()); -// annotatedClasses.add(HibernateIdentityObjectTextAttribute.class.getName()); -// annotatedClasses.add(HibernateIdentityObjectCredential.class.getName()); -// annotatedClasses.add(HibernateIdentityObjectCredentialType.class.getName()); -// annotatedClasses.add(HibernateIdentityObjectRelationship.class.getName()); -// annotatedClasses.add(HibernateIdentityObjectRelationshipName.class.getName()); -// annotatedClasses.add(HibernateIdentityObjectRelationshipType.class.getName()); -// annotatedClasses.add(HibernateIdentityObjectType.class.getName()); -// annotatedClasses.add(HibernateRealm.class.getName()); - List<String> mappings = new LinkedList<String>(); mappings.add("mappings/HibernateIdentityObject.hbm.xml"); mappings.add("mappings/HibernateIdentityObjectAttribute.hbm.xml"); @@ -163,34 +138,26 @@ return getHibernateSupport().getSessionFactory(); } - - - - @Parameter(name="dataSourceName") public void setDataSourceName(String dataSourceName) { this.dataSourceName = dataSourceName; } - @Parameter(name="hibernateConfig") public void setHibernateConfig(String hibernateConfig) { this.hibernateConfig = hibernateConfig; } - @Parameter(name="datasources") public void setDatasources(String datasources) { this.datasources = datasources; } - @Parameter(name="identityConfig") public void setIdentityConfig(String identityConfig) { this.identityConfig = identityConfig; } - @Parameter(name="realmName") public void setRealmName(String realmName) { this.realmName = realmName; Deleted: idm/trunk/idm-testsuite/src/test/java/org/jboss/identity/idm/test/HibernateAnnotationsSupport.java =================================================================== --- idm/trunk/idm-testsuite/src/test/java/org/jboss/identity/idm/test/HibernateAnnotationsSupport.java 2009-11-08 22:45:12 UTC (rev 916) +++ idm/trunk/idm-testsuite/src/test/java/org/jboss/identity/idm/test/HibernateAnnotationsSupport.java 2009-11-09 13:12:00 UTC (rev 917) @@ -1,88 +0,0 @@ -/* -* JBoss, a division of Red Hat -* Copyright 2006, Red Hat Middleware, LLC, and individual contributors as indicated -* by the @authors tag. See the copyright.txt in the distribution for a -* full listing of individual contributors. -* -* This is free software; you can redistribute it and/or modify it -* under the terms of the GNU Lesser General Public License as -* published by the Free Software Foundation; either version 2.1 of -* the License, or (at your option) any later version. -* -* This software is distributed in the hope that it will be useful, -* but WITHOUT ANY WARRANTY; without even the implied warranty of -* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -* Lesser General Public License for more details. -* -* You should have received a copy of the GNU Lesser General Public -* License along with this software; if not, write to the Free -* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA -* 02110-1301 USA, or see the FSF site: http://www.fsf.org. -*/ - -package org.jboss.identity.idm.test; - -import org.jboss.portal.test.framework.embedded.HibernateSupport; -import org.hibernate.cfg.Configuration; -import org.hibernate.cfg.AnnotationConfiguration; - -import java.util.Iterator; -import java.util.Properties; -import java.util.Map; - -/** - * @author <a href="mailto:boleslaw.dawidowicz at redhat.com">Boleslaw Dawidowicz</a> - * @version : 0.1 $ - */ -public class HibernateAnnotationsSupport extends HibernateSupport -{ - - @Override - protected void createConfiguration() - { - AnnotationConfiguration cfg = new AnnotationConfiguration(); - - // - for (Iterator i = mappings.iterator(); i.hasNext();) - { - String mapping = (String)i.next(); - log.debug("Adding annotated enitity " + mapping); - try - { - Class mappedClass = Class.forName(mapping); - cfg.addAnnotatedClass(mappedClass); - } - catch (ClassNotFoundException e) - { - throw new IllegalArgumentException("Cannot find mapped class: " + mapping, e); - } - - } - - // - Properties props = new Properties(); - for (Iterator i = config.getProperties().entrySet().iterator();i.hasNext();) - { - Map.Entry entry = (Map.Entry)i.next(); - String key = (String)entry.getKey(); - String value = (String)entry.getValue(); - log.debug("Adding property " + key + " = " + value); - cfg.setProperty(key, value); - } - cfg.addProperties(props); - - // todo : make this configurable somehow - cfg.setProperty("hibernate.connection.datasource", "java:/DefaultDS"); - - // - if (jndiName != null) - { - log.debug("Setting jndi name to " + jndiName); - cfg.setProperty("hibernate.session_factory_name", jndiName); - } - - // - this.settings = cfg.buildSettings(); - this.cfg = cfg; - } -} Modified: idm/trunk/idm-testsuite/src/test/resources/datasources/hibernates.xml =================================================================== --- idm/trunk/idm-testsuite/src/test/resources/datasources/hibernates.xml 2009-11-08 22:45:12 UTC (rev 916) +++ idm/trunk/idm-testsuite/src/test/resources/datasources/hibernates.xml 2009-11-09 13:12:00 UTC (rev 917) @@ -9,7 +9,7 @@ </property> <property> <name>hibernate.show_sql</name> - <value>true</value> + <value>false</value> </property> <property> <name>hibernate.auto_close_session</name> Modified: idm/trunk/idm-testsuite/src/test/resources/hibernate-jboss-identity-classes.cfg.xml =================================================================== --- idm/trunk/idm-testsuite/src/test/resources/hibernate-jboss-identity-classes.cfg.xml 2009-11-08 22:45:12 UTC (rev 916) +++ idm/trunk/idm-testsuite/src/test/resources/hibernate-jboss-identity-classes.cfg.xml 2009-11-09 13:12:00 UTC (rev 917) @@ -43,18 +43,5 @@ <property name="hibernate.connection.username">sa</property> <property name="hibernate.connection.password"></property> - <!-- Mapping classes --> - - <mapping class="org.jboss.identity.idm.impl.model.hibernate.HibernateRealm"/> - <mapping class="org.jboss.identity.idm.impl.model.hibernate.HibernateIdentityObject"/> - <mapping class="org.jboss.identity.idm.impl.model.hibernate.HibernateIdentityObjectCredential"/> - <mapping class="org.jboss.identity.idm.impl.model.hibernate.HibernateIdentityObjectCredentialType"/> - <mapping class="org.jboss.identity.idm.impl.model.hibernate.HibernateIdentityObjectAttribute"/> - <mapping class="org.jboss.identity.idm.impl.model.hibernate.HibernateIdentityObjectTextAttribute"/> - <mapping class="org.jboss.identity.idm.impl.model.hibernate.HibernateIdentityObjectBinaryAttribute"/> - <mapping class="org.jboss.identity.idm.impl.model.hibernate.HibernateIdentityObjectType"/> - <mapping class="org.jboss.identity.idm.impl.model.hibernate.HibernateIdentityObjectRelationship"/> - <mapping class="org.jboss.identity.idm.impl.model.hibernate.HibernateIdentityObjectRelationshipType"/> - <mapping class="org.jboss.identity.idm.impl.model.hibernate.HibernateIdentityObjectRelationshipName"/> </session-factory> </hibernate-configuration> \ No newline at end of file Modified: idm/trunk/idm-testsuite/src/test/resources/hibernate-jboss-identity.cfg.xml =================================================================== --- idm/trunk/idm-testsuite/src/test/resources/hibernate-jboss-identity.cfg.xml 2009-11-08 22:45:12 UTC (rev 916) +++ idm/trunk/idm-testsuite/src/test/resources/hibernate-jboss-identity.cfg.xml 2009-11-09 13:12:00 UTC (rev 917) @@ -44,18 +44,17 @@ <property name="hibernate.connection.password"></property> <!-- Mapping classes --> - <!-- all nessesary mappings are added programatically to the configuration --> - <!--<mapping class="org.jboss.identity.idm.impl.model.hibernate.HibernateRealm"/>--> - <!--<mapping class="org.jboss.identity.idm.impl.model.hibernate.HibernateIdentityObject"/>--> - <!--<mapping class="org.jboss.identity.idm.impl.model.hibernate.HibernateIdentityObjectCredential"/>--> - <!--<mapping class="org.jboss.identity.idm.impl.model.hibernate.HibernateIdentityObjectCredentialType"/>--> - <!--<mapping class="org.jboss.identity.idm.impl.model.hibernate.HibernateIdentityObjectAttribute"/>--> - <!--<mapping class="org.jboss.identity.idm.impl.model.hibernate.HibernateIdentityObjectTextAttribute"/>--> - <!--<mapping class="org.jboss.identity.idm.impl.model.hibernate.HibernateIdentityObjectBinaryAttribute"/>--> - <!--<mapping class="org.jboss.identity.idm.impl.model.hibernate.HibernateIdentityObjectType"/>--> - <!--<mapping class="org.jboss.identity.idm.impl.model.hibernate.HibernateIdentityObjectRelationship"/>--> - <!--<mapping class="org.jboss.identity.idm.impl.model.hibernate.HibernateIdentityObjectRelationshipType"/>--> - <!--<mapping class="org.jboss.identity.idm.impl.model.hibernate.HibernateIdentityObjectRelationshipName"/>--> + <!-- all nessesary mappings are added programatically to the configuration in the store--> + <!-- this is for manual SF creation or when 'addHibernateMappings' is set to false in the store configuration--> + <!--<mapping resource="mappings/HibernateRealm.hbm.xml"/>--> + <!--<mapping resource="mappings/HibernateIdentityObject.hbm.xml"/>--> + <!--<mapping resource="mappings/HibernateIdentityObjectCredential.hbm.xml"/>--> + <!--<mapping resource="mappings/HibernateIdentityObjectCredentialType.hbm.xml"/>--> + <!--<mapping resource="mappings/HibernateIdentityObjectAttribute.hbm.xml"/>--> + <!--<mapping resource="mappings/HibernateIdentityObjectType.hbm.xml"/>--> + <!--<mapping resource="mappings/HibernateIdentityObjectRelationship.hbm.xml"/>--> + <!--<mapping resource="mappings/HibernateIdentityObjectRelationshipType.hbm.xml"/>--> + <!--<mapping resource="mappings/HibernateIdentityObjectRelationshipName.hbm.xml"/>--> </session-factory> </hibernate-configuration> \ No newline at end of file Modified: idm/trunk/integration/deployer/src/main/resources/jboss.idm.hibernate.cfg.xml =================================================================== --- idm/trunk/integration/deployer/src/main/resources/jboss.idm.hibernate.cfg.xml 2009-11-08 22:45:12 UTC (rev 916) +++ idm/trunk/integration/deployer/src/main/resources/jboss.idm.hibernate.cfg.xml 2009-11-09 13:12:00 UTC (rev 917) @@ -44,19 +44,17 @@ <property name="hibernate.connection.password"></property> <!-- Mapping classes --> - <!-- all nessesary mappings are added programatically to the configuration --> - <!--<mapping class="org.jboss.identity.idm.impl.model.hibernate.HibernateRealm"/>--> - <!--<mapping class="org.jboss.identity.idm.impl.model.hibernate.HibernateIdentityObject"/>--> - <!--<mapping class="org.jboss.identity.idm.impl.model.hibernate.HibernateIdentityObjectCredential"/>--> - <!--<mapping class="org.jboss.identity.idm.impl.model.hibernate.HibernateIdentityObjectCredentialType"/>--> - <!--<mapping class="org.jboss.identity.idm.impl.model.hibernate.HibernateIdentityObjectAttribute"/>--> - <!--<mapping class="org.jboss.identity.idm.impl.model.hibernate.HibernateIdentityObjectTextAttribute"/>--> - <!--<mapping class="org.jboss.identity.idm.impl.model.hibernate.HibernateIdentityObjectBinaryAttribute"/>--> - <!--<mapping class="org.jboss.identity.idm.impl.model.hibernate.HibernateIdentityObjectBinaryAttributeValue"/>--> - <!--<mapping class="org.jboss.identity.idm.impl.model.hibernate.HibernateIdentityObjectType"/>--> - <!--<mapping class="org.jboss.identity.idm.impl.model.hibernate.HibernateIdentityObjectRelationship"/>--> - <!--<mapping class="org.jboss.identity.idm.impl.model.hibernate.HibernateIdentityObjectRelationshipType"/>--> - <!--<mapping class="org.jboss.identity.idm.impl.model.hibernate.HibernateIdentityObjectRelationshipName"/>--> + <!-- all nessesary mappings are added programatically to the configuration in the store--> + <!-- this is for manual SF creation or when 'addHibernateMappings' is set to false in the store configuration--> + <!--<mapping resource="mappings/HibernateRealm.hbm.xml"/>--> + <!--<mapping resource="mappings/HibernateIdentityObject.hbm.xml"/>--> + <!--<mapping resource="mappings/HibernateIdentityObjectCredential.hbm.xml"/>--> + <!--<mapping resource="mappings/HibernateIdentityObjectCredentialType.hbm.xml"/>--> + <!--<mapping resource="mappings/HibernateIdentityObjectAttribute.hbm.xml"/>--> + <!--<mapping resource="mappings/HibernateIdentityObjectType.hbm.xml"/>--> + <!--<mapping resource="mappings/HibernateIdentityObjectRelationship.hbm.xml"/>--> + <!--<mapping resource="mappings/HibernateIdentityObjectRelationshipType.hbm.xml"/>--> + <!--<mapping resource="mappings/HibernateIdentityObjectRelationshipName.hbm.xml"/>--> </session-factory> </hibernate-configuration> \ No newline at end of file Modified: idm/trunk/integration/jboss5/src/main/java/org/jboss/identity/idm/integration/jboss5/IDMService.java =================================================================== --- idm/trunk/integration/jboss5/src/main/java/org/jboss/identity/idm/integration/jboss5/IDMService.java 2009-11-08 22:45:12 UTC (rev 916) +++ idm/trunk/integration/jboss5/src/main/java/org/jboss/identity/idm/integration/jboss5/IDMService.java 2009-11-09 13:12:00 UTC (rev 917) @@ -16,7 +16,6 @@ import javax.transaction.TransactionManager; import org.hibernate.SessionFactory; -import org.hibernate.cfg.AnnotationConfiguration; import org.hibernate.cfg.Configuration; import org.hibernate.dialect.Dialect; import org.hibernate.dialect.resolver.DialectFactory; @@ -200,7 +199,7 @@ if (hibernateConfigLocation == null) { throw new Exception ("Couldn't find the hibernate configuration file"); } - Configuration configuration = new AnnotationConfiguration().configure(hibernateConfigLocation); + Configuration configuration = new Configuration().configure(hibernateConfigLocation); logger.fine("starting to populate the schema from file [" + hibernateConfigLocation + "]"); HibernatePopulator hibernatePopulator = new HibernatePopulator(doChecking, setupLocation, configuration); hibernatePopulator.populateSchema(); @@ -231,7 +230,7 @@ private void deployHibernateSessionFactory(InitialContext context) throws NamingException, IdentityException { - hibernateSessionFactory = new AnnotationConfiguration().configure(hibernateConfigLocation).buildSessionFactory(); + hibernateSessionFactory = new Configuration().configure(hibernateConfigLocation).buildSessionFactory(); if (hibernateSessionFactoryJNDIName != null) { context.bind(hibernateSessionFactoryJNDIName, hibernateSessionFactory); logger.info("Bind the Hibernate Session Factory in JNDI of " + hibernateSessionFactoryJNDIName); Modified: idm/trunk/parent/pom.xml =================================================================== --- idm/trunk/parent/pom.xml 2009-11-08 22:45:12 UTC (rev 916) +++ idm/trunk/parent/pom.xml 2009-11-09 13:12:00 UTC (rev 917) @@ -164,11 +164,6 @@ <version>3.8.1</version> <scope>test</scope> </dependency> - <dependency> - <groupId>javax.persistence</groupId> - <artifactId>persistence-api</artifactId> - <version>1.0</version> - </dependency> </dependencies> </dependencyManagement> Modified: idm/trunk/pom.xml =================================================================== --- idm/trunk/pom.xml 2009-11-08 22:45:12 UTC (rev 916) +++ idm/trunk/pom.xml 2009-11-09 13:12:00 UTC (rev 917) @@ -27,10 +27,9 @@ <module>idm-testsuite</module> <module>integration</module> <module>idm-doc</module> - <!--TODO: fix--> - <!--<module>example/simple</module>--> - <!--<module>example/auth</module>--> - <!--<module>example/auth-simple</module>--> + <module>example/simple</module> + <module>example/auth</module> + <module>example/auth-simple</module> </modules> <profiles>