Hibernate SVN: r18503 - core/branches/Branch_3_3_2_GA_CP/testsuite/src/test/java/org/hibernate/test/legacy.
by hibernate-commits@lists.jboss.org
Author: stliu
Date: 2010-01-10 18:41:10 -0500 (Sun, 10 Jan 2010)
New Revision: 18503
Modified:
core/branches/Branch_3_3_2_GA_CP/testsuite/src/test/java/org/hibernate/test/legacy/CustomSQLTest.java
Log:
JBPAPP-3325 exclude mssql server, as the customer inster sql is not correct on mssql server
Modified: core/branches/Branch_3_3_2_GA_CP/testsuite/src/test/java/org/hibernate/test/legacy/CustomSQLTest.java
===================================================================
--- core/branches/Branch_3_3_2_GA_CP/testsuite/src/test/java/org/hibernate/test/legacy/CustomSQLTest.java 2010-01-10 23:09:02 UTC (rev 18502)
+++ core/branches/Branch_3_3_2_GA_CP/testsuite/src/test/java/org/hibernate/test/legacy/CustomSQLTest.java 2010-01-10 23:41:10 UTC (rev 18503)
@@ -12,6 +12,7 @@
import org.hibernate.classic.Session;
import org.hibernate.dialect.DB2Dialect;
import org.hibernate.dialect.MySQLDialect;
+import org.hibernate.dialect.SQLServerDialect;
import org.hibernate.dialect.SybaseASE15Dialect;
import org.hibernate.dialect.SybaseDialect;
@@ -37,7 +38,8 @@
if ( getDialect() instanceof MySQLDialect
|| getDialect() instanceof SybaseDialect
|| getDialect() instanceof SybaseASE15Dialect
- || getDialect() instanceof DB2Dialect)
+ || getDialect() instanceof DB2Dialect
+ || getDialect() instanceof SQLServerDialect)
return;
Role p = new Role();
14 years, 3 months
Hibernate SVN: r18502 - core/branches/Branch_3_3_2_GA_CP/testsuite/src/test/java/org/hibernate/test/legacy.
by hibernate-commits@lists.jboss.org
Author: stliu
Date: 2010-01-10 18:09:02 -0500 (Sun, 10 Jan 2010)
New Revision: 18502
Modified:
core/branches/Branch_3_3_2_GA_CP/testsuite/src/test/java/org/hibernate/test/legacy/CustomSQLTest.java
Log:
JBPAPP-3325 exclude db2, as the customer inster sql is not correct on db2
Modified: core/branches/Branch_3_3_2_GA_CP/testsuite/src/test/java/org/hibernate/test/legacy/CustomSQLTest.java
===================================================================
--- core/branches/Branch_3_3_2_GA_CP/testsuite/src/test/java/org/hibernate/test/legacy/CustomSQLTest.java 2010-01-10 22:59:41 UTC (rev 18501)
+++ core/branches/Branch_3_3_2_GA_CP/testsuite/src/test/java/org/hibernate/test/legacy/CustomSQLTest.java 2010-01-10 23:09:02 UTC (rev 18502)
@@ -10,6 +10,7 @@
import org.hibernate.HibernateException;
import org.hibernate.junit.functional.FunctionalTestClassTestSuite;
import org.hibernate.classic.Session;
+import org.hibernate.dialect.DB2Dialect;
import org.hibernate.dialect.MySQLDialect;
import org.hibernate.dialect.SybaseASE15Dialect;
import org.hibernate.dialect.SybaseDialect;
@@ -35,7 +36,8 @@
public void testInsert() throws HibernateException, SQLException {
if ( getDialect() instanceof MySQLDialect
|| getDialect() instanceof SybaseDialect
- || getDialect() instanceof SybaseASE15Dialect)
+ || getDialect() instanceof SybaseASE15Dialect
+ || getDialect() instanceof DB2Dialect)
return;
Role p = new Role();
14 years, 3 months
Hibernate SVN: r18501 - core/branches/Branch_3_3_2_GA_CP/testsuite/src/test/java/org/hibernate/test/legacy.
by hibernate-commits@lists.jboss.org
Author: stliu
Date: 2010-01-10 17:59:41 -0500 (Sun, 10 Jan 2010)
New Revision: 18501
Modified:
core/branches/Branch_3_3_2_GA_CP/testsuite/src/test/java/org/hibernate/test/legacy/CustomSQLTest.java
Log:
JBPAPP-3325 exclude sybase ase 15 dialect, as the customer sql is not correct for sybase
Modified: core/branches/Branch_3_3_2_GA_CP/testsuite/src/test/java/org/hibernate/test/legacy/CustomSQLTest.java
===================================================================
--- core/branches/Branch_3_3_2_GA_CP/testsuite/src/test/java/org/hibernate/test/legacy/CustomSQLTest.java 2010-01-10 15:18:02 UTC (rev 18500)
+++ core/branches/Branch_3_3_2_GA_CP/testsuite/src/test/java/org/hibernate/test/legacy/CustomSQLTest.java 2010-01-10 22:59:41 UTC (rev 18501)
@@ -11,6 +11,7 @@
import org.hibernate.junit.functional.FunctionalTestClassTestSuite;
import org.hibernate.classic.Session;
import org.hibernate.dialect.MySQLDialect;
+import org.hibernate.dialect.SybaseASE15Dialect;
import org.hibernate.dialect.SybaseDialect;
/**
@@ -32,7 +33,10 @@
}
public void testInsert() throws HibernateException, SQLException {
- if(getDialect() instanceof MySQLDialect || getDialect() instanceof SybaseDialect)return;
+ if ( getDialect() instanceof MySQLDialect
+ || getDialect() instanceof SybaseDialect
+ || getDialect() instanceof SybaseASE15Dialect)
+ return;
Role p = new Role();
14 years, 3 months
Hibernate SVN: r18500 - core/trunk/entitymanager/src/test/bundles/overridenpar.
by hibernate-commits@lists.jboss.org
Author: stliu
Date: 2010-01-10 10:18:02 -0500 (Sun, 10 Jan 2010)
New Revision: 18500
Added:
core/trunk/entitymanager/src/test/bundles/overridenpar/overridenpar.properties
Log:
HHH-4777 HHH-4532 org.hibernate.ejb.test.PackagedEntityManagerTest.testOverridenPar() hard code hsqldb connection info
Added: core/trunk/entitymanager/src/test/bundles/overridenpar/overridenpar.properties
===================================================================
--- core/trunk/entitymanager/src/test/bundles/overridenpar/overridenpar.properties (rev 0)
+++ core/trunk/entitymanager/src/test/bundles/overridenpar/overridenpar.properties 2010-01-10 15:18:02 UTC (rev 18500)
@@ -0,0 +1,5 @@
+hibernate.connection.driver_class ${jdbc.driver}
+hibernate.connection.url ${jdbc.url}
+hibernate.connection.username ${jdbc.user}
+hibernate.connection.password ${jdbc.pass}
+hibernate.connection.isolation ${jdbc.isolation}
\ No newline at end of file
14 years, 3 months
Hibernate SVN: r18499 - in core/trunk/entitymanager/src/test: bundles/defaultpar/META-INF and 11 other directories.
by hibernate-commits@lists.jboss.org
Author: stliu
Date: 2010-01-10 10:16:34 -0500 (Sun, 10 Jan 2010)
New Revision: 18499
Modified:
core/trunk/entitymanager/src/test/bundles/cfgxmlpar/org/hibernate/ejb/test/pack/cfgxmlpar/hibernate.cfg.xml
core/trunk/entitymanager/src/test/bundles/defaultpar/META-INF/persistence.xml
core/trunk/entitymanager/src/test/bundles/defaultpar_1_0/META-INF/persistence.xml
core/trunk/entitymanager/src/test/bundles/excludehbmpar/META-INF/persistence.xml
core/trunk/entitymanager/src/test/bundles/explicitpar/META-INF/orm.xml
core/trunk/entitymanager/src/test/bundles/explicitpar/META-INF/persistence.xml
core/trunk/entitymanager/src/test/bundles/explodedpar/META-INF/persistence.xml
core/trunk/entitymanager/src/test/bundles/overridenpar/META-INF/persistence.xml
core/trunk/entitymanager/src/test/bundles/space par/META-INF/persistence.xml
core/trunk/entitymanager/src/test/bundles/war/WEB-INF/classes/META-INF/persistence.xml
core/trunk/entitymanager/src/test/java/org/hibernate/ejb/test/PackagedEntityManagerTest.java
core/trunk/entitymanager/src/test/java/org/hibernate/ejb/test/pack/overridenpar/Bug.java
core/trunk/entitymanager/src/test/java/org/hibernate/ejb/test/pack/spacepar/Bug.java
Log:
HHH-4777 HHH-4532 org.hibernate.ejb.test.PackagedEntityManagerTest.testOverridenPar() hard code hsqldb connection info
Modified: core/trunk/entitymanager/src/test/bundles/cfgxmlpar/org/hibernate/ejb/test/pack/cfgxmlpar/hibernate.cfg.xml
===================================================================
--- core/trunk/entitymanager/src/test/bundles/cfgxmlpar/org/hibernate/ejb/test/pack/cfgxmlpar/hibernate.cfg.xml 2010-01-10 14:58:15 UTC (rev 18498)
+++ core/trunk/entitymanager/src/test/bundles/cfgxmlpar/org/hibernate/ejb/test/pack/cfgxmlpar/hibernate.cfg.xml 2010-01-10 15:16:34 UTC (rev 18499)
@@ -9,6 +9,7 @@
<property name="hibernate.connection.username">${jdbc.user}</property>
<property name="hibernate.connection.password">${jdbc.pass}</property>
<property name="hibernate.connection.url">${jdbc.url}</property>
+ <property name="hibernate.connection.isolation">${jdbc.isolation}</property>
<property name="hibernate.cache.use_query_cache">true</property>
<property name="hibernate.cache.region_prefix">hibernate.test</property>
<property name="hibernate.jdbc.use_streams_for_binary">true</property>
Modified: core/trunk/entitymanager/src/test/bundles/defaultpar/META-INF/persistence.xml
===================================================================
--- core/trunk/entitymanager/src/test/bundles/defaultpar/META-INF/persistence.xml 2010-01-10 14:58:15 UTC (rev 18498)
+++ core/trunk/entitymanager/src/test/bundles/defaultpar/META-INF/persistence.xml 2010-01-10 15:16:34 UTC (rev 18499)
@@ -13,6 +13,7 @@
<property name="hibernate.connection.username" value="${jdbc.user}"/>
<property name="hibernate.connection.password" value="${jdbc.pass}"/>
<property name="hibernate.connection.url" value="${jdbc.url}"/>
+ <property name="hibernate.connection.isolation" value="${jdbc.isolation}"/>
<property name="hibernate.hbm2ddl.auto" value="create-drop"/>
<property name="hibernate.cache.provider_class" value="org.hibernate.cache.HashtableCacheProvider"/>
</properties>
Modified: core/trunk/entitymanager/src/test/bundles/defaultpar_1_0/META-INF/persistence.xml
===================================================================
--- core/trunk/entitymanager/src/test/bundles/defaultpar_1_0/META-INF/persistence.xml 2010-01-10 14:58:15 UTC (rev 18498)
+++ core/trunk/entitymanager/src/test/bundles/defaultpar_1_0/META-INF/persistence.xml 2010-01-10 15:16:34 UTC (rev 18499)
@@ -12,6 +12,7 @@
<property name="hibernate.connection.username" value="${jdbc.user}"/>
<property name="hibernate.connection.password" value="${jdbc.pass}"/>
<property name="hibernate.connection.url" value="${jdbc.url}"/>
+ <property name="hibernate.connection.isolation" value="${jdbc.isolation}"/>
<property name="hibernate.hbm2ddl.auto" value="create-drop"/>
<property name="hibernate.cache.provider_class" value="org.hibernate.cache.HashtableCacheProvider"/>
</properties>
Modified: core/trunk/entitymanager/src/test/bundles/excludehbmpar/META-INF/persistence.xml
===================================================================
--- core/trunk/entitymanager/src/test/bundles/excludehbmpar/META-INF/persistence.xml 2010-01-10 14:58:15 UTC (rev 18498)
+++ core/trunk/entitymanager/src/test/bundles/excludehbmpar/META-INF/persistence.xml 2010-01-10 15:16:34 UTC (rev 18499)
@@ -12,6 +12,7 @@
<property name="hibernate.connection.username" value="${jdbc.user}"/>
<property name="hibernate.connection.password" value="${jdbc.pass}"/>
<property name="hibernate.connection.url" value="${jdbc.url}"/>
+ <property name="hibernate.connection.isolation" value="${jdbc.isolation}"/>
<property name="hibernate.hbm2ddl.auto" value="create-drop"/>
<property name="hibernate.cache.provider_class" value="org.hibernate.cache.HashtableCacheProvider"/>
<property name="hibernate.archive.autodetection" value="class"/>
Modified: core/trunk/entitymanager/src/test/bundles/explicitpar/META-INF/orm.xml
===================================================================
--- core/trunk/entitymanager/src/test/bundles/explicitpar/META-INF/orm.xml 2010-01-10 14:58:15 UTC (rev 18498)
+++ core/trunk/entitymanager/src/test/bundles/explicitpar/META-INF/orm.xml 2010-01-10 15:16:34 UTC (rev 18499)
@@ -8,7 +8,9 @@
<package>org.hibernate.ejb.test.pack.various</package>
<entity class="Seat" access="PROPERTY" metadata-complete="true">
<attributes>
- <id name="number"/>
+ <id name="number">
+ <column name="`number`" />
+ </id>
</attributes>
</entity>
</entity-mappings>
\ No newline at end of file
Modified: core/trunk/entitymanager/src/test/bundles/explicitpar/META-INF/persistence.xml
===================================================================
--- core/trunk/entitymanager/src/test/bundles/explicitpar/META-INF/persistence.xml 2010-01-10 14:58:15 UTC (rev 18498)
+++ core/trunk/entitymanager/src/test/bundles/explicitpar/META-INF/persistence.xml 2010-01-10 15:16:34 UTC (rev 18499)
@@ -17,6 +17,7 @@
<property name="hibernate.connection.username" value="${jdbc.user}"/>
<property name="hibernate.connection.password" value="${jdbc.pass}"/>
<property name="hibernate.connection.url" value="${jdbc.url}"/>
+ <property name="hibernate.connection.isolation" value="${jdbc.isolation}"/>
<property name="hibernate.cache.use_query_cache" value="true"/>
<property name="hibernate.cache.region_prefix" value="hibernate.test"/>
<property name="hibernate.jdbc.use_streams_for_binary" value="true"/>
Modified: core/trunk/entitymanager/src/test/bundles/explodedpar/META-INF/persistence.xml
===================================================================
--- core/trunk/entitymanager/src/test/bundles/explodedpar/META-INF/persistence.xml 2010-01-10 14:58:15 UTC (rev 18498)
+++ core/trunk/entitymanager/src/test/bundles/explodedpar/META-INF/persistence.xml 2010-01-10 15:16:34 UTC (rev 18499)
@@ -12,6 +12,7 @@
<property name="hibernate.connection.username" value="${jdbc.user}"/>
<property name="hibernate.connection.password" value="${jdbc.pass}"/>
<property name="hibernate.connection.url" value="${jdbc.url}"/>
+ <property name="hibernate.connection.isolation" value="${jdbc.isolation}"/>
<property name="hibernate.hbm2ddl.auto" value="create-drop"/>
<property name="hibernate.cache.provider_class" value="org.hibernate.cache.HashtableCacheProvider"/>
</properties>
Modified: core/trunk/entitymanager/src/test/bundles/overridenpar/META-INF/persistence.xml
===================================================================
--- core/trunk/entitymanager/src/test/bundles/overridenpar/META-INF/persistence.xml 2010-01-10 14:58:15 UTC (rev 18498)
+++ core/trunk/entitymanager/src/test/bundles/overridenpar/META-INF/persistence.xml 2010-01-10 15:16:34 UTC (rev 18499)
@@ -6,7 +6,7 @@
<persistence-unit name="overridenpar">
<jta-data-source>java:/unreachableDS</jta-data-source>
<properties>
- <property name="hibernate.dialect" value="org.hibernate.dialect.HSQLDialect"/>
+ <property name="hibernate.dialect" value="${db.dialect}"/>
<property name="hibernate.hbm2ddl.auto" value="create-drop"/>
<property name="hibernate.cache.provider_class" value="org.hibernate.cache.HashtableCacheProvider"/>
</properties>
Modified: core/trunk/entitymanager/src/test/bundles/space par/META-INF/persistence.xml
===================================================================
--- core/trunk/entitymanager/src/test/bundles/space par/META-INF/persistence.xml 2010-01-10 14:58:15 UTC (rev 18498)
+++ core/trunk/entitymanager/src/test/bundles/space par/META-INF/persistence.xml 2010-01-10 15:16:34 UTC (rev 18499)
@@ -11,6 +11,7 @@
<property name="hibernate.connection.username" value="${jdbc.user}"/>
<property name="hibernate.connection.password" value="${jdbc.pass}"/>
<property name="hibernate.connection.url" value="${jdbc.url}"/>
+ <property name="hibernate.connection.isolation" value="${jdbc.isolation}"/>
<property name="hibernate.hbm2ddl.auto" value="create-drop"/>
<property name="hibernate.cache.provider_class" value="org.hibernate.cache.HashtableCacheProvider"/>
</properties>
Modified: core/trunk/entitymanager/src/test/bundles/war/WEB-INF/classes/META-INF/persistence.xml
===================================================================
--- core/trunk/entitymanager/src/test/bundles/war/WEB-INF/classes/META-INF/persistence.xml 2010-01-10 14:58:15 UTC (rev 18498)
+++ core/trunk/entitymanager/src/test/bundles/war/WEB-INF/classes/META-INF/persistence.xml 2010-01-10 15:16:34 UTC (rev 18499)
@@ -12,6 +12,7 @@
<property name="hibernate.connection.username" value="${jdbc.user}"/>
<property name="hibernate.connection.password" value="${jdbc.pass}"/>
<property name="hibernate.connection.url" value="${jdbc.url}"/>
+ <property name="hibernate.connection.isolation" value="${jdbc.isolation}"/>
<property name="hibernate.hbm2ddl.auto" value="create-drop"/>
<property name="hibernate.cache.provider_class" value="org.hibernate.cache.HashtableCacheProvider"/>
</properties>
Modified: core/trunk/entitymanager/src/test/java/org/hibernate/ejb/test/PackagedEntityManagerTest.java
===================================================================
--- core/trunk/entitymanager/src/test/java/org/hibernate/ejb/test/PackagedEntityManagerTest.java 2010-01-10 14:58:15 UTC (rev 18498)
+++ core/trunk/entitymanager/src/test/java/org/hibernate/ejb/test/PackagedEntityManagerTest.java 2010-01-10 15:16:34 UTC (rev 18499)
@@ -3,6 +3,8 @@
import java.util.HashMap;
import java.util.HashSet;
+import java.util.Properties;
+
import javax.persistence.EntityManager;
import javax.persistence.EntityManagerFactory;
import javax.persistence.Persistence;
@@ -32,6 +34,7 @@
import org.hibernate.engine.SessionImplementor;
import org.hibernate.event.EventListeners;
import org.hibernate.stat.Statistics;
+import org.hibernate.util.ConfigHelper;
/**
* @author Gavin King
@@ -230,10 +233,9 @@
public void testOverridenPar() throws Exception {
HashMap properties = new HashMap();
properties.put( HibernatePersistence.JTA_DATASOURCE, null );
- properties.put( "hibernate.connection.driver_class", "org.hsqldb.jdbcDriver" );
- properties.put( "hibernate.connection.username", "sa" );
- properties.put( "hibernate.connection.password", "" );
- properties.put( "hibernate.connection.url", "jdbc:hsqldb:." );
+ Properties p=new Properties();
+ p.load( ConfigHelper.getResourceAsStream( "/overridenpar.properties" ) );
+ properties.putAll( p );
EntityManagerFactory emf = Persistence.createEntityManagerFactory( "overridenpar", properties );
EntityManager em = emf.createEntityManager();
org.hibernate.ejb.test.pack.overridenpar.Bug bug = new org.hibernate.ejb.test.pack.overridenpar.Bug();
Modified: core/trunk/entitymanager/src/test/java/org/hibernate/ejb/test/pack/overridenpar/Bug.java
===================================================================
--- core/trunk/entitymanager/src/test/java/org/hibernate/ejb/test/pack/overridenpar/Bug.java 2010-01-10 14:58:15 UTC (rev 18498)
+++ core/trunk/entitymanager/src/test/java/org/hibernate/ejb/test/pack/overridenpar/Bug.java 2010-01-10 15:16:34 UTC (rev 18499)
@@ -1,6 +1,7 @@
//$Id$
package org.hibernate.ejb.test.pack.overridenpar;
+import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Id;
import javax.persistence.GeneratedValue;
@@ -14,6 +15,7 @@
@GeneratedValue
private Long id;
private String subject;
+ @Column(name="`comment`")
private String comment;
public Long getId() {
Modified: core/trunk/entitymanager/src/test/java/org/hibernate/ejb/test/pack/spacepar/Bug.java
===================================================================
--- core/trunk/entitymanager/src/test/java/org/hibernate/ejb/test/pack/spacepar/Bug.java 2010-01-10 14:58:15 UTC (rev 18498)
+++ core/trunk/entitymanager/src/test/java/org/hibernate/ejb/test/pack/spacepar/Bug.java 2010-01-10 15:16:34 UTC (rev 18499)
@@ -1,6 +1,7 @@
//$Id$
package org.hibernate.ejb.test.pack.spacepar;
+import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Id;
import javax.persistence.GeneratedValue;
@@ -14,6 +15,7 @@
@GeneratedValue
private Long id;
private String subject;
+ @Column(name="`comment`")
private String comment;
public Long getId() {
14 years, 3 months
Hibernate SVN: r18498 - in entitymanager/branches/v3_4_0_GA_CP/src/test: bundles/space and 3 other directories.
by hibernate-commits@lists.jboss.org
Author: stliu
Date: 2010-01-10 09:58:15 -0500 (Sun, 10 Jan 2010)
New Revision: 18498
Modified:
entitymanager/branches/v3_4_0_GA_CP/src/test/bundles/explicitpar/META-INF/orm.xml
entitymanager/branches/v3_4_0_GA_CP/src/test/bundles/space par/META-INF/persistence.xml
entitymanager/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/ejb/test/pack/overridenpar/Bug.java
entitymanager/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/ejb/test/pack/spacepar/Bug.java
Log:
JBPAPP-3377 HHH-4523 some EM test doesn't be tested on other DBs
Modified: entitymanager/branches/v3_4_0_GA_CP/src/test/bundles/explicitpar/META-INF/orm.xml
===================================================================
--- entitymanager/branches/v3_4_0_GA_CP/src/test/bundles/explicitpar/META-INF/orm.xml 2010-01-10 13:45:23 UTC (rev 18497)
+++ entitymanager/branches/v3_4_0_GA_CP/src/test/bundles/explicitpar/META-INF/orm.xml 2010-01-10 14:58:15 UTC (rev 18498)
@@ -8,7 +8,9 @@
<package>org.hibernate.ejb.test.pack.various</package>
<entity class="Seat" access="PROPERTY" metadata-complete="true">
<attributes>
- <id name="number"/>
+ <id name="number">
+ <column name="`number`"/>
+ </id>
</attributes>
</entity>
</entity-mappings>
\ No newline at end of file
Modified: entitymanager/branches/v3_4_0_GA_CP/src/test/bundles/space par/META-INF/persistence.xml
===================================================================
--- entitymanager/branches/v3_4_0_GA_CP/src/test/bundles/space par/META-INF/persistence.xml 2010-01-10 13:45:23 UTC (rev 18497)
+++ entitymanager/branches/v3_4_0_GA_CP/src/test/bundles/space par/META-INF/persistence.xml 2010-01-10 14:58:15 UTC (rev 18498)
@@ -6,11 +6,12 @@
version="1.0">
<persistence-unit name="space par">
<properties>
- <property name="hibernate.dialect" value="org.hibernate.dialect.HSQLDialect"/>
- <property name="hibernate.connection.driver_class" value="org.hsqldb.jdbcDriver"/>
- <property name="hibernate.connection.username" value="sa"/>
- <property name="hibernate.connection.password" value=""/>
- <property name="hibernate.connection.url" value="jdbc:hsqldb:."/>
+ <property name="hibernate.dialect" value="${db.dialect}"/>
+ <property name="hibernate.connection.driver_class" value="${jdbc.driver}"/>
+ <property name="hibernate.connection.username" value="${jdbc.user}"/>
+ <property name="hibernate.connection.password" value="${jdbc.pass}"/>
+ <property name="hibernate.connection.url" value="${jdbc.url}"/>
+ <property name="hibernate.connection.isolation" value="${jdbc.isolation}"/>
<property name="hibernate.hbm2ddl.auto" value="create-drop"/>
<property name="hibernate.cache.provider_class" value="org.hibernate.cache.HashtableCacheProvider"/>
</properties>
Modified: entitymanager/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/ejb/test/pack/overridenpar/Bug.java
===================================================================
--- entitymanager/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/ejb/test/pack/overridenpar/Bug.java 2010-01-10 13:45:23 UTC (rev 18497)
+++ entitymanager/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/ejb/test/pack/overridenpar/Bug.java 2010-01-10 14:58:15 UTC (rev 18498)
@@ -1,6 +1,7 @@
//$Id: $
package org.hibernate.ejb.test.pack.overridenpar;
+import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Id;
import javax.persistence.GeneratedValue;
@@ -14,6 +15,7 @@
@GeneratedValue
private Long id;
private String subject;
+ @Column(name="`comment`")
private String comment;
public Long getId() {
Modified: entitymanager/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/ejb/test/pack/spacepar/Bug.java
===================================================================
--- entitymanager/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/ejb/test/pack/spacepar/Bug.java 2010-01-10 13:45:23 UTC (rev 18497)
+++ entitymanager/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/ejb/test/pack/spacepar/Bug.java 2010-01-10 14:58:15 UTC (rev 18498)
@@ -1,6 +1,7 @@
//$Id: $
package org.hibernate.ejb.test.pack.spacepar;
+import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Id;
import javax.persistence.GeneratedValue;
@@ -14,6 +15,7 @@
@GeneratedValue
private Long id;
private String subject;
+ @Column(name="`comment`")
private String comment;
public Long getId() {
14 years, 3 months
Hibernate SVN: r18497 - in entitymanager/branches/v3_4_0_GA_CP/src/test: java/org/hibernate/ejb/test and 1 other directory.
by hibernate-commits@lists.jboss.org
Author: stliu
Date: 2010-01-10 08:45:23 -0500 (Sun, 10 Jan 2010)
New Revision: 18497
Added:
entitymanager/branches/v3_4_0_GA_CP/src/test/bundles/overridenpar/overridenpar.properties
Modified:
entitymanager/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/ejb/test/PackagedEntityManagerTest.java
Log:
JBPAPP-3377 HHH-4523 some EM test doesn't be tested on other DBs
Added: entitymanager/branches/v3_4_0_GA_CP/src/test/bundles/overridenpar/overridenpar.properties
===================================================================
--- entitymanager/branches/v3_4_0_GA_CP/src/test/bundles/overridenpar/overridenpar.properties (rev 0)
+++ entitymanager/branches/v3_4_0_GA_CP/src/test/bundles/overridenpar/overridenpar.properties 2010-01-10 13:45:23 UTC (rev 18497)
@@ -0,0 +1,5 @@
+hibernate.connection.driver_class ${jdbc.driver}
+hibernate.connection.url ${jdbc.url}
+hibernate.connection.username ${jdbc.user}
+hibernate.connection.password ${jdbc.pass}
+hibernate.connection.isolation ${jdbc.isolation}
\ No newline at end of file
Modified: entitymanager/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/ejb/test/PackagedEntityManagerTest.java
===================================================================
--- entitymanager/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/ejb/test/PackagedEntityManagerTest.java 2010-01-09 23:50:55 UTC (rev 18496)
+++ entitymanager/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/ejb/test/PackagedEntityManagerTest.java 2010-01-10 13:45:23 UTC (rev 18497)
@@ -2,6 +2,8 @@
import java.util.HashMap;
import java.util.HashSet;
+import java.util.Properties;
+
import javax.persistence.EntityManager;
import javax.persistence.EntityManagerFactory;
import javax.persistence.Persistence;
@@ -27,6 +29,7 @@
import org.hibernate.engine.SessionImplementor;
import org.hibernate.event.EventListeners;
import org.hibernate.stat.Statistics;
+import org.hibernate.util.ConfigHelper;
//$Id$
@@ -197,10 +200,9 @@
public void testOverridenPar() throws Exception {
HashMap properties = new HashMap();
properties.put( HibernatePersistence.JTA_DATASOURCE, null );
- properties.put( "hibernate.connection.driver_class", "org.hsqldb.jdbcDriver" );
- properties.put( "hibernate.connection.username", "sa" );
- properties.put( "hibernate.connection.password", "" );
- properties.put( "hibernate.connection.url", "jdbc:hsqldb:." );
+ Properties p=new Properties();
+ p.load( ConfigHelper.getResourceAsStream( "/overridenpar.properties" ) );
+ properties.putAll( p );
EntityManagerFactory emf = Persistence.createEntityManagerFactory( "overridenpar", properties );
EntityManager em = emf.createEntityManager();
org.hibernate.ejb.test.pack.overridenpar.Bug bug = new org.hibernate.ejb.test.pack.overridenpar.Bug();
14 years, 3 months
Hibernate SVN: r18496 - in search/branches/Branch_3_1/src/test/java/org/hibernate/search/test: engine and 2 other directories.
by hibernate-commits@lists.jboss.org
Author: sannegrinovero
Date: 2010-01-09 18:50:55 -0500 (Sat, 09 Jan 2010)
New Revision: 18496
Modified:
search/branches/Branch_3_1/src/test/java/org/hibernate/search/test/embedded/Product.java
search/branches/Branch_3_1/src/test/java/org/hibernate/search/test/engine/LazyCollectionsUpdatingTest.java
search/branches/Branch_3_1/src/test/java/org/hibernate/search/test/jms/master/JMSMasterTest.java
search/branches/Branch_3_1/src/test/java/org/hibernate/search/test/jms/master/TShirt.java
search/branches/Branch_3_1/src/test/java/org/hibernate/search/test/jms/slave/TShirt.java
Log:
HSEARCH-439 merge fixes from JBAPP (v3_1_1_GA_CP) branch to Branch_3_1 branch
Modified: search/branches/Branch_3_1/src/test/java/org/hibernate/search/test/embedded/Product.java
===================================================================
--- search/branches/Branch_3_1/src/test/java/org/hibernate/search/test/embedded/Product.java 2010-01-09 23:30:42 UTC (rev 18495)
+++ search/branches/Branch_3_1/src/test/java/org/hibernate/search/test/embedded/Product.java 2010-01-09 23:50:55 UTC (rev 18496)
@@ -33,7 +33,7 @@
@IndexedEmbedded
private Set<Author> authors = new HashSet<Author>();
@ManyToMany(cascade = CascadeType.REMOVE) //just to make the test easier, cascade doesn't really make any business sense
- @MapKey(columns = @Column(name="CUST_NAME") )
+ @MapKey(columns = @Column(name="CUST_NAME",nullable=false) )
@IndexedEmbedded
private Map<String, Order> orders = new HashMap<String, Order>();
Modified: search/branches/Branch_3_1/src/test/java/org/hibernate/search/test/engine/LazyCollectionsUpdatingTest.java
===================================================================
--- search/branches/Branch_3_1/src/test/java/org/hibernate/search/test/engine/LazyCollectionsUpdatingTest.java 2010-01-09 23:30:42 UTC (rev 18495)
+++ search/branches/Branch_3_1/src/test/java/org/hibernate/search/test/engine/LazyCollectionsUpdatingTest.java 2010-01-09 23:50:55 UTC (rev 18496)
@@ -28,7 +28,10 @@
FullTextSession fullTextSession = Search.getFullTextSession( sessions.openSession() );
try {
Transaction tx = fullTextSession.beginTransaction();
- BusStop busStop = (BusStop) fullTextSession.get( BusStop.class, 1L );
+ List list = fullTextSession.createCriteria( BusStop.class ).list();
+ assertNotNull( list );
+ assertEquals( 4 , list.size() );
+ BusStop busStop = (BusStop) list.get( 1 );
busStop.setRoadName( "new road" );
tx.commit();
}
@@ -45,7 +48,10 @@
assertFindsByRoadName( "buonarroti" );
FullTextSession fullTextSession = Search.getFullTextSession( sessions.openSession() );
try {
- BusStop busStop = (BusStop) fullTextSession.get( BusStop.class, 1L );
+ List list = fullTextSession.createCriteria( BusStop.class ).list();
+ assertNotNull( list );
+ assertEquals( 4 , list.size() );
+ BusStop busStop = (BusStop) list.get( 1 );
busStop.setRoadName( "new road" );
fullTextSession.flush();
}
Modified: search/branches/Branch_3_1/src/test/java/org/hibernate/search/test/jms/master/JMSMasterTest.java
===================================================================
--- search/branches/Branch_3_1/src/test/java/org/hibernate/search/test/jms/master/JMSMasterTest.java 2010-01-09 23:30:42 UTC (rev 18495)
+++ search/branches/Branch_3_1/src/test/java/org/hibernate/search/test/jms/master/JMSMasterTest.java 2010-01-09 23:50:55 UTC (rev 18496)
@@ -33,7 +33,7 @@
import org.hibernate.search.test.SearchTestCase;
/**
- * Tests that the Master node in a JMS cluster can propertly process messages placed onto the queue.
+ * Tests that the Master node in a JMS cluster can properly process messages placed onto the queue.
*
* @author Emmanuel Bernard
* @author Hardy Ferentschik
@@ -135,18 +135,18 @@
}
/**
- * Create a test object without trigggering indexing. Use SQL directly.
+ * Create a test object without triggering indexing. Use SQL directly.
*
* @return a <code>TShirt</code> test object.
*
- * @throws SQLException in case the inset fails.
+ * @throws SQLException in case the insert fails.
*/
private TShirt createObjectWithSQL() throws SQLException {
Session s = openSession();
s.getTransaction().begin();
Statement statement = s.connection().createStatement();
statement.executeUpdate(
- "insert into TShirt_Master(id, logo, size) values( '1', 'JBoss balls', 'large')"
+ "insert into TShirt_Master(id, logo, size_) values( 1, 'JBoss balls', 'large')"
);
statement.close();
TShirt ts = ( TShirt ) s.get( TShirt.class, 1 );
Modified: search/branches/Branch_3_1/src/test/java/org/hibernate/search/test/jms/master/TShirt.java
===================================================================
--- search/branches/Branch_3_1/src/test/java/org/hibernate/search/test/jms/master/TShirt.java 2010-01-09 23:30:42 UTC (rev 18495)
+++ search/branches/Branch_3_1/src/test/java/org/hibernate/search/test/jms/master/TShirt.java 2010-01-09 23:50:55 UTC (rev 18496)
@@ -1,6 +1,7 @@
//$Id$
package org.hibernate.search.test.jms.master;
+import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Id;
import javax.persistence.Table;
@@ -22,6 +23,7 @@
private int id;
@Field(index= Index.TOKENIZED)
private String logo;
+ @Column(name="size_")
private String size;
public int getId() {
Modified: search/branches/Branch_3_1/src/test/java/org/hibernate/search/test/jms/slave/TShirt.java
===================================================================
--- search/branches/Branch_3_1/src/test/java/org/hibernate/search/test/jms/slave/TShirt.java 2010-01-09 23:30:42 UTC (rev 18495)
+++ search/branches/Branch_3_1/src/test/java/org/hibernate/search/test/jms/slave/TShirt.java 2010-01-09 23:50:55 UTC (rev 18496)
@@ -1,6 +1,7 @@
//$Id$
package org.hibernate.search.test.jms.slave;
+import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Id;
import javax.persistence.GeneratedValue;
@@ -22,6 +23,7 @@
private int id;
@Field(index= Index.TOKENIZED)
private String logo;
+ @Column(name="size_")
private String size;
public int getId() {
14 years, 3 months
Hibernate SVN: r18495 - search/trunk.
by hibernate-commits@lists.jboss.org
Author: sannegrinovero
Date: 2010-01-09 18:30:42 -0500 (Sat, 09 Jan 2010)
New Revision: 18495
Modified:
search/trunk/pom.xml
Log:
declaring project resources as UTF-8 encoding in pom.xml
Modified: search/trunk/pom.xml
===================================================================
--- search/trunk/pom.xml 2010-01-09 23:27:21 UTC (rev 18494)
+++ search/trunk/pom.xml 2010-01-09 23:30:42 UTC (rev 18495)
@@ -118,6 +118,7 @@
<luceneVersion>2.4.1</luceneVersion>
<hibernateVersion>3.5.0-SNAPSHOT</hibernateVersion>
<hibernateCommonsAnnotationVersion>3.2.0.Beta1</hibernateCommonsAnnotationVersion>
+ <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
</properties>
<dependencies>
14 years, 3 months
Hibernate SVN: r18494 - search/trunk.
by hibernate-commits@lists.jboss.org
Author: sannegrinovero
Date: 2010-01-09 18:27:21 -0500 (Sat, 09 Jan 2010)
New Revision: 18494
Modified:
search/trunk/pom.xml
Log:
HSEARCH-439 : merging selected pom improvements from branch v3_1_1_GA_CP
Modified: search/trunk/pom.xml
===================================================================
--- search/trunk/pom.xml 2010-01-09 23:11:33 UTC (rev 18493)
+++ search/trunk/pom.xml 2010-01-09 23:27:21 UTC (rev 18494)
@@ -1,60 +1,118 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
- <modelVersion>4.0.0</modelVersion>
- <groupId>org.hibernate</groupId>
- <artifactId>hibernate-search</artifactId>
- <version>3.2.0.Beta2-SNAPSHOT</version>
- <name>Hibernate Search</name>
- <description>Hibernate Search</description>
- <url>http://search.hibernate.org</url>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ * Hibernate, Relational Persistence for Idiomatic Java
+ *
+ * Copyright (c) 2009, Red Hat, Inc. and/or its affiliates or third-party contributors as
+ * indicated by the @author tags or express copyright attribution
+ * statements applied by the authors. All third-party contributions are
+ * distributed under license by Red Hat, Inc.
+ *
+ * This copyrighted material is made available to anyone wishing to use, modify,
+ * copy, or redistribute it subject to the terms and conditions of the GNU
+ * Lesser General Public License, as published by the Free Software Foundation.
+ *
+ * This program 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 distribution; if not, write to:
+ * Free Software Foundation, Inc.
+ * 51 Franklin Street, Fifth Floor
+ * Boston, MA 02110-1301 USA
+ -->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>org.hibernate</groupId>
+ <artifactId>hibernate-search</artifactId>
+ <version>3.2.0.Beta2-SNAPSHOT</version>
+ <name>Hibernate Search</name>
+ <description>Hibernate Search</description>
+ <url>http://search.hibernate.org</url>
- <issueManagement>
- <system>JIRA</system>
- <url>http://opensource.atlassian.com/projects/hibernate/browse/HSEARCH</url>
- </issueManagement>
- <scm>
- <connection>scm:svn:http://anonsvn.jboss.org/repos/hibernate/search/trunk</connection>
- <developerConnection>scm:svn:https://svn.jboss.org/repos/hibernate/search/trunk</developerConnection>
- <url>http://fisheye.jboss.com/browse/Hibernate/search/trunk</url>
- </scm>
+ <issueManagement>
+ <system>JIRA</system>
+ <url>http://opensource.atlassian.com/projects/hibernate/browse/HSEARCH</url>
+ </issueManagement>
+ <scm>
+ <connection>scm:svn:http://anonsvn.jboss.org/repos/hibernate/search/trunk</connection>
+ <developerConnection>scm:svn:https://svn.jboss.org/repos/hibernate/search/trunk</developerConnection>
+ <url>http://fisheye.jboss.com/browse/Hibernate/search/trunk</url>
+ </scm>
- <organization>
- <name>Hibernate</name>
- <url>http://www.hibernate.org</url>
- </organization>
+ <organization>
+ <name>Hibernate</name>
+ <url>http://www.hibernate.org</url>
+ </organization>
- <licenses>
- <license>
- <name>LGPL</name>
- <url>lgpl.txt</url>
- </license>
- </licenses>
+ <licenses>
+ <license>
+ <name>GNU Lesser General Public License</name>
+ <url>http://www.gnu.org/licenses/lgpl-2.1.html</url>
+ <comments>See discussion at http://hibernate.org/356.html for more details.</comments>
+ </license>
+ </licenses>
- <ciManagement>
- <system>Hudson</system>
- <url>http://hudson.jboss.org/hudson/view/hibernate/job/hibernate-search-trunk/</url>
- </ciManagement>
- <inceptionYear>2006</inceptionYear>
- <developers>
- <developer>
- <id>epbernard</id>
- <name>Emmanuel Bernard</name>
- <email>emmanuel(a)hibernate.org</email>
- <url>http://in.relation.to/Bloggers/Emmanuel</url>
- </developer>
- <developer>
- <id>hardy.ferentschik</id>
- <name>Hardy Ferentschik</name>
- <url>http://in.relation.to/Bloggers/Hardy</url>
- </developer>
- <developer>
- <id>sannegrinovero</id>
- <name>Sanne Grinovero</name>
- <url>http://in.relation.to/Bloggers/Sanne</url>
- </developer>
- </developers>
- <contributors>
- </contributors>
+ <ciManagement>
+ <system>Hudson</system>
+ <url>http://hudson.jboss.org/hudson/view/hibernate/job/hibernate-search-trunk/</url>
+ </ciManagement>
+ <inceptionYear>2006</inceptionYear>
+ <developers>
+ <developer>
+ <id>epbernard</id>
+ <name>Emmanuel Bernard</name>
+ <email>emmanuel(a)hibernate.org</email>
+ <url>http://in.relation.to/Bloggers/Emmanuel</url>
+ </developer>
+ <developer>
+ <id>hardy.ferentschik</id>
+ <name>Hardy Ferentschik</name>
+ <url>http://in.relation.to/Bloggers/Hardy</url>
+ </developer>
+ <developer>
+ <id>sannegrinovero</id>
+ <name>Sanne Grinovero</name>
+ <url>http://in.relation.to/Bloggers/Sanne</url>
+ </developer>
+ </developers>
+ <mailingLists>
+ <mailingList>
+ <name>Hibernate Announcements</name>
+ <post>hibernate-announce(a)lists.jboss.org</post>
+ <subscribe>https://lists.jboss.org/mailman/listinfo/hibernate-announce</subscribe>
+ <unsubscribe>https://lists.jboss.org/mailman/listinfo/hibernate-announce</unsubscribe>
+ <archive>http://lists.jboss.org/pipermail/hibernate-dev/</archive>
+ </mailingList>
+ <mailingList>
+ <name>Hibernate Commit Notificatons</name>
+ <post>hibernate-commits(a)lists.jboss.org</post>
+ <subscribe>https://lists.jboss.org/mailman/listinfo/hibernate-commits</subscribe>
+ <unsubscribe>https://lists.jboss.org/mailman/listinfo/hibernate-commits</unsubscribe>
+ <archive>http://lists.jboss.org/pipermail/hibernate-commits/</archive>
+ </mailingList>
+ <mailingList>
+ <name>Hibernate Developers</name>
+ <post>hibernate-dev(a)lists.jboss.org</post>
+ <subscribe>https://lists.jboss.org/mailman/listinfo/hibernate-dev</subscribe>
+ <unsubscribe>https://lists.jboss.org/mailman/listinfo/hibernate-dev</unsubscribe>
+ <archive>http://lists.jboss.org/pipermail/hibernate-dev/</archive>
+ <otherArchives>
+ <otherArchive>http://www.mail-archive.com/hibernate-dev%40lists.jboss.org/index.html</otherArchive>
+ </otherArchives>
+ </mailingList>
+ <mailingList>
+ <name>Hibernate Issue Notifications</name>
+ <post>hibernate-issues(a)lists.jboss.org</post>
+ <subscribe>https://lists.jboss.org/mailman/listinfo/hibernate-issues</subscribe>
+ <unsubscribe>https://lists.jboss.org/mailman/listinfo/hibernate-issues</unsubscribe>
+ <archive>http://lists.jboss.org/pipermail/hibernate-issues/</archive>
+ </mailingList>
+ </mailingLists>
+
<properties>
<slf4jVersion>1.5.8</slf4jVersion>
<luceneVersion>2.4.1</luceneVersion>
14 years, 3 months