March 2008 - hibernate-commits - Jboss List Archives

Hibernate SVN: r14476 - search/trunk/doc/reference/en/modules.

by hibernate-commits＠lists.jboss.org

Author: epbernard Date: 2008-03-21 09:49:20 -0400 (Fri, 21 Mar 2008) New Revision: 14476 Modified: search/trunk/doc/reference/en/modules/mapping.xml Log: doc on TermVector Modified: search/trunk/doc/reference/en/modules/mapping.xml =================================================================== --- search/trunk/doc/reference/en/modules/mapping.xml 2008-03-21 13:43:58 UTC (rev 14475) +++ search/trunk/doc/reference/en/modules/mapping.xml 2008-03-21 13:49:20 UTC (rev 14476) @@ -72,6 +72,67 @@ </listitem> </itemizedlist> + <itemizedlist> + <listitem> + <para>termVector: describes collections of term-frequency pairs. To + utilize Term Vectors this attribute enables their being stored + during indexing so they are stored with documents. The default value + is Field.TermVector.NO. </para> + + <para>The different values of this attribute are </para> + + <informaltable align="left" width=""> + <tgroup cols="2"> + <colspec align="center" /> + + <thead> + <row> + <entry align="center">Value</entry> + + <entry align="center">Definition</entry> + </row> + </thead> + + <tbody> + <row> + <entry align="left">Field.TermVector.YES</entry> + + <entry>Store the term vectors of each document.</entry> + </row> + + <row> + <entry align="left">Field.TermVector.NO</entry> + + <entry>Do not store term vectors.</entry> + </row> + + <row> + <entry align="left">Field.TermVector.WITH_OFFSETS</entry> + + <entry>Store the term vector and token offset + information</entry> + </row> + + <row> + <entry align="left">Field.TermVector.WITH_POSITIONS</entry> + + <entry>Store the term vector and token position + information</entry> + </row> + + <row> + <entry + align="left">Field.TermVector.WITH_POSITIONS_OFFSETS</entry> + + <entry>Store the term vector, token position and offset + information</entry> + </row> + </tbody> + </tgroup> + </informaltable> + </listitem> + </itemizedlist> + <para>These attributes are part of the <literal>@Field</literal> annotation.</para> @@ -773,7 +834,9 @@ <classname>@ClassBridges</classname> annotations can be defined at the class level (as opposed to the property level). In this case the custom field bridge implementation receives the entity instance as the - value parameter instead of a particular property.</para> + value parameter instead of a particular property. Though not shown in + this example, <classname>@ClassBridge</classname> supports the + <methodname>termVector</methodname> attribute discussed previously.</para> <programlisting>@Entity @Indexed

16 years, 9 months

1
0
0 / 0

Hibernate SVN: r14475 - search/trunk/src/java/org/hibernate/search/impl.

by hibernate-commits＠lists.jboss.org

Author: epbernard Date: 2008-03-21 09:43:58 -0400 (Fri, 21 Mar 2008) New Revision: 14475 Modified: search/trunk/src/java/org/hibernate/search/impl/SearchFactoryImpl.java Log: HSEARCH-133 add similarity support Modified: search/trunk/src/java/org/hibernate/search/impl/SearchFactoryImpl.java =================================================================== --- search/trunk/src/java/org/hibernate/search/impl/SearchFactoryImpl.java 2008-03-20 22:21:30 UTC (rev 14474) +++ search/trunk/src/java/org/hibernate/search/impl/SearchFactoryImpl.java 2008-03-21 13:43:58 UTC (rev 14475) @@ -1,20 +1,21 @@ //$Id$ package org.hibernate.search.impl; +import java.beans.Introspector; +import java.lang.reflect.Method; +import java.util.ArrayList; import java.util.HashMap; import java.util.Iterator; +import java.util.List; import java.util.Map; +import java.util.Properties; import java.util.Set; import java.util.WeakHashMap; -import java.util.List; -import java.util.ArrayList; -import java.util.Properties; import java.util.concurrent.locks.ReentrantLock; -import java.lang.reflect.Method; -import java.beans.Introspector; import org.apache.lucene.analysis.Analyzer; import org.apache.lucene.analysis.standard.StandardAnalyzer; +import org.apache.lucene.search.Similarity; import org.hibernate.annotations.common.reflection.ReflectionManager; import org.hibernate.annotations.common.reflection.XClass; import org.hibernate.annotations.common.reflection.java.JavaReflectionManager; @@ -24,13 +25,11 @@ import org.hibernate.search.Environment; import org.hibernate.search.SearchException; import org.hibernate.search.Version; -import org.hibernate.search.filter.FilterCachingStrategy; -import org.hibernate.search.filter.MRUFilterCachingStrategy; +import org.hibernate.search.annotations.Factory; +import org.hibernate.search.annotations.FullTextFilterDef; +import org.hibernate.search.annotations.FullTextFilterDefs; import org.hibernate.search.annotations.Indexed; -import org.hibernate.search.annotations.FullTextFilterDef; -import org.hibernate.search.annotations.Factory; import org.hibernate.search.annotations.Key; -import org.hibernate.search.annotations.FullTextFilterDefs; import org.hibernate.search.backend.BackendQueueProcessorFactory; import org.hibernate.search.backend.LuceneIndexingParameters; import org.hibernate.search.backend.LuceneWork; @@ -38,8 +37,10 @@ import org.hibernate.search.backend.Worker; import org.hibernate.search.backend.WorkerFactory; import org.hibernate.search.engine.DocumentBuilder; +import org.hibernate.search.engine.FilterDef; import org.hibernate.search.engine.SearchFactoryImplementor; -import org.hibernate.search.engine.FilterDef; +import org.hibernate.search.filter.FilterCachingStrategy; +import org.hibernate.search.filter.MRUFilterCachingStrategy; import org.hibernate.search.reader.ReaderProvider; import org.hibernate.search.reader.ReaderProviderFactory; import org.hibernate.search.store.DirectoryProvider; @@ -89,9 +90,11 @@ public SearchFactoryImpl(Configuration cfg) { //yuk ReflectionManager reflectionManager = getReflectionManager( cfg ); - + //InitContext context = new InitContext(); + //Analyzer analyzer = initAnalyzer(cfg, context); Analyzer analyzer = initAnalyzer(cfg); - initDocumentBuilders(cfg, reflectionManager, analyzer); + Similarity similarity = initSimilarity(cfg); + initDocumentBuilders(cfg, reflectionManager, analyzer, similarity); Set<Class> indexedClasses = documentBuilders.keySet(); for (DocumentBuilder builder : documentBuilders.values()) { @@ -247,9 +250,13 @@ getBackendQueueProcessorFactory().getProcessor( queue ).run(); } - private void initDocumentBuilders(Configuration cfg, ReflectionManager reflectionManager, Analyzer analyzer) { + private void initDocumentBuilders(Configuration cfg, ReflectionManager reflectionManager, Analyzer analyzer, Similarity similarity) { Iterator iter = cfg.getClassMappings(); DirectoryProviderFactory factory = new DirectoryProviderFactory(); + //Map<String, AnalyzerDef> analyzerDefs = new HashMap<String, AnalyzerDef>(); + + //cfg.getClass().getAnnotation( AnalyzerDef.class ); + //TODO SOlr....... while (iter.hasNext()) { PersistentClass clazz = (PersistentClass) iter.next(); Class<?> mappedClass = clazz.getMappedClass(); @@ -260,7 +267,7 @@ DirectoryProviderFactory.DirectoryProviders providers = factory.createDirectoryProviders( mappedXClass, cfg, this ); final DocumentBuilder<Object> documentBuilder = new DocumentBuilder<Object>( - mappedXClass, analyzer, providers.getProviders(), providers.getSelectionStrategy(), + mappedXClass, analyzer, similarity, providers.getProviders(), providers.getSelectionStrategy(), reflectionManager ); @@ -306,6 +313,42 @@ return defaultAnalyzer; } + /** + * Initilises the Lucene similarity to use + */ + private Similarity initSimilarity(Configuration cfg) { + Class similarityClass; + String similarityClassName = cfg.getProperty(Environment.SIMILARITY_CLASS); + if (similarityClassName != null) { + try { + similarityClass = ReflectHelper.classForName(similarityClassName); + } catch (Exception e) { + throw new SearchException("Lucene Similarity class '" + similarityClassName + "' defined in property '" + + Environment.SIMILARITY_CLASS + "' could not be found.", e); + } + } + else { + similarityClass = null; + } + + // Initialize similarity + if ( similarityClass == null ) { + return Similarity.getDefault(); + } + else { + Similarity defaultSimilarity; + try { + defaultSimilarity = (Similarity) similarityClass.newInstance(); + } catch (ClassCastException e) { + throw new SearchException("Lucene similarity does not extend " + Similarity.class.getName() + ": " + + similarityClassName, e); + } catch (Exception e) { + throw new SearchException("Failed to instantiate lucene similarity with type " + similarityClassName, e); + } + return defaultSimilarity; + } + } + private void buildFilterCachingStrategy(Properties properties) { String impl = properties.getProperty( Environment.FILTER_CACHING_STRATEGY ); if ( StringHelper.isEmpty( impl ) || "mru".equalsIgnoreCase( impl ) ) {

16 years, 9 months

1
0
0 / 0

Hibernate SVN: r14474 - in search/trunk/src: java/org/hibernate/search/annotations and 6 other directories.

by hibernate-commits＠lists.jboss.org

Author: epbernard Date: 2008-03-20 18:21:30 -0400 (Thu, 20 Mar 2008) New Revision: 14474 Added: search/trunk/src/java/org/hibernate/search/annotations/Similarity.java search/trunk/src/test/org/hibernate/search/test/similarity/ search/trunk/src/test/org/hibernate/search/test/similarity/Can.java search/trunk/src/test/org/hibernate/search/test/similarity/DummySimilarity.java search/trunk/src/test/org/hibernate/search/test/similarity/DummySimilarity2.java search/trunk/src/test/org/hibernate/search/test/similarity/SimilarityTest.java search/trunk/src/test/org/hibernate/search/test/similarity/Trash.java Modified: search/trunk/src/java/org/hibernate/search/Environment.java search/trunk/src/java/org/hibernate/search/backend/Workspace.java search/trunk/src/java/org/hibernate/search/engine/DocumentBuilder.java search/trunk/src/java/org/hibernate/search/query/FullTextQueryImpl.java search/trunk/src/java/org/hibernate/search/reader/CacheableMultiReader.java search/trunk/src/java/org/hibernate/search/reader/ReaderProviderHelper.java Log: HSEARCH-133 add similarity support Modified: search/trunk/src/java/org/hibernate/search/Environment.java =================================================================== --- search/trunk/src/java/org/hibernate/search/Environment.java 2008-03-20 19:01:16 UTC (rev 14473) +++ search/trunk/src/java/org/hibernate/search/Environment.java 2008-03-20 22:21:30 UTC (rev 14474) @@ -18,10 +18,15 @@ public static final String INDEXING_STRATEGY = "hibernate.search.indexing_strategy"; /** - * Lucene analyser + * Default Lucene analyser */ public static final String ANALYZER_CLASS = "hibernate.search.analyzer"; + /** + * Default Lucene similarity + */ + public static final String SIMILARITY_CLASS = "hibernate.search.similarity"; + public static final String WORKER_PREFIX = "hibernate.search.worker."; public static final String WORKER_SCOPE = WORKER_PREFIX + "scope"; public static final String WORKER_BACKEND = WORKER_PREFIX + "backend"; Added: search/trunk/src/java/org/hibernate/search/annotations/Similarity.java =================================================================== --- search/trunk/src/java/org/hibernate/search/annotations/Similarity.java (rev 0) +++ search/trunk/src/java/org/hibernate/search/annotations/Similarity.java 2008-03-20 22:21:30 UTC (rev 14474) @@ -0,0 +1,19 @@ +package org.hibernate.search.annotations; + +import java.lang.annotation.Documented; +import java.lang.annotation.ElementType; +import java.lang.annotation.Retention; +import java.lang.annotation.RetentionPolicy; +import java.lang.annotation.Target; + +@Retention( RetentionPolicy.RUNTIME ) +@Target( ElementType.TYPE ) +@Documented +/** + * Specifies a similarity implementation to use + * + * @author Nick Vincent + */ +public @interface Similarity { + public Class impl(); +} Modified: search/trunk/src/java/org/hibernate/search/backend/Workspace.java =================================================================== --- search/trunk/src/java/org/hibernate/search/backend/Workspace.java 2008-03-20 19:01:16 UTC (rev 14473) +++ search/trunk/src/java/org/hibernate/search/backend/Workspace.java 2008-03-20 22:21:30 UTC (rev 14474) @@ -112,10 +112,12 @@ lockProvider( provider ); if ( modificationOperation ) dpStatistics.get( provider ).operations++; try { + DocumentBuilder documentBuilder = searchFactoryImplementor.getDocumentBuilders().get( entity ); Analyzer analyzer = entity != null ? - searchFactoryImplementor.getDocumentBuilders().get( entity ).getAnalyzer() : + documentBuilder.getAnalyzer() : new SimpleAnalyzer(); //never used writer = new IndexWriter( provider.getDirectory(), analyzer, false ); //has been created at init time + writer.setSimilarity( documentBuilder.getSimilarity() ); LuceneIndexingParameters indexingParams = searchFactoryImplementor.getIndexingParameters( provider ); if ( isBatch ) { Modified: search/trunk/src/java/org/hibernate/search/engine/DocumentBuilder.java =================================================================== --- search/trunk/src/java/org/hibernate/search/engine/DocumentBuilder.java 2008-03-20 19:01:16 UTC (rev 14473) +++ search/trunk/src/java/org/hibernate/search/engine/DocumentBuilder.java 2008-03-20 22:21:30 UTC (rev 14474) @@ -17,6 +17,7 @@ import org.apache.lucene.document.Document; import org.apache.lucene.document.Field; import org.apache.lucene.index.Term; +import org.apache.lucene.search.Similarity; import org.hibernate.Hibernate; import org.hibernate.annotations.common.AssertionFailure; import org.hibernate.annotations.common.reflection.ReflectionManager; @@ -75,9 +76,10 @@ private int level = 0; private int maxLevel = Integer.MAX_VALUE; private ScopedAnalyzer analyzer; + private Similarity similarity; - public DocumentBuilder(XClass clazz, Analyzer defaultAnalyzer, DirectoryProvider[] directoryProviders, + public DocumentBuilder(XClass clazz, Analyzer defaultAnalyzer, Similarity defaultSimilarity, DirectoryProvider[] directoryProviders, IndexShardingStrategy shardingStrategy, ReflectionManager reflectionManager) { this.analyzer = new ScopedAnalyzer(); this.beanClass = clazz; @@ -85,8 +87,9 @@ this.shardingStrategy = shardingStrategy; //FIXME get rid of it when boost is stored? this.reflectionManager = reflectionManager; + this.similarity = defaultSimilarity; - if ( clazz == null ) throw new AssertionFailure( "Unable to build a DocumemntBuilder with a null class" ); + if ( clazz == null ) throw new AssertionFailure( "Unable to build a DocumentBuilder with a null class" ); rootPropertiesMetadata = new PropertiesMetadata(); rootPropertiesMetadata.boost = getBoost( clazz ); rootPropertiesMetadata.analyzer = defaultAnalyzer; @@ -132,6 +135,7 @@ for (XClass currClass = clazz; currClass != null; currClass = currClass.getSuperclass()) { hierarchy.add( currClass ); } + Class similarityClass = null; for (int index = hierarchy.size() - 1; index >= 0; index--) { XClass currClass = hierarchy.get( index ); /** @@ -157,6 +161,18 @@ bindClassAnnotation( prefix, propertiesMetadata, classBridgeAnn ); } + //Get similarity + //TODO: similarity form @IndexedEmbedded are not taken care of. Exception?? + if ( isRoot ) { + org.hibernate.search.annotations.Similarity similarityAnn = currClass.getAnnotation( org.hibernate.search.annotations.Similarity.class ); + if ( similarityAnn != null ) { + if ( similarityClass != null ) { + throw new SearchException( "Multiple Similarities defined in the same class hierarchy: " + beanClass.getName() ); + } + similarityClass = similarityAnn.impl(); + } + } + //rejecting non properties (ie regular methods) because the object is loaded from Hibernate, // so indexing a non property does not make sense List<XProperty> methods = currClass.getDeclaredProperties( XClass.ACCESS_PROPERTY ); @@ -169,12 +185,25 @@ initializeMember( field, propertiesMetadata, isRoot, prefix, processedClasses ); } } + if ( isRoot && similarityClass != null ) { + try { + similarity = (Similarity) similarityClass.newInstance(); + } + catch (Exception e) { + log.error( "Exception attempting to instantiate Similarity '" + similarityClass.getName() + + "' set for " + beanClass.getName() ); + } + } } public String getIdentifierName() { return idGetter.getName(); } + public Similarity getSimilarity() { + return similarity; + } + private void initializeMember(XProperty member, PropertiesMetadata propertiesMetadata, boolean isRoot, String prefix, Set<XClass> processedClasses) { Modified: search/trunk/src/java/org/hibernate/search/query/FullTextQueryImpl.java =================================================================== --- search/trunk/src/java/org/hibernate/search/query/FullTextQueryImpl.java 2008-03-20 19:01:16 UTC (rev 14473) +++ search/trunk/src/java/org/hibernate/search/query/FullTextQueryImpl.java 2008-03-20 22:21:30 UTC (rev 14474) @@ -14,6 +14,7 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; +import org.apache.lucene.index.IndexReader; import org.apache.lucene.index.Term; import org.apache.lucene.search.BooleanClause; import org.apache.lucene.search.BooleanQuery; @@ -21,6 +22,7 @@ import org.apache.lucene.search.Hits; import org.apache.lucene.search.IndexSearcher; import org.apache.lucene.search.Searcher; +import org.apache.lucene.search.Similarity; import org.apache.lucene.search.Sort; import org.apache.lucene.search.TermQuery; import org.hibernate.Criteria; @@ -49,6 +51,8 @@ import org.hibernate.search.engine.SearchFactoryImplementor; import org.hibernate.search.filter.ChainedFilter; import org.hibernate.search.filter.FilterKey; +import org.hibernate.search.reader.ReaderProvider; +import static org.hibernate.search.reader.ReaderProviderHelper.getIndexReaders; import org.hibernate.search.store.DirectoryProvider; import org.hibernate.search.util.ContextHelper; import org.hibernate.transform.ResultTransformer; @@ -141,7 +145,7 @@ } finally { try { - searchFactoryImplementor.getReaderProvider().closeReader( searcher.getIndexReader() ); + closeSearcher( searcher, searchFactoryImplementor.getReaderProvider() ); } catch (SearchException e) { log.warn( "Unable to properly close searcher during lucene query: " + getQueryString(), e ); @@ -210,7 +214,7 @@ catch (IOException e) { //close only in case of exception try { - searchFactory.getReaderProvider().closeReader( searcher.getIndexReader() ); + closeSearcher( searcher, searchFactory.getReaderProvider() ); } catch (SearchException ee) { //we have the initial issue already @@ -244,7 +248,7 @@ } Loader loader = getLoader( sess, searchFactoryImplementor ); List list = loader.load( infos.toArray( new EntityInfo[infos.size()] ) ); - if ( resultTransformer == null || loader instanceof ProjectionLoader) { + if ( resultTransformer == null || loader instanceof ProjectionLoader ) { //stay consistent with transformTuple which can only be executed during a projection return list; } @@ -257,7 +261,7 @@ } finally { try { - searchFactoryImplementor.getReaderProvider().closeReader( searcher.getIndexReader() ); + closeSearcher( searcher, searchFactoryImplementor.getReaderProvider() ); } catch (SearchException e) { log.warn( "Unable to properly close searcher during lucene query: " + getQueryString(), e ); @@ -285,7 +289,7 @@ SearchFactoryImplementor searchFactoryImplementor = getSearchFactoryImplementor(); if ( filterDefinitions != null && filterDefinitions.size() > 0 ) { ChainedFilter chainedFilter = new ChainedFilter(); - for ( FullTextFilterImpl filterDefinition : filterDefinitions.values() ) { + for (FullTextFilterImpl filterDefinition : filterDefinitions.values()) { FilterDef def = searchFactoryImplementor.getFilterDefinition( filterDefinition.getName() ); Class implClass = def.getImpl(); Object instance; @@ -298,22 +302,22 @@ catch (IllegalAccessException e) { throw new SearchException( "Unable to create @FullTextFilterDef: " + def.getImpl(), e ); } - for ( Map.Entry<String, Object> entry : filterDefinition.getParameters().entrySet() ) { + for (Map.Entry<String, Object> entry : filterDefinition.getParameters().entrySet()) { def.invoke( entry.getKey(), instance, entry.getValue() ); } if ( def.isCache() && def.getKeyMethod() == null && filterDefinition.getParameters().size() > 0 ) { - throw new SearchException("Filter with parameters and no @Key method: " + filterDefinition.getName() ); + throw new SearchException( "Filter with parameters and no @Key method: " + filterDefinition.getName() ); } FilterKey key = null; if ( def.isCache() ) { if ( def.getKeyMethod() == null ) { - key = new FilterKey( ) { + key = new FilterKey() { public int hashCode() { return getImpl().hashCode(); } public boolean equals(Object obj) { - if ( ! ( obj instanceof FilterKey ) ) return false; + if ( !( obj instanceof FilterKey ) ) return false; FilterKey that = (FilterKey) obj; return this.getImpl().equals( that.getImpl() ); } @@ -324,15 +328,15 @@ key = (FilterKey) def.getKeyMethod().invoke( instance ); } catch (IllegalAccessException e) { - throw new SearchException("Unable to access @Key method: " + throw new SearchException( "Unable to access @Key method: " + def.getImpl().getName() + "." + def.getKeyMethod().getName() ); } catch (InvocationTargetException e) { - throw new SearchException("Unable to access @Key method: " + throw new SearchException( "Unable to access @Key method: " + def.getImpl().getName() + "." + def.getKeyMethod().getName() ); } catch (ClassCastException e) { - throw new SearchException("@Key method does not return FilterKey: " + throw new SearchException( "@Key method does not return FilterKey: " + def.getImpl().getName() + "." + def.getKeyMethod().getName() ); } } @@ -342,21 +346,21 @@ Filter filter = def.isCache() ? searchFactoryImplementor.getFilterCachingStrategy().getCachedFilter( key ) : null; - if (filter == null) { + if ( filter == null ) { if ( def.getFactoryMethod() != null ) { try { filter = (Filter) def.getFactoryMethod().invoke( instance ); } catch (IllegalAccessException e) { - throw new SearchException("Unable to access @Factory method: " + throw new SearchException( "Unable to access @Factory method: " + def.getImpl().getName() + "." + def.getFactoryMethod().getName() ); } catch (InvocationTargetException e) { - throw new SearchException("Unable to access @Factory method: " + throw new SearchException( "Unable to access @Factory method: " + def.getImpl().getName() + "." + def.getFactoryMethod().getName() ); } catch (ClassCastException e) { - throw new SearchException("@Key method does not return a org.apache.lucene.search.Filter class: " + throw new SearchException( "@Key method does not return a org.apache.lucene.search.Filter class: " + def.getImpl().getName() + "." + def.getFactoryMethod().getName() ); } } @@ -365,11 +369,12 @@ filter = (Filter) instance; } catch (ClassCastException e) { - throw new SearchException("@Key method does not return a org.apache.lucene.search.Filter class: " + throw new SearchException( "@Key method does not return a org.apache.lucene.search.Filter class: " + def.getImpl().getName() + "." + def.getFactoryMethod().getName() ); } } - if ( def.isCache() ) searchFactoryImplementor.getFilterCachingStrategy().addCachedFilter( key, filter ); + if ( def.isCache() ) + searchFactoryImplementor.getFilterCachingStrategy().addCachedFilter( key, filter ); } chainedFilter.addFilter( filter ); } @@ -422,16 +427,15 @@ private IndexSearcher buildSearcher(SearchFactoryImplementor searchFactoryImplementor) { Map<Class, DocumentBuilder<Object>> builders = searchFactoryImplementor.getDocumentBuilders(); List<DirectoryProvider> directories = new ArrayList<DirectoryProvider>(); + + Similarity searcherSimilarity = null; + if ( classes == null || classes.length == 0 ) { //no class means all classes for (DocumentBuilder builder : builders.values()) { - final DirectoryProvider[] directoryProviders = - builder.getDirectoryProviderSelectionStrategy().getDirectoryProvidersForAllShards(); - for (DirectoryProvider provider : directoryProviders) { - if ( !directories.contains( provider ) ) { - directories.add( provider ); - } - } + searcherSimilarity = checkSimilarity( searcherSimilarity, builder ); + final DirectoryProvider[] directoryProviders = builder.getDirectoryProviderSelectionStrategy().getDirectoryProvidersForAllShards(); + populateDirectories( directories, directoryProviders ); } classesAndSubclasses = null; } @@ -442,27 +446,55 @@ DocumentBuilder builder = builders.get( clazz ); if ( builder != null ) involvedClasses.addAll( builder.getMappedSubclasses() ); } + for (Class clazz : involvedClasses) { DocumentBuilder builder = builders.get( clazz ); //TODO should we rather choose a polymorphic path and allow non mapped entities if ( builder == null ) throw new HibernateException( "Not a mapped entity (don't forget to add @Indexed): " + clazz ); - final DirectoryProvider[] directoryProviders = - builder.getDirectoryProviderSelectionStrategy().getDirectoryProvidersForAllShards(); - for (DirectoryProvider provider : directoryProviders) { - if ( !directories.contains( provider ) ) { - directories.add( provider ); - } - } + + final DirectoryProvider[] directoryProviders = builder.getDirectoryProviderSelectionStrategy().getDirectoryProvidersForAllShards(); + searcherSimilarity = checkSimilarity( searcherSimilarity, builder ); + populateDirectories( directories, directoryProviders ); } classesAndSubclasses = involvedClasses; } //set up the searcher final DirectoryProvider[] directoryProviders = directories.toArray( new DirectoryProvider[directories.size()] ); - return new IndexSearcher( searchFactoryImplementor.getReaderProvider().openReader( directoryProviders ) ); + IndexSearcher is = new IndexSearcher( searchFactoryImplementor.getReaderProvider().openReader( directoryProviders ) ); + is.setSimilarity( searcherSimilarity ); + return is; } + private void populateDirectories(List<DirectoryProvider> directories, DirectoryProvider[] directoryProviders) { + for (DirectoryProvider provider : directoryProviders) { + if ( !directories.contains( provider ) ) { + directories.add( provider ); + } + } + } + + private Similarity checkSimilarity(Similarity similarity, DocumentBuilder builder) { + if ( similarity == null ) { + similarity = builder.getSimilarity(); + } + else if ( !similarity.getClass().equals( builder.getSimilarity().getClass() ) ) { + throw new HibernateException( "Cannot perform search on two entities with differing Similarity implementations (" + similarity.getClass().getName() + " & " + builder.getSimilarity().getClass().getName() + ")" ); + } + + return similarity; + } + + private void closeSearcher(Searcher searcher, ReaderProvider readerProvider) { + boolean trace = log.isTraceEnabled(); + Set<IndexReader> indexReaders = getIndexReaders( searcher ); + + for (IndexReader indexReader : indexReaders) { + readerProvider.closeReader( indexReader ); + } + } + private void setResultSize(Hits hits) { resultSize = hits.length(); } @@ -488,7 +520,8 @@ finally { //searcher cannot be null try { - searchFactoryImplementor.getReaderProvider().closeReader( searcher.getIndexReader() ); + closeSearcher( searcher, searchFactoryImplementor.getReaderProvider() ); + //searchFactoryImplementor.getReaderProvider().closeReader( searcher.getIndexReader() ); } catch (SearchException e) { log.warn( "Unable to properly close searcher during lucene query: " + getQueryString(), e ); @@ -515,16 +548,16 @@ } public FullTextQuery setFirstResult(int firstResult) { - if (firstResult < 0) { - throw new IllegalArgumentException("'first' pagination parameter less than 0"); + if ( firstResult < 0 ) { + throw new IllegalArgumentException( "'first' pagination parameter less than 0" ); } this.firstResult = firstResult; return this; } public FullTextQuery setMaxResults(int maxResults) { - if (maxResults < 0) { - throw new IllegalArgumentException("'max' pagination parameter less than 0"); + if ( maxResults < 0 ) { + throw new IllegalArgumentException( "'max' pagination parameter less than 0" ); } this.maxResults = maxResults; return this; @@ -568,10 +601,10 @@ filterDefinition = new FullTextFilterImpl(); filterDefinition.setName( name ); FilterDef filterDef = getSearchFactoryImplementor().getFilterDefinition( name ); - if (filterDef == null) { - throw new SearchException("Unkown @FullTextFilter: " + name); + if ( filterDef == null ) { + throw new SearchException( "Unkown @FullTextFilter: " + name ); } - filterDefinitions.put(name, filterDefinition); + filterDefinitions.put( name, filterDefinition ); return filterDefinition; } Modified: search/trunk/src/java/org/hibernate/search/reader/CacheableMultiReader.java =================================================================== --- search/trunk/src/java/org/hibernate/search/reader/CacheableMultiReader.java 2008-03-20 19:01:16 UTC (rev 14473) +++ search/trunk/src/java/org/hibernate/search/reader/CacheableMultiReader.java 2008-03-20 22:21:30 UTC (rev 14474) @@ -5,7 +5,6 @@ import org.apache.lucene.index.IndexReader; import org.apache.lucene.index.MultiReader; -import org.hibernate.search.SearchException; /** * MultiReader ensuring equals returns true if the underlying readers are the same (and in the same order) @@ -14,30 +13,34 @@ * @author Emmanuel Bernard */ public class CacheableMultiReader extends MultiReader { - private IndexReader[] subReaders; + // This is package private as the intention of the Lucene team seems to be to not + // expose this publically (it's a protected member in Lucene 2.3) + IndexReader[] subReaders; + public CacheableMultiReader(IndexReader[] subReaders) throws IOException { super( subReaders ); this.subReaders = subReaders; } - /** only available since 2.3 */ + /** + * only available since 2.3 + */ /* public CacheableMultiReader(IndexReader[] subReaders, boolean closeSubReaders) { super( subReaders, closeSubReaders ); this.subReaders = subReaders; } */ - @Override public boolean equals(Object obj) { if ( this == obj ) return true; - if ( ! ( obj instanceof CacheableMultiReader ) ) return false; - CacheableMultiReader that = ( CacheableMultiReader ) obj; + if ( !( obj instanceof CacheableMultiReader ) ) return false; + CacheableMultiReader that = (CacheableMultiReader) obj; int length = this.subReaders.length; if ( length != that.subReaders.length ) return false; - for (int index = 0 ; index < length ; index++) { - if ( ! this.subReaders[index].equals( that.subReaders[index] ) ) return false; + for (int index = 0; index < length; index++) { + if ( !this.subReaders[index].equals( that.subReaders[index] ) ) return false; } return true; } @@ -46,7 +49,7 @@ public int hashCode() { int result = 0; for (Object reader : this.subReaders) { - result = 31*result + reader.hashCode(); + result = 31 * result + reader.hashCode(); } return result; } Modified: search/trunk/src/java/org/hibernate/search/reader/ReaderProviderHelper.java =================================================================== --- search/trunk/src/java/org/hibernate/search/reader/ReaderProviderHelper.java 2008-03-20 19:01:16 UTC (rev 14473) +++ search/trunk/src/java/org/hibernate/search/reader/ReaderProviderHelper.java 2008-03-20 22:21:30 UTC (rev 14474) @@ -2,9 +2,13 @@ package org.hibernate.search.reader; import java.io.IOException; +import java.util.HashSet; +import java.util.Set; import org.apache.lucene.index.IndexReader; -import org.apache.lucene.index.MultiReader; +import org.apache.lucene.search.IndexSearcher; +import org.apache.lucene.search.MultiSearcher; +import org.apache.lucene.search.Searchable; import org.hibernate.search.SearchException; /** @@ -52,4 +56,48 @@ } throw e; } + + /** + * Find the underlying IndexReaders for the given searchable + * + * @param searchable The searchable to find the IndexReaders for + * @return A list of all base IndexReaders used within this searchable + */ + public static Set<IndexReader> getIndexReaders(Searchable searchable) { + Set<IndexReader> readers = new HashSet<IndexReader>(); + getIndexReadersInternal( readers, searchable ); + return readers; + } + + /** + * Find the underlying IndexReaders for the given reader + * + * @param reader The reader to find the IndexReaders for + * @return A list of all base IndexReaders used within this searchable + */ + public static Set<IndexReader> getIndexReaders(IndexReader reader) { + Set<IndexReader> readers = new HashSet<IndexReader>(); + getIndexReadersInternal( readers, reader ); + return readers; + } + + /** + * Recursive method should identify all underlying readers for any nested structure of Lucene Searchable or IndexReader + * + * @param readers The working list of all readers found + * @param obj The object to find the readers within + */ + private static void getIndexReadersInternal(Set<IndexReader> readers, Object obj) { + if ( obj instanceof MultiSearcher ) { + for (Searchable s : ( (MultiSearcher) obj ).getSearchables()) { + getIndexReadersInternal( readers, s ); + } + } + else if ( obj instanceof IndexSearcher ) { + getIndexReadersInternal( readers, ( (IndexSearcher) obj ).getIndexReader() ); + } + else if ( obj instanceof IndexReader ) { + readers.add( (IndexReader) obj ); + } + } } Added: search/trunk/src/test/org/hibernate/search/test/similarity/Can.java =================================================================== --- search/trunk/src/test/org/hibernate/search/test/similarity/Can.java (rev 0) +++ search/trunk/src/test/org/hibernate/search/test/similarity/Can.java 2008-03-20 22:21:30 UTC (rev 14474) @@ -0,0 +1,40 @@ +//$ +package org.hibernate.search.test.similarity; + +import javax.persistence.Entity; +import javax.persistence.GeneratedValue; +import javax.persistence.Id; + +import org.hibernate.search.annotations.DocumentId; +import org.hibernate.search.annotations.Field; +import org.hibernate.search.annotations.Indexed; + +/** + * @author Emmanuel Bernard + */ +@Entity +@Indexed +public class Can { + @Id + @DocumentId + @GeneratedValue + private Integer id; + @Field + private String name; + + public Integer getId() { + return id; + } + + public void setId(Integer id) { + this.id = id; + } + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } +} Added: search/trunk/src/test/org/hibernate/search/test/similarity/DummySimilarity.java =================================================================== --- search/trunk/src/test/org/hibernate/search/test/similarity/DummySimilarity.java (rev 0) +++ search/trunk/src/test/org/hibernate/search/test/similarity/DummySimilarity.java 2008-03-20 22:21:30 UTC (rev 14474) @@ -0,0 +1,41 @@ +//$ +package org.hibernate.search.test.similarity; + +import org.apache.lucene.search.DefaultSimilarity; + +/** + * @author Emmanuel Bernard + */ +public class DummySimilarity extends DefaultSimilarity { + private float CONST = 1.0f; + + @Override + public float lengthNorm(String fieldName, int numTerms) { + return CONST; + } + + @Override + public float queryNorm(float sumOfSquaredWeights) { + return CONST; + } + + @Override + public float tf(float freq) { + return CONST; + } + + @Override + public float sloppyFreq(int distance) { + return CONST; + } + + @Override + public float idf(int docFreq, int numDocs) { + return CONST; + } + + @Override + public float coord(int overlap, int maxOverlap) { + return CONST; + } +} Added: search/trunk/src/test/org/hibernate/search/test/similarity/DummySimilarity2.java =================================================================== --- search/trunk/src/test/org/hibernate/search/test/similarity/DummySimilarity2.java (rev 0) +++ search/trunk/src/test/org/hibernate/search/test/similarity/DummySimilarity2.java 2008-03-20 22:21:30 UTC (rev 14474) @@ -0,0 +1,41 @@ +//$ +package org.hibernate.search.test.similarity; + +import org.apache.lucene.search.DefaultSimilarity; + +/** + * @author Emmanuel Bernard + */ +public class DummySimilarity2 extends DefaultSimilarity { + private float CONST = .5f; + + @Override + public float lengthNorm(String fieldName, int numTerms) { + return CONST; + } + + @Override + public float queryNorm(float sumOfSquaredWeights) { + return CONST; + } + + @Override + public float tf(float freq) { + return CONST; + } + + @Override + public float sloppyFreq(int distance) { + return CONST; + } + + @Override + public float idf(int docFreq, int numDocs) { + return CONST; + } + + @Override + public float coord(int overlap, int maxOverlap) { + return CONST; + } +} \ No newline at end of file Added: search/trunk/src/test/org/hibernate/search/test/similarity/SimilarityTest.java =================================================================== --- search/trunk/src/test/org/hibernate/search/test/similarity/SimilarityTest.java (rev 0) +++ search/trunk/src/test/org/hibernate/search/test/similarity/SimilarityTest.java 2008-03-20 22:21:30 UTC (rev 14474) @@ -0,0 +1,71 @@ +//$ +package org.hibernate.search.test.similarity; + +import java.util.List; + +import org.hibernate.search.test.SearchTestCase; +import org.hibernate.search.Search; +import org.hibernate.search.FullTextSession; +import org.hibernate.search.FullTextQuery; +import org.hibernate.search.Environment; +import org.hibernate.Session; +import org.hibernate.Transaction; +import org.hibernate.cfg.Configuration; +import org.apache.lucene.search.TermQuery; +import org.apache.lucene.index.Term; + +/** + * @author Emmanuel Bernard + */ +public class SimilarityTest extends SearchTestCase { + public void testClassAndGlobalSimilarity() throws Exception { + Session s = openSession( ); + Transaction tx = s.beginTransaction(); + Trash trash = new Trash(); + trash.setName( "Green trash" ); + s.persist( trash ); + trash = new Trash(); + trash.setName( "Green Green Green trash" ); + s.persist( trash ); + Can can = new Can(); + can.setName( "Green can" ); + s.persist( can ); + can = new Can(); + can.setName( "Green Green Green can" ); + s.persist( can ); + tx.commit(); + + s.clear(); + + tx = s.beginTransaction(); + TermQuery tq = new TermQuery( new Term("name", "green") ); + FullTextSession fts = Search.createFullTextSession( s ); + List results = fts.createFullTextQuery( tq, Trash.class ).setProjection( FullTextQuery.SCORE, FullTextQuery.THIS ).list(); + assertEquals( 2, results.size() ); + assertEquals( "Similarity not overridden at the class level", ( (Object[]) results.get( 0 ) )[0], ( (Object[]) results.get( 1 ) )[0]); + assertEquals( "Similarity not overridden", 1.0f, ( (Object[]) results.get( 0 ) )[0] ); + for (Object result : results) s.delete( ( (Object[]) result )[1] ); + + results = fts.createFullTextQuery( tq, Can.class ).setProjection( FullTextQuery.SCORE, FullTextQuery.THIS ).list(); + assertEquals( 2, results.size() ); + assertEquals( "Similarity not overridden by the global setting", ( (Object[]) results.get( 0 ) )[0], ( (Object[]) results.get( 1 ) )[0]); + assertFalse( "Similarity not overridden by the global setting", new Float(1.0f).equals( ( (Object[]) results.get( 0 ) )[0] ) ); + for (Object result : results) s.delete( ( (Object[]) result )[1] ); + + tx.commit(); + s.close(); + + } + protected Class[] getMappings() { + return new Class[] { + Trash.class, + Can.class + }; + } + + @Override + protected void configure(Configuration cfg) { + cfg.setProperty( Environment.SIMILARITY_CLASS, DummySimilarity2.class.getName() ); + super.configure( cfg ); + } +} Added: search/trunk/src/test/org/hibernate/search/test/similarity/Trash.java =================================================================== --- search/trunk/src/test/org/hibernate/search/test/similarity/Trash.java (rev 0) +++ search/trunk/src/test/org/hibernate/search/test/similarity/Trash.java 2008-03-20 22:21:30 UTC (rev 14474) @@ -0,0 +1,42 @@ +//$ +package org.hibernate.search.test.similarity; + +import javax.persistence.Id; +import javax.persistence.GeneratedValue; +import javax.persistence.Entity; + +import org.hibernate.search.annotations.Indexed; +import org.hibernate.search.annotations.DocumentId; +import org.hibernate.search.annotations.Field; +import org.hibernate.search.annotations.Similarity; + +/** + * @author Emmanuel Bernard + */ +@Entity +@Indexed +@Similarity(impl = DummySimilarity.class) +public class Trash { + @Id + @DocumentId + @GeneratedValue + private Integer id; + @Field + private String name; + + public Integer getId() { + return id; + } + + public void setId(Integer id) { + this.id = id; + } + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } +}

16 years, 9 months

1
0
0 / 0

Hibernate SVN: r14473 - in search/trunk: src/java/org/hibernate/search and 1 other directory.

by hibernate-commits＠lists.jboss.org

Author: epbernard Date: 2008-03-20 15:01:16 -0400 (Thu, 20 Mar 2008) New Revision: 14473 Modified: search/trunk/build.xml search/trunk/src/java/org/hibernate/search/Version.java Log: bump version Modified: search/trunk/build.xml =================================================================== --- search/trunk/build.xml 2008-03-20 19:00:58 UTC (rev 14472) +++ search/trunk/build.xml 2008-03-20 19:01:16 UTC (rev 14473) @@ -17,7 +17,7 @@  <property name="Name" value="Hibernate Search"/> <property name="name" value="hibernate-search"/> - <property name="version" value="3.0.1.GA"/> + <property name="version" value="3.1.x"/> <property name="javadoc.packagenames" value="org.hibernate.search.*"/> <property name="copy.test" value="true"/> <property name="javac.source" value="1.5"/> Modified: search/trunk/src/java/org/hibernate/search/Version.java =================================================================== --- search/trunk/src/java/org/hibernate/search/Version.java 2008-03-20 19:00:58 UTC (rev 14472) +++ search/trunk/src/java/org/hibernate/search/Version.java 2008-03-20 19:01:16 UTC (rev 14473) @@ -10,7 +10,7 @@ * @author Emmanuel Bernard */ public class Version { - public static final String VERSION = "3.0.1.GA"; // + new Date(); + public static final String VERSION = "3.1.x." + new Date(); private static Log log = LogFactory.getLog( Version.class ); static {

16 years, 9 months

1
0
0 / 0

Hibernate SVN: r14472 - in search/trunk/src: java/org/hibernate/search/bridge and 4 other directories.

by hibernate-commits＠lists.jboss.org

Author: epbernard Date: 2008-03-20 15:00:58 -0400 (Thu, 20 Mar 2008) New Revision: 14472 Added: search/trunk/src/java/org/hibernate/search/annotations/TermVector.java search/trunk/src/test/org/hibernate/search/test/query/ElectricalProperties.java search/trunk/src/test/org/hibernate/search/test/query/TermVectorTest.java Modified: search/trunk/src/java/org/hibernate/search/annotations/ClassBridge.java search/trunk/src/java/org/hibernate/search/annotations/Field.java search/trunk/src/java/org/hibernate/search/bridge/FieldBridge.java search/trunk/src/java/org/hibernate/search/bridge/String2FieldBridgeAdaptor.java search/trunk/src/java/org/hibernate/search/engine/DocumentBuilder.java search/trunk/src/test/org/hibernate/search/test/bridge/CatDeptsFieldsClassBridge.java search/trunk/src/test/org/hibernate/search/test/bridge/CatFieldsClassBridge.java search/trunk/src/test/org/hibernate/search/test/bridge/DateSplitBridge.java search/trunk/src/test/org/hibernate/search/test/bridge/EquipmentType.java search/trunk/src/test/org/hibernate/search/test/bridge/TruncateFieldBridge.java search/trunk/src/test/org/hibernate/search/test/id/PersonPKBridge.java Log: HSEARCH-141 add term vector Modified: search/trunk/src/java/org/hibernate/search/annotations/ClassBridge.java =================================================================== --- search/trunk/src/java/org/hibernate/search/annotations/ClassBridge.java 2008-03-19 21:33:37 UTC (rev 14471) +++ search/trunk/src/java/org/hibernate/search/annotations/ClassBridge.java 2008-03-20 19:00:58 UTC (rev 14472) @@ -42,6 +42,12 @@ Index index() default Index.TOKENIZED; /** + * Define term vector storage requirements, + * default to NO. + */ + TermVector termVector() default TermVector.NO; + + /** * A float value of the amount of lucene defined * boost to apply to a field. */ Modified: search/trunk/src/java/org/hibernate/search/annotations/Field.java =================================================================== --- search/trunk/src/java/org/hibernate/search/annotations/Field.java 2008-03-19 21:33:37 UTC (rev 14471) +++ search/trunk/src/java/org/hibernate/search/annotations/Field.java 2008-03-20 19:00:58 UTC (rev 14472) @@ -17,7 +17,7 @@ * @author Emmanuel Bernard */ @Retention( RetentionPolicy.RUNTIME ) -@Target( {ElementType.METHOD, ElementType.FIELD} ) +@Target( { ElementType.METHOD, ElementType.FIELD } ) @Documented public @interface Field { /** @@ -38,6 +38,12 @@ Index index() default Index.TOKENIZED; /** + * Define term vector storage requirements, + * default to NO. + */ + TermVector termVector() default TermVector.NO; + + /** * Define an analyzer for the field, default to * the inherited analyzer */ Added: search/trunk/src/java/org/hibernate/search/annotations/TermVector.java =================================================================== --- search/trunk/src/java/org/hibernate/search/annotations/TermVector.java (rev 0) +++ search/trunk/src/java/org/hibernate/search/annotations/TermVector.java 2008-03-20 19:00:58 UTC (rev 14472) @@ -0,0 +1,31 @@ +//$ +package org.hibernate.search.annotations; + +/** + * Defines the term vector storing strategy + * + * @author John Griffin + */ +public enum TermVector { + /** + * Store term vectors. + */ + YES, + /** + * Do not store term vectors. + */ + NO, + /** + * Store the term vector + Token offset information + */ + WITH_OFFSETS, + /** + * Store the term vector + token position information + */ + WITH_POSITIONS, + /** + * Store the term vector + Token position and offset information + */ + WITH_POSITION_OFFSETS +} + Modified: search/trunk/src/java/org/hibernate/search/bridge/FieldBridge.java =================================================================== --- search/trunk/src/java/org/hibernate/search/bridge/FieldBridge.java 2008-03-19 21:33:37 UTC (rev 14471) +++ search/trunk/src/java/org/hibernate/search/bridge/FieldBridge.java 2008-03-20 19:00:58 UTC (rev 14472) @@ -19,5 +19,5 @@ * the parameters (<code>store</code>, <code>index</code>, <code>boost</code>) if the * <code>value</code> is not null */ - void set(String name, Object value, Document document, Field.Store store, Field.Index index, Float boost); + void set(String name, Object value, Document document, Field.Store store, Field.Index index, Field.TermVector termVector, Float boost); } Modified: search/trunk/src/java/org/hibernate/search/bridge/String2FieldBridgeAdaptor.java =================================================================== --- search/trunk/src/java/org/hibernate/search/bridge/String2FieldBridgeAdaptor.java 2008-03-19 21:33:37 UTC (rev 14471) +++ search/trunk/src/java/org/hibernate/search/bridge/String2FieldBridgeAdaptor.java 2008-03-20 19:00:58 UTC (rev 14472) @@ -17,12 +17,12 @@ this.stringBridge = stringBridge; } - public void set(String name, Object value, Document document, Field.Store store, Field.Index index, Float boost) { + public void set(String name, Object value, Document document, Field.Store store, Field.Index index, Field.TermVector termVector, Float boost) { String indexedString = stringBridge.objectToString( value ); //Do not add fields on empty strings, seems a sensible default in most situations //TODO if Store, probably also save empty ones if ( StringHelper.isNotEmpty( indexedString ) ) { - Field field = new Field( name, indexedString, store, index ); + Field field = new Field( name, indexedString, store, index, termVector ); if ( boost != null ) field.setBoost( boost ); document.add( field ); } Modified: search/trunk/src/java/org/hibernate/search/engine/DocumentBuilder.java =================================================================== --- search/trunk/src/java/org/hibernate/search/engine/DocumentBuilder.java 2008-03-19 21:33:37 UTC (rev 14471) +++ search/trunk/src/java/org/hibernate/search/engine/DocumentBuilder.java 2008-03-20 19:00:58 UTC (rev 14472) @@ -28,13 +28,14 @@ import org.hibernate.proxy.HibernateProxy; import org.hibernate.search.SearchException; import org.hibernate.search.annotations.Boost; +import org.hibernate.search.annotations.ClassBridge; +import org.hibernate.search.annotations.ClassBridges; import org.hibernate.search.annotations.ContainedIn; import org.hibernate.search.annotations.DocumentId; import org.hibernate.search.annotations.Index; import org.hibernate.search.annotations.IndexedEmbedded; import org.hibernate.search.annotations.Store; -import org.hibernate.search.annotations.ClassBridge; -import org.hibernate.search.annotations.ClassBridges; +import org.hibernate.search.annotations.TermVector; import org.hibernate.search.backend.AddLuceneWork; import org.hibernate.search.backend.DeleteLuceneWork; import org.hibernate.search.backend.LuceneWork; @@ -142,18 +143,18 @@ propertiesMetadata.analyzer = analyzer; } // Check for any ClassBridges annotation. - ClassBridges classBridgesAnn = currClass.getAnnotation( ClassBridges.class); - if (classBridgesAnn != null) { + ClassBridges classBridgesAnn = currClass.getAnnotation( ClassBridges.class ); + if ( classBridgesAnn != null ) { ClassBridge[] cbs = classBridgesAnn.value(); for (ClassBridge cb : cbs) { - bindClassAnnotation(prefix, propertiesMetadata, cb); + bindClassAnnotation( prefix, propertiesMetadata, cb ); } - } + } // Check for any ClassBridge style of annotations. - ClassBridge classBridgeAnn = currClass.getAnnotation(ClassBridge.class); - if (classBridgeAnn != null) { - bindClassAnnotation(prefix, propertiesMetadata, classBridgeAnn); + ClassBridge classBridgeAnn = currClass.getAnnotation( ClassBridge.class ); + if ( classBridgeAnn != null ) { + bindClassAnnotation( prefix, propertiesMetadata, classBridgeAnn ); } //rejecting non properties (ie regular methods) because the object is loaded from Hibernate, @@ -205,6 +206,7 @@ propertiesMetadata.fieldNames.add( fieldName ); propertiesMetadata.fieldStore.add( getStore( Store.YES ) ); propertiesMetadata.fieldIndex.add( getIndex( Index.UN_TOKENIZED ) ); + propertiesMetadata.fieldTermVectors.add( getTermVector( TermVector.NO ) ); propertiesMetadata.fieldBridges.add( BridgeFactory.guessType( null, member, reflectionManager ) ); // Field > property > entity analyzer Analyzer analyzer = null; //no field analyzer @@ -313,6 +315,7 @@ propertiesMetadata.classNames.add( fieldName ); propertiesMetadata.classStores.add( getStore( ann.store() ) ); propertiesMetadata.classIndexes.add( getIndex( ann.index() ) ); + propertiesMetadata.classTermVectors.add( getTermVector( ann.termVector() ) ); propertiesMetadata.classBridges.add( BridgeFactory.extractType( ann ) ); propertiesMetadata.classBoosts.add( ann.boost().value() ); @@ -329,7 +332,9 @@ propertiesMetadata.fieldNames.add( fieldName ); propertiesMetadata.fieldStore.add( getStore( fieldAnn.store() ) ); propertiesMetadata.fieldIndex.add( getIndex( fieldAnn.index() ) ); + propertiesMetadata.fieldTermVectors.add( getTermVector( fieldAnn.termVector() ) ); propertiesMetadata.fieldBridges.add( BridgeFactory.guessType( fieldAnn, member, reflectionManager ) ); + // Field > property > entity analyzer Analyzer analyzer = getAnalyzer( fieldAnn.analyzer() ); if ( analyzer == null ) analyzer = getAnalyzer( member ); @@ -363,6 +368,23 @@ } } + private Field.TermVector getTermVector(TermVector vector) { + switch ( vector ) { + case NO: + return Field.TermVector.NO; + case YES: + return Field.TermVector.YES; + case WITH_OFFSETS: + return Field.TermVector.WITH_OFFSETS; + case WITH_POSITIONS: + return Field.TermVector.WITH_POSITIONS; + case WITH_POSITION_OFFSETS: + return Field.TermVector.WITH_POSITIONS_OFFSETS; + default: + throw new AssertionFailure( "Unexpected TermVector: " + vector ); + } + } + private Field.Index getIndex(Index index) { switch ( index ) { case NO: @@ -403,9 +425,9 @@ for (LuceneWork luceneWork : queue) { //any work on the same entity should be ignored if ( luceneWork.getEntityClass() == entityClass - ) { + ) { Serializable currentId = luceneWork.getId(); - if ( currentId != null && currentId.equals( id ) ) { //find a way to use Type.equals(x,y) + if ( currentId != null && currentId.equals( id ) ) { //find a way to use Type.equals(x,y) return; } //TODO do something to avoid multiple PURGE ALL and OPTIMIZE @@ -518,9 +540,9 @@ } { Field classField = - new Field( CLASS_FIELDNAME, instanceClass.getName(), Field.Store.YES, Field.Index.UN_TOKENIZED ); + new Field( CLASS_FIELDNAME, instanceClass.getName(), Field.Store.YES, Field.Index.UN_TOKENIZED, Field.TermVector.NO ); doc.add( classField ); - idBridge.set( idKeywordName, id, doc, Field.Store.YES, Field.Index.UN_TOKENIZED, idBoost ); + idBridge.set( idKeywordName, id, doc, Field.Store.YES, Field.Index.UN_TOKENIZED, Field.TermVector.NO, idBoost ); } buildDocumentFields( instance, doc, rootPropertiesMetadata ); return doc; @@ -533,19 +555,24 @@ for (int i = 0; i < propertiesMetadata.classBridges.size(); i++) { FieldBridge fb = propertiesMetadata.classBridges.get( i ); - fb.set( propertiesMetadata.classNames.get(i), + fb.set( propertiesMetadata.classNames.get( i ), unproxiedInstance, doc, - propertiesMetadata.classStores.get(i), - propertiesMetadata.classIndexes.get(i), - propertiesMetadata.classBoosts.get(i)); + propertiesMetadata.classStores.get( i ), + propertiesMetadata.classIndexes.get( i ), + propertiesMetadata.classTermVectors.get( i ), + propertiesMetadata.classBoosts.get( i ) ); } for (int i = 0; i < propertiesMetadata.fieldNames.size(); i++) { XMember member = propertiesMetadata.fieldGetters.get( i ); Object value = getMemberValue( unproxiedInstance, member ); propertiesMetadata.fieldBridges.get( i ).set( - propertiesMetadata.fieldNames.get( i ), value, doc, propertiesMetadata.fieldStore.get( i ), - propertiesMetadata.fieldIndex.get( i ), getBoost( member ) + propertiesMetadata.fieldNames.get( i ), + value, doc, + propertiesMetadata.fieldStore.get( i ), + propertiesMetadata.fieldIndex.get( i ), + propertiesMetadata.fieldTermVectors.get( i ), + getBoost( member ) ); } for (int i = 0; i < propertiesMetadata.embeddedGetters.size(); i++) { @@ -726,6 +753,7 @@ public final List<FieldBridge> fieldBridges = new ArrayList<FieldBridge>(); public final List<Field.Store> fieldStore = new ArrayList<Field.Store>(); public final List<Field.Index> fieldIndex = new ArrayList<Field.Index>(); + public final List<Field.TermVector> fieldTermVectors = new ArrayList<Field.TermVector>(); public final List<XMember> embeddedGetters = new ArrayList<XMember>(); public final List<PropertiesMetadata> embeddedPropertiesMetadata = new ArrayList<PropertiesMetadata>(); public final List<Container> embeddedContainers = new ArrayList<Container>(); @@ -734,6 +762,7 @@ public final List<Field.Store> classStores = new ArrayList<Field.Store>(); public final List<Field.Index> classIndexes = new ArrayList<Field.Index>(); public final List<FieldBridge> classBridges = new ArrayList<FieldBridge>(); + public final List<Field.TermVector> classTermVectors = new ArrayList<Field.TermVector>(); public final List<Float> classBoosts = new ArrayList<Float>(); public enum Container { Modified: search/trunk/src/test/org/hibernate/search/test/bridge/CatDeptsFieldsClassBridge.java =================================================================== --- search/trunk/src/test/org/hibernate/search/test/bridge/CatDeptsFieldsClassBridge.java 2008-03-19 21:33:37 UTC (rev 14471) +++ search/trunk/src/test/org/hibernate/search/test/bridge/CatDeptsFieldsClassBridge.java 2008-03-20 19:00:58 UTC (rev 14472) @@ -2,10 +2,10 @@ import java.util.Map; +import org.apache.lucene.document.Document; +import org.apache.lucene.document.Field; import org.hibernate.search.bridge.FieldBridge; import org.hibernate.search.bridge.ParameterizedBridge; -import org.apache.lucene.document.Document; -import org.apache.lucene.document.Field; /** * @author John Griffin @@ -18,7 +18,7 @@ this.sepChar = (String) parameters.get( "sepChar" ); } - public void set(String name, Object value, Document document, Field.Store store, Field.Index index, Float boost) { + public void set(String name, Object value, Document document, Field.Store store, Field.Index index, Field.TermVector termVector, Float boost) { // In this particular class the name of the new field was passed // from the name field of the ClassBridge Annotation. This is not // a requirement. It just works that way in this instance. The @@ -33,7 +33,7 @@ fieldValue2 = ""; } String fieldValue = fieldValue1 + sepChar + fieldValue2; - Field field = new Field( name, fieldValue, store, index ); + Field field = new Field( name, fieldValue, store, index, termVector ); if ( boost != null ) field.setBoost( boost ); document.add( field ); } Modified: search/trunk/src/test/org/hibernate/search/test/bridge/CatFieldsClassBridge.java =================================================================== --- search/trunk/src/test/org/hibernate/search/test/bridge/CatFieldsClassBridge.java 2008-03-19 21:33:37 UTC (rev 14471) +++ search/trunk/src/test/org/hibernate/search/test/bridge/CatFieldsClassBridge.java 2008-03-20 19:00:58 UTC (rev 14472) @@ -2,12 +2,10 @@ import java.util.Map; -import org.hibernate.search.bridge.StringBridge; -import org.hibernate.search.bridge.ParameterizedBridge; -import org.hibernate.search.bridge.FieldBridge; -import org.hibernate.util.StringHelper; import org.apache.lucene.document.Document; import org.apache.lucene.document.Field; +import org.hibernate.search.bridge.FieldBridge; +import org.hibernate.search.bridge.ParameterizedBridge; /** * @author John Griffin @@ -20,7 +18,7 @@ this.sepChar = (String) parameters.get( "sepChar" ); } - public void set(String name, Object value, Document document, Field.Store store, Field.Index index, Float boost) { + public void set(String name, Object value, Document document, Field.Store store, Field.Index index, Field.TermVector termVector, Float boost) { // In this particular class the name of the new field was passed // from the name field of the ClassBridge Annotation. This is not // a requirement. It just works that way in this instance. The @@ -35,8 +33,8 @@ fieldValue2 = ""; } String fieldValue = fieldValue1 + sepChar + fieldValue2; - Field field = new Field( name, fieldValue, store, index ); + Field field = new Field( name, fieldValue, store, index, termVector ); if ( boost != null ) field.setBoost( boost ); document.add( field ); } -} \ No newline at end of file +} Modified: search/trunk/src/test/org/hibernate/search/test/bridge/DateSplitBridge.java =================================================================== --- search/trunk/src/test/org/hibernate/search/test/bridge/DateSplitBridge.java 2008-03-19 21:33:37 UTC (rev 14471) +++ search/trunk/src/test/org/hibernate/search/test/bridge/DateSplitBridge.java 2008-03-20 19:00:58 UTC (rev 14472) @@ -1,14 +1,14 @@ //$Id$ package org.hibernate.search.test.bridge; +import java.util.Calendar; import java.util.Date; -import java.util.Calendar; import java.util.GregorianCalendar; import java.util.TimeZone; -import org.hibernate.search.bridge.FieldBridge; import org.apache.lucene.document.Document; import org.apache.lucene.document.Field; +import org.hibernate.search.bridge.FieldBridge; /** * Store the date in 3 different field year, month, day @@ -18,9 +18,9 @@ * @author Emmanuel Bernard */ public class DateSplitBridge implements FieldBridge { - private final static TimeZone GMT = TimeZone.getTimeZone("GMT"); + private final static TimeZone GMT = TimeZone.getTimeZone( "GMT" ); - public void set(String name, Object value, Document document, Field.Store store, Field.Index index, Float boost) { + public void set(String name, Object value, Document document, Field.Store store, Field.Index index, Field.TermVector termVector, Float boost) { Date date = (Date) value; Calendar cal = GregorianCalendar.getInstance( GMT ); cal.setTime( date ); @@ -28,15 +28,15 @@ int month = cal.get( Calendar.MONTH ) + 1; int day = cal.get( Calendar.DAY_OF_MONTH ); //set year - Field field = new Field( name + ".year", String.valueOf(year), store, index ); + Field field = new Field( name + ".year", String.valueOf( year ), store, index, termVector ); if ( boost != null ) field.setBoost( boost ); document.add( field ); //set month and pad it if needed - field = new Field( name + ".month", month < 10 ? "0" : "" + String.valueOf(month), store, index ); + field = new Field( name + ".month", month < 10 ? "0" : "" + String.valueOf( month ), store, index, termVector ); if ( boost != null ) field.setBoost( boost ); document.add( field ); //set day and pad it if needed - field = new Field( name + ".day", day < 10 ? "0" : "" + String.valueOf(day), store, index ); + field = new Field( name + ".day", day < 10 ? "0" : "" + String.valueOf( day ), store, index, termVector ); if ( boost != null ) field.setBoost( boost ); document.add( field ); } Modified: search/trunk/src/test/org/hibernate/search/test/bridge/EquipmentType.java =================================================================== --- search/trunk/src/test/org/hibernate/search/test/bridge/EquipmentType.java 2008-03-19 21:33:37 UTC (rev 14471) +++ search/trunk/src/test/org/hibernate/search/test/bridge/EquipmentType.java 2008-03-20 19:00:58 UTC (rev 14472) @@ -10,7 +10,7 @@ /** * @author John Griffin */ -public class EquipmentType implements FieldBridge, ParameterizedBridge { +public class EquipmentType implements FieldBridge, ParameterizedBridge { private Map equips; public void setParameterValues(Map parameters) { @@ -18,7 +18,7 @@ this.equips = parameters; } - public void set(String name, Object value, Document document, Field.Store store, Field.Index index, Float boost) { + public void set(String name, Object value, Document document, Field.Store store, Field.Index index, Field.TermVector termVector, Float boost) { // In this particular class the name of the new field was passed // from the name field of the ClassBridge Annotation. This is not // a requirement. It just works that way in this instance. The @@ -31,8 +31,8 @@ fieldValue1 = ""; } else { - String fieldValue = (String)equips.get( fieldValue1); - field = new Field( name, fieldValue, store, index ); + String fieldValue = (String) equips.get( fieldValue1 ); + field = new Field( name, fieldValue, store, index, termVector ); if ( boost != null ) field.setBoost( boost ); } document.add( field ); Modified: search/trunk/src/test/org/hibernate/search/test/bridge/TruncateFieldBridge.java =================================================================== --- search/trunk/src/test/org/hibernate/search/test/bridge/TruncateFieldBridge.java 2008-03-19 21:33:37 UTC (rev 14471) +++ search/trunk/src/test/org/hibernate/search/test/bridge/TruncateFieldBridge.java 2008-03-20 19:00:58 UTC (rev 14472) @@ -1,27 +1,27 @@ //$Id$ package org.hibernate.search.test.bridge; +import org.apache.lucene.document.Document; +import org.apache.lucene.document.Field; import org.hibernate.search.bridge.FieldBridge; import org.hibernate.util.StringHelper; -import org.apache.lucene.document.Document; -import org.apache.lucene.document.Field; /** * @author Emmanuel Bernard */ public class TruncateFieldBridge implements FieldBridge { - public Object get(String name, Document document) { + public Object get(String name, Document document) { Field field = document.getField( name ); return field.stringValue(); } - public void set(String name, Object value, Document document, Field.Store store, Field.Index index, Float boost) { - String indexedString = (String) value; - //Do not add fields on empty strings, seems a sensible default in most situations - if ( StringHelper.isNotEmpty( indexedString ) ) { - Field field = new Field(name, indexedString.substring(0, indexedString.length() / 2), store, index); - if (boost != null) field.setBoost( boost ); - document.add( field ); - } - } + public void set(String name, Object value, Document document, Field.Store store, Field.Index index, Field.TermVector termVector, Float boost) { + String indexedString = (String) value; + //Do not add fields on empty strings, seems a sensible default in most situations + if ( StringHelper.isNotEmpty( indexedString ) ) { + Field field = new Field( name, indexedString.substring( 0, indexedString.length() / 2 ), store, index, termVector ); + if ( boost != null ) field.setBoost( boost ); + document.add( field ); + } + } } Modified: search/trunk/src/test/org/hibernate/search/test/id/PersonPKBridge.java =================================================================== --- search/trunk/src/test/org/hibernate/search/test/id/PersonPKBridge.java 2008-03-19 21:33:37 UTC (rev 14471) +++ search/trunk/src/test/org/hibernate/search/test/id/PersonPKBridge.java 2008-03-20 19:00:58 UTC (rev 14472) @@ -26,12 +26,12 @@ return sb.toString(); } - public void set(String name, Object value, Document document, Field.Store store, Field.Index index, Float boost) { + public void set(String name, Object value, Document document, Field.Store store, Field.Index index, Field.TermVector termVector, Float boost) { PersonPK id = (PersonPK) value; - Field field = new Field( name + ".firstName", id.getFirstName(), store, index ); + Field field = new Field( name + ".firstName", id.getFirstName(), store, index, termVector ); if ( boost != null ) field.setBoost( boost ); document.add( field ); - field = new Field( name + ".lastName", id.getLastName(), store, index ); + field = new Field( name + ".lastName", id.getLastName(), store, index, termVector ); if ( boost != null ) field.setBoost( boost ); document.add( field ); } Added: search/trunk/src/test/org/hibernate/search/test/query/ElectricalProperties.java =================================================================== --- search/trunk/src/test/org/hibernate/search/test/query/ElectricalProperties.java (rev 0) +++ search/trunk/src/test/org/hibernate/search/test/query/ElectricalProperties.java 2008-03-20 19:00:58 UTC (rev 14472) @@ -0,0 +1,49 @@ +package org.hibernate.search.test.query; + +import javax.persistence.Entity; +import javax.persistence.Id; + +import org.hibernate.search.annotations.DocumentId; +import org.hibernate.search.annotations.Field; +import org.hibernate.search.annotations.Index; +import org.hibernate.search.annotations.Indexed; +import org.hibernate.search.annotations.Store; +import org.hibernate.search.annotations.TermVector; + +/** + * @author John Griffin + */ +@Entity +@Indexed +public class ElectricalProperties { + private int id; + private String content; + + public ElectricalProperties() { + + } + + public ElectricalProperties(int id, String content) { + this.id = id; + this.content = content; + } + + @Field( index = Index.TOKENIZED, store = Store.YES, termVector = TermVector.WITH_POSITION_OFFSETS ) + public String getContent() { + return content; + } + + public void setContent(String content) { + this.content = content; + } + + @Id + @DocumentId + public int getId() { + return id; + } + + public void setId(int id) { + this.id = id; + } +} Added: search/trunk/src/test/org/hibernate/search/test/query/TermVectorTest.java =================================================================== --- search/trunk/src/test/org/hibernate/search/test/query/TermVectorTest.java (rev 0) +++ search/trunk/src/test/org/hibernate/search/test/query/TermVectorTest.java 2008-03-20 19:00:58 UTC (rev 14472) @@ -0,0 +1,116 @@ +package org.hibernate.search.test.query; + +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; +import org.apache.lucene.index.IndexReader; +import org.apache.lucene.index.TermPositionVector; +import org.apache.lucene.index.TermVectorOffsetInfo; +import org.hibernate.Transaction; +import org.hibernate.search.FullTextSession; +import org.hibernate.search.Search; +import org.hibernate.search.SearchFactory; +import org.hibernate.search.reader.ReaderProvider; +import org.hibernate.search.store.DirectoryProvider; +import org.hibernate.search.test.SearchTestCase; + +/** + * @author John Griffin + */ +public class TermVectorTest extends SearchTestCase { + private static Log log = LogFactory.getLog( TermVectorTest.class ); + + public void testPositionOffsets() throws Exception { + FullTextSession s = Search.createFullTextSession( openSession() ); + createIndex( s ); + + s.clear(); + Transaction tx = s.beginTransaction(); + + // Here's how to get a reader from a FullTextSession + SearchFactory searchFactory = s.getSearchFactory(); + DirectoryProvider provider = searchFactory.getDirectoryProviders( ElectricalProperties.class )[0]; + ReaderProvider readerProvider = searchFactory.getReaderProvider(); + IndexReader reader = readerProvider.openReader( provider ); + + /** + * Since there are so many combinations of results here, rather + * than try to do assertions, this test prints out all the results + * found from the three ElectricalProperties entities. This will + * do a better job of demonstrating exactly what the result are. - J.G. + */ + ///TODO: try and find some ways to assert it. Nobody reads the results. I've added + for (int x = 0; x < 3; x++) { + TermPositionVector vector = (TermPositionVector) reader.getTermFreqVector( x, "content" ); + assertNotNull( vector ); + String[] terms = vector.getTerms(); + int[] freqs = vector.getTermFrequencies(); + + for (int y = 0; y < vector.size(); y++) { + log.info( "doc# =>" + x ); + log.info( " term => " + terms[y] ); + log.info( " freq => " + freqs[y] ); + + int[] positions = vector.getTermPositions( y ); + TermVectorOffsetInfo[] offsets = vector.getOffsets( y ); + for (int z = 0; z < positions.length; z++) { + log.info( " position => " + positions[z] ); + log.info( " starting offset => " + offsets[z].getStartOffset() ); + log.info( " ending offset => " + offsets[z].getEndOffset() ); + } + log.info( "---------------" ); + } + } + + //cleanup + for (Object element : s.createQuery( "from " + ElectricalProperties.class.getName() ).list()) + s.delete( element ); + tx.commit(); + s.close(); + } + + public void testNoTermVector() throws Exception { + FullTextSession s = Search.createFullTextSession( openSession() ); + Transaction tx = s.beginTransaction(); + + Employee e1 = new Employee( 1000, "Griffin", "ITech" ); + s.save( e1 ); + tx.commit(); + s.clear(); + + tx = s.beginTransaction(); + + // Here's how to get a reader from a FullTextSession + SearchFactory searchFactory = s.getSearchFactory(); + DirectoryProvider provider = searchFactory.getDirectoryProviders( Employee.class )[0]; + ReaderProvider readerProvider = searchFactory.getReaderProvider(); + IndexReader reader = readerProvider.openReader( provider ); + + TermPositionVector vector = (TermPositionVector) reader.getTermFreqVector( 0, "dept" ); + assertNull( "should not find a term position vector", vector ); + + //cleanup + for (Object element : s.createQuery( "from " + ElectricalProperties.class.getName() ).list()) + s.delete( element ); + tx.commit(); + s.close(); + } + + private void createIndex(FullTextSession s) { + Transaction tx = s.beginTransaction(); + ElectricalProperties e1 = new ElectricalProperties( 1000, "Electrical Engineers measure Electrical Properties" ); + s.save( e1 ); + ElectricalProperties e2 = new ElectricalProperties( 1001, "Electrical Properties are interesting" ); + s.save( e2 ); + ElectricalProperties e3 = new ElectricalProperties( 1002, "Electrical Properties are measurable properties" ); + s.save( e3 ); + + tx.commit(); + } + + protected Class[] getMappings() { + return new Class[] { + ElectricalProperties.class, + Employee.class + }; + } +}

16 years, 9 months

1
0
0 / 0

Hibernate SVN: r14471 - jpa-api/trunk.

by hibernate-commits＠lists.jboss.org

Author: epbernard Date: 2008-03-19 17:33:37 -0400 (Wed, 19 Mar 2008) New Revision: 14471 Modified: jpa-api/trunk/build.xml Log: Add Maven2 deploy tasks Modified: jpa-api/trunk/build.xml =================================================================== --- jpa-api/trunk/build.xml 2008-03-19 21:16:55 UTC (rev 14470) +++ jpa-api/trunk/build.xml 2008-03-19 21:33:37 UTC (rev 14471) @@ -124,11 +124,18 @@  </jar> + <artifact:pom id="maven.project" file="${pom.file}" /> + + <artifact:install file="${build.dir}/${jar.name}.jar"> + <pom refid="maven.project"/> + </artifact:install> + <artifact:deploy file="${build.dir}/${jar.name}.jar"> - <pom file="${pom.file}" /> + <pom refid="maven.project" /> <remoteRepository refId="offline.repository.jboss.org"> </remoteRepository> <attach file="${src.jar}" classifier="sources" /> + <attach file="${build.dir}/${jar.name}.jar" classifier="" /> </artifact:deploy> </target>

16 years, 9 months

1
0
0 / 0

Hibernate SVN: r14470 - jpa-api/tags.

by hibernate-commits＠lists.jboss.org

Author: epbernard Date: 2008-03-19 17:16:55 -0400 (Wed, 19 Mar 2008) New Revision: 14470 Added: jpa-api/tags/v1_0_2_GA/ Log: jpa-api 1.0.2.GA Copied: jpa-api/tags/v1_0_2_GA (from rev 14469, jpa-api/trunk)

16 years, 9 months

1
0
0 / 0

Hibernate SVN: r14469 - in jpa-api/trunk: ivy and 1 other directory.

by hibernate-commits＠lists.jboss.org

Author: epbernard Date: 2008-03-19 17:15:57 -0400 (Wed, 19 Mar 2008) New Revision: 14469 Added: jpa-api/trunk/ivy/maven-ant-tasks.jar jpa-api/trunk/pom.xml Modified: jpa-api/trunk/build.xml jpa-api/trunk/ivy.xml Log: Add Maven2 deploy tasks Modified: jpa-api/trunk/build.xml =================================================================== --- jpa-api/trunk/build.xml 2008-03-18 14:24:07 UTC (rev 14468) +++ jpa-api/trunk/build.xml 2008-03-19 21:15:57 UTC (rev 14469) @@ -7,7 +7,8 @@ --> <project name="EJB-API" default="jar" basedir="." - xmlns:ivy="antlib:fr.jayasoft.ivy.ant"> + xmlns:ivy="antlib:fr.jayasoft.ivy.ant" + xmlns:artifact="urn:maven-artifact-ant">  <property file="build.properties"/> @@ -15,16 +16,20 @@  <property name="name" value="ejb3-persistence"/> - <property name="version" value="3.0 Final Release (1.0.1.GA)"/> + <property name="version" value="3.0 Final Release (1.0.2.GA)"/>  <property name="src.dir" value="src"/> <property name="build.dir" value="build"/> <property name="metainf.dir" value="etc"/> <property name="classes.dir" value="${build.dir}/classes"/> - <property name="jar.name" value="${name}"/> + <property name="jar.name" value="${name}"/> - <property name="javac.debug" value="on"/> +  + <property name="src.jar" value="${build.dir}/src.jar"/> + <property name="pom.file" value="pom.xml"/> + + <property name="javac.debug" value="on"/> <property name="javac.optimize" value="off"/> <patternset id="src.files"> @@ -40,10 +45,16 @@ <path id="ivy.lib.path"> <fileset dir="${ivy.jar.dir}" includes="*.jar"/> </path> - <taskdef resource="fr/jayasoft/ivy/ant/antlib.xml" + <path id="maven-ant-tasks.path" path="${ivy.jar.dir}/maven-ant-tasks.jar" /> + <taskdef resource="fr/jayasoft/ivy/ant/antlib.xml" uri="antlib:fr.jayasoft.ivy.ant" classpathref="ivy.lib.path"/> + <typedef resource="org/apache/maven/artifact/ant/antlib.xml" + uri="urn:maven-artifact-ant" + classpathref="maven-ant-tasks.path" /> + <artifact:remoteRepository id="offline.repository.jboss.org" url="file://${offline.repository.jboss.org}" /> +  <target name="clean" description="Cleans up build and dist directories"> @@ -106,6 +117,21 @@ /> </target> + <target name="deploy" depends="jar"> + <jar jarfile="${src.jar}" basedir="${src.dir}"> + <include name="**/*.java" /> + <exclude name="**/test/*.java" /> +  + </jar> + + <artifact:deploy file="${build.dir}/${jar.name}.jar"> + <pom file="${pom.file}" /> + <remoteRepository refId="offline.repository.jboss.org"> + </remoteRepository> + <attach file="${src.jar}" classifier="sources" /> + </artifact:deploy> + </target> + <target name="javadoc" description="Compile the Javadoc API documentation"> <mkdir dir="${build.dir}/api"/> <javadoc Added: jpa-api/trunk/ivy/maven-ant-tasks.jar =================================================================== (Binary files differ) Property changes on: jpa-api/trunk/ivy/maven-ant-tasks.jar ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Modified: jpa-api/trunk/ivy.xml =================================================================== --- jpa-api/trunk/ivy.xml 2008-03-18 14:24:07 UTC (rev 14468) +++ jpa-api/trunk/ivy.xml 2008-03-19 21:15:57 UTC (rev 14469) @@ -3,7 +3,7 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation= "http://www.jayasoft.org/misc/ivy/ivy.xsd"> - <info organisation="org.hibernate" module="ejb3-persistence" revision="1.0.1.GA" status="release"/> + <info organisation="org.hibernate" module="ejb3-persistence" revision="1.0.2.GA" status="release"/> <publications> <artifact name="ejb3-persistence" type="jar" /> </publications> Added: jpa-api/trunk/pom.xml =================================================================== --- jpa-api/trunk/pom.xml (rev 0) +++ jpa-api/trunk/pom.xml 2008-03-19 21:15:57 UTC (rev 14469) @@ -0,0 +1,15 @@ +<project xmlns="http://maven.apache.org/POM/4.0.0" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> + + <modelVersion>4.0.0</modelVersion> + + <groupId>org.hibernate</groupId> + <artifactId>ejb3-persistence</artifactId> + <packaging>pom</packaging> + <version>1.0.2.GA</version> + + <name>Java Persistence API</name> + <description>Java Persistence API</description> + <url>http://www.hibernate.org</url> +</project>

16 years, 9 months

1
0
0 / 0

Hibernate SVN: r14468 - in core/trunk: cache-ehcache and 11 other directories.

by hibernate-commits＠lists.jboss.org

Author: steve.ebersole(a)jboss.com Date: 2008-03-18 10:24:07 -0400 (Tue, 18 Mar 2008) New Revision: 14468 Modified: core/trunk/cache-ehcache/pom.xml core/trunk/cache-jbosscache/pom.xml core/trunk/cache-jbosscache2/pom.xml core/trunk/cache-oscache/pom.xml core/trunk/cache-swarmcache/pom.xml core/trunk/connection-c3p0/pom.xml core/trunk/connection-proxool/pom.xml core/trunk/core/pom.xml core/trunk/eg/pom.xml core/trunk/jmx/pom.xml core/trunk/pom.xml core/trunk/testing/pom.xml core/trunk/testsuite/pom.xml Log: [maven-release-plugin] prepare for next development iteration Modified: core/trunk/cache-ehcache/pom.xml =================================================================== --- core/trunk/cache-ehcache/pom.xml 2008-03-18 14:24:00 UTC (rev 14467) +++ core/trunk/cache-ehcache/pom.xml 2008-03-18 14:24:07 UTC (rev 14468) @@ -10,7 +10,7 @@ <groupId>org.hibernate</groupId> <artifactId>hibernate-ehcache</artifactId> - <version>3.3.0.CR1</version> + <version>3.3.0-SNAPSHOT</version> <packaging>jar</packaging> <name>Hibernate Ehcache Integration</name> @@ -91,11 +91,4 @@ <scope>test</scope> </dependency> </dependencies> - - - <scm> - <connection>scm:svn:http://anonsvn.jboss.org/repos/hibernate/core/tags/hibernate-3.3....</connection> - <developerConnection>scm:svn:https://svn.jboss.org/repos/hibernate/core/tags/hibernate-3.3.0.C...</developerConnection> - <url>http://viewvc.jboss.org/cgi-bin/viewvc.cgi/hibernate/core/tags/hibernate-...</url> - </scm> </project> \ No newline at end of file Modified: core/trunk/cache-jbosscache/pom.xml =================================================================== --- core/trunk/cache-jbosscache/pom.xml 2008-03-18 14:24:00 UTC (rev 14467) +++ core/trunk/cache-jbosscache/pom.xml 2008-03-18 14:24:07 UTC (rev 14468) @@ -10,7 +10,7 @@ <groupId>org.hibernate</groupId> <artifactId>hibernate-jbosscache</artifactId> - <version>3.3.0.CR1</version> + <version>3.3.0-SNAPSHOT</version> <packaging>jar</packaging> <name>Hibernate JBossCache Integration</name> @@ -122,11 +122,4 @@ <scope>test</scope> </dependency> </dependencies> - - - <scm> - <connection>scm:svn:http://anonsvn.jboss.org/repos/hibernate/core/tags/hibernate-3.3....</connection> - <developerConnection>scm:svn:https://svn.jboss.org/repos/hibernate/core/tags/hibernate-3.3.0.C...</developerConnection> - <url>http://viewvc.jboss.org/cgi-bin/viewvc.cgi/hibernate/core/tags/hibernate-...</url> - </scm> </project> \ No newline at end of file Modified: core/trunk/cache-jbosscache2/pom.xml =================================================================== --- core/trunk/cache-jbosscache2/pom.xml 2008-03-18 14:24:00 UTC (rev 14467) +++ core/trunk/cache-jbosscache2/pom.xml 2008-03-18 14:24:07 UTC (rev 14468) @@ -10,7 +10,7 @@ <groupId>org.hibernate</groupId> <artifactId>hibernate-jbosscache2</artifactId> - <version>3.3.0.CR1</version> + <version>3.3.0-SNAPSHOT</version> <packaging>jar</packaging> <name>Hibernate JBossCache2.x Integration</name> @@ -202,11 +202,4 @@ </properties> </profile> </profiles> - - - <scm> - <connection>scm:svn:http://anonsvn.jboss.org/repos/hibernate/core/tags/hibernate-3.3....</connection> - <developerConnection>scm:svn:https://svn.jboss.org/repos/hibernate/core/tags/hibernate-3.3.0.C...</developerConnection> - <url>http://viewvc.jboss.org/cgi-bin/viewvc.cgi/hibernate/core/tags/hibernate-...</url> - </scm> </project> \ No newline at end of file Modified: core/trunk/cache-oscache/pom.xml =================================================================== --- core/trunk/cache-oscache/pom.xml 2008-03-18 14:24:00 UTC (rev 14467) +++ core/trunk/cache-oscache/pom.xml 2008-03-18 14:24:07 UTC (rev 14468) @@ -10,7 +10,7 @@ <groupId>org.hibernate</groupId> <artifactId>hibernate-oscache</artifactId> - <version>3.3.0.CR1</version> + <version>3.3.0-SNAPSHOT</version> <packaging>jar</packaging> <name>Hibernate OSCache Integration</name> @@ -28,11 +28,4 @@ <version>2.1</version> </dependency> </dependencies> - - - <scm> - <connection>scm:svn:http://anonsvn.jboss.org/repos/hibernate/core/tags/hibernate-3.3....</connection> - <developerConnection>scm:svn:https://svn.jboss.org/repos/hibernate/core/tags/hibernate-3.3.0.C...</developerConnection> - <url>http://viewvc.jboss.org/cgi-bin/viewvc.cgi/hibernate/core/tags/hibernate-...</url> - </scm> </project> \ No newline at end of file Modified: core/trunk/cache-swarmcache/pom.xml =================================================================== --- core/trunk/cache-swarmcache/pom.xml 2008-03-18 14:24:00 UTC (rev 14467) +++ core/trunk/cache-swarmcache/pom.xml 2008-03-18 14:24:07 UTC (rev 14468) @@ -10,7 +10,7 @@ <groupId>org.hibernate</groupId> <artifactId>hibernate-swarmcache</artifactId> - <version>3.3.0.CR1</version> + <version>3.3.0-SNAPSHOT</version> <packaging>jar</packaging> <name>Hibernate SwarmCache Integration</name> @@ -28,11 +28,4 @@ <version>1.0RC2</version> </dependency> </dependencies> - - - <scm> - <connection>scm:svn:http://anonsvn.jboss.org/repos/hibernate/core/tags/hibernate-3.3....</connection> - <developerConnection>scm:svn:https://svn.jboss.org/repos/hibernate/core/tags/hibernate-3.3.0.C...</developerConnection> - <url>http://viewvc.jboss.org/cgi-bin/viewvc.cgi/hibernate/core/tags/hibernate-...</url> - </scm> </project> \ No newline at end of file Modified: core/trunk/connection-c3p0/pom.xml =================================================================== --- core/trunk/connection-c3p0/pom.xml 2008-03-18 14:24:00 UTC (rev 14467) +++ core/trunk/connection-c3p0/pom.xml 2008-03-18 14:24:07 UTC (rev 14468) @@ -10,7 +10,7 @@ <groupId>org.hibernate</groupId> <artifactId>hibernate-c3p0</artifactId> - <version>3.3.0.CR1</version> + <version>3.3.0-SNAPSHOT</version> <packaging>jar</packaging> <name>Hibernate C3P0 ConnectionProvider</name> @@ -28,11 +28,4 @@ <version>0.9.1</version> </dependency> </dependencies> - - - <scm> - <connection>scm:svn:http://anonsvn.jboss.org/repos/hibernate/core/tags/hibernate-3.3....</connection> - <developerConnection>scm:svn:https://svn.jboss.org/repos/hibernate/core/tags/hibernate-3.3.0.C...</developerConnection> - <url>http://viewvc.jboss.org/cgi-bin/viewvc.cgi/hibernate/core/tags/hibernate-...</url> - </scm> </project> \ No newline at end of file Modified: core/trunk/connection-proxool/pom.xml =================================================================== --- core/trunk/connection-proxool/pom.xml 2008-03-18 14:24:00 UTC (rev 14467) +++ core/trunk/connection-proxool/pom.xml 2008-03-18 14:24:07 UTC (rev 14468) @@ -10,7 +10,7 @@ <groupId>org.hibernate</groupId> <artifactId>hibernate-proxool</artifactId> - <version>3.3.0.CR1</version> + <version>3.3.0-SNAPSHOT</version> <packaging>jar</packaging> <name>Hibernate Proxool ConnectionProvider</name> @@ -28,11 +28,4 @@ <version>0.8.3</version> </dependency> </dependencies> - - - <scm> - <connection>scm:svn:http://anonsvn.jboss.org/repos/hibernate/core/tags/hibernate-3.3....</connection> - <developerConnection>scm:svn:https://svn.jboss.org/repos/hibernate/core/tags/hibernate-3.3.0.C...</developerConnection> - <url>http://viewvc.jboss.org/cgi-bin/viewvc.cgi/hibernate/core/tags/hibernate-...</url> - </scm> </project> \ No newline at end of file Modified: core/trunk/core/pom.xml =================================================================== --- core/trunk/core/pom.xml 2008-03-18 14:24:00 UTC (rev 14467) +++ core/trunk/core/pom.xml 2008-03-18 14:24:07 UTC (rev 14468) @@ -10,7 +10,7 @@ <groupId>org.hibernate</groupId> <artifactId>hibernate-core</artifactId> - <version>3.3.0.CR1</version> + <version>3.3.0-SNAPSHOT</version> <packaging>jar</packaging> <name>Hibernate Core</name> @@ -141,11 +141,4 @@ <properties> <antlrPluginVersion>2.1</antlrPluginVersion> </properties> - - - <scm> - <connection>scm:svn:http://anonsvn.jboss.org/repos/hibernate/core/tags/hibernate-3.3....</connection> - <developerConnection>scm:svn:https://svn.jboss.org/repos/hibernate/core/tags/hibernate-3.3.0.C...</developerConnection> - <url>http://viewvc.jboss.org/cgi-bin/viewvc.cgi/hibernate/core/tags/hibernate-...</url> - </scm> </project> \ No newline at end of file Modified: core/trunk/eg/pom.xml =================================================================== --- core/trunk/eg/pom.xml 2008-03-18 14:24:00 UTC (rev 14467) +++ core/trunk/eg/pom.xml 2008-03-18 14:24:07 UTC (rev 14468) @@ -12,7 +12,7 @@ <groupId>org.hibernate</groupId> <artifactId>hibernate-eg</artifactId> - <version>3.3.0.CR1</version> + <version>3.3.0-SNAPSHOT</version> <packaging>jar</packaging> <name>Hibernate Example</name> @@ -25,11 +25,4 @@ <version>${version}</version> </dependency> </dependencies> - - - <scm> - <connection>scm:svn:http://anonsvn.jboss.org/repos/hibernate/core/tags/hibernate-3.3....</connection> - <developerConnection>scm:svn:https://svn.jboss.org/repos/hibernate/core/tags/hibernate-3.3.0.C...</developerConnection> - <url>http://viewvc.jboss.org/cgi-bin/viewvc.cgi/hibernate/core/tags/hibernate-...</url> - </scm> </project> \ No newline at end of file Modified: core/trunk/jmx/pom.xml =================================================================== --- core/trunk/jmx/pom.xml 2008-03-18 14:24:00 UTC (rev 14467) +++ core/trunk/jmx/pom.xml 2008-03-18 14:24:07 UTC (rev 14468) @@ -10,7 +10,7 @@ <groupId>org.hibernate</groupId> <artifactId>hibernate-jmx</artifactId> - <version>3.3.0.CR1</version> + <version>3.3.0-SNAPSHOT</version> <packaging>jar</packaging> <name>Hibernate JMX Module</name> @@ -34,11 +34,4 @@ <version>1.2.14</version> </dependency> </dependencies> - - - <scm> - <connection>scm:svn:http://anonsvn.jboss.org/repos/hibernate/core/tags/hibernate-3.3....</connection> - <developerConnection>scm:svn:https://svn.jboss.org/repos/hibernate/core/tags/hibernate-3.3.0.C...</developerConnection> - <url>http://viewvc.jboss.org/cgi-bin/viewvc.cgi/hibernate/core/tags/hibernate-...</url> - </scm> </project> \ No newline at end of file Modified: core/trunk/pom.xml =================================================================== --- core/trunk/pom.xml 2008-03-18 14:24:00 UTC (rev 14467) +++ core/trunk/pom.xml 2008-03-18 14:24:07 UTC (rev 14468) @@ -11,16 +11,16 @@ <groupId>org.hibernate</groupId> <artifactId>hibernate</artifactId> <packaging>pom</packaging> - <version>3.3.0.CR1</version> + <version>3.3.0-SNAPSHOT</version> <name>Hibernate Core Aggregator</name> <description>Aggregator of the Hibernate Core modules.</description> <url>http://hibernate.org</url> <scm> - <connection>scm:svn:https://svn.jboss.org/repos/hibernate/core/tags/hibernate-3.3.0.CR1</connection> - <developerConnection>scm:svn:https://svn.jboss.org/repos/hibernate/core/tags/hibernate-3.3.0.CR1</developerConnection> - <url>https://svn.jboss.org/repos/hibernate/core/tags/hibernate-3.3.0.CR1</url> + <connection>scm:svn:https://svn.jboss.org/repos/hibernate/core/trunk</connection> + <developerConnection>scm:svn:https://svn.jboss.org/repos/hibernate/core/trunk</developerConnection> + <url>https://svn.jboss.org/repos/hibernate/core/trunk</url> </scm> <modules> Modified: core/trunk/testing/pom.xml =================================================================== --- core/trunk/testing/pom.xml 2008-03-18 14:24:00 UTC (rev 14467) +++ core/trunk/testing/pom.xml 2008-03-18 14:24:07 UTC (rev 14468) @@ -10,7 +10,7 @@ <groupId>org.hibernate</groupId> <artifactId>hibernate-testing</artifactId> - <version>3.3.0.CR1</version> + <version>3.3.0-SNAPSHOT</version> <packaging>jar</packaging> <name>Hibernate Testing</name> @@ -42,11 +42,4 @@ </resource> </resources> </build> - - - <scm> - <connection>scm:svn:http://anonsvn.jboss.org/repos/hibernate/core/tags/hibernate-3.3....</connection> - <developerConnection>scm:svn:https://svn.jboss.org/repos/hibernate/core/tags/hibernate-3.3.0.C...</developerConnection> - <url>http://viewvc.jboss.org/cgi-bin/viewvc.cgi/hibernate/core/tags/hibernate-...</url> - </scm> </project> \ No newline at end of file Modified: core/trunk/testsuite/pom.xml =================================================================== --- core/trunk/testsuite/pom.xml 2008-03-18 14:24:00 UTC (rev 14467) +++ core/trunk/testsuite/pom.xml 2008-03-18 14:24:07 UTC (rev 14468) @@ -10,7 +10,7 @@ <groupId>org.hibernate</groupId> <artifactId>hibernate-testsuite</artifactId> - <version>3.3.0.CR1</version> + <version>3.3.0-SNAPSHOT</version> <packaging>jar</packaging> <name>Hibernate Testsuite</name> @@ -355,11 +355,4 @@ </profile> </profiles> - - - <scm> - <connection>scm:svn:http://anonsvn.jboss.org/repos/hibernate/core/tags/hibernate-3.3....</connection> - <developerConnection>scm:svn:https://svn.jboss.org/repos/hibernate/core/tags/hibernate-3.3.0.C...</developerConnection> - <url>http://viewvc.jboss.org/cgi-bin/viewvc.cgi/hibernate/core/tags/hibernate-...</url> - </scm> </project> \ No newline at end of file

16 years, 9 months

1
0
0 / 0

Hibernate SVN: r14467 - in core/tags: hibernate-3.3.0.CR1 and 18 other directories.

by hibernate-commits＠lists.jboss.org

Author: steve.ebersole(a)jboss.com Date: 2008-03-18 10:24:00 -0400 (Tue, 18 Mar 2008) New Revision: 14467 Added: core/tags/hibernate-3.3.0.CR1/ core/tags/hibernate-3.3.0.CR1/cache-ehcache/pom.xml core/tags/hibernate-3.3.0.CR1/cache-jbosscache/pom.xml core/tags/hibernate-3.3.0.CR1/cache-jbosscache2/pom.xml core/tags/hibernate-3.3.0.CR1/cache-jbosscache2/src/test/java/org/hibernate/test/cache/jbc2/functional/util/DualNodeTransactionManagerLookup.java core/tags/hibernate-3.3.0.CR1/cache-jbosscache2/src/test/java/org/hibernate/test/tm/jbc2/BatchModeTransactionManagerLookup.java core/tags/hibernate-3.3.0.CR1/cache-oscache/pom.xml core/tags/hibernate-3.3.0.CR1/cache-swarmcache/pom.xml core/tags/hibernate-3.3.0.CR1/connection-c3p0/pom.xml core/tags/hibernate-3.3.0.CR1/connection-proxool/pom.xml core/tags/hibernate-3.3.0.CR1/core/pom.xml core/tags/hibernate-3.3.0.CR1/documentation/jbosscache2/pom.xml core/tags/hibernate-3.3.0.CR1/documentation/manual/pom.xml core/tags/hibernate-3.3.0.CR1/documentation/pom.xml core/tags/hibernate-3.3.0.CR1/documentation/tutorial/pom.xml core/tags/hibernate-3.3.0.CR1/eg/pom.xml core/tags/hibernate-3.3.0.CR1/jmx/pom.xml core/tags/hibernate-3.3.0.CR1/pom.xml core/tags/hibernate-3.3.0.CR1/testing/pom.xml core/tags/hibernate-3.3.0.CR1/testsuite/pom.xml Removed: core/tags/hibernate-3.3.0.CR1/cache-ehcache/pom.xml core/tags/hibernate-3.3.0.CR1/cache-jbosscache/pom.xml core/tags/hibernate-3.3.0.CR1/cache-jbosscache2/pom.xml core/tags/hibernate-3.3.0.CR1/cache-jbosscache2/src/test/java/org/hibernate/test/cache/jbc2/functional/util/DualNodeTransactionManagerLookup.java core/tags/hibernate-3.3.0.CR1/cache-jbosscache2/src/test/java/org/hibernate/test/tm/jbc2/BatchModeTransactionManagerLookup.java core/tags/hibernate-3.3.0.CR1/cache-oscache/pom.xml core/tags/hibernate-3.3.0.CR1/cache-swarmcache/pom.xml core/tags/hibernate-3.3.0.CR1/connection-c3p0/pom.xml core/tags/hibernate-3.3.0.CR1/connection-proxool/pom.xml core/tags/hibernate-3.3.0.CR1/core/pom.xml core/tags/hibernate-3.3.0.CR1/documentation/jbosscache2/pom.xml core/tags/hibernate-3.3.0.CR1/documentation/manual/pom.xml core/tags/hibernate-3.3.0.CR1/documentation/pom.xml core/tags/hibernate-3.3.0.CR1/documentation/tutorial/pom.xml core/tags/hibernate-3.3.0.CR1/eg/pom.xml core/tags/hibernate-3.3.0.CR1/jmx/pom.xml core/tags/hibernate-3.3.0.CR1/pom.xml core/tags/hibernate-3.3.0.CR1/testing/pom.xml core/tags/hibernate-3.3.0.CR1/testsuite/pom.xml Log: [maven-release-plugin] copy for tag hibernate-3.3.0.CR1 Copied: core/tags/hibernate-3.3.0.CR1 (from rev 14456, core/trunk) Deleted: core/tags/hibernate-3.3.0.CR1/cache-ehcache/pom.xml =================================================================== --- core/trunk/cache-ehcache/pom.xml 2008-03-18 07:26:18 UTC (rev 14456) +++ core/tags/hibernate-3.3.0.CR1/cache-ehcache/pom.xml 2008-03-18 14:24:00 UTC (rev 14467) @@ -1,97 +0,0 @@ -<project xmlns="http://maven.apache.org/POM/4.0.0" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - - <modelVersion>4.0.0</modelVersion> - - <parent> - <groupId>org.hibernate</groupId> - <artifactId>hibernate-core-parent</artifactId> - <version>1</version> - </parent> - - <groupId>org.hibernate</groupId> - <artifactId>hibernate-ehcache</artifactId> - <version>3.3.0-SNAPSHOT</version> - <packaging>jar</packaging> - - <name>Hibernate Ehcache Integration</name> - <description>Integration of Hibernate with Ehcache</description> - - <dependencies> - <dependency> - <groupId>${groupId}</groupId> - <artifactId>hibernate-core</artifactId> - <version>${version}</version> - </dependency> - <dependency> - <groupId>net.sf.ehcache</groupId> - <artifactId>ehcache</artifactId> - <version>1.2.3</version> - </dependency> - -  - <dependency> - <groupId>${groupId}</groupId> - <artifactId>hibernate-testing</artifactId> - <version>${version}</version> - <scope>test</scope> - </dependency> - <dependency> - <groupId>hsqldb</groupId> - <artifactId>hsqldb</artifactId> - <version>1.8.0.2</version> - <scope>test</scope> - </dependency> - <dependency> - <groupId>commons-logging</groupId> - <artifactId>commons-logging</artifactId> - <version>99.0-does-not-exist</version> - <scope>test</scope> - </dependency> - <dependency> - <groupId>commons-logging</groupId> - <artifactId>commons-logging-api</artifactId> - <version>99.0-does-not-exist</version> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.slf4j</groupId> - <artifactId>jcl104-over-slf4j</artifactId> - <version>1.4.2</version> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-log4j12</artifactId> - <version>1.4.2</version> - <scope>test</scope> - </dependency> - <dependency> - <groupId>log4j</groupId> - <artifactId>log4j</artifactId> - <version>1.2.14</version> - <scope>test</scope> - </dependency> -  - <dependency> - <groupId>javassist</groupId> - <artifactId>javassist</artifactId> - <version>3.4.GA</version> - <scope>test</scope> - </dependency> - <dependency> - <groupId>cglib</groupId> - <artifactId>cglib</artifactId> - <version>2.1_3</version> - <scope>test</scope> - </dependency> - <dependency> - <groupId>asm</groupId> - <artifactId>asm-attrs</artifactId> - <version>1.5.3</version> - <scope>test</scope> - </dependency> - </dependencies> - -</project> Copied: core/tags/hibernate-3.3.0.CR1/cache-ehcache/pom.xml (from rev 14466, core/trunk/cache-ehcache/pom.xml) =================================================================== --- core/tags/hibernate-3.3.0.CR1/cache-ehcache/pom.xml (rev 0) +++ core/tags/hibernate-3.3.0.CR1/cache-ehcache/pom.xml 2008-03-18 14:24:00 UTC (rev 14467) @@ -0,0 +1,101 @@ +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> + + <modelVersion>4.0.0</modelVersion> + + <parent> + <groupId>org.hibernate</groupId> + <artifactId>hibernate-core-parent</artifactId> + <version>2</version> + </parent> + + <groupId>org.hibernate</groupId> + <artifactId>hibernate-ehcache</artifactId> + <version>3.3.0.CR1</version> + <packaging>jar</packaging> + + <name>Hibernate Ehcache Integration</name> + <description>Integration of Hibernate with Ehcache</description> + + <dependencies> + <dependency> + <groupId>${groupId}</groupId> + <artifactId>hibernate-core</artifactId> + <version>${version}</version> + </dependency> + <dependency> + <groupId>net.sf.ehcache</groupId> + <artifactId>ehcache</artifactId> + <version>1.2.3</version> + </dependency> + +  + <dependency> + <groupId>${groupId}</groupId> + <artifactId>hibernate-testing</artifactId> + <version>${version}</version> + <scope>test</scope> + </dependency> + <dependency> + <groupId>hsqldb</groupId> + <artifactId>hsqldb</artifactId> + <version>1.8.0.2</version> + <scope>test</scope> + </dependency> + <dependency> + <groupId>commons-logging</groupId> + <artifactId>commons-logging</artifactId> + <version>99.0-does-not-exist</version> + <scope>test</scope> + </dependency> + <dependency> + <groupId>commons-logging</groupId> + <artifactId>commons-logging-api</artifactId> + <version>99.0-does-not-exist</version> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.slf4j</groupId> + <artifactId>jcl104-over-slf4j</artifactId> + <version>1.4.2</version> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-log4j12</artifactId> + <version>1.4.2</version> + <scope>test</scope> + </dependency> + <dependency> + <groupId>log4j</groupId> + <artifactId>log4j</artifactId> + <version>1.2.14</version> + <scope>test</scope> + </dependency> +  + <dependency> + <groupId>javassist</groupId> + <artifactId>javassist</artifactId> + <version>3.4.GA</version> + <scope>test</scope> + </dependency> + <dependency> + <groupId>cglib</groupId> + <artifactId>cglib</artifactId> + <version>2.1_3</version> + <scope>test</scope> + </dependency> + <dependency> + <groupId>asm</groupId> + <artifactId>asm-attrs</artifactId> + <version>1.5.3</version> + <scope>test</scope> + </dependency> + </dependencies> + + + <scm> + <connection>scm:svn:http://anonsvn.jboss.org/repos/hibernate/core/tags/hibernate-3.3....</connection> + <developerConnection>scm:svn:https://svn.jboss.org/repos/hibernate/core/tags/hibernate-3.3.0.C...</developerConnection> + <url>http://viewvc.jboss.org/cgi-bin/viewvc.cgi/hibernate/core/tags/hibernate-...</url> + </scm> +</project> \ No newline at end of file Deleted: core/tags/hibernate-3.3.0.CR1/cache-jbosscache/pom.xml =================================================================== --- core/trunk/cache-jbosscache/pom.xml 2008-03-18 07:26:18 UTC (rev 14456) +++ core/tags/hibernate-3.3.0.CR1/cache-jbosscache/pom.xml 2008-03-18 14:24:00 UTC (rev 14467) @@ -1,128 +0,0 @@ -<project xmlns="http://maven.apache.org/POM/4.0.0" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - - <modelVersion>4.0.0</modelVersion> - - <parent> - <groupId>org.hibernate</groupId> - <artifactId>hibernate-core-parent</artifactId> - <version>1</version> - </parent> - - <groupId>org.hibernate</groupId> - <artifactId>hibernate-jbosscache</artifactId> - <version>3.3.0-SNAPSHOT</version> - <packaging>jar</packaging> - - <name>Hibernate JBossCache Integration</name> - <description>Integration of Hibernate with JBossCache (based on JBossCache1.x APIs)</description> - - <dependencies> - <dependency> - <groupId>${groupId}</groupId> - <artifactId>hibernate-core</artifactId> - <version>${version}</version> - </dependency> - <dependency> - <groupId>jboss</groupId> - <artifactId>jboss-cache</artifactId> - <version>1.4.1.GA</version> - </dependency> -  - <dependency> - <groupId>jboss</groupId> - <artifactId>jboss-system</artifactId> - <version>4.0.2</version> - </dependency> - <dependency> - <groupId>jboss</groupId> - <artifactId>jboss-common</artifactId> - <version>4.0.2</version> - </dependency> - <dependency> - <groupId>jboss</groupId> - <artifactId>jboss-minimal</artifactId> - <version>4.0.2</version> - </dependency> - <dependency> - <groupId>jboss</groupId> - <artifactId>jboss-j2se</artifactId> - <version>200504122039</version> - </dependency> - <dependency> - <groupId>concurrent</groupId> - <artifactId>concurrent</artifactId> - <version>1.3.4</version> - </dependency> - <dependency> - <groupId>jgroups</groupId> - <artifactId>jgroups-all</artifactId> - <version>2.2.7</version> - </dependency> - -  - <dependency> - <groupId>${groupId}</groupId> - <artifactId>hibernate-testing</artifactId> - <version>${version}</version> - <scope>test</scope> - </dependency> - <dependency> - <groupId>hsqldb</groupId> - <artifactId>hsqldb</artifactId> - <version>1.8.0.2</version> - <scope>test</scope> - </dependency> - <dependency> - <groupId>commons-logging</groupId> - <artifactId>commons-logging</artifactId> - <version>99.0-does-not-exist</version> - <scope>test</scope> - </dependency> - <dependency> - <groupId>commons-logging</groupId> - <artifactId>commons-logging-api</artifactId> - <version>99.0-does-not-exist</version> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.slf4j</groupId> - <artifactId>jcl104-over-slf4j</artifactId> - <version>1.4.2</version> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-log4j12</artifactId> - <version>1.4.2</version> - <scope>test</scope> - </dependency> - <dependency> - <groupId>log4j</groupId> - <artifactId>log4j</artifactId> - <version>1.2.14</version> - <scope>test</scope> - </dependency> -  - <dependency> - <groupId>javassist</groupId> - <artifactId>javassist</artifactId> - <version>3.4.GA</version> - <scope>test</scope> - </dependency> - <dependency> - <groupId>cglib</groupId> - <artifactId>cglib</artifactId> - <version>2.1_3</version> - <scope>test</scope> - </dependency> - <dependency> - <groupId>asm</groupId> - <artifactId>asm-attrs</artifactId> - <version>1.5.3</version> - <scope>test</scope> - </dependency> - </dependencies> - -</project> Copied: core/tags/hibernate-3.3.0.CR1/cache-jbosscache/pom.xml (from rev 14466, core/trunk/cache-jbosscache/pom.xml) =================================================================== --- core/tags/hibernate-3.3.0.CR1/cache-jbosscache/pom.xml (rev 0) +++ core/tags/hibernate-3.3.0.CR1/cache-jbosscache/pom.xml 2008-03-18 14:24:00 UTC (rev 14467) @@ -0,0 +1,132 @@ +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> + + <modelVersion>4.0.0</modelVersion> + + <parent> + <groupId>org.hibernate</groupId> + <artifactId>hibernate-core-parent</artifactId> + <version>2</version> + </parent> + + <groupId>org.hibernate</groupId> + <artifactId>hibernate-jbosscache</artifactId> + <version>3.3.0.CR1</version> + <packaging>jar</packaging> + + <name>Hibernate JBossCache Integration</name> + <description>Integration of Hibernate with JBossCache (based on JBossCache1.x APIs)</description> + + <dependencies> + <dependency> + <groupId>${groupId}</groupId> + <artifactId>hibernate-core</artifactId> + <version>${version}</version> + </dependency> + <dependency> + <groupId>jboss</groupId> + <artifactId>jboss-cache</artifactId> + <version>1.4.1.GA</version> + </dependency> +  + <dependency> + <groupId>jboss</groupId> + <artifactId>jboss-system</artifactId> + <version>4.0.2</version> + </dependency> + <dependency> + <groupId>jboss</groupId> + <artifactId>jboss-common</artifactId> + <version>4.0.2</version> + </dependency> + <dependency> + <groupId>jboss</groupId> + <artifactId>jboss-minimal</artifactId> + <version>4.0.2</version> + </dependency> + <dependency> + <groupId>jboss</groupId> + <artifactId>jboss-j2se</artifactId> + <version>200504122039</version> + </dependency> + <dependency> + <groupId>concurrent</groupId> + <artifactId>concurrent</artifactId> + <version>1.3.4</version> + </dependency> + <dependency> + <groupId>jgroups</groupId> + <artifactId>jgroups-all</artifactId> + <version>2.2.7</version> + </dependency> + +  + <dependency> + <groupId>${groupId}</groupId> + <artifactId>hibernate-testing</artifactId> + <version>${version}</version> + <scope>test</scope> + </dependency> + <dependency> + <groupId>hsqldb</groupId> + <artifactId>hsqldb</artifactId> + <version>1.8.0.2</version> + <scope>test</scope> + </dependency> + <dependency> + <groupId>commons-logging</groupId> + <artifactId>commons-logging</artifactId> + <version>99.0-does-not-exist</version> + <scope>test</scope> + </dependency> + <dependency> + <groupId>commons-logging</groupId> + <artifactId>commons-logging-api</artifactId> + <version>99.0-does-not-exist</version> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.slf4j</groupId> + <artifactId>jcl104-over-slf4j</artifactId> + <version>1.4.2</version> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-log4j12</artifactId> + <version>1.4.2</version> + <scope>test</scope> + </dependency> + <dependency> + <groupId>log4j</groupId> + <artifactId>log4j</artifactId> + <version>1.2.14</version> + <scope>test</scope> + </dependency> +  + <dependency> + <groupId>javassist</groupId> + <artifactId>javassist</artifactId> + <version>3.4.GA</version> + <scope>test</scope> + </dependency> + <dependency> + <groupId>cglib</groupId> + <artifactId>cglib</artifactId> + <version>2.1_3</version> + <scope>test</scope> + </dependency> + <dependency> + <groupId>asm</groupId> + <artifactId>asm-attrs</artifactId> + <version>1.5.3</version> + <scope>test</scope> + </dependency> + </dependencies> + + + <scm> + <connection>scm:svn:http://anonsvn.jboss.org/repos/hibernate/core/tags/hibernate-3.3....</connection> + <developerConnection>scm:svn:https://svn.jboss.org/repos/hibernate/core/tags/hibernate-3.3.0.C...</developerConnection> + <url>http://viewvc.jboss.org/cgi-bin/viewvc.cgi/hibernate/core/tags/hibernate-...</url> + </scm> +</project> \ No newline at end of file Deleted: core/tags/hibernate-3.3.0.CR1/cache-jbosscache2/pom.xml =================================================================== --- core/trunk/cache-jbosscache2/pom.xml 2008-03-18 07:26:18 UTC (rev 14456) +++ core/tags/hibernate-3.3.0.CR1/cache-jbosscache2/pom.xml 2008-03-18 14:24:00 UTC (rev 14467) @@ -1,208 +0,0 @@ -<project xmlns="http://maven.apache.org/POM/4.0.0" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - - <modelVersion>4.0.0</modelVersion> - - <parent> - <groupId>org.hibernate</groupId> - <artifactId>hibernate-core-parent</artifactId> - <version>1</version> - </parent> - - <groupId>org.hibernate</groupId> - <artifactId>hibernate-jbosscache2</artifactId> - <version>3.3.0-SNAPSHOT</version> - <packaging>jar</packaging> - - <name>Hibernate JBossCache2.x Integration</name> - <description>Integration of Hibernate with JBossCache (based on JBossCache2.x APIs)</description> - - <dependencies> - <dependency> - <groupId>${groupId}</groupId> - <artifactId>hibernate-core</artifactId> - <version>${version}</version> - </dependency> - <dependency> - <groupId>org.jboss.cache</groupId> - <artifactId>jbosscache-core</artifactId> - <version>2.1.0.CR4</version> - </dependency> -  - <dependency> - <groupId>jgroups</groupId> - <artifactId>jgroups</artifactId> - <version>2.6.1</version> - </dependency> - -  - <dependency> - <groupId>${groupId}</groupId> - <artifactId>hibernate-testing</artifactId> - <version>${version}</version> - <scope>test</scope> - </dependency> - <dependency> - <groupId>hsqldb</groupId> - <artifactId>hsqldb</artifactId> - <version>1.8.0.2</version> - <scope>test</scope> - </dependency> - <dependency> - <groupId>commons-logging</groupId> - <artifactId>commons-logging</artifactId> - <version>99.0-does-not-exist</version> - <scope>test</scope> - </dependency> - <dependency> - <groupId>commons-logging</groupId> - <artifactId>commons-logging-api</artifactId> - <version>99.0-does-not-exist</version> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.slf4j</groupId> - <artifactId>jcl104-over-slf4j</artifactId> - <version>1.4.2</version> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-log4j12</artifactId> - <version>1.4.2</version> - <scope>test</scope> - </dependency> - <dependency> - <groupId>log4j</groupId> - <artifactId>log4j</artifactId> - <version>1.2.14</version> - <scope>test</scope> - </dependency> -  - <dependency> - <groupId>javassist</groupId> - <artifactId>javassist</artifactId> - <version>3.4.GA</version> - <scope>test</scope> - </dependency> - <dependency> - <groupId>cglib</groupId> - <artifactId>cglib</artifactId> - <version>2.1_3</version> - <scope>test</scope> - </dependency> - <dependency> - <groupId>asm</groupId> - <artifactId>asm-attrs</artifactId> - <version>1.5.3</version> - <scope>test</scope> - </dependency> - </dependencies> - - <build> - <testResources> - <testResource> - <filtering>false</filtering> - <directory>src/test/java</directory> - <includes> - <include>**/*.xml</include> - </includes> - </testResource> - <testResource> - <filtering>true</filtering> - <directory>src/test/resources</directory> - </testResource> - </testResources> - - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-compiler-plugin</artifactId> - <configuration> - <source>1.5</source> - <target>1.5</target> - </configuration> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-surefire-plugin</artifactId> - <configuration> - <excludes> -  - <exclude>**/ClusteredConcurrentTimestampRegionTestCase.java</exclude> - </excludes> - <systemProperties> - <property> - <name>hibernate.test.validatefailureexpected</name> - <value>true</value> - </property> - <property> - <name>jgroups.bind_addr</name> - <value>${jgroups.bind_addr}</value> - </property> -  - <property> - <name>java.net.preferIPv4Stack</name> - <value>true</value> - </property> -  - <property> - <name>jgroups.ping.timeout</name> - <value>500</value> - </property> -  - <property> - <name>jgroups.ping.num_initial_members</name> - <value>1</value> - </property> -  - <property> - <name>jgroups.udp.enable_bundling</name> - <value>false</value> - </property> - </systemProperties> - <skipExec>${skipUnitTests}</skipExec> - </configuration> - </plugin> - </plugins> - </build> - - <properties> - <skipUnitTests>true</skipUnitTests> -  - <jgroups.bind_addr>127.0.0.1</jgroups.bind_addr> - </properties> - - <profiles> - <profile> - <id>test</id> - <activation> - <activeByDefault>false</activeByDefault> - </activation> - <properties> - <skipUnitTests>false</skipUnitTests> - </properties> - </profile> - </profiles> - -</project> Copied: core/tags/hibernate-3.3.0.CR1/cache-jbosscache2/pom.xml (from rev 14466, core/trunk/cache-jbosscache2/pom.xml) =================================================================== --- core/tags/hibernate-3.3.0.CR1/cache-jbosscache2/pom.xml (rev 0) +++ core/tags/hibernate-3.3.0.CR1/cache-jbosscache2/pom.xml 2008-03-18 14:24:00 UTC (rev 14467) @@ -0,0 +1,212 @@ +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> + + <modelVersion>4.0.0</modelVersion> + + <parent> + <groupId>org.hibernate</groupId> + <artifactId>hibernate-core-parent</artifactId> + <version>2</version> + </parent> + + <groupId>org.hibernate</groupId> + <artifactId>hibernate-jbosscache2</artifactId> + <version>3.3.0.CR1</version> + <packaging>jar</packaging> + + <name>Hibernate JBossCache2.x Integration</name> + <description>Integration of Hibernate with JBossCache (based on JBossCache2.x APIs)</description> + + <dependencies> + <dependency> + <groupId>${groupId}</groupId> + <artifactId>hibernate-core</artifactId> + <version>${version}</version> + </dependency> + <dependency> + <groupId>org.jboss.cache</groupId> + <artifactId>jbosscache-core</artifactId> + <version>2.1.0.CR4</version> + </dependency> +  + <dependency> + <groupId>jgroups</groupId> + <artifactId>jgroups</artifactId> + <version>2.6.1</version> + </dependency> + +  + <dependency> + <groupId>${groupId}</groupId> + <artifactId>hibernate-testing</artifactId> + <version>${version}</version> + <scope>test</scope> + </dependency> + <dependency> + <groupId>hsqldb</groupId> + <artifactId>hsqldb</artifactId> + <version>1.8.0.2</version> + <scope>test</scope> + </dependency> + <dependency> + <groupId>commons-logging</groupId> + <artifactId>commons-logging</artifactId> + <version>99.0-does-not-exist</version> + <scope>test</scope> + </dependency> + <dependency> + <groupId>commons-logging</groupId> + <artifactId>commons-logging-api</artifactId> + <version>99.0-does-not-exist</version> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.slf4j</groupId> + <artifactId>jcl104-over-slf4j</artifactId> + <version>1.4.2</version> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-log4j12</artifactId> + <version>1.4.2</version> + <scope>test</scope> + </dependency> + <dependency> + <groupId>log4j</groupId> + <artifactId>log4j</artifactId> + <version>1.2.14</version> + <scope>test</scope> + </dependency> +  + <dependency> + <groupId>javassist</groupId> + <artifactId>javassist</artifactId> + <version>3.4.GA</version> + <scope>test</scope> + </dependency> + <dependency> + <groupId>cglib</groupId> + <artifactId>cglib</artifactId> + <version>2.1_3</version> + <scope>test</scope> + </dependency> + <dependency> + <groupId>asm</groupId> + <artifactId>asm-attrs</artifactId> + <version>1.5.3</version> + <scope>test</scope> + </dependency> + </dependencies> + + <build> + <testResources> + <testResource> + <filtering>false</filtering> + <directory>src/test/java</directory> + <includes> + <include>**/*.xml</include> + </includes> + </testResource> + <testResource> + <filtering>true</filtering> + <directory>src/test/resources</directory> + </testResource> + </testResources> + + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-compiler-plugin</artifactId> + <configuration> + <source>1.5</source> + <target>1.5</target> + </configuration> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-surefire-plugin</artifactId> + <configuration> + <excludes> +  + <exclude>**/ClusteredConcurrentTimestampRegionTestCase.java</exclude> + </excludes> + <systemProperties> + <property> + <name>hibernate.test.validatefailureexpected</name> + <value>true</value> + </property> + <property> + <name>jgroups.bind_addr</name> + <value>${jgroups.bind_addr}</value> + </property> +  + <property> + <name>java.net.preferIPv4Stack</name> + <value>true</value> + </property> +  + <property> + <name>jgroups.ping.timeout</name> + <value>500</value> + </property> +  + <property> + <name>jgroups.ping.num_initial_members</name> + <value>1</value> + </property> +  + <property> + <name>jgroups.udp.enable_bundling</name> + <value>false</value> + </property> + </systemProperties> + <skipExec>${skipUnitTests}</skipExec> + </configuration> + </plugin> + </plugins> + </build> + + <properties> + <skipUnitTests>true</skipUnitTests> +  + <jgroups.bind_addr>127.0.0.1</jgroups.bind_addr> + </properties> + + <profiles> + <profile> + <id>test</id> + <activation> + <activeByDefault>false</activeByDefault> + </activation> + <properties> + <skipUnitTests>false</skipUnitTests> + </properties> + </profile> + </profiles> + + + <scm> + <connection>scm:svn:http://anonsvn.jboss.org/repos/hibernate/core/tags/hibernate-3.3....</connection> + <developerConnection>scm:svn:https://svn.jboss.org/repos/hibernate/core/tags/hibernate-3.3.0.C...</developerConnection> + <url>http://viewvc.jboss.org/cgi-bin/viewvc.cgi/hibernate/core/tags/hibernate-...</url> + </scm> +</project> \ No newline at end of file Deleted: core/tags/hibernate-3.3.0.CR1/cache-jbosscache2/src/test/java/org/hibernate/test/cache/jbc2/functional/util/DualNodeTransactionManagerLookup.java =================================================================== --- core/trunk/cache-jbosscache2/src/test/java/org/hibernate/test/cache/jbc2/functional/util/DualNodeTransactionManagerLookup.java 2008-03-18 07:26:18 UTC (rev 14456) +++ core/tags/hibernate-3.3.0.CR1/cache-jbosscache2/src/test/java/org/hibernate/test/cache/jbc2/functional/util/DualNodeTransactionManagerLookup.java 2008-03-18 14:24:00 UTC (rev 14467) @@ -1,51 +0,0 @@ -/* - * Hibernate, Relational Persistence for Idiomatic Java - * - * Copyright (c) 2007, Red Hat Middleware LLC or third-party contributors as - * indicated by the @author tags or express copyright attribution - * statements applied by the authors. All third-party contributions are - * distributed under license by Red Hat Middleware LLC. - * - * This copyrighted material is made available to anyone wishing to use, modify, - * copy, or redistribute it subject to the terms and conditions of the GNU - * Lesser General Public License, as published by the Free Software Foundation. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY - * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License - * for more details. - * - * You should have received a copy of the GNU Lesser General Public License - * along with this distribution; if not, write to: - * Free Software Foundation, Inc. - * 51 Franklin Street, Fifth Floor - * Boston, MA 02110-1301 USA - */ -package org.hibernate.test.cache.jbc2.functional.util; - -import java.util.Properties; -import javax.transaction.TransactionManager; - -import org.hibernate.transaction.TransactionManagerLookup; -import org.hibernate.HibernateException; - -/** - * SimpleJtaTransactionManagerLookupImpl subclass that finds a different - * DualNodeTransactionManager based on the value of property - * {@link DualNodeTestUtil#NODE_ID_PROP}. - * - * @author Brian Stansberry - */ -public class DualNodeTransactionManagerLookup implements TransactionManagerLookup { - - public TransactionManager getTransactionManager(Properties props) throws HibernateException { - String nodeId = props.getProperty(DualNodeTestUtil.NODE_ID_PROP); - if (nodeId == null) - throw new HibernateException(DualNodeTestUtil.NODE_ID_PROP + " not configured"); - return DualNodeJtaTransactionManagerImpl.getInstance(nodeId); - } - - public String getUserTransactionName() { - throw new UnsupportedOperationException( "jndi currently not implemented for these tests" ); - } -} Copied: core/tags/hibernate-3.3.0.CR1/cache-jbosscache2/src/test/java/org/hibernate/test/cache/jbc2/functional/util/DualNodeTransactionManagerLookup.java (from rev 14459, core/trunk/cache-jbosscache2/src/test/java/org/hibernate/test/cache/jbc2/functional/util/DualNodeTransactionManagerLookup.java) =================================================================== --- core/tags/hibernate-3.3.0.CR1/cache-jbosscache2/src/test/java/org/hibernate/test/cache/jbc2/functional/util/DualNodeTransactionManagerLookup.java (rev 0) +++ core/tags/hibernate-3.3.0.CR1/cache-jbosscache2/src/test/java/org/hibernate/test/cache/jbc2/functional/util/DualNodeTransactionManagerLookup.java 2008-03-18 14:24:00 UTC (rev 14467) @@ -0,0 +1,56 @@ +/* + * Hibernate, Relational Persistence for Idiomatic Java + * + * Copyright (c) 2007, Red Hat Middleware LLC or third-party contributors as + * indicated by the @author tags or express copyright attribution + * statements applied by the authors. All third-party contributions are + * distributed under license by Red Hat Middleware LLC. + * + * This copyrighted material is made available to anyone wishing to use, modify, + * copy, or redistribute it subject to the terms and conditions of the GNU + * Lesser General Public License, as published by the Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY + * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License + * for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with this distribution; if not, write to: + * Free Software Foundation, Inc. + * 51 Franklin Street, Fifth Floor + * Boston, MA 02110-1301 USA + */ +package org.hibernate.test.cache.jbc2.functional.util; + +import java.util.Properties; +import javax.transaction.TransactionManager; +import javax.transaction.Transaction; + +import org.hibernate.transaction.TransactionManagerLookup; +import org.hibernate.HibernateException; + +/** + * SimpleJtaTransactionManagerLookupImpl subclass that finds a different + * DualNodeTransactionManager based on the value of property + * {@link DualNodeTestUtil#NODE_ID_PROP}. + * + * @author Brian Stansberry + */ +public class DualNodeTransactionManagerLookup implements TransactionManagerLookup { + + public TransactionManager getTransactionManager(Properties props) throws HibernateException { + String nodeId = props.getProperty(DualNodeTestUtil.NODE_ID_PROP); + if (nodeId == null) + throw new HibernateException(DualNodeTestUtil.NODE_ID_PROP + " not configured"); + return DualNodeJtaTransactionManagerImpl.getInstance(nodeId); + } + + public String getUserTransactionName() { + throw new UnsupportedOperationException( "jndi currently not implemented for these tests" ); + } + + public Object getTransactionIdentifier(Transaction transaction) { + return transaction; + } +} Deleted: core/tags/hibernate-3.3.0.CR1/cache-jbosscache2/src/test/java/org/hibernate/test/tm/jbc2/BatchModeTransactionManagerLookup.java =================================================================== --- core/trunk/cache-jbosscache2/src/test/java/org/hibernate/test/tm/jbc2/BatchModeTransactionManagerLookup.java 2008-03-18 07:26:18 UTC (rev 14456) +++ core/tags/hibernate-3.3.0.CR1/cache-jbosscache2/src/test/java/org/hibernate/test/tm/jbc2/BatchModeTransactionManagerLookup.java 2008-03-18 14:24:00 UTC (rev 14467) @@ -1,56 +0,0 @@ -/* - * Hibernate, Relational Persistence for Idiomatic Java - * - * Copyright (c) 2007, Red Hat Middleware LLC or third-party contributors as - * indicated by the @author tags or express copyright attribution - * statements applied by the authors. All third-party contributions are - * distributed under license by Red Hat Middleware LLC. - * - * This copyrighted material is made available to anyone wishing to use, modify, - * copy, or redistribute it subject to the terms and conditions of the GNU - * Lesser General Public License, as published by the Free Software Foundation. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY - * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License - * for more details. - * - * You should have received a copy of the GNU Lesser General Public License - * along with this distribution; if not, write to: - * Free Software Foundation, Inc. - * 51 Franklin Street, Fifth Floor - * Boston, MA 02110-1301 USA - */ -package org.hibernate.test.tm.jbc2; - -import java.util.Properties; - -import javax.transaction.TransactionManager; - -import org.hibernate.HibernateException; -import org.hibernate.transaction.TransactionManagerLookup; -import org.jboss.cache.transaction.BatchModeTransactionManager; - -/** - * Uses the JBoss Cache BatchModeTransactionManager. Should not be used in - * any tests that simulate usage of database connections. - * - * @author Brian Stansberry - */ -public class BatchModeTransactionManagerLookup - implements TransactionManagerLookup { - - public TransactionManager getTransactionManager(Properties props) throws HibernateException { - try { - return BatchModeTransactionManager.getInstance(); - } - catch (Exception e) { - throw new HibernateException("Failed getting BatchModeTransactionManager", e); - } - } - - public String getUserTransactionName() { - throw new UnsupportedOperationException(); - } - -} Copied: core/tags/hibernate-3.3.0.CR1/cache-jbosscache2/src/test/java/org/hibernate/test/tm/jbc2/BatchModeTransactionManagerLookup.java (from rev 14459, core/trunk/cache-jbosscache2/src/test/java/org/hibernate/test/tm/jbc2/BatchModeTransactionManagerLookup.java) =================================================================== --- core/tags/hibernate-3.3.0.CR1/cache-jbosscache2/src/test/java/org/hibernate/test/tm/jbc2/BatchModeTransactionManagerLookup.java (rev 0) +++ core/tags/hibernate-3.3.0.CR1/cache-jbosscache2/src/test/java/org/hibernate/test/tm/jbc2/BatchModeTransactionManagerLookup.java 2008-03-18 14:24:00 UTC (rev 14467) @@ -0,0 +1,61 @@ +/* + * Hibernate, Relational Persistence for Idiomatic Java + * + * Copyright (c) 2007, Red Hat Middleware LLC or third-party contributors as + * indicated by the @author tags or express copyright attribution + * statements applied by the authors. All third-party contributions are + * distributed under license by Red Hat Middleware LLC. + * + * This copyrighted material is made available to anyone wishing to use, modify, + * copy, or redistribute it subject to the terms and conditions of the GNU + * Lesser General Public License, as published by the Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY + * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License + * for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with this distribution; if not, write to: + * Free Software Foundation, Inc. + * 51 Franklin Street, Fifth Floor + * Boston, MA 02110-1301 USA + */ +package org.hibernate.test.tm.jbc2; + +import java.util.Properties; + +import javax.transaction.TransactionManager; +import javax.transaction.Transaction; + +import org.hibernate.HibernateException; +import org.hibernate.transaction.TransactionManagerLookup; +import org.jboss.cache.transaction.BatchModeTransactionManager; + +/** + * Uses the JBoss Cache BatchModeTransactionManager. Should not be used in + * any tests that simulate usage of database connections. + * + * @author Brian Stansberry + */ +public class BatchModeTransactionManagerLookup + implements TransactionManagerLookup { + + public TransactionManager getTransactionManager(Properties props) throws HibernateException { + try { + return BatchModeTransactionManager.getInstance(); + } + catch (Exception e) { + throw new HibernateException("Failed getting BatchModeTransactionManager", e); + } + } + + public String getUserTransactionName() { + throw new UnsupportedOperationException(); + } + + public Object getTransactionIdentifier(Transaction transaction) { + return transaction; + } + +} Deleted: core/tags/hibernate-3.3.0.CR1/cache-oscache/pom.xml =================================================================== --- core/trunk/cache-oscache/pom.xml 2008-03-18 07:26:18 UTC (rev 14456) +++ core/tags/hibernate-3.3.0.CR1/cache-oscache/pom.xml 2008-03-18 14:24:00 UTC (rev 14467) @@ -1,34 +0,0 @@ -<project xmlns="http://maven.apache.org/POM/4.0.0" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - - <modelVersion>4.0.0</modelVersion> - - <parent> - <groupId>org.hibernate</groupId> - <artifactId>hibernate-core-parent</artifactId> - <version>1</version> - </parent> - - <groupId>org.hibernate</groupId> - <artifactId>hibernate-oscache</artifactId> - <version>3.3.0-SNAPSHOT</version> - <packaging>jar</packaging> - - <name>Hibernate OSCache Integration</name> - <description>Integration of Hibernate with OSCache</description> - - <dependencies> - <dependency> - <groupId>${groupId}</groupId> - <artifactId>hibernate-core</artifactId> - <version>${version}</version> - </dependency> - <dependency> - <groupId>opensymphony</groupId> - <artifactId>oscache</artifactId> - <version>2.1</version> - </dependency> - </dependencies> - -</project> Copied: core/tags/hibernate-3.3.0.CR1/cache-oscache/pom.xml (from rev 14466, core/trunk/cache-oscache/pom.xml) =================================================================== --- core/tags/hibernate-3.3.0.CR1/cache-oscache/pom.xml (rev 0) +++ core/tags/hibernate-3.3.0.CR1/cache-oscache/pom.xml 2008-03-18 14:24:00 UTC (rev 14467) @@ -0,0 +1,38 @@ +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> + + <modelVersion>4.0.0</modelVersion> + + <parent> + <groupId>org.hibernate</groupId> + <artifactId>hibernate-core-parent</artifactId> + <version>2</version> + </parent> + + <groupId>org.hibernate</groupId> + <artifactId>hibernate-oscache</artifactId> + <version>3.3.0.CR1</version> + <packaging>jar</packaging> + + <name>Hibernate OSCache Integration</name> + <description>Integration of Hibernate with OSCache</description> + + <dependencies> + <dependency> + <groupId>${groupId}</groupId> + <artifactId>hibernate-core</artifactId> + <version>${version}</version> + </dependency> + <dependency> + <groupId>opensymphony</groupId> + <artifactId>oscache</artifactId> + <version>2.1</version> + </dependency> + </dependencies> + + + <scm> + <connection>scm:svn:http://anonsvn.jboss.org/repos/hibernate/core/tags/hibernate-3.3....</connection> + <developerConnection>scm:svn:https://svn.jboss.org/repos/hibernate/core/tags/hibernate-3.3.0.C...</developerConnection> + <url>http://viewvc.jboss.org/cgi-bin/viewvc.cgi/hibernate/core/tags/hibernate-...</url> + </scm> +</project> \ No newline at end of file Deleted: core/tags/hibernate-3.3.0.CR1/cache-swarmcache/pom.xml =================================================================== --- core/trunk/cache-swarmcache/pom.xml 2008-03-18 07:26:18 UTC (rev 14456) +++ core/tags/hibernate-3.3.0.CR1/cache-swarmcache/pom.xml 2008-03-18 14:24:00 UTC (rev 14467) @@ -1,34 +0,0 @@ -<project xmlns="http://maven.apache.org/POM/4.0.0" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - - <modelVersion>4.0.0</modelVersion> - - <parent> - <groupId>org.hibernate</groupId> - <artifactId>hibernate-core-parent</artifactId> - <version>1</version> - </parent> - - <groupId>org.hibernate</groupId> - <artifactId>hibernate-swarmcache</artifactId> - <version>3.3.0-SNAPSHOT</version> - <packaging>jar</packaging> - - <name>Hibernate SwarmCache Integration</name> - <description>Integration of Hibernate with SwarmCache</description> - - <dependencies> - <dependency> - <groupId>${groupId}</groupId> - <artifactId>hibernate-core</artifactId> - <version>${version}</version> - </dependency> - <dependency> - <groupId>swarmcache</groupId> - <artifactId>swarmcache</artifactId> - <version>1.0RC2</version> - </dependency> - </dependencies> - -</project> Copied: core/tags/hibernate-3.3.0.CR1/cache-swarmcache/pom.xml (from rev 14466, core/trunk/cache-swarmcache/pom.xml) =================================================================== --- core/tags/hibernate-3.3.0.CR1/cache-swarmcache/pom.xml (rev 0) +++ core/tags/hibernate-3.3.0.CR1/cache-swarmcache/pom.xml 2008-03-18 14:24:00 UTC (rev 14467) @@ -0,0 +1,38 @@ +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> + + <modelVersion>4.0.0</modelVersion> + + <parent> + <groupId>org.hibernate</groupId> + <artifactId>hibernate-core-parent</artifactId> + <version>2</version> + </parent> + + <groupId>org.hibernate</groupId> + <artifactId>hibernate-swarmcache</artifactId> + <version>3.3.0.CR1</version> + <packaging>jar</packaging> + + <name>Hibernate SwarmCache Integration</name> + <description>Integration of Hibernate with SwarmCache</description> + + <dependencies> + <dependency> + <groupId>${groupId}</groupId> + <artifactId>hibernate-core</artifactId> + <version>${version}</version> + </dependency> + <dependency> + <groupId>swarmcache</groupId> + <artifactId>swarmcache</artifactId> + <version>1.0RC2</version> + </dependency> + </dependencies> + + + <scm> + <connection>scm:svn:http://anonsvn.jboss.org/repos/hibernate/core/tags/hibernate-3.3....</connection> + <developerConnection>scm:svn:https://svn.jboss.org/repos/hibernate/core/tags/hibernate-3.3.0.C...</developerConnection> + <url>http://viewvc.jboss.org/cgi-bin/viewvc.cgi/hibernate/core/tags/hibernate-...</url> + </scm> +</project> \ No newline at end of file Deleted: core/tags/hibernate-3.3.0.CR1/connection-c3p0/pom.xml =================================================================== --- core/trunk/connection-c3p0/pom.xml 2008-03-18 07:26:18 UTC (rev 14456) +++ core/tags/hibernate-3.3.0.CR1/connection-c3p0/pom.xml 2008-03-18 14:24:00 UTC (rev 14467) @@ -1,34 +0,0 @@ -<project xmlns="http://maven.apache.org/POM/4.0.0" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - - <modelVersion>4.0.0</modelVersion> - - <parent> - <groupId>org.hibernate</groupId> - <artifactId>hibernate-core-parent</artifactId> - <version>1</version> - </parent> - - <groupId>org.hibernate</groupId> - <artifactId>hibernate-c3p0</artifactId> - <version>3.3.0-SNAPSHOT</version> - <packaging>jar</packaging> - - <name>Hibernate C3P0 ConnectionProvider</name> - <description>C3P0-based implementation of the Hibernate ConnectionProvder contract</description> - - <dependencies> - <dependency> - <groupId>${groupId}</groupId> - <artifactId>hibernate-core</artifactId> - <version>${version}</version> - </dependency> - <dependency> - <groupId>c3p0</groupId> - <artifactId>c3p0</artifactId> - <version>0.9.1</version> - </dependency> - </dependencies> - -</project> Copied: core/tags/hibernate-3.3.0.CR1/connection-c3p0/pom.xml (from rev 14466, core/trunk/connection-c3p0/pom.xml) =================================================================== --- core/tags/hibernate-3.3.0.CR1/connection-c3p0/pom.xml (rev 0) +++ core/tags/hibernate-3.3.0.CR1/connection-c3p0/pom.xml 2008-03-18 14:24:00 UTC (rev 14467) @@ -0,0 +1,38 @@ +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> + + <modelVersion>4.0.0</modelVersion> + + <parent> + <groupId>org.hibernate</groupId> + <artifactId>hibernate-core-parent</artifactId> + <version>2</version> + </parent> + + <groupId>org.hibernate</groupId> + <artifactId>hibernate-c3p0</artifactId> + <version>3.3.0.CR1</version> + <packaging>jar</packaging> + + <name>Hibernate C3P0 ConnectionProvider</name> + <description>C3P0-based implementation of the Hibernate ConnectionProvder contract</description> + + <dependencies> + <dependency> + <groupId>${groupId}</groupId> + <artifactId>hibernate-core</artifactId> + <version>${version}</version> + </dependency> + <dependency> + <groupId>c3p0</groupId> + <artifactId>c3p0</artifactId> + <version>0.9.1</version> + </dependency> + </dependencies> + + + <scm> + <connection>scm:svn:http://anonsvn.jboss.org/repos/hibernate/core/tags/hibernate-3.3....</connection> + <developerConnection>scm:svn:https://svn.jboss.org/repos/hibernate/core/tags/hibernate-3.3.0.C...</developerConnection> + <url>http://viewvc.jboss.org/cgi-bin/viewvc.cgi/hibernate/core/tags/hibernate-...</url> + </scm> +</project> \ No newline at end of file Deleted: core/tags/hibernate-3.3.0.CR1/connection-proxool/pom.xml =================================================================== --- core/trunk/connection-proxool/pom.xml 2008-03-18 07:26:18 UTC (rev 14456) +++ core/tags/hibernate-3.3.0.CR1/connection-proxool/pom.xml 2008-03-18 14:24:00 UTC (rev 14467) @@ -1,34 +0,0 @@ -<project xmlns="http://maven.apache.org/POM/4.0.0" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - - <modelVersion>4.0.0</modelVersion> - - <parent> - <groupId>org.hibernate</groupId> - <artifactId>hibernate-core-parent</artifactId> - <version>1</version> - </parent> - - <groupId>org.hibernate</groupId> - <artifactId>hibernate-proxool</artifactId> - <version>3.3.0-SNAPSHOT</version> - <packaging>jar</packaging> - - <name>Hibernate Proxool ConnectionProvider</name> - <description>Proxool-based implementation of the Hibernate ConnectionProvder contract</description> - - <dependencies> - <dependency> - <groupId>${groupId}</groupId> - <artifactId>hibernate-core</artifactId> - <version>${version}</version> - </dependency> - <dependency> - <groupId>proxool</groupId> - <artifactId>proxool</artifactId> - <version>0.8.3</version> - </dependency> - </dependencies> - -</project> Copied: core/tags/hibernate-3.3.0.CR1/connection-proxool/pom.xml (from rev 14466, core/trunk/connection-proxool/pom.xml) =================================================================== --- core/tags/hibernate-3.3.0.CR1/connection-proxool/pom.xml (rev 0) +++ core/tags/hibernate-3.3.0.CR1/connection-proxool/pom.xml 2008-03-18 14:24:00 UTC (rev 14467) @@ -0,0 +1,38 @@ +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> + + <modelVersion>4.0.0</modelVersion> + + <parent> + <groupId>org.hibernate</groupId> + <artifactId>hibernate-core-parent</artifactId> + <version>2</version> + </parent> + + <groupId>org.hibernate</groupId> + <artifactId>hibernate-proxool</artifactId> + <version>3.3.0.CR1</version> + <packaging>jar</packaging> + + <name>Hibernate Proxool ConnectionProvider</name> + <description>Proxool-based implementation of the Hibernate ConnectionProvder contract</description> + + <dependencies> + <dependency> + <groupId>${groupId}</groupId> + <artifactId>hibernate-core</artifactId> + <version>${version}</version> + </dependency> + <dependency> + <groupId>proxool</groupId> + <artifactId>proxool</artifactId> + <version>0.8.3</version> + </dependency> + </dependencies> + + + <scm> + <connection>scm:svn:http://anonsvn.jboss.org/repos/hibernate/core/tags/hibernate-3.3....</connection> + <developerConnection>scm:svn:https://svn.jboss.org/repos/hibernate/core/tags/hibernate-3.3.0.C...</developerConnection> + <url>http://viewvc.jboss.org/cgi-bin/viewvc.cgi/hibernate/core/tags/hibernate-...</url> + </scm> +</project> \ No newline at end of file Deleted: core/tags/hibernate-3.3.0.CR1/core/pom.xml =================================================================== --- core/trunk/core/pom.xml 2008-03-18 07:26:18 UTC (rev 14456) +++ core/tags/hibernate-3.3.0.CR1/core/pom.xml 2008-03-18 14:24:00 UTC (rev 14467) @@ -1,147 +0,0 @@ -<project xmlns="http://maven.apache.org/POM/4.0.0" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - - <modelVersion>4.0.0</modelVersion> - - <parent> - <groupId>org.hibernate</groupId> - <artifactId>hibernate-core-parent</artifactId> - <version>1</version> - </parent> - - <groupId>org.hibernate</groupId> - <artifactId>hibernate-core</artifactId> - <version>3.3.0-SNAPSHOT</version> - <packaging>jar</packaging> - - <name>Hibernate Core</name> - <description>The core functionality of Hibernate</description> - - <dependencies> - <dependency> - <groupId>antlr</groupId> - <artifactId>antlr</artifactId> - </dependency> - <dependency> - <groupId>commons-collections</groupId> - <artifactId>commons-collections</artifactId> - </dependency> - <dependency> - <groupId>dom4j</groupId> - <artifactId>dom4j</artifactId> - </dependency> - - <dependency> -  - <groupId>javax.transaction</groupId> - <artifactId>jta</artifactId> - <version>1.1</version> - </dependency> - <dependency> - <groupId>javax.security</groupId> - <artifactId>jaas</artifactId> - <version>1.0.01</version> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>javax.security</groupId> - <artifactId>jacc</artifactId> - <version>1.0</version> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>ant</groupId> - <artifactId>ant</artifactId> - <version>1.6.5</version> - <scope>provided</scope> - </dependency> - -  - <dependency> - <groupId>javassist</groupId> - <artifactId>javassist</artifactId> - <version>3.4.GA</version> - <optional>true</optional> - </dependency> - <dependency> - <groupId>cglib</groupId> - <artifactId>cglib</artifactId> - <version>2.1_3</version> - <optional>true</optional> - </dependency> - <dependency> - <groupId>asm</groupId> - <artifactId>asm-attrs</artifactId> - <version>1.5.3</version> - <optional>true</optional> - </dependency> - </dependencies> - - <build> - <plugins> - <plugin> - <groupId>org.codehaus.mojo</groupId> - <artifactId>antlr-maven-plugin</artifactId> - <version>${antlrPluginVersion}</version> - <configuration> - <grammars>hql.g,hql-sql.g,sql-gen.g</grammars> - </configuration> - <executions> - <execution> - <goals> - <goal>generate</goal> - </goals> - </execution> - </executions> - </plugin> - </plugins> - </build> - - <reporting> - <plugins> - <plugin> - <groupId>org.codehaus.mojo</groupId> - <artifactId>antlr-maven-plugin</artifactId> - <version>${antlrPluginVersion}</version> - <configuration> -  - <grammars>hql.g</grammars> - </configuration> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-javadoc-plugin</artifactId> - <configuration> -  - <groups> - <group> - <title>Core API</title> - <packages>org.hibernate:org.hibernate.classic:org.hibernate.criterion:org.hibernate.metadata:org.hibernate.cfg:org.hibernate.usertype</packages> - </group> - <group> - <title>Extension API</title> - <packages>org.hibernate.id:org.hibernate.connection:org.hibernate.transaction:org.hibernate.type:org.hibernate.dialect*:org.hibernate.cache*:org.hibernate.event*:org.hibernate.action:org.hibernate.property:org.hibernate.loader*:org.hibernate.persister*:org.hibernate.proxy:org.hibernate.tuple:org.hibernate.transform:org.hibernate.collection:org.hibernate.jdbc</packages> - </group> - <group> - <title>Miscellaneous API</title> - <packages>org.hibernate.stat:org.hibernate.tool.hbm2ddl:org.hibernate.jmx:org.hibernate.mapping:org.hibernate.tool.instrument</packages> - </group> - <group> - <title>Internal Implementation</title> - <packages>org.hibernate.engine:org.hibernate.impl:org.hibernate.sql:org.hibernate.lob:org.hibernate.util:org.hibernate.exception:org.hibernate.hql:org.hibernate.hql.ast:org.hibernate.hql.antlr:org.hibernate.hql.classic:org.hibernate.intercept:org.hibernate.secure:org.hibernate.pretty</packages> - </group> - </groups> - </configuration> - </plugin> - </plugins> - </reporting> - - <properties> - <antlrPluginVersion>2.1</antlrPluginVersion> - </properties> - -</project> Copied: core/tags/hibernate-3.3.0.CR1/core/pom.xml (from rev 14466, core/trunk/core/pom.xml) =================================================================== --- core/tags/hibernate-3.3.0.CR1/core/pom.xml (rev 0) +++ core/tags/hibernate-3.3.0.CR1/core/pom.xml 2008-03-18 14:24:00 UTC (rev 14467) @@ -0,0 +1,151 @@ +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> + + <modelVersion>4.0.0</modelVersion> + + <parent> + <groupId>org.hibernate</groupId> + <artifactId>hibernate-core-parent</artifactId> + <version>2</version> + </parent> + + <groupId>org.hibernate</groupId> + <artifactId>hibernate-core</artifactId> + <version>3.3.0.CR1</version> + <packaging>jar</packaging> + + <name>Hibernate Core</name> + <description>The core functionality of Hibernate</description> + + <dependencies> + <dependency> + <groupId>antlr</groupId> + <artifactId>antlr</artifactId> + </dependency> + <dependency> + <groupId>commons-collections</groupId> + <artifactId>commons-collections</artifactId> + </dependency> + <dependency> + <groupId>dom4j</groupId> + <artifactId>dom4j</artifactId> + </dependency> + + <dependency> +  + <groupId>javax.transaction</groupId> + <artifactId>jta</artifactId> + <version>1.1</version> + </dependency> + <dependency> + <groupId>javax.security</groupId> + <artifactId>jaas</artifactId> + <version>1.0.01</version> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>javax.security</groupId> + <artifactId>jacc</artifactId> + <version>1.0</version> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>ant</groupId> + <artifactId>ant</artifactId> + <version>1.6.5</version> + <scope>provided</scope> + </dependency> + +  + <dependency> + <groupId>javassist</groupId> + <artifactId>javassist</artifactId> + <version>3.4.GA</version> + <optional>true</optional> + </dependency> + <dependency> + <groupId>cglib</groupId> + <artifactId>cglib</artifactId> + <version>2.1_3</version> + <optional>true</optional> + </dependency> + <dependency> + <groupId>asm</groupId> + <artifactId>asm-attrs</artifactId> + <version>1.5.3</version> + <optional>true</optional> + </dependency> + </dependencies> + + <build> + <plugins> + <plugin> + <groupId>org.codehaus.mojo</groupId> + <artifactId>antlr-maven-plugin</artifactId> + <version>${antlrPluginVersion}</version> + <configuration> + <grammars>hql.g,hql-sql.g,sql-gen.g</grammars> + </configuration> + <executions> + <execution> + <goals> + <goal>generate</goal> + </goals> + </execution> + </executions> + </plugin> + </plugins> + </build> + + <reporting> + <plugins> + <plugin> + <groupId>org.codehaus.mojo</groupId> + <artifactId>antlr-maven-plugin</artifactId> + <version>${antlrPluginVersion}</version> + <configuration> +  + <grammars>hql.g</grammars> + </configuration> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-javadoc-plugin</artifactId> + <configuration> +  + <groups> + <group> + <title>Core API</title> + <packages>org.hibernate:org.hibernate.classic:org.hibernate.criterion:org.hibernate.metadata:org.hibernate.cfg:org.hibernate.usertype</packages> + </group> + <group> + <title>Extension API</title> + <packages>org.hibernate.id:org.hibernate.connection:org.hibernate.transaction:org.hibernate.type:org.hibernate.dialect*:org.hibernate.cache*:org.hibernate.event*:org.hibernate.action:org.hibernate.property:org.hibernate.loader*:org.hibernate.persister*:org.hibernate.proxy:org.hibernate.tuple:org.hibernate.transform:org.hibernate.collection:org.hibernate.jdbc</packages> + </group> + <group> + <title>Miscellaneous API</title> + <packages>org.hibernate.stat:org.hibernate.tool.hbm2ddl:org.hibernate.jmx:org.hibernate.mapping:org.hibernate.tool.instrument</packages> + </group> + <group> + <title>Internal Implementation</title> + <packages>org.hibernate.engine:org.hibernate.impl:org.hibernate.sql:org.hibernate.lob:org.hibernate.util:org.hibernate.exception:org.hibernate.hql:org.hibernate.hql.ast:org.hibernate.hql.antlr:org.hibernate.hql.classic:org.hibernate.intercept:org.hibernate.secure:org.hibernate.pretty</packages> + </group> + </groups> + </configuration> + </plugin> + </plugins> + </reporting> + + <properties> + <antlrPluginVersion>2.1</antlrPluginVersion> + </properties> + + + <scm> + <connection>scm:svn:http://anonsvn.jboss.org/repos/hibernate/core/tags/hibernate-3.3....</connection> + <developerConnection>scm:svn:https://svn.jboss.org/repos/hibernate/core/tags/hibernate-3.3.0.C...</developerConnection> + <url>http://viewvc.jboss.org/cgi-bin/viewvc.cgi/hibernate/core/tags/hibernate-...</url> + </scm> +</project> \ No newline at end of file Deleted: core/tags/hibernate-3.3.0.CR1/documentation/jbosscache2/pom.xml =================================================================== --- core/trunk/documentation/jbosscache2/pom.xml 2008-03-18 07:26:18 UTC (rev 14456) +++ core/tags/hibernate-3.3.0.CR1/documentation/jbosscache2/pom.xml 2008-03-18 14:24:00 UTC (rev 14467) @@ -1,86 +0,0 @@ -<project xmlns="http://maven.apache.org/POM/4.0.0" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - - <modelVersion>4.0.0</modelVersion> - - <parent> - <groupId>org.hibernate</groupId> - <artifactId>hibernate-core-parent</artifactId> - <version>1</version> - </parent> - - <groupId>org.hibernate</groupId> - <artifactId>hibernate-jbc2-manual</artifactId> - <version>3.3.0-SNAPSHOT</version> - <packaging>jdocbook</packaging> - - <name>Hibernate/JBoss Cache 2 Reference Manual</name> - <description>The Hibernate / JBoss Cache 2 integration reference manual</description> - - <build> - <plugins> - <plugin> - <groupId>org.jboss.maven.plugins</groupId> - <artifactId>maven-jdocbook-plugin</artifactId> - <version>2.1.0-SNAPSHOT</version> - <extensions>true</extensions> - <dependencies> - <dependency> - <groupId>org.hibernate</groupId> - <artifactId>hibernate-jdocbook-style</artifactId> - <version>1.0.1-SNAPSHOT</version> - <type>jdocbook-style</type> - </dependency> - </dependencies> - <configuration> - <sourceDocumentName>Hibernate_JBC2_Reference.xml</sourceDocumentName> - <masterTranslation>en-US</masterTranslation> - <translations> - <translation>es-ES</translation> - <translation>fr-FR</translation> - <translation>ja-JP</translation> - <translation>ko-KR</translation> - <translation>pt-BR</translation> - <translation>zh-CN</translation> - </translations> - <imageResource> - <directory>src/main/docbook/en-US</directory> - <excludes> - <exclude>*.xml</exclude> - <exclude>**/*.xml</exclude> - <exclude>*.zargo</exclude> - <exclude>**/*.zargo</exclude> - </excludes> - </imageResource> - <formats> - <format> - <formatName>pdf</formatName> - <stylesheetResource>classpath:/xslt/hibernate/pdf/main-pdf.xsl</stylesheetResource> - <finalName>hibernate_reference.pdf</finalName> - <profilingTypeName>two_pass</profilingTypeName> - </format> - <format> - <formatName>html_single</formatName> - <stylesheetResource>classpath:/xslt/hibernate/html/main-single.xsl</stylesheetResource> - <finalName>index.html</finalName> - <profilingTypeName>two_pass</profilingTypeName> - </format> - <format> - <formatName>html</formatName> - <stylesheetResource>classpath:/xslt/hibernate/html/main-chunk.xsl</stylesheetResource> - <finalName>index.html</finalName> - <profilingTypeName>two_pass</profilingTypeName> - </format> - </formats> - <options> - <xincludeSupported>true</xincludeSupported> - <localeSeparator>-</localeSeparator> - <useRelativeImageUris>true</useRelativeImageUris> - </options> - </configuration> - </plugin> - </plugins> - </build> - -</project> Copied: core/tags/hibernate-3.3.0.CR1/documentation/jbosscache2/pom.xml (from rev 14457, core/trunk/documentation/jbosscache2/pom.xml) =================================================================== --- core/tags/hibernate-3.3.0.CR1/documentation/jbosscache2/pom.xml (rev 0) +++ core/tags/hibernate-3.3.0.CR1/documentation/jbosscache2/pom.xml 2008-03-18 14:24:00 UTC (rev 14467) @@ -0,0 +1,86 @@ +<project xmlns="http://maven.apache.org/POM/4.0.0" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> + + <modelVersion>4.0.0</modelVersion> + + <parent> + <groupId>org.hibernate</groupId> + <artifactId>hibernate-core-parent</artifactId> + <version>2</version> + </parent> + + <groupId>org.hibernate</groupId> + <artifactId>hibernate-jbc2-manual</artifactId> + <version>3.3.0-SNAPSHOT</version> + <packaging>jdocbook</packaging> + + <name>Hibernate/JBoss Cache 2 Reference Manual</name> + <description>The Hibernate / JBoss Cache 2 integration reference manual</description> + + <build> + <plugins> + <plugin> + <groupId>org.jboss.maven.plugins</groupId> + <artifactId>maven-jdocbook-plugin</artifactId> + <version>2.1.0-SNAPSHOT</version> + <extensions>true</extensions> + <dependencies> + <dependency> + <groupId>org.hibernate</groupId> + <artifactId>hibernate-jdocbook-style</artifactId> + <version>1.0.1-SNAPSHOT</version> + <type>jdocbook-style</type> + </dependency> + </dependencies> + <configuration> + <sourceDocumentName>Hibernate_JBC2_Reference.xml</sourceDocumentName> + <masterTranslation>en-US</masterTranslation> + <translations> + <translation>es-ES</translation> + <translation>fr-FR</translation> + <translation>ja-JP</translation> + <translation>ko-KR</translation> + <translation>pt-BR</translation> + <translation>zh-CN</translation> + </translations> + <imageResource> + <directory>src/main/docbook/en-US</directory> + <excludes> + <exclude>*.xml</exclude> + <exclude>**/*.xml</exclude> + <exclude>*.zargo</exclude> + <exclude>**/*.zargo</exclude> + </excludes> + </imageResource> + <formats> + <format> + <formatName>pdf</formatName> + <stylesheetResource>classpath:/xslt/hibernate/pdf/main-pdf.xsl</stylesheetResource> + <finalName>hibernate_reference.pdf</finalName> + <profilingTypeName>two_pass</profilingTypeName> + </format> + <format> + <formatName>html_single</formatName> + <stylesheetResource>classpath:/xslt/hibernate/html/main-single.xsl</stylesheetResource> + <finalName>index.html</finalName> + <profilingTypeName>two_pass</profilingTypeName> + </format> + <format> + <formatName>html</formatName> + <stylesheetResource>classpath:/xslt/hibernate/html/main-chunk.xsl</stylesheetResource> + <finalName>index.html</finalName> + <profilingTypeName>two_pass</profilingTypeName> + </format> + </formats> + <options> + <xincludeSupported>true</xincludeSupported> + <localeSeparator>-</localeSeparator> + <useRelativeImageUris>true</useRelativeImageUris> + </options> + </configuration> + </plugin> + </plugins> + </build> + +</project> Deleted: core/tags/hibernate-3.3.0.CR1/documentation/manual/pom.xml =================================================================== --- core/trunk/documentation/manual/pom.xml 2008-03-18 07:26:18 UTC (rev 14456) +++ core/tags/hibernate-3.3.0.CR1/documentation/manual/pom.xml 2008-03-18 14:24:00 UTC (rev 14467) @@ -1,99 +0,0 @@ -<project xmlns="http://maven.apache.org/POM/4.0.0" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - - <modelVersion>4.0.0</modelVersion> - - <parent> - <groupId>org.hibernate</groupId> - <artifactId>hibernate-core-parent</artifactId> - <version>1</version> - </parent> - - <groupId>org.hibernate</groupId> - <artifactId>hibernate-manual</artifactId> - <version>3.3.0-SNAPSHOT</version> - <packaging>jdocbook</packaging> - - <name>Hibernate Manual</name> - <description>The Hibernate reference manual</description> - - <build> - <plugins> - <plugin> - <groupId>org.jboss.maven.plugins</groupId> - <artifactId>maven-jdocbook-plugin</artifactId> - <version>2.1.0-SNAPSHOT</version> - <extensions>true</extensions> - <executions> - <execution> -  - <phase>process-resources</phase> - <goals> - <goal>translate</goal> - </goals> - </execution> - </executions> - <dependencies> - <dependency> - <groupId>org.hibernate</groupId> - <artifactId>hibernate-jdocbook-style</artifactId> - <version>1.0.1-SNAPSHOT</version> - <type>jdocbook-style</type> - </dependency> - </dependencies> - <configuration> - <sourceDocumentName>Hibernate_Reference.xml</sourceDocumentName> - <masterTranslation>en-US</masterTranslation> - <translations> - <translation>es-ES</translation> - <translation>fr-FR</translation> - <translation>ja-JP</translation> - <translation>ko-KR</translation> - <translation>pt-BR</translation> - <translation>zh-CN</translation> - </translations> - <imageResource> - <directory>${basedir}/src/main/docbook/en-US</directory> - <excludes> - <exclude>*.xml</exclude> - <exclude>**/*.xml</exclude> - <exclude>*.zargo</exclude> - <exclude>**/*.zargo</exclude> - </excludes> - </imageResource> - <formats> - <format> - <formatName>pdf</formatName> - <stylesheetResource>classpath:/xslt/hibernate/pdf/main-pdf.xsl</stylesheetResource> - <finalName>hibernate_reference.pdf</finalName> - <profilingTypeName>two_pass</profilingTypeName> - </format> - <format> - <formatName>html_single</formatName> - <stylesheetResource>classpath:/xslt/hibernate/html/main-single.xsl</stylesheetResource> - <finalName>index.html</finalName> - <profilingTypeName>two_pass</profilingTypeName> - </format> - <format> - <formatName>html</formatName> - <stylesheetResource>classpath:/xslt/hibernate/html/main-chunk.xsl</stylesheetResource> - <finalName>index.html</finalName> - <profilingTypeName>two_pass</profilingTypeName> - </format> - </formats> - <options> - <xincludeSupported>true</xincludeSupported> - <localeSeparator>-</localeSeparator> - <useRelativeImageUris>true</useRelativeImageUris> - </options> - </configuration> - </plugin> - </plugins> - </build> - -</project> Copied: core/tags/hibernate-3.3.0.CR1/documentation/manual/pom.xml (from rev 14457, core/trunk/documentation/manual/pom.xml) =================================================================== --- core/tags/hibernate-3.3.0.CR1/documentation/manual/pom.xml (rev 0) +++ core/tags/hibernate-3.3.0.CR1/documentation/manual/pom.xml 2008-03-18 14:24:00 UTC (rev 14467) @@ -0,0 +1,99 @@ +<project xmlns="http://maven.apache.org/POM/4.0.0" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> + + <modelVersion>4.0.0</modelVersion> + + <parent> + <groupId>org.hibernate</groupId> + <artifactId>hibernate-core-parent</artifactId> + <version>2</version> + </parent> + + <groupId>org.hibernate</groupId> + <artifactId>hibernate-manual</artifactId> + <version>3.3.0-SNAPSHOT</version> + <packaging>jdocbook</packaging> + + <name>Hibernate Manual</name> + <description>The Hibernate reference manual</description> + + <build> + <plugins> + <plugin> + <groupId>org.jboss.maven.plugins</groupId> + <artifactId>maven-jdocbook-plugin</artifactId> + <version>2.1.0-SNAPSHOT</version> + <extensions>true</extensions> + <executions> + <execution> +  + <phase>process-resources</phase> + <goals> + <goal>translate</goal> + </goals> + </execution> + </executions> + <dependencies> + <dependency> + <groupId>org.hibernate</groupId> + <artifactId>hibernate-jdocbook-style</artifactId> + <version>1.0.1-SNAPSHOT</version> + <type>jdocbook-style</type> + </dependency> + </dependencies> + <configuration> + <sourceDocumentName>Hibernate_Reference.xml</sourceDocumentName> + <masterTranslation>en-US</masterTranslation> + <translations> + <translation>es-ES</translation> + <translation>fr-FR</translation> + <translation>ja-JP</translation> + <translation>ko-KR</translation> + <translation>pt-BR</translation> + <translation>zh-CN</translation> + </translations> + <imageResource> + <directory>${basedir}/src/main/docbook/en-US</directory> + <excludes> + <exclude>*.xml</exclude> + <exclude>**/*.xml</exclude> + <exclude>*.zargo</exclude> + <exclude>**/*.zargo</exclude> + </excludes> + </imageResource> + <formats> + <format> + <formatName>pdf</formatName> + <stylesheetResource>classpath:/xslt/hibernate/pdf/main-pdf.xsl</stylesheetResource> + <finalName>hibernate_reference.pdf</finalName> + <profilingTypeName>two_pass</profilingTypeName> + </format> + <format> + <formatName>html_single</formatName> + <stylesheetResource>classpath:/xslt/hibernate/html/main-single.xsl</stylesheetResource> + <finalName>index.html</finalName> + <profilingTypeName>two_pass</profilingTypeName> + </format> + <format> + <formatName>html</formatName> + <stylesheetResource>classpath:/xslt/hibernate/html/main-chunk.xsl</stylesheetResource> + <finalName>index.html</finalName> + <profilingTypeName>two_pass</profilingTypeName> + </format> + </formats> + <options> + <xincludeSupported>true</xincludeSupported> + <localeSeparator>-</localeSeparator> + <useRelativeImageUris>true</useRelativeImageUris> + </options> + </configuration> + </plugin> + </plugins> + </build> + +</project> Deleted: core/tags/hibernate-3.3.0.CR1/documentation/pom.xml =================================================================== --- core/trunk/documentation/pom.xml 2008-03-18 07:26:18 UTC (rev 14456) +++ core/tags/hibernate-3.3.0.CR1/documentation/pom.xml 2008-03-18 14:24:00 UTC (rev 14467) @@ -1,26 +0,0 @@ -<project xmlns="http://maven.apache.org/POM/4.0.0" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - - <modelVersion>4.0.0</modelVersion> - - <parent> - <groupId>org.hibernate</groupId> - <artifactId>hibernate-core-parent</artifactId> - <version>1</version> - </parent> - - <groupId>org.hibernate</groupId> - <artifactId>hibernate-documentation</artifactId> - <version>3.3.0-SNAPSHOT</version> - <packaging>pom</packaging> - - <name>Hibernate Core - Documentation</name> - <description>Grouping of Hibernate Core Project documentation modules</description> - - <modules> - <module>manual</module> - <module>tutorial</module> - </modules> - -</project> Copied: core/tags/hibernate-3.3.0.CR1/documentation/pom.xml (from rev 14457, core/trunk/documentation/pom.xml) =================================================================== --- core/tags/hibernate-3.3.0.CR1/documentation/pom.xml (rev 0) +++ core/tags/hibernate-3.3.0.CR1/documentation/pom.xml 2008-03-18 14:24:00 UTC (rev 14467) @@ -0,0 +1,26 @@ +<project xmlns="http://maven.apache.org/POM/4.0.0" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> + + <modelVersion>4.0.0</modelVersion> + + <parent> + <groupId>org.hibernate</groupId> + <artifactId>hibernate-core-parent</artifactId> + <version>2</version> + </parent> + + <groupId>org.hibernate</groupId> + <artifactId>hibernate-documentation</artifactId> + <version>3.3.0-SNAPSHOT</version> + <packaging>pom</packaging> + + <name>Hibernate Core - Documentation</name> + <description>Grouping of Hibernate Core Project documentation modules</description> + + <modules> + <module>manual</module> + <module>tutorial</module> + </modules> + +</project> Deleted: core/tags/hibernate-3.3.0.CR1/documentation/tutorial/pom.xml =================================================================== --- core/trunk/documentation/tutorial/pom.xml 2008-03-18 07:26:18 UTC (rev 14456) +++ core/tags/hibernate-3.3.0.CR1/documentation/tutorial/pom.xml 2008-03-18 14:24:00 UTC (rev 14467) @@ -1,34 +0,0 @@ -<project xmlns="http://maven.apache.org/POM/4.0.0" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - - <modelVersion>4.0.0</modelVersion> - - <parent> - <groupId>org.hibernate</groupId> - <artifactId>hibernate-core-parent</artifactId> - <version>1</version> - </parent> - - <groupId>org.hibernate</groupId> - <artifactId>hibernate-tutorial</artifactId> - <version>3.3.0-SNAPSHOT</version> - <packaging>war</packaging> - - <name>Hibernate Tutorial</name> - <description>A tutorial project showcasing Hibernate usage</description> - - <dependencies> - <dependency> - <groupId>org.hibernate</groupId> - <artifactId>hibernate-core</artifactId> - <version>${version}</version> - </dependency> - <dependency> - <groupId>javax.servlet</groupId> - <artifactId>servlet-api</artifactId> - <version>2.3</version> - </dependency> - </dependencies> - -</project> Copied: core/tags/hibernate-3.3.0.CR1/documentation/tutorial/pom.xml (from rev 14457, core/trunk/documentation/tutorial/pom.xml) =================================================================== --- core/tags/hibernate-3.3.0.CR1/documentation/tutorial/pom.xml (rev 0) +++ core/tags/hibernate-3.3.0.CR1/documentation/tutorial/pom.xml 2008-03-18 14:24:00 UTC (rev 14467) @@ -0,0 +1,34 @@ +<project xmlns="http://maven.apache.org/POM/4.0.0" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> + + <modelVersion>4.0.0</modelVersion> + + <parent> + <groupId>org.hibernate</groupId> + <artifactId>hibernate-core-parent</artifactId> + <version>2</version> + </parent> + + <groupId>org.hibernate</groupId> + <artifactId>hibernate-tutorial</artifactId> + <version>3.3.0-SNAPSHOT</version> + <packaging>war</packaging> + + <name>Hibernate Tutorial</name> + <description>A tutorial project showcasing Hibernate usage</description> + + <dependencies> + <dependency> + <groupId>org.hibernate</groupId> + <artifactId>hibernate-core</artifactId> + <version>${version}</version> + </dependency> + <dependency> + <groupId>javax.servlet</groupId> + <artifactId>servlet-api</artifactId> + <version>2.3</version> + </dependency> + </dependencies> + +</project> Deleted: core/tags/hibernate-3.3.0.CR1/eg/pom.xml =================================================================== --- core/trunk/eg/pom.xml 2008-03-18 07:26:18 UTC (rev 14456) +++ core/tags/hibernate-3.3.0.CR1/eg/pom.xml 2008-03-18 14:24:00 UTC (rev 14467) @@ -1,31 +0,0 @@ -<project xmlns="http://maven.apache.org/POM/4.0.0" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - - <modelVersion>4.0.0</modelVersion> - -  - - <parent> - <groupId>org.hibernate</groupId> - <artifactId>hibernate-core-parent</artifactId> - <version>1</version> - </parent> - - <groupId>org.hibernate</groupId> - <artifactId>hibernate-eg</artifactId> - <version>3.3.0-SNAPSHOT</version> - <packaging>jar</packaging> - - <name>Hibernate Example</name> - <description>A simple example of Hibernate functionality</description> - - <dependencies> - <dependency> - <groupId>${groupId}</groupId> - <artifactId>hibernate-core</artifactId> - <version>${version}</version> - </dependency> - </dependencies> - -</project> Copied: core/tags/hibernate-3.3.0.CR1/eg/pom.xml (from rev 14466, core/trunk/eg/pom.xml) =================================================================== --- core/tags/hibernate-3.3.0.CR1/eg/pom.xml (rev 0) +++ core/tags/hibernate-3.3.0.CR1/eg/pom.xml 2008-03-18 14:24:00 UTC (rev 14467) @@ -0,0 +1,35 @@ +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> + + <modelVersion>4.0.0</modelVersion> + +  + + <parent> + <groupId>org.hibernate</groupId> + <artifactId>hibernate-core-parent</artifactId> + <version>2</version> + </parent> + + <groupId>org.hibernate</groupId> + <artifactId>hibernate-eg</artifactId> + <version>3.3.0.CR1</version> + <packaging>jar</packaging> + + <name>Hibernate Example</name> + <description>A simple example of Hibernate functionality</description> + + <dependencies> + <dependency> + <groupId>${groupId}</groupId> + <artifactId>hibernate-core</artifactId> + <version>${version}</version> + </dependency> + </dependencies> + + + <scm> + <connection>scm:svn:http://anonsvn.jboss.org/repos/hibernate/core/tags/hibernate-3.3....</connection> + <developerConnection>scm:svn:https://svn.jboss.org/repos/hibernate/core/tags/hibernate-3.3.0.C...</developerConnection> + <url>http://viewvc.jboss.org/cgi-bin/viewvc.cgi/hibernate/core/tags/hibernate-...</url> + </scm> +</project> \ No newline at end of file Deleted: core/tags/hibernate-3.3.0.CR1/jmx/pom.xml =================================================================== --- core/trunk/jmx/pom.xml 2008-03-18 07:26:18 UTC (rev 14456) +++ core/tags/hibernate-3.3.0.CR1/jmx/pom.xml 2008-03-18 14:24:00 UTC (rev 14467) @@ -1,40 +0,0 @@ -<project xmlns="http://maven.apache.org/POM/4.0.0" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - - <modelVersion>4.0.0</modelVersion> - - <parent> - <groupId>org.hibernate</groupId> - <artifactId>hibernate-core-parent</artifactId> - <version>1</version> - </parent> - - <groupId>org.hibernate</groupId> - <artifactId>hibernate-jmx</artifactId> - <version>3.3.0-SNAPSHOT</version> - <packaging>jar</packaging> - - <name>Hibernate JMX Module</name> - <description>Defines Hibernate JMX capabilities</description> - - <dependencies> - <dependency> - <groupId>${groupId}</groupId> - <artifactId>hibernate-core</artifactId> - <version>${version}</version> - </dependency> -  - <dependency> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-log4j12</artifactId> - <version>1.4.2</version> - </dependency> - <dependency> - <groupId>log4j</groupId> - <artifactId>log4j</artifactId> - <version>1.2.14</version> - </dependency> - </dependencies> - -</project> Copied: core/tags/hibernate-3.3.0.CR1/jmx/pom.xml (from rev 14466, core/trunk/jmx/pom.xml) =================================================================== --- core/tags/hibernate-3.3.0.CR1/jmx/pom.xml (rev 0) +++ core/tags/hibernate-3.3.0.CR1/jmx/pom.xml 2008-03-18 14:24:00 UTC (rev 14467) @@ -0,0 +1,44 @@ +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> + + <modelVersion>4.0.0</modelVersion> + + <parent> + <groupId>org.hibernate</groupId> + <artifactId>hibernate-core-parent</artifactId> + <version>2</version> + </parent> + + <groupId>org.hibernate</groupId> + <artifactId>hibernate-jmx</artifactId> + <version>3.3.0.CR1</version> + <packaging>jar</packaging> + + <name>Hibernate JMX Module</name> + <description>Defines Hibernate JMX capabilities</description> + + <dependencies> + <dependency> + <groupId>${groupId}</groupId> + <artifactId>hibernate-core</artifactId> + <version>${version}</version> + </dependency> +  + <dependency> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-log4j12</artifactId> + <version>1.4.2</version> + </dependency> + <dependency> + <groupId>log4j</groupId> + <artifactId>log4j</artifactId> + <version>1.2.14</version> + </dependency> + </dependencies> + + + <scm> + <connection>scm:svn:http://anonsvn.jboss.org/repos/hibernate/core/tags/hibernate-3.3....</connection> + <developerConnection>scm:svn:https://svn.jboss.org/repos/hibernate/core/tags/hibernate-3.3.0.C...</developerConnection> + <url>http://viewvc.jboss.org/cgi-bin/viewvc.cgi/hibernate/core/tags/hibernate-...</url> + </scm> +</project> \ No newline at end of file Deleted: core/tags/hibernate-3.3.0.CR1/pom.xml =================================================================== --- core/trunk/pom.xml 2008-03-18 07:26:18 UTC (rev 14456) +++ core/tags/hibernate-3.3.0.CR1/pom.xml 2008-03-18 14:24:00 UTC (rev 14467) @@ -1,107 +0,0 @@ -<project xmlns="http://maven.apache.org/POM/4.0.0" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - - <modelVersion>4.0.0</modelVersion> - - <parent> - <groupId>org.hibernate</groupId> - <artifactId>hibernate-core-parent</artifactId> - <version>1</version> - </parent> - - <groupId>org.hibernate</groupId> - <artifactId>hibernate</artifactId> - <packaging>pom</packaging> - <version>3.3.0-SNAPSHOT</version> - - <name>Hibernate Core Aggregator</name> - <description>Aggregator of the Hibernate Core modules.</description> - <url>http://hibernate.org</url> - - <scm> - <connection>scm:svn:https://svn.jboss.org/repos/hibernate/core/trunk</connection> - <developerConnection>scm:svn:https://svn.jboss.org/repos/hibernate/core/trunk</developerConnection> - <url>https://svn.jboss.org/repos/hibernate/core/trunk</url> - </scm> - - <modules> - <module>core</module> - <module>cache-ehcache</module> - <module>cache-jbosscache</module> - <module>cache-jbosscache2</module> - <module>cache-oscache</module> - <module>cache-swarmcache</module> - <module>connection-c3p0</module> - <module>connection-proxool</module> - <module>jmx</module> - <module>testing</module> - <module>testsuite</module> - <module>eg</module> - - </modules> - - <build> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-release-plugin</artifactId> - <version>2.0-beta-7</version> - <configuration> - <autoVersionSubmodules>true</autoVersionSubmodules> - </configuration> - </plugin> - </plugins> - </build> - - <profiles> - <profile> -  - <id>release</id> - - <build> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-assembly-plugin</artifactId> - <version>2.2-beta-1</version> - <executions> - <execution> - <id>assemble</id> - <phase>deploy</phase> - <goals> - <goal>single</goal> - </goals> - </execution> - </executions> - <configuration> - <descriptors> - <descriptor>src/assembly/dist.xml</descriptor> - <descriptor>src/assembly/hibernate-all.xml</descriptor> - </descriptors> - </configuration> - </plugin> - </plugins> - </build> - </profile> - -  - <profile> - <id>docs</id> - <modules> - <module>documentation</module> - </modules> - </profile> - </profiles> -</project> Copied: core/tags/hibernate-3.3.0.CR1/pom.xml (from rev 14466, core/trunk/pom.xml) =================================================================== --- core/tags/hibernate-3.3.0.CR1/pom.xml (rev 0) +++ core/tags/hibernate-3.3.0.CR1/pom.xml 2008-03-18 14:24:00 UTC (rev 14467) @@ -0,0 +1,107 @@ +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> + + <modelVersion>4.0.0</modelVersion> + + <parent> + <groupId>org.hibernate</groupId> + <artifactId>hibernate-core-parent</artifactId> + <version>2</version> + </parent> + + <groupId>org.hibernate</groupId> + <artifactId>hibernate</artifactId> + <packaging>pom</packaging> + <version>3.3.0.CR1</version> + + <name>Hibernate Core Aggregator</name> + <description>Aggregator of the Hibernate Core modules.</description> + <url>http://hibernate.org</url> + + <scm> + <connection>scm:svn:https://svn.jboss.org/repos/hibernate/core/tags/hibernate-3.3.0.CR1</connection> + <developerConnection>scm:svn:https://svn.jboss.org/repos/hibernate/core/tags/hibernate-3.3.0.CR1</developerConnection> + <url>https://svn.jboss.org/repos/hibernate/core/tags/hibernate-3.3.0.CR1</url> + </scm> + + <modules> + <module>core</module> + <module>cache-ehcache</module> + <module>cache-jbosscache</module> + <module>cache-jbosscache2</module> + <module>cache-oscache</module> + <module>cache-swarmcache</module> + <module>connection-c3p0</module> + <module>connection-proxool</module> + <module>jmx</module> + <module>testing</module> + <module>testsuite</module> + <module>eg</module> + + </modules> + + <build> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-release-plugin</artifactId> + <version>2.0-beta-7</version> + <configuration> + <autoVersionSubmodules>true</autoVersionSubmodules> + </configuration> + </plugin> + </plugins> + </build> + + <profiles> + <profile> +  + <id>release</id> + + <build> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-assembly-plugin</artifactId> + <version>2.2-beta-2</version> + + <configuration> + <descriptors> + <descriptor>src/assembly/dist.xml</descriptor> + <descriptor>src/assembly/hibernate-all.xml</descriptor> + </descriptors> + </configuration> + </plugin> + </plugins> + </build> + </profile> + +  + <profile> + <id>docs</id> + <modules> + <module>documentation</module> + </modules> + </profile> + </profiles> +</project> \ No newline at end of file Deleted: core/tags/hibernate-3.3.0.CR1/testing/pom.xml =================================================================== --- core/trunk/testing/pom.xml 2008-03-18 07:26:18 UTC (rev 14456) +++ core/tags/hibernate-3.3.0.CR1/testing/pom.xml 2008-03-18 14:24:00 UTC (rev 14467) @@ -1,48 +0,0 @@ -<project xmlns="http://maven.apache.org/POM/4.0.0" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - - <modelVersion>4.0.0</modelVersion> - - <parent> - <groupId>org.hibernate</groupId> - <artifactId>hibernate-core-parent</artifactId> - <version>1</version> - </parent> - - <groupId>org.hibernate</groupId> - <artifactId>hibernate-testing</artifactId> - <version>3.3.0-SNAPSHOT</version> - <packaging>jar</packaging> - - <name>Hibernate Testing</name> - <description>Hibernate JUnit test utilities</description> - - <dependencies> - <dependency> - <groupId>${groupId}</groupId> - <artifactId>hibernate-core</artifactId> - <version>${version}</version> - </dependency> - <dependency> - <groupId>junit</groupId> - <artifactId>junit</artifactId> -  - <version>3.8.1</version> - <scope>compile</scope> - </dependency> - </dependencies> - - <build> - <resources> - <resource> - <filtering>false</filtering> - <directory>src/main/java</directory> - <includes> - <include>**/*.hbm.xml</include> - </includes> - </resource> - </resources> - </build> - -</project> Copied: core/tags/hibernate-3.3.0.CR1/testing/pom.xml (from rev 14466, core/trunk/testing/pom.xml) =================================================================== --- core/tags/hibernate-3.3.0.CR1/testing/pom.xml (rev 0) +++ core/tags/hibernate-3.3.0.CR1/testing/pom.xml 2008-03-18 14:24:00 UTC (rev 14467) @@ -0,0 +1,52 @@ +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> + + <modelVersion>4.0.0</modelVersion> + + <parent> + <groupId>org.hibernate</groupId> + <artifactId>hibernate-core-parent</artifactId> + <version>2</version> + </parent> + + <groupId>org.hibernate</groupId> + <artifactId>hibernate-testing</artifactId> + <version>3.3.0.CR1</version> + <packaging>jar</packaging> + + <name>Hibernate Testing</name> + <description>Hibernate JUnit test utilities</description> + + <dependencies> + <dependency> + <groupId>${groupId}</groupId> + <artifactId>hibernate-core</artifactId> + <version>${version}</version> + </dependency> + <dependency> + <groupId>junit</groupId> + <artifactId>junit</artifactId> +  + <version>3.8.1</version> + <scope>compile</scope> + </dependency> + </dependencies> + + <build> + <resources> + <resource> + <filtering>false</filtering> + <directory>src/main/java</directory> + <includes> + <include>**/*.hbm.xml</include> + </includes> + </resource> + </resources> + </build> + + + <scm> + <connection>scm:svn:http://anonsvn.jboss.org/repos/hibernate/core/tags/hibernate-3.3....</connection> + <developerConnection>scm:svn:https://svn.jboss.org/repos/hibernate/core/tags/hibernate-3.3.0.C...</developerConnection> + <url>http://viewvc.jboss.org/cgi-bin/viewvc.cgi/hibernate/core/tags/hibernate-...</url> + </scm> +</project> \ No newline at end of file Deleted: core/tags/hibernate-3.3.0.CR1/testsuite/pom.xml =================================================================== --- core/trunk/testsuite/pom.xml 2008-03-18 07:26:18 UTC (rev 14456) +++ core/tags/hibernate-3.3.0.CR1/testsuite/pom.xml 2008-03-18 14:24:00 UTC (rev 14467) @@ -1,361 +0,0 @@ -<project xmlns="http://maven.apache.org/POM/4.0.0" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - - <modelVersion>4.0.0</modelVersion> - - <parent> - <groupId>org.hibernate</groupId> - <artifactId>hibernate-core-parent</artifactId> - <version>1</version> - </parent> - - <groupId>org.hibernate</groupId> - <artifactId>hibernate-testsuite</artifactId> - <version>3.3.0-SNAPSHOT</version> - <packaging>jar</packaging> - - <name>Hibernate Testsuite</name> - <description>The testsuite of Hibernate functionality</description> - - <dependencies> - <dependency> - <groupId>${groupId}</groupId> - <artifactId>hibernate-core</artifactId> - <version>${version}</version> - </dependency> - <dependency> - <groupId>${groupId}</groupId> - <artifactId>hibernate-testing</artifactId> - <version>${version}</version> - </dependency> -  - <dependency> - <groupId>javassist</groupId> - <artifactId>javassist</artifactId> - <version>3.4.GA</version> - </dependency> - <dependency> - <groupId>cglib</groupId> - <artifactId>cglib</artifactId> - <version>2.1_3</version> - </dependency> - <dependency> - <groupId>asm</groupId> - <artifactId>asm-attrs</artifactId> - <version>1.5.3</version> - </dependency> -  - <dependency> - <groupId>jaxen</groupId> - <artifactId>jaxen</artifactId> - <version>1.1</version> - </dependency> -  - <dependency> - <groupId>commons-logging</groupId> - <artifactId>commons-logging</artifactId> - <version>99.0-does-not-exist</version> - </dependency> - <dependency> - <groupId>commons-logging</groupId> - <artifactId>commons-logging-api</artifactId> - <version>99.0-does-not-exist</version> - </dependency> - <dependency> - <groupId>org.slf4j</groupId> - <artifactId>jcl104-over-slf4j</artifactId> - <version>1.4.2</version> - </dependency> - <dependency> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-log4j12</artifactId> - <version>1.4.2</version> - </dependency> - <dependency> - <groupId>log4j</groupId> - <artifactId>log4j</artifactId> - <version>1.2.14</version> - </dependency> - </dependencies> - - <build> - <testResources> - <testResource> - <filtering>false</filtering> - <directory>src/test/java</directory> - <includes> - <include>**/*.xml</include> - </includes> - </testResource> - <testResource> - <filtering>true</filtering> - <directory>src/test/resources</directory> - </testResource> - </testResources> - - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-compiler-plugin</artifactId> - <configuration> - <source>1.5</source> - <target>1.5</target> - </configuration> - </plugin> - <plugin> - <groupId>org.jboss.maven.plugins</groupId> - <artifactId>maven-test-ext-plugin</artifactId> - <version>1.1.0</version> - <executions> - <execution> - <goals> - <goal>extend</goal> - </goals> - </execution> - </executions> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-surefire-plugin</artifactId> - <configuration> - <systemProperties> - <property> - <name>hibernate.test.validatefailureexpected</name> - <value>true</value> - </property> - </systemProperties> - </configuration> - </plugin> - </plugins> - </build> - - <profiles> -  - <profile> - <id>hsqldb</id> - <activation> - <activeByDefault>true</activeByDefault> - </activation> - <dependencies> - <dependency> - <groupId>hsqldb</groupId> - <artifactId>hsqldb</artifactId> - <version>1.8.0.2</version> - </dependency> - </dependencies> - <properties> - <db.dialect>org.hibernate.dialect.HSQLDialect</db.dialect> - <jdbc.driver>org.hsqldb.jdbcDriver</jdbc.driver> - <jdbc.url>jdbc:hsqldb:target/test/db/hsqldb/hibernate</jdbc.url> - <jdbc.user>sa</jdbc.user> - <jdbc.pass/> - <jdbc.isolation/> - </properties> - </profile> - -  - <profile> - <id>h2</id> - <dependencies> - <dependency> - <groupId>org.h2database</groupId> - <artifactId>h2database</artifactId> - <version>1.0.20061217</version> - </dependency> - </dependencies> - <properties> - <db.dialect>org.hibernate.dialect.H2Dialect</db.dialect> - <jdbc.driver>org.h2.Driver</jdbc.driver> - <jdbc.url>jdbc:h2:mem:target/test/db/h2/hibernate</jdbc.url> - <jdbc.user>sa</jdbc.user> - <jdbc.pass/> - <jdbc.isolation/> - </properties> - </profile> - -  - -  - <profile> - <id>mysql5</id> - <dependencies> - <dependency> - <groupId>mysql</groupId> - <artifactId>mysql-connector-java</artifactId> - <version>5.0.5</version> - </dependency> - </dependencies> - <properties> - <db.dialect>org.hibernate.dialect.MySQL5InnoDBDialect</db.dialect> - <jdbc.driver>com.mysql.jdbc.Driver</jdbc.driver> - <jdbc.url>jdbc:mysql://dev02.qa.atl.jboss.com/cruisecontrol</jdbc.url> - <jdbc.user>cruisecontrol</jdbc.user> - <jdbc.pass>cruisecontrol</jdbc.pass> - <jdbc.isolation/> - </properties> - </profile> - -  - <profile> - <id>pgsql8</id> - <dependencies> - <dependency> - <groupId>postgresql</groupId> - <artifactId>postgresql</artifactId> - <version>8.2-504</version> - <classifier>jdbc3</classifier> - </dependency> - </dependencies> - <properties> - <db.dialect>org.hibernate.dialect.PostgreSQLDialect</db.dialect> - <jdbc.driver>org.postgresql.Driver</jdbc.driver> - <jdbc.url>jdbc:postgresql://dev01.qa.atl.jboss.com:5432:cruisecontrol</jdbc.url> - <jdbc.user>cruisecontrol</jdbc.user> - <jdbc.pass>cruisecontrol</jdbc.pass> - <jdbc.isolation/> - </properties> - </profile> - -  - -  - <profile> - <id>oracle9i</id> - <dependencies> - <dependency> - <groupId>com.oracle</groupId> - <artifactId>ojdbc14</artifactId> -  - <version>10.0.2.0</version> - </dependency> - </dependencies> - <properties> - <db.dialect>org.hibernate.dialect.Oracle9iDialect</db.dialect> - <jdbc.driver>oracle.jdbc.driver.OracleDriver</jdbc.driver> - <jdbc.url>jdbc:oracle:thin:@dev20.qa.atl.jboss.com:1521:qa</jdbc.url> - <jdbc.user>cruisecontrol</jdbc.user> - <jdbc.pass>cruisecontrol</jdbc.pass> - <jdbc.isolation/> - </properties> - </profile> - -  - <profile> - <id>oracle10g</id> - <dependencies> - <dependency> - <groupId>com.oracle</groupId> - <artifactId>ojdbc14</artifactId> -  - <version>10.0.2.0</version> - </dependency> - </dependencies> - <properties> - <db.dialect>org.hibernate.dialect.Oracle10gDialect</db.dialect> - <jdbc.driver>oracle.jdbc.driver.OracleDriver</jdbc.driver> - <jdbc.url>jdbc:oracle:thin:@dev01.qa.atl.jboss.com:1521:qadb01</jdbc.url> - <jdbc.user>cruisecontrol</jdbc.user> - <jdbc.pass>cruisecontrol</jdbc.pass> - <jdbc.isolation/> - </properties> - </profile> - -  - <profile> - <id>db2-8</id> - <dependencies> - <dependency> - <groupId>com.ibm</groupId> - <artifactId>db2jcc</artifactId> - <version>3.1.57</version> - </dependency> - <dependency> - <groupId>com.ibm</groupId> - <artifactId>db2jcc_license_cu</artifactId> - <version>3.1.57</version> - </dependency> - </dependencies> - <properties> - <db.dialect>org.hibernate.dialect.DB2Dialect</db.dialect> - <jdbc.driver>com.ibm.db2.jcc.DB2Driver</jdbc.driver> - <jdbc.url>jdbc:db2://dev32.qa.atl.jboss.com:50000/jbossqa</jdbc.url> - <jdbc.user>hiber</jdbc.user> - <jdbc.pass>hiber</jdbc.pass> - <jdbc.isolation/> - </properties> - </profile> - -  - <profile> - <id>sybase12</id> - <dependencies> - <dependency> - <groupId>com.sybase</groupId> - <artifactId>jconnect</artifactId> - <version>6.0.5</version> - </dependency> - </dependencies> - <properties> - <db.dialect>org.hibernate.dialect.SybaseDialect</db.dialect> - <jdbc.driver>com.sybase.jdbc3.jdbc.SybDriver</jdbc.driver> - <jdbc.url>jdbc:sybase:Tds:dev01.qa.atl.jboss.com:4100/cruisecontrol</jdbc.url> - <jdbc.user>cruisecontrol</jdbc.user> - <jdbc.pass>cruisecontrol</jdbc.pass> - <jdbc.isolation/> - </properties> - </profile> - -  - <profile> - <id>sqlserver-jtds</id> - <dependencies> - <dependency> - <groupId>net.sourceforge.jtds</groupId> - <artifactId>jtds</artifactId> - <version>1.2</version> - </dependency> - </dependencies> - <properties> - <db.dialect>org.hibernate.dialect.SQLServerDialect</db.dialect> - <jdbc.driver>net.sourceforge.jtds.jdbc.Driver</jdbc.driver> - <jdbc.url>jdbc:jtds:sqlserver://dev30.qa.atl.jboss.com:3918/cruisecontrol</jdbc.url> - <jdbc.user>cruisecontrol</jdbc.user> - <jdbc.pass>cruisecontrol</jdbc.pass> - <jdbc.isolation/> - </properties> - </profile> - -  - <profile> - <id>sqlserver-msjdbc</id> - <dependencies> - <dependency> - <groupId>com.microsoft.sqlserver</groupId> - <artifactId>msjdbc</artifactId> - <version>1.1</version> - </dependency> - </dependencies> - <properties> - <db.dialect>org.hibernate.dialect.SQLServerDialect</db.dialect> - <jdbc.driver>com.microsoft.sqlserver.jdbc.SQLServerDriver</jdbc.driver> - <jdbc.url>jdbc:sqlserver://dev30.qa.atl.jboss.com:3918</jdbc.url> - <jdbc.user>cruisecontrol</jdbc.user> - <jdbc.pass>cruisecontrol</jdbc.pass> - <jdbc.isolation>4096</jdbc.isolation> - </properties> - </profile> - - </profiles> - -</project> Copied: core/tags/hibernate-3.3.0.CR1/testsuite/pom.xml (from rev 14466, core/trunk/testsuite/pom.xml) =================================================================== --- core/tags/hibernate-3.3.0.CR1/testsuite/pom.xml (rev 0) +++ core/tags/hibernate-3.3.0.CR1/testsuite/pom.xml 2008-03-18 14:24:00 UTC (rev 14467) @@ -0,0 +1,365 @@ +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> + + <modelVersion>4.0.0</modelVersion> + + <parent> + <groupId>org.hibernate</groupId> + <artifactId>hibernate-core-parent</artifactId> + <version>2</version> + </parent> + + <groupId>org.hibernate</groupId> + <artifactId>hibernate-testsuite</artifactId> + <version>3.3.0.CR1</version> + <packaging>jar</packaging> + + <name>Hibernate Testsuite</name> + <description>The testsuite of Hibernate functionality</description> + + <dependencies> + <dependency> + <groupId>${groupId}</groupId> + <artifactId>hibernate-core</artifactId> + <version>${version}</version> + </dependency> + <dependency> + <groupId>${groupId}</groupId> + <artifactId>hibernate-testing</artifactId> + <version>${version}</version> + </dependency> +  + <dependency> + <groupId>javassist</groupId> + <artifactId>javassist</artifactId> + <version>3.4.GA</version> + </dependency> + <dependency> + <groupId>cglib</groupId> + <artifactId>cglib</artifactId> + <version>2.1_3</version> + </dependency> + <dependency> + <groupId>asm</groupId> + <artifactId>asm-attrs</artifactId> + <version>1.5.3</version> + </dependency> +  + <dependency> + <groupId>jaxen</groupId> + <artifactId>jaxen</artifactId> + <version>1.1</version> + </dependency> +  + <dependency> + <groupId>commons-logging</groupId> + <artifactId>commons-logging</artifactId> + <version>99.0-does-not-exist</version> + </dependency> + <dependency> + <groupId>commons-logging</groupId> + <artifactId>commons-logging-api</artifactId> + <version>99.0-does-not-exist</version> + </dependency> + <dependency> + <groupId>org.slf4j</groupId> + <artifactId>jcl104-over-slf4j</artifactId> + <version>1.4.2</version> + </dependency> + <dependency> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-log4j12</artifactId> + <version>1.4.2</version> + </dependency> + <dependency> + <groupId>log4j</groupId> + <artifactId>log4j</artifactId> + <version>1.2.14</version> + </dependency> + </dependencies> + + <build> + <testResources> + <testResource> + <filtering>false</filtering> + <directory>src/test/java</directory> + <includes> + <include>**/*.xml</include> + </includes> + </testResource> + <testResource> + <filtering>true</filtering> + <directory>src/test/resources</directory> + </testResource> + </testResources> + + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-compiler-plugin</artifactId> + <configuration> + <source>1.5</source> + <target>1.5</target> + </configuration> + </plugin> + <plugin> + <groupId>org.jboss.maven.plugins</groupId> + <artifactId>maven-test-ext-plugin</artifactId> + <version>1.1.0</version> + <executions> + <execution> + <goals> + <goal>extend</goal> + </goals> + </execution> + </executions> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-surefire-plugin</artifactId> + <configuration> + <systemProperties> + <property> + <name>hibernate.test.validatefailureexpected</name> + <value>true</value> + </property> + </systemProperties> + </configuration> + </plugin> + </plugins> + </build> + + <profiles> +  + <profile> + <id>hsqldb</id> + <activation> + <activeByDefault>true</activeByDefault> + </activation> + <dependencies> + <dependency> + <groupId>hsqldb</groupId> + <artifactId>hsqldb</artifactId> + <version>1.8.0.2</version> + </dependency> + </dependencies> + <properties> + <db.dialect>org.hibernate.dialect.HSQLDialect</db.dialect> + <jdbc.driver>org.hsqldb.jdbcDriver</jdbc.driver> + <jdbc.url>jdbc:hsqldb:target/test/db/hsqldb/hibernate</jdbc.url> + <jdbc.user>sa</jdbc.user> + <jdbc.pass /> + <jdbc.isolation /> + </properties> + </profile> + +  + <profile> + <id>h2</id> + <dependencies> + <dependency> + <groupId>org.h2database</groupId> + <artifactId>h2database</artifactId> + <version>1.0.20061217</version> + </dependency> + </dependencies> + <properties> + <db.dialect>org.hibernate.dialect.H2Dialect</db.dialect> + <jdbc.driver>org.h2.Driver</jdbc.driver> + <jdbc.url>jdbc:h2:mem:target/test/db/h2/hibernate</jdbc.url> + <jdbc.user>sa</jdbc.user> + <jdbc.pass /> + <jdbc.isolation /> + </properties> + </profile> + +  + +  + <profile> + <id>mysql5</id> + <dependencies> + <dependency> + <groupId>mysql</groupId> + <artifactId>mysql-connector-java</artifactId> + <version>5.0.5</version> + </dependency> + </dependencies> + <properties> + <db.dialect>org.hibernate.dialect.MySQL5InnoDBDialect</db.dialect> + <jdbc.driver>com.mysql.jdbc.Driver</jdbc.driver> + <jdbc.url>jdbc:mysql://dev02.qa.atl.jboss.com/cruisecontrol</jdbc.url> + <jdbc.user>cruisecontrol</jdbc.user> + <jdbc.pass>cruisecontrol</jdbc.pass> + <jdbc.isolation /> + </properties> + </profile> + +  + <profile> + <id>pgsql8</id> + <dependencies> + <dependency> + <groupId>postgresql</groupId> + <artifactId>postgresql</artifactId> + <version>8.2-504</version> + <classifier>jdbc3</classifier> + </dependency> + </dependencies> + <properties> + <db.dialect>org.hibernate.dialect.PostgreSQLDialect</db.dialect> + <jdbc.driver>org.postgresql.Driver</jdbc.driver> + <jdbc.url>jdbc:postgresql://dev01.qa.atl.jboss.com:5432:cruisecontrol</jdbc.url> + <jdbc.user>cruisecontrol</jdbc.user> + <jdbc.pass>cruisecontrol</jdbc.pass> + <jdbc.isolation /> + </properties> + </profile> + +  + +  + <profile> + <id>oracle9i</id> + <dependencies> + <dependency> + <groupId>com.oracle</groupId> + <artifactId>ojdbc14</artifactId> +  + <version>10.0.2.0</version> + </dependency> + </dependencies> + <properties> + <db.dialect>org.hibernate.dialect.Oracle9iDialect</db.dialect> + <jdbc.driver>oracle.jdbc.driver.OracleDriver</jdbc.driver> + <jdbc.url>jdbc:oracle:thin:@dev20.qa.atl.jboss.com:1521:qa</jdbc.url> + <jdbc.user>cruisecontrol</jdbc.user> + <jdbc.pass>cruisecontrol</jdbc.pass> + <jdbc.isolation /> + </properties> + </profile> + +  + <profile> + <id>oracle10g</id> + <dependencies> + <dependency> + <groupId>com.oracle</groupId> + <artifactId>ojdbc14</artifactId> +  + <version>10.0.2.0</version> + </dependency> + </dependencies> + <properties> + <db.dialect>org.hibernate.dialect.Oracle10gDialect</db.dialect> + <jdbc.driver>oracle.jdbc.driver.OracleDriver</jdbc.driver> + <jdbc.url>jdbc:oracle:thin:@dev01.qa.atl.jboss.com:1521:qadb01</jdbc.url> + <jdbc.user>cruisecontrol</jdbc.user> + <jdbc.pass>cruisecontrol</jdbc.pass> + <jdbc.isolation /> + </properties> + </profile> + +  + <profile> + <id>db2-8</id> + <dependencies> + <dependency> + <groupId>com.ibm</groupId> + <artifactId>db2jcc</artifactId> + <version>3.1.57</version> + </dependency> + <dependency> + <groupId>com.ibm</groupId> + <artifactId>db2jcc_license_cu</artifactId> + <version>3.1.57</version> + </dependency> + </dependencies> + <properties> + <db.dialect>org.hibernate.dialect.DB2Dialect</db.dialect> + <jdbc.driver>com.ibm.db2.jcc.DB2Driver</jdbc.driver> + <jdbc.url>jdbc:db2://dev32.qa.atl.jboss.com:50000/jbossqa</jdbc.url> + <jdbc.user>hiber</jdbc.user> + <jdbc.pass>hiber</jdbc.pass> + <jdbc.isolation /> + </properties> + </profile> + +  + <profile> + <id>sybase12</id> + <dependencies> + <dependency> + <groupId>com.sybase</groupId> + <artifactId>jconnect</artifactId> + <version>6.0.5</version> + </dependency> + </dependencies> + <properties> + <db.dialect>org.hibernate.dialect.SybaseDialect</db.dialect> + <jdbc.driver>com.sybase.jdbc3.jdbc.SybDriver</jdbc.driver> + <jdbc.url>jdbc:sybase:Tds:dev01.qa.atl.jboss.com:4100/cruisecontrol</jdbc.url> + <jdbc.user>cruisecontrol</jdbc.user> + <jdbc.pass>cruisecontrol</jdbc.pass> + <jdbc.isolation /> + </properties> + </profile> + +  + <profile> + <id>sqlserver-jtds</id> + <dependencies> + <dependency> + <groupId>net.sourceforge.jtds</groupId> + <artifactId>jtds</artifactId> + <version>1.2</version> + </dependency> + </dependencies> + <properties> + <db.dialect>org.hibernate.dialect.SQLServerDialect</db.dialect> + <jdbc.driver>net.sourceforge.jtds.jdbc.Driver</jdbc.driver> + <jdbc.url>jdbc:jtds:sqlserver://dev30.qa.atl.jboss.com:3918/cruisecontrol</jdbc.url> + <jdbc.user>cruisecontrol</jdbc.user> + <jdbc.pass>cruisecontrol</jdbc.pass> + <jdbc.isolation /> + </properties> + </profile> + +  + <profile> + <id>sqlserver-msjdbc</id> + <dependencies> + <dependency> + <groupId>com.microsoft.sqlserver</groupId> + <artifactId>msjdbc</artifactId> + <version>1.1</version> + </dependency> + </dependencies> + <properties> + <db.dialect>org.hibernate.dialect.SQLServerDialect</db.dialect> + <jdbc.driver>com.microsoft.sqlserver.jdbc.SQLServerDriver</jdbc.driver> + <jdbc.url>jdbc:sqlserver://dev30.qa.atl.jboss.com:3918</jdbc.url> + <jdbc.user>cruisecontrol</jdbc.user> + <jdbc.pass>cruisecontrol</jdbc.pass> + <jdbc.isolation>4096</jdbc.isolation> + </properties> + </profile> + + </profiles> + + + <scm> + <connection>scm:svn:http://anonsvn.jboss.org/repos/hibernate/core/tags/hibernate-3.3....</connection> + <developerConnection>scm:svn:https://svn.jboss.org/repos/hibernate/core/tags/hibernate-3.3.0.C...</developerConnection> + <url>http://viewvc.jboss.org/cgi-bin/viewvc.cgi/hibernate/core/tags/hibernate-...</url> + </scm> +</project> \ No newline at end of file

16 years, 9 months

1
0
0 / 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

hibernate-commits March 2008