July 2007 - hibernate-commits - Jboss List Archives

by hibernate-commits＠lists.jboss.org

Author: steve.ebersole(a)jboss.com Date: 2007-07-21 03:17:25 -0400 (Sat, 21 Jul 2007) New Revision: 12795 Modified: core/trunk/ Log: added svn:ignore Property changes on: core/trunk ___________________________________________________________________ Name: svn:ignore + target local *.ipr *.iws *.iml .classpath .project .nbattrs *.log *.properties .clover

16 years, 9 months

1
0
0 / 0

Hibernate SVN: r12794 - in core/trunk/src: site and 4 other directories.

by hibernate-commits＠lists.jboss.org

Author: steve.ebersole(a)jboss.com Date: 2007-07-21 03:15:20 -0400 (Sat, 21 Jul 2007) New Revision: 12794 Added: core/trunk/src/site/ core/trunk/src/site/apt/ core/trunk/src/site/apt/index.apt core/trunk/src/site/resources/ core/trunk/src/site/resources/css/ core/trunk/src/site/resources/css/site.css core/trunk/src/site/resources/images/ core/trunk/src/site/resources/images/favicon.ico core/trunk/src/site/resources/images/hibernate_icon.png core/trunk/src/site/resources/images/hibernate_logo.png core/trunk/src/site/resources/images/maven-button-4.png core/trunk/src/site/site.xml Log: basic site design for dist bundles Added: core/trunk/src/site/apt/index.apt =================================================================== --- core/trunk/src/site/apt/index.apt (rev 0) +++ core/trunk/src/site/apt/index.apt 2007-07-21 07:15:20 UTC (rev 12794) @@ -0,0 +1,51 @@ + ------ + Introduction + ------ + Steve Ebersole + ------ + 20 July 2007 + ------ + +~~ Copyright © 2007 Red Hat Middleware, LLC. All rights reserved. +~~ +~~ 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, v. 2.1. This program is distributed in the +~~ hope that it will be useful, but WITHOUT A 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, v.2.1 along with this +~~ distribution; if not, write to the Free Software Foundation, Inc., +~~ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. +~~ +~~ Red Hat Author(s): Steve Ebersole + +Hibernate Core - Relational Persistence for Idiomatic Java + + Hibernate is a powerful, high performance object/relational persistence and query + service. Hibernate lets you develop persistent classes following common object-oriented + idioms such as association, inheritance, polymorphism, composition, and collections. + + Hibernate's goal is to relieve the developer from 95 percent of common data persistence related + programming tasks, compared to manual coding with SQL and the JDBC API. Hibernate Core for Java + generates SQL for you, relieves you from manual JDBC result set handling and object conversion, + and keeps your application portable to all SQL databases. However, unlike many other persistence + solutions, Hibernate does not hide the power of SQL from you and guarantees that your investment + in relational technology and knowledge is as valid as always. + + Hibernate provides transparent persistence, the only requirement for a persistent class is a + no-argument constructor. You don't even need classes, you can also persist a model using Maps of + Maps, or just about anything else. + + Hibernate offers sophisticated query options. You can write plain SQL, object-oriented + HQL (Hibernate Query Language), or create programatic Criteria and Example queries. Hibernate can + optimize object loading all the time, with various fetching and caching options. + + Hibernate adapts to your development process, no matter if you start with a design from scratch or + work with an existing database, and it will support any application architecture. Combined with + Hibernate EntityManager and Hibernate Annotations you can use Hibernate as a certified Java Persistence + provider. + + Please visit the {{{http://hibernate.org}website}} for more information. + + Happpy Hibernating! Added: core/trunk/src/site/resources/css/site.css =================================================================== --- core/trunk/src/site/resources/css/site.css (rev 0) +++ core/trunk/src/site/resources/css/site.css 2007-07-21 07:15:20 UTC (rev 12794) @@ -0,0 +1,23 @@ +/** + * Copyright © 2007 Red Hat Middleware, LLC. All rights reserved. + * + * 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, v. 2.1. This program is distributed in the + * hope that it will be useful, but WITHOUT A 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, v.2.1 along with this + * distribution; if not, write to the Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + * + * Red Hat Author(s): Steve Ebersole + */ +h2 { + color: #aea477; + /*color: #c2b585;*/ +} + +#navcolumn h5 { + color: #59666c; +} Added: core/trunk/src/site/resources/images/favicon.ico =================================================================== (Binary files differ) Property changes on: core/trunk/src/site/resources/images/favicon.ico ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: core/trunk/src/site/resources/images/hibernate_icon.png =================================================================== (Binary files differ) Property changes on: core/trunk/src/site/resources/images/hibernate_icon.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: core/trunk/src/site/resources/images/hibernate_logo.png =================================================================== (Binary files differ) Property changes on: core/trunk/src/site/resources/images/hibernate_logo.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: core/trunk/src/site/resources/images/maven-button-4.png =================================================================== (Binary files differ) Property changes on: core/trunk/src/site/resources/images/maven-button-4.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: core/trunk/src/site/site.xml =================================================================== --- core/trunk/src/site/site.xml (rev 0) +++ core/trunk/src/site/site.xml 2007-07-21 07:15:20 UTC (rev 12794) @@ -0,0 +1,35 @@ +<project name="Hibernate Core"> + + <bannerLeft> + <name>Hibernate Core Project</name> + <src>images/hibernate_logo.png</src> + <href>http://hibernate.org</href> + </bannerLeft> + + <version position="left"/> + <publishDate position="navigation-bottom" format="yyyy-MM-dd"/> + + <poweredBy> + <logo name="Maven" href="http://maven.apache.org/" img="images/maven-button-4.png"/> + </poweredBy> + + <body> + <head> + <link rel="shortcut icon" href="images/favicon.ico"/> + </head> + + <links> + <item name="Hibernate" href="http://hibernate.org"/> + <item name="JBoss" href="http://jboss.org"/> + <item name="Red Hat" href="http://redhat.com"/> + </links> + + <menu name="Overview"> + <item name="Introduction" href="index.html"/> + </menu> + + <menu ref="reports"/> + </body> +</project> + + \ No newline at end of file

16 years, 9 months

1
0
0 / 0

Hibernate SVN: r12793 - core/trunk.

by hibernate-commits＠lists.jboss.org

Author: steve.ebersole(a)jboss.com Date: 2007-07-21 03:14:55 -0400 (Sat, 21 Jul 2007) New Revision: 12793 Modified: core/trunk/pom.xml Log: move assembly to deploy phase Modified: core/trunk/pom.xml =================================================================== --- core/trunk/pom.xml 2007-07-21 00:16:16 UTC (rev 12792) +++ core/trunk/pom.xml 2007-07-21 07:14:55 UTC (rev 12793) @@ -61,7 +61,7 @@ <executions> <execution> <id>assemble</id> - <phase>site</phase> + <phase>deploy</phase> <goals> <goal>single</goal> </goals>

16 years, 9 months

1
0
0 / 0

Hibernate SVN: r12792 - in trunk/HibernateExt/search/src: java/org/hibernate/search/engine and 3 other directories.

by hibernate-commits＠lists.jboss.org

Author: epbernard Date: 2007-07-20 20:16:16 -0400 (Fri, 20 Jul 2007) New Revision: 12792 Added: trunk/HibernateExt/search/src/java/org/hibernate/search/ProjectionConstants.java trunk/HibernateExt/search/src/test/org/hibernate/search/test/query/Employee.java Modified: trunk/HibernateExt/search/src/java/org/hibernate/search/FullTextQuery.java trunk/HibernateExt/search/src/java/org/hibernate/search/FullTextSession.java trunk/HibernateExt/search/src/java/org/hibernate/search/engine/DocumentExtractor.java trunk/HibernateExt/search/src/java/org/hibernate/search/engine/EntityInfo.java trunk/HibernateExt/search/src/java/org/hibernate/search/engine/ProjectionLoader.java trunk/HibernateExt/search/src/java/org/hibernate/search/jpa/FullTextQuery.java trunk/HibernateExt/search/src/java/org/hibernate/search/query/FullTextQueryImpl.java trunk/HibernateExt/search/src/java/org/hibernate/search/query/ScrollableResultsImpl.java trunk/HibernateExt/search/src/test/org/hibernate/search/test/query/ProjectionQueryTest.java Log: HSEARCH-74 Provide access to SCORE, BOOST, THIS, ID, DOCUMENT through projection (John Griffin) Modified: trunk/HibernateExt/search/src/java/org/hibernate/search/FullTextQuery.java =================================================================== --- trunk/HibernateExt/search/src/java/org/hibernate/search/FullTextQuery.java 2007-07-20 23:57:34 UTC (rev 12791) +++ trunk/HibernateExt/search/src/java/org/hibernate/search/FullTextQuery.java 2007-07-21 00:16:16 UTC (rev 12792) @@ -12,10 +12,7 @@ * @author Emmanuel Bernard */ //TODO return FullTextQuery rather than Query in useful chain methods -public interface FullTextQuery extends Query { - //todo Determine what other lucene specific features to expose via this - // interface. Maybe we should give access to the underlying lucene hit - // objects? +public interface FullTextQuery extends Query, ProjectionConstants { /** * Allows to let lucene sort the results. This is useful when you have Modified: trunk/HibernateExt/search/src/java/org/hibernate/search/FullTextSession.java =================================================================== --- trunk/HibernateExt/search/src/java/org/hibernate/search/FullTextSession.java 2007-07-20 23:57:34 UTC (rev 12791) +++ trunk/HibernateExt/search/src/java/org/hibernate/search/FullTextSession.java 2007-07-21 00:16:16 UTC (rev 12792) @@ -2,7 +2,6 @@ package org.hibernate.search; import org.hibernate.classic.Session; -import org.hibernate.search.FullTextQuery; /** * Extends the Hibernate {@link Session} with Full text search and indexing capabilities Added: trunk/HibernateExt/search/src/java/org/hibernate/search/ProjectionConstants.java =================================================================== --- trunk/HibernateExt/search/src/java/org/hibernate/search/ProjectionConstants.java (rev 0) +++ trunk/HibernateExt/search/src/java/org/hibernate/search/ProjectionConstants.java 2007-07-21 00:16:16 UTC (rev 12792) @@ -0,0 +1,34 @@ +//$Id$ +package org.hibernate.search; + +/** + * Define Projection constants + * + * @author Emmanuel Bernard + */ +public interface ProjectionConstants { + /** + * Represtnts the Hibernate Entity returned in a search. + */ + public String THIS = "__HSearch_This"; + /** + * The Lucene document returned by a search. + */ + public String DOCUMENT = "__HSearch_Document"; + /** + * The legacy document's score from a search. + */ + public String SCORE = "__HSearch_Score"; + /** + * The boost value of the legacy document. + */ + public String BOOST = "__HSearch_Boost"; + /** + * Object id property + */ + public String ID = "__HSearch_id"; + /** + * Object class + */ + //TODO OBJECT CLASS +} Modified: trunk/HibernateExt/search/src/java/org/hibernate/search/engine/DocumentExtractor.java =================================================================== --- trunk/HibernateExt/search/src/java/org/hibernate/search/engine/DocumentExtractor.java 2007-07-20 23:57:34 UTC (rev 12791) +++ trunk/HibernateExt/search/src/java/org/hibernate/search/engine/DocumentExtractor.java 2007-07-21 00:16:16 UTC (rev 12792) @@ -1,11 +1,19 @@ //$Id$ package org.hibernate.search.engine; +import java.util.ArrayList; +import java.util.List; +import java.io.IOException; + import org.apache.lucene.document.Document; +import org.apache.lucene.search.Hits; import org.hibernate.search.engine.EntityInfo; +import org.hibernate.search.FullTextQuery; +import org.hibernate.search.ProjectionConstants; /** * @author Emmanuel Bernard + * @author John Griffin */ public class DocumentExtractor { private SearchFactoryImplementor searchFactoryImplementor; @@ -16,14 +24,46 @@ this.projection = projection; } - public EntityInfo extract(Document document) { + private EntityInfo extract(Document document) { EntityInfo entityInfo = new EntityInfo(); entityInfo.clazz = DocumentBuilder.getDocumentClass( document ); entityInfo.id = DocumentBuilder.getDocumentId( searchFactoryImplementor, entityInfo.clazz, document ); - if (projection != null && projection.length > 0) { + if ( projection != null && projection.length > 0 ) { entityInfo.projection = DocumentBuilder.getDocumentFields( searchFactoryImplementor, entityInfo.clazz, document, projection ); } - //TODO read fields return entityInfo; } + + public EntityInfo extract(Hits hits, int index) throws IOException { + Document doc = hits.doc( index ); + //TODO if we are lonly looking for score (unlikely), avoid accessing doc (lazy load) + EntityInfo entityInfo = extract( doc ); + Object[] eip = entityInfo.projection; + + if ( eip != null && eip.length > 0 ) { + for (int x = 0; x < projection.length; x++) { + if ( ProjectionConstants.SCORE.equals( projection[x] ) ) { + eip[x] = hits.score( index ); + } + else if ( ProjectionConstants.ID.equals( projection[x] ) ) { + eip[x] = entityInfo.id; + } + else if ( ProjectionConstants.DOCUMENT.equals( projection[x] ) ) { + eip[x] = doc; + } + else if ( ProjectionConstants.BOOST.equals( projection[x] ) ) { + eip[x] = doc.getBoost(); + } + else if ( ProjectionConstants.THIS.equals( projection[x] ) ) { + //THIS could be projected more than once + //THIS loading delayed to the Loader phase + if (entityInfo.indexesOfThis == null) { + entityInfo.indexesOfThis = new ArrayList<Integer>(1); + } + entityInfo.indexesOfThis.add(x); + } + } + } + return entityInfo; + } } Modified: trunk/HibernateExt/search/src/java/org/hibernate/search/engine/EntityInfo.java =================================================================== --- trunk/HibernateExt/search/src/java/org/hibernate/search/engine/EntityInfo.java 2007-07-20 23:57:34 UTC (rev 12791) +++ trunk/HibernateExt/search/src/java/org/hibernate/search/engine/EntityInfo.java 2007-07-21 00:16:16 UTC (rev 12792) @@ -2,14 +2,17 @@ package org.hibernate.search.engine; import java.io.Serializable; +import java.util.List; +import java.util.ArrayList; /** * * @author Emmanuel Bernard */ -//Move to egine? +//TODO Move to egine? public class EntityInfo { public Class clazz; public Serializable id; public Object[] projection; + public List<Integer> indexesOfThis; } Modified: trunk/HibernateExt/search/src/java/org/hibernate/search/engine/ProjectionLoader.java =================================================================== --- trunk/HibernateExt/search/src/java/org/hibernate/search/engine/ProjectionLoader.java 2007-07-20 23:57:34 UTC (rev 12791) +++ trunk/HibernateExt/search/src/java/org/hibernate/search/engine/ProjectionLoader.java 2007-07-21 00:16:16 UTC (rev 12792) @@ -5,24 +5,60 @@ import java.util.List; import org.hibernate.Session; -import org.hibernate.search.engine.EntityInfo; /** * @author Emmanuel Bernard */ public class ProjectionLoader implements Loader { + private SearchFactoryImplementor searchFactoryImplementor; + private Session session; + private ObjectLoader objectLoader; + private Boolean projectThis; + public void init(Session session, SearchFactoryImplementor searchFactoryImplementor) { + this.session = session; + this.searchFactoryImplementor = searchFactoryImplementor; } public Object load(EntityInfo entityInfo) { + initThisProjectionFlag( entityInfo ); + if ( projectThis ) { + for (int index : entityInfo.indexesOfThis) { + entityInfo.projection[index] = objectLoader.load( entityInfo ); + } + } return entityInfo.projection; } + private void initThisProjectionFlag(EntityInfo entityInfo) { + if ( projectThis == null ) { + projectThis = entityInfo.indexesOfThis != null; + if ( projectThis ) { + //TODO use QueryLoader when possible + objectLoader = new ObjectLoader(); + objectLoader.init( session, searchFactoryImplementor ); + } + } + } + public List load(EntityInfo... entityInfos) { - List results = new ArrayList(entityInfos.length); + List results = new ArrayList( entityInfos.length ); + if ( entityInfos.length == 0 ) return results; + + initThisProjectionFlag( entityInfos[0] ); + if ( projectThis ) { + objectLoader.load( entityInfos ); //load by batch + for (EntityInfo entityInfo : entityInfos) { + for (int index : entityInfo.indexesOfThis) { + //set one by one to avoid loosing null objects (skipped in the objectLoader.load( EntityInfo[] )) + entityInfo.projection[index] = objectLoader.load( entityInfo ); + } + } + } for (EntityInfo entityInfo : entityInfos) { results.add( entityInfo.projection ); } + return results; } } Modified: trunk/HibernateExt/search/src/java/org/hibernate/search/jpa/FullTextQuery.java =================================================================== --- trunk/HibernateExt/search/src/java/org/hibernate/search/jpa/FullTextQuery.java 2007-07-20 23:57:34 UTC (rev 12791) +++ trunk/HibernateExt/search/src/java/org/hibernate/search/jpa/FullTextQuery.java 2007-07-21 00:16:16 UTC (rev 12792) @@ -5,6 +5,7 @@ import org.apache.lucene.search.Sort; import org.hibernate.Criteria; +import org.hibernate.search.ProjectionConstants; /** * The base interface for lucene powered searches. @@ -14,10 +15,7 @@ * @author Emmanuel Bernard */ //TODO return FullTextQuery rather than Query in useful chain methods -public interface FullTextQuery extends Query { - //todo Determine what other lucene specific features to expose via this - // interface. Maybe we should give access to the underlying lucene hit - // objects? +public interface FullTextQuery extends Query, ProjectionConstants { /** * Allows to let lucene sort the results. This is useful when you have Modified: trunk/HibernateExt/search/src/java/org/hibernate/search/query/FullTextQueryImpl.java =================================================================== --- trunk/HibernateExt/search/src/java/org/hibernate/search/query/FullTextQueryImpl.java 2007-07-20 23:57:34 UTC (rev 12791) +++ trunk/HibernateExt/search/src/java/org/hibernate/search/query/FullTextQueryImpl.java 2007-07-21 00:16:16 UTC (rev 12792) @@ -12,7 +12,6 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.apache.lucene.document.Document; import org.apache.lucene.index.Term; import org.apache.lucene.search.BooleanClause; import org.apache.lucene.search.BooleanQuery; @@ -35,7 +34,6 @@ import org.hibernate.impl.CriteriaImpl; import org.hibernate.search.FullTextQuery; import org.hibernate.search.SearchException; -import org.hibernate.search.impl.SearchFactoryImpl; import org.hibernate.search.engine.DocumentBuilder; import org.hibernate.search.engine.DocumentExtractor; import org.hibernate.search.engine.EntityInfo; @@ -97,7 +95,7 @@ //find the directories IndexSearcher searcher = buildSearcher( searchFactoryImplementor ); if ( searcher == null ) { - return new IteratorImpl( new ArrayList<EntityInfo>(0), noLoader ); + return new IteratorImpl( new ArrayList<EntityInfo>( 0 ), noLoader ); } try { Hits hits = getHits( searcher ); @@ -107,12 +105,11 @@ List<EntityInfo> entityInfos = new ArrayList<EntityInfo>( max - first + 1 ); DocumentExtractor extractor = new DocumentExtractor( searchFactoryImplementor, indexProjection ); - for ( int index = first; index <= max; index++ ) { + for (int index = first; index <= max; index++) { //TODO use indexSearcher.getIndexReader().document( hits.id(index), FieldSelector(indexProjection) ); - Document document = hits.doc( index ); - entityInfos.add( extractor.extract( document ) ); + entityInfos.add( extractor.extract( hits, index ) ); } - Loader loader = getLoader(sess, searchFactoryImplementor); + Loader loader = getLoader( sess, searchFactoryImplementor ); return new IteratorImpl( entityInfos, loader ); } catch (IOException e) { @@ -122,24 +119,24 @@ try { searchFactoryImplementor.getReaderProvider().closeReader( searcher.getIndexReader() ); } - catch( SearchException e ) { + catch (SearchException e) { log.warn( "Unable to properly close searcher during lucene query: " + getQueryString(), e ); } } } private Loader getLoader(Session session, SearchFactoryImplementor searchFactoryImplementor) { - if ( indexProjection != null) { + if ( indexProjection != null ) { ProjectionLoader loader = new ProjectionLoader(); loader.init( session, searchFactoryImplementor ); return loader; } - if (criteria != null) { - if (classes.length > 1) throw new SearchException("Cannot mix criteria and multiple entity types"); + if ( criteria != null ) { + if ( classes.length > 1 ) throw new SearchException( "Cannot mix criteria and multiple entity types" ); if ( criteria instanceof CriteriaImpl ) { - String targetEntity = ( (CriteriaImpl) criteria).getEntityOrClassName(); + String targetEntity = ( (CriteriaImpl) criteria ).getEntityOrClassName(); if ( classes.length == 1 && !classes[0].getName().equals( targetEntity ) ) { - throw new SearchException("Criteria query entity should match query entity"); + throw new SearchException( "Criteria query entity should match query entity" ); } else { try { @@ -147,17 +144,17 @@ classes = new Class[] { entityType }; } catch (ClassNotFoundException e) { - throw new SearchException("Unable to load entity class from criteria: " + targetEntity, e); + throw new SearchException( "Unable to load entity class from criteria: " + targetEntity, e ); } } } QueryLoader loader = new QueryLoader(); loader.init( session, searchFactoryImplementor ); loader.setEntityType( classes[0] ); - loader.setCriteria(criteria); + loader.setCriteria( criteria ); return loader; } - else if (classes.length == 1) { + else if ( classes.length == 1 ) { QueryLoader loader = new QueryLoader(); loader.init( session, searchFactoryImplementor ); loader.setEntityType( classes[0] ); @@ -184,14 +181,14 @@ int max = max( first, hits ); DocumentExtractor extractor = new DocumentExtractor( searchFactory, indexProjection ); Loader loader = getLoader( (Session) this.session, searchFactory ); - return new ScrollableResultsImpl( searcher, hits, first, max, extractor, loader, searchFactory); + return new ScrollableResultsImpl( searcher, hits, first, max, extractor, loader, searchFactory ); } catch (IOException e) { //close only in case of exception try { searchFactory.getReaderProvider().closeReader( searcher.getIndexReader() ); } - catch( SearchException ee ) { + catch (SearchException ee) { //we have the initial issue already } throw new HibernateException( "Unable to query Lucene index", e ); @@ -207,7 +204,7 @@ SearchFactoryImplementor searchFactoryImplementor = ContextHelper.getSearchFactoryBySFI( session ); //find the directories IndexSearcher searcher = buildSearcher( searchFactoryImplementor ); - if (searcher == null) return new ArrayList(0); + if ( searcher == null ) return new ArrayList( 0 ); Hits hits; try { hits = getHits( searcher ); @@ -216,12 +213,11 @@ Session sess = (Session) this.session; List<EntityInfo> infos = new ArrayList<EntityInfo>( max - first + 1 ); DocumentExtractor extractor = new DocumentExtractor( searchFactoryImplementor, indexProjection ); - for ( int index = first; index <= max; index++ ) { - Document document = hits.doc( index ); - infos.add( extractor.extract( document ) ); + for (int index = first; index <= max; index++) { + infos.add( extractor.extract( hits, index ) ); } Loader loader = getLoader( sess, searchFactoryImplementor ); - return loader.load( infos.toArray( new EntityInfo[infos.size()]) ); + return loader.load( infos.toArray( new EntityInfo[infos.size()] ) ); } catch (IOException e) { throw new HibernateException( "Unable to query Lucene index", e ); @@ -246,7 +242,7 @@ private Hits getHits(Searcher searcher) throws IOException { Hits hits; org.apache.lucene.search.Query query = filterQueryByClasses( luceneQuery ); - if(sort == null){ + if ( sort == null ) { hits = searcher.search( query ); } else { @@ -266,7 +262,7 @@ BooleanQuery classFilter = new BooleanQuery(); //annihilate the scoring impact of DocumentBuilder.CLASS_FIELDNAME classFilter.setBoost( 0 ); - for ( Class clazz : classesAndSubclasses ) { + for (Class clazz : classesAndSubclasses) { Term t = new Term( DocumentBuilder.CLASS_FIELDNAME, clazz.getName() ); TermQuery termQuery = new TermQuery( t ); classFilter.add( termQuery, BooleanClause.Occur.SHOULD ); @@ -302,9 +298,9 @@ List<DirectoryProvider> directories = new ArrayList<DirectoryProvider>(); if ( classes == null || classes.length == 0 ) { //no class means all classes - for ( DocumentBuilder builder : builders.values() ) { + for (DocumentBuilder builder : builders.values()) { final DirectoryProvider directoryProvider = builder.getDirectoryProvider(); - if ( ! directories.contains( directoryProvider ) ) { + if ( !directories.contains( directoryProvider ) ) { directories.add( directoryProvider ); } } @@ -313,16 +309,17 @@ else { Set<Class> involvedClasses = new HashSet<Class>( classes.length ); Collections.addAll( involvedClasses, classes ); - for ( Class clazz : classes ) { + for (Class clazz : classes) { DocumentBuilder builder = builders.get( clazz ); if ( builder != null ) involvedClasses.addAll( builder.getMappedSubclasses() ); } - for ( Class clazz : involvedClasses ) { + 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 ); + if ( builder == null ) + throw new HibernateException( "Not a mapped entity (don't forget to add @Indexed): " + clazz ); final DirectoryProvider directoryProvider = builder.getDirectoryProvider(); - if ( ! directories.contains( directoryProvider ) ) { + if ( !directories.contains( directoryProvider ) ) { directories.add( directoryProvider ); } } @@ -340,11 +337,11 @@ public int getResultSize() { - if (resultSize == null) { + if ( resultSize == null ) { //get result size without object initialization SearchFactoryImplementor searchFactoryImplementor = ContextHelper.getSearchFactoryBySFI( session ); IndexSearcher searcher = buildSearcher( searchFactoryImplementor ); - if (searcher == null) { + if ( searcher == null ) { resultSize = 0; } else { @@ -361,7 +358,7 @@ try { searchFactoryImplementor.getReaderProvider().closeReader( searcher.getIndexReader() ); } - catch( SearchException e ) { + catch (SearchException e) { log.warn( "Unable to properly close searcher during lucene query: " + getQueryString(), e ); } } @@ -376,7 +373,7 @@ } public FullTextQuery setIndexProjection(String... fields) { - if ( fields == null || fields.length == 0) { + if ( fields == null || fields.length == 0 ) { this.indexProjection = null; } else { Modified: trunk/HibernateExt/search/src/java/org/hibernate/search/query/ScrollableResultsImpl.java =================================================================== --- trunk/HibernateExt/search/src/java/org/hibernate/search/query/ScrollableResultsImpl.java 2007-07-20 23:57:34 UTC (rev 12791) +++ trunk/HibernateExt/search/src/java/org/hibernate/search/query/ScrollableResultsImpl.java 2007-07-21 00:16:16 UTC (rev 12792) @@ -112,18 +112,23 @@ } public Object[] get() throws HibernateException { - if ( current < first || current > max ) return null; //or exception? + // don't throw an exception here just + // return 'null' this is similar to the + // RowSet spec in JDBC. It returns false + // (or 0 I can't remember) but we can't + // do that since we have to make up for + // an Object[]. J.G + if ( current < first || current > max ) return null; EntityInfo info = entityInfos[current - first]; if ( info == null ) { Document document = null; try { - document = hits.doc( current ); + info = documentExtractor.extract( hits, current ); } catch (IOException e) { throw new HibernateException( "Unable to read Lucene hits[" + current + "]", e ); } //FIXME should check that clazz match classes but this complexify a lot the firstResult/maxResult - info = documentExtractor.extract( document ); entityInfos[current - first] = info; } if ( !resultContext.containsKey( info ) ) { Added: trunk/HibernateExt/search/src/test/org/hibernate/search/test/query/Employee.java =================================================================== --- trunk/HibernateExt/search/src/test/org/hibernate/search/test/query/Employee.java (rev 0) +++ trunk/HibernateExt/search/src/test/org/hibernate/search/test/query/Employee.java 2007-07-21 00:16:16 UTC (rev 12792) @@ -0,0 +1,59 @@ +//$Id$ +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; + +/** + * @author John Grffin + */ +@Entity +@Indexed +public class Employee { + private Integer id; + private String lastname; + private String dept; + + public Employee() { + } + + public Employee(Integer id, String lastname, String dept) { + this.id = id; + this.lastname = lastname; + this.dept = dept; + } + + @Id + @DocumentId + public Integer getId() { + return id; + } + + public void setId(Integer id) { + this.id = id; + } + + @Field( index = Index.NO, store = Store.YES ) + public String getLastname() { + return lastname; + } + + public void setLastname(String lastname) { + this.lastname = lastname; + } + + @Field( index = Index.TOKENIZED, store = Store.YES ) + public String getDept() { + return dept; + } + + public void setDept(String dept) { + this.dept = dept; + } +} Modified: trunk/HibernateExt/search/src/test/org/hibernate/search/test/query/ProjectionQueryTest.java =================================================================== --- trunk/HibernateExt/search/src/test/org/hibernate/search/test/query/ProjectionQueryTest.java 2007-07-20 23:57:34 UTC (rev 12791) +++ trunk/HibernateExt/search/src/test/org/hibernate/search/test/query/ProjectionQueryTest.java 2007-07-21 00:16:16 UTC (rev 12792) @@ -2,21 +2,224 @@ package org.hibernate.search.test.query; import java.util.List; +import java.util.Iterator; +import java.io.Serializable; import org.apache.lucene.analysis.StopAnalyzer; +import org.apache.lucene.analysis.standard.StandardAnalyzer; import org.apache.lucene.queryParser.QueryParser; import org.apache.lucene.search.Query; +import org.apache.lucene.document.Document; import org.hibernate.Transaction; +import org.hibernate.ScrollableResults; +import org.hibernate.Session; import org.hibernate.search.FullTextSession; import org.hibernate.search.Search; import org.hibernate.search.SearchException; +import org.hibernate.search.FullTextQuery; import org.hibernate.search.test.SearchTestCase; /** * @author Emmanuel Bernard + * @author John Griffin */ public class ProjectionQueryTest extends SearchTestCase { + public void testLuceneObjectsProjectionWithScroll() throws Exception { + FullTextSession s = Search.createFullTextSession( openSession() ); + prepEmployeeIndex( s ); + + Transaction tx; + s.clear(); + tx = s.beginTransaction(); + QueryParser parser = new QueryParser( "dept", new StandardAnalyzer() ); + + Query query = parser.parse( "dept:ITech" ); + org.hibernate.search.FullTextQuery hibQuery = s.createFullTextQuery( query, Employee.class ); + // Is the 'FullTextQuery.ID' value correct here? Do we want the Lucene internal document number? + hibQuery.setIndexProjection( "id", "lastname", "dept", FullTextQuery.THIS, FullTextQuery.SCORE, FullTextQuery.BOOST, FullTextQuery.DOCUMENT, FullTextQuery.ID ); + + ScrollableResults projections = hibQuery.scroll(); + + // There are a lot of methods to check in ScrollableResultsImpl + // so, we'll use methods to check each projection as needed. + + projections.beforeFirst(); + projections.next(); + Object[] projection = projections.get(); + checkProjectionFirst( projection, s ); + assertTrue(projections.isFirst()); + + projections.last(); + projection = projections.get(); + checkProjectionLast( projection, s ); + assertTrue(projections.isLast()); + + projections.next(); + projection = projections.get(); + assertNull(projection); + + projections.previous(); + projection = projections.get(); + checkProjectionLast( projection, s ); + + projections.first(); + projection = projections.get(); + checkProjectionFirst( projection, s ); + + projections.scroll( 2 ); + projection = projections.get(); + checkProjection2( projection, s ); + + projections.scroll( -5 ); + projection = projections.get(); + assertNull(projection); + + //cleanup + for (Object element : s.createQuery( "from " + Employee.class.getName() ).list()) s.delete( element ); + tx.commit(); + s.close(); + } + + private void checkProjectionFirst(Object[] projection, Session s) { + assertEquals( "id incorrect", 1000, projection[0] ); + assertEquals( "lastname incorrect", "Griffin", projection[1] ); + assertEquals( "dept incorrect", "ITech", projection[2] ); + assertEquals( "THIS incorrect", projection[3], s.get(Employee.class, (Serializable) projection[0]) ); + assertEquals( "SCORE incorrect", 1.0F, projection[4] ); + assertEquals( "BOOST incorrect", 1.0F, projection[5] ); + assertTrue( "DOCUMENT incorrect", projection[6] instanceof Document ); + assertEquals( "DOCUMENT size incorrect", 4, ( (Document) projection[6] ).getFields().size() ); + assertEquals( "legacy ID incorrect", 1000, projection[7] ); + } + + private void checkProjectionLast(Object[] projection, Session s) { + assertEquals( "id incorrect", 1004, projection[0] ); + assertEquals( "lastname incorrect", "Whetbrook", projection[1] ); + assertEquals( "dept incorrect", "ITech", projection[2] ); + assertEquals( "THIS incorrect", projection[3], s.get(Employee.class, (Serializable) projection[0]) ); + assertEquals( "SCORE incorrect", 1.0F, projection[4] ); + assertEquals( "BOOST incorrect", 1.0F, projection[5] ); + assertTrue( "DOCUMENT incorrect", projection[6] instanceof Document ); + assertEquals( "DOCUMENT size incorrect", 4, ( (Document) projection[6] ).getFields().size() ); + assertEquals( "legacy ID incorrect", 1004, projection[7] ); + } + + private void checkProjection2(Object[] projection, Session s) { + assertEquals( "id incorrect", 1003, projection[0] ); + assertEquals( "lastname incorrect", "Stejskal", projection[1] ); + assertEquals( "dept incorrect", "ITech", projection[2] ); + assertEquals( "THIS incorrect", projection[3], s.get(Employee.class, (Serializable) projection[0]) ); + assertEquals( "SCORE incorrect", 1.0F, projection[4] ); + assertEquals( "BOOST incorrect", 1.0F, projection[5] ); + assertTrue( "DOCUMENT incorrect", projection[6] instanceof Document ); + assertEquals( "DOCUMENT size incorrect", 4, ( (Document) projection[6] ).getFields().size() ); + assertEquals( "legacy ID incorrect", 1003, projection[7] ); + } + + public void testLuceneObjectsProjectionWithIterate() throws Exception { + FullTextSession s = Search.createFullTextSession( openSession() ); + prepEmployeeIndex( s ); + + Transaction tx; + s.clear(); + tx = s.beginTransaction(); + QueryParser parser = new QueryParser( "dept", new StandardAnalyzer() ); + + Query query = parser.parse( "dept:ITech" ); + org.hibernate.search.FullTextQuery hibQuery = s.createFullTextQuery( query, Employee.class ); + hibQuery.setIndexProjection( "id", "lastname", "dept", FullTextQuery.THIS, FullTextQuery.SCORE, FullTextQuery.BOOST, FullTextQuery.DOCUMENT, FullTextQuery.ID ); + + int counter = 0; + + for (Iterator iter = hibQuery.iterate(); iter.hasNext();) { + Object[] projection = (Object[]) iter.next(); + assertNotNull( projection ); + counter++; + assertEquals( "dept incorrect", "ITech", projection[2] ); + assertEquals( "THIS incorrect", projection[3], s.get(Employee.class, (Serializable) projection[0]) ); + assertEquals( "SCORE incorrect", 1.0F, projection[4] ); + assertEquals( "BOOST incorrect", 1.0F, projection[5] ); + assertTrue( "DOCUMENT incorrect", projection[6] instanceof Document ); + assertEquals( "DOCUMENT size incorrect", 4, ( (Document) projection[6] ).getFields().size() ); + } + assertEquals( "incorrect number of results returned", 4, counter ); + + //cleanup + for (Object element : s.createQuery( "from " + Employee.class.getName() ).list()) s.delete( element ); + tx.commit(); + s.close(); + } + + public void testLuceneObjectsProjectionWithList() throws Exception { + FullTextSession s = Search.createFullTextSession( openSession() ); + prepEmployeeIndex( s ); + + Transaction tx; + s.clear(); + tx = s.beginTransaction(); + QueryParser parser = new QueryParser( "dept", new StandardAnalyzer() ); + + Query query = parser.parse( "dept:Accounting" ); + org.hibernate.search.FullTextQuery hibQuery = s.createFullTextQuery( query, Employee.class ); + hibQuery.setIndexProjection( "id", "lastname", "dept", FullTextQuery.THIS, FullTextQuery.SCORE, FullTextQuery.BOOST, FullTextQuery.DOCUMENT, FullTextQuery.ID ); + + List result = hibQuery.list(); + assertNotNull( result ); + + Object[] projection = (Object[]) result.get( 0 ); + assertNotNull( projection ); + assertEquals( "id incorrect", 1001, projection[0] ); + assertEquals( "last name incorrect", "Jackson", projection[1] ); + assertEquals( "dept incorrect", "Accounting", projection[2] ); + assertEquals( "THIS incorrect", projection[3], s.get(Employee.class, (Serializable) projection[0]) ); + assertEquals( "SCORE incorrect", 1.0F, projection[4] ); + assertEquals( "BOOST incorrect", 1.0F, projection[5] ); + assertTrue( "DOCUMENT incorrect", projection[6] instanceof Document ); + assertEquals( "DOCUMENT size incorrect", 4, ( (Document) projection[6] ).getFields().size() ); + assertEquals( "ID incorrect", 1001, projection[7] ); + + // Change the projection order and null one + hibQuery.setIndexProjection( FullTextQuery.DOCUMENT, FullTextQuery.THIS, FullTextQuery.SCORE, null, FullTextQuery.ID, "id", "lastname", "dept" ); + + result = hibQuery.list(); + assertNotNull( result ); + + projection = (Object[]) result.get( 0 ); + assertNotNull( projection ); + + assertTrue( "DOCUMENT incorrect", projection[0] instanceof Document ); + assertEquals( "DOCUMENT size incorrect", 4, ( (Document) projection[0] ).getFields().size() ); + assertEquals( "THIS incorrect", projection[1], s.get(Employee.class, (Serializable) projection[4]) ); + assertEquals( "SCORE incorrect", 1.0F, projection[2] ); + assertNull( "BOOST not removed", projection[3] ); + assertEquals( "ID incorrect", 1001, projection[4] ); + assertEquals( "id incorrect", 1001, projection[5] ); + assertEquals( "last name incorrect", "Jackson", projection[6] ); + assertEquals( "dept incorrect", "Accounting", projection[7] ); + + //cleanup + for (Object element : s.createQuery( "from " + Employee.class.getName() ).list()) s.delete( element ); + tx.commit(); + s.close(); + } + + private void prepEmployeeIndex(FullTextSession s) { + Transaction tx = s.beginTransaction(); + Employee e1 = new Employee( 1000, "Griffin", "ITech" ); + s.save( e1 ); + Employee e2 = new Employee( 1001, "Jackson", "Accounting" ); + s.save( e2 ); + Employee e3 = new Employee( 1002, "Jimenez", "ITech" ); + s.save( e3 ); + Employee e4 = new Employee( 1003, "Stejskal", "ITech" ); + s.save( e4 ); + Employee e5 = new Employee( 1004, "Whetbrook", "ITech" ); + s.save( e5 ); + + tx.commit(); + } + public void testProjection() throws Exception { FullTextSession s = Search.createFullTextSession( openSession() ); Transaction tx = s.beginTransaction(); @@ -27,7 +230,7 @@ Author emmanuel = new Author(); emmanuel.setName( "Emmanuel" ); s.save( emmanuel ); - book.setMainAuthor(emmanuel); + book.setMainAuthor( emmanuel ); tx.commit(); s.clear(); tx = s.beginTransaction(); @@ -35,8 +238,8 @@ Query query = parser.parse( "summary:Festina" ); org.hibernate.search.FullTextQuery hibQuery = s.createFullTextQuery( query, Book.class ); - hibQuery.setIndexProjection( "id", "summary", "mainAuthor.name"); - + hibQuery.setIndexProjection( "id", "summary", "mainAuthor.name" ); + List result = hibQuery.list(); assertNotNull( result ); assertEquals( "Query with no explicit criteria", 1, result.size() ); @@ -46,11 +249,11 @@ assertEquals( "mainAuthor.name (embedded objects)", "Emmanuel", projection[2] ); hibQuery = s.createFullTextQuery( query, Book.class ); - hibQuery.setIndexProjection( "id", "body", "mainAuthor.name"); + hibQuery.setIndexProjection( "id", "body", "mainAuthor.name" ); try { result = hibQuery.list(); - fail("Projecting an unstored field should raise an exception"); + fail( "Projecting an unstored field should raise an exception" ); } catch (SearchException e) { //success @@ -62,18 +265,18 @@ result = hibQuery.list(); assertNotNull( result ); assertEquals( 1, result.size() ); - assertTrue( "Should not trigger projection", result.get(0) instanceof Book); + assertTrue( "Should not trigger projection", result.get( 0 ) instanceof Book ); hibQuery = s.createFullTextQuery( query, Book.class ); - hibQuery.setIndexProjection(null); + hibQuery.setIndexProjection( null ); result = hibQuery.list(); assertNotNull( result ); assertEquals( 1, result.size() ); - assertTrue( "Should not trigger projection", result.get(0) instanceof Book); + assertTrue( "Should not trigger projection", result.get( 0 ) instanceof Book ); query = parser.parse( "summary:fleurs" ); hibQuery = s.createFullTextQuery( query, Book.class ); - hibQuery.setIndexProjection( "id", "summary", "mainAuthor.name"); + hibQuery.setIndexProjection( "id", "summary", "mainAuthor.name" ); result = hibQuery.list(); assertEquals( 1, result.size() ); projection = (Object[]) result.get( 0 ); @@ -90,7 +293,8 @@ protected Class[] getMappings() { return new Class[] { Book.class, - Author.class + Author.class, + Employee.class }; } }

16 years, 9 months

1
0
0 / 0

Hibernate SVN: r12791 - trunk/HibernateExt/search/src/java/org/hibernate/search/engine.

by hibernate-commits＠lists.jboss.org

Author: epbernard Date: 2007-07-20 19:57:34 -0400 (Fri, 20 Jul 2007) New Revision: 12791 Modified: trunk/HibernateExt/search/src/java/org/hibernate/search/engine/ObjectLoader.java trunk/HibernateExt/search/src/java/org/hibernate/search/engine/QueryLoader.java Log: HSEARCH-99 be sure every object returned is initialized. Modified: trunk/HibernateExt/search/src/java/org/hibernate/search/engine/ObjectLoader.java =================================================================== --- trunk/HibernateExt/search/src/java/org/hibernate/search/engine/ObjectLoader.java 2007-07-20 23:51:23 UTC (rev 12790) +++ trunk/HibernateExt/search/src/java/org/hibernate/search/engine/ObjectLoader.java 2007-07-20 23:57:34 UTC (rev 12791) @@ -23,7 +23,17 @@ } public Object load(EntityInfo entityInfo) { - return session.get( entityInfo.clazz, entityInfo.id ); + //be sure to get an initialized object + Object maybeProxy = session.get( entityInfo.clazz, entityInfo.id ); + try { + Hibernate.initialize( maybeProxy ); + } + catch (ObjectNotFoundException e) { + log.debug( "Object found in Search index but not in database: " + + e.getEntityName() + " wih id " + e.getIdentifier() ); + maybeProxy = null; + } + return maybeProxy; } public List load(EntityInfo... entityInfos) { Modified: trunk/HibernateExt/search/src/java/org/hibernate/search/engine/QueryLoader.java =================================================================== --- trunk/HibernateExt/search/src/java/org/hibernate/search/engine/QueryLoader.java 2007-07-20 23:51:23 UTC (rev 12790) +++ trunk/HibernateExt/search/src/java/org/hibernate/search/engine/QueryLoader.java 2007-07-20 23:57:34 UTC (rev 12791) @@ -7,10 +7,13 @@ import org.hibernate.Criteria; import org.hibernate.Session; import org.hibernate.Hibernate; +import org.hibernate.ObjectNotFoundException; import org.hibernate.annotations.common.AssertionFailure; import org.hibernate.criterion.Disjunction; import org.hibernate.criterion.Restrictions; import org.hibernate.search.engine.EntityInfo; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; /** * @author Emmanuel Bernard @@ -18,6 +21,7 @@ public class QueryLoader implements Loader { private static final int MAX_IN_CLAUSE = 500; private static final List EMPTY_LIST = new ArrayList(0); + private static Log log = LogFactory.getLog( QueryLoader.class ); private Session session; private Class entityType; @@ -36,7 +40,17 @@ public Object load(EntityInfo entityInfo) { - return session.get( entityInfo.clazz, entityInfo.id ); + //be sure to get an initialized object + Object maybeProxy = session.get( entityInfo.clazz, entityInfo.id ); + try { + Hibernate.initialize( maybeProxy ); + } + catch (ObjectNotFoundException e) { + log.debug( "Object found in Search index but not in database: " + + e.getEntityName() + " wih id " + e.getIdentifier() ); + maybeProxy = null; + } + return maybeProxy; } public List load(EntityInfo... entityInfos) {

16 years, 9 months

1
0
0 / 0

Hibernate SVN: r12790 - trunk/HibernateExt/search.

by hibernate-commits＠lists.jboss.org

Author: epbernard Date: 2007-07-20 19:51:23 -0400 (Fri, 20 Jul 2007) New Revision: 12790 Modified: trunk/HibernateExt/search/build.xml Log: Fix build dependency with entitymanager (for tests) Modified: trunk/HibernateExt/search/build.xml =================================================================== --- trunk/HibernateExt/search/build.xml 2007-07-20 20:34:47 UTC (rev 12789) +++ trunk/HibernateExt/search/build.xml 2007-07-20 23:51:23 UTC (rev 12790) @@ -91,6 +91,7 @@ <available file="${jpa-api.jar}" type="file" property="jpa-api.jar.available"/> <available file="${commons-annotations.jar}" type="file" property="commons-annotations.jar.available"/> <available file="${annotations.jar}" type="file" property="annotations.jar.available"/> + <available file="${entitymanager.jar}" type="file" property="entitymanager.jar.available"/> <mkdir dir="${lib.dir}/test"/> <mkdir dir="${build.testresources.dir}"/> </target> @@ -110,7 +111,12 @@ <ant inheritall="false" dir="${basedir}/../annotations" target="jar"/> </target> - <target name="compile" depends="init,get.commons-annotations" description="Compile the Java source code"> + <target name="get.entitymanager" depends="init" unless="entitymanager.jar.available"> + <ant inheritall="false" dir="${basedir}/../entitymanager" target="clean"/> + <ant inheritall="false" dir="${basedir}/../entitymanager" target="jar"/> + </target> + + <target name="compile" depends="init,get.commons-annotations" description="Compile the Java source code"> <available classname="org.eclipse.core.launcher.Main" property="build.compiler" @@ -135,7 +141,7 @@ </copy> </target> - <target name="compiletest" depends="init,get.jpa-api,get.annotations,compile" description="Compile the tests"> + <target name="compiletest" depends="init,get.jpa-api,get.annotations,get.entitymanager,compile" description="Compile the tests"> <available classname="org.eclipse.core.launcher.Main" property="build.compiler"

16 years, 9 months

1
0
0 / 0

Hibernate SVN: r12789 - trunk/HibernateExt/annotations/src/java/org/hibernate/cfg/annotations.

by hibernate-commits＠lists.jboss.org

Author: epbernard Date: 2007-07-20 16:34:47 -0400 (Fri, 20 Jul 2007) New Revision: 12789 Modified: trunk/HibernateExt/annotations/src/java/org/hibernate/cfg/annotations/EntityBinder.java Log: ANN-637 Table.appliesTo wrongly apply to the last table when no matching table exists Modified: trunk/HibernateExt/annotations/src/java/org/hibernate/cfg/annotations/EntityBinder.java =================================================================== --- trunk/HibernateExt/annotations/src/java/org/hibernate/cfg/annotations/EntityBinder.java 2007-07-20 20:32:29 UTC (rev 12788) +++ trunk/HibernateExt/annotations/src/java/org/hibernate/cfg/annotations/EntityBinder.java 2007-07-20 20:34:47 UTC (rev 12789) @@ -750,6 +750,7 @@ //we are in the correct table to find columns break; } + hibTable = null; } if ( hibTable == null ) { throw new AnnotationException(

16 years, 9 months

1
0
0 / 0

Hibernate SVN: r12788 - trunk/HibernateExt/annotations/src/java/org/hibernate/cfg.

by hibernate-commits＠lists.jboss.org

Author: epbernard Date: 2007-07-20 16:32:29 -0400 (Fri, 20 Jul 2007) New Revision: 12788 Modified: trunk/HibernateExt/annotations/src/java/org/hibernate/cfg/AnnotationBinder.java Log: ANN-638 NPE when @Index was wrongly used Modified: trunk/HibernateExt/annotations/src/java/org/hibernate/cfg/AnnotationBinder.java =================================================================== --- trunk/HibernateExt/annotations/src/java/org/hibernate/cfg/AnnotationBinder.java 2007-07-20 19:22:34 UTC (rev 12787) +++ trunk/HibernateExt/annotations/src/java/org/hibernate/cfg/AnnotationBinder.java 2007-07-20 20:32:29 UTC (rev 12788) @@ -1642,13 +1642,16 @@ Index index = property.getAnnotation( Index.class ); if ( index != null ) { if ( joinColumns != null ) { + for (Ejb3Column column : joinColumns) { column.addIndex( index, inSecondPass ); } } else { - for (Ejb3Column column : columns) { - column.addIndex( index, inSecondPass ); + if ( columns != null ) { + for (Ejb3Column column : columns) { + column.addIndex( index, inSecondPass ); + } } } }

16 years, 9 months

1
0
0 / 0

Hibernate SVN: r12787 - in core/trunk: src and 1 other directories.

by hibernate-commits＠lists.jboss.org

Author: steve.ebersole(a)jboss.com Date: 2007-07-20 15:22:34 -0400 (Fri, 20 Jul 2007) New Revision: 12787 Added: core/trunk/src/ core/trunk/src/assembly/ core/trunk/src/assembly/dist.xml Log: added initial assembly Added: core/trunk/src/assembly/dist.xml =================================================================== --- core/trunk/src/assembly/dist.xml (rev 0) +++ core/trunk/src/assembly/dist.xml 2007-07-20 19:22:34 UTC (rev 12787) @@ -0,0 +1,118 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<assembly 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/assembly-1.1.0-SNAPSHOT.xsd"> + +  + + <id>dist</id> + <formats> + <format>zip</format> + <format>tar.gz</format> + </formats> + + <includeBaseDirectory>true</includeBaseDirectory> + <includeSiteDirectory>true</includeSiteDirectory> + + <files> + <file> + <source>lgpl.txt</source> + </file> + <file> +  +  + <source>changelog.txt</source> + </file> + </files> + + <fileSets> + <fileSet> + <outputDirectory>sources</outputDirectory> + <useDefaultExcludes>true</useDefaultExcludes> + <excludes> + <exclude>**/target/**</exclude> + </excludes> + </fileSet> +  + <fileSet> + <directory>documentation/manual/en-US/target/docbook</directory> + <outputDirectory>manual/en-US</outputDirectory> + <includes> + <include>**/**</include> + </includes> + </fileSet> + <fileSet> + <directory>documentation/manual/fr-FR/target/docbook</directory> + <outputDirectory>manual/fr-FR</outputDirectory> + <includes> + <include>**/**</include> + </includes> + </fileSet> + </fileSets> + + <moduleSets> +  + <moduleSet> +  + <includeSubModules>false</includeSubModules> + <includes> + <include>org.hibernate:*</include> + </includes> + <excludes> +  + <exclude>org.hibernate:hibernate-documentation</exclude> +  + <exclude>org.hibernate:hibernate-testsuite</exclude> +  + <exclude>org.hibernate:hibernate-eg</exclude> + </excludes> + <binaries> + <unpack>false</unpack> + <includeDependencies>false</includeDependencies> +  + <outputFileNameMapping>${artifactId}.${extension}</outputFileNameMapping> + <dependencySets> + <dependencySet> + <outputDirectory>lib</outputDirectory> + <includes> + <include>*:jar:*</include> + </includes> + <excludes> + <exclude>org.hibernate:*</exclude> + <exclude>*:sources</exclude> + <exclude>*:javadoc</exclude> +  + <exclude>c3p0:c3p0:jar:0.9.0.4</exclude> + <exclude>commons-logging:commons-logging:jar:1.1</exclude> + <exclude>findbugs:annotations:*</exclude> + <exclude>apache-httpclient:commons-httpclient:*</exclude> + <exclude>apache-slide:*</exclude> + <exclude>jdbm:jdbm:*</exclude> + <exclude>org.beanshell:bsh:*</exclude> + <exclude>sleepycat:je:*</exclude> + </excludes> + </dependencySet> + </dependencySets> + </binaries> + </moduleSet> + </moduleSets> + +</assembly>

16 years, 9 months

1
0
0 / 0

Hibernate SVN: r12786 - core/trunk.

by hibernate-commits＠lists.jboss.org

Author: steve.ebersole(a)jboss.com Date: 2007-07-20 15:21:41 -0400 (Fri, 20 Jul 2007) New Revision: 12786 Modified: core/trunk/pom.xml Log: added initial assembly Modified: core/trunk/pom.xml =================================================================== --- core/trunk/pom.xml 2007-07-20 19:20:16 UTC (rev 12785) +++ core/trunk/pom.xml 2007-07-20 19:21:41 UTC (rev 12786) @@ -54,6 +54,25 @@ <autoVersionSubmodules>true</autoVersionSubmodules> </configuration> </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-assembly-plugin</artifactId> + <version>2.2-beta-1</version> + <executions> + <execution> + <id>assemble</id> + <phase>site</phase> + <goals> + <goal>single</goal> + </goals> + </execution> + </executions> + <configuration> + <descriptors> + <descriptor>src/assembly/dist.xml</descriptor> + </descriptors> + </configuration> + </plugin> </plugins> </build>

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 July 2007