[hibernate-commits] Hibernate SVN: r17526 - in core/trunk: entitymanager/src/main/java/org/hibernate/ejb/criteria/expression and 3 other directories.

Author: steve.ebersole(a)jboss.com Date: 2009-09-17 17:26:25 -0400 (Thu, 17 Sep 2009) New Revision: 17526 Modified: core/trunk/entitymanager/src/main/java/org/hibernate/ejb/criteria/AbstractBasicPluralJoin.java core/trunk/entitymanager/src/main/java/org/hibernate/ejb/criteria/AbstractNode.java core/trunk/entitymanager/src/main/java/org/hibernate/ejb/criteria/BasicCollectionJoinImpl.java core/trunk/entitymanager/src/main/java/org/hibernate/ejb/criteria/BasicListJoinImpl.java core/trunk/entitymanager/src/main/java/org/hibernate/ejb/criteria/BasicMapJoinImpl.java core/trunk/entitymanager/src/main/java/org/hibernate/ejb/criteria/BasicPathUsageException.java core/trunk/entitymanager/src/main/java/org/hibernate/ejb/criteria/BasicSetJoinImpl.java core/trunk/entitymanager/src/main/java/org/hibernate/ejb/criteria/CollectionJoinImpl.java core/trunk/entitymanager/src/main/java/org/hibernate/ejb/criteria/CriteriaQueryImpl.java core/trunk/entitymanager/src/main/java/org/hibernate/ejb/criteria/CriteriaSubqueryImpl.java core/trunk/entitymanager/src/main/java/org/hibernate/ejb/criteria/FromImpl.java core/trunk/entitymanager/src/main/java/org/hibernate/ejb/criteria/JoinImpl.java core/trunk/entitymanager/src/main/java/org/hibernate/ejb/criteria/JoinImplementors.java core/trunk/entitymanager/src/main/java/org/hibernate/ejb/criteria/ListJoinImpl.java core/trunk/entitymanager/src/main/java/org/hibernate/ejb/criteria/MapJoinImpl.java core/trunk/entitymanager/src/main/java/org/hibernate/ejb/criteria/MapKeyHelpers.java core/trunk/entitymanager/src/main/java/org/hibernate/ejb/criteria/OrderImpl.java core/trunk/entitymanager/src/main/java/org/hibernate/ejb/criteria/ParameterContainer.java core/trunk/entitymanager/src/main/java/org/hibernate/ejb/criteria/ParameterRegistry.java core/trunk/entitymanager/src/main/java/org/hibernate/ejb/criteria/PathImpl.java core/trunk/entitymanager/src/main/java/org/hibernate/ejb/criteria/QueryBuilderImpl.java core/trunk/entitymanager/src/main/java/org/hibernate/ejb/criteria/QueryStructure.java core/trunk/entitymanager/src/main/java/org/hibernate/ejb/criteria/RootImpl.java core/trunk/entitymanager/src/main/java/org/hibernate/ejb/criteria/SetJoinImpl.java core/trunk/entitymanager/src/main/java/org/hibernate/ejb/criteria/expression/AbstractTupleElement.java core/trunk/entitymanager/src/main/java/org/hibernate/ejb/criteria/expression/BinaryArithmeticOperation.java core/trunk/entitymanager/src/main/java/org/hibernate/ejb/criteria/expression/BinaryOperatorExpression.java core/trunk/entitymanager/src/main/java/org/hibernate/ejb/criteria/expression/CoalesceExpression.java core/trunk/entitymanager/src/main/java/org/hibernate/ejb/criteria/expression/CollectionExpression.java core/trunk/entitymanager/src/main/java/org/hibernate/ejb/criteria/expression/CompoundSelectionImpl.java core/trunk/entitymanager/src/main/java/org/hibernate/ejb/criteria/expression/ConcatExpression.java core/trunk/entitymanager/src/main/java/org/hibernate/ejb/criteria/expression/EntityTypeExpression.java core/trunk/entitymanager/src/main/java/org/hibernate/ejb/criteria/expression/ExpressionImpl.java core/trunk/entitymanager/src/main/java/org/hibernate/ejb/criteria/expression/ListIndexExpression.java core/trunk/entitymanager/src/main/java/org/hibernate/ejb/criteria/expression/LiteralExpression.java core/trunk/entitymanager/src/main/java/org/hibernate/ejb/criteria/expression/NullifExpression.java core/trunk/entitymanager/src/main/java/org/hibernate/ejb/criteria/expression/ParameterExpressionImpl.java core/trunk/entitymanager/src/main/java/org/hibernate/ejb/criteria/expression/SearchedCaseExpression.java core/trunk/entitymanager/src/main/java/org/hibernate/ejb/criteria/expression/SelectionImpl.java core/trunk/entitymanager/src/main/java/org/hibernate/ejb/criteria/expression/SimpleCaseExpression.java core/trunk/entitymanager/src/main/java/org/hibernate/ejb/criteria/expression/SizeOfCollectionExpression.java core/trunk/entitymanager/src/main/java/org/hibernate/ejb/criteria/expression/SubqueryComparisonModifierExpression.java core/trunk/entitymanager/src/main/java/org/hibernate/ejb/criteria/expression/UnaryArithmeticOperation.java core/trunk/entitymanager/src/main/java/org/hibernate/ejb/criteria/expression/UnaryOperatorExpression.java core/trunk/entitymanager/src/main/java/org/hibernate/ejb/criteria/expression/function/AbsFunction.java core/trunk/entitymanager/src/main/java/org/hibernate/ejb/criteria/expression/function/AggregationFunction.java core/trunk/entitymanager/src/main/java/org/hibernate/ejb/criteria/expression/function/BasicFunctionExpression.java core/trunk/entitymanager/src/main/java/org/hibernate/ejb/criteria/expression/function/CastFunction.java core/trunk/entitymanager/src/main/java/org/hibernate/ejb/criteria/expression/function/CurrentDateFunction.java core/trunk/entitymanager/src/main/java/org/hibernate/ejb/criteria/expression/function/CurrentTimeFunction.java core/trunk/entitymanager/src/main/java/org/hibernate/ejb/criteria/expression/function/CurrentTimestampFunction.java core/trunk/entitymanager/src/main/java/org/hibernate/ejb/criteria/expression/function/FunctionExpression.java core/trunk/entitymanager/src/main/java/org/hibernate/ejb/criteria/expression/function/LengthFunction.java core/trunk/entitymanager/src/main/java/org/hibernate/ejb/criteria/expression/function/LocateFunction.java core/trunk/entitymanager/src/main/java/org/hibernate/ejb/criteria/expression/function/LowerFunction.java core/trunk/entitymanager/src/main/java/org/hibernate/ejb/criteria/expression/function/ParameterizedFunctionExpression.java core/trunk/entitymanager/src/main/java/org/hibernate/ejb/criteria/expression/function/SqrtFunction.java core/trunk/entitymanager/src/main/java/org/hibernate/ejb/criteria/expression/function/SubstringFunction.java core/trunk/entitymanager/src/main/java/org/hibernate/ejb/criteria/expression/function/TrimFunction.java core/trunk/entitymanager/src/main/java/org/hibernate/ejb/criteria/expression/function/UpperFunction.java core/trunk/entitymanager/src/main/java/org/hibernate/ejb/criteria/predicate/AbstractPredicateImpl.java core/trunk/entitymanager/src/main/java/org/hibernate/ejb/criteria/predicate/AbstractSimplePredicate.java core/trunk/entitymanager/src/main/java/org/hibernate/ejb/criteria/predicate/BetweenPredicate.java core/trunk/entitymanager/src/main/java/org/hibernate/ejb/criteria/predicate/BooleanExpressionPredicate.java core/trunk/entitymanager/src/main/java/org/hibernate/ejb/criteria/predicate/ComparisonPredicate.java core/trunk/entitymanager/src/main/java/org/hibernate/ejb/criteria/predicate/CompoundPredicate.java core/trunk/entitymanager/src/main/java/org/hibernate/ejb/criteria/predicate/ExistsPredicate.java core/trunk/entitymanager/src/main/java/org/hibernate/ejb/criteria/predicate/ExplicitTruthValueCheck.java core/trunk/entitymanager/src/main/java/org/hibernate/ejb/criteria/predicate/InPredicate.java core/trunk/entitymanager/src/main/java/org/hibernate/ejb/criteria/predicate/IsEmptyPredicate.java core/trunk/entitymanager/src/main/java/org/hibernate/ejb/criteria/predicate/LikePredicate.java core/trunk/entitymanager/src/main/java/org/hibernate/ejb/criteria/predicate/MemberOfPredicate.java core/trunk/entitymanager/src/main/java/org/hibernate/ejb/criteria/predicate/NullnessPredicate.java core/trunk/entitymanager/src/main/java/org/hibernate/ejb/criteria/predicate/TruthValue.java core/trunk/parent/pom.xml Log: HHH-4196 - Implement JPA 2.0 criteria apis (building) Modified: core/trunk/entitymanager/src/main/java/org/hibernate/ejb/criteria/AbstractBasicPluralJoin.java =================================================================== --- core/trunk/entitymanager/src/main/java/org/hibernate/ejb/criteria/AbstractBasicPluralJoin.java 2009-09-17 20:22:44 UTC (rev 17525) +++ core/trunk/entitymanager/src/main/java/org/hibernate/ejb/criteria/AbstractBasicPluralJoin.java 2009-09-17 21:26:25 UTC (rev 17526) @@ -1,9 +1,11 @@ /* - * Copyright (c) 2009, 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. + * Hibernate, Relational Persistence for Idiomatic Java * + * Copyright (c) 2009 by Red Hat Inc and/or its affiliates or by + * third-party contributors as indicated by either @author tags or express + * copyright attribution statements applied by the authors. All + * third-party contributions are distributed under license by Red Hat Inc. + * * This copyrighted material is made available to anyone wishing to use, modify, * copy, or redistribute it subject to the terms and conditions of the GNU * Lesser General Public License, as published by the Free Software Foundation. Modified: core/trunk/entitymanager/src/main/java/org/hibernate/ejb/criteria/AbstractNode.java =================================================================== --- core/trunk/entitymanager/src/main/java/org/hibernate/ejb/criteria/AbstractNode.java 2009-09-17 20:22:44 UTC (rev 17525) +++ core/trunk/entitymanager/src/main/java/org/hibernate/ejb/criteria/AbstractNode.java 2009-09-17 21:26:25 UTC (rev 17526) @@ -1,9 +1,11 @@ /* - * Copyright (c) 2009, 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. + * Hibernate, Relational Persistence for Idiomatic Java * + * Copyright (c) 2009 by Red Hat Inc and/or its affiliates or by + * third-party contributors as indicated by either @author tags or express + * copyright attribution statements applied by the authors. All + * third-party contributions are distributed under license by Red Hat Inc. + * * This copyrighted material is made available to anyone wishing to use, modify, * copy, or redistribute it subject to the terms and conditions of the GNU * Lesser General Public License, as published by the Free Software Foundation. Modified: core/trunk/entitymanager/src/main/java/org/hibernate/ejb/criteria/BasicCollectionJoinImpl.java =================================================================== --- core/trunk/entitymanager/src/main/java/org/hibernate/ejb/criteria/BasicCollectionJoinImpl.java 2009-09-17 20:22:44 UTC (rev 17525) +++ core/trunk/entitymanager/src/main/java/org/hibernate/ejb/criteria/BasicCollectionJoinImpl.java 2009-09-17 21:26:25 UTC (rev 17526) @@ -1,9 +1,11 @@ /* - * Copyright (c) 2009, 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. + * Hibernate, Relational Persistence for Idiomatic Java * + * Copyright (c) 2009 by Red Hat Inc and/or its affiliates or by + * third-party contributors as indicated by either @author tags or express + * copyright attribution statements applied by the authors. All + * third-party contributions are distributed under license by Red Hat Inc. + * * This copyrighted material is made available to anyone wishing to use, modify, * copy, or redistribute it subject to the terms and conditions of the GNU * Lesser General Public License, as published by the Free Software Foundation. @@ -23,6 +25,7 @@ import javax.persistence.criteria.JoinType; import javax.persistence.metamodel.CollectionAttribute; +import org.hibernate.ejb.criteria.JoinImplementors.CollectionJoinImplementor; /** * Represents a join to a persistent collection, defined as type {@link java.util.Collection}, whose elements @@ -44,8 +47,26 @@ } @Override + public CollectionAttribute<? super O, E> getAttribute() { + return (CollectionAttribute<? super O, E>) super.getAttribute(); + } + + @Override public CollectionAttribute<? super O, E> getModel() { - return (CollectionAttribute<? super O, E>) super.getAttribute(); + return getAttribute(); } + @Override + public CollectionJoinImplementor<O, E> correlateTo(CriteriaSubqueryImpl subquery) { + BasicCollectionJoinImpl<O,E> correlation = new BasicCollectionJoinImpl<O,E>( + queryBuilder(), + getJavaType(), + (PathImpl<O>) getParentPath(), + getModel(), + getJoinType() + ); + correlation.defineJoinScope( subquery.getJoinScope() ); + return correlation; + } + } Modified: core/trunk/entitymanager/src/main/java/org/hibernate/ejb/criteria/BasicListJoinImpl.java =================================================================== --- core/trunk/entitymanager/src/main/java/org/hibernate/ejb/criteria/BasicListJoinImpl.java 2009-09-17 20:22:44 UTC (rev 17525) +++ core/trunk/entitymanager/src/main/java/org/hibernate/ejb/criteria/BasicListJoinImpl.java 2009-09-17 21:26:25 UTC (rev 17526) @@ -1,9 +1,11 @@ /* - * Copyright (c) 2009, 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. + * Hibernate, Relational Persistence for Idiomatic Java * + * Copyright (c) 2009 by Red Hat Inc and/or its affiliates or by + * third-party contributors as indicated by either @author tags or express + * copyright attribution statements applied by the authors. All + * third-party contributions are distributed under license by Red Hat Inc. + * * This copyrighted material is made available to anyone wishing to use, modify, * copy, or redistribute it subject to the terms and conditions of the GNU * Lesser General Public License, as published by the Free Software Foundation. @@ -24,6 +26,7 @@ import javax.persistence.criteria.Expression; import javax.persistence.criteria.JoinType; import javax.persistence.metamodel.ListAttribute; +import org.hibernate.ejb.criteria.JoinImplementors.ListJoinImplementor; import org.hibernate.ejb.criteria.expression.ListIndexExpression; /** @@ -58,4 +61,18 @@ public Expression<Integer> index() { return new ListIndexExpression( queryBuilder(), getAttribute() ); } + + @Override + public ListJoinImplementor<O, E> correlateTo(CriteriaSubqueryImpl subquery) { + BasicListJoinImpl<O,E> correlation = new BasicListJoinImpl<O,E>( + queryBuilder(), + getJavaType(), + (PathImpl<O>) getParentPath(), + getAttribute(), + getJoinType() + ); + correlation.defineJoinScope( subquery.getJoinScope() ); + return correlation; + } + } Modified: core/trunk/entitymanager/src/main/java/org/hibernate/ejb/criteria/BasicMapJoinImpl.java =================================================================== --- core/trunk/entitymanager/src/main/java/org/hibernate/ejb/criteria/BasicMapJoinImpl.java 2009-09-17 20:22:44 UTC (rev 17525) +++ core/trunk/entitymanager/src/main/java/org/hibernate/ejb/criteria/BasicMapJoinImpl.java 2009-09-17 21:26:25 UTC (rev 17526) @@ -1,9 +1,11 @@ /* - * Copyright (c) 2009, 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. + * Hibernate, Relational Persistence for Idiomatic Java * + * Copyright (c) 2009 by Red Hat Inc and/or its affiliates or by + * third-party contributors as indicated by either @author tags or express + * copyright attribution statements applied by the authors. All + * third-party contributions are distributed under license by Red Hat Inc. + * * This copyrighted material is made available to anyone wishing to use, modify, * copy, or redistribute it subject to the terms and conditions of the GNU * Lesser General Public License, as published by the Free Software Foundation. @@ -29,6 +31,7 @@ import javax.persistence.criteria.Path; import javax.persistence.metamodel.MapAttribute; import javax.persistence.metamodel.Type.PersistenceType; +import org.hibernate.ejb.criteria.JoinImplementors.MapJoinImplementor; /** * Represents a join to a persistent collection, defined as type {@link java.util.Map}, whose elements @@ -54,6 +57,19 @@ } @Override + public MapJoinImplementor<O, K, V> correlateTo(CriteriaSubqueryImpl subquery) { + BasicMapJoinImpl<O,K,V> correlation = new BasicMapJoinImpl<O,K,V>( + queryBuilder(), + getJavaType(), + (PathImpl<O>) getParentPath(), + getAttribute(), + getJoinType() + ); + correlation.defineJoinScope( subquery.getJoinScope() ); + return correlation; + } + + @Override public MapAttribute<? super O, K, V> getAttribute() { return (MapAttribute<? super O, K, V>) super.getAttribute(); } Modified: core/trunk/entitymanager/src/main/java/org/hibernate/ejb/criteria/BasicPathUsageException.java =================================================================== --- core/trunk/entitymanager/src/main/java/org/hibernate/ejb/criteria/BasicPathUsageException.java 2009-09-17 20:22:44 UTC (rev 17525) +++ core/trunk/entitymanager/src/main/java/org/hibernate/ejb/criteria/BasicPathUsageException.java 2009-09-17 21:26:25 UTC (rev 17526) @@ -1,9 +1,11 @@ /* - * Copyright (c) 2009, 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. + * Hibernate, Relational Persistence for Idiomatic Java * + * Copyright (c) 2009 by Red Hat Inc and/or its affiliates or by + * third-party contributors as indicated by either @author tags or express + * copyright attribution statements applied by the authors. All + * third-party contributions are distributed under license by Red Hat Inc. + * * This copyrighted material is made available to anyone wishing to use, modify, * copy, or redistribute it subject to the terms and conditions of the GNU * Lesser General Public License, as published by the Free Software Foundation. Modified: core/trunk/entitymanager/src/main/java/org/hibernate/ejb/criteria/BasicSetJoinImpl.java =================================================================== --- core/trunk/entitymanager/src/main/java/org/hibernate/ejb/criteria/BasicSetJoinImpl.java 2009-09-17 20:22:44 UTC (rev 17525) +++ core/trunk/entitymanager/src/main/java/org/hibernate/ejb/criteria/BasicSetJoinImpl.java 2009-09-17 21:26:25 UTC (rev 17526) @@ -1,9 +1,11 @@ /* - * Copyright (c) 2009, 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. + * Hibernate, Relational Persistence for Idiomatic Java * + * Copyright (c) 2009 by Red Hat Inc and/or its affiliates or by + * third-party contributors as indicated by either @author tags or express + * copyright attribution statements applied by the authors. All + * third-party contributions are distributed under license by Red Hat Inc. + * * This copyrighted material is made available to anyone wishing to use, modify, * copy, or redistribute it subject to the terms and conditions of the GNU * Lesser General Public License, as published by the Free Software Foundation. @@ -23,6 +25,7 @@ import javax.persistence.criteria.JoinType; import javax.persistence.metamodel.SetAttribute; +import org.hibernate.ejb.criteria.JoinImplementors.SetJoinImplementor; /** * Represents a join to a persistent collection, defined as type {@link java.util.Set}, whose elements @@ -44,7 +47,25 @@ } @Override + public SetJoinImplementor<O, E> correlateTo(CriteriaSubqueryImpl subquery) { + BasicSetJoinImpl<O,E> correlation = new BasicSetJoinImpl<O,E>( + queryBuilder(), + getJavaType(), + (PathImpl<O>) getParentPath(), + getAttribute(), + getJoinType() + ); + correlation.defineJoinScope( subquery.getJoinScope() ); + return correlation; + } + + @Override + public SetAttribute<? super O, E> getAttribute() { + return (SetAttribute<? super O, E>) super.getAttribute(); + } + + @Override public SetAttribute<? super O, E> getModel() { - return (SetAttribute<? super O, E>) super.getAttribute(); + return getAttribute(); } } Modified: core/trunk/entitymanager/src/main/java/org/hibernate/ejb/criteria/CollectionJoinImpl.java =================================================================== --- core/trunk/entitymanager/src/main/java/org/hibernate/ejb/criteria/CollectionJoinImpl.java 2009-09-17 20:22:44 UTC (rev 17525) +++ core/trunk/entitymanager/src/main/java/org/hibernate/ejb/criteria/CollectionJoinImpl.java 2009-09-17 21:26:25 UTC (rev 17526) @@ -1,9 +1,11 @@ /* - * Copyright (c) 2009, 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. + * Hibernate, Relational Persistence for Idiomatic Java * + * Copyright (c) 2009 by Red Hat Inc and/or its affiliates or by + * third-party contributors as indicated by either @author tags or express + * copyright attribution statements applied by the authors. All + * third-party contributions are distributed under license by Red Hat Inc. + * * This copyrighted material is made available to anyone wishing to use, modify, * copy, or redistribute it subject to the terms and conditions of the GNU * Lesser General Public License, as published by the Free Software Foundation. @@ -23,6 +25,7 @@ import javax.persistence.criteria.JoinType; import javax.persistence.metamodel.CollectionAttribute; +import org.hibernate.ejb.criteria.JoinImplementors.CollectionJoinImplementor; /** * Represents a join to a persistent collection, defined as type {@link java.util.Collection}, whose elements @@ -44,8 +47,26 @@ } @Override + public CollectionJoinImplementor<O, E> correlateTo(CriteriaSubqueryImpl subquery) { + CollectionJoinImpl<O,E> correlation = new CollectionJoinImpl<O,E>( + queryBuilder(), + getJavaType(), + (PathImpl<O>) getParentPath(), + getAttribute(), + getJoinType() + ); + correlation.defineJoinScope( subquery.getJoinScope() ); + return correlation; + } + + @Override + public CollectionAttribute<? super O, E> getAttribute() { + return (CollectionAttribute<? super O, E>) super.getAttribute(); + } + + @Override public CollectionAttribute<? super O, E> getModel() { - return (CollectionAttribute<? super O, E>) super.getAttribute(); + return getAttribute(); } } Modified: core/trunk/entitymanager/src/main/java/org/hibernate/ejb/criteria/CriteriaQueryImpl.java =================================================================== --- core/trunk/entitymanager/src/main/java/org/hibernate/ejb/criteria/CriteriaQueryImpl.java 2009-09-17 20:22:44 UTC (rev 17525) +++ core/trunk/entitymanager/src/main/java/org/hibernate/ejb/criteria/CriteriaQueryImpl.java 2009-09-17 21:26:25 UTC (rev 17526) @@ -1,9 +1,11 @@ /* - * Copyright (c) 2009, 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. + * Hibernate, Relational Persistence for Idiomatic Java * + * Copyright (c) 2009 by Red Hat Inc and/or its affiliates or by + * third-party contributors as indicated by either @author tags or express + * copyright attribution statements applied by the authors. All + * third-party contributions are distributed under license by Red Hat Inc. + * * This copyrighted material is made available to anyone wishing to use, modify, * copy, or redistribute it subject to the terms and conditions of the GNU * Lesser General Public License, as published by the Free Software Foundation. @@ -57,6 +59,9 @@ this.queryStructure = new QueryStructure<T>( this, queryBuilder ); } + /** + * {@inheritDoc} + */ public Class<T> getResultType() { return returnType; } @@ -64,15 +69,24 @@ // SELECTION ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + /** + * {@inheritDoc} + */ public CriteriaQuery<T> distinct(boolean applyDistinction) { queryStructure.setDistinction( applyDistinction ); return this; } + /** + * {@inheritDoc} + */ public boolean isDistinct() { return queryStructure.isDistinction(); } + /** + * {@inheritDoc} + */ @SuppressWarnings({ "unchecked" }) public Selection<T> getSelection() { return ( Selection<T> ) queryStructure.getSelection(); @@ -82,16 +96,25 @@ queryStructure.setSelection( selection ); } + /** + * {@inheritDoc} + */ public CriteriaQuery<T> select(Selection<? extends T> selection) { applySelection( selection ); return this; } + /** + * {@inheritDoc} + */ @SuppressWarnings({ "unchecked" }) public CriteriaQuery<T> multiselect(Selection<?>... selections) { return multiselect( Arrays.asList( selections ) ); } + /** + * {@inheritDoc} + */ @SuppressWarnings({ "unchecked" }) public CriteriaQuery<T> multiselect(List<Selection<?>> selections) { final Selection<? extends T> selection; @@ -131,14 +154,23 @@ // ROOTS ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + /** + * {@inheritDoc} + */ public Set<Root<?>> getRoots() { return queryStructure.getRoots(); } + /** + * {@inheritDoc} + */ public <X> Root<X> from(EntityType<X> entityType) { return queryStructure.from( entityType ); } + /** + * {@inheritDoc} + */ public <X> Root<X> from(Class<X> entityClass) { return queryStructure.from( entityClass ); } @@ -188,6 +220,11 @@ return this; } + public CriteriaQuery<T> groupBy(List<Expression<?>> groupings) { + queryStructure.setGroupings( groupings ); + return this; + } + /** * {@inheritDoc} */ @@ -214,10 +251,16 @@ // ORDERING ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + /** + * {@inheritDoc} + */ public List<Order> getOrderList() { return orderSpecs; } + /** + * {@inheritDoc} + */ public CriteriaQuery<T> orderBy(Order... orders) { if ( orders != null && orders.length > 0 ) { orderSpecs = Arrays.asList( orders ); @@ -228,10 +271,24 @@ return this; } + /** + * {@inheritDoc} + */ + public CriteriaQuery<T> orderBy(List<Order> orders) { + orderSpecs = orders; + return this; + } + + /** + * {@inheritDoc} + */ public Set<ParameterExpression<?>> getParameters() { return queryStructure.getParameters(); } + /** + * {@inheritDoc} + */ public <U> Subquery<U> subquery(Class<U> subqueryType) { return queryStructure.subquery( subqueryType ); } Modified: core/trunk/entitymanager/src/main/java/org/hibernate/ejb/criteria/CriteriaSubqueryImpl.java =================================================================== --- core/trunk/entitymanager/src/main/java/org/hibernate/ejb/criteria/CriteriaSubqueryImpl.java 2009-09-17 20:22:44 UTC (rev 17525) +++ core/trunk/entitymanager/src/main/java/org/hibernate/ejb/criteria/CriteriaSubqueryImpl.java 2009-09-17 21:26:25 UTC (rev 17526) @@ -1,9 +1,11 @@ /* - * Copyright (c) 2009, 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. + * Hibernate, Relational Persistence for Idiomatic Java * + * Copyright (c) 2009 by Red Hat Inc and/or its affiliates or by + * third-party contributors as indicated by either @author tags or express + * copyright attribution statements applied by the authors. All + * third-party contributions are distributed under license by Red Hat Inc. + * * This copyrighted material is made available to anyone wishing to use, modify, * copy, or redistribute it subject to the terms and conditions of the GNU * Lesser General Public License, as published by the Free Software Foundation. @@ -23,9 +25,12 @@ import java.util.List; import java.util.Set; +import java.util.HashSet; +import java.util.Collections; import javax.persistence.criteria.AbstractQuery; import javax.persistence.criteria.CollectionJoin; import javax.persistence.criteria.Expression; +import javax.persistence.criteria.Fetch; import javax.persistence.criteria.Join; import javax.persistence.criteria.ListJoin; import javax.persistence.criteria.MapJoin; @@ -35,6 +40,7 @@ import javax.persistence.criteria.SetJoin; import javax.persistence.criteria.Subquery; import javax.persistence.metamodel.EntityType; +import org.hibernate.ejb.criteria.FromImpl.JoinScope; import org.hibernate.ejb.criteria.expression.ExpressionImpl; /** @@ -48,8 +54,18 @@ private final QueryStructure<T> queryStructure; private Expression<T> selection; - private Set<Join<?, ?>> joins; + private Set<Join<?, ?>> correlatedJoins = new HashSet<Join<?,?>>(); + private final FromImpl.JoinScope joinScope = new FromImpl.JoinScope() { + public void addJoin(Join join) { + correlatedJoins.add( join ); + } + + public void addFetch(Fetch fetch) { + throw new UnsupportedOperationException( "Cannot define fetch from a subquery correlation" ); + } + }; + public CriteriaSubqueryImpl( QueryBuilderImpl queryBuilder, Class<T> javaType, @@ -59,28 +75,58 @@ this.queryStructure = new QueryStructure<T>( this, queryBuilder ); } + /** + * Get the scope used to scope joins to this subquery. + * + * @return The subquery's join scope. + */ + public JoinScope getJoinScope() { + return joinScope; + } + + /** + * {@inheritDoc} + */ public AbstractQuery<?> getParent() { return parent; } + /** + * {@inheritDoc} + */ public void registerParameters(ParameterRegistry registry) { for ( ParameterExpression param : queryStructure.getParameters() ) { registry.registerParameter( param ); } - // TODO : correlations. Can they contain parameters? } + /** + * {@inheritDoc} + */ + public Class<T> getResultType() { + return getJavaType(); + } + // ROOTS ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + /** + * {@inheritDoc} + */ public Set<Root<?>> getRoots() { return queryStructure.getRoots(); } + /** + * {@inheritDoc} + */ public <X> Root<X> from(EntityType<X> entityType) { return queryStructure.from( entityType ); } + /** + * {@inheritDoc} + */ public <X> Root<X> from(Class<X> entityClass) { return queryStructure.from( entityClass ); } @@ -156,6 +202,14 @@ /** * {@inheritDoc} */ + public Subquery<T> groupBy(List<Expression<?>> groupings) { + queryStructure.setGroupings( groupings ); + return this; + } + + /** + * {@inheritDoc} + */ public Predicate getGroupRestriction() { return queryStructure.getHaving(); } @@ -179,34 +233,58 @@ // CORRELATIONS ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ - public Set<Join<?, ?>> getJoins() { - return joins; + /** + * {@inheritDoc} + */ + public Set<Join<?, ?>> getCorrelatedJoins() { + return correlatedJoins; } - public <Y> Root<Y> correlate(Root<Y> arg0) { - throw new UnsupportedOperationException("Not supported yet."); + /** + * {@inheritDoc} + */ + public <Y> Root<Y> correlate(Root<Y> source) { + return ( ( RootImpl<Y> ) source ).correlateTo( this ); } - public <X, Y> Join<X, Y> correlate(Join<X, Y> arg0) { - throw new UnsupportedOperationException("Not supported yet."); + /** + * {@inheritDoc} + */ + public <X, Y> Join<X, Y> correlate(Join<X, Y> source) { + return ( ( JoinImplementors.JoinImplementor<X,Y> ) source ).correlateTo( this ); } - public <X, Y> CollectionJoin<X, Y> correlate(CollectionJoin<X, Y> arg0) { - throw new UnsupportedOperationException("Not supported yet."); + /** + * {@inheritDoc} + */ + public <X, Y> CollectionJoin<X, Y> correlate(CollectionJoin<X, Y> source) { + return ( ( JoinImplementors.CollectionJoinImplementor<X,Y> ) source ).correlateTo( this ); } - public <X, Y> SetJoin<X, Y> correlate(SetJoin<X, Y> arg0) { - throw new UnsupportedOperationException("Not supported yet."); + /** + * {@inheritDoc} + */ + public <X, Y> SetJoin<X, Y> correlate(SetJoin<X, Y> source) { + return ( ( JoinImplementors.SetJoinImplementor<X,Y> ) source ).correlateTo( this ); } - public <X, Y> ListJoin<X, Y> correlate(ListJoin<X, Y> arg0) { - throw new UnsupportedOperationException("Not supported yet."); + /** + * {@inheritDoc} + */ + public <X, Y> ListJoin<X, Y> correlate(ListJoin<X, Y> source) { + return ( ( JoinImplementors.ListJoinImplementor<X,Y> ) source ).correlateTo( this ); } - public <X, K, V> MapJoin<X, K, V> correlate(MapJoin<X, K, V> arg0) { - throw new UnsupportedOperationException("Not supported yet."); + /** + * {@inheritDoc} + */ + public <X, K, V> MapJoin<X, K, V> correlate(MapJoin<X, K, V> source) { + return ( ( JoinImplementors.MapJoinImplementor<X, K, V> ) source ).correlateTo( this ); } + /** + * {@inheritDoc} + */ public <U> Subquery<U> subquery(Class<U> subqueryType) { return queryStructure.subquery( subqueryType ); } Modified: core/trunk/entitymanager/src/main/java/org/hibernate/ejb/criteria/FromImpl.java =================================================================== --- core/trunk/entitymanager/src/main/java/org/hibernate/ejb/criteria/FromImpl.java 2009-09-17 20:22:44 UTC (rev 17525) +++ core/trunk/entitymanager/src/main/java/org/hibernate/ejb/criteria/FromImpl.java 2009-09-17 21:26:25 UTC (rev 17526) @@ -1,9 +1,11 @@ /* - * Copyright (c) 2009, 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. + * Hibernate, Relational Persistence for Idiomatic Java * + * Copyright (c) 2009 by Red Hat Inc and/or its affiliates or by + * third-party contributors as indicated by either @author tags or express + * copyright attribution statements applied by the authors. All + * third-party contributions are distributed under license by Red Hat Inc. + * * This copyrighted material is made available to anyone wishing to use, modify, * copy, or redistribute it subject to the terms and conditions of the GNU * Lesser General Public License, as published by the Free Software Foundation. @@ -59,10 +61,34 @@ public abstract class FromImpl<Z,X> extends PathImpl<X> implements From<Z,X> { public static final JoinType DEFAULT_JOIN_TYPE = JoinType.INNER; + /** + * Helper contract used to define who/what keeps track of joins and fetches made from this <tt>FROM</tt>. + */ + public static interface JoinScope<X> { + public void addJoin(Join<X, ?> join); + public void addFetch(Fetch<X,?> fetch); + } + private final Expression<Class<? extends X>> type; private Set<Join<X, ?>> joins; private Set<Fetch<X, ?>> fetches; + private JoinScope<X> joinScope = new JoinScope<X>() { + public void addJoin(Join<X, ?> join) { + if ( joins == null ) { + joins = new LinkedHashSet<Join<X,?>>(); + } + joins.add( join ); + } + + public void addFetch(Fetch<X, ?> fetch) { + if ( fetches == null ) { + fetches = new LinkedHashSet<Fetch<X,?>>(); + } + fetches.add( fetch ); + } + }; + /** * Special constructor for {@link RootImpl}. * @@ -84,6 +110,10 @@ this.type = new EntityTypeExpression( queryBuilder, model.getJavaType() ); } + protected void defineJoinScope(JoinScope<X> joinScope) { + this.joinScope = joinScope; + } + @Override public Expression<Class<? extends X>> type() { return type; @@ -112,19 +142,6 @@ } /** - * Retrieve the collection of joins, imnplementing delayed creations. Calls on this method - * assume the set is physically needed, and the result is the set being built if not already. - * - * @return The set of joins. - */ - public Set<Join<X, ?>> getJoinsInternal() { - if ( joins == null ) { - joins = new LinkedHashSet<Join<X,?>>(); - } - return joins; - } - - /** * {@inheritDoc} */ public <Y> Join<X, Y> join(SingularAttribute<? super X, Y> singularAttribute) { @@ -136,7 +153,7 @@ */ public <Y> Join<X, Y> join(SingularAttribute<? super X, Y> attribute, JoinType jt) { Join<X, Y> join = constructJoin( attribute, jt ); - getJoinsInternal().add( join ); + joinScope.addJoin( join ); return join; } @@ -172,7 +189,7 @@ */ public <Y> CollectionJoin<X, Y> join(CollectionAttribute<? super X, Y> collection, JoinType jt) { final CollectionJoin<X, Y> join = constructJoin( collection, jt ); - getJoinsInternal().add( join ); + joinScope.addJoin( join ); return join; } @@ -220,7 +237,7 @@ */ public <Y> SetJoin<X, Y> join(SetAttribute<? super X, Y> set, JoinType jt) { final SetJoin<X, Y> join = constructJoin( set, jt ); - getJoinsInternal().add( join ); + joinScope.addJoin( join ); return join; } @@ -252,7 +269,7 @@ */ public <Y> ListJoin<X, Y> join(ListAttribute<? super X, Y> list, JoinType jt) { final ListJoin<X, Y> join = constructJoin( list, jt ); - getJoinsInternal().add( join ); + joinScope.addJoin( join ); return join; } @@ -284,7 +301,7 @@ */ public <K, V> MapJoin<X, K, V> join(MapAttribute<? super X, K, V> map, JoinType jt) { final MapJoin<X, K, V> join = constructJoin( map, jt ); - getJoinsInternal().add( join ); + joinScope.addJoin( join ); return join; } @@ -448,14 +465,11 @@ /** * Retrieve the collection of fetches, imnplementing delayed creations. Calls on this method - * assume the set is physically needed, and the result is the set being built if not already. + * assume the set is physically needed, and as a result the set is built if not already. * * @return The set of fetches. */ - public Set<Fetch<X, ?>> getFetchesInternal() { - if ( fetches == null ) { - fetches = new LinkedHashSet<Fetch<X,?>>(); - } + public Set<Fetch<X, ?>> internalGetFetches() { return fetches; } @@ -465,7 +479,7 @@ public <Y> Fetch<X, Y> fetch(SingularAttribute<? super X, Y> attribute, JoinType jt) { Fetch<X, Y> fetch = constructJoin( attribute, jt ); - getFetchesInternal().add( fetch ); + joinScope.addFetch( fetch ); return fetch; } @@ -488,7 +502,7 @@ else { fetch = constructJoin( (MapAttribute<X,?,Y>) pluralAttribute, jt ); } - getFetchesInternal().add( fetch ); + joinScope.addFetch( fetch ); return fetch; } Modified: core/trunk/entitymanager/src/main/java/org/hibernate/ejb/criteria/JoinImpl.java =================================================================== --- core/trunk/entitymanager/src/main/java/org/hibernate/ejb/criteria/JoinImpl.java 2009-09-17 20:22:44 UTC (rev 17525) +++ core/trunk/entitymanager/src/main/java/org/hibernate/ejb/criteria/JoinImpl.java 2009-09-17 21:26:25 UTC (rev 17526) @@ -1,9 +1,11 @@ /* - * Copyright (c) 2009, 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. + * Hibernate, Relational Persistence for Idiomatic Java * + * Copyright (c) 2009 by Red Hat Inc and/or its affiliates or by + * third-party contributors as indicated by either @author tags or express + * copyright attribution statements applied by the authors. All + * third-party contributions are distributed under license by Red Hat Inc. + * * This copyrighted material is made available to anyone wishing to use, modify, * copy, or redistribute it subject to the terms and conditions of the GNU * Lesser General Public License, as published by the Free Software Foundation. @@ -83,4 +85,18 @@ protected Attribute<X, ?> getAttribute(String name) { return (Attribute<X, ?>) managedType.getAttribute( name ); } + + public JoinImplementors.JoinImplementor<Z,X> correlateTo(CriteriaSubqueryImpl subquery) { + JoinImpl<Z,X> correlation = new JoinImpl<Z,X>( + queryBuilder(), + getJavaType(), + (PathImpl<Z>)getParentPath(), + getAttribute(), + getJoinType() + ); + correlation.defineJoinScope( subquery.getJoinScope() ); + return correlation; + } + + } Modified: core/trunk/entitymanager/src/main/java/org/hibernate/ejb/criteria/JoinImplementors.java =================================================================== --- core/trunk/entitymanager/src/main/java/org/hibernate/ejb/criteria/JoinImplementors.java 2009-09-17 20:22:44 UTC (rev 17525) +++ core/trunk/entitymanager/src/main/java/org/hibernate/ejb/criteria/JoinImplementors.java 2009-09-17 21:26:25 UTC (rev 17526) @@ -1,9 +1,11 @@ /* - * Copyright (c) 2009, 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. + * Hibernate, Relational Persistence for Idiomatic Java * + * Copyright (c) 2009 by Red Hat Inc and/or its affiliates or by + * third-party contributors as indicated by either @author tags or express + * copyright attribution statements applied by the authors. All + * third-party contributions are distributed under license by Red Hat Inc. + * * This copyrighted material is made available to anyone wishing to use, modify, * copy, or redistribute it subject to the terms and conditions of the GNU * Lesser General Public License, as published by the Free Software Foundation. @@ -35,18 +37,28 @@ * @author Steve Ebersole */ public interface JoinImplementors { - public static interface JoinImplementor<Z,X> extends Join<Z,X>, Fetch<Z,X> { + public static interface JoinImplementor<Z,X> + extends Join<Z,X>, Fetch<Z,X> { + public JoinImplementor<Z,X> correlateTo(CriteriaSubqueryImpl subquery); } - public static interface CollectionJoinImplementor<Z,X> extends CollectionJoin<Z,X>, Fetch<Z,X> { + public static interface CollectionJoinImplementor<Z,X> + extends JoinImplementor<Z,X>, CollectionJoin<Z,X>, Fetch<Z,X> { + public CollectionJoinImplementor<Z,X> correlateTo(CriteriaSubqueryImpl subquery); } - public static interface SetJoinImplementor<Z,X> extends SetJoin<Z,X>, Fetch<Z,X> { + public static interface SetJoinImplementor<Z,X> + extends JoinImplementor<Z,X>, SetJoin<Z,X>, Fetch<Z,X> { + public SetJoinImplementor<Z,X> correlateTo(CriteriaSubqueryImpl subquery); } - public static interface ListJoinImplementor<Z,X> extends ListJoin<Z,X>, Fetch<Z,X> { + public static interface ListJoinImplementor<Z,X> + extends JoinImplementor<Z,X>, ListJoin<Z,X>, Fetch<Z,X> { + public ListJoinImplementor<Z,X> correlateTo(CriteriaSubqueryImpl subquery); } - public static interface MapJoinImplementor<Z,K,V> extends MapJoin<Z,K,V>, Fetch<Z,V> { + public static interface MapJoinImplementor<Z,K,V> + extends JoinImplementor<Z,V>, MapJoin<Z,K,V>, Fetch<Z,V> { + public MapJoinImplementor<Z,K,V> correlateTo(CriteriaSubqueryImpl subquery); } } Modified: core/trunk/entitymanager/src/main/java/org/hibernate/ejb/criteria/ListJoinImpl.java =================================================================== --- core/trunk/entitymanager/src/main/java/org/hibernate/ejb/criteria/ListJoinImpl.java 2009-09-17 20:22:44 UTC (rev 17525) +++ core/trunk/entitymanager/src/main/java/org/hibernate/ejb/criteria/ListJoinImpl.java 2009-09-17 21:26:25 UTC (rev 17526) @@ -1,9 +1,11 @@ /* - * Copyright (c) 2009, 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. + * Hibernate, Relational Persistence for Idiomatic Java * + * Copyright (c) 2009 by Red Hat Inc and/or its affiliates or by + * third-party contributors as indicated by either @author tags or express + * copyright attribution statements applied by the authors. All + * third-party contributions are distributed under license by Red Hat Inc. + * * This copyrighted material is made available to anyone wishing to use, modify, * copy, or redistribute it subject to the terms and conditions of the GNU * Lesser General Public License, as published by the Free Software Foundation. @@ -24,6 +26,7 @@ import javax.persistence.criteria.Expression; import javax.persistence.criteria.JoinType; import javax.persistence.metamodel.ListAttribute; +import org.hibernate.ejb.criteria.JoinImplementors.ListJoinImplementor; import org.hibernate.ejb.criteria.expression.ListIndexExpression; /** @@ -43,6 +46,19 @@ } @Override + public ListJoinImplementor<O, E> correlateTo(CriteriaSubqueryImpl subquery) { + ListJoinImpl<O,E> correlation = new ListJoinImpl<O,E>( + queryBuilder(), + getJavaType(), + (PathImpl<O>) getParentPath(), + getAttribute(), + getJoinType() + ); + correlation.defineJoinScope( subquery.getJoinScope() ); + return correlation; + } + + @Override public ListAttribute<? super O, E> getAttribute() { return (ListAttribute<? super O, E>) super.getAttribute(); } Modified: core/trunk/entitymanager/src/main/java/org/hibernate/ejb/criteria/MapJoinImpl.java =================================================================== --- core/trunk/entitymanager/src/main/java/org/hibernate/ejb/criteria/MapJoinImpl.java 2009-09-17 20:22:44 UTC (rev 17525) +++ core/trunk/entitymanager/src/main/java/org/hibernate/ejb/criteria/MapJoinImpl.java 2009-09-17 21:26:25 UTC (rev 17526) @@ -1,9 +1,11 @@ /* - * Copyright (c) 2009, 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. + * Hibernate, Relational Persistence for Idiomatic Java * + * Copyright (c) 2009 by Red Hat Inc and/or its affiliates or by + * third-party contributors as indicated by either @author tags or express + * copyright attribution statements applied by the authors. All + * third-party contributions are distributed under license by Red Hat Inc. + * * This copyrighted material is made available to anyone wishing to use, modify, * copy, or redistribute it subject to the terms and conditions of the GNU * Lesser General Public License, as published by the Free Software Foundation. @@ -29,6 +31,7 @@ import javax.persistence.criteria.Path; import javax.persistence.metamodel.MapAttribute; import javax.persistence.metamodel.Type.PersistenceType; +import org.hibernate.ejb.criteria.JoinImplementors.MapJoinImplementor; /** * Represents a join to a persistent collection, defined as type {@link java.util.Map}, whose elements @@ -50,6 +53,19 @@ } @Override + public MapJoinImplementor<O, K, V> correlateTo(CriteriaSubqueryImpl subquery) { + MapJoinImpl<O, K, V> correlation = new MapJoinImpl<O, K, V>( + queryBuilder(), + getJavaType(), + (PathImpl<O>) getParentPath(), + getAttribute(), + getJoinType() + ); + correlation.defineJoinScope( subquery.getJoinScope() ); + return correlation; + } + + @Override public MapAttribute<? super O, K, V> getAttribute() { return (MapAttribute<? super O, K, V>) super.getAttribute(); } Modified: core/trunk/entitymanager/src/main/java/org/hibernate/ejb/criteria/MapKeyHelpers.java =================================================================== --- core/trunk/entitymanager/src/main/java/org/hibernate/ejb/criteria/MapKeyHelpers.java 2009-09-17 20:22:44 UTC (rev 17525) +++ core/trunk/entitymanager/src/main/java/org/hibernate/ejb/criteria/MapKeyHelpers.java 2009-09-17 21:26:25 UTC (rev 17526) @@ -1,9 +1,11 @@ /* - * Copyright (c) 2009, 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. + * Hibernate, Relational Persistence for Idiomatic Java * + * Copyright (c) 2009 by Red Hat Inc and/or its affiliates or by + * third-party contributors as indicated by either @author tags or express + * copyright attribution statements applied by the authors. All + * third-party contributions are distributed under license by Red Hat Inc. + * * This copyrighted material is made available to anyone wishing to use, modify, * copy, or redistribute it subject to the terms and conditions of the GNU * Lesser General Public License, as published by the Free Software Foundation. @@ -35,6 +37,7 @@ import javax.persistence.metamodel.MapAttribute; import javax.persistence.metamodel.SingularAttribute; import javax.persistence.metamodel.Type.PersistenceType; +import org.hibernate.ejb.criteria.JoinImplementors.JoinImplementor; import org.hibernate.ejb.criteria.expression.ExpressionImpl; import org.hibernate.engine.SessionFactoryImplementor; import org.hibernate.persister.collection.CollectionPersister; @@ -66,6 +69,12 @@ jt ); } + + @Override + public JoinImplementor<Map<K, V>, K> correlateTo(CriteriaSubqueryImpl subquery) { + throw new UnsupportedOperationException( "Map key join cannot be used as a correlation" ); + } + } /** Modified: core/trunk/entitymanager/src/main/java/org/hibernate/ejb/criteria/OrderImpl.java =================================================================== --- core/trunk/entitymanager/src/main/java/org/hibernate/ejb/criteria/OrderImpl.java 2009-09-17 20:22:44 UTC (rev 17525) +++ core/trunk/entitymanager/src/main/java/org/hibernate/ejb/criteria/OrderImpl.java 2009-09-17 21:26:25 UTC (rev 17526) @@ -1,9 +1,11 @@ /* - * Copyright (c) 2009, 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. + * Hibernate, Relational Persistence for Idiomatic Java * + * Copyright (c) 2009 by Red Hat Inc and/or its affiliates or by + * third-party contributors as indicated by either @author tags or express + * copyright attribution statements applied by the authors. All + * third-party contributions are distributed under license by Red Hat Inc. + * * This copyrighted material is made available to anyone wishing to use, modify, * copy, or redistribute it subject to the terms and conditions of the GNU * Lesser General Public License, as published by the Free Software Foundation. Modified: core/trunk/entitymanager/src/main/java/org/hibernate/ejb/criteria/ParameterContainer.java =================================================================== --- core/trunk/entitymanager/src/main/java/org/hibernate/ejb/criteria/ParameterContainer.java 2009-09-17 20:22:44 UTC (rev 17525) +++ core/trunk/entitymanager/src/main/java/org/hibernate/ejb/criteria/ParameterContainer.java 2009-09-17 21:26:25 UTC (rev 17526) @@ -1,9 +1,11 @@ /* - * Copyright (c) 2009, 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. + * Hibernate, Relational Persistence for Idiomatic Java * + * Copyright (c) 2009 by Red Hat Inc and/or its affiliates or by + * third-party contributors as indicated by either @author tags or express + * copyright attribution statements applied by the authors. All + * third-party contributions are distributed under license by Red Hat Inc. + * * This copyrighted material is made available to anyone wishing to use, modify, * copy, or redistribute it subject to the terms and conditions of the GNU * Lesser General Public License, as published by the Free Software Foundation. Modified: core/trunk/entitymanager/src/main/java/org/hibernate/ejb/criteria/ParameterRegistry.java =================================================================== --- core/trunk/entitymanager/src/main/java/org/hibernate/ejb/criteria/ParameterRegistry.java 2009-09-17 20:22:44 UTC (rev 17525) +++ core/trunk/entitymanager/src/main/java/org/hibernate/ejb/criteria/ParameterRegistry.java 2009-09-17 21:26:25 UTC (rev 17526) @@ -1,9 +1,11 @@ /* - * Copyright (c) 2009, 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. + * Hibernate, Relational Persistence for Idiomatic Java * + * Copyright (c) 2009 by Red Hat Inc and/or its affiliates or by + * third-party contributors as indicated by either @author tags or express + * copyright attribution statements applied by the authors. All + * third-party contributions are distributed under license by Red Hat Inc. + * * This copyrighted material is made available to anyone wishing to use, modify, * copy, or redistribute it subject to the terms and conditions of the GNU * Lesser General Public License, as published by the Free Software Foundation. Modified: core/trunk/entitymanager/src/main/java/org/hibernate/ejb/criteria/PathImpl.java =================================================================== --- core/trunk/entitymanager/src/main/java/org/hibernate/ejb/criteria/PathImpl.java 2009-09-17 20:22:44 UTC (rev 17525) +++ core/trunk/entitymanager/src/main/java/org/hibernate/ejb/criteria/PathImpl.java 2009-09-17 21:26:25 UTC (rev 17526) @@ -1,9 +1,11 @@ /* - * Copyright (c) 2009, 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. + * Hibernate, Relational Persistence for Idiomatic Java * + * Copyright (c) 2009 by Red Hat Inc and/or its affiliates or by + * third-party contributors as indicated by either @author tags or express + * copyright attribution statements applied by the authors. All + * third-party contributions are distributed under license by Red Hat Inc. + * * This copyrighted material is made available to anyone wishing to use, modify, * copy, or redistribute it subject to the terms and conditions of the GNU * Lesser General Public License, as published by the Free Software Foundation. Modified: core/trunk/entitymanager/src/main/java/org/hibernate/ejb/criteria/QueryBuilderImpl.java =================================================================== --- core/trunk/entitymanager/src/main/java/org/hibernate/ejb/criteria/QueryBuilderImpl.java 2009-09-17 20:22:44 UTC (rev 17525) +++ core/trunk/entitymanager/src/main/java/org/hibernate/ejb/criteria/QueryBuilderImpl.java 2009-09-17 21:26:25 UTC (rev 17526) @@ -1,9 +1,11 @@ /* - * Copyright (c) 2009, 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. + * Hibernate, Relational Persistence for Idiomatic Java * + * Copyright (c) 2009 by Red Hat Inc and/or its affiliates or by + * third-party contributors as indicated by either @author tags or express + * copyright attribution statements applied by the authors. All + * third-party contributions are distributed under license by Red Hat Inc. + * * This copyrighted material is made available to anyone wishing to use, modify, * copy, or redistribute it subject to the terms and conditions of the GNU * Lesser General Public License, as published by the Free Software Foundation. @@ -69,8 +71,6 @@ import org.hibernate.ejb.criteria.expression.function.TrimFunction; import org.hibernate.ejb.criteria.expression.function.UpperFunction; import org.hibernate.ejb.criteria.predicate.BooleanExpressionPredicate; -import org.hibernate.ejb.criteria.predicate.ExplicitTruthValueCheck; -import org.hibernate.ejb.criteria.predicate.TruthValue; import org.hibernate.ejb.criteria.predicate.NullnessPredicate; import org.hibernate.ejb.criteria.predicate.CompoundPredicate; import org.hibernate.ejb.criteria.predicate.ComparisonPredicate; @@ -309,14 +309,18 @@ * {@inheritDoc} */ public Predicate isTrue(Expression<Boolean> x) { - return new ExplicitTruthValueCheck( this, x, TruthValue.TRUE ); + return wrap( x ); +// TODO : the correct thing here depends on response to #5 on my wiki page +// return new ExplicitTruthValueCheck( this, x, TruthValue.TRUE ); } /** * {@inheritDoc} */ public Predicate isFalse(Expression<Boolean> x) { - return new ExplicitTruthValueCheck( this, x, TruthValue.FALSE ); + return wrap( x ).negate(); +// TODO : the correct thing here depends on response to #5 on my wiki page +// return new ExplicitTruthValueCheck( this, x, TruthValue.FALSE ); } /** Modified: core/trunk/entitymanager/src/main/java/org/hibernate/ejb/criteria/QueryStructure.java =================================================================== --- core/trunk/entitymanager/src/main/java/org/hibernate/ejb/criteria/QueryStructure.java 2009-09-17 20:22:44 UTC (rev 17525) +++ core/trunk/entitymanager/src/main/java/org/hibernate/ejb/criteria/QueryStructure.java 2009-09-17 21:26:25 UTC (rev 17526) @@ -1,9 +1,11 @@ /* - * Copyright (c) 2009, 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. + * Hibernate, Relational Persistence for Idiomatic Java * + * Copyright (c) 2009 by Red Hat Inc and/or its affiliates or by + * third-party contributors as indicated by either @author tags or express + * copyright attribution statements applied by the authors. All + * third-party contributions are distributed under license by Red Hat Inc. + * * This copyrighted material is made available to anyone wishing to use, modify, * copy, or redistribute it subject to the terms and conditions of the GNU * Lesser General Public License, as published by the Free Software Foundation. Modified: core/trunk/entitymanager/src/main/java/org/hibernate/ejb/criteria/RootImpl.java =================================================================== --- core/trunk/entitymanager/src/main/java/org/hibernate/ejb/criteria/RootImpl.java 2009-09-17 20:22:44 UTC (rev 17525) +++ core/trunk/entitymanager/src/main/java/org/hibernate/ejb/criteria/RootImpl.java 2009-09-17 21:26:25 UTC (rev 17526) @@ -1,9 +1,11 @@ /* - * Copyright (c) 2009, 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. + * Hibernate, Relational Persistence for Idiomatic Java * + * Copyright (c) 2009 by Red Hat Inc and/or its affiliates or by + * third-party contributors as indicated by either @author tags or express + * copyright attribution statements applied by the authors. All + * third-party contributions are distributed under license by Red Hat Inc. + * * This copyrighted material is made available to anyone wishing to use, modify, * copy, or redistribute it subject to the terms and conditions of the GNU * Lesser General Public License, as published by the Free Software Foundation. @@ -47,4 +49,9 @@ return (Attribute<X, ?>) getModel().getAttribute( name ); } + public RootImpl<X> correlateTo(CriteriaSubqueryImpl subquery) { + RootImpl<X> correlation = new RootImpl<X>( queryBuilder(), getModel() ); + correlation.defineJoinScope( subquery.getJoinScope() ); + return correlation; + } } Modified: core/trunk/entitymanager/src/main/java/org/hibernate/ejb/criteria/SetJoinImpl.java =================================================================== --- core/trunk/entitymanager/src/main/java/org/hibernate/ejb/criteria/SetJoinImpl.java 2009-09-17 20:22:44 UTC (rev 17525) +++ core/trunk/entitymanager/src/main/java/org/hibernate/ejb/criteria/SetJoinImpl.java 2009-09-17 21:26:25 UTC (rev 17526) @@ -1,9 +1,11 @@ /* - * Copyright (c) 2009, 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. + * Hibernate, Relational Persistence for Idiomatic Java * + * Copyright (c) 2009 by Red Hat Inc and/or its affiliates or by + * third-party contributors as indicated by either @author tags or express + * copyright attribution statements applied by the authors. All + * third-party contributions are distributed under license by Red Hat Inc. + * * This copyrighted material is made available to anyone wishing to use, modify, * copy, or redistribute it subject to the terms and conditions of the GNU * Lesser General Public License, as published by the Free Software Foundation. @@ -23,6 +25,7 @@ import javax.persistence.criteria.JoinType; import javax.persistence.metamodel.SetAttribute; +import org.hibernate.ejb.criteria.JoinImplementors.SetJoinImplementor; /** * Represents a join to a persistent collection, defined as type {@link java.util.Set}, whose elements @@ -44,8 +47,25 @@ } @Override + public SetJoinImplementor<O, E> correlateTo(CriteriaSubqueryImpl subquery) { + SetJoinImpl<O,E> correlation = new SetJoinImpl<O,E>( + queryBuilder(), + getJavaType(), + (PathImpl<O>) getParentPath(), + getAttribute(), + getJoinType() + ); + correlation.defineJoinScope( subquery.getJoinScope() ); + return correlation; + } + + @Override + public SetAttribute<? super O, E> getAttribute() { + return (SetAttribute<? super O, E>) super.getAttribute(); + } + + @Override public SetAttribute<? super O, E> getModel() { - return (SetAttribute<? super O, E>) super.getAttribute(); + return getAttribute(); } - } Modified: core/trunk/entitymanager/src/main/java/org/hibernate/ejb/criteria/expression/AbstractTupleElement.java =================================================================== --- core/trunk/entitymanager/src/main/java/org/hibernate/ejb/criteria/expression/AbstractTupleElement.java 2009-09-17 20:22:44 UTC (rev 17525) +++ core/trunk/entitymanager/src/main/java/org/hibernate/ejb/criteria/expression/AbstractTupleElement.java 2009-09-17 21:26:25 UTC (rev 17526) @@ -1,9 +1,11 @@ /* - * Copyright (c) 2009, 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. + * Hibernate, Relational Persistence for Idiomatic Java * + * Copyright (c) 2009 by Red Hat Inc and/or its affiliates or by + * third-party contributors as indicated by either @author tags or express + * copyright attribution statements applied by the authors. All + * third-party contributions are distributed under license by Red Hat Inc. + * * This copyrighted material is made available to anyone wishing to use, modify, * copy, or redistribute it subject to the terms and conditions of the GNU * Lesser General Public License, as published by the Free Software Foundation. Modified: core/trunk/entitymanager/src/main/java/org/hibernate/ejb/criteria/expression/BinaryArithmeticOperation.java =================================================================== --- core/trunk/entitymanager/src/main/java/org/hibernate/ejb/criteria/expression/BinaryArithmeticOperation.java 2009-09-17 20:22:44 UTC (rev 17525) +++ core/trunk/entitymanager/src/main/java/org/hibernate/ejb/criteria/expression/BinaryArithmeticOperation.java 2009-09-17 21:26:25 UTC (rev 17526) @@ -1,9 +1,11 @@ /* - * Copyright (c) 2009, 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. + * Hibernate, Relational Persistence for Idiomatic Java * + * Copyright (c) 2009 by Red Hat Inc and/or its affiliates or by + * third-party contributors as indicated by either @author tags or express + * copyright attribution statements applied by the authors. All + * third-party contributions are distributed under license by Red Hat Inc. + * * This copyrighted material is made available to anyone wishing to use, modify, * copy, or redistribute it subject to the terms and conditions of the GNU * Lesser General Public License, as published by the Free Software Foundation. Modified: core/trunk/entitymanager/src/main/java/org/hibernate/ejb/criteria/expression/BinaryOperatorExpression.java =================================================================== --- core/trunk/entitymanager/src/main/java/org/hibernate/ejb/criteria/expression/BinaryOperatorExpression.java 2009-09-17 20:22:44 UTC (rev 17525) +++ core/trunk/entitymanager/src/main/java/org/hibernate/ejb/criteria/expression/BinaryOperatorExpression.java 2009-09-17 21:26:25 UTC (rev 17526) @@ -1,9 +1,11 @@ /* - * Copyright (c) 2009, 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. + * Hibernate, Relational Persistence for Idiomatic Java * + * Copyright (c) 2009 by Red Hat Inc and/or its affiliates or by + * third-party contributors as indicated by either @author tags or express + * copyright attribution statements applied by the authors. All + * third-party contributions are distributed under license by Red Hat Inc. + * * This copyrighted material is made available to anyone wishing to use, modify, * copy, or redistribute it subject to the terms and conditions of the GNU * Lesser General Public License, as published by the Free Software Foundation. Modified: core/trunk/entitymanager/src/main/java/org/hibernate/ejb/criteria/expression/CoalesceExpression.java =================================================================== --- core/trunk/entitymanager/src/main/java/org/hibernate/ejb/criteria/expression/CoalesceExpression.java 2009-09-17 20:22:44 UTC (rev 17525) +++ core/trunk/entitymanager/src/main/java/org/hibernate/ejb/criteria/expression/CoalesceExpression.java 2009-09-17 21:26:25 UTC (rev 17526) @@ -1,9 +1,11 @@ /* - * Copyright (c) 2009, 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. + * Hibernate, Relational Persistence for Idiomatic Java * + * Copyright (c) 2009 by Red Hat Inc and/or its affiliates or by + * third-party contributors as indicated by either @author tags or express + * copyright attribution statements applied by the authors. All + * third-party contributions are distributed under license by Red Hat Inc. + * * This copyrighted material is made available to anyone wishing to use, modify, * copy, or redistribute it subject to the terms and conditions of the GNU * Lesser General Public License, as published by the Free Software Foundation. Modified: core/trunk/entitymanager/src/main/java/org/hibernate/ejb/criteria/expression/CollectionExpression.java =================================================================== --- core/trunk/entitymanager/src/main/java/org/hibernate/ejb/criteria/expression/CollectionExpression.java 2009-09-17 20:22:44 UTC (rev 17525) +++ core/trunk/entitymanager/src/main/java/org/hibernate/ejb/criteria/expression/CollectionExpression.java 2009-09-17 21:26:25 UTC (rev 17526) @@ -1,9 +1,11 @@ /* - * Copyright (c) 2009, 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. + * Hibernate, Relational Persistence for Idiomatic Java * + * Copyright (c) 2009 by Red Hat Inc and/or its affiliates or by + * third-party contributors as indicated by either @author tags or express + * copyright attribution statements applied by the authors. All + * third-party contributions are distributed under license by Red Hat Inc. + * * This copyrighted material is made available to anyone wishing to use, modify, * copy, or redistribute it subject to the terms and conditions of the GNU * Lesser General Public License, as published by the Free Software Foundation. Modified: core/trunk/entitymanager/src/main/java/org/hibernate/ejb/criteria/expression/CompoundSelectionImpl.java =================================================================== --- core/trunk/entitymanager/src/main/java/org/hibernate/ejb/criteria/expression/CompoundSelectionImpl.java 2009-09-17 20:22:44 UTC (rev 17525) +++ core/trunk/entitymanager/src/main/java/org/hibernate/ejb/criteria/expression/CompoundSelectionImpl.java 2009-09-17 21:26:25 UTC (rev 17526) @@ -1,9 +1,11 @@ /* - * Copyright (c) 2009, 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. + * Hibernate, Relational Persistence for Idiomatic Java * + * Copyright (c) 2009 by Red Hat Inc and/or its affiliates or by + * third-party contributors as indicated by either @author tags or express + * copyright attribution statements applied by the authors. All + * third-party contributions are distributed under license by Red Hat Inc. + * * This copyrighted material is made available to anyone wishing to use, modify, * copy, or redistribute it subject to the terms and conditions of the GNU * Lesser General Public License, as published by the Free Software Foundation. Modified: core/trunk/entitymanager/src/main/java/org/hibernate/ejb/criteria/expression/ConcatExpression.java =================================================================== --- core/trunk/entitymanager/src/main/java/org/hibernate/ejb/criteria/expression/ConcatExpression.java 2009-09-17 20:22:44 UTC (rev 17525) +++ core/trunk/entitymanager/src/main/java/org/hibernate/ejb/criteria/expression/ConcatExpression.java 2009-09-17 21:26:25 UTC (rev 17526) @@ -1,9 +1,11 @@ /* - * Copyright (c) 2009, 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. + * Hibernate, Relational Persistence for Idiomatic Java * + * Copyright (c) 2009 by Red Hat Inc and/or its affiliates or by + * third-party contributors as indicated by either @author tags or express + * copyright attribution statements applied by the authors. All + * third-party contributions are distributed under license by Red Hat Inc. + * * This copyrighted material is made available to anyone wishing to use, modify, * copy, or redistribute it subject to the terms and conditions of the GNU * Lesser General Public License, as published by the Free Software Foundation. Modified: core/trunk/entitymanager/src/main/java/org/hibernate/ejb/criteria/expression/EntityTypeExpression.java =================================================================== --- core/trunk/entitymanager/src/main/java/org/hibernate/ejb/criteria/expression/EntityTypeExpression.java 2009-09-17 20:22:44 UTC (rev 17525) +++ core/trunk/entitymanager/src/main/java/org/hibernate/ejb/criteria/expression/EntityTypeExpression.java 2009-09-17 21:26:25 UTC (rev 17526) @@ -1,9 +1,11 @@ /* - * Copyright (c) 2009, 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. + * Hibernate, Relational Persistence for Idiomatic Java * + * Copyright (c) 2009 by Red Hat Inc and/or its affiliates or by + * third-party contributors as indicated by either @author tags or express + * copyright attribution statements applied by the authors. All + * third-party contributions are distributed under license by Red Hat Inc. + * * This copyrighted material is made available to anyone wishing to use, modify, * copy, or redistribute it subject to the terms and conditions of the GNU * Lesser General Public License, as published by the Free Software Foundation. Modified: core/trunk/entitymanager/src/main/java/org/hibernate/ejb/criteria/expression/ExpressionImpl.java =================================================================== --- core/trunk/entitymanager/src/main/java/org/hibernate/ejb/criteria/expression/ExpressionImpl.java 2009-09-17 20:22:44 UTC (rev 17525) +++ core/trunk/entitymanager/src/main/java/org/hibernate/ejb/criteria/expression/ExpressionImpl.java 2009-09-17 21:26:25 UTC (rev 17526) @@ -1,9 +1,11 @@ /* - * Copyright (c) 2009, 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. + * Hibernate, Relational Persistence for Idiomatic Java * + * Copyright (c) 2009 by Red Hat Inc and/or its affiliates or by + * third-party contributors as indicated by either @author tags or express + * copyright attribution statements applied by the authors. All + * third-party contributions are distributed under license by Red Hat Inc. + * * This copyrighted material is made available to anyone wishing to use, modify, * copy, or redistribute it subject to the terms and conditions of the GNU * Lesser General Public License, as published by the Free Software Foundation. Modified: core/trunk/entitymanager/src/main/java/org/hibernate/ejb/criteria/expression/ListIndexExpression.java =================================================================== --- core/trunk/entitymanager/src/main/java/org/hibernate/ejb/criteria/expression/ListIndexExpression.java 2009-09-17 20:22:44 UTC (rev 17525) +++ core/trunk/entitymanager/src/main/java/org/hibernate/ejb/criteria/expression/ListIndexExpression.java 2009-09-17 21:26:25 UTC (rev 17526) @@ -1,3 +1,26 @@ +/* + * Hibernate, Relational Persistence for Idiomatic Java + * + * Copyright (c) 2009 by Red Hat Inc and/or its affiliates or by + * third-party contributors as indicated by either @author tags or express + * copyright attribution statements applied by the authors. All + * third-party contributions are distributed under license by Red Hat Inc. + * + * This copyrighted material is made available to anyone wishing to use, modify, + * copy, or redistribute it subject to the terms and conditions of the GNU + * Lesser General Public License, as published by the Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY + * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License + * for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with this distribution; if not, write to: + * Free Software Foundation, Inc. + * 51 Franklin Street, Fifth Floor + * Boston, MA 02110-1301 USA + */ package org.hibernate.ejb.criteria.expression; import javax.persistence.metamodel.ListAttribute; Modified: core/trunk/entitymanager/src/main/java/org/hibernate/ejb/criteria/expression/LiteralExpression.java =================================================================== --- core/trunk/entitymanager/src/main/java/org/hibernate/ejb/criteria/expression/LiteralExpression.java 2009-09-17 20:22:44 UTC (rev 17525) +++ core/trunk/entitymanager/src/main/java/org/hibernate/ejb/criteria/expression/LiteralExpression.java 2009-09-17 21:26:25 UTC (rev 17526) @@ -1,9 +1,11 @@ /* - * Copyright (c) 2009, 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. + * Hibernate, Relational Persistence for Idiomatic Java * + * Copyright (c) 2009 by Red Hat Inc and/or its affiliates or by + * third-party contributors as indicated by either @author tags or express + * copyright attribution statements applied by the authors. All + * third-party contributions are distributed under license by Red Hat Inc. + * * This copyrighted material is made available to anyone wishing to use, modify, * copy, or redistribute it subject to the terms and conditions of the GNU * Lesser General Public License, as published by the Free Software Foundation. Modified: core/trunk/entitymanager/src/main/java/org/hibernate/ejb/criteria/expression/NullifExpression.java =================================================================== --- core/trunk/entitymanager/src/main/java/org/hibernate/ejb/criteria/expression/NullifExpression.java 2009-09-17 20:22:44 UTC (rev 17525) +++ core/trunk/entitymanager/src/main/java/org/hibernate/ejb/criteria/expression/NullifExpression.java 2009-09-17 21:26:25 UTC (rev 17526) @@ -1,9 +1,11 @@ /* - * Copyright (c) 2009, 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. + * Hibernate, Relational Persistence for Idiomatic Java * + * Copyright (c) 2009 by Red Hat Inc and/or its affiliates or by + * third-party contributors as indicated by either @author tags or express + * copyright attribution statements applied by the authors. All + * third-party contributions are distributed under license by Red Hat Inc. + * * This copyrighted material is made available to anyone wishing to use, modify, * copy, or redistribute it subject to the terms and conditions of the GNU * Lesser General Public License, as published by the Free Software Foundation. Modified: core/trunk/entitymanager/src/main/java/org/hibernate/ejb/criteria/expression/ParameterExpressionImpl.java =================================================================== --- core/trunk/entitymanager/src/main/java/org/hibernate/ejb/criteria/expression/ParameterExpressionImpl.java 2009-09-17 20:22:44 UTC (rev 17525) +++ core/trunk/entitymanager/src/main/java/org/hibernate/ejb/criteria/expression/ParameterExpressionImpl.java 2009-09-17 21:26:25 UTC (rev 17526) @@ -1,9 +1,11 @@ /* - * Copyright (c) 2009, 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. + * Hibernate, Relational Persistence for Idiomatic Java * + * Copyright (c) 2009 by Red Hat Inc and/or its affiliates or by + * third-party contributors as indicated by either @author tags or express + * copyright attribution statements applied by the authors. All + * third-party contributions are distributed under license by Red Hat Inc. + * * This copyrighted material is made available to anyone wishing to use, modify, * copy, or redistribute it subject to the terms and conditions of the GNU * Lesser General Public License, as published by the Free Software Foundation. Modified: core/trunk/entitymanager/src/main/java/org/hibernate/ejb/criteria/expression/SearchedCaseExpression.java =================================================================== --- core/trunk/entitymanager/src/main/java/org/hibernate/ejb/criteria/expression/SearchedCaseExpression.java 2009-09-17 20:22:44 UTC (rev 17525) +++ core/trunk/entitymanager/src/main/java/org/hibernate/ejb/criteria/expression/SearchedCaseExpression.java 2009-09-17 21:26:25 UTC (rev 17526) @@ -1,9 +1,11 @@ /* - * Copyright (c) 2009, 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. + * Hibernate, Relational Persistence for Idiomatic Java * + * Copyright (c) 2009 by Red Hat Inc and/or its affiliates or by + * third-party contributors as indicated by either @author tags or express + * copyright attribution statements applied by the authors. All + * third-party contributions are distributed under license by Red Hat Inc. + * * This copyrighted material is made available to anyone wishing to use, modify, * copy, or redistribute it subject to the terms and conditions of the GNU * Lesser General Public License, as published by the Free Software Foundation. Modified: core/trunk/entitymanager/src/main/java/org/hibernate/ejb/criteria/expression/SelectionImpl.java =================================================================== --- core/trunk/entitymanager/src/main/java/org/hibernate/ejb/criteria/expression/SelectionImpl.java 2009-09-17 20:22:44 UTC (rev 17525) +++ core/trunk/entitymanager/src/main/java/org/hibernate/ejb/criteria/expression/SelectionImpl.java 2009-09-17 21:26:25 UTC (rev 17526) @@ -1,9 +1,11 @@ /* - * Copyright (c) 2009, 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. + * Hibernate, Relational Persistence for Idiomatic Java * + * Copyright (c) 2009 by Red Hat Inc and/or its affiliates or by + * third-party contributors as indicated by either @author tags or express + * copyright attribution statements applied by the authors. All + * third-party contributions are distributed under license by Red Hat Inc. + * * This copyrighted material is made available to anyone wishing to use, modify, * copy, or redistribute it subject to the terms and conditions of the GNU * Lesser General Public License, as published by the Free Software Foundation. Modified: core/trunk/entitymanager/src/main/java/org/hibernate/ejb/criteria/expression/SimpleCaseExpression.java =================================================================== --- core/trunk/entitymanager/src/main/java/org/hibernate/ejb/criteria/expression/SimpleCaseExpression.java 2009-09-17 20:22:44 UTC (rev 17525) +++ core/trunk/entitymanager/src/main/java/org/hibernate/ejb/criteria/expression/SimpleCaseExpression.java 2009-09-17 21:26:25 UTC (rev 17526) @@ -1,9 +1,11 @@ /* - * Copyright (c) 2009, 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. + * Hibernate, Relational Persistence for Idiomatic Java * + * Copyright (c) 2009 by Red Hat Inc and/or its affiliates or by + * third-party contributors as indicated by either @author tags or express + * copyright attribution statements applied by the authors. All + * third-party contributions are distributed under license by Red Hat Inc. + * * This copyrighted material is made available to anyone wishing to use, modify, * copy, or redistribute it subject to the terms and conditions of the GNU * Lesser General Public License, as published by the Free Software Foundation. Modified: core/trunk/entitymanager/src/main/java/org/hibernate/ejb/criteria/expression/SizeOfCollectionExpression.java =================================================================== --- core/trunk/entitymanager/src/main/java/org/hibernate/ejb/criteria/expression/SizeOfCollectionExpression.java 2009-09-17 20:22:44 UTC (rev 17525) +++ core/trunk/entitymanager/src/main/java/org/hibernate/ejb/criteria/expression/SizeOfCollectionExpression.java 2009-09-17 21:26:25 UTC (rev 17526) @@ -1,9 +1,11 @@ /* - * Copyright (c) 2009, 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. + * Hibernate, Relational Persistence for Idiomatic Java * + * Copyright (c) 2009 by Red Hat Inc and/or its affiliates or by + * third-party contributors as indicated by either @author tags or express + * copyright attribution statements applied by the authors. All + * third-party contributions are distributed under license by Red Hat Inc. + * * This copyrighted material is made available to anyone wishing to use, modify, * copy, or redistribute it subject to the terms and conditions of the GNU * Lesser General Public License, as published by the Free Software Foundation. Modified: core/trunk/entitymanager/src/main/java/org/hibernate/ejb/criteria/expression/SubqueryComparisonModifierExpression.java =================================================================== --- core/trunk/entitymanager/src/main/java/org/hibernate/ejb/criteria/expression/SubqueryComparisonModifierExpression.java 2009-09-17 20:22:44 UTC (rev 17525) +++ core/trunk/entitymanager/src/main/java/org/hibernate/ejb/criteria/expression/SubqueryComparisonModifierExpression.java 2009-09-17 21:26:25 UTC (rev 17526) @@ -1,3 +1,26 @@ +/* + * Hibernate, Relational Persistence for Idiomatic Java + * + * Copyright (c) 2009 by Red Hat Inc and/or its affiliates or by + * third-party contributors as indicated by either @author tags or express + * copyright attribution statements applied by the authors. All + * third-party contributions are distributed under license by Red Hat Inc. + * + * This copyrighted material is made available to anyone wishing to use, modify, + * copy, or redistribute it subject to the terms and conditions of the GNU + * Lesser General Public License, as published by the Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY + * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License + * for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with this distribution; if not, write to: + * Free Software Foundation, Inc. + * 51 Franklin Street, Fifth Floor + * Boston, MA 02110-1301 USA + */ package org.hibernate.ejb.criteria.expression; import javax.persistence.criteria.Subquery; Modified: core/trunk/entitymanager/src/main/java/org/hibernate/ejb/criteria/expression/UnaryArithmeticOperation.java =================================================================== --- core/trunk/entitymanager/src/main/java/org/hibernate/ejb/criteria/expression/UnaryArithmeticOperation.java 2009-09-17 20:22:44 UTC (rev 17525) +++ core/trunk/entitymanager/src/main/java/org/hibernate/ejb/criteria/expression/UnaryArithmeticOperation.java 2009-09-17 21:26:25 UTC (rev 17526) @@ -1,3 +1,26 @@ +/* + * Hibernate, Relational Persistence for Idiomatic Java + * + * Copyright (c) 2009 by Red Hat Inc and/or its affiliates or by + * third-party contributors as indicated by either @author tags or express + * copyright attribution statements applied by the authors. All + * third-party contributions are distributed under license by Red Hat Inc. + * + * This copyrighted material is made available to anyone wishing to use, modify, + * copy, or redistribute it subject to the terms and conditions of the GNU + * Lesser General Public License, as published by the Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY + * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License + * for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with this distribution; if not, write to: + * Free Software Foundation, Inc. + * 51 Franklin Street, Fifth Floor + * Boston, MA 02110-1301 USA + */ package org.hibernate.ejb.criteria.expression; import javax.persistence.criteria.Expression; Modified: core/trunk/entitymanager/src/main/java/org/hibernate/ejb/criteria/expression/UnaryOperatorExpression.java =================================================================== --- core/trunk/entitymanager/src/main/java/org/hibernate/ejb/criteria/expression/UnaryOperatorExpression.java 2009-09-17 20:22:44 UTC (rev 17525) +++ core/trunk/entitymanager/src/main/java/org/hibernate/ejb/criteria/expression/UnaryOperatorExpression.java 2009-09-17 21:26:25 UTC (rev 17526) @@ -1,9 +1,11 @@ /* - * Copyright (c) 2009, 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. + * Hibernate, Relational Persistence for Idiomatic Java * + * Copyright (c) 2009 by Red Hat Inc and/or its affiliates or by + * third-party contributors as indicated by either @author tags or express + * copyright attribution statements applied by the authors. All + * third-party contributions are distributed under license by Red Hat Inc. + * * This copyrighted material is made available to anyone wishing to use, modify, * copy, or redistribute it subject to the terms and conditions of the GNU * Lesser General Public License, as published by the Free Software Foundation. Modified: core/trunk/entitymanager/src/main/java/org/hibernate/ejb/criteria/expression/function/AbsFunction.java =================================================================== --- core/trunk/entitymanager/src/main/java/org/hibernate/ejb/criteria/expression/function/AbsFunction.java 2009-09-17 20:22:44 UTC (rev 17525) +++ core/trunk/entitymanager/src/main/java/org/hibernate/ejb/criteria/expression/function/AbsFunction.java 2009-09-17 21:26:25 UTC (rev 17526) @@ -1,9 +1,11 @@ /* - * Copyright (c) 2009, 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. + * Hibernate, Relational Persistence for Idiomatic Java * + * Copyright (c) 2009 by Red Hat Inc and/or its affiliates or by + * third-party contributors as indicated by either @author tags or express + * copyright attribution statements applied by the authors. All + * third-party contributions are distributed under license by Red Hat Inc. + * * This copyrighted material is made available to anyone wishing to use, modify, * copy, or redistribute it subject to the terms and conditions of the GNU * Lesser General Public License, as published by the Free Software Foundation. Modified: core/trunk/entitymanager/src/main/java/org/hibernate/ejb/criteria/expression/function/AggregationFunction.java =================================================================== --- core/trunk/entitymanager/src/main/java/org/hibernate/ejb/criteria/expression/function/AggregationFunction.java 2009-09-17 20:22:44 UTC (rev 17525) +++ core/trunk/entitymanager/src/main/java/org/hibernate/ejb/criteria/expression/function/AggregationFunction.java 2009-09-17 21:26:25 UTC (rev 17526) @@ -1,9 +1,11 @@ /* - * Copyright (c) 2009, 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. + * Hibernate, Relational Persistence for Idiomatic Java * + * Copyright (c) 2009 by Red Hat Inc and/or its affiliates or by + * third-party contributors as indicated by either @author tags or express + * copyright attribution statements applied by the authors. All + * third-party contributions are distributed under license by Red Hat Inc. + * * This copyrighted material is made available to anyone wishing to use, modify, * copy, or redistribute it subject to the terms and conditions of the GNU * Lesser General Public License, as published by the Free Software Foundation. Modified: core/trunk/entitymanager/src/main/java/org/hibernate/ejb/criteria/expression/function/BasicFunctionExpression.java =================================================================== --- core/trunk/entitymanager/src/main/java/org/hibernate/ejb/criteria/expression/function/BasicFunctionExpression.java 2009-09-17 20:22:44 UTC (rev 17525) +++ core/trunk/entitymanager/src/main/java/org/hibernate/ejb/criteria/expression/function/BasicFunctionExpression.java 2009-09-17 21:26:25 UTC (rev 17526) @@ -1,9 +1,11 @@ /* - * Copyright (c) 2009, 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. + * Hibernate, Relational Persistence for Idiomatic Java * + * Copyright (c) 2009 by Red Hat Inc and/or its affiliates or by + * third-party contributors as indicated by either @author tags or express + * copyright attribution statements applied by the authors. All + * third-party contributions are distributed under license by Red Hat Inc. + * * This copyrighted material is made available to anyone wishing to use, modify, * copy, or redistribute it subject to the terms and conditions of the GNU * Lesser General Public License, as published by the Free Software Foundation. Modified: core/trunk/entitymanager/src/main/java/org/hibernate/ejb/criteria/expression/function/CastFunction.java =================================================================== --- core/trunk/entitymanager/src/main/java/org/hibernate/ejb/criteria/expression/function/CastFunction.java 2009-09-17 20:22:44 UTC (rev 17525) +++ core/trunk/entitymanager/src/main/java/org/hibernate/ejb/criteria/expression/function/CastFunction.java 2009-09-17 21:26:25 UTC (rev 17526) @@ -1,9 +1,11 @@ /* - * Copyright (c) 2009, 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. + * Hibernate, Relational Persistence for Idiomatic Java * + * Copyright (c) 2009 by Red Hat Inc and/or its affiliates or by + * third-party contributors as indicated by either @author tags or express + * copyright attribution statements applied by the authors. All + * third-party contributions are distributed under license by Red Hat Inc. + * * This copyrighted material is made available to anyone wishing to use, modify, * copy, or redistribute it subject to the terms and conditions of the GNU * Lesser General Public License, as published by the Free Software Foundation. Modified: core/trunk/entitymanager/src/main/java/org/hibernate/ejb/criteria/expression/function/CurrentDateFunction.java =================================================================== --- core/trunk/entitymanager/src/main/java/org/hibernate/ejb/criteria/expression/function/CurrentDateFunction.java 2009-09-17 20:22:44 UTC (rev 17525) +++ core/trunk/entitymanager/src/main/java/org/hibernate/ejb/criteria/expression/function/CurrentDateFunction.java 2009-09-17 21:26:25 UTC (rev 17526) @@ -1,9 +1,11 @@ /* - * Copyright (c) 2009, 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. + * Hibernate, Relational Persistence for Idiomatic Java * + * Copyright (c) 2009 by Red Hat Inc and/or its affiliates or by + * third-party contributors as indicated by either @author tags or express + * copyright attribution statements applied by the authors. All + * third-party contributions are distributed under license by Red Hat Inc. + * * This copyrighted material is made available to anyone wishing to use, modify, * copy, or redistribute it subject to the terms and conditions of the GNU * Lesser General Public License, as published by the Free Software Foundation. Modified: core/trunk/entitymanager/src/main/java/org/hibernate/ejb/criteria/expression/function/CurrentTimeFunction.java =================================================================== --- core/trunk/entitymanager/src/main/java/org/hibernate/ejb/criteria/expression/function/CurrentTimeFunction.java 2009-09-17 20:22:44 UTC (rev 17525) +++ core/trunk/entitymanager/src/main/java/org/hibernate/ejb/criteria/expression/function/CurrentTimeFunction.java 2009-09-17 21:26:25 UTC (rev 17526) @@ -1,9 +1,11 @@ /* - * Copyright (c) 2009, 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. + * Hibernate, Relational Persistence for Idiomatic Java * + * Copyright (c) 2009 by Red Hat Inc and/or its affiliates or by + * third-party contributors as indicated by either @author tags or express + * copyright attribution statements applied by the authors. All + * third-party contributions are distributed under license by Red Hat Inc. + * * This copyrighted material is made available to anyone wishing to use, modify, * copy, or redistribute it subject to the terms and conditions of the GNU * Lesser General Public License, as published by the Free Software Foundation. Modified: core/trunk/entitymanager/src/main/java/org/hibernate/ejb/criteria/expression/function/CurrentTimestampFunction.java =================================================================== --- core/trunk/entitymanager/src/main/java/org/hibernate/ejb/criteria/expression/function/CurrentTimestampFunction.java 2009-09-17 20:22:44 UTC (rev 17525) +++ core/trunk/entitymanager/src/main/java/org/hibernate/ejb/criteria/expression/function/CurrentTimestampFunction.java 2009-09-17 21:26:25 UTC (rev 17526) @@ -1,9 +1,11 @@ /* - * Copyright (c) 2009, 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. + * Hibernate, Relational Persistence for Idiomatic Java * + * Copyright (c) 2009 by Red Hat Inc and/or its affiliates or by + * third-party contributors as indicated by either @author tags or express + * copyright attribution statements applied by the authors. All + * third-party contributions are distributed under license by Red Hat Inc. + * * This copyrighted material is made available to anyone wishing to use, modify, * copy, or redistribute it subject to the terms and conditions of the GNU * Lesser General Public License, as published by the Free Software Foundation. Modified: core/trunk/entitymanager/src/main/java/org/hibernate/ejb/criteria/expression/function/FunctionExpression.java =================================================================== --- core/trunk/entitymanager/src/main/java/org/hibernate/ejb/criteria/expression/function/FunctionExpression.java 2009-09-17 20:22:44 UTC (rev 17525) +++ core/trunk/entitymanager/src/main/java/org/hibernate/ejb/criteria/expression/function/FunctionExpression.java 2009-09-17 21:26:25 UTC (rev 17526) @@ -1,9 +1,11 @@ /* - * Copyright (c) 2009, 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. + * Hibernate, Relational Persistence for Idiomatic Java * + * Copyright (c) 2009 by Red Hat Inc and/or its affiliates or by + * third-party contributors as indicated by either @author tags or express + * copyright attribution statements applied by the authors. All + * third-party contributions are distributed under license by Red Hat Inc. + * * This copyrighted material is made available to anyone wishing to use, modify, * copy, or redistribute it subject to the terms and conditions of the GNU * Lesser General Public License, as published by the Free Software Foundation. Modified: core/trunk/entitymanager/src/main/java/org/hibernate/ejb/criteria/expression/function/LengthFunction.java =================================================================== --- core/trunk/entitymanager/src/main/java/org/hibernate/ejb/criteria/expression/function/LengthFunction.java 2009-09-17 20:22:44 UTC (rev 17525) +++ core/trunk/entitymanager/src/main/java/org/hibernate/ejb/criteria/expression/function/LengthFunction.java 2009-09-17 21:26:25 UTC (rev 17526) @@ -1,9 +1,11 @@ /* - * Copyright (c) 2009, 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. + * Hibernate, Relational Persistence for Idiomatic Java * + * Copyright (c) 2009 by Red Hat Inc and/or its affiliates or by + * third-party contributors as indicated by either @author tags or express + * copyright attribution statements applied by the authors. All + * third-party contributions are distributed under license by Red Hat Inc. + * * This copyrighted material is made available to anyone wishing to use, modify, * copy, or redistribute it subject to the terms and conditions of the GNU * Lesser General Public License, as published by the Free Software Foundation. Modified: core/trunk/entitymanager/src/main/java/org/hibernate/ejb/criteria/expression/function/LocateFunction.java =================================================================== --- core/trunk/entitymanager/src/main/java/org/hibernate/ejb/criteria/expression/function/LocateFunction.java 2009-09-17 20:22:44 UTC (rev 17525) +++ core/trunk/entitymanager/src/main/java/org/hibernate/ejb/criteria/expression/function/LocateFunction.java 2009-09-17 21:26:25 UTC (rev 17526) @@ -1,9 +1,11 @@ /* - * Copyright (c) 2009, 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. + * Hibernate, Relational Persistence for Idiomatic Java * + * Copyright (c) 2009 by Red Hat Inc and/or its affiliates or by + * third-party contributors as indicated by either @author tags or express + * copyright attribution statements applied by the authors. All + * third-party contributions are distributed under license by Red Hat Inc. + * * This copyrighted material is made available to anyone wishing to use, modify, * copy, or redistribute it subject to the terms and conditions of the GNU * Lesser General Public License, as published by the Free Software Foundation. Modified: core/trunk/entitymanager/src/main/java/org/hibernate/ejb/criteria/expression/function/LowerFunction.java =================================================================== --- core/trunk/entitymanager/src/main/java/org/hibernate/ejb/criteria/expression/function/LowerFunction.java 2009-09-17 20:22:44 UTC (rev 17525) +++ core/trunk/entitymanager/src/main/java/org/hibernate/ejb/criteria/expression/function/LowerFunction.java 2009-09-17 21:26:25 UTC (rev 17526) @@ -1,9 +1,11 @@ /* - * Copyright (c) 2009, 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. + * Hibernate, Relational Persistence for Idiomatic Java * + * Copyright (c) 2009 by Red Hat Inc and/or its affiliates or by + * third-party contributors as indicated by either @author tags or express + * copyright attribution statements applied by the authors. All + * third-party contributions are distributed under license by Red Hat Inc. + * * This copyrighted material is made available to anyone wishing to use, modify, * copy, or redistribute it subject to the terms and conditions of the GNU * Lesser General Public License, as published by the Free Software Foundation. Modified: core/trunk/entitymanager/src/main/java/org/hibernate/ejb/criteria/expression/function/ParameterizedFunctionExpression.java =================================================================== --- core/trunk/entitymanager/src/main/java/org/hibernate/ejb/criteria/expression/function/ParameterizedFunctionExpression.java 2009-09-17 20:22:44 UTC (rev 17525) +++ core/trunk/entitymanager/src/main/java/org/hibernate/ejb/criteria/expression/function/ParameterizedFunctionExpression.java 2009-09-17 21:26:25 UTC (rev 17526) @@ -1,9 +1,11 @@ /* - * Copyright (c) 2009, 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. + * Hibernate, Relational Persistence for Idiomatic Java * + * Copyright (c) 2009 by Red Hat Inc and/or its affiliates or by + * third-party contributors as indicated by either @author tags or express + * copyright attribution statements applied by the authors. All + * third-party contributions are distributed under license by Red Hat Inc. + * * This copyrighted material is made available to anyone wishing to use, modify, * copy, or redistribute it subject to the terms and conditions of the GNU * Lesser General Public License, as published by the Free Software Foundation. Modified: core/trunk/entitymanager/src/main/java/org/hibernate/ejb/criteria/expression/function/SqrtFunction.java =================================================================== --- core/trunk/entitymanager/src/main/java/org/hibernate/ejb/criteria/expression/function/SqrtFunction.java 2009-09-17 20:22:44 UTC (rev 17525) +++ core/trunk/entitymanager/src/main/java/org/hibernate/ejb/criteria/expression/function/SqrtFunction.java 2009-09-17 21:26:25 UTC (rev 17526) @@ -1,9 +1,11 @@ /* - * Copyright (c) 2009, 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. + * Hibernate, Relational Persistence for Idiomatic Java * + * Copyright (c) 2009 by Red Hat Inc and/or its affiliates or by + * third-party contributors as indicated by either @author tags or express + * copyright attribution statements applied by the authors. All + * third-party contributions are distributed under license by Red Hat Inc. + * * This copyrighted material is made available to anyone wishing to use, modify, * copy, or redistribute it subject to the terms and conditions of the GNU * Lesser General Public License, as published by the Free Software Foundation. Modified: core/trunk/entitymanager/src/main/java/org/hibernate/ejb/criteria/expression/function/SubstringFunction.java =================================================================== --- core/trunk/entitymanager/src/main/java/org/hibernate/ejb/criteria/expression/function/SubstringFunction.java 2009-09-17 20:22:44 UTC (rev 17525) +++ core/trunk/entitymanager/src/main/java/org/hibernate/ejb/criteria/expression/function/SubstringFunction.java 2009-09-17 21:26:25 UTC (rev 17526) @@ -1,3 +1,26 @@ +/* + * Hibernate, Relational Persistence for Idiomatic Java + * + * Copyright (c) 2009 by Red Hat Inc and/or its affiliates or by + * third-party contributors as indicated by either @author tags or express + * copyright attribution statements applied by the authors. All + * third-party contributions are distributed under license by Red Hat Inc. + * + * This copyrighted material is made available to anyone wishing to use, modify, + * copy, or redistribute it subject to the terms and conditions of the GNU + * Lesser General Public License, as published by the Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY + * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License + * for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with this distribution; if not, write to: + * Free Software Foundation, Inc. + * 51 Franklin Street, Fifth Floor + * Boston, MA 02110-1301 USA + */ package org.hibernate.ejb.criteria.expression.function; import javax.persistence.criteria.Expression; Modified: core/trunk/entitymanager/src/main/java/org/hibernate/ejb/criteria/expression/function/TrimFunction.java =================================================================== --- core/trunk/entitymanager/src/main/java/org/hibernate/ejb/criteria/expression/function/TrimFunction.java 2009-09-17 20:22:44 UTC (rev 17525) +++ core/trunk/entitymanager/src/main/java/org/hibernate/ejb/criteria/expression/function/TrimFunction.java 2009-09-17 21:26:25 UTC (rev 17526) @@ -1,3 +1,26 @@ +/* + * Hibernate, Relational Persistence for Idiomatic Java + * + * Copyright (c) 2009 by Red Hat Inc and/or its affiliates or by + * third-party contributors as indicated by either @author tags or express + * copyright attribution statements applied by the authors. All + * third-party contributions are distributed under license by Red Hat Inc. + * + * This copyrighted material is made available to anyone wishing to use, modify, + * copy, or redistribute it subject to the terms and conditions of the GNU + * Lesser General Public License, as published by the Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY + * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License + * for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with this distribution; if not, write to: + * Free Software Foundation, Inc. + * 51 Franklin Street, Fifth Floor + * Boston, MA 02110-1301 USA + */ package org.hibernate.ejb.criteria.expression.function; import javax.persistence.criteria.Expression; Modified: core/trunk/entitymanager/src/main/java/org/hibernate/ejb/criteria/expression/function/UpperFunction.java =================================================================== --- core/trunk/entitymanager/src/main/java/org/hibernate/ejb/criteria/expression/function/UpperFunction.java 2009-09-17 20:22:44 UTC (rev 17525) +++ core/trunk/entitymanager/src/main/java/org/hibernate/ejb/criteria/expression/function/UpperFunction.java 2009-09-17 21:26:25 UTC (rev 17526) @@ -1,9 +1,11 @@ /* - * Copyright (c) 2009, 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. + * Hibernate, Relational Persistence for Idiomatic Java * + * Copyright (c) 2009 by Red Hat Inc and/or its affiliates or by + * third-party contributors as indicated by either @author tags or express + * copyright attribution statements applied by the authors. All + * third-party contributions are distributed under license by Red Hat Inc. + * * This copyrighted material is made available to anyone wishing to use, modify, * copy, or redistribute it subject to the terms and conditions of the GNU * Lesser General Public License, as published by the Free Software Foundation. Modified: core/trunk/entitymanager/src/main/java/org/hibernate/ejb/criteria/predicate/AbstractPredicateImpl.java =================================================================== --- core/trunk/entitymanager/src/main/java/org/hibernate/ejb/criteria/predicate/AbstractPredicateImpl.java 2009-09-17 20:22:44 UTC (rev 17525) +++ core/trunk/entitymanager/src/main/java/org/hibernate/ejb/criteria/predicate/AbstractPredicateImpl.java 2009-09-17 21:26:25 UTC (rev 17526) @@ -1,9 +1,11 @@ /* - * Copyright (c) 2009, 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. + * Hibernate, Relational Persistence for Idiomatic Java * + * Copyright (c) 2009 by Red Hat Inc and/or its affiliates or by + * third-party contributors as indicated by either @author tags or express + * copyright attribution statements applied by the authors. All + * third-party contributions are distributed under license by Red Hat Inc. + * * This copyrighted material is made available to anyone wishing to use, modify, * copy, or redistribute it subject to the terms and conditions of the GNU * Lesser General Public License, as published by the Free Software Foundation. Modified: core/trunk/entitymanager/src/main/java/org/hibernate/ejb/criteria/predicate/AbstractSimplePredicate.java =================================================================== --- core/trunk/entitymanager/src/main/java/org/hibernate/ejb/criteria/predicate/AbstractSimplePredicate.java 2009-09-17 20:22:44 UTC (rev 17525) +++ core/trunk/entitymanager/src/main/java/org/hibernate/ejb/criteria/predicate/AbstractSimplePredicate.java 2009-09-17 21:26:25 UTC (rev 17526) @@ -1,9 +1,11 @@ /* - * Copyright (c) 2009, 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. + * Hibernate, Relational Persistence for Idiomatic Java * + * Copyright (c) 2009 by Red Hat Inc and/or its affiliates or by + * third-party contributors as indicated by either @author tags or express + * copyright attribution statements applied by the authors. All + * third-party contributions are distributed under license by Red Hat Inc. + * * This copyrighted material is made available to anyone wishing to use, modify, * copy, or redistribute it subject to the terms and conditions of the GNU * Lesser General Public License, as published by the Free Software Foundation. Modified: core/trunk/entitymanager/src/main/java/org/hibernate/ejb/criteria/predicate/BetweenPredicate.java =================================================================== --- core/trunk/entitymanager/src/main/java/org/hibernate/ejb/criteria/predicate/BetweenPredicate.java 2009-09-17 20:22:44 UTC (rev 17525) +++ core/trunk/entitymanager/src/main/java/org/hibernate/ejb/criteria/predicate/BetweenPredicate.java 2009-09-17 21:26:25 UTC (rev 17526) @@ -1,9 +1,11 @@ /* - * Copyright (c) 2009, 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. + * Hibernate, Relational Persistence for Idiomatic Java * + * Copyright (c) 2009 by Red Hat Inc and/or its affiliates or by + * third-party contributors as indicated by either @author tags or express + * copyright attribution statements applied by the authors. All + * third-party contributions are distributed under license by Red Hat Inc. + * * This copyrighted material is made available to anyone wishing to use, modify, * copy, or redistribute it subject to the terms and conditions of the GNU * Lesser General Public License, as published by the Free Software Foundation. Modified: core/trunk/entitymanager/src/main/java/org/hibernate/ejb/criteria/predicate/BooleanExpressionPredicate.java =================================================================== --- core/trunk/entitymanager/src/main/java/org/hibernate/ejb/criteria/predicate/BooleanExpressionPredicate.java 2009-09-17 20:22:44 UTC (rev 17525) +++ core/trunk/entitymanager/src/main/java/org/hibernate/ejb/criteria/predicate/BooleanExpressionPredicate.java 2009-09-17 21:26:25 UTC (rev 17526) @@ -1,9 +1,11 @@ /* - * Copyright (c) 2009, 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. + * Hibernate, Relational Persistence for Idiomatic Java * + * Copyright (c) 2009 by Red Hat Inc and/or its affiliates or by + * third-party contributors as indicated by either @author tags or express + * copyright attribution statements applied by the authors. All + * third-party contributions are distributed under license by Red Hat Inc. + * * This copyrighted material is made available to anyone wishing to use, modify, * copy, or redistribute it subject to the terms and conditions of the GNU * Lesser General Public License, as published by the Free Software Foundation. Modified: core/trunk/entitymanager/src/main/java/org/hibernate/ejb/criteria/predicate/ComparisonPredicate.java =================================================================== --- core/trunk/entitymanager/src/main/java/org/hibernate/ejb/criteria/predicate/ComparisonPredicate.java 2009-09-17 20:22:44 UTC (rev 17525) +++ core/trunk/entitymanager/src/main/java/org/hibernate/ejb/criteria/predicate/ComparisonPredicate.java 2009-09-17 21:26:25 UTC (rev 17526) @@ -1,9 +1,11 @@ /* - * Copyright (c) 2009, 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. + * Hibernate, Relational Persistence for Idiomatic Java * + * Copyright (c) 2009 by Red Hat Inc and/or its affiliates or by + * third-party contributors as indicated by either @author tags or express + * copyright attribution statements applied by the authors. All + * third-party contributions are distributed under license by Red Hat Inc. + * * This copyrighted material is made available to anyone wishing to use, modify, * copy, or redistribute it subject to the terms and conditions of the GNU * Lesser General Public License, as published by the Free Software Foundation. Modified: core/trunk/entitymanager/src/main/java/org/hibernate/ejb/criteria/predicate/CompoundPredicate.java =================================================================== --- core/trunk/entitymanager/src/main/java/org/hibernate/ejb/criteria/predicate/CompoundPredicate.java 2009-09-17 20:22:44 UTC (rev 17525) +++ core/trunk/entitymanager/src/main/java/org/hibernate/ejb/criteria/predicate/CompoundPredicate.java 2009-09-17 21:26:25 UTC (rev 17526) @@ -1,9 +1,11 @@ /* - * Copyright (c) 2009, 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. + * Hibernate, Relational Persistence for Idiomatic Java * + * Copyright (c) 2009 by Red Hat Inc and/or its affiliates or by + * third-party contributors as indicated by either @author tags or express + * copyright attribution statements applied by the authors. All + * third-party contributions are distributed under license by Red Hat Inc. + * * This copyrighted material is made available to anyone wishing to use, modify, * copy, or redistribute it subject to the terms and conditions of the GNU * Lesser General Public License, as published by the Free Software Foundation. Modified: core/trunk/entitymanager/src/main/java/org/hibernate/ejb/criteria/predicate/ExistsPredicate.java =================================================================== --- core/trunk/entitymanager/src/main/java/org/hibernate/ejb/criteria/predicate/ExistsPredicate.java 2009-09-17 20:22:44 UTC (rev 17525) +++ core/trunk/entitymanager/src/main/java/org/hibernate/ejb/criteria/predicate/ExistsPredicate.java 2009-09-17 21:26:25 UTC (rev 17526) @@ -1,9 +1,11 @@ /* - * Copyright (c) 2009, 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. + * Hibernate, Relational Persistence for Idiomatic Java * + * Copyright (c) 2009 by Red Hat Inc and/or its affiliates or by + * third-party contributors as indicated by either @author tags or express + * copyright attribution statements applied by the authors. All + * third-party contributions are distributed under license by Red Hat Inc. + * * This copyrighted material is made available to anyone wishing to use, modify, * copy, or redistribute it subject to the terms and conditions of the GNU * Lesser General Public License, as published by the Free Software Foundation. Modified: core/trunk/entitymanager/src/main/java/org/hibernate/ejb/criteria/predicate/ExplicitTruthValueCheck.java =================================================================== --- core/trunk/entitymanager/src/main/java/org/hibernate/ejb/criteria/predicate/ExplicitTruthValueCheck.java 2009-09-17 20:22:44 UTC (rev 17525) +++ core/trunk/entitymanager/src/main/java/org/hibernate/ejb/criteria/predicate/ExplicitTruthValueCheck.java 2009-09-17 21:26:25 UTC (rev 17526) @@ -1,9 +1,11 @@ /* - * Copyright (c) 2009, 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. + * Hibernate, Relational Persistence for Idiomatic Java * + * Copyright (c) 2009 by Red Hat Inc and/or its affiliates or by + * third-party contributors as indicated by either @author tags or express + * copyright attribution statements applied by the authors. All + * third-party contributions are distributed under license by Red Hat Inc. + * * This copyrighted material is made available to anyone wishing to use, modify, * copy, or redistribute it subject to the terms and conditions of the GNU * Lesser General Public License, as published by the Free Software Foundation. Modified: core/trunk/entitymanager/src/main/java/org/hibernate/ejb/criteria/predicate/InPredicate.java =================================================================== --- core/trunk/entitymanager/src/main/java/org/hibernate/ejb/criteria/predicate/InPredicate.java 2009-09-17 20:22:44 UTC (rev 17525) +++ core/trunk/entitymanager/src/main/java/org/hibernate/ejb/criteria/predicate/InPredicate.java 2009-09-17 21:26:25 UTC (rev 17526) @@ -1,9 +1,11 @@ /* - * Copyright (c) 2009, 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. + * Hibernate, Relational Persistence for Idiomatic Java * + * Copyright (c) 2009 by Red Hat Inc and/or its affiliates or by + * third-party contributors as indicated by either @author tags or express + * copyright attribution statements applied by the authors. All + * third-party contributions are distributed under license by Red Hat Inc. + * * This copyrighted material is made available to anyone wishing to use, modify, * copy, or redistribute it subject to the terms and conditions of the GNU * Lesser General Public License, as published by the Free Software Foundation. Modified: core/trunk/entitymanager/src/main/java/org/hibernate/ejb/criteria/predicate/IsEmptyPredicate.java =================================================================== --- core/trunk/entitymanager/src/main/java/org/hibernate/ejb/criteria/predicate/IsEmptyPredicate.java 2009-09-17 20:22:44 UTC (rev 17525) +++ core/trunk/entitymanager/src/main/java/org/hibernate/ejb/criteria/predicate/IsEmptyPredicate.java 2009-09-17 21:26:25 UTC (rev 17526) @@ -1,9 +1,11 @@ /* - * Copyright (c) 2009, 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. + * Hibernate, Relational Persistence for Idiomatic Java * + * Copyright (c) 2009 by Red Hat Inc and/or its affiliates or by + * third-party contributors as indicated by either @author tags or express + * copyright attribution statements applied by the authors. All + * third-party contributions are distributed under license by Red Hat Inc. + * * This copyrighted material is made available to anyone wishing to use, modify, * copy, or redistribute it subject to the terms and conditions of the GNU * Lesser General Public License, as published by the Free Software Foundation. Modified: core/trunk/entitymanager/src/main/java/org/hibernate/ejb/criteria/predicate/LikePredicate.java =================================================================== --- core/trunk/entitymanager/src/main/java/org/hibernate/ejb/criteria/predicate/LikePredicate.java 2009-09-17 20:22:44 UTC (rev 17525) +++ core/trunk/entitymanager/src/main/java/org/hibernate/ejb/criteria/predicate/LikePredicate.java 2009-09-17 21:26:25 UTC (rev 17526) @@ -1,9 +1,11 @@ /* - * Copyright (c) 2009, 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. + * Hibernate, Relational Persistence for Idiomatic Java * + * Copyright (c) 2009 by Red Hat Inc and/or its affiliates or by + * third-party contributors as indicated by either @author tags or express + * copyright attribution statements applied by the authors. All + * third-party contributions are distributed under license by Red Hat Inc. + * * This copyrighted material is made available to anyone wishing to use, modify, * copy, or redistribute it subject to the terms and conditions of the GNU * Lesser General Public License, as published by the Free Software Foundation. Modified: core/trunk/entitymanager/src/main/java/org/hibernate/ejb/criteria/predicate/MemberOfPredicate.java =================================================================== --- core/trunk/entitymanager/src/main/java/org/hibernate/ejb/criteria/predicate/MemberOfPredicate.java 2009-09-17 20:22:44 UTC (rev 17525) +++ core/trunk/entitymanager/src/main/java/org/hibernate/ejb/criteria/predicate/MemberOfPredicate.java 2009-09-17 21:26:25 UTC (rev 17526) @@ -1,9 +1,11 @@ /* - * Copyright (c) 2009, 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. + * Hibernate, Relational Persistence for Idiomatic Java * + * Copyright (c) 2009 by Red Hat Inc and/or its affiliates or by + * third-party contributors as indicated by either @author tags or express + * copyright attribution statements applied by the authors. All + * third-party contributions are distributed under license by Red Hat Inc. + * * This copyrighted material is made available to anyone wishing to use, modify, * copy, or redistribute it subject to the terms and conditions of the GNU * Lesser General Public License, as published by the Free Software Foundation. Modified: core/trunk/entitymanager/src/main/java/org/hibernate/ejb/criteria/predicate/NullnessPredicate.java =================================================================== --- core/trunk/entitymanager/src/main/java/org/hibernate/ejb/criteria/predicate/NullnessPredicate.java 2009-09-17 20:22:44 UTC (rev 17525) +++ core/trunk/entitymanager/src/main/java/org/hibernate/ejb/criteria/predicate/NullnessPredicate.java 2009-09-17 21:26:25 UTC (rev 17526) @@ -1,9 +1,11 @@ /* - * Copyright (c) 2009, 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. + * Hibernate, Relational Persistence for Idiomatic Java * + * Copyright (c) 2009 by Red Hat Inc and/or its affiliates or by + * third-party contributors as indicated by either @author tags or express + * copyright attribution statements applied by the authors. All + * third-party contributions are distributed under license by Red Hat Inc. + * * This copyrighted material is made available to anyone wishing to use, modify, * copy, or redistribute it subject to the terms and conditions of the GNU * Lesser General Public License, as published by the Free Software Foundation. Modified: core/trunk/entitymanager/src/main/java/org/hibernate/ejb/criteria/predicate/TruthValue.java =================================================================== --- core/trunk/entitymanager/src/main/java/org/hibernate/ejb/criteria/predicate/TruthValue.java 2009-09-17 20:22:44 UTC (rev 17525) +++ core/trunk/entitymanager/src/main/java/org/hibernate/ejb/criteria/predicate/TruthValue.java 2009-09-17 21:26:25 UTC (rev 17526) @@ -1,9 +1,11 @@ /* - * Copyright (c) 2009, 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. + * Hibernate, Relational Persistence for Idiomatic Java * + * Copyright (c) 2009 by Red Hat Inc and/or its affiliates or by + * third-party contributors as indicated by either @author tags or express + * copyright attribution statements applied by the authors. All + * third-party contributions are distributed under license by Red Hat Inc. + * * This copyrighted material is made available to anyone wishing to use, modify, * copy, or redistribute it subject to the terms and conditions of the GNU * Lesser General Public License, as published by the Free Software Foundation. Modified: core/trunk/parent/pom.xml =================================================================== --- core/trunk/parent/pom.xml 2009-09-17 20:22:44 UTC (rev 17525) +++ core/trunk/parent/pom.xml 2009-09-17 21:26:25 UTC (rev 17526) @@ -428,7 +428,7 @@ <dependency> <groupId>org.hibernate.java-persistence</groupId> <artifactId>jpa-api</artifactId> - <version>2.0.Beta-20090815</version> + <version>2.0.Beta-SNAPSHOT</version> </dependency> <!-- Set the version of the hibernate-commons-annotations to be used throughout the the project --> <dependency>