249505 - more converters support on attribute mappings, conversion-values on object-type-converter still unfinished

36 files changed, 3567 insertions, 1567 deletions

diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/orm/EclipseLinkOrmConversionValue.java b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/orm/EclipseLinkOrmConversionValue.java
new file mode 100644
index 0000000000..d12cc740d9
--- /dev/null
+++ b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/orm/EclipseLinkOrmConversionValue.java
@@ -0,0 +1,126 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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.eclipselink.core.internal.context.orm;
+
+import java.util.List;
+import org.eclipse.jpt.core.internal.context.AbstractXmlContextNode;
+import org.eclipse.jpt.core.utility.TextRange;
+import org.eclipse.jpt.eclipselink.core.context.ConversionValue;
+import org.eclipse.jpt.eclipselink.core.internal.DefaultEclipseLinkJpaValidationMessages;
+import org.eclipse.jpt.eclipselink.core.internal.EclipseLinkJpaValidationMessages;
+import org.eclipse.jpt.eclipselink.core.resource.orm.XmlConversionValue;
+import org.eclipse.jpt.utility.internal.CollectionTools;
+import org.eclipse.wst.validation.internal.provisional.core.IMessage;
+
+public class EclipseLinkOrmConversionValue extends AbstractXmlContextNode implements ConversionValue
+{	
+	private XmlConversionValue resourceConversionValue;
+	
+	private String dataValue;
+	
+	private String objectValue;
+	
+	public EclipseLinkOrmConversionValue(EclipseLinkOrmObjectTypeConverter parent) {
+		super(parent);
+	}
+	
+	@Override
+	public EclipseLinkOrmObjectTypeConverter getParent() {
+		return (EclipseLinkOrmObjectTypeConverter) super.getParent();
+	}
+
+	public TextRange getValidationTextRange() {
+		return this.resourceConversionValue.getValidationTextRange();
+	}
+	
+	public String getDataValue() {
+		return this.dataValue;
+	}
+
+	public void setDataValue(String newDataValue) {
+		String oldDataValue = this.dataValue;
+		this.dataValue = newDataValue;
+		this.resourceConversionValue.setDataValue(newDataValue);
+		firePropertyChanged(DATA_VALUE_PROPERTY, oldDataValue, newDataValue);
+	}
+	
+	protected void setDataValue_(String newDataValue) {
+		String oldDataValue = this.dataValue;
+		this.dataValue = newDataValue;
+		firePropertyChanged(DATA_VALUE_PROPERTY, oldDataValue, newDataValue);
+	}
+	
+	public String getObjectValue() {
+		return this.objectValue;
+	}
+
+	public void setObjectValue(String newObjectValue) {
+		String oldObjectValue = this.objectValue;
+		this.objectValue = newObjectValue;
+		this.resourceConversionValue.setObjectValue(newObjectValue);
+		firePropertyChanged(OBJECT_VALUE_PROPERTY, oldObjectValue, newObjectValue);
+	}
+	
+	protected void setObjectValue_(String newObjectValue) {
+		String oldObjectValue = this.objectValue;
+		this.objectValue = newObjectValue;
+		firePropertyChanged(OBJECT_VALUE_PROPERTY, oldObjectValue, newObjectValue);
+	}
+
+	public void initialize(XmlConversionValue resourceConversionValue) {
+		this.resourceConversionValue = resourceConversionValue;
+		this.dataValue = this.dataValue();
+		this.objectValue = this.objectValue();
+	}
+	
+	public void update(XmlConversionValue resourceConversionValue) {
+		this.resourceConversionValue = resourceConversionValue;
+		this.setDataValue_(this.dataValue());
+		this.setObjectValue_(this.objectValue());
+	}
+
+	protected String dataValue() {
+		return this.resourceConversionValue.getDataValue();
+	}
+
+	protected String objectValue() {
+		return this.resourceConversionValue.getObjectValue();
+	}
+
+	public TextRange getDataValueTextRange() {
+		return this.resourceConversionValue.getDataValueTextRange();
+	}
+
+	public TextRange getObjectValueTextRange() {
+		return this.resourceConversionValue.getObjectValueTextRange();
+	}
+	
+	@Override
+	public void validate(List<IMessage> messages) {
+		super.validate(messages);
+		validateDataValuesUnique(messages);
+	}
+	
+	protected void validateDataValuesUnique(List<IMessage> messages) {
+		List<String> dataValues = CollectionTools.list(getParent().dataValues());
+		dataValues.remove(this.dataValue);
+		if (dataValues.contains(this.dataValue)) {
+			messages.add(
+				DefaultEclipseLinkJpaValidationMessages.buildMessage(
+					IMessage.HIGH_SEVERITY,
+					EclipseLinkJpaValidationMessages.MULTIPLE_OBJECT_VALUES_FOR_DATA_VALUE,
+					new String[] {this.dataValue}, 
+					this,
+					this.getDataValueTextRange()
+				)
+			);
+		}
+	}
+}
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/orm/EclipseLinkOrmConvert.java b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/orm/EclipseLinkOrmConvert.java
index 10f9b186bf..9138bbc030 100644
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/orm/EclipseLinkOrmConvert.java
+++ b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/orm/EclipseLinkOrmConvert.java
@@ -25,7 +25,7 @@ public class EclipseLinkOrmConvert extends AbstractXmlContextNode implements Con
 	
 	protected XmlConvertibleMapping resourceMapping;
 	
-//	protected EclipseLinkOrmConverter converter;
+	protected EclipseLinkOrmConverter converter;
 	
 	public EclipseLinkOrmConvert(OrmAttributeMapping parent, XmlConvertibleMapping resourceMapping) {
 		super(parent);
@@ -78,55 +78,55 @@ public class EclipseLinkOrmConvert extends AbstractXmlContextNode implements Con
 		firePropertyChanged(SPECIFIED_CONVERTER_NAME_PROPERTY, oldSpecifiedConverterName, newSpecifiedConverterName);
 	}
 
-	public EclipseLinkConverter getConverter() {
-		return null;
+	public EclipseLinkOrmConverter getConverter() {
+		return this.converter;
 	}
 	
 	protected String getConverterType() {
-		//if (this.converter == null) {
+		if (this.converter == null) {
 			return EclipseLinkConverter.NO_CONVERTER;
-		//}
-		//return this.converter.getType();
+		}
+		return this.converter.getType();
 	}
 
 	public void setConverter(String converterType) {
-//		if (getConverterType() == converterType) {
-//			return;
-//		}
-//		EclipseLinkOrmConverter oldConverter = this.converter;
-//		EclipseLinkOrmConverter newConverter = buildConverter(converterType);
-//		this.converter = null;
-//		if (oldConverter != null) {
-//			oldConverter.removeFromResourceModel();
-//		}
-//		this.converter = newConverter;
-//		if (newConverter != null) {
-//			newConverter.addToResourceModel();
-//		}
-//		firePropertyChanged(CONVERTER_PROPERTY, oldConverter, newConverter);
-	}
-//	
-//	protected void setConverter(EclipseLinkOrmConverter newConverter) {
-//		EclipseLinkOrmConverter oldConverter = this.converter;
-//		this.converter = newConverter;
-//		firePropertyChanged(CONVERTER_PROPERTY, oldConverter, newConverter);
-//	}
+		if (getConverterType() == converterType) {
+			return;
+		}
+		EclipseLinkOrmConverter oldConverter = this.converter;
+		EclipseLinkOrmConverter newConverter = buildConverter(converterType);
+		this.converter = null;
+		if (oldConverter != null) {
+			oldConverter.removeFromResourceModel();
+		}
+		this.converter = newConverter;
+		if (newConverter != null) {
+			newConverter.addToResourceModel();
+		}
+		firePropertyChanged(CONVERTER_PROPERTY, oldConverter, newConverter);
+	}
+	
+	protected void setConverter(EclipseLinkOrmConverter newConverter) {
+		EclipseLinkOrmConverter oldConverter = this.converter;
+		this.converter = newConverter;
+		firePropertyChanged(CONVERTER_PROPERTY, oldConverter, newConverter);
+	}
 	
 	protected void initialize(XmlConvertibleMapping resourceMapping) {
 		this.resourceMapping = resourceMapping;
 		this.specifiedConverterName = this.specifiedConverterName();
-//		this.converter = this.buildConverter(this.converterType());
+		this.converter = this.buildConverter(this.converterType());
 	}
 	
 	public void update() {
 		this.setSpecifiedConverterName_(this.specifiedConverterName());
-//		if (converterType() == getConverterType()) {
-//			getConverter().update(jrpa);
-//		}
-//		else {
-//			EclipseLinkOrmConverter javaConverter = buildConverter(converterType());
-//			setConverter(javaConverter);
-//		}
+		if (converterType() == getConverterType()) {
+			this.converter.update();
+		}
+		else {
+			EclipseLinkOrmConverter javaConverter = buildConverter(converterType());
+			setConverter(javaConverter);
+		}
 	}
 	
 	protected String specifiedConverterName() {
@@ -134,38 +134,38 @@ public class EclipseLinkOrmConvert extends AbstractXmlContextNode implements Con
 	}
 
 	
-//	protected EclipseLinkOrmConverter buildConverter(String converterType) {
-//		if (converterType == EclipseLinkConverter.NO_CONVERTER) {
-//			return null;
-//		}
-//		if (converterType == EclipseLinkConverter.CONVERTER) {
-//			return new org.eclipse.jpt.eclipselink.core.internal.context.java.EclipseLinkJavaConverter(this, this.resourcePersistentAttribute);
-//		}
-//		else if (converterType == EclipseLinkConverter.TYPE_CONVERTER) {
-//			return new EclipseLinkOrmTypeConverter(this, this.resourcePersistentAttribute);
-//		}
-//		else if (converterType == EclipseLinkConverter.OBJECT_TYPE_CONVERTER) {
-//			return new EclipseLinkOrmObjectTypeConverter(this, this.resourcePersistentAttribute);
-//		}
-//		else if (converterType == EclipseLinkConverter.STRUCT_CONVERTER) {
-//			return new EclipseLinkOrmStructConverter(this, this.resourcePersistentAttribute);
-//		}
-//		return null;
-//	}
+	protected EclipseLinkOrmConverter buildConverter(String converterType) {
+		if (converterType == EclipseLinkConverter.NO_CONVERTER) {
+			return null;
+		}
+		if (converterType == EclipseLinkConverter.CONVERTER) {
+			return new EclipseLinkOrmConverterImpl(this, this.resourceMapping);
+		}
+		else if (converterType == EclipseLinkConverter.TYPE_CONVERTER) {
+			return new EclipseLinkOrmTypeConverter(this, this.resourceMapping);
+		}
+		else if (converterType == EclipseLinkConverter.OBJECT_TYPE_CONVERTER) {
+			return new EclipseLinkOrmObjectTypeConverter(this, this.resourceMapping);
+		}
+		else if (converterType == EclipseLinkConverter.STRUCT_CONVERTER) {
+			return new EclipseLinkOrmStructConverter(this, this.resourceMapping);
+		}
+		return null;
+	}
 	
 	protected String converterType() {
-//		if (jrpa.getSupportingAnnotation(ConverterAnnotation.ANNOTATION_NAME) != null) {
-//			return EclipseLinkConverter.CONVERTER;
-//		}
-//		else if (jrpa.getSupportingAnnotation(TypeConverterAnnotation.ANNOTATION_NAME) != null) {
-//			return EclipseLinkConverter.TYPE_CONVERTER;
-//		}
-//		else if (jrpa.getSupportingAnnotation(ObjectTypeConverterAnnotation.ANNOTATION_NAME) != null) {
-//			return EclipseLinkConverter.OBJECT_TYPE_CONVERTER;
-//		}
-//		else if (jrpa.getSupportingAnnotation(StructConverterAnnotation.ANNOTATION_NAME) != null) {
-//			return EclipseLinkConverter.STRUCT_CONVERTER;
-//		}
+		if (this.resourceMapping.getConverter() != null) {
+			return EclipseLinkConverter.CONVERTER;
+		}
+		else if (this.resourceMapping.getTypeConverter() != null) {
+			return EclipseLinkConverter.TYPE_CONVERTER;
+		}
+		else if (this.resourceMapping.getObjectTypeConverter() != null) {
+			return EclipseLinkConverter.OBJECT_TYPE_CONVERTER;
+		}
+		else if (this.resourceMapping.getStructConverter() != null) {
+			return EclipseLinkConverter.STRUCT_CONVERTER;
+		}
 		
 		return null;
 	}
@@ -173,8 +173,8 @@ public class EclipseLinkOrmConvert extends AbstractXmlContextNode implements Con
 	@Override
 	public void validate(List<IMessage> messages) {
 		super.validate(messages);
-//		if (getConverter() != null) {
-//			getConverter().validate(messages);
-//		}
+		if (getConverter() != null) {
+			getConverter().validate(messages);
+		}
 	}
 }
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/orm/EclipseLinkOrmConverter.java b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/orm/EclipseLinkOrmConverter.java
new file mode 100644
index 0000000000..106621edc3
--- /dev/null
+++ b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/orm/EclipseLinkOrmConverter.java
@@ -0,0 +1,33 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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.eclipselink.core.internal.context.orm;
+
+import org.eclipse.jpt.core.context.XmlContextNode;
+import org.eclipse.jpt.eclipselink.core.context.EclipseLinkConverter;
+
+
+/**
+ * Provisional API: This interface is part of an interim API that is still
+ * under development and expected to change significantly before reaching
+ * stability. It is available at this early stage to solicit feedback from
+ * pioneering adopters on the understanding that any code that uses this API
+ * will almost certainly be broken (repeatedly) as the API evolves.
+ * 
+ * @version 2.1
+ * @since 2.1
+ */
+public interface EclipseLinkOrmConverter extends EclipseLinkConverter, XmlContextNode
+{
+	/**
+	 * Update the EclipseLinkOrmConverter context model object to match the 
+	 * resource model object. see {@link org.eclipse.jpt.core.JpaProject#update()}
+	 */
+	void update();
+}
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/orm/EclipseLinkOrmConverterImpl.java b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/orm/EclipseLinkOrmConverterImpl.java
new file mode 100644
index 0000000000..95e118356a
--- /dev/null
+++ b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/orm/EclipseLinkOrmConverterImpl.java
@@ -0,0 +1,135 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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.eclipselink.core.internal.context.orm;
+
+import java.util.List;
+import org.eclipse.jpt.core.context.XmlContextNode;
+import org.eclipse.jpt.core.internal.context.AbstractXmlContextNode;
+import org.eclipse.jpt.core.utility.TextRange;
+import org.eclipse.jpt.eclipselink.core.context.Converter;
+import org.eclipse.jpt.eclipselink.core.context.EclipseLinkConverter;
+import org.eclipse.jpt.eclipselink.core.resource.orm.EclipseLinkOrmFactory;
+import org.eclipse.jpt.eclipselink.core.resource.orm.XmlConverter;
+import org.eclipse.jpt.eclipselink.core.resource.orm.XmlConvertibleMapping;
+import org.eclipse.wst.validation.internal.provisional.core.IMessage;
+
+public class EclipseLinkOrmConverterImpl extends AbstractXmlContextNode implements Converter, EclipseLinkOrmConverter
+{	
+	private XmlConvertibleMapping resourceMapping;
+	
+	private String name;
+	
+	private String converterClass;
+	
+	public EclipseLinkOrmConverterImpl(XmlContextNode parent, XmlConvertibleMapping resourceMapping) {
+		super(parent);
+		this.initialize(resourceMapping);
+	}
+
+	public String getType() {
+		return EclipseLinkConverter.CONVERTER;
+	}
+		
+	public void addToResourceModel() {
+		this.resourceMapping.setConverter(EclipseLinkOrmFactory.eINSTANCE.createXmlConverterImpl());
+	}
+	
+	public void removeFromResourceModel() {
+		this.resourceMapping.setConverter(null);
+	}
+
+	protected XmlConverter getResourceConverter() {
+		return this.resourceMapping.getConverter();
+	}
+	
+	public String getConverterClass() {
+		return this.converterClass;
+	}
+
+	public void setConverterClass(String newConverterClass) {
+		String oldConverterClass = this.converterClass;
+		this.converterClass = newConverterClass;
+		getResourceConverter().setClassName(newConverterClass);
+		firePropertyChanged(CONVERTER_CLASS_PROPERTY, oldConverterClass, newConverterClass);
+	}
+	
+	protected void setConverterClass_(String newConverterClass) {
+		String oldConverterClass = this.converterClass;
+		this.converterClass = newConverterClass;
+		firePropertyChanged(CONVERTER_CLASS_PROPERTY, oldConverterClass, newConverterClass);
+	}
+
+	public String getName() {
+		return this.name;
+	}
+
+	public void setName(String newName) {
+		String oldName = this.name;
+		this.name = newName;
+		getResourceConverter().setName(newName);
+		firePropertyChanged(NAME_PROPERTY, oldName, newName);
+	}
+
+	protected void setName_(String newName) {
+		String oldName = this.name;
+		this.name = newName;
+		firePropertyChanged(NAME_PROPERTY, oldName, newName);
+	}
+	
+	protected void initialize(XmlConvertibleMapping resourceMapping) {
+		this.resourceMapping = resourceMapping;
+		this.name = this.name();
+		this.converterClass = this.converterClass();
+	}
+	
+	public void update() {
+		this.setName_(this.name());
+		this.setConverterClass_(this.converterClass());
+	}
+
+	protected String name() {
+		return getResourceConverter() == null ? null : getResourceConverter().getName();
+	}
+	
+	protected String converterClass() {
+		return getResourceConverter() == null ? null : getResourceConverter().getClassName();
+	}
+	
+	//************ validation ***************
+	
+	@Override
+	public void validate(List<IMessage> messages) {
+		super.validate(messages);
+		validateConverterClass(messages);
+	}
+//TODO validate converter class	
+	protected void validateConverterClass(List<IMessage> messages) {
+//		if (!getResourceConverter().implementsConverter()) {
+//			messages.add(
+//				DefaultEclipseLinkJpaValidationMessages.buildMessage(
+//					IMessage.HIGH_SEVERITY,
+//					EclipseLinkJpaValidationMessages.CONVERTER_CLASS_IMPLEMENTS_CONVERTER,
+//					new String[] {this.converterClass},
+//					this, 
+//					getConverterClassTextRange()
+//				)
+//			);
+//		}
+	}
+	
+//	public TextRange getConverterClassTextRange() {
+//		return getResourceConverter().getClassNameTextRange();
+//	}
+
+	public TextRange getValidationTextRange() {
+		return getResourceConverter().getValidationTextRange();
+	}
+
+}
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/orm/EclipseLinkOrmObjectTypeConverter.java b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/orm/EclipseLinkOrmObjectTypeConverter.java
new file mode 100644
index 0000000000..7639691943
--- /dev/null
+++ b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/orm/EclipseLinkOrmObjectTypeConverter.java
@@ -0,0 +1,209 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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.eclipselink.core.internal.context.orm;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.ListIterator;
+import org.eclipse.jpt.core.context.XmlContextNode;
+import org.eclipse.jpt.core.internal.context.AbstractXmlContextNode;
+import org.eclipse.jpt.core.utility.TextRange;
+import org.eclipse.jpt.eclipselink.core.context.ConversionValue;
+import org.eclipse.jpt.eclipselink.core.context.EclipseLinkConverter;
+import org.eclipse.jpt.eclipselink.core.context.ObjectTypeConverter;
+import org.eclipse.jpt.eclipselink.core.resource.orm.EclipseLinkOrmFactory;
+import org.eclipse.jpt.eclipselink.core.resource.orm.XmlConvertibleMapping;
+import org.eclipse.jpt.eclipselink.core.resource.orm.XmlObjectTypeConverter;
+import org.eclipse.jpt.utility.internal.iterators.CloneListIterator;
+import org.eclipse.jpt.utility.internal.iterators.TransformationListIterator;
+
+public class EclipseLinkOrmObjectTypeConverter extends AbstractXmlContextNode implements ObjectTypeConverter, EclipseLinkOrmConverter
+{	
+	private XmlConvertibleMapping resourceMapping;
+	
+	private String name;
+	
+	private String dataType;
+	
+	private String objectType;
+	
+	private String defaultObjectValue;
+
+	private final List<EclipseLinkOrmConversionValue> conversionValues;
+
+	public EclipseLinkOrmObjectTypeConverter(XmlContextNode parent, XmlConvertibleMapping resourceMapping) {
+		super(parent);
+		this.conversionValues = new ArrayList<EclipseLinkOrmConversionValue>();
+		this.initialize(resourceMapping);
+	}
+
+	public String getType() {
+		return EclipseLinkConverter.OBJECT_TYPE_CONVERTER;
+	}
+		
+	public void addToResourceModel() {
+		this.resourceMapping.setObjectTypeConverter(EclipseLinkOrmFactory.eINSTANCE.createXmlObjectTypeConverterImpl());
+	}
+	
+	public void removeFromResourceModel() {
+		this.resourceMapping.setObjectTypeConverter(null);
+	}
+
+	protected XmlObjectTypeConverter getResourceConverter() {
+		return this.resourceMapping.getObjectTypeConverter();
+	}
+
+	public String getName() {
+		return this.name;
+	}
+
+	public void setName(String newName) {
+		String oldName = this.name;
+		this.name = newName;
+		getResourceConverter().setName(newName);
+		firePropertyChanged(NAME_PROPERTY, oldName, newName);
+	}
+
+	protected void setName_(String newName) {
+		String oldName = this.name;
+		this.name = newName;
+		firePropertyChanged(NAME_PROPERTY, oldName, newName);
+	}
+	
+	public String getDataType() {
+		return this.dataType;
+	}
+
+	public void setDataType(String newDataType) {
+		String oldDataType = this.dataType;
+		this.dataType = newDataType;
+		getResourceConverter().setDataType(newDataType);
+		firePropertyChanged(DATA_TYPE_PROPERTY, oldDataType, newDataType);
+	}
+	
+	protected void setDataType_(String newDataType) {
+		String oldDataType = this.dataType;
+		this.dataType = newDataType;
+		firePropertyChanged(DATA_TYPE_PROPERTY, oldDataType, newDataType);
+	}
+	
+	public String getObjectType() {
+		return this.objectType;
+	}
+
+	public void setObjectType(String newObjectType) {
+		String oldObjectType = this.objectType;
+		this.objectType = newObjectType;
+		getResourceConverter().setObjectType(newObjectType);
+		firePropertyChanged(OBJECT_TYPE_PROPERTY, oldObjectType, newObjectType);
+	}
+	
+	protected void setObjectType_(String newObjectType) {
+		String oldObjectType = this.objectType;
+		this.objectType = newObjectType;
+		firePropertyChanged(OBJECT_TYPE_PROPERTY, oldObjectType, newObjectType);
+	}
+
+	public ListIterator<EclipseLinkOrmConversionValue> conversionValues() {
+		return new CloneListIterator<EclipseLinkOrmConversionValue>(this.conversionValues);
+	}
+
+	public int conversionValuesSize() {
+		return this.conversionValues.size();
+	}
+
+	public ConversionValue addConversionValue(int index) {
+		// TODO Auto-generated method stub
+		return null;
+	}
+
+	public ConversionValue addConversionValue() {
+		// TODO Auto-generated method stub
+		return null;
+	}
+	
+	public void moveConversionValue(int targetIndex, int sourceIndex) {
+		// TODO Auto-generated method stub
+		
+	}
+
+	public void removeConversionValue(int index) {
+		// TODO Auto-generated method stub
+		
+	}
+
+	public void removeConversionValue(ConversionValue conversionValue) {
+		// TODO Auto-generated method stub
+		
+	}
+
+	public ListIterator<String> dataValues() {
+		return new TransformationListIterator<EclipseLinkOrmConversionValue, String>(conversionValues()) {
+			@Override
+			protected String transform(EclipseLinkOrmConversionValue next) {
+				return next.getDataValue();
+			}
+		};
+	}
+
+
+	public String getDefaultObjectValue() {
+		return this.defaultObjectValue;
+	}
+
+	public void setDefaultObjectValue(String newDefaultObjectValue) {
+		String oldDefaultObjectValue = this.defaultObjectValue;
+		this.defaultObjectValue = newDefaultObjectValue;
+		getResourceConverter().setDefaultObjectValue(newDefaultObjectValue);
+		firePropertyChanged(DEFAULT_OBJECT_VALUE_PROPERTY, oldDefaultObjectValue, newDefaultObjectValue);
+	}
+	
+	protected void setDefaultObjectValue_(String newDefaultObjectValue) {
+		String oldDefaultObjectValue = this.defaultObjectValue;
+		this.defaultObjectValue = newDefaultObjectValue;
+		firePropertyChanged(DEFAULT_OBJECT_VALUE_PROPERTY, oldDefaultObjectValue, newDefaultObjectValue);
+	}
+	
+	
+	protected void initialize(XmlConvertibleMapping resourceMapping) {
+		this.resourceMapping = resourceMapping;
+		this.name = this.name();
+		this.dataType = this.dataType();
+		this.objectType = this.objectType();
+		this.defaultObjectValue = this.defaultObjectValue();
+	}
+	
+	public void update() {
+		this.setName_(this.name());
+		this.setDataType_(this.dataType());
+		this.setObjectType_(this.objectType());
+		this.setDefaultObjectValue_(this.defaultObjectValue());
+	}
+
+	protected String name() {
+		return getResourceConverter() == null ? null : getResourceConverter().getName();
+	}
+
+	protected String dataType() {
+		return getResourceConverter() == null ? null : getResourceConverter().getDataType();
+	}
+
+	protected String objectType() {
+		return getResourceConverter() == null ? null : getResourceConverter().getObjectType();
+	}
+
+	protected String defaultObjectValue() {
+		return getResourceConverter() == null ? null : getResourceConverter().getDefaultObjectValue();
+	}
+
+	public TextRange getValidationTextRange() {
+		return getResourceConverter().getValidationTextRange();
+	}
+}
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/orm/EclipseLinkOrmStructConverter.java b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/orm/EclipseLinkOrmStructConverter.java
new file mode 100644
index 0000000000..62f0cb9d50
--- /dev/null
+++ b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/orm/EclipseLinkOrmStructConverter.java
@@ -0,0 +1,135 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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.eclipselink.core.internal.context.orm;
+
+import java.util.List;
+import org.eclipse.jpt.core.context.XmlContextNode;
+import org.eclipse.jpt.core.internal.context.AbstractXmlContextNode;
+import org.eclipse.jpt.core.utility.TextRange;
+import org.eclipse.jpt.eclipselink.core.context.EclipseLinkConverter;
+import org.eclipse.jpt.eclipselink.core.context.StructConverter;
+import org.eclipse.jpt.eclipselink.core.resource.orm.EclipseLinkOrmFactory;
+import org.eclipse.jpt.eclipselink.core.resource.orm.XmlConvertibleMapping;
+import org.eclipse.jpt.eclipselink.core.resource.orm.XmlStructConverter;
+import org.eclipse.wst.validation.internal.provisional.core.IMessage;
+
+public class EclipseLinkOrmStructConverter extends AbstractXmlContextNode implements StructConverter, EclipseLinkOrmConverter
+{	
+	private XmlConvertibleMapping resourceMapping;
+	
+	private String name;
+	
+	private String converterClass;
+	
+	public EclipseLinkOrmStructConverter(XmlContextNode parent, XmlConvertibleMapping resourceMapping) {
+		super(parent);
+		this.initialize(resourceMapping);
+	}
+
+	public String getType() {
+		return EclipseLinkConverter.STRUCT_CONVERTER;
+	}
+		
+	public void addToResourceModel() {
+		this.resourceMapping.setStructConverter(EclipseLinkOrmFactory.eINSTANCE.createXmlStructConverterImpl());
+	}
+	
+	public void removeFromResourceModel() {
+		this.resourceMapping.setStructConverter(null);
+	}
+
+	protected XmlStructConverter getResourceConverter() {
+		return this.resourceMapping.getStructConverter();
+	}
+	
+	public String getConverterClass() {
+		return this.converterClass;
+	}
+
+	public void setConverterClass(String newConverterClass) {
+		String oldConverterClass = this.converterClass;
+		this.converterClass = newConverterClass;
+		getResourceConverter().setConverter(newConverterClass);
+		firePropertyChanged(CONVERTER_CLASS_PROPERTY, oldConverterClass, newConverterClass);
+	}
+	
+	protected void setConverterClass_(String newConverterClass) {
+		String oldConverterClass = this.converterClass;
+		this.converterClass = newConverterClass;
+		firePropertyChanged(CONVERTER_CLASS_PROPERTY, oldConverterClass, newConverterClass);
+	}
+
+	public String getName() {
+		return this.name;
+	}
+
+	public void setName(String newName) {
+		String oldName = this.name;
+		this.name = newName;
+		getResourceConverter().setName(newName);
+		firePropertyChanged(NAME_PROPERTY, oldName, newName);
+	}
+
+	protected void setName_(String newName) {
+		String oldName = this.name;
+		this.name = newName;
+		firePropertyChanged(NAME_PROPERTY, oldName, newName);
+	}
+	
+	protected void initialize(XmlConvertibleMapping resourceMapping) {
+		this.resourceMapping = resourceMapping;
+		this.name = this.name();
+		this.converterClass = this.converterClass();
+	}
+	
+	public void update() {
+		this.setName_(this.name());
+		this.setConverterClass_(this.converterClass());
+	}
+
+	protected String name() {
+		return getResourceConverter() == null ? null : getResourceConverter().getName();
+	}
+	
+	protected String converterClass() {
+		return getResourceConverter() == null ? null : getResourceConverter().getConverter();
+	}
+	
+	//************ validation ***************
+	
+	@Override
+	public void validate(List<IMessage> messages) {
+		super.validate(messages);
+		validateConverterClass(messages);
+	}
+//TODO validate converter class	
+	protected void validateConverterClass(List<IMessage> messages) {
+//		if (!getResourceConverter().implementsConverter()) {
+//			messages.add(
+//				DefaultEclipseLinkJpaValidationMessages.buildMessage(
+//					IMessage.HIGH_SEVERITY,
+//					EclipseLinkJpaValidationMessages.CONVERTER_CLASS_IMPLEMENTS_CONVERTER,
+//					new String[] {this.converterClass},
+//					this, 
+//					getConverterClassTextRange()
+//				)
+//			);
+//		}
+	}
+	
+//	public TextRange getConverterClassTextRange() {
+//		return getResourceConverter().getClassNameTextRange();
+//	}
+
+	public TextRange getValidationTextRange() {
+		return getResourceConverter().getValidationTextRange();
+	}
+
+}
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/orm/EclipseLinkOrmTypeConverter.java b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/orm/EclipseLinkOrmTypeConverter.java
new file mode 100644
index 0000000000..d6b350f94e
--- /dev/null
+++ b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/orm/EclipseLinkOrmTypeConverter.java
@@ -0,0 +1,131 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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.eclipselink.core.internal.context.orm;
+
+import org.eclipse.jpt.core.context.XmlContextNode;
+import org.eclipse.jpt.core.internal.context.AbstractXmlContextNode;
+import org.eclipse.jpt.core.utility.TextRange;
+import org.eclipse.jpt.eclipselink.core.context.EclipseLinkConverter;
+import org.eclipse.jpt.eclipselink.core.context.TypeConverter;
+import org.eclipse.jpt.eclipselink.core.resource.orm.EclipseLinkOrmFactory;
+import org.eclipse.jpt.eclipselink.core.resource.orm.XmlConvertibleMapping;
+import org.eclipse.jpt.eclipselink.core.resource.orm.XmlTypeConverter;
+
+public class EclipseLinkOrmTypeConverter extends AbstractXmlContextNode implements TypeConverter, EclipseLinkOrmConverter
+{	
+	private XmlConvertibleMapping resourceMapping;
+	
+	private String name;
+	
+	private String dataType;
+	
+	private String objectType;
+
+	public EclipseLinkOrmTypeConverter(XmlContextNode parent, XmlConvertibleMapping resourceMapping) {
+		super(parent);
+		this.initialize(resourceMapping);
+	}
+
+	public String getType() {
+		return EclipseLinkConverter.TYPE_CONVERTER;
+	}
+		
+	public void addToResourceModel() {
+		this.resourceMapping.setTypeConverter(EclipseLinkOrmFactory.eINSTANCE.createXmlTypeConverterImpl());
+	}
+	
+	public void removeFromResourceModel() {
+		this.resourceMapping.setTypeConverter(null);
+	}
+
+	protected XmlTypeConverter getResourceConverter() {
+		return this.resourceMapping.getTypeConverter();
+	}
+
+	public String getName() {
+		return this.name;
+	}
+
+	public void setName(String newName) {
+		String oldName = this.name;
+		this.name = newName;
+		getResourceConverter().setName(newName);
+		firePropertyChanged(NAME_PROPERTY, oldName, newName);
+	}
+
+	protected void setName_(String newName) {
+		String oldName = this.name;
+		this.name = newName;
+		firePropertyChanged(NAME_PROPERTY, oldName, newName);
+	}
+	
+	public String getDataType() {
+		return this.dataType;
+	}
+
+	public void setDataType(String newDataType) {
+		String oldDataType = this.dataType;
+		this.dataType = newDataType;
+		getResourceConverter().setDataType(newDataType);
+		firePropertyChanged(DATA_TYPE_PROPERTY, oldDataType, newDataType);
+	}
+	
+	protected void setDataType_(String newDataType) {
+		String oldDataType = this.dataType;
+		this.dataType = newDataType;
+		firePropertyChanged(DATA_TYPE_PROPERTY, oldDataType, newDataType);
+	}
+	
+	public String getObjectType() {
+		return this.objectType;
+	}
+
+	public void setObjectType(String newObjectType) {
+		String oldObjectType = this.objectType;
+		this.objectType = newObjectType;
+		getResourceConverter().setObjectType(newObjectType);
+		firePropertyChanged(OBJECT_TYPE_PROPERTY, oldObjectType, newObjectType);
+	}
+	
+	protected void setObjectType_(String newObjectType) {
+		String oldObjectType = this.objectType;
+		this.objectType = newObjectType;
+		firePropertyChanged(OBJECT_TYPE_PROPERTY, oldObjectType, newObjectType);
+	}
+
+	protected void initialize(XmlConvertibleMapping resourceMapping) {
+		this.resourceMapping = resourceMapping;
+		this.name = this.name();
+		this.dataType = this.dataType();
+		this.objectType = this.objectType();
+	}
+	
+	public void update() {
+		this.setName_(this.name());
+		this.setDataType_(this.dataType());
+		this.setObjectType_(this.objectType());
+	}
+
+	protected String name() {
+		return getResourceConverter() == null ? null : getResourceConverter().getName();
+	}
+
+	protected String dataType() {
+		return getResourceConverter() == null ? null : getResourceConverter().getDataType();
+	}
+
+	protected String objectType() {
+		return getResourceConverter() == null ? null : getResourceConverter().getObjectType();
+	}
+
+	public TextRange getValidationTextRange() {
+		return getResourceConverter().getValidationTextRange();
+	}
+}
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/orm/EclipseLinkVirtualXmlConverter.java b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/orm/EclipseLinkVirtualXmlConverter.java
new file mode 100644
index 0000000000..fc51e04f58
--- /dev/null
+++ b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/orm/EclipseLinkVirtualXmlConverter.java
@@ -0,0 +1,58 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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.eclipselink.core.internal.context.orm;
+
+import org.eclipse.jpt.core.context.orm.OrmTypeMapping;
+import org.eclipse.jpt.core.resource.common.AbstractJpaEObject;
+import org.eclipse.jpt.eclipselink.core.context.Converter;
+import org.eclipse.jpt.eclipselink.core.resource.orm.XmlConverter;
+
+/**
+ * VirtualBasic is an implementation of Basic used when there is 
+ * no tag in the orm.xml and an underlying javaBasicMapping exists.
+ */
+public class EclipseLinkVirtualXmlConverter extends AbstractJpaEObject implements XmlConverter
+{
+	protected OrmTypeMapping ormTypeMapping;
+	
+	protected Converter javaConverter;
+	
+	public EclipseLinkVirtualXmlConverter(OrmTypeMapping ormTypeMapping, Converter javaConverter) {
+		super();
+		this.ormTypeMapping = ormTypeMapping;
+		this.javaConverter = javaConverter;
+	}
+	
+	protected boolean isOrmMetadataComplete() {
+		return this.ormTypeMapping.isMetadataComplete();
+	}
+
+	public String getClassName() {
+		if (isOrmMetadataComplete()) {
+			return null;
+		}
+		return this.javaConverter.getConverterClass();
+	}
+	
+	public void setClassName(String value) {
+		throw new UnsupportedOperationException("cannot set values on a virtual mapping"); //$NON-NLS-1$
+	}
+	
+	public String getName() {
+		if (isOrmMetadataComplete()) {
+			return null;
+		}
+		return this.javaConverter.getName();
+	}
+	
+	public void setName(String value) {
+		throw new UnsupportedOperationException("cannot set values on a virtual mapping"); //$NON-NLS-1$
+	}
+}
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/orm/EclipseLinkVirtualXmlObjectTypeConverter.java b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/orm/EclipseLinkVirtualXmlObjectTypeConverter.java
new file mode 100644
index 0000000000..cc89367946
--- /dev/null
+++ b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/orm/EclipseLinkVirtualXmlObjectTypeConverter.java
@@ -0,0 +1,88 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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.eclipselink.core.internal.context.orm;
+
+import org.eclipse.emf.common.util.EList;
+import org.eclipse.jpt.core.context.orm.OrmTypeMapping;
+import org.eclipse.jpt.core.resource.common.AbstractJpaEObject;
+import org.eclipse.jpt.eclipselink.core.context.ObjectTypeConverter;
+import org.eclipse.jpt.eclipselink.core.resource.orm.XmlConversionValue;
+import org.eclipse.jpt.eclipselink.core.resource.orm.XmlObjectTypeConverter;
+
+/**
+ * VirtualBasic is an implementation of Basic used when there is 
+ * no tag in the orm.xml and an underlying javaBasicMapping exists.
+ */
+public class EclipseLinkVirtualXmlObjectTypeConverter extends AbstractJpaEObject implements XmlObjectTypeConverter
+{
+	protected OrmTypeMapping ormTypeMapping;
+	
+	protected ObjectTypeConverter javaConverter;
+	
+	public EclipseLinkVirtualXmlObjectTypeConverter(OrmTypeMapping ormTypeMapping, ObjectTypeConverter javaConverter) {
+		super();
+		this.ormTypeMapping = ormTypeMapping;
+		this.javaConverter = javaConverter;
+	}
+	
+	protected boolean isOrmMetadataComplete() {
+		return this.ormTypeMapping.isMetadataComplete();
+	}
+	
+	public String getName() {
+		if (isOrmMetadataComplete()) {
+			return null;
+		}
+		return this.javaConverter.getName();
+	}
+	
+	public void setName(String value) {
+		throw new UnsupportedOperationException("cannot set values on a virtual mapping"); //$NON-NLS-1$
+	}
+
+	public String getDataType() {
+		if (isOrmMetadataComplete()) {
+			return null;
+		}
+		return this.javaConverter.getDataType();
+	}
+	
+	public void setDataType(String value) {
+		throw new UnsupportedOperationException("cannot set values on a virtual mapping"); //$NON-NLS-1$
+	}
+
+	public String getObjectType() {
+		if (isOrmMetadataComplete()) {
+			return null;
+		}
+		return this.javaConverter.getObjectType();
+	}
+	
+	public void setObjectType(String value) {
+		throw new UnsupportedOperationException("cannot set values on a virtual mapping"); //$NON-NLS-1$
+	}
+
+	public String getDefaultObjectValue() {
+		if (isOrmMetadataComplete()) {
+			return null;
+		}
+		return this.javaConverter.getDefaultObjectValue();
+	}
+
+	public void setDefaultObjectValue(String value) {
+		throw new UnsupportedOperationException("cannot set values on a virtual mapping"); //$NON-NLS-1$
+	}
+	
+	public EList<XmlConversionValue> getConversionValues() {
+		// TODO Auto-generated method stub
+		return null;
+	}
+
+}
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/orm/EclipseLinkVirtualXmlStructConverter.java b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/orm/EclipseLinkVirtualXmlStructConverter.java
new file mode 100644
index 0000000000..7dcda68133
--- /dev/null
+++ b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/orm/EclipseLinkVirtualXmlStructConverter.java
@@ -0,0 +1,58 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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.eclipselink.core.internal.context.orm;
+
+import org.eclipse.jpt.core.context.orm.OrmTypeMapping;
+import org.eclipse.jpt.core.resource.common.AbstractJpaEObject;
+import org.eclipse.jpt.eclipselink.core.context.StructConverter;
+import org.eclipse.jpt.eclipselink.core.resource.orm.XmlStructConverter;
+
+/**
+ * VirtualBasic is an implementation of Basic used when there is 
+ * no tag in the orm.xml and an underlying javaBasicMapping exists.
+ */
+public class EclipseLinkVirtualXmlStructConverter extends AbstractJpaEObject implements XmlStructConverter
+{
+	protected OrmTypeMapping ormTypeMapping;
+	
+	protected StructConverter javaConverter;
+	
+	public EclipseLinkVirtualXmlStructConverter(OrmTypeMapping ormTypeMapping, StructConverter javaConverter) {
+		super();
+		this.ormTypeMapping = ormTypeMapping;
+		this.javaConverter = javaConverter;
+	}
+	
+	protected boolean isOrmMetadataComplete() {
+		return this.ormTypeMapping.isMetadataComplete();
+	}
+
+	public String getConverter() {
+		if (isOrmMetadataComplete()) {
+			return null;
+		}
+		return this.javaConverter.getConverterClass();
+	}
+	
+	public void setConverter(String value) {
+		throw new UnsupportedOperationException("cannot set values on a virtual mapping"); //$NON-NLS-1$
+	}
+	
+	public String getName() {
+		if (isOrmMetadataComplete()) {
+			return null;
+		}
+		return this.javaConverter.getName();
+	}
+	
+	public void setName(String value) {
+		throw new UnsupportedOperationException("cannot set values on a virtual mapping"); //$NON-NLS-1$
+	}
+}
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/orm/EclipseLinkVirtualXmlTypeConverter.java b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/orm/EclipseLinkVirtualXmlTypeConverter.java
new file mode 100644
index 0000000000..2859580bd0
--- /dev/null
+++ b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/orm/EclipseLinkVirtualXmlTypeConverter.java
@@ -0,0 +1,69 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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.eclipselink.core.internal.context.orm;
+
+import org.eclipse.jpt.core.context.orm.OrmTypeMapping;
+import org.eclipse.jpt.core.resource.common.AbstractJpaEObject;
+import org.eclipse.jpt.eclipselink.core.context.TypeConverter;
+import org.eclipse.jpt.eclipselink.core.resource.orm.XmlTypeConverter;
+
+/**
+ * VirtualBasic is an implementation of Basic used when there is 
+ * no tag in the orm.xml and an underlying javaBasicMapping exists.
+ */
+public class EclipseLinkVirtualXmlTypeConverter extends AbstractJpaEObject implements XmlTypeConverter
+{
+	protected OrmTypeMapping ormTypeMapping;
+	
+	protected TypeConverter javaConverter;
+	
+	public EclipseLinkVirtualXmlTypeConverter(OrmTypeMapping ormTypeMapping, TypeConverter javaConverter) {
+		super();
+		this.ormTypeMapping = ormTypeMapping;
+		this.javaConverter = javaConverter;
+	}
+	
+	protected boolean isOrmMetadataComplete() {
+		return this.ormTypeMapping.isMetadataComplete();
+	}
+	
+	public String getName() {
+		if (isOrmMetadataComplete()) {
+			return null;
+		}
+		return this.javaConverter.getName();
+	}
+	
+	public void setName(String value) {
+		throw new UnsupportedOperationException("cannot set values on a virtual mapping"); //$NON-NLS-1$
+	}
+
+	public String getDataType() {
+		if (isOrmMetadataComplete()) {
+			return null;
+		}
+		return this.javaConverter.getDataType();
+	}
+	
+	public void setDataType(String value) {
+		throw new UnsupportedOperationException("cannot set values on a virtual mapping"); //$NON-NLS-1$
+	}
+
+	public String getObjectType() {
+		if (isOrmMetadataComplete()) {
+			return null;
+		}
+		return this.javaConverter.getObjectType();
+	}
+	
+	public void setObjectType(String value) {
+		throw new UnsupportedOperationException("cannot set values on a virtual mapping"); //$NON-NLS-1$
+	}
+}
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/orm/VirtualEclipseLinkXmlBasic.java b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/orm/VirtualEclipseLinkXmlBasic.java
index a450ac1837..3cd79c0fc2 100644
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/orm/VirtualEclipseLinkXmlBasic.java
+++ b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/orm/VirtualEclipseLinkXmlBasic.java
@@ -14,7 +14,12 @@ import org.eclipse.jpt.core.context.orm.OrmTypeMapping;
 import org.eclipse.jpt.core.internal.context.orm.VirtualXmlBasic;
 import org.eclipse.jpt.core.utility.TextRange;
 import org.eclipse.jpt.eclipselink.core.context.Convert;
+import org.eclipse.jpt.eclipselink.core.context.Converter;
 import org.eclipse.jpt.eclipselink.core.context.EclipseLinkBasicMapping;
+import org.eclipse.jpt.eclipselink.core.context.EclipseLinkConverter;
+import org.eclipse.jpt.eclipselink.core.context.ObjectTypeConverter;
+import org.eclipse.jpt.eclipselink.core.context.StructConverter;
+import org.eclipse.jpt.eclipselink.core.context.TypeConverter;
 import org.eclipse.jpt.eclipselink.core.resource.orm.XmlBasic;
 import org.eclipse.jpt.eclipselink.core.resource.orm.XmlConverter;
 import org.eclipse.jpt.eclipselink.core.resource.orm.XmlObjectTypeConverter;
@@ -66,42 +71,70 @@ public class VirtualEclipseLinkXmlBasic extends VirtualXmlBasic implements XmlBa
 	}
 
 	public XmlConverter getConverter() {
-		// TODO Auto-generated method stub
+		if (isOrmMetadataComplete()) {
+			return null;
+		}
+		if (this.javaAttributeMapping.getConverter().getType() == Convert.ECLIPSE_LINK_CONVERTER) {
+			EclipseLinkConverter converter = ((Convert) this.javaAttributeMapping.getConverter()).getConverter();
+			if (converter != null && converter.getType() == EclipseLinkConverter.CONVERTER) {
+				return new EclipseLinkVirtualXmlConverter(this.ormTypeMapping, (Converter) ((Convert) this.javaAttributeMapping.getConverter()).getConverter());
+			}
+		}
 		return null;
 	}
 
 	public XmlObjectTypeConverter getObjectTypeConverter() {
-		// TODO Auto-generated method stub
+		if (isOrmMetadataComplete()) {
+			return null;
+		}
+		if (this.javaAttributeMapping.getConverter().getType() == Convert.ECLIPSE_LINK_CONVERTER) {
+			EclipseLinkConverter converter = ((Convert) this.javaAttributeMapping.getConverter()).getConverter();
+			if (converter != null && converter.getType() == EclipseLinkConverter.OBJECT_TYPE_CONVERTER) {
+				return new EclipseLinkVirtualXmlObjectTypeConverter(this.ormTypeMapping, (ObjectTypeConverter) ((Convert) this.javaAttributeMapping.getConverter()).getConverter());
+			}
+		}
 		return null;
 	}
 
 	public XmlStructConverter getStructConverter() {
-		// TODO Auto-generated method stub
+		if (isOrmMetadataComplete()) {
+			return null;
+		}
+		if (this.javaAttributeMapping.getConverter().getType() == Convert.ECLIPSE_LINK_CONVERTER) {
+			EclipseLinkConverter converter = ((Convert) this.javaAttributeMapping.getConverter()).getConverter();
+			if (converter != null && converter.getType() == EclipseLinkConverter.STRUCT_CONVERTER) {
+				return new EclipseLinkVirtualXmlStructConverter(this.ormTypeMapping, (StructConverter) ((Convert) this.javaAttributeMapping.getConverter()).getConverter());
+			}
+		}
 		return null;
 	}
 
 	public XmlTypeConverter getTypeConverter() {
-		// TODO Auto-generated method stub
+		if (isOrmMetadataComplete()) {
+			return null;
+		}
+		if (this.javaAttributeMapping.getConverter().getType() == Convert.ECLIPSE_LINK_CONVERTER) {
+			EclipseLinkConverter converter = ((Convert) this.javaAttributeMapping.getConverter()).getConverter();
+			if (converter != null && converter.getType() == EclipseLinkConverter.TYPE_CONVERTER) {
+				return new EclipseLinkVirtualXmlTypeConverter(this.ormTypeMapping, (TypeConverter) ((Convert) this.javaAttributeMapping.getConverter()).getConverter());
+			}
+		}
 		return null;
 	}
 
 	public void setConverter(XmlConverter value) {
-		// TODO Auto-generated method stub
-		
+		throw new UnsupportedOperationException("cannot set values on a virtual mapping"); //$NON-NLS-1$
 	}
 
 	public void setObjectTypeConverter(XmlObjectTypeConverter value) {
-		// TODO Auto-generated method stub
-		
+		throw new UnsupportedOperationException("cannot set values on a virtual mapping"); //$NON-NLS-1$
 	}
 
 	public void setStructConverter(XmlStructConverter value) {
-		// TODO Auto-generated method stub
-		
+		throw new UnsupportedOperationException("cannot set values on a virtual mapping"); //$NON-NLS-1$
 	}
 
 	public void setTypeConverter(XmlTypeConverter value) {
-		// TODO Auto-generated method stub
-		
+		throw new UnsupportedOperationException("cannot set values on a virtual mapping"); //$NON-NLS-1$
 	}
 }
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/resource/orm/translators/EclipseLinkBasicTranslator.java b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/resource/orm/translators/EclipseLinkBasicTranslator.java
index 7f6ebb8bce..3f20b681af 100644
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/resource/orm/translators/EclipseLinkBasicTranslator.java
+++ b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/resource/orm/translators/EclipseLinkBasicTranslator.java
@@ -58,18 +58,18 @@ public class EclipseLinkBasicTranslator extends BasicTranslator
 	}
 	
 	protected Translator createConverterTranslator() {
-		return new Translator(CONVERTER, ECLIPSELINK_ORM_PKG.getXmlConverterHolder_Converter());
+		return new ConverterTranslator(CONVERTER, ECLIPSELINK_ORM_PKG.getXmlConverterHolder_Converter());
 	}
 	
 	protected Translator createTypeConverterTranslator() {
-		return new Translator(TYPE_CONVERTER, ECLIPSELINK_ORM_PKG.getXmlConverterHolder_TypeConverter());
+		return new TypeConverterTranslator(TYPE_CONVERTER, ECLIPSELINK_ORM_PKG.getXmlConverterHolder_TypeConverter());
 	}
 	
 	protected Translator createObjectTypeConverterTranslator() {
-		return new Translator(OBJECT_TYPE_CONVERTER, ECLIPSELINK_ORM_PKG.getXmlConverterHolder_ObjectTypeConverter());
+		return new ObjectTypeConverterTranslator(OBJECT_TYPE_CONVERTER, ECLIPSELINK_ORM_PKG.getXmlConverterHolder_ObjectTypeConverter());
 	}
 	
 	protected Translator createStructConverterTranslator() {
-		return new Translator(STRUCT_CONVERTER, ECLIPSELINK_ORM_PKG.getXmlConverterHolder_StructConverter());
+		return new StructConverterTranslator(STRUCT_CONVERTER, ECLIPSELINK_ORM_PKG.getXmlConverterHolder_StructConverter());
 	}
 }
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/resource/orm/translators/EclipseLinkIdTranslator.java b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/resource/orm/translators/EclipseLinkIdTranslator.java
index d3af3c34b3..d43d3d2e2f 100644
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/resource/orm/translators/EclipseLinkIdTranslator.java
+++ b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/resource/orm/translators/EclipseLinkIdTranslator.java
@@ -55,18 +55,18 @@ public class EclipseLinkIdTranslator extends IdTranslator
 	}
 	
 	protected Translator createConverterTranslator() {
-		return new Translator(CONVERTER, ECLIPSELINK_ORM_PKG.getXmlConverterHolder_Converter());
+		return new ConverterTranslator(CONVERTER, ECLIPSELINK_ORM_PKG.getXmlConverterHolder_Converter());
 	}
 	
 	protected Translator createTypeConverterTranslator() {
-		return new Translator(TYPE_CONVERTER, ECLIPSELINK_ORM_PKG.getXmlConverterHolder_TypeConverter());
+		return new TypeConverterTranslator(TYPE_CONVERTER, ECLIPSELINK_ORM_PKG.getXmlConverterHolder_TypeConverter());
 	}
 	
 	protected Translator createObjectTypeConverterTranslator() {
-		return new Translator(OBJECT_TYPE_CONVERTER, ECLIPSELINK_ORM_PKG.getXmlConverterHolder_ObjectTypeConverter());
+		return new ObjectTypeConverterTranslator(OBJECT_TYPE_CONVERTER, ECLIPSELINK_ORM_PKG.getXmlConverterHolder_ObjectTypeConverter());
 	}
 	
 	protected Translator createStructConverterTranslator() {
-		return new Translator(STRUCT_CONVERTER, ECLIPSELINK_ORM_PKG.getXmlConverterHolder_StructConverter());
+		return new StructConverterTranslator(STRUCT_CONVERTER, ECLIPSELINK_ORM_PKG.getXmlConverterHolder_StructConverter());
 	}
 }
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/resource/orm/translators/EclipseLinkOrmXmlMapper.java b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/resource/orm/translators/EclipseLinkOrmXmlMapper.java
index c85342affe..73c76a8d6f 100644
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/resource/orm/translators/EclipseLinkOrmXmlMapper.java
+++ b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/resource/orm/translators/EclipseLinkOrmXmlMapper.java
@@ -51,7 +51,7 @@ public interface EclipseLinkOrmXmlMapper
 	
 	String MUTABLE = "mutable";  //$NON-NLS-1$
 	
-	String OBJECT_TYPE_CONVERTER = "type-converter"; //$NON-NLS-1$
+	String OBJECT_TYPE_CONVERTER = "object-type-converter"; //$NON-NLS-1$
 	String OBJECT_TYPE_CONVERTER__NAME = "name"; //$NON-NLS-1$
 	String OBJECT_TYPE_CONVERTER__DATA_TYPE = "data-type"; //$NON-NLS-1$
 	String OBJECT_TYPE_CONVERTER__OBJECT_TYPE = "object-type"; //$NON-NLS-1$
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/resource/orm/translators/EclipseLinkVersionTranslator.java b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/resource/orm/translators/EclipseLinkVersionTranslator.java
index c0a747b6b7..b11028e897 100644
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/resource/orm/translators/EclipseLinkVersionTranslator.java
+++ b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/resource/orm/translators/EclipseLinkVersionTranslator.java
@@ -52,18 +52,18 @@ public class EclipseLinkVersionTranslator extends VersionTranslator
 	}
 	
 	protected Translator createConverterTranslator() {
-		return new Translator(CONVERTER, ECLIPSELINK_ORM_PKG.getXmlConverterHolder_Converter());
+		return new ConverterTranslator(CONVERTER, ECLIPSELINK_ORM_PKG.getXmlConverterHolder_Converter());
 	}
 	
 	protected Translator createTypeConverterTranslator() {
-		return new Translator(TYPE_CONVERTER, ECLIPSELINK_ORM_PKG.getXmlConverterHolder_TypeConverter());
+		return new TypeConverterTranslator(TYPE_CONVERTER, ECLIPSELINK_ORM_PKG.getXmlConverterHolder_TypeConverter());
 	}
 	
 	protected Translator createObjectTypeConverterTranslator() {
-		return new Translator(OBJECT_TYPE_CONVERTER, ECLIPSELINK_ORM_PKG.getXmlConverterHolder_ObjectTypeConverter());
+		return new ObjectTypeConverterTranslator(OBJECT_TYPE_CONVERTER, ECLIPSELINK_ORM_PKG.getXmlConverterHolder_ObjectTypeConverter());
 	}
 	
 	protected Translator createStructConverterTranslator() {
-		return new Translator(STRUCT_CONVERTER, ECLIPSELINK_ORM_PKG.getXmlConverterHolder_StructConverter());
+		return new StructConverterTranslator(STRUCT_CONVERTER, ECLIPSELINK_ORM_PKG.getXmlConverterHolder_StructConverter());
 	}
 }
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/resource/orm/translators/ObjectTypeConverterTranslator.java b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/resource/orm/translators/ObjectTypeConverterTranslator.java
index 84599c4a57..41a613f82f 100644
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/resource/orm/translators/ObjectTypeConverterTranslator.java
+++ b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/resource/orm/translators/ObjectTypeConverterTranslator.java
@@ -44,7 +44,7 @@ public class ObjectTypeConverterTranslator extends Translator
 	}
 	
 	protected Translator createDefaultObjectValueTranslator() {
-		return new Translator(OBJECT_TYPE_CONVERTER__DEFAULT_OBJECT_VALUE, ECLIPSELINK_ORM_PKG.getXmlTypeConverter_Name(), DOM_ATTRIBUTE);
+		return new Translator(OBJECT_TYPE_CONVERTER__DEFAULT_OBJECT_VALUE, ECLIPSELINK_ORM_PKG.getXmlObjectTypeConverter_DefaultObjectValue());
 	}
 	
 	protected Translator createNameTranslator() {
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/orm/EclipseLinkOrmFactory.java b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/orm/EclipseLinkOrmFactory.java
index 8662e27443..fd8fccdcda 100644
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/orm/EclipseLinkOrmFactory.java
+++ b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/orm/EclipseLinkOrmFactory.java
@@ -85,11 +85,11 @@ public class EclipseLinkOrmFactory extends EFactoryImpl
 			case EclipseLinkOrmPackage.XML_CACHE: return (EObject)createXmlCache();
 			case EclipseLinkOrmPackage.XML_ENTITY: return (EObject)createXmlEntity();
 			case EclipseLinkOrmPackage.XML_MAPPED_SUPERCLASS: return (EObject)createXmlMappedSuperclass();
-			case EclipseLinkOrmPackage.XML_CONVERTER: return (EObject)createXmlConverter();
-			case EclipseLinkOrmPackage.XML_TYPE_CONVERTER: return (EObject)createXmlTypeConverter();
-			case EclipseLinkOrmPackage.XML_CONVERSION_VALUE: return (EObject)createXmlConversionValue();
-			case EclipseLinkOrmPackage.XML_OBJECT_TYPE_CONVERTER: return (EObject)createXmlObjectTypeConverter();
-			case EclipseLinkOrmPackage.XML_STRUCT_CONVERTER: return (EObject)createXmlStructConverter();
+			case EclipseLinkOrmPackage.XML_CONVERTER_IMPL: return (EObject)createXmlConverterImpl();
+			case EclipseLinkOrmPackage.XML_TYPE_CONVERTER_IMPL: return (EObject)createXmlTypeConverterImpl();
+			case EclipseLinkOrmPackage.XML_CONVERSION_VALUE_IMPL: return (EObject)createXmlConversionValueImpl();
+			case EclipseLinkOrmPackage.XML_OBJECT_TYPE_CONVERTER_IMPL: return (EObject)createXmlObjectTypeConverterImpl();
+			case EclipseLinkOrmPackage.XML_STRUCT_CONVERTER_IMPL: return (EObject)createXmlStructConverterImpl();
 			case EclipseLinkOrmPackage.XML_ID_IMPL: return (EObject)createXmlIdImpl();
 			case EclipseLinkOrmPackage.XML_BASIC_IMPL: return (EObject)createXmlBasicImpl();
 			case EclipseLinkOrmPackage.XML_VERSION_IMPL: return (EObject)createXmlVersionImpl();
@@ -197,10 +197,10 @@ public class EclipseLinkOrmFactory extends EFactoryImpl
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public XmlIdImpl createXmlIdImpl()
+	public XmlConverterImpl createXmlConverterImpl()
 	{
-		XmlIdImpl xmlIdImpl = new XmlIdImpl();
-		return xmlIdImpl;
+		XmlConverterImpl xmlConverterImpl = new XmlConverterImpl();
+		return xmlConverterImpl;
 	}
 
 	/**
@@ -208,10 +208,10 @@ public class EclipseLinkOrmFactory extends EFactoryImpl
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public XmlBasicImpl createXmlBasicImpl()
+	public XmlTypeConverterImpl createXmlTypeConverterImpl()
 	{
-		XmlBasicImpl xmlBasicImpl = new XmlBasicImpl();
-		return xmlBasicImpl;
+		XmlTypeConverterImpl xmlTypeConverterImpl = new XmlTypeConverterImpl();
+		return xmlTypeConverterImpl;
 	}
 
 	/**
@@ -219,10 +219,10 @@ public class EclipseLinkOrmFactory extends EFactoryImpl
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public XmlVersionImpl createXmlVersionImpl()
+	public XmlConversionValueImpl createXmlConversionValueImpl()
 	{
-		XmlVersionImpl xmlVersionImpl = new XmlVersionImpl();
-		return xmlVersionImpl;
+		XmlConversionValueImpl xmlConversionValueImpl = new XmlConversionValueImpl();
+		return xmlConversionValueImpl;
 	}
 
 	/**
@@ -230,10 +230,10 @@ public class EclipseLinkOrmFactory extends EFactoryImpl
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public XmlOneToOneImpl createXmlOneToOneImpl()
+	public XmlObjectTypeConverterImpl createXmlObjectTypeConverterImpl()
 	{
-		XmlOneToOneImpl xmlOneToOneImpl = new XmlOneToOneImpl();
-		return xmlOneToOneImpl;
+		XmlObjectTypeConverterImpl xmlObjectTypeConverterImpl = new XmlObjectTypeConverterImpl();
+		return xmlObjectTypeConverterImpl;
 	}
 
 	/**
@@ -241,10 +241,10 @@ public class EclipseLinkOrmFactory extends EFactoryImpl
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public XmlOneToManyImpl createXmlOneToManyImpl()
+	public XmlStructConverterImpl createXmlStructConverterImpl()
 	{
-		XmlOneToManyImpl xmlOneToManyImpl = new XmlOneToManyImpl();
-		return xmlOneToManyImpl;
+		XmlStructConverterImpl xmlStructConverterImpl = new XmlStructConverterImpl();
+		return xmlStructConverterImpl;
 	}
 
 	/**
@@ -252,10 +252,10 @@ public class EclipseLinkOrmFactory extends EFactoryImpl
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public XmlManyToOneImpl createXmlManyToOneImpl()
+	public XmlIdImpl createXmlIdImpl()
 	{
-		XmlManyToOneImpl xmlManyToOneImpl = new XmlManyToOneImpl();
-		return xmlManyToOneImpl;
+		XmlIdImpl xmlIdImpl = new XmlIdImpl();
+		return xmlIdImpl;
 	}
 
 	/**
@@ -263,10 +263,10 @@ public class EclipseLinkOrmFactory extends EFactoryImpl
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public XmlManyToManyImpl createXmlManyToManyImpl()
+	public XmlBasicImpl createXmlBasicImpl()
 	{
-		XmlManyToManyImpl xmlManyToManyImpl = new XmlManyToManyImpl();
-		return xmlManyToManyImpl;
+		XmlBasicImpl xmlBasicImpl = new XmlBasicImpl();
+		return xmlBasicImpl;
 	}
 
 	/**
@@ -274,10 +274,10 @@ public class EclipseLinkOrmFactory extends EFactoryImpl
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public XmlConverter createXmlConverter()
+	public XmlVersionImpl createXmlVersionImpl()
 	{
-		XmlConverter xmlConverter = new XmlConverter();
-		return xmlConverter;
+		XmlVersionImpl xmlVersionImpl = new XmlVersionImpl();
+		return xmlVersionImpl;
 	}
 
 	/**
@@ -285,10 +285,10 @@ public class EclipseLinkOrmFactory extends EFactoryImpl
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public XmlTypeConverter createXmlTypeConverter()
+	public XmlOneToOneImpl createXmlOneToOneImpl()
 	{
-		XmlTypeConverter xmlTypeConverter = new XmlTypeConverter();
-		return xmlTypeConverter;
+		XmlOneToOneImpl xmlOneToOneImpl = new XmlOneToOneImpl();
+		return xmlOneToOneImpl;
 	}
 
 	/**
@@ -296,10 +296,10 @@ public class EclipseLinkOrmFactory extends EFactoryImpl
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public XmlConversionValue createXmlConversionValue()
+	public XmlOneToManyImpl createXmlOneToManyImpl()
 	{
-		XmlConversionValue xmlConversionValue = new XmlConversionValue();
-		return xmlConversionValue;
+		XmlOneToManyImpl xmlOneToManyImpl = new XmlOneToManyImpl();
+		return xmlOneToManyImpl;
 	}
 
 	/**
@@ -307,10 +307,10 @@ public class EclipseLinkOrmFactory extends EFactoryImpl
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public XmlObjectTypeConverter createXmlObjectTypeConverter()
+	public XmlManyToOneImpl createXmlManyToOneImpl()
 	{
-		XmlObjectTypeConverter xmlObjectTypeConverter = new XmlObjectTypeConverter();
-		return xmlObjectTypeConverter;
+		XmlManyToOneImpl xmlManyToOneImpl = new XmlManyToOneImpl();
+		return xmlManyToOneImpl;
 	}
 
 	/**
@@ -318,10 +318,10 @@ public class EclipseLinkOrmFactory extends EFactoryImpl
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public XmlStructConverter createXmlStructConverter()
+	public XmlManyToManyImpl createXmlManyToManyImpl()
 	{
-		XmlStructConverter xmlStructConverter = new XmlStructConverter();
-		return xmlStructConverter;
+		XmlManyToManyImpl xmlManyToManyImpl = new XmlManyToManyImpl();
+		return xmlManyToManyImpl;
 	}
 
 	/**
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/orm/EclipseLinkOrmPackage.java b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/orm/EclipseLinkOrmPackage.java
index 7cc0bda3b7..fafe6f8539 100644
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/orm/EclipseLinkOrmPackage.java
+++ b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/orm/EclipseLinkOrmPackage.java
@@ -979,52 +979,7 @@ public class EclipseLinkOrmPackage extends EPackageImpl
 	 * @see org.eclipse.jpt.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlConvertibleMapping()
 	 * @generated
 	 */
-	public static final int XML_CONVERTIBLE_MAPPING = 10;
-
-	/**
-	 * The feature id for the '<em><b>Lob</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_CONVERTIBLE_MAPPING__LOB = OrmPackage.XML_CONVERTIBLE_MAPPING__LOB;
-
-	/**
-	 * The feature id for the '<em><b>Temporal</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_CONVERTIBLE_MAPPING__TEMPORAL = OrmPackage.XML_CONVERTIBLE_MAPPING__TEMPORAL;
-
-	/**
-	 * The feature id for the '<em><b>Enumerated</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_CONVERTIBLE_MAPPING__ENUMERATED = OrmPackage.XML_CONVERTIBLE_MAPPING__ENUMERATED;
-
-	/**
-	 * The feature id for the '<em><b>Convert</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_CONVERTIBLE_MAPPING__CONVERT = OrmPackage.XML_CONVERTIBLE_MAPPING_FEATURE_COUNT + 0;
-
-	/**
-	 * The number of structural features of the '<em>Xml Convertible Mapping</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	public static final int XML_CONVERTIBLE_MAPPING_FEATURE_COUNT = OrmPackage.XML_CONVERTIBLE_MAPPING_FEATURE_COUNT + 1;
+	public static final int XML_CONVERTIBLE_MAPPING = 21;
 
 	/**
 	 * The meta object id for the '{@link org.eclipse.jpt.eclipselink.core.resource.orm.XmlId <em>Xml Id</em>}' class.
@@ -1034,7 +989,7 @@ public class EclipseLinkOrmPackage extends EPackageImpl
 	 * @see org.eclipse.jpt.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlId()
 	 * @generated
 	 */
-	public static final int XML_ID = 17;
+	public static final int XML_ID = 22;
 
 	/**
 	 * The meta object id for the '{@link org.eclipse.jpt.eclipselink.core.resource.orm.XmlIdImpl <em>Xml Id Impl</em>}' class.
@@ -1044,7 +999,7 @@ public class EclipseLinkOrmPackage extends EPackageImpl
 	 * @see org.eclipse.jpt.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlIdImpl()
 	 * @generated
 	 */
-	public static final int XML_ID_IMPL = 18;
+	public static final int XML_ID_IMPL = 23;
 
 	/**
 	 * The meta object id for the '{@link org.eclipse.jpt.eclipselink.core.resource.orm.XmlBasic <em>Xml Basic</em>}' class.
@@ -1054,7 +1009,7 @@ public class EclipseLinkOrmPackage extends EPackageImpl
 	 * @see org.eclipse.jpt.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlBasic()
 	 * @generated
 	 */
-	public static final int XML_BASIC = 19;
+	public static final int XML_BASIC = 24;
 
 	/**
 	 * The meta object id for the '{@link org.eclipse.jpt.eclipselink.core.resource.orm.XmlBasicImpl <em>Xml Basic Impl</em>}' class.
@@ -1064,7 +1019,7 @@ public class EclipseLinkOrmPackage extends EPackageImpl
 	 * @see org.eclipse.jpt.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlBasicImpl()
 	 * @generated
 	 */
-	public static final int XML_BASIC_IMPL = 20;
+	public static final int XML_BASIC_IMPL = 25;
 
 	/**
 	 * The meta object id for the '{@link org.eclipse.jpt.eclipselink.core.resource.orm.XmlVersion <em>Xml Version</em>}' class.
@@ -1074,7 +1029,7 @@ public class EclipseLinkOrmPackage extends EPackageImpl
 	 * @see org.eclipse.jpt.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlVersion()
 	 * @generated
 	 */
-	public static final int XML_VERSION = 21;
+	public static final int XML_VERSION = 26;
 
 	/**
 	 * The meta object id for the '{@link org.eclipse.jpt.eclipselink.core.resource.orm.XmlVersionImpl <em>Xml Version Impl</em>}' class.
@@ -1084,7 +1039,7 @@ public class EclipseLinkOrmPackage extends EPackageImpl
 	 * @see org.eclipse.jpt.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlVersionImpl()
 	 * @generated
 	 */
-	public static final int XML_VERSION_IMPL = 22;
+	public static final int XML_VERSION_IMPL = 27;
 
 	/**
 	 * The meta object id for the '{@link org.eclipse.jpt.eclipselink.core.resource.orm.XmlPrivateOwned <em>Xml Private Owned</em>}' class.
@@ -1094,7 +1049,7 @@ public class EclipseLinkOrmPackage extends EPackageImpl
 	 * @see org.eclipse.jpt.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlPrivateOwned()
 	 * @generated
 	 */
-	public static final int XML_PRIVATE_OWNED = 23;
+	public static final int XML_PRIVATE_OWNED = 28;
 
 	/**
 	 * The meta object id for the '{@link org.eclipse.jpt.eclipselink.core.resource.orm.XmlJoinFetch <em>Xml Join Fetch</em>}' class.
@@ -1104,7 +1059,7 @@ public class EclipseLinkOrmPackage extends EPackageImpl
 	 * @see org.eclipse.jpt.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlJoinFetch()
 	 * @generated
 	 */
-	public static final int XML_JOIN_FETCH = 24;
+	public static final int XML_JOIN_FETCH = 29;
 
 	/**
 	 * The meta object id for the '{@link org.eclipse.jpt.eclipselink.core.resource.orm.XmlOneToOne <em>Xml One To One</em>}' class.
@@ -1114,7 +1069,7 @@ public class EclipseLinkOrmPackage extends EPackageImpl
 	 * @see org.eclipse.jpt.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlOneToOne()
 	 * @generated
 	 */
-	public static final int XML_ONE_TO_ONE = 25;
+	public static final int XML_ONE_TO_ONE = 30;
 
 	/**
 	 * The meta object id for the '{@link org.eclipse.jpt.eclipselink.core.resource.orm.XmlOneToOneImpl <em>Xml One To One Impl</em>}' class.
@@ -1124,7 +1079,7 @@ public class EclipseLinkOrmPackage extends EPackageImpl
 	 * @see org.eclipse.jpt.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlOneToOneImpl()
 	 * @generated
 	 */
-	public static final int XML_ONE_TO_ONE_IMPL = 26;
+	public static final int XML_ONE_TO_ONE_IMPL = 31;
 
 	/**
 	 * The meta object id for the '{@link org.eclipse.jpt.eclipselink.core.resource.orm.XmlOneToMany <em>Xml One To Many</em>}' class.
@@ -1134,7 +1089,7 @@ public class EclipseLinkOrmPackage extends EPackageImpl
 	 * @see org.eclipse.jpt.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlOneToMany()
 	 * @generated
 	 */
-	public static final int XML_ONE_TO_MANY = 27;
+	public static final int XML_ONE_TO_MANY = 32;
 
 	/**
 	 * The meta object id for the '{@link org.eclipse.jpt.eclipselink.core.resource.orm.XmlOneToManyImpl <em>Xml One To Many Impl</em>}' class.
@@ -1144,7 +1099,7 @@ public class EclipseLinkOrmPackage extends EPackageImpl
 	 * @see org.eclipse.jpt.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlOneToManyImpl()
 	 * @generated
 	 */
-	public static final int XML_ONE_TO_MANY_IMPL = 28;
+	public static final int XML_ONE_TO_MANY_IMPL = 33;
 
 	/**
 	 * The meta object id for the '{@link org.eclipse.jpt.eclipselink.core.resource.orm.XmlManyToOne <em>Xml Many To One</em>}' class.
@@ -1154,7 +1109,7 @@ public class EclipseLinkOrmPackage extends EPackageImpl
 	 * @see org.eclipse.jpt.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlManyToOne()
 	 * @generated
 	 */
-	public static final int XML_MANY_TO_ONE = 29;
+	public static final int XML_MANY_TO_ONE = 34;
 
 	/**
 	 * The meta object id for the '{@link org.eclipse.jpt.eclipselink.core.resource.orm.XmlManyToOneImpl <em>Xml Many To One Impl</em>}' class.
@@ -1164,7 +1119,7 @@ public class EclipseLinkOrmPackage extends EPackageImpl
 	 * @see org.eclipse.jpt.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlManyToOneImpl()
 	 * @generated
 	 */
-	public static final int XML_MANY_TO_ONE_IMPL = 30;
+	public static final int XML_MANY_TO_ONE_IMPL = 35;
 
 	/**
 	 * The meta object id for the '{@link org.eclipse.jpt.eclipselink.core.resource.orm.XmlManyToMany <em>Xml Many To Many</em>}' class.
@@ -1174,7 +1129,7 @@ public class EclipseLinkOrmPackage extends EPackageImpl
 	 * @see org.eclipse.jpt.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlManyToMany()
 	 * @generated
 	 */
-	public static final int XML_MANY_TO_MANY = 31;
+	public static final int XML_MANY_TO_MANY = 36;
 
 	/**
 	 * The meta object id for the '{@link org.eclipse.jpt.eclipselink.core.resource.orm.XmlManyToManyImpl <em>Xml Many To Many Impl</em>}' class.
@@ -1184,7 +1139,7 @@ public class EclipseLinkOrmPackage extends EPackageImpl
 	 * @see org.eclipse.jpt.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlManyToManyImpl()
 	 * @generated
 	 */
-	public static final int XML_MANY_TO_MANY_IMPL = 32;
+	public static final int XML_MANY_TO_MANY_IMPL = 37;
 
 	/**
 	 * The meta object id for the '{@link org.eclipse.jpt.eclipselink.core.resource.orm.XmlConverter <em>Xml Converter</em>}' class.
@@ -1194,7 +1149,57 @@ public class EclipseLinkOrmPackage extends EPackageImpl
 	 * @see org.eclipse.jpt.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlConverter()
 	 * @generated
 	 */
-	public static final int XML_CONVERTER = 11;
+	public static final int XML_CONVERTER = 10;
+
+	/**
+	 * The meta object id for the '{@link org.eclipse.jpt.eclipselink.core.resource.orm.XmlTypeConverter <em>Xml Type Converter</em>}' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see org.eclipse.jpt.eclipselink.core.resource.orm.XmlTypeConverter
+	 * @see org.eclipse.jpt.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlTypeConverter()
+	 * @generated
+	 */
+	public static final int XML_TYPE_CONVERTER = 12;
+
+	/**
+	 * The meta object id for the '{@link org.eclipse.jpt.eclipselink.core.resource.orm.XmlConversionValue <em>Xml Conversion Value</em>}' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see org.eclipse.jpt.eclipselink.core.resource.orm.XmlConversionValue
+	 * @see org.eclipse.jpt.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlConversionValue()
+	 * @generated
+	 */
+	public static final int XML_CONVERSION_VALUE = 14;
+
+	/**
+	 * The meta object id for the '{@link org.eclipse.jpt.eclipselink.core.resource.orm.XmlObjectTypeConverter <em>Xml Object Type Converter</em>}' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see org.eclipse.jpt.eclipselink.core.resource.orm.XmlObjectTypeConverter
+	 * @see org.eclipse.jpt.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlObjectTypeConverter()
+	 * @generated
+	 */
+	public static final int XML_OBJECT_TYPE_CONVERTER = 16;
+
+	/**
+	 * The meta object id for the '{@link org.eclipse.jpt.eclipselink.core.resource.orm.XmlStructConverter <em>Xml Struct Converter</em>}' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see org.eclipse.jpt.eclipselink.core.resource.orm.XmlStructConverter
+	 * @see org.eclipse.jpt.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlStructConverter()
+	 * @generated
+	 */
+	public static final int XML_STRUCT_CONVERTER = 18;
+
+	/**
+	 * The meta object id for the '{@link org.eclipse.jpt.eclipselink.core.resource.orm.XmlConverterHolder <em>Xml Converter Holder</em>}' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see org.eclipse.jpt.eclipselink.core.resource.orm.XmlConverterHolder
+	 * @see org.eclipse.jpt.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlConverterHolder()
+	 * @generated
+	 */
+	public static final int XML_CONVERTER_HOLDER = 20;
 
 	/**
 	 * The feature id for the '<em><b>Name</b></em>' attribute.
@@ -1224,14 +1229,41 @@ public class EclipseLinkOrmPackage extends EPackageImpl
 	public static final int XML_CONVERTER_FEATURE_COUNT = 2;
 
 	/**
-	 * The meta object id for the '{@link org.eclipse.jpt.eclipselink.core.resource.orm.XmlTypeConverter <em>Xml Type Converter</em>}' class.
+	 * The meta object id for the '{@link org.eclipse.jpt.eclipselink.core.resource.orm.XmlConverterImpl <em>Xml Converter Impl</em>}' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @see org.eclipse.jpt.eclipselink.core.resource.orm.XmlTypeConverter
-	 * @see org.eclipse.jpt.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlTypeConverter()
+	 * @see org.eclipse.jpt.eclipselink.core.resource.orm.XmlConverterImpl
+	 * @see org.eclipse.jpt.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlConverterImpl()
 	 * @generated
 	 */
-	public static final int XML_TYPE_CONVERTER = 12;
+	public static final int XML_CONVERTER_IMPL = 11;
+
+	/**
+	 * The feature id for the '<em><b>Name</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	public static final int XML_CONVERTER_IMPL__NAME = XML_CONVERTER__NAME;
+
+	/**
+	 * The feature id for the '<em><b>Class Name</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	public static final int XML_CONVERTER_IMPL__CLASS_NAME = XML_CONVERTER__CLASS_NAME;
+
+	/**
+	 * The number of structural features of the '<em>Xml Converter Impl</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	public static final int XML_CONVERTER_IMPL_FEATURE_COUNT = XML_CONVERTER_FEATURE_COUNT + 0;
 
 	/**
 	 * The feature id for the '<em><b>Name</b></em>' attribute.
@@ -1270,14 +1302,50 @@ public class EclipseLinkOrmPackage extends EPackageImpl
 	public static final int XML_TYPE_CONVERTER_FEATURE_COUNT = 3;
 
 	/**
-	 * The meta object id for the '{@link org.eclipse.jpt.eclipselink.core.resource.orm.XmlConversionValue <em>Xml Conversion Value</em>}' class.
+	 * The meta object id for the '{@link org.eclipse.jpt.eclipselink.core.resource.orm.XmlTypeConverterImpl <em>Xml Type Converter Impl</em>}' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see org.eclipse.jpt.eclipselink.core.resource.orm.XmlTypeConverterImpl
+	 * @see org.eclipse.jpt.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlTypeConverterImpl()
+	 * @generated
+	 */
+	public static final int XML_TYPE_CONVERTER_IMPL = 13;
+
+	/**
+	 * The feature id for the '<em><b>Name</b></em>' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @see org.eclipse.jpt.eclipselink.core.resource.orm.XmlConversionValue
-	 * @see org.eclipse.jpt.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlConversionValue()
 	 * @generated
+	 * @ordered
 	 */
-	public static final int XML_CONVERSION_VALUE = 13;
+	public static final int XML_TYPE_CONVERTER_IMPL__NAME = XML_TYPE_CONVERTER__NAME;
+
+	/**
+	 * The feature id for the '<em><b>Data Type</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	public static final int XML_TYPE_CONVERTER_IMPL__DATA_TYPE = XML_TYPE_CONVERTER__DATA_TYPE;
+
+	/**
+	 * The feature id for the '<em><b>Object Type</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	public static final int XML_TYPE_CONVERTER_IMPL__OBJECT_TYPE = XML_TYPE_CONVERTER__OBJECT_TYPE;
+
+	/**
+	 * The number of structural features of the '<em>Xml Type Converter Impl</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	public static final int XML_TYPE_CONVERTER_IMPL_FEATURE_COUNT = XML_TYPE_CONVERTER_FEATURE_COUNT + 0;
 
 	/**
 	 * The feature id for the '<em><b>Data Value</b></em>' attribute.
@@ -1307,14 +1375,41 @@ public class EclipseLinkOrmPackage extends EPackageImpl
 	public static final int XML_CONVERSION_VALUE_FEATURE_COUNT = 2;
 
 	/**
-	 * The meta object id for the '{@link org.eclipse.jpt.eclipselink.core.resource.orm.XmlObjectTypeConverter <em>Xml Object Type Converter</em>}' class.
+	 * The meta object id for the '{@link org.eclipse.jpt.eclipselink.core.resource.orm.XmlConversionValueImpl <em>Xml Conversion Value Impl</em>}' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see org.eclipse.jpt.eclipselink.core.resource.orm.XmlConversionValueImpl
+	 * @see org.eclipse.jpt.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlConversionValueImpl()
+	 * @generated
+	 */
+	public static final int XML_CONVERSION_VALUE_IMPL = 15;
+
+	/**
+	 * The feature id for the '<em><b>Data Value</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	public static final int XML_CONVERSION_VALUE_IMPL__DATA_VALUE = XML_CONVERSION_VALUE__DATA_VALUE;
+
+	/**
+	 * The feature id for the '<em><b>Object Value</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	public static final int XML_CONVERSION_VALUE_IMPL__OBJECT_VALUE = XML_CONVERSION_VALUE__OBJECT_VALUE;
+
+	/**
+	 * The number of structural features of the '<em>Xml Conversion Value Impl</em>' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @see org.eclipse.jpt.eclipselink.core.resource.orm.XmlObjectTypeConverter
-	 * @see org.eclipse.jpt.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlObjectTypeConverter()
 	 * @generated
+	 * @ordered
 	 */
-	public static final int XML_OBJECT_TYPE_CONVERTER = 14;
+	public static final int XML_CONVERSION_VALUE_IMPL_FEATURE_COUNT = XML_CONVERSION_VALUE_FEATURE_COUNT + 0;
 
 	/**
 	 * The feature id for the '<em><b>Conversion Values</b></em>' containment reference list.
@@ -1371,14 +1466,68 @@ public class EclipseLinkOrmPackage extends EPackageImpl
 	public static final int XML_OBJECT_TYPE_CONVERTER_FEATURE_COUNT = 5;
 
 	/**
-	 * The meta object id for the '{@link org.eclipse.jpt.eclipselink.core.resource.orm.XmlStructConverter <em>Xml Struct Converter</em>}' class.
+	 * The meta object id for the '{@link org.eclipse.jpt.eclipselink.core.resource.orm.XmlObjectTypeConverterImpl <em>Xml Object Type Converter Impl</em>}' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see org.eclipse.jpt.eclipselink.core.resource.orm.XmlObjectTypeConverterImpl
+	 * @see org.eclipse.jpt.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlObjectTypeConverterImpl()
+	 * @generated
+	 */
+	public static final int XML_OBJECT_TYPE_CONVERTER_IMPL = 17;
+
+	/**
+	 * The feature id for the '<em><b>Conversion Values</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	public static final int XML_OBJECT_TYPE_CONVERTER_IMPL__CONVERSION_VALUES = XML_OBJECT_TYPE_CONVERTER__CONVERSION_VALUES;
+
+	/**
+	 * The feature id for the '<em><b>Default Object Value</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	public static final int XML_OBJECT_TYPE_CONVERTER_IMPL__DEFAULT_OBJECT_VALUE = XML_OBJECT_TYPE_CONVERTER__DEFAULT_OBJECT_VALUE;
+
+	/**
+	 * The feature id for the '<em><b>Name</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	public static final int XML_OBJECT_TYPE_CONVERTER_IMPL__NAME = XML_OBJECT_TYPE_CONVERTER__NAME;
+
+	/**
+	 * The feature id for the '<em><b>Data Type</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	public static final int XML_OBJECT_TYPE_CONVERTER_IMPL__DATA_TYPE = XML_OBJECT_TYPE_CONVERTER__DATA_TYPE;
+
+	/**
+	 * The feature id for the '<em><b>Object Type</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	public static final int XML_OBJECT_TYPE_CONVERTER_IMPL__OBJECT_TYPE = XML_OBJECT_TYPE_CONVERTER__OBJECT_TYPE;
+
+	/**
+	 * The number of structural features of the '<em>Xml Object Type Converter Impl</em>' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @see org.eclipse.jpt.eclipselink.core.resource.orm.XmlStructConverter
-	 * @see org.eclipse.jpt.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlStructConverter()
 	 * @generated
+	 * @ordered
 	 */
-	public static final int XML_STRUCT_CONVERTER = 15;
+	public static final int XML_OBJECT_TYPE_CONVERTER_IMPL_FEATURE_COUNT = XML_OBJECT_TYPE_CONVERTER_FEATURE_COUNT + 0;
 
 	/**
 	 * The feature id for the '<em><b>Name</b></em>' attribute.
@@ -1408,14 +1557,41 @@ public class EclipseLinkOrmPackage extends EPackageImpl
 	public static final int XML_STRUCT_CONVERTER_FEATURE_COUNT = 2;
 
 	/**
-	 * The meta object id for the '{@link org.eclipse.jpt.eclipselink.core.resource.orm.XmlConverterHolder <em>Xml Converter Holder</em>}' class.
+	 * The meta object id for the '{@link org.eclipse.jpt.eclipselink.core.resource.orm.XmlStructConverterImpl <em>Xml Struct Converter Impl</em>}' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see org.eclipse.jpt.eclipselink.core.resource.orm.XmlStructConverterImpl
+	 * @see org.eclipse.jpt.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlStructConverterImpl()
+	 * @generated
+	 */
+	public static final int XML_STRUCT_CONVERTER_IMPL = 19;
+
+	/**
+	 * The feature id for the '<em><b>Name</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	public static final int XML_STRUCT_CONVERTER_IMPL__NAME = XML_STRUCT_CONVERTER__NAME;
+
+	/**
+	 * The feature id for the '<em><b>Converter</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	public static final int XML_STRUCT_CONVERTER_IMPL__CONVERTER = XML_STRUCT_CONVERTER__CONVERTER;
+
+	/**
+	 * The number of structural features of the '<em>Xml Struct Converter Impl</em>' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @see org.eclipse.jpt.eclipselink.core.resource.orm.XmlConverterHolder
-	 * @see org.eclipse.jpt.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlConverterHolder()
 	 * @generated
+	 * @ordered
 	 */
-	public static final int XML_CONVERTER_HOLDER = 16;
+	public static final int XML_STRUCT_CONVERTER_IMPL_FEATURE_COUNT = XML_STRUCT_CONVERTER_FEATURE_COUNT + 0;
 
 	/**
 	 * The feature id for the '<em><b>Converter</b></em>' containment reference.
@@ -1463,6 +1639,87 @@ public class EclipseLinkOrmPackage extends EPackageImpl
 	public static final int XML_CONVERTER_HOLDER_FEATURE_COUNT = 4;
 
 	/**
+	 * The feature id for the '<em><b>Lob</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	public static final int XML_CONVERTIBLE_MAPPING__LOB = OrmPackage.XML_CONVERTIBLE_MAPPING__LOB;
+
+	/**
+	 * The feature id for the '<em><b>Temporal</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	public static final int XML_CONVERTIBLE_MAPPING__TEMPORAL = OrmPackage.XML_CONVERTIBLE_MAPPING__TEMPORAL;
+
+	/**
+	 * The feature id for the '<em><b>Enumerated</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	public static final int XML_CONVERTIBLE_MAPPING__ENUMERATED = OrmPackage.XML_CONVERTIBLE_MAPPING__ENUMERATED;
+
+	/**
+	 * The feature id for the '<em><b>Converter</b></em>' containment reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	public static final int XML_CONVERTIBLE_MAPPING__CONVERTER = OrmPackage.XML_CONVERTIBLE_MAPPING_FEATURE_COUNT + 0;
+
+	/**
+	 * The feature id for the '<em><b>Type Converter</b></em>' containment reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	public static final int XML_CONVERTIBLE_MAPPING__TYPE_CONVERTER = OrmPackage.XML_CONVERTIBLE_MAPPING_FEATURE_COUNT + 1;
+
+	/**
+	 * The feature id for the '<em><b>Object Type Converter</b></em>' containment reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	public static final int XML_CONVERTIBLE_MAPPING__OBJECT_TYPE_CONVERTER = OrmPackage.XML_CONVERTIBLE_MAPPING_FEATURE_COUNT + 2;
+
+	/**
+	 * The feature id for the '<em><b>Struct Converter</b></em>' containment reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	public static final int XML_CONVERTIBLE_MAPPING__STRUCT_CONVERTER = OrmPackage.XML_CONVERTIBLE_MAPPING_FEATURE_COUNT + 3;
+
+	/**
+	 * The feature id for the '<em><b>Convert</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	public static final int XML_CONVERTIBLE_MAPPING__CONVERT = OrmPackage.XML_CONVERTIBLE_MAPPING_FEATURE_COUNT + 4;
+
+	/**
+	 * The number of structural features of the '<em>Xml Convertible Mapping</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	public static final int XML_CONVERTIBLE_MAPPING_FEATURE_COUNT = OrmPackage.XML_CONVERTIBLE_MAPPING_FEATURE_COUNT + 5;
+
+	/**
 	 * The feature id for the '<em><b>Name</b></em>' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
@@ -1544,49 +1801,49 @@ public class EclipseLinkOrmPackage extends EPackageImpl
 	public static final int XML_ID__MUTABLE = OrmPackage.XML_ID_FEATURE_COUNT + 0;
 
 	/**
-	 * The feature id for the '<em><b>Convert</b></em>' attribute.
+	 * The feature id for the '<em><b>Converter</b></em>' containment reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
 	 * @ordered
 	 */
-	public static final int XML_ID__CONVERT = OrmPackage.XML_ID_FEATURE_COUNT + 1;
+	public static final int XML_ID__CONVERTER = OrmPackage.XML_ID_FEATURE_COUNT + 1;
 
 	/**
-	 * The feature id for the '<em><b>Converter</b></em>' containment reference.
+	 * The feature id for the '<em><b>Type Converter</b></em>' containment reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
 	 * @ordered
 	 */
-	public static final int XML_ID__CONVERTER = OrmPackage.XML_ID_FEATURE_COUNT + 2;
+	public static final int XML_ID__TYPE_CONVERTER = OrmPackage.XML_ID_FEATURE_COUNT + 2;
 
 	/**
-	 * The feature id for the '<em><b>Type Converter</b></em>' containment reference.
+	 * The feature id for the '<em><b>Object Type Converter</b></em>' containment reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
 	 * @ordered
 	 */
-	public static final int XML_ID__TYPE_CONVERTER = OrmPackage.XML_ID_FEATURE_COUNT + 3;
+	public static final int XML_ID__OBJECT_TYPE_CONVERTER = OrmPackage.XML_ID_FEATURE_COUNT + 3;
 
 	/**
-	 * The feature id for the '<em><b>Object Type Converter</b></em>' containment reference.
+	 * The feature id for the '<em><b>Struct Converter</b></em>' containment reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
 	 * @ordered
 	 */
-	public static final int XML_ID__OBJECT_TYPE_CONVERTER = OrmPackage.XML_ID_FEATURE_COUNT + 4;
+	public static final int XML_ID__STRUCT_CONVERTER = OrmPackage.XML_ID_FEATURE_COUNT + 4;
 
 	/**
-	 * The feature id for the '<em><b>Struct Converter</b></em>' containment reference.
+	 * The feature id for the '<em><b>Convert</b></em>' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
 	 * @ordered
 	 */
-	public static final int XML_ID__STRUCT_CONVERTER = OrmPackage.XML_ID_FEATURE_COUNT + 5;
+	public static final int XML_ID__CONVERT = OrmPackage.XML_ID_FEATURE_COUNT + 5;
 
 	/**
 	 * The number of structural features of the '<em>Xml Id</em>' class.
@@ -1679,49 +1936,49 @@ public class EclipseLinkOrmPackage extends EPackageImpl
 	public static final int XML_ID_IMPL__MUTABLE = OrmPackage.XML_ID_IMPL_FEATURE_COUNT + 0;
 
 	/**
-	 * The feature id for the '<em><b>Convert</b></em>' attribute.
+	 * The feature id for the '<em><b>Converter</b></em>' containment reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
 	 * @ordered
 	 */
-	public static final int XML_ID_IMPL__CONVERT = OrmPackage.XML_ID_IMPL_FEATURE_COUNT + 1;
+	public static final int XML_ID_IMPL__CONVERTER = OrmPackage.XML_ID_IMPL_FEATURE_COUNT + 1;
 
 	/**
-	 * The feature id for the '<em><b>Converter</b></em>' containment reference.
+	 * The feature id for the '<em><b>Type Converter</b></em>' containment reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
 	 * @ordered
 	 */
-	public static final int XML_ID_IMPL__CONVERTER = OrmPackage.XML_ID_IMPL_FEATURE_COUNT + 2;
+	public static final int XML_ID_IMPL__TYPE_CONVERTER = OrmPackage.XML_ID_IMPL_FEATURE_COUNT + 2;
 
 	/**
-	 * The feature id for the '<em><b>Type Converter</b></em>' containment reference.
+	 * The feature id for the '<em><b>Object Type Converter</b></em>' containment reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
 	 * @ordered
 	 */
-	public static final int XML_ID_IMPL__TYPE_CONVERTER = OrmPackage.XML_ID_IMPL_FEATURE_COUNT + 3;
+	public static final int XML_ID_IMPL__OBJECT_TYPE_CONVERTER = OrmPackage.XML_ID_IMPL_FEATURE_COUNT + 3;
 
 	/**
-	 * The feature id for the '<em><b>Object Type Converter</b></em>' containment reference.
+	 * The feature id for the '<em><b>Struct Converter</b></em>' containment reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
 	 * @ordered
 	 */
-	public static final int XML_ID_IMPL__OBJECT_TYPE_CONVERTER = OrmPackage.XML_ID_IMPL_FEATURE_COUNT + 4;
+	public static final int XML_ID_IMPL__STRUCT_CONVERTER = OrmPackage.XML_ID_IMPL_FEATURE_COUNT + 4;
 
 	/**
-	 * The feature id for the '<em><b>Struct Converter</b></em>' containment reference.
+	 * The feature id for the '<em><b>Convert</b></em>' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
 	 * @ordered
 	 */
-	public static final int XML_ID_IMPL__STRUCT_CONVERTER = OrmPackage.XML_ID_IMPL_FEATURE_COUNT + 5;
+	public static final int XML_ID_IMPL__CONVERT = OrmPackage.XML_ID_IMPL_FEATURE_COUNT + 5;
 
 	/**
 	 * The number of structural features of the '<em>Xml Id Impl</em>' class.
@@ -1805,49 +2062,49 @@ public class EclipseLinkOrmPackage extends EPackageImpl
 	public static final int XML_BASIC__MUTABLE = OrmPackage.XML_BASIC_FEATURE_COUNT + 0;
 
 	/**
-	 * The feature id for the '<em><b>Convert</b></em>' attribute.
+	 * The feature id for the '<em><b>Converter</b></em>' containment reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
 	 * @ordered
 	 */
-	public static final int XML_BASIC__CONVERT = OrmPackage.XML_BASIC_FEATURE_COUNT + 1;
+	public static final int XML_BASIC__CONVERTER = OrmPackage.XML_BASIC_FEATURE_COUNT + 1;
 
 	/**
-	 * The feature id for the '<em><b>Converter</b></em>' containment reference.
+	 * The feature id for the '<em><b>Type Converter</b></em>' containment reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
 	 * @ordered
 	 */
-	public static final int XML_BASIC__CONVERTER = OrmPackage.XML_BASIC_FEATURE_COUNT + 2;
+	public static final int XML_BASIC__TYPE_CONVERTER = OrmPackage.XML_BASIC_FEATURE_COUNT + 2;
 
 	/**
-	 * The feature id for the '<em><b>Type Converter</b></em>' containment reference.
+	 * The feature id for the '<em><b>Object Type Converter</b></em>' containment reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
 	 * @ordered
 	 */
-	public static final int XML_BASIC__TYPE_CONVERTER = OrmPackage.XML_BASIC_FEATURE_COUNT + 3;
+	public static final int XML_BASIC__OBJECT_TYPE_CONVERTER = OrmPackage.XML_BASIC_FEATURE_COUNT + 3;
 
 	/**
-	 * The feature id for the '<em><b>Object Type Converter</b></em>' containment reference.
+	 * The feature id for the '<em><b>Struct Converter</b></em>' containment reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
 	 * @ordered
 	 */
-	public static final int XML_BASIC__OBJECT_TYPE_CONVERTER = OrmPackage.XML_BASIC_FEATURE_COUNT + 4;
+	public static final int XML_BASIC__STRUCT_CONVERTER = OrmPackage.XML_BASIC_FEATURE_COUNT + 4;
 
 	/**
-	 * The feature id for the '<em><b>Struct Converter</b></em>' containment reference.
+	 * The feature id for the '<em><b>Convert</b></em>' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
 	 * @ordered
 	 */
-	public static final int XML_BASIC__STRUCT_CONVERTER = OrmPackage.XML_BASIC_FEATURE_COUNT + 5;
+	public static final int XML_BASIC__CONVERT = OrmPackage.XML_BASIC_FEATURE_COUNT + 5;
 
 	/**
 	 * The number of structural features of the '<em>Xml Basic</em>' class.
@@ -1931,49 +2188,49 @@ public class EclipseLinkOrmPackage extends EPackageImpl
 	public static final int XML_BASIC_IMPL__MUTABLE = OrmPackage.XML_BASIC_IMPL_FEATURE_COUNT + 0;
 
 	/**
-	 * The feature id for the '<em><b>Convert</b></em>' attribute.
+	 * The feature id for the '<em><b>Converter</b></em>' containment reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
 	 * @ordered
 	 */
-	public static final int XML_BASIC_IMPL__CONVERT = OrmPackage.XML_BASIC_IMPL_FEATURE_COUNT + 1;
+	public static final int XML_BASIC_IMPL__CONVERTER = OrmPackage.XML_BASIC_IMPL_FEATURE_COUNT + 1;
 
 	/**
-	 * The feature id for the '<em><b>Converter</b></em>' containment reference.
+	 * The feature id for the '<em><b>Type Converter</b></em>' containment reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
 	 * @ordered
 	 */
-	public static final int XML_BASIC_IMPL__CONVERTER = OrmPackage.XML_BASIC_IMPL_FEATURE_COUNT + 2;
+	public static final int XML_BASIC_IMPL__TYPE_CONVERTER = OrmPackage.XML_BASIC_IMPL_FEATURE_COUNT + 2;
 
 	/**
-	 * The feature id for the '<em><b>Type Converter</b></em>' containment reference.
+	 * The feature id for the '<em><b>Object Type Converter</b></em>' containment reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
 	 * @ordered
 	 */
-	public static final int XML_BASIC_IMPL__TYPE_CONVERTER = OrmPackage.XML_BASIC_IMPL_FEATURE_COUNT + 3;
+	public static final int XML_BASIC_IMPL__OBJECT_TYPE_CONVERTER = OrmPackage.XML_BASIC_IMPL_FEATURE_COUNT + 3;
 
 	/**
-	 * The feature id for the '<em><b>Object Type Converter</b></em>' containment reference.
+	 * The feature id for the '<em><b>Struct Converter</b></em>' containment reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
 	 * @ordered
 	 */
-	public static final int XML_BASIC_IMPL__OBJECT_TYPE_CONVERTER = OrmPackage.XML_BASIC_IMPL_FEATURE_COUNT + 4;
+	public static final int XML_BASIC_IMPL__STRUCT_CONVERTER = OrmPackage.XML_BASIC_IMPL_FEATURE_COUNT + 4;
 
 	/**
-	 * The feature id for the '<em><b>Struct Converter</b></em>' containment reference.
+	 * The feature id for the '<em><b>Convert</b></em>' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
 	 * @ordered
 	 */
-	public static final int XML_BASIC_IMPL__STRUCT_CONVERTER = OrmPackage.XML_BASIC_IMPL_FEATURE_COUNT + 5;
+	public static final int XML_BASIC_IMPL__CONVERT = OrmPackage.XML_BASIC_IMPL_FEATURE_COUNT + 5;
 
 	/**
 	 * The number of structural features of the '<em>Xml Basic Impl</em>' class.
@@ -2039,49 +2296,49 @@ public class EclipseLinkOrmPackage extends EPackageImpl
 	public static final int XML_VERSION__MUTABLE = OrmPackage.XML_VERSION_FEATURE_COUNT + 0;
 
 	/**
-	 * The feature id for the '<em><b>Convert</b></em>' attribute.
+	 * The feature id for the '<em><b>Converter</b></em>' containment reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
 	 * @ordered
 	 */
-	public static final int XML_VERSION__CONVERT = OrmPackage.XML_VERSION_FEATURE_COUNT + 1;
+	public static final int XML_VERSION__CONVERTER = OrmPackage.XML_VERSION_FEATURE_COUNT + 1;
 
 	/**
-	 * The feature id for the '<em><b>Converter</b></em>' containment reference.
+	 * The feature id for the '<em><b>Type Converter</b></em>' containment reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
 	 * @ordered
 	 */
-	public static final int XML_VERSION__CONVERTER = OrmPackage.XML_VERSION_FEATURE_COUNT + 2;
+	public static final int XML_VERSION__TYPE_CONVERTER = OrmPackage.XML_VERSION_FEATURE_COUNT + 2;
 
 	/**
-	 * The feature id for the '<em><b>Type Converter</b></em>' containment reference.
+	 * The feature id for the '<em><b>Object Type Converter</b></em>' containment reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
 	 * @ordered
 	 */
-	public static final int XML_VERSION__TYPE_CONVERTER = OrmPackage.XML_VERSION_FEATURE_COUNT + 3;
+	public static final int XML_VERSION__OBJECT_TYPE_CONVERTER = OrmPackage.XML_VERSION_FEATURE_COUNT + 3;
 
 	/**
-	 * The feature id for the '<em><b>Object Type Converter</b></em>' containment reference.
+	 * The feature id for the '<em><b>Struct Converter</b></em>' containment reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
 	 * @ordered
 	 */
-	public static final int XML_VERSION__OBJECT_TYPE_CONVERTER = OrmPackage.XML_VERSION_FEATURE_COUNT + 4;
+	public static final int XML_VERSION__STRUCT_CONVERTER = OrmPackage.XML_VERSION_FEATURE_COUNT + 4;
 
 	/**
-	 * The feature id for the '<em><b>Struct Converter</b></em>' containment reference.
+	 * The feature id for the '<em><b>Convert</b></em>' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
 	 * @ordered
 	 */
-	public static final int XML_VERSION__STRUCT_CONVERTER = OrmPackage.XML_VERSION_FEATURE_COUNT + 5;
+	public static final int XML_VERSION__CONVERT = OrmPackage.XML_VERSION_FEATURE_COUNT + 5;
 
 	/**
 	 * The number of structural features of the '<em>Xml Version</em>' class.
@@ -2147,49 +2404,49 @@ public class EclipseLinkOrmPackage extends EPackageImpl
 	public static final int XML_VERSION_IMPL__MUTABLE = OrmPackage.XML_VERSION_IMPL_FEATURE_COUNT + 0;
 
 	/**
-	 * The feature id for the '<em><b>Convert</b></em>' attribute.
+	 * The feature id for the '<em><b>Converter</b></em>' containment reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
 	 * @ordered
 	 */
-	public static final int XML_VERSION_IMPL__CONVERT = OrmPackage.XML_VERSION_IMPL_FEATURE_COUNT + 1;
+	public static final int XML_VERSION_IMPL__CONVERTER = OrmPackage.XML_VERSION_IMPL_FEATURE_COUNT + 1;
 
 	/**
-	 * The feature id for the '<em><b>Converter</b></em>' containment reference.
+	 * The feature id for the '<em><b>Type Converter</b></em>' containment reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
 	 * @ordered
 	 */
-	public static final int XML_VERSION_IMPL__CONVERTER = OrmPackage.XML_VERSION_IMPL_FEATURE_COUNT + 2;
+	public static final int XML_VERSION_IMPL__TYPE_CONVERTER = OrmPackage.XML_VERSION_IMPL_FEATURE_COUNT + 2;
 
 	/**
-	 * The feature id for the '<em><b>Type Converter</b></em>' containment reference.
+	 * The feature id for the '<em><b>Object Type Converter</b></em>' containment reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
 	 * @ordered
 	 */
-	public static final int XML_VERSION_IMPL__TYPE_CONVERTER = OrmPackage.XML_VERSION_IMPL_FEATURE_COUNT + 3;
+	public static final int XML_VERSION_IMPL__OBJECT_TYPE_CONVERTER = OrmPackage.XML_VERSION_IMPL_FEATURE_COUNT + 3;
 
 	/**
-	 * The feature id for the '<em><b>Object Type Converter</b></em>' containment reference.
+	 * The feature id for the '<em><b>Struct Converter</b></em>' containment reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
 	 * @ordered
 	 */
-	public static final int XML_VERSION_IMPL__OBJECT_TYPE_CONVERTER = OrmPackage.XML_VERSION_IMPL_FEATURE_COUNT + 4;
+	public static final int XML_VERSION_IMPL__STRUCT_CONVERTER = OrmPackage.XML_VERSION_IMPL_FEATURE_COUNT + 4;
 
 	/**
-	 * The feature id for the '<em><b>Struct Converter</b></em>' containment reference.
+	 * The feature id for the '<em><b>Convert</b></em>' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
 	 * @ordered
 	 */
-	public static final int XML_VERSION_IMPL__STRUCT_CONVERTER = OrmPackage.XML_VERSION_IMPL_FEATURE_COUNT + 5;
+	public static final int XML_VERSION_IMPL__CONVERT = OrmPackage.XML_VERSION_IMPL_FEATURE_COUNT + 5;
 
 	/**
 	 * The number of structural features of the '<em>Xml Version Impl</em>' class.
@@ -3018,7 +3275,7 @@ public class EclipseLinkOrmPackage extends EPackageImpl
 	 * @see org.eclipse.jpt.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getCacheType()
 	 * @generated
 	 */
-	public static final int CACHE_TYPE = 33;
+	public static final int CACHE_TYPE = 38;
 
 	/**
 	 * The meta object id for the '{@link org.eclipse.jpt.eclipselink.core.resource.orm.CacheCoordinationType <em>Cache Coordination Type</em>}' enum.
@@ -3028,7 +3285,7 @@ public class EclipseLinkOrmPackage extends EPackageImpl
 	 * @see org.eclipse.jpt.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getCacheCoordinationType()
 	 * @generated
 	 */
-	public static final int CACHE_COORDINATION_TYPE = 34;
+	public static final int CACHE_COORDINATION_TYPE = 39;
 
 	/**
 	 * The meta object id for the '{@link org.eclipse.jpt.eclipselink.core.resource.orm.XmlJoinFetchType <em>Xml Join Fetch Type</em>}' enum.
@@ -3038,7 +3295,7 @@ public class EclipseLinkOrmPackage extends EPackageImpl
 	 * @see org.eclipse.jpt.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlJoinFetchType()
 	 * @generated
 	 */
-	public static final int XML_JOIN_FETCH_TYPE = 36;
+	public static final int XML_JOIN_FETCH_TYPE = 41;
 
 	/**
 	 * The meta object id for the '{@link org.eclipse.jpt.eclipselink.core.resource.orm.ExistenceType <em>Existence Type</em>}' enum.
@@ -3048,7 +3305,7 @@ public class EclipseLinkOrmPackage extends EPackageImpl
 	 * @see org.eclipse.jpt.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getExistenceType()
 	 * @generated
 	 */
-	public static final int EXISTENCE_TYPE = 35;
+	public static final int EXISTENCE_TYPE = 40;
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -3251,6 +3508,13 @@ public class EclipseLinkOrmPackage extends EPackageImpl
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	private EClass xmlConverterImplEClass = null;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
 	private EClass xmlTypeConverterEClass = null;
 
 	/**
@@ -3258,6 +3522,13 @@ public class EclipseLinkOrmPackage extends EPackageImpl
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	private EClass xmlTypeConverterImplEClass = null;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
 	private EClass xmlConversionValueEClass = null;
 
 	/**
@@ -3265,6 +3536,13 @@ public class EclipseLinkOrmPackage extends EPackageImpl
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	private EClass xmlConversionValueImplEClass = null;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
 	private EClass xmlObjectTypeConverterEClass = null;
 
 	/**
@@ -3272,6 +3550,13 @@ public class EclipseLinkOrmPackage extends EPackageImpl
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	private EClass xmlObjectTypeConverterImplEClass = null;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
 	private EClass xmlStructConverterEClass = null;
 
 	/**
@@ -3279,6 +3564,13 @@ public class EclipseLinkOrmPackage extends EPackageImpl
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	private EClass xmlStructConverterImplEClass = null;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
 	private EClass xmlConverterHolderEClass = null;
 
 	/**
@@ -4098,6 +4390,20 @@ public class EclipseLinkOrmPackage extends EPackageImpl
 
 
 	/**
+	 * Returns the meta object for class '{@link org.eclipse.jpt.eclipselink.core.resource.orm.XmlConverterImpl <em>Xml Converter Impl</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for class '<em>Xml Converter Impl</em>'.
+	 * @see org.eclipse.jpt.eclipselink.core.resource.orm.XmlConverterImpl
+	 * @generated
+	 */
+	public EClass getXmlConverterImpl()
+	{
+		return xmlConverterImplEClass;
+	}
+
+
+	/**
 	 * Returns the meta object for class '{@link org.eclipse.jpt.eclipselink.core.resource.orm.XmlTypeConverter <em>Xml Type Converter</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
@@ -4157,6 +4463,20 @@ public class EclipseLinkOrmPackage extends EPackageImpl
 
 
 	/**
+	 * Returns the meta object for class '{@link org.eclipse.jpt.eclipselink.core.resource.orm.XmlTypeConverterImpl <em>Xml Type Converter Impl</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for class '<em>Xml Type Converter Impl</em>'.
+	 * @see org.eclipse.jpt.eclipselink.core.resource.orm.XmlTypeConverterImpl
+	 * @generated
+	 */
+	public EClass getXmlTypeConverterImpl()
+	{
+		return xmlTypeConverterImplEClass;
+	}
+
+
+	/**
 	 * Returns the meta object for class '{@link org.eclipse.jpt.eclipselink.core.resource.orm.XmlConversionValue <em>Xml Conversion Value</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
@@ -4201,6 +4521,20 @@ public class EclipseLinkOrmPackage extends EPackageImpl
 
 
 	/**
+	 * Returns the meta object for class '{@link org.eclipse.jpt.eclipselink.core.resource.orm.XmlConversionValueImpl <em>Xml Conversion Value Impl</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for class '<em>Xml Conversion Value Impl</em>'.
+	 * @see org.eclipse.jpt.eclipselink.core.resource.orm.XmlConversionValueImpl
+	 * @generated
+	 */
+	public EClass getXmlConversionValueImpl()
+	{
+		return xmlConversionValueImplEClass;
+	}
+
+
+	/**
 	 * Returns the meta object for class '{@link org.eclipse.jpt.eclipselink.core.resource.orm.XmlObjectTypeConverter <em>Xml Object Type Converter</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
@@ -4260,6 +4594,20 @@ public class EclipseLinkOrmPackage extends EPackageImpl
 
 
 	/**
+	 * Returns the meta object for class '{@link org.eclipse.jpt.eclipselink.core.resource.orm.XmlObjectTypeConverterImpl <em>Xml Object Type Converter Impl</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for class '<em>Xml Object Type Converter Impl</em>'.
+	 * @see org.eclipse.jpt.eclipselink.core.resource.orm.XmlObjectTypeConverterImpl
+	 * @generated
+	 */
+	public EClass getXmlObjectTypeConverterImpl()
+	{
+		return xmlObjectTypeConverterImplEClass;
+	}
+
+
+	/**
 	 * Returns the meta object for the containment reference list '{@link org.eclipse.jpt.eclipselink.core.resource.orm.XmlObjectTypeConverter#getConversionValues <em>Conversion Values</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
@@ -4334,6 +4682,20 @@ public class EclipseLinkOrmPackage extends EPackageImpl
 
 
 	/**
+	 * Returns the meta object for class '{@link org.eclipse.jpt.eclipselink.core.resource.orm.XmlStructConverterImpl <em>Xml Struct Converter Impl</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for class '<em>Xml Struct Converter Impl</em>'.
+	 * @see org.eclipse.jpt.eclipselink.core.resource.orm.XmlStructConverterImpl
+	 * @generated
+	 */
+	public EClass getXmlStructConverterImpl()
+	{
+		return xmlStructConverterImplEClass;
+	}
+
+
+	/**
 	 * Returns the meta object for class '{@link org.eclipse.jpt.eclipselink.core.resource.orm.XmlConverterHolder <em>Xml Converter Holder</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
@@ -4530,22 +4892,25 @@ public class EclipseLinkOrmPackage extends EPackageImpl
 		xmlMutableEClass = createEClass(XML_MUTABLE);
 		createEAttribute(xmlMutableEClass, XML_MUTABLE__MUTABLE);
 
-		xmlConvertibleMappingEClass = createEClass(XML_CONVERTIBLE_MAPPING);
-		createEAttribute(xmlConvertibleMappingEClass, XML_CONVERTIBLE_MAPPING__CONVERT);
-
 		xmlConverterEClass = createEClass(XML_CONVERTER);
 		createEAttribute(xmlConverterEClass, XML_CONVERTER__NAME);
 		createEAttribute(xmlConverterEClass, XML_CONVERTER__CLASS_NAME);
 
+		xmlConverterImplEClass = createEClass(XML_CONVERTER_IMPL);
+
 		xmlTypeConverterEClass = createEClass(XML_TYPE_CONVERTER);
 		createEAttribute(xmlTypeConverterEClass, XML_TYPE_CONVERTER__NAME);
 		createEAttribute(xmlTypeConverterEClass, XML_TYPE_CONVERTER__DATA_TYPE);
 		createEAttribute(xmlTypeConverterEClass, XML_TYPE_CONVERTER__OBJECT_TYPE);
 
+		xmlTypeConverterImplEClass = createEClass(XML_TYPE_CONVERTER_IMPL);
+
 		xmlConversionValueEClass = createEClass(XML_CONVERSION_VALUE);
 		createEAttribute(xmlConversionValueEClass, XML_CONVERSION_VALUE__DATA_VALUE);
 		createEAttribute(xmlConversionValueEClass, XML_CONVERSION_VALUE__OBJECT_VALUE);
 
+		xmlConversionValueImplEClass = createEClass(XML_CONVERSION_VALUE_IMPL);
+
 		xmlObjectTypeConverterEClass = createEClass(XML_OBJECT_TYPE_CONVERTER);
 		createEReference(xmlObjectTypeConverterEClass, XML_OBJECT_TYPE_CONVERTER__CONVERSION_VALUES);
 		createEAttribute(xmlObjectTypeConverterEClass, XML_OBJECT_TYPE_CONVERTER__DEFAULT_OBJECT_VALUE);
@@ -4553,16 +4918,23 @@ public class EclipseLinkOrmPackage extends EPackageImpl
 		createEAttribute(xmlObjectTypeConverterEClass, XML_OBJECT_TYPE_CONVERTER__DATA_TYPE);
 		createEAttribute(xmlObjectTypeConverterEClass, XML_OBJECT_TYPE_CONVERTER__OBJECT_TYPE);
 
+		xmlObjectTypeConverterImplEClass = createEClass(XML_OBJECT_TYPE_CONVERTER_IMPL);
+
 		xmlStructConverterEClass = createEClass(XML_STRUCT_CONVERTER);
 		createEAttribute(xmlStructConverterEClass, XML_STRUCT_CONVERTER__NAME);
 		createEAttribute(xmlStructConverterEClass, XML_STRUCT_CONVERTER__CONVERTER);
 
+		xmlStructConverterImplEClass = createEClass(XML_STRUCT_CONVERTER_IMPL);
+
 		xmlConverterHolderEClass = createEClass(XML_CONVERTER_HOLDER);
 		createEReference(xmlConverterHolderEClass, XML_CONVERTER_HOLDER__CONVERTER);
 		createEReference(xmlConverterHolderEClass, XML_CONVERTER_HOLDER__TYPE_CONVERTER);
 		createEReference(xmlConverterHolderEClass, XML_CONVERTER_HOLDER__OBJECT_TYPE_CONVERTER);
 		createEReference(xmlConverterHolderEClass, XML_CONVERTER_HOLDER__STRUCT_CONVERTER);
 
+		xmlConvertibleMappingEClass = createEClass(XML_CONVERTIBLE_MAPPING);
+		createEAttribute(xmlConvertibleMappingEClass, XML_CONVERTIBLE_MAPPING__CONVERT);
+
 		xmlIdEClass = createEClass(XML_ID);
 
 		xmlIdImplEClass = createEClass(XML_ID_IMPL);
@@ -4647,23 +5019,26 @@ public class EclipseLinkOrmPackage extends EPackageImpl
 		xmlMappedSuperclassEClass.getESuperTypes().add(this.getXmlReadOnly());
 		xmlMappedSuperclassEClass.getESuperTypes().add(this.getXmlCustomizerHolder());
 		xmlMappedSuperclassEClass.getESuperTypes().add(this.getXmlCacheHolder());
+		xmlConverterImplEClass.getESuperTypes().add(this.getXmlConverter());
+		xmlTypeConverterImplEClass.getESuperTypes().add(this.getXmlTypeConverter());
+		xmlConversionValueImplEClass.getESuperTypes().add(this.getXmlConversionValue());
+		xmlObjectTypeConverterImplEClass.getESuperTypes().add(this.getXmlObjectTypeConverter());
+		xmlStructConverterImplEClass.getESuperTypes().add(this.getXmlStructConverter());
 		xmlConvertibleMappingEClass.getESuperTypes().add(theOrmPackage.getXmlConvertibleMapping());
+		xmlConvertibleMappingEClass.getESuperTypes().add(this.getXmlConverterHolder());
 		xmlIdEClass.getESuperTypes().add(theOrmPackage.getXmlId());
 		xmlIdEClass.getESuperTypes().add(this.getXmlMutable());
 		xmlIdEClass.getESuperTypes().add(this.getXmlConvertibleMapping());
-		xmlIdEClass.getESuperTypes().add(this.getXmlConverterHolder());
 		xmlIdImplEClass.getESuperTypes().add(theOrmPackage.getXmlIdImpl());
 		xmlIdImplEClass.getESuperTypes().add(this.getXmlId());
 		xmlBasicEClass.getESuperTypes().add(theOrmPackage.getXmlBasic());
 		xmlBasicEClass.getESuperTypes().add(this.getXmlMutable());
 		xmlBasicEClass.getESuperTypes().add(this.getXmlConvertibleMapping());
-		xmlBasicEClass.getESuperTypes().add(this.getXmlConverterHolder());
 		xmlBasicImplEClass.getESuperTypes().add(theOrmPackage.getXmlBasicImpl());
 		xmlBasicImplEClass.getESuperTypes().add(this.getXmlBasic());
 		xmlVersionEClass.getESuperTypes().add(theOrmPackage.getXmlVersion());
 		xmlVersionEClass.getESuperTypes().add(this.getXmlMutable());
 		xmlVersionEClass.getESuperTypes().add(this.getXmlConvertibleMapping());
-		xmlVersionEClass.getESuperTypes().add(this.getXmlConverterHolder());
 		xmlVersionImplEClass.getESuperTypes().add(theOrmPackage.getXmlVersionImpl());
 		xmlVersionImplEClass.getESuperTypes().add(this.getXmlVersion());
 		xmlOneToOneEClass.getESuperTypes().add(theOrmPackage.getXmlOneToOne());
@@ -4725,39 +5100,49 @@ public class EclipseLinkOrmPackage extends EPackageImpl
 		initEClass(xmlMutableEClass, XmlMutable.class, "XmlMutable", IS_ABSTRACT, IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
 		initEAttribute(getXmlMutable_Mutable(), theXMLTypePackage.getBooleanObject(), "mutable", null, 0, 1, XmlMutable.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 
-		initEClass(xmlConvertibleMappingEClass, XmlConvertibleMapping.class, "XmlConvertibleMapping", IS_ABSTRACT, IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEAttribute(getXmlConvertibleMapping_Convert(), ecorePackage.getEString(), "convert", null, 0, 1, XmlConvertibleMapping.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-		initEClass(xmlConverterEClass, XmlConverter.class, "XmlConverter", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+		initEClass(xmlConverterEClass, XmlConverter.class, "XmlConverter", IS_ABSTRACT, IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
 		initEAttribute(getXmlConverter_Name(), ecorePackage.getEString(), "name", null, 0, 1, XmlConverter.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 		initEAttribute(getXmlConverter_ClassName(), ecorePackage.getEString(), "className", null, 0, 1, XmlConverter.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 
-		initEClass(xmlTypeConverterEClass, XmlTypeConverter.class, "XmlTypeConverter", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+		initEClass(xmlConverterImplEClass, XmlConverterImpl.class, "XmlConverterImpl", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+
+		initEClass(xmlTypeConverterEClass, XmlTypeConverter.class, "XmlTypeConverter", IS_ABSTRACT, IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
 		initEAttribute(getXmlTypeConverter_Name(), ecorePackage.getEString(), "name", null, 0, 1, XmlTypeConverter.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 		initEAttribute(getXmlTypeConverter_DataType(), ecorePackage.getEString(), "dataType", null, 0, 1, XmlTypeConverter.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 		initEAttribute(getXmlTypeConverter_ObjectType(), ecorePackage.getEString(), "objectType", null, 0, 1, XmlTypeConverter.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 
-		initEClass(xmlConversionValueEClass, XmlConversionValue.class, "XmlConversionValue", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+		initEClass(xmlTypeConverterImplEClass, XmlTypeConverterImpl.class, "XmlTypeConverterImpl", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+
+		initEClass(xmlConversionValueEClass, XmlConversionValue.class, "XmlConversionValue", IS_ABSTRACT, IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
 		initEAttribute(getXmlConversionValue_DataValue(), ecorePackage.getEString(), "dataValue", null, 0, 1, XmlConversionValue.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 		initEAttribute(getXmlConversionValue_ObjectValue(), ecorePackage.getEString(), "objectValue", null, 0, 1, XmlConversionValue.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 
-		initEClass(xmlObjectTypeConverterEClass, XmlObjectTypeConverter.class, "XmlObjectTypeConverter", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+		initEClass(xmlConversionValueImplEClass, XmlConversionValueImpl.class, "XmlConversionValueImpl", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+
+		initEClass(xmlObjectTypeConverterEClass, XmlObjectTypeConverter.class, "XmlObjectTypeConverter", IS_ABSTRACT, IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
 		initEReference(getXmlObjectTypeConverter_ConversionValues(), this.getXmlConversionValue(), null, "conversionValues", null, 0, -1, XmlObjectTypeConverter.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 		initEAttribute(getXmlObjectTypeConverter_DefaultObjectValue(), ecorePackage.getEString(), "defaultObjectValue", null, 0, 1, XmlObjectTypeConverter.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 		initEAttribute(getXmlObjectTypeConverter_Name(), ecorePackage.getEString(), "name", null, 0, 1, XmlObjectTypeConverter.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 		initEAttribute(getXmlObjectTypeConverter_DataType(), ecorePackage.getEString(), "dataType", null, 0, 1, XmlObjectTypeConverter.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 		initEAttribute(getXmlObjectTypeConverter_ObjectType(), ecorePackage.getEString(), "objectType", null, 0, 1, XmlObjectTypeConverter.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 
-		initEClass(xmlStructConverterEClass, XmlStructConverter.class, "XmlStructConverter", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+		initEClass(xmlObjectTypeConverterImplEClass, XmlObjectTypeConverterImpl.class, "XmlObjectTypeConverterImpl", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+
+		initEClass(xmlStructConverterEClass, XmlStructConverter.class, "XmlStructConverter", IS_ABSTRACT, IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
 		initEAttribute(getXmlStructConverter_Name(), ecorePackage.getEString(), "name", null, 0, 1, XmlStructConverter.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 		initEAttribute(getXmlStructConverter_Converter(), ecorePackage.getEString(), "converter", null, 0, 1, XmlStructConverter.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 
+		initEClass(xmlStructConverterImplEClass, XmlStructConverterImpl.class, "XmlStructConverterImpl", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+
 		initEClass(xmlConverterHolderEClass, XmlConverterHolder.class, "XmlConverterHolder", IS_ABSTRACT, IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
 		initEReference(getXmlConverterHolder_Converter(), this.getXmlConverter(), null, "converter", null, 0, 1, XmlConverterHolder.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 		initEReference(getXmlConverterHolder_TypeConverter(), this.getXmlTypeConverter(), null, "typeConverter", null, 0, 1, XmlConverterHolder.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 		initEReference(getXmlConverterHolder_ObjectTypeConverter(), this.getXmlObjectTypeConverter(), null, "objectTypeConverter", null, 0, 1, XmlConverterHolder.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 		initEReference(getXmlConverterHolder_StructConverter(), this.getXmlStructConverter(), null, "structConverter", null, 0, 1, XmlConverterHolder.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 
+		initEClass(xmlConvertibleMappingEClass, XmlConvertibleMapping.class, "XmlConvertibleMapping", IS_ABSTRACT, IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+		initEAttribute(getXmlConvertibleMapping_Convert(), ecorePackage.getEString(), "convert", null, 0, 1, XmlConvertibleMapping.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+
 		initEClass(xmlIdEClass, XmlId.class, "XmlId", IS_ABSTRACT, IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
 
 		initEClass(xmlIdImplEClass, XmlIdImpl.class, "XmlIdImpl", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
@@ -5309,6 +5694,16 @@ public class EclipseLinkOrmPackage extends EPackageImpl
 		public static final EAttribute XML_CONVERTER__CLASS_NAME = eINSTANCE.getXmlConverter_ClassName();
 
 		/**
+		 * The meta object literal for the '{@link org.eclipse.jpt.eclipselink.core.resource.orm.XmlConverterImpl <em>Xml Converter Impl</em>}' class.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @see org.eclipse.jpt.eclipselink.core.resource.orm.XmlConverterImpl
+		 * @see org.eclipse.jpt.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlConverterImpl()
+		 * @generated
+		 */
+		public static final EClass XML_CONVERTER_IMPL = eINSTANCE.getXmlConverterImpl();
+
+		/**
 		 * The meta object literal for the '{@link org.eclipse.jpt.eclipselink.core.resource.orm.XmlTypeConverter <em>Xml Type Converter</em>}' class.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
@@ -5343,6 +5738,16 @@ public class EclipseLinkOrmPackage extends EPackageImpl
 		public static final EAttribute XML_TYPE_CONVERTER__OBJECT_TYPE = eINSTANCE.getXmlTypeConverter_ObjectType();
 
 		/**
+		 * The meta object literal for the '{@link org.eclipse.jpt.eclipselink.core.resource.orm.XmlTypeConverterImpl <em>Xml Type Converter Impl</em>}' class.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @see org.eclipse.jpt.eclipselink.core.resource.orm.XmlTypeConverterImpl
+		 * @see org.eclipse.jpt.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlTypeConverterImpl()
+		 * @generated
+		 */
+		public static final EClass XML_TYPE_CONVERTER_IMPL = eINSTANCE.getXmlTypeConverterImpl();
+
+		/**
 		 * The meta object literal for the '{@link org.eclipse.jpt.eclipselink.core.resource.orm.XmlConversionValue <em>Xml Conversion Value</em>}' class.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
@@ -5369,6 +5774,16 @@ public class EclipseLinkOrmPackage extends EPackageImpl
 		public static final EAttribute XML_CONVERSION_VALUE__OBJECT_VALUE = eINSTANCE.getXmlConversionValue_ObjectValue();
 
 		/**
+		 * The meta object literal for the '{@link org.eclipse.jpt.eclipselink.core.resource.orm.XmlConversionValueImpl <em>Xml Conversion Value Impl</em>}' class.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @see org.eclipse.jpt.eclipselink.core.resource.orm.XmlConversionValueImpl
+		 * @see org.eclipse.jpt.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlConversionValueImpl()
+		 * @generated
+		 */
+		public static final EClass XML_CONVERSION_VALUE_IMPL = eINSTANCE.getXmlConversionValueImpl();
+
+		/**
 		 * The meta object literal for the '{@link org.eclipse.jpt.eclipselink.core.resource.orm.XmlObjectTypeConverter <em>Xml Object Type Converter</em>}' class.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
@@ -5403,6 +5818,16 @@ public class EclipseLinkOrmPackage extends EPackageImpl
 		public static final EAttribute XML_OBJECT_TYPE_CONVERTER__OBJECT_TYPE = eINSTANCE.getXmlObjectTypeConverter_ObjectType();
 
 		/**
+		 * The meta object literal for the '{@link org.eclipse.jpt.eclipselink.core.resource.orm.XmlObjectTypeConverterImpl <em>Xml Object Type Converter Impl</em>}' class.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @see org.eclipse.jpt.eclipselink.core.resource.orm.XmlObjectTypeConverterImpl
+		 * @see org.eclipse.jpt.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlObjectTypeConverterImpl()
+		 * @generated
+		 */
+		public static final EClass XML_OBJECT_TYPE_CONVERTER_IMPL = eINSTANCE.getXmlObjectTypeConverterImpl();
+
+		/**
 		 * The meta object literal for the '<em><b>Conversion Values</b></em>' containment reference list feature.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
@@ -5445,6 +5870,16 @@ public class EclipseLinkOrmPackage extends EPackageImpl
 		public static final EAttribute XML_STRUCT_CONVERTER__CONVERTER = eINSTANCE.getXmlStructConverter_Converter();
 
 		/**
+		 * The meta object literal for the '{@link org.eclipse.jpt.eclipselink.core.resource.orm.XmlStructConverterImpl <em>Xml Struct Converter Impl</em>}' class.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @see org.eclipse.jpt.eclipselink.core.resource.orm.XmlStructConverterImpl
+		 * @see org.eclipse.jpt.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlStructConverterImpl()
+		 * @generated
+		 */
+		public static final EClass XML_STRUCT_CONVERTER_IMPL = eINSTANCE.getXmlStructConverterImpl();
+
+		/**
 		 * The meta object literal for the '{@link org.eclipse.jpt.eclipselink.core.resource.orm.XmlConverterHolder <em>Xml Converter Holder</em>}' class.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/orm/XmlBasic.java b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/orm/XmlBasic.java
index 16d1ed075c..128deb3122 100644
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/orm/XmlBasic.java
+++ b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/orm/XmlBasic.java
@@ -20,6 +20,6 @@ package org.eclipse.jpt.eclipselink.core.resource.orm;
  * @model kind="class" interface="true" abstract="true"
  * @generated
  */
-public interface XmlBasic extends org.eclipse.jpt.core.resource.orm.XmlBasic, XmlMutable, XmlConvertibleMapping, XmlConverterHolder
+public interface XmlBasic extends org.eclipse.jpt.core.resource.orm.XmlBasic, XmlMutable, XmlConvertibleMapping
 {
 } // XmlBasic
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/orm/XmlBasicImpl.java b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/orm/XmlBasicImpl.java
index 8cd81e2a8c..9429cbcbdd 100644
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/orm/XmlBasicImpl.java
+++ b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/orm/XmlBasicImpl.java
@@ -49,24 +49,6 @@ public class XmlBasicImpl extends org.eclipse.jpt.core.resource.orm.XmlBasicImpl
 	protected Boolean mutable = MUTABLE_EDEFAULT;
 
 	/**
-	 * The default value of the '{@link #getConvert() <em>Convert</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getConvert()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String CONVERT_EDEFAULT = null;
-	/**
-	 * The cached value of the '{@link #getConvert() <em>Convert</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getConvert()
-	 * @generated
-	 * @ordered
-	 */
-	protected String convert = CONVERT_EDEFAULT;
-	/**
 	 * The cached value of the '{@link #getConverter() <em>Converter</em>}' containment reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
@@ -102,6 +84,24 @@ public class XmlBasicImpl extends org.eclipse.jpt.core.resource.orm.XmlBasicImpl
 	 * @ordered
 	 */
 	protected XmlStructConverter structConverter;
+	/**
+	 * The default value of the '{@link #getConvert() <em>Convert</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getConvert()
+	 * @generated
+	 * @ordered
+	 */
+	protected static final String CONVERT_EDEFAULT = null;
+	/**
+	 * The cached value of the '{@link #getConvert() <em>Convert</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getConvert()
+	 * @generated
+	 * @ordered
+	 */
+	protected String convert = CONVERT_EDEFAULT;
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -468,8 +468,6 @@ public class XmlBasicImpl extends org.eclipse.jpt.core.resource.orm.XmlBasicImpl
 		{
 			case EclipseLinkOrmPackage.XML_BASIC_IMPL__MUTABLE:
 				return getMutable();
-			case EclipseLinkOrmPackage.XML_BASIC_IMPL__CONVERT:
-				return getConvert();
 			case EclipseLinkOrmPackage.XML_BASIC_IMPL__CONVERTER:
 				return getConverter();
 			case EclipseLinkOrmPackage.XML_BASIC_IMPL__TYPE_CONVERTER:
@@ -478,6 +476,8 @@ public class XmlBasicImpl extends org.eclipse.jpt.core.resource.orm.XmlBasicImpl
 				return getObjectTypeConverter();
 			case EclipseLinkOrmPackage.XML_BASIC_IMPL__STRUCT_CONVERTER:
 				return getStructConverter();
+			case EclipseLinkOrmPackage.XML_BASIC_IMPL__CONVERT:
+				return getConvert();
 		}
 		return super.eGet(featureID, resolve, coreType);
 	}
@@ -495,9 +495,6 @@ public class XmlBasicImpl extends org.eclipse.jpt.core.resource.orm.XmlBasicImpl
 			case EclipseLinkOrmPackage.XML_BASIC_IMPL__MUTABLE:
 				setMutable((Boolean)newValue);
 				return;
-			case EclipseLinkOrmPackage.XML_BASIC_IMPL__CONVERT:
-				setConvert((String)newValue);
-				return;
 			case EclipseLinkOrmPackage.XML_BASIC_IMPL__CONVERTER:
 				setConverter((XmlConverter)newValue);
 				return;
@@ -510,6 +507,9 @@ public class XmlBasicImpl extends org.eclipse.jpt.core.resource.orm.XmlBasicImpl
 			case EclipseLinkOrmPackage.XML_BASIC_IMPL__STRUCT_CONVERTER:
 				setStructConverter((XmlStructConverter)newValue);
 				return;
+			case EclipseLinkOrmPackage.XML_BASIC_IMPL__CONVERT:
+				setConvert((String)newValue);
+				return;
 		}
 		super.eSet(featureID, newValue);
 	}
@@ -527,9 +527,6 @@ public class XmlBasicImpl extends org.eclipse.jpt.core.resource.orm.XmlBasicImpl
 			case EclipseLinkOrmPackage.XML_BASIC_IMPL__MUTABLE:
 				setMutable(MUTABLE_EDEFAULT);
 				return;
-			case EclipseLinkOrmPackage.XML_BASIC_IMPL__CONVERT:
-				setConvert(CONVERT_EDEFAULT);
-				return;
 			case EclipseLinkOrmPackage.XML_BASIC_IMPL__CONVERTER:
 				setConverter((XmlConverter)null);
 				return;
@@ -542,6 +539,9 @@ public class XmlBasicImpl extends org.eclipse.jpt.core.resource.orm.XmlBasicImpl
 			case EclipseLinkOrmPackage.XML_BASIC_IMPL__STRUCT_CONVERTER:
 				setStructConverter((XmlStructConverter)null);
 				return;
+			case EclipseLinkOrmPackage.XML_BASIC_IMPL__CONVERT:
+				setConvert(CONVERT_EDEFAULT);
+				return;
 		}
 		super.eUnset(featureID);
 	}
@@ -558,8 +558,6 @@ public class XmlBasicImpl extends org.eclipse.jpt.core.resource.orm.XmlBasicImpl
 		{
 			case EclipseLinkOrmPackage.XML_BASIC_IMPL__MUTABLE:
 				return MUTABLE_EDEFAULT == null ? mutable != null : !MUTABLE_EDEFAULT.equals(mutable);
-			case EclipseLinkOrmPackage.XML_BASIC_IMPL__CONVERT:
-				return CONVERT_EDEFAULT == null ? convert != null : !CONVERT_EDEFAULT.equals(convert);
 			case EclipseLinkOrmPackage.XML_BASIC_IMPL__CONVERTER:
 				return converter != null;
 			case EclipseLinkOrmPackage.XML_BASIC_IMPL__TYPE_CONVERTER:
@@ -568,6 +566,8 @@ public class XmlBasicImpl extends org.eclipse.jpt.core.resource.orm.XmlBasicImpl
 				return objectTypeConverter != null;
 			case EclipseLinkOrmPackage.XML_BASIC_IMPL__STRUCT_CONVERTER:
 				return structConverter != null;
+			case EclipseLinkOrmPackage.XML_BASIC_IMPL__CONVERT:
+				return CONVERT_EDEFAULT == null ? convert != null : !CONVERT_EDEFAULT.equals(convert);
 		}
 		return super.eIsSet(featureID);
 	}
@@ -588,22 +588,22 @@ public class XmlBasicImpl extends org.eclipse.jpt.core.resource.orm.XmlBasicImpl
 				default: return -1;
 			}
 		}
-		if (baseClass == XmlConvertibleMapping.class)
+		if (baseClass == XmlConverterHolder.class)
 		{
 			switch (derivedFeatureID)
 			{
-				case EclipseLinkOrmPackage.XML_BASIC_IMPL__CONVERT: return EclipseLinkOrmPackage.XML_CONVERTIBLE_MAPPING__CONVERT;
+				case EclipseLinkOrmPackage.XML_BASIC_IMPL__CONVERTER: return EclipseLinkOrmPackage.XML_CONVERTER_HOLDER__CONVERTER;
+				case EclipseLinkOrmPackage.XML_BASIC_IMPL__TYPE_CONVERTER: return EclipseLinkOrmPackage.XML_CONVERTER_HOLDER__TYPE_CONVERTER;
+				case EclipseLinkOrmPackage.XML_BASIC_IMPL__OBJECT_TYPE_CONVERTER: return EclipseLinkOrmPackage.XML_CONVERTER_HOLDER__OBJECT_TYPE_CONVERTER;
+				case EclipseLinkOrmPackage.XML_BASIC_IMPL__STRUCT_CONVERTER: return EclipseLinkOrmPackage.XML_CONVERTER_HOLDER__STRUCT_CONVERTER;
 				default: return -1;
 			}
 		}
-		if (baseClass == XmlConverterHolder.class)
+		if (baseClass == XmlConvertibleMapping.class)
 		{
 			switch (derivedFeatureID)
 			{
-				case EclipseLinkOrmPackage.XML_BASIC_IMPL__CONVERTER: return EclipseLinkOrmPackage.XML_CONVERTER_HOLDER__CONVERTER;
-				case EclipseLinkOrmPackage.XML_BASIC_IMPL__TYPE_CONVERTER: return EclipseLinkOrmPackage.XML_CONVERTER_HOLDER__TYPE_CONVERTER;
-				case EclipseLinkOrmPackage.XML_BASIC_IMPL__OBJECT_TYPE_CONVERTER: return EclipseLinkOrmPackage.XML_CONVERTER_HOLDER__OBJECT_TYPE_CONVERTER;
-				case EclipseLinkOrmPackage.XML_BASIC_IMPL__STRUCT_CONVERTER: return EclipseLinkOrmPackage.XML_CONVERTER_HOLDER__STRUCT_CONVERTER;
+				case EclipseLinkOrmPackage.XML_BASIC_IMPL__CONVERT: return EclipseLinkOrmPackage.XML_CONVERTIBLE_MAPPING__CONVERT;
 				default: return -1;
 			}
 		}
@@ -633,22 +633,22 @@ public class XmlBasicImpl extends org.eclipse.jpt.core.resource.orm.XmlBasicImpl
 				default: return -1;
 			}
 		}
-		if (baseClass == XmlConvertibleMapping.class)
+		if (baseClass == XmlConverterHolder.class)
 		{
 			switch (baseFeatureID)
 			{
-				case EclipseLinkOrmPackage.XML_CONVERTIBLE_MAPPING__CONVERT: return EclipseLinkOrmPackage.XML_BASIC_IMPL__CONVERT;
+				case EclipseLinkOrmPackage.XML_CONVERTER_HOLDER__CONVERTER: return EclipseLinkOrmPackage.XML_BASIC_IMPL__CONVERTER;
+				case EclipseLinkOrmPackage.XML_CONVERTER_HOLDER__TYPE_CONVERTER: return EclipseLinkOrmPackage.XML_BASIC_IMPL__TYPE_CONVERTER;
+				case EclipseLinkOrmPackage.XML_CONVERTER_HOLDER__OBJECT_TYPE_CONVERTER: return EclipseLinkOrmPackage.XML_BASIC_IMPL__OBJECT_TYPE_CONVERTER;
+				case EclipseLinkOrmPackage.XML_CONVERTER_HOLDER__STRUCT_CONVERTER: return EclipseLinkOrmPackage.XML_BASIC_IMPL__STRUCT_CONVERTER;
 				default: return -1;
 			}
 		}
-		if (baseClass == XmlConverterHolder.class)
+		if (baseClass == XmlConvertibleMapping.class)
 		{
 			switch (baseFeatureID)
 			{
-				case EclipseLinkOrmPackage.XML_CONVERTER_HOLDER__CONVERTER: return EclipseLinkOrmPackage.XML_BASIC_IMPL__CONVERTER;
-				case EclipseLinkOrmPackage.XML_CONVERTER_HOLDER__TYPE_CONVERTER: return EclipseLinkOrmPackage.XML_BASIC_IMPL__TYPE_CONVERTER;
-				case EclipseLinkOrmPackage.XML_CONVERTER_HOLDER__OBJECT_TYPE_CONVERTER: return EclipseLinkOrmPackage.XML_BASIC_IMPL__OBJECT_TYPE_CONVERTER;
-				case EclipseLinkOrmPackage.XML_CONVERTER_HOLDER__STRUCT_CONVERTER: return EclipseLinkOrmPackage.XML_BASIC_IMPL__STRUCT_CONVERTER;
+				case EclipseLinkOrmPackage.XML_CONVERTIBLE_MAPPING__CONVERT: return EclipseLinkOrmPackage.XML_BASIC_IMPL__CONVERT;
 				default: return -1;
 			}
 		}
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/orm/XmlConversionValue.java b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/orm/XmlConversionValue.java
index f01d59a6fe..72a27993a0 100644
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/orm/XmlConversionValue.java
+++ b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/orm/XmlConversionValue.java
@@ -9,16 +9,8 @@
  ******************************************************************************/
 package org.eclipse.jpt.eclipselink.core.resource.orm;
 
-import org.eclipse.emf.common.notify.Notification;
-
-import org.eclipse.emf.ecore.EClass;
-
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-
-import org.eclipse.jpt.core.resource.common.AbstractJpaEObject;
 import org.eclipse.jpt.core.resource.common.JpaEObject;
 import org.eclipse.jpt.core.utility.TextRange;
-import org.eclipse.jpt.eclipselink.core.internal.resource.orm.translators.EclipseLinkOrmXmlMapper;
 
 /**
  * <!-- begin-user-doc -->
@@ -34,74 +26,13 @@ import org.eclipse.jpt.eclipselink.core.internal.resource.orm.translators.Eclips
  * </p>
  *
  * @see org.eclipse.jpt.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlConversionValue()
- * @model kind="class"
+ * @model kind="class" interface="true" abstract="true"
  * @extends JpaEObject
  * @generated
  */
-public class XmlConversionValue extends AbstractJpaEObject implements JpaEObject
+public interface XmlConversionValue extends JpaEObject
 {
 	/**
-	 * The default value of the '{@link #getDataValue() <em>Data Value</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getDataValue()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String DATA_VALUE_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getDataValue() <em>Data Value</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getDataValue()
-	 * @generated
-	 * @ordered
-	 */
-	protected String dataValue = DATA_VALUE_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #getObjectValue() <em>Object Value</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getObjectValue()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String OBJECT_VALUE_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getObjectValue() <em>Object Value</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getObjectValue()
-	 * @generated
-	 * @ordered
-	 */
-	protected String objectValue = OBJECT_VALUE_EDEFAULT;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected XmlConversionValue()
-	{
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected EClass eStaticClass()
-	{
-		return EclipseLinkOrmPackage.Literals.XML_CONVERSION_VALUE;
-	}
-
-	/**
 	 * Returns the value of the '<em><b>Data Value</b></em>' attribute.
 	 * <!-- begin-user-doc -->
 	 * <p>
@@ -115,10 +46,7 @@ public class XmlConversionValue extends AbstractJpaEObject implements JpaEObject
 	 * @model
 	 * @generated
 	 */
-	public String getDataValue()
-	{
-		return dataValue;
-	}
+	String getDataValue();
 
 	/**
 	 * Sets the value of the '{@link org.eclipse.jpt.eclipselink.core.resource.orm.XmlConversionValue#getDataValue <em>Data Value</em>}' attribute.
@@ -128,13 +56,7 @@ public class XmlConversionValue extends AbstractJpaEObject implements JpaEObject
 	 * @see #getDataValue()
 	 * @generated
 	 */
-	public void setDataValue(String newDataValue)
-	{
-		String oldDataValue = dataValue;
-		dataValue = newDataValue;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, EclipseLinkOrmPackage.XML_CONVERSION_VALUE__DATA_VALUE, oldDataValue, dataValue));
-	}
+	void setDataValue(String value);
 
 	/**
 	 * Returns the value of the '<em><b>Object Value</b></em>' attribute.
@@ -150,10 +72,7 @@ public class XmlConversionValue extends AbstractJpaEObject implements JpaEObject
 	 * @model
 	 * @generated
 	 */
-	public String getObjectValue()
-	{
-		return objectValue;
-	}
+	String getObjectValue();
 
 	/**
 	 * Sets the value of the '{@link org.eclipse.jpt.eclipselink.core.resource.orm.XmlConversionValue#getObjectValue <em>Object Value</em>}' attribute.
@@ -163,120 +82,16 @@ public class XmlConversionValue extends AbstractJpaEObject implements JpaEObject
 	 * @see #getObjectValue()
 	 * @generated
 	 */
-	public void setObjectValue(String newObjectValue)
-	{
-		String oldObjectValue = objectValue;
-		objectValue = newObjectValue;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, EclipseLinkOrmPackage.XML_CONVERSION_VALUE__OBJECT_VALUE, oldObjectValue, objectValue));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Object eGet(int featureID, boolean resolve, boolean coreType)
-	{
-		switch (featureID)
-		{
-			case EclipseLinkOrmPackage.XML_CONVERSION_VALUE__DATA_VALUE:
-				return getDataValue();
-			case EclipseLinkOrmPackage.XML_CONVERSION_VALUE__OBJECT_VALUE:
-				return getObjectValue();
-		}
-		return super.eGet(featureID, resolve, coreType);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void eSet(int featureID, Object newValue)
-	{
-		switch (featureID)
-		{
-			case EclipseLinkOrmPackage.XML_CONVERSION_VALUE__DATA_VALUE:
-				setDataValue((String)newValue);
-				return;
-			case EclipseLinkOrmPackage.XML_CONVERSION_VALUE__OBJECT_VALUE:
-				setObjectValue((String)newValue);
-				return;
-		}
-		super.eSet(featureID, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void eUnset(int featureID)
-	{
-		switch (featureID)
-		{
-			case EclipseLinkOrmPackage.XML_CONVERSION_VALUE__DATA_VALUE:
-				setDataValue(DATA_VALUE_EDEFAULT);
-				return;
-			case EclipseLinkOrmPackage.XML_CONVERSION_VALUE__OBJECT_VALUE:
-				setObjectValue(OBJECT_VALUE_EDEFAULT);
-				return;
-		}
-		super.eUnset(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public boolean eIsSet(int featureID)
-	{
-		switch (featureID)
-		{
-			case EclipseLinkOrmPackage.XML_CONVERSION_VALUE__DATA_VALUE:
-				return DATA_VALUE_EDEFAULT == null ? dataValue != null : !DATA_VALUE_EDEFAULT.equals(dataValue);
-			case EclipseLinkOrmPackage.XML_CONVERSION_VALUE__OBJECT_VALUE:
-				return OBJECT_VALUE_EDEFAULT == null ? objectValue != null : !OBJECT_VALUE_EDEFAULT.equals(objectValue);
-		}
-		return super.eIsSet(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public String toString()
-	{
-		if (eIsProxy()) return super.toString();
-
-		StringBuffer result = new StringBuffer(super.toString());
-		result.append(" (dataValue: ");
-		result.append(dataValue);
-		result.append(", objectValue: ");
-		result.append(objectValue);
-		result.append(')');
-		return result.toString();
-	}
+	void setObjectValue(String value);
 	
 	/**
 	 * Return the {@link TextRange} for the data-value attribute.
 	 */
-	public TextRange getDataValueTextRange() {
-		return getAttributeTextRange(EclipseLinkOrmXmlMapper.CONVERSION_VALUE__DATA_VALUE);
-	}
+	public TextRange getDataValueTextRange();
 	
 	/**
 	 * Return the {@link TextRange} for the object-value attribute.
 	 */
-	public TextRange getObjectValueTextRange() {
-		return getAttributeTextRange(EclipseLinkOrmXmlMapper.CONVERSION_VALUE__OBJECT_VALUE);
-	}	
+	public TextRange getObjectValueTextRange();
+
 } // XmlConversionValue
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/orm/XmlConversionValueImpl.java b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/orm/XmlConversionValueImpl.java
new file mode 100644
index 0000000000..a3d517d737
--- /dev/null
+++ b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/orm/XmlConversionValueImpl.java
@@ -0,0 +1,267 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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.eclipselink.core.resource.orm;
+
+import org.eclipse.emf.common.notify.Notification;
+
+import org.eclipse.emf.ecore.EClass;
+
+import org.eclipse.emf.ecore.impl.ENotificationImpl;
+
+import org.eclipse.jpt.core.resource.common.AbstractJpaEObject;
+import org.eclipse.jpt.core.utility.TextRange;
+import org.eclipse.jpt.eclipselink.core.internal.resource.orm.translators.EclipseLinkOrmXmlMapper;
+
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the model object '<em><b>Xml Conversion Value</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ *
+ * @see org.eclipse.jpt.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlConversionValueImpl()
+ * @model kind="class"
+ * @generated
+ */
+public class XmlConversionValueImpl extends AbstractJpaEObject implements XmlConversionValue
+{
+	/**
+	 * The default value of the '{@link #getDataValue() <em>Data Value</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getDataValue()
+	 * @generated
+	 * @ordered
+	 */
+	protected static final String DATA_VALUE_EDEFAULT = null;
+
+	/**
+	 * The cached value of the '{@link #getDataValue() <em>Data Value</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getDataValue()
+	 * @generated
+	 * @ordered
+	 */
+	protected String dataValue = DATA_VALUE_EDEFAULT;
+
+	/**
+	 * The default value of the '{@link #getObjectValue() <em>Object Value</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getObjectValue()
+	 * @generated
+	 * @ordered
+	 */
+	protected static final String OBJECT_VALUE_EDEFAULT = null;
+
+	/**
+	 * The cached value of the '{@link #getObjectValue() <em>Object Value</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getObjectValue()
+	 * @generated
+	 * @ordered
+	 */
+	protected String objectValue = OBJECT_VALUE_EDEFAULT;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected XmlConversionValueImpl()
+	{
+		super();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	protected EClass eStaticClass()
+	{
+		return EclipseLinkOrmPackage.Literals.XML_CONVERSION_VALUE_IMPL;
+	}
+
+	/**
+	 * Returns the value of the '<em><b>Data Value</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of the '<em>Data Value</em>' attribute isn't clear,
+	 * there really should be more of a description here...
+	 * </p>
+	 * <!-- end-user-doc -->
+	 * @return the value of the '<em>Data Value</em>' attribute.
+	 * @see #setDataValue(String)
+	 * @see org.eclipse.jpt.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlConversionValue_DataValue()
+	 * @model
+	 * @generated
+	 */
+	public String getDataValue()
+	{
+		return dataValue;
+	}
+
+	/**
+	 * Sets the value of the '{@link org.eclipse.jpt.eclipselink.core.resource.orm.XmlConversionValueImpl#getDataValue <em>Data Value</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param value the new value of the '<em>Data Value</em>' attribute.
+	 * @see #getDataValue()
+	 * @generated
+	 */
+	public void setDataValue(String newDataValue)
+	{
+		String oldDataValue = dataValue;
+		dataValue = newDataValue;
+		if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, EclipseLinkOrmPackage.XML_CONVERSION_VALUE_IMPL__DATA_VALUE, oldDataValue, dataValue));
+	}
+
+	/**
+	 * Returns the value of the '<em><b>Object Value</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of the '<em>Object Value</em>' attribute isn't clear,
+	 * there really should be more of a description here...
+	 * </p>
+	 * <!-- end-user-doc -->
+	 * @return the value of the '<em>Object Value</em>' attribute.
+	 * @see #setObjectValue(String)
+	 * @see org.eclipse.jpt.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlConversionValue_ObjectValue()
+	 * @model
+	 * @generated
+	 */
+	public String getObjectValue()
+	{
+		return objectValue;
+	}
+
+	/**
+	 * Sets the value of the '{@link org.eclipse.jpt.eclipselink.core.resource.orm.XmlConversionValueImpl#getObjectValue <em>Object Value</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param value the new value of the '<em>Object Value</em>' attribute.
+	 * @see #getObjectValue()
+	 * @generated
+	 */
+	public void setObjectValue(String newObjectValue)
+	{
+		String oldObjectValue = objectValue;
+		objectValue = newObjectValue;
+		if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, EclipseLinkOrmPackage.XML_CONVERSION_VALUE_IMPL__OBJECT_VALUE, oldObjectValue, objectValue));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public Object eGet(int featureID, boolean resolve, boolean coreType)
+	{
+		switch (featureID)
+		{
+			case EclipseLinkOrmPackage.XML_CONVERSION_VALUE_IMPL__DATA_VALUE:
+				return getDataValue();
+			case EclipseLinkOrmPackage.XML_CONVERSION_VALUE_IMPL__OBJECT_VALUE:
+				return getObjectValue();
+		}
+		return super.eGet(featureID, resolve, coreType);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void eSet(int featureID, Object newValue)
+	{
+		switch (featureID)
+		{
+			case EclipseLinkOrmPackage.XML_CONVERSION_VALUE_IMPL__DATA_VALUE:
+				setDataValue((String)newValue);
+				return;
+			case EclipseLinkOrmPackage.XML_CONVERSION_VALUE_IMPL__OBJECT_VALUE:
+				setObjectValue((String)newValue);
+				return;
+		}
+		super.eSet(featureID, newValue);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void eUnset(int featureID)
+	{
+		switch (featureID)
+		{
+			case EclipseLinkOrmPackage.XML_CONVERSION_VALUE_IMPL__DATA_VALUE:
+				setDataValue(DATA_VALUE_EDEFAULT);
+				return;
+			case EclipseLinkOrmPackage.XML_CONVERSION_VALUE_IMPL__OBJECT_VALUE:
+				setObjectValue(OBJECT_VALUE_EDEFAULT);
+				return;
+		}
+		super.eUnset(featureID);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public boolean eIsSet(int featureID)
+	{
+		switch (featureID)
+		{
+			case EclipseLinkOrmPackage.XML_CONVERSION_VALUE_IMPL__DATA_VALUE:
+				return DATA_VALUE_EDEFAULT == null ? dataValue != null : !DATA_VALUE_EDEFAULT.equals(dataValue);
+			case EclipseLinkOrmPackage.XML_CONVERSION_VALUE_IMPL__OBJECT_VALUE:
+				return OBJECT_VALUE_EDEFAULT == null ? objectValue != null : !OBJECT_VALUE_EDEFAULT.equals(objectValue);
+		}
+		return super.eIsSet(featureID);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public String toString()
+	{
+		if (eIsProxy()) return super.toString();
+
+		StringBuffer result = new StringBuffer(super.toString());
+		result.append(" (dataValue: ");
+		result.append(dataValue);
+		result.append(", objectValue: ");
+		result.append(objectValue);
+		result.append(')');
+		return result.toString();
+	}
+	
+	public TextRange getDataValueTextRange() {
+		return getAttributeTextRange(EclipseLinkOrmXmlMapper.CONVERSION_VALUE__DATA_VALUE);
+	}
+	
+	public TextRange getObjectValueTextRange() {
+		return getAttributeTextRange(EclipseLinkOrmXmlMapper.CONVERSION_VALUE__OBJECT_VALUE);
+	}	
+} // XmlConversionValue
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/orm/XmlConverter.java b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/orm/XmlConverter.java
index 098d662c87..abcbc6cf19 100644
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/orm/XmlConverter.java
+++ b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/orm/XmlConverter.java
@@ -9,13 +9,6 @@
  ******************************************************************************/
 package org.eclipse.jpt.eclipselink.core.resource.orm;
 
-import org.eclipse.emf.common.notify.Notification;
-
-import org.eclipse.emf.ecore.EClass;
-
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-
-import org.eclipse.jpt.core.resource.common.AbstractJpaEObject;
 import org.eclipse.jpt.core.resource.common.JpaEObject;
 
 /**
@@ -32,74 +25,13 @@ import org.eclipse.jpt.core.resource.common.JpaEObject;
  * </p>
  *
  * @see org.eclipse.jpt.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlConverter()
- * @model kind="class"
+ * @model kind="class" interface="true" abstract="true"
  * @extends JpaEObject
  * @generated
  */
-public class XmlConverter extends AbstractJpaEObject implements JpaEObject
+public interface XmlConverter extends JpaEObject
 {
 	/**
-	 * The default value of the '{@link #getName() <em>Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getName()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String NAME_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getName() <em>Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getName()
-	 * @generated
-	 * @ordered
-	 */
-	protected String name = NAME_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #getClassName() <em>Class Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getClassName()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String CLASS_NAME_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getClassName() <em>Class Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getClassName()
-	 * @generated
-	 * @ordered
-	 */
-	protected String className = CLASS_NAME_EDEFAULT;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected XmlConverter()
-	{
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected EClass eStaticClass()
-	{
-		return EclipseLinkOrmPackage.Literals.XML_CONVERTER;
-	}
-
-	/**
 	 * Returns the value of the '<em><b>Name</b></em>' attribute.
 	 * <!-- begin-user-doc -->
 	 * <p>
@@ -113,10 +45,7 @@ public class XmlConverter extends AbstractJpaEObject implements JpaEObject
 	 * @model
 	 * @generated
 	 */
-	public String getName()
-	{
-		return name;
-	}
+	String getName();
 
 	/**
 	 * Sets the value of the '{@link org.eclipse.jpt.eclipselink.core.resource.orm.XmlConverter#getName <em>Name</em>}' attribute.
@@ -126,13 +55,7 @@ public class XmlConverter extends AbstractJpaEObject implements JpaEObject
 	 * @see #getName()
 	 * @generated
 	 */
-	public void setName(String newName)
-	{
-		String oldName = name;
-		name = newName;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, EclipseLinkOrmPackage.XML_CONVERTER__NAME, oldName, name));
-	}
+	void setName(String value);
 
 	/**
 	 * Returns the value of the '<em><b>Class Name</b></em>' attribute.
@@ -148,10 +71,7 @@ public class XmlConverter extends AbstractJpaEObject implements JpaEObject
 	 * @model
 	 * @generated
 	 */
-	public String getClassName()
-	{
-		return className;
-	}
+	String getClassName();
 
 	/**
 	 * Sets the value of the '{@link org.eclipse.jpt.eclipselink.core.resource.orm.XmlConverter#getClassName <em>Class Name</em>}' attribute.
@@ -161,107 +81,6 @@ public class XmlConverter extends AbstractJpaEObject implements JpaEObject
 	 * @see #getClassName()
 	 * @generated
 	 */
-	public void setClassName(String newClassName)
-	{
-		String oldClassName = className;
-		className = newClassName;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, EclipseLinkOrmPackage.XML_CONVERTER__CLASS_NAME, oldClassName, className));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Object eGet(int featureID, boolean resolve, boolean coreType)
-	{
-		switch (featureID)
-		{
-			case EclipseLinkOrmPackage.XML_CONVERTER__NAME:
-				return getName();
-			case EclipseLinkOrmPackage.XML_CONVERTER__CLASS_NAME:
-				return getClassName();
-		}
-		return super.eGet(featureID, resolve, coreType);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void eSet(int featureID, Object newValue)
-	{
-		switch (featureID)
-		{
-			case EclipseLinkOrmPackage.XML_CONVERTER__NAME:
-				setName((String)newValue);
-				return;
-			case EclipseLinkOrmPackage.XML_CONVERTER__CLASS_NAME:
-				setClassName((String)newValue);
-				return;
-		}
-		super.eSet(featureID, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void eUnset(int featureID)
-	{
-		switch (featureID)
-		{
-			case EclipseLinkOrmPackage.XML_CONVERTER__NAME:
-				setName(NAME_EDEFAULT);
-				return;
-			case EclipseLinkOrmPackage.XML_CONVERTER__CLASS_NAME:
-				setClassName(CLASS_NAME_EDEFAULT);
-				return;
-		}
-		super.eUnset(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public boolean eIsSet(int featureID)
-	{
-		switch (featureID)
-		{
-			case EclipseLinkOrmPackage.XML_CONVERTER__NAME:
-				return NAME_EDEFAULT == null ? name != null : !NAME_EDEFAULT.equals(name);
-			case EclipseLinkOrmPackage.XML_CONVERTER__CLASS_NAME:
-				return CLASS_NAME_EDEFAULT == null ? className != null : !CLASS_NAME_EDEFAULT.equals(className);
-		}
-		return super.eIsSet(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public String toString()
-	{
-		if (eIsProxy()) return super.toString();
-
-		StringBuffer result = new StringBuffer(super.toString());
-		result.append(" (name: ");
-		result.append(name);
-		result.append(", className: ");
-		result.append(className);
-		result.append(')');
-		return result.toString();
-	}
+	void setClassName(String value);
 
 } // XmlConverter
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/orm/XmlConverterImpl.java b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/orm/XmlConverterImpl.java
new file mode 100644
index 0000000000..6f3015331f
--- /dev/null
+++ b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/orm/XmlConverterImpl.java
@@ -0,0 +1,259 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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.eclipselink.core.resource.orm;
+
+import org.eclipse.emf.common.notify.Notification;
+
+import org.eclipse.emf.ecore.EClass;
+
+import org.eclipse.emf.ecore.impl.ENotificationImpl;
+
+import org.eclipse.jpt.core.resource.common.AbstractJpaEObject;
+import org.eclipse.jpt.core.resource.common.JpaEObject;
+
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the model object '<em><b>Xml Converter</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ *
+ * @see org.eclipse.jpt.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlConverterImpl()
+ * @model kind="class"
+ * @generated
+ */
+public class XmlConverterImpl extends AbstractJpaEObject implements XmlConverter
+{
+	/**
+	 * The default value of the '{@link #getName() <em>Name</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getName()
+	 * @generated
+	 * @ordered
+	 */
+	protected static final String NAME_EDEFAULT = null;
+
+	/**
+	 * The cached value of the '{@link #getName() <em>Name</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getName()
+	 * @generated
+	 * @ordered
+	 */
+	protected String name = NAME_EDEFAULT;
+
+	/**
+	 * The default value of the '{@link #getClassName() <em>Class Name</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getClassName()
+	 * @generated
+	 * @ordered
+	 */
+	protected static final String CLASS_NAME_EDEFAULT = null;
+
+	/**
+	 * The cached value of the '{@link #getClassName() <em>Class Name</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getClassName()
+	 * @generated
+	 * @ordered
+	 */
+	protected String className = CLASS_NAME_EDEFAULT;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected XmlConverterImpl()
+	{
+		super();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	protected EClass eStaticClass()
+	{
+		return EclipseLinkOrmPackage.Literals.XML_CONVERTER_IMPL;
+	}
+
+	/**
+	 * Returns the value of the '<em><b>Name</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of the '<em>Name</em>' attribute isn't clear,
+	 * there really should be more of a description here...
+	 * </p>
+	 * <!-- end-user-doc -->
+	 * @return the value of the '<em>Name</em>' attribute.
+	 * @see #setName(String)
+	 * @see org.eclipse.jpt.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlConverter_Name()
+	 * @model
+	 * @generated
+	 */
+	public String getName()
+	{
+		return name;
+	}
+
+	/**
+	 * Sets the value of the '{@link org.eclipse.jpt.eclipselink.core.resource.orm.XmlConverterImpl#getName <em>Name</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param value the new value of the '<em>Name</em>' attribute.
+	 * @see #getName()
+	 * @generated
+	 */
+	public void setName(String newName)
+	{
+		String oldName = name;
+		name = newName;
+		if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, EclipseLinkOrmPackage.XML_CONVERTER_IMPL__NAME, oldName, name));
+	}
+
+	/**
+	 * Returns the value of the '<em><b>Class Name</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of the '<em>Class Name</em>' attribute isn't clear,
+	 * there really should be more of a description here...
+	 * </p>
+	 * <!-- end-user-doc -->
+	 * @return the value of the '<em>Class Name</em>' attribute.
+	 * @see #setClassName(String)
+	 * @see org.eclipse.jpt.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlConverter_ClassName()
+	 * @model
+	 * @generated
+	 */
+	public String getClassName()
+	{
+		return className;
+	}
+
+	/**
+	 * Sets the value of the '{@link org.eclipse.jpt.eclipselink.core.resource.orm.XmlConverterImpl#getClassName <em>Class Name</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param value the new value of the '<em>Class Name</em>' attribute.
+	 * @see #getClassName()
+	 * @generated
+	 */
+	public void setClassName(String newClassName)
+	{
+		String oldClassName = className;
+		className = newClassName;
+		if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, EclipseLinkOrmPackage.XML_CONVERTER_IMPL__CLASS_NAME, oldClassName, className));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public Object eGet(int featureID, boolean resolve, boolean coreType)
+	{
+		switch (featureID)
+		{
+			case EclipseLinkOrmPackage.XML_CONVERTER_IMPL__NAME:
+				return getName();
+			case EclipseLinkOrmPackage.XML_CONVERTER_IMPL__CLASS_NAME:
+				return getClassName();
+		}
+		return super.eGet(featureID, resolve, coreType);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void eSet(int featureID, Object newValue)
+	{
+		switch (featureID)
+		{
+			case EclipseLinkOrmPackage.XML_CONVERTER_IMPL__NAME:
+				setName((String)newValue);
+				return;
+			case EclipseLinkOrmPackage.XML_CONVERTER_IMPL__CLASS_NAME:
+				setClassName((String)newValue);
+				return;
+		}
+		super.eSet(featureID, newValue);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void eUnset(int featureID)
+	{
+		switch (featureID)
+		{
+			case EclipseLinkOrmPackage.XML_CONVERTER_IMPL__NAME:
+				setName(NAME_EDEFAULT);
+				return;
+			case EclipseLinkOrmPackage.XML_CONVERTER_IMPL__CLASS_NAME:
+				setClassName(CLASS_NAME_EDEFAULT);
+				return;
+		}
+		super.eUnset(featureID);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public boolean eIsSet(int featureID)
+	{
+		switch (featureID)
+		{
+			case EclipseLinkOrmPackage.XML_CONVERTER_IMPL__NAME:
+				return NAME_EDEFAULT == null ? name != null : !NAME_EDEFAULT.equals(name);
+			case EclipseLinkOrmPackage.XML_CONVERTER_IMPL__CLASS_NAME:
+				return CLASS_NAME_EDEFAULT == null ? className != null : !CLASS_NAME_EDEFAULT.equals(className);
+		}
+		return super.eIsSet(featureID);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public String toString()
+	{
+		if (eIsProxy()) return super.toString();
+
+		StringBuffer result = new StringBuffer(super.toString());
+		result.append(" (name: ");
+		result.append(name);
+		result.append(", className: ");
+		result.append(className);
+		result.append(')');
+		return result.toString();
+	}
+
+} // XmlConverter
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/orm/XmlConvertibleMapping.java b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/orm/XmlConvertibleMapping.java
index c503780473..0c59c793a5 100644
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/orm/XmlConvertibleMapping.java
+++ b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/orm/XmlConvertibleMapping.java
@@ -28,7 +28,7 @@ import org.eclipse.jpt.core.utility.TextRange;
  * @model kind="class" interface="true" abstract="true"
  * @generated
  */
-public interface XmlConvertibleMapping extends org.eclipse.jpt.core.resource.orm.XmlConvertibleMapping
+public interface XmlConvertibleMapping extends org.eclipse.jpt.core.resource.orm.XmlConvertibleMapping, XmlConverterHolder
 {
 	/**
 	 * Returns the value of the '<em><b>Convert</b></em>' attribute.
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/orm/XmlId.java b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/orm/XmlId.java
index 5a7703d84f..e68cfa9b57 100644
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/orm/XmlId.java
+++ b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/orm/XmlId.java
@@ -20,6 +20,6 @@ package org.eclipse.jpt.eclipselink.core.resource.orm;
  * @model kind="class" interface="true" abstract="true"
  * @generated
  */
-public interface XmlId extends org.eclipse.jpt.core.resource.orm.XmlId, XmlMutable, XmlConvertibleMapping, XmlConverterHolder
+public interface XmlId extends org.eclipse.jpt.core.resource.orm.XmlId, XmlMutable, XmlConvertibleMapping
 {
 } // XmlId
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/orm/XmlIdImpl.java b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/orm/XmlIdImpl.java
index a4b07be1cf..c46a91980c 100644
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/orm/XmlIdImpl.java
+++ b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/orm/XmlIdImpl.java
@@ -50,64 +50,64 @@ public class XmlIdImpl extends org.eclipse.jpt.core.resource.orm.XmlIdImpl imple
 	protected Boolean mutable = MUTABLE_EDEFAULT;
 
 	/**
-	 * The default value of the '{@link #getConvert() <em>Convert</em>}' attribute.
+	 * The cached value of the '{@link #getConverter() <em>Converter</em>}' containment reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @see #getConvert()
+	 * @see #getConverter()
 	 * @generated
 	 * @ordered
 	 */
-	protected static final String CONVERT_EDEFAULT = null;
+	protected XmlConverter converter;
 
 	/**
-	 * The cached value of the '{@link #getConvert() <em>Convert</em>}' attribute.
+	 * The cached value of the '{@link #getTypeConverter() <em>Type Converter</em>}' containment reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @see #getConvert()
+	 * @see #getTypeConverter()
 	 * @generated
 	 * @ordered
 	 */
-	protected String convert = CONVERT_EDEFAULT;
+	protected XmlTypeConverter typeConverter;
 
 	/**
-	 * The cached value of the '{@link #getConverter() <em>Converter</em>}' containment reference.
+	 * The cached value of the '{@link #getObjectTypeConverter() <em>Object Type Converter</em>}' containment reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @see #getConverter()
+	 * @see #getObjectTypeConverter()
 	 * @generated
 	 * @ordered
 	 */
-	protected XmlConverter converter;
+	protected XmlObjectTypeConverter objectTypeConverter;
 
 	/**
-	 * The cached value of the '{@link #getTypeConverter() <em>Type Converter</em>}' containment reference.
+	 * The cached value of the '{@link #getStructConverter() <em>Struct Converter</em>}' containment reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @see #getTypeConverter()
+	 * @see #getStructConverter()
 	 * @generated
 	 * @ordered
 	 */
-	protected XmlTypeConverter typeConverter;
+	protected XmlStructConverter structConverter;
 
 	/**
-	 * The cached value of the '{@link #getObjectTypeConverter() <em>Object Type Converter</em>}' containment reference.
+	 * The default value of the '{@link #getConvert() <em>Convert</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @see #getObjectTypeConverter()
+	 * @see #getConvert()
 	 * @generated
 	 * @ordered
 	 */
-	protected XmlObjectTypeConverter objectTypeConverter;
+	protected static final String CONVERT_EDEFAULT = null;
 
 	/**
-	 * The cached value of the '{@link #getStructConverter() <em>Struct Converter</em>}' containment reference.
+	 * The cached value of the '{@link #getConvert() <em>Convert</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @see #getStructConverter()
+	 * @see #getConvert()
 	 * @generated
 	 * @ordered
 	 */
-	protected XmlStructConverter structConverter;
+	protected String convert = CONVERT_EDEFAULT;
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -474,8 +474,6 @@ public class XmlIdImpl extends org.eclipse.jpt.core.resource.orm.XmlIdImpl imple
 		{
 			case EclipseLinkOrmPackage.XML_ID_IMPL__MUTABLE:
 				return getMutable();
-			case EclipseLinkOrmPackage.XML_ID_IMPL__CONVERT:
-				return getConvert();
 			case EclipseLinkOrmPackage.XML_ID_IMPL__CONVERTER:
 				return getConverter();
 			case EclipseLinkOrmPackage.XML_ID_IMPL__TYPE_CONVERTER:
@@ -484,6 +482,8 @@ public class XmlIdImpl extends org.eclipse.jpt.core.resource.orm.XmlIdImpl imple
 				return getObjectTypeConverter();
 			case EclipseLinkOrmPackage.XML_ID_IMPL__STRUCT_CONVERTER:
 				return getStructConverter();
+			case EclipseLinkOrmPackage.XML_ID_IMPL__CONVERT:
+				return getConvert();
 		}
 		return super.eGet(featureID, resolve, coreType);
 	}
@@ -501,9 +501,6 @@ public class XmlIdImpl extends org.eclipse.jpt.core.resource.orm.XmlIdImpl imple
 			case EclipseLinkOrmPackage.XML_ID_IMPL__MUTABLE:
 				setMutable((Boolean)newValue);
 				return;
-			case EclipseLinkOrmPackage.XML_ID_IMPL__CONVERT:
-				setConvert((String)newValue);
-				return;
 			case EclipseLinkOrmPackage.XML_ID_IMPL__CONVERTER:
 				setConverter((XmlConverter)newValue);
 				return;
@@ -516,6 +513,9 @@ public class XmlIdImpl extends org.eclipse.jpt.core.resource.orm.XmlIdImpl imple
 			case EclipseLinkOrmPackage.XML_ID_IMPL__STRUCT_CONVERTER:
 				setStructConverter((XmlStructConverter)newValue);
 				return;
+			case EclipseLinkOrmPackage.XML_ID_IMPL__CONVERT:
+				setConvert((String)newValue);
+				return;
 		}
 		super.eSet(featureID, newValue);
 	}
@@ -533,9 +533,6 @@ public class XmlIdImpl extends org.eclipse.jpt.core.resource.orm.XmlIdImpl imple
 			case EclipseLinkOrmPackage.XML_ID_IMPL__MUTABLE:
 				setMutable(MUTABLE_EDEFAULT);
 				return;
-			case EclipseLinkOrmPackage.XML_ID_IMPL__CONVERT:
-				setConvert(CONVERT_EDEFAULT);
-				return;
 			case EclipseLinkOrmPackage.XML_ID_IMPL__CONVERTER:
 				setConverter((XmlConverter)null);
 				return;
@@ -548,6 +545,9 @@ public class XmlIdImpl extends org.eclipse.jpt.core.resource.orm.XmlIdImpl imple
 			case EclipseLinkOrmPackage.XML_ID_IMPL__STRUCT_CONVERTER:
 				setStructConverter((XmlStructConverter)null);
 				return;
+			case EclipseLinkOrmPackage.XML_ID_IMPL__CONVERT:
+				setConvert(CONVERT_EDEFAULT);
+				return;
 		}
 		super.eUnset(featureID);
 	}
@@ -564,8 +564,6 @@ public class XmlIdImpl extends org.eclipse.jpt.core.resource.orm.XmlIdImpl imple
 		{
 			case EclipseLinkOrmPackage.XML_ID_IMPL__MUTABLE:
 				return MUTABLE_EDEFAULT == null ? mutable != null : !MUTABLE_EDEFAULT.equals(mutable);
-			case EclipseLinkOrmPackage.XML_ID_IMPL__CONVERT:
-				return CONVERT_EDEFAULT == null ? convert != null : !CONVERT_EDEFAULT.equals(convert);
 			case EclipseLinkOrmPackage.XML_ID_IMPL__CONVERTER:
 				return converter != null;
 			case EclipseLinkOrmPackage.XML_ID_IMPL__TYPE_CONVERTER:
@@ -574,6 +572,8 @@ public class XmlIdImpl extends org.eclipse.jpt.core.resource.orm.XmlIdImpl imple
 				return objectTypeConverter != null;
 			case EclipseLinkOrmPackage.XML_ID_IMPL__STRUCT_CONVERTER:
 				return structConverter != null;
+			case EclipseLinkOrmPackage.XML_ID_IMPL__CONVERT:
+				return CONVERT_EDEFAULT == null ? convert != null : !CONVERT_EDEFAULT.equals(convert);
 		}
 		return super.eIsSet(featureID);
 	}
@@ -594,22 +594,22 @@ public class XmlIdImpl extends org.eclipse.jpt.core.resource.orm.XmlIdImpl imple
 				default: return -1;
 			}
 		}
-		if (baseClass == XmlConvertibleMapping.class)
+		if (baseClass == XmlConverterHolder.class)
 		{
 			switch (derivedFeatureID)
 			{
-				case EclipseLinkOrmPackage.XML_ID_IMPL__CONVERT: return EclipseLinkOrmPackage.XML_CONVERTIBLE_MAPPING__CONVERT;
+				case EclipseLinkOrmPackage.XML_ID_IMPL__CONVERTER: return EclipseLinkOrmPackage.XML_CONVERTER_HOLDER__CONVERTER;
+				case EclipseLinkOrmPackage.XML_ID_IMPL__TYPE_CONVERTER: return EclipseLinkOrmPackage.XML_CONVERTER_HOLDER__TYPE_CONVERTER;
+				case EclipseLinkOrmPackage.XML_ID_IMPL__OBJECT_TYPE_CONVERTER: return EclipseLinkOrmPackage.XML_CONVERTER_HOLDER__OBJECT_TYPE_CONVERTER;
+				case EclipseLinkOrmPackage.XML_ID_IMPL__STRUCT_CONVERTER: return EclipseLinkOrmPackage.XML_CONVERTER_HOLDER__STRUCT_CONVERTER;
 				default: return -1;
 			}
 		}
-		if (baseClass == XmlConverterHolder.class)
+		if (baseClass == XmlConvertibleMapping.class)
 		{
 			switch (derivedFeatureID)
 			{
-				case EclipseLinkOrmPackage.XML_ID_IMPL__CONVERTER: return EclipseLinkOrmPackage.XML_CONVERTER_HOLDER__CONVERTER;
-				case EclipseLinkOrmPackage.XML_ID_IMPL__TYPE_CONVERTER: return EclipseLinkOrmPackage.XML_CONVERTER_HOLDER__TYPE_CONVERTER;
-				case EclipseLinkOrmPackage.XML_ID_IMPL__OBJECT_TYPE_CONVERTER: return EclipseLinkOrmPackage.XML_CONVERTER_HOLDER__OBJECT_TYPE_CONVERTER;
-				case EclipseLinkOrmPackage.XML_ID_IMPL__STRUCT_CONVERTER: return EclipseLinkOrmPackage.XML_CONVERTER_HOLDER__STRUCT_CONVERTER;
+				case EclipseLinkOrmPackage.XML_ID_IMPL__CONVERT: return EclipseLinkOrmPackage.XML_CONVERTIBLE_MAPPING__CONVERT;
 				default: return -1;
 			}
 		}
@@ -639,22 +639,22 @@ public class XmlIdImpl extends org.eclipse.jpt.core.resource.orm.XmlIdImpl imple
 				default: return -1;
 			}
 		}
-		if (baseClass == XmlConvertibleMapping.class)
+		if (baseClass == XmlConverterHolder.class)
 		{
 			switch (baseFeatureID)
 			{
-				case EclipseLinkOrmPackage.XML_CONVERTIBLE_MAPPING__CONVERT: return EclipseLinkOrmPackage.XML_ID_IMPL__CONVERT;
+				case EclipseLinkOrmPackage.XML_CONVERTER_HOLDER__CONVERTER: return EclipseLinkOrmPackage.XML_ID_IMPL__CONVERTER;
+				case EclipseLinkOrmPackage.XML_CONVERTER_HOLDER__TYPE_CONVERTER: return EclipseLinkOrmPackage.XML_ID_IMPL__TYPE_CONVERTER;
+				case EclipseLinkOrmPackage.XML_CONVERTER_HOLDER__OBJECT_TYPE_CONVERTER: return EclipseLinkOrmPackage.XML_ID_IMPL__OBJECT_TYPE_CONVERTER;
+				case EclipseLinkOrmPackage.XML_CONVERTER_HOLDER__STRUCT_CONVERTER: return EclipseLinkOrmPackage.XML_ID_IMPL__STRUCT_CONVERTER;
 				default: return -1;
 			}
 		}
-		if (baseClass == XmlConverterHolder.class)
+		if (baseClass == XmlConvertibleMapping.class)
 		{
 			switch (baseFeatureID)
 			{
-				case EclipseLinkOrmPackage.XML_CONVERTER_HOLDER__CONVERTER: return EclipseLinkOrmPackage.XML_ID_IMPL__CONVERTER;
-				case EclipseLinkOrmPackage.XML_CONVERTER_HOLDER__TYPE_CONVERTER: return EclipseLinkOrmPackage.XML_ID_IMPL__TYPE_CONVERTER;
-				case EclipseLinkOrmPackage.XML_CONVERTER_HOLDER__OBJECT_TYPE_CONVERTER: return EclipseLinkOrmPackage.XML_ID_IMPL__OBJECT_TYPE_CONVERTER;
-				case EclipseLinkOrmPackage.XML_CONVERTER_HOLDER__STRUCT_CONVERTER: return EclipseLinkOrmPackage.XML_ID_IMPL__STRUCT_CONVERTER;
+				case EclipseLinkOrmPackage.XML_CONVERTIBLE_MAPPING__CONVERT: return EclipseLinkOrmPackage.XML_ID_IMPL__CONVERT;
 				default: return -1;
 			}
 		}
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/orm/XmlObjectTypeConverter.java b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/orm/XmlObjectTypeConverter.java
index e40ebdf39a..ca9760e1f7 100644
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/orm/XmlObjectTypeConverter.java
+++ b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/orm/XmlObjectTypeConverter.java
@@ -9,19 +9,8 @@
  ******************************************************************************/
 package org.eclipse.jpt.eclipselink.core.resource.orm;
 
-import java.util.Collection;
-import org.eclipse.emf.common.notify.Notification;
-
-import org.eclipse.emf.common.notify.NotificationChain;
 import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.ecore.EClass;
-
-import org.eclipse.emf.ecore.InternalEObject;
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
 
-import org.eclipse.emf.ecore.util.EObjectContainmentEList;
-import org.eclipse.emf.ecore.util.InternalEList;
-import org.eclipse.jpt.core.resource.common.AbstractJpaEObject;
 import org.eclipse.jpt.core.resource.common.JpaEObject;
 
 /**
@@ -41,122 +30,53 @@ import org.eclipse.jpt.core.resource.common.JpaEObject;
  * </p>
  *
  * @see org.eclipse.jpt.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlObjectTypeConverter()
- * @model kind="class"
+ * @model kind="class" interface="true" abstract="true"
  * @extends JpaEObject
  * @generated
  */
-public class XmlObjectTypeConverter extends AbstractJpaEObject implements JpaEObject
+public interface XmlObjectTypeConverter extends JpaEObject
 {
 	/**
-	 * The cached value of the '{@link #getConversionValues() <em>Conversion Values</em>}' containment reference list.
+	 * Returns the value of the '<em><b>Conversion Values</b></em>' containment reference list.
+	 * The list contents are of type {@link org.eclipse.jpt.eclipselink.core.resource.orm.XmlConversionValue}.
 	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of the '<em>Conversion Values</em>' containment reference list isn't clear,
+	 * there really should be more of a description here...
+	 * </p>
 	 * <!-- end-user-doc -->
-	 * @see #getConversionValues()
+	 * @return the value of the '<em>Conversion Values</em>' containment reference list.
+	 * @see org.eclipse.jpt.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlObjectTypeConverter_ConversionValues()
+	 * @model containment="true"
 	 * @generated
-	 * @ordered
 	 */
-	protected EList<XmlConversionValue> conversionValues;
+	EList<XmlConversionValue> getConversionValues();
 
 	/**
-	 * The default value of the '{@link #getDefaultObjectValue() <em>Default Object Value</em>}' attribute.
+	 * Returns the value of the '<em><b>Default Object Value</b></em>' attribute.
 	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of the '<em>Default Object Value</em>' attribute isn't clear,
+	 * there really should be more of a description here...
+	 * </p>
 	 * <!-- end-user-doc -->
-	 * @see #getDefaultObjectValue()
+	 * @return the value of the '<em>Default Object Value</em>' attribute.
+	 * @see #setDefaultObjectValue(String)
+	 * @see org.eclipse.jpt.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlObjectTypeConverter_DefaultObjectValue()
+	 * @model
 	 * @generated
-	 * @ordered
 	 */
-	protected static final String DEFAULT_OBJECT_VALUE_EDEFAULT = null;
+	String getDefaultObjectValue();
 
 	/**
-	 * The cached value of the '{@link #getDefaultObjectValue() <em>Default Object Value</em>}' attribute.
+	 * Sets the value of the '{@link org.eclipse.jpt.eclipselink.core.resource.orm.XmlObjectTypeConverter#getDefaultObjectValue <em>Default Object Value</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * @param value the new value of the '<em>Default Object Value</em>' attribute.
 	 * @see #getDefaultObjectValue()
 	 * @generated
-	 * @ordered
-	 */
-	protected String defaultObjectValue = DEFAULT_OBJECT_VALUE_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #getName() <em>Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getName()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String NAME_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getName() <em>Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getName()
-	 * @generated
-	 * @ordered
-	 */
-	protected String name = NAME_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #getDataType() <em>Data Type</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getDataType()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String DATA_TYPE_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getDataType() <em>Data Type</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getDataType()
-	 * @generated
-	 * @ordered
-	 */
-	protected String dataType = DATA_TYPE_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #getObjectType() <em>Object Type</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getObjectType()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String OBJECT_TYPE_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getObjectType() <em>Object Type</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getObjectType()
-	 * @generated
-	 * @ordered
-	 */
-	protected String objectType = OBJECT_TYPE_EDEFAULT;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected XmlObjectTypeConverter()
-	{
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
 	 */
-	@Override
-	protected EClass eStaticClass()
-	{
-		return EclipseLinkOrmPackage.Literals.XML_OBJECT_TYPE_CONVERTER;
-	}
+	void setDefaultObjectValue(String value);
 
 	/**
 	 * Returns the value of the '<em><b>Name</b></em>' attribute.
@@ -172,10 +92,7 @@ public class XmlObjectTypeConverter extends AbstractJpaEObject implements JpaEOb
 	 * @model
 	 * @generated
 	 */
-	public String getName()
-	{
-		return name;
-	}
+	String getName();
 
 	/**
 	 * Sets the value of the '{@link org.eclipse.jpt.eclipselink.core.resource.orm.XmlObjectTypeConverter#getName <em>Name</em>}' attribute.
@@ -185,13 +102,7 @@ public class XmlObjectTypeConverter extends AbstractJpaEObject implements JpaEOb
 	 * @see #getName()
 	 * @generated
 	 */
-	public void setName(String newName)
-	{
-		String oldName = name;
-		name = newName;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, EclipseLinkOrmPackage.XML_OBJECT_TYPE_CONVERTER__NAME, oldName, name));
-	}
+	void setName(String value);
 
 	/**
 	 * Returns the value of the '<em><b>Data Type</b></em>' attribute.
@@ -207,10 +118,7 @@ public class XmlObjectTypeConverter extends AbstractJpaEObject implements JpaEOb
 	 * @model
 	 * @generated
 	 */
-	public String getDataType()
-	{
-		return dataType;
-	}
+	String getDataType();
 
 	/**
 	 * Sets the value of the '{@link org.eclipse.jpt.eclipselink.core.resource.orm.XmlObjectTypeConverter#getDataType <em>Data Type</em>}' attribute.
@@ -220,13 +128,7 @@ public class XmlObjectTypeConverter extends AbstractJpaEObject implements JpaEOb
 	 * @see #getDataType()
 	 * @generated
 	 */
-	public void setDataType(String newDataType)
-	{
-		String oldDataType = dataType;
-		dataType = newDataType;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, EclipseLinkOrmPackage.XML_OBJECT_TYPE_CONVERTER__DATA_TYPE, oldDataType, dataType));
-	}
+	void setDataType(String value);
 
 	/**
 	 * Returns the value of the '<em><b>Object Type</b></em>' attribute.
@@ -242,10 +144,7 @@ public class XmlObjectTypeConverter extends AbstractJpaEObject implements JpaEOb
 	 * @model
 	 * @generated
 	 */
-	public String getObjectType()
-	{
-		return objectType;
-	}
+	String getObjectType();
 
 	/**
 	 * Sets the value of the '{@link org.eclipse.jpt.eclipselink.core.resource.orm.XmlObjectTypeConverter#getObjectType <em>Object Type</em>}' attribute.
@@ -255,217 +154,6 @@ public class XmlObjectTypeConverter extends AbstractJpaEObject implements JpaEOb
 	 * @see #getObjectType()
 	 * @generated
 	 */
-	public void setObjectType(String newObjectType)
-	{
-		String oldObjectType = objectType;
-		objectType = newObjectType;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, EclipseLinkOrmPackage.XML_OBJECT_TYPE_CONVERTER__OBJECT_TYPE, oldObjectType, objectType));
-	}
-
-	/**
-	 * Returns the value of the '<em><b>Conversion Values</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.jpt.eclipselink.core.resource.orm.XmlConversionValue}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Conversion Values</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Conversion Values</em>' containment reference list.
-	 * @see org.eclipse.jpt.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlObjectTypeConverter_ConversionValues()
-	 * @model containment="true"
-	 * @generated
-	 */
-	public EList<XmlConversionValue> getConversionValues()
-	{
-		if (conversionValues == null)
-		{
-			conversionValues = new EObjectContainmentEList<XmlConversionValue>(XmlConversionValue.class, this, EclipseLinkOrmPackage.XML_OBJECT_TYPE_CONVERTER__CONVERSION_VALUES);
-		}
-		return conversionValues;
-	}
-
-	/**
-	 * Returns the value of the '<em><b>Default Object Value</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Default Object Value</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Default Object Value</em>' attribute.
-	 * @see #setDefaultObjectValue(String)
-	 * @see org.eclipse.jpt.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlObjectTypeConverter_DefaultObjectValue()
-	 * @model
-	 * @generated
-	 */
-	public String getDefaultObjectValue()
-	{
-		return defaultObjectValue;
-	}
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.jpt.eclipselink.core.resource.orm.XmlObjectTypeConverter#getDefaultObjectValue <em>Default Object Value</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Default Object Value</em>' attribute.
-	 * @see #getDefaultObjectValue()
-	 * @generated
-	 */
-	public void setDefaultObjectValue(String newDefaultObjectValue)
-	{
-		String oldDefaultObjectValue = defaultObjectValue;
-		defaultObjectValue = newDefaultObjectValue;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, EclipseLinkOrmPackage.XML_OBJECT_TYPE_CONVERTER__DEFAULT_OBJECT_VALUE, oldDefaultObjectValue, defaultObjectValue));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs)
-	{
-		switch (featureID)
-		{
-			case EclipseLinkOrmPackage.XML_OBJECT_TYPE_CONVERTER__CONVERSION_VALUES:
-				return ((InternalEList<?>)getConversionValues()).basicRemove(otherEnd, msgs);
-		}
-		return super.eInverseRemove(otherEnd, featureID, msgs);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Object eGet(int featureID, boolean resolve, boolean coreType)
-	{
-		switch (featureID)
-		{
-			case EclipseLinkOrmPackage.XML_OBJECT_TYPE_CONVERTER__CONVERSION_VALUES:
-				return getConversionValues();
-			case EclipseLinkOrmPackage.XML_OBJECT_TYPE_CONVERTER__DEFAULT_OBJECT_VALUE:
-				return getDefaultObjectValue();
-			case EclipseLinkOrmPackage.XML_OBJECT_TYPE_CONVERTER__NAME:
-				return getName();
-			case EclipseLinkOrmPackage.XML_OBJECT_TYPE_CONVERTER__DATA_TYPE:
-				return getDataType();
-			case EclipseLinkOrmPackage.XML_OBJECT_TYPE_CONVERTER__OBJECT_TYPE:
-				return getObjectType();
-		}
-		return super.eGet(featureID, resolve, coreType);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@SuppressWarnings("unchecked")
-	@Override
-	public void eSet(int featureID, Object newValue)
-	{
-		switch (featureID)
-		{
-			case EclipseLinkOrmPackage.XML_OBJECT_TYPE_CONVERTER__CONVERSION_VALUES:
-				getConversionValues().clear();
-				getConversionValues().addAll((Collection<? extends XmlConversionValue>)newValue);
-				return;
-			case EclipseLinkOrmPackage.XML_OBJECT_TYPE_CONVERTER__DEFAULT_OBJECT_VALUE:
-				setDefaultObjectValue((String)newValue);
-				return;
-			case EclipseLinkOrmPackage.XML_OBJECT_TYPE_CONVERTER__NAME:
-				setName((String)newValue);
-				return;
-			case EclipseLinkOrmPackage.XML_OBJECT_TYPE_CONVERTER__DATA_TYPE:
-				setDataType((String)newValue);
-				return;
-			case EclipseLinkOrmPackage.XML_OBJECT_TYPE_CONVERTER__OBJECT_TYPE:
-				setObjectType((String)newValue);
-				return;
-		}
-		super.eSet(featureID, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void eUnset(int featureID)
-	{
-		switch (featureID)
-		{
-			case EclipseLinkOrmPackage.XML_OBJECT_TYPE_CONVERTER__CONVERSION_VALUES:
-				getConversionValues().clear();
-				return;
-			case EclipseLinkOrmPackage.XML_OBJECT_TYPE_CONVERTER__DEFAULT_OBJECT_VALUE:
-				setDefaultObjectValue(DEFAULT_OBJECT_VALUE_EDEFAULT);
-				return;
-			case EclipseLinkOrmPackage.XML_OBJECT_TYPE_CONVERTER__NAME:
-				setName(NAME_EDEFAULT);
-				return;
-			case EclipseLinkOrmPackage.XML_OBJECT_TYPE_CONVERTER__DATA_TYPE:
-				setDataType(DATA_TYPE_EDEFAULT);
-				return;
-			case EclipseLinkOrmPackage.XML_OBJECT_TYPE_CONVERTER__OBJECT_TYPE:
-				setObjectType(OBJECT_TYPE_EDEFAULT);
-				return;
-		}
-		super.eUnset(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public boolean eIsSet(int featureID)
-	{
-		switch (featureID)
-		{
-			case EclipseLinkOrmPackage.XML_OBJECT_TYPE_CONVERTER__CONVERSION_VALUES:
-				return conversionValues != null && !conversionValues.isEmpty();
-			case EclipseLinkOrmPackage.XML_OBJECT_TYPE_CONVERTER__DEFAULT_OBJECT_VALUE:
-				return DEFAULT_OBJECT_VALUE_EDEFAULT == null ? defaultObjectValue != null : !DEFAULT_OBJECT_VALUE_EDEFAULT.equals(defaultObjectValue);
-			case EclipseLinkOrmPackage.XML_OBJECT_TYPE_CONVERTER__NAME:
-				return NAME_EDEFAULT == null ? name != null : !NAME_EDEFAULT.equals(name);
-			case EclipseLinkOrmPackage.XML_OBJECT_TYPE_CONVERTER__DATA_TYPE:
-				return DATA_TYPE_EDEFAULT == null ? dataType != null : !DATA_TYPE_EDEFAULT.equals(dataType);
-			case EclipseLinkOrmPackage.XML_OBJECT_TYPE_CONVERTER__OBJECT_TYPE:
-				return OBJECT_TYPE_EDEFAULT == null ? objectType != null : !OBJECT_TYPE_EDEFAULT.equals(objectType);
-		}
-		return super.eIsSet(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public String toString()
-	{
-		if (eIsProxy()) return super.toString();
-
-		StringBuffer result = new StringBuffer(super.toString());
-		result.append(" (defaultObjectValue: ");
-		result.append(defaultObjectValue);
-		result.append(", name: ");
-		result.append(name);
-		result.append(", dataType: ");
-		result.append(dataType);
-		result.append(", objectType: ");
-		result.append(objectType);
-		result.append(')');
-		return result.toString();
-	}
+	void setObjectType(String value);
 
 } // XmlObjectTypeConverter
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/orm/XmlObjectTypeConverterImpl.java b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/orm/XmlObjectTypeConverterImpl.java
new file mode 100644
index 0000000000..3887ab0016
--- /dev/null
+++ b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/orm/XmlObjectTypeConverterImpl.java
@@ -0,0 +1,460 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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.eclipselink.core.resource.orm;
+
+import java.util.Collection;
+import org.eclipse.emf.common.notify.Notification;
+
+import org.eclipse.emf.common.notify.NotificationChain;
+import org.eclipse.emf.common.util.EList;
+import org.eclipse.emf.ecore.EClass;
+
+import org.eclipse.emf.ecore.InternalEObject;
+import org.eclipse.emf.ecore.impl.ENotificationImpl;
+
+import org.eclipse.emf.ecore.util.EObjectContainmentEList;
+import org.eclipse.emf.ecore.util.InternalEList;
+import org.eclipse.jpt.core.resource.common.AbstractJpaEObject;
+import org.eclipse.jpt.core.resource.common.JpaEObject;
+
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the model object '<em><b>Xml Object Type Converter</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ *
+ * @see org.eclipse.jpt.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlObjectTypeConverterImpl()
+ * @model kind="class"
+ * @generated
+ */
+public class XmlObjectTypeConverterImpl extends AbstractJpaEObject implements XmlObjectTypeConverter
+{
+	/**
+	 * The cached value of the '{@link #getConversionValues() <em>Conversion Values</em>}' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getConversionValues()
+	 * @generated
+	 * @ordered
+	 */
+	protected EList<XmlConversionValue> conversionValues;
+
+	/**
+	 * The default value of the '{@link #getDefaultObjectValue() <em>Default Object Value</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getDefaultObjectValue()
+	 * @generated
+	 * @ordered
+	 */
+	protected static final String DEFAULT_OBJECT_VALUE_EDEFAULT = null;
+
+	/**
+	 * The cached value of the '{@link #getDefaultObjectValue() <em>Default Object Value</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getDefaultObjectValue()
+	 * @generated
+	 * @ordered
+	 */
+	protected String defaultObjectValue = DEFAULT_OBJECT_VALUE_EDEFAULT;
+
+	/**
+	 * The default value of the '{@link #getName() <em>Name</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getName()
+	 * @generated
+	 * @ordered
+	 */
+	protected static final String NAME_EDEFAULT = null;
+
+	/**
+	 * The cached value of the '{@link #getName() <em>Name</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getName()
+	 * @generated
+	 * @ordered
+	 */
+	protected String name = NAME_EDEFAULT;
+
+	/**
+	 * The default value of the '{@link #getDataType() <em>Data Type</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getDataType()
+	 * @generated
+	 * @ordered
+	 */
+	protected static final String DATA_TYPE_EDEFAULT = null;
+
+	/**
+	 * The cached value of the '{@link #getDataType() <em>Data Type</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getDataType()
+	 * @generated
+	 * @ordered
+	 */
+	protected String dataType = DATA_TYPE_EDEFAULT;
+
+	/**
+	 * The default value of the '{@link #getObjectType() <em>Object Type</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getObjectType()
+	 * @generated
+	 * @ordered
+	 */
+	protected static final String OBJECT_TYPE_EDEFAULT = null;
+
+	/**
+	 * The cached value of the '{@link #getObjectType() <em>Object Type</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getObjectType()
+	 * @generated
+	 * @ordered
+	 */
+	protected String objectType = OBJECT_TYPE_EDEFAULT;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected XmlObjectTypeConverterImpl()
+	{
+		super();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	protected EClass eStaticClass()
+	{
+		return EclipseLinkOrmPackage.Literals.XML_OBJECT_TYPE_CONVERTER_IMPL;
+	}
+
+	/**
+	 * Returns the value of the '<em><b>Name</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of the '<em>Name</em>' attribute isn't clear,
+	 * there really should be more of a description here...
+	 * </p>
+	 * <!-- end-user-doc -->
+	 * @return the value of the '<em>Name</em>' attribute.
+	 * @see #setName(String)
+	 * @see org.eclipse.jpt.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlObjectTypeConverter_Name()
+	 * @model
+	 * @generated
+	 */
+	public String getName()
+	{
+		return name;
+	}
+
+	/**
+	 * Sets the value of the '{@link org.eclipse.jpt.eclipselink.core.resource.orm.XmlObjectTypeConverterImpl#getName <em>Name</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param value the new value of the '<em>Name</em>' attribute.
+	 * @see #getName()
+	 * @generated
+	 */
+	public void setName(String newName)
+	{
+		String oldName = name;
+		name = newName;
+		if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, EclipseLinkOrmPackage.XML_OBJECT_TYPE_CONVERTER_IMPL__NAME, oldName, name));
+	}
+
+	/**
+	 * Returns the value of the '<em><b>Data Type</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of the '<em>Data Type</em>' attribute isn't clear,
+	 * there really should be more of a description here...
+	 * </p>
+	 * <!-- end-user-doc -->
+	 * @return the value of the '<em>Data Type</em>' attribute.
+	 * @see #setDataType(String)
+	 * @see org.eclipse.jpt.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlObjectTypeConverter_DataType()
+	 * @model
+	 * @generated
+	 */
+	public String getDataType()
+	{
+		return dataType;
+	}
+
+	/**
+	 * Sets the value of the '{@link org.eclipse.jpt.eclipselink.core.resource.orm.XmlObjectTypeConverterImpl#getDataType <em>Data Type</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param value the new value of the '<em>Data Type</em>' attribute.
+	 * @see #getDataType()
+	 * @generated
+	 */
+	public void setDataType(String newDataType)
+	{
+		String oldDataType = dataType;
+		dataType = newDataType;
+		if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, EclipseLinkOrmPackage.XML_OBJECT_TYPE_CONVERTER_IMPL__DATA_TYPE, oldDataType, dataType));
+	}
+
+	/**
+	 * Returns the value of the '<em><b>Object Type</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of the '<em>Object Type</em>' attribute isn't clear,
+	 * there really should be more of a description here...
+	 * </p>
+	 * <!-- end-user-doc -->
+	 * @return the value of the '<em>Object Type</em>' attribute.
+	 * @see #setObjectType(String)
+	 * @see org.eclipse.jpt.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlObjectTypeConverter_ObjectType()
+	 * @model
+	 * @generated
+	 */
+	public String getObjectType()
+	{
+		return objectType;
+	}
+
+	/**
+	 * Sets the value of the '{@link org.eclipse.jpt.eclipselink.core.resource.orm.XmlObjectTypeConverterImpl#getObjectType <em>Object Type</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param value the new value of the '<em>Object Type</em>' attribute.
+	 * @see #getObjectType()
+	 * @generated
+	 */
+	public void setObjectType(String newObjectType)
+	{
+		String oldObjectType = objectType;
+		objectType = newObjectType;
+		if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, EclipseLinkOrmPackage.XML_OBJECT_TYPE_CONVERTER_IMPL__OBJECT_TYPE, oldObjectType, objectType));
+	}
+
+	/**
+	 * Returns the value of the '<em><b>Conversion Values</b></em>' containment reference list.
+	 * The list contents are of type {@link org.eclipse.jpt.eclipselink.core.resource.orm.XmlConversionValue}.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of the '<em>Conversion Values</em>' containment reference list isn't clear,
+	 * there really should be more of a description here...
+	 * </p>
+	 * <!-- end-user-doc -->
+	 * @return the value of the '<em>Conversion Values</em>' containment reference list.
+	 * @see org.eclipse.jpt.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlObjectTypeConverter_ConversionValues()
+	 * @model containment="true"
+	 * @generated
+	 */
+	public EList<XmlConversionValue> getConversionValues()
+	{
+		if (conversionValues == null)
+		{
+			conversionValues = new EObjectContainmentEList<XmlConversionValue>(XmlConversionValue.class, this, EclipseLinkOrmPackage.XML_OBJECT_TYPE_CONVERTER_IMPL__CONVERSION_VALUES);
+		}
+		return conversionValues;
+	}
+
+	/**
+	 * Returns the value of the '<em><b>Default Object Value</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of the '<em>Default Object Value</em>' attribute isn't clear,
+	 * there really should be more of a description here...
+	 * </p>
+	 * <!-- end-user-doc -->
+	 * @return the value of the '<em>Default Object Value</em>' attribute.
+	 * @see #setDefaultObjectValue(String)
+	 * @see org.eclipse.jpt.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlObjectTypeConverter_DefaultObjectValue()
+	 * @model
+	 * @generated
+	 */
+	public String getDefaultObjectValue()
+	{
+		return defaultObjectValue;
+	}
+
+	/**
+	 * Sets the value of the '{@link org.eclipse.jpt.eclipselink.core.resource.orm.XmlObjectTypeConverterImpl#getDefaultObjectValue <em>Default Object Value</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param value the new value of the '<em>Default Object Value</em>' attribute.
+	 * @see #getDefaultObjectValue()
+	 * @generated
+	 */
+	public void setDefaultObjectValue(String newDefaultObjectValue)
+	{
+		String oldDefaultObjectValue = defaultObjectValue;
+		defaultObjectValue = newDefaultObjectValue;
+		if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, EclipseLinkOrmPackage.XML_OBJECT_TYPE_CONVERTER_IMPL__DEFAULT_OBJECT_VALUE, oldDefaultObjectValue, defaultObjectValue));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs)
+	{
+		switch (featureID)
+		{
+			case EclipseLinkOrmPackage.XML_OBJECT_TYPE_CONVERTER_IMPL__CONVERSION_VALUES:
+				return ((InternalEList<?>)getConversionValues()).basicRemove(otherEnd, msgs);
+		}
+		return super.eInverseRemove(otherEnd, featureID, msgs);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public Object eGet(int featureID, boolean resolve, boolean coreType)
+	{
+		switch (featureID)
+		{
+			case EclipseLinkOrmPackage.XML_OBJECT_TYPE_CONVERTER_IMPL__CONVERSION_VALUES:
+				return getConversionValues();
+			case EclipseLinkOrmPackage.XML_OBJECT_TYPE_CONVERTER_IMPL__DEFAULT_OBJECT_VALUE:
+				return getDefaultObjectValue();
+			case EclipseLinkOrmPackage.XML_OBJECT_TYPE_CONVERTER_IMPL__NAME:
+				return getName();
+			case EclipseLinkOrmPackage.XML_OBJECT_TYPE_CONVERTER_IMPL__DATA_TYPE:
+				return getDataType();
+			case EclipseLinkOrmPackage.XML_OBJECT_TYPE_CONVERTER_IMPL__OBJECT_TYPE:
+				return getObjectType();
+		}
+		return super.eGet(featureID, resolve, coreType);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@SuppressWarnings("unchecked")
+	@Override
+	public void eSet(int featureID, Object newValue)
+	{
+		switch (featureID)
+		{
+			case EclipseLinkOrmPackage.XML_OBJECT_TYPE_CONVERTER_IMPL__CONVERSION_VALUES:
+				getConversionValues().clear();
+				getConversionValues().addAll((Collection<? extends XmlConversionValue>)newValue);
+				return;
+			case EclipseLinkOrmPackage.XML_OBJECT_TYPE_CONVERTER_IMPL__DEFAULT_OBJECT_VALUE:
+				setDefaultObjectValue((String)newValue);
+				return;
+			case EclipseLinkOrmPackage.XML_OBJECT_TYPE_CONVERTER_IMPL__NAME:
+				setName((String)newValue);
+				return;
+			case EclipseLinkOrmPackage.XML_OBJECT_TYPE_CONVERTER_IMPL__DATA_TYPE:
+				setDataType((String)newValue);
+				return;
+			case EclipseLinkOrmPackage.XML_OBJECT_TYPE_CONVERTER_IMPL__OBJECT_TYPE:
+				setObjectType((String)newValue);
+				return;
+		}
+		super.eSet(featureID, newValue);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void eUnset(int featureID)
+	{
+		switch (featureID)
+		{
+			case EclipseLinkOrmPackage.XML_OBJECT_TYPE_CONVERTER_IMPL__CONVERSION_VALUES:
+				getConversionValues().clear();
+				return;
+			case EclipseLinkOrmPackage.XML_OBJECT_TYPE_CONVERTER_IMPL__DEFAULT_OBJECT_VALUE:
+				setDefaultObjectValue(DEFAULT_OBJECT_VALUE_EDEFAULT);
+				return;
+			case EclipseLinkOrmPackage.XML_OBJECT_TYPE_CONVERTER_IMPL__NAME:
+				setName(NAME_EDEFAULT);
+				return;
+			case EclipseLinkOrmPackage.XML_OBJECT_TYPE_CONVERTER_IMPL__DATA_TYPE:
+				setDataType(DATA_TYPE_EDEFAULT);
+				return;
+			case EclipseLinkOrmPackage.XML_OBJECT_TYPE_CONVERTER_IMPL__OBJECT_TYPE:
+				setObjectType(OBJECT_TYPE_EDEFAULT);
+				return;
+		}
+		super.eUnset(featureID);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public boolean eIsSet(int featureID)
+	{
+		switch (featureID)
+		{
+			case EclipseLinkOrmPackage.XML_OBJECT_TYPE_CONVERTER_IMPL__CONVERSION_VALUES:
+				return conversionValues != null && !conversionValues.isEmpty();
+			case EclipseLinkOrmPackage.XML_OBJECT_TYPE_CONVERTER_IMPL__DEFAULT_OBJECT_VALUE:
+				return DEFAULT_OBJECT_VALUE_EDEFAULT == null ? defaultObjectValue != null : !DEFAULT_OBJECT_VALUE_EDEFAULT.equals(defaultObjectValue);
+			case EclipseLinkOrmPackage.XML_OBJECT_TYPE_CONVERTER_IMPL__NAME:
+				return NAME_EDEFAULT == null ? name != null : !NAME_EDEFAULT.equals(name);
+			case EclipseLinkOrmPackage.XML_OBJECT_TYPE_CONVERTER_IMPL__DATA_TYPE:
+				return DATA_TYPE_EDEFAULT == null ? dataType != null : !DATA_TYPE_EDEFAULT.equals(dataType);
+			case EclipseLinkOrmPackage.XML_OBJECT_TYPE_CONVERTER_IMPL__OBJECT_TYPE:
+				return OBJECT_TYPE_EDEFAULT == null ? objectType != null : !OBJECT_TYPE_EDEFAULT.equals(objectType);
+		}
+		return super.eIsSet(featureID);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public String toString()
+	{
+		if (eIsProxy()) return super.toString();
+
+		StringBuffer result = new StringBuffer(super.toString());
+		result.append(" (defaultObjectValue: ");
+		result.append(defaultObjectValue);
+		result.append(", name: ");
+		result.append(name);
+		result.append(", dataType: ");
+		result.append(dataType);
+		result.append(", objectType: ");
+		result.append(objectType);
+		result.append(')');
+		return result.toString();
+	}
+
+} // XmlObjectTypeConverter
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/orm/XmlStructConverter.java b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/orm/XmlStructConverter.java
index 33db9406b6..384067bf2a 100644
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/orm/XmlStructConverter.java
+++ b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/orm/XmlStructConverter.java
@@ -9,13 +9,6 @@
  ******************************************************************************/
 package org.eclipse.jpt.eclipselink.core.resource.orm;
 
-import org.eclipse.emf.common.notify.Notification;
-
-import org.eclipse.emf.ecore.EClass;
-
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-
-import org.eclipse.jpt.core.resource.common.AbstractJpaEObject;
 import org.eclipse.jpt.core.resource.common.JpaEObject;
 
 /**
@@ -32,74 +25,13 @@ import org.eclipse.jpt.core.resource.common.JpaEObject;
  * </p>
  *
  * @see org.eclipse.jpt.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlStructConverter()
- * @model kind="class"
+ * @model kind="class" interface="true" abstract="true"
  * @extends JpaEObject
  * @generated
  */
-public class XmlStructConverter extends AbstractJpaEObject implements JpaEObject
+public interface XmlStructConverter extends JpaEObject
 {
 	/**
-	 * The default value of the '{@link #getName() <em>Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getName()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String NAME_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getName() <em>Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getName()
-	 * @generated
-	 * @ordered
-	 */
-	protected String name = NAME_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #getConverter() <em>Converter</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getConverter()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String CONVERTER_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getConverter() <em>Converter</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getConverter()
-	 * @generated
-	 * @ordered
-	 */
-	protected String converter = CONVERTER_EDEFAULT;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected XmlStructConverter()
-	{
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected EClass eStaticClass()
-	{
-		return EclipseLinkOrmPackage.Literals.XML_STRUCT_CONVERTER;
-	}
-
-	/**
 	 * Returns the value of the '<em><b>Name</b></em>' attribute.
 	 * <!-- begin-user-doc -->
 	 * <p>
@@ -113,10 +45,7 @@ public class XmlStructConverter extends AbstractJpaEObject implements JpaEObject
 	 * @model
 	 * @generated
 	 */
-	public String getName()
-	{
-		return name;
-	}
+	String getName();
 
 	/**
 	 * Sets the value of the '{@link org.eclipse.jpt.eclipselink.core.resource.orm.XmlStructConverter#getName <em>Name</em>}' attribute.
@@ -126,13 +55,7 @@ public class XmlStructConverter extends AbstractJpaEObject implements JpaEObject
 	 * @see #getName()
 	 * @generated
 	 */
-	public void setName(String newName)
-	{
-		String oldName = name;
-		name = newName;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, EclipseLinkOrmPackage.XML_STRUCT_CONVERTER__NAME, oldName, name));
-	}
+	void setName(String value);
 
 	/**
 	 * Returns the value of the '<em><b>Converter</b></em>' attribute.
@@ -148,10 +71,7 @@ public class XmlStructConverter extends AbstractJpaEObject implements JpaEObject
 	 * @model
 	 * @generated
 	 */
-	public String getConverter()
-	{
-		return converter;
-	}
+	String getConverter();
 
 	/**
 	 * Sets the value of the '{@link org.eclipse.jpt.eclipselink.core.resource.orm.XmlStructConverter#getConverter <em>Converter</em>}' attribute.
@@ -161,107 +81,6 @@ public class XmlStructConverter extends AbstractJpaEObject implements JpaEObject
 	 * @see #getConverter()
 	 * @generated
 	 */
-	public void setConverter(String newConverter)
-	{
-		String oldConverter = converter;
-		converter = newConverter;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, EclipseLinkOrmPackage.XML_STRUCT_CONVERTER__CONVERTER, oldConverter, converter));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Object eGet(int featureID, boolean resolve, boolean coreType)
-	{
-		switch (featureID)
-		{
-			case EclipseLinkOrmPackage.XML_STRUCT_CONVERTER__NAME:
-				return getName();
-			case EclipseLinkOrmPackage.XML_STRUCT_CONVERTER__CONVERTER:
-				return getConverter();
-		}
-		return super.eGet(featureID, resolve, coreType);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void eSet(int featureID, Object newValue)
-	{
-		switch (featureID)
-		{
-			case EclipseLinkOrmPackage.XML_STRUCT_CONVERTER__NAME:
-				setName((String)newValue);
-				return;
-			case EclipseLinkOrmPackage.XML_STRUCT_CONVERTER__CONVERTER:
-				setConverter((String)newValue);
-				return;
-		}
-		super.eSet(featureID, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void eUnset(int featureID)
-	{
-		switch (featureID)
-		{
-			case EclipseLinkOrmPackage.XML_STRUCT_CONVERTER__NAME:
-				setName(NAME_EDEFAULT);
-				return;
-			case EclipseLinkOrmPackage.XML_STRUCT_CONVERTER__CONVERTER:
-				setConverter(CONVERTER_EDEFAULT);
-				return;
-		}
-		super.eUnset(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public boolean eIsSet(int featureID)
-	{
-		switch (featureID)
-		{
-			case EclipseLinkOrmPackage.XML_STRUCT_CONVERTER__NAME:
-				return NAME_EDEFAULT == null ? name != null : !NAME_EDEFAULT.equals(name);
-			case EclipseLinkOrmPackage.XML_STRUCT_CONVERTER__CONVERTER:
-				return CONVERTER_EDEFAULT == null ? converter != null : !CONVERTER_EDEFAULT.equals(converter);
-		}
-		return super.eIsSet(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public String toString()
-	{
-		if (eIsProxy()) return super.toString();
-
-		StringBuffer result = new StringBuffer(super.toString());
-		result.append(" (name: ");
-		result.append(name);
-		result.append(", converter: ");
-		result.append(converter);
-		result.append(')');
-		return result.toString();
-	}
+	void setConverter(String value);
 
 } // XmlStructConverter
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/orm/XmlStructConverterImpl.java b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/orm/XmlStructConverterImpl.java
new file mode 100644
index 0000000000..cd2b873dcb
--- /dev/null
+++ b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/orm/XmlStructConverterImpl.java
@@ -0,0 +1,259 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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.eclipselink.core.resource.orm;
+
+import org.eclipse.emf.common.notify.Notification;
+
+import org.eclipse.emf.ecore.EClass;
+
+import org.eclipse.emf.ecore.impl.ENotificationImpl;
+
+import org.eclipse.jpt.core.resource.common.AbstractJpaEObject;
+import org.eclipse.jpt.core.resource.common.JpaEObject;
+
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the model object '<em><b>Xml Struct Converter</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ *
+ * @see org.eclipse.jpt.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlStructConverterImpl()
+ * @model kind="class"
+ * @generated
+ */
+public class XmlStructConverterImpl extends AbstractJpaEObject implements XmlStructConverter
+{
+	/**
+	 * The default value of the '{@link #getName() <em>Name</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getName()
+	 * @generated
+	 * @ordered
+	 */
+	protected static final String NAME_EDEFAULT = null;
+
+	/**
+	 * The cached value of the '{@link #getName() <em>Name</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getName()
+	 * @generated
+	 * @ordered
+	 */
+	protected String name = NAME_EDEFAULT;
+
+	/**
+	 * The default value of the '{@link #getConverter() <em>Converter</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getConverter()
+	 * @generated
+	 * @ordered
+	 */
+	protected static final String CONVERTER_EDEFAULT = null;
+
+	/**
+	 * The cached value of the '{@link #getConverter() <em>Converter</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getConverter()
+	 * @generated
+	 * @ordered
+	 */
+	protected String converter = CONVERTER_EDEFAULT;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected XmlStructConverterImpl()
+	{
+		super();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	protected EClass eStaticClass()
+	{
+		return EclipseLinkOrmPackage.Literals.XML_STRUCT_CONVERTER_IMPL;
+	}
+
+	/**
+	 * Returns the value of the '<em><b>Name</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of the '<em>Name</em>' attribute isn't clear,
+	 * there really should be more of a description here...
+	 * </p>
+	 * <!-- end-user-doc -->
+	 * @return the value of the '<em>Name</em>' attribute.
+	 * @see #setName(String)
+	 * @see org.eclipse.jpt.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlStructConverter_Name()
+	 * @model
+	 * @generated
+	 */
+	public String getName()
+	{
+		return name;
+	}
+
+	/**
+	 * Sets the value of the '{@link org.eclipse.jpt.eclipselink.core.resource.orm.XmlStructConverterImpl#getName <em>Name</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param value the new value of the '<em>Name</em>' attribute.
+	 * @see #getName()
+	 * @generated
+	 */
+	public void setName(String newName)
+	{
+		String oldName = name;
+		name = newName;
+		if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, EclipseLinkOrmPackage.XML_STRUCT_CONVERTER_IMPL__NAME, oldName, name));
+	}
+
+	/**
+	 * Returns the value of the '<em><b>Converter</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of the '<em>Converter</em>' attribute isn't clear,
+	 * there really should be more of a description here...
+	 * </p>
+	 * <!-- end-user-doc -->
+	 * @return the value of the '<em>Converter</em>' attribute.
+	 * @see #setConverter(String)
+	 * @see org.eclipse.jpt.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlStructConverter_Converter()
+	 * @model
+	 * @generated
+	 */
+	public String getConverter()
+	{
+		return converter;
+	}
+
+	/**
+	 * Sets the value of the '{@link org.eclipse.jpt.eclipselink.core.resource.orm.XmlStructConverterImpl#getConverter <em>Converter</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param value the new value of the '<em>Converter</em>' attribute.
+	 * @see #getConverter()
+	 * @generated
+	 */
+	public void setConverter(String newConverter)
+	{
+		String oldConverter = converter;
+		converter = newConverter;
+		if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, EclipseLinkOrmPackage.XML_STRUCT_CONVERTER_IMPL__CONVERTER, oldConverter, converter));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public Object eGet(int featureID, boolean resolve, boolean coreType)
+	{
+		switch (featureID)
+		{
+			case EclipseLinkOrmPackage.XML_STRUCT_CONVERTER_IMPL__NAME:
+				return getName();
+			case EclipseLinkOrmPackage.XML_STRUCT_CONVERTER_IMPL__CONVERTER:
+				return getConverter();
+		}
+		return super.eGet(featureID, resolve, coreType);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void eSet(int featureID, Object newValue)
+	{
+		switch (featureID)
+		{
+			case EclipseLinkOrmPackage.XML_STRUCT_CONVERTER_IMPL__NAME:
+				setName((String)newValue);
+				return;
+			case EclipseLinkOrmPackage.XML_STRUCT_CONVERTER_IMPL__CONVERTER:
+				setConverter((String)newValue);
+				return;
+		}
+		super.eSet(featureID, newValue);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void eUnset(int featureID)
+	{
+		switch (featureID)
+		{
+			case EclipseLinkOrmPackage.XML_STRUCT_CONVERTER_IMPL__NAME:
+				setName(NAME_EDEFAULT);
+				return;
+			case EclipseLinkOrmPackage.XML_STRUCT_CONVERTER_IMPL__CONVERTER:
+				setConverter(CONVERTER_EDEFAULT);
+				return;
+		}
+		super.eUnset(featureID);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public boolean eIsSet(int featureID)
+	{
+		switch (featureID)
+		{
+			case EclipseLinkOrmPackage.XML_STRUCT_CONVERTER_IMPL__NAME:
+				return NAME_EDEFAULT == null ? name != null : !NAME_EDEFAULT.equals(name);
+			case EclipseLinkOrmPackage.XML_STRUCT_CONVERTER_IMPL__CONVERTER:
+				return CONVERTER_EDEFAULT == null ? converter != null : !CONVERTER_EDEFAULT.equals(converter);
+		}
+		return super.eIsSet(featureID);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public String toString()
+	{
+		if (eIsProxy()) return super.toString();
+
+		StringBuffer result = new StringBuffer(super.toString());
+		result.append(" (name: ");
+		result.append(name);
+		result.append(", converter: ");
+		result.append(converter);
+		result.append(')');
+		return result.toString();
+	}
+
+} // XmlStructConverter
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/orm/XmlTypeConverter.java b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/orm/XmlTypeConverter.java
index 723e2a3045..c94d6bd2ff 100644
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/orm/XmlTypeConverter.java
+++ b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/orm/XmlTypeConverter.java
@@ -9,13 +9,6 @@
  ******************************************************************************/
 package org.eclipse.jpt.eclipselink.core.resource.orm;
 
-import org.eclipse.emf.common.notify.Notification;
-
-import org.eclipse.emf.ecore.EClass;
-
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-
-import org.eclipse.jpt.core.resource.common.AbstractJpaEObject;
 import org.eclipse.jpt.core.resource.common.JpaEObject;
 
 /**
@@ -33,94 +26,13 @@ import org.eclipse.jpt.core.resource.common.JpaEObject;
  * </p>
  *
  * @see org.eclipse.jpt.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlTypeConverter()
- * @model kind="class"
+ * @model kind="class" interface="true" abstract="true"
  * @extends JpaEObject
  * @generated
  */
-public class XmlTypeConverter extends AbstractJpaEObject implements JpaEObject
+public interface XmlTypeConverter extends JpaEObject
 {
 	/**
-	 * The default value of the '{@link #getName() <em>Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getName()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String NAME_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getName() <em>Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getName()
-	 * @generated
-	 * @ordered
-	 */
-	protected String name = NAME_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #getDataType() <em>Data Type</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getDataType()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String DATA_TYPE_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getDataType() <em>Data Type</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getDataType()
-	 * @generated
-	 * @ordered
-	 */
-	protected String dataType = DATA_TYPE_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #getObjectType() <em>Object Type</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getObjectType()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String OBJECT_TYPE_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getObjectType() <em>Object Type</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getObjectType()
-	 * @generated
-	 * @ordered
-	 */
-	protected String objectType = OBJECT_TYPE_EDEFAULT;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected XmlTypeConverter()
-	{
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected EClass eStaticClass()
-	{
-		return EclipseLinkOrmPackage.Literals.XML_TYPE_CONVERTER;
-	}
-
-	/**
 	 * Returns the value of the '<em><b>Name</b></em>' attribute.
 	 * <!-- begin-user-doc -->
 	 * <p>
@@ -134,10 +46,7 @@ public class XmlTypeConverter extends AbstractJpaEObject implements JpaEObject
 	 * @model
 	 * @generated
 	 */
-	public String getName()
-	{
-		return name;
-	}
+	String getName();
 
 	/**
 	 * Sets the value of the '{@link org.eclipse.jpt.eclipselink.core.resource.orm.XmlTypeConverter#getName <em>Name</em>}' attribute.
@@ -147,13 +56,7 @@ public class XmlTypeConverter extends AbstractJpaEObject implements JpaEObject
 	 * @see #getName()
 	 * @generated
 	 */
-	public void setName(String newName)
-	{
-		String oldName = name;
-		name = newName;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, EclipseLinkOrmPackage.XML_TYPE_CONVERTER__NAME, oldName, name));
-	}
+	void setName(String value);
 
 	/**
 	 * Returns the value of the '<em><b>Data Type</b></em>' attribute.
@@ -169,10 +72,7 @@ public class XmlTypeConverter extends AbstractJpaEObject implements JpaEObject
 	 * @model
 	 * @generated
 	 */
-	public String getDataType()
-	{
-		return dataType;
-	}
+	String getDataType();
 
 	/**
 	 * Sets the value of the '{@link org.eclipse.jpt.eclipselink.core.resource.orm.XmlTypeConverter#getDataType <em>Data Type</em>}' attribute.
@@ -182,13 +82,7 @@ public class XmlTypeConverter extends AbstractJpaEObject implements JpaEObject
 	 * @see #getDataType()
 	 * @generated
 	 */
-	public void setDataType(String newDataType)
-	{
-		String oldDataType = dataType;
-		dataType = newDataType;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, EclipseLinkOrmPackage.XML_TYPE_CONVERTER__DATA_TYPE, oldDataType, dataType));
-	}
+	void setDataType(String value);
 
 	/**
 	 * Returns the value of the '<em><b>Object Type</b></em>' attribute.
@@ -204,10 +98,7 @@ public class XmlTypeConverter extends AbstractJpaEObject implements JpaEObject
 	 * @model
 	 * @generated
 	 */
-	public String getObjectType()
-	{
-		return objectType;
-	}
+	String getObjectType();
 
 	/**
 	 * Sets the value of the '{@link org.eclipse.jpt.eclipselink.core.resource.orm.XmlTypeConverter#getObjectType <em>Object Type</em>}' attribute.
@@ -217,119 +108,6 @@ public class XmlTypeConverter extends AbstractJpaEObject implements JpaEObject
 	 * @see #getObjectType()
 	 * @generated
 	 */
-	public void setObjectType(String newObjectType)
-	{
-		String oldObjectType = objectType;
-		objectType = newObjectType;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, EclipseLinkOrmPackage.XML_TYPE_CONVERTER__OBJECT_TYPE, oldObjectType, objectType));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Object eGet(int featureID, boolean resolve, boolean coreType)
-	{
-		switch (featureID)
-		{
-			case EclipseLinkOrmPackage.XML_TYPE_CONVERTER__NAME:
-				return getName();
-			case EclipseLinkOrmPackage.XML_TYPE_CONVERTER__DATA_TYPE:
-				return getDataType();
-			case EclipseLinkOrmPackage.XML_TYPE_CONVERTER__OBJECT_TYPE:
-				return getObjectType();
-		}
-		return super.eGet(featureID, resolve, coreType);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void eSet(int featureID, Object newValue)
-	{
-		switch (featureID)
-		{
-			case EclipseLinkOrmPackage.XML_TYPE_CONVERTER__NAME:
-				setName((String)newValue);
-				return;
-			case EclipseLinkOrmPackage.XML_TYPE_CONVERTER__DATA_TYPE:
-				setDataType((String)newValue);
-				return;
-			case EclipseLinkOrmPackage.XML_TYPE_CONVERTER__OBJECT_TYPE:
-				setObjectType((String)newValue);
-				return;
-		}
-		super.eSet(featureID, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void eUnset(int featureID)
-	{
-		switch (featureID)
-		{
-			case EclipseLinkOrmPackage.XML_TYPE_CONVERTER__NAME:
-				setName(NAME_EDEFAULT);
-				return;
-			case EclipseLinkOrmPackage.XML_TYPE_CONVERTER__DATA_TYPE:
-				setDataType(DATA_TYPE_EDEFAULT);
-				return;
-			case EclipseLinkOrmPackage.XML_TYPE_CONVERTER__OBJECT_TYPE:
-				setObjectType(OBJECT_TYPE_EDEFAULT);
-				return;
-		}
-		super.eUnset(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public boolean eIsSet(int featureID)
-	{
-		switch (featureID)
-		{
-			case EclipseLinkOrmPackage.XML_TYPE_CONVERTER__NAME:
-				return NAME_EDEFAULT == null ? name != null : !NAME_EDEFAULT.equals(name);
-			case EclipseLinkOrmPackage.XML_TYPE_CONVERTER__DATA_TYPE:
-				return DATA_TYPE_EDEFAULT == null ? dataType != null : !DATA_TYPE_EDEFAULT.equals(dataType);
-			case EclipseLinkOrmPackage.XML_TYPE_CONVERTER__OBJECT_TYPE:
-				return OBJECT_TYPE_EDEFAULT == null ? objectType != null : !OBJECT_TYPE_EDEFAULT.equals(objectType);
-		}
-		return super.eIsSet(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public String toString()
-	{
-		if (eIsProxy()) return super.toString();
-
-		StringBuffer result = new StringBuffer(super.toString());
-		result.append(" (name: ");
-		result.append(name);
-		result.append(", dataType: ");
-		result.append(dataType);
-		result.append(", objectType: ");
-		result.append(objectType);
-		result.append(')');
-		return result.toString();
-	}
+	void setObjectType(String value);
 
 } // XmlTypeConverter
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/orm/XmlTypeConverterImpl.java b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/orm/XmlTypeConverterImpl.java
new file mode 100644
index 0000000000..fee56c9a99
--- /dev/null
+++ b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/orm/XmlTypeConverterImpl.java
@@ -0,0 +1,326 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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.eclipselink.core.resource.orm;
+
+import org.eclipse.emf.common.notify.Notification;
+
+import org.eclipse.emf.ecore.EClass;
+
+import org.eclipse.emf.ecore.impl.ENotificationImpl;
+
+import org.eclipse.jpt.core.resource.common.AbstractJpaEObject;
+import org.eclipse.jpt.core.resource.common.JpaEObject;
+
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the model object '<em><b>Xml Type Converter</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ *
+ * @see org.eclipse.jpt.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlTypeConverterImpl()
+ * @model kind="class"
+ * @generated
+ */
+public class XmlTypeConverterImpl extends AbstractJpaEObject implements XmlTypeConverter
+{
+	/**
+	 * The default value of the '{@link #getName() <em>Name</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getName()
+	 * @generated
+	 * @ordered
+	 */
+	protected static final String NAME_EDEFAULT = null;
+
+	/**
+	 * The cached value of the '{@link #getName() <em>Name</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getName()
+	 * @generated
+	 * @ordered
+	 */
+	protected String name = NAME_EDEFAULT;
+
+	/**
+	 * The default value of the '{@link #getDataType() <em>Data Type</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getDataType()
+	 * @generated
+	 * @ordered
+	 */
+	protected static final String DATA_TYPE_EDEFAULT = null;
+
+	/**
+	 * The cached value of the '{@link #getDataType() <em>Data Type</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getDataType()
+	 * @generated
+	 * @ordered
+	 */
+	protected String dataType = DATA_TYPE_EDEFAULT;
+
+	/**
+	 * The default value of the '{@link #getObjectType() <em>Object Type</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getObjectType()
+	 * @generated
+	 * @ordered
+	 */
+	protected static final String OBJECT_TYPE_EDEFAULT = null;
+
+	/**
+	 * The cached value of the '{@link #getObjectType() <em>Object Type</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getObjectType()
+	 * @generated
+	 * @ordered
+	 */
+	protected String objectType = OBJECT_TYPE_EDEFAULT;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected XmlTypeConverterImpl()
+	{
+		super();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	protected EClass eStaticClass()
+	{
+		return EclipseLinkOrmPackage.Literals.XML_TYPE_CONVERTER_IMPL;
+	}
+
+	/**
+	 * Returns the value of the '<em><b>Name</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of the '<em>Name</em>' attribute isn't clear,
+	 * there really should be more of a description here...
+	 * </p>
+	 * <!-- end-user-doc -->
+	 * @return the value of the '<em>Name</em>' attribute.
+	 * @see #setName(String)
+	 * @see org.eclipse.jpt.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlTypeConverter_Name()
+	 * @model
+	 * @generated
+	 */
+	public String getName()
+	{
+		return name;
+	}
+
+	/**
+	 * Sets the value of the '{@link org.eclipse.jpt.eclipselink.core.resource.orm.XmlTypeConverterImpl#getName <em>Name</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param value the new value of the '<em>Name</em>' attribute.
+	 * @see #getName()
+	 * @generated
+	 */
+	public void setName(String newName)
+	{
+		String oldName = name;
+		name = newName;
+		if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, EclipseLinkOrmPackage.XML_TYPE_CONVERTER_IMPL__NAME, oldName, name));
+	}
+
+	/**
+	 * Returns the value of the '<em><b>Data Type</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of the '<em>Data Type</em>' attribute isn't clear,
+	 * there really should be more of a description here...
+	 * </p>
+	 * <!-- end-user-doc -->
+	 * @return the value of the '<em>Data Type</em>' attribute.
+	 * @see #setDataType(String)
+	 * @see org.eclipse.jpt.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlTypeConverter_DataType()
+	 * @model
+	 * @generated
+	 */
+	public String getDataType()
+	{
+		return dataType;
+	}
+
+	/**
+	 * Sets the value of the '{@link org.eclipse.jpt.eclipselink.core.resource.orm.XmlTypeConverterImpl#getDataType <em>Data Type</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param value the new value of the '<em>Data Type</em>' attribute.
+	 * @see #getDataType()
+	 * @generated
+	 */
+	public void setDataType(String newDataType)
+	{
+		String oldDataType = dataType;
+		dataType = newDataType;
+		if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, EclipseLinkOrmPackage.XML_TYPE_CONVERTER_IMPL__DATA_TYPE, oldDataType, dataType));
+	}
+
+	/**
+	 * Returns the value of the '<em><b>Object Type</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of the '<em>Object Type</em>' attribute isn't clear,
+	 * there really should be more of a description here...
+	 * </p>
+	 * <!-- end-user-doc -->
+	 * @return the value of the '<em>Object Type</em>' attribute.
+	 * @see #setObjectType(String)
+	 * @see org.eclipse.jpt.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlTypeConverter_ObjectType()
+	 * @model
+	 * @generated
+	 */
+	public String getObjectType()
+	{
+		return objectType;
+	}
+
+	/**
+	 * Sets the value of the '{@link org.eclipse.jpt.eclipselink.core.resource.orm.XmlTypeConverterImpl#getObjectType <em>Object Type</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param value the new value of the '<em>Object Type</em>' attribute.
+	 * @see #getObjectType()
+	 * @generated
+	 */
+	public void setObjectType(String newObjectType)
+	{
+		String oldObjectType = objectType;
+		objectType = newObjectType;
+		if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, EclipseLinkOrmPackage.XML_TYPE_CONVERTER_IMPL__OBJECT_TYPE, oldObjectType, objectType));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public Object eGet(int featureID, boolean resolve, boolean coreType)
+	{
+		switch (featureID)
+		{
+			case EclipseLinkOrmPackage.XML_TYPE_CONVERTER_IMPL__NAME:
+				return getName();
+			case EclipseLinkOrmPackage.XML_TYPE_CONVERTER_IMPL__DATA_TYPE:
+				return getDataType();
+			case EclipseLinkOrmPackage.XML_TYPE_CONVERTER_IMPL__OBJECT_TYPE:
+				return getObjectType();
+		}
+		return super.eGet(featureID, resolve, coreType);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void eSet(int featureID, Object newValue)
+	{
+		switch (featureID)
+		{
+			case EclipseLinkOrmPackage.XML_TYPE_CONVERTER_IMPL__NAME:
+				setName((String)newValue);
+				return;
+			case EclipseLinkOrmPackage.XML_TYPE_CONVERTER_IMPL__DATA_TYPE:
+				setDataType((String)newValue);
+				return;
+			case EclipseLinkOrmPackage.XML_TYPE_CONVERTER_IMPL__OBJECT_TYPE:
+				setObjectType((String)newValue);
+				return;
+		}
+		super.eSet(featureID, newValue);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void eUnset(int featureID)
+	{
+		switch (featureID)
+		{
+			case EclipseLinkOrmPackage.XML_TYPE_CONVERTER_IMPL__NAME:
+				setName(NAME_EDEFAULT);
+				return;
+			case EclipseLinkOrmPackage.XML_TYPE_CONVERTER_IMPL__DATA_TYPE:
+				setDataType(DATA_TYPE_EDEFAULT);
+				return;
+			case EclipseLinkOrmPackage.XML_TYPE_CONVERTER_IMPL__OBJECT_TYPE:
+				setObjectType(OBJECT_TYPE_EDEFAULT);
+				return;
+		}
+		super.eUnset(featureID);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public boolean eIsSet(int featureID)
+	{
+		switch (featureID)
+		{
+			case EclipseLinkOrmPackage.XML_TYPE_CONVERTER_IMPL__NAME:
+				return NAME_EDEFAULT == null ? name != null : !NAME_EDEFAULT.equals(name);
+			case EclipseLinkOrmPackage.XML_TYPE_CONVERTER_IMPL__DATA_TYPE:
+				return DATA_TYPE_EDEFAULT == null ? dataType != null : !DATA_TYPE_EDEFAULT.equals(dataType);
+			case EclipseLinkOrmPackage.XML_TYPE_CONVERTER_IMPL__OBJECT_TYPE:
+				return OBJECT_TYPE_EDEFAULT == null ? objectType != null : !OBJECT_TYPE_EDEFAULT.equals(objectType);
+		}
+		return super.eIsSet(featureID);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public String toString()
+	{
+		if (eIsProxy()) return super.toString();
+
+		StringBuffer result = new StringBuffer(super.toString());
+		result.append(" (name: ");
+		result.append(name);
+		result.append(", dataType: ");
+		result.append(dataType);
+		result.append(", objectType: ");
+		result.append(objectType);
+		result.append(')');
+		return result.toString();
+	}
+
+} // XmlTypeConverter
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/orm/XmlVersion.java b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/orm/XmlVersion.java
index 54a5d3fc40..9dd01b986b 100644
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/orm/XmlVersion.java
+++ b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/orm/XmlVersion.java
@@ -20,6 +20,6 @@ package org.eclipse.jpt.eclipselink.core.resource.orm;
  * @model kind="class" interface="true" abstract="true"
  * @generated
  */
-public interface XmlVersion extends org.eclipse.jpt.core.resource.orm.XmlVersion, XmlMutable, XmlConvertibleMapping, XmlConverterHolder
+public interface XmlVersion extends org.eclipse.jpt.core.resource.orm.XmlVersion, XmlMutable, XmlConvertibleMapping
 {
 } // XmlVersion
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/orm/XmlVersionImpl.java b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/orm/XmlVersionImpl.java
index bdca94b33c..b28336efa1 100644
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/orm/XmlVersionImpl.java
+++ b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/orm/XmlVersionImpl.java
@@ -50,64 +50,64 @@ public class XmlVersionImpl extends org.eclipse.jpt.core.resource.orm.XmlVersion
 	protected Boolean mutable = MUTABLE_EDEFAULT;
 
 	/**
-	 * The default value of the '{@link #getConvert() <em>Convert</em>}' attribute.
+	 * The cached value of the '{@link #getConverter() <em>Converter</em>}' containment reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @see #getConvert()
+	 * @see #getConverter()
 	 * @generated
 	 * @ordered
 	 */
-	protected static final String CONVERT_EDEFAULT = null;
+	protected XmlConverter converter;
 
 	/**
-	 * The cached value of the '{@link #getConvert() <em>Convert</em>}' attribute.
+	 * The cached value of the '{@link #getTypeConverter() <em>Type Converter</em>}' containment reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @see #getConvert()
+	 * @see #getTypeConverter()
 	 * @generated
 	 * @ordered
 	 */
-	protected String convert = CONVERT_EDEFAULT;
+	protected XmlTypeConverter typeConverter;
 
 	/**
-	 * The cached value of the '{@link #getConverter() <em>Converter</em>}' containment reference.
+	 * The cached value of the '{@link #getObjectTypeConverter() <em>Object Type Converter</em>}' containment reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @see #getConverter()
+	 * @see #getObjectTypeConverter()
 	 * @generated
 	 * @ordered
 	 */
-	protected XmlConverter converter;
+	protected XmlObjectTypeConverter objectTypeConverter;
 
 	/**
-	 * The cached value of the '{@link #getTypeConverter() <em>Type Converter</em>}' containment reference.
+	 * The cached value of the '{@link #getStructConverter() <em>Struct Converter</em>}' containment reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @see #getTypeConverter()
+	 * @see #getStructConverter()
 	 * @generated
 	 * @ordered
 	 */
-	protected XmlTypeConverter typeConverter;
+	protected XmlStructConverter structConverter;
 
 	/**
-	 * The cached value of the '{@link #getObjectTypeConverter() <em>Object Type Converter</em>}' containment reference.
+	 * The default value of the '{@link #getConvert() <em>Convert</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @see #getObjectTypeConverter()
+	 * @see #getConvert()
 	 * @generated
 	 * @ordered
 	 */
-	protected XmlObjectTypeConverter objectTypeConverter;
+	protected static final String CONVERT_EDEFAULT = null;
 
 	/**
-	 * The cached value of the '{@link #getStructConverter() <em>Struct Converter</em>}' containment reference.
+	 * The cached value of the '{@link #getConvert() <em>Convert</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @see #getStructConverter()
+	 * @see #getConvert()
 	 * @generated
 	 * @ordered
 	 */
-	protected XmlStructConverter structConverter;
+	protected String convert = CONVERT_EDEFAULT;
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -474,8 +474,6 @@ public class XmlVersionImpl extends org.eclipse.jpt.core.resource.orm.XmlVersion
 		{
 			case EclipseLinkOrmPackage.XML_VERSION_IMPL__MUTABLE:
 				return getMutable();
-			case EclipseLinkOrmPackage.XML_VERSION_IMPL__CONVERT:
-				return getConvert();
 			case EclipseLinkOrmPackage.XML_VERSION_IMPL__CONVERTER:
 				return getConverter();
 			case EclipseLinkOrmPackage.XML_VERSION_IMPL__TYPE_CONVERTER:
@@ -484,6 +482,8 @@ public class XmlVersionImpl extends org.eclipse.jpt.core.resource.orm.XmlVersion
 				return getObjectTypeConverter();
 			case EclipseLinkOrmPackage.XML_VERSION_IMPL__STRUCT_CONVERTER:
 				return getStructConverter();
+			case EclipseLinkOrmPackage.XML_VERSION_IMPL__CONVERT:
+				return getConvert();
 		}
 		return super.eGet(featureID, resolve, coreType);
 	}
@@ -501,9 +501,6 @@ public class XmlVersionImpl extends org.eclipse.jpt.core.resource.orm.XmlVersion
 			case EclipseLinkOrmPackage.XML_VERSION_IMPL__MUTABLE:
 				setMutable((Boolean)newValue);
 				return;
-			case EclipseLinkOrmPackage.XML_VERSION_IMPL__CONVERT:
-				setConvert((String)newValue);
-				return;
 			case EclipseLinkOrmPackage.XML_VERSION_IMPL__CONVERTER:
 				setConverter((XmlConverter)newValue);
 				return;
@@ -516,6 +513,9 @@ public class XmlVersionImpl extends org.eclipse.jpt.core.resource.orm.XmlVersion
 			case EclipseLinkOrmPackage.XML_VERSION_IMPL__STRUCT_CONVERTER:
 				setStructConverter((XmlStructConverter)newValue);
 				return;
+			case EclipseLinkOrmPackage.XML_VERSION_IMPL__CONVERT:
+				setConvert((String)newValue);
+				return;
 		}
 		super.eSet(featureID, newValue);
 	}
@@ -533,9 +533,6 @@ public class XmlVersionImpl extends org.eclipse.jpt.core.resource.orm.XmlVersion
 			case EclipseLinkOrmPackage.XML_VERSION_IMPL__MUTABLE:
 				setMutable(MUTABLE_EDEFAULT);
 				return;
-			case EclipseLinkOrmPackage.XML_VERSION_IMPL__CONVERT:
-				setConvert(CONVERT_EDEFAULT);
-				return;
 			case EclipseLinkOrmPackage.XML_VERSION_IMPL__CONVERTER:
 				setConverter((XmlConverter)null);
 				return;
@@ -548,6 +545,9 @@ public class XmlVersionImpl extends org.eclipse.jpt.core.resource.orm.XmlVersion
 			case EclipseLinkOrmPackage.XML_VERSION_IMPL__STRUCT_CONVERTER:
 				setStructConverter((XmlStructConverter)null);
 				return;
+			case EclipseLinkOrmPackage.XML_VERSION_IMPL__CONVERT:
+				setConvert(CONVERT_EDEFAULT);
+				return;
 		}
 		super.eUnset(featureID);
 	}
@@ -564,8 +564,6 @@ public class XmlVersionImpl extends org.eclipse.jpt.core.resource.orm.XmlVersion
 		{
 			case EclipseLinkOrmPackage.XML_VERSION_IMPL__MUTABLE:
 				return MUTABLE_EDEFAULT == null ? mutable != null : !MUTABLE_EDEFAULT.equals(mutable);
-			case EclipseLinkOrmPackage.XML_VERSION_IMPL__CONVERT:
-				return CONVERT_EDEFAULT == null ? convert != null : !CONVERT_EDEFAULT.equals(convert);
 			case EclipseLinkOrmPackage.XML_VERSION_IMPL__CONVERTER:
 				return converter != null;
 			case EclipseLinkOrmPackage.XML_VERSION_IMPL__TYPE_CONVERTER:
@@ -574,6 +572,8 @@ public class XmlVersionImpl extends org.eclipse.jpt.core.resource.orm.XmlVersion
 				return objectTypeConverter != null;
 			case EclipseLinkOrmPackage.XML_VERSION_IMPL__STRUCT_CONVERTER:
 				return structConverter != null;
+			case EclipseLinkOrmPackage.XML_VERSION_IMPL__CONVERT:
+				return CONVERT_EDEFAULT == null ? convert != null : !CONVERT_EDEFAULT.equals(convert);
 		}
 		return super.eIsSet(featureID);
 	}
@@ -594,22 +594,22 @@ public class XmlVersionImpl extends org.eclipse.jpt.core.resource.orm.XmlVersion
 				default: return -1;
 			}
 		}
-		if (baseClass == XmlConvertibleMapping.class)
+		if (baseClass == XmlConverterHolder.class)
 		{
 			switch (derivedFeatureID)
 			{
-				case EclipseLinkOrmPackage.XML_VERSION_IMPL__CONVERT: return EclipseLinkOrmPackage.XML_CONVERTIBLE_MAPPING__CONVERT;
+				case EclipseLinkOrmPackage.XML_VERSION_IMPL__CONVERTER: return EclipseLinkOrmPackage.XML_CONVERTER_HOLDER__CONVERTER;
+				case EclipseLinkOrmPackage.XML_VERSION_IMPL__TYPE_CONVERTER: return EclipseLinkOrmPackage.XML_CONVERTER_HOLDER__TYPE_CONVERTER;
+				case EclipseLinkOrmPackage.XML_VERSION_IMPL__OBJECT_TYPE_CONVERTER: return EclipseLinkOrmPackage.XML_CONVERTER_HOLDER__OBJECT_TYPE_CONVERTER;
+				case EclipseLinkOrmPackage.XML_VERSION_IMPL__STRUCT_CONVERTER: return EclipseLinkOrmPackage.XML_CONVERTER_HOLDER__STRUCT_CONVERTER;
 				default: return -1;
 			}
 		}
-		if (baseClass == XmlConverterHolder.class)
+		if (baseClass == XmlConvertibleMapping.class)
 		{
 			switch (derivedFeatureID)
 			{
-				case EclipseLinkOrmPackage.XML_VERSION_IMPL__CONVERTER: return EclipseLinkOrmPackage.XML_CONVERTER_HOLDER__CONVERTER;
-				case EclipseLinkOrmPackage.XML_VERSION_IMPL__TYPE_CONVERTER: return EclipseLinkOrmPackage.XML_CONVERTER_HOLDER__TYPE_CONVERTER;
-				case EclipseLinkOrmPackage.XML_VERSION_IMPL__OBJECT_TYPE_CONVERTER: return EclipseLinkOrmPackage.XML_CONVERTER_HOLDER__OBJECT_TYPE_CONVERTER;
-				case EclipseLinkOrmPackage.XML_VERSION_IMPL__STRUCT_CONVERTER: return EclipseLinkOrmPackage.XML_CONVERTER_HOLDER__STRUCT_CONVERTER;
+				case EclipseLinkOrmPackage.XML_VERSION_IMPL__CONVERT: return EclipseLinkOrmPackage.XML_CONVERTIBLE_MAPPING__CONVERT;
 				default: return -1;
 			}
 		}
@@ -639,22 +639,22 @@ public class XmlVersionImpl extends org.eclipse.jpt.core.resource.orm.XmlVersion
 				default: return -1;
 			}
 		}
-		if (baseClass == XmlConvertibleMapping.class)
+		if (baseClass == XmlConverterHolder.class)
 		{
 			switch (baseFeatureID)
 			{
-				case EclipseLinkOrmPackage.XML_CONVERTIBLE_MAPPING__CONVERT: return EclipseLinkOrmPackage.XML_VERSION_IMPL__CONVERT;
+				case EclipseLinkOrmPackage.XML_CONVERTER_HOLDER__CONVERTER: return EclipseLinkOrmPackage.XML_VERSION_IMPL__CONVERTER;
+				case EclipseLinkOrmPackage.XML_CONVERTER_HOLDER__TYPE_CONVERTER: return EclipseLinkOrmPackage.XML_VERSION_IMPL__TYPE_CONVERTER;
+				case EclipseLinkOrmPackage.XML_CONVERTER_HOLDER__OBJECT_TYPE_CONVERTER: return EclipseLinkOrmPackage.XML_VERSION_IMPL__OBJECT_TYPE_CONVERTER;
+				case EclipseLinkOrmPackage.XML_CONVERTER_HOLDER__STRUCT_CONVERTER: return EclipseLinkOrmPackage.XML_VERSION_IMPL__STRUCT_CONVERTER;
 				default: return -1;
 			}
 		}
-		if (baseClass == XmlConverterHolder.class)
+		if (baseClass == XmlConvertibleMapping.class)
 		{
 			switch (baseFeatureID)
 			{
-				case EclipseLinkOrmPackage.XML_CONVERTER_HOLDER__CONVERTER: return EclipseLinkOrmPackage.XML_VERSION_IMPL__CONVERTER;
-				case EclipseLinkOrmPackage.XML_CONVERTER_HOLDER__TYPE_CONVERTER: return EclipseLinkOrmPackage.XML_VERSION_IMPL__TYPE_CONVERTER;
-				case EclipseLinkOrmPackage.XML_CONVERTER_HOLDER__OBJECT_TYPE_CONVERTER: return EclipseLinkOrmPackage.XML_VERSION_IMPL__OBJECT_TYPE_CONVERTER;
-				case EclipseLinkOrmPackage.XML_CONVERTER_HOLDER__STRUCT_CONVERTER: return EclipseLinkOrmPackage.XML_VERSION_IMPL__STRUCT_CONVERTER;
+				case EclipseLinkOrmPackage.XML_CONVERTIBLE_MAPPING__CONVERT: return EclipseLinkOrmPackage.XML_VERSION_IMPL__CONVERT;
 				default: return -1;
 			}
 		}