removed "moxy" references in ui (and using ELJaxb as standard prefix)

8 files changed, 31 insertions, 31 deletions

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 a70771a5cd..eddadbfdf5 100644
--- a/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/plugin.properties
+++ b/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/plugin.properties
@@ -19,8 +19,8 @@
 # %%% END OF TRANSLATED PROPERTIES %%%
 # ====================================================================
 
-pluginName = Dali Java Persistence Tools - EclipseLink MOXy Support - Core
+pluginName = Dali Java Persistence Tools - EclipseLink JAXB Support - Core
 providerName = Eclipse Web Tools Platform
 
-MOXY_PLATFORM_GROUP_LABEL = EclipseLink MOXy
-MOXY_2_3_PLATFORM_LABEL = EclipseLink MOXy 2.3.x
+ECLIPSELINK_PLATFORM_GROUP_LABEL = EclipseLink
+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 49dba7a13b..be6030071c 100644
--- a/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/plugin.xml
+++ b/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/plugin.xml
@@ -16,14 +16,14 @@
 		point="org.eclipse.jpt.jaxb.core.jaxbPlatforms">
 		
 		<jaxbPlatformGroup
-        	id="moxy"
-        	label="%MOXY_PLATFORM_GROUP_LABEL"/>
+        	id="eclipselink"
+        	label="%ECLIPSELINK_PLATFORM_GROUP_LABEL"/>
 		
 		<jaxbPlatform
-			id="moxy_2_3"
-			label="%MOXY_2_3_PLATFORM_LABEL"
-			factoryClass="org.eclipse.jpt.jaxb.eclipselink.core.internal.v2_3.Moxy_2_3_PlatformDefinitionFactory"
-			group="moxy"
+			id="eclipselink_2_3"
+			label="%ECLIPSELINK_2_3_PLATFORM_LABEL"
+			factoryClass="org.eclipse.jpt.jaxb.eclipselink.core.internal.v2_3.ELJaxb_2_3_PlatformDefinitionFactory"
+			group="eclipselink"
 			jaxbFacetVersion="2.2"
 			default="false"/>
 		
@@ -34,15 +34,15 @@
 		point="org.eclipse.jpt.common.core.libraryValidators">
 		
 		<libraryValidator
-			id="moxyUserLibraryValidator"
-			class="org.eclipse.jpt.jaxb.eclipselink.core.internal.libval.MoxyUserLibraryValidator">
+			id="eclipselinkUserLibraryValidator"
+			class="org.eclipse.jpt.jaxb.eclipselink.core.internal.libval.ELJaxbUserLibraryValidator">
 			<enablement>
 				<and>
 					<with variable="libraryProvider">
 						<test property="org.eclipse.jpt.common.core.extendsId" value="jaxb-user-library-provider"/>
 					</with>
 					<with variable="config">
-						<test property="org.eclipse.jpt.jaxb.core.jaxbPlatformGroup" value="moxy"/>
+						<test property="org.eclipse.jpt.jaxb.core.jaxbPlatformGroup" value="eclipselink"/>
 					</with>
 				</and>
 			</enablement>
diff --git a/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/MoxyPlatform.java b/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/ELJaxbPlatform.java
index cbf4880517..6ab19b6a6f 100644
--- a/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/MoxyPlatform.java
+++ b/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/ELJaxbPlatform.java
@@ -14,17 +14,17 @@ import org.eclipse.jpt.jaxb.core.platform.JaxbPlatformDescription;
 import org.eclipse.jpt.jaxb.core.platform.JaxbPlatformGroupDescription;
 
 
-public class MoxyPlatform {
+public class ELJaxbPlatform {
 	
 	public static final JaxbPlatformGroupDescription GROUP 
-			= JptJaxbCorePlugin.getJaxbPlatformManager().getJaxbPlatformGroup("moxy"); //$NON-NLS-1$
+			= JptJaxbCorePlugin.getJaxbPlatformManager().getJaxbPlatformGroup("eclipselink"); //$NON-NLS-1$
 	
 	public static final JaxbPlatformDescription VERSION_2_3
-			= JptJaxbCorePlugin.getJaxbPlatformManager().getJaxbPlatform("moxy_2_3"); //$NON-NLS-1$
+			= JptJaxbCorePlugin.getJaxbPlatformManager().getJaxbPlatform("eclipselink_2_3"); //$NON-NLS-1$
 	
 	
 	/**
 	 * Not for instantiation
 	 */
-	private MoxyPlatform() {}
+	private ELJaxbPlatform() {}
 }
diff --git a/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/internal/libval/MoxyUserLibraryValidator.java b/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/internal/libval/ELJaxbUserLibraryValidator.java
index 9cfa69693b..d2ed9d7519 100644
--- a/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/internal/libval/MoxyUserLibraryValidator.java
+++ b/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/internal/libval/ELJaxbUserLibraryValidator.java
@@ -17,18 +17,18 @@ import org.eclipse.jpt.common.core.libval.LibraryValidator;
 import org.eclipse.jpt.common.eclipselink.core.internal.libval.EclipseLinkLibValUtil;
 import org.eclipse.jpt.jaxb.core.internal.libprov.JaxbUserLibraryProviderInstallOperationConfig;
 import org.eclipse.jpt.jaxb.core.platform.JaxbPlatformDescription;
-import org.eclipse.jpt.jaxb.eclipselink.core.MoxyPlatform;
+import org.eclipse.jpt.jaxb.eclipselink.core.ELJaxbPlatform;
 import org.eclipse.osgi.service.resolver.VersionRange;
 
 
 /**
- * Library validator for Moxy user libraries.
+ * Library validator for EclipseLink JAXB user libraries.
  * 
  * In order to validate that the correct eclipselink.jar is present in the user library, the version
  * class which appears in standard EclipseLink libraries will be examined and compared against the
  * union of calculated version ranges, depending on the platform specified in the config.
  */
-public class MoxyUserLibraryValidator
+public class ELJaxbUserLibraryValidator
 		implements LibraryValidator {
 	
 	public IStatus validate(JptLibraryProviderInstallOperationConfig config) {
@@ -37,7 +37,7 @@ public class MoxyUserLibraryValidator
 		JaxbPlatformDescription platform = jaxbConfig.getJaxbPlatform();
 		Set<VersionRange> versionRanges = new HashSet<VersionRange>();
 		
-		if (MoxyPlatform.VERSION_2_3.equals(platform)) {
+		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_3/Moxy_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 662480854c..4583f14dbd 100644
--- a/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/internal/v2_3/Moxy_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
@@ -14,14 +14,14 @@ 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.MoxyPlatform;
+import org.eclipse.jpt.jaxb.eclipselink.core.ELJaxbPlatform;
 
 
-public class Moxy_2_3_PlatformDefinition
+public class ELJaxb_2_3_PlatformDefinition
 		extends  AbstractJaxb_2_2_PlatformDefinition {
 	
 	// singleton
-	private static final JaxbPlatformDefinition INSTANCE = new Moxy_2_3_PlatformDefinition();
+	private static final JaxbPlatformDefinition INSTANCE = new ELJaxb_2_3_PlatformDefinition();
 	
 	/**
 	 * Return the singleton.
@@ -31,13 +31,13 @@ public class Moxy_2_3_PlatformDefinition
 	}
 	
 	
-	protected Moxy_2_3_PlatformDefinition() {
+	protected ELJaxb_2_3_PlatformDefinition() {
 		super();
 	}
 	
 	
 	public JaxbPlatformDescription getDescription() {
-		return MoxyPlatform.VERSION_2_3;
+		return ELJaxbPlatform.VERSION_2_3;
 	}
 
 	public JaxbFactory getFactory() {
diff --git a/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/internal/v2_3/Moxy_2_3_PlatformDefinitionFactory.java b/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/internal/v2_3/ELJaxb_2_3_PlatformDefinitionFactory.java
index 5eb34841ec..9dfc64c4e1 100644
--- a/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/internal/v2_3/Moxy_2_3_PlatformDefinitionFactory.java
+++ b/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/internal/v2_3/ELJaxb_2_3_PlatformDefinitionFactory.java
@@ -13,10 +13,10 @@ import org.eclipse.jpt.jaxb.core.platform.JaxbPlatformDefinition;
 import org.eclipse.jpt.jaxb.core.platform.JaxbPlatformDefinitionFactory;
 
 
-public class Moxy_2_3_PlatformDefinitionFactory
+public class ELJaxb_2_3_PlatformDefinitionFactory
 		implements JaxbPlatformDefinitionFactory {
 	
 	public JaxbPlatformDefinition buildJaxbPlatformDefinition() {
-		return Moxy_2_3_PlatformDefinition.instance();
+		return ELJaxb_2_3_PlatformDefinition.instance();
 	}
 }
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 b4b1e1e2d4..75782d4723 100644
--- a/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.ui/plugin.xml
+++ b/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.ui/plugin.xml
@@ -16,9 +16,9 @@
 		point="org.eclipse.jpt.jaxb.ui.jaxbPlatformUis">
 		
 		<jaxbPlatformUi
-			id="moxy_2_3.ui"
-			jaxbPlatform="moxy_2_3"
-			class="org.eclipse.jpt.jaxb.eclipselink.ui.internal.v2_3.Moxy_2_3_PlatformUi"/>
+			id="eclipselink_2_3.ui"
+			jaxbPlatform="eclipselink_2_3"
+			class="org.eclipse.jpt.jaxb.eclipselink.ui.internal.v2_3.ELJaxb_2_3_PlatformUi"/>
 		
 	</extension>
 	
diff --git a/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.ui/src/org/eclipse/jpt/jaxb/eclipselink/ui/internal/v2_3/Moxy_2_3_PlatformUi.java b/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.ui/src/org/eclipse/jpt/jaxb/eclipselink/ui/internal/v2_3/ELJaxb_2_3_PlatformUi.java
index 8f51d98830..27e5f7cad4 100644
--- a/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.ui/src/org/eclipse/jpt/jaxb/eclipselink/ui/internal/v2_3/Moxy_2_3_PlatformUi.java
+++ b/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.ui/src/org/eclipse/jpt/jaxb/eclipselink/ui/internal/v2_3/ELJaxb_2_3_PlatformUi.java
@@ -13,7 +13,7 @@ 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 Moxy_2_3_PlatformUi
+public class ELJaxb_2_3_PlatformUi
 		implements JaxbPlatformUi {
 	
 	public JaxbNavigatorUi getNavigatorUi() {