refactored eclipselink java annotation name interface to match up with xml

27 files changed, 43 insertions, 44 deletions

diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/java/CacheCoordinationType.java b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/java/CacheCoordinationType.java
index a7a8bdfdb8..c6b3e1a5f5 100644
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/java/CacheCoordinationType.java
+++ b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/java/CacheCoordinationType.java
@@ -24,10 +24,10 @@ package org.eclipse.jpt.eclipselink.core.resource.java;
  */
 public enum CacheCoordinationType {
 
-	SEND_OBJECT_CHANGES(EclipseLinkJPA.CACHE_COORDINATION_TYPE__SEND_OBJECT_CHANGES),
-	INVALIDATE_CHANGED_OBJECTS(EclipseLinkJPA.CACHE_COORDINATION_TYPE__INVALIDATE_CHANGED_OBJECTS),
-	SEND_NEW_OBJECTS_WITH_CHANGES(EclipseLinkJPA.CACHE_COORDINATION_TYPE__SEND_NEW_OBJECTS_WITH_CHANGES),
-	NONE(EclipseLinkJPA.CACHE_COORDINATION_TYPE__NONE);
+	SEND_OBJECT_CHANGES(EclipseLink.CACHE_COORDINATION_TYPE__SEND_OBJECT_CHANGES),
+	INVALIDATE_CHANGED_OBJECTS(EclipseLink.CACHE_COORDINATION_TYPE__INVALIDATE_CHANGED_OBJECTS),
+	SEND_NEW_OBJECTS_WITH_CHANGES(EclipseLink.CACHE_COORDINATION_TYPE__SEND_NEW_OBJECTS_WITH_CHANGES),
+	NONE(EclipseLink.CACHE_COORDINATION_TYPE__NONE);
 
 
 	private String javaAnnotationValue;
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/java/CacheType.java b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/java/CacheType.java
index d569be1fc1..8720062d0a 100644
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/java/CacheType.java
+++ b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/java/CacheType.java
@@ -24,13 +24,13 @@ package org.eclipse.jpt.eclipselink.core.resource.java;
  */
 public enum CacheType {
 
-	FULL(EclipseLinkJPA.CACHE_TYPE__FULL),
-	WEAK(EclipseLinkJPA.CACHE_TYPE__WEAK),
-	SOFT(EclipseLinkJPA.CACHE_TYPE__SOFT),
-	SOFT_WEAK(EclipseLinkJPA.CACHE_TYPE__SOFT_WEAK),
-	HARD_WEAK(EclipseLinkJPA.CACHE_TYPE__HARD_WEAK),
-	CACHE(EclipseLinkJPA.CACHE_TYPE__CACHE),
-	NONE(EclipseLinkJPA.CACHE_TYPE__NONE);
+	FULL(EclipseLink.CACHE_TYPE__FULL),
+	WEAK(EclipseLink.CACHE_TYPE__WEAK),
+	SOFT(EclipseLink.CACHE_TYPE__SOFT),
+	SOFT_WEAK(EclipseLink.CACHE_TYPE__SOFT_WEAK),
+	HARD_WEAK(EclipseLink.CACHE_TYPE__HARD_WEAK),
+	CACHE(EclipseLink.CACHE_TYPE__CACHE),
+	NONE(EclipseLink.CACHE_TYPE__NONE);
 
 
 	private String javaAnnotationValue;
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/java/ChangeTrackingType.java b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/java/ChangeTrackingType.java
index 4fc64883de..f322f45217 100644
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/java/ChangeTrackingType.java
+++ b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/java/ChangeTrackingType.java
@@ -24,10 +24,10 @@ package org.eclipse.jpt.eclipselink.core.resource.java;
  */
 public enum ChangeTrackingType {
 
-	ATTRIBUTE(EclipseLinkJPA.CHANGE_TRACKING_TYPE__ATTRIBUTE),
-	OBJECT(EclipseLinkJPA.CHANGE_TRACKING_TYPE__OBJECT),
-	DEFERRED(EclipseLinkJPA.CHANGE_TRACKING_TYPE__DEFERRED),
-	AUTO(EclipseLinkJPA.CHANGE_TRACKING_TYPE__AUTO);
+	ATTRIBUTE(EclipseLink.CHANGE_TRACKING_TYPE__ATTRIBUTE),
+	OBJECT(EclipseLink.CHANGE_TRACKING_TYPE__OBJECT),
+	DEFERRED(EclipseLink.CHANGE_TRACKING_TYPE__DEFERRED),
+	AUTO(EclipseLink.CHANGE_TRACKING_TYPE__AUTO);
 
 
 	private String javaAnnotationValue;
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/java/EclipseLinkJPA.java b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/java/EclipseLink.java
index b08036a97f..5271e704df 100644
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/java/EclipseLinkJPA.java
+++ b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/java/EclipseLink.java
@@ -22,7 +22,7 @@ package org.eclipse.jpt.eclipselink.core.resource.java;
  * @since 2.1
  */
 @SuppressWarnings("nls")
-public interface EclipseLinkJPA {
+public interface EclipseLink {
 
 	// EclipseLink package
 	String PACKAGE = "org.eclipse.persistence.annotations"; //$NON-NLS-1$
@@ -128,5 +128,4 @@ public interface EclipseLinkJPA {
 		String JOIN_FETCH_TYPE_ = JOIN_FETCH_TYPE + ".";
 		String JOIN_FETCH_TYPE__INNER = JOIN_FETCH_TYPE_ + "INNER";
 		String JOIN_FETCH_TYPE__OUTER = JOIN_FETCH_TYPE_ + "OUTER";
-
 }
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/java/EclipseLinkBasicCollectionAnnotation.java b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/java/EclipseLinkBasicCollectionAnnotation.java
index a923e603b1..04f5e7af4c 100644
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/java/EclipseLinkBasicCollectionAnnotation.java
+++ b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/java/EclipseLinkBasicCollectionAnnotation.java
@@ -27,5 +27,5 @@ import org.eclipse.jpt.core.resource.java.Annotation;
 public interface EclipseLinkBasicCollectionAnnotation
 	extends Annotation
 {
-	String ANNOTATION_NAME = EclipseLinkJPA.BASIC_COLLECTION;
+	String ANNOTATION_NAME = EclipseLink.BASIC_COLLECTION;
 }
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/java/EclipseLinkBasicMapAnnotation.java b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/java/EclipseLinkBasicMapAnnotation.java
index 5a687ca0bf..784049ff42 100644
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/java/EclipseLinkBasicMapAnnotation.java
+++ b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/java/EclipseLinkBasicMapAnnotation.java
@@ -27,5 +27,5 @@ import org.eclipse.jpt.core.resource.java.Annotation;
 public interface EclipseLinkBasicMapAnnotation
 	extends Annotation
 {
-	String ANNOTATION_NAME = EclipseLinkJPA.BASIC_MAP;
+	String ANNOTATION_NAME = EclipseLink.BASIC_MAP;
 }
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/java/EclipseLinkCacheAnnotation.java b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/java/EclipseLinkCacheAnnotation.java
index 950146b017..a42db3421b 100644
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/java/EclipseLinkCacheAnnotation.java
+++ b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/java/EclipseLinkCacheAnnotation.java
@@ -29,7 +29,7 @@ import org.eclipse.jpt.core.utility.TextRange;
 public interface EclipseLinkCacheAnnotation
 	extends Annotation
 {
-	String ANNOTATION_NAME = EclipseLinkJPA.CACHE;
+	String ANNOTATION_NAME = EclipseLink.CACHE;
 
 	/**
 	 * Corresponds to the 'type' element of the Cache annotation.
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/java/EclipseLinkChangeTrackingAnnotation.java b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/java/EclipseLinkChangeTrackingAnnotation.java
index 4b20982e3f..51a5fa4ff3 100644
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/java/EclipseLinkChangeTrackingAnnotation.java
+++ b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/java/EclipseLinkChangeTrackingAnnotation.java
@@ -29,7 +29,7 @@ import org.eclipse.jpt.core.utility.TextRange;
 public interface EclipseLinkChangeTrackingAnnotation
 	extends Annotation
 {
-	String ANNOTATION_NAME = EclipseLinkJPA.CHANGE_TRACKING;
+	String ANNOTATION_NAME = EclipseLink.CHANGE_TRACKING;
 
 	/**
 	 * Corresponds to the 'value' element of the ChangeTracking annotation.
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/java/EclipseLinkConversionValueAnnotation.java b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/java/EclipseLinkConversionValueAnnotation.java
index e6a9a57b37..c3165ed67c 100644
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/java/EclipseLinkConversionValueAnnotation.java
+++ b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/java/EclipseLinkConversionValueAnnotation.java
@@ -29,7 +29,7 @@ import org.eclipse.jpt.core.utility.TextRange;
 public interface EclipseLinkConversionValueAnnotation
 	extends Annotation
 {
-	String ANNOTATION_NAME = EclipseLinkJPA.CONVERSION_VALUE;
+	String ANNOTATION_NAME = EclipseLink.CONVERSION_VALUE;
 
 	/**
 	 * Corresponds to the 'dataValue' element of the ConversionValue annotation.
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/java/EclipseLinkConvertAnnotation.java b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/java/EclipseLinkConvertAnnotation.java
index 61ffce60b2..34af205401 100644
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/java/EclipseLinkConvertAnnotation.java
+++ b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/java/EclipseLinkConvertAnnotation.java
@@ -29,7 +29,7 @@ import org.eclipse.jpt.core.utility.TextRange;
 public interface EclipseLinkConvertAnnotation
 	extends Annotation
 {
-	String ANNOTATION_NAME = EclipseLinkJPA.CONVERT;
+	String ANNOTATION_NAME = EclipseLink.CONVERT;
 		
 	/**
 	 * Corresponds to the 'value' element of the Convert annotation.
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/java/EclipseLinkConverterAnnotation.java b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/java/EclipseLinkConverterAnnotation.java
index 6d4449e980..3c6e8a0bb3 100644
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/java/EclipseLinkConverterAnnotation.java
+++ b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/java/EclipseLinkConverterAnnotation.java
@@ -28,7 +28,7 @@ import org.eclipse.jpt.core.utility.TextRange;
 public interface EclipseLinkConverterAnnotation
 	extends EclipseLinkNamedConverterAnnotation
 {
-	String ANNOTATION_NAME = EclipseLinkJPA.CONVERTER;
+	String ANNOTATION_NAME = EclipseLink.CONVERTER;
 		
 	/**
 	 * Corresponds to the 'converterClass' element of the Converter annotation.
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/java/EclipseLinkCustomizerAnnotation.java b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/java/EclipseLinkCustomizerAnnotation.java
index 8aa4dc7457..dacfc5d489 100644
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/java/EclipseLinkCustomizerAnnotation.java
+++ b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/java/EclipseLinkCustomizerAnnotation.java
@@ -29,7 +29,7 @@ import org.eclipse.jpt.core.utility.TextRange;
 public interface EclipseLinkCustomizerAnnotation
 	extends Annotation
 {
-	String ANNOTATION_NAME = EclipseLinkJPA.CUSTOMIZER;
+	String ANNOTATION_NAME = EclipseLink.CUSTOMIZER;
 
 	/**
 	 * Corresponds to the 'value' element of the Customizer annotation.
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/java/EclipseLinkExistenceCheckingAnnotation.java b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/java/EclipseLinkExistenceCheckingAnnotation.java
index dc6e6017c2..9bd4975450 100644
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/java/EclipseLinkExistenceCheckingAnnotation.java
+++ b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/java/EclipseLinkExistenceCheckingAnnotation.java
@@ -29,7 +29,7 @@ import org.eclipse.jpt.core.utility.TextRange;
 public interface EclipseLinkExistenceCheckingAnnotation
 	extends Annotation
 {
-	String ANNOTATION_NAME = EclipseLinkJPA.EXISTENCE_CHECKING;
+	String ANNOTATION_NAME = EclipseLink.EXISTENCE_CHECKING;
 
 	/**
 	 * Corresponds to the 'value' element of the ExistenceChecking annotation.
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/java/EclipseLinkJoinFetchAnnotation.java b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/java/EclipseLinkJoinFetchAnnotation.java
index d206506c44..366ee1e7a0 100644
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/java/EclipseLinkJoinFetchAnnotation.java
+++ b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/java/EclipseLinkJoinFetchAnnotation.java
@@ -29,7 +29,7 @@ import org.eclipse.jpt.core.utility.TextRange;
 public interface EclipseLinkJoinFetchAnnotation
 	extends Annotation
 {
-	String ANNOTATION_NAME = EclipseLinkJPA.JOIN_FETCH;
+	String ANNOTATION_NAME = EclipseLink.JOIN_FETCH;
 
 	/**
 	 * Corresponds to the 'value' element of the JoinFetch annotation.
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/java/EclipseLinkMutableAnnotation.java b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/java/EclipseLinkMutableAnnotation.java
index c5730be3c4..45f495837f 100644
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/java/EclipseLinkMutableAnnotation.java
+++ b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/java/EclipseLinkMutableAnnotation.java
@@ -29,7 +29,7 @@ import org.eclipse.jpt.core.utility.TextRange;
 public interface EclipseLinkMutableAnnotation
 	extends Annotation
 {
-	String ANNOTATION_NAME = EclipseLinkJPA.MUTABLE;
+	String ANNOTATION_NAME = EclipseLink.MUTABLE;
 		
 	/**
 	 * Corresponds to the 'value' element of the Mutable annotation.
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/java/EclipseLinkObjectTypeConverterAnnotation.java b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/java/EclipseLinkObjectTypeConverterAnnotation.java
index 910f1bb9bb..f82d4dcaf3 100644
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/java/EclipseLinkObjectTypeConverterAnnotation.java
+++ b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/java/EclipseLinkObjectTypeConverterAnnotation.java
@@ -29,7 +29,7 @@ import org.eclipse.jpt.core.utility.TextRange;
 public interface EclipseLinkObjectTypeConverterAnnotation
 	extends BaseEclipseLinkTypeConverterAnnotation
 {
-	String ANNOTATION_NAME = EclipseLinkJPA.OBJECT_TYPE_CONVERTER;
+	String ANNOTATION_NAME = EclipseLink.OBJECT_TYPE_CONVERTER;
 	
 	/**
 	 * Corresponds to the 'conversionValues' element of the ObjectTypeConverter annotation.
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/java/EclipseLinkPrivateOwnedAnnotation.java b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/java/EclipseLinkPrivateOwnedAnnotation.java
index 4cbb5e563b..7037c609ec 100644
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/java/EclipseLinkPrivateOwnedAnnotation.java
+++ b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/java/EclipseLinkPrivateOwnedAnnotation.java
@@ -27,5 +27,5 @@ import org.eclipse.jpt.core.resource.java.Annotation;
 public interface EclipseLinkPrivateOwnedAnnotation
 	extends Annotation
 {	
-	String ANNOTATION_NAME = EclipseLinkJPA.PRIVATE_OWNED;
+	String ANNOTATION_NAME = EclipseLink.PRIVATE_OWNED;
 }
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/java/EclipseLinkReadOnlyAnnotation.java b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/java/EclipseLinkReadOnlyAnnotation.java
index 40e6a70542..e872f77914 100644
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/java/EclipseLinkReadOnlyAnnotation.java
+++ b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/java/EclipseLinkReadOnlyAnnotation.java
@@ -27,5 +27,5 @@ import org.eclipse.jpt.core.resource.java.Annotation;
 public interface EclipseLinkReadOnlyAnnotation
 	extends Annotation
 {	
-	String ANNOTATION_NAME = EclipseLinkJPA.READ_ONLY;
+	String ANNOTATION_NAME = EclipseLink.READ_ONLY;
 }
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/java/EclipseLinkReadTransformerAnnotation.java b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/java/EclipseLinkReadTransformerAnnotation.java
index 9a71c80bca..6b5361b533 100644
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/java/EclipseLinkReadTransformerAnnotation.java
+++ b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/java/EclipseLinkReadTransformerAnnotation.java
@@ -25,5 +25,5 @@ package org.eclipse.jpt.eclipselink.core.resource.java;
 public interface EclipseLinkReadTransformerAnnotation
 	extends EclipseLinkTransformerAnnotation
 {
-	String ANNOTATION_NAME = EclipseLinkJPA.READ_TRANSFORMER;
+	String ANNOTATION_NAME = EclipseLink.READ_TRANSFORMER;
 }
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/java/EclipseLinkStructConverterAnnotation.java b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/java/EclipseLinkStructConverterAnnotation.java
index e381356523..e85ff3324c 100644
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/java/EclipseLinkStructConverterAnnotation.java
+++ b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/java/EclipseLinkStructConverterAnnotation.java
@@ -28,7 +28,7 @@ import org.eclipse.jpt.core.utility.TextRange;
 public interface EclipseLinkStructConverterAnnotation
 	extends EclipseLinkNamedConverterAnnotation
 {
-	String ANNOTATION_NAME = EclipseLinkJPA.STRUCT_CONVERTER;
+	String ANNOTATION_NAME = EclipseLink.STRUCT_CONVERTER;
 
 	/**
 	 * Corresponds to the 'converter' element of the StructConverter annotation.
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/java/EclipseLinkTimeOfDayAnnotation.java b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/java/EclipseLinkTimeOfDayAnnotation.java
index 6d8c2c8720..d60ed0ca1b 100644
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/java/EclipseLinkTimeOfDayAnnotation.java
+++ b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/java/EclipseLinkTimeOfDayAnnotation.java
@@ -29,7 +29,7 @@ import org.eclipse.jpt.core.utility.TextRange;
 public interface EclipseLinkTimeOfDayAnnotation
 	extends Annotation
 {
-	String ANNOTATION_NAME = EclipseLinkJPA.TIME_OF_DAY;
+	String ANNOTATION_NAME = EclipseLink.TIME_OF_DAY;
 
 	/**
 	 * Corresponds to the 'hour' element of the TimeOfDay annotation.
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/java/EclipseLinkTransformationAnnotation.java b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/java/EclipseLinkTransformationAnnotation.java
index 5b09c1e4d5..e0e404063e 100644
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/java/EclipseLinkTransformationAnnotation.java
+++ b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/java/EclipseLinkTransformationAnnotation.java
@@ -30,7 +30,7 @@ import org.eclipse.jpt.core.utility.TextRange;
 public interface EclipseLinkTransformationAnnotation
 	extends Annotation
 {
-	String ANNOTATION_NAME = EclipseLinkJPA.TRANSFORMATION;
+	String ANNOTATION_NAME = EclipseLink.TRANSFORMATION;
 
 	/**
 	 * Corresponds to the 'fetch' element of the Transformation annotation.
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/java/EclipseLinkTypeConverterAnnotation.java b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/java/EclipseLinkTypeConverterAnnotation.java
index 6708c517a6..c7df28c2aa 100644
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/java/EclipseLinkTypeConverterAnnotation.java
+++ b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/java/EclipseLinkTypeConverterAnnotation.java
@@ -25,5 +25,5 @@ package org.eclipse.jpt.eclipselink.core.resource.java;
 public interface EclipseLinkTypeConverterAnnotation
 	extends BaseEclipseLinkTypeConverterAnnotation
 {
-	String ANNOTATION_NAME = EclipseLinkJPA.TYPE_CONVERTER;
+	String ANNOTATION_NAME = EclipseLink.TYPE_CONVERTER;
 }
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/java/EclipseLinkVariableOneToOneAnnotation.java b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/java/EclipseLinkVariableOneToOneAnnotation.java
index d3fc8da334..29f456389d 100644
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/java/EclipseLinkVariableOneToOneAnnotation.java
+++ b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/java/EclipseLinkVariableOneToOneAnnotation.java
@@ -27,5 +27,5 @@ import org.eclipse.jpt.core.resource.java.Annotation;
 public interface EclipseLinkVariableOneToOneAnnotation
 	extends Annotation
 {
-	String ANNOTATION_NAME = EclipseLinkJPA.VARIABLE_ONE_TO_ONE;
+	String ANNOTATION_NAME = EclipseLink.VARIABLE_ONE_TO_ONE;
 }
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/java/EclipseLinkWriteTransformerAnnotation.java b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/java/EclipseLinkWriteTransformerAnnotation.java
index 8cf574457a..1a0e2fdc49 100644
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/java/EclipseLinkWriteTransformerAnnotation.java
+++ b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/java/EclipseLinkWriteTransformerAnnotation.java
@@ -29,7 +29,7 @@ import org.eclipse.jpt.core.utility.TextRange;
 public interface EclipseLinkWriteTransformerAnnotation
 	extends EclipseLinkTransformerAnnotation
 {
-	String ANNOTATION_NAME = EclipseLinkJPA.WRITE_TRANSFORMER;
+	String ANNOTATION_NAME = EclipseLink.WRITE_TRANSFORMER;
 
 	/**
 	 * Corresponds to the 'column' element of the WriteTransformer annotation.
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/java/ExistenceType.java b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/java/ExistenceType.java
index 8b80206c8b..a2b06d1494 100644
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/java/ExistenceType.java
+++ b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/java/ExistenceType.java
@@ -24,10 +24,10 @@ package org.eclipse.jpt.eclipselink.core.resource.java;
  */
 public enum ExistenceType {
 
-    CHECK_CACHE(EclipseLinkJPA.EXISTENCE_TYPE__CHECK_CACHE),
-    CHECK_DATABASE(EclipseLinkJPA.EXISTENCE_TYPE__CHECK_DATABASE),
-    ASSUME_EXISTENCE(EclipseLinkJPA.EXISTENCE_TYPE__ASSUME_EXISTENCE),
-    ASSUME_NON_EXISTENCE(EclipseLinkJPA.EXISTENCE_TYPE__ASSUME_NON_EXISTENCE);
+    CHECK_CACHE(EclipseLink.EXISTENCE_TYPE__CHECK_CACHE),
+    CHECK_DATABASE(EclipseLink.EXISTENCE_TYPE__CHECK_DATABASE),
+    ASSUME_EXISTENCE(EclipseLink.EXISTENCE_TYPE__ASSUME_EXISTENCE),
+    ASSUME_NON_EXISTENCE(EclipseLink.EXISTENCE_TYPE__ASSUME_NON_EXISTENCE);
 
 
 	private String javaAnnotationValue;
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/java/JoinFetchType.java b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/java/JoinFetchType.java
index 40bc6177eb..b702790e75 100644
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/java/JoinFetchType.java
+++ b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/java/JoinFetchType.java
@@ -24,8 +24,8 @@ package org.eclipse.jpt.eclipselink.core.resource.java;
  */
 public enum JoinFetchType {
 
-    INNER(EclipseLinkJPA.JOIN_FETCH_TYPE__INNER),
-    OUTER(EclipseLinkJPA.JOIN_FETCH_TYPE__OUTER);
+    INNER(EclipseLink.JOIN_FETCH_TYPE__INNER),
+    OUTER(EclipseLink.JOIN_FETCH_TYPE__OUTER);
 
 
 	private String javaAnnotationValue;