added eclipselink 2.1 and 2.2 platforms

14 files changed, 227 insertions, 1 deletions

diff --git a/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/META-INF/MANIFEST.MF b/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/META-INF/MANIFEST.MF
index c20c179de3..804d5ae6af 100644
--- a/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/META-INF/MANIFEST.MF
+++ b/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/META-INF/MANIFEST.MF
@@ -19,4 +19,6 @@ Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.7.0,4.0.0)",
  org.eclipse.jst.j2ee;bundle-version="[1.1.500,2.0.0)"
 Export-Package: org.eclipse.jpt.jaxb.eclipselink.core,
  org.eclipse.jpt.jaxb.eclipselink.core.internal.libval,
+ org.eclipse.jpt.jaxb.eclipselink.core.internal.v2_1,
+ org.eclipse.jpt.jaxb.eclipselink.core.internal.v2_2,
  org.eclipse.jpt.jaxb.eclipselink.core.internal.v2_3
diff --git a/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/plugin.properties b/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/plugin.properties
index eddadbfdf5..98d631a019 100644
--- a/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/plugin.properties
+++ b/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/plugin.properties
@@ -23,4 +23,6 @@ pluginName = Dali Java Persistence Tools - EclipseLink JAXB Support - Core
 providerName = Eclipse Web Tools Platform
 
 ECLIPSELINK_PLATFORM_GROUP_LABEL = EclipseLink
+ECLIPSELINK_2_1_PLATFORM_LABEL = EclipseLink 2.1.x
+ECLIPSELINK_2_2_PLATFORM_LABEL = EclipseLink 2.2.x
 ECLIPSELINK_2_3_PLATFORM_LABEL = EclipseLink 2.3.x
diff --git a/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/plugin.xml b/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/plugin.xml
index be6030071c..43993445b9 100644
--- a/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/plugin.xml
+++ b/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/plugin.xml
@@ -20,6 +20,22 @@
         	label="%ECLIPSELINK_PLATFORM_GROUP_LABEL"/>
 		
 		<jaxbPlatform
+			id="eclipselink_2_1"
+			label="%ECLIPSELINK_2_1_PLATFORM_LABEL"
+			factoryClass="org.eclipse.jpt.jaxb.eclipselink.core.internal.v2_1.ELJaxb_2_1_PlatformDefinitionFactory"
+			group="eclipselink"
+			jaxbFacetVersion="2.1"
+			default="false"/>
+		
+		<jaxbPlatform
+			id="eclipselink_2_2"
+			label="%ECLIPSELINK_2_2_PLATFORM_LABEL"
+			factoryClass="org.eclipse.jpt.jaxb.eclipselink.core.internal.v2_2.ELJaxb_2_2_PlatformDefinitionFactory"
+			group="eclipselink"
+			jaxbFacetVersion="2.2"
+			default="false"/>
+		
+		<jaxbPlatform
 			id="eclipselink_2_3"
 			label="%ECLIPSELINK_2_3_PLATFORM_LABEL"
 			factoryClass="org.eclipse.jpt.jaxb.eclipselink.core.internal.v2_3.ELJaxb_2_3_PlatformDefinitionFactory"
diff --git a/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/ELJaxbPlatform.java b/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/ELJaxbPlatform.java
index 6ab19b6a6f..b37ded3cc6 100644
--- a/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/ELJaxbPlatform.java
+++ b/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/ELJaxbPlatform.java
@@ -19,6 +19,12 @@ public class ELJaxbPlatform {
 	public static final JaxbPlatformGroupDescription GROUP 
 			= JptJaxbCorePlugin.getJaxbPlatformManager().getJaxbPlatformGroup("eclipselink"); //$NON-NLS-1$
 	
+	public static final JaxbPlatformDescription VERSION_2_1
+			= JptJaxbCorePlugin.getJaxbPlatformManager().getJaxbPlatform("eclipselink_2_1"); //$NON-NLS-1$
+	
+	public static final JaxbPlatformDescription VERSION_2_2
+			= JptJaxbCorePlugin.getJaxbPlatformManager().getJaxbPlatform("eclipselink_2_2"); //$NON-NLS-1$
+	
 	public static final JaxbPlatformDescription VERSION_2_3
 			= JptJaxbCorePlugin.getJaxbPlatformManager().getJaxbPlatform("eclipselink_2_3"); //$NON-NLS-1$
 	
diff --git a/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/internal/libval/ELJaxbUserLibraryValidator.java b/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/internal/libval/ELJaxbUserLibraryValidator.java
index d2ed9d7519..f29a274454 100644
--- a/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/internal/libval/ELJaxbUserLibraryValidator.java
+++ b/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/internal/libval/ELJaxbUserLibraryValidator.java
@@ -37,6 +37,12 @@ public class ELJaxbUserLibraryValidator
 		JaxbPlatformDescription platform = jaxbConfig.getJaxbPlatform();
 		Set<VersionRange> versionRanges = new HashSet<VersionRange>();
 		
+		if (ELJaxbPlatform.VERSION_2_1.equals(platform)) {
+			versionRanges.add(new VersionRange("[2.1, 3.0)")); //$NON-NLS-1$
+		}
+		if (ELJaxbPlatform.VERSION_2_2.equals(platform)) {
+			versionRanges.add(new VersionRange("[2.2, 3.0)")); //$NON-NLS-1$
+		}
 		if (ELJaxbPlatform.VERSION_2_3.equals(platform)) {
 			versionRanges.add(new VersionRange("[2.3, 3.0)")); //$NON-NLS-1$
 		}
diff --git a/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/internal/v2_1/ELJaxb_2_1_PlatformDefinition.java b/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/internal/v2_1/ELJaxb_2_1_PlatformDefinition.java
new file mode 100644
index 0000000000..622eb210a4
--- /dev/null
+++ b/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/internal/v2_1/ELJaxb_2_1_PlatformDefinition.java
@@ -0,0 +1,46 @@
+/*******************************************************************************
+ *  Copyright (c) 2011  Oracle. All rights reserved.
+ *  This program and the accompanying materials are made available under the
+ *  terms of the Eclipse Public License v1.0, which accompanies this distribution
+ *  and is available at http://www.eclipse.org/legal/epl-v10.html
+ *  
+ *  Contributors: 
+ *  	Oracle - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.jpt.jaxb.eclipselink.core.internal.v2_1;
+
+import org.eclipse.jpt.jaxb.core.JaxbFactory;
+import org.eclipse.jpt.jaxb.core.internal.jaxb21.AbstractJaxb_2_1_PlatformDefinition;
+import org.eclipse.jpt.jaxb.core.internal.jaxb21.GenericJaxb_2_1_Factory;
+import org.eclipse.jpt.jaxb.core.platform.JaxbPlatformDefinition;
+import org.eclipse.jpt.jaxb.core.platform.JaxbPlatformDescription;
+import org.eclipse.jpt.jaxb.eclipselink.core.ELJaxbPlatform;
+
+
+public class ELJaxb_2_1_PlatformDefinition
+		extends  AbstractJaxb_2_1_PlatformDefinition {
+	
+	// singleton
+	private static final JaxbPlatformDefinition INSTANCE = new ELJaxb_2_1_PlatformDefinition();
+	
+	/**
+	 * Return the singleton.
+	 */
+	public static JaxbPlatformDefinition instance() {
+		return INSTANCE;
+	}
+	
+	
+	protected ELJaxb_2_1_PlatformDefinition() {
+		super();
+	}
+	
+	
+	public JaxbPlatformDescription getDescription() {
+		return ELJaxbPlatform.VERSION_2_1;
+	}
+	
+	public JaxbFactory getFactory() {
+		return GenericJaxb_2_1_Factory.instance();
+	}
+}
diff --git a/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/internal/v2_1/ELJaxb_2_1_PlatformDefinitionFactory.java b/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/internal/v2_1/ELJaxb_2_1_PlatformDefinitionFactory.java
new file mode 100644
index 0000000000..61bc504659
--- /dev/null
+++ b/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/internal/v2_1/ELJaxb_2_1_PlatformDefinitionFactory.java
@@ -0,0 +1,22 @@
+/*******************************************************************************
+ *  Copyright (c) 2011  Oracle. All rights reserved.
+ *  This program and the accompanying materials are made available under the
+ *  terms of the Eclipse Public License v1.0, which accompanies this distribution
+ *  and is available at http://www.eclipse.org/legal/epl-v10.html
+ *  
+ *  Contributors: 
+ *  	Oracle - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.jpt.jaxb.eclipselink.core.internal.v2_1;
+
+import org.eclipse.jpt.jaxb.core.platform.JaxbPlatformDefinition;
+import org.eclipse.jpt.jaxb.core.platform.JaxbPlatformDefinitionFactory;
+
+
+public class ELJaxb_2_1_PlatformDefinitionFactory
+		implements JaxbPlatformDefinitionFactory {
+	
+	public JaxbPlatformDefinition buildJaxbPlatformDefinition() {
+		return ELJaxb_2_1_PlatformDefinition.instance();
+	}
+}
diff --git a/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/internal/v2_2/ELJaxb_2_2_PlatformDefinition.java b/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/internal/v2_2/ELJaxb_2_2_PlatformDefinition.java
new file mode 100644
index 0000000000..5ef9ca3d56
--- /dev/null
+++ b/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/internal/v2_2/ELJaxb_2_2_PlatformDefinition.java
@@ -0,0 +1,46 @@
+/*******************************************************************************
+ *  Copyright (c) 2011  Oracle. All rights reserved.
+ *  This program and the accompanying materials are made available under the
+ *  terms of the Eclipse Public License v1.0, which accompanies this distribution
+ *  and is available at http://www.eclipse.org/legal/epl-v10.html
+ *  
+ *  Contributors: 
+ *  	Oracle - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.jpt.jaxb.eclipselink.core.internal.v2_2;
+
+import org.eclipse.jpt.jaxb.core.JaxbFactory;
+import org.eclipse.jpt.jaxb.core.internal.jaxb21.GenericJaxb_2_1_Factory;
+import org.eclipse.jpt.jaxb.core.internal.jaxb22.AbstractJaxb_2_2_PlatformDefinition;
+import org.eclipse.jpt.jaxb.core.platform.JaxbPlatformDefinition;
+import org.eclipse.jpt.jaxb.core.platform.JaxbPlatformDescription;
+import org.eclipse.jpt.jaxb.eclipselink.core.ELJaxbPlatform;
+
+
+public class ELJaxb_2_2_PlatformDefinition
+		extends  AbstractJaxb_2_2_PlatformDefinition {
+	
+	// singleton
+	private static final JaxbPlatformDefinition INSTANCE = new ELJaxb_2_2_PlatformDefinition();
+	
+	/**
+	 * Return the singleton.
+	 */
+	public static JaxbPlatformDefinition instance() {
+		return INSTANCE;
+	}
+	
+	
+	protected ELJaxb_2_2_PlatformDefinition() {
+		super();
+	}
+	
+	
+	public JaxbPlatformDescription getDescription() {
+		return ELJaxbPlatform.VERSION_2_2;
+	}
+	
+	public JaxbFactory getFactory() {
+		return GenericJaxb_2_1_Factory.instance();
+	}
+}
diff --git a/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/internal/v2_2/ELJaxb_2_2_PlatformDefinitionFactory.java b/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/internal/v2_2/ELJaxb_2_2_PlatformDefinitionFactory.java
new file mode 100644
index 0000000000..d1844d766b
--- /dev/null
+++ b/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/internal/v2_2/ELJaxb_2_2_PlatformDefinitionFactory.java
@@ -0,0 +1,22 @@
+/*******************************************************************************
+ *  Copyright (c) 2011  Oracle. All rights reserved.
+ *  This program and the accompanying materials are made available under the
+ *  terms of the Eclipse Public License v1.0, which accompanies this distribution
+ *  and is available at http://www.eclipse.org/legal/epl-v10.html
+ *  
+ *  Contributors: 
+ *  	Oracle - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.jpt.jaxb.eclipselink.core.internal.v2_2;
+
+import org.eclipse.jpt.jaxb.core.platform.JaxbPlatformDefinition;
+import org.eclipse.jpt.jaxb.core.platform.JaxbPlatformDefinitionFactory;
+
+
+public class ELJaxb_2_2_PlatformDefinitionFactory
+		implements JaxbPlatformDefinitionFactory {
+	
+	public JaxbPlatformDefinition buildJaxbPlatformDefinition() {
+		return ELJaxb_2_2_PlatformDefinition.instance();
+	}
+}
diff --git a/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/internal/v2_3/ELJaxb_2_3_PlatformDefinition.java b/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/internal/v2_3/ELJaxb_2_3_PlatformDefinition.java
index 4583f14dbd..e71928d539 100644
--- a/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/internal/v2_3/ELJaxb_2_3_PlatformDefinition.java
+++ b/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/internal/v2_3/ELJaxb_2_3_PlatformDefinition.java
@@ -39,7 +39,7 @@ public class ELJaxb_2_3_PlatformDefinition
 	public JaxbPlatformDescription getDescription() {
 		return ELJaxbPlatform.VERSION_2_3;
 	}
-
+	
 	public JaxbFactory getFactory() {
 		return GenericJaxb_2_1_Factory.instance();
 	}
diff --git a/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.ui/META-INF/MANIFEST.MF b/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.ui/META-INF/MANIFEST.MF
index ba3603f5a3..c11ee115df 100644
--- a/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.ui/META-INF/MANIFEST.MF
+++ b/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.ui/META-INF/MANIFEST.MF
@@ -13,4 +13,6 @@ Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.7.0,4.0.0)",
  org.eclipse.jpt.jaxb.ui;bundle-version="[1.1.0,2.0.0)",
  org.eclipse.ui.workbench;bundle-version="[3.7.0,4.0.0)"
 Export-Package: org.eclipse.jpt.jaxb.eclipselink.ui,
+ org.eclipse.jpt.jaxb.eclipselink.ui.internal.v2_1,
+ org.eclipse.jpt.jaxb.eclipselink.ui.internal.v2_2,
  org.eclipse.jpt.jaxb.eclipselink.ui.internal.v2_3
diff --git a/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.ui/plugin.xml b/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.ui/plugin.xml
index 75782d4723..e833f512f0 100644
--- a/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.ui/plugin.xml
+++ b/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.ui/plugin.xml
@@ -16,6 +16,16 @@
 		point="org.eclipse.jpt.jaxb.ui.jaxbPlatformUis">
 		
 		<jaxbPlatformUi
+			id="eclipselink_2_1.ui"
+			jaxbPlatform="eclipselink_2_1"
+			class="org.eclipse.jpt.jaxb.eclipselink.ui.internal.v2_1.ELJaxb_2_1_PlatformUi"/>
+		
+		<jaxbPlatformUi
+			id="eclipselink_2_2.ui"
+			jaxbPlatform="eclipselink_2_2"
+			class="org.eclipse.jpt.jaxb.eclipselink.ui.internal.v2_2.ELJaxb_2_2_PlatformUi"/>
+		
+		<jaxbPlatformUi
 			id="eclipselink_2_3.ui"
 			jaxbPlatform="eclipselink_2_3"
 			class="org.eclipse.jpt.jaxb.eclipselink.ui.internal.v2_3.ELJaxb_2_3_PlatformUi"/>
diff --git a/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.ui/src/org/eclipse/jpt/jaxb/eclipselink/ui/internal/v2_1/ELJaxb_2_1_PlatformUi.java b/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.ui/src/org/eclipse/jpt/jaxb/eclipselink/ui/internal/v2_1/ELJaxb_2_1_PlatformUi.java
new file mode 100644
index 0000000000..cdaa30c23f
--- /dev/null
+++ b/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.ui/src/org/eclipse/jpt/jaxb/eclipselink/ui/internal/v2_1/ELJaxb_2_1_PlatformUi.java
@@ -0,0 +1,23 @@
+/*******************************************************************************
+ *  Copyright (c) 2011  Oracle. All rights reserved.
+ *  This program and the accompanying materials are made available under the
+ *  terms of the Eclipse Public License v1.0, which accompanies this distribution
+ *  and is available at http://www.eclipse.org/legal/epl-v10.html
+ *  
+ *  Contributors: 
+ *  	Oracle - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.jpt.jaxb.eclipselink.ui.internal.v2_1;
+
+import org.eclipse.jpt.jaxb.ui.internal.jaxb21.GenericJaxb_2_1_NavigatorUi;
+import org.eclipse.jpt.jaxb.ui.navigator.JaxbNavigatorUi;
+import org.eclipse.jpt.jaxb.ui.platform.JaxbPlatformUi;
+
+
+public class ELJaxb_2_1_PlatformUi
+		implements JaxbPlatformUi {
+	
+	public JaxbNavigatorUi getNavigatorUi() {
+		return GenericJaxb_2_1_NavigatorUi.instance();
+	}
+}
diff --git a/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.ui/src/org/eclipse/jpt/jaxb/eclipselink/ui/internal/v2_2/ELJaxb_2_2_PlatformUi.java b/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.ui/src/org/eclipse/jpt/jaxb/eclipselink/ui/internal/v2_2/ELJaxb_2_2_PlatformUi.java
new file mode 100644
index 0000000000..075aa3c866
--- /dev/null
+++ b/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.ui/src/org/eclipse/jpt/jaxb/eclipselink/ui/internal/v2_2/ELJaxb_2_2_PlatformUi.java
@@ -0,0 +1,23 @@
+/*******************************************************************************
+ *  Copyright (c) 2011  Oracle. All rights reserved.
+ *  This program and the accompanying materials are made available under the
+ *  terms of the Eclipse Public License v1.0, which accompanies this distribution
+ *  and is available at http://www.eclipse.org/legal/epl-v10.html
+ *  
+ *  Contributors: 
+ *  	Oracle - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.jpt.jaxb.eclipselink.ui.internal.v2_2;
+
+import org.eclipse.jpt.jaxb.ui.internal.jaxb21.GenericJaxb_2_1_NavigatorUi;
+import org.eclipse.jpt.jaxb.ui.navigator.JaxbNavigatorUi;
+import org.eclipse.jpt.jaxb.ui.platform.JaxbPlatformUi;
+
+
+public class ELJaxb_2_2_PlatformUi
+		implements JaxbPlatformUi {
+	
+	public JaxbNavigatorUi getNavigatorUi() {
+		return GenericJaxb_2_1_NavigatorUi.instance();
+	}
+}