TEIIDDES-2838

 * Added check for empty JNDI during set connection profile. If NULL
pop-up dialog to set it... or keep null
 * now allows JNDI name to be empty (null)
 * setting connection profile props removes the JNDI name, so now
caching if not null and re-setting it.

plugins/org.teiid.designer.advisor.ui/src/org/teiid/designer/advisor/ui/actions/AdvisorActionFactory.java

@@ -37,14 +37,14 @@
 import org.teiid.designer.advisor.ui.AdvisorUiConstants;
 import org.teiid.designer.advisor.ui.AdvisorUiPlugin;
 import org.teiid.designer.advisor.ui.Messages;
-import org.teiid.designer.datatools.ui.actions.SetConnectionProfileAction;
 import org.teiid.designer.datatools.ui.dialogs.NewTeiidFilteredCPWizard;
 import org.teiid.designer.metamodels.core.ModelType;
 import org.teiid.designer.runtime.DqpPlugin;
 import org.teiid.designer.runtime.spi.ITeiidServer;
 import org.teiid.designer.runtime.ui.actions.DeployVdbAction;
 import org.teiid.designer.runtime.ui.actions.EditVdbAction;
 import org.teiid.designer.runtime.ui.connection.CreateDataSourceAction;
+import org.teiid.designer.runtime.ui.connection.SetConnectionProfileAction;
 import org.teiid.designer.runtime.ui.preview.PreviewDataAction;
 import org.teiid.designer.runtime.ui.server.RuntimeAssistant;
 import org.teiid.designer.runtime.ui.vdb.ExecuteVdbAction;

plugins/org.teiid.designer.datatools.ui/plugin.properties

@@ -6,9 +6,6 @@
 pluginProvider	= JBoss by Red Hat
 pluginName=Designer Datatools UI Plug-in
 
-
-setConnectionProfileAction.name=setConnectionProfileAction
-setConnectionProfileAction.label=Set Connection Profile
 connectionProperties.name = Connection Properties
 removeConnectionInfoAction.name=removeConnectionInfoAction
 removeConnectionInfoAction.label=Remove Connection Info

plugins/org.teiid.designer.datatools.ui/plugin.xml

@@ -1,15 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?eclipse version="3.4"?>
 <plugin>
-   <extension
-        id="SetConnectionProfileAction"
-        name="%setConnectionProfileAction.name"
-        point="org.teiid.designer.ui.modelResourceAction">
-      <resourceAction
-         name="org.teiid.designer.datatools.ui.actions.SetConnectionProfileAction"
-         label="%setConnectionProfileAction.label">
-      </resourceAction>
-   </extension>
    <extension
         id="RemoveConnectionInfoAction"
         name="%removeConnectionInfoAction.name"
@@ -281,7 +272,37 @@
          </enabledWhen>
       </page>
    </extension>
+
+<!-- 
+   <extension
+         point="org.eclipse.ui.propertyPages">
+      <page
+            class="org.teiid.designer.datatools.profiles.jdg.JDGProfilePropertyPage"
+            icon="icons/full/obj16/connectionFolder.gif"
+            id="org.teiid.designer.datatools.profiles.jdg.profileProperties"
+            name="%connectionProperties.name">
+         <filter
+               name="org.eclipse.datatools.profile.property.id"
+               value="org.teiid.designer.datatools.profiles.jdg.JDGConnectionProfile"/>
+         <enabledWhen>
+            <instanceof
+                  value="org.eclipse.datatools.connectivity.IConnectionProfile">
+            </instanceof>
+         </enabledWhen>
+      </page>
+   </extension>
    
+      <extension
+         point="org.eclipse.datatools.connectivity.connectionProfile">
+   <newWizard
+         class="org.teiid.designer.datatools.profiles.jdg.JDGConnectionProfileWizard"
+         description="Create a JDG connection profile."
+         icon="icons/full/obj16/connectionFolder.gif"
+         id="org.teiid.designer.datatools.profiles.jdg.JDGConnectionProfileWizard"
+         name="JDG"
+         profile="org.teiid.designer.datatools.profiles.jdg.JDGConnectionProfile"/>
+   </extension>
+-->
    <extension point="org.eclipse.datatools.connectivity.ui.driverUIContributor">
       <driverUIContributor
             class="org.teiid.designer.datatools.profiles.modeshape.ModeShapeDriverUIContributor"

plugins/org.teiid.designer.datatools.ui/src/org/teiid/designer/datatools/ui/DatatoolsUiConstants.java

@@ -1,3 +1,10 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ *
+ * See the LEGAL.txt file distributed with this work for information regarding copyright ownership and licensing.
+ *
+ * See the AUTHORS.txt file distributed with this work for a full listing of individual contributors.
+ */
 package org.teiid.designer.datatools.ui;
 
 import java.util.ResourceBundle;

plugins/org.teiid.designer.datatools.ui/src/org/teiid/designer/datatools/ui/i18n.properties

@@ -11,14 +11,6 @@ SelectConnectionProfileDialog.categorySelectionMessage=Connection Profile catego
 SelectConnectionProfileDialog.okSelectionMessage=Select OK to finish
 SelectConnectionProfileDialog.invalidSelectionMessage=No valid selection
 
-SetConnectionProfileAction.no.provider.found=No ConnectionInfoProvider resolved for this ConnectionProfile
-SetConnectionProfileAction.exceptionMessage=An exception occurred setting the ConnectionProfile
-SetConnectionProfileAction.noProvileProviderMessage=Teiid Designer does not support using this connection profile type
-SetConnectionProfileAction.noProvileProviderTitle=Connection Profile Not Supported
-SetConnectionProfileAction.confirmDriverclassChangeDialogTitle=Confirm Connection Profile Change
-SetConnectionProfileAction.confirmDriverclassChangeDialogMsg=This Connection Profile change will also change the model import settings,\nsince the driver class is different than the current driver.\n\nDo you wish to continue?
-SetConnectionProfileAction.sourceModelUndefined.title=Source Model Undefined
-SetConnectionProfileAction.sourceModelUndefined.message=No source model defined.\n\nExecute previous action to create source model from Teiid data source
 RemoveConnectionInfoAction.exceptionMessage=An exception occurred removing connection info from model
 
 ViewConnectionProfileAction.title=View Connection Profile Info
@@ -117,6 +109,8 @@ LdapAuthenticationWidget.User.ToolTip=If using authentication then the ldap bind
 LdapAuthenticationWidget.Password.Label=Bind password
 LdapAuthenticationWidget.Password.ToolTip=If using authentication then the ldap bind password must be specified
 
+#JDGProfileDetailsWizardPage.Name=JBoss DataSource Properties
+
 Common.Properties.Label=Properties
 Common.Profile.Label=Profile Name
 Common.Description.Label=Profile Description

plugins/org.teiid.designer.dqp.ui/plugin.properties

@@ -136,4 +136,7 @@ editServerAction.description = Show dialog for editing Teiid Instance
 newServerCommand.label = New JBoss / Teiid Instance
 newServerAction.description = Create a new connection server model to JBoss and Teiid
 
+setConnectionProfileAction.name=setConnectionProfileAction
+setConnectionProfileAction.label=Set Connection Profile
+
 AllJBTTeiidServerTypes = org.jboss.ide.eclipse.as.50,org.jboss.ide.eclipse.as.51,org.jboss.ide.eclipse.as.60,org.jboss.ide.eclipse.as.70,org.jboss.ide.eclipse.as.71,org.jboss.ide.eclipse.as.eap.43,org.jboss.ide.eclipse.as.eap.50,org.jboss.ide.eclipse.as.eap.60,org.jboss.ide.eclipse.as.eap.61,org.jboss.ide.eclipse.as.wildfly.80,org.jboss.ide.eclipse.as.systemCopyServer

plugins/org.teiid.designer.dqp.ui/plugin.xml

@@ -191,6 +191,15 @@
          label="%generateArchiveVdbAction.label">
       </resourceAction>
    </extension>
+   <extension
+        id="SetConnectionProfileAction"
+        name="%setConnectionProfileAction.name"
+        point="org.teiid.designer.ui.modelResourceAction">
+      <resourceAction
+         name="org.teiid.designer.runtime.ui.connection.SetConnectionProfileAction"
+         label="%setConnectionProfileAction.label">
+      </resourceAction>
+   </extension>
 
 <!-- Decorator -->
    <extension

plugins/org.teiid.designer.dqp.ui/src/org/teiid/designer/runtime/ui/DqpUiConstants.java

@@ -10,6 +10,7 @@
 import java.util.ResourceBundle;
 import org.teiid.core.designer.PluginUtil;
 import org.teiid.core.designer.util.PluginUtilImpl;
+import org.teiid.designer.datatools.ui.DatatoolsUiConstants.PC;
 
 
 /**
@@ -131,6 +132,7 @@ interface Images {
         public static final String DDL_VDB = PC.OBJ16 + "ddl-vdb.png"; //$NON-NLS-1$
         public static final String STANDARD_VDB = PC.OBJ16 + "standard-vdb.png"; //$NON-NLS-1$
         public static final String SHOW_VDB_ERRORS = PC.CTOOL16 + "show-vdb-errors.png"; //$NON-NLS-1$
+		public static final String WARNING_ICON = PC.OBJ16 + "warning.gif"; //$NON-NLS-1$
     }
 
     /**