You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by dw...@apache.org on 2009/10/12 04:23:16 UTC
svn commit: r824215 [1/3] - in
/geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence:
./ criteria/ metamodel/ spi/
Author: dwoods
Date: Mon Oct 12 02:23:08 2009
New Revision: 824215
URL: http://svn.apache.org/viewvc?rev=824215&view=rev
Log:
GERONIMO-4410 Latest JPA2 API updates from 20091008. Patch contributed by Jeremy Bauer.
Added:
geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/MapsId.java (with props)
geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/SharedCacheMode.java (with props)
geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/ValidationMode.java (with props)
geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/criteria/CriteriaBuilder.java (with props)
Removed:
geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/CacheGetMode.java
geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/CachePutMode.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/criteria/QueryBuilder.java
geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/spi/SharedCacheMode.java
geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/spi/ValidationMode.java
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/AccessType.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/Cacheable.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/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/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/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/EnumType.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/FetchType.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/FlushModeType.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/GenerationType.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/InheritanceType.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/LockModeType.java
geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/LockTimeoutException.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/MapKeyEnumerated.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/MapKeyTemporal.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/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/Parameter.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/PersistenceContextType.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/PersistenceUnitUtil.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/PersistenceUtil.java
geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/PessimisticLockScope.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/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/QueryHint.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/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/TemporalType.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/TypedQuery.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/criteria/FetchParent.java
geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/criteria/From.java
geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/criteria/JoinType.java
geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/criteria/MapJoin.java
geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/criteria/Predicate.java
geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/criteria/Subquery.java
geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/metamodel/Attribute.java
geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/metamodel/Bindable.java
geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/metamodel/EntityType.java
geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/metamodel/IdentifiableType.java
geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/metamodel/ManagedType.java
geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/metamodel/MappedSuperclassType.java
geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/metamodel/Metamodel.java
geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/metamodel/PluralAttribute.java
geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/metamodel/SingularAttribute.java
geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/metamodel/StaticMetamodel.java
geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/metamodel/Type.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/LoadState.java
geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/spi/PersistenceProviderResolver.java
geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/spi/PersistenceUnitInfo.java
geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/spi/PersistenceUnitTransactionType.java
geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/spi/ProviderUtil.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=824215&r1=824214&r2=824215&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 Mon Oct 12 02:23:08 2009
@@ -24,13 +24,17 @@
//
package javax.persistence;
-import java.lang.annotation.ElementType;
+import static java.lang.annotation.ElementType.FIELD;
+import static java.lang.annotation.ElementType.METHOD;
+import static java.lang.annotation.ElementType.TYPE;
+import static java.lang.annotation.RetentionPolicy.RUNTIME;
+
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)
+@Target( { TYPE, METHOD, FIELD })
+@Retention(RUNTIME)
public @interface Access {
+
AccessType value();
}
Modified: geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/AccessType.java
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/AccessType.java?rev=824215&r1=824214&r2=824215&view=diff
==============================================================================
--- geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/AccessType.java (original)
+++ geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/AccessType.java Mon Oct 12 02:23:08 2009
@@ -24,6 +24,10 @@
//
package javax.persistence;
+
public enum AccessType {
- FIELD, PROPERTY
-};
\ No newline at end of file
+
+ FIELD,
+
+ PROPERTY
+}
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=824215&r1=824214&r2=824215&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 Mon Oct 12 02:23:08 2009
@@ -24,14 +24,19 @@
//
package javax.persistence;
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
import java.lang.annotation.Target;
+import java.lang.annotation.Retention;
+import static java.lang.annotation.ElementType.TYPE;
+import static java.lang.annotation.ElementType.METHOD;
+import static java.lang.annotation.ElementType.FIELD;
+import static java.lang.annotation.RetentionPolicy.RUNTIME;
+
+
+@Target({TYPE, METHOD, FIELD})
+@Retention(RUNTIME)
-@Target({ElementType.TYPE, ElementType.METHOD, ElementType.FIELD})
-@Retention(RetentionPolicy.RUNTIME)
public @interface AssociationOverride {
+
String name();
JoinColumn[] joinColumns() default {};
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=824215&r1=824214&r2=824215&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 Mon Oct 12 02:23:08 2009
@@ -24,16 +24,18 @@
//
package javax.persistence;
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
import java.lang.annotation.Target;
+import java.lang.annotation.Retention;
+import static java.lang.annotation.ElementType.TYPE;
+import static java.lang.annotation.ElementType.METHOD;
+import static java.lang.annotation.ElementType.FIELD;
+import static java.lang.annotation.RetentionPolicy.RUNTIME;
+
+
+@Target({TYPE, METHOD, FIELD})
+@Retention(RUNTIME)
-/**
- * @version $Revision$ $Date$
- */
-@Target({ElementType.TYPE, ElementType.METHOD, ElementType.FIELD})
-@Retention(RetentionPolicy.RUNTIME)
public @interface AssociationOverrides {
+
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=824215&r1=824214&r2=824215&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 Mon Oct 12 02:23:08 2009
@@ -24,17 +24,19 @@
//
package javax.persistence;
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
import java.lang.annotation.Target;
+import java.lang.annotation.Retention;
+import static java.lang.annotation.ElementType.TYPE;
+import static java.lang.annotation.ElementType.METHOD;
+import static java.lang.annotation.ElementType.FIELD;
+import static java.lang.annotation.RetentionPolicy.RUNTIME;
+
+
+@Target({TYPE, METHOD, FIELD})
+@Retention(RUNTIME)
-/**
- * @version $Rev$ $Date$
- */
-@Target({ElementType.TYPE, ElementType.METHOD, ElementType.FIELD})
-@Retention(RetentionPolicy.RUNTIME)
public @interface AttributeOverride {
+
String name();
Column column();
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=824215&r1=824214&r2=824215&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 Mon Oct 12 02:23:08 2009
@@ -24,16 +24,18 @@
//
package javax.persistence;
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
import java.lang.annotation.Target;
+import java.lang.annotation.Retention;
+import static java.lang.annotation.ElementType.TYPE;
+import static java.lang.annotation.ElementType.METHOD;
+import static java.lang.annotation.ElementType.FIELD;
+import static java.lang.annotation.RetentionPolicy.RUNTIME;
+
+
+@Target({TYPE, METHOD, FIELD})
+@Retention(RUNTIME)
-/**
- * @version $Rev$ $Date$
- */
-@Target({ElementType.TYPE, ElementType.METHOD, ElementType.FIELD})
-@Retention(RetentionPolicy.RUNTIME)
public @interface AttributeOverrides {
+
AttributeOverride[] value();
}
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=824215&r1=824214&r2=824215&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 Mon Oct 12 02:23:08 2009
@@ -24,18 +24,19 @@
//
package javax.persistence;
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
import java.lang.annotation.Target;
+import java.lang.annotation.Retention;
+import static java.lang.annotation.ElementType.METHOD;
+import static java.lang.annotation.ElementType.FIELD;
+import static java.lang.annotation.RetentionPolicy.RUNTIME;
+import static javax.persistence.FetchType.EAGER;
-/**
- * @version $Rev$ $Date$
- */
-@Target({ElementType.METHOD, ElementType.FIELD})
-@Retention(RetentionPolicy.RUNTIME)
+
+@Target({METHOD, FIELD})
+@Retention(RUNTIME)
public @interface Basic {
- FetchType fetch() default FetchType.EAGER;
+
+ FetchType fetch() default EAGER;
boolean optional() default true;
}
Modified: geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/Cacheable.java
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/Cacheable.java?rev=824215&r1=824214&r2=824215&view=diff
==============================================================================
--- geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/Cacheable.java (original)
+++ geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/Cacheable.java Mon Oct 12 02:23:08 2009
@@ -24,13 +24,15 @@
//
package javax.persistence;
-import java.lang.annotation.ElementType;
+import static java.lang.annotation.ElementType.TYPE;
+import static java.lang.annotation.RetentionPolicy.RUNTIME;
import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
import java.lang.annotation.Target;
-@Target({ElementType.TYPE})
-@Retention(RetentionPolicy.RUNTIME)
+
+@Target( { TYPE })
+@Retention(RUNTIME)
public @interface Cacheable {
+
boolean value() default true;
}
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=824215&r1=824214&r2=824215&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 Mon Oct 12 02:23:08 2009
@@ -22,11 +22,20 @@
// Community Process. In order to remain compliant with the specification
// DO NOT add / change / or delete method signatures!
//
+
package javax.persistence;
-/**
- * @version $Rev$ $Date$
- */
-public enum CascadeType {
- ALL, PERSIST, MERGE, REMOVE, REFRESH, DETACH
-};
+public enum CascadeType {
+
+ ALL,
+
+ PERSIST,
+
+ MERGE,
+
+ REMOVE,
+
+ REFRESH,
+
+ DETACH
+}
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=824215&r1=824214&r2=824215&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 Mon Oct 12 02:23:08 2009
@@ -24,21 +24,25 @@
//
package javax.persistence;
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
import java.lang.annotation.Target;
+import java.lang.annotation.Retention;
+import static java.lang.annotation.ElementType.METHOD;
+import static java.lang.annotation.ElementType.FIELD;
+import static java.lang.annotation.RetentionPolicy.RUNTIME;
+
-@Target({ElementType.METHOD, ElementType.FIELD})
-@Retention(RetentionPolicy.RUNTIME)
+
+@Target( { METHOD, FIELD })
+@Retention(RUNTIME)
public @interface CollectionTable {
+
String name() default "";
String catalog() default "";
String schema() default "";
- JoinColumn[] joinColumns() 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=824215&r1=824214&r2=824215&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 Mon Oct 12 02:23:08 2009
@@ -25,17 +25,16 @@
package javax.persistence;
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
import java.lang.annotation.Target;
+import java.lang.annotation.Retention;
+import static java.lang.annotation.ElementType.METHOD;
+import static java.lang.annotation.ElementType.FIELD;
+import static java.lang.annotation.RetentionPolicy.RUNTIME;
-/**
- * @version $Rev$ $Date$
- */
-@Target({ElementType.METHOD, ElementType.FIELD})
-@Retention(RetentionPolicy.RUNTIME)
+@Target({METHOD, FIELD})
+@Retention(RUNTIME)
public @interface Column {
+
String name() default "";
boolean unique() default false;
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=824215&r1=824214&r2=824215&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 Mon Oct 12 02:23:08 2009
@@ -24,15 +24,15 @@
//
package javax.persistence;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
import java.lang.annotation.Target;
+import java.lang.annotation.Retention;
+import static java.lang.annotation.RetentionPolicy.RUNTIME;
+
+
+@Target({})
+@Retention(RUNTIME)
+
+public @interface ColumnResult {
-/**
- * @version $Rev$ $Date$
- */
-@Target({})
-@Retention(RetentionPolicy.RUNTIME)
-public @interface ColumnResult {
String name();
}
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=824215&r1=824214&r2=824215&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 Mon Oct 12 02:23:08 2009
@@ -24,20 +24,21 @@
//
package javax.persistence;
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
import java.lang.annotation.Target;
+import java.lang.annotation.Retention;
+import static java.lang.annotation.ElementType.TYPE;
+import static java.lang.annotation.RetentionPolicy.RUNTIME;
+import static javax.persistence.DiscriminatorType.STRING;
+
+
+@Target({TYPE})
+@Retention(RUNTIME)
-/**
- * @version $Rev$ $Date$
- */
-@Target({ElementType.TYPE})
-@Retention(RetentionPolicy.RUNTIME)
public @interface DiscriminatorColumn {
+
String name() default "DTYPE";
- DiscriminatorType discriminatorType() default DiscriminatorType.STRING;
+ DiscriminatorType discriminatorType() default STRING;
String columnDefinition() default "";
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=824215&r1=824214&r2=824215&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 Mon Oct 12 02:23:08 2009
@@ -24,9 +24,12 @@
//
package javax.persistence;
-/**
- * @version $Rev$ $Date$
- */
-public enum DiscriminatorType {
- STRING, CHAR, INTEGER
-};
+
+public enum DiscriminatorType {
+
+ 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=824215&r1=824214&r2=824215&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 Mon Oct 12 02:23:08 2009
@@ -24,16 +24,16 @@
//
package javax.persistence;
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
import java.lang.annotation.Target;
+import java.lang.annotation.Retention;
+import static java.lang.annotation.ElementType.TYPE;
+import static java.lang.annotation.RetentionPolicy.RUNTIME;
+
+
+@Target({TYPE})
+@Retention(RUNTIME)
-/**
- * @version $Rev$ $Date$
- */
-@Target({ElementType.TYPE})
-@Retention(RetentionPolicy.RUNTIME)
public @interface DiscriminatorValue {
+
String value();
}
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=824215&r1=824214&r2=824215&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 Mon Oct 12 02:23:08 2009
@@ -24,15 +24,18 @@
//
package javax.persistence;
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
import java.lang.annotation.Target;
+import java.lang.annotation.Retention;
+import static java.lang.annotation.ElementType.METHOD;
+import static java.lang.annotation.ElementType.FIELD;
+import static java.lang.annotation.RetentionPolicy.RUNTIME;
+import static javax.persistence.FetchType.LAZY;
+
-@Target({ElementType.METHOD, ElementType.FIELD})
-@Retention(RetentionPolicy.RUNTIME)
+@Target( { METHOD, FIELD })
+@Retention(RUNTIME)
public @interface ElementCollection {
- Class targetClass() default void.class;
- FetchType fetch() default FetchType.LAZY;
+ Class targetClass() default void.class;
+ FetchType fetch() default 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=824215&r1=824214&r2=824215&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 Mon Oct 12 02:23:08 2009
@@ -24,15 +24,15 @@
//
package javax.persistence;
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
import java.lang.annotation.Target;
+import java.lang.annotation.Retention;
+import java.lang.annotation.Documented;
+import static java.lang.annotation.ElementType.TYPE;
+import static java.lang.annotation.RetentionPolicy.RUNTIME;
+
-/**
- * @version $Rev$ $Date$
- */
-@Target({ElementType.TYPE})
-@Retention(RetentionPolicy.RUNTIME)
+@Documented
+@Target({TYPE})
+@Retention(RUNTIME)
public @interface Embeddable {
}
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=824215&r1=824214&r2=824215&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 Mon Oct 12 02:23:08 2009
@@ -24,15 +24,15 @@
//
package javax.persistence;
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
import java.lang.annotation.Target;
+import java.lang.annotation.Retention;
+import static java.lang.annotation.ElementType.FIELD;
+import static java.lang.annotation.ElementType.METHOD;
+import static java.lang.annotation.RetentionPolicy.RUNTIME;
+
+
+@Target({METHOD, FIELD})
+@Retention(RUNTIME)
-/**
- * @version $Rev$ $Date$
- */
-@Target({ElementType.METHOD, ElementType.FIELD})
-@Retention(RetentionPolicy.RUNTIME)
public @interface Embedded {
}
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=824215&r1=824214&r2=824215&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 Mon Oct 12 02:23:08 2009
@@ -24,16 +24,14 @@
//
package javax.persistence;
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
import java.lang.annotation.Target;
+import java.lang.annotation.Retention;
+import static java.lang.annotation.ElementType.FIELD;
+import static java.lang.annotation.ElementType.METHOD;
+import static java.lang.annotation.RetentionPolicy.RUNTIME;
+
-/**
- * @version $Rev$ $Date$
- */
-@Target({ElementType.METHOD, ElementType.FIELD})
-@Retention(RetentionPolicy.RUNTIME)
-public @interface EmbeddedId {
-}
+@Target({METHOD, FIELD})
+@Retention(RUNTIME)
+public @interface EmbeddedId {}
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=824215&r1=824214&r2=824215&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 Mon Oct 12 02:23:08 2009
@@ -24,16 +24,17 @@
//
package javax.persistence;
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
import java.lang.annotation.Target;
+import java.lang.annotation.Retention;
+import java.lang.annotation.Documented;
+import static java.lang.annotation.ElementType.TYPE;
+import static java.lang.annotation.RetentionPolicy.RUNTIME;
-/**
- * @version $Rev$ $Date$
- */
-@Target(ElementType.TYPE)
-@Retention(RetentionPolicy.RUNTIME)
+
+@Documented
+@Target(TYPE)
+@Retention(RUNTIME)
public @interface Entity {
- String name() default "";
-}
\ No newline at end of file
+
+ String name() default "";
+}
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=824215&r1=824214&r2=824215&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 Mon Oct 12 02:23:08 2009
@@ -24,16 +24,15 @@
//
package javax.persistence;
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
import java.lang.annotation.Target;
+import java.lang.annotation.Retention;
+import static java.lang.annotation.ElementType.TYPE;
+import static java.lang.annotation.RetentionPolicy.RUNTIME;
-/**
- * @version $Rev$ $Date$
- */
-@Target({ElementType.TYPE})
-@Retention(RetentionPolicy.RUNTIME)
+
+@Target({TYPE})
+@Retention(RUNTIME)
public @interface EntityListeners {
+
Class[] value();
-}
\ No newline at end of file
+}
Modified: geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/EntityManager.java
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/EntityManager.java?rev=824215&r1=824214&r2=824215&view=diff
==============================================================================
--- geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/EntityManager.java (original)
+++ geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/EntityManager.java Mon Oct 12 02:23:08 2009
@@ -25,96 +25,93 @@
package javax.persistence;
-import java.util.Set;
import java.util.Map;
import javax.persistence.metamodel.Metamodel;
-import javax.persistence.criteria.QueryBuilder;
+import javax.persistence.criteria.CriteriaBuilder;
import javax.persistence.criteria.CriteriaQuery;
public interface EntityManager {
- public void persist(Object entity);
- public <T> T merge(T entity);
- public void remove(Object entity);
- public <T> T find(Class<T> entityClass, Object primaryKey);
- public <T> T find(Class<T> entityClass, Object primaryKey,
- Map<String, Object> properties);
- public <T> T find(Class<T> entityClass, Object primaryKey,
- LockModeType lockMode);
-
- public <T> T find(Class<T> entityClass, Object primaryKey,
- LockModeType lockMode,
- Map<String, Object> properties);
+ public void persist(Object entity);
+ public <T> T merge(T entity);
+ public void remove(Object entity);
+ public <T> T find(Class<T> entityClass, Object primaryKey);
+ public <T> T find(Class<T> entityClass, Object primaryKey,
+ Map<String, Object> properties);
+ public <T> T find(Class<T> entityClass, Object primaryKey,
+ LockModeType lockMode);
+
+ public <T> T find(Class<T> entityClass, Object primaryKey,
+ LockModeType lockMode,
+ Map<String, Object> properties);
- public <T> T getReference(Class<T> entityClass,
+ public <T> T getReference(Class<T> entityClass,
Object primaryKey);
- public void flush();
+ public void flush();
- public void setFlushMode(FlushModeType flushMode);
+ public void setFlushMode(FlushModeType flushMode);
- public FlushModeType getFlushMode();
+ public FlushModeType getFlushMode();
- public void lock(Object entity, LockModeType lockMode);
+ public void lock(Object entity, LockModeType lockMode);
- public void lock(Object entity, LockModeType lockMode,
- Map<String, Object> properties);
+ public void lock(Object entity, LockModeType lockMode,
+ Map<String, Object> properties);
- public void refresh(Object entity);
+ public void refresh(Object entity);
- public void refresh(Object entity,
+ public void refresh(Object entity,
Map<String, Object> properties);
- public void refresh(Object entity, LockModeType lockMode);
+ public void refresh(Object entity, LockModeType lockMode);
- public void refresh(Object entity, LockModeType lockMode,
- Map<String, Object> properties);
- public void clear();
+ public void refresh(Object entity, LockModeType lockMode,
+ Map<String, Object> properties);
+ public void clear();
- public void detach(Object entity);
+ public void detach(Object entity);
- public boolean contains(Object entity);
+ public boolean contains(Object entity);
- public LockModeType getLockMode(Object entity);
+ public LockModeType getLockMode(Object entity);
- public void setProperty(String propertyName, Object value);
+ public void setProperty(String propertyName, Object value);
- public Map<String, Object> getProperties();
+ public Map<String, Object> getProperties();
- public Set<String> getSupportedProperties();
+ public Query createQuery(String qlString);
- public Query createQuery(String qlString);
+ public <T> TypedQuery<T> createQuery(CriteriaQuery<T> criteriaQuery);
- public <T> TypedQuery<T> createQuery(CriteriaQuery<T> criteriaQuery);
+ public <T> TypedQuery<T> createQuery(String qlString, Class<T> resultClass);
- public <T> TypedQuery<T> createQuery(String qlString, Class<T> resultClass);
+ public Query createNamedQuery(String name);
- public Query createNamedQuery(String name);
+ public <T> TypedQuery<T> createNamedQuery(String name, Class<T> resultClass);
- public <T> TypedQuery<T> createNamedQuery(String name, Class<T> resultClass);
+ public Query createNativeQuery(String sqlString);
- public Query createNativeQuery(String sqlString);
+ public Query createNativeQuery(String sqlString, Class resultClass);
- public Query createNativeQuery(String sqlString, Class resultClass);
+ public Query createNativeQuery(String sqlString, String resultSetMapping);
- public Query createNativeQuery(String sqlString, String resultSetMapping);
+ public void joinTransaction();
- public void joinTransaction();
+ public <T> T unwrap(Class<T> cls);
- public <T> T unwrap(Class<T> cls);
+ public Object getDelegate();
- public Object getDelegate();
+ public void close();
- public void close();
+ public boolean isOpen();
- public boolean isOpen();
+ public EntityTransaction getTransaction();
- public EntityTransaction getTransaction();
+ public EntityManagerFactory getEntityManagerFactory();
- public EntityManagerFactory getEntityManagerFactory();
+ public CriteriaBuilder getCriteriaBuilder();
- public QueryBuilder getQueryBuilder();
-
- public Metamodel getMetamodel();
+ public Metamodel getMetamodel();
}
Modified: geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/EntityManagerFactory.java
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/EntityManagerFactory.java?rev=824215&r1=824214&r2=824215&view=diff
==============================================================================
--- geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/EntityManagerFactory.java (original)
+++ geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/EntityManagerFactory.java Mon Oct 12 02:23:08 2009
@@ -29,7 +29,7 @@
import java.util.Set;
import java.util.Map;
import javax.persistence.metamodel.Metamodel;
-import javax.persistence.criteria.QueryBuilder;
+import javax.persistence.criteria.CriteriaBuilder;
public interface EntityManagerFactory {
@@ -37,7 +37,7 @@
public EntityManager createEntityManager();
public EntityManager createEntityManager(Map map);
- public QueryBuilder getQueryBuilder();
+ public CriteriaBuilder getCriteriaBuilder();
public Metamodel getMetamodel();
public boolean isOpen();
@@ -45,8 +45,6 @@
public Map<String, Object> getProperties();
- public Set<String> getSupportedProperties();
-
public Cache getCache();
public PersistenceUnitUtil getPersistenceUnitUtil();
Modified: geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/EntityResult.java
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/EntityResult.java?rev=824215&r1=824214&r2=824215&view=diff
==============================================================================
--- geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/EntityResult.java (original)
+++ geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/EntityResult.java Mon Oct 12 02:23:08 2009
@@ -22,19 +22,20 @@
// Community Process. In order to remain compliant with the specification
// DO NOT add / change / or delete method signatures!
//
+
+
package javax.persistence;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
import java.lang.annotation.Target;
+import java.lang.annotation.Retention;
+import static java.lang.annotation.RetentionPolicy.RUNTIME;
+
+
+@Target({})
+@Retention(RUNTIME)
+public @interface EntityResult {
-/**
- * @version $Rev$ $Date$
- */
-@Target({})
-@Retention(RetentionPolicy.RUNTIME)
-public @interface EntityResult {
- Class entityClass();
+ Class entityClass();
FieldResult[] fields() default {};
Modified: geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/EntityTransaction.java
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/EntityTransaction.java?rev=824215&r1=824214&r2=824215&view=diff
==============================================================================
--- geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/EntityTransaction.java (original)
+++ geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/EntityTransaction.java Mon Oct 12 02:23:08 2009
@@ -22,21 +22,20 @@
// Community Process. In order to remain compliant with the specification
// DO NOT add / change / or delete method signatures!
//
-
package javax.persistence;
public interface EntityTransaction {
- public void begin();
+ public void begin();
- public void commit();
+ public void commit();
- public void rollback();
+ public void rollback();
- public void setRollbackOnly();
+ public void setRollbackOnly();
- public boolean getRollbackOnly();
+ public boolean getRollbackOnly();
- public boolean isActive();
+ public boolean isActive();
}
Modified: geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/EnumType.java
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/EnumType.java?rev=824215&r1=824214&r2=824215&view=diff
==============================================================================
--- geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/EnumType.java (original)
+++ geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/EnumType.java Mon Oct 12 02:23:08 2009
@@ -25,10 +25,9 @@
package javax.persistence;
-/**
- * @version $Rev$ $Date$
- */
+
public enum EnumType {
ORDINAL,
+
STRING
}
Modified: geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/Enumerated.java
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/Enumerated.java?rev=824215&r1=824214&r2=824215&view=diff
==============================================================================
--- geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/Enumerated.java (original)
+++ geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/Enumerated.java Mon Oct 12 02:23:08 2009
@@ -24,16 +24,17 @@
//
package javax.persistence;
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
import java.lang.annotation.Target;
+import java.lang.annotation.Retention;
+import static java.lang.annotation.ElementType.FIELD;
+import static java.lang.annotation.ElementType.METHOD;
+import static java.lang.annotation.RetentionPolicy.RUNTIME;
+import static javax.persistence.EnumType.ORDINAL;
-/**
- * @version $Rev$ $Date$
- */
-@Target({ElementType.METHOD, ElementType.FIELD})
-@Retention(RetentionPolicy.RUNTIME)
+
+@Target({METHOD, FIELD})
+@Retention(RUNTIME)
public @interface Enumerated {
- EnumType value() default EnumType.ORDINAL;
+
+ EnumType value() default ORDINAL;
}
Modified: geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/ExcludeDefaultListeners.java
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/ExcludeDefaultListeners.java?rev=824215&r1=824214&r2=824215&view=diff
==============================================================================
--- geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/ExcludeDefaultListeners.java (original)
+++ geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/ExcludeDefaultListeners.java Mon Oct 12 02:23:08 2009
@@ -24,15 +24,13 @@
//
package javax.persistence;
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
import java.lang.annotation.Target;
+import java.lang.annotation.Retention;
+import static java.lang.annotation.ElementType.TYPE;
+import static java.lang.annotation.RetentionPolicy.RUNTIME;
+
-/**
- * @version $Rev$ $Date$
- */
-@Target({ElementType.TYPE})
-@Retention(RetentionPolicy.RUNTIME)
+@Target({TYPE})
+@Retention(RUNTIME)
public @interface ExcludeDefaultListeners {
-}
+}
Modified: geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/ExcludeSuperclassListeners.java
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/ExcludeSuperclassListeners.java?rev=824215&r1=824214&r2=824215&view=diff
==============================================================================
--- geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/ExcludeSuperclassListeners.java (original)
+++ geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/ExcludeSuperclassListeners.java Mon Oct 12 02:23:08 2009
@@ -24,15 +24,14 @@
//
package javax.persistence;
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
import java.lang.annotation.Target;
+import java.lang.annotation.Retention;
+import static java.lang.annotation.ElementType.TYPE;
+import static java.lang.annotation.RetentionPolicy.RUNTIME;
+
+
+@Target({TYPE})
+@Retention(RUNTIME)
-/**
- * @version $Rev$ $Date$
- */
-@Target({ElementType.TYPE})
-@Retention(RetentionPolicy.RUNTIME)
public @interface ExcludeSuperclassListeners {
}
Modified: geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/FetchType.java
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/FetchType.java?rev=824215&r1=824214&r2=824215&view=diff
==============================================================================
--- geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/FetchType.java (original)
+++ geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/FetchType.java Mon Oct 12 02:23:08 2009
@@ -24,9 +24,10 @@
//
package javax.persistence;
-/**
- * @version $Rev$ $Date$
- */
+
public enum FetchType {
- LAZY, EAGER
-};
+
+ LAZY,
+
+ EAGER
+}
Modified: geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/FieldResult.java
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/FieldResult.java?rev=824215&r1=824214&r2=824215&view=diff
==============================================================================
--- geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/FieldResult.java (original)
+++ geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/FieldResult.java Mon Oct 12 02:23:08 2009
@@ -24,16 +24,16 @@
//
package javax.persistence;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
import java.lang.annotation.Target;
+import java.lang.annotation.Retention;
+import static java.lang.annotation.RetentionPolicy.RUNTIME;
+
+
+@Target({})
+@Retention(RUNTIME)
+
+public @interface FieldResult {
-/**
- * @version $Rev$ $Date$
- */
-@Target({})
-@Retention(RetentionPolicy.RUNTIME)
-public @interface FieldResult {
String name();
String column();
Modified: geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/FlushModeType.java
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/FlushModeType.java?rev=824215&r1=824214&r2=824215&view=diff
==============================================================================
--- geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/FlushModeType.java (original)
+++ geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/FlushModeType.java Mon Oct 12 02:23:08 2009
@@ -22,10 +22,12 @@
// Community Process. In order to remain compliant with the specification
// DO NOT add / change / or delete method signatures!
//
-
package javax.persistence;
+
public enum FlushModeType {
- COMMIT,
- AUTO
+
+ COMMIT,
+
+ AUTO
}
Modified: geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/GeneratedValue.java
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/GeneratedValue.java?rev=824215&r1=824214&r2=824215&view=diff
==============================================================================
--- geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/GeneratedValue.java (original)
+++ geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/GeneratedValue.java Mon Oct 12 02:23:08 2009
@@ -24,18 +24,20 @@
//
package javax.persistence;
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
import java.lang.annotation.Target;
+import java.lang.annotation.Retention;
+import static java.lang.annotation.ElementType.FIELD;
+import static java.lang.annotation.ElementType.METHOD;
+import static java.lang.annotation.RetentionPolicy.RUNTIME;
+import static javax.persistence.GenerationType.AUTO;
+
+
+@Target({METHOD, FIELD})
+@Retention(RUNTIME)
-/**
- * @version $Rev$ $Date$
- */
-@Target({ElementType.METHOD, ElementType.FIELD})
-@Retention(RetentionPolicy.RUNTIME)
public @interface GeneratedValue {
- GenerationType strategy() default GenerationType.AUTO;
+
+ GenerationType strategy() default AUTO;
String generator() default "";
}
Modified: geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/GenerationType.java
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/GenerationType.java?rev=824215&r1=824214&r2=824215&view=diff
==============================================================================
--- geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/GenerationType.java (original)
+++ geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/GenerationType.java Mon Oct 12 02:23:08 2009
@@ -24,9 +24,14 @@
//
package javax.persistence;
-/**
- * @version $Rev$ $Date$
- */
-public enum GenerationType {
- TABLE, SEQUENCE, IDENTITY, AUTO
-};
+
+public enum GenerationType {
+
+ TABLE,
+
+ SEQUENCE,
+
+ IDENTITY,
+
+ AUTO
+}
Modified: geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/Id.java
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/Id.java?rev=824215&r1=824214&r2=824215&view=diff
==============================================================================
--- geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/Id.java (original)
+++ geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/Id.java Mon Oct 12 02:23:08 2009
@@ -24,12 +24,14 @@
//
package javax.persistence;
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
import java.lang.annotation.Target;
+import java.lang.annotation.Retention;
+import static java.lang.annotation.ElementType.FIELD;
+import static java.lang.annotation.ElementType.METHOD;
+import static java.lang.annotation.RetentionPolicy.RUNTIME;
+
+
+@Target({METHOD, FIELD})
+@Retention(RUNTIME)
-@Target({ElementType.METHOD, ElementType.FIELD})
-@Retention(RetentionPolicy.RUNTIME)
-public @interface Id {
-}
+public @interface Id {}
Modified: geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/IdClass.java
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/IdClass.java?rev=824215&r1=824214&r2=824215&view=diff
==============================================================================
--- geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/IdClass.java (original)
+++ geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/IdClass.java Mon Oct 12 02:23:08 2009
@@ -24,17 +24,16 @@
//
package javax.persistence;
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
import java.lang.annotation.Target;
+import java.lang.annotation.Retention;
+import static java.lang.annotation.ElementType.TYPE;
+import static java.lang.annotation.RetentionPolicy.RUNTIME;
+
+
+@Target({TYPE})
+@Retention(RUNTIME)
-/**
- * @version $Rev$ $Date$
- */
-@Target({ElementType.TYPE})
-@Retention(RetentionPolicy.RUNTIME)
public @interface IdClass {
+
Class value();
}
-
Modified: geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/Inheritance.java
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/Inheritance.java?rev=824215&r1=824214&r2=824215&view=diff
==============================================================================
--- geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/Inheritance.java (original)
+++ geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/Inheritance.java Mon Oct 12 02:23:08 2009
@@ -22,19 +22,19 @@
// Community Process. In order to remain compliant with the specification
// DO NOT add / change / or delete method signatures!
//
-
package javax.persistence;
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
import java.lang.annotation.Target;
+import java.lang.annotation.Retention;
+import static java.lang.annotation.ElementType.TYPE;
+import static java.lang.annotation.RetentionPolicy.RUNTIME;
+import static javax.persistence.InheritanceType.SINGLE_TABLE;
+
+
+@Target({TYPE})
+@Retention(RUNTIME)
-/**
- * @version $Rev$ $Date$
- */
-@Target({ElementType.TYPE})
-@Retention(RetentionPolicy.RUNTIME)
public @interface Inheritance {
- InheritanceType strategy() default InheritanceType.SINGLE_TABLE;
+
+ InheritanceType strategy() default SINGLE_TABLE;
}
Modified: geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/InheritanceType.java
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/InheritanceType.java?rev=824215&r1=824214&r2=824215&view=diff
==============================================================================
--- geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/InheritanceType.java (original)
+++ geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/InheritanceType.java Mon Oct 12 02:23:08 2009
@@ -24,9 +24,12 @@
//
package javax.persistence;
-/**
- * @version $Rev$ $Date$
- */
-public enum InheritanceType {
- SINGLE_TABLE, JOINED, TABLE_PER_CLASS
-};
+
+public enum InheritanceType {
+
+ SINGLE_TABLE,
+
+ TABLE_PER_CLASS,
+
+ JOINED
+}
Modified: geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/JoinColumn.java
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/JoinColumn.java?rev=824215&r1=824214&r2=824215&view=diff
==============================================================================
--- geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/JoinColumn.java (original)
+++ geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/JoinColumn.java Mon Oct 12 02:23:08 2009
@@ -22,20 +22,19 @@
// Community Process. In order to remain compliant with the specification
// DO NOT add / change / or delete method signatures!
//
-
package javax.persistence;
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
import java.lang.annotation.Target;
+import java.lang.annotation.Retention;
+import static java.lang.annotation.ElementType.FIELD;
+import static java.lang.annotation.ElementType.METHOD;
+import static java.lang.annotation.RetentionPolicy.RUNTIME;
-/**
- * @version $Rev$ $Date$
- */
-@Target({ElementType.METHOD, ElementType.FIELD})
-@Retention(RetentionPolicy.RUNTIME)
+
+@Target({METHOD, FIELD})
+@Retention(RUNTIME)
public @interface JoinColumn {
+
String name() default "";
String referencedColumnName() default "";
Modified: geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/JoinColumns.java
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/JoinColumns.java?rev=824215&r1=824214&r2=824215&view=diff
==============================================================================
--- geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/JoinColumns.java (original)
+++ geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/JoinColumns.java Mon Oct 12 02:23:08 2009
@@ -22,20 +22,18 @@
// Community Process. In order to remain compliant with the specification
// DO NOT add / change / or delete method signatures!
//
-
package javax.persistence;
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
import java.lang.annotation.Target;
+import java.lang.annotation.Retention;
+import static java.lang.annotation.ElementType.FIELD;
+import static java.lang.annotation.ElementType.METHOD;
+import static java.lang.annotation.RetentionPolicy.RUNTIME;
-/**
- * @version $Rev$ $Date$
- */
-@Target({ElementType.METHOD, ElementType.FIELD})
-@Retention(RetentionPolicy.RUNTIME)
+
+@Target({METHOD, FIELD})
+@Retention(RUNTIME)
public @interface JoinColumns {
+
JoinColumn[] value();
}
-
Modified: geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/JoinTable.java
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/JoinTable.java?rev=824215&r1=824214&r2=824215&view=diff
==============================================================================
--- geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/JoinTable.java (original)
+++ geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/JoinTable.java Mon Oct 12 02:23:08 2009
@@ -24,17 +24,18 @@
//
package javax.persistence;
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
import java.lang.annotation.Target;
+import java.lang.annotation.Retention;
+import static java.lang.annotation.ElementType.FIELD;
+import static java.lang.annotation.ElementType.METHOD;
+import static java.lang.annotation.RetentionPolicy.RUNTIME;
+
+
+@Target({METHOD, FIELD})
+@Retention(RUNTIME)
-/**
- * @version $Rev$ $Date$
- */
-@Target({ElementType.METHOD, ElementType.FIELD})
-@Retention(RetentionPolicy.RUNTIME)
public @interface JoinTable {
+
String name() default "";
String catalog() default "";
Modified: geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/Lob.java
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/Lob.java?rev=824215&r1=824214&r2=824215&view=diff
==============================================================================
--- geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/Lob.java (original)
+++ geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/Lob.java Mon Oct 12 02:23:08 2009
@@ -24,15 +24,14 @@
//
package javax.persistence;
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
import java.lang.annotation.Target;
+import java.lang.annotation.Retention;
+import static java.lang.annotation.ElementType.FIELD;
+import static java.lang.annotation.ElementType.METHOD;
+import static java.lang.annotation.RetentionPolicy.RUNTIME;
+
-/**
- * @version $Rev$ $Date$
- */
-@Target({ElementType.METHOD, ElementType.FIELD})
-@Retention(RetentionPolicy.RUNTIME)
+@Target({METHOD, FIELD})
+@Retention(RUNTIME)
public @interface Lob {
}
Modified: geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/LockModeType.java
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/LockModeType.java?rev=824215&r1=824214&r2=824215&view=diff
==============================================================================
--- geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/LockModeType.java (original)
+++ geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/LockModeType.java Mon Oct 12 02:23:08 2009
@@ -22,17 +22,24 @@
// Community Process. In order to remain compliant with the specification
// DO NOT add / change / or delete method signatures!
//
-
package javax.persistence;
+
public enum LockModeType
{
READ,
+
WRITE,
+
OPTIMISTIC,
+
OPTIMISTIC_FORCE_INCREMENT,
+
PESSIMISTIC_READ,
+
PESSIMISTIC_WRITE,
+
PESSIMISTIC_FORCE_INCREMENT,
+
NONE
}
Modified: geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/LockTimeoutException.java
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/LockTimeoutException.java?rev=824215&r1=824214&r2=824215&view=diff
==============================================================================
--- geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/LockTimeoutException.java (original)
+++ geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/LockTimeoutException.java Mon Oct 12 02:23:08 2009
@@ -24,16 +24,37 @@
//
package javax.persistence;
-public class LockTimeoutException extends PersistenceException {
- private static final long serialVersionUID = -5849057243739854898L;
+public class LockTimeoutException extends PersistenceException {
+ Object entity;
public LockTimeoutException() {
super();
}
- public LockTimeoutException(String string) {
- super(string);
+ public LockTimeoutException(String message) {
+ super(message);
+ }
+
+ public LockTimeoutException(String message, Throwable cause) {
+ super(message, cause);
+ }
+
+ public LockTimeoutException(Throwable cause) {
+ super(cause);
}
+ public LockTimeoutException(Object entity) {
+ this.entity = entity;
+ }
+
+ public LockTimeoutException(String message, Throwable cause, Object entity) {
+ super(message, cause);
+ this.entity = entity;
+ }
+ public Object getObject() {
+ return this.entity;
+ }
}
+
+
Modified: geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/ManyToMany.java
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/ManyToMany.java?rev=824215&r1=824214&r2=824215&view=diff
==============================================================================
--- geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/ManyToMany.java (original)
+++ geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/ManyToMany.java Mon Oct 12 02:23:08 2009
@@ -24,23 +24,24 @@
//
package javax.persistence;
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
import java.lang.annotation.Target;
+import java.lang.annotation.Retention;
+import javax.persistence.CascadeType;
+import static java.lang.annotation.ElementType.FIELD;
+import static java.lang.annotation.ElementType.METHOD;
+import static java.lang.annotation.RetentionPolicy.RUNTIME;
+import static javax.persistence.FetchType.LAZY;
+
-/**
- * @version $Rev$ $Date$
- */
-@Target({ElementType.METHOD, ElementType.FIELD})
-@Retention(RetentionPolicy.RUNTIME)
+@Target({METHOD, FIELD})
+@Retention(RUNTIME)
public @interface ManyToMany {
+
Class targetEntity() default void.class;
CascadeType[] cascade() default {};
- FetchType fetch() default FetchType.LAZY;
+ FetchType fetch() default LAZY;
String mappedBy() default "";
}
-
Modified: geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/ManyToOne.java
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/ManyToOne.java?rev=824215&r1=824214&r2=824215&view=diff
==============================================================================
--- geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/ManyToOne.java (original)
+++ geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/ManyToOne.java Mon Oct 12 02:23:08 2009
@@ -24,22 +24,25 @@
//
package javax.persistence;
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
import java.lang.annotation.Target;
+import java.lang.annotation.Retention;
+import javax.persistence.CascadeType;
+import static java.lang.annotation.ElementType.FIELD;
+import static java.lang.annotation.ElementType.METHOD;
+import static java.lang.annotation.RetentionPolicy.RUNTIME;
+import static javax.persistence.FetchType.EAGER;
+
+
+@Target({METHOD, FIELD})
+@Retention(RUNTIME)
-/**
- * @version $Rev$ $Date$
- */
-@Target({ElementType.METHOD, ElementType.FIELD})
-@Retention(RetentionPolicy.RUNTIME)
public @interface ManyToOne {
+
Class targetEntity() default void.class;
CascadeType[] cascade() default {};
- FetchType fetch() default FetchType.EAGER;
+ FetchType fetch() default EAGER;
boolean optional() default true;
}
Modified: geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/MapKey.java
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/MapKey.java?rev=824215&r1=824214&r2=824215&view=diff
==============================================================================
--- geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/MapKey.java (original)
+++ geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/MapKey.java Mon Oct 12 02:23:08 2009
@@ -24,16 +24,16 @@
//
package javax.persistence;
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
import java.lang.annotation.Target;
+import java.lang.annotation.Retention;
+import static java.lang.annotation.ElementType.FIELD;
+import static java.lang.annotation.ElementType.METHOD;
+import static java.lang.annotation.RetentionPolicy.RUNTIME;
-/**
- * @version $Rev$ $Date$
- */
-@Target({ElementType.METHOD, ElementType.FIELD})
-@Retention(RetentionPolicy.RUNTIME)
+
+@Target({METHOD, FIELD})
+@Retention(RUNTIME)
public @interface MapKey {
+
String name() default "";
}
Modified: geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/MapKeyClass.java
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/MapKeyClass.java?rev=824215&r1=824214&r2=824215&view=diff
==============================================================================
--- geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/MapKeyClass.java (original)
+++ geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/MapKeyClass.java Mon Oct 12 02:23:08 2009
@@ -24,13 +24,16 @@
//
package javax.persistence;
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
import java.lang.annotation.Target;
+import java.lang.annotation.Retention;
+import static java.lang.annotation.ElementType.FIELD;
+import static java.lang.annotation.ElementType.METHOD;
+import static java.lang.annotation.RetentionPolicy.RUNTIME;
+
+
-@Target({ElementType.METHOD, ElementType.FIELD})
-@Retention(RetentionPolicy.RUNTIME)
+@Target( { METHOD, FIELD })
+@Retention(RUNTIME)
public @interface MapKeyClass {
- Class value();
+ Class value();
}
Modified: geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/MapKeyColumn.java
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/MapKeyColumn.java?rev=824215&r1=824214&r2=824215&view=diff
==============================================================================
--- geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/MapKeyColumn.java (original)
+++ geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/MapKeyColumn.java Mon Oct 12 02:23:08 2009
@@ -24,31 +24,34 @@
//
package javax.persistence;
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
import java.lang.annotation.Target;
+import java.lang.annotation.Retention;
+import static java.lang.annotation.ElementType.FIELD;
+import static java.lang.annotation.ElementType.METHOD;
+import static java.lang.annotation.RetentionPolicy.RUNTIME;
-@Target({ElementType.METHOD, ElementType.FIELD})
-@Retention(RetentionPolicy.RUNTIME)
+
+@Target( { METHOD, FIELD })
+@Retention(RUNTIME)
public @interface MapKeyColumn {
- String name() default "";
- boolean unique() default false;
+ String name() default "";
+
+ boolean unique() default false;
- boolean nullable() default false;
+ boolean nullable() default false;
- boolean insertable() default true;
+ boolean insertable() default true;
- boolean updatable() default true;
+ boolean updatable() default true;
- String columnDefinition() default "";
+ String columnDefinition() default "";
- String table() default "";
+ String table() default "";
- int length() default 255;
+ int length() default 255;
- int precision() default 0;
+ int precision() default 0;
- int scale() default 0;
+ int scale() default 0;
}
Modified: geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/MapKeyEnumerated.java
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/MapKeyEnumerated.java?rev=824215&r1=824214&r2=824215&view=diff
==============================================================================
--- geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/MapKeyEnumerated.java (original)
+++ geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/MapKeyEnumerated.java Mon Oct 12 02:23:08 2009
@@ -22,16 +22,17 @@
// Community Process. In order to remain compliant with the specification
// DO NOT add / change / or delete method signatures!
//
-
package javax.persistence;
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
import java.lang.annotation.Target;
+import java.lang.annotation.Retention;
+import static java.lang.annotation.ElementType.FIELD;
+import static java.lang.annotation.ElementType.METHOD;
+import static java.lang.annotation.RetentionPolicy.RUNTIME;
+import static javax.persistence.EnumType.ORDINAL;
+
-@Target({ElementType.METHOD, ElementType.FIELD})
-@Retention(RetentionPolicy.RUNTIME)
+@Target({METHOD, FIELD}) @Retention(RUNTIME)
public @interface MapKeyEnumerated {
- EnumType value() default EnumType.ORDINAL;
+ EnumType value() default ORDINAL;
}
Modified: geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/MapKeyJoinColumn.java
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/MapKeyJoinColumn.java?rev=824215&r1=824214&r2=824215&view=diff
==============================================================================
--- geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/MapKeyJoinColumn.java (original)
+++ geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/MapKeyJoinColumn.java Mon Oct 12 02:23:08 2009
@@ -24,27 +24,29 @@
//
package javax.persistence;
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
import java.lang.annotation.Target;
+import java.lang.annotation.Retention;
+import static java.lang.annotation.ElementType.FIELD;
+import static java.lang.annotation.ElementType.METHOD;
+import static java.lang.annotation.RetentionPolicy.RUNTIME;
+
-@Target({ElementType.METHOD, ElementType.FIELD})
-@Retention(RetentionPolicy.RUNTIME)
+@Target( { METHOD, FIELD })
+@Retention(RUNTIME)
public @interface MapKeyJoinColumn {
- String name() default "";
+ String name() default "";
- String referencedColumnName() default "";
+ String referencedColumnName() default "";
- boolean unique() default false;
+ boolean unique() default false;
- boolean nullable() default false;
+ boolean nullable() default false;
- boolean insertable() default true;
+ boolean insertable() default true;
- boolean updatable() default true;
+ boolean updatable() default true;
- String columnDefinition() default "";
+ String columnDefinition() default "";
- String table() default "";
+ String table() default "";
}
Modified: geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/MapKeyJoinColumns.java
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/MapKeyJoinColumns.java?rev=824215&r1=824214&r2=824215&view=diff
==============================================================================
--- geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/MapKeyJoinColumns.java (original)
+++ geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/MapKeyJoinColumns.java Mon Oct 12 02:23:08 2009
@@ -24,13 +24,15 @@
//
package javax.persistence;
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
import java.lang.annotation.Target;
+import java.lang.annotation.Retention;
+import static java.lang.annotation.ElementType.FIELD;
+import static java.lang.annotation.ElementType.METHOD;
+import static java.lang.annotation.RetentionPolicy.RUNTIME;
+
-@Target({ElementType.METHOD, ElementType.FIELD})
-@Retention(RetentionPolicy.RUNTIME)
+@Target( { METHOD, FIELD })
+@Retention(RUNTIME)
public @interface MapKeyJoinColumns {
- MapKeyJoinColumn[] value();
+ MapKeyJoinColumn[] value();
}
Modified: geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/MapKeyTemporal.java
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/MapKeyTemporal.java?rev=824215&r1=824214&r2=824215&view=diff
==============================================================================
--- geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/MapKeyTemporal.java (original)
+++ geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/MapKeyTemporal.java Mon Oct 12 02:23:08 2009
@@ -22,16 +22,19 @@
// Community Process. In order to remain compliant with the specification
// DO NOT add / change / or delete method signatures!
//
-
package javax.persistence;
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
import java.lang.annotation.Target;
+import java.lang.annotation.Retention;
+import static java.lang.annotation.ElementType.FIELD;
+import static java.lang.annotation.ElementType.METHOD;
+import static java.lang.annotation.RetentionPolicy.RUNTIME;
-@Target({ElementType.METHOD, ElementType.FIELD})
-@Retention(RetentionPolicy.RUNTIME)
+
+@Target({METHOD, FIELD})
+@Retention(RUNTIME)
public @interface MapKeyTemporal {
+
TemporalType value();
}
+
Modified: geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/MappedSuperclass.java
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/MappedSuperclass.java?rev=824215&r1=824214&r2=824215&view=diff
==============================================================================
--- geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/MappedSuperclass.java (original)
+++ geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/MappedSuperclass.java Mon Oct 12 02:23:08 2009
@@ -24,15 +24,15 @@
//
package javax.persistence;
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
import java.lang.annotation.Target;
+import java.lang.annotation.Retention;
+import java.lang.annotation.Documented;
+import static java.lang.annotation.ElementType.TYPE;
+import static java.lang.annotation.RetentionPolicy.RUNTIME;
+
-/**
- * @version $Rev$ $Date$
- */
-@Target(ElementType.TYPE)
-@Retention(RetentionPolicy.RUNTIME)
+@Documented
+@Target({TYPE})
+@Retention(RUNTIME)
public @interface MappedSuperclass {
}
Added: geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/MapsId.java
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/MapsId.java?rev=824215&view=auto
==============================================================================
--- geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/MapsId.java (added)
+++ geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/MapsId.java Mon Oct 12 02:23:08 2009
@@ -0,0 +1,39 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+//
+// This source code implements specifications defined by the Java
+// Community Process. In order to remain compliant with the specification
+// DO NOT add / change / or delete method signatures!
+//
+package javax.persistence;
+
+
+import java.lang.annotation.Target;
+import java.lang.annotation.Retention;
+import static java.lang.annotation.ElementType.FIELD;
+import static java.lang.annotation.ElementType.METHOD;
+import static java.lang.annotation.RetentionPolicy.RUNTIME;
+
+
+@Target( { METHOD, FIELD })
+@Retention(RUNTIME)
+public @interface MapsId {
+
+ String value() default ""; }
Propchange: geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/MapsId.java
------------------------------------------------------------------------------
svn:eol-style = native
Modified: geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/NamedNativeQueries.java
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/NamedNativeQueries.java?rev=824215&r1=824214&r2=824215&view=diff
==============================================================================
--- geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/NamedNativeQueries.java (original)
+++ geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/NamedNativeQueries.java Mon Oct 12 02:23:08 2009
@@ -22,18 +22,17 @@
// Community Process. In order to remain compliant with the specification
// DO NOT add / change / or delete method signatures!
//
-package javax.persistence;
+package javax.persistence;
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
import java.lang.annotation.Target;
+import java.lang.annotation.Retention;
+import static java.lang.annotation.ElementType.TYPE;
+import static java.lang.annotation.RetentionPolicy.RUNTIME;
+
+
+@Target({TYPE})
+@Retention(RUNTIME)
+public @interface NamedNativeQueries {
-/**
- * @version $Rev$ $Date$
- */
-@Target({ElementType.TYPE})
-@Retention(RetentionPolicy.RUNTIME)
-public @interface NamedNativeQueries {
- NamedNativeQuery[] value();
+ NamedNativeQuery[] value ();
}
Modified: geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/NamedNativeQuery.java
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/NamedNativeQuery.java?rev=824215&r1=824214&r2=824215&view=diff
==============================================================================
--- geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/NamedNativeQuery.java (original)
+++ geronimo/specs/trunk/geronimo-jpa_2.0_spec/src/main/java/javax/persistence/NamedNativeQuery.java Mon Oct 12 02:23:08 2009
@@ -24,24 +24,23 @@
//
package javax.persistence;
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
import java.lang.annotation.Target;
+import java.lang.annotation.Retention;
+import static java.lang.annotation.ElementType.TYPE;
+import static java.lang.annotation.RetentionPolicy.RUNTIME;
+
+
+@Target({TYPE})
+@Retention(RUNTIME)
+public @interface NamedNativeQuery {
-/**
- * @version $Rev$ $Date$
- */
-@Target({ElementType.TYPE})
-@Retention(RetentionPolicy.RUNTIME)
-public @interface NamedNativeQuery {
String name();
String query();
QueryHint[] hints() default {};
- Class resultClass() default void.class;
+ Class resultClass() default void.class;
String resultSetMapping() default "";
}