You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by dj...@apache.org on 2008/11/27 01:23:46 UTC
svn commit: r721048 [1/5] - in
/geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence:
./ spi/
Author: djencks
Date: Wed Nov 26 16:23:43 2008
New Revision: 721048
URL: http://svn.apache.org/viewvc?rev=721048&view=rev
Log:
GERONIMO-4410 Try to avoid future merge problems by reformatting all code with IDEA to a standard
Modified:
geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/Access.java
geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/Aggregate.java
geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/AssociationOverride.java
geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/AssociationOverrides.java
geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/AttributeOverride.java
geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/AttributeOverrides.java
geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/Basic.java
geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/Cache.java
geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/CascadeType.java
geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/CaseExpression.java
geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/CollectionTable.java
geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/Column.java
geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/ColumnResult.java
geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/DiscriminatorColumn.java
geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/DiscriminatorType.java
geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/DiscriminatorValue.java
geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/DomainObject.java
geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/ElementCollection.java
geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/Embeddable.java
geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/Embedded.java
geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/EmbeddedId.java
geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/Entity.java
geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/EntityExistsException.java
geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/EntityListeners.java
geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/EntityManager.java
geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/EntityManagerFactory.java
geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/EntityResult.java
geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/EntityTransaction.java
geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/Enumerated.java
geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/ExcludeDefaultListeners.java
geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/ExcludeSuperclassListeners.java
geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/Expression.java
geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/FieldResult.java
geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/GeneratedValue.java
geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/Id.java
geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/IdClass.java
geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/Inheritance.java
geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/JoinColumn.java
geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/JoinColumns.java
geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/JoinTable.java
geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/Lob.java
geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/ManyToMany.java
geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/ManyToOne.java
geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/MapKey.java
geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/MapKeyClass.java
geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/MapKeyColumn.java
geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/MapKeyJoinColumn.java
geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/MapKeyJoinColumns.java
geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/MappedById.java
geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/MappedSuperclass.java
geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/NamedNativeQueries.java
geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/NamedNativeQuery.java
geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/NamedQueries.java
geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/NamedQuery.java
geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/OneToMany.java
geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/OneToOne.java
geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/OptimisticLockException.java
geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/OrderBy.java
geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/OrderColumn.java
geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/PathExpression.java
geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/Persistence.java
geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/PersistenceContext.java
geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/PersistenceContexts.java
geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/PersistenceProperty.java
geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/PersistenceUnit.java
geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/PersistenceUnits.java
geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/PessimisticLockException.java
geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/PostLoad.java
geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/PostPersist.java
geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/PostRemove.java
geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/PostUpdate.java
geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/PrePersist.java
geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/PreRemove.java
geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/PreUpdate.java
geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/Predicate.java
geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/PredicateOperand.java
geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/PrimaryKeyJoinColumn.java
geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/PrimaryKeyJoinColumns.java
geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/Query.java
geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/QueryBuilder.java
geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/QueryDefinition.java
geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/SecondaryTable.java
geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/SecondaryTables.java
geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/SelectItem.java
geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/SequenceGenerator.java
geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/SqlResultSetMapping.java
geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/SqlResultSetMappings.java
geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/Table.java
geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/TableGenerator.java
geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/Temporal.java
geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/Transient.java
geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/TrimSpec.java
geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/UniqueConstraint.java
geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/Version.java
geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/spi/ClassTransformer.java
geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/spi/PersistenceProvider.java
Modified: geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/Access.java
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/Access.java?rev=721048&r1=721047&r2=721048&view=diff
==============================================================================
--- geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/Access.java (original)
+++ geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/Access.java Wed Nov 26 16:23:43 2008
@@ -24,10 +24,10 @@
//
package javax.persistence;
-import java.lang.annotation.Target;
-import java.lang.annotation.Retention;
import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
@Target({ElementType.TYPE, ElementType.METHOD, ElementType.FIELD})
@Retention(RetentionPolicy.RUNTIME)
Modified: geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/Aggregate.java
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/Aggregate.java?rev=721048&r1=721047&r2=721048&view=diff
==============================================================================
--- geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/Aggregate.java (original)
+++ geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/Aggregate.java Wed Nov 26 16:23:43 2008
@@ -28,9 +28,9 @@
* Type of the result of an aggregate operation
*/
public interface Aggregate extends Expression {
- /**
- * Specify that duplicates are to be removed before the aggregate operation
- * is invoked.
- */
- Expression distinct();
+ /**
+ * Specify that duplicates are to be removed before the aggregate operation
+ * is invoked.
+ */
+ Expression distinct();
}
Modified: geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/AssociationOverride.java
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/AssociationOverride.java?rev=721048&r1=721047&r2=721048&view=diff
==============================================================================
--- geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/AssociationOverride.java (original)
+++ geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/AssociationOverride.java Wed Nov 26 16:23:43 2008
@@ -32,7 +32,9 @@
@Target({ElementType.TYPE, ElementType.METHOD, ElementType.FIELD})
@Retention(RetentionPolicy.RUNTIME)
public @interface AssociationOverride {
- String name();
- JoinColumn[] joinColumns();
- JoinTable joinTable() default @JoinTable;
+ String name();
+
+ JoinColumn[] joinColumns();
+
+ JoinTable joinTable() default @JoinTable;
}
Modified: geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/AssociationOverrides.java
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/AssociationOverrides.java?rev=721048&r1=721047&r2=721048&view=diff
==============================================================================
--- geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/AssociationOverrides.java (original)
+++ geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/AssociationOverrides.java Wed Nov 26 16:23:43 2008
@@ -35,5 +35,5 @@
@Target({ElementType.TYPE, ElementType.METHOD, ElementType.FIELD})
@Retention(RetentionPolicy.RUNTIME)
public @interface AssociationOverrides {
- AssociationOverride[] value();
+ AssociationOverride[] value();
}
Modified: geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/AttributeOverride.java
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/AttributeOverride.java?rev=721048&r1=721047&r2=721048&view=diff
==============================================================================
--- geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/AttributeOverride.java (original)
+++ geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/AttributeOverride.java Wed Nov 26 16:23:43 2008
@@ -24,10 +24,10 @@
//
package javax.persistence;
-import java.lang.annotation.Target;
-import java.lang.annotation.Retention;
import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
/**
* @version $Rev$ $Date$
Modified: geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/AttributeOverrides.java
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/AttributeOverrides.java?rev=721048&r1=721047&r2=721048&view=diff
==============================================================================
--- geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/AttributeOverrides.java (original)
+++ geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/AttributeOverrides.java Wed Nov 26 16:23:43 2008
@@ -24,10 +24,10 @@
//
package javax.persistence;
-import java.lang.annotation.Target;
-import java.lang.annotation.Retention;
import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
/**
* @version $Rev$ $Date$
Modified: geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/Basic.java
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/Basic.java?rev=721048&r1=721047&r2=721048&view=diff
==============================================================================
--- geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/Basic.java (original)
+++ geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/Basic.java Wed Nov 26 16:23:43 2008
@@ -24,10 +24,10 @@
//
package javax.persistence;
-import java.lang.annotation.Target;
-import java.lang.annotation.Retention;
import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
/**
* @version $Rev$ $Date$
Modified: geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/Cache.java
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/Cache.java?rev=721048&r1=721047&r2=721048&view=diff
==============================================================================
--- geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/Cache.java (original)
+++ geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/Cache.java Wed Nov 26 16:23:43 2008
@@ -23,27 +23,31 @@
// DO NOT add / change / or delete method signatures!
//
package javax.persistence;
+
/**
-* Interface used to interact with the second-level cache.
-* If a cache is not in use, the methods of this interface have
-* no effect, except for contains, which returns false.
-*/
+ * Interface used to interact with the second-level cache.
+ * If a cache is not in use, the methods of this interface have
+ * no effect, except for contains, which returns false.
+ */
public interface Cache {
/**
- * Whether the cache contains data for the given entity.
- */
+ * Whether the cache contains data for the given entity.
+ */
public boolean contains(Class cls, Object primaryKey);
+
/**
- * Remove the data for the given entity from the cache.
- */
+ * Remove the data for the given entity from the cache.
+ */
public void evict(Class cls, Object primaryKey);
+
/**
- * Remove the data for entities of the specified class (and its
- subclasses) from the cache.
- */
+ * Remove the data for entities of the specified class (and its
+ * subclasses) from the cache.
+ */
public void evict(Class cls);
+
/**
- * Clear the cache.
- */
+ * Clear the cache.
+ */
public void evictAll();
}
Modified: geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/CascadeType.java
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/CascadeType.java?rev=721048&r1=721047&r2=721048&view=diff
==============================================================================
--- geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/CascadeType.java (original)
+++ geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/CascadeType.java Wed Nov 26 16:23:43 2008
@@ -28,4 +28,5 @@
* @version $Rev$ $Date$
*/
public enum CascadeType {
- ALL, PERSIST, MERGE, REMOVE, REFRESH, CLEAR};
+ ALL, PERSIST, MERGE, REMOVE, REFRESH, CLEAR
+};
Modified: geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/CaseExpression.java
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/CaseExpression.java?rev=721048&r1=721047&r2=721048&view=diff
==============================================================================
--- geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/CaseExpression.java (original)
+++ geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/CaseExpression.java Wed Nov 26 16:23:43 2008
@@ -24,252 +24,252 @@
//
package javax.persistence;
-import java.util.Date;
import java.util.Calendar;
+import java.util.Date;
/**
* Interface for the construction of case expressions
*/
public interface CaseExpression {
- /**
- * Add a when predicate clause to a general case expression. The when
- * predicate must be followed by the corresponding then case expression that
- * specifies the result of the specific case. Clauses are evaluated in the
- * order added.
- *
- * @param pred -
- * corresponds to the evaluation condition for the specific case
- * @return CaseExpression corresponding to the case with the added when
- * clause
- */
- CaseExpression when(Predicate pred);
-
- /**
- * Add a when clause to a simple case expression. The when case expression
- * must be followed by the corresponding then case expression that specifies
- * the result of the specific case. Clauses are evaluated in the order added
- *
- * @param when -
- * corresponds to the value against which the case operand of the
- * simple case is tested
- * @return CaseExpression corresponding to the case with the added clause
- */
- CaseExpression when(Expression when);
-
- /**
- * Add a when clause to a simple case expression. The when case expression
- * must be followed by the corresponding then case expression that specifies
- * the result of the specific case. Clauses are evaluated in the order added
- *
- * @param when -
- * corresponds to the value against which the case operand of the
- * simple case is tested
- * @return CaseExpression corresponding to the case with the added clause
- */
- CaseExpression when(Number when);
-
- /**
- * Add a when clause to a simple case expression. The when case expression
- * must be followed by the corresponding then case expression that specifies
- * the result of the specific case. Clauses are evaluated in the order added
- *
- * @param when -
- * corresponds to the value against which the
- * case operand of the simple case is tested
- * @return CaseExpression corresponding to the case with the added clause
- */
- CaseExpression when(String when);
-
- /**
- * Add a when clause to a simple case expression. The when case expression
- * must be followed by the corresponding then case expression that specifies
- * the result of the specific case. Clauses are evaluated in the order added
- *
- * @param when -
- * corresponds to the value against which the case operand of the
- * simple case is tested
- * @return CaseExpression corresponding to the case with the added clause
- */
- CaseExpression when(Date when);
-
- /**
- * Add a when clause to a simple case expression. The when case expression
- * must be followed by the corresponding then case expression that specifies
- * the result of the specific case. Clauses are evaluated in the order added
- *
- * @param when -
- * corresponds to the value against which the case operand of the
- * simple case is tested
- * @return CaseExpression corresponding to the case with the added clause
- */
- CaseExpression when(Calendar when);
-
- /**
- * Add a when clause to a simple case expression. The when case expression
- * must be followed by the corresponding then case expression that specifies
- * the result of the specific case. Clauses are evaluated in the order added
- *
- * @param when -
- * corresponds to the value against which the case operand of the
- * simple case is tested
- * @return CaseExpression corresponding to the case with the added clause
- */
- CaseExpression when(Class when);
-
- /**
- * Add a when clause to a simple case expression. The when case expression
- * must be followed by the corresponding then case expression that specifies
- * the result of the specific case. Clauses are evaluated in the order added
- *
- * @param when -
- * corresponds to the value against which the case operand of the
- * simple case is tested
- * @return CaseExpression corresponding to the case with the added clause
- */
- CaseExpression when(Enum<?> when);
-
- /**
- * Add a then clause to a general or simple case expression. The then clause
- * specifies the result corresponding to the immediately preceding when.
- * Clauses are evaluated in the order added.
- *
- * @param then -
- * corresponds to the result of the case expression if the when
- * is satisfied
- * @return CaseExpression corresponding to the case with the added then
- * clause
- */
- CaseExpression then(Expression then);
-
- /**
- * Add a then clause to a general or simple case expression. The then clause
- * specifies the result corresponding to the immediately preceding when.
- * Clauses are evaluated in the order added.
- *
- * @param then -
- * corresponds to the result of the case expression if the when
- * is satisfied
- * @return CaseExpression corresponding to the case with the added then
- * clause
- */
- CaseExpression then(Number then);
-
- /**
- * Add a then clause to a general or simple case expression. The then clause
- * specifies the result corresponding to the immediately preceding when.
- * Clauses are evaluated in the order added.
- *
- * @param then -
- * corresponds to the result of the case expression if the when
- * is satisfied
- * @return CaseExpression corresponding to the case with the added then
- * clause
- */
- CaseExpression then(String then);
-
- /**
- * Add a then clause to a general or simple case expression. The then clause
- * specifies the result corresponding to the immediately preceding when.
- * Clauses are evaluated in the order added.
- *
- * @param then -
- * corresponds to the result of the case expression if the when
- * is satisfied
- * @return CaseExpression corresponding to the case with the added then
- * clause
- */
- CaseExpression then(Date then);
-
- /**
- * Add a then clause to a general or simple case expression. The then clause
- * specifies the result corresponding to the immediately preceding when.
- * Clauses are evaluated in the order added.
- *
- * @param then -
- * corresponds to the result of the case expression if the when
- * is satisfied
- * @return CaseExpression corresponding to the case with the added then
- * clause
- */
- CaseExpression then(Calendar then);
-
- /**
- * Add a then clause to a general or simple case expression. The then clause
- * specifies the result corresponding to the immediately preceding when.
- * Clauses are evaluated in the order added.
- *
- * @param then -
- * corresponds to the result of the case expression if the when
- * is satisfied
- * @return CaseExpression corresponding to the case with the added then
- * clause
- */
- CaseExpression then(Class then);
-
- /**
- * Add a then clause to a general or simple case expression. The then clause
- * specifies the result corresponding to the immediately preceding when.
- * Clauses are evaluated in the order added.
- *
- * @param then -
- * corresponds to the result of the case expression if the when
- * is satisfied
- * @return CaseExpression corresponding to the case with the added then
- * clause
- */
- CaseExpression then(Enum<?> then);
-
- /**
- * Add else to a case expression. A case expression must have an else
- * clause.
- *
- * @param arg -
- * corresponds to the result of the case expression if the when
- * condition is not satisfied
- * @return Expression corresponding to the case expression with the added
- * clause
- */
- Expression elseCase(Expression arg);
-
- /**
- * Add else to a case expression. A case expression must have an else
- * clause.
- *
- * @param arg -
- * corresponds to the result of the case expression if the when
- * condition is not satisfied
- * @return Expression corresponding to the case expression with the added
- * clause
- */
- Expression elseCase(String arg);
-
- /**
- * Add else to a case expression. A case expression must have an else
- * clause.
- *
- * @param arg -
- * corresponds to the result of the case expression if the when
- * condition is not satisfied
- * @return Expression corresponding to the case expression with the added
- * clause
- */
- Expression elseCase(Number arg);
-
- /**
- * Add else to a case expression. A case expression must have an else
- * clause.
- *
- * @param arg -
- * corresponds to the result of the case expression if the when
- * condition is not satisfied
- * @return Expression corresponding to the case expression with the added
- * clause
- */
- Expression elseCase(Date arg);
-
- /**
- * Add else to a case expression. A case expression must have an else
- * clause.
+ /**
+ * Add a when predicate clause to a general case expression. The when
+ * predicate must be followed by the corresponding then case expression that
+ * specifies the result of the specific case. Clauses are evaluated in the
+ * order added.
+ *
+ * @param pred -
+ * corresponds to the evaluation condition for the specific case
+ * @return CaseExpression corresponding to the case with the added when
+ * clause
+ */
+ CaseExpression when(Predicate pred);
+
+ /**
+ * Add a when clause to a simple case expression. The when case expression
+ * must be followed by the corresponding then case expression that specifies
+ * the result of the specific case. Clauses are evaluated in the order added
+ *
+ * @param when -
+ * corresponds to the value against which the case operand of the
+ * simple case is tested
+ * @return CaseExpression corresponding to the case with the added clause
+ */
+ CaseExpression when(Expression when);
+
+ /**
+ * Add a when clause to a simple case expression. The when case expression
+ * must be followed by the corresponding then case expression that specifies
+ * the result of the specific case. Clauses are evaluated in the order added
+ *
+ * @param when -
+ * corresponds to the value against which the case operand of the
+ * simple case is tested
+ * @return CaseExpression corresponding to the case with the added clause
+ */
+ CaseExpression when(Number when);
+
+ /**
+ * Add a when clause to a simple case expression. The when case expression
+ * must be followed by the corresponding then case expression that specifies
+ * the result of the specific case. Clauses are evaluated in the order added
+ *
+ * @param when -
+ * corresponds to the value against which the
+ * case operand of the simple case is tested
+ * @return CaseExpression corresponding to the case with the added clause
+ */
+ CaseExpression when(String when);
+
+ /**
+ * Add a when clause to a simple case expression. The when case expression
+ * must be followed by the corresponding then case expression that specifies
+ * the result of the specific case. Clauses are evaluated in the order added
+ *
+ * @param when -
+ * corresponds to the value against which the case operand of the
+ * simple case is tested
+ * @return CaseExpression corresponding to the case with the added clause
+ */
+ CaseExpression when(Date when);
+
+ /**
+ * Add a when clause to a simple case expression. The when case expression
+ * must be followed by the corresponding then case expression that specifies
+ * the result of the specific case. Clauses are evaluated in the order added
+ *
+ * @param when -
+ * corresponds to the value against which the case operand of the
+ * simple case is tested
+ * @return CaseExpression corresponding to the case with the added clause
+ */
+ CaseExpression when(Calendar when);
+
+ /**
+ * Add a when clause to a simple case expression. The when case expression
+ * must be followed by the corresponding then case expression that specifies
+ * the result of the specific case. Clauses are evaluated in the order added
+ *
+ * @param when -
+ * corresponds to the value against which the case operand of the
+ * simple case is tested
+ * @return CaseExpression corresponding to the case with the added clause
+ */
+ CaseExpression when(Class when);
+
+ /**
+ * Add a when clause to a simple case expression. The when case expression
+ * must be followed by the corresponding then case expression that specifies
+ * the result of the specific case. Clauses are evaluated in the order added
+ *
+ * @param when -
+ * corresponds to the value against which the case operand of the
+ * simple case is tested
+ * @return CaseExpression corresponding to the case with the added clause
+ */
+ CaseExpression when(Enum<?> when);
+
+ /**
+ * Add a then clause to a general or simple case expression. The then clause
+ * specifies the result corresponding to the immediately preceding when.
+ * Clauses are evaluated in the order added.
+ *
+ * @param then -
+ * corresponds to the result of the case expression if the when
+ * is satisfied
+ * @return CaseExpression corresponding to the case with the added then
+ * clause
+ */
+ CaseExpression then(Expression then);
+
+ /**
+ * Add a then clause to a general or simple case expression. The then clause
+ * specifies the result corresponding to the immediately preceding when.
+ * Clauses are evaluated in the order added.
+ *
+ * @param then -
+ * corresponds to the result of the case expression if the when
+ * is satisfied
+ * @return CaseExpression corresponding to the case with the added then
+ * clause
+ */
+ CaseExpression then(Number then);
+
+ /**
+ * Add a then clause to a general or simple case expression. The then clause
+ * specifies the result corresponding to the immediately preceding when.
+ * Clauses are evaluated in the order added.
+ *
+ * @param then -
+ * corresponds to the result of the case expression if the when
+ * is satisfied
+ * @return CaseExpression corresponding to the case with the added then
+ * clause
+ */
+ CaseExpression then(String then);
+
+ /**
+ * Add a then clause to a general or simple case expression. The then clause
+ * specifies the result corresponding to the immediately preceding when.
+ * Clauses are evaluated in the order added.
+ *
+ * @param then -
+ * corresponds to the result of the case expression if the when
+ * is satisfied
+ * @return CaseExpression corresponding to the case with the added then
+ * clause
+ */
+ CaseExpression then(Date then);
+
+ /**
+ * Add a then clause to a general or simple case expression. The then clause
+ * specifies the result corresponding to the immediately preceding when.
+ * Clauses are evaluated in the order added.
+ *
+ * @param then -
+ * corresponds to the result of the case expression if the when
+ * is satisfied
+ * @return CaseExpression corresponding to the case with the added then
+ * clause
+ */
+ CaseExpression then(Calendar then);
+
+ /**
+ * Add a then clause to a general or simple case expression. The then clause
+ * specifies the result corresponding to the immediately preceding when.
+ * Clauses are evaluated in the order added.
+ *
+ * @param then -
+ * corresponds to the result of the case expression if the when
+ * is satisfied
+ * @return CaseExpression corresponding to the case with the added then
+ * clause
+ */
+ CaseExpression then(Class then);
+
+ /**
+ * Add a then clause to a general or simple case expression. The then clause
+ * specifies the result corresponding to the immediately preceding when.
+ * Clauses are evaluated in the order added.
+ *
+ * @param then -
+ * corresponds to the result of the case expression if the when
+ * is satisfied
+ * @return CaseExpression corresponding to the case with the added then
+ * clause
+ */
+ CaseExpression then(Enum<?> then);
+
+ /**
+ * Add else to a case expression. A case expression must have an else
+ * clause.
+ *
+ * @param arg -
+ * corresponds to the result of the case expression if the when
+ * condition is not satisfied
+ * @return Expression corresponding to the case expression with the added
+ * clause
+ */
+ Expression elseCase(Expression arg);
+
+ /**
+ * Add else to a case expression. A case expression must have an else
+ * clause.
+ *
+ * @param arg -
+ * corresponds to the result of the case expression if the when
+ * condition is not satisfied
+ * @return Expression corresponding to the case expression with the added
+ * clause
+ */
+ Expression elseCase(String arg);
+
+ /**
+ * Add else to a case expression. A case expression must have an else
+ * clause.
+ *
+ * @param arg -
+ * corresponds to the result of the case expression if the when
+ * condition is not satisfied
+ * @return Expression corresponding to the case expression with the added
+ * clause
+ */
+ Expression elseCase(Number arg);
+
+ /**
+ * Add else to a case expression. A case expression must have an else
+ * clause.
+ *
+ * @param arg -
+ * corresponds to the result of the case expression if the when
+ * condition is not satisfied
+ * @return Expression corresponding to the case expression with the added
+ * clause
+ */
+ Expression elseCase(Date arg);
+
+ /**
+ * Add else to a case expression. A case expression must have an else
+ * clause.
*
* @param arg -
* corresponds to the result of the case expression if the when
Modified: geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/CollectionTable.java
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/CollectionTable.java?rev=721048&r1=721047&r2=721048&view=diff
==============================================================================
--- geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/CollectionTable.java (original)
+++ geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/CollectionTable.java Wed Nov 26 16:23:43 2008
@@ -24,17 +24,21 @@
//
package javax.persistence;
-import java.lang.annotation.Target;
-import java.lang.annotation.Retention;
import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
@Target({ElementType.METHOD, ElementType.FIELD})
@Retention(RetentionPolicy.RUNTIME)
public @interface CollectionTable {
String name() default "";
+
String catalog() default "";
+
String schema() default "";
+
JoinColumn[] joinColumns() default {};
+
UniqueConstraint[] uniqueConstraints() default {};
}
Modified: geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/Column.java
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/Column.java?rev=721048&r1=721047&r2=721048&view=diff
==============================================================================
--- geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/Column.java (original)
+++ geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/Column.java Wed Nov 26 16:23:43 2008
@@ -25,10 +25,10 @@
package javax.persistence;
-import java.lang.annotation.Target;
-import java.lang.annotation.Retention;
import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
/**
* @version $Rev$ $Date$
Modified: geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/ColumnResult.java
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/ColumnResult.java?rev=721048&r1=721047&r2=721048&view=diff
==============================================================================
--- geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/ColumnResult.java (original)
+++ geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/ColumnResult.java Wed Nov 26 16:23:43 2008
@@ -24,9 +24,9 @@
//
package javax.persistence;
-import java.lang.annotation.Target;
import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
/**
* @version $Rev$ $Date$
Modified: geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/DiscriminatorColumn.java
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/DiscriminatorColumn.java?rev=721048&r1=721047&r2=721048&view=diff
==============================================================================
--- geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/DiscriminatorColumn.java (original)
+++ geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/DiscriminatorColumn.java Wed Nov 26 16:23:43 2008
@@ -24,10 +24,10 @@
//
package javax.persistence;
-import java.lang.annotation.Target;
-import java.lang.annotation.Retention;
import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
/**
* @version $Rev$ $Date$
Modified: geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/DiscriminatorType.java
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/DiscriminatorType.java?rev=721048&r1=721047&r2=721048&view=diff
==============================================================================
--- geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/DiscriminatorType.java (original)
+++ geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/DiscriminatorType.java Wed Nov 26 16:23:43 2008
@@ -28,4 +28,5 @@
* @version $Rev$ $Date$
*/
public enum DiscriminatorType {
- STRING, CHAR, INTEGER };
+ STRING, CHAR, INTEGER
+};
Modified: geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/DiscriminatorValue.java
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/DiscriminatorValue.java?rev=721048&r1=721047&r2=721048&view=diff
==============================================================================
--- geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/DiscriminatorValue.java (original)
+++ geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/DiscriminatorValue.java Wed Nov 26 16:23:43 2008
@@ -24,10 +24,10 @@
//
package javax.persistence;
-import java.lang.annotation.Target;
-import java.lang.annotation.Retention;
import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
/**
* @version $Rev$ $Date$
Modified: geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/DomainObject.java
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/DomainObject.java?rev=721048&r1=721047&r2=721048&view=diff
==============================================================================
--- geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/DomainObject.java (original)
+++ geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/DomainObject.java Wed Nov 26 16:23:43 2008
@@ -30,95 +30,95 @@
* identification variable.
*/
public interface DomainObject extends PathExpression, QueryDefinition {
- /**
- * Extend the query domain by joining with a class that can be navigated to
- * or that is embedded in the class corresponding to the domain object on
- * which the method is invoked. This method is permitted to be invoked only
- * when defining the domain of the query. It must not be invoked within the
- * context of the select, where, groupBy, or having operations. The domain
- * object must correspond to a class that contains the referenced attribute.
- * The query definition is modified to include the newly joined domain
- * object.
- *
- * @param attribute -
- * name of the attribute that references the target of the join
- * @return the new DomainObject that is added for the target of the join
- */
- DomainObject join(String attribute);
-
- /**
- * Extend the query domain by left outer joining with a class that can be
- * navigated to or that is embedded in the class corresponding to the domain
- * object on which the method is invoked. This method is permitted to be
- * invoked only when defining the domain of the query. It must not be
- * invoked within the context of the select, where, groupBy, or having
- * operations. The domain object must correspond to a class that contains
- * the referenced attribute. The query definition is modified to include the
- * newly joined domain object.
- *
- * @param attribute -
- * name of the attribute that references the target of the join
- * @return the new DomainObject that is added for the target of the join
- */
- DomainObject leftJoin(String attribute);
-
- /**
- * Specify that the association or element collection that is referenced by
- * the attribute be eagerly fetched through use of an inner join. The domain
- * object must correspond to a class that contains the referenced attribute.
- * The query is modified to include the joined domain object.
- *
- * @param attribute -
- * name of the attribute that references the target of the join
- * @return the FetchJoinObject that is added for the target of the join
- */
- FetchJoinObject joinFetch(String attribute);
-
- /**
- * Specify that the association or element collection that is referenced by
- * the attribute be eagerly fetched through use of a left outer join. The
- * domain object must correspond to a class that contains the referenced
- * attribute. The query is modified to include the joined domain object.
- *
- * @param attribute -
- * name of the attribute that references the target of the join
- * @return the FetchJoinObject that is added for the target of the join
- */
- FetchJoinObject leftJoinFetch(String attribute);
-
- /**
- * Return a path expression corresponding to the value of a map-valued
- * association or element collection. This method is only permitted to be
- * invoked upon a domain object that corresponds to a map-valued association
- * or element collection.
- *
- * @return PathExpression corresponding to the map value
- */
- PathExpression value();
-
- /**
- * Return a path expression corresponding to the key of a map-valued
- * association or element collection. This method is only permitted to be
- * invoked upon a domain object that corresponds to a map-valued association
- * or element collection.
- *
- * @return PathExpression corresponding to the map key
- */
- PathExpression key();
-
- /**
- * Return a select item corresponding to the map entry of a map-valued
- * association or element collection. This method is only permitted to be
- * invoked upon a domain object that corresponds to a map-valued association
- * or element collection.
- *
- * @return SelectItem corresponding to the map entry
- */
- SelectItem entry();
-
- /**
- * Return an expression that corresponds to the index. of the domain object
- * in the referenced association or element collection. This method is only
+ /**
+ * Extend the query domain by joining with a class that can be navigated to
+ * or that is embedded in the class corresponding to the domain object on
+ * which the method is invoked. This method is permitted to be invoked only
+ * when defining the domain of the query. It must not be invoked within the
+ * context of the select, where, groupBy, or having operations. The domain
+ * object must correspond to a class that contains the referenced attribute.
+ * The query definition is modified to include the newly joined domain
+ * object.
+ *
+ * @param attribute -
+ * name of the attribute that references the target of the join
+ * @return the new DomainObject that is added for the target of the join
+ */
+ DomainObject join(String attribute);
+
+ /**
+ * Extend the query domain by left outer joining with a class that can be
+ * navigated to or that is embedded in the class corresponding to the domain
+ * object on which the method is invoked. This method is permitted to be
+ * invoked only when defining the domain of the query. It must not be
+ * invoked within the context of the select, where, groupBy, or having
+ * operations. The domain object must correspond to a class that contains
+ * the referenced attribute. The query definition is modified to include the
+ * newly joined domain object.
+ *
+ * @param attribute -
+ * name of the attribute that references the target of the join
+ * @return the new DomainObject that is added for the target of the join
+ */
+ DomainObject leftJoin(String attribute);
+
+ /**
+ * Specify that the association or element collection that is referenced by
+ * the attribute be eagerly fetched through use of an inner join. The domain
+ * object must correspond to a class that contains the referenced attribute.
+ * The query is modified to include the joined domain object.
+ *
+ * @param attribute -
+ * name of the attribute that references the target of the join
+ * @return the FetchJoinObject that is added for the target of the join
+ */
+ FetchJoinObject joinFetch(String attribute);
+
+ /**
+ * Specify that the association or element collection that is referenced by
+ * the attribute be eagerly fetched through use of a left outer join. The
+ * domain object must correspond to a class that contains the referenced
+ * attribute. The query is modified to include the joined domain object.
+ *
+ * @param attribute -
+ * name of the attribute that references the target of the join
+ * @return the FetchJoinObject that is added for the target of the join
+ */
+ FetchJoinObject leftJoinFetch(String attribute);
+
+ /**
+ * Return a path expression corresponding to the value of a map-valued
+ * association or element collection. This method is only permitted to be
+ * invoked upon a domain object that corresponds to a map-valued association
+ * or element collection.
+ *
+ * @return PathExpression corresponding to the map value
+ */
+ PathExpression value();
+
+ /**
+ * Return a path expression corresponding to the key of a map-valued
+ * association or element collection. This method is only permitted to be
+ * invoked upon a domain object that corresponds to a map-valued association
+ * or element collection.
+ *
+ * @return PathExpression corresponding to the map key
+ */
+ PathExpression key();
+
+ /**
+ * Return a select item corresponding to the map entry of a map-valued
+ * association or element collection. This method is only permitted to be
+ * invoked upon a domain object that corresponds to a map-valued association
+ * or element collection.
+ *
+ * @return SelectItem corresponding to the map entry
+ */
+ SelectItem entry();
+
+ /**
+ * Return an expression that corresponds to the index. of the domain object
+ * in the referenced association or element collection. This method is only
* permitted to be invoked upon a domain object that corresponds to a
* multi-valued association or element collection for which an order column
* has been defined.
Modified: geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/ElementCollection.java
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/ElementCollection.java?rev=721048&r1=721047&r2=721048&view=diff
==============================================================================
--- geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/ElementCollection.java (original)
+++ geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/ElementCollection.java Wed Nov 26 16:23:43 2008
@@ -24,14 +24,15 @@
//
package javax.persistence;
-import java.lang.annotation.Target;
-import java.lang.annotation.Retention;
import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
@Target({ElementType.METHOD, ElementType.FIELD})
@Retention(RetentionPolicy.RUNTIME)
public @interface ElementCollection {
Class targetClass() default void.class;
+
FetchType fetch() default FetchType.LAZY;
}
Modified: geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/Embeddable.java
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/Embeddable.java?rev=721048&r1=721047&r2=721048&view=diff
==============================================================================
--- geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/Embeddable.java (original)
+++ geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/Embeddable.java Wed Nov 26 16:23:43 2008
@@ -24,10 +24,10 @@
//
package javax.persistence;
-import java.lang.annotation.Retention;
-import java.lang.annotation.Target;
import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
/**
* @version $Rev$ $Date$
Modified: geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/Embedded.java
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/Embedded.java?rev=721048&r1=721047&r2=721048&view=diff
==============================================================================
--- geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/Embedded.java (original)
+++ geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/Embedded.java Wed Nov 26 16:23:43 2008
@@ -24,10 +24,10 @@
//
package javax.persistence;
-import java.lang.annotation.Retention;
-import java.lang.annotation.Target;
import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
/**
* @version $Rev$ $Date$
Modified: geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/EmbeddedId.java
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/EmbeddedId.java?rev=721048&r1=721047&r2=721048&view=diff
==============================================================================
--- geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/EmbeddedId.java (original)
+++ geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/EmbeddedId.java Wed Nov 26 16:23:43 2008
@@ -24,10 +24,10 @@
//
package javax.persistence;
-import java.lang.annotation.Target;
+import java.lang.annotation.ElementType;
import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.ElementType;
+import java.lang.annotation.Target;
/**
* @version $Rev$ $Date$
Modified: geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/Entity.java
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/Entity.java?rev=721048&r1=721047&r2=721048&view=diff
==============================================================================
--- geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/Entity.java (original)
+++ geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/Entity.java Wed Nov 26 16:23:43 2008
@@ -24,10 +24,10 @@
//
package javax.persistence;
-import java.lang.annotation.Target;
-import java.lang.annotation.Retention;
import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
/**
* @version $Rev$ $Date$
Modified: geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/EntityExistsException.java
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/EntityExistsException.java?rev=721048&r1=721047&r2=721048&view=diff
==============================================================================
--- geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/EntityExistsException.java (original)
+++ geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/EntityExistsException.java Wed Nov 26 16:23:43 2008
@@ -29,19 +29,19 @@
*/
public class EntityExistsException extends PersistenceException {
- public EntityExistsException() {
+ public EntityExistsException() {
- }
+ }
- public EntityExistsException(String message) {
- super(message);
- }
+ public EntityExistsException(String message) {
+ super(message);
+ }
- public EntityExistsException(Throwable cause) {
- super(cause);
- }
+ public EntityExistsException(Throwable cause) {
+ super(cause);
+ }
- public EntityExistsException(String message, Throwable cause) {
- super(message, cause);
- }
+ public EntityExistsException(String message, Throwable cause) {
+ super(message, cause);
+ }
}
Modified: geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/EntityListeners.java
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/EntityListeners.java?rev=721048&r1=721047&r2=721048&view=diff
==============================================================================
--- geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/EntityListeners.java (original)
+++ geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/EntityListeners.java Wed Nov 26 16:23:43 2008
@@ -24,15 +24,15 @@
//
package javax.persistence;
-import java.lang.annotation.Target;
import java.lang.annotation.ElementType;
import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
/**
* @version $Rev$ $Date$
*/
-@Target( { ElementType.TYPE })
+@Target({ElementType.TYPE})
@Retention(RetentionPolicy.RUNTIME)
public @interface EntityListeners {
Class[] value();