[hibernate-commits] Hibernate SVN: r17742 - in entitymanager/branches/v3_3_2_GA_CP/src/test: org/hibernate/ejb/test/connection and 2 other directories.

hibernate-commits at lists.jboss.org hibernate-commits at lists.jboss.org
Wed Oct 14 04:11:10 EDT 2009 

Author: stliu
Date: 2009-10-14 04:11:10 -0400 (Wed, 14 Oct 2009)
New Revision: 17742

Modified:
   entitymanager/branches/v3_3_2_GA_CP/src/test/hibernate.properties
   entitymanager/branches/v3_3_2_GA_CP/src/test/org/hibernate/ejb/test/connection/FakeDataSource.java
   entitymanager/branches/v3_3_2_GA_CP/src/test/org/hibernate/ejb/test/xml/Employee.java
   entitymanager/branches/v3_3_2_GA_CP/src/test/org/hibernate/ejb/test/xml/sequences/Employee.java
Log:
JBPAPP-1679 Modify Annotations, Entity Manager, and Search to work with the same property settings as Core

Modified: entitymanager/branches/v3_3_2_GA_CP/src/test/hibernate.properties
===================================================================
--- entitymanager/branches/v3_3_2_GA_CP/src/test/hibernate.properties	2009-10-14 06:19:33 UTC (rev 17741)
+++ entitymanager/branches/v3_3_2_GA_CP/src/test/hibernate.properties	2009-10-14 08:11:10 UTC (rev 17742)
@@ -1,30 +1,10 @@
-###############
-### EJB 3.0 ###
-###############
-
-## select Hibernate persistence provider
-
-javax.persistence.provider org.hibernate.ejb.HibernatePersistence
-javax.persistence.transactionType=RESOURCE_LOCAL
-
-## entity bean class name (comma separated)
-
-#hibernate.ejb.classes org.hibernate.ejb.test.Item, org.hibernate.ejb.test.Distributor
-
-## entity caching (strategy, optional region name)
-#hibernate.ejb.classcache.org.hibernate.ejb.test.Item read-write, RegionName
-#hibernate.ejb.classcache.org.hibernate.ejb.test.Item read-write
-
-## collection caching (role, optional region name)
-#hibernate.ejb.collectioncache.org.hibernate.ejb.test.Item.distributors read-write, RegionName
-
 ######################
 ### Query Language ###
 ######################
 
 ## define query language constants / function names
 
-hibernate.query.substitutions true 1, false 0, yes 'Y', no 'N'
+hibernate.query.substitutions yes 'Y', no 'N'
 
 
 ## select the classic query parser
@@ -50,52 +30,65 @@
 hibernate.connection.driver_class org.hsqldb.jdbcDriver
 hibernate.connection.username sa
 hibernate.connection.password
-hibernate.connection.url jdbc:hsqldb:hsql://localhost
-hibernate.connection.url jdbc:hsqldb:test
-hibernate.connection.url jdbc:hsqldb:.
+hibernate.connection.url jdbc:hsqldb:./build/db/hsqldb/hibernate
+#hibernate.connection.url jdbc:hsqldb:hsql://localhost
+#hibernate.connection.url jdbc:hsqldb:test
 
+## H2 (www.h2database.com)
+#hibernate.dialect org.hibernate.dialect.H2Dialect
+#hibernate.connection.driver_class org.h2.Driver
+#hibernate.connection.username sa
+#hibernate.connection.password
+#hibernate.connection.url jdbc:h2:mem:./build/db/h2/hibernate
+#hibernate.connection.url jdbc:h2:testdb/h2test
+#hibernate.connection.url jdbc:h2:mem:imdb1
+#hibernate.connection.url jdbc:h2:tcp://dbserv:8084/sample; 	
+#hibernate.connection.url jdbc:h2:ssl://secureserv:8085/sample; 	
+#hibernate.connection.url jdbc:h2:ssl://secureserv/testdb;cipher=AES
 
 ## MySQL
 
 #hibernate.dialect org.hibernate.dialect.MySQLDialect
 #hibernate.dialect org.hibernate.dialect.MySQLInnoDBDialect
 #hibernate.dialect org.hibernate.dialect.MySQLMyISAMDialect
-#hibernate.connection.driver_class org.gjt.mm.mysql.Driver
 #hibernate.connection.driver_class com.mysql.jdbc.Driver
 #hibernate.connection.url jdbc:mysql:///test
-#hibernate.connection.username emmanuel
+#hibernate.connection.username gavin
 #hibernate.connection.password
 
 
 ## Oracle
 
-#hibernate.dialect org.hibernate.dialect.OracleDialect
-#hibernate.dialect org.hibernate.dialect.Oracle9Dialect
+#hibernate.dialect org.hibernate.dialect.Oracle8iDialect
+#hibernate.dialect org.hibernate.dialect.Oracle9iDialect
+#hibernate.dialect org.hibernate.dialect.Oracle10gDialect
 #hibernate.connection.driver_class oracle.jdbc.driver.OracleDriver
 #hibernate.connection.username ora
 #hibernate.connection.password ora
-#hibernate.connection.url jdbc:oracle:thin:@localhost:1521:test
+#hibernate.connection.url jdbc:oracle:thin:@localhost:1521:orcl
+#hibernate.connection.url jdbc:oracle:thin:@localhost:1522:XE
 
 
 ## PostgreSQL
 
 #hibernate.dialect org.hibernate.dialect.PostgreSQLDialect
 #hibernate.connection.driver_class org.postgresql.Driver
-#hibernate.connection.url jdbc:postgresql:annotations
-#hibernate.connection.username postgres
-#hibernate.connection.password hibernate
-#hibernate.query.substitutions yes 'Y', no 'N'
+#hibernate.connection.url jdbc:postgresql:template1
+#hibernate.connection.username pg
+#hibernate.connection.password
 
 
 ## DB2
 
 #hibernate.dialect org.hibernate.dialect.DB2Dialect
+#hibernate.connection.driver_class com.ibm.db2.jcc.DB2Driver
 #hibernate.connection.driver_class COM.ibm.db2.jdbc.app.DB2Driver
-#hibernate.connection.url jdbc:db2:test
+#hibernate.connection.url jdbc:db2://localhost:50000/somename
+#hibernate.connection.url jdbc:db2:somename
 #hibernate.connection.username db2
 #hibernate.connection.password db2
 
-## TimesTen (not supported yet)
+## TimesTen
 
 #hibernate.dialect org.hibernate.dialect.TimesTenDialect
 #hibernate.connection.driver_class com.timesten.jdbc.TimesTenDriver
@@ -118,13 +111,13 @@
 #hibernate.connection.url jdbc:as400://systemname
 
 
-## Derby (Not supported!)
+## Derby (not supported!)
 
 #hibernate.dialect org.hibernate.dialect.DerbyDialect
 #hibernate.connection.driver_class org.apache.derby.jdbc.EmbeddedDriver
 #hibernate.connection.username
 #hibernate.connection.password
-#hibernate.connection.url jdbc:derby:/test;create=true
+#hibernate.connection.url jdbc:derby:build/db/derby/hibernate;create=true
 
 
 ## Sybase
@@ -141,7 +134,7 @@
 #hibernate.dialect org.hibernate.dialect.MckoiDialect
 #hibernate.connection.driver_class com.mckoi.JDBCDriver
 #hibernate.connection.url jdbc:mckoi:///
-#hibernate.connection.url jdbc:mckoi:local://C:/mckoi1.00/db.conf
+#hibernate.connection.url jdbc:mckoi:local://C:/mckoi1.0.3/db.conf
 #hibernate.connection.username admin
 #hibernate.connection.password nimda
 
@@ -178,6 +171,10 @@
 #hibernate.connection.driver_class com.microsoft.jdbc.sqlserver.SQLServerDriver
 #hibernate.connection.url jdbc:microsoft:sqlserver://1E1;DatabaseName=test;SelectMethod=cursor
 
+## The New Microsoft Driver 
+#hibernate.connection.driver_class com.microsoft.sqlserver.jdbc.SQLServerDriver
+#hibernate.connection.url jdbc:sqlserver://localhost
+
 ## jTDS (since version 0.9)
 #hibernate.connection.driver_class net.sourceforge.jtds.jdbc.Driver
 #hibernate.connection.url jdbc:jtds:sqlserver://1E1/test
@@ -210,7 +207,42 @@
 #hibernate.connection.password PBPUBLIC
 
 
+## Ingres
 
+## older versions (before Ingress 2006)
+
+#hibernate.dialect org.hibernate.dialect.IngresDialect
+#hibernate.connection.driver_class ca.edbc.jdbc.EdbcDriver
+#hibernate.connection.url jdbc:edbc://localhost:II7/database
+#hibernate.connection.username user
+#hibernate.connection.password password
+
+## Ingres 2006 or later
+
+#hibernate.dialect org.hibernate.dialect.IngresDialect
+#hibernate.connection.driver_class com.ingres.jdbc.IngresDriver
+#hibernate.connection.url jdbc:ingres://localhost:II7/database;CURSOR=READONLY;auto=multi
+#hibernate.connection.username user
+#hibernate.connection.password password
+
+## Mimer SQL
+
+#hibernate.dialect org.hibernate.dialect.MimerSQLDialect
+#hibernate.connection.driver_class com.mimer.jdbc.Driver
+#hibernate.connection.url jdbc:mimer:multi1
+#hibernate.connection.username hibernate
+#hibernate.connection.password hibernate
+
+
+## InterSystems Cache
+
+#hibernate.dialect org.hibernate.dialect.Cache71Dialect
+#hibernate.connection.driver_class com.intersys.jdbc.CacheDriver
+#hibernate.connection.username _SYSTEM
+#hibernate.connection.password SYS
+#hibernate.connection.url jdbc:Cache://127.0.0.1:1972/HIBERNATE
+
+
 #################################
 ### Hibernate Connection Pool ###
 #################################
@@ -258,7 +290,6 @@
 #hibernate.connection.provider_class org.hibernate.connection.DriverManagerConnectionProvider
 #hibernate.connection.provider_class org.hibernate.connection.DatasourceConnectionProvider
 #hibernate.connection.provider_class org.hibernate.connection.C3P0ConnectionProvider
-#hibernate.connection.provider_class org.hibernate.connection.DBCPConnectionProvider
 #hibernate.connection.provider_class org.hibernate.connection.ProxoolConnectionProvider
 
 
@@ -313,6 +344,11 @@
 #hibernate.show_sql true
 
 
+## format SQL in log and console
+
+hibernate.format_sql true
+
+
 ## add comments to the generated SQL
 
 #hibernate.use_sql_comments true
@@ -325,9 +361,10 @@
 
 ## auto schema export
 
-hibernate.hbm2ddl.auto create-drop
+#hibernate.hbm2ddl.auto create-drop
 #hibernate.hbm2ddl.auto create
 #hibernate.hbm2ddl.auto update
+#hibernate.hbm2ddl.auto validate
 
 
 ## specify a default schema and catalog for unqualified tablenames
@@ -338,7 +375,7 @@
 
 ## enable ordering of SQL UPDATEs by primary key
 
-hibernate.order_updates true
+#hibernate.order_updates true
 
 
 ## set the maximum depth of the outer join fetch tree
@@ -348,7 +385,7 @@
 
 ## set the default batch size for batch fetching
 
-hibernate.default_batch_fetch_size 8
+#hibernate.default_batch_fetch_size 8
 
 
 ## rollback generated identifier values of deleted entities to default values
@@ -356,9 +393,9 @@
 #hibernate.use_identifer_rollback true
 
 
-## enable CGLIB reflection optimizer (enabled by default)
+## enable bytecode reflection optimizer (disabled by default)
 
-#hibernate.cglib.use_reflection_optimizer false
+#hibernate.bytecode.use_reflection_optimizer true
 
 
 
@@ -384,6 +421,7 @@
 ## set the maximum JDBC 2 batch size (a nonzero value enables batching)
 
 #hibernate.jdbc.batch_size 5
+#hibernate.jdbc.batch_size 0
 
 
 ## enable batch updates even for versioned data

Modified: entitymanager/branches/v3_3_2_GA_CP/src/test/org/hibernate/ejb/test/connection/FakeDataSource.java
===================================================================
--- entitymanager/branches/v3_3_2_GA_CP/src/test/org/hibernate/ejb/test/connection/FakeDataSource.java	2009-10-14 06:19:33 UTC (rev 17741)
+++ entitymanager/branches/v3_3_2_GA_CP/src/test/org/hibernate/ejb/test/connection/FakeDataSource.java	2009-10-14 08:11:10 UTC (rev 17742)
@@ -33,4 +33,16 @@
 	public int getLoginTimeout() throws SQLException {
 		throw new FakeDataSourceException( "getLoginTimeout" );
 	}
+
+	@Override
+	public boolean isWrapperFor(Class<?> iface) throws SQLException {
+		// TODO Auto-generated method stub
+		return false;
+	}
+
+	@Override
+	public <T> T unwrap(Class<T> iface) throws SQLException {
+		// TODO Auto-generated method stub
+		return null;
+	}
 }

Modified: entitymanager/branches/v3_3_2_GA_CP/src/test/org/hibernate/ejb/test/xml/Employee.java
===================================================================
--- entitymanager/branches/v3_3_2_GA_CP/src/test/org/hibernate/ejb/test/xml/Employee.java	2009-10-14 06:19:33 UTC (rev 17741)
+++ entitymanager/branches/v3_3_2_GA_CP/src/test/org/hibernate/ejb/test/xml/Employee.java	2009-10-14 08:11:10 UTC (rev 17742)
@@ -7,7 +7,7 @@
 /**
  * @author Emmanuel Bernard
  */
- at Entity
+ at Entity(name = "EMPLOYEE_XML")
 public class Employee {
     @Id
 	Long id;

Modified: entitymanager/branches/v3_3_2_GA_CP/src/test/org/hibernate/ejb/test/xml/sequences/Employee.java
===================================================================
--- entitymanager/branches/v3_3_2_GA_CP/src/test/org/hibernate/ejb/test/xml/sequences/Employee.java	2009-10-14 06:19:33 UTC (rev 17741)
+++ entitymanager/branches/v3_3_2_GA_CP/src/test/org/hibernate/ejb/test/xml/sequences/Employee.java	2009-10-14 08:11:10 UTC (rev 17742)
@@ -7,7 +7,7 @@
 /**
  * @author Emmanuel Bernard
  */
- at Entity
+ at Entity(name = "EMPLOYEE_XML")
 public class Employee {
     @Id
 	Long id;

More information about the hibernate-commits mailing list