Hibernate SVN: r15376 - in search/trunk/src: java/org/hibernate/search/backend/impl and 4 other directories.
by hibernate-commits＠lists.jboss.org
Author: epbernard
Date: 2008-10-22 22:15:50 -0400 (Wed, 22 Oct 2008)
New Revision: 15376
Added:
search/trunk/src/java/org/hibernate/search/engine/EntityState.java
search/trunk/src/test/org/hibernate/search/test/embedded/NonIndexedEntity.java
Modified:
search/trunk/src/java/org/hibernate/search/backend/WorkType.java
search/trunk/src/java/org/hibernate/search/backend/impl/BatchedQueueingProcessor.java
search/trunk/src/java/org/hibernate/search/engine/DocumentBuilder.java
search/trunk/src/java/org/hibernate/search/engine/SearchFactoryImplementor.java
search/trunk/src/java/org/hibernate/search/event/FullTextIndexEventListener.java
search/trunk/src/java/org/hibernate/search/impl/FullTextSessionImpl.java
search/trunk/src/java/org/hibernate/search/impl/SearchFactoryImpl.java
search/trunk/src/test/org/hibernate/search/test/embedded/EmbeddedTest.java
search/trunk/src/test/org/hibernate/search/test/embedded/State.java
Log:
HSEARCH-142 Entity not marked as @Indexed but using @ContainedIn are now properly indexed on update
Modified: search/trunk/src/java/org/hibernate/search/backend/WorkType.java
===================================================================
--- search/trunk/src/java/org/hibernate/search/backend/WorkType.java 2008-10-23 00:04:14 UTC (rev 15375)
+++ search/trunk/src/java/org/hibernate/search/backend/WorkType.java 2008-10-23 02:15:50 UTC (rev 15376)
@@ -10,23 +10,38 @@
* @author John Griffin
*/
public enum WorkType {
- ADD,
- UPDATE,
- DELETE,
- COLLECTION,
+ ADD(true),
+ UPDATE(true),
+ DELETE(false),
+ COLLECTION(true),
/**
* Used to remove a specific instance
* of a class from an index.
*/
- PURGE,
+ PURGE(false),
/**
* Used to remove all instances of a
* class from an index.
*/
- PURGE_ALL,
+ PURGE_ALL(false),
/**
* This type is used for batch indexing.
*/
- INDEX
+ INDEX(true);
+
+ private final boolean searchForContainers;
+
+ private WorkType(boolean searchForContainers) {
+ this.searchForContainers = searchForContainers;
+ }
+
+ /**
+ * When references are changed, either null or another one, we expect dirty checking to be triggered (both sides
+ * have to be updated)
+ * When the internal object is changed, we apply the {Add|Update}Work on containedIns
+ */
+ public boolean searchForContainers() {
+ return this.searchForContainers;
+ }
}
Modified: search/trunk/src/java/org/hibernate/search/backend/impl/BatchedQueueingProcessor.java
===================================================================
--- search/trunk/src/java/org/hibernate/search/backend/impl/BatchedQueueingProcessor.java 2008-10-23 00:04:14 UTC (rev 15375)
+++ search/trunk/src/java/org/hibernate/search/backend/impl/BatchedQueueingProcessor.java 2008-10-23 02:15:50 UTC (rev 15376)
@@ -146,6 +146,10 @@
work.getEntityClass() :
Hibernate.getClass( work.getEntity() );
DocumentBuilder<T> builder = searchFactoryImplementor.getDocumentBuilder( entityClass );
+ if ( builder == null ) {
+ //might be a entity contained in
+ builder = searchFactoryImplementor.getContainedInOnlyBuilder( entityClass );
+ }
if ( builder == null ) return;
//TODO remove casting when Work is Work<T>
builder.addWorkToQueue(entityClass, (T) work.getEntity(), work.getId(), work.getType(), luceneQueue, searchFactoryImplementor );
Modified: search/trunk/src/java/org/hibernate/search/engine/DocumentBuilder.java
===================================================================
--- search/trunk/src/java/org/hibernate/search/engine/DocumentBuilder.java 2008-10-23 00:04:14 UTC (rev 15375)
+++ search/trunk/src/java/org/hibernate/search/engine/DocumentBuilder.java 2008-10-23 02:15:50 UTC (rev 15376)
@@ -67,7 +67,6 @@
* @author Richard Hallier
* @author Hardy Ferentschik
*/
-@SuppressWarnings( "unchecked" )
public class DocumentBuilder<T> {
private static final Logger log = LoggerFactory.make();
@@ -90,14 +89,19 @@
//if composite id, use of (a, b) in ((1,2), (3,4)) fails on most database
private boolean safeFromTupleId;
private boolean idProvided = false;
+ private EntityState entityState;
public boolean isRoot() {
return isRoot;
}
+ /**
+ * used on an @Indexed entity
+ */
public DocumentBuilder(XClass clazz, InitContext context, DirectoryProvider[] directoryProviders,
IndexShardingStrategy shardingStrategy, ReflectionManager reflectionManager) {
+ this.entityState = EntityState.INDEXED;
this.beanClass = clazz;
this.directoryProviders = directoryProviders;
this.shardingStrategy = shardingStrategy;
@@ -105,6 +109,10 @@
this.reflectionManager = reflectionManager;
this.similarity = context.getDefaultSimilarity();
+ init( clazz, context, reflectionManager );
+ }
+
+ private void init(XClass clazz, InitContext context, ReflectionManager reflectionManager) {
if ( clazz == null ) throw new AssertionFailure( "Unable to build a DocumentBuilder with a null class" );
rootPropertiesMetadata.boost = getBoost( clazz );
rootPropertiesMetadata.analyzer = context.getDefaultAnalyzer();
@@ -113,7 +121,7 @@
initializeMembers( clazz, rootPropertiesMetadata, true, "", processedClasses, context );
//processedClasses.remove( clazz ); for the sake of completness
this.analyzer.setGlobalAnalyzer( rootPropertiesMetadata.analyzer );
- if ( idKeywordName == null ) {
+ if ( entityState == EntityState.INDEXED && idKeywordName == null ) {
// if no DocumentId then check if we have a ProvidedId instead
ProvidedId provided = findProvidedId( clazz, reflectionManager );
if ( provided == null ) throw new SearchException( "No document id in: " + clazz.getName() );
@@ -123,9 +131,28 @@
}
//if composite id, use of (a, b) in ((1,2)TwoWayString2FieldBridgeAdaptor, (3,4)) fails on most database
//a TwoWayString2FieldBridgeAdaptor is never a composite id
- safeFromTupleId = TwoWayString2FieldBridgeAdaptor.class.isAssignableFrom( idBridge.getClass() );
+ safeFromTupleId = entityState != EntityState.INDEXED || TwoWayString2FieldBridgeAdaptor.class.isAssignableFrom( idBridge.getClass() );
}
+ /**
+ * used on a non @Indexed entity
+ */
+ public DocumentBuilder(XClass clazz, InitContext context, ReflectionManager reflectionManager) {
+ this.entityState = EntityState.CONTAINED_IN_ONLY;
+ this.beanClass = clazz;
+ this.directoryProviders = null;
+ this.shardingStrategy = null;
+
+ //FIXME get rid of it when boost is stored?
+ this.reflectionManager = reflectionManager;
+ this.similarity = context.getDefaultSimilarity();
+
+ init( clazz, context, reflectionManager );
+ if (rootPropertiesMetadata.containedInGetters.size() == 0) {
+ this.entityState = EntityState.NON_INDEXABLE;
+ }
+ }
+
private ProvidedId findProvidedId(XClass clazz, ReflectionManager reflectionManager) {
ProvidedId id = null;
XClass currentClass = clazz;
@@ -502,83 +529,81 @@
}
//TODO could we use T instead of EntityClass?
- public void addWorkToQueue(Class entityClass, T entity, Serializable id, WorkType workType, List<LuceneWork> queue, SearchFactoryImplementor searchFactoryImplementor) {
+ public void addWorkToQueue(Class<T> entityClass, T entity, Serializable id, WorkType workType, List<LuceneWork> queue, SearchFactoryImplementor searchFactoryImplementor) {
//TODO with the caller loop we are in a n^2: optimize it using a HashMap for work recognition
- List<LuceneWork> toDelete = new ArrayList<LuceneWork>();
- boolean duplicateDelete = false;
- for (LuceneWork luceneWork : queue) {
- //avoid unecessary duplicated work
- if ( luceneWork.getEntityClass() == entityClass
- ) {
- Serializable currentId = luceneWork.getId();
- //currentId != null => either ADD or Delete work
- if ( currentId != null && currentId.equals( id ) ) { //find a way to use Type.equals(x,y)
- if (workType == WorkType.DELETE) { //TODO add PURGE?
- //DELETE should have precedence over any update before (HSEARCH-257)
- //if an Add work is here, remove it
- //if an other delete is here remember but still search for Add
- if (luceneWork instanceof AddLuceneWork) {
- toDelete.add( luceneWork );
+ if ( entityState == EntityState.INDEXED ) {
+ List<LuceneWork> toDelete = new ArrayList<LuceneWork>();
+ boolean duplicateDelete = false;
+ for (LuceneWork luceneWork : queue) {
+ //avoid unecessary duplicated work
+ if ( luceneWork.getEntityClass() == entityClass
+ ) {
+ Serializable currentId = luceneWork.getId();
+ //currentId != null => either ADD or Delete work
+ if ( currentId != null && currentId.equals( id ) ) { //find a way to use Type.equals(x,y)
+ if (workType == WorkType.DELETE) { //TODO add PURGE?
+ //DELETE should have precedence over any update before (HSEARCH-257)
+ //if an Add work is here, remove it
+ //if an other delete is here remember but still search for Add
+ if (luceneWork instanceof AddLuceneWork) {
+ toDelete.add( luceneWork );
+ }
+ else if (luceneWork instanceof DeleteLuceneWork) {
+ duplicateDelete = true;
+ }
}
- else if (luceneWork instanceof DeleteLuceneWork) {
- duplicateDelete = true;
+ else {
+ //we can safely say we are out, the other work is an ADD
+ return;
}
}
- else {
- //we can safely say we are out, the other work is an ADD
- return;
- }
+ //TODO do something to avoid multiple PURGE ALL and OPTIMIZE
}
- //TODO do something to avoid multiple PURGE ALL and OPTIMIZE
}
- }
- for ( LuceneWork luceneWork : toDelete ) {
- toDelete.remove( luceneWork );
- }
- if (duplicateDelete) return;
+ for ( LuceneWork luceneWork : toDelete ) {
+ toDelete.remove( luceneWork );
+ }
+ if (duplicateDelete) return;
- boolean searchForContainers = false;
- String idInString = idBridge.objectToString( id );
- if ( workType == WorkType.ADD ) {
- Document doc = getDocument( entity, id );
- queue.add( new AddLuceneWork( id, idInString, entityClass, doc ) );
- searchForContainers = true;
+ String idInString = idBridge.objectToString( id );
+ if ( workType == WorkType.ADD ) {
+ Document doc = getDocument( entity, id );
+ queue.add( new AddLuceneWork( id, idInString, entityClass, doc ) );
+ }
+ else if ( workType == WorkType.DELETE || workType == WorkType.PURGE ) {
+ queue.add( new DeleteLuceneWork( id, idInString, entityClass ) );
+ }
+ else if ( workType == WorkType.PURGE_ALL ) {
+ queue.add( new PurgeAllLuceneWork( entityClass ) );
+ }
+ else if ( workType == WorkType.UPDATE || workType == WorkType.COLLECTION ) {
+ Document doc = getDocument( entity, id );
+ /**
+ * even with Lucene 2.1, use of indexWriter to update is not an option
+ * We can only delete by term, and the index doesn't have a term that
+ * uniquely identify the entry.
+ * But essentially the optimization we are doing is the same Lucene is doing, the only extra cost is the
+ * double file opening.
+ */
+ queue.add( new DeleteLuceneWork( id, idInString, entityClass ) );
+ queue.add( new AddLuceneWork( id, idInString, entityClass, doc ) );
+ }
+ else if ( workType == WorkType.INDEX ) {
+ Document doc = getDocument( entity, id );
+ queue.add( new DeleteLuceneWork( id, idInString, entityClass ) );
+ queue.add( new AddLuceneWork( id, idInString, entityClass, doc, true ) );
+ }
+ else {
+ throw new AssertionFailure( "Unknown WorkType: " + workType );
+ }
}
- else if ( workType == WorkType.DELETE || workType == WorkType.PURGE ) {
- queue.add( new DeleteLuceneWork( id, idInString, entityClass ) );
- }
- else if ( workType == WorkType.PURGE_ALL ) {
- queue.add( new PurgeAllLuceneWork( entityClass ) );
- }
- else if ( workType == WorkType.UPDATE || workType == WorkType.COLLECTION ) {
- Document doc = getDocument( entity, id );
- /**
- * even with Lucene 2.1, use of indexWriter to update is not an option
- * We can only delete by term, and the index doesn't have a term that
- * uniquely identify the entry.
- * But essentially the optimization we are doing is the same Lucene is doing, the only extra cost is the
- * double file opening.
- */
- queue.add( new DeleteLuceneWork( id, idInString, entityClass ) );
- queue.add( new AddLuceneWork( id, idInString, entityClass, doc ) );
- searchForContainers = true;
- }
- else if ( workType == WorkType.INDEX ) {
- Document doc = getDocument( entity, id );
- queue.add( new DeleteLuceneWork( id, idInString, entityClass ) );
- queue.add( new AddLuceneWork( id, idInString, entityClass, doc, true ) );
- searchForContainers = true;
- }
- else {
- throw new AssertionFailure( "Unknown WorkType: " + workType );
- }
/**
* When references are changed, either null or another one, we expect dirty checking to be triggered (both sides
* have to be updated)
* When the internal object is changed, we apply the {Add|Update}Work on containedIns
*/
- if ( searchForContainers ) {
+ if ( workType.searchForContainers() ) {
processContainedIn( entity, queue, rootPropertiesMetadata, searchFactoryImplementor );
}
}
@@ -626,7 +651,7 @@
//do not walk through them
}
- private void processContainedInValue(Object value, List<LuceneWork> queue, Class valueClass,
+ private void processContainedInValue(Object value, List<LuceneWork> queue, Class<?> valueClass,
DocumentBuilder builder, SearchFactoryImplementor searchFactoryImplementor) {
Serializable id = (Serializable) builder.getMemberValue( value, builder.idGetter );
builder.addWorkToQueue( valueClass, value, id, WorkType.UPDATE, queue, searchFactoryImplementor );
@@ -634,7 +659,8 @@
public Document getDocument(T instance, Serializable id) {
Document doc = new Document();
- XClass instanceClass = reflectionManager.toXClass( Hibernate.getClass( instance ) );
+ final Class<?> entityType = Hibernate.getClass( instance );
+ XClass instanceClass = reflectionManager.toXClass( entityType );
if ( rootPropertiesMetadata.boost != null ) {
doc.setBoost( rootPropertiesMetadata.boost );
}
@@ -718,10 +744,16 @@
}
public DirectoryProvider[] getDirectoryProviders() {
+ if( entityState != EntityState.INDEXED ) {
+ throw new AssertionFailure("Contained in only entity: getDirectoryProvider should not have been called.");
+ }
return directoryProviders;
}
public IndexShardingStrategy getDirectoryProviderSelectionStrategy() {
+ if( entityState != EntityState.INDEXED ) {
+ throw new AssertionFailure("Contained in only entity: getDirectoryProviderSelectionStrategy should not have been called.");
+ }
return shardingStrategy;
}
@@ -825,6 +857,7 @@
}
public void postInitialize(Set<Class<?>> indexedClasses) {
+ if (entityState == EntityState.NON_INDEXABLE) throw new AssertionFailure("A non indexed entity is post processed");
//this method does not requires synchronization
Class plainClass = reflectionManager.toClass( beanClass );
Set<Class<?>> tempMappedSubclasses = new HashSet<Class<?>>();
@@ -844,6 +877,9 @@
}
}
+ public EntityState getEntityState() {
+ return entityState;
+ }
public Set<Class<?>> getMappedSubclasses() {
return mappedSubclasses;
Added: search/trunk/src/java/org/hibernate/search/engine/EntityState.java
===================================================================
--- search/trunk/src/java/org/hibernate/search/engine/EntityState.java (rev 0)
+++ search/trunk/src/java/org/hibernate/search/engine/EntityState.java 2008-10-23 02:15:50 UTC (rev 15376)
@@ -0,0 +1,12 @@
+package org.hibernate.search.engine;
+
+/**
+ * Entity state with regard to indexing possibilities
+ *
+ * @author Emmanuel Bernard
+ */
+public enum EntityState {
+ INDEXED,
+ CONTAINED_IN_ONLY,
+ NON_INDEXABLE
+}
Modified: search/trunk/src/java/org/hibernate/search/engine/SearchFactoryImplementor.java
===================================================================
--- search/trunk/src/java/org/hibernate/search/engine/SearchFactoryImplementor.java 2008-10-23 00:04:14 UTC (rev 15375)
+++ search/trunk/src/java/org/hibernate/search/engine/SearchFactoryImplementor.java 2008-10-23 02:15:50 UTC (rev 15376)
@@ -19,7 +19,6 @@
* @author Emmanuel Bernard
* @author Hardy Ferentschik
*/
-@SuppressWarnings("unchecked")
public interface SearchFactoryImplementor extends SearchFactory {
BackendQueueProcessorFactory getBackendQueueProcessorFactory();
@@ -29,6 +28,8 @@
<T> DocumentBuilder<T> getDocumentBuilder(Class<T> entityType);
+ <T> DocumentBuilder<T> getContainedInOnlyBuilder(Class<T> entityType);
+
Worker getWorker();
void addOptimizerStrategy(DirectoryProvider<?> provider, OptimizerStrategy optimizerStrategy);
Modified: search/trunk/src/java/org/hibernate/search/event/FullTextIndexEventListener.java
===================================================================
--- search/trunk/src/java/org/hibernate/search/event/FullTextIndexEventListener.java 2008-10-23 00:04:14 UTC (rev 15375)
+++ search/trunk/src/java/org/hibernate/search/event/FullTextIndexEventListener.java 2008-10-23 02:15:50 UTC (rev 15376)
@@ -72,17 +72,20 @@
}
public void onPostDelete(PostDeleteEvent event) {
- if ( used && searchFactoryImplementor.getDocumentBuilders().containsKey( event.getEntity().getClass() ) ) {
- processWork( event.getEntity(), event.getId(), WorkType.DELETE, event );
+ if ( used ) {
+ final Class<?> entityType = event.getEntity().getClass();
+ if ( searchFactoryImplementor.getDocumentBuilders().containsKey( entityType )
+ || searchFactoryImplementor.getContainedInOnlyBuilder( entityType ) != null ) {
+ processWork( event.getEntity(), event.getId(), WorkType.DELETE, event );
+ }
}
}
public void onPostInsert(PostInsertEvent event) {
if ( used ) {
final Object entity = event.getEntity();
- DocumentBuilder<?> builder = searchFactoryImplementor.getDocumentBuilder( entity.getClass() );
- //not strictly necessary but a small optimization
- if ( builder != null ) {
+ if ( searchFactoryImplementor.getDocumentBuilder( entity.getClass() ) != null
+ || searchFactoryImplementor.getContainedInOnlyBuilder( entity.getClass() ) != null ) {
Serializable id = event.getId();
processWork( entity, id, WorkType.ADD, event );
}
@@ -92,9 +95,8 @@
public void onPostUpdate(PostUpdateEvent event) {
if ( used ) {
final Object entity = event.getEntity();
- //not strictly necessary but a small optimization
- DocumentBuilder<?> builder = searchFactoryImplementor.getDocumentBuilder( entity.getClass() );
- if ( builder != null ) {
+ if ( searchFactoryImplementor.getDocumentBuilder( entity.getClass() ) != null
+ || searchFactoryImplementor.getContainedInOnlyBuilder( entity.getClass() ) != null ) {
Serializable id = event.getId();
processWork( entity, id, WorkType.UPDATE, event );
}
@@ -131,16 +133,19 @@
//Should log really but we don't know if we're interested in this collection for indexing
return;
}
- if ( used && searchFactoryImplementor.getDocumentBuilders().containsKey( entity.getClass() ) ) {
- Serializable id = getId( entity, event );
- if ( id == null ) {
- log.warn(
- "Unable to reindex entity on collection change, id cannot be extracted: {}",
- event.getAffectedOwnerEntityName()
- );
- return;
+ if ( used ) {
+ if ( searchFactoryImplementor.getDocumentBuilder( entity.getClass() ) != null
+ || searchFactoryImplementor.getContainedInOnlyBuilder( entity.getClass() ) != null ) {
+ Serializable id = getId( entity, event );
+ if ( id == null ) {
+ log.warn(
+ "Unable to reindex entity on collection change, id cannot be extracted: {}",
+ event.getAffectedOwnerEntityName()
+ );
+ return;
+ }
+ processWork( entity, id, WorkType.COLLECTION, event );
}
- processWork( entity, id, WorkType.COLLECTION, event );
}
}
Modified: search/trunk/src/java/org/hibernate/search/impl/FullTextSessionImpl.java
===================================================================
--- search/trunk/src/java/org/hibernate/search/impl/FullTextSessionImpl.java 2008-10-23 00:04:14 UTC (rev 15375)
+++ search/trunk/src/java/org/hibernate/search/impl/FullTextSessionImpl.java 2008-10-23 02:15:50 UTC (rev 15376)
@@ -112,9 +112,10 @@
// not strictly necessary but a small optimization plus let's make sure the
// client didn't mess something up.
- DocumentBuilder<?> builder = searchFactoryImplementor.getDocumentBuilder( entityType );
- if ( builder == null ) {
- throw new IllegalArgumentException( entityType.getName() + " is not a mapped entity (don't forget to add @Indexed)" );
+ if ( searchFactoryImplementor.getDocumentBuilder( entityType ) == null
+ && searchFactoryImplementor.getContainedInOnlyBuilder( entityType ) == null ) {
+ throw new IllegalArgumentException( "Entity to index is not an @Indexed entity nor @ContainedIn another entity: "
+ + entityType.getName() );
}
WorkType type;
if ( id == null ) {
@@ -142,9 +143,10 @@
//TODO cache that at the FTSession level
SearchFactoryImplementor searchFactoryImplementor = getSearchFactoryImplementor();
//not strictly necessary but a small optimization
- DocumentBuilder<?> builder = searchFactoryImplementor.getDocumentBuilder( clazz );
- if ( builder == null ) {
- throw new IllegalArgumentException( "Entity to index not an @Indexed entity: " + entity.getClass().getName() );
+ if ( searchFactoryImplementor.getDocumentBuilder( clazz ) == null
+ && searchFactoryImplementor.getContainedInOnlyBuilder( clazz ) == null ) {
+ throw new IllegalArgumentException( "Entity to index is not an @Indexed entity nor @ContainedIn another entity: "
+ + entity.getClass().getName() );
}
Serializable id = session.getIdentifier( entity );
Work work = new Work( entity, id, WorkType.INDEX );
Modified: search/trunk/src/java/org/hibernate/search/impl/SearchFactoryImpl.java
===================================================================
--- search/trunk/src/java/org/hibernate/search/impl/SearchFactoryImpl.java 2008-10-23 00:04:14 UTC (rev 15375)
+++ search/trunk/src/java/org/hibernate/search/impl/SearchFactoryImpl.java 2008-10-23 02:15:50 UTC (rev 15376)
@@ -42,6 +42,7 @@
import org.hibernate.search.engine.DocumentBuilder;
import org.hibernate.search.engine.FilterDef;
import org.hibernate.search.engine.SearchFactoryImplementor;
+import org.hibernate.search.engine.EntityState;
import org.hibernate.search.filter.CachingWrapperFilter;
import org.hibernate.search.filter.FilterCachingStrategy;
import org.hibernate.search.filter.MRUFilterCachingStrategy;
@@ -66,6 +67,7 @@
private static final Logger log = LoggerFactory.make();
private final Map<Class<?>, DocumentBuilder<?>> documentBuilders = new HashMap<Class<?>, DocumentBuilder<?>>();
+ private final Map<Class<?>, DocumentBuilder<?>> containedInOnlyBuilders = new HashMap<Class<?>, DocumentBuilder<?>>();
//keep track of the index modifiers per DirectoryProvider since multiple entity can use the same directory provider
private final Map<DirectoryProvider<?>, DirectoryProviderData> dirProviderData = new HashMap<DirectoryProvider<?>, DirectoryProviderData>();
private final Worker worker;
@@ -117,6 +119,10 @@
for (DocumentBuilder builder : documentBuilders.values()) {
builder.postInitialize( indexedClasses );
}
+ //not really necessary today
+ for (DocumentBuilder builder : containedInOnlyBuilders.values()) {
+ builder.postInitialize( indexedClasses );
+ }
this.worker = WorkerFactory.createWorker( cfg, this );
this.readerProvider = ReaderProviderFactory.createReaderProvider( cfg, this );
this.filterCachingStrategy = buildFilterCachingStrategy( cfg.getProperties() );
@@ -244,9 +250,16 @@
@SuppressWarnings( "unckecked" )
public <T> DocumentBuilder<T> getDocumentBuilder(Class<T> entityType) {
+ if (barrier != 0) { } //read barrier
return ( DocumentBuilder<T> ) documentBuilders.get( entityType );
}
+ @SuppressWarnings( "unckecked" )
+ public <T> DocumentBuilder<T> getContainedInOnlyBuilder(Class<T> entityType) {
+ if (barrier != 0) { } //read barrier
+ return ( DocumentBuilder<T> ) containedInOnlyBuilders.get( entityType );
+ }
+
public Set<DirectoryProvider<?>> getDirectoryProviders() {
if (barrier != 0) { } //read barrier
return this.dirProviderData.keySet();
@@ -343,14 +356,26 @@
if ( mappedXClass != null) {
if ( mappedXClass.isAnnotationPresent( Indexed.class ) ) {
DirectoryProviderFactory.DirectoryProviders providers = factory.createDirectoryProviders( mappedXClass, cfg, this, reflectionManager );
-
- final DocumentBuilder<Object> documentBuilder = new DocumentBuilder<Object>(
+ //FIXME DocumentBuilder needs to be built by a helper method receiving Class<T> to infer T properly
+ //XClass unfortunately is not (yet) genericized: TODO?
+ final DocumentBuilder<?> documentBuilder = new DocumentBuilder(
mappedXClass, context, providers.getProviders(), providers.getSelectionStrategy(),
reflectionManager
);
documentBuilders.put( mappedClass, documentBuilder );
}
+ else {
+ //FIXME DocumentBuilder needs to be built by a helper method receiving Class<T> to infer T properly
+ //XClass unfortunately is not (yet) genericized: TODO?
+ final DocumentBuilder<?> documentBuilder = new DocumentBuilder(
+ mappedXClass, context, reflectionManager
+ );
+ //TODO enhance that, I don't like to expose EntityState
+ if ( documentBuilder.getEntityState() != EntityState.NON_INDEXABLE ) {
+ containedInOnlyBuilders.put( mappedClass, documentBuilder );
+ }
+ }
bindFilterDefs(mappedXClass);
//TODO should analyzer def for classes at tyher sqme level???
}
Modified: search/trunk/src/test/org/hibernate/search/test/embedded/EmbeddedTest.java
===================================================================
--- search/trunk/src/test/org/hibernate/search/test/embedded/EmbeddedTest.java 2008-10-23 00:04:14 UTC (rev 15375)
+++ search/trunk/src/test/org/hibernate/search/test/embedded/EmbeddedTest.java 2008-10-23 02:15:50 UTC (rev 15376)
@@ -264,7 +264,6 @@
* Tests that updating an indexed embedded object updates the Lucene index as well.
*
* @throws Exception in case the test fails
- * @see HSEARCH-142
*/
public void testEmbeddedObjectUpdate() throws Exception {
@@ -316,6 +315,7 @@
protected Class<?>[] getMappings() {
return new Class[] { Tower.class, Address.class, Product.class, Order.class, Author.class, Country.class,
- State.class, StateCandidate.class };
+ State.class, StateCandidate.class, NonIndexedEntity.class
+ };
}
}
Added: search/trunk/src/test/org/hibernate/search/test/embedded/NonIndexedEntity.java
===================================================================
--- search/trunk/src/test/org/hibernate/search/test/embedded/NonIndexedEntity.java (rev 0)
+++ search/trunk/src/test/org/hibernate/search/test/embedded/NonIndexedEntity.java 2008-10-23 02:15:50 UTC (rev 15376)
@@ -0,0 +1,23 @@
+package org.hibernate.search.test.embedded;
+
+import javax.persistence.Entity;
+import javax.persistence.Id;
+import javax.persistence.GeneratedValue;
+
+/**
+ * @author Emmanuel Bernard
+ */
+@Entity
+public class NonIndexedEntity {
+ @Id
+ @GeneratedValue
+ private int id;
+
+ public int getId() {
+ return id;
+ }
+
+ public void setId(int id) {
+ this.id = id;
+ }
+}
Modified: search/trunk/src/test/org/hibernate/search/test/embedded/State.java
===================================================================
--- search/trunk/src/test/org/hibernate/search/test/embedded/State.java 2008-10-23 00:04:14 UTC (rev 15375)
+++ search/trunk/src/test/org/hibernate/search/test/embedded/State.java 2008-10-23 02:15:50 UTC (rev 15376)
@@ -15,7 +15,6 @@
* @author Hardy Ferentschik
*/
@Entity
-@Indexed // @indexed should not be needed, see HSEARCH-142 and testEmbeddedObjectUpdate()
public class State {
@Id
@DocumentId
15 years, 7 months
- 1
- 0
Hibernate SVN: r15375 - search/trunk/src/java/org/hibernate/search/annotations.
by hibernate-commits＠lists.jboss.org
Author: epbernard
Date: 2008-10-22 20:04:14 -0400 (Wed, 22 Oct 2008)
New Revision: 15375
Modified:
search/trunk/src/java/org/hibernate/search/annotations/IndexedEmbedded.java
Log:
HSEARCH-282 more use of generics and less warnings
Modified: search/trunk/src/java/org/hibernate/search/annotations/IndexedEmbedded.java
===================================================================
--- search/trunk/src/java/org/hibernate/search/annotations/IndexedEmbedded.java 2008-10-22 21:36:38 UTC (rev 15374)
+++ search/trunk/src/java/org/hibernate/search/annotations/IndexedEmbedded.java 2008-10-23 00:04:14 UTC (rev 15375)
@@ -32,5 +32,5 @@
/**
* Overrides the type of an association. If a collection, overrides the type of the collection generics
*/
- Class targetElement() default void.class;
+ Class<?> targetElement() default void.class;
}
15 years, 7 months
- 1
- 0
Hibernate SVN: r15374 - in search/trunk/src: java/org/hibernate/search/backend and 9 other directories.
by hibernate-commits＠lists.jboss.org
Author: epbernard
Date: 2008-10-22 17:36:38 -0400 (Wed, 22 Oct 2008)
New Revision: 15374
Modified:
search/trunk/src/java/org/hibernate/search/FullTextSession.java
search/trunk/src/java/org/hibernate/search/SearchFactory.java
search/trunk/src/java/org/hibernate/search/backend/Workspace.java
search/trunk/src/java/org/hibernate/search/backend/impl/BatchedQueueingProcessor.java
search/trunk/src/java/org/hibernate/search/backend/impl/lucene/LuceneBackendQueueProcessor.java
search/trunk/src/java/org/hibernate/search/backend/impl/lucene/works/DeleteWorkDelegate.java
search/trunk/src/java/org/hibernate/search/engine/DocumentBuilder.java
search/trunk/src/java/org/hibernate/search/engine/MultiClassesQueryLoader.java
search/trunk/src/java/org/hibernate/search/engine/ObjectLoaderHelper.java
search/trunk/src/java/org/hibernate/search/engine/SearchFactoryImplementor.java
search/trunk/src/java/org/hibernate/search/event/FullTextIndexEventListener.java
search/trunk/src/java/org/hibernate/search/impl/FullTextSessionImpl.java
search/trunk/src/java/org/hibernate/search/impl/SearchFactoryImpl.java
search/trunk/src/java/org/hibernate/search/query/FullTextQueryImpl.java
search/trunk/src/java/org/hibernate/search/reader/SharedReaderProvider.java
search/trunk/src/java/org/hibernate/search/reader/SharingBufferReaderProvider.java
search/trunk/src/test/org/hibernate/search/test/configuration/ShardsConfigurationTest.java
Log:
HSEARCH-282 more use of generics and less warnings
Modified: search/trunk/src/java/org/hibernate/search/FullTextSession.java
===================================================================
--- search/trunk/src/java/org/hibernate/search/FullTextSession.java 2008-10-22 18:39:37 UTC (rev 15373)
+++ search/trunk/src/java/org/hibernate/search/FullTextSession.java 2008-10-22 21:36:38 UTC (rev 15374)
@@ -16,7 +16,7 @@
* of type <code>entities</code> and their respective subclasses.
* If no entity is provided, no type filtering is done.
*/
- FullTextQuery createFullTextQuery(org.apache.lucene.search.Query luceneQuery, Class... entities);
+ FullTextQuery createFullTextQuery(org.apache.lucene.search.Query luceneQuery, Class<?>... entities);
/**
* Force the (re)indexing of a given <b>managed</b> object.
@@ -41,7 +41,7 @@
*
* @throws IllegalArgumentException if entityType is null or not an @Indexed entity type
*/
- public void purge(Class entityType, Serializable id);
+ public void purge(Class<?> entityType, Serializable id);
/**
* Remove all entities from a particular class of an index.
@@ -49,7 +49,7 @@
* @param entityType
* @throws IllegalArgumentException if entityType is null or not an @Indexed entity type
*/
- public void purgeAll(Class entityType);
+ public void purgeAll(Class<?> entityType);
/**
* flush full text changes to the index
Modified: search/trunk/src/java/org/hibernate/search/SearchFactory.java
===================================================================
--- search/trunk/src/java/org/hibernate/search/SearchFactory.java 2008-10-22 18:39:37 UTC (rev 15373)
+++ search/trunk/src/java/org/hibernate/search/SearchFactory.java 2008-10-22 21:36:38 UTC (rev 15374)
@@ -23,7 +23,7 @@
* But if the given entity is configured to use sharded indexes, then multiple
* elements will be returned. In this case all of them should be considered.
*/
- DirectoryProvider[] getDirectoryProviders(Class entity);
+ DirectoryProvider[] getDirectoryProviders(Class<?> entity);
/**
* Optimize all indexes
@@ -51,5 +51,5 @@
* @throws IllegalArgumentException in case <code>clazz == null</code> or the specified
* class is not an indexed entity.
*/
- Analyzer getAnalyzer(Class clazz);
+ Analyzer getAnalyzer(Class<?> clazz);
}
Modified: search/trunk/src/java/org/hibernate/search/backend/Workspace.java
===================================================================
--- search/trunk/src/java/org/hibernate/search/backend/Workspace.java 2008-10-22 18:39:37 UTC (rev 15373)
+++ search/trunk/src/java/org/hibernate/search/backend/Workspace.java 2008-10-22 21:36:38 UTC (rev 15374)
@@ -49,7 +49,7 @@
private final DirectoryProvider directoryProvider;
private final OptimizerStrategy optimizerStrategy;
private final ReentrantLock lock;
- private final Set<Class> entitiesInDirectory;
+ private final Set<Class<?>> entitiesInDirectory;
private final LuceneIndexingParameters indexingParams;
// variable state:
@@ -69,7 +69,7 @@
*/
private final AtomicLong operations = new AtomicLong( 0L );
- public Workspace(SearchFactoryImplementor searchFactoryImplementor, DirectoryProvider provider) {
+ public Workspace(SearchFactoryImplementor searchFactoryImplementor, DirectoryProvider<?> provider) {
this.searchFactoryImplementor = searchFactoryImplementor;
this.directoryProvider = provider;
this.optimizerStrategy = searchFactoryImplementor.getOptimizerStrategy( directoryProvider );
@@ -78,8 +78,8 @@
this.lock = searchFactoryImplementor.getDirectoryProviderLock( provider );
}
- public DocumentBuilder getDocumentBuilder(Class entity) {
- return searchFactoryImplementor.getDocumentBuilders().get( entity );
+ public <T> DocumentBuilder<T> getDocumentBuilder(Class<T> entity) {
+ return searchFactoryImplementor.getDocumentBuilder( entity );
}
/**
@@ -173,6 +173,7 @@
return writer;
try {
// don't care about the Analyzer as it will be selected during usage of IndexWriter.
+ //FIXME use the non deprecated constructor => requires to call #Commit()
writer = new IndexWriter( directoryProvider.getDirectory(), SIMPLE_ANALYZER, false ); // has been created at init time
indexingParams.applyToWriter( writer, batchmode );
log.trace( "IndexWriter opened" );
@@ -220,7 +221,7 @@
* @return The unmodifiable set of entity types being indexed
* in the underlying Lucene Directory backing this Workspace.
*/
- public Set<Class> getEntitiesInDirectory() {
+ public Set<Class<?>> getEntitiesInDirectory() {
return entitiesInDirectory;
}
Modified: search/trunk/src/java/org/hibernate/search/backend/impl/BatchedQueueingProcessor.java
===================================================================
--- search/trunk/src/java/org/hibernate/search/backend/impl/BatchedQueueingProcessor.java 2008-10-22 18:39:37 UTC (rev 15373)
+++ search/trunk/src/java/org/hibernate/search/backend/impl/BatchedQueueingProcessor.java 2008-10-22 21:36:38 UTC (rev 15374)
@@ -134,17 +134,23 @@
if ( work != null) {
if ( layer.isRightLayer( work.getType() ) ) {
queue.set( i, null ); // help GC and avoid 2 loaded queues in memory
- Class entityClass = work.getEntityClass() != null ?
- work.getEntityClass() :
- Hibernate.getClass( work.getEntity() );
- DocumentBuilder<Object> builder = searchFactoryImplementor.getDocumentBuilders().get( entityClass );
- if ( builder == null ) continue; //or exception?
- builder.addWorkToQueue(entityClass, work.getEntity(), work.getId(), work.getType(), luceneQueue, searchFactoryImplementor );
+ addWorkToBuilderQueue( luceneQueue, work );
}
}
}
}
+ private <T> void addWorkToBuilderQueue(List<LuceneWork> luceneQueue, Work work) {
+ @SuppressWarnings( "unchecked" )
+ Class<T> entityClass = work.getEntityClass() != null ?
+ work.getEntityClass() :
+ Hibernate.getClass( work.getEntity() );
+ DocumentBuilder<T> builder = searchFactoryImplementor.getDocumentBuilder( entityClass );
+ if ( builder == null ) return;
+ //TODO remove casting when Work is Work<T>
+ builder.addWorkToQueue(entityClass, (T) work.getEntity(), work.getId(), work.getType(), luceneQueue, searchFactoryImplementor );
+ }
+
//TODO implements parallel batchWorkers (one per Directory)
public void performWorks(WorkQueue workQueue) {
Runnable processor = backendQueueProcessorFactory.getProcessor( workQueue.getSealedQueue() );
Modified: search/trunk/src/java/org/hibernate/search/backend/impl/lucene/LuceneBackendQueueProcessor.java
===================================================================
--- search/trunk/src/java/org/hibernate/search/backend/impl/lucene/LuceneBackendQueueProcessor.java 2008-10-22 18:39:37 UTC (rev 15373)
+++ search/trunk/src/java/org/hibernate/search/backend/impl/lucene/LuceneBackendQueueProcessor.java 2008-10-22 21:36:38 UTC (rev 15374)
@@ -38,7 +38,8 @@
QueueProcessors processors = new QueueProcessors( visitorsMap );
// divide tasks in parts, adding to QueueProcessors by affected Directory.
for ( LuceneWork work : queue ) {
- DocumentBuilder documentBuilder = searchFactoryImplementor.getDocumentBuilders().get( work.getEntityClass() );
+ final Class<?> entityType = work.getEntityClass();
+ DocumentBuilder<?> documentBuilder = searchFactoryImplementor.getDocumentBuilder( entityType );
IndexShardingStrategy shardingStrategy = documentBuilder.getDirectoryProviderSelectionStrategy();
work.getWorkDelegate( providerSelectionVisitor ).addAsPayLoadsToQueue( work, shardingStrategy, processors );
}
Modified: search/trunk/src/java/org/hibernate/search/backend/impl/lucene/works/DeleteWorkDelegate.java
===================================================================
--- search/trunk/src/java/org/hibernate/search/backend/impl/lucene/works/DeleteWorkDelegate.java 2008-10-22 18:39:37 UTC (rev 15373)
+++ search/trunk/src/java/org/hibernate/search/backend/impl/lucene/works/DeleteWorkDelegate.java 2008-10-22 21:36:38 UTC (rev 15374)
@@ -42,15 +42,16 @@
}
public void performWork(LuceneWork work, IndexWriter writer) {
- log.trace( "Removing {}#{} by query.", work.getEntityClass(), work.getId() );
- DocumentBuilder builder = workspace.getDocumentBuilder( work.getEntityClass() );
+ final Class<?> entityType = work.getEntityClass();
+ log.trace( "Removing {}#{} by query.", entityType, work.getId() );
+ DocumentBuilder<?> builder = workspace.getDocumentBuilder( entityType );
BooleanQuery entityDeletionQuery = new BooleanQuery();
TermQuery idQueryTerm = new TermQuery( builder.getTerm( work.getId() ) );
entityDeletionQuery.add( idQueryTerm, BooleanClause.Occur.MUST );
- Term classNameQueryTerm = new Term( DocumentBuilder.CLASS_FIELDNAME, work.getEntityClass().getName() );
+ Term classNameQueryTerm = new Term( DocumentBuilder.CLASS_FIELDNAME, entityType.getName() );
TermQuery classNameQuery = new TermQuery( classNameQueryTerm );
entityDeletionQuery.add( classNameQuery, BooleanClause.Occur.MUST );
@@ -58,7 +59,7 @@
writer.deleteDocuments( entityDeletionQuery );
}
catch ( Exception e ) {
- String message = "Unable to remove " + work.getEntityClass() + "#" + work.getId() + " from index.";
+ String message = "Unable to remove " + entityType + "#" + work.getId() + " from index.";
throw new SearchException( message, e );
}
}
@@ -75,15 +76,16 @@
* We can only delete by term, and the index doesn't have a term that
* uniquely identify the entry. See logic below
*/
- log.trace( "Removing {}#{} from Lucene index.", work.getEntityClass(), work.getId() );
- DocumentBuilder builder = workspace.getDocumentBuilder( work.getEntityClass() );
+ final Class<?> entityType = work.getEntityClass();
+ log.trace( "Removing {}#{} from Lucene index.", entityType, work.getId() );
+ DocumentBuilder<?> builder = workspace.getDocumentBuilder( entityType );
Term term = builder.getTerm( work.getId() );
TermDocs termDocs = null;
try {
//TODO is there a faster way?
//TODO include TermDocs into the workspace?
termDocs = reader.termDocs( term );
- String entityName = work.getEntityClass().getName();
+ String entityName = entityType.getName();
while ( termDocs.next() ) {
int docIndex = termDocs.doc();
if ( entityName.equals( reader.document( docIndex ).get( DocumentBuilder.CLASS_FIELDNAME ) ) ) {
@@ -97,7 +99,7 @@
catch ( Exception e ) {
throw new SearchException(
"Unable to remove from Lucene index: "
- + work.getEntityClass() + "#" + work.getId(), e
+ + entityType + "#" + work.getId(), e
);
}
finally {
Modified: search/trunk/src/java/org/hibernate/search/engine/DocumentBuilder.java
===================================================================
--- search/trunk/src/java/org/hibernate/search/engine/DocumentBuilder.java 2008-10-22 18:39:37 UTC (rev 15373)
+++ search/trunk/src/java/org/hibernate/search/engine/DocumentBuilder.java 2008-10-22 21:36:38 UTC (rev 15374)
@@ -80,7 +80,7 @@
private Float idBoost;
public static final String CLASS_FIELDNAME = "_hibernate_class";
private TwoWayFieldBridge idBridge;
- private Set<Class> mappedSubclasses = new HashSet<Class>();
+ private Set<Class<?>> mappedSubclasses = new HashSet<Class<?>>();
private ReflectionManager reflectionManager;
private int level = 0;
private int maxLevel = Integer.MAX_VALUE;
@@ -592,8 +592,8 @@
if ( member.isArray() ) {
for (Object arrayValue : (Object[]) value) {
//highly inneficient but safe wrt the actual targeted class
- Class valueClass = Hibernate.getClass( arrayValue );
- DocumentBuilder builder = searchFactoryImplementor.getDocumentBuilders().get( valueClass );
+ Class<?> valueClass = Hibernate.getClass( arrayValue );
+ DocumentBuilder<?> builder = searchFactoryImplementor.getDocumentBuilder( valueClass );
if ( builder == null ) continue;
processContainedInValue( arrayValue, queue, valueClass, builder, searchFactoryImplementor );
}
@@ -609,15 +609,15 @@
}
for (Object collectionValue : collection) {
//highly inneficient but safe wrt the actual targeted class
- Class valueClass = Hibernate.getClass( collectionValue );
- DocumentBuilder builder = searchFactoryImplementor.getDocumentBuilders().get( valueClass );
+ Class<?> valueClass = Hibernate.getClass( collectionValue );
+ DocumentBuilder<?> builder = searchFactoryImplementor.getDocumentBuilder( valueClass );
if ( builder == null ) continue;
processContainedInValue( collectionValue, queue, valueClass, builder, searchFactoryImplementor );
}
}
else {
- Class valueClass = Hibernate.getClass( value );
- DocumentBuilder builder = searchFactoryImplementor.getDocumentBuilders().get( valueClass );
+ Class<?> valueClass = Hibernate.getClass( value );
+ DocumentBuilder<?> builder = searchFactoryImplementor.getDocumentBuilder( valueClass );
if ( builder == null ) continue;
processContainedInValue( value, queue, valueClass, builder, searchFactoryImplementor );
}
@@ -753,14 +753,14 @@
}
}
- public static Serializable getDocumentId(SearchFactoryImplementor searchFactoryImplementor, Class clazz, Document document) {
- DocumentBuilder builder = searchFactoryImplementor.getDocumentBuilders().get( clazz );
+ public static Serializable getDocumentId(SearchFactoryImplementor searchFactoryImplementor, Class<?> clazz, Document document) {
+ DocumentBuilder<?> builder = searchFactoryImplementor.getDocumentBuilder( clazz );
if ( builder == null ) throw new SearchException( "No Lucene configuration set up for: " + clazz.getName() );
return (Serializable) builder.getIdBridge().get( builder.getIdKeywordName(), document );
}
- public static Object[] getDocumentFields(SearchFactoryImplementor searchFactoryImplementor, Class clazz, Document document, String[] fields) {
- DocumentBuilder builder = searchFactoryImplementor.getDocumentBuilders().get( clazz );
+ public static Object[] getDocumentFields(SearchFactoryImplementor searchFactoryImplementor, Class<?> clazz, Document document, String[] fields) {
+ DocumentBuilder<?> builder = searchFactoryImplementor.getDocumentBuilder( clazz );
if ( builder == null ) throw new SearchException( "No Lucene configuration set up for: " + clazz.getName() );
final int fieldNbr = fields.length;
Object[] result = new Object[fieldNbr];
@@ -824,10 +824,10 @@
return -1;
}
- public void postInitialize(Set<Class> indexedClasses) {
+ public void postInitialize(Set<Class<?>> indexedClasses) {
//this method does not requires synchronization
Class plainClass = reflectionManager.toClass( beanClass );
- Set<Class> tempMappedSubclasses = new HashSet<Class>();
+ Set<Class<?>> tempMappedSubclasses = new HashSet<Class<?>>();
//together with the caller this creates a o(2), but I think it's still faster than create the up hierarchy for each class
for (Class currentClass : indexedClasses) {
if ( plainClass.isAssignableFrom( currentClass ) ) tempMappedSubclasses.add( currentClass );
@@ -845,7 +845,7 @@
}
- public Set<Class> getMappedSubclasses() {
+ public Set<Class<?>> getMappedSubclasses() {
return mappedSubclasses;
}
Modified: search/trunk/src/java/org/hibernate/search/engine/MultiClassesQueryLoader.java
===================================================================
--- search/trunk/src/java/org/hibernate/search/engine/MultiClassesQueryLoader.java 2008-10-22 18:39:37 UTC (rev 15373)
+++ search/trunk/src/java/org/hibernate/search/engine/MultiClassesQueryLoader.java 2008-10-22 21:36:38 UTC (rev 15374)
@@ -37,7 +37,7 @@
if ( entityTypes.length == 0 ) {
//support all classes
safeEntityTypes = new ArrayList<Class>();
- for( Map.Entry<Class, DocumentBuilder<Object>> entry : searchFactoryImplementor.getDocumentBuilders().entrySet() ) {
+ for( Map.Entry<Class<?>, DocumentBuilder<?>> entry : searchFactoryImplementor.getDocumentBuilders().entrySet() ) {
//get only root entities to limit queries
if ( entry.getValue().isRoot() ) {
safeEntityTypes.add( entry.getKey() );
@@ -108,14 +108,14 @@
}
private static class RootEntityMetadata {
- public final Class rootEntity;
- public final Set<Class> mappedSubclasses;
+ public final Class<?> rootEntity;
+ public final Set<Class<?>> mappedSubclasses;
private final Criteria criteria;
public final boolean useObjectLoader;
- RootEntityMetadata(Class rootEntity, SearchFactoryImplementor searchFactoryImplementor, Session session) {
+ RootEntityMetadata(Class<?> rootEntity, SearchFactoryImplementor searchFactoryImplementor, Session session) {
this.rootEntity = rootEntity;
- DocumentBuilder provider = searchFactoryImplementor.getDocumentBuilders().get( rootEntity );
+ DocumentBuilder<?> provider = searchFactoryImplementor.getDocumentBuilder( rootEntity );
if ( provider == null) throw new AssertionFailure("Provider not found for class: " + rootEntity);
this.mappedSubclasses = provider.getMappedSubclasses();
this.criteria = session.createCriteria( rootEntity );
Modified: search/trunk/src/java/org/hibernate/search/engine/ObjectLoaderHelper.java
===================================================================
--- search/trunk/src/java/org/hibernate/search/engine/ObjectLoaderHelper.java 2008-10-22 18:39:37 UTC (rev 15373)
+++ search/trunk/src/java/org/hibernate/search/engine/ObjectLoaderHelper.java 2008-10-22 21:36:38 UTC (rev 15374)
@@ -41,12 +41,12 @@
return maybeProxy;
}
- public static void initializeObjects(EntityInfo[] entityInfos, Criteria criteria, Class entityType,
+ public static void initializeObjects(EntityInfo[] entityInfos, Criteria criteria, Class<?> entityType,
SearchFactoryImplementor searchFactoryImplementor) {
final int maxResults = entityInfos.length;
if ( maxResults == 0 ) return;
- DocumentBuilder builder = searchFactoryImplementor.getDocumentBuilders().get( entityType );
+ DocumentBuilder<?> builder = searchFactoryImplementor.getDocumentBuilder( entityType );
String idName = builder.getIdentifierName();
int loop = maxResults / MAX_IN_CLAUSE;
boolean exact = maxResults % MAX_IN_CLAUSE == 0;
Modified: search/trunk/src/java/org/hibernate/search/engine/SearchFactoryImplementor.java
===================================================================
--- search/trunk/src/java/org/hibernate/search/engine/SearchFactoryImplementor.java 2008-10-22 18:39:37 UTC (rev 15373)
+++ search/trunk/src/java/org/hibernate/search/engine/SearchFactoryImplementor.java 2008-10-22 21:36:38 UTC (rev 15374)
@@ -25,8 +25,10 @@
void setBackendQueueProcessorFactory(BackendQueueProcessorFactory backendQueueProcessorFactory);
- Map<Class, DocumentBuilder<Object>> getDocumentBuilders();
+ Map<Class<?>, DocumentBuilder<?>> getDocumentBuilders();
+ <T> DocumentBuilder<T> getDocumentBuilder(Class<T> entityType);
+
Worker getWorker();
void addOptimizerStrategy(DirectoryProvider<?> provider, OptimizerStrategy optimizerStrategy);
@@ -45,13 +47,13 @@
void close();
- void addClassToDirectoryProvider(Class clazz, DirectoryProvider<?> directoryProvider);
+ void addClassToDirectoryProvider(Class<?> clazz, DirectoryProvider<?> directoryProvider);
- Set<Class> getClassesInDirectoryProvider(DirectoryProvider<?> directoryProvider);
+ Set<Class<?>> getClassesInDirectoryProvider(DirectoryProvider<?> directoryProvider);
- Set<DirectoryProvider> getDirectoryProviders();
+ Set<DirectoryProvider<?>> getDirectoryProviders();
- ReentrantLock getDirectoryProviderLock(DirectoryProvider dp);
+ ReentrantLock getDirectoryProviderLock(DirectoryProvider<?> dp);
void addDirectoryProvider(DirectoryProvider<?> provider);
Modified: search/trunk/src/java/org/hibernate/search/event/FullTextIndexEventListener.java
===================================================================
--- search/trunk/src/java/org/hibernate/search/event/FullTextIndexEventListener.java 2008-10-22 18:39:37 UTC (rev 15373)
+++ search/trunk/src/java/org/hibernate/search/event/FullTextIndexEventListener.java 2008-10-22 21:36:38 UTC (rev 15374)
@@ -80,7 +80,7 @@
public void onPostInsert(PostInsertEvent event) {
if ( used ) {
final Object entity = event.getEntity();
- DocumentBuilder<Object> builder = searchFactoryImplementor.getDocumentBuilders().get( entity.getClass() );
+ DocumentBuilder<?> builder = searchFactoryImplementor.getDocumentBuilder( entity.getClass() );
//not strictly necessary but a small optimization
if ( builder != null ) {
Serializable id = event.getId();
@@ -93,7 +93,7 @@
if ( used ) {
final Object entity = event.getEntity();
//not strictly necessary but a small optimization
- DocumentBuilder<Object> builder = searchFactoryImplementor.getDocumentBuilders().get( entity.getClass() );
+ DocumentBuilder<?> builder = searchFactoryImplementor.getDocumentBuilder( entity.getClass() );
if ( builder != null ) {
Serializable id = event.getId();
processWork( entity, id, WorkType.UPDATE, event );
Modified: search/trunk/src/java/org/hibernate/search/impl/FullTextSessionImpl.java
===================================================================
--- search/trunk/src/java/org/hibernate/search/impl/FullTextSessionImpl.java 2008-10-22 18:39:37 UTC (rev 15373)
+++ search/trunk/src/java/org/hibernate/search/impl/FullTextSessionImpl.java 2008-10-22 21:36:38 UTC (rev 15374)
@@ -61,7 +61,6 @@
* @author John Griffin
* @author Hardy Ferentschik
*/
-@SuppressWarnings( { "serial", "unchecked" } )
public class FullTextSessionImpl implements FullTextSession, SessionImplementor {
private final Session session;
private final SessionImplementor sessionImplementor;
@@ -107,14 +106,13 @@
* @param id
* @throws IllegalArgumentException if entityType is null or not an @Indexed entity type
*/
- public void purge(Class entityType, Serializable id) {
+ public void purge(Class<?> entityType, Serializable id) {
if ( entityType == null ) return;
SearchFactoryImplementor searchFactoryImplementor = getSearchFactoryImplementor();
// not strictly necessary but a small optimization plus let's make sure the
// client didn't mess something up.
- Map<Class, DocumentBuilder<Object>> builders = searchFactoryImplementor.getDocumentBuilders();
- DocumentBuilder<Object> builder = builders.get( entityType );
+ DocumentBuilder<?> builder = searchFactoryImplementor.getDocumentBuilder( entityType );
if ( builder == null ) {
throw new IllegalArgumentException( entityType.getName() + " is not a mapped entity (don't forget to add @Indexed)" );
}
@@ -139,12 +137,12 @@
*/
public void index(Object entity) {
if ( entity == null ) throw new IllegalArgumentException( "Entity to index should not be null" );
- ;
- Class clazz = Hibernate.getClass( entity );
+
+ Class<?> clazz = Hibernate.getClass( entity );
//TODO cache that at the FTSession level
SearchFactoryImplementor searchFactoryImplementor = getSearchFactoryImplementor();
//not strictly necessary but a small optimization
- DocumentBuilder<Object> builder = searchFactoryImplementor.getDocumentBuilders().get( clazz );
+ DocumentBuilder<?> builder = searchFactoryImplementor.getDocumentBuilder( clazz );
if ( builder == null ) {
throw new IllegalArgumentException( "Entity to index not an @Indexed entity: " + entity.getClass().getName() );
}
Modified: search/trunk/src/java/org/hibernate/search/impl/SearchFactoryImpl.java
===================================================================
--- search/trunk/src/java/org/hibernate/search/impl/SearchFactoryImpl.java 2008-10-22 18:39:37 UTC (rev 15373)
+++ search/trunk/src/java/org/hibernate/search/impl/SearchFactoryImpl.java 2008-10-22 21:36:38 UTC (rev 15374)
@@ -65,9 +65,9 @@
private static final Logger log = LoggerFactory.make();
- private final Map<Class, DocumentBuilder<Object>> documentBuilders = new HashMap<Class, DocumentBuilder<Object>>();
+ private final Map<Class<?>, DocumentBuilder<?>> documentBuilders = new HashMap<Class<?>, DocumentBuilder<?>>();
//keep track of the index modifiers per DirectoryProvider since multiple entity can use the same directory provider
- private final Map<DirectoryProvider, DirectoryProviderData> dirProviderData = new HashMap<DirectoryProvider, DirectoryProviderData>();
+ private final Map<DirectoryProvider<?>, DirectoryProviderData> dirProviderData = new HashMap<DirectoryProvider<?>, DirectoryProviderData>();
private final Worker worker;
private final ReaderProvider readerProvider;
private BackendQueueProcessorFactory backendQueueProcessorFactory;
@@ -113,7 +113,7 @@
this.indexingStrategy = defineIndexingStrategy( cfg ); //need to be done before the document builds
initDocumentBuilders( cfg, reflectionManager );
- Set<Class> indexedClasses = documentBuilders.keySet();
+ Set<Class<?>> indexedClasses = documentBuilders.keySet();
for (DocumentBuilder builder : documentBuilders.values()) {
builder.postInitialize( indexedClasses );
}
@@ -166,7 +166,7 @@
}
}
- public void addClassToDirectoryProvider(Class clazz, DirectoryProvider<?> directoryProvider) {
+ public void addClassToDirectoryProvider(Class<?> clazz, DirectoryProvider<?> directoryProvider) {
//no need to set a read barrier, we only use this class in the init thread
DirectoryProviderData data = dirProviderData.get(directoryProvider);
if (data == null) {
@@ -176,7 +176,7 @@
data.classes.add(clazz);
}
- public Set<Class> getClassesInDirectoryProvider(DirectoryProvider<?> directoryProvider) {
+ public Set<Class<?>> getClassesInDirectoryProvider(DirectoryProvider<?> directoryProvider) {
if (barrier != 0) { } //read barrier
return Collections.unmodifiableSet( dirProviderData.get(directoryProvider).classes );
}
@@ -237,12 +237,17 @@
}
- public Map<Class, DocumentBuilder<Object>> getDocumentBuilders() {
+ public Map<Class<?>, DocumentBuilder<?>> getDocumentBuilders() {
if (barrier != 0) { } //read barrier
return documentBuilders;
}
- public Set<DirectoryProvider> getDirectoryProviders() {
+ @SuppressWarnings( "unckecked" )
+ public <T> DocumentBuilder<T> getDocumentBuilder(Class<T> entityType) {
+ return ( DocumentBuilder<T> ) documentBuilders.get( entityType );
+ }
+
+ public Set<DirectoryProvider<?>> getDirectoryProviders() {
if (barrier != 0) { } //read barrier
return this.dirProviderData.keySet();
}
@@ -282,15 +287,15 @@
return readerProvider;
}
- public DirectoryProvider[] getDirectoryProviders(Class entity) {
+ public DirectoryProvider[] getDirectoryProviders(Class<?> entity) {
if (barrier != 0) {} //read barrier
- DocumentBuilder<Object> documentBuilder = getDocumentBuilders().get( entity );
+ DocumentBuilder<?> documentBuilder = getDocumentBuilder( entity );
return documentBuilder == null ? null : documentBuilder.getDirectoryProviders();
}
public void optimize() {
if (barrier != 0) {} //read barrier
- Set<Class> clazzs = getDocumentBuilders().keySet();
+ Set<Class<?>> clazzs = getDocumentBuilders().keySet();
for (Class clazz : clazzs) {
optimize( clazz );
}
@@ -318,7 +323,7 @@
throw new IllegalArgumentException( "A class has to be specified for retrieving a scoped analyzer" );
}
- DocumentBuilder<Object> builder = documentBuilders.get( clazz );
+ DocumentBuilder<?> builder = documentBuilders.get( clazz );
if ( builder == null ) {
throw new IllegalArgumentException( "Entity for which to retrieve the scoped analyzer is not an @Indexed entity: " + clazz.getName() );
}
@@ -393,10 +398,10 @@
private static class DirectoryProviderData {
public final ReentrantLock dirLock = new ReentrantLock();
public OptimizerStrategy optimizerStrategy;
- public Set<Class> classes = new HashSet<Class>(2);
+ public Set<Class<?>> classes = new HashSet<Class<?>>(2);
}
- public ReentrantLock getDirectoryProviderLock(DirectoryProvider dp) {
+ public ReentrantLock getDirectoryProviderLock(DirectoryProvider<?> dp) {
if (barrier != 0) {} //read barrier
return this.dirProviderData.get( dp ).dirLock;
}
Modified: search/trunk/src/java/org/hibernate/search/query/FullTextQueryImpl.java
===================================================================
--- search/trunk/src/java/org/hibernate/search/query/FullTextQueryImpl.java 2008-10-22 18:39:37 UTC (rev 15373)
+++ search/trunk/src/java/org/hibernate/search/query/FullTextQueryImpl.java 2008-10-22 21:36:38 UTC (rev 15374)
@@ -72,8 +72,8 @@
public class FullTextQueryImpl extends AbstractQueryImpl implements FullTextQuery {
private static final Logger log = LoggerFactory.make();
private final org.apache.lucene.search.Query luceneQuery;
- private Class[] classes;
- private Set<Class> classesAndSubclasses;
+ private Class<?>[] classes;
+ private Set<Class<?>> classesAndSubclasses;
//optimization: if we can avoid the filter clause (we can most of the time) do it as it has a significant perf impact
private boolean needClassFilterClause;
private Integer firstResult;
@@ -528,7 +528,7 @@
* TODO change classesAndSubclasses by side effect, which is a mismatch with the Searcher return, fix that.
*/
private IndexSearcher buildSearcher(SearchFactoryImplementor searchFactoryImplementor) {
- Map<Class, DocumentBuilder<Object>> builders = searchFactoryImplementor.getDocumentBuilders();
+ Map<Class<?>, DocumentBuilder<?>> builders = searchFactoryImplementor.getDocumentBuilders();
List<DirectoryProvider> directories = new ArrayList<DirectoryProvider>();
Similarity searcherSimilarity = null;
@@ -543,10 +543,10 @@
classesAndSubclasses = null;
}
else {
- Set<Class> involvedClasses = new HashSet<Class>( classes.length );
+ Set<Class<?>> involvedClasses = new HashSet<Class<?>>( classes.length );
Collections.addAll( involvedClasses, classes );
- for (Class clazz : classes) {
- DocumentBuilder builder = builders.get( clazz );
+ for (Class<?> clazz : classes) {
+ DocumentBuilder<?> builder = builders.get( clazz );
if ( builder != null ) involvedClasses.addAll( builder.getMappedSubclasses() );
}
@@ -567,7 +567,7 @@
//if at least one DP contains one class that is not part of the targeted classesAndSubclasses we can't optimize
if ( classesAndSubclasses != null) {
for (DirectoryProvider dp : directories) {
- final Set<Class> classesInDirectoryProvider = searchFactoryImplementor.getClassesInDirectoryProvider( dp );
+ final Set<Class<?>> classesInDirectoryProvider = searchFactoryImplementor.getClassesInDirectoryProvider( dp );
// if a DP contains only one class, we know for sure it's part of classesAndSubclasses
if ( classesInDirectoryProvider.size() > 1 ) {
//risk of needClassFilterClause
Modified: search/trunk/src/java/org/hibernate/search/reader/SharedReaderProvider.java
===================================================================
--- search/trunk/src/java/org/hibernate/search/reader/SharedReaderProvider.java 2008-10-22 18:39:37 UTC (rev 15373)
+++ search/trunk/src/java/org/hibernate/search/reader/SharedReaderProvider.java 2008-10-22 21:36:38 UTC (rev 15374)
@@ -54,7 +54,7 @@
*/
private Map<IndexReader, ReaderData> searchIndexReaderSemaphores = new HashMap<IndexReader, ReaderData>();
- public IndexReader openReader(DirectoryProvider[] directoryProviders) {
+ public IndexReader openReader(DirectoryProvider... directoryProviders) {
boolean trace = log.isTraceEnabled();
int length = directoryProviders.length;
IndexReader[] readers = new IndexReader[length];
@@ -320,7 +320,7 @@
}
public void initialize(Properties props, SearchFactoryImplementor searchFactoryImplementor) {
- Set<DirectoryProvider> providers = searchFactoryImplementor.getDirectoryProviders();
+ Set<DirectoryProvider<?>> providers = searchFactoryImplementor.getDirectoryProviders();
perDirectoryProviderManipulationLocks = new HashMap<DirectoryProvider, Lock>( providers.size() );
for ( DirectoryProvider dp : providers ) {
perDirectoryProviderManipulationLocks.put( dp, new ReentrantLock() );
Modified: search/trunk/src/java/org/hibernate/search/reader/SharingBufferReaderProvider.java
===================================================================
--- search/trunk/src/java/org/hibernate/search/reader/SharingBufferReaderProvider.java 2008-10-22 18:39:37 UTC (rev 15373)
+++ search/trunk/src/java/org/hibernate/search/reader/SharingBufferReaderProvider.java 2008-10-22 21:36:38 UTC (rev 15374)
@@ -65,7 +65,7 @@
public void initialize(Properties props, SearchFactoryImplementor searchFactoryImplementor) {
Map<DirectoryProvider,PerDirectoryLatestReader> map = new HashMap<DirectoryProvider,PerDirectoryLatestReader>();
- Set<DirectoryProvider> providers = searchFactoryImplementor.getDirectoryProviders();
+ Set<DirectoryProvider<?>> providers = searchFactoryImplementor.getDirectoryProviders();
for ( DirectoryProvider provider : providers ) {
try {
map.put( provider, new PerDirectoryLatestReader( provider ) );
Modified: search/trunk/src/test/org/hibernate/search/test/configuration/ShardsConfigurationTest.java
===================================================================
--- search/trunk/src/test/org/hibernate/search/test/configuration/ShardsConfigurationTest.java 2008-10-22 18:39:37 UTC (rev 15373)
+++ search/trunk/src/test/org/hibernate/search/test/configuration/ShardsConfigurationTest.java 2008-10-22 21:36:38 UTC (rev 15374)
@@ -56,8 +56,8 @@
}
public void testSelectionOfShardingStrategy() throws Exception {
- IndexShardingStrategy shardingStrategy = getSearchFactory().getDocumentBuilders()
- .get( Document.class ).getDirectoryProviderSelectionStrategy();
+ IndexShardingStrategy shardingStrategy = getSearchFactory().getDocumentBuilder( Document.class )
+ .getDirectoryProviderSelectionStrategy();
assertNotNull( shardingStrategy );
assertEquals( shardingStrategy.getClass(), UselessShardingStrategy.class );
}
15 years, 7 months
- 1
- 0
Hibernate SVN: r15373 - core/branches.
by hibernate-commits＠lists.jboss.org
Author: steve.ebersole(a)jboss.com
Date: 2008-10-22 14:39:37 -0400 (Wed, 22 Oct 2008)
New Revision: 15373
Added:
core/branches/CFG_REDESIGN/
Log:
Creating working branch for large and invasive cfg/mapping/metadata
changes
Copied: core/branches/CFG_REDESIGN (from rev 15372, core/trunk)
15 years, 7 months
- 1
- 0
Hibernate SVN: r15372 - in entitymanager/trunk/src/test/org/hibernate/ejb/test: association and 11 other directories.
by hibernate-commits＠lists.jboss.org
Author: jcosta(a)redhat.com
Date: 2008-10-22 10:33:35 -0400 (Wed, 22 Oct 2008)
New Revision: 15372
Modified:
entitymanager/trunk/src/test/org/hibernate/ejb/test/EntityManagerTest.java
entitymanager/trunk/src/test/org/hibernate/ejb/test/PackagedEntityManagerTest.java
entitymanager/trunk/src/test/org/hibernate/ejb/test/QueryTest.java
entitymanager/trunk/src/test/org/hibernate/ejb/test/TestCase.java
entitymanager/trunk/src/test/org/hibernate/ejb/test/association/AssociationTest.java
entitymanager/trunk/src/test/org/hibernate/ejb/test/callbacks/CallbackAndDirtyTest.java
entitymanager/trunk/src/test/org/hibernate/ejb/test/callbacks/CallbacksTest.java
entitymanager/trunk/src/test/org/hibernate/ejb/test/cascade/CascadeTest.java
entitymanager/trunk/src/test/org/hibernate/ejb/test/cascade/DeleteOrphanTest.java
entitymanager/trunk/src/test/org/hibernate/ejb/test/cascade/FetchTest.java
entitymanager/trunk/src/test/org/hibernate/ejb/test/emops/FlushTest.java
entitymanager/trunk/src/test/org/hibernate/ejb/test/emops/GetReferenceTest.java
entitymanager/trunk/src/test/org/hibernate/ejb/test/emops/MergeTest.java
entitymanager/trunk/src/test/org/hibernate/ejb/test/emops/RefreshTest.java
entitymanager/trunk/src/test/org/hibernate/ejb/test/emops/RemoveTest.java
entitymanager/trunk/src/test/org/hibernate/ejb/test/emops/cascade/CascadePersistTest.java
entitymanager/trunk/src/test/org/hibernate/ejb/test/exception/ExceptionTest.java
entitymanager/trunk/src/test/org/hibernate/ejb/test/inheritance/InheritanceTest.java
entitymanager/trunk/src/test/org/hibernate/ejb/test/lob/BlobTest.java
entitymanager/trunk/src/test/org/hibernate/ejb/test/lock/LockTest.java
entitymanager/trunk/src/test/org/hibernate/ejb/test/ops/FindTest.java
entitymanager/trunk/src/test/org/hibernate/ejb/test/ops/MergeNewTest.java
entitymanager/trunk/src/test/org/hibernate/ejb/test/transaction/FlushAndTransactionTest.java
entitymanager/trunk/src/test/org/hibernate/ejb/test/xml/XmlAttributeOverrideTest.java
entitymanager/trunk/src/test/org/hibernate/ejb/test/xml/XmlTest.java
Log:
EJB-395 - changed method calls from getEntityManager to getOrCreateEntityManager
Modified: entitymanager/trunk/src/test/org/hibernate/ejb/test/EntityManagerTest.java
===================================================================
--- entitymanager/trunk/src/test/org/hibernate/ejb/test/EntityManagerTest.java 2008-10-22 13:53:17 UTC (rev 15371)
+++ entitymanager/trunk/src/test/org/hibernate/ejb/test/EntityManagerTest.java 2008-10-22 14:33:35 UTC (rev 15372)
@@ -95,7 +95,7 @@
Item item = new Item( "Mouse", "Micro$oft mouse" );
- EntityManager em = getEntityManager();
+ EntityManager em = getOrCreateEntityManager();
em.getTransaction().begin();
em.persist( item );
assertTrue( em.contains( item ) );
@@ -148,7 +148,7 @@
stats.clear();
stats.setStatisticsEnabled( true );
- EntityManager em = getEntityManager();
+ EntityManager em = getOrCreateEntityManager();
em.getTransaction().begin();
em.persist( res );
@@ -161,7 +161,7 @@
assertEquals( 1, stats.getSecondLevelCachePutCount() );
assertEquals( 0, stats.getSecondLevelCacheHitCount() );
- em = getEntityManager();
+ em = getOrCreateEntityManager();
em.getTransaction().begin();
Item second = em.find( Item.class, item.getName() );
assertEquals( 1, second.getDistributors().size() );
@@ -169,7 +169,7 @@
em.getTransaction().commit();
em.close();
- em = getEntityManager();
+ em = getOrCreateEntityManager();
em.getTransaction().begin();
second = em.find( Item.class, item.getName() );
assertEquals( 1, second.getDistributors().size() );
@@ -184,7 +184,7 @@
}
public void testContains() throws Exception {
- EntityManager em = getEntityManager();
+ EntityManager em = getOrCreateEntityManager();
em.getTransaction().begin();
Integer nonManagedObject = new Integer( 4 );
try {
@@ -198,7 +198,7 @@
finally {
em.close();
}
- em = getEntityManager();
+ em = getOrCreateEntityManager();
em.getTransaction().begin();
Item item = new Item();
item.setDescr( "Mine" );
@@ -214,7 +214,7 @@
}
public void testClear() throws Exception {
- EntityManager em = getEntityManager();
+ EntityManager em = getOrCreateEntityManager();
em.getTransaction().begin();
Wallet w = new Wallet();
w.setBrand( "Lacoste" );
@@ -229,7 +229,7 @@
}
public void testFlushMode() throws Exception {
- EntityManager em = getEntityManager();
+ EntityManager em = getOrCreateEntityManager();
em.setFlushMode( FlushModeType.COMMIT );
assertEquals( FlushModeType.COMMIT, em.getFlushMode() );
( (HibernateEntityManager) em ).getSession().setFlushMode( FlushMode.ALWAYS );
@@ -238,7 +238,7 @@
}
public void testPersistNoneGenerator() throws Exception {
- EntityManager em = getEntityManager();
+ EntityManager em = getOrCreateEntityManager();
em.getTransaction().begin();
Wallet w = new Wallet();
w.setBrand( "Lacoste" );
@@ -255,7 +255,7 @@
}
public void testSerializableException() throws Exception {
- EntityManager em = getEntityManager();
+ EntityManager em = getOrCreateEntityManager();
em.getTransaction().begin();
try {
Query query = em.createQuery( "SELECT p FETCH JOIN p.distributors FROM Item p" );
@@ -297,7 +297,7 @@
}
public void testIsOpen() throws Exception {
- EntityManager em = getEntityManager();
+ EntityManager em = getOrCreateEntityManager();
assertTrue( em.isOpen() );
em.getTransaction().begin();
assertTrue( em.isOpen() );
Modified: entitymanager/trunk/src/test/org/hibernate/ejb/test/PackagedEntityManagerTest.java
===================================================================
--- entitymanager/trunk/src/test/org/hibernate/ejb/test/PackagedEntityManagerTest.java 2008-10-22 13:53:17 UTC (rev 15371)
+++ entitymanager/trunk/src/test/org/hibernate/ejb/test/PackagedEntityManagerTest.java 2008-10-22 14:33:35 UTC (rev 15372)
@@ -233,7 +233,7 @@
Item item = new Item( "Mouse", "Micro$oft mouse" );
- EntityManager em = getEntityManager();
+ EntityManager em = getOrCreateEntityManager();
em.getTransaction().begin();
em.persist( item );
assertTrue( em.contains( item ) );
@@ -286,7 +286,7 @@
stats.clear();
stats.setStatisticsEnabled( true );
- EntityManager em = getEntityManager();
+ EntityManager em = getOrCreateEntityManager();
em.getTransaction().begin();
em.persist( res );
@@ -299,7 +299,7 @@
assertEquals( 1, stats.getSecondLevelCachePutCount() );
assertEquals( 0, stats.getSecondLevelCacheHitCount() );
- em = getEntityManager();
+ em = getOrCreateEntityManager();
em.getTransaction().begin();
Item second = em.find( Item.class, item.getName() );
assertEquals( 1, second.getDistributors().size() );
@@ -307,7 +307,7 @@
em.getTransaction().commit();
em.close();
- em = getEntityManager();
+ em = getOrCreateEntityManager();
em.getTransaction().begin();
second = em.find( Item.class, item.getName() );
assertEquals( 1, second.getDistributors().size() );
@@ -324,7 +324,7 @@
}
public void testExternalJar() throws Exception {
- EntityManager em = getEntityManager();
+ EntityManager em = getOrCreateEntityManager();
Scooter s = new Scooter();
s.setModel( "Abadah" );
s.setSpeed( 85l );
@@ -332,7 +332,7 @@
em.persist( s );
em.getTransaction().commit();
em.close();
- em = getEntityManager();
+ em = getOrCreateEntityManager();
em.getTransaction().begin();
s = em.find( Scooter.class, s.getModel() );
assertEquals( new Long( 85 ), s.getSpeed() );
@@ -342,7 +342,7 @@
}
public void testORMFileOnMainAndExplicitJars() throws Exception {
- EntityManager em = getEntityManager();
+ EntityManager em = getOrCreateEntityManager();
Seat seat = new Seat();
seat.setNumber( "3B" );
Airplane plane = new Airplane();
Modified: entitymanager/trunk/src/test/org/hibernate/ejb/test/QueryTest.java
===================================================================
--- entitymanager/trunk/src/test/org/hibernate/ejb/test/QueryTest.java 2008-10-22 13:53:17 UTC (rev 15371)
+++ entitymanager/trunk/src/test/org/hibernate/ejb/test/QueryTest.java 2008-10-22 14:33:35 UTC (rev 15372)
@@ -17,7 +17,7 @@
public class QueryTest extends TestCase {
public void testPagedQuery() throws Exception {
- EntityManager em = getEntityManager();
+ EntityManager em = getOrCreateEntityManager();
em.getTransaction().begin();
Item item = new Item( "Mouse", "Micro$oft mouse" );
em.persist( item );
@@ -36,7 +36,7 @@
}
public void testAggregationReturnType() throws Exception {
- EntityManager em = getEntityManager();
+ EntityManager em = getOrCreateEntityManager();
em.getTransaction().begin();
Item item = new Item( "Mouse", "Micro$oft mouse" );
em.persist( item );
@@ -51,9 +51,9 @@
public void testParameterList() throws Exception {
final Item item = new Item( "Mouse", "Micro$oft mouse" );
- final Item item2 = new Item( "Computer", "D�ll computer" );
+ final Item item2 = new Item( "Computer", "D�ll computer" );
- EntityManager em = getEntityManager();
+ EntityManager em = getOrCreateEntityManager();
em.getTransaction().begin();
em.persist( item );
em.persist( item2 );
@@ -97,7 +97,7 @@
// auchan.setName("Auchan");
// item.addDistributor(auchan);
//
-// EntityManager em = getEntityManager();
+// EntityManager em = getOrCreateEntityManager();
// em.getTransaction().begin();
// em.persist(fnac);
// em.persist(auchan);
@@ -123,9 +123,9 @@
public void testEscapeCharacter() throws Exception {
final Item item = new Item( "Mouse", "Micro_oft mouse" );
- final Item item2 = new Item( "Computer", "D�ll computer" );
+ final Item item2 = new Item( "Computer", "D�ll computer" );
- EntityManager em = getEntityManager();
+ EntityManager em = getOrCreateEntityManager();
em.getTransaction().begin();
em.persist( item );
em.persist( item2 );
@@ -148,7 +148,7 @@
Item item = new Item( "Mouse", "Micro$oft mouse" );
- EntityManager em = getEntityManager();
+ EntityManager em = getOrCreateEntityManager();
em.getTransaction().begin();
em.persist( item );
assertTrue( em.contains( item ) );
@@ -169,7 +169,7 @@
Item item = new Item( "Mouse", "Micro$oft mouse" );
- EntityManager em = getEntityManager();
+ EntityManager em = getOrCreateEntityManager();
em.getTransaction().begin();
em.persist( item );
assertTrue( em.contains( item ) );
@@ -188,7 +188,7 @@
}
public void testExplicitPositionalParameter() throws Exception {
- EntityManager em = getEntityManager();
+ EntityManager em = getOrCreateEntityManager();
em.getTransaction().begin();
Wallet w = new Wallet();
w.setBrand( "Lacoste" );
@@ -213,7 +213,7 @@
}
public void testNativeQuestionMarkParameter() throws Exception {
- EntityManager em = getEntityManager();
+ EntityManager em = getOrCreateEntityManager();
em.getTransaction().begin();
Wallet w = new Wallet();
w.setBrand( "Lacoste" );
@@ -235,7 +235,7 @@
Item item = new Item( "Mouse", "Micro$oft mouse" );
- EntityManager em = getEntityManager();
+ EntityManager em = getOrCreateEntityManager();
em.getTransaction().begin();
em.persist( item );
assertTrue( em.contains( item ) );
@@ -260,7 +260,7 @@
}
public void testDistinct() throws Exception {
- EntityManager em = getEntityManager();
+ EntityManager em = getOrCreateEntityManager();
em.getTransaction().begin();
em.createQuery( "delete Item" ).executeUpdate();
em.createQuery( "delete Distributor" ).executeUpdate();
@@ -288,7 +288,7 @@
}
public void testIsNull() throws Exception {
- EntityManager em = getEntityManager();
+ EntityManager em = getOrCreateEntityManager();
em.getTransaction().begin();
Distributor d1 = new Distributor();
d1.setName( "Fnac" );
@@ -324,7 +324,7 @@
Item item = new Item( "Mouse", "Micro$oft mouse" );
- EntityManager em = getEntityManager();
+ EntityManager em = getOrCreateEntityManager();
em.getTransaction().begin();
em.persist( item );
assertTrue( em.contains( item ) );
@@ -349,7 +349,7 @@
public void testUnavailableNamedQuery() throws Exception {
Item item = new Item( "Mouse", "Micro$oft mouse" );
- EntityManager em = getEntityManager();
+ EntityManager em = getOrCreateEntityManager();
em.getTransaction().begin();
em.persist( item );
try {
Modified: entitymanager/trunk/src/test/org/hibernate/ejb/test/TestCase.java
===================================================================
--- entitymanager/trunk/src/test/org/hibernate/ejb/test/TestCase.java 2008-10-22 13:53:17 UTC (rev 15371)
+++ entitymanager/trunk/src/test/org/hibernate/ejb/test/TestCase.java 2008-10-22 14:33:35 UTC (rev 15372)
@@ -42,7 +42,7 @@
@Override
public void runTest() throws Throwable {
try {
- em = getEntityManager();
+ em = getOrCreateEntityManager();
super.runTest();
} catch (Throwable t) {
if (em.getTransaction().isActive())
@@ -51,7 +51,7 @@
}
}
- protected EntityManager getEntityManager() {
+ protected EntityManager getOrCreateEntityManager() {
if (em == null || !em.isOpen())
em = factory.createEntityManager();
return em;
Modified: entitymanager/trunk/src/test/org/hibernate/ejb/test/association/AssociationTest.java
===================================================================
--- entitymanager/trunk/src/test/org/hibernate/ejb/test/association/AssociationTest.java 2008-10-22 13:53:17 UTC (rev 15371)
+++ entitymanager/trunk/src/test/org/hibernate/ejb/test/association/AssociationTest.java 2008-10-22 14:33:35 UTC (rev 15372)
@@ -10,7 +10,7 @@
*/
public class AssociationTest extends TestCase {
public void testBidirOneToOne() throws Exception {
- EntityManager em = getEntityManager();
+ EntityManager em = getOrCreateEntityManager();
em.getTransaction().begin();
String id = "10";
Incident i = em.find( Incident.class, id );
@@ -30,7 +30,7 @@
}
public void testMergeAndBidirOneToOne() throws Exception {
- EntityManager em = getEntityManager();
+ EntityManager em = getOrCreateEntityManager();
em.getTransaction().begin();
Oven oven = new Oven();
Kitchen kitchen = new Kitchen();
Modified: entitymanager/trunk/src/test/org/hibernate/ejb/test/callbacks/CallbackAndDirtyTest.java
===================================================================
--- entitymanager/trunk/src/test/org/hibernate/ejb/test/callbacks/CallbackAndDirtyTest.java 2008-10-22 13:53:17 UTC (rev 15371)
+++ entitymanager/trunk/src/test/org/hibernate/ejb/test/callbacks/CallbackAndDirtyTest.java 2008-10-22 14:33:35 UTC (rev 15372)
@@ -13,7 +13,7 @@
public class CallbackAndDirtyTest extends TestCase {
public void testDirtyButNotDirty() throws Exception {
- EntityManager manager = getEntityManager();
+ EntityManager manager = getOrCreateEntityManager();
manager.getTransaction().begin();
Employee mark = new Employee();
mark.setName( "Mark" );
Modified: entitymanager/trunk/src/test/org/hibernate/ejb/test/callbacks/CallbacksTest.java
===================================================================
--- entitymanager/trunk/src/test/org/hibernate/ejb/test/callbacks/CallbacksTest.java 2008-10-22 13:53:17 UTC (rev 15371)
+++ entitymanager/trunk/src/test/org/hibernate/ejb/test/callbacks/CallbacksTest.java 2008-10-22 14:33:35 UTC (rev 15372)
@@ -17,7 +17,7 @@
public class CallbacksTest extends TestCase {
public void testCallbackMethod() throws Exception {
- EntityManager em = getEntityManager();
+ EntityManager em = getOrCreateEntityManager();
Cat c = new Cat();
c.setName( "Kitty" );
c.setDateOfBirth( new Date( 90, 11, 15 ) );
@@ -39,7 +39,7 @@
}
public void testEntityListener() throws Exception {
- EntityManager em = getEntityManager();
+ EntityManager em = getOrCreateEntityManager();
Cat c = new Cat();
c.setName( "Kitty" );
c.setLength( 12 );
@@ -66,7 +66,7 @@
public void testPostPersist() throws Exception {
- EntityManager em = getEntityManager();
+ EntityManager em = getOrCreateEntityManager();
Cat c = new Cat();
em.getTransaction().begin();
c.setLength( 23 );
@@ -83,7 +83,7 @@
//Not a test since the spec did not make the proper change on listeners
public void listenerAnnotation() throws Exception {
- EntityManager em = getEntityManager();
+ EntityManager em = getOrCreateEntityManager();
Translation tl = new Translation();
em.getTransaction().begin();
tl.setInto( "France" );
@@ -105,7 +105,7 @@
}
public void testPrePersistOnCascade() throws Exception {
- EntityManager em = getEntityManager();
+ EntityManager em = getOrCreateEntityManager();
em.getTransaction().begin();
Television tv = new Television();
RemoteControl rc = new RemoteControl();
@@ -119,7 +119,7 @@
}
public void testCallBackListenersHierarchy() throws Exception {
- EntityManager em = getEntityManager();
+ EntityManager em = getOrCreateEntityManager();
em.getTransaction().begin();
Television tv = new Television();
em.persist( tv );
@@ -134,7 +134,7 @@
}
public void testException() throws Exception {
- EntityManager em = getEntityManager();
+ EntityManager em = getOrCreateEntityManager();
em.getTransaction().begin();
Rythm r = new Rythm();
try {
@@ -157,7 +157,7 @@
public void testIdNullSetByPrePersist() throws Exception {
Plant plant = new Plant();
plant.setName( "Origuna plantula gigantic" );
- EntityManager em = getEntityManager();
+ EntityManager em = getOrCreateEntityManager();
em.getTransaction().begin();
em.persist( plant );
em.flush();
Modified: entitymanager/trunk/src/test/org/hibernate/ejb/test/cascade/CascadeTest.java
===================================================================
--- entitymanager/trunk/src/test/org/hibernate/ejb/test/cascade/CascadeTest.java 2008-10-22 13:53:17 UTC (rev 15371)
+++ entitymanager/trunk/src/test/org/hibernate/ejb/test/cascade/CascadeTest.java 2008-10-22 14:33:35 UTC (rev 15372)
@@ -14,7 +14,7 @@
public void testCascade() throws Exception {
- EntityManager em = getEntityManager();
+ EntityManager em = getOrCreateEntityManager();
em.getTransaction().begin();
Teacher teacher = null;
@@ -33,7 +33,7 @@
em.getTransaction().commit();
System.out.println("***************************");
- em = getEntityManager();
+ em = getOrCreateEntityManager();
em.getTransaction().begin();
Teacher foundTeacher = (Teacher) em.createQuery( "select t from Teacher as t" ).getSingleResult();
@@ -59,7 +59,7 @@
e1.setAuthor(e2);
- EntityManager em = getEntityManager();
+ EntityManager em = getOrCreateEntityManager();
EntityTransaction tx = em.getTransaction();
tx.begin();
em.persist(e2);
@@ -67,7 +67,7 @@
tx.commit();
em.close();
- em = getEntityManager();
+ em = getOrCreateEntityManager();
e1 = em.find(Song.class, e1.getId());
e2 = null;
Modified: entitymanager/trunk/src/test/org/hibernate/ejb/test/cascade/DeleteOrphanTest.java
===================================================================
--- entitymanager/trunk/src/test/org/hibernate/ejb/test/cascade/DeleteOrphanTest.java 2008-10-22 13:53:17 UTC (rev 15371)
+++ entitymanager/trunk/src/test/org/hibernate/ejb/test/cascade/DeleteOrphanTest.java 2008-10-22 14:33:35 UTC (rev 15372)
@@ -20,7 +20,7 @@
public void testDeleteOrphan() throws Exception {
EntityTransaction tx;
- EntityManager em = getEntityManager();
+ EntityManager em = getOrCreateEntityManager();
tx = em.getTransaction();
tx.begin();
Troop disney = new Troop();
@@ -33,7 +33,7 @@
tx.commit();
em.close();
- em = getEntityManager();
+ em = getOrCreateEntityManager();
tx = em.getTransaction();
tx.begin();
Troop troop = em.find( Troop.class, disney.getId() );
@@ -45,14 +45,14 @@
troop.getSoldiers().remove( soldier );
troop = (Troop) unserialize( serialize( troop ) );
- em = getEntityManager();
+ em = getOrCreateEntityManager();
tx = em.getTransaction();
tx.begin();
em.merge( troop );
tx.commit();
em.close();
- em = getEntityManager();
+ em = getOrCreateEntityManager();
tx = em.getTransaction();
tx.begin();
soldier = em.find( Soldier.class, mickey.getId() );
Modified: entitymanager/trunk/src/test/org/hibernate/ejb/test/cascade/FetchTest.java
===================================================================
--- entitymanager/trunk/src/test/org/hibernate/ejb/test/cascade/FetchTest.java 2008-10-22 13:53:17 UTC (rev 15371)
+++ entitymanager/trunk/src/test/org/hibernate/ejb/test/cascade/FetchTest.java 2008-10-22 14:33:35 UTC (rev 15372)
@@ -17,7 +17,7 @@
public class FetchTest extends TestCase {
public void testCascadeAndFetchCollection() throws Exception {
- EntityManager em = getEntityManager();
+ EntityManager em = getOrCreateEntityManager();
em.getTransaction().begin();
Troop disney = new Troop();
disney.setName( "Disney" );
@@ -28,7 +28,7 @@
em.getTransaction().commit();
em.close();
- em = getEntityManager();
+ em = getOrCreateEntityManager();
em.getTransaction().begin();
Troop troop = em.find( Troop.class, disney.getId() );
assertFalse( Hibernate.isInitialized( troop.getSoldiers() ) );
@@ -36,7 +36,7 @@
assertFalse( Hibernate.isInitialized( troop.getSoldiers() ) );
em.close();
- em = getEntityManager();
+ em = getOrCreateEntityManager();
em.getTransaction().begin();
troop = em.find( Troop.class, disney.getId() );
em.remove( troop );
@@ -46,7 +46,7 @@
}
public void testCascadeAndFetchEntity() throws Exception {
- EntityManager em = getEntityManager();
+ EntityManager em = getOrCreateEntityManager();
em.getTransaction().begin();
Troop disney = new Troop();
disney.setName( "Disney" );
@@ -57,14 +57,14 @@
em.getTransaction().commit();
em.close();
- em = getEntityManager();
+ em = getOrCreateEntityManager();
em.getTransaction().begin();
Soldier soldier = em.find( Soldier.class, mickey.getId() );
assertFalse( Hibernate.isInitialized( soldier.getTroop() ) );
em.getTransaction().commit();
assertFalse( Hibernate.isInitialized( soldier.getTroop() ) );
em.close();
- em = getEntityManager();
+ em = getOrCreateEntityManager();
em.getTransaction().begin();
Troop troop = em.find( Troop.class, disney.getId() );
em.remove( troop );
@@ -76,7 +76,7 @@
public void testTwoLevelDeepPersist() throws Exception {
EntityTransaction tx;
- EntityManager em = getEntityManager();
+ EntityManager em = getOrCreateEntityManager();
tx = em.getTransaction();
tx.begin();
Conference jbwBarcelona = new Conference();
@@ -94,7 +94,7 @@
tx.commit();
em.close();
- em = getEntityManager();
+ em = getOrCreateEntityManager();
tx = em.getTransaction();
tx.begin();
jbwBarcelona = em.find( Conference.class, jbwBarcelona.getId() );
@@ -112,7 +112,7 @@
public void testTwoLevelDeepPersistOnManyToOne() throws Exception {
EntityTransaction tx;
- EntityManager em = getEntityManager();
+ EntityManager em = getOrCreateEntityManager();
tx = em.getTransaction();
tx.begin();
Grandson gs = new Grandson();
@@ -121,7 +121,7 @@
em.persist( gs );
tx.commit();
em.close();
- em = getEntityManager();
+ em = getOrCreateEntityManager();
tx = em.getTransaction();
tx.begin();
gs = em.find( Grandson.class, gs.getId() );
@@ -134,7 +134,7 @@
}
public void testPerfCascadeAndFetchEntity() throws Exception {
- EntityManager em = getEntityManager();
+ EntityManager em = getOrCreateEntityManager();
//init data
em.getTransaction().begin();
int loop = 50;
@@ -150,7 +150,7 @@
em.close();
//Warm up loop
- em = getEntityManager();
+ em = getOrCreateEntityManager();
em.getTransaction().begin();
for ( int i = 0; i < loop ; i++ ) {
//Soldier soldier = em.find( Soldier.class, new Integer(i) );
@@ -167,7 +167,7 @@
//do not evict
for ( int j = 0; j < 10 ; j++ ) {
- em = getEntityManager();
+ em = getOrCreateEntityManager();
em.getTransaction().begin();
for ( int i = 0; i < loop ; i++ ) {
Troop troop = em.find( Troop.class, new Integer( i ) );
@@ -182,7 +182,7 @@
em.close();
//evict
- em = getEntityManager();
+ em = getOrCreateEntityManager();
em.getTransaction().begin();
for ( int i = 0; i < loop ; i++ ) {
//Soldier soldier = em.find( Soldier.class, new Integer(i) );
Modified: entitymanager/trunk/src/test/org/hibernate/ejb/test/emops/FlushTest.java
===================================================================
--- entitymanager/trunk/src/test/org/hibernate/ejb/test/emops/FlushTest.java 2008-10-22 13:53:17 UTC (rev 15371)
+++ entitymanager/trunk/src/test/org/hibernate/ejb/test/emops/FlushTest.java 2008-10-22 14:33:35 UTC (rev 15372)
@@ -26,7 +26,7 @@
//Test for EJBTHREE-722
public void testFlushOnDetached() throws Exception {
- EntityManager manager = getEntityManager( );
+ EntityManager manager = getOrCreateEntityManager( );
manager.getTransaction().begin();
Pet p1 = createCat("Toonses", 15.0, 9, manager);
Modified: entitymanager/trunk/src/test/org/hibernate/ejb/test/emops/GetReferenceTest.java
===================================================================
--- entitymanager/trunk/src/test/org/hibernate/ejb/test/emops/GetReferenceTest.java 2008-10-22 13:53:17 UTC (rev 15371)
+++ entitymanager/trunk/src/test/org/hibernate/ejb/test/emops/GetReferenceTest.java 2008-10-22 14:33:35 UTC (rev 15372)
@@ -12,7 +12,7 @@
public class GetReferenceTest extends TestCase {
public void testWrongIdType() throws Exception {
- EntityManager em = getEntityManager();
+ EntityManager em = getOrCreateEntityManager();
try {
Competitor c = em.getReference( Competitor.class, new String("30") );
fail("Expected IllegalArgumentException");
Modified: entitymanager/trunk/src/test/org/hibernate/ejb/test/emops/MergeTest.java
===================================================================
--- entitymanager/trunk/src/test/org/hibernate/ejb/test/emops/MergeTest.java 2008-10-22 13:53:17 UTC (rev 15371)
+++ entitymanager/trunk/src/test/org/hibernate/ejb/test/emops/MergeTest.java 2008-10-22 14:33:35 UTC (rev 15372)
@@ -16,7 +16,7 @@
race.competitors.add( new Competitor("Name") );
race.competitors.add( new Competitor() );
race.competitors.add( new Competitor() );
- EntityManager em = getEntityManager();
+ EntityManager em = getOrCreateEntityManager();
em.getTransaction().begin();
em.persist( race );
em.flush();
@@ -40,7 +40,7 @@
competition.getCompetitors().add( new Competitor("Name") );
competition.getCompetitors().add( new Competitor() );
competition.getCompetitors().add( new Competitor() );
- EntityManager em = getEntityManager();
+ EntityManager em = getOrCreateEntityManager();
em.getTransaction().begin();
em.persist( competition );
em.flush();
@@ -64,7 +64,7 @@
competition.getCompetitors().add( new Competitor("Name") );
competition.getCompetitors().add( new Competitor() );
competition.getCompetitors().add( new Competitor() );
- EntityManager em = getEntityManager();
+ EntityManager em = getOrCreateEntityManager();
em.getTransaction().begin();
em.persist( competition );
em.flush();
@@ -86,7 +86,7 @@
public void testRemoveAndMerge() {
Race race = new Race();
- EntityManager em = getEntityManager();
+ EntityManager em = getOrCreateEntityManager();
em.getTransaction().begin();
em.persist( race );
em.flush();
@@ -111,7 +111,7 @@
public void testConcurrentMerge() {
Race race = new Race();
race.name = "Derby";
- EntityManager em = getEntityManager();
+ EntityManager em = getOrCreateEntityManager();
em.getTransaction().begin();
em.persist( race );
em.flush();
@@ -120,7 +120,7 @@
race.name = "Magnicourt";
- em = getEntityManager();
+ em = getOrCreateEntityManager();
em.getTransaction().begin();
Race race2 = em.find(Race.class, race.id );
race2.name = "Mans";
@@ -130,7 +130,7 @@
em.getTransaction().commit();
em.close();
- em = getEntityManager();
+ em = getOrCreateEntityManager();
em.getTransaction().begin();
race2 = em.find(Race.class, race.id );
assertEquals( "Last commit win in merge", "Magnicourt", race2.name );
@@ -141,7 +141,7 @@
}
public void testMergeUnidirectionalOneToMany() throws Exception {
- EntityManager em = getEntityManager();
+ EntityManager em = getOrCreateEntityManager();
em.getTransaction().begin();
Empire roman = new Empire();
em.persist( roman );
Modified: entitymanager/trunk/src/test/org/hibernate/ejb/test/emops/RefreshTest.java
===================================================================
--- entitymanager/trunk/src/test/org/hibernate/ejb/test/emops/RefreshTest.java 2008-10-22 13:53:17 UTC (rev 15371)
+++ entitymanager/trunk/src/test/org/hibernate/ejb/test/emops/RefreshTest.java 2008-10-22 14:33:35 UTC (rev 15372)
@@ -11,7 +11,7 @@
public class RefreshTest extends TestCase {
public void testRefreshNonManaged() throws Exception {
- EntityManager em = getEntityManager();
+ EntityManager em = getOrCreateEntityManager();
em.getTransaction().begin();
Race race = new Race();
em.persist( race );
Modified: entitymanager/trunk/src/test/org/hibernate/ejb/test/emops/RemoveTest.java
===================================================================
--- entitymanager/trunk/src/test/org/hibernate/ejb/test/emops/RemoveTest.java 2008-10-22 13:53:17 UTC (rev 15371)
+++ entitymanager/trunk/src/test/org/hibernate/ejb/test/emops/RemoveTest.java 2008-10-22 14:33:35 UTC (rev 15372)
@@ -16,7 +16,7 @@
race.competitors.add( new Competitor() );
race.competitors.add( new Competitor() );
race.competitors.add( new Competitor() );
- EntityManager em = getEntityManager();
+ EntityManager em = getOrCreateEntityManager();
em.getTransaction().begin();
em.persist( race );
em.flush();
@@ -28,7 +28,7 @@
public void testRemoveAndFind() {
Race race = new Race();
- EntityManager em = getEntityManager();
+ EntityManager em = getOrCreateEntityManager();
em.getTransaction().begin();
em.persist( race );
em.remove( race );
@@ -40,14 +40,14 @@
public void testUpdatedAndRemove() throws Exception {
Music music = new Music();
music.setName( "Classical" );
- EntityManager em = getEntityManager();
+ EntityManager em = getOrCreateEntityManager();
em.getTransaction().begin();
em.persist( music );
em.getTransaction().commit();
em.clear();
- em = getEntityManager();
+ em = getOrCreateEntityManager();
em.getTransaction().begin();
EntityManager em2 = factory.createEntityManager();
Modified: entitymanager/trunk/src/test/org/hibernate/ejb/test/emops/cascade/CascadePersistTest.java
===================================================================
--- entitymanager/trunk/src/test/org/hibernate/ejb/test/emops/cascade/CascadePersistTest.java 2008-10-22 13:53:17 UTC (rev 15371)
+++ entitymanager/trunk/src/test/org/hibernate/ejb/test/emops/cascade/CascadePersistTest.java 2008-10-22 14:33:35 UTC (rev 15372)
@@ -13,7 +13,7 @@
public class CascadePersistTest extends TestCase {
public void testLazyCollectionsStayLazyOnPersist() throws Exception {
- EntityManager em = getEntityManager();
+ EntityManager em = getOrCreateEntityManager();
em.getTransaction().begin();
//initialize
A a = new A();
Modified: entitymanager/trunk/src/test/org/hibernate/ejb/test/exception/ExceptionTest.java
===================================================================
--- entitymanager/trunk/src/test/org/hibernate/ejb/test/exception/ExceptionTest.java 2008-10-22 13:53:17 UTC (rev 15371)
+++ entitymanager/trunk/src/test/org/hibernate/ejb/test/exception/ExceptionTest.java 2008-10-22 14:33:35 UTC (rev 15372)
@@ -23,7 +23,7 @@
private final Logger log = LoggerFactory.getLogger(ExceptionTest.class);
public void testOptimisticLockingException() throws Exception {
- EntityManager em = getEntityManager();
+ EntityManager em = getOrCreateEntityManager();
EntityManager em2 = factory.createEntityManager();
em.getTransaction().begin();
Music music = new Music();
@@ -64,7 +64,7 @@
}
public void testEntityNotFoundException() throws Exception {
- EntityManager em = getEntityManager( );
+ EntityManager em = getOrCreateEntityManager( );
Music music = em.getReference( Music.class, new Integer(-1) );
try {
music.getName();
@@ -79,7 +79,7 @@
}
public void testConstraintViolationException() throws Exception {
- EntityManager em = getEntityManager( );
+ EntityManager em = getOrCreateEntityManager( );
em.getTransaction().begin();
Music music = new Music();
music.setName( "Jazz" );
Modified: entitymanager/trunk/src/test/org/hibernate/ejb/test/inheritance/InheritanceTest.java
===================================================================
--- entitymanager/trunk/src/test/org/hibernate/ejb/test/inheritance/InheritanceTest.java 2008-10-22 13:53:17 UTC (rev 15371)
+++ entitymanager/trunk/src/test/org/hibernate/ejb/test/inheritance/InheritanceTest.java 2008-10-22 14:33:35 UTC (rev 15372)
@@ -11,7 +11,7 @@
public class InheritanceTest extends TestCase {
public void testFind() throws Exception {
- EntityManager firstSession = getEntityManager( );
+ EntityManager firstSession = getOrCreateEntityManager( );
Strawberry u = new Strawberry();
u.setSize( 12l );
firstSession.getTransaction().begin();
Modified: entitymanager/trunk/src/test/org/hibernate/ejb/test/lob/BlobTest.java
===================================================================
--- entitymanager/trunk/src/test/org/hibernate/ejb/test/lob/BlobTest.java 2008-10-22 13:53:17 UTC (rev 15371)
+++ entitymanager/trunk/src/test/org/hibernate/ejb/test/lob/BlobTest.java 2008-10-22 14:33:35 UTC (rev 15372)
@@ -18,7 +18,7 @@
public class BlobTest extends TestCase {
public void testBlobSerialization() throws Exception {
- EntityManager em = getEntityManager();
+ EntityManager em = getOrCreateEntityManager();
em.getTransaction().begin();
Map image = new HashMap();
image.put( "meta", "metadata" );
@@ -31,7 +31,7 @@
em.persist( reader );
em.getTransaction().commit();
em.close(); //useless but y'a know
- em = getEntityManager();
+ em = getOrCreateEntityManager();
em.getTransaction().begin();
reader = em.find( ImageReader.class, reader.getId() );
ObjectInputStream ois = new ObjectInputStream( reader.getImage().getBinaryStream() );
Modified: entitymanager/trunk/src/test/org/hibernate/ejb/test/lock/LockTest.java
===================================================================
--- entitymanager/trunk/src/test/org/hibernate/ejb/test/lock/LockTest.java 2008-10-22 13:53:17 UTC (rev 15371)
+++ entitymanager/trunk/src/test/org/hibernate/ejb/test/lock/LockTest.java 2008-10-22 14:33:35 UTC (rev 15372)
@@ -14,7 +14,7 @@
public void testLockRead() throws Exception {
Lock lock = new Lock();
lock.setName( "name" );
- EntityManager em = getEntityManager();
+ EntityManager em = getOrCreateEntityManager();
em.getTransaction().begin();
em.persist( lock );
em.getTransaction().commit();
@@ -35,7 +35,7 @@
public void testLockWrite() throws Exception {
Lock lock = new Lock();
lock.setName( "second" );
- EntityManager em = getEntityManager();
+ EntityManager em = getOrCreateEntityManager();
em.getTransaction().begin();
em.persist( lock );
em.getTransaction().commit();
@@ -61,7 +61,7 @@
public void testLockWriteOnUnversioned() throws Exception {
UnversionedLock lock = new UnversionedLock();
lock.setName( "second" );
- EntityManager em = getEntityManager();
+ EntityManager em = getOrCreateEntityManager();
em.getTransaction().begin();
em.persist( lock );
em.getTransaction().commit();
Modified: entitymanager/trunk/src/test/org/hibernate/ejb/test/ops/FindTest.java
===================================================================
--- entitymanager/trunk/src/test/org/hibernate/ejb/test/ops/FindTest.java 2008-10-22 13:53:17 UTC (rev 15371)
+++ entitymanager/trunk/src/test/org/hibernate/ejb/test/ops/FindTest.java 2008-10-22 14:33:35 UTC (rev 15372)
@@ -14,7 +14,7 @@
Mammal mammal = new Mammal();
mammal.setMamalNbr( 2 );
mammal.setName( "Human" );
- EntityManager em = getEntityManager();
+ EntityManager em = getOrCreateEntityManager();
em.getTransaction().begin();
em.persist( mammal );
em.flush();
Modified: entitymanager/trunk/src/test/org/hibernate/ejb/test/ops/MergeNewTest.java
===================================================================
--- entitymanager/trunk/src/test/org/hibernate/ejb/test/ops/MergeNewTest.java 2008-10-22 13:53:17 UTC (rev 15371)
+++ entitymanager/trunk/src/test/org/hibernate/ejb/test/ops/MergeNewTest.java 2008-10-22 14:33:35 UTC (rev 15372)
@@ -14,7 +14,7 @@
Workload load = new Workload();
load.name = "Cleaning";
load.load = 10;
- EntityManager em = getEntityManager();
+ EntityManager em = getOrCreateEntityManager();
em.getTransaction().begin();
load = em.merge( load );
assertNotNull( load.id );
@@ -28,20 +28,20 @@
Workload load = new Workload();
load.name = "Cleaning";
load.load = 10;
- EntityManager em = getEntityManager();
+ EntityManager em = getOrCreateEntityManager();
em.getTransaction().begin();
load = em.merge( load );
em.flush();
em.getTransaction().commit();
em.close();
- em = getEntityManager();
+ em = getOrCreateEntityManager();
em.getTransaction().begin();
load = em.find( Workload.class, load.id );
em.remove( load );
em.flush();
em.getTransaction().commit();
em.close();
- em = getEntityManager();
+ em = getOrCreateEntityManager();
em.getTransaction().begin();
em.merge( load );
em.flush();
Modified: entitymanager/trunk/src/test/org/hibernate/ejb/test/transaction/FlushAndTransactionTest.java
===================================================================
--- entitymanager/trunk/src/test/org/hibernate/ejb/test/transaction/FlushAndTransactionTest.java 2008-10-22 13:53:17 UTC (rev 15371)
+++ entitymanager/trunk/src/test/org/hibernate/ejb/test/transaction/FlushAndTransactionTest.java 2008-10-22 14:33:35 UTC (rev 15372)
@@ -21,7 +21,7 @@
public void testAlwaysTransactionalOperations() throws Exception {
Book book = new Book();
book.name = "Le petit prince";
- EntityManager em = getEntityManager();
+ EntityManager em = getOrCreateEntityManager();
em.getTransaction().begin();
em.persist( book );
em.getTransaction().commit();
@@ -75,7 +75,7 @@
public void testTransactionalOperationsWhenExtended() throws Exception {
Book book = new Book();
book.name = "Le petit prince";
- EntityManager em = getEntityManager();
+ EntityManager em = getOrCreateEntityManager();
Statistics stats = ( (HibernateEntityManagerFactory) factory ).getSessionFactory().getStatistics();
stats.clear();
stats.setStatisticsEnabled( true );
@@ -118,7 +118,7 @@
public void testMergeWhenExtended() throws Exception {
Book book = new Book();
book.name = "Le petit prince";
- EntityManager em = getEntityManager();
+ EntityManager em = getOrCreateEntityManager();
Statistics stats = ( (HibernateEntityManagerFactory) factory ).getSessionFactory().getStatistics();
em.getTransaction().begin();
@@ -159,7 +159,7 @@
}
public void testCloseAndTransaction() throws Exception {
- EntityManager em = getEntityManager();
+ EntityManager em = getOrCreateEntityManager();
em.getTransaction().begin();
Book book = new Book();
book.name = "Java for Dummies";
@@ -176,7 +176,7 @@
}
em.getTransaction().commit();
assertFalse( em.isOpen() );
- em = getEntityManager();
+ em = getOrCreateEntityManager();
em.getTransaction().begin();
book = em.find( Book.class, book.id );
assertEquals( "C# for Dummies", book.name );
@@ -186,14 +186,14 @@
}
public void testTransactionCommitDoesNotFlush() throws Exception {
- EntityManager em = getEntityManager();
+ EntityManager em = getOrCreateEntityManager();
em.getTransaction().begin();
Book book = new Book();
book.name = "Java for Dummies";
em.persist( book );
em.getTransaction().commit();
em.close();
- em = getEntityManager();
+ em = getOrCreateEntityManager();
em.getTransaction().begin();
List result = em.createQuery("select book from Book book where book.name = :title").
setParameter( "title", book.name ).getResultList();
@@ -203,14 +203,14 @@
}
public void testTransactionAndContains() throws Exception {
- EntityManager em = getEntityManager();
+ EntityManager em = getOrCreateEntityManager();
em.getTransaction().begin();
Book book = new Book();
book.name = "Java for Dummies";
em.persist( book );
em.getTransaction().commit();
em.close();
- em = getEntityManager();
+ em = getOrCreateEntityManager();
em.getTransaction().begin();
List result = em.createQuery("select book from Book book where book.name = :title").
setParameter( "title", book.name ).getResultList();
@@ -225,7 +225,7 @@
Book book = new Book();
book.name = "Stolen keys";
book.id = null; //new Integer( 50 );
- EntityManager em = getEntityManager();
+ EntityManager em = getOrCreateEntityManager();
em.getTransaction().begin();
try {
em.persist( book );
@@ -260,7 +260,7 @@
Book book = new Book();
book.name = "Stolen keys";
book.id = null; //new Integer( 50 );
- EntityManager em = getEntityManager();
+ EntityManager em = getOrCreateEntityManager();
em.getTransaction().begin();
em.persist( book );
em.flush();
@@ -287,7 +287,7 @@
public void testRollbackClearPC() throws Exception {
Book book = new Book();
book.name = "Stolen keys";
- EntityManager em = getEntityManager();
+ EntityManager em = getOrCreateEntityManager();
em.getTransaction().begin();
em.persist( book );
em.getTransaction().commit();
Modified: entitymanager/trunk/src/test/org/hibernate/ejb/test/xml/XmlAttributeOverrideTest.java
===================================================================
--- entitymanager/trunk/src/test/org/hibernate/ejb/test/xml/XmlAttributeOverrideTest.java 2008-10-22 13:53:17 UTC (rev 15371)
+++ entitymanager/trunk/src/test/org/hibernate/ejb/test/xml/XmlAttributeOverrideTest.java 2008-10-22 14:33:35 UTC (rev 15372)
@@ -11,7 +11,7 @@
public class XmlAttributeOverrideTest extends TestCase {
public void testAttributeOverriding() throws Exception {
- EntityManager em = getEntityManager();
+ EntityManager em = getOrCreateEntityManager();
em.getTransaction().begin();
Employee e = new Employee();
@@ -29,7 +29,7 @@
}
public void testDefaultEventListener() throws Exception {
- EntityManager em = getEntityManager();
+ EntityManager em = getOrCreateEntityManager();
em.getTransaction().begin();
CounterListener.reset();
Modified: entitymanager/trunk/src/test/org/hibernate/ejb/test/xml/XmlTest.java
===================================================================
--- entitymanager/trunk/src/test/org/hibernate/ejb/test/xml/XmlTest.java 2008-10-22 13:53:17 UTC (rev 15371)
+++ entitymanager/trunk/src/test/org/hibernate/ejb/test/xml/XmlTest.java 2008-10-22 14:33:35 UTC (rev 15372)
@@ -10,7 +10,7 @@
*/
public class XmlTest extends TestCase {
public void testXmlMappingCorrectness() throws Exception {
- EntityManager em = getEntityManager();
+ EntityManager em = getOrCreateEntityManager();
em.close();
}
15 years, 7 months
- 1
- 0
Hibernate SVN: r15371 - search/branches.
by hibernate-commits＠lists.jboss.org
Author: anthonyHib
Date: 2008-10-22 09:53:17 -0400 (Wed, 22 Oct 2008)
New Revision: 15371
Added:
search/branches/Branch_3_0_1_GA_CP/
Removed:
search/branches/Branch_3_0_1_GA_EAP_seamfp/
Log:
to be consistent with cp naming
Copied: search/branches/Branch_3_0_1_GA_CP (from rev 15370, search/branches/Branch_3_0_1_GA_EAP_seamfp)
15 years, 7 months
- 1
- 0
Hibernate SVN: r15370 - search/branches.
by hibernate-commits＠lists.jboss.org
Author: anthonyHib
Date: 2008-10-22 09:41:46 -0400 (Wed, 22 Oct 2008)
New Revision: 15370
Added:
search/branches/Branch_3_0_1_GA_EAP_seamfp/
Log:
Created to port fixes from community edition to EAP
Copied: search/branches/Branch_3_0_1_GA_EAP_seamfp (from rev 15369, search/tags/v3_0_1_GA)
15 years, 7 months
- 1
- 0
Hibernate SVN: r15369 - in validator/trunk: hibernate-validator/src/main/java/org/hibernate/validation/constraints and 14 other directories.
by hibernate-commits＠lists.jboss.org
Author: hardy.ferentschik
Date: 2008-10-22 08:36:21 -0400 (Wed, 22 Oct 2008)
New Revision: 15369
Modified:
validator/trunk/hibernate-validator/src/main/java/org/hibernate/validation/HibernateValidatorBuilder.java
validator/trunk/hibernate-validator/src/main/java/org/hibernate/validation/ValidatorConstants.java
validator/trunk/hibernate-validator/src/main/java/org/hibernate/validation/Version.java
validator/trunk/hibernate-validator/src/main/java/org/hibernate/validation/constraints/Length.java
validator/trunk/hibernate-validator/src/main/java/org/hibernate/validation/constraints/LengthConstraint.java
validator/trunk/hibernate-validator/src/main/java/org/hibernate/validation/constraints/NotEmpty.java
validator/trunk/hibernate-validator/src/main/java/org/hibernate/validation/constraints/NotEmptyConstraint.java
validator/trunk/hibernate-validator/src/main/java/org/hibernate/validation/constraints/NotNull.java
validator/trunk/hibernate-validator/src/main/java/org/hibernate/validation/constraints/NotNullConstraint.java
validator/trunk/hibernate-validator/src/main/java/org/hibernate/validation/constraints/Pattern.java
validator/trunk/hibernate-validator/src/main/java/org/hibernate/validation/constraints/PatternConstraint.java
validator/trunk/hibernate-validator/src/main/java/org/hibernate/validation/constraints/Patterns.java
validator/trunk/hibernate-validator/src/main/java/org/hibernate/validation/engine/ContextImpl.java
validator/trunk/hibernate-validator/src/main/java/org/hibernate/validation/engine/MetaDataProvider.java
validator/trunk/hibernate-validator/src/main/java/org/hibernate/validation/engine/MetaDataProviderImpl.java
validator/trunk/hibernate-validator/src/main/java/org/hibernate/validation/engine/ValidationContext.java
validator/trunk/hibernate-validator/src/main/java/org/hibernate/validation/engine/ValidatorImpl.java
validator/trunk/hibernate-validator/src/main/java/org/hibernate/validation/engine/ValidatorMetaData.java
validator/trunk/hibernate-validator/src/main/java/org/hibernate/validation/impl/ConstraintDescriptorImpl.java
validator/trunk/hibernate-validator/src/main/java/org/hibernate/validation/impl/ConstraintFactoryImpl.java
validator/trunk/hibernate-validator/src/main/java/org/hibernate/validation/impl/ElementDescriptorImpl.java
validator/trunk/hibernate-validator/src/main/java/org/hibernate/validation/impl/HibernateValidationProvider.java
validator/trunk/hibernate-validator/src/main/java/org/hibernate/validation/impl/InvalidConstraintImpl.java
validator/trunk/hibernate-validator/src/main/java/org/hibernate/validation/impl/ResourceBundleMessageResolver.java
validator/trunk/hibernate-validator/src/main/java/org/hibernate/validation/impl/ValidatorBuilderImpl.java
validator/trunk/hibernate-validator/src/main/java/org/hibernate/validation/impl/ValidatorFactoryImpl.java
validator/trunk/hibernate-validator/src/main/java/org/hibernate/validation/util/IdentitySet.java
validator/trunk/hibernate-validator/src/main/java/org/hibernate/validation/util/LoggerFactory.java
validator/trunk/hibernate-validator/src/main/java/org/hibernate/validation/util/PropertyIterator.java
validator/trunk/hibernate-validator/src/main/java/org/hibernate/validation/util/ReflectionHelper.java
validator/trunk/hibernate-validator/src/test/java/org/hibernate/validation/bootstrap/ValidationTest.java
validator/trunk/hibernate-validator/src/test/java/org/hibernate/validation/constraints/LengthConstraintTest.java
validator/trunk/hibernate-validator/src/test/java/org/hibernate/validation/constraints/NotEmptyConstraintTest.java
validator/trunk/hibernate-validator/src/test/java/org/hibernate/validation/constraints/NotNullConstraintTest.java
validator/trunk/hibernate-validator/src/test/java/org/hibernate/validation/constraints/PatternConstraintTest.java
validator/trunk/hibernate-validator/src/test/java/org/hibernate/validation/eg/Actor.java
validator/trunk/hibernate-validator/src/test/java/org/hibernate/validation/eg/Address.java
validator/trunk/hibernate-validator/src/test/java/org/hibernate/validation/eg/Animal.java
validator/trunk/hibernate-validator/src/test/java/org/hibernate/validation/eg/Author.java
validator/trunk/hibernate-validator/src/test/java/org/hibernate/validation/eg/Book.java
validator/trunk/hibernate-validator/src/test/java/org/hibernate/validation/eg/Boy.java
validator/trunk/hibernate-validator/src/test/java/org/hibernate/validation/eg/Customer.java
validator/trunk/hibernate-validator/src/test/java/org/hibernate/validation/eg/Dictonary.java
validator/trunk/hibernate-validator/src/test/java/org/hibernate/validation/eg/Engine.java
validator/trunk/hibernate-validator/src/test/java/org/hibernate/validation/eg/EnglishDictonary.java
validator/trunk/hibernate-validator/src/test/java/org/hibernate/validation/eg/Female.java
validator/trunk/hibernate-validator/src/test/java/org/hibernate/validation/eg/Male.java
validator/trunk/hibernate-validator/src/test/java/org/hibernate/validation/eg/Order.java
validator/trunk/hibernate-validator/src/test/java/org/hibernate/validation/eg/Person.java
validator/trunk/hibernate-validator/src/test/java/org/hibernate/validation/eg/Unconstraint.java
validator/trunk/hibernate-validator/src/test/java/org/hibernate/validation/eg/constraint/NoGroups.java
validator/trunk/hibernate-validator/src/test/java/org/hibernate/validation/eg/constraint/NoGroupsConstraint.java
validator/trunk/hibernate-validator/src/test/java/org/hibernate/validation/eg/constraint/NoMessage.java
validator/trunk/hibernate-validator/src/test/java/org/hibernate/validation/eg/constraint/NoMessageConstraint.java
validator/trunk/hibernate-validator/src/test/java/org/hibernate/validation/engine/ValidatorImplTest.java
validator/trunk/hibernate-validator/src/test/java/org/hibernate/validation/impl/ResourceBundleMessageResolverTest.java
validator/trunk/hibernate-validator/src/test/java/org/hibernate/validation/util/IdentitySetTest.java
validator/trunk/hibernate-validator/src/test/java/org/hibernate/validation/util/PropertyIteratorTest.java
validator/trunk/hibernate-validator/src/test/java/org/hibernate/validation/util/ReflectionHelperTest.java
validator/trunk/validation-api/src/main/java/javax/validation/Constraint.java
validator/trunk/validation-api/src/main/java/javax/validation/ConstraintDescriptor.java
validator/trunk/validation-api/src/main/java/javax/validation/ConstraintFactory.java
validator/trunk/validation-api/src/main/java/javax/validation/ConstraintValidator.java
validator/trunk/validation-api/src/main/java/javax/validation/Context.java
validator/trunk/validation-api/src/main/java/javax/validation/ElementDescriptor.java
validator/trunk/validation-api/src/main/java/javax/validation/GroupSequence.java
validator/trunk/validation-api/src/main/java/javax/validation/GroupSequences.java
validator/trunk/validation-api/src/main/java/javax/validation/InvalidConstraint.java
validator/trunk/validation-api/src/main/java/javax/validation/MessageResolver.java
validator/trunk/validation-api/src/main/java/javax/validation/OverridesParameter.java
validator/trunk/validation-api/src/main/java/javax/validation/ReportAsSingleInvalidConstraint.java
validator/trunk/validation-api/src/main/java/javax/validation/StandardConstraint.java
validator/trunk/validation-api/src/main/java/javax/validation/StandardConstraintDescriptor.java
validator/trunk/validation-api/src/main/java/javax/validation/Valid.java
validator/trunk/validation-api/src/main/java/javax/validation/Validation.java
validator/trunk/validation-api/src/main/java/javax/validation/ValidationException.java
validator/trunk/validation-api/src/main/java/javax/validation/ValidationProviderResolver.java
validator/trunk/validation-api/src/main/java/javax/validation/Validator.java
validator/trunk/validation-api/src/main/java/javax/validation/ValidatorBuilder.java
validator/trunk/validation-api/src/main/java/javax/validation/ValidatorFactory.java
validator/trunk/validation-api/src/main/java/javax/validation/bootstrap/DefaultValidationProviderResolver.java
validator/trunk/validation-api/src/main/java/javax/validation/bootstrap/GenericBuilderFactory.java
validator/trunk/validation-api/src/main/java/javax/validation/bootstrap/SpecializedBuilderFactory.java
validator/trunk/validation-api/src/main/java/javax/validation/constraints/AssertFalse.java
validator/trunk/validation-api/src/main/java/javax/validation/constraints/AssertTrue.java
validator/trunk/validation-api/src/main/java/javax/validation/constraints/Digits.java
validator/trunk/validation-api/src/main/java/javax/validation/constraints/Future.java
validator/trunk/validation-api/src/main/java/javax/validation/constraints/Max.java
validator/trunk/validation-api/src/main/java/javax/validation/constraints/Min.java
validator/trunk/validation-api/src/main/java/javax/validation/constraints/NotNull.java
validator/trunk/validation-api/src/main/java/javax/validation/constraints/Null.java
validator/trunk/validation-api/src/main/java/javax/validation/constraints/Past.java
validator/trunk/validation-api/src/main/java/javax/validation/constraints/Size.java
validator/trunk/validation-api/src/main/java/javax/validation/spi/BootstrapState.java
validator/trunk/validation-api/src/main/java/javax/validation/spi/ValidationProvider.java
validator/trunk/validation-api/src/main/java/javax/validation/spi/ValidatorBuilderImplementor.java
Log:
Set svn:keyword to Id
Fixed some class headers
Property changes on: validator/trunk/hibernate-validator/src/main/java/org/hibernate/validation/HibernateValidatorBuilder.java
___________________________________________________________________
Name: svn:keywords
+ Id
Property changes on: validator/trunk/hibernate-validator/src/main/java/org/hibernate/validation/ValidatorConstants.java
___________________________________________________________________
Name: svn:keywords
+ Id
Modified: validator/trunk/hibernate-validator/src/main/java/org/hibernate/validation/Version.java
===================================================================
--- validator/trunk/hibernate-validator/src/main/java/org/hibernate/validation/Version.java 2008-10-22 10:12:17 UTC (rev 15368)
+++ validator/trunk/hibernate-validator/src/main/java/org/hibernate/validation/Version.java 2008-10-22 12:36:21 UTC (rev 15369)
@@ -1,4 +1,4 @@
-// $Id: Version.java 105 2008-09-29 12:37:32Z hardy.ferentschik $
+// $Id$
/*
* JBoss, Home of Professional Open Source
* Copyright 2008, Red Hat Middleware LLC, and individual contributors
Property changes on: validator/trunk/hibernate-validator/src/main/java/org/hibernate/validation/Version.java
___________________________________________________________________
Name: svn:keywords
+ Id
Modified: validator/trunk/hibernate-validator/src/main/java/org/hibernate/validation/constraints/Length.java
===================================================================
--- validator/trunk/hibernate-validator/src/main/java/org/hibernate/validation/constraints/Length.java 2008-10-22 10:12:17 UTC (rev 15368)
+++ validator/trunk/hibernate-validator/src/main/java/org/hibernate/validation/constraints/Length.java 2008-10-22 12:36:21 UTC (rev 15369)
@@ -1,4 +1,4 @@
-// $Id: Length.java 105 2008-09-29 12:37:32Z hardy.ferentschik $
+// $Id$
/*
* JBoss, Home of Professional Open Source
* Copyright 2008, Red Hat Middleware LLC, and individual contributors
Property changes on: validator/trunk/hibernate-validator/src/main/java/org/hibernate/validation/constraints/Length.java
___________________________________________________________________
Name: svn:keywords
+ Id
Modified: validator/trunk/hibernate-validator/src/main/java/org/hibernate/validation/constraints/LengthConstraint.java
===================================================================
--- validator/trunk/hibernate-validator/src/main/java/org/hibernate/validation/constraints/LengthConstraint.java 2008-10-22 10:12:17 UTC (rev 15368)
+++ validator/trunk/hibernate-validator/src/main/java/org/hibernate/validation/constraints/LengthConstraint.java 2008-10-22 12:36:21 UTC (rev 15369)
@@ -1,4 +1,4 @@
-// $Id: LengthConstraint.java 110 2008-09-29 23:46:37Z epbernard $
+// $Id$
/*
* JBoss, Home of Professional Open Source
* Copyright 2008, Red Hat Middleware LLC, and individual contributors
Property changes on: validator/trunk/hibernate-validator/src/main/java/org/hibernate/validation/constraints/LengthConstraint.java
___________________________________________________________________
Name: svn:keywords
+ Id
Modified: validator/trunk/hibernate-validator/src/main/java/org/hibernate/validation/constraints/NotEmpty.java
===================================================================
--- validator/trunk/hibernate-validator/src/main/java/org/hibernate/validation/constraints/NotEmpty.java 2008-10-22 10:12:17 UTC (rev 15368)
+++ validator/trunk/hibernate-validator/src/main/java/org/hibernate/validation/constraints/NotEmpty.java 2008-10-22 12:36:21 UTC (rev 15369)
@@ -1,4 +1,4 @@
-// $Id: NotEmpty.java 105 2008-09-29 12:37:32Z hardy.ferentschik $
+// $Id$
/*
* JBoss, Home of Professional Open Source
* Copyright 2008, Red Hat Middleware LLC, and individual contributors
Property changes on: validator/trunk/hibernate-validator/src/main/java/org/hibernate/validation/constraints/NotEmpty.java
___________________________________________________________________
Name: svn:keywords
+ Id
Modified: validator/trunk/hibernate-validator/src/main/java/org/hibernate/validation/constraints/NotEmptyConstraint.java
===================================================================
--- validator/trunk/hibernate-validator/src/main/java/org/hibernate/validation/constraints/NotEmptyConstraint.java 2008-10-22 10:12:17 UTC (rev 15368)
+++ validator/trunk/hibernate-validator/src/main/java/org/hibernate/validation/constraints/NotEmptyConstraint.java 2008-10-22 12:36:21 UTC (rev 15369)
@@ -1,4 +1,4 @@
-// $Id: NotEmptyConstraint.java 110 2008-09-29 23:46:37Z epbernard $
+// $Id$
/*
* JBoss, Home of Professional Open Source
* Copyright 2008, Red Hat Middleware LLC, and individual contributors
Property changes on: validator/trunk/hibernate-validator/src/main/java/org/hibernate/validation/constraints/NotEmptyConstraint.java
___________________________________________________________________
Name: svn:keywords
+ Id
Modified: validator/trunk/hibernate-validator/src/main/java/org/hibernate/validation/constraints/NotNull.java
===================================================================
--- validator/trunk/hibernate-validator/src/main/java/org/hibernate/validation/constraints/NotNull.java 2008-10-22 10:12:17 UTC (rev 15368)
+++ validator/trunk/hibernate-validator/src/main/java/org/hibernate/validation/constraints/NotNull.java 2008-10-22 12:36:21 UTC (rev 15369)
@@ -1,4 +1,4 @@
-// $Id: NotNull.java 105 2008-09-29 12:37:32Z hardy.ferentschik $
+// $Id$
/*
* JBoss, Home of Professional Open Source
* Copyright 2008, Red Hat Middleware LLC, and individual contributors
Property changes on: validator/trunk/hibernate-validator/src/main/java/org/hibernate/validation/constraints/NotNull.java
___________________________________________________________________
Name: svn:keywords
+ Id
Modified: validator/trunk/hibernate-validator/src/main/java/org/hibernate/validation/constraints/NotNullConstraint.java
===================================================================
--- validator/trunk/hibernate-validator/src/main/java/org/hibernate/validation/constraints/NotNullConstraint.java 2008-10-22 10:12:17 UTC (rev 15368)
+++ validator/trunk/hibernate-validator/src/main/java/org/hibernate/validation/constraints/NotNullConstraint.java 2008-10-22 12:36:21 UTC (rev 15369)
@@ -1,4 +1,4 @@
-// $Id: NotNullConstraint.java 110 2008-09-29 23:46:37Z epbernard $
+// $Id$
/*
* JBoss, Home of Professional Open Source
* Copyright 2008, Red Hat Middleware LLC, and individual contributors
Property changes on: validator/trunk/hibernate-validator/src/main/java/org/hibernate/validation/constraints/NotNullConstraint.java
___________________________________________________________________
Name: svn:keywords
+ Id
Modified: validator/trunk/hibernate-validator/src/main/java/org/hibernate/validation/constraints/Pattern.java
===================================================================
--- validator/trunk/hibernate-validator/src/main/java/org/hibernate/validation/constraints/Pattern.java 2008-10-22 10:12:17 UTC (rev 15368)
+++ validator/trunk/hibernate-validator/src/main/java/org/hibernate/validation/constraints/Pattern.java 2008-10-22 12:36:21 UTC (rev 15369)
@@ -1,4 +1,4 @@
-// $Id: Pattern.java 105 2008-09-29 12:37:32Z hardy.ferentschik $
+// $Id$
/*
* JBoss, Home of Professional Open Source
* Copyright 2008, Red Hat Middleware LLC, and individual contributors
Property changes on: validator/trunk/hibernate-validator/src/main/java/org/hibernate/validation/constraints/Pattern.java
___________________________________________________________________
Name: svn:keywords
+ Id
Modified: validator/trunk/hibernate-validator/src/main/java/org/hibernate/validation/constraints/PatternConstraint.java
===================================================================
--- validator/trunk/hibernate-validator/src/main/java/org/hibernate/validation/constraints/PatternConstraint.java 2008-10-22 10:12:17 UTC (rev 15368)
+++ validator/trunk/hibernate-validator/src/main/java/org/hibernate/validation/constraints/PatternConstraint.java 2008-10-22 12:36:21 UTC (rev 15369)
@@ -1,4 +1,4 @@
-// $Id: PatternConstraint.java 110 2008-09-29 23:46:37Z epbernard $
+// $Id$
/*
* JBoss, Home of Professional Open Source
* Copyright 2008, Red Hat Middleware LLC, and individual contributors
Property changes on: validator/trunk/hibernate-validator/src/main/java/org/hibernate/validation/constraints/PatternConstraint.java
___________________________________________________________________
Name: svn:keywords
+ Id
Modified: validator/trunk/hibernate-validator/src/main/java/org/hibernate/validation/constraints/Patterns.java
===================================================================
--- validator/trunk/hibernate-validator/src/main/java/org/hibernate/validation/constraints/Patterns.java 2008-10-22 10:12:17 UTC (rev 15368)
+++ validator/trunk/hibernate-validator/src/main/java/org/hibernate/validation/constraints/Patterns.java 2008-10-22 12:36:21 UTC (rev 15369)
@@ -1,4 +1,4 @@
-// $Id: Patterns.java 105 2008-09-29 12:37:32Z hardy.ferentschik $
+// $Id$
/*
* JBoss, Home of Professional Open Source
* Copyright 2008, Red Hat Middleware LLC, and individual contributors
Property changes on: validator/trunk/hibernate-validator/src/main/java/org/hibernate/validation/constraints/Patterns.java
___________________________________________________________________
Name: svn:keywords
+ Id
Property changes on: validator/trunk/hibernate-validator/src/main/java/org/hibernate/validation/engine/ContextImpl.java
___________________________________________________________________
Name: svn:keywords
+ Id
Modified: validator/trunk/hibernate-validator/src/main/java/org/hibernate/validation/engine/MetaDataProvider.java
===================================================================
--- validator/trunk/hibernate-validator/src/main/java/org/hibernate/validation/engine/MetaDataProvider.java 2008-10-22 10:12:17 UTC (rev 15368)
+++ validator/trunk/hibernate-validator/src/main/java/org/hibernate/validation/engine/MetaDataProvider.java 2008-10-22 12:36:21 UTC (rev 15369)
@@ -1,4 +1,4 @@
-// $Id: MetaDataProvider.java 105 2008-09-29 12:37:32Z hardy.ferentschik $
+// $Id$
/*
* JBoss, Home of Professional Open Source
* Copyright 2008, Red Hat Middleware LLC, and individual contributors
Property changes on: validator/trunk/hibernate-validator/src/main/java/org/hibernate/validation/engine/MetaDataProvider.java
___________________________________________________________________
Name: svn:keywords
+ Id
Modified: validator/trunk/hibernate-validator/src/main/java/org/hibernate/validation/engine/MetaDataProviderImpl.java
===================================================================
--- validator/trunk/hibernate-validator/src/main/java/org/hibernate/validation/engine/MetaDataProviderImpl.java 2008-10-22 10:12:17 UTC (rev 15368)
+++ validator/trunk/hibernate-validator/src/main/java/org/hibernate/validation/engine/MetaDataProviderImpl.java 2008-10-22 12:36:21 UTC (rev 15369)
@@ -1,4 +1,4 @@
-// $Id: MetaDataProviderImpl.java 105 2008-09-29 12:37:32Z hardy.ferentschik $
+// $Id$
/*
* JBoss, Home of Professional Open Source
* Copyright 2008, Red Hat Middleware LLC, and individual contributors
Property changes on: validator/trunk/hibernate-validator/src/main/java/org/hibernate/validation/engine/MetaDataProviderImpl.java
___________________________________________________________________
Name: svn:keywords
+ Id
Modified: validator/trunk/hibernate-validator/src/main/java/org/hibernate/validation/engine/ValidationContext.java
===================================================================
--- validator/trunk/hibernate-validator/src/main/java/org/hibernate/validation/engine/ValidationContext.java 2008-10-22 10:12:17 UTC (rev 15368)
+++ validator/trunk/hibernate-validator/src/main/java/org/hibernate/validation/engine/ValidationContext.java 2008-10-22 12:36:21 UTC (rev 15369)
@@ -1,4 +1,4 @@
-// $Id: ValidationContext.java 105 2008-09-29 12:37:32Z hardy.ferentschik $
+// $Id$
/*
* JBoss, Home of Professional Open Source
* Copyright 2008, Red Hat Middleware LLC, and individual contributors
@@ -32,7 +32,7 @@
* At the same time it keeps track of the currently validated object, the current group and property path.
* The way the validation works at the moment the validated object and the property path have to be processed
* in a stack fashion.
- *
+ * <p/>
* all sort of information needed Introduced to reduce the parameters passed around between the different
* validate methdods in <code>ValidatorImpl</code>.
*
Property changes on: validator/trunk/hibernate-validator/src/main/java/org/hibernate/validation/engine/ValidationContext.java
___________________________________________________________________
Name: svn:keywords
+ Id
Modified: validator/trunk/hibernate-validator/src/main/java/org/hibernate/validation/engine/ValidatorImpl.java
===================================================================
--- validator/trunk/hibernate-validator/src/main/java/org/hibernate/validation/engine/ValidatorImpl.java 2008-10-22 10:12:17 UTC (rev 15368)
+++ validator/trunk/hibernate-validator/src/main/java/org/hibernate/validation/engine/ValidatorImpl.java 2008-10-22 12:36:21 UTC (rev 15369)
@@ -1,4 +1,4 @@
-// $Id: ValidatorImpl.java 113 2008-09-30 20:00:16Z epbernard $
+// $Id$
/*
* JBoss, Home of Professional Open Source
* Copyright 2008, Red Hat Middleware LLC, and individual contributors
Property changes on: validator/trunk/hibernate-validator/src/main/java/org/hibernate/validation/engine/ValidatorImpl.java
___________________________________________________________________
Name: svn:keywords
+ Id
Modified: validator/trunk/hibernate-validator/src/main/java/org/hibernate/validation/engine/ValidatorMetaData.java
===================================================================
--- validator/trunk/hibernate-validator/src/main/java/org/hibernate/validation/engine/ValidatorMetaData.java 2008-10-22 10:12:17 UTC (rev 15368)
+++ validator/trunk/hibernate-validator/src/main/java/org/hibernate/validation/engine/ValidatorMetaData.java 2008-10-22 12:36:21 UTC (rev 15369)
@@ -1,4 +1,4 @@
-// $Id: ValidatorMetaData.java 105 2008-09-29 12:37:32Z hardy.ferentschik $// $Id: ValidatorMetaData.java 105 2008-09-29 12:37:32Z hardy.ferentschik $
+// $Id$// $Id$
/*
* JBoss, Home of Professional Open Source
* Copyright 2008, Red Hat Middleware LLC, and individual contributors
Property changes on: validator/trunk/hibernate-validator/src/main/java/org/hibernate/validation/engine/ValidatorMetaData.java
___________________________________________________________________
Name: svn:keywords
+ Id
Modified: validator/trunk/hibernate-validator/src/main/java/org/hibernate/validation/impl/ConstraintDescriptorImpl.java
===================================================================
--- validator/trunk/hibernate-validator/src/main/java/org/hibernate/validation/impl/ConstraintDescriptorImpl.java 2008-10-22 10:12:17 UTC (rev 15368)
+++ validator/trunk/hibernate-validator/src/main/java/org/hibernate/validation/impl/ConstraintDescriptorImpl.java 2008-10-22 12:36:21 UTC (rev 15369)
@@ -1,4 +1,4 @@
-// $Id: ConstraintDescriptorImpl.java 105 2008-09-29 12:37:32Z hardy.ferentschik $
+// $Id$
/*
* JBoss, Home of Professional Open Source
* Copyright 2008, Red Hat Middleware LLC, and individual contributors
Property changes on: validator/trunk/hibernate-validator/src/main/java/org/hibernate/validation/impl/ConstraintDescriptorImpl.java
___________________________________________________________________
Name: svn:keywords
+ Id
Modified: validator/trunk/hibernate-validator/src/main/java/org/hibernate/validation/impl/ConstraintFactoryImpl.java
===================================================================
--- validator/trunk/hibernate-validator/src/main/java/org/hibernate/validation/impl/ConstraintFactoryImpl.java 2008-10-22 10:12:17 UTC (rev 15368)
+++ validator/trunk/hibernate-validator/src/main/java/org/hibernate/validation/impl/ConstraintFactoryImpl.java 2008-10-22 12:36:21 UTC (rev 15369)
@@ -1,4 +1,4 @@
-// $Id: ConstraintFactoryImpl.java 105 2008-09-29 12:37:32Z hardy.ferentschik $
+// $Id$
/*
* JBoss, Home of Professional Open Source
* Copyright 2008, Red Hat Middleware LLC, and individual contributors
Property changes on: validator/trunk/hibernate-validator/src/main/java/org/hibernate/validation/impl/ConstraintFactoryImpl.java
___________________________________________________________________
Name: svn:keywords
+ Id
Modified: validator/trunk/hibernate-validator/src/main/java/org/hibernate/validation/impl/ElementDescriptorImpl.java
===================================================================
--- validator/trunk/hibernate-validator/src/main/java/org/hibernate/validation/impl/ElementDescriptorImpl.java 2008-10-22 10:12:17 UTC (rev 15368)
+++ validator/trunk/hibernate-validator/src/main/java/org/hibernate/validation/impl/ElementDescriptorImpl.java 2008-10-22 12:36:21 UTC (rev 15369)
@@ -1,4 +1,4 @@
-// $Id: ElementDescriptorImpl.java 105 2008-09-29 12:37:32Z hardy.ferentschik $
+// $Id$
/*
* JBoss, Home of Professional Open Source
* Copyright 2008, Red Hat Middleware LLC, and individual contributors
Property changes on: validator/trunk/hibernate-validator/src/main/java/org/hibernate/validation/impl/ElementDescriptorImpl.java
___________________________________________________________________
Name: svn:keywords
+ Id
Modified: validator/trunk/hibernate-validator/src/main/java/org/hibernate/validation/impl/HibernateValidationProvider.java
===================================================================
--- validator/trunk/hibernate-validator/src/main/java/org/hibernate/validation/impl/HibernateValidationProvider.java 2008-10-22 10:12:17 UTC (rev 15368)
+++ validator/trunk/hibernate-validator/src/main/java/org/hibernate/validation/impl/HibernateValidationProvider.java 2008-10-22 12:36:21 UTC (rev 15369)
@@ -1,4 +1,4 @@
-// $Id: HibernateValidationProvider.java 105 2008-09-29 12:37:32Z hardy.ferentschik $
+// $Id$
/*
* JBoss, Home of Professional Open Source
* Copyright 2008, Red Hat Middleware LLC, and individual contributors
Property changes on: validator/trunk/hibernate-validator/src/main/java/org/hibernate/validation/impl/HibernateValidationProvider.java
___________________________________________________________________
Name: svn:keywords
+ Id
Modified: validator/trunk/hibernate-validator/src/main/java/org/hibernate/validation/impl/InvalidConstraintImpl.java
===================================================================
--- validator/trunk/hibernate-validator/src/main/java/org/hibernate/validation/impl/InvalidConstraintImpl.java 2008-10-22 10:12:17 UTC (rev 15368)
+++ validator/trunk/hibernate-validator/src/main/java/org/hibernate/validation/impl/InvalidConstraintImpl.java 2008-10-22 12:36:21 UTC (rev 15369)
@@ -1,4 +1,4 @@
-// $Id: InvalidConstraintImpl.java 105 2008-09-29 12:37:32Z hardy.ferentschik $
+// $Id$
/*
* JBoss, Home of Professional Open Source
* Copyright 2008, Red Hat Middleware LLC, and individual contributors
Property changes on: validator/trunk/hibernate-validator/src/main/java/org/hibernate/validation/impl/InvalidConstraintImpl.java
___________________________________________________________________
Name: svn:keywords
+ Id
Modified: validator/trunk/hibernate-validator/src/main/java/org/hibernate/validation/impl/ResourceBundleMessageResolver.java
===================================================================
--- validator/trunk/hibernate-validator/src/main/java/org/hibernate/validation/impl/ResourceBundleMessageResolver.java 2008-10-22 10:12:17 UTC (rev 15368)
+++ validator/trunk/hibernate-validator/src/main/java/org/hibernate/validation/impl/ResourceBundleMessageResolver.java 2008-10-22 12:36:21 UTC (rev 15369)
@@ -1,4 +1,4 @@
-// $Id: ResourceBundleMessageResolver.java 105 2008-09-29 12:37:32Z hardy.ferentschik $
+// $Id$
/*
* JBoss, Home of Professional Open Source
* Copyright 2008, Red Hat Middleware LLC, and individual contributors
Property changes on: validator/trunk/hibernate-validator/src/main/java/org/hibernate/validation/impl/ResourceBundleMessageResolver.java
___________________________________________________________________
Name: svn:keywords
+ Id
Modified: validator/trunk/hibernate-validator/src/main/java/org/hibernate/validation/impl/ValidatorBuilderImpl.java
===================================================================
--- validator/trunk/hibernate-validator/src/main/java/org/hibernate/validation/impl/ValidatorBuilderImpl.java 2008-10-22 10:12:17 UTC (rev 15368)
+++ validator/trunk/hibernate-validator/src/main/java/org/hibernate/validation/impl/ValidatorBuilderImpl.java 2008-10-22 12:36:21 UTC (rev 15369)
@@ -1,4 +1,4 @@
-// $Id: ValidatorBuilderImpl.java 105 2008-09-29 12:37:32Z hardy.ferentschik $
+// $Id$
/*
* JBoss, Home of Professional Open Source
* Copyright 2008, Red Hat Middleware LLC, and individual contributors
Property changes on: validator/trunk/hibernate-validator/src/main/java/org/hibernate/validation/impl/ValidatorBuilderImpl.java
___________________________________________________________________
Name: svn:keywords
+ Id
Modified: validator/trunk/hibernate-validator/src/main/java/org/hibernate/validation/impl/ValidatorFactoryImpl.java
===================================================================
--- validator/trunk/hibernate-validator/src/main/java/org/hibernate/validation/impl/ValidatorFactoryImpl.java 2008-10-22 10:12:17 UTC (rev 15368)
+++ validator/trunk/hibernate-validator/src/main/java/org/hibernate/validation/impl/ValidatorFactoryImpl.java 2008-10-22 12:36:21 UTC (rev 15369)
@@ -1,4 +1,4 @@
-// $Id: ValidatorFactoryImpl.java 105 2008-09-29 12:37:32Z hardy.ferentschik $
+// $Id$
/*
* JBoss, Home of Professional Open Source
* Copyright 2008, Red Hat Middleware LLC, and individual contributors
Property changes on: validator/trunk/hibernate-validator/src/main/java/org/hibernate/validation/impl/ValidatorFactoryImpl.java
___________________________________________________________________
Name: svn:keywords
+ Id
Modified: validator/trunk/hibernate-validator/src/main/java/org/hibernate/validation/util/IdentitySet.java
===================================================================
--- validator/trunk/hibernate-validator/src/main/java/org/hibernate/validation/util/IdentitySet.java 2008-10-22 10:12:17 UTC (rev 15368)
+++ validator/trunk/hibernate-validator/src/main/java/org/hibernate/validation/util/IdentitySet.java 2008-10-22 12:36:21 UTC (rev 15369)
@@ -1,4 +1,4 @@
-// $Id: IdentitySet.java 105 2008-09-29 12:37:32Z hardy.ferentschik $
+// $Id$
/*
* JBoss, Home of Professional Open Source
* Copyright 2008, Red Hat Middleware LLC, and individual contributors
Property changes on: validator/trunk/hibernate-validator/src/main/java/org/hibernate/validation/util/IdentitySet.java
___________________________________________________________________
Name: svn:keywords
+ Id
Property changes on: validator/trunk/hibernate-validator/src/main/java/org/hibernate/validation/util/LoggerFactory.java
___________________________________________________________________
Name: svn:keywords
+ Id
Modified: validator/trunk/hibernate-validator/src/main/java/org/hibernate/validation/util/PropertyIterator.java
===================================================================
--- validator/trunk/hibernate-validator/src/main/java/org/hibernate/validation/util/PropertyIterator.java 2008-10-22 10:12:17 UTC (rev 15368)
+++ validator/trunk/hibernate-validator/src/main/java/org/hibernate/validation/util/PropertyIterator.java 2008-10-22 12:36:21 UTC (rev 15369)
@@ -1,4 +1,4 @@
-// $Id: PropertyIterator.java 112 2008-09-30 08:08:50Z hardy.ferentschik $
+// $Id$
/*
* JBoss, Home of Professional Open Source
* Copyright 2008, Red Hat Middleware LLC, and individual contributors
Property changes on: validator/trunk/hibernate-validator/src/main/java/org/hibernate/validation/util/PropertyIterator.java
___________________________________________________________________
Name: svn:keywords
+ Id
Modified: validator/trunk/hibernate-validator/src/main/java/org/hibernate/validation/util/ReflectionHelper.java
===================================================================
--- validator/trunk/hibernate-validator/src/main/java/org/hibernate/validation/util/ReflectionHelper.java 2008-10-22 10:12:17 UTC (rev 15368)
+++ validator/trunk/hibernate-validator/src/main/java/org/hibernate/validation/util/ReflectionHelper.java 2008-10-22 12:36:21 UTC (rev 15369)
@@ -1,4 +1,4 @@
-// $Id: ReflectionHelper.java 111 2008-09-30 08:00:12Z hardy.ferentschik $
+// $Id$
/*
* JBoss, Home of Professional Open Source
* Copyright 2008, Red Hat Middleware LLC, and individual contributors
Property changes on: validator/trunk/hibernate-validator/src/main/java/org/hibernate/validation/util/ReflectionHelper.java
___________________________________________________________________
Name: svn:keywords
+ Id
Modified: validator/trunk/hibernate-validator/src/test/java/org/hibernate/validation/bootstrap/ValidationTest.java
===================================================================
--- validator/trunk/hibernate-validator/src/test/java/org/hibernate/validation/bootstrap/ValidationTest.java 2008-10-22 10:12:17 UTC (rev 15368)
+++ validator/trunk/hibernate-validator/src/test/java/org/hibernate/validation/bootstrap/ValidationTest.java 2008-10-22 12:36:21 UTC (rev 15369)
@@ -1,4 +1,4 @@
-// $Id: ValidationTest.java 115 2008-10-01 15:33:10Z hardy.ferentschik $
+// $Id$
/*
* JBoss, Home of Professional Open Source
* Copyright 2008, Red Hat Middleware LLC, and individual contributors
Property changes on: validator/trunk/hibernate-validator/src/test/java/org/hibernate/validation/bootstrap/ValidationTest.java
___________________________________________________________________
Name: svn:keywords
+ Id
Modified: validator/trunk/hibernate-validator/src/test/java/org/hibernate/validation/constraints/LengthConstraintTest.java
===================================================================
--- validator/trunk/hibernate-validator/src/test/java/org/hibernate/validation/constraints/LengthConstraintTest.java 2008-10-22 10:12:17 UTC (rev 15368)
+++ validator/trunk/hibernate-validator/src/test/java/org/hibernate/validation/constraints/LengthConstraintTest.java 2008-10-22 12:36:21 UTC (rev 15369)
@@ -1,4 +1,4 @@
-// $Id: LengthConstraintTest.java 110 2008-09-29 23:46:37Z epbernard $
+// $Id$
/*
* JBoss, Home of Professional Open Source
* Copyright 2008, Red Hat Middleware LLC, and individual contributors
Property changes on: validator/trunk/hibernate-validator/src/test/java/org/hibernate/validation/constraints/LengthConstraintTest.java
___________________________________________________________________
Name: svn:keywords
+ Id
Modified: validator/trunk/hibernate-validator/src/test/java/org/hibernate/validation/constraints/NotEmptyConstraintTest.java
===================================================================
--- validator/trunk/hibernate-validator/src/test/java/org/hibernate/validation/constraints/NotEmptyConstraintTest.java 2008-10-22 10:12:17 UTC (rev 15368)
+++ validator/trunk/hibernate-validator/src/test/java/org/hibernate/validation/constraints/NotEmptyConstraintTest.java 2008-10-22 12:36:21 UTC (rev 15369)
@@ -1,4 +1,4 @@
-// $Id: NotEmptyConstraintTest.java 110 2008-09-29 23:46:37Z epbernard $
+// $Id$
/*
* JBoss, Home of Professional Open Source
* Copyright 2008, Red Hat Middleware LLC, and individual contributors
Property changes on: validator/trunk/hibernate-validator/src/test/java/org/hibernate/validation/constraints/NotEmptyConstraintTest.java
___________________________________________________________________
Name: svn:keywords
+ Id
Modified: validator/trunk/hibernate-validator/src/test/java/org/hibernate/validation/constraints/NotNullConstraintTest.java
===================================================================
--- validator/trunk/hibernate-validator/src/test/java/org/hibernate/validation/constraints/NotNullConstraintTest.java 2008-10-22 10:12:17 UTC (rev 15368)
+++ validator/trunk/hibernate-validator/src/test/java/org/hibernate/validation/constraints/NotNullConstraintTest.java 2008-10-22 12:36:21 UTC (rev 15369)
@@ -1,4 +1,4 @@
-// $Id: NotNullConstraintTest.java 110 2008-09-29 23:46:37Z epbernard $
+// $Id$
/*
* JBoss, Home of Professional Open Source
* Copyright 2008, Red Hat Middleware LLC, and individual contributors
Property changes on: validator/trunk/hibernate-validator/src/test/java/org/hibernate/validation/constraints/NotNullConstraintTest.java
___________________________________________________________________
Name: svn:keywords
+ Id
Modified: validator/trunk/hibernate-validator/src/test/java/org/hibernate/validation/constraints/PatternConstraintTest.java
===================================================================
--- validator/trunk/hibernate-validator/src/test/java/org/hibernate/validation/constraints/PatternConstraintTest.java 2008-10-22 10:12:17 UTC (rev 15368)
+++ validator/trunk/hibernate-validator/src/test/java/org/hibernate/validation/constraints/PatternConstraintTest.java 2008-10-22 12:36:21 UTC (rev 15369)
@@ -1,4 +1,4 @@
-// $Id: PatternConstraintTest.java 110 2008-09-29 23:46:37Z epbernard $
+// $Id$
/*
* JBoss, Home of Professional Open Source
* Copyright 2008, Red Hat Middleware LLC, and individual contributors
Property changes on: validator/trunk/hibernate-validator/src/test/java/org/hibernate/validation/constraints/PatternConstraintTest.java
___________________________________________________________________
Name: svn:keywords
+ Id
Modified: validator/trunk/hibernate-validator/src/test/java/org/hibernate/validation/eg/Actor.java
===================================================================
--- validator/trunk/hibernate-validator/src/test/java/org/hibernate/validation/eg/Actor.java 2008-10-22 10:12:17 UTC (rev 15368)
+++ validator/trunk/hibernate-validator/src/test/java/org/hibernate/validation/eg/Actor.java 2008-10-22 12:36:21 UTC (rev 15369)
@@ -1,4 +1,4 @@
-// $Id: Actor.java 105 2008-09-29 12:37:32Z hardy.ferentschik $
+// $Id$
/*
* JBoss, Home of Professional Open Source
* Copyright 2008, Red Hat Middleware LLC, and individual contributors
Property changes on: validator/trunk/hibernate-validator/src/test/java/org/hibernate/validation/eg/Actor.java
___________________________________________________________________
Name: svn:keywords
+ Id
Modified: validator/trunk/hibernate-validator/src/test/java/org/hibernate/validation/eg/Address.java
===================================================================
--- validator/trunk/hibernate-validator/src/test/java/org/hibernate/validation/eg/Address.java 2008-10-22 10:12:17 UTC (rev 15368)
+++ validator/trunk/hibernate-validator/src/test/java/org/hibernate/validation/eg/Address.java 2008-10-22 12:36:21 UTC (rev 15369)
@@ -1,4 +1,4 @@
-// $Id: Address.java 105 2008-09-29 12:37:32Z hardy.ferentschik $
+// $Id$
/*
* JBoss, Home of Professional Open Source
* Copyright 2008, Red Hat Middleware LLC, and individual contributors
Property changes on: validator/trunk/hibernate-validator/src/test/java/org/hibernate/validation/eg/Address.java
___________________________________________________________________
Name: svn:keywords
+ Id
Modified: validator/trunk/hibernate-validator/src/test/java/org/hibernate/validation/eg/Animal.java
===================================================================
--- validator/trunk/hibernate-validator/src/test/java/org/hibernate/validation/eg/Animal.java 2008-10-22 10:12:17 UTC (rev 15368)
+++ validator/trunk/hibernate-validator/src/test/java/org/hibernate/validation/eg/Animal.java 2008-10-22 12:36:21 UTC (rev 15369)
@@ -1,4 +1,4 @@
-// $Id: Animal.java 105 2008-09-29 12:37:32Z hardy.ferentschik $
+// $Id$
/*
* JBoss, Home of Professional Open Source
* Copyright 2008, Red Hat Middleware LLC, and individual contributors
Property changes on: validator/trunk/hibernate-validator/src/test/java/org/hibernate/validation/eg/Animal.java
___________________________________________________________________
Name: svn:keywords
+ Id
Modified: validator/trunk/hibernate-validator/src/test/java/org/hibernate/validation/eg/Author.java
===================================================================
--- validator/trunk/hibernate-validator/src/test/java/org/hibernate/validation/eg/Author.java 2008-10-22 10:12:17 UTC (rev 15368)
+++ validator/trunk/hibernate-validator/src/test/java/org/hibernate/validation/eg/Author.java 2008-10-22 12:36:21 UTC (rev 15369)
@@ -1,4 +1,4 @@
-// $Id: Author.java 105 2008-09-29 12:37:32Z hardy.ferentschik $
+// $Id$
/*
* JBoss, Home of Professional Open Source
* Copyright 2008, Red Hat Middleware LLC, and individual contributors
Property changes on: validator/trunk/hibernate-validator/src/test/java/org/hibernate/validation/eg/Author.java
___________________________________________________________________
Name: svn:keywords
+ Id
Modified: validator/trunk/hibernate-validator/src/test/java/org/hibernate/validation/eg/Book.java
===================================================================
--- validator/trunk/hibernate-validator/src/test/java/org/hibernate/validation/eg/Book.java 2008-10-22 10:12:17 UTC (rev 15368)
+++ validator/trunk/hibernate-validator/src/test/java/org/hibernate/validation/eg/Book.java 2008-10-22 12:36:21 UTC (rev 15369)
@@ -1,4 +1,4 @@
-// $Id: Book.java 105 2008-09-29 12:37:32Z hardy.ferentschik $
+// $Id$
/*
* JBoss, Home of Professional Open Source
* Copyright 2008, Red Hat Middleware LLC, and individual contributors
Property changes on: validator/trunk/hibernate-validator/src/test/java/org/hibernate/validation/eg/Book.java
___________________________________________________________________
Name: svn:keywords
+ Id
Modified: validator/trunk/hibernate-validator/src/test/java/org/hibernate/validation/eg/Boy.java
===================================================================
--- validator/trunk/hibernate-validator/src/test/java/org/hibernate/validation/eg/Boy.java 2008-10-22 10:12:17 UTC (rev 15368)
+++ validator/trunk/hibernate-validator/src/test/java/org/hibernate/validation/eg/Boy.java 2008-10-22 12:36:21 UTC (rev 15369)
@@ -1,4 +1,4 @@
-// $Id: Boy.java 105 2008-09-29 12:37:32Z hardy.ferentschik $
+// $Id$
/*
* JBoss, Home of Professional Open Source
* Copyright 2008, Red Hat Middleware LLC, and individual contributors
Property changes on: validator/trunk/hibernate-validator/src/test/java/org/hibernate/validation/eg/Boy.java
___________________________________________________________________
Name: svn:keywords
+ Id
Modified: validator/trunk/hibernate-validator/src/test/java/org/hibernate/validation/eg/Customer.java
===================================================================
--- validator/trunk/hibernate-validator/src/test/java/org/hibernate/validation/eg/Customer.java 2008-10-22 10:12:17 UTC (rev 15368)
+++ validator/trunk/hibernate-validator/src/test/java/org/hibernate/validation/eg/Customer.java 2008-10-22 12:36:21 UTC (rev 15369)
@@ -1,4 +1,4 @@
-// $Id: Customer.java 105 2008-09-29 12:37:32Z hardy.ferentschik $
+// $Id$
/*
* JBoss, Home of Professional Open Source
* Copyright 2008, Red Hat Middleware LLC, and individual contributors
Property changes on: validator/trunk/hibernate-validator/src/test/java/org/hibernate/validation/eg/Customer.java
___________________________________________________________________
Name: svn:keywords
+ Id
Modified: validator/trunk/hibernate-validator/src/test/java/org/hibernate/validation/eg/Dictonary.java
===================================================================
--- validator/trunk/hibernate-validator/src/test/java/org/hibernate/validation/eg/Dictonary.java 2008-10-22 10:12:17 UTC (rev 15368)
+++ validator/trunk/hibernate-validator/src/test/java/org/hibernate/validation/eg/Dictonary.java 2008-10-22 12:36:21 UTC (rev 15369)
@@ -1,4 +1,4 @@
-// $Id: Dictonary.java 105 2008-09-29 12:37:32Z hardy.ferentschik $
+// $Id$
/*
* JBoss, Home of Professional Open Source
* Copyright 2008, Red Hat Middleware LLC, and individual contributors
Property changes on: validator/trunk/hibernate-validator/src/test/java/org/hibernate/validation/eg/Dictonary.java
___________________________________________________________________
Name: svn:keywords
+ Id
Modified: validator/trunk/hibernate-validator/src/test/java/org/hibernate/validation/eg/Engine.java
===================================================================
--- validator/trunk/hibernate-validator/src/test/java/org/hibernate/validation/eg/Engine.java 2008-10-22 10:12:17 UTC (rev 15368)
+++ validator/trunk/hibernate-validator/src/test/java/org/hibernate/validation/eg/Engine.java 2008-10-22 12:36:21 UTC (rev 15369)
@@ -1,4 +1,4 @@
-// $Id: Engine.java 105 2008-09-29 12:37:32Z hardy.ferentschik $
+// $Id$
/*
* JBoss, Home of Professional Open Source
* Copyright 2008, Red Hat Middleware LLC, and individual contributors
Property changes on: validator/trunk/hibernate-validator/src/test/java/org/hibernate/validation/eg/Engine.java
___________________________________________________________________
Name: svn:keywords
+ Id
Modified: validator/trunk/hibernate-validator/src/test/java/org/hibernate/validation/eg/EnglishDictonary.java
===================================================================
--- validator/trunk/hibernate-validator/src/test/java/org/hibernate/validation/eg/EnglishDictonary.java 2008-10-22 10:12:17 UTC (rev 15368)
+++ validator/trunk/hibernate-validator/src/test/java/org/hibernate/validation/eg/EnglishDictonary.java 2008-10-22 12:36:21 UTC (rev 15369)
@@ -1,4 +1,4 @@
-// $Id: EnglishDictonary.java 105 2008-09-29 12:37:32Z hardy.ferentschik $
+// $Id$
/*
* JBoss, Home of Professional Open Source
* Copyright 2008, Red Hat Middleware LLC, and individual contributors
Property changes on: validator/trunk/hibernate-validator/src/test/java/org/hibernate/validation/eg/EnglishDictonary.java
___________________________________________________________________
Name: svn:keywords
+ Id
Modified: validator/trunk/hibernate-validator/src/test/java/org/hibernate/validation/eg/Female.java
===================================================================
--- validator/trunk/hibernate-validator/src/test/java/org/hibernate/validation/eg/Female.java 2008-10-22 10:12:17 UTC (rev 15368)
+++ validator/trunk/hibernate-validator/src/test/java/org/hibernate/validation/eg/Female.java 2008-10-22 12:36:21 UTC (rev 15369)
@@ -1,4 +1,4 @@
-// $Id: Female.java 105 2008-09-29 12:37:32Z hardy.ferentschik $
+// $Id$
/*
* JBoss, Home of Professional Open Source
* Copyright 2008, Red Hat Middleware LLC, and individual contributors
Property changes on: validator/trunk/hibernate-validator/src/test/java/org/hibernate/validation/eg/Female.java
___________________________________________________________________
Name: svn:keywords
+ Id
Modified: validator/trunk/hibernate-validator/src/test/java/org/hibernate/validation/eg/Male.java
===================================================================
--- validator/trunk/hibernate-validator/src/test/java/org/hibernate/validation/eg/Male.java 2008-10-22 10:12:17 UTC (rev 15368)
+++ validator/trunk/hibernate-validator/src/test/java/org/hibernate/validation/eg/Male.java 2008-10-22 12:36:21 UTC (rev 15369)
@@ -1,4 +1,4 @@
-// $Id: Male.java 105 2008-09-29 12:37:32Z hardy.ferentschik $
+// $Id$
/*
* JBoss, Home of Professional Open Source
* Copyright 2008, Red Hat Middleware LLC, and individual contributors
Property changes on: validator/trunk/hibernate-validator/src/test/java/org/hibernate/validation/eg/Male.java
___________________________________________________________________
Name: svn:keywords
+ Id
Modified: validator/trunk/hibernate-validator/src/test/java/org/hibernate/validation/eg/Order.java
===================================================================
--- validator/trunk/hibernate-validator/src/test/java/org/hibernate/validation/eg/Order.java 2008-10-22 10:12:17 UTC (rev 15368)
+++ validator/trunk/hibernate-validator/src/test/java/org/hibernate/validation/eg/Order.java 2008-10-22 12:36:21 UTC (rev 15369)
@@ -1,4 +1,4 @@
-// $Id: Order.java 105 2008-09-29 12:37:32Z hardy.ferentschik $
+// $Id$
/*
* JBoss, Home of Professional Open Source
* Copyright 2008, Red Hat Middleware LLC, and individual contributors
Property changes on: validator/trunk/hibernate-validator/src/test/java/org/hibernate/validation/eg/Order.java
___________________________________________________________________
Name: svn:keywords
+ Id
Modified: validator/trunk/hibernate-validator/src/test/java/org/hibernate/validation/eg/Person.java
===================================================================
--- validator/trunk/hibernate-validator/src/test/java/org/hibernate/validation/eg/Person.java 2008-10-22 10:12:17 UTC (rev 15368)
+++ validator/trunk/hibernate-validator/src/test/java/org/hibernate/validation/eg/Person.java 2008-10-22 12:36:21 UTC (rev 15369)
@@ -1,4 +1,4 @@
-// $Id: Person.java 105 2008-09-29 12:37:32Z hardy.ferentschik $
+// $Id$
/*
* JBoss, Home of Professional Open Source
* Copyright 2008, Red Hat Middleware LLC, and individual contributors
Property changes on: validator/trunk/hibernate-validator/src/test/java/org/hibernate/validation/eg/Person.java
___________________________________________________________________
Name: svn:keywords
+ Id
Property changes on: validator/trunk/hibernate-validator/src/test/java/org/hibernate/validation/eg/Unconstraint.java
___________________________________________________________________
Name: svn:keywords
+ Id
Modified: validator/trunk/hibernate-validator/src/test/java/org/hibernate/validation/eg/constraint/NoGroups.java
===================================================================
--- validator/trunk/hibernate-validator/src/test/java/org/hibernate/validation/eg/constraint/NoGroups.java 2008-10-22 10:12:17 UTC (rev 15368)
+++ validator/trunk/hibernate-validator/src/test/java/org/hibernate/validation/eg/constraint/NoGroups.java 2008-10-22 12:36:21 UTC (rev 15369)
@@ -1,4 +1,4 @@
-// $Id: NoGroups.java 105 2008-09-29 12:37:32Z hardy.ferentschik $
+// $Id$
/*
* JBoss, Home of Professional Open Source
* Copyright 2008, Red Hat Middleware LLC, and individual contributors
Property changes on: validator/trunk/hibernate-validator/src/test/java/org/hibernate/validation/eg/constraint/NoGroups.java
___________________________________________________________________
Name: svn:keywords
+ Id
Modified: validator/trunk/hibernate-validator/src/test/java/org/hibernate/validation/eg/constraint/NoGroupsConstraint.java
===================================================================
--- validator/trunk/hibernate-validator/src/test/java/org/hibernate/validation/eg/constraint/NoGroupsConstraint.java 2008-10-22 10:12:17 UTC (rev 15368)
+++ validator/trunk/hibernate-validator/src/test/java/org/hibernate/validation/eg/constraint/NoGroupsConstraint.java 2008-10-22 12:36:21 UTC (rev 15369)
@@ -1,4 +1,4 @@
-// $Id: NoGroupsConstraint.java 110 2008-09-29 23:46:37Z epbernard $
+// $Id$
/*
* JBoss, Home of Professional Open Source
* Copyright 2008, Red Hat Middleware LLC, and individual contributors
Property changes on: validator/trunk/hibernate-validator/src/test/java/org/hibernate/validation/eg/constraint/NoGroupsConstraint.java
___________________________________________________________________
Name: svn:keywords
+ Id
Modified: validator/trunk/hibernate-validator/src/test/java/org/hibernate/validation/eg/constraint/NoMessage.java
===================================================================
--- validator/trunk/hibernate-validator/src/test/java/org/hibernate/validation/eg/constraint/NoMessage.java 2008-10-22 10:12:17 UTC (rev 15368)
+++ validator/trunk/hibernate-validator/src/test/java/org/hibernate/validation/eg/constraint/NoMessage.java 2008-10-22 12:36:21 UTC (rev 15369)
@@ -1,4 +1,4 @@
-// $Id: NoMessage.java 105 2008-09-29 12:37:32Z hardy.ferentschik $
+// $Id$
/*
* JBoss, Home of Professional Open Source
* Copyright 2008, Red Hat Middleware LLC, and individual contributors
Property changes on: validator/trunk/hibernate-validator/src/test/java/org/hibernate/validation/eg/constraint/NoMessage.java
___________________________________________________________________
Name: svn:keywords
+ Id
Modified: validator/trunk/hibernate-validator/src/test/java/org/hibernate/validation/eg/constraint/NoMessageConstraint.java
===================================================================
--- validator/trunk/hibernate-validator/src/test/java/org/hibernate/validation/eg/constraint/NoMessageConstraint.java 2008-10-22 10:12:17 UTC (rev 15368)
+++ validator/trunk/hibernate-validator/src/test/java/org/hibernate/validation/eg/constraint/NoMessageConstraint.java 2008-10-22 12:36:21 UTC (rev 15369)
@@ -1,4 +1,4 @@
-// $Id: NoMessageConstraint.java 110 2008-09-29 23:46:37Z epbernard $
+// $Id$
/*
* JBoss, Home of Professional Open Source
* Copyright 2008, Red Hat Middleware LLC, and individual contributors
Property changes on: validator/trunk/hibernate-validator/src/test/java/org/hibernate/validation/eg/constraint/NoMessageConstraint.java
___________________________________________________________________
Name: svn:keywords
+ Id
Modified: validator/trunk/hibernate-validator/src/test/java/org/hibernate/validation/engine/ValidatorImplTest.java
===================================================================
--- validator/trunk/hibernate-validator/src/test/java/org/hibernate/validation/engine/ValidatorImplTest.java 2008-10-22 10:12:17 UTC (rev 15368)
+++ validator/trunk/hibernate-validator/src/test/java/org/hibernate/validation/engine/ValidatorImplTest.java 2008-10-22 12:36:21 UTC (rev 15369)
@@ -1,4 +1,4 @@
-// $Id: ValidatorImplTest.java 105 2008-09-29 12:37:32Z hardy.ferentschik $
+// $Id$
/*
* JBoss, Home of Professional Open Source
* Copyright 2008, Red Hat Middleware LLC, and individual contributors
Property changes on: validator/trunk/hibernate-validator/src/test/java/org/hibernate/validation/engine/ValidatorImplTest.java
___________________________________________________________________
Name: svn:keywords
+ Id
Modified: validator/trunk/hibernate-validator/src/test/java/org/hibernate/validation/impl/ResourceBundleMessageResolverTest.java
===================================================================
--- validator/trunk/hibernate-validator/src/test/java/org/hibernate/validation/impl/ResourceBundleMessageResolverTest.java 2008-10-22 10:12:17 UTC (rev 15368)
+++ validator/trunk/hibernate-validator/src/test/java/org/hibernate/validation/impl/ResourceBundleMessageResolverTest.java 2008-10-22 12:36:21 UTC (rev 15369)
@@ -1,4 +1,4 @@
-// $Id: ResourceBundleMessageResolverTest.java 105 2008-09-29 12:37:32Z hardy.ferentschik $
+// $Id$
/*
* JBoss, Home of Professional Open Source
* Copyright 2008, Red Hat Middleware LLC, and individual contributors
Property changes on: validator/trunk/hibernate-validator/src/test/java/org/hibernate/validation/impl/ResourceBundleMessageResolverTest.java
___________________________________________________________________
Name: svn:keywords
+ Id
Modified: validator/trunk/hibernate-validator/src/test/java/org/hibernate/validation/util/IdentitySetTest.java
===================================================================
--- validator/trunk/hibernate-validator/src/test/java/org/hibernate/validation/util/IdentitySetTest.java 2008-10-22 10:12:17 UTC (rev 15368)
+++ validator/trunk/hibernate-validator/src/test/java/org/hibernate/validation/util/IdentitySetTest.java 2008-10-22 12:36:21 UTC (rev 15369)
@@ -1,4 +1,4 @@
-// $Id: IdentitySetTest.java 105 2008-09-29 12:37:32Z hardy.ferentschik $
+// $Id$
/*
* JBoss, Home of Professional Open Source
* Copyright 2008, Red Hat Middleware LLC, and individual contributors
Property changes on: validator/trunk/hibernate-validator/src/test/java/org/hibernate/validation/util/IdentitySetTest.java
___________________________________________________________________
Name: svn:keywords
+ Id
Modified: validator/trunk/hibernate-validator/src/test/java/org/hibernate/validation/util/PropertyIteratorTest.java
===================================================================
--- validator/trunk/hibernate-validator/src/test/java/org/hibernate/validation/util/PropertyIteratorTest.java 2008-10-22 10:12:17 UTC (rev 15368)
+++ validator/trunk/hibernate-validator/src/test/java/org/hibernate/validation/util/PropertyIteratorTest.java 2008-10-22 12:36:21 UTC (rev 15369)
@@ -1,4 +1,4 @@
-// $Id: PropertyIteratorTest.java 112 2008-09-30 08:08:50Z hardy.ferentschik $
+// $Id$
/*
* JBoss, Home of Professional Open Source
* Copyright 2008, Red Hat Middleware LLC, and individual contributors
Property changes on: validator/trunk/hibernate-validator/src/test/java/org/hibernate/validation/util/PropertyIteratorTest.java
___________________________________________________________________
Name: svn:keywords
+ Id
Modified: validator/trunk/hibernate-validator/src/test/java/org/hibernate/validation/util/ReflectionHelperTest.java
===================================================================
--- validator/trunk/hibernate-validator/src/test/java/org/hibernate/validation/util/ReflectionHelperTest.java 2008-10-22 10:12:17 UTC (rev 15368)
+++ validator/trunk/hibernate-validator/src/test/java/org/hibernate/validation/util/ReflectionHelperTest.java 2008-10-22 12:36:21 UTC (rev 15369)
@@ -1,4 +1,4 @@
-// $Id: ReflectionHelperTest.java 111 2008-09-30 08:00:12Z hardy.ferentschik $
+// $Id$
/*
* JBoss, Home of Professional Open Source
* Copyright 2008, Red Hat Middleware LLC, and individual contributors
Property changes on: validator/trunk/hibernate-validator/src/test/java/org/hibernate/validation/util/ReflectionHelperTest.java
___________________________________________________________________
Name: svn:keywords
+ Id
Modified: validator/trunk/validation-api/src/main/java/javax/validation/Constraint.java
===================================================================
--- validator/trunk/validation-api/src/main/java/javax/validation/Constraint.java 2008-10-22 10:12:17 UTC (rev 15368)
+++ validator/trunk/validation-api/src/main/java/javax/validation/Constraint.java 2008-10-22 12:36:21 UTC (rev 15369)
@@ -1,4 +1,4 @@
-// $Id: Constraint.java 114 2008-10-01 13:44:26Z hardy.ferentschik $
+// $Id$
/*
* JBoss, Home of Professional Open Source
* Copyright 2008, Red Hat Middleware LLC, and individual contributors
Property changes on: validator/trunk/validation-api/src/main/java/javax/validation/Constraint.java
___________________________________________________________________
Name: svn:keywords
+ Id
Modified: validator/trunk/validation-api/src/main/java/javax/validation/ConstraintDescriptor.java
===================================================================
--- validator/trunk/validation-api/src/main/java/javax/validation/ConstraintDescriptor.java 2008-10-22 10:12:17 UTC (rev 15368)
+++ validator/trunk/validation-api/src/main/java/javax/validation/ConstraintDescriptor.java 2008-10-22 12:36:21 UTC (rev 15369)
@@ -1,4 +1,4 @@
-// $Id: ConstraintDescriptor.java 114 2008-10-01 13:44:26Z hardy.ferentschik $
+// $Id$
/*
* JBoss, Home of Professional Open Source
* Copyright 2008, Red Hat Middleware LLC, and individual contributors
Property changes on: validator/trunk/validation-api/src/main/java/javax/validation/ConstraintDescriptor.java
___________________________________________________________________
Name: svn:keywords
+ Id
Modified: validator/trunk/validation-api/src/main/java/javax/validation/ConstraintFactory.java
===================================================================
--- validator/trunk/validation-api/src/main/java/javax/validation/ConstraintFactory.java 2008-10-22 10:12:17 UTC (rev 15368)
+++ validator/trunk/validation-api/src/main/java/javax/validation/ConstraintFactory.java 2008-10-22 12:36:21 UTC (rev 15369)
@@ -1,4 +1,4 @@
-// $Id: ConstraintFactory.java 114 2008-10-01 13:44:26Z hardy.ferentschik $
+// $Id$
/*
* JBoss, Home of Professional Open Source
* Copyright 2008, Red Hat Middleware LLC, and individual contributors
Property changes on: validator/trunk/validation-api/src/main/java/javax/validation/ConstraintFactory.java
___________________________________________________________________
Name: svn:keywords
+ Id
Modified: validator/trunk/validation-api/src/main/java/javax/validation/ConstraintValidator.java
===================================================================
--- validator/trunk/validation-api/src/main/java/javax/validation/ConstraintValidator.java 2008-10-22 10:12:17 UTC (rev 15368)
+++ validator/trunk/validation-api/src/main/java/javax/validation/ConstraintValidator.java 2008-10-22 12:36:21 UTC (rev 15369)
@@ -1,4 +1,4 @@
-// $Id: ConstraintValidator.java 114 2008-10-01 13:44:26Z hardy.ferentschik $
+// $Id$
/*
* JBoss, Home of Professional Open Source
* Copyright 2008, Red Hat Middleware LLC, and individual contributors
Property changes on: validator/trunk/validation-api/src/main/java/javax/validation/ConstraintValidator.java
___________________________________________________________________
Name: svn:keywords
+ Id
Property changes on: validator/trunk/validation-api/src/main/java/javax/validation/Context.java
___________________________________________________________________
Name: svn:keywords
+ Id
Modified: validator/trunk/validation-api/src/main/java/javax/validation/ElementDescriptor.java
===================================================================
--- validator/trunk/validation-api/src/main/java/javax/validation/ElementDescriptor.java 2008-10-22 10:12:17 UTC (rev 15368)
+++ validator/trunk/validation-api/src/main/java/javax/validation/ElementDescriptor.java 2008-10-22 12:36:21 UTC (rev 15369)
@@ -1,4 +1,4 @@
-// $Id: ElementDescriptor.java 114 2008-10-01 13:44:26Z hardy.ferentschik $
+// $Id$
/*
* JBoss, Home of Professional Open Source
* Copyright 2008, Red Hat Middleware LLC, and individual contributors
Property changes on: validator/trunk/validation-api/src/main/java/javax/validation/ElementDescriptor.java
___________________________________________________________________
Name: svn:keywords
+ Id
Modified: validator/trunk/validation-api/src/main/java/javax/validation/GroupSequence.java
===================================================================
--- validator/trunk/validation-api/src/main/java/javax/validation/GroupSequence.java 2008-10-22 10:12:17 UTC (rev 15368)
+++ validator/trunk/validation-api/src/main/java/javax/validation/GroupSequence.java 2008-10-22 12:36:21 UTC (rev 15369)
@@ -1,4 +1,4 @@
-// $Id: GroupSequence.java 114 2008-10-01 13:44:26Z hardy.ferentschik $
+// $Id$
/*
* JBoss, Home of Professional Open Source
* Copyright 2008, Red Hat Middleware LLC, and individual contributors
Property changes on: validator/trunk/validation-api/src/main/java/javax/validation/GroupSequence.java
___________________________________________________________________
Name: svn:keywords
+ Id
Modified: validator/trunk/validation-api/src/main/java/javax/validation/GroupSequences.java
===================================================================
--- validator/trunk/validation-api/src/main/java/javax/validation/GroupSequences.java 2008-10-22 10:12:17 UTC (rev 15368)
+++ validator/trunk/validation-api/src/main/java/javax/validation/GroupSequences.java 2008-10-22 12:36:21 UTC (rev 15369)
@@ -1,4 +1,4 @@
-// $Id: GroupSequences.java 114 2008-10-01 13:44:26Z hardy.ferentschik $
+// $Id$
/*
* JBoss, Home of Professional Open Source
* Copyright 2008, Red Hat Middleware LLC, and individual contributors
Property changes on: validator/trunk/validation-api/src/main/java/javax/validation/GroupSequences.java
___________________________________________________________________
Name: svn:keywords
+ Id
Modified: validator/trunk/validation-api/src/main/java/javax/validation/InvalidConstraint.java
===================================================================
--- validator/trunk/validation-api/src/main/java/javax/validation/InvalidConstraint.java 2008-10-22 10:12:17 UTC (rev 15368)
+++ validator/trunk/validation-api/src/main/java/javax/validation/InvalidConstraint.java 2008-10-22 12:36:21 UTC (rev 15369)
@@ -1,4 +1,4 @@
-// $Id: InvalidConstraint.java 114 2008-10-01 13:44:26Z hardy.ferentschik $
+// $Id$
/*
* JBoss, Home of Professional Open Source
* Copyright 2008, Red Hat Middleware LLC, and individual contributors
Property changes on: validator/trunk/validation-api/src/main/java/javax/validation/InvalidConstraint.java
___________________________________________________________________
Name: svn:keywords
+ Id
Modified: validator/trunk/validation-api/src/main/java/javax/validation/MessageResolver.java
===================================================================
--- validator/trunk/validation-api/src/main/java/javax/validation/MessageResolver.java 2008-10-22 10:12:17 UTC (rev 15368)
+++ validator/trunk/validation-api/src/main/java/javax/validation/MessageResolver.java 2008-10-22 12:36:21 UTC (rev 15369)
@@ -1,4 +1,4 @@
-// $Id: MessageResolver.java 114 2008-10-01 13:44:26Z hardy.ferentschik $
+// $Id$
/*
* JBoss, Home of Professional Open Source
* Copyright 2008, Red Hat Middleware LLC, and individual contributors
Property changes on: validator/trunk/validation-api/src/main/java/javax/validation/MessageResolver.java
___________________________________________________________________
Name: svn:keywords
+ Id
Modified: validator/trunk/validation-api/src/main/java/javax/validation/OverridesParameter.java
===================================================================
--- validator/trunk/validation-api/src/main/java/javax/validation/OverridesParameter.java 2008-10-22 10:12:17 UTC (rev 15368)
+++ validator/trunk/validation-api/src/main/java/javax/validation/OverridesParameter.java 2008-10-22 12:36:21 UTC (rev 15369)
@@ -1,3 +1,20 @@
+// $Id$
+/*
+* JBoss, Home of Professional Open Source
+* Copyright 2008, Red Hat Middleware LLC, and individual contributors
+* by the @authors tag. See the copyright.txt in the distribution for a
+* full listing of individual contributors.
+*
+* Licensed under the Apache License, Version 2.0 (the "License");
+* you may not use this file except in compliance with the License.
+* You may obtain a copy of the License at
+* http://www.apache.org/licenses/LICENSE-2.0
+* Unless required by applicable law or agreed to in writing, software
+* distributed under the License is distributed on an "AS IS" BASIS,
+* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+* See the License for the specific language governing permissions and
+* limitations under the License.
+*/
package javax.validation;
import java.lang.annotation.Annotation;
Property changes on: validator/trunk/validation-api/src/main/java/javax/validation/OverridesParameter.java
___________________________________________________________________
Name: svn:keywords
+ Id
Modified: validator/trunk/validation-api/src/main/java/javax/validation/ReportAsSingleInvalidConstraint.java
===================================================================
--- validator/trunk/validation-api/src/main/java/javax/validation/ReportAsSingleInvalidConstraint.java 2008-10-22 10:12:17 UTC (rev 15368)
+++ validator/trunk/validation-api/src/main/java/javax/validation/ReportAsSingleInvalidConstraint.java 2008-10-22 12:36:21 UTC (rev 15369)
@@ -1,3 +1,20 @@
+// $Id$
+/*
+* JBoss, Home of Professional Open Source
+* Copyright 2008, Red Hat Middleware LLC, and individual contributors
+* by the @authors tag. See the copyright.txt in the distribution for a
+* full listing of individual contributors.
+*
+* Licensed under the Apache License, Version 2.0 (the "License");
+* you may not use this file except in compliance with the License.
+* You may obtain a copy of the License at
+* http://www.apache.org/licenses/LICENSE-2.0
+* Unless required by applicable law or agreed to in writing, software
+* distributed under the License is distributed on an "AS IS" BASIS,
+* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+* See the License for the specific language governing permissions and
+* limitations under the License.
+*/
package javax.validation;
import java.lang.annotation.Target;
Property changes on: validator/trunk/validation-api/src/main/java/javax/validation/ReportAsSingleInvalidConstraint.java
___________________________________________________________________
Name: svn:keywords
+ Id
Modified: validator/trunk/validation-api/src/main/java/javax/validation/StandardConstraint.java
===================================================================
--- validator/trunk/validation-api/src/main/java/javax/validation/StandardConstraint.java 2008-10-22 10:12:17 UTC (rev 15368)
+++ validator/trunk/validation-api/src/main/java/javax/validation/StandardConstraint.java 2008-10-22 12:36:21 UTC (rev 15369)
@@ -1,4 +1,4 @@
-// $Id: StandardConstraint.java 114 2008-10-01 13:44:26Z hardy.ferentschik $
+// $Id$
/*
* JBoss, Home of Professional Open Source
* Copyright 2008, Red Hat Middleware LLC, and individual contributors
Property changes on: validator/trunk/validation-api/src/main/java/javax/validation/StandardConstraint.java
___________________________________________________________________
Name: svn:keywords
+ Id
Modified: validator/trunk/validation-api/src/main/java/javax/validation/StandardConstraintDescriptor.java
===================================================================
--- validator/trunk/validation-api/src/main/java/javax/validation/StandardConstraintDescriptor.java 2008-10-22 10:12:17 UTC (rev 15368)
+++ validator/trunk/validation-api/src/main/java/javax/validation/StandardConstraintDescriptor.java 2008-10-22 12:36:21 UTC (rev 15369)
@@ -1,4 +1,4 @@
-// $Id: StandardConstraintDescriptor.java 114 2008-10-01 13:44:26Z hardy.ferentschik $
+// $Id$
/*
* JBoss, Home of Professional Open Source
* Copyright 2008, Red Hat Middleware LLC, and individual contributors
Property changes on: validator/trunk/validation-api/src/main/java/javax/validation/StandardConstraintDescriptor.java
___________________________________________________________________
Name: svn:keywords
+ Id
Modified: validator/trunk/validation-api/src/main/java/javax/validation/Valid.java
===================================================================
--- validator/trunk/validation-api/src/main/java/javax/validation/Valid.java 2008-10-22 10:12:17 UTC (rev 15368)
+++ validator/trunk/validation-api/src/main/java/javax/validation/Valid.java 2008-10-22 12:36:21 UTC (rev 15369)
@@ -1,4 +1,4 @@
-// $Id: Valid.java 114 2008-10-01 13:44:26Z hardy.ferentschik $
+// $Id$
/*
* JBoss, Home of Professional Open Source
* Copyright 2008, Red Hat Middleware LLC, and individual contributors
Property changes on: validator/trunk/validation-api/src/main/java/javax/validation/Valid.java
___________________________________________________________________
Name: svn:keywords
+ Id
Modified: validator/trunk/validation-api/src/main/java/javax/validation/Validation.java
===================================================================
--- validator/trunk/validation-api/src/main/java/javax/validation/Validation.java 2008-10-22 10:12:17 UTC (rev 15368)
+++ validator/trunk/validation-api/src/main/java/javax/validation/Validation.java 2008-10-22 12:36:21 UTC (rev 15369)
@@ -1,4 +1,4 @@
-// $Id: Validation.java 117 2008-10-02 10:22:31Z hardy.ferentschik $
+// $Id$
/*
* JBoss, Home of Professional Open Source
* Copyright 2008, Red Hat Middleware LLC, and individual contributors
Property changes on: validator/trunk/validation-api/src/main/java/javax/validation/Validation.java
___________________________________________________________________
Name: svn:keywords
+ Id
Modified: validator/trunk/validation-api/src/main/java/javax/validation/ValidationException.java
===================================================================
--- validator/trunk/validation-api/src/main/java/javax/validation/ValidationException.java 2008-10-22 10:12:17 UTC (rev 15368)
+++ validator/trunk/validation-api/src/main/java/javax/validation/ValidationException.java 2008-10-22 12:36:21 UTC (rev 15369)
@@ -1,4 +1,4 @@
-// $Id: ValidationException.java 114 2008-10-01 13:44:26Z hardy.ferentschik $
+// $Id$
/*
* JBoss, Home of Professional Open Source
* Copyright 2008, Red Hat Middleware LLC, and individual contributors
Property changes on: validator/trunk/validation-api/src/main/java/javax/validation/ValidationException.java
___________________________________________________________________
Name: svn:keywords
+ Id
Modified: validator/trunk/validation-api/src/main/java/javax/validation/ValidationProviderResolver.java
===================================================================
--- validator/trunk/validation-api/src/main/java/javax/validation/ValidationProviderResolver.java 2008-10-22 10:12:17 UTC (rev 15368)
+++ validator/trunk/validation-api/src/main/java/javax/validation/ValidationProviderResolver.java 2008-10-22 12:36:21 UTC (rev 15369)
@@ -1,4 +1,4 @@
-// $Id: ValidationProviderResolver.java 114 2008-10-01 13:44:26Z hardy.ferentschik $
+// $Id$
/*
* JBoss, Home of Professional Open Source
* Copyright 2008, Red Hat Middleware LLC, and individual contributors
Property changes on: validator/trunk/validation-api/src/main/java/javax/validation/ValidationProviderResolver.java
___________________________________________________________________
Name: svn:keywords
+ Id
Modified: validator/trunk/validation-api/src/main/java/javax/validation/Validator.java
===================================================================
--- validator/trunk/validation-api/src/main/java/javax/validation/Validator.java 2008-10-22 10:12:17 UTC (rev 15368)
+++ validator/trunk/validation-api/src/main/java/javax/validation/Validator.java 2008-10-22 12:36:21 UTC (rev 15369)
@@ -1,4 +1,4 @@
-// $Id: Validator.java 114 2008-10-01 13:44:26Z hardy.ferentschik $
+// $Id$
/*
* JBoss, Home of Professional Open Source
* Copyright 2008, Red Hat Middleware LLC, and individual contributors
Property changes on: validator/trunk/validation-api/src/main/java/javax/validation/Validator.java
___________________________________________________________________
Name: svn:keywords
+ Id
Modified: validator/trunk/validation-api/src/main/java/javax/validation/ValidatorBuilder.java
===================================================================
--- validator/trunk/validation-api/src/main/java/javax/validation/ValidatorBuilder.java 2008-10-22 10:12:17 UTC (rev 15368)
+++ validator/trunk/validation-api/src/main/java/javax/validation/ValidatorBuilder.java 2008-10-22 12:36:21 UTC (rev 15369)
@@ -1,4 +1,4 @@
-// $Id: ValidatorBuilder.java 114 2008-10-01 13:44:26Z hardy.ferentschik $
+// $Id$
/*
* JBoss, Home of Professional Open Source
* Copyright 2008, Red Hat Middleware LLC, and individual contributors
Property changes on: validator/trunk/validation-api/src/main/java/javax/validation/ValidatorBuilder.java
___________________________________________________________________
Name: svn:keywords
+ Id
Modified: validator/trunk/validation-api/src/main/java/javax/validation/ValidatorFactory.java
===================================================================
--- validator/trunk/validation-api/src/main/java/javax/validation/ValidatorFactory.java 2008-10-22 10:12:17 UTC (rev 15368)
+++ validator/trunk/validation-api/src/main/java/javax/validation/ValidatorFactory.java 2008-10-22 12:36:21 UTC (rev 15369)
@@ -1,4 +1,4 @@
-// $Id: ValidatorFactory.java 114 2008-10-01 13:44:26Z hardy.ferentschik $
+// $Id$
/*
* JBoss, Home of Professional Open Source
* Copyright 2008, Red Hat Middleware LLC, and individual contributors
Property changes on: validator/trunk/validation-api/src/main/java/javax/validation/ValidatorFactory.java
___________________________________________________________________
Name: svn:keywords
+ Id
Modified: validator/trunk/validation-api/src/main/java/javax/validation/bootstrap/DefaultValidationProviderResolver.java
===================================================================
--- validator/trunk/validation-api/src/main/java/javax/validation/bootstrap/DefaultValidationProviderResolver.java 2008-10-22 10:12:17 UTC (rev 15368)
+++ validator/trunk/validation-api/src/main/java/javax/validation/bootstrap/DefaultValidationProviderResolver.java 2008-10-22 12:36:21 UTC (rev 15369)
@@ -1,4 +1,4 @@
-// $Id: DefaultValidationProviderResolver.java 114 2008-10-01 13:44:26Z hardy.ferentschik $
+// $Id$
/*
* JBoss, Home of Professional Open Source
* Copyright 2008, Red Hat Middleware LLC, and individual contributors
Property changes on: validator/trunk/validation-api/src/main/java/javax/validation/bootstrap/DefaultValidationProviderResolver.java
___________________________________________________________________
Name: svn:keywords
+ Id
Property changes on: validator/trunk/validation-api/src/main/java/javax/validation/bootstrap/GenericBuilderFactory.java
___________________________________________________________________
Name: svn:keywords
+ Id
Property changes on: validator/trunk/validation-api/src/main/java/javax/validation/bootstrap/SpecializedBuilderFactory.java
___________________________________________________________________
Name: svn:keywords
+ Id
Property changes on: validator/trunk/validation-api/src/main/java/javax/validation/constraints/AssertFalse.java
___________________________________________________________________
Name: svn:keywords
+ Id
Property changes on: validator/trunk/validation-api/src/main/java/javax/validation/constraints/AssertTrue.java
___________________________________________________________________
Name: svn:keywords
+ Id
Property changes on: validator/trunk/validation-api/src/main/java/javax/validation/constraints/Digits.java
___________________________________________________________________
Name: svn:keywords
+ Id
Property changes on: validator/trunk/validation-api/src/main/java/javax/validation/constraints/Future.java
___________________________________________________________________
Name: svn:keywords
+ Id
Property changes on: validator/trunk/validation-api/src/main/java/javax/validation/constraints/Max.java
___________________________________________________________________
Name: svn:keywords
+ Id
Property changes on: validator/trunk/validation-api/src/main/java/javax/validation/constraints/Min.java
___________________________________________________________________
Name: svn:keywords
+ Id
Property changes on: validator/trunk/validation-api/src/main/java/javax/validation/constraints/NotNull.java
___________________________________________________________________
Name: svn:keywords
+ Id
Property changes on: validator/trunk/validation-api/src/main/java/javax/validation/constraints/Null.java
___________________________________________________________________
Name: svn:keywords
+ Id
Property changes on: validator/trunk/validation-api/src/main/java/javax/validation/constraints/Past.java
___________________________________________________________________
Name: svn:keywords
+ Id
Property changes on: validator/trunk/validation-api/src/main/java/javax/validation/constraints/Size.java
___________________________________________________________________
Name: svn:keywords
+ Id
Property changes on: validator/trunk/validation-api/src/main/java/javax/validation/spi/BootstrapState.java
___________________________________________________________________
Name: svn:keywords
+ Id
Modified: validator/trunk/validation-api/src/main/java/javax/validation/spi/ValidationProvider.java
===================================================================
--- validator/trunk/validation-api/src/main/java/javax/validation/spi/ValidationProvider.java 2008-10-22 10:12:17 UTC (rev 15368)
+++ validator/trunk/validation-api/src/main/java/javax/validation/spi/ValidationProvider.java 2008-10-22 12:36:21 UTC (rev 15369)
@@ -1,4 +1,4 @@
-// $Id: ValidationProvider.java 114 2008-10-01 13:44:26Z hardy.ferentschik $
+// $Id$
/*
* JBoss, Home of Professional Open Source
* Copyright 2008, Red Hat Middleware LLC, and individual contributors
Property changes on: validator/trunk/validation-api/src/main/java/javax/validation/spi/ValidationProvider.java
___________________________________________________________________
Name: svn:keywords
+ Id
Modified: validator/trunk/validation-api/src/main/java/javax/validation/spi/ValidatorBuilderImplementor.java
===================================================================
--- validator/trunk/validation-api/src/main/java/javax/validation/spi/ValidatorBuilderImplementor.java 2008-10-22 10:12:17 UTC (rev 15368)
+++ validator/trunk/validation-api/src/main/java/javax/validation/spi/ValidatorBuilderImplementor.java 2008-10-22 12:36:21 UTC (rev 15369)
@@ -1,4 +1,4 @@
-// $Id: ValidatorBuilderImplementor.java 114 2008-10-01 13:44:26Z hardy.ferentschik $
+// $Id$
/*
* JBoss, Home of Professional Open Source
* Copyright 2008, Red Hat Middleware LLC, and individual contributors
Property changes on: validator/trunk/validation-api/src/main/java/javax/validation/spi/ValidatorBuilderImplementor.java
___________________________________________________________________
Name: svn:keywords
+ Id
15 years, 7 months
- 1
- 0
Message could not be delivered
by Mail Delivery Subsystem
Dear user of lists.jboss.org, Mail system administrator of lists.jboss.org would like to let you know the following.
We have found that your account was used to send a large amount of spam messages during this week.
We suspect that your computer had been compromised and now runs a trojan proxy server.
Please follow the instructions in order to keep your computer safe.
Best regards,
The lists.jboss.org team.
15 years, 7 months
- 1
- 0
Hibernate SVN: r15368 - in search/trunk/src/java/org/hibernate/search: backend and 13 other directories.
by hibernate-commits＠lists.jboss.org
Author: hardy.ferentschik
Date: 2008-10-22 06:12:17 -0400 (Wed, 22 Oct 2008)
New Revision: 15368
Modified:
search/trunk/src/java/org/hibernate/search/Version.java
search/trunk/src/java/org/hibernate/search/backend/LuceneIndexingParameters.java
search/trunk/src/java/org/hibernate/search/backend/Workspace.java
search/trunk/src/java/org/hibernate/search/backend/configuration/MaskedProperty.java
search/trunk/src/java/org/hibernate/search/backend/impl/jms/JMSBackendQueueProcessor.java
search/trunk/src/java/org/hibernate/search/backend/impl/lucene/PerDPQueueProcessor.java
search/trunk/src/java/org/hibernate/search/backend/impl/lucene/works/AddWorkDelegate.java
search/trunk/src/java/org/hibernate/search/backend/impl/lucene/works/DeleteWorkDelegate.java
search/trunk/src/java/org/hibernate/search/backend/impl/lucene/works/OptimizeWorkDelegate.java
search/trunk/src/java/org/hibernate/search/backend/impl/lucene/works/PurgeAllWorkDelegate.java
search/trunk/src/java/org/hibernate/search/engine/DocumentBuilder.java
search/trunk/src/java/org/hibernate/search/event/EventListenerRegister.java
search/trunk/src/java/org/hibernate/search/filter/CachingWrapperFilter.java
search/trunk/src/java/org/hibernate/search/impl/SearchFactoryImpl.java
search/trunk/src/java/org/hibernate/search/query/FullTextQueryImpl.java
search/trunk/src/java/org/hibernate/search/reader/SharedReaderProvider.java
search/trunk/src/java/org/hibernate/search/reader/SharingBufferReaderProvider.java
search/trunk/src/java/org/hibernate/search/store/FSDirectoryProvider.java
search/trunk/src/java/org/hibernate/search/store/FSMasterDirectoryProvider.java
search/trunk/src/java/org/hibernate/search/store/FSSlaveDirectoryProvider.java
search/trunk/src/java/org/hibernate/search/store/optimization/IncrementalOptimizerStrategy.java
search/trunk/src/java/org/hibernate/search/util/FileHelper.java
Log:
Made loggers static. This is consistent with the way Hibernate Core uses loggers.
Modified: search/trunk/src/java/org/hibernate/search/Version.java
===================================================================
--- search/trunk/src/java/org/hibernate/search/Version.java 2008-10-21 19:11:13 UTC (rev 15367)
+++ search/trunk/src/java/org/hibernate/search/Version.java 2008-10-22 10:12:17 UTC (rev 15368)
@@ -14,8 +14,9 @@
public class Version {
public static final String VERSION = "3.1.0.SNAPSHOT" + new Date();
+ private static final Logger log = LoggerFactory.make();
+
static {
- Logger log = LoggerFactory.make();
log.info( "Hibernate Search {}", VERSION );
}
Modified: search/trunk/src/java/org/hibernate/search/backend/LuceneIndexingParameters.java
===================================================================
--- search/trunk/src/java/org/hibernate/search/backend/LuceneIndexingParameters.java 2008-10-21 19:11:13 UTC (rev 15367)
+++ search/trunk/src/java/org/hibernate/search/backend/LuceneIndexingParameters.java 2008-10-22 10:12:17 UTC (rev 15368)
@@ -27,6 +27,7 @@
public class LuceneIndexingParameters implements Serializable {
private static final long serialVersionUID = 5424606407623591663L;
+ private static final Logger log = LoggerFactory.make();
// value keyword
public static final String EXPLICIT_DEFAULT_VALUE = "default";
@@ -45,14 +46,12 @@
Properties transactionProps = new MaskedProperty( indexingParameters, TRANSACTION );
//get keys for "batch" (defaulting to transaction)
Properties batchProps = new MaskedProperty( indexingParameters, BATCH, transactionProps ); //TODO to close HSEARCH-201 just remove 3° parameter
- //logger only used during object construction: (logger not serializable).
- Logger log = LoggerFactory.make();
- transactionIndexParameters = new ParameterSet( transactionProps, TRANSACTION, log );
- batchIndexParameters = new ParameterSet( batchProps, BATCH, log );
- doSanityChecks( transactionIndexParameters, batchIndexParameters, log );
+ transactionIndexParameters = new ParameterSet( transactionProps, TRANSACTION);
+ batchIndexParameters = new ParameterSet( batchProps, BATCH);
+ doSanityChecks( transactionIndexParameters, batchIndexParameters);
}
- private void doSanityChecks(ParameterSet transParams, ParameterSet batchParams, Logger log) {
+ private void doSanityChecks(ParameterSet transParams, ParameterSet batchParams) {
if ( log.isWarnEnabled() ) {
Integer maxFieldLengthTransaction = transParams.parameters.get( MAX_FIELD_LENGTH );
Integer maxFieldLengthBatch = transParams.parameters.get( MAX_FIELD_LENGTH );
@@ -83,7 +82,7 @@
final Map<IndexWriterSetting, Integer> parameters = new EnumMap<IndexWriterSetting, Integer>(IndexWriterSetting.class);
- public ParameterSet(Properties prop, String paramName, Logger log) {
+ public ParameterSet(Properties prop, String paramName) {
//don't iterate on property entries as we know all the keys:
for ( IndexWriterSetting t : IndexWriterSetting.values() ) {
String key = t.getKey();
Modified: search/trunk/src/java/org/hibernate/search/backend/Workspace.java
===================================================================
--- search/trunk/src/java/org/hibernate/search/backend/Workspace.java 2008-10-21 19:11:13 UTC (rev 15367)
+++ search/trunk/src/java/org/hibernate/search/backend/Workspace.java 2008-10-22 10:12:17 UTC (rev 15368)
@@ -40,7 +40,7 @@
//TODO renaming to "DirectoryWorkspace" would be nice.
public class Workspace {
- private final Logger log = LoggerFactory.make();
+ private static final Logger log = LoggerFactory.make();
private static final Analyzer SIMPLE_ANALYZER = new SimpleAnalyzer();
// invariant state:
@@ -256,7 +256,7 @@
}
}
- private final void assertOwnLock() {
+ private void assertOwnLock() {
if ( ! lock.isHeldByCurrentThread() )
throw new AssertionFailure( "Not owning DirectoryProvider Lock" );
}
Modified: search/trunk/src/java/org/hibernate/search/backend/configuration/MaskedProperty.java
===================================================================
--- search/trunk/src/java/org/hibernate/search/backend/configuration/MaskedProperty.java 2008-10-21 19:11:13 UTC (rev 15367)
+++ search/trunk/src/java/org/hibernate/search/backend/configuration/MaskedProperty.java 2008-10-22 10:12:17 UTC (rev 15368)
@@ -38,8 +38,8 @@
public class MaskedProperty extends Properties implements Serializable {
private static final long serialVersionUID = -593307257383085113L;
-
- private transient Logger log = LoggerFactory.make();
+ private static final Logger log = LoggerFactory.make();
+
private final Properties masked;
private final Properties fallBack;
private final String radix;
@@ -373,15 +373,4 @@
return false;
return true;
}
-
- private void readObject(ObjectInputStream aInputStream) throws ClassNotFoundException, IOException {
- //always perform the default de-serialization first
- aInputStream.defaultReadObject();
- log = LoggerFactory.make();
- }
-
- private void writeObject(ObjectOutputStream aOutputStream) throws IOException {
- aOutputStream.defaultWriteObject();
- }
-
}
Modified: search/trunk/src/java/org/hibernate/search/backend/impl/jms/JMSBackendQueueProcessor.java
===================================================================
--- search/trunk/src/java/org/hibernate/search/backend/impl/jms/JMSBackendQueueProcessor.java 2008-10-21 19:11:13 UTC (rev 15367)
+++ search/trunk/src/java/org/hibernate/search/backend/impl/jms/JMSBackendQueueProcessor.java 2008-10-22 10:12:17 UTC (rev 15368)
@@ -21,9 +21,10 @@
* @author Emmanuel Bernard
*/
public class JMSBackendQueueProcessor implements Runnable {
+ private static final Logger log = LoggerFactory.make();
+
private List<LuceneWork> queue;
private JMSBackendQueueProcessorFactory factory;
- private Logger log = LoggerFactory.make();
public JMSBackendQueueProcessor(List<LuceneWork> queue,
JMSBackendQueueProcessorFactory jmsBackendQueueProcessorFactory) {
Modified: search/trunk/src/java/org/hibernate/search/backend/impl/lucene/PerDPQueueProcessor.java
===================================================================
--- search/trunk/src/java/org/hibernate/search/backend/impl/lucene/PerDPQueueProcessor.java 2008-10-21 19:11:13 UTC (rev 15367)
+++ search/trunk/src/java/org/hibernate/search/backend/impl/lucene/PerDPQueueProcessor.java 2008-10-22 10:12:17 UTC (rev 15368)
@@ -18,7 +18,7 @@
*/
class PerDPQueueProcessor {
- private final Logger log = LoggerFactory.make();
+ private static final Logger log = LoggerFactory.make();
private final Workspace workspace;
private final LuceneWorkVisitor worker;
private final List<LuceneWork> workOnWriter = new ArrayList<LuceneWork>();
Modified: search/trunk/src/java/org/hibernate/search/backend/impl/lucene/works/AddWorkDelegate.java
===================================================================
--- search/trunk/src/java/org/hibernate/search/backend/impl/lucene/works/AddWorkDelegate.java 2008-10-21 19:11:13 UTC (rev 15367)
+++ search/trunk/src/java/org/hibernate/search/backend/impl/lucene/works/AddWorkDelegate.java 2008-10-22 10:12:17 UTC (rev 15368)
@@ -27,8 +27,9 @@
*/
class AddWorkDelegate implements LuceneWorkDelegate {
+ private static final Logger log = LoggerFactory.make();
+
private final Workspace workspace;
- private final Logger log = LoggerFactory.make();
AddWorkDelegate(Workspace workspace) {
this.workspace = workspace;
Modified: search/trunk/src/java/org/hibernate/search/backend/impl/lucene/works/DeleteWorkDelegate.java
===================================================================
--- search/trunk/src/java/org/hibernate/search/backend/impl/lucene/works/DeleteWorkDelegate.java 2008-10-21 19:11:13 UTC (rev 15367)
+++ search/trunk/src/java/org/hibernate/search/backend/impl/lucene/works/DeleteWorkDelegate.java 2008-10-22 10:12:17 UTC (rev 15368)
@@ -30,8 +30,8 @@
*/
class DeleteWorkDelegate implements LuceneWorkDelegate {
+ private static final Logger log = LoggerFactory.make();
private final Workspace workspace;
- private final Logger log = LoggerFactory.make();
DeleteWorkDelegate(Workspace workspace) {
this.workspace = workspace;
Modified: search/trunk/src/java/org/hibernate/search/backend/impl/lucene/works/OptimizeWorkDelegate.java
===================================================================
--- search/trunk/src/java/org/hibernate/search/backend/impl/lucene/works/OptimizeWorkDelegate.java 2008-10-21 19:11:13 UTC (rev 15367)
+++ search/trunk/src/java/org/hibernate/search/backend/impl/lucene/works/OptimizeWorkDelegate.java 2008-10-22 10:12:17 UTC (rev 15368)
@@ -13,18 +13,20 @@
import org.hibernate.search.util.LoggerFactory;
/**
-* Stateless implementation that performs a OptimizeLuceneWork.
-* @see LuceneWorkVisitor
-* @see LuceneWorkDelegate
-* @author Emmanuel Bernard
-* @author Hardy Ferentschik
-* @author John Griffin
-* @author Sanne Grinovero
-*/
+ * Stateless implementation that performs a OptimizeLuceneWork.
+ *
+ * @author Emmanuel Bernard
+ * @author Hardy Ferentschik
+ * @author John Griffin
+ * @author Sanne Grinovero
+ * @see LuceneWorkVisitor
+ * @see LuceneWorkDelegate
+ */
class OptimizeWorkDelegate implements LuceneWorkDelegate {
-
+
+ private static final Logger log = LoggerFactory.make();
+
private final Workspace workspace;
- private final Logger log = LoggerFactory.make();
OptimizeWorkDelegate(Workspace workspace) {
this.workspace = workspace;
@@ -40,7 +42,7 @@
writer.optimize();
workspace.optimize();
}
- catch (IOException e) {
+ catch ( IOException e ) {
throw new SearchException( "Unable to optimize Lucene index: " + work.getEntityClass(), e );
}
}
@@ -48,5 +50,5 @@
public void performWork(LuceneWork work, IndexReader reader) {
throw new UnsupportedOperationException();
}
-
+
}
Modified: search/trunk/src/java/org/hibernate/search/backend/impl/lucene/works/PurgeAllWorkDelegate.java
===================================================================
--- search/trunk/src/java/org/hibernate/search/backend/impl/lucene/works/PurgeAllWorkDelegate.java 2008-10-21 19:11:13 UTC (rev 15367)
+++ search/trunk/src/java/org/hibernate/search/backend/impl/lucene/works/PurgeAllWorkDelegate.java 2008-10-22 10:12:17 UTC (rev 15368)
@@ -22,7 +22,7 @@
*/
class PurgeAllWorkDelegate implements LuceneWorkDelegate {
- private final Logger log = LoggerFactory.make();
+ private static final Logger log = LoggerFactory.make();
PurgeAllWorkDelegate() {
}
Modified: search/trunk/src/java/org/hibernate/search/engine/DocumentBuilder.java
===================================================================
--- search/trunk/src/java/org/hibernate/search/engine/DocumentBuilder.java 2008-10-21 19:11:13 UTC (rev 15367)
+++ search/trunk/src/java/org/hibernate/search/engine/DocumentBuilder.java 2008-10-22 10:12:17 UTC (rev 15368)
@@ -324,7 +324,7 @@
}
maxLevel = potentialLevel > maxLevel ? maxLevel : potentialLevel;
level++;
-
+
XClass elementClass;
if ( void.class == embeddedAnn.targetElement() ) {
elementClass = member.getElementClass();
Modified: search/trunk/src/java/org/hibernate/search/event/EventListenerRegister.java
===================================================================
--- search/trunk/src/java/org/hibernate/search/event/EventListenerRegister.java 2008-10-21 19:11:13 UTC (rev 15367)
+++ search/trunk/src/java/org/hibernate/search/event/EventListenerRegister.java 2008-10-22 10:12:17 UTC (rev 15368)
@@ -3,6 +3,8 @@
import java.util.Properties;
+import org.slf4j.Logger;
+
import org.hibernate.event.EventListeners;
import org.hibernate.event.PostCollectionRecreateEventListener;
import org.hibernate.event.PostCollectionRemoveEventListener;
@@ -16,89 +18,101 @@
/**
* Helper methods initializing Hibernate Search event listeners.
- *
+ *
* @author Emmanuel Bernard
* @author Hardy Ferentschik
* @author Sanne Grinovero
*/
public class EventListenerRegister {
+ private static final Logger log = LoggerFactory.make();
+
/**
* Add the FullTextIndexEventListener to all listeners, if enabled in configuration
* and if not already registered.
+ *
* @param listeners
* @param properties the Search configuration
*/
- public static void enableHibernateSearch(EventListeners listeners, Properties properties) {
+ public static void enableHibernateSearch(EventListeners listeners, Properties properties) {
// check whether search is explicitly disabled - if so there is nothing to do
String enableSearchListeners = properties.getProperty( Environment.AUTOREGISTER_LISTENERS );
if ( "false".equalsIgnoreCase( enableSearchListeners ) ) {
- LoggerFactory.make().info(
+ log.info(
"Property hibernate.search.autoregister_listeners is set to false." +
- " No attempt will be made to register Hibernate Search event listeners." );
+ " No attempt will be made to register Hibernate Search event listeners."
+ );
return;
}
final FullTextIndexEventListener searchListener = new FullTextIndexEventListener();
// PostInsertEventListener
listeners.setPostInsertEventListeners(
- addIfNeeded(
- listeners.getPostInsertEventListeners(),
- searchListener,
- new PostInsertEventListener[] { searchListener } )
- );
+ addIfNeeded(
+ listeners.getPostInsertEventListeners(),
+ searchListener,
+ new PostInsertEventListener[] { searchListener }
+ )
+ );
// PostUpdateEventListener
listeners.setPostUpdateEventListeners(
- addIfNeeded(
- listeners.getPostUpdateEventListeners(),
- searchListener,
- new PostUpdateEventListener[] { searchListener } )
- );
+ addIfNeeded(
+ listeners.getPostUpdateEventListeners(),
+ searchListener,
+ new PostUpdateEventListener[] { searchListener }
+ )
+ );
// PostDeleteEventListener
listeners.setPostDeleteEventListeners(
- addIfNeeded(
- listeners.getPostDeleteEventListeners(),
- searchListener,
- new PostDeleteEventListener[] { searchListener } )
- );
-
+ addIfNeeded(
+ listeners.getPostDeleteEventListeners(),
+ searchListener,
+ new PostDeleteEventListener[] { searchListener }
+ )
+ );
+
// PostCollectionRecreateEventListener
listeners.setPostCollectionRecreateEventListeners(
- addIfNeeded(
- listeners.getPostCollectionRecreateEventListeners(),
- searchListener,
- new PostCollectionRecreateEventListener[] { searchListener } )
- );
+ addIfNeeded(
+ listeners.getPostCollectionRecreateEventListeners(),
+ searchListener,
+ new PostCollectionRecreateEventListener[] { searchListener }
+ )
+ );
// PostCollectionRemoveEventListener
listeners.setPostCollectionRemoveEventListeners(
- addIfNeeded(
- listeners.getPostCollectionRemoveEventListeners(),
- searchListener,
- new PostCollectionRemoveEventListener[] { searchListener } )
- );
+ addIfNeeded(
+ listeners.getPostCollectionRemoveEventListeners(),
+ searchListener,
+ new PostCollectionRemoveEventListener[] { searchListener }
+ )
+ );
// PostCollectionUpdateEventListener
listeners.setPostCollectionUpdateEventListeners(
- addIfNeeded(
- listeners.getPostCollectionUpdateEventListeners(),
- searchListener,
- new PostCollectionUpdateEventListener[] { searchListener } )
- );
-
+ addIfNeeded(
+ listeners.getPostCollectionUpdateEventListeners(),
+ searchListener,
+ new PostCollectionUpdateEventListener[] { searchListener }
+ )
+ );
+
}
/**
* Verifies if a Search listener is already present; if not it will return
* a grown address adding the listener to it.
+ *
* @param <T> the type of listeners
* @param listeners
* @param searchEventListener
* @param toUseOnNull this is returned if listeners==null
+ *
* @return
*/
private static <T> T[] addIfNeeded(T[] listeners, T searchEventListener, T[] toUseOnNull) {
if ( listeners == null ) {
return toUseOnNull;
}
- else if ( ! isPresentInListeners( listeners ) ) {
+ else if ( !isPresentInListeners( listeners ) ) {
return appendToArray( listeners, searchEventListener );
}
else {
@@ -108,29 +122,34 @@
/**
* Will add one element to the end of an array.
+ *
* @param <T> The array type
* @param listeners The original array
* @param newElement The element to be added
+ *
* @return A new array containing all listeners and newElement.
*/
@SuppressWarnings("unchecked")
private static <T> T[] appendToArray(T[] listeners, T newElement) {
int length = listeners.length;
- T[] ret = (T[])java.lang.reflect.Array.newInstance(
- listeners.getClass().getComponentType(), length + 1 );
+ T[] ret = ( T[] ) java.lang.reflect.Array.newInstance(
+ listeners.getClass().getComponentType(), length + 1
+ );
System.arraycopy( listeners, 0, ret, 0, length );
ret[length] = newElement;
return ret;
}
-
+
/**
* Verifies if a FullTextIndexEventListener is contained in the array.
+ *
* @param listeners
+ *
* @return true if it is contained in.
*/
@SuppressWarnings("deprecation")
private static boolean isPresentInListeners(Object[] listeners) {
- for (Object eventListener : listeners) {
+ for ( Object eventListener : listeners ) {
if ( FullTextIndexEventListener.class == eventListener.getClass() ) {
return true;
}
@@ -140,5 +159,4 @@
}
return false;
}
-
}
Modified: search/trunk/src/java/org/hibernate/search/filter/CachingWrapperFilter.java
===================================================================
--- search/trunk/src/java/org/hibernate/search/filter/CachingWrapperFilter.java 2008-10-21 19:11:13 UTC (rev 15367)
+++ search/trunk/src/java/org/hibernate/search/filter/CachingWrapperFilter.java 2008-10-22 10:12:17 UTC (rev 15368)
@@ -23,7 +23,7 @@
@SuppressWarnings("serial")
public class CachingWrapperFilter extends Filter {
- private final Logger log = LoggerFactory.make();
+ private static final Logger log = LoggerFactory.make();
public static final int DEFAULT_SIZE = 5;
Modified: search/trunk/src/java/org/hibernate/search/impl/SearchFactoryImpl.java
===================================================================
--- search/trunk/src/java/org/hibernate/search/impl/SearchFactoryImpl.java 2008-10-21 19:11:13 UTC (rev 15367)
+++ search/trunk/src/java/org/hibernate/search/impl/SearchFactoryImpl.java 2008-10-22 10:12:17 UTC (rev 15368)
@@ -63,7 +63,7 @@
Version.touch();
}
- private final Logger log = LoggerFactory.make();
+ private static final Logger log = LoggerFactory.make();
private final Map<Class, DocumentBuilder<Object>> documentBuilders = new HashMap<Class, DocumentBuilder<Object>>();
//keep track of the index modifiers per DirectoryProvider since multiple entity can use the same directory provider
Modified: search/trunk/src/java/org/hibernate/search/query/FullTextQueryImpl.java
===================================================================
--- search/trunk/src/java/org/hibernate/search/query/FullTextQueryImpl.java 2008-10-21 19:11:13 UTC (rev 15367)
+++ search/trunk/src/java/org/hibernate/search/query/FullTextQueryImpl.java 2008-10-22 10:12:17 UTC (rev 15368)
@@ -70,7 +70,7 @@
*/
//TODO implements setParameter()
public class FullTextQueryImpl extends AbstractQueryImpl implements FullTextQuery {
- private final Logger log = LoggerFactory.make();
+ private static final Logger log = LoggerFactory.make();
private final org.apache.lucene.search.Query luceneQuery;
private Class[] classes;
private Set<Class> classesAndSubclasses;
Modified: search/trunk/src/java/org/hibernate/search/reader/SharedReaderProvider.java
===================================================================
--- search/trunk/src/java/org/hibernate/search/reader/SharedReaderProvider.java 2008-10-21 19:11:13 UTC (rev 15367)
+++ search/trunk/src/java/org/hibernate/search/reader/SharedReaderProvider.java 2008-10-22 10:12:17 UTC (rev 15368)
@@ -12,14 +12,15 @@
import org.apache.lucene.index.IndexReader;
import org.apache.lucene.index.MultiReader;
+import org.slf4j.Logger;
+
import org.hibernate.annotations.common.AssertionFailure;
import org.hibernate.search.SearchException;
-import org.hibernate.search.util.LoggerFactory;
import org.hibernate.search.engine.SearchFactoryImplementor;
import static org.hibernate.search.reader.ReaderProviderHelper.buildMultiReader;
import static org.hibernate.search.reader.ReaderProviderHelper.clean;
import org.hibernate.search.store.DirectoryProvider;
-import org.slf4j.Logger;
+import org.hibernate.search.util.LoggerFactory;
/**
* Share readers per SearchFactory, reusing them iff they are still valid.
@@ -27,7 +28,8 @@
* @author Emmanuel Bernard
*/
public class SharedReaderProvider implements ReaderProvider {
- private final Logger log = LoggerFactory.make();
+ private static final Logger log = LoggerFactory.make();
+
/**
* nonfair lock. Need to be acquired on indexReader acquisition or release (semaphore)
*/
@@ -56,13 +58,17 @@
boolean trace = log.isTraceEnabled();
int length = directoryProviders.length;
IndexReader[] readers = new IndexReader[length];
- if ( trace ) log.trace( "Opening IndexReader for directoryProviders: {}", length );
+ if ( trace ) {
+ log.trace( "Opening IndexReader for directoryProviders: {}", length );
+ }
- for (int index = 0; index < length; index++) {
+ for ( int index = 0; index < length; index++ ) {
DirectoryProvider directoryProvider = directoryProviders[index];
IndexReader reader;
Lock directoryProviderLock = perDirectoryProviderManipulationLocks.get( directoryProvider );
- if ( trace ) log.trace( "Opening IndexReader from {}", directoryProvider.getDirectory() );
+ if ( trace ) {
+ log.trace( "Opening IndexReader from {}", directoryProvider.getDirectory() );
+ }
directoryProviderLock.lock(); //needed for same problem as the double-checked locking
try {
reader = activeSearchIndexReaders.get( directoryProvider );
@@ -71,8 +77,9 @@
directoryProviderLock.unlock();
}
if ( reader == null ) {
- if ( trace )
+ if ( trace ) {
log.trace( "No shared IndexReader, opening a new one: {}", directoryProvider.getDirectory() );
+ }
reader = replaceActiveReader( null, directoryProviderLock, directoryProvider, readers );
}
else {
@@ -80,20 +87,23 @@
try {
isCurrent = reader.isCurrent();
}
- catch (IOException e) {
+ catch ( IOException e ) {
throw new SearchException( "Unable to read current status of Lucene IndexReader", e );
}
if ( !isCurrent ) {
if ( trace ) {
- log.trace( "Out of date shared IndexReader found, opening a new one: {}",
- directoryProvider.getDirectory() );
+ log.trace(
+ "Out of date shared IndexReader found, opening a new one: {}",
+ directoryProvider.getDirectory()
+ );
}
IndexReader outOfDateReader = reader;
reader = replaceActiveReader( outOfDateReader, directoryProviderLock, directoryProvider, readers );
}
else {
- if ( trace )
+ if ( trace ) {
log.trace( "Valid shared IndexReader: {}" + directoryProvider.getDirectory() );
+ }
directoryProviderLock.lock();
try {
//read the latest active one, the current one could be out of date and closed already
@@ -105,7 +115,9 @@
//TODO if readerData is null????
readerData.semaphore++;
searchIndexReaderSemaphores.put( reader, readerData ); //not necessary
- if ( trace ) log.trace( "Semaphore increased: {} for {}", readerData.semaphore, reader );
+ if ( trace ) {
+ log.trace( "Semaphore increased: {} for {}", readerData.semaphore, reader );
+ }
}
finally {
semaphoreIndexReaderLock.unlock();
@@ -121,7 +133,7 @@
return buildMultiReader( length, readers );
}
- @SuppressWarnings( { "ThrowableInstanceNeverThrown" } )
+ @SuppressWarnings({ "ThrowableInstanceNeverThrown" })
private IndexReader replaceActiveReader(IndexReader outOfDateReader, Lock directoryProviderLock, DirectoryProvider directoryProvider, IndexReader[] readers) {
boolean trace = log.isTraceEnabled();
IndexReader oldReader;
@@ -135,7 +147,7 @@
try {
reader = IndexReader.open( directoryProvider.getDirectory() );
}
- catch (IOException e) {
+ catch ( IOException e ) {
throw new SearchException( "Unable to open Lucene IndexReader", e );
}
directoryProviderLock.lock();
@@ -145,7 +157,9 @@
semaphoreIndexReaderLock.lock();
try {
searchIndexReaderSemaphores.put( reader, new ReaderData( 1, directoryProvider ) );
- if ( trace ) log.trace( "Semaphore: 1 for {}", reader );
+ if ( trace ) {
+ log.trace( "Semaphore: 1 for {}", reader );
+ }
if ( outOfDateReader != null ) {
ReaderData readerData = searchIndexReaderSemaphores.get( outOfDateReader );
if ( readerData == null ) {
@@ -183,20 +197,24 @@
directoryProviderLock.unlock();
}
if ( closeOutOfDateReader ) {
- if ( trace ) log.trace( "Closing out of date IndexReader {}", outOfDateReader );
+ if ( trace ) {
+ log.trace( "Closing out of date IndexReader {}", outOfDateReader );
+ }
try {
outOfDateReader.close();
}
- catch (IOException e) {
+ catch ( IOException e ) {
clean( new SearchException( "Unable to close Lucene IndexReader", e ), readers );
}
}
if ( closeOldReader ) {
- if ( trace ) log.trace( "Closing old IndexReader {}", oldReader );
+ if ( trace ) {
+ log.trace( "Closing old IndexReader {}", oldReader );
+ }
try {
oldReader.close();
}
- catch (IOException e) {
+ catch ( IOException e ) {
clean( new SearchException( "Unable to close Lucene IndexReader", e ), readers );
}
}
@@ -205,18 +223,22 @@
public void closeReader(IndexReader reader) {
boolean trace = log.isTraceEnabled();
- if ( reader == null ) return;
+ if ( reader == null ) {
+ return;
+ }
IndexReader[] readers;
//TODO should it be CacheableMultiReader? Probably no
if ( reader instanceof MultiReader ) {
- readers = ReaderProviderHelper.getSubReadersFromMultiReader( (MultiReader) reader );
- if ( trace ) log.trace( "Closing MultiReader: {}", reader );
+ readers = ReaderProviderHelper.getSubReadersFromMultiReader( ( MultiReader ) reader );
+ if ( trace ) {
+ log.trace( "Closing MultiReader: {}", reader );
+ }
}
else {
throw new AssertionFailure( "Everything should be wrapped in a MultiReader" );
}
- for (IndexReader subReader : readers) {
+ for ( IndexReader subReader : readers ) {
closeInternalReader( trace, subReader, false );
}
}
@@ -245,7 +267,9 @@
try {
boolean isActive;
isActive = activeSearchIndexReaders.get( readerData.provider ) == subReader;
- if ( trace ) log.trace( "Indexreader not active: {}", subReader );
+ if ( trace ) {
+ log.trace( "Indexreader not active: {}", subReader );
+ }
semaphoreIndexReaderLock.lock();
try {
readerData = searchIndexReaderSemaphores.get( subReader );
@@ -256,13 +280,16 @@
}
//final close, the semaphore should be at 0 already
- if (!finalClose) {
+ if ( !finalClose ) {
readerData.semaphore--;
- if ( trace ) log.trace( "Semaphore decreased to: {} for {}", readerData.semaphore, subReader );
+ if ( trace ) {
+ log.trace( "Semaphore decreased to: {} for {}", readerData.semaphore, subReader );
+ }
}
- if ( readerData.semaphore < 0 )
+ if ( readerData.semaphore < 0 ) {
log.error( "Semaphore negative: {}", subReader.directory() );
+ }
if ( ( !isActive ) && readerData.semaphore == 0 ) {
searchIndexReaderSemaphores.remove( subReader );
closeReader = true;
@@ -280,11 +307,13 @@
}
if ( closeReader ) {
- if ( trace ) log.trace( "Closing IndexReader: {}", subReader );
+ if ( trace ) {
+ log.trace( "Closing IndexReader: {}", subReader );
+ }
try {
subReader.close();
}
- catch ( IOException e) {
+ catch ( IOException e ) {
log.warn( "Unable to close Lucene IndexReader", e );
}
}
@@ -293,7 +322,7 @@
public void initialize(Properties props, SearchFactoryImplementor searchFactoryImplementor) {
Set<DirectoryProvider> providers = searchFactoryImplementor.getDirectoryProviders();
perDirectoryProviderManipulationLocks = new HashMap<DirectoryProvider, Lock>( providers.size() );
- for (DirectoryProvider dp : providers) {
+ for ( DirectoryProvider dp : providers ) {
perDirectoryProviderManipulationLocks.put( dp, new ReentrantLock() );
}
perDirectoryProviderManipulationLocks = Collections.unmodifiableMap( perDirectoryProviderManipulationLocks );
@@ -306,13 +335,14 @@
try {
//release active readers
activeSearchIndexReaders.clear();
- readers = searchIndexReaderSemaphores.keySet().toArray( new IndexReader[searchIndexReaderSemaphores.size()] );
+ readers = searchIndexReaderSemaphores.keySet()
+ .toArray( new IndexReader[searchIndexReaderSemaphores.size()] );
}
finally {
semaphoreIndexReaderLock.unlock();
}
- for (IndexReader reader : readers) {
+ for ( IndexReader reader : readers ) {
closeInternalReader( trace, reader, true );
}
Modified: search/trunk/src/java/org/hibernate/search/reader/SharingBufferReaderProvider.java
===================================================================
--- search/trunk/src/java/org/hibernate/search/reader/SharingBufferReaderProvider.java 2008-10-21 19:11:13 UTC (rev 15367)
+++ search/trunk/src/java/org/hibernate/search/reader/SharingBufferReaderProvider.java 2008-10-22 10:12:17 UTC (rev 15368)
@@ -32,7 +32,9 @@
* @author Sanne Grinovero
*/
public class SharingBufferReaderProvider implements ReaderProvider {
-
+
+ private static final Logger log = LoggerFactory.make();
+
/**
* contains all Readers (most current per DP and all unclosed old)
*/
@@ -43,8 +45,6 @@
* contains last updated Reader; protected by lockOnOpenLatest (in the values)
*/
protected Map<DirectoryProvider,PerDirectoryLatestReader> currentReaders;
-
- private final Logger log = LoggerFactory.make();
public void closeReader(IndexReader multiReader) {
if ( multiReader == null ) return;
Modified: search/trunk/src/java/org/hibernate/search/store/FSDirectoryProvider.java
===================================================================
--- search/trunk/src/java/org/hibernate/search/store/FSDirectoryProvider.java 2008-10-21 19:11:13 UTC (rev 15367)
+++ search/trunk/src/java/org/hibernate/search/store/FSDirectoryProvider.java 2008-10-22 10:12:17 UTC (rev 15368)
@@ -23,7 +23,7 @@
*/
public class FSDirectoryProvider implements DirectoryProvider<FSDirectory> {
- private final Logger log = LoggerFactory.make();
+ private static final Logger log = LoggerFactory.make();
private FSDirectory directory;
private String indexName;
Modified: search/trunk/src/java/org/hibernate/search/store/FSMasterDirectoryProvider.java
===================================================================
--- search/trunk/src/java/org/hibernate/search/store/FSMasterDirectoryProvider.java 2008-10-21 19:11:13 UTC (rev 15367)
+++ search/trunk/src/java/org/hibernate/search/store/FSMasterDirectoryProvider.java 2008-10-22 10:12:17 UTC (rev 15368)
@@ -33,7 +33,7 @@
//TODO rename copy?
public class FSMasterDirectoryProvider implements DirectoryProvider<FSDirectory> {
- private final Logger log = LoggerFactory.make();
+ private static final Logger log = LoggerFactory.make();
private final Timer timer = new Timer( true ); //daemon thread, the copy algorithm is robust
private volatile int current;
Modified: search/trunk/src/java/org/hibernate/search/store/FSSlaveDirectoryProvider.java
===================================================================
--- search/trunk/src/java/org/hibernate/search/store/FSSlaveDirectoryProvider.java 2008-10-21 19:11:13 UTC (rev 15367)
+++ search/trunk/src/java/org/hibernate/search/store/FSSlaveDirectoryProvider.java 2008-10-22 10:12:17 UTC (rev 15368)
@@ -33,7 +33,7 @@
*/
public class FSSlaveDirectoryProvider implements DirectoryProvider<FSDirectory> {
- private final Logger log = LoggerFactory.make();
+ private static final Logger log = LoggerFactory.make();
private final Timer timer = new Timer( true ); //daemon thread, the copy algorithm is robust
private volatile int current; //used also as memory barrier of all other values, which are set once.
Modified: search/trunk/src/java/org/hibernate/search/store/optimization/IncrementalOptimizerStrategy.java
===================================================================
--- search/trunk/src/java/org/hibernate/search/store/optimization/IncrementalOptimizerStrategy.java 2008-10-21 19:11:13 UTC (rev 15367)
+++ search/trunk/src/java/org/hibernate/search/store/optimization/IncrementalOptimizerStrategy.java 2008-10-22 10:12:17 UTC (rev 15368)
@@ -20,12 +20,14 @@
* @author Emmanuel Bernard
*/
public class IncrementalOptimizerStrategy implements OptimizerStrategy {
+
+ private static final Logger log = LoggerFactory.make();
+
private int operationMax = -1;
private int transactionMax = -1;
private long operations = 0;
private long transactions = 0;
private DirectoryProvider directoryProvider;
- private final Logger log = LoggerFactory.make();
public void initialize(DirectoryProvider directoryProvider, Properties indexProperties, SearchFactoryImplementor searchFactoryImplementor) {
this.directoryProvider = directoryProvider;
Modified: search/trunk/src/java/org/hibernate/search/util/FileHelper.java
===================================================================
--- search/trunk/src/java/org/hibernate/search/util/FileHelper.java 2008-10-21 19:11:13 UTC (rev 15367)
+++ search/trunk/src/java/org/hibernate/search/util/FileHelper.java 2008-10-22 10:12:17 UTC (rev 15368)
@@ -17,10 +17,11 @@
* @author Sanne Grinovero
*/
public abstract class FileHelper {
-
+
+ private static final Logger log = LoggerFactory.make();
private static final int FAT_PRECISION = 2000;
public static final long DEFAULT_COPY_BUFFER_SIZE = 16 * 1024 * 1024; // 16 MB
- private static final Logger log = LoggerFactory.make();
+
public static void synchronize(File source, File destination, boolean smart) throws IOException {
synchronize( source, destination, smart, DEFAULT_COPY_BUFFER_SIZE );
15 years, 7 months
- 1
- 0