Author: jeff.yuchang Date: 2009-11-13 03:45:08 -0500 (Fri, 13 Nov 2009) New Revision: 935 Modified: idm/trunk/assembly/pom.xml idm/trunk/assembly/src/main/build.properties 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/hsqldburl.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: * update Modified: idm/trunk/assembly/pom.xml =================================================================== --- idm/trunk/assembly/pom.xml 2009-11-12 23:56:38 UTC (rev 934) +++ idm/trunk/assembly/pom.xml 2009-11-13 08:45:08 UTC (rev 935) @@ -24,10 +24,10 @@ <mysql.connector.version>5.0.8</mysql.connector.version> <postgresql.version>8.3-603.jdbc3</postgresql.version> <jtds.version>1.2.2</jtds.version> - </properties> <dependencies> + <dependency> <groupId>org.jboss.identity.idm</groupId> <artifactId>idm-api</artifactId> @@ -82,26 +82,22 @@ <type>zip</type> <version>${idm.version}</version> </dependency> - - + <dependency> <groupId>org.hibernate</groupId> <artifactId>hibernate-commons-annotations</artifactId> <version>${hibernate-commons-annotations}</version> </dependency> - <dependency> <groupId>org.hibernate</groupId> <artifactId>hibernate-tools</artifactId> <version>${hibernate-tools-version}</version> </dependency> - <dependency> <groupId>hsqldb</groupId> <artifactId>hsqldb</artifactId> <version>${hsqldb-version}</version> - </dependency> - + </dependency> <dependency> <groupId>org.apache.ant</groupId> <artifactId>ant</artifactId> Modified: idm/trunk/assembly/src/main/build.properties =================================================================== --- idm/trunk/assembly/src/main/build.properties 2009-11-12 23:56:38 UTC (rev 934) +++ idm/trunk/assembly/src/main/build.properties 2009-11-13 08:45:08 UTC (rev 935) @@ -1,4 +1,4 @@ -jbossidm.home=. +jbossidm.home=.. database=hsqldburl 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/jboss/build.xml =================================================================== --- idm/trunk/assembly/src/main/files/jboss/build.xml 2009-11-12 23:56:38 UTC (rev 934) +++ idm/trunk/assembly/src/main/files/jboss/build.xml 2009-11-13 08:45:08 UTC (rev 935) @@ -84,7 +84,7 @@ <target name="internal.install.jbossidm.into.jboss.db.mysql"> <copy todir="${jboss.server.config.dir}/deploy/idm/idm-service.sar" overwrite="true"> <fileset dir="${jbossidm.home}/lib"> - <include name="mysql-connector-java.jar"/> + <include name="mysql-connector-java-*.jar"/> </fileset> </copy> </target> @@ -99,20 +99,29 @@ <!-- ### THE POSTGRESQL SPECIFIC PART ################################### --> <target name="internal.install.jbossidm.into.jboss.db.postgresql"> - <copy file="${jbossidm.home}/lib/postgresql.jar" - todir="${jboss.server.config.dir}/deploy/idm/idm-service.sar" /> + <copy todir="${jboss.server.config.dir}/deploy/idm/idm-service.sar" overwrite="true"> + <fileset dir="${jbossidm.home}/lib"> + <include name="postgresql-*.jar"/> + </fileset> + </copy> </target> <!--### THE SYBASE SPECIFIC PART ######################################## --> <target name="internal.install.jbossidm.into.jboss.db.sybase"> - <copy file="${jbossidm.home}/lib/jtds.jar" - todir="${jboss.server.config.dir}/deploy/idm/idm-service.sar" /> + <copy todir="${jboss.server.config.dir}/deploy/idm/idm-service.sar" overwrite="true"> + <fileset dir="${jbossidm.home}/lib"> + <include name="jtds-*.jar"/> + </fileset> + </copy> </target> <!--### THE MSSQL SPECIFIC PART ######################################## --> <target name="internal.install.jbossidm.into.jboss.db.mssql"> - <copy file="${jbossidm.home}/lib/jtds.jar" - todir="${jboss.server.config.dir}/deploy/idm/idm-service.sar" /> + <copy todir="${jboss.server.config.dir}/deploy/idm/idm-service.sar" overwrite="true"> + <fileset dir="${jbossidm.home}/lib"> + <include name="jtds-*.jar"/> + </fileset> + </copy> </target> </project> 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 23:56:38 UTC (rev 934) +++ idm/trunk/assembly/src/main/files/jboss/hibernate.cfg/hsqldb.hibernate.cfg.xml 2009-11-13 08:45:08 UTC (rev 935) @@ -33,6 +33,8 @@ <property name="cache.use_second_level_cache">true</property> <property name="cache.use_query_cache">true</property> + + <property name="hibernate.cache.provider_class">org.hibernate.cache.HashtableCacheProvider</property> <property name="hibernate.dialect">org.hibernate.dialect.HSQLDialect</property> <property name="hibernate.connection.datasource">java:jbossidmDS</property> Modified: 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 2009-11-12 23:56:38 UTC (rev 934) +++ idm/trunk/assembly/src/main/files/jboss/hibernate.cfg/hsqldburl.hibernate.cfg.xml 2009-11-13 08:45:08 UTC (rev 935) @@ -33,7 +33,9 @@ <property name="cache.use_second_level_cache">true</property> <property name="cache.use_query_cache">true</property> - + + <property name="hibernate.cache.provider_class">org.hibernate.cache.HashtableCacheProvider</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> 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 23:56:38 UTC (rev 934) +++ idm/trunk/assembly/src/main/files/jboss/hibernate.cfg/mssql.hibernate.cfg.xml 2009-11-13 08:45:08 UTC (rev 935) @@ -30,6 +30,8 @@ <property name="cache.use_second_level_cache">true</property> <property name="cache.use_query_cache">true</property> + + <property name="hibernate.cache.provider_class">org.hibernate.cache.HashtableCacheProvider</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 23:56:38 UTC (rev 934) +++ idm/trunk/assembly/src/main/files/jboss/hibernate.cfg/mysql.hibernate.cfg.xml 2009-11-13 08:45:08 UTC (rev 935) @@ -33,6 +33,8 @@ <property name="cache.use_second_level_cache">true</property> <property name="cache.use_query_cache">true</property> + <property name="hibernate.cache.provider_class">org.hibernate.cache.HashtableCacheProvider</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 23:56:38 UTC (rev 934) +++ idm/trunk/assembly/src/main/files/jboss/hibernate.cfg/oracle.hibernate.cfg.xml 2009-11-13 08:45:08 UTC (rev 935) @@ -33,6 +33,8 @@ <property name="cache.use_second_level_cache">true</property> <property name="cache.use_query_cache">true</property> + + <property name="hibernate.cache.provider_class">org.hibernate.cache.HashtableCacheProvider</property> <property name="hibernate.dialect">org.hibernate.dialect.Oracle9Dialect</property> <property name="hibernate.connection.datasource">java:jbossidmDS</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 23:56:38 UTC (rev 934) +++ idm/trunk/assembly/src/main/files/jboss/hibernate.cfg/postgresql.hibernate.cfg.xml 2009-11-13 08:45:08 UTC (rev 935) @@ -33,6 +33,8 @@ <property name="cache.use_second_level_cache">true</property> <property name="cache.use_query_cache">true</property> + + <property name="hibernate.cache.provider_class">org.hibernate.cache.HashtableCacheProvider</property> <property name="hibernate.dialect">org.hibernate.dialect.PostgreSQLDialect</property> <property name="hibernate.connection.datasource">java:jbossidmDS</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 23:56:38 UTC (rev 934) +++ idm/trunk/assembly/src/main/files/jboss/hibernate.cfg/sybase.hibernate.cfg.xml 2009-11-13 08:45:08 UTC (rev 935) @@ -30,6 +30,8 @@ <property name="cache.use_second_level_cache">true</property> <property name="cache.use_query_cache">true</property> + + <property name="hibernate.cache.provider_class">org.hibernate.cache.HashtableCacheProvider</property> <!-- ask hibernate to do the schema population --> <!-- property name="hibernate.hbm2ddl.auto">create-drop</property-->