# This patch file was generated by NetBeans IDE
# Following Index: paths are relative to: C:\ws_v3\v3\admingui
# This patch can be applied using context Tools: Patch action on respective folder.
# It uses platform neutral UTF-8 encoding and \n newlines.
# Above lines and this line are ignored by the patching process.
Index: common/src/main/java/org/glassfish/admingui/common/handlers/JdbcTempHandler.java
--- common/src/main/java/org/glassfish/admingui/common/handlers/JdbcTempHandler.java Base (BASE)
+++ common/src/main/java/org/glassfish/admingui/common/handlers/JdbcTempHandler.java Locally Modified (Based On LOCAL)
@@ -224,7 +224,6 @@
                             System.out.println( "classname[" + i + "] : " + dsl.get(i));
                         }
                     }
-                    
                     List<Map<String, String>> noprops = new ArrayList<Map<String, String>>();
                     String dslName = (dsl != null && (dsl.size() > 0)) ? (String) dsl.get(0) : "";
                     if (resType.equals(DRIVER)) {
@@ -232,12 +231,15 @@
                         extra.put("DSList", "");
                         extra.put("DatasourceClassnameField", "");
                         extra.put("dsClassname", Boolean.FALSE);
+                        extra.put("DriverClassname", dslName);
+                        extra.remove("DatasourceClassname");
                     } else {
                         extra.put("DSList", dsl);
                         extra.put("DList", "");
                         extra.put("DriverClassnameField", "");
                         extra.put("dsClassname", Boolean.TRUE);
                         extra.put("DatasourceClassname", dslName);
+                        extra.remove("DriverClassname");
                     }
                     GuiUtil.getLogger().info("===== getConnectionDefinitionPropertiesAndDefaults(\"" + dslName + "\"," + resType +")");
                     Map result = (Map) V3AMX.getInstance().getConnectorRuntime().getConnectionDefinitionPropertiesAndDefaults(dslName, resType);
@@ -277,7 +279,15 @@
     public static void updateJdbcConnectionPoolPropertiesTable(HandlerContext handlerCtx) {
         Map extra = (Map) handlerCtx.getFacesContext().getExternalContext().getSessionMap().get("wizardPoolExtra");
         String resType = (String) extra.get("ResType");
-        String classname = (String) extra.get("DatasourceClassname");
+        String classname = (String) extra.get("SelectedClassName");
+// The DriverClassname seems to be coming in as empty value. Not sure why
+// If you can fix that, then you can use the following and remove mapput 'SelectedClassName'
+// from jsf
+//        if (resType.equals(DRIVER)) {
+//            classname = (String) extra.get("DriverClassname");
+//        } else {
+//            classname = (String) extra.get("DatasourceClassname");
+//        }
         List<Map<String, String>> noprops = new ArrayList<Map<String, String>>();
         GuiUtil.getLogger().info("===== getConnectionDefinitionPropertiesAndDefaults(\"" + classname + "\"," + resType + ")");
         Map result = (Map) V3AMX.getInstance().getConnectorRuntime().getConnectionDefinitionPropertiesAndDefaults(classname, resType);
Index: jdbc/src/main/resources/poolPropertyNew.inc
--- jdbc/src/main/resources/poolPropertyNew.inc Base (BASE)
+++ jdbc/src/main/resources/poolPropertyNew.inc Locally Modified (Based On LOCAL)
@@ -57,6 +57,7 @@
             <!command
                     setAttribute(key="click" value="$this{component}");
                     mapPut(map="#{wizardPoolExtra}" key="DatasourceClassname" value="#{click.selected}");
+                    mapPut(map="#{wizardPoolExtra}" key="SelectedClassName" value="#{click.selected}");
                     updateJdbcConnectionPoolPropertiesTable();
                     gf.navigate(page="#{selfPage}");
                 />
@@ -65,7 +66,15 @@
         <sun:textField id="datasourceField"  columns="$int{60}" text="#{wizardPoolExtra.DatasourceClassnameField}"  disabled="#{!wizardPoolExtra.dsClassname}" />
     </sun:property>
     <sun:property id="ddsProp" labelAlign="left" noWrap="#{false}" overlapLabel="#{false}" label="$resource{i18njdbc.jdbcPool.driver}" helpText="$resource{i18njdbc.jdbcPool.driverHelpEnter}">
-        <sun:dropDown id="ddatasource"  selected="#{wizardPoolExtra.DriverClassname}" labels="$attribute{DList}"  disabled="#{wizardPoolExtra.dsClassname}" />
+        <sun:dropDown id="ddatasource"  selected="#{wizardPoolExtra.DriverClassname}" labels="$attribute{DList}"  disabled="#{wizardPoolExtra.dsClassname}" submitForm="#{true}" immediate="#{true}" >
+        <!command
+                    setAttribute(key="click" value="$this{component}");
+                    mapPut(map="#{wizardPoolExtra}" key="DriverClassname" value="#{click.selected}");
+                    mapPut(map="#{wizardPoolExtra}" key="SelectedClassName" value="#{click.selected}");
+                    updateJdbcConnectionPoolPropertiesTable();
+                    gf.navigate(page="#{selfPage}");
+        />
+        </sun:dropDown>
         "<br/>
         <sun:textField id="ddatasourceField"  columns="$int{60}" text="#{wizardPoolExtra.DriverClassnameField}"  disabled="#{wizardPoolExtra.dsClassname}" />
     </sun:property>