Hibernate SVN: r20832 - search/trunk/hibernate-search/src/main/docbook/en-US/modules.
by hibernate-commits@lists.jboss.org
Author: hardy.ferentschik
Date: 2010-10-14 08:58:00 -0400 (Thu, 14 Oct 2010)
New Revision: 20832
Modified:
search/trunk/hibernate-search/src/main/docbook/en-US/modules/configuration.xml
Log:
HSEARCH-554 Updated worker configuration
Modified: search/trunk/hibernate-search/src/main/docbook/en-US/modules/configuration.xml
===================================================================
--- search/trunk/hibernate-search/src/main/docbook/en-US/modules/configuration.xml 2010-10-14 12:56:59 UTC (rev 20831)
+++ search/trunk/hibernate-search/src/main/docbook/en-US/modules/configuration.xml 2010-10-14 12:58:00 UTC (rev 20832)
@@ -25,7 +25,6 @@
<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
"http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd">
<chapter id="search-configuration">
-
<title>Configuration</title>
<section id="search-configuration-directory" revision="1">
@@ -365,48 +364,99 @@
<title>Worker configuration</title>
<para>It is possible to refine how Hibernate Search interacts with Lucene
- through the worker configuration. The work can be executed to the Lucene
- directory or sent to a JMS queue for later processing. When processed to
- the Lucene directory, the work can be processed synchronously or
- asynchronously to the transaction commit.</para>
+ through the worker configuration. There exist several architectural
+ components and possible extension points. Let's have a closer look.
+ </para>
- <para>You can define the worker configuration using the following
- properties</para>
+ <para>First there is a <classname>Worker</classname>. An implementation of
+ the <classname>Worker</classname> interface is reponsible for receiving
+ all entity changes, queuing them by context and applying them once a
+ context ends. The most intuative context, especially in connection with
+ ORM, is the transaction. For this reason Hibernate Search will per default
+ use the <classname>TransactionalWorker</classname> to scope all changes
+ per transaction. One can, however, imagine a scenario where the context
+ depends for example on the number of entity changes or some other
+ application (lifecycle) events. For this reason the
+ <classname>Worker</classname> implementation is configurable as shown in
+ <xref linkend="table-worker-configuration" />.</para>
- <table>
- <title>worker configuration</title>
+ <table id="table-worker-configuration">
+ <title>Scope configuration</title>
<tgroup cols="2">
<tbody>
<row>
- <entry>Property</entry>
+ <entry><emphasis role="bold">Property</emphasis></entry>
- <entry>Description</entry>
+ <entry><emphasis role="bold">Description</emphasis></entry>
</row>
<row>
- <entry><literal>hibernate.search.worker.backend</literal></entry>
+ <entry><literal>hibernate.search.worker.scope</literal></entry>
- <entry>Out of the box support for the Apache Lucene back end and
- the JMS back end. Default to <literal>lucene</literal>. Supports
- also <literal>jms</literal>, <literal>blackhole</literal>,
- <literal>jgroupsMaster</literal> and
- <literal>jgroupsSlave</literal>.</entry>
+ <entry>The fully qualifed class name of the
+ <classname>Worker</classname> implementation to use. If this
+ property is not set, empty or <literal>transaction</literal> the
+ default <classname>TransactionalWorker</classname> is
+ used.</entry>
</row>
<row>
+ <entry><literal>hibernate.search.worker.*</literal></entry>
+
+ <entry>All configuration properties prefixed with
+ <literal>hibernate.search.worker</literal> are passed to the
+ Worker during initialization. This allows adding custom, worker
+ specific parameters.</entry>
+ </row>
+
+ <row>
+ <entry><literal>hibernate.search.worker.batch_size</literal></entry>
+
+ <entry>Defines the maximum number of indexing operation batched
+ per context. Once the limit is reached indexing will be triggered
+ even though the context has not ended yet. This property only
+ works if the <classname>Worker</classname> implementation
+ delegates the queued work to BatchedQueueingProcessor (which is
+ what the <classname>TransactionalWorker</classname> does)</entry>
+ </row>
+ </tbody>
+ </tgroup>
+ </table>
+
+ <para>Once a context ends it is time to prepare and apply the index
+ changes. This can be done synchronously or asynchronously from within a
+ new thread. Synchronous updates have the advantage that the index is at
+ all times in sync with the databases. Asynchronous updates, on the other
+ hand, can help to minimize the user response time. The drawback is
+ potential discrepancies between database and index states. Lets look at
+ the configuration options shown in <xref
+ linkend="table-work-execution-configuration" />.</para>
+
+ <table id="table-work-execution-configuration">
+ <title>Execution configuration</title>
+
+ <tgroup cols="2">
+ <tbody>
+ <row>
+ <entry><emphasis role="bold">Property</emphasis></entry>
+
+ <entry><emphasis role="bold">Description</emphasis></entry>
+ </row>
+
+ <row>
<entry><literal>hibernate.search.worker.execution</literal></entry>
- <entry>Supports synchronous and asynchronous execution. Default to
- <literal><literal>sync</literal></literal>. Supports also
- <literal>async</literal>.</entry>
+ <entry><para><literal>sync</literal>: synchronous execution
+ (default)</para><para><literal>async</literal>: asynchronous
+ execution</para></entry>
</row>
<row>
<entry><literal>hibernate.search.worker.thread_pool.size</literal></entry>
- <entry>Defines the number of threads in the pool. useful only for
- asynchronous execution. Default to 1.</entry>
+ <entry>Defines the number of threads in the pool for asynchronous
+ execution. Defaults to 1.</entry>
</row>
<row>
@@ -417,8 +467,71 @@
infinite. If the limit is reached, the work is done by the main
thread.</entry>
</row>
+ </tbody>
+ </tgroup>
+ </table>
+ <para>So far all work is done within the same Virtual Machine (VM), no
+ matter which execution mode. The total amount of work has not changed for
+ the single VM. Luckily there is a better approach, namely delegation. It
+ is possible to send the indexing work to a different server by configuring
+ hibernate.search.worker.backend - see <xref
+ linkend="table-backend-configuration" />.</para>
+
+ <table id="table-backend-configuration">
+ <title>Backend configuration</title>
+
+ <tgroup cols="2">
+ <tbody>
<row>
+ <entry><emphasis role="bold">Property</emphasis></entry>
+
+ <entry><emphasis role="bold">Description</emphasis></entry>
+ </row>
+
+ <row>
+ <entry><literal>hibernate.search.worker.backend</literal></entry>
+
+ <entry><para><literal>lucene</literal>: The default backend which
+ runs index updates in the same VM. Also used when the property is
+ undefined or empty.</para><para><literal>jms</literal>: JMS
+ backend. Index updates are send to a JMS queue to be processed by
+ an indexing master. See <xref
+ linkend="table-jms-backend-configuration" /> for additional
+ configuration options and <xref linkend="jms-backend" /> for a
+ more detailed descripton of this
+ setup.</para><para><literal>jgroupsMaster</literal> or
+ <literal>jgroupsSlave</literal>: Backend using <ulink
+ url="http://www.jgroups.org/">JGroups</ulink> as communication
+ layer. See <xref linkend="table-jgroups-backend-configuration" />
+ for additional configuration options and <xref
+ linkend="jgroups-backend" /> for a more detailed description of
+ this setup.</para><para><literal>blackhole</literal>: Mainly a
+ test/developer setting which ignores all indexing
+ work</para><para>You can also specify the fully qualified name of
+ a class implementing
+ <classname>BackendQueueProcessorFactory</classname>. This way you
+ can implement your own communication layer. The implementation is
+ responsilbe for returning a <classname>Runnable</classname>
+ instance which on execution will process the index
+ work.</para></entry>
+ </row>
+ </tbody>
+ </tgroup>
+ </table>
+
+ <table id="table-jms-backend-configuration">
+ <title>JMS backend configuration</title>
+
+ <tgroup cols="2">
+ <tbody>
+ <row>
+ <entry><emphasis role="bold">Property</emphasis></entry>
+
+ <entry><emphasis role="bold">Description</emphasis></entry>
+ </row>
+
+ <row>
<entry><literal>hibernate.search.worker.jndi.*</literal></entry>
<entry>Defines the JNDI properties to initiate the InitialContext
@@ -426,8 +539,7 @@
</row>
<row>
- <entry><literal>
- hibernate.search.worker.jms.connection_factory</literal></entry>
+ <entry><literal>hibernate.search.worker.jms.connection_factory</literal></entry>
<entry>Mandatory for the JMS back end. Defines the JNDI name to
lookup the JMS connection factory from
@@ -442,8 +554,22 @@
lookup the JMS queue from. The queue will be used to post work
messages.</entry>
</row>
+ </tbody>
+ </tgroup>
+ </table>
+ <table id="table-jgroups-backend-configuration">
+ <title>JGroups backend configuration</title>
+
+ <tgroup cols="2">
+ <tbody>
<row>
+ <entry><emphasis role="bold">Property</emphasis></entry>
+
+ <entry><emphasis role="bold">Description</emphasis></entry>
+ </row>
+
+ <row>
<entry><literal>hibernate.search.worker.jgroups.clusterName</literal></entry>
<entry>Optional for JGroups back end. Defines the name of JGroups
@@ -474,6 +600,17 @@
</tbody>
</tgroup>
</table>
+
+ <warning>
+ <para>As you probably noticed, some of the shown properties are
+ correlated which means that not all combinations of property values make
+ sense. In fact you can end up with a non-functional configuration. This
+ is especially true for the case that you provide your own
+ implementations of some of the shown interfaces. Make sure to study the
+ existing code before you write your own <classname>Worker</classname> or
+ <classname>BackendQueueProcessorFactory</classname>
+ implementation.</para>
+ </warning>
</section>
<section id="jms-backend">
13 years, 6 months
Hibernate SVN: r20831 - in search/trunk/hibernate-search/src/main/java/org/hibernate/search/backend: impl and 1 other directory.
by hibernate-commits@lists.jboss.org
Author: hardy.ferentschik
Date: 2010-10-14 08:56:59 -0400 (Thu, 14 Oct 2010)
New Revision: 20831
Modified:
search/trunk/hibernate-search/src/main/java/org/hibernate/search/backend/BackendQueueProcessorFactory.java
search/trunk/hibernate-search/src/main/java/org/hibernate/search/backend/Worker.java
search/trunk/hibernate-search/src/main/java/org/hibernate/search/backend/WorkerFactory.java
search/trunk/hibernate-search/src/main/java/org/hibernate/search/backend/impl/PostTransactionWorkQueueSynchronization.java
search/trunk/hibernate-search/src/main/java/org/hibernate/search/backend/impl/TransactionalWorker.java
Log:
HSEARCH-554 Some formatting and javadoc changes while working on the documentation of the worker configuration
Modified: search/trunk/hibernate-search/src/main/java/org/hibernate/search/backend/BackendQueueProcessorFactory.java
===================================================================
--- search/trunk/hibernate-search/src/main/java/org/hibernate/search/backend/BackendQueueProcessorFactory.java 2010-10-14 11:08:07 UTC (rev 20830)
+++ search/trunk/hibernate-search/src/main/java/org/hibernate/search/backend/BackendQueueProcessorFactory.java 2010-10-14 12:56:59 UTC (rev 20831)
@@ -1,26 +1,25 @@
-/* $Id$
- *
+/*
* 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
+ *
+ * Copyright (c) 2010, 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
*/
package org.hibernate.search.backend;
@@ -40,7 +39,7 @@
/**
* Used at startup, called once as first method.
* @param props all configuration properties
- * @param searchFactory the client
+ * @param context context giving access to required meta data
*/
void initialize(Properties props, WorkerBuildContext context);
Modified: search/trunk/hibernate-search/src/main/java/org/hibernate/search/backend/Worker.java
===================================================================
--- search/trunk/hibernate-search/src/main/java/org/hibernate/search/backend/Worker.java 2010-10-14 11:08:07 UTC (rev 20830)
+++ search/trunk/hibernate-search/src/main/java/org/hibernate/search/backend/Worker.java 2010-10-14 12:56:59 UTC (rev 20831)
@@ -1,26 +1,25 @@
-/* $Id$
- *
+/*
* 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
+ *
+ * Copyright (c) 2010, 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
*/
package org.hibernate.search.backend;
@@ -29,15 +28,16 @@
import org.hibernate.search.spi.WorkerBuildContext;
/**
- * Perform work for a given session. This implementation has to be multi threaded.
+ * Perform work for a given context (eg a transaction). This implementation has to be threaded-safe.
*
* @author Emmanuel Bernard
*/
public interface Worker {
/**
* Declare a work to be done within a given transaction context
- * @param work
- * @param transactionContext
+ *
+ * @param work the work to be executed
+ * @param transactionContext transactional context information
*/
void performWork(Work<?> work, TransactionContext transactionContext);
Modified: search/trunk/hibernate-search/src/main/java/org/hibernate/search/backend/WorkerFactory.java
===================================================================
--- search/trunk/hibernate-search/src/main/java/org/hibernate/search/backend/WorkerFactory.java 2010-10-14 11:08:07 UTC (rev 20830)
+++ search/trunk/hibernate-search/src/main/java/org/hibernate/search/backend/WorkerFactory.java 2010-10-14 12:56:59 UTC (rev 20831)
@@ -42,10 +42,9 @@
Properties props = cfg.getProperties();
Properties workerProperties = new Properties();
for ( Map.Entry entry : props.entrySet() ) {
- String key = ( String ) entry.getKey();
+ String key = (String) entry.getKey();
if ( key.startsWith( Environment.WORKER_PREFIX ) ) {
- //key.substring( Environment.WORKER_PREFIX.length() )
- workerProperties.setProperty( key, ( String ) entry.getValue() );
+ workerProperties.setProperty( key, (String) entry.getValue() );
}
}
return workerProperties;
Modified: search/trunk/hibernate-search/src/main/java/org/hibernate/search/backend/impl/PostTransactionWorkQueueSynchronization.java
===================================================================
--- search/trunk/hibernate-search/src/main/java/org/hibernate/search/backend/impl/PostTransactionWorkQueueSynchronization.java 2010-10-14 11:08:07 UTC (rev 20830)
+++ search/trunk/hibernate-search/src/main/java/org/hibernate/search/backend/impl/PostTransactionWorkQueueSynchronization.java 2010-10-14 12:56:59 UTC (rev 20831)
@@ -1,26 +1,25 @@
-/* $Id$
- *
+/*
* 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
+ *
+ * Copyright (c) 2010, 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
*/
package org.hibernate.search.backend.impl;
@@ -43,13 +42,13 @@
public class PostTransactionWorkQueueSynchronization implements Synchronization {
private static final Logger log = LoggerFactory.make();
-
+
/**
* FullTextIndexEventListener is using a WeakIdentityHashMap<Session,Synchronization>
* So make sure all Synchronization implementations don't have any
* (direct or indirect) reference to the Session.
*/
-
+
private final QueueingProcessor queueingProcessor;
private boolean consumed;
private boolean prepared;
@@ -75,14 +74,16 @@
public void beforeCompletion() {
if ( prepared ) {
if ( log.isTraceEnabled() ) {
- log.trace("Transaction's beforeCompletion() phase already been processed, ignoring: {}", this.toString() );
+ log.trace(
+ "Transaction's beforeCompletion() phase already been processed, ignoring: {}", this.toString()
+ );
}
}
else {
if ( log.isTraceEnabled() ) {
- log.trace("Processing Transaction's beforeCompletion() phase: {}", this.toString() );
+ log.trace( "Processing Transaction's beforeCompletion() phase: {}", this.toString() );
}
- queueingProcessor.prepareWorks(queue);
+ queueingProcessor.prepareWorks( queue );
prepared = true;
}
}
@@ -91,22 +92,30 @@
try {
if ( Status.STATUS_COMMITTED == i ) {
if ( log.isTraceEnabled() ) {
- log.trace("Processing Transaction's afterCompletion() phase for {}. Performing work.", this.toString() );
+ log.trace(
+ "Processing Transaction's afterCompletion() phase for {}. Performing work.", this.toString()
+ );
}
- queueingProcessor.performWorks(queue);
+ queueingProcessor.performWorks( queue );
}
else {
if ( log.isTraceEnabled() ) {
- log.trace("Processing Transaction's afterCompletion() phase for {}. Cancelling work due to transaction status {}", this.toString(), i );
+ log.trace(
+ "Processing Transaction's afterCompletion() phase for {}. Cancelling work due to transaction status {}",
+ this.toString(),
+ i
+ );
}
- queueingProcessor.cancelWorks(queue);
+ queueingProcessor.cancelWorks( queue );
}
}
finally {
consumed = true;
//clean the Synchronization per Transaction
//not needed stricto sensus but a cleaner approach and faster than the GC
- if (queuePerTransaction != null) queuePerTransaction.removeValue( this );
+ if ( queuePerTransaction != null ) {
+ queuePerTransaction.removeValue( this );
+ }
}
}
Modified: search/trunk/hibernate-search/src/main/java/org/hibernate/search/backend/impl/TransactionalWorker.java
===================================================================
--- search/trunk/hibernate-search/src/main/java/org/hibernate/search/backend/impl/TransactionalWorker.java 2010-10-14 11:08:07 UTC (rev 20830)
+++ search/trunk/hibernate-search/src/main/java/org/hibernate/search/backend/impl/TransactionalWorker.java 2010-10-14 12:56:59 UTC (rev 20831)
@@ -1,26 +1,25 @@
-/* $Id$
- *
+/*
* 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
+ *
+ * Copyright (c) 2010, 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
*/
package org.hibernate.search.backend.impl;
@@ -30,13 +29,13 @@
import org.slf4j.Logger;
import org.hibernate.search.SearchException;
-import org.hibernate.search.engine.SearchFactoryImplementor;
-import org.hibernate.search.spi.WorkerBuildContext;
import org.hibernate.search.backend.QueueingProcessor;
import org.hibernate.search.backend.TransactionContext;
import org.hibernate.search.backend.Work;
import org.hibernate.search.backend.WorkQueue;
import org.hibernate.search.backend.Worker;
+import org.hibernate.search.engine.SearchFactoryImplementor;
+import org.hibernate.search.spi.WorkerBuildContext;
import org.hibernate.search.util.HibernateHelper;
import org.hibernate.search.util.LoggerFactory;
import org.hibernate.search.util.WeakIdentityHashMap;
@@ -47,15 +46,15 @@
* <p/>
* When <code>hibernate.search.worker.type</code> is set to <code>async</code>
* the work is done in a separate thread (threads are pooled)
- *
+ *
* @author Emmanuel Bernard
*/
public class TransactionalWorker implements Worker {
-
+
//note: there is one Worker instance per SearchFactory, reused concurrently for all sessions.
-
+
private static final Logger log = LoggerFactory.make();
-
+
//this is being used from different threads, but doesn't need a
//synchronized map since for a given transaction, we have not concurrent access
protected final WeakIdentityHashMap<Object, Synchronization> synchronizationPerTransaction = new WeakIdentityHashMap<Object, Synchronization>();
@@ -65,12 +64,12 @@
public void performWork(Work<?> work, TransactionContext transactionContext) {
final Class<?> entityType = HibernateHelper.getClassFromWork( work );
if ( factory.getDocumentBuilderIndexedEntity( entityType ) == null
- && factory.getDocumentBuilderContainedEntity( entityType ) == null ) {
- throw new SearchException( "Unable to perform work. Entity Class is not @Indexed nor hosts @ContainedIn: " + entityType);
+ && factory.getDocumentBuilderContainedEntity( entityType ) == null ) {
+ throw new SearchException( "Unable to perform work. Entity Class is not @Indexed nor hosts @ContainedIn: " + entityType );
}
if ( transactionContext.isTransactionInProgress() ) {
Object transactionIdentifier = transactionContext.getTransactionIdentifier();
- PostTransactionWorkQueueSynchronization txSync = ( PostTransactionWorkQueueSynchronization )
+ PostTransactionWorkQueueSynchronization txSync = (PostTransactionWorkQueueSynchronization)
synchronizationPerTransaction.get( transactionIdentifier );
if ( txSync == null || txSync.isConsumed() ) {
txSync = new PostTransactionWorkQueueSynchronization(
@@ -84,8 +83,10 @@
else {
// this is a workaround: isTransactionInProgress should return "true"
// for correct configurations.
- log.warn( "It appears changes are being pushed to the index out of a transaction. " +
- "Register the IndexWorkFlushEventListener listener on flush to correctly manage Collections!" );
+ log.warn(
+ "It appears changes are being pushed to the index out of a transaction. " +
+ "Register the IndexWorkFlushEventListener listener on flush to correctly manage Collections!"
+ );
WorkQueue queue = new WorkQueue( 2 ); //one work can be split
queueingProcessor.add( work, queue );
queueingProcessor.prepareWorks( queue );
@@ -105,12 +106,11 @@
public void flushWorks(TransactionContext transactionContext) {
if ( transactionContext.isTransactionInProgress() ) {
Object transaction = transactionContext.getTransactionIdentifier();
- PostTransactionWorkQueueSynchronization txSync = ( PostTransactionWorkQueueSynchronization )
+ PostTransactionWorkQueueSynchronization txSync = (PostTransactionWorkQueueSynchronization)
synchronizationPerTransaction.get( transaction );
if ( txSync != null && !txSync.isConsumed() ) {
txSync.flushWorks();
}
}
}
-
}
13 years, 6 months
Hibernate SVN: r20830 - in tools/trunk/src: test/org/hibernate/tool/hbm2x/hbm2hbmxml and 1 other directories.
by hibernate-commits@lists.jboss.org
Author: dgeraskov
Date: 2010-10-14 07:08:07 -0400 (Thu, 14 Oct 2010)
New Revision: 20830
Modified:
tools/trunk/src/java/org/hibernate/tool/hbm2x/Hbm2DDLExporter.java
tools/trunk/src/test/org/hibernate/tool/hbm2x/hbm2hbmxml/AbstractTest.java
tools/trunk/src/test/org/hibernate/tool/hbm2x/hbm2hbmxml/BackrefTest.java
tools/trunk/src/test/org/hibernate/tool/hbm2x/hbm2hbmxml/CompositeElementTest.java
tools/trunk/src/test/org/hibernate/tool/hbm2x/hbm2hbmxml/DynamicComponentTest.java
tools/trunk/src/test/org/hibernate/tool/hbm2x/hbm2hbmxml/IdBagTest.java
tools/trunk/src/test/org/hibernate/tool/hbm2x/hbm2hbmxml/ListArrayTest.java
tools/trunk/src/test/org/hibernate/tool/hbm2x/hbm2hbmxml/MapAndAnyTest.java
tools/trunk/src/test/org/hibernate/tool/hbm2x/hbm2hbmxml/SetElementTest.java
tools/trunk/src/test/org/hibernate/tool/hbm2x/hbm2hbmxml/TypeParamsTest.java
tools/trunk/src/test/org/hibernate/tool/ide/completion/City.java
Log:
https://jira.jboss.org/browse/JBIDE-5735
License changed to LGPL.
Modified: tools/trunk/src/java/org/hibernate/tool/hbm2x/Hbm2DDLExporter.java
===================================================================
--- tools/trunk/src/java/org/hibernate/tool/hbm2x/Hbm2DDLExporter.java 2010-10-14 08:55:10 UTC (rev 20829)
+++ tools/trunk/src/java/org/hibernate/tool/hbm2x/Hbm2DDLExporter.java 2010-10-14 11:08:07 UTC (rev 20830)
@@ -1,13 +1,19 @@
-/*******************************************************************************
- * Copyright (c) 2007 Exadel, Inc. and Red Hat, Inc.
- * Distributed under license by Red Hat, Inc. All rights reserved.
- * This program is made available under the terms of the
- * Eclipse Public License v1.0 which accompanies this distribution,
- * and is available at http://www.eclipse.org/legal/epl-v10.html
+/*
+ * 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.
*
- * Contributors:
- * Exadel, Inc. and Red Hat, Inc. - initial API and implementation
- ******************************************************************************/
+ * 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.
+ */
package org.hibernate.tool.hbm2x;
import java.io.File;
Modified: tools/trunk/src/test/org/hibernate/tool/hbm2x/hbm2hbmxml/AbstractTest.java
===================================================================
--- tools/trunk/src/test/org/hibernate/tool/hbm2x/hbm2hbmxml/AbstractTest.java 2010-10-14 08:55:10 UTC (rev 20829)
+++ tools/trunk/src/test/org/hibernate/tool/hbm2x/hbm2hbmxml/AbstractTest.java 2010-10-14 11:08:07 UTC (rev 20830)
@@ -1,13 +1,19 @@
-/*******************************************************************************
- * Copyright (c) 2007-2009 Red Hat, Inc.
- * Distributed under license by Red Hat, Inc. All rights reserved.
- * This program is made available under the terms of the
- * Eclipse Public License v1.0 which accompanies this distribution,
- * and is available at http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributor:
- * Red Hat, Inc. - initial API and implementation
- ******************************************************************************/
+/*
+ * 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.
+ */
package org.hibernate.tool.hbm2x.hbm2hbmxml;
import java.io.File;
Modified: tools/trunk/src/test/org/hibernate/tool/hbm2x/hbm2hbmxml/BackrefTest.java
===================================================================
--- tools/trunk/src/test/org/hibernate/tool/hbm2x/hbm2hbmxml/BackrefTest.java 2010-10-14 08:55:10 UTC (rev 20829)
+++ tools/trunk/src/test/org/hibernate/tool/hbm2x/hbm2hbmxml/BackrefTest.java 2010-10-14 11:08:07 UTC (rev 20830)
@@ -1,13 +1,19 @@
-/*******************************************************************************
- * Copyright (c) 2007-2008 Red Hat, Inc.
- * Distributed under license by Red Hat, Inc. All rights reserved.
- * This program is made available under the terms of the
- * Eclipse Public License v1.0 which accompanies this distribution,
- * and is available at http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributor:
- * Red Hat, Inc. - initial API and implementation
- ******************************************************************************/
+/*
+ * 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.
+ */
package org.hibernate.tool.hbm2x.hbm2hbmxml;
import java.io.File;
Modified: tools/trunk/src/test/org/hibernate/tool/hbm2x/hbm2hbmxml/CompositeElementTest.java
===================================================================
--- tools/trunk/src/test/org/hibernate/tool/hbm2x/hbm2hbmxml/CompositeElementTest.java 2010-10-14 08:55:10 UTC (rev 20829)
+++ tools/trunk/src/test/org/hibernate/tool/hbm2x/hbm2hbmxml/CompositeElementTest.java 2010-10-14 11:08:07 UTC (rev 20830)
@@ -1,13 +1,19 @@
-/*******************************************************************************
- * Copyright (c) 2007-2008 Red Hat, Inc.
- * Distributed under license by Red Hat, Inc. All rights reserved.
- * This program is made available under the terms of the
- * Eclipse Public License v1.0 which accompanies this distribution,
- * and is available at http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributor:
- * Red Hat, Inc. - initial API and implementation
- ******************************************************************************/
+/*
+ * 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.
+ */
package org.hibernate.tool.hbm2x.hbm2hbmxml;
import java.io.File;
Modified: tools/trunk/src/test/org/hibernate/tool/hbm2x/hbm2hbmxml/DynamicComponentTest.java
===================================================================
--- tools/trunk/src/test/org/hibernate/tool/hbm2x/hbm2hbmxml/DynamicComponentTest.java 2010-10-14 08:55:10 UTC (rev 20829)
+++ tools/trunk/src/test/org/hibernate/tool/hbm2x/hbm2hbmxml/DynamicComponentTest.java 2010-10-14 11:08:07 UTC (rev 20830)
@@ -1,13 +1,19 @@
-/*******************************************************************************
- * Copyright (c) 2007-2008 Red Hat, Inc.
- * Distributed under license by Red Hat, Inc. All rights reserved.
- * This program is made available under the terms of the
- * Eclipse Public License v1.0 which accompanies this distribution,
- * and is available at http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributor:
- * Red Hat, Inc. - initial API and implementation
- ******************************************************************************/
+/*
+ * 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.
+ */
package org.hibernate.tool.hbm2x.hbm2hbmxml;
import java.io.File;
Modified: tools/trunk/src/test/org/hibernate/tool/hbm2x/hbm2hbmxml/IdBagTest.java
===================================================================
--- tools/trunk/src/test/org/hibernate/tool/hbm2x/hbm2hbmxml/IdBagTest.java 2010-10-14 08:55:10 UTC (rev 20829)
+++ tools/trunk/src/test/org/hibernate/tool/hbm2x/hbm2hbmxml/IdBagTest.java 2010-10-14 11:08:07 UTC (rev 20830)
@@ -1,13 +1,19 @@
-/*******************************************************************************
- * Copyright (c) 2007-2008 Red Hat, Inc.
- * Distributed under license by Red Hat, Inc. All rights reserved.
- * This program is made available under the terms of the
- * Eclipse Public License v1.0 which accompanies this distribution,
- * and is available at http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributor:
- * Red Hat, Inc. - initial API and implementation
- ******************************************************************************/
+/*
+ * 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.
+ */
package org.hibernate.tool.hbm2x.hbm2hbmxml;
import java.io.File;
Modified: tools/trunk/src/test/org/hibernate/tool/hbm2x/hbm2hbmxml/ListArrayTest.java
===================================================================
--- tools/trunk/src/test/org/hibernate/tool/hbm2x/hbm2hbmxml/ListArrayTest.java 2010-10-14 08:55:10 UTC (rev 20829)
+++ tools/trunk/src/test/org/hibernate/tool/hbm2x/hbm2hbmxml/ListArrayTest.java 2010-10-14 11:08:07 UTC (rev 20830)
@@ -1,13 +1,19 @@
-/*******************************************************************************
- * Copyright (c) 2007-2008 Red Hat, Inc.
- * Distributed under license by Red Hat, Inc. All rights reserved.
- * This program is made available under the terms of the
- * Eclipse Public License v1.0 which accompanies this distribution,
- * and is available at http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributor:
- * Red Hat, Inc. - initial API and implementation
- ******************************************************************************/
+/*
+ * 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.
+ */
package org.hibernate.tool.hbm2x.hbm2hbmxml;
import java.io.File;
Modified: tools/trunk/src/test/org/hibernate/tool/hbm2x/hbm2hbmxml/MapAndAnyTest.java
===================================================================
--- tools/trunk/src/test/org/hibernate/tool/hbm2x/hbm2hbmxml/MapAndAnyTest.java 2010-10-14 08:55:10 UTC (rev 20829)
+++ tools/trunk/src/test/org/hibernate/tool/hbm2x/hbm2hbmxml/MapAndAnyTest.java 2010-10-14 11:08:07 UTC (rev 20830)
@@ -1,13 +1,19 @@
-/*******************************************************************************
- * Copyright (c) 2007-2008 Red Hat, Inc.
- * Distributed under license by Red Hat, Inc. All rights reserved.
- * This program is made available under the terms of the
- * Eclipse Public License v1.0 which accompanies this distribution,
- * and is available at http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributor:
- * Red Hat, Inc. - initial API and implementation
- ******************************************************************************/
+/*
+ * 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.
+ */
package org.hibernate.tool.hbm2x.hbm2hbmxml;
import java.io.File;
Modified: tools/trunk/src/test/org/hibernate/tool/hbm2x/hbm2hbmxml/SetElementTest.java
===================================================================
--- tools/trunk/src/test/org/hibernate/tool/hbm2x/hbm2hbmxml/SetElementTest.java 2010-10-14 08:55:10 UTC (rev 20829)
+++ tools/trunk/src/test/org/hibernate/tool/hbm2x/hbm2hbmxml/SetElementTest.java 2010-10-14 11:08:07 UTC (rev 20830)
@@ -1,13 +1,19 @@
-/*******************************************************************************
- * Copyright (c) 2007-2008 Red Hat, Inc.
- * Distributed under license by Red Hat, Inc. All rights reserved.
- * This program is made available under the terms of the
- * Eclipse Public License v1.0 which accompanies this distribution,
- * and is available at http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributor:
- * Red Hat, Inc. - initial API and implementation
- ******************************************************************************/
+/*
+ * 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.
+ */
package org.hibernate.tool.hbm2x.hbm2hbmxml;
import java.io.File;
Modified: tools/trunk/src/test/org/hibernate/tool/hbm2x/hbm2hbmxml/TypeParamsTest.java
===================================================================
--- tools/trunk/src/test/org/hibernate/tool/hbm2x/hbm2hbmxml/TypeParamsTest.java 2010-10-14 08:55:10 UTC (rev 20829)
+++ tools/trunk/src/test/org/hibernate/tool/hbm2x/hbm2hbmxml/TypeParamsTest.java 2010-10-14 11:08:07 UTC (rev 20830)
@@ -1,13 +1,19 @@
-/*******************************************************************************
- * Copyright (c) 2007-2009 Red Hat, Inc.
- * Distributed under license by Red Hat, Inc. All rights reserved.
- * This program is made available under the terms of the
- * Eclipse Public License v1.0 which accompanies this distribution,
- * and is available at http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributor:
- * Red Hat, Inc. - initial API and implementation
- ******************************************************************************/
+/*
+ * 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.
+ */
package org.hibernate.tool.hbm2x.hbm2hbmxml;
import java.io.File;
Modified: tools/trunk/src/test/org/hibernate/tool/ide/completion/City.java
===================================================================
--- tools/trunk/src/test/org/hibernate/tool/ide/completion/City.java 2010-10-14 08:55:10 UTC (rev 20829)
+++ tools/trunk/src/test/org/hibernate/tool/ide/completion/City.java 2010-10-14 11:08:07 UTC (rev 20830)
@@ -1,13 +1,19 @@
-/*******************************************************************************
- * Copyright (c) 2010 Red Hat, Inc.
- * Distributed under license by Red Hat, Inc. All rights reserved.
- * This program is made available under the terms of the
- * Eclipse Public License v1.0 which accompanies this distribution,
- * and is available at http://www.eclipse.org/legal/epl-v10.html
+/*
+ * 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.
*
- * Contributor:
- * Red Hat, Inc. - initial API and implementation
- ******************************************************************************/
+ * 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.
+ */
package org.hibernate.tool.ide.completion;
/**
13 years, 6 months
Hibernate SVN: r20829 - search/trunk.
by hibernate-commits@lists.jboss.org
Author: hardy.ferentschik
Date: 2010-10-14 04:55:10 -0400 (Thu, 14 Oct 2010)
New Revision: 20829
Modified:
search/trunk/pom.xml
Log:
HSEARCH-600 Updated HCore version
Modified: search/trunk/pom.xml
===================================================================
--- search/trunk/pom.xml 2010-10-13 16:08:50 UTC (rev 20828)
+++ search/trunk/pom.xml 2010-10-14 08:55:10 UTC (rev 20829)
@@ -131,7 +131,7 @@
<properties>
<slf4jVersion>1.6.1</slf4jVersion>
<luceneVersion>3.0.2</luceneVersion>
- <hibernateVersion>3.6.0.Beta3</hibernateVersion>
+ <hibernateVersion>3.6.0.Final</hibernateVersion>
<hibernateCommonsAnnotationVersion>3.2.0.Final</hibernateCommonsAnnotationVersion>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
</properties>
13 years, 6 months
[hibernate/hibernate-core] 857524: HHH-5638 : move o.h.engine.jdbc.proxy to o.h.engin...
by noreply@github.com
Branch: refs/heads/master
Home: http://github.com/hibernate/hibernate-core
Commit: 8575247aafd8ad5c1fc60faac01963908cb11ab9
http://github.com/hibernate/hibernate-core/commit/8575247aafd8ad5c1fc60fa...
Author: Gail Badner <gbadner(a)redhat.com>
Date: 2010-10-13 (Wed, 13 Oct 2010)
Changed paths:
M hibernate-core/src/main/java/org/hibernate/engine/jdbc/batch/internal/AbstractBatchImpl.java
A hibernate-core/src/main/java/org/hibernate/engine/jdbc/internal/proxy/AbstractProxyHandler.java
A hibernate-core/src/main/java/org/hibernate/engine/jdbc/internal/proxy/AbstractResultSetProxyHandler.java
A hibernate-core/src/main/java/org/hibernate/engine/jdbc/internal/proxy/AbstractStatementProxyHandler.java
A hibernate-core/src/main/java/org/hibernate/engine/jdbc/internal/proxy/BasicStatementProxyHandler.java
A hibernate-core/src/main/java/org/hibernate/engine/jdbc/internal/proxy/ConnectionProxyHandler.java
A hibernate-core/src/main/java/org/hibernate/engine/jdbc/internal/proxy/DatabaseMetaDataProxyHandler.java
A hibernate-core/src/main/java/org/hibernate/engine/jdbc/internal/proxy/ImplicitResultSetProxyHandler.java
A hibernate-core/src/main/java/org/hibernate/engine/jdbc/internal/proxy/ImplicitStatementProxyHandler.java
A hibernate-core/src/main/java/org/hibernate/engine/jdbc/internal/proxy/PreparedStatementProxyHandler.java
A hibernate-core/src/main/java/org/hibernate/engine/jdbc/internal/proxy/ProxyBuilder.java
A hibernate-core/src/main/java/org/hibernate/engine/jdbc/internal/proxy/ResultSetProxyHandler.java
R hibernate-core/src/main/java/org/hibernate/engine/jdbc/proxy/AbstractProxyHandler.java
R hibernate-core/src/main/java/org/hibernate/engine/jdbc/proxy/AbstractResultSetProxyHandler.java
R hibernate-core/src/main/java/org/hibernate/engine/jdbc/proxy/AbstractStatementProxyHandler.java
R hibernate-core/src/main/java/org/hibernate/engine/jdbc/proxy/BasicStatementProxyHandler.java
R hibernate-core/src/main/java/org/hibernate/engine/jdbc/proxy/ConnectionProxyHandler.java
R hibernate-core/src/main/java/org/hibernate/engine/jdbc/proxy/DatabaseMetaDataProxyHandler.java
R hibernate-core/src/main/java/org/hibernate/engine/jdbc/proxy/ImplicitResultSetProxyHandler.java
R hibernate-core/src/main/java/org/hibernate/engine/jdbc/proxy/ImplicitStatementProxyHandler.java
R hibernate-core/src/main/java/org/hibernate/engine/jdbc/proxy/PreparedStatementProxyHandler.java
R hibernate-core/src/main/java/org/hibernate/engine/jdbc/proxy/ProxyBuilder.java
R hibernate-core/src/main/java/org/hibernate/engine/jdbc/proxy/ResultSetProxyHandler.java
M hibernate-core/src/test/java/org/hibernate/test/jdbc/proxies/AggressiveReleaseTest.java
M hibernate-core/src/test/java/org/hibernate/test/jdbc/proxies/BasicConnectionProxyTest.java
Log Message:
-----------
HHH-5638 : move o.h.engine.jdbc.proxy to o.h.engine.jdbc.internal.proxy
13 years, 6 months
[hibernate/hibernate-core] 7f91fb: HHH-5656 : Import ServicesRegistry bootstrap code ...
by noreply@github.com
Branch: refs/heads/master
Home: http://github.com/hibernate/hibernate-core
Commit: 7f91fb73d56de125958a65883cb137eb53a35573
http://github.com/hibernate/hibernate-core/commit/7f91fb73d56de125958a658...
Author: Gail Badner <gbadner(a)redhat.com>
Date: 2010-10-13 (Wed, 13 Oct 2010)
Changed paths:
A hibernate-core/src/main/java/org/hibernate/cfg/internal/ServicesRegistryBootstrap.java
A hibernate-core/src/test/java/org/hibernate/test/cfg/internal/ServiceBootstrappingTest.java
A hibernate-core/src/test/java/org/hibernate/test/cfg/internal/TestServicesRegistryBootstrapping.java
A hibernate-core/src/test/java/org/hibernate/test/common/BasicTestingJdbcServiceImpl.java
A hibernate-core/src/test/java/org/hibernate/test/common/ConnectionProviderBuilder.java
A hibernate-core/src/test/java/org/hibernate/test/jdbc/TypeInfoTest.java
A hibernate-core/src/test/java/org/hibernate/test/jdbc/proxies/AggressiveReleaseTest.java
A hibernate-core/src/test/java/org/hibernate/test/jdbc/proxies/BasicConnectionProxyTest.java
Log Message:
-----------
HHH-5656 : Import ServicesRegistry bootstrap code and service tests
13 years, 6 months
[hibernate/hibernate-core] 9aed0d: Updating pom versions to 3.6.0.Final
by noreply@github.com
Branch: refs/heads/3.6
Home: http://github.com/hibernate/hibernate-core
Commit: 9aed0daf4d96c0ca473a4e98b90e821a5b5a242a
http://github.com/hibernate/hibernate-core/commit/9aed0daf4d96c0ca473a4e9...
Author: Steve Ebersole <steve(a)hibernate.org>
Date: 2010-10-13 (Wed, 13 Oct 2010)
Changed paths:
M cache-ehcache/pom.xml
M cache-infinispan/pom.xml
M cache-jbosscache/pom.xml
M cache-oscache/pom.xml
M cache-swarmcache/pom.xml
M connection-c3p0/pom.xml
M connection-proxool/pom.xml
M core/pom.xml
M distribution/pom.xml
M documentation/devguide/pom.xml
M documentation/envers/pom.xml
M documentation/jbosscache2/pom.xml
M documentation/manual/pom.xml
M documentation/pom.xml
M documentation/quickstart/pom.xml
M documentation/quickstart/tutorials/annotations/pom.xml
M documentation/quickstart/tutorials/basic/pom.xml
M documentation/quickstart/tutorials/entitymanager/pom.xml
M documentation/quickstart/tutorials/envers/pom.xml
M documentation/quickstart/tutorials/pom.xml
M entitymanager/pom.xml
M envers/pom.xml
M jdbc3-testing/pom.xml
M jdbc4-testing/pom.xml
M parent/pom.xml
M pom.xml
M testing/pom.xml
M testsuite/pom.xml
Log Message:
-----------
Updating pom versions to 3.6.0.Final
Commit: 88f1bbd3ca89f70e4e24d750c0a411d9ef597e23
http://github.com/hibernate/hibernate-core/commit/88f1bbd3ca89f70e4e24d75...
Author: Steve Ebersole <steve(a)hibernate.org>
Date: 2010-10-13 (Wed, 13 Oct 2010)
Changed paths:
M cache-ehcache/pom.xml
M cache-infinispan/pom.xml
M cache-jbosscache/pom.xml
M cache-oscache/pom.xml
M cache-swarmcache/pom.xml
M connection-c3p0/pom.xml
M connection-proxool/pom.xml
M core/pom.xml
M distribution/pom.xml
M documentation/devguide/pom.xml
M documentation/envers/pom.xml
M documentation/jbosscache2/pom.xml
M documentation/manual/pom.xml
M documentation/pom.xml
M documentation/quickstart/pom.xml
M documentation/quickstart/tutorials/annotations/pom.xml
M documentation/quickstart/tutorials/basic/pom.xml
M documentation/quickstart/tutorials/entitymanager/pom.xml
M documentation/quickstart/tutorials/envers/pom.xml
M documentation/quickstart/tutorials/pom.xml
M entitymanager/pom.xml
M envers/pom.xml
M jdbc3-testing/pom.xml
M jdbc4-testing/pom.xml
M parent/pom.xml
M pom.xml
M testing/pom.xml
M testsuite/pom.xml
Log Message:
-----------
Updating pom versions to 3.6.1-SNAPSHOT
13 years, 6 months