package rename to jpa2

37 files changed, 59 insertions, 59 deletions

diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink1_1/ui/internal/EclipseLink1_1JpaUiFactory.java b/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/v1_1/EclipseLink1_1JpaUiFactory.java
index 63fe2c4c79..c64dd797cd 100644
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink1_1/ui/internal/EclipseLink1_1JpaUiFactory.java
+++ b/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/v1_1/EclipseLink1_1JpaUiFactory.java
@@ -7,15 +7,15 @@
  * Contributors:
  *     Oracle - initial API and implementation
  *******************************************************************************/
-package org.eclipse.jpt.eclipselink1_1.ui.internal;
+package org.eclipse.jpt.eclipselink.ui.internal.v1_1;
 
 import org.eclipse.jpt.core.context.java.JavaEmbeddable;
 import org.eclipse.jpt.core.context.java.JavaEntity;
 import org.eclipse.jpt.core.context.java.JavaMappedSuperclass;
 import org.eclipse.jpt.eclipselink.ui.internal.EclipseLinkJpaUiFactory;
-import org.eclipse.jpt.eclipselink1_1.ui.internal.java.details.EclipseLink1_1JavaEmbeddableComposite;
-import org.eclipse.jpt.eclipselink1_1.ui.internal.java.details.EclipseLink1_1JavaEntityComposite;
-import org.eclipse.jpt.eclipselink1_1.ui.internal.java.details.EclipseLink1_1JavaMappedSuperclassComposite;
+import org.eclipse.jpt.eclipselink.ui.internal.v1_1.java.details.EclipseLink1_1JavaEmbeddableComposite;
+import org.eclipse.jpt.eclipselink.ui.internal.v1_1.java.details.EclipseLink1_1JavaEntityComposite;
+import org.eclipse.jpt.eclipselink.ui.internal.v1_1.java.details.EclipseLink1_1JavaMappedSuperclassComposite;
 import org.eclipse.jpt.ui.WidgetFactory;
 import org.eclipse.jpt.ui.details.JpaComposite;
 import org.eclipse.jpt.utility.model.value.PropertyValueModel;
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink1_1/ui/internal/java/details/EclipseLink1_1JavaEmbeddableComposite.java b/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/v1_1/java/details/EclipseLink1_1JavaEmbeddableComposite.java
index 04aed00fb3..34692f2ac9 100644
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink1_1/ui/internal/java/details/EclipseLink1_1JavaEmbeddableComposite.java
+++ b/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/v1_1/java/details/EclipseLink1_1JavaEmbeddableComposite.java
@@ -7,7 +7,7 @@
  * Contributors:
  *     Oracle - initial API and implementation
  ******************************************************************************/
-package org.eclipse.jpt.eclipselink1_1.ui.internal.java.details;
+package org.eclipse.jpt.eclipselink.ui.internal.v1_1.java.details;
 
 import org.eclipse.jpt.core.context.AccessHolder;
 import org.eclipse.jpt.core.context.java.JavaEmbeddable;
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink1_1/ui/internal/java/details/EclipseLink1_1JavaEntityComposite.java b/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/v1_1/java/details/EclipseLink1_1JavaEntityComposite.java
index 73bb441122..01177aac86 100644
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink1_1/ui/internal/java/details/EclipseLink1_1JavaEntityComposite.java
+++ b/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/v1_1/java/details/EclipseLink1_1JavaEntityComposite.java
@@ -7,7 +7,7 @@
  * Contributors:
  *     Oracle - initial API and implementation
  ******************************************************************************/
-package org.eclipse.jpt.eclipselink1_1.ui.internal.java.details;
+package org.eclipse.jpt.eclipselink.ui.internal.v1_1.java.details;
 
 import org.eclipse.jpt.core.context.AccessHolder;
 import org.eclipse.jpt.core.context.java.JavaEntity;
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink1_1/ui/internal/java/details/EclipseLink1_1JavaMappedSuperclassComposite.java b/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/v1_1/java/details/EclipseLink1_1JavaMappedSuperclassComposite.java
index f8d64a990d..51fa11d794 100644
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink1_1/ui/internal/java/details/EclipseLink1_1JavaMappedSuperclassComposite.java
+++ b/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/v1_1/java/details/EclipseLink1_1JavaMappedSuperclassComposite.java
@@ -7,7 +7,7 @@
  * Contributors:
  *     Oracle - initial API and implementation
  ******************************************************************************/
-package org.eclipse.jpt.eclipselink1_1.ui.internal.java.details;
+package org.eclipse.jpt.eclipselink.ui.internal.v1_1.java.details;
 
 import org.eclipse.jpt.core.context.AccessHolder;
 import org.eclipse.jpt.core.context.java.JavaMappedSuperclass;
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink1_1/ui/internal/orm/details/EclipseLink1_1OrmBasicCollectionMappingComposite.java b/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/v1_1/orm/details/EclipseLink1_1OrmBasicCollectionMappingComposite.java
index 1706e9e5c0..6fbd6e5bbe 100644
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink1_1/ui/internal/orm/details/EclipseLink1_1OrmBasicCollectionMappingComposite.java
+++ b/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/v1_1/orm/details/EclipseLink1_1OrmBasicCollectionMappingComposite.java
@@ -7,7 +7,7 @@
  * Contributors:
  *     Oracle - initial API and implementation
  ******************************************************************************/
-package org.eclipse.jpt.eclipselink1_1.ui.internal.orm.details;
+package org.eclipse.jpt.eclipselink.ui.internal.v1_1.orm.details;
 
 import org.eclipse.jpt.core.context.AccessHolder;
 import org.eclipse.jpt.eclipselink.core.context.BasicCollectionMapping;
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink1_1/ui/internal/orm/details/EclipseLink1_1OrmBasicCollectionMappingUiProvider.java b/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/v1_1/orm/details/EclipseLink1_1OrmBasicCollectionMappingUiProvider.java
index 89864de7d8..0fc1a59c28 100644
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink1_1/ui/internal/orm/details/EclipseLink1_1OrmBasicCollectionMappingUiProvider.java
+++ b/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/v1_1/orm/details/EclipseLink1_1OrmBasicCollectionMappingUiProvider.java
@@ -7,7 +7,7 @@
  * Contributors:
  *     Oracle - initial API and implementation
  ******************************************************************************/
-package org.eclipse.jpt.eclipselink1_1.ui.internal.orm.details;
+package org.eclipse.jpt.eclipselink.ui.internal.v1_1.orm.details;
 
 import org.eclipse.core.runtime.content.IContentType;
 import org.eclipse.jpt.eclipselink.core.context.BasicCollectionMapping;
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink1_1/ui/internal/orm/details/EclipseLink1_1OrmBasicMapMappingComposite.java b/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/v1_1/orm/details/EclipseLink1_1OrmBasicMapMappingComposite.java
index e158f2152b..cf5e8a7679 100644
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink1_1/ui/internal/orm/details/EclipseLink1_1OrmBasicMapMappingComposite.java
+++ b/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/v1_1/orm/details/EclipseLink1_1OrmBasicMapMappingComposite.java
@@ -7,7 +7,7 @@
  * Contributors:
  *     Oracle - initial API and implementation
  ******************************************************************************/
-package org.eclipse.jpt.eclipselink1_1.ui.internal.orm.details;
+package org.eclipse.jpt.eclipselink.ui.internal.v1_1.orm.details;
 
 import org.eclipse.jpt.core.context.AccessHolder;
 import org.eclipse.jpt.eclipselink.core.context.BasicMapMapping;
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink1_1/ui/internal/orm/details/EclipseLink1_1OrmBasicMapMappingUiProvider.java b/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/v1_1/orm/details/EclipseLink1_1OrmBasicMapMappingUiProvider.java
index e3da2886e3..46f9626a73 100644
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink1_1/ui/internal/orm/details/EclipseLink1_1OrmBasicMapMappingUiProvider.java
+++ b/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/v1_1/orm/details/EclipseLink1_1OrmBasicMapMappingUiProvider.java
@@ -7,7 +7,7 @@
  * Contributors:
  *     Oracle - initial API and implementation
  ******************************************************************************/
-package org.eclipse.jpt.eclipselink1_1.ui.internal.orm.details;
+package org.eclipse.jpt.eclipselink.ui.internal.v1_1.orm.details;
 
 import org.eclipse.core.runtime.content.IContentType;
 import org.eclipse.jpt.eclipselink.core.context.BasicMapMapping;
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink1_1/ui/internal/orm/details/EclipseLink1_1OrmBasicMappingComposite.java b/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/v1_1/orm/details/EclipseLink1_1OrmBasicMappingComposite.java
index 10e9b53640..187b754c60 100644
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink1_1/ui/internal/orm/details/EclipseLink1_1OrmBasicMappingComposite.java
+++ b/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/v1_1/orm/details/EclipseLink1_1OrmBasicMappingComposite.java
@@ -7,7 +7,7 @@
  * Contributors:
  *     Oracle - initial API and implementation
  ******************************************************************************/
-package org.eclipse.jpt.eclipselink1_1.ui.internal.orm.details;
+package org.eclipse.jpt.eclipselink.ui.internal.v1_1.orm.details;
 
 import org.eclipse.jpt.core.context.AccessHolder;
 import org.eclipse.jpt.core.context.BasicMapping;
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink1_1/ui/internal/orm/details/EclipseLink1_1OrmBasicMappingUiProvider.java b/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/v1_1/orm/details/EclipseLink1_1OrmBasicMappingUiProvider.java
index 1398534bfd..cfa7d93001 100644
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink1_1/ui/internal/orm/details/EclipseLink1_1OrmBasicMappingUiProvider.java
+++ b/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/v1_1/orm/details/EclipseLink1_1OrmBasicMappingUiProvider.java
@@ -7,7 +7,7 @@
  * Contributors:
  *     Oracle - initial API and implementation
  ******************************************************************************/
-package org.eclipse.jpt.eclipselink1_1.ui.internal.orm.details;
+package org.eclipse.jpt.eclipselink.ui.internal.v1_1.orm.details;
 
 import org.eclipse.core.runtime.content.IContentType;
 import org.eclipse.jpt.eclipselink.core.internal.JptEclipseLinkCorePlugin;
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink1_1/ui/internal/orm/details/EclipseLink1_1OrmEmbeddableComposite.java b/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/v1_1/orm/details/EclipseLink1_1OrmEmbeddableComposite.java
index f6f9e57bc1..928a96d0f5 100644
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink1_1/ui/internal/orm/details/EclipseLink1_1OrmEmbeddableComposite.java
+++ b/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/v1_1/orm/details/EclipseLink1_1OrmEmbeddableComposite.java
@@ -7,7 +7,7 @@
  * Contributors:
  *     Oracle - initial API and implementation
  ******************************************************************************/
-package org.eclipse.jpt.eclipselink1_1.ui.internal.orm.details;
+package org.eclipse.jpt.eclipselink.ui.internal.v1_1.orm.details;
 
 import org.eclipse.jpt.core.context.AccessHolder;
 import org.eclipse.jpt.eclipselink.core.internal.context.orm.ConverterHolder;
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink1_1/ui/internal/orm/details/EclipseLink1_1OrmEmbeddableUiProvider.java b/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/v1_1/orm/details/EclipseLink1_1OrmEmbeddableUiProvider.java
index 822b1fd54a..8788e5aaa7 100644
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink1_1/ui/internal/orm/details/EclipseLink1_1OrmEmbeddableUiProvider.java
+++ b/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/v1_1/orm/details/EclipseLink1_1OrmEmbeddableUiProvider.java
@@ -8,7 +8,7 @@
  *  Contributors: 
  *  	Oracle - initial API and implementation
  *******************************************************************************/
-package org.eclipse.jpt.eclipselink1_1.ui.internal.orm.details;
+package org.eclipse.jpt.eclipselink.ui.internal.v1_1.orm.details;
 
 import org.eclipse.core.runtime.content.IContentType;
 import org.eclipse.jpt.eclipselink.core.internal.JptEclipseLinkCorePlugin;
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink1_1/ui/internal/orm/details/EclipseLink1_1OrmEmbeddedIdMappingComposite.java b/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/v1_1/orm/details/EclipseLink1_1OrmEmbeddedIdMappingComposite.java
index cba71989b5..caa2e24cda 100644
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink1_1/ui/internal/orm/details/EclipseLink1_1OrmEmbeddedIdMappingComposite.java
+++ b/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/v1_1/orm/details/EclipseLink1_1OrmEmbeddedIdMappingComposite.java
@@ -7,7 +7,7 @@
  * Contributors:
  *     Oracle - initial API and implementation
  ******************************************************************************/
-package org.eclipse.jpt.eclipselink1_1.ui.internal.orm.details;
+package org.eclipse.jpt.eclipselink.ui.internal.v1_1.orm.details;
 
 import org.eclipse.jpt.core.context.AccessHolder;
 import org.eclipse.jpt.core.context.EmbeddedIdMapping;
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink1_1/ui/internal/orm/details/EclipseLink1_1OrmEmbeddedIdMappingUiProvider.java b/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/v1_1/orm/details/EclipseLink1_1OrmEmbeddedIdMappingUiProvider.java
index 243f6dd74c..d3c459f204 100644
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink1_1/ui/internal/orm/details/EclipseLink1_1OrmEmbeddedIdMappingUiProvider.java
+++ b/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/v1_1/orm/details/EclipseLink1_1OrmEmbeddedIdMappingUiProvider.java
@@ -8,7 +8,7 @@
  *  Contributors: 
  *  	Oracle - initial API and implementation
  *******************************************************************************/
-package org.eclipse.jpt.eclipselink1_1.ui.internal.orm.details;
+package org.eclipse.jpt.eclipselink.ui.internal.v1_1.orm.details;
 
 import org.eclipse.core.runtime.content.IContentType;
 import org.eclipse.jpt.core.context.orm.OrmEmbeddedIdMapping;
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink1_1/ui/internal/orm/details/EclipseLink1_1OrmEmbeddedMappingComposite.java b/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/v1_1/orm/details/EclipseLink1_1OrmEmbeddedMappingComposite.java
index da10997f28..41269bf728 100644
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink1_1/ui/internal/orm/details/EclipseLink1_1OrmEmbeddedMappingComposite.java
+++ b/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/v1_1/orm/details/EclipseLink1_1OrmEmbeddedMappingComposite.java
@@ -7,7 +7,7 @@
  * Contributors:
  *     Oracle - initial API and implementation
  ******************************************************************************/
-package org.eclipse.jpt.eclipselink1_1.ui.internal.orm.details;
+package org.eclipse.jpt.eclipselink.ui.internal.v1_1.orm.details;
 
 import org.eclipse.jpt.core.context.AccessHolder;
 import org.eclipse.jpt.core.context.EmbeddedMapping;
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink1_1/ui/internal/orm/details/EclipseLink1_1OrmEmbeddedMappingUiProvider.java b/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/v1_1/orm/details/EclipseLink1_1OrmEmbeddedMappingUiProvider.java
index 2346ac9277..6aaf6b94ca 100644
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink1_1/ui/internal/orm/details/EclipseLink1_1OrmEmbeddedMappingUiProvider.java
+++ b/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/v1_1/orm/details/EclipseLink1_1OrmEmbeddedMappingUiProvider.java
@@ -8,7 +8,7 @@
  *  Contributors: 
  *  	Oracle - initial API and implementation
  *******************************************************************************/
-package org.eclipse.jpt.eclipselink1_1.ui.internal.orm.details;
+package org.eclipse.jpt.eclipselink.ui.internal.v1_1.orm.details;
 
 import org.eclipse.core.runtime.content.IContentType;
 import org.eclipse.jpt.core.context.orm.OrmEmbeddedMapping;
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink1_1/ui/internal/orm/details/EclipseLink1_1OrmEntityUiProvider.java b/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/v1_1/orm/details/EclipseLink1_1OrmEntityUiProvider.java
index bc74a18b9f..760f49a6d0 100644
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink1_1/ui/internal/orm/details/EclipseLink1_1OrmEntityUiProvider.java
+++ b/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/v1_1/orm/details/EclipseLink1_1OrmEntityUiProvider.java
@@ -8,7 +8,7 @@
  *  Contributors: 
  *  	Oracle - initial API and implementation
  *******************************************************************************/
-package org.eclipse.jpt.eclipselink1_1.ui.internal.orm.details;
+package org.eclipse.jpt.eclipselink.ui.internal.v1_1.orm.details;
 
 import org.eclipse.core.runtime.content.IContentType;
 import org.eclipse.jpt.eclipselink.core.internal.JptEclipseLinkCorePlugin;
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink1_1/ui/internal/orm/details/EclipseLink1_1OrmIdMappingComposite.java b/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/v1_1/orm/details/EclipseLink1_1OrmIdMappingComposite.java
index 40536d211a..0d864d8003 100644
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink1_1/ui/internal/orm/details/EclipseLink1_1OrmIdMappingComposite.java
+++ b/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/v1_1/orm/details/EclipseLink1_1OrmIdMappingComposite.java
@@ -7,7 +7,7 @@
  * Contributors:
  *     Oracle - initial API and implementation
  ******************************************************************************/
-package org.eclipse.jpt.eclipselink1_1.ui.internal.orm.details;
+package org.eclipse.jpt.eclipselink.ui.internal.v1_1.orm.details;
 
 import org.eclipse.jpt.core.context.AccessHolder;
 import org.eclipse.jpt.core.context.IdMapping;
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink1_1/ui/internal/orm/details/EclipseLink1_1OrmIdMappingUiProvider.java b/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/v1_1/orm/details/EclipseLink1_1OrmIdMappingUiProvider.java
index 7886a464c3..ebdcf325a9 100644
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink1_1/ui/internal/orm/details/EclipseLink1_1OrmIdMappingUiProvider.java
+++ b/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/v1_1/orm/details/EclipseLink1_1OrmIdMappingUiProvider.java
@@ -7,7 +7,7 @@
  * Contributors:
  *     Oracle - initial API and implementation
  ******************************************************************************/
-package org.eclipse.jpt.eclipselink1_1.ui.internal.orm.details;
+package org.eclipse.jpt.eclipselink.ui.internal.v1_1.orm.details;
 
 import org.eclipse.core.runtime.content.IContentType;
 import org.eclipse.jpt.eclipselink.core.internal.JptEclipseLinkCorePlugin;
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink1_1/ui/internal/orm/details/EclipseLink1_1OrmManyToManyMappingComposite.java b/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/v1_1/orm/details/EclipseLink1_1OrmManyToManyMappingComposite.java
index 910045ab79..482d5491ac 100644
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink1_1/ui/internal/orm/details/EclipseLink1_1OrmManyToManyMappingComposite.java
+++ b/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/v1_1/orm/details/EclipseLink1_1OrmManyToManyMappingComposite.java
@@ -7,7 +7,7 @@
  * Contributors:
  *     Oracle - initial API and implementation
  ******************************************************************************/
-package org.eclipse.jpt.eclipselink1_1.ui.internal.orm.details;
+package org.eclipse.jpt.eclipselink.ui.internal.v1_1.orm.details;
 
 import org.eclipse.jpt.core.context.AccessHolder;
 import org.eclipse.jpt.core.context.ManyToManyMapping;
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink1_1/ui/internal/orm/details/EclipseLink1_1OrmManyToManyMappingUiProvider.java b/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/v1_1/orm/details/EclipseLink1_1OrmManyToManyMappingUiProvider.java
index fcfe60392b..b5c0c3cce6 100644
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink1_1/ui/internal/orm/details/EclipseLink1_1OrmManyToManyMappingUiProvider.java
+++ b/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/v1_1/orm/details/EclipseLink1_1OrmManyToManyMappingUiProvider.java
@@ -7,7 +7,7 @@
  * Contributors:
  *     Oracle - initial API and implementation
  ******************************************************************************/
-package org.eclipse.jpt.eclipselink1_1.ui.internal.orm.details;
+package org.eclipse.jpt.eclipselink.ui.internal.v1_1.orm.details;
 
 import org.eclipse.core.runtime.content.IContentType;
 import org.eclipse.jpt.eclipselink.core.internal.JptEclipseLinkCorePlugin;
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink1_1/ui/internal/orm/details/EclipseLink1_1OrmManyToOneMappingComposite.java b/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/v1_1/orm/details/EclipseLink1_1OrmManyToOneMappingComposite.java
index f9364f1b86..ce2cb68ccc 100644
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink1_1/ui/internal/orm/details/EclipseLink1_1OrmManyToOneMappingComposite.java
+++ b/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/v1_1/orm/details/EclipseLink1_1OrmManyToOneMappingComposite.java
@@ -7,7 +7,7 @@
  * Contributors:
  *     Oracle - initial API and implementation
  ******************************************************************************/
-package org.eclipse.jpt.eclipselink1_1.ui.internal.orm.details;
+package org.eclipse.jpt.eclipselink.ui.internal.v1_1.orm.details;
 
 import org.eclipse.jpt.core.context.AccessHolder;
 import org.eclipse.jpt.core.context.ManyToOneMapping;
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink1_1/ui/internal/orm/details/EclipseLink1_1OrmManyToOneMappingUiProvider.java b/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/v1_1/orm/details/EclipseLink1_1OrmManyToOneMappingUiProvider.java
index dd96870968..07dee115fc 100644
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink1_1/ui/internal/orm/details/EclipseLink1_1OrmManyToOneMappingUiProvider.java
+++ b/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/v1_1/orm/details/EclipseLink1_1OrmManyToOneMappingUiProvider.java
@@ -7,7 +7,7 @@
  * Contributors:
  *     Oracle - initial API and implementation
  ******************************************************************************/
-package org.eclipse.jpt.eclipselink1_1.ui.internal.orm.details;
+package org.eclipse.jpt.eclipselink.ui.internal.v1_1.orm.details;
 
 import org.eclipse.core.runtime.content.IContentType;
 import org.eclipse.jpt.eclipselink.core.internal.JptEclipseLinkCorePlugin;
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink1_1/ui/internal/orm/details/EclipseLink1_1OrmMappedSuperclassUiProvider.java b/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/v1_1/orm/details/EclipseLink1_1OrmMappedSuperclassUiProvider.java
index e66c3c88eb..3f7cd78b3d 100644
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink1_1/ui/internal/orm/details/EclipseLink1_1OrmMappedSuperclassUiProvider.java
+++ b/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/v1_1/orm/details/EclipseLink1_1OrmMappedSuperclassUiProvider.java
@@ -8,7 +8,7 @@
  *  Contributors: 
  *  	Oracle - initial API and implementation
  *******************************************************************************/
-package org.eclipse.jpt.eclipselink1_1.ui.internal.orm.details;
+package org.eclipse.jpt.eclipselink.ui.internal.v1_1.orm.details;
 
 import org.eclipse.core.runtime.content.IContentType;
 import org.eclipse.jpt.eclipselink.core.internal.JptEclipseLinkCorePlugin;
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink1_1/ui/internal/orm/details/EclipseLink1_1OrmOneToManyMappingComposite.java b/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/v1_1/orm/details/EclipseLink1_1OrmOneToManyMappingComposite.java
index 829a2fb8e6..e089e1ff19 100644
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink1_1/ui/internal/orm/details/EclipseLink1_1OrmOneToManyMappingComposite.java
+++ b/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/v1_1/orm/details/EclipseLink1_1OrmOneToManyMappingComposite.java
@@ -7,7 +7,7 @@
  * Contributors:
  *     Oracle - initial API and implementation
  ******************************************************************************/
-package org.eclipse.jpt.eclipselink1_1.ui.internal.orm.details;
+package org.eclipse.jpt.eclipselink.ui.internal.v1_1.orm.details;
 
 import org.eclipse.jpt.core.context.AccessHolder;
 import org.eclipse.jpt.core.context.OneToManyMapping;
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink1_1/ui/internal/orm/details/EclipseLink1_1OrmOneToManyMappingUiProvider.java b/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/v1_1/orm/details/EclipseLink1_1OrmOneToManyMappingUiProvider.java
index ee73ad7f92..a5b2ce0544 100644
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink1_1/ui/internal/orm/details/EclipseLink1_1OrmOneToManyMappingUiProvider.java
+++ b/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/v1_1/orm/details/EclipseLink1_1OrmOneToManyMappingUiProvider.java
@@ -7,7 +7,7 @@
  * Contributors:
  *     Oracle - initial API and implementation
  ******************************************************************************/
-package org.eclipse.jpt.eclipselink1_1.ui.internal.orm.details;
+package org.eclipse.jpt.eclipselink.ui.internal.v1_1.orm.details;
 
 import org.eclipse.core.runtime.content.IContentType;
 import org.eclipse.jpt.eclipselink.core.internal.JptEclipseLinkCorePlugin;
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink1_1/ui/internal/orm/details/EclipseLink1_1OrmOneToOneMappingComposite.java b/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/v1_1/orm/details/EclipseLink1_1OrmOneToOneMappingComposite.java
index b67387ead3..e853c86c4c 100644
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink1_1/ui/internal/orm/details/EclipseLink1_1OrmOneToOneMappingComposite.java
+++ b/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/v1_1/orm/details/EclipseLink1_1OrmOneToOneMappingComposite.java
@@ -7,7 +7,7 @@
  * Contributors:
  *     Oracle - initial API and implementation
  ******************************************************************************/
-package org.eclipse.jpt.eclipselink1_1.ui.internal.orm.details;
+package org.eclipse.jpt.eclipselink.ui.internal.v1_1.orm.details;
 
 import org.eclipse.jpt.core.context.AccessHolder;
 import org.eclipse.jpt.core.context.OneToOneMapping;
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink1_1/ui/internal/orm/details/EclipseLink1_1OrmOneToOneMappingUiProvider.java b/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/v1_1/orm/details/EclipseLink1_1OrmOneToOneMappingUiProvider.java
index 194c092021..9876b35557 100644
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink1_1/ui/internal/orm/details/EclipseLink1_1OrmOneToOneMappingUiProvider.java
+++ b/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/v1_1/orm/details/EclipseLink1_1OrmOneToOneMappingUiProvider.java
@@ -7,7 +7,7 @@
  * Contributors:
  *     Oracle - initial API and implementation
  ******************************************************************************/
-package org.eclipse.jpt.eclipselink1_1.ui.internal.orm.details;
+package org.eclipse.jpt.eclipselink.ui.internal.v1_1.orm.details;
 
 import org.eclipse.core.runtime.content.IContentType;
 import org.eclipse.jpt.eclipselink.core.internal.JptEclipseLinkCorePlugin;
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink1_1/ui/internal/orm/details/EclipseLink1_1OrmTransformationMappingUiProvider.java b/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/v1_1/orm/details/EclipseLink1_1OrmTransformationMappingUiProvider.java
index 7677e71637..889109d1a3 100644
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink1_1/ui/internal/orm/details/EclipseLink1_1OrmTransformationMappingUiProvider.java
+++ b/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/v1_1/orm/details/EclipseLink1_1OrmTransformationMappingUiProvider.java
@@ -7,7 +7,7 @@
  * Contributors:
  *     Oracle - initial API and implementation
  ******************************************************************************/
-package org.eclipse.jpt.eclipselink1_1.ui.internal.orm.details;
+package org.eclipse.jpt.eclipselink.ui.internal.v1_1.orm.details;
 
 import org.eclipse.core.runtime.content.IContentType;
 import org.eclipse.jpt.eclipselink.core.context.TransformationMapping;
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink1_1/ui/internal/orm/details/EclipseLink1_1OrmTransientMappingUiProvider.java b/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/v1_1/orm/details/EclipseLink1_1OrmTransientMappingUiProvider.java
index 20225d8b36..27df3cdb1c 100644
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink1_1/ui/internal/orm/details/EclipseLink1_1OrmTransientMappingUiProvider.java
+++ b/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/v1_1/orm/details/EclipseLink1_1OrmTransientMappingUiProvider.java
@@ -8,7 +8,7 @@
  *  Contributors: 
  *  	Oracle - initial API and implementation
  *******************************************************************************/
-package org.eclipse.jpt.eclipselink1_1.ui.internal.orm.details;
+package org.eclipse.jpt.eclipselink.ui.internal.v1_1.orm.details;
 
 import org.eclipse.core.runtime.content.IContentType;
 import org.eclipse.jpt.core.context.orm.OrmTransientMapping;
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink1_1/ui/internal/orm/details/EclipseLink1_1OrmVariableOneToOneMappingUiProvider.java b/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/v1_1/orm/details/EclipseLink1_1OrmVariableOneToOneMappingUiProvider.java
index 3c4d152d6f..f954aae08c 100644
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink1_1/ui/internal/orm/details/EclipseLink1_1OrmVariableOneToOneMappingUiProvider.java
+++ b/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/v1_1/orm/details/EclipseLink1_1OrmVariableOneToOneMappingUiProvider.java
@@ -7,7 +7,7 @@
  * Contributors:
  *     Oracle - initial API and implementation
  ******************************************************************************/
-package org.eclipse.jpt.eclipselink1_1.ui.internal.orm.details;
+package org.eclipse.jpt.eclipselink.ui.internal.v1_1.orm.details;
 
 import org.eclipse.core.runtime.content.IContentType;
 import org.eclipse.jpt.eclipselink.core.context.VariableOneToOneMapping;
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink1_1/ui/internal/orm/details/EclipseLink1_1OrmVersionMappingComposite.java b/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/v1_1/orm/details/EclipseLink1_1OrmVersionMappingComposite.java
index 3e9b83059c..d74637ee33 100644
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink1_1/ui/internal/orm/details/EclipseLink1_1OrmVersionMappingComposite.java
+++ b/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/v1_1/orm/details/EclipseLink1_1OrmVersionMappingComposite.java
@@ -7,7 +7,7 @@
  * Contributors:
  *     Oracle - initial API and implementation
  ******************************************************************************/
-package org.eclipse.jpt.eclipselink1_1.ui.internal.orm.details;
+package org.eclipse.jpt.eclipselink.ui.internal.v1_1.orm.details;
 
 import org.eclipse.jpt.core.context.AccessHolder;
 import org.eclipse.jpt.core.context.VersionMapping;
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink1_1/ui/internal/orm/details/EclipseLink1_1OrmVersionMappingUiProvider.java b/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/v1_1/orm/details/EclipseLink1_1OrmVersionMappingUiProvider.java
index 4c2238a2e7..ecd05d4dd7 100644
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink1_1/ui/internal/orm/details/EclipseLink1_1OrmVersionMappingUiProvider.java
+++ b/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/v1_1/orm/details/EclipseLink1_1OrmVersionMappingUiProvider.java
@@ -7,7 +7,7 @@
  * Contributors:
  *     Oracle - initial API and implementation
  ******************************************************************************/
-package org.eclipse.jpt.eclipselink1_1.ui.internal.orm.details;
+package org.eclipse.jpt.eclipselink.ui.internal.v1_1.orm.details;
 
 import org.eclipse.core.runtime.content.IContentType;
 import org.eclipse.jpt.eclipselink.core.internal.JptEclipseLinkCorePlugin;
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink1_1/ui/internal/platform/EclipseLink1_1JpaPlatformUiFactory.java b/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/v1_1/platform/EclipseLink1_1JpaPlatformUiFactory.java
index ae926175e2..3ceb8536c5 100644
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink1_1/ui/internal/platform/EclipseLink1_1JpaPlatformUiFactory.java
+++ b/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/v1_1/platform/EclipseLink1_1JpaPlatformUiFactory.java
@@ -7,7 +7,7 @@
  * Contributors:
  *     Oracle - initial API and implementation
  ******************************************************************************/
-package org.eclipse.jpt.eclipselink1_1.ui.internal.platform;
+package org.eclipse.jpt.eclipselink.ui.internal.v1_1.platform;
 
 import org.eclipse.jpt.eclipselink.ui.internal.EclipseLinkJpaUiFactory;
 import org.eclipse.jpt.eclipselink.ui.internal.platform.EclipseLinkJpaPlatformUi;
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink1_1/ui/internal/platform/EclipseLink1_1JpaPlatformUiProvider.java b/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/v1_1/platform/EclipseLink1_1JpaPlatformUiProvider.java
index 353c3bbf99..c325c5b4fb 100644
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink1_1/ui/internal/platform/EclipseLink1_1JpaPlatformUiProvider.java
+++ b/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/v1_1/platform/EclipseLink1_1JpaPlatformUiProvider.java
@@ -7,28 +7,28 @@
  * Contributors:
  *     Oracle - initial API and implementation
  ******************************************************************************/
-package org.eclipse.jpt.eclipselink1_1.ui.internal.platform;
+package org.eclipse.jpt.eclipselink.ui.internal.v1_1.platform;
 
 import java.util.List;
 import org.eclipse.jpt.core.context.AttributeMapping;
-import org.eclipse.jpt.eclipselink1_1.ui.internal.orm.details.EclipseLink1_1OrmBasicCollectionMappingUiProvider;
-import org.eclipse.jpt.eclipselink1_1.ui.internal.orm.details.EclipseLink1_1OrmBasicMapMappingUiProvider;
-import org.eclipse.jpt.eclipselink1_1.ui.internal.orm.details.EclipseLink1_1OrmBasicMappingUiProvider;
-import org.eclipse.jpt.eclipselink1_1.ui.internal.orm.details.EclipseLink1_1OrmEmbeddableUiProvider;
-import org.eclipse.jpt.eclipselink1_1.ui.internal.orm.details.EclipseLink1_1OrmEmbeddedIdMappingUiProvider;
-import org.eclipse.jpt.eclipselink1_1.ui.internal.orm.details.EclipseLink1_1OrmEmbeddedMappingUiProvider;
-import org.eclipse.jpt.eclipselink1_1.ui.internal.orm.details.EclipseLink1_1OrmEntityUiProvider;
-import org.eclipse.jpt.eclipselink1_1.ui.internal.orm.details.EclipseLink1_1OrmIdMappingUiProvider;
-import org.eclipse.jpt.eclipselink1_1.ui.internal.orm.details.EclipseLink1_1OrmManyToManyMappingUiProvider;
-import org.eclipse.jpt.eclipselink1_1.ui.internal.orm.details.EclipseLink1_1OrmManyToOneMappingUiProvider;
-import org.eclipse.jpt.eclipselink1_1.ui.internal.orm.details.EclipseLink1_1OrmMappedSuperclassUiProvider;
-import org.eclipse.jpt.eclipselink1_1.ui.internal.orm.details.EclipseLink1_1OrmOneToManyMappingUiProvider;
-import org.eclipse.jpt.eclipselink1_1.ui.internal.orm.details.EclipseLink1_1OrmOneToOneMappingUiProvider;
-import org.eclipse.jpt.eclipselink1_1.ui.internal.orm.details.EclipseLink1_1OrmTransformationMappingUiProvider;
-import org.eclipse.jpt.eclipselink1_1.ui.internal.orm.details.EclipseLink1_1OrmTransientMappingUiProvider;
-import org.eclipse.jpt.eclipselink1_1.ui.internal.orm.details.EclipseLink1_1OrmVariableOneToOneMappingUiProvider;
-import org.eclipse.jpt.eclipselink1_1.ui.internal.orm.details.EclipseLink1_1OrmVersionMappingUiProvider;
-import org.eclipse.jpt.eclipselink1_1.ui.internal.structure.EclipseLink1_1OrmResourceModelStructureProvider;
+import org.eclipse.jpt.eclipselink.ui.internal.v1_1.orm.details.EclipseLink1_1OrmBasicCollectionMappingUiProvider;
+import org.eclipse.jpt.eclipselink.ui.internal.v1_1.orm.details.EclipseLink1_1OrmBasicMapMappingUiProvider;
+import org.eclipse.jpt.eclipselink.ui.internal.v1_1.orm.details.EclipseLink1_1OrmBasicMappingUiProvider;
+import org.eclipse.jpt.eclipselink.ui.internal.v1_1.orm.details.EclipseLink1_1OrmEmbeddableUiProvider;
+import org.eclipse.jpt.eclipselink.ui.internal.v1_1.orm.details.EclipseLink1_1OrmEmbeddedIdMappingUiProvider;
+import org.eclipse.jpt.eclipselink.ui.internal.v1_1.orm.details.EclipseLink1_1OrmEmbeddedMappingUiProvider;
+import org.eclipse.jpt.eclipselink.ui.internal.v1_1.orm.details.EclipseLink1_1OrmEntityUiProvider;
+import org.eclipse.jpt.eclipselink.ui.internal.v1_1.orm.details.EclipseLink1_1OrmIdMappingUiProvider;
+import org.eclipse.jpt.eclipselink.ui.internal.v1_1.orm.details.EclipseLink1_1OrmManyToManyMappingUiProvider;
+import org.eclipse.jpt.eclipselink.ui.internal.v1_1.orm.details.EclipseLink1_1OrmManyToOneMappingUiProvider;
+import org.eclipse.jpt.eclipselink.ui.internal.v1_1.orm.details.EclipseLink1_1OrmMappedSuperclassUiProvider;
+import org.eclipse.jpt.eclipselink.ui.internal.v1_1.orm.details.EclipseLink1_1OrmOneToManyMappingUiProvider;
+import org.eclipse.jpt.eclipselink.ui.internal.v1_1.orm.details.EclipseLink1_1OrmOneToOneMappingUiProvider;
+import org.eclipse.jpt.eclipselink.ui.internal.v1_1.orm.details.EclipseLink1_1OrmTransformationMappingUiProvider;
+import org.eclipse.jpt.eclipselink.ui.internal.v1_1.orm.details.EclipseLink1_1OrmTransientMappingUiProvider;
+import org.eclipse.jpt.eclipselink.ui.internal.v1_1.orm.details.EclipseLink1_1OrmVariableOneToOneMappingUiProvider;
+import org.eclipse.jpt.eclipselink.ui.internal.v1_1.orm.details.EclipseLink1_1OrmVersionMappingUiProvider;
+import org.eclipse.jpt.eclipselink.ui.internal.v1_1.structure.EclipseLink1_1OrmResourceModelStructureProvider;
 import org.eclipse.jpt.ui.JpaPlatformUiProvider;
 import org.eclipse.jpt.ui.details.AttributeMappingUiProvider;
 import org.eclipse.jpt.ui.details.DefaultAttributeMappingUiProvider;
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink1_1/ui/internal/structure/EclipseLink1_1OrmResourceModelStructureProvider.java b/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/v1_1/structure/EclipseLink1_1OrmResourceModelStructureProvider.java
index 1bfdfa72ad..c38e15d2f7 100644
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink1_1/ui/internal/structure/EclipseLink1_1OrmResourceModelStructureProvider.java
+++ b/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/v1_1/structure/EclipseLink1_1OrmResourceModelStructureProvider.java
@@ -7,7 +7,7 @@
  * Contributors:
  *     Oracle - initial API and implementation
  ******************************************************************************/
-package org.eclipse.jpt.eclipselink1_1.ui.internal.structure;
+package org.eclipse.jpt.eclipselink.ui.internal.v1_1.structure;
 
 import org.eclipse.core.runtime.content.IContentType;
 import org.eclipse.jpt.eclipselink.core.internal.JptEclipseLinkCorePlugin;
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink1_1/ui/internal/wizards/EclipseLink1_1MappingFileWizard.java b/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/v1_1/wizards/EclipseLink1_1MappingFileWizard.java
index 56f119eb9b..aab7947837 100644
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink1_1/ui/internal/wizards/EclipseLink1_1MappingFileWizard.java
+++ b/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/v1_1/wizards/EclipseLink1_1MappingFileWizard.java
@@ -8,11 +8,11 @@
  *  Contributors: 
  *  	Oracle - initial API and implementation
  *******************************************************************************/
-package org.eclipse.jpt.eclipselink1_1.ui.internal.wizards;
+package org.eclipse.jpt.eclipselink.ui.internal.v1_1.wizards;
 
+import org.eclipse.jpt.eclipselink.core.internal.v1_1.operations.EclipseLink1_1OrmFileCreationDataModelProvider;
 import org.eclipse.jpt.eclipselink.ui.internal.EclipseLinkUiMessages;
 import org.eclipse.jpt.eclipselink.ui.internal.wizards.EclipseLinkMappingFileWizardPage;
-import org.eclipse.jpt.eclipselink1_1.core.internal.operations.EclipseLink1_1OrmFileCreationDataModelProvider;
 import org.eclipse.jpt.ui.internal.wizards.orm.MappingFileWizard;
 import org.eclipse.jpt.ui.internal.wizards.orm.MappingFileWizardPage;
 import org.eclipse.ui.INewWizard;