Hibernate SVN: r19199 - search/trunk/hibernate-search/src/test/java/org/hibernate/search/test/bridge.
by hibernate-commits＠lists.jboss.org
Author: stliu
Date: 2010-04-09 05:50:30 -0400 (Fri, 09 Apr 2010)
New Revision: 19199
Modified:
search/trunk/hibernate-search/src/test/java/org/hibernate/search/test/bridge/BridgeTest.java
Log:
HSEARCH-496 Some hudson configurations need more time to run the testsuite
Modified: search/trunk/hibernate-search/src/test/java/org/hibernate/search/test/bridge/BridgeTest.java
===================================================================
--- search/trunk/hibernate-search/src/test/java/org/hibernate/search/test/bridge/BridgeTest.java 2010-04-09 09:26:48 UTC (rev 19198)
+++ search/trunk/hibernate-search/src/test/java/org/hibernate/search/test/bridge/BridgeTest.java 2010-04-09 09:50:30 UTC (rev 19199)
@@ -135,6 +135,7 @@
Cloud cloud = new Cloud();
cloud.setCustomFieldBridge( "This is divided by 2" );
cloud.setCustomStringBridge( "This is div by 4" );
+ cloud.setChar2( 's' );
org.hibernate.Session s = openSession();
Transaction tx = s.beginTransaction();
s.persist( cloud );
@@ -177,6 +178,7 @@
cloud.setDateMonth( date );
cloud.setDateSecond( date );
cloud.setDateYear( date );
+ cloud.setChar2( 's' );
org.hibernate.Session s = openSession();
Transaction tx = s.beginTransaction();
s.persist( cloud );
@@ -225,6 +227,7 @@
cloud.setCalendarMonth( c );
cloud.setCalendarSecond( c );
cloud.setCalendarYear( c );
+ cloud.setChar2( 's' );
org.hibernate.Session s = openSession();
Transaction tx = s.beginTransaction();
s.persist( cloud );
14 years, 1 month
Hibernate SVN: r19198 - search/trunk/hibernate-search/src/test/java/org/hibernate/search/test/jgroups/common.
by hibernate-commits＠lists.jboss.org
Author: stliu
Date: 2010-04-09 05:26:48 -0400 (Fri, 09 Apr 2010)
New Revision: 19198
Modified:
search/trunk/hibernate-search/src/test/java/org/hibernate/search/test/jgroups/common/JGroupsCommonTest.java
Log:
HSEARCH-496 Some hudson configurations need more time to run the testsuite
Modified: search/trunk/hibernate-search/src/test/java/org/hibernate/search/test/jgroups/common/JGroupsCommonTest.java
===================================================================
--- search/trunk/hibernate-search/src/test/java/org/hibernate/search/test/jgroups/common/JGroupsCommonTest.java 2010-04-09 08:49:25 UTC (rev 19197)
+++ search/trunk/hibernate-search/src/test/java/org/hibernate/search/test/jgroups/common/JGroupsCommonTest.java 2010-04-09 09:26:48 UTC (rev 19198)
@@ -103,7 +103,7 @@
query = ftSess.createFullTextQuery( luceneQuery );
result = query.list();
assertEquals( 0, result.size() );
-
+ ftSess.getTransaction().commit();
ftSess.close();
s.close();
14 years, 1 month
Hibernate SVN: r19197 - search/trunk/hibernate-search/src/test/java/org/hibernate/search/test/jgroups/common.
by hibernate-commits＠lists.jboss.org
Author: sannegrinovero
Date: 2010-04-09 04:49:25 -0400 (Fri, 09 Apr 2010)
New Revision: 19197
Modified:
search/trunk/hibernate-search/src/test/java/org/hibernate/search/test/jgroups/common/JGroupsCommonTest.java
search/trunk/hibernate-search/src/test/java/org/hibernate/search/test/jgroups/common/MultipleSessionsSearchTestCase.java
Log:
JGroups backend test cleanup
Modified: search/trunk/hibernate-search/src/test/java/org/hibernate/search/test/jgroups/common/JGroupsCommonTest.java
===================================================================
--- search/trunk/hibernate-search/src/test/java/org/hibernate/search/test/jgroups/common/JGroupsCommonTest.java 2010-04-09 08:46:53 UTC (rev 19196)
+++ search/trunk/hibernate-search/src/test/java/org/hibernate/search/test/jgroups/common/JGroupsCommonTest.java 2010-04-09 08:49:25 UTC (rev 19197)
@@ -28,7 +28,6 @@
import org.apache.lucene.queryParser.QueryParser;
import org.apache.lucene.search.Query;
-import org.hibernate.HibernateException;
import org.hibernate.Session;
import org.hibernate.Transaction;
import org.hibernate.cfg.Configuration;
@@ -41,16 +40,14 @@
/**
* In case of running test outside Hibernate Search Maven configuration set following VM configuration:
- * <br><br>
+ * <br>
* <code>
* -Djava.net.preferIPv4Stack=true -Djgroups.bind_addr=127.0.0.1
* </code>
* @author Lukasz Moren
*/
-
public class JGroupsCommonTest extends MultipleSessionsSearchTestCase {
- public static final String CHANNEL_NAME = "jgroups_test_channel";
private static final String DEFAULT_JGROUPS_CONFIGURATION_FILE = "flush-udp.xml";
public void testJGroupsBackend() throws Exception {
@@ -88,7 +85,6 @@
//need to sleep for the message consumption
Thread.sleep( 3000 );
- parser = new QueryParser( getTargetLuceneVersion(), "id", SearchTestCase.stopAnalyzer );
luceneQuery = parser.parse( "logo:Peter pan" );
query = ftSess.createFullTextQuery( luceneQuery );
result = query.list();
@@ -103,7 +99,6 @@
//Need to sleep for the message consumption
Thread.sleep( 3000 );
- parser = new QueryParser( getTargetLuceneVersion(), "id", SearchTestCase.stopAnalyzer );
luceneQuery = parser.parse( "logo:Boston or logo:Mapple leaves" );
query = ftSess.createFullTextQuery( luceneQuery );
result = query.list();
@@ -130,10 +125,6 @@
cfg.setProperty( JGroupsBackendQueueProcessorFactory.CONFIGURATION_FILE, DEFAULT_JGROUPS_CONFIGURATION_FILE );
}
- public static Session getSession() throws HibernateException {
- return sessions.openSession();
- }
-
@Override
protected Class<?>[] getMappings() {
return new Class[] {
@@ -147,5 +138,4 @@
};
}
-
}
Modified: search/trunk/hibernate-search/src/test/java/org/hibernate/search/test/jgroups/common/MultipleSessionsSearchTestCase.java
===================================================================
--- search/trunk/hibernate-search/src/test/java/org/hibernate/search/test/jgroups/common/MultipleSessionsSearchTestCase.java 2010-04-09 08:46:53 UTC (rev 19196)
+++ search/trunk/hibernate-search/src/test/java/org/hibernate/search/test/jgroups/common/MultipleSessionsSearchTestCase.java 2010-04-09 08:49:25 UTC (rev 19197)
@@ -26,8 +26,6 @@
import java.io.InputStream;
-import org.slf4j.Logger;
-
import org.hibernate.SessionFactory;
import org.hibernate.cfg.AnnotationConfiguration;
import org.hibernate.cfg.Configuration;
@@ -43,19 +41,17 @@
*/
public abstract class MultipleSessionsSearchTestCase extends SearchTestCase {
- private static final Logger log = org.hibernate.search.util.LoggerFactory.make();
+ private static final String masterCopy = "/master/copy";
- private String masterCopy = "/master/copy";
-
/**
* The lucene index directory which is specific to the master node.
*/
- private String masterMain = "/master/main";
+ private static final String masterMain = "/master/main";
/**
* The lucene index directory which is specific to the slave node.
*/
- private String slave = "/slave";
+ private static final String slave = "/slave";
protected static SessionFactory slaveSessionFactory;
@@ -107,41 +103,31 @@
if ( slaveSessionFactory != null ) {
slaveSessionFactory.close();
}
- if ( getSessions() != null ) {
- getSessions().close();
- }
- log.info( "Deleting test directory {} ", getIndexDir().getAbsolutePath() );
FileHelper.delete( getIndexDir() );
}
private void buildCommonSessionFactory(Class<?>[] classes, String[] packages, String[] xmlFiles) throws Exception {
- try {
- if ( getSlaveSessionFactory() != null ) {
- getSlaveSessionFactory().close();
- }
+ if ( getSlaveSessionFactory() != null ) {
+ getSlaveSessionFactory().close();
+ }
- setCommonCfg( new AnnotationConfiguration() );
- commonConfigure( commonCfg );
- if ( recreateSchema() ) {
- commonCfg.setProperty( org.hibernate.cfg.Environment.HBM2DDL_AUTO, "create-drop" );
- }
- for ( String aPackage : packages ) {
- ( ( AnnotationConfiguration ) getCommonConfiguration() ).addPackage( aPackage );
- }
- for ( Class<?> aClass : classes ) {
- ( ( AnnotationConfiguration ) getCommonConfiguration() ).addAnnotatedClass( aClass );
- }
- for ( String xmlFile : xmlFiles ) {
- InputStream is = Thread.currentThread().getContextClassLoader().getResourceAsStream( xmlFile );
- getCommonConfiguration().addInputStream( is );
- }
- setDialect( Dialect.getDialect() );
- slaveSessionFactory = getCommonConfiguration().buildSessionFactory();
+ setCommonCfg( new AnnotationConfiguration() );
+ commonConfigure( commonCfg );
+ if ( recreateSchema() ) {
+ commonCfg.setProperty( org.hibernate.cfg.Environment.HBM2DDL_AUTO, "create-drop" );
}
- catch ( Exception e ) {
- e.printStackTrace();
- throw e;
+ for ( String aPackage : packages ) {
+ ((AnnotationConfiguration) getCommonConfiguration()).addPackage( aPackage );
}
+ for ( Class<?> aClass : classes ) {
+ ((AnnotationConfiguration) getCommonConfiguration()).addAnnotatedClass( aClass );
+ }
+ for ( String xmlFile : xmlFiles ) {
+ InputStream is = Thread.currentThread().getContextClassLoader().getResourceAsStream( xmlFile );
+ getCommonConfiguration().addInputStream( is );
+ }
+ setDialect( Dialect.getDialect() );
+ slaveSessionFactory = getCommonConfiguration().buildSessionFactory();
}
private void setCommonCfg(Configuration configuration) {
14 years, 1 month
Hibernate SVN: r19196 - search/trunk/hibernate-search/src/test/java/org/hibernate/search/test.
by hibernate-commits＠lists.jboss.org
Author: sannegrinovero
Date: 2010-04-09 04:46:53 -0400 (Fri, 09 Apr 2010)
New Revision: 19196
Modified:
search/trunk/hibernate-search/src/test/java/org/hibernate/search/test/SearchTestCase.java
search/trunk/hibernate-search/src/test/java/org/hibernate/search/test/TestCase.java
Log:
HSEARCH-500 Some tests don't close the SessionFactory and SearchFactory
Modified: search/trunk/hibernate-search/src/test/java/org/hibernate/search/test/SearchTestCase.java
===================================================================
--- search/trunk/hibernate-search/src/test/java/org/hibernate/search/test/SearchTestCase.java 2010-04-09 07:37:38 UTC (rev 19195)
+++ search/trunk/hibernate-search/src/test/java/org/hibernate/search/test/SearchTestCase.java 2010-04-09 08:46:53 UTC (rev 19196)
@@ -50,6 +50,7 @@
import org.hibernate.search.SearchFactory;
import org.hibernate.search.annotations.Indexed;
import org.hibernate.search.event.FullTextIndexEventListener;
+import org.hibernate.search.impl.SearchFactoryImpl;
import org.hibernate.search.store.RAMDirectoryProvider;
import org.hibernate.tool.hbm2ddl.SchemaExport;
@@ -69,7 +70,7 @@
private static File indexDir;
- private SearchFactory searchFactory;
+ private SearchFactoryImpl searchFactory;
static {
String buildDir = System.getProperty( "build.dir" );
@@ -87,8 +88,12 @@
}
protected void tearDown() throws Exception {
+ super.tearDown();
SchemaExport export = new SchemaExport( cfg );
export.drop( false, true );
+ if ( searchFactory != null ) {
+ searchFactory.close();
+ }
searchFactory = null;
}
@@ -134,7 +139,7 @@
if ( searchFactory == null ) {
Session session = openSession();
FullTextSession fullTextSession = Search.getFullTextSession( session );
- searchFactory = fullTextSession.getSearchFactory();
+ searchFactory = (SearchFactoryImpl) fullTextSession.getSearchFactory();
fullTextSession.close();
}
return searchFactory;
Modified: search/trunk/hibernate-search/src/test/java/org/hibernate/search/test/TestCase.java
===================================================================
--- search/trunk/hibernate-search/src/test/java/org/hibernate/search/test/TestCase.java 2010-04-09 07:37:38 UTC (rev 19195)
+++ search/trunk/hibernate-search/src/test/java/org/hibernate/search/test/TestCase.java 2010-04-09 08:46:53 UTC (rev 19196)
@@ -91,6 +91,13 @@
lastTestClass = getClass();
}
}
+
+ protected void tearDown() throws Exception {
+ super.tearDown();
+ if ( sessions != null ) {
+ sessions.close();
+ }
+ }
protected void runTest() throws Throwable {
try {
14 years, 1 month
Hibernate SVN: r19195 - in core/trunk/core/src/main/java/org/hibernate: cfg and 1 other directory.
by hibernate-commits＠lists.jboss.org
Author: sannegrinovero
Date: 2010-04-09 03:37:38 -0400 (Fri, 09 Apr 2010)
New Revision: 19195
Modified:
core/trunk/core/src/main/java/org/hibernate/Session.java
core/trunk/core/src/main/java/org/hibernate/cfg/Environment.java
core/trunk/core/src/main/java/org/hibernate/cfg/SettingsFactory.java
Log:
minor javadoc typos
Modified: core/trunk/core/src/main/java/org/hibernate/Session.java
===================================================================
--- core/trunk/core/src/main/java/org/hibernate/Session.java 2010-04-09 04:39:44 UTC (rev 19194)
+++ core/trunk/core/src/main/java/org/hibernate/Session.java 2010-04-09 07:37:38 UTC (rev 19195)
@@ -168,7 +168,6 @@
*
* @return The session factory.
* @see SessionFactory
-
*/
public SessionFactory getSessionFactory();
@@ -761,7 +760,6 @@
* Return the persistent instance of the given entity class with the given identifier,
* or null if there is no such persistent instance. (If the instance is already associated
* with the session, return that instance. This method never returns an uninitialized instance.)
- * Obtain the specified lock mode if the instance exists.
*
* @param clazz a persistent class
* @param id an identifier
@@ -840,7 +838,6 @@
*/
public Object get(String entityName, Serializable id, LockOptions lockOptions) throws HibernateException;
-
/**
* Return the entity name for a persistent entity
*
@@ -922,7 +919,6 @@
*/
public void doWork(Work work) throws HibernateException;
-
/**
* Disconnect the <tt>Session</tt> from the current JDBC connection. If
* the connection was obtained by Hibernate close it and return it to
Modified: core/trunk/core/src/main/java/org/hibernate/cfg/Environment.java
===================================================================
--- core/trunk/core/src/main/java/org/hibernate/cfg/Environment.java 2010-04-09 04:39:44 UTC (rev 19194)
+++ core/trunk/core/src/main/java/org/hibernate/cfg/Environment.java 2010-04-09 07:37:38 UTC (rev 19195)
@@ -420,7 +420,7 @@
*/
public static final String USE_SECOND_LEVEL_CACHE = "hibernate.cache.use_second_level_cache";
/**
- * Optimize the cache for mimimal puts instead of minimal gets
+ * Optimize the cache for minimal puts instead of minimal gets
*/
public static final String USE_MINIMAL_PUTS = "hibernate.cache.use_minimal_puts";
/**
@@ -450,7 +450,7 @@
public static final String QUERY_TRANSLATOR = "hibernate.query.factory_class";
/**
- * A comma-seperated list of token substitutions to use when translating a Hibernate
+ * A comma-separated list of token substitutions to use when translating a Hibernate
* query to SQL
*/
public static final String QUERY_SUBSTITUTIONS = "hibernate.query.substitutions";
@@ -487,7 +487,7 @@
public static final String ORDER_UPDATES = "hibernate.order_updates";
/**
- * Enable ordering of insert statements for the purpose of more effecient JDBC batching.
+ * Enable ordering of insert statements for the purpose of more efficient JDBC batching.
*/
public static final String ORDER_INSERTS = "hibernate.order_inserts";
Modified: core/trunk/core/src/main/java/org/hibernate/cfg/SettingsFactory.java
===================================================================
--- core/trunk/core/src/main/java/org/hibernate/cfg/SettingsFactory.java 2010-04-09 04:39:44 UTC (rev 19194)
+++ core/trunk/core/src/main/java/org/hibernate/cfg/SettingsFactory.java 2010-04-09 07:37:38 UTC (rev 19195)
@@ -102,7 +102,7 @@
JdbcSupport jdbcSupport = null;
// 'hibernate.temp.use_jdbc_metadata_defaults' is a temporary magic value.
- // The need for it is intended to be alleviated with future developement, thus it is
+ // The need for it is intended to be alleviated with future development, thus it is
// not defined as an Environment constant...
//
// it is used to control whether we should consult the JDBC metadata to determine
14 years, 1 month
Hibernate SVN: r19194 - core/trunk/testsuite/src/test/java/org/hibernate/test/legacy.
by hibernate-commits＠lists.jboss.org
Author: stliu
Date: 2010-04-09 00:39:44 -0400 (Fri, 09 Apr 2010)
New Revision: 19194
Modified:
core/trunk/testsuite/src/test/java/org/hibernate/test/legacy/Baz.hbm.xml
Log:
HHH-5002 testQuery in org.hibernate.test.legacy.FooBarTest errors running with Ingres dialect
Modified: core/trunk/testsuite/src/test/java/org/hibernate/test/legacy/Baz.hbm.xml
===================================================================
--- core/trunk/testsuite/src/test/java/org/hibernate/test/legacy/Baz.hbm.xml 2010-04-09 03:30:29 UTC (rev 19193)
+++ core/trunk/testsuite/src/test/java/org/hibernate/test/legacy/Baz.hbm.xml 2010-04-09 04:39:44 UTC (rev 19194)
@@ -258,7 +258,7 @@
<component name="collectionComponent">
<component name="nested">
- <property name="str"/>
+ <property name="str" column="`str`"/>
<bag name="foos" cascade="all">
<key column="baz_compon_id"/>
<one-to-many class="org.hibernate.test.legacy.Foo"/>
14 years, 1 month
Hibernate SVN: r19193 - core/trunk/testsuite/src/test/java/org/hibernate/test/manytomany.
by hibernate-commits＠lists.jboss.org
Author: stliu
Date: 2010-04-08 23:30:29 -0400 (Thu, 08 Apr 2010)
New Revision: 19193
Modified:
core/trunk/testsuite/src/test/java/org/hibernate/test/manytomany/UserGroup.hbm.xml
Log:
HHH-4912 testManyToManyWithFormula induces error with Ingres dialect
Modified: core/trunk/testsuite/src/test/java/org/hibernate/test/manytomany/UserGroup.hbm.xml
===================================================================
--- core/trunk/testsuite/src/test/java/org/hibernate/test/manytomany/UserGroup.hbm.xml 2010-04-08 14:04:07 UTC (rev 19192)
+++ core/trunk/testsuite/src/test/java/org/hibernate/test/manytomany/UserGroup.hbm.xml 2010-04-09 03:30:29 UTC (rev 19193)
@@ -21,7 +21,7 @@
</composite-id>
<set name="groups" table="UserGroup">
<key>
- <column name="userName"/>
+ <column name="`userName`"/>
<column name="org"/>
</key>
<many-to-many class="Group">
@@ -43,7 +43,7 @@
<column name="org"/>
</key>
<many-to-many class="User">
- <column name="userName"/>
+ <column name="`userName`"/>
<formula>org</formula>
</many-to-many>
</set>
14 years, 1 month
Hibernate SVN: r19192 - search/trunk/hibernate-search.
by hibernate-commits＠lists.jboss.org
Author: sannegrinovero
Date: 2010-04-08 10:04:07 -0400 (Thu, 08 Apr 2010)
New Revision: 19192
Modified:
search/trunk/hibernate-search/
Log:
ignore eclipse metadata files
Property changes on: search/trunk/hibernate-search
___________________________________________________________________
Name: svn:ignore
- target
+ target
.settings
.classpath
.project
14 years, 1 month
Hibernate SVN: r19191 - search/trunk/hibernate-search/src/test/java/org/hibernate/search/test/embedded/nested.
by hibernate-commits＠lists.jboss.org
Author: stliu
Date: 2010-04-08 09:53:06 -0400 (Thu, 08 Apr 2010)
New Revision: 19191
Modified:
search/trunk/hibernate-search/src/test/java/org/hibernate/search/test/embedded/nested/NestedEmbeddedTest.java
Log:
HSEARCH-496 Some hudson configurations need more time to run the testsuite
Modified: search/trunk/hibernate-search/src/test/java/org/hibernate/search/test/embedded/nested/NestedEmbeddedTest.java
===================================================================
--- search/trunk/hibernate-search/src/test/java/org/hibernate/search/test/embedded/nested/NestedEmbeddedTest.java 2010-04-08 13:49:57 UTC (rev 19190)
+++ search/trunk/hibernate-search/src/test/java/org/hibernate/search/test/embedded/nested/NestedEmbeddedTest.java 2010-04-08 13:53:06 UTC (rev 19191)
@@ -137,6 +137,7 @@
john = ( Person ) s.get( Person.class, john.getId() );
session = Search.getFullTextSession( s );
+ tx = s.beginTransaction();
query = parser.parse( "London" );
result = session.createFullTextQuery( query, Person.class ).list();
@@ -146,6 +147,7 @@
result = session.createFullTextQuery( query, Person.class ).list();
assertEquals( "change in embedded not reflected in root index", 1, result.size() );
+ tx.commit();
session.close();
//s.close();
}
14 years, 1 month
Hibernate SVN: r19190 - search/trunk/hibernate-search/src/main/java/org/hibernate/search/engine.
by hibernate-commits＠lists.jboss.org
Author: epbernard
Date: 2010-04-08 09:49:57 -0400 (Thu, 08 Apr 2010)
New Revision: 19190
Modified:
search/trunk/hibernate-search/src/main/java/org/hibernate/search/engine/DocumentBuilderIndexedEntity.java
Log:
HSEARCH-443 use Fieldable when possible instead of Field
Modified: search/trunk/hibernate-search/src/main/java/org/hibernate/search/engine/DocumentBuilderIndexedEntity.java
===================================================================
--- search/trunk/hibernate-search/src/main/java/org/hibernate/search/engine/DocumentBuilderIndexedEntity.java 2010-04-08 12:43:51 UTC (rev 19189)
+++ search/trunk/hibernate-search/src/main/java/org/hibernate/search/engine/DocumentBuilderIndexedEntity.java 2010-04-08 13:49:57 UTC (rev 19190)
@@ -37,6 +37,7 @@
import org.apache.lucene.analysis.Analyzer;
import org.apache.lucene.document.Document;
import org.apache.lucene.document.Field;
+import org.apache.lucene.document.Fieldable;
import org.apache.lucene.index.Term;
import org.slf4j.Logger;
@@ -514,7 +515,7 @@
// now we give the discriminator the opportunity to specify a analyzer per field level
for ( Object o : doc.getFields() ) {
- Field field = ( Field ) o;
+ Fieldable field = ( Fieldable ) o;
if ( !processedFieldNames.contains( field.name() ) ) {
String analyzerName = discriminator.getAnalyzerDefinitionName( value, unproxiedInstance, field.name() );
if ( analyzerName != null ) {
14 years, 1 month