Added Connection tab.

3 files changed, 136 insertions, 17 deletions

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 f55ee94585..678b003b96 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
@@ -16,6 +16,54 @@ PersistenceXmlGeneralTab_provider = Provider:
 PersistenceXmlGeneralTab_browse = Browse...
 PersistenceXmlGeneralTab_description = Description:
 
+# Connection
+PersistenceXmlConnectionTab_title = Connection
+PersistenceXmlConnectionTab_sectionTitle = Persistence Unit Connection
+PersistenceXmlConnectionTab_sectionDescription = Configure the Data Source or JDBC Connection properties.
+PersistenceXmlConnectionTab_defaultWithOneParam = Default ({0})
+PersistenceXmlConnectionTab_defaultEmpty = Default ()
+
+PersistenceXmlConnectionTab_transactionTypeLabel = Transaction Type:
+
+TransactionTypeComposite_jta = JTA
+TransactionTypeComposite_resource_local = Resource Local
+
+PersistenceXmlConnectionTab_nativeSqlLabel = Native SQL
+PersistenceXmlConnectionTab_nativeSqlLabelDefault = Native SQL ({0})
+
+PersistenceXmlConnectionTab_batchWritingLabel = Batch Writing:
+
+BatchWritingComposite_none = None
+BatchWritingComposite_jdbc = JDBC
+BatchWritingComposite_buffered = Buffered
+BatchWritingComposite_oracle_jdbc = Oracle JDBC
+
+PersistenceXmlConnectionTab_cacheStatementsLabel = Statement Caching
+PersistenceXmlConnectionTab_cacheStatementsLabelDefault = Statement Caching ({0})
+PersistenceXmlConnectionTab_cacheStatementsSizeLabel = Size:
+
+PersistenceXmlConnectionTab_dataSourceLabel = Data Source
+PersistenceXmlConnectionTab_jdbcLabel = JDBC
+	
+PersistenceXmlConnectionTab_jtaDataSourceLabel = JTA Data Source:
+PersistenceXmlConnectionTab_nonJtaDataSourceLabel = Non-JTA Data Source:
+
+PersistenceXmlConnectionTab_driverLabel = Driver:
+PersistenceXmlConnectionTab_urlLabel = URL:
+PersistenceXmlConnectionTab_userLabel = User:
+PersistenceXmlConnectionTab_passwordLabel = Password:
+PersistenceXmlConnectionTab_bindParametersLabel = Bind Parameters
+PersistenceXmlConnectionTab_bindParametersLabelDefault = Bind Parameters ({0})
+
+PersistenceXmlConnectionTab_readConnectionsSharedLabel = Shared
+PersistenceXmlConnectionTab_readConnectionsSharedLabelDefault = Shared ({0})
+PersistenceXmlConnectionTab_readConnectionsSectionTitle = Read Connection
+PersistenceXmlConnectionTab_readConnectionsMinLabel = Minimum:
+PersistenceXmlConnectionTab_readConnectionsMaxLabel = Maximum:
+PersistenceXmlConnectionTab_writeConnectionsSectionTitle = Write Connection
+PersistenceXmlConnectionTab_writeConnectionsMinLabel = Minimum:
+PersistenceXmlConnectionTab_writeConnectionsMaxLabel = Maximum:
+
 # SchemaGeneration
 PersistenceXmlSchemaGenerationTab_title = Schema Generation
 PersistenceXmlSchemaGenerationTab_sectionTitle = Persistence Unit Schema Generation
@@ -23,11 +71,10 @@ PersistenceXmlSchemaGenerationTab_sectionDescription = Configure the EclipseLink
 PersistenceXmlSchemaGenerationTab_defaultWithOneParam = Default ({0})
 PersistenceXmlSchemaGenerationTab_defaultEmpty = Default ()
 
-PersistenceXmlSchemaGenerationTab_ddlGenerationType = DDL Generation Type:
-PersistenceXmlSchemaGenerationTab_outputMode = Output Mode:
-
-PersistenceXmlSchemaGenerationTab_createDdlFileName = Create DDL File Name:
-PersistenceXmlSchemaGenerationTab_dropDdlFileName = Drop DDL File Name:
+PersistenceXmlSchemaGenerationTab_ddlGenerationTypeLabel = DDL Generation Type:
+PersistenceXmlSchemaGenerationTab_outputModeLabel = Output Mode:
+PersistenceXmlSchemaGenerationTab_createDdlFileNameLabel = Create DDL File Name:
+PersistenceXmlSchemaGenerationTab_dropDdlFileNameLabel = Drop DDL File Name:
 
 OutputModeComposite_both = Both
 OutputModeComposite_sql_script = Sql-script
@@ -37,6 +84,10 @@ DdlGenerationTypeComposite_none = none
 DdlGenerationTypeComposite_create_tables = Create-tables
 DdlGenerationTypeComposite_drop_and_create_tables = Drop-and-Create-tables
 
+PersistenceXmlSchemaGenerationTab_ddlGenerationLocationLabel = DDL Generation Location:
+	
+DdlGenerationLocationComposite_dialogTitle = Generation Location
+
 # Caching
 PersistenceXmlCachingTab_title = Caching
 PersistenceXmlCachingTab_sectionTitle = Persistence Unit Caching
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 2ff45ed8d7..c8a45f1dc8 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
@@ -36,7 +36,55 @@ public class EclipseLinkUiMessages extends NLS
 	public static String PersistenceXmlGeneralTab_provider;
 	public static String PersistenceXmlGeneralTab_browse;
 	public static String PersistenceXmlGeneralTab_description;
+
+	// Connection
+	public static String PersistenceXmlConnectionTab_title;
+	public static String PersistenceXmlConnectionTab_sectionTitle;
+	public static String PersistenceXmlConnectionTab_sectionDescription;
+	public static String PersistenceXmlConnectionTab_defaultWithOneParam;
+	public static String PersistenceXmlConnectionTab_defaultEmpty;
+	
+	public static String PersistenceXmlConnectionTab_transactionTypeLabel;
+	
+	public static String TransactionTypeComposite_jta;
+	public static String TransactionTypeComposite_resource_local;
+	
+	public static String PersistenceXmlConnectionTab_nativeSqlLabel;
+	public static String PersistenceXmlConnectionTab_nativeSqlLabelDefault;
+	
+	public static String PersistenceXmlConnectionTab_batchWritingLabel;
+
+	public static String BatchWritingComposite_none;
+	public static String BatchWritingComposite_jdbc;
+	public static String BatchWritingComposite_buffered;
+	public static String BatchWritingComposite_oracle_jdbc;
 	
+	public static String PersistenceXmlConnectionTab_cacheStatementsLabel;
+	public static String PersistenceXmlConnectionTab_cacheStatementsLabelDefault;
+	public static String PersistenceXmlConnectionTab_cacheStatementsSizeLabel;
+	
+	public static String PersistenceXmlConnectionTab_dataSourceLabel;
+	public static String PersistenceXmlConnectionTab_jdbcLabel;
+
+	public static String PersistenceXmlConnectionTab_jtaDataSourceLabel;
+	public static String PersistenceXmlConnectionTab_nonJtaDataSourceLabel;
+	
+	public static String PersistenceXmlConnectionTab_driverLabel;
+	public static String PersistenceXmlConnectionTab_urlLabel;
+	public static String PersistenceXmlConnectionTab_userLabel;
+	public static String PersistenceXmlConnectionTab_passwordLabel;
+	public static String PersistenceXmlConnectionTab_bindParametersLabel;
+	public static String PersistenceXmlConnectionTab_bindParametersLabelDefault;
+
+	public static String PersistenceXmlConnectionTab_readConnectionsSharedLabel;
+	public static String PersistenceXmlConnectionTab_readConnectionsSharedLabelDefault;
+	public static String PersistenceXmlConnectionTab_readConnectionsSectionTitle;
+	public static String PersistenceXmlConnectionTab_readConnectionsMinLabel;
+	public static String PersistenceXmlConnectionTab_readConnectionsMaxLabel;
+	public static String PersistenceXmlConnectionTab_writeConnectionsSectionTitle;
+	public static String PersistenceXmlConnectionTab_writeConnectionsMinLabel;
+	public static String PersistenceXmlConnectionTab_writeConnectionsMaxLabel;
+
 	// SchemaGeneration
 	public static String PersistenceXmlSchemaGenerationTab_title;
 	public static String PersistenceXmlSchemaGenerationTab_sectionTitle;
@@ -44,11 +92,11 @@ public class EclipseLinkUiMessages extends NLS
 	public static String PersistenceXmlSchemaGenerationTab_defaultWithOneParam;
 	public static String PersistenceXmlSchemaGenerationTab_defaultEmpty;
 	
-	public static String PersistenceXmlSchemaGenerationTab_ddlGenerationType;
-	public static String PersistenceXmlSchemaGenerationTab_outputMode;
+	public static String PersistenceXmlSchemaGenerationTab_ddlGenerationTypeLabel;
+	public static String PersistenceXmlSchemaGenerationTab_outputModeLabel;
 	
-	public static String PersistenceXmlSchemaGenerationTab_createDdlFileName;
-	public static String PersistenceXmlSchemaGenerationTab_dropDdlFileName;
+	public static String PersistenceXmlSchemaGenerationTab_createDdlFileNameLabel;
+	public static String PersistenceXmlSchemaGenerationTab_dropDdlFileNameLabel;
 
 	public static String OutputModeComposite_both;
 	public static String OutputModeComposite_sql_script;
@@ -57,6 +105,10 @@ public class EclipseLinkUiMessages extends NLS
 	public static String DdlGenerationTypeComposite_none;
 	public static String DdlGenerationTypeComposite_create_tables;
 	public static String DdlGenerationTypeComposite_drop_and_create_tables;
+
+	public static String PersistenceXmlSchemaGenerationTab_ddlGenerationLocationLabel;
+	
+	public static String DdlGenerationLocationComposite_dialogTitle;
 	
 	// Caching
 	public static String PersistenceXmlCachingTab_title;
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/platform/EclipseLinkUiFactory.java b/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/platform/EclipseLinkUiFactory.java
index 64d1180cd1..18e8d7403b 100644
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/platform/EclipseLinkUiFactory.java
+++ b/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/platform/EclipseLinkUiFactory.java
@@ -15,11 +15,13 @@ import java.util.ListIterator;
 import org.eclipse.jpt.core.context.persistence.PersistenceUnit;
 import org.eclipse.jpt.eclipselink.core.internal.context.EclipseLinkPersistenceUnit;
 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.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.logging.PersistenceXmlLoggingTab;
 import org.eclipse.jpt.eclipselink.ui.internal.options.PersistenceXmlOptionsTab;
@@ -49,20 +51,20 @@ public class EclipseLinkUiFactory extends BaseJpaUiFactory
 		PropertyValueModel<EclipseLinkPersistenceUnit> eclipseLinkPersistenceUnitHolder = 
 			this.buildEclipseLinkPersistenceUnitHolder(subjectHolder);
 		ArrayList<JpaPageComposite<PersistenceUnit>> pages = 
-			new ArrayList<JpaPageComposite<PersistenceUnit>>(2);
+			new ArrayList<JpaPageComposite<PersistenceUnit>>(10);
 		
-		PropertyValueModel<SchemaGeneration> schemaGenHolder = 
-			this.buildSchemaGenerationHolder(eclipseLinkPersistenceUnitHolder);
-		pages.add(new PersistenceXmlSchemaGenerationTab(schemaGenHolder, parent, widgetFactory));
+		PropertyValueModel<Connection> connectionHolder = 
+			this.buildConnectionHolder(eclipseLinkPersistenceUnitHolder);
+		pages.add(new PersistenceXmlConnectionTab(connectionHolder, parent, widgetFactory));
+		
+		PropertyValueModel<Customization> customizationHolder = 
+			this.buildCustomizationHolder(eclipseLinkPersistenceUnitHolder);
+		pages.add(new PersistenceXmlCustomizationTab(customizationHolder, parent, widgetFactory));
 		
 		PropertyValueModel<Caching> cachingHolder = 
 			this.buildCachingHolder(eclipseLinkPersistenceUnitHolder);
 		pages.add(new PersistenceXmlCachingTab(cachingHolder, parent, widgetFactory));
 		
-		PropertyValueModel<Customization> customizationHolder = 
-			this.buildCustomizationHolder(eclipseLinkPersistenceUnitHolder);
-		pages.add(new PersistenceXmlCustomizationTab(customizationHolder, parent, widgetFactory));
-
 		PropertyValueModel<Logging> loggingHolder = 
 			this.buildLoggingHolder(eclipseLinkPersistenceUnitHolder);
 		pages.add(new PersistenceXmlLoggingTab(loggingHolder, parent, widgetFactory));
@@ -71,9 +73,23 @@ public class EclipseLinkUiFactory extends BaseJpaUiFactory
 			this.buildOptionsHolder(eclipseLinkPersistenceUnitHolder);
 		pages.add(new PersistenceXmlOptionsTab(optionsHolder, parent, widgetFactory));
 		
+		PropertyValueModel<SchemaGeneration> schemaGenHolder = 
+			this.buildSchemaGenerationHolder(eclipseLinkPersistenceUnitHolder);
+		pages.add(new PersistenceXmlSchemaGenerationTab(schemaGenHolder, parent, widgetFactory));
+		
 		return pages.listIterator();
 	}
 
+	private PropertyValueModel<Connection> buildConnectionHolder(
+				PropertyValueModel<EclipseLinkPersistenceUnit> subjectHolder) {
+		return new TransformationPropertyValueModel<EclipseLinkPersistenceUnit, Connection>(subjectHolder) {
+			@Override
+			protected Connection transform_(EclipseLinkPersistenceUnit value) {
+				return value.getConnection();
+			}
+		};
+	}
+
 	private PropertyValueModel<Options> buildOptionsHolder(
 				PropertyValueModel<EclipseLinkPersistenceUnit> subjectHolder) {
 		return new TransformationPropertyValueModel<EclipseLinkPersistenceUnit, Options>(subjectHolder) {