Author: epbernard Date: 2009-11-27 11:44:34 -0500 (Fri, 27 Nov 2009) New Revision: 18075 Modified: search/trunk/pom.xml search/trunk/src/main/java/org/hibernate/search/batchindexing/IdentifierProducer.java search/trunk/src/main/java/org/hibernate/search/jpa/impl/FullTextEntityManagerImpl.java search/trunk/src/main/java/org/hibernate/search/jpa/impl/FullTextQueryImpl.java Log: HSEARCH-423 Migrate to Hibernate Core 3.5 beta2 and JPA 2.0 CR1 Modified: search/trunk/pom.xml =================================================================== --- search/trunk/pom.xml 2009-11-26 20:41:04 UTC (rev 18074) +++ search/trunk/pom.xml 2009-11-27 16:44:34 UTC (rev 18075) @@ -53,7 +53,7 @@ <properties> <slf4jVersion>1.5.8</slf4jVersion> <luceneVersion>2.4.1</luceneVersion> - <hibernateVersion>3.5.0.Beta-1</hibernateVersion> + <hibernateVersion>3.5.0-Beta-2</hibernateVersion> <hibernateCommonsAnnotationVersion>3.2.0.Beta1</hibernateCommonsAnnotationVersion> </properties> @@ -79,7 +79,7 @@ <dependency> <groupId>org.hibernate.java-persistence</groupId> <artifactId>jpa-api</artifactId> - <version>2.0.Beta-20090815</version> + <version>2.0-cr-1</version> </dependency> <dependency> <groupId>org.apache.lucene</groupId> Modified: search/trunk/src/main/java/org/hibernate/search/batchindexing/IdentifierProducer.java =================================================================== --- search/trunk/src/main/java/org/hibernate/search/batchindexing/IdentifierProducer.java 2009-11-26 20:41:04 UTC (rev 18074) +++ search/trunk/src/main/java/org/hibernate/search/batchindexing/IdentifierProducer.java 2009-11-27 16:44:34 UTC (rev 18075) @@ -111,14 +111,14 @@ } private void loadAllIdentifiers(final StatelessSession session) throws InterruptedException { - Integer totalCount = (Integer) session + Long totalCount = (Long) session .createCriteria( indexedType ) .setProjection( Projections.count( "id" ) ) .setCacheable( false ) .uniqueResult(); if ( objectsLimit != 0 && objectsLimit < totalCount.intValue() ) { - totalCount = objectsLimit; + totalCount = new Long(objectsLimit); } log.debug( "going to fetch {} primary keys", totalCount); monitor.addToTotalCount( totalCount ); Modified: search/trunk/src/main/java/org/hibernate/search/jpa/impl/FullTextEntityManagerImpl.java =================================================================== --- search/trunk/src/main/java/org/hibernate/search/jpa/impl/FullTextEntityManagerImpl.java 2009-11-26 20:41:04 UTC (rev 18074) +++ search/trunk/src/main/java/org/hibernate/search/jpa/impl/FullTextEntityManagerImpl.java 2009-11-27 16:44:34 UTC (rev 18075) @@ -36,7 +36,7 @@ import javax.persistence.TypedQuery; import javax.persistence.metamodel.Metamodel; import javax.persistence.criteria.CriteriaQuery; -import javax.persistence.criteria.QueryBuilder; +import javax.persistence.criteria.CriteriaBuilder; import org.hibernate.search.jpa.FullTextEntityManager; import org.hibernate.search.jpa.FullTextQuery; @@ -212,10 +212,6 @@ return null; //To change body of implemented methods use File | Settings | File Templates. } - public Set<String> getSupportedProperties() { - return null; //To change body of implemented methods use File | Settings | File Templates. - } - public Query createQuery(String ejbqlString) { return em.createQuery( ejbqlString ); } @@ -276,7 +272,7 @@ return null; //To change body of implemented methods use File | Settings | File Templates. } - public QueryBuilder getQueryBuilder() { + public CriteriaBuilder getCriteriaBuilder() { return null; //To change body of implemented methods use File | Settings | File Templates. } @@ -284,6 +280,7 @@ return null; //To change body of implemented methods use File | Settings | File Templates. } + public MassIndexer createIndexer(Class<?>... types) { return getFullTextSession().createIndexer( types ); } Modified: search/trunk/src/main/java/org/hibernate/search/jpa/impl/FullTextQueryImpl.java =================================================================== --- search/trunk/src/main/java/org/hibernate/search/jpa/impl/FullTextQueryImpl.java 2009-11-26 20:41:04 UTC (rev 18074) +++ search/trunk/src/main/java/org/hibernate/search/jpa/impl/FullTextQueryImpl.java 2009-11-27 16:44:34 UTC (rev 18075) @@ -278,6 +278,18 @@ return null; //To change body of implemented methods use File | Settings | File Templates. } + public <T> Query setParameter(Parameter<T> tParameter, T t) { + return null; //To change body of implemented methods use File | Settings | File Templates. + } + + public Query setParameter(Parameter<Calendar> calendarParameter, Calendar calendar, TemporalType temporalType) { + return null; //To change body of implemented methods use File | Settings | File Templates. + } + + public Query setParameter(Parameter<Date> dateParameter, Date date, TemporalType temporalType) { + return null; //To change body of implemented methods use File | Settings | File Templates. + } + public Set<String> getSupportedHints() { return null; //To change body of implemented methods use File | Settings | File Templates. }