Author: jeff.yuchang Date: 2009-11-12 10:30:33 -0500 (Thu, 12 Nov 2009) New Revision: 930 Added: idm/trunk/assembly/src/main/files/jboss/hibernate.cfg/hsqldburl.hibernate.cfg.xml Removed: idm/trunk/assembly/src/main/config/ idm/trunk/assembly/src/main/files/db/hibernate.cfg/ idm/trunk/assembly/src/main/files/jboss/config.jboss5/ Modified: idm/trunk/assembly/pom.xml idm/trunk/assembly/scripts/antrun-schema.xml idm/trunk/assembly/scripts/assembly-distro.xml idm/trunk/assembly/src/main/build.properties idm/trunk/assembly/src/main/files/db/build.xml idm/trunk/assembly/src/main/files/jboss/build.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 Log: * remove unnecessary files. Modified: idm/trunk/assembly/pom.xml =================================================================== --- idm/trunk/assembly/pom.xml 2009-11-12 13:37:28 UTC (rev 929) +++ idm/trunk/assembly/pom.xml 2009-11-12 15:30:33 UTC (rev 930) @@ -16,7 +16,7 @@ </parent> <properties> - <hibernate-commons-annotations>3.0.0.ga</hibernate-commons-annotations> + <hibernate-commons-annotations>3.1.0.GA</hibernate-commons-annotations> <hibernate-tools-version>3.2.0.ga</hibernate-tools-version> <hsqldb-version>1.8.0.7</hsqldb-version> <idm.version>${project.version}</idm.version> Modified: idm/trunk/assembly/scripts/antrun-schema.xml =================================================================== --- idm/trunk/assembly/scripts/antrun-schema.xml 2009-11-12 13:37:28 UTC (rev 929) +++ idm/trunk/assembly/scripts/antrun-schema.xml 2009-11-12 15:30:33 UTC (rev 930) @@ -10,7 +10,7 @@ <project> <property name="db.scripts.dir" value="target/db/schema.scripts" /> - <property name="config.dir" value="src/main/config"/> + <property name="config.dir" value="src/main/files/jboss/hibernate.cfg"/> <path id="classpath"> <pathelement path="${maven.runtime.classpath}"/> Modified: idm/trunk/assembly/scripts/assembly-distro.xml =================================================================== --- idm/trunk/assembly/scripts/assembly-distro.xml 2009-11-12 13:37:28 UTC (rev 929) +++ idm/trunk/assembly/scripts/assembly-distro.xml 2009-11-12 15:30:33 UTC (rev 930) @@ -14,21 +14,8 @@ <!-- Dependency Sets --> <dependencySets> <dependencySet> - <!--<outputFileNameMapping>${artifact.artifactId}${dashClassifier?}.${artifact.extension}</outputFileNameMapping>--> - <!-- useStrictFiltering>true</useStrictFiltering --> <unpack>false</unpack> <scope>test</scope> - <!-- excludes> - <exclude>org.jboss.identity.idm.integration:idm-jboss5</exclude> - <exclude>org.jboss.identity.idm:idm-cache</exclude> - <exclude>org.jboss.identity.idm:idm-ldap</exclude> - <exclude>org.jboss.identity.idm:idm-hibernate</exclude> - <exclude>org.jboss.identity.idm:idm-core</exclude> - <exclude>org.jboss.identity.idm:idm-api</exclude> - <exclude>org.jboss.identity.idm:idm-common</exclude> - <exclude>org.jboss.identity.idm:idm-spi</exclude> - <exclude>org.jboss.identity.idm:idm-assembly</exclude> - </excludes--> <outputDirectory>lib</outputDirectory> </dependencySet> Modified: idm/trunk/assembly/src/main/build.properties =================================================================== --- idm/trunk/assembly/src/main/build.properties 2009-11-12 13:37:28 UTC (rev 929) +++ idm/trunk/assembly/src/main/build.properties 2009-11-12 15:30:33 UTC (rev 930) @@ -1,5 +1,4 @@ -jbossidm.home=.. +jbossidm.home=. database=hsqldburl -jbossidm.version=1.0.0-SANPSHOT jboss.home=/local/deploy/jboss-5.0.1.GA jboss.server.configuration=default \ No newline at end of file Modified: idm/trunk/assembly/src/main/files/db/build.xml =================================================================== --- idm/trunk/assembly/src/main/files/db/build.xml 2009-11-12 13:37:28 UTC (rev 929) +++ idm/trunk/assembly/src/main/files/db/build.xml 2009-11-12 15:30:33 UTC (rev 930) @@ -67,6 +67,4 @@ </java> </target> - - </project> Modified: idm/trunk/assembly/src/main/files/jboss/build.xml =================================================================== --- idm/trunk/assembly/src/main/files/jboss/build.xml 2009-11-12 13:37:28 UTC (rev 929) +++ idm/trunk/assembly/src/main/files/jboss/build.xml 2009-11-12 15:30:33 UTC (rev 930) @@ -1,11 +1,10 @@ <?xml version="1.0" encoding="UTF-8"?> -<project name="jbossidm.jboss.install" default="install.jbossidm.into.jboss"> +<project name="jbossidm.jboss.install" default="deploy"> <!-- DEVELOPER SPECIFIC CONFIGURATIONS --> <property file="../build.properties" /> - <!-- JDBC PROPERTIES --> <property file="${jbossidm.home}/db/jdbc/${database}.properties" /> @@ -21,14 +20,14 @@ </target> <!-- ### MAIN TARGET TO INSTALL jbossidm INTO JBOSS ######################### --> - <target name="install.jbossidm.into.jboss" + <target name="deploy" depends="log.properties" description="installs jbossidm into jboss"> <antcall target="internal.install.jbossidm.into.jboss5" /> <antcall target="internal.install.jbossidm.into.jboss.db.${database}" /> </target> - <target name="uninstall.jbossidm" description="uninstall jbossidm from jboss"> + <target name="undeploy" description="uninstall jbossidm from jboss"> <delete dir="${jboss.server.config.dir}/deploy/idm" /> <delete dir="${jboss.server.config.dir}/deployers/idm-deployer" /> </target> @@ -78,7 +77,9 @@ <!-- ### THE HSQLDB SPECIFIC PART ####################################### --> <target name="internal.install.jbossidm.into.jboss.db.hsqldb" /> - + + <target name="internal.install.jbossidm.into.jboss.db.hsqldburl" /> + <!-- ### THE MYSQL SPECIFIC PART ####################################### --> <target name="internal.install.jbossidm.into.jboss.db.mysql"> <copy todir="${jboss.server.config.dir}/deploy/idm/idm-service.sar" overwrite="true"> 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-12 13:37:28 UTC (rev 929) +++ idm/trunk/assembly/src/main/files/jboss/hibernate.cfg/hsqldb.hibernate.cfg.xml 2009-11-12 15:30:33 UTC (rev 930) @@ -30,6 +30,9 @@ <!-- ask hibernate to do the schema population --> <!-- property name="hibernate.hbm2ddl.auto">create-drop</property--> + + <property name="cache.use_second_level_cache">true</property> + <property name="cache.use_query_cache">true</property> <property name="hibernate.dialect">org.hibernate.dialect.HSQLDialect</property> <property name="hibernate.connection.datasource">java:jbossidmDS</property> Added: idm/trunk/assembly/src/main/files/jboss/hibernate.cfg/hsqldburl.hibernate.cfg.xml =================================================================== --- idm/trunk/assembly/src/main/files/jboss/hibernate.cfg/hsqldburl.hibernate.cfg.xml (rev 0) +++ idm/trunk/assembly/src/main/files/jboss/hibernate.cfg/hsqldburl.hibernate.cfg.xml 2009-11-12 15:30:33 UTC (rev 930) @@ -0,0 +1,58 @@ +<?xml version='1.0' encoding='utf-8'?> +<!--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + ~ 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. ~ + ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~--> + +<!DOCTYPE hibernate-configuration PUBLIC + "-//Hibernate/Hibernate Configuration DTD//EN" + "http://hibernate.sourceforge.net/hibernate-configuration-3.0.dtd"> +<hibernate-configuration> + <session-factory> + + <!-- ask hibernate to do the schema population --> + <!-- property name="hibernate.hbm2ddl.auto">create-drop</property--> + + <property name="cache.use_second_level_cache">true</property> + <property name="cache.use_query_cache">true</property> + + <property name="hibernate.dialect">org.hibernate.dialect.HSQLDialect</property> + <property name="hibernate.connection.datasource">java:jbossidmDS</property> + <property name="hibernate.transaction.factory_class">org.hibernate.transaction.JTATransactionFactory</property> + <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 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-12 13:37:28 UTC (rev 929) +++ idm/trunk/assembly/src/main/files/jboss/hibernate.cfg/mssql.hibernate.cfg.xml 2009-11-12 15:30:33 UTC (rev 930) @@ -28,11 +28,9 @@ <hibernate-configuration> <session-factory> - <property name="show_sql">false</property> <property name="cache.use_second_level_cache">true</property> - <property name="cache.use_query_cache">false</property> + <property name="cache.use_query_cache">true</property> - <property name="current_session_context_class">thread</property> <!-- ask hibernate to do the schema population --> <!-- property name="hibernate.hbm2ddl.auto">create-drop</property--> 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-12 13:37:28 UTC (rev 929) +++ idm/trunk/assembly/src/main/files/jboss/hibernate.cfg/mysql.hibernate.cfg.xml 2009-11-12 15:30:33 UTC (rev 930) @@ -30,7 +30,9 @@ <!-- ask hibernate to do the schema population --> <!-- property name="hibernate.hbm2ddl.auto">create-drop</property--> - + <property name="cache.use_second_level_cache">true</property> + <property name="cache.use_query_cache">true</property> + <property name="hibernate.dialect">org.hibernate.dialect.MySQLInnoDBDialect</property> <property name="hibernate.connection.datasource">java:jbossidmDS</property> <property name="hibernate.transaction.factory_class">org.hibernate.transaction.JTATransactionFactory</property> 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-12 13:37:28 UTC (rev 929) +++ idm/trunk/assembly/src/main/files/jboss/hibernate.cfg/oracle.hibernate.cfg.xml 2009-11-12 15:30:33 UTC (rev 930) @@ -31,6 +31,9 @@ <!-- ask hibernate to do the schema population --> <!-- property name="hibernate.hbm2ddl.auto">create-drop</property--> + <property name="cache.use_second_level_cache">true</property> + <property name="cache.use_query_cache">true</property> + <property name="hibernate.dialect">org.hibernate.dialect.Oracle9Dialect</property> <property name="hibernate.connection.datasource">java:jbossidmDS</property> <property name="hibernate.transaction.factory_class">org.hibernate.transaction.JTATransactionFactory</property> 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-12 13:37:28 UTC (rev 929) +++ idm/trunk/assembly/src/main/files/jboss/hibernate.cfg/postgresql.hibernate.cfg.xml 2009-11-12 15:30:33 UTC (rev 930) @@ -31,6 +31,9 @@ <!-- ask hibernate to do the schema population --> <!-- property name="hibernate.hbm2ddl.auto">create-drop</property--> + <property name="cache.use_second_level_cache">true</property> + <property name="cache.use_query_cache">true</property> + <property name="hibernate.dialect">org.hibernate.dialect.PostgreSQLDialect</property> <property name="hibernate.connection.datasource">java:jbossidmDS</property> <property name="hibernate.transaction.factory_class">org.hibernate.transaction.JTATransactionFactory</property> 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-12 13:37:28 UTC (rev 929) +++ idm/trunk/assembly/src/main/files/jboss/hibernate.cfg/sybase.hibernate.cfg.xml 2009-11-12 15:30:33 UTC (rev 930) @@ -28,11 +28,9 @@ <hibernate-configuration> <session-factory> - <property name="show_sql">false</property> <property name="cache.use_second_level_cache">true</property> - <property name="cache.use_query_cache">false</property> + <property name="cache.use_query_cache">true</property> - <property name="current_session_context_class">thread</property> <!-- ask hibernate to do the schema population --> <!-- property name="hibernate.hbm2ddl.auto">create-drop</property-->