Added EclipseLink General tab

4 files changed, 63 insertions, 2 deletions

diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.ui/META-INF/MANIFEST.MF b/jpa/plugins/org.eclipse.jpt.eclipselink.ui/META-INF/MANIFEST.MF
index 88bce6af0b..3c8ff54103 100644
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.ui/META-INF/MANIFEST.MF
+++ b/jpa/plugins/org.eclipse.jpt.eclipselink.ui/META-INF/MANIFEST.MF
@@ -19,6 +19,7 @@ Require-Bundle: org.eclipse.core.resources;bundle-version="[3.4.0,4.0.0)",
  org.eclipse.jpt.ui;bundle-version="[2.0.0,3.0.0)",
  org.eclipse.jpt.utility;bundle-version="[1.2.0,2.0.0)",
  org.eclipse.ui;bundle-version="[3.4.0,4.0.0)",
+ org.eclipse.ui.ide;bundle-version="[3.4.0,4.0.0)",
  org.eclipse.ui.navigator;bundle-version="[3.3.100,4.0.0)",
  org.eclipse.ui.views.properties.tabbed;bundle-version="[3.4.0,4.0.0)",
  org.eclipse.wst.common.frameworks;bundle-version="[1.1.200,2.0.0)",
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.ui/property_files/eclipselink_ui.properties b/jpa/plugins/org.eclipse.jpt.eclipselink.ui/property_files/eclipselink_ui.properties
index 25e37d7e77..239752f4c9 100644
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.ui/property_files/eclipselink_ui.properties
+++ b/jpa/plugins/org.eclipse.jpt.eclipselink.ui/property_files/eclipselink_ui.properties
@@ -26,6 +26,29 @@ PersistenceXmlGeneralTab_provider = Provider:
 PersistenceXmlGeneralTab_browse = Browse...
 PersistenceXmlGeneralTab_description = Description:
 
+# General
+PersistenceXmlGeneralTab_title = General
+PersistenceXmlGeneralTab_generalSectionTitle = General
+PersistenceXmlGeneralTab_mappedClassesSectionTitle = Managed Classes
+PersistenceXmlGeneralTab_mappedClassesSectionDescription=Specify the list of classes to be managed in this persistence unit.
+PersistenceXmlGeneralTab_xmlMappingFilesSectionTitle = XML Mapping Files
+PersistenceXmlGeneralTab_xmlMappingFilesSectionDescription=Specify the XML mapping files for this persistence unit.
+
+PersistenceXmlGeneralTab_nameLabel = Name:
+PersistenceXmlGeneralTab_persistenceProviderLabel = Persistence Provider:
+PersistenceXmlGeneralTab_descriptionLabel = Description:
+
+PersistenceXmlGeneralTab_excludeUnlistedMappedClasses=Exclude unlisted classes
+PersistenceXmlGeneralTab_excludeUnlistedMappedClassesWithDefault=Exclude unlisted classes ({0})
+PersistenceXmlGeneralTab_mappedClassesNoName=<name not set>
+PersistenceXmlGeneralTab_open=Open
+
+PersistenceXmlGeneralTab_xmlMappingFilesDialog_title=JPA XML Mapping File Selection
+PersistenceXmlGeneralTab_xmlMappingFilesDialog_message=Choose the XML mapping files to be added to the persistence unit.
+PersistenceXmlGeneralTab_ormNoName=<name not set>
+PersistenceXmlGeneralTab_excludeEclipselinkOrm=Exclude unlisted EclipseLink XML mapping file
+PersistenceXmlGeneralTab_excludeEclipselinkOrmWithDefault=Exclude unlisted EclipseLink XML mapping file ({0})
+
 # Connection
 PersistenceXmlConnectionTab_title = Connection
 PersistenceXmlConnectionTab_sectionTitle = Persistence Unit Connection
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/EclipseLinkJpaUiFactory.java b/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/EclipseLinkJpaUiFactory.java
index c39d4c526d..76cac15004 100644
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/EclipseLinkJpaUiFactory.java
+++ b/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/EclipseLinkJpaUiFactory.java
@@ -11,6 +11,7 @@ package org.eclipse.jpt.eclipselink.ui.internal;
 
 import java.util.ArrayList;
 import java.util.ListIterator;
+
 import org.eclipse.jpt.core.context.BasicMapping;
 import org.eclipse.jpt.core.context.IdMapping;
 import org.eclipse.jpt.core.context.ManyToManyMapping;
@@ -29,12 +30,14 @@ import org.eclipse.jpt.eclipselink.core.internal.context.EclipseLinkPersistenceU
 import org.eclipse.jpt.eclipselink.core.internal.context.caching.Caching;
 import org.eclipse.jpt.eclipselink.core.internal.context.connection.Connection;
 import org.eclipse.jpt.eclipselink.core.internal.context.customization.Customization;
+import org.eclipse.jpt.eclipselink.core.internal.context.general.GeneralProperties;
 import org.eclipse.jpt.eclipselink.core.internal.context.logging.Logging;
 import org.eclipse.jpt.eclipselink.core.internal.context.options.Options;
 import org.eclipse.jpt.eclipselink.core.internal.context.schema.generation.SchemaGeneration;
 import org.eclipse.jpt.eclipselink.ui.internal.caching.PersistenceXmlCachingTab;
 import org.eclipse.jpt.eclipselink.ui.internal.connection.PersistenceXmlConnectionTab;
 import org.eclipse.jpt.eclipselink.ui.internal.customization.PersistenceXmlCustomizationTab;
+import org.eclipse.jpt.eclipselink.ui.internal.general.PersistenceXmlGeneralTab;
 import org.eclipse.jpt.eclipselink.ui.internal.java.details.EclipseLinkJavaEmbeddableComposite;
 import org.eclipse.jpt.eclipselink.ui.internal.java.details.EclipseLinkJavaEntityComposite;
 import org.eclipse.jpt.eclipselink.ui.internal.java.details.EclipseLinkJavaMappedSuperclassComposite;
@@ -55,7 +58,6 @@ import org.eclipse.jpt.ui.WidgetFactory;
 import org.eclipse.jpt.ui.details.JpaComposite;
 import org.eclipse.jpt.ui.details.JpaPageComposite;
 import org.eclipse.jpt.ui.internal.BaseJpaUiFactory;
-import org.eclipse.jpt.ui.internal.persistence.details.PersistenceUnitGeneralComposite;
 import org.eclipse.jpt.ui.internal.persistence.details.PersistenceUnitPropertiesComposite;
 import org.eclipse.jpt.utility.internal.model.value.TransformationPropertyValueModel;
 import org.eclipse.jpt.utility.model.value.PropertyValueModel;
@@ -81,7 +83,9 @@ public class EclipseLinkJpaUiFactory extends BaseJpaUiFactory
 		ArrayList<JpaPageComposite> pages = 
 			new ArrayList<JpaPageComposite>(8);
 
-		pages.add(new PersistenceUnitGeneralComposite(subjectHolder, parent, widgetFactory));
+		PropertyValueModel<GeneralProperties> generalPropertyHolder = 
+			this.buildGeneralPropertyHolder(eclipseLinkPersistenceUnitHolder);
+		pages.add(new PersistenceXmlGeneralTab(generalPropertyHolder, parent, widgetFactory));
 		
 		PropertyValueModel<Connection> connectionHolder = 
 			this.buildConnectionHolder(eclipseLinkPersistenceUnitHolder);
@@ -122,6 +126,16 @@ public class EclipseLinkJpaUiFactory extends BaseJpaUiFactory
 		};
 	}
 
+	private PropertyValueModel<GeneralProperties> buildGeneralPropertyHolder(
+				PropertyValueModel<EclipseLinkPersistenceUnit> subjectHolder) {
+		return new TransformationPropertyValueModel<EclipseLinkPersistenceUnit, GeneralProperties>(subjectHolder) {
+			@Override
+			protected GeneralProperties transform_(EclipseLinkPersistenceUnit value) {
+				return value.getGeneralProperties();
+			}
+		};
+	}
+
 	private PropertyValueModel<Connection> buildConnectionHolder(
 				PropertyValueModel<EclipseLinkPersistenceUnit> subjectHolder) {
 		return new TransformationPropertyValueModel<EclipseLinkPersistenceUnit, Connection>(subjectHolder) {
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/EclipseLinkUiMessages.java b/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/EclipseLinkUiMessages.java
index 79ba7c4008..8bb17f2e12 100644
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/EclipseLinkUiMessages.java
+++ b/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/EclipseLinkUiMessages.java
@@ -41,6 +41,29 @@ public class EclipseLinkUiMessages extends NLS
 	public static String PersistenceXmlGeneralTab_browse;
 	public static String PersistenceXmlGeneralTab_description;
 
+	// General
+	public static String PersistenceXmlGeneralTab_title;
+	public static String PersistenceXmlGeneralTab_generalSectionTitle;
+	public static String PersistenceXmlGeneralTab_mappedClassesSectionTitle;
+	public static String PersistenceXmlGeneralTab_mappedClassesSectionDescription;
+	public static String PersistenceXmlGeneralTab_xmlMappingFilesSectionTitle;
+	public static String PersistenceXmlGeneralTab_xmlMappingFilesSectionDescription;
+	
+	public static String PersistenceXmlGeneralTab_nameLabel;
+	public static String PersistenceXmlGeneralTab_persistenceProviderLabel;
+	public static String PersistenceXmlGeneralTab_descriptionLabel;
+	
+	public static String PersistenceXmlGeneralTab_excludeUnlistedMappedClasses;
+	public static String PersistenceXmlGeneralTab_excludeUnlistedMappedClassesWithDefault;
+	public static String PersistenceXmlGeneralTab_mappedClassesNoName;
+	public static String PersistenceXmlGeneralTab_open;
+	
+	public static String PersistenceXmlGeneralTab_xmlMappingFilesDialog_title;
+	public static String PersistenceXmlGeneralTab_xmlMappingFilesDialog_message;
+	public static String PersistenceXmlGeneralTab_ormNoName;
+	public static String PersistenceXmlGeneralTab_excludeEclipselinkOrm;
+	public static String PersistenceXmlGeneralTab_excludeEclipselinkOrmWithDefault;
+
 	// Connection
 	public static String PersistenceXmlConnectionTab_title;
 	public static String PersistenceXmlConnectionTab_sectionTitle;