added jar files to persistence.xml editor

3 files changed, 43 insertions, 42 deletions

diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/persistence/PersistenceFactory.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/persistence/PersistenceFactory.java
index 751be7a6f2..7313cae886 100644
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/persistence/PersistenceFactory.java
+++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/persistence/PersistenceFactory.java
@@ -88,10 +88,10 @@ public class PersistenceFactory extends EFactoryImpl
 			case PersistencePackage.XML_PERSISTENCE: return (EObject)createXmlPersistence();
 			case PersistencePackage.XML_PERSISTENCE_UNIT: return (EObject)createXmlPersistenceUnit();
 			case PersistencePackage.XML_MAPPING_FILE_REF: return (EObject)createXmlMappingFileRef();
+			case PersistencePackage.XML_JAR_FILE_REF: return (EObject)createXmlJarFileRef();
 			case PersistencePackage.XML_JAVA_CLASS_REF: return (EObject)createXmlJavaClassRef();
 			case PersistencePackage.XML_PROPERTIES: return (EObject)createXmlProperties();
 			case PersistencePackage.XML_PROPERTY: return (EObject)createXmlProperty();
-			case PersistencePackage.XML_JAR_FILE_REF: return (EObject)createXmlJarFileRef();
 			default:
 				throw new IllegalArgumentException("The class '" + eClass.getName() + "' is not a valid classifier");
 		}
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/persistence/PersistencePackage.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/persistence/PersistencePackage.java
index 63405a7dc3..31a495e166 100644
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/persistence/PersistencePackage.java
+++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/persistence/PersistencePackage.java
@@ -267,118 +267,118 @@ public class PersistencePackage extends EPackageImpl
 	 * @see org.eclipse.jpt.core.resource.persistence.PersistencePackage#getXmlJavaClassRef()
 	 * @generated
 	 */
-	public static final int XML_JAVA_CLASS_REF = 3;
+	public static final int XML_JAVA_CLASS_REF = 4;
 
 	/**
-	 * The feature id for the '<em><b>Java Class</b></em>' attribute.
+	 * The meta object id for the '{@link org.eclipse.jpt.core.resource.persistence.XmlProperties <em>Xml Properties</em>}' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * @see org.eclipse.jpt.core.resource.persistence.XmlProperties
+	 * @see org.eclipse.jpt.core.resource.persistence.PersistencePackage#getXmlProperties()
 	 * @generated
-	 * @ordered
 	 */
-	public static final int XML_JAVA_CLASS_REF__JAVA_CLASS = 0;
+	public static final int XML_PROPERTIES = 5;
 
 	/**
-	 * The number of structural features of the '<em>Xml Java Class Ref</em>' class.
+	 * The meta object id for the '{@link org.eclipse.jpt.core.resource.persistence.XmlProperty <em>Xml Property</em>}' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * @see org.eclipse.jpt.core.resource.persistence.XmlProperty
+	 * @see org.eclipse.jpt.core.resource.persistence.PersistencePackage#getXmlProperty()
 	 * @generated
-	 * @ordered
 	 */
-	public static final int XML_JAVA_CLASS_REF_FEATURE_COUNT = 1;
+	public static final int XML_PROPERTY = 6;
 
 	/**
-	 * The meta object id for the '{@link org.eclipse.jpt.core.resource.persistence.XmlProperties <em>Xml Properties</em>}' class.
+	 * The meta object id for the '{@link org.eclipse.jpt.core.resource.persistence.XmlJarFileRef <em>Xml Jar File Ref</em>}' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @see org.eclipse.jpt.core.resource.persistence.XmlProperties
-	 * @see org.eclipse.jpt.core.resource.persistence.PersistencePackage#getXmlProperties()
+	 * @see org.eclipse.jpt.core.resource.persistence.XmlJarFileRef
+	 * @see org.eclipse.jpt.core.resource.persistence.PersistencePackage#getXmlJarFileRef()
 	 * @generated
 	 */
-	public static final int XML_PROPERTIES = 4;
+	public static final int XML_JAR_FILE_REF = 3;
 
 	/**
-	 * The feature id for the '<em><b>Properties</b></em>' containment reference list.
+	 * The feature id for the '<em><b>File Name</b></em>' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
 	 * @ordered
 	 */
-	public static final int XML_PROPERTIES__PROPERTIES = 0;
+	public static final int XML_JAR_FILE_REF__FILE_NAME = 0;
 
 	/**
-	 * The number of structural features of the '<em>Xml Properties</em>' class.
+	 * The number of structural features of the '<em>Xml Jar File Ref</em>' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
 	 * @ordered
 	 */
-	public static final int XML_PROPERTIES_FEATURE_COUNT = 1;
+	public static final int XML_JAR_FILE_REF_FEATURE_COUNT = 1;
 
 	/**
-	 * The meta object id for the '{@link org.eclipse.jpt.core.resource.persistence.XmlProperty <em>Xml Property</em>}' class.
+	 * The feature id for the '<em><b>Java Class</b></em>' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @see org.eclipse.jpt.core.resource.persistence.XmlProperty
-	 * @see org.eclipse.jpt.core.resource.persistence.PersistencePackage#getXmlProperty()
 	 * @generated
+	 * @ordered
 	 */
-	public static final int XML_PROPERTY = 5;
+	public static final int XML_JAVA_CLASS_REF__JAVA_CLASS = 0;
 
 	/**
-	 * The feature id for the '<em><b>Name</b></em>' attribute.
+	 * The number of structural features of the '<em>Xml Java Class Ref</em>' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
 	 * @ordered
 	 */
-	public static final int XML_PROPERTY__NAME = 0;
+	public static final int XML_JAVA_CLASS_REF_FEATURE_COUNT = 1;
 
 	/**
-	 * The feature id for the '<em><b>Value</b></em>' attribute.
+	 * The feature id for the '<em><b>Properties</b></em>' containment reference list.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
 	 * @ordered
 	 */
-	public static final int XML_PROPERTY__VALUE = 1;
+	public static final int XML_PROPERTIES__PROPERTIES = 0;
 
 	/**
-	 * The number of structural features of the '<em>Xml Property</em>' class.
+	 * The number of structural features of the '<em>Xml Properties</em>' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
 	 * @ordered
 	 */
-	public static final int XML_PROPERTY_FEATURE_COUNT = 2;
+	public static final int XML_PROPERTIES_FEATURE_COUNT = 1;
 
 	/**
-	 * The meta object id for the '{@link org.eclipse.jpt.core.resource.persistence.XmlJarFileRef <em>Xml Jar File Ref</em>}' class.
+	 * The feature id for the '<em><b>Name</b></em>' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @see org.eclipse.jpt.core.resource.persistence.XmlJarFileRef
-	 * @see org.eclipse.jpt.core.resource.persistence.PersistencePackage#getXmlJarFileRef()
 	 * @generated
+	 * @ordered
 	 */
-	public static final int XML_JAR_FILE_REF = 6;
+	public static final int XML_PROPERTY__NAME = 0;
 
 	/**
-	 * The feature id for the '<em><b>File Name</b></em>' attribute.
+	 * The feature id for the '<em><b>Value</b></em>' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
 	 * @ordered
 	 */
-	public static final int XML_JAR_FILE_REF__FILE_NAME = 0;
+	public static final int XML_PROPERTY__VALUE = 1;
 
 	/**
-	 * The number of structural features of the '<em>Xml Jar File Ref</em>' class.
+	 * The number of structural features of the '<em>Xml Property</em>' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
 	 * @ordered
 	 */
-	public static final int XML_JAR_FILE_REF_FEATURE_COUNT = 1;
+	public static final int XML_PROPERTY_FEATURE_COUNT = 2;
 
 	/**
 	 * The meta object id for the '{@link org.eclipse.jpt.core.resource.persistence.XmlPersistenceUnitTransactionType <em>Xml Persistence Unit Transaction Type</em>}' enum.
@@ -1039,6 +1039,9 @@ public class PersistencePackage extends EPackageImpl
 		xmlMappingFileRefEClass = createEClass(XML_MAPPING_FILE_REF);
 		createEAttribute(xmlMappingFileRefEClass, XML_MAPPING_FILE_REF__FILE_NAME);
 
+		xmlJarFileRefEClass = createEClass(XML_JAR_FILE_REF);
+		createEAttribute(xmlJarFileRefEClass, XML_JAR_FILE_REF__FILE_NAME);
+
 		xmlJavaClassRefEClass = createEClass(XML_JAVA_CLASS_REF);
 		createEAttribute(xmlJavaClassRefEClass, XML_JAVA_CLASS_REF__JAVA_CLASS);
 
@@ -1049,9 +1052,6 @@ public class PersistencePackage extends EPackageImpl
 		createEAttribute(xmlPropertyEClass, XML_PROPERTY__NAME);
 		createEAttribute(xmlPropertyEClass, XML_PROPERTY__VALUE);
 
-		xmlJarFileRefEClass = createEClass(XML_JAR_FILE_REF);
-		createEAttribute(xmlJarFileRefEClass, XML_JAR_FILE_REF__FILE_NAME);
-
 		// Create enums
 		xmlPersistenceUnitTransactionTypeEEnum = createEEnum(XML_PERSISTENCE_UNIT_TRANSACTION_TYPE);
 
@@ -1115,6 +1115,9 @@ public class PersistencePackage extends EPackageImpl
 		initEClass(xmlMappingFileRefEClass, XmlMappingFileRef.class, "XmlMappingFileRef", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
 		initEAttribute(getXmlMappingFileRef_FileName(), theEcorePackage.getEString(), "fileName", "", 0, 1, XmlMappingFileRef.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);
 
+		initEClass(xmlJarFileRefEClass, XmlJarFileRef.class, "XmlJarFileRef", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+		initEAttribute(getXmlJarFileRef_FileName(), theEcorePackage.getEString(), "fileName", "", 0, 1, XmlJarFileRef.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);
+
 		initEClass(xmlJavaClassRefEClass, XmlJavaClassRef.class, "XmlJavaClassRef", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
 		initEAttribute(getXmlJavaClassRef_JavaClass(), theEcorePackage.getEString(), "javaClass", "", 0, 1, XmlJavaClassRef.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);
 
@@ -1125,9 +1128,6 @@ public class PersistencePackage extends EPackageImpl
 		initEAttribute(getXmlProperty_Name(), theXMLTypePackage.getString(), "name", null, 1, 1, XmlProperty.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 		initEAttribute(getXmlProperty_Value(), theXMLTypePackage.getString(), "value", null, 1, 1, XmlProperty.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 
-		initEClass(xmlJarFileRefEClass, XmlJarFileRef.class, "XmlJarFileRef", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEAttribute(getXmlJarFileRef_FileName(), theEcorePackage.getEString(), "fileName", null, 0, 1, XmlJarFileRef.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);
-
 		// Initialize enums and add enum literals
 		initEEnum(xmlPersistenceUnitTransactionTypeEEnum, XmlPersistenceUnitTransactionType.class, "XmlPersistenceUnitTransactionType");
 		addEEnumLiteral(xmlPersistenceUnitTransactionTypeEEnum, XmlPersistenceUnitTransactionType.JTA);
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/persistence/XmlJarFileRef.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/persistence/XmlJarFileRef.java
index efce27058a..d79564568e 100644
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/persistence/XmlJarFileRef.java
+++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/persistence/XmlJarFileRef.java
@@ -48,7 +48,7 @@ public class XmlJarFileRef extends AbstractJpaEObject implements JpaEObject
 	 * @generated
 	 * @ordered
 	 */
-	protected static final String FILE_NAME_EDEFAULT = null;
+	protected static final String FILE_NAME_EDEFAULT = "";
 
 	/**
 	 * The cached value of the '{@link #getFileName() <em>File Name</em>}' attribute.
@@ -83,6 +83,7 @@ public class XmlJarFileRef extends AbstractJpaEObject implements JpaEObject
 
 	/**
 	 * Returns the value of the '<em><b>File Name</b></em>' attribute.
+	 * The default value is <code>""</code>.
 	 * <!-- begin-user-doc -->
 	 * <p>
 	 * If the meaning of the '<em>File Name</em>' attribute isn't clear,
@@ -92,7 +93,7 @@ public class XmlJarFileRef extends AbstractJpaEObject implements JpaEObject
 	 * @return the value of the '<em>File Name</em>' attribute.
 	 * @see #setFileName(String)
 	 * @see org.eclipse.jpt.core.resource.persistence.PersistencePackage#getXmlJarFileRef_FileName()
-	 * @model unique="false" ordered="false"
+	 * @model default="" unique="false" ordered="false"
 	 * @generated
 	 */
 	public String getFileName()