You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by jd...@apache.org on 2006/07/21 01:41:48 UTC
svn commit: r424122 - in
/geronimo/sandbox/svkmerge/m2migration/applications/console/console-standard/src:
./ java/org/apache/geronimo/console/databasemanager/wizard/
webapp/WEB-INF/view/dbwizard/
Author: jdillon
Date: Thu Jul 20 16:41:48 2006
New Revision: 424122
URL: http://svn.apache.org/viewvc?rev=424122&view=rev
Log:
r494@Bliss (orig r424120): jdillon | 2006-07-20 16:41:13 -0700
r474@Bliss (orig r424019): sppatel | 2006-07-20 11:47:41 -0700
GERONIMO-1524
Modified:
geronimo/sandbox/svkmerge/m2migration/applications/console/console-standard/src/ (props changed)
geronimo/sandbox/svkmerge/m2migration/applications/console/console-standard/src/java/org/apache/geronimo/console/databasemanager/wizard/DatabasePoolPortlet.java
geronimo/sandbox/svkmerge/m2migration/applications/console/console-standard/src/webapp/WEB-INF/view/dbwizard/basicParams.jsp
geronimo/sandbox/svkmerge/m2migration/applications/console/console-standard/src/webapp/WEB-INF/view/dbwizard/confirmURL.jsp
geronimo/sandbox/svkmerge/m2migration/applications/console/console-standard/src/webapp/WEB-INF/view/dbwizard/downloadStatus.jsp
geronimo/sandbox/svkmerge/m2migration/applications/console/console-standard/src/webapp/WEB-INF/view/dbwizard/edit.jsp
geronimo/sandbox/svkmerge/m2migration/applications/console/console-standard/src/webapp/WEB-INF/view/dbwizard/selectDatabase.jsp
geronimo/sandbox/svkmerge/m2migration/applications/console/console-standard/src/webapp/WEB-INF/view/dbwizard/selectDownload.jsp
geronimo/sandbox/svkmerge/m2migration/applications/console/console-standard/src/webapp/WEB-INF/view/dbwizard/showPlan.jsp
geronimo/sandbox/svkmerge/m2migration/applications/console/console-standard/src/webapp/WEB-INF/view/dbwizard/testConnection.jsp
Propchange: geronimo/sandbox/svkmerge/m2migration/applications/console/console-standard/src/
------------------------------------------------------------------------------
--- svk:merge (original)
+++ svk:merge Thu Jul 20 16:41:48 2006
@@ -1 +1 @@
-13f79535-47bb-0310-9956-ffa450edef68:/geronimo/sandbox/svkmerge/trunk/applications/console/console-standard/src:423294
+13f79535-47bb-0310-9956-ffa450edef68:/geronimo/sandbox/svkmerge/trunk/applications/console/console-standard/src:424120
Modified: geronimo/sandbox/svkmerge/m2migration/applications/console/console-standard/src/java/org/apache/geronimo/console/databasemanager/wizard/DatabasePoolPortlet.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/svkmerge/m2migration/applications/console/console-standard/src/java/org/apache/geronimo/console/databasemanager/wizard/DatabasePoolPortlet.java?rev=424122&r1=424121&r2=424122&view=diff
==============================================================================
--- geronimo/sandbox/svkmerge/m2migration/applications/console/console-standard/src/java/org/apache/geronimo/console/databasemanager/wizard/DatabasePoolPortlet.java (original)
+++ geronimo/sandbox/svkmerge/m2migration/applications/console/console-standard/src/java/org/apache/geronimo/console/databasemanager/wizard/DatabasePoolPortlet.java Thu Jul 20 16:41:48 2006
@@ -281,7 +281,7 @@
}
}
if(found != null) {
- data.jar1 = found.getRepositoryURI();
+ data.jars = new String[] {found.getRepositoryURI()};
WriteableRepository repo = PortletManager.getCurrentServer(actionRequest).getWritableRepositories()[0];
final PortletSession session = actionRequest.getPortletSession();
ProgressInfo progressInfo = new ProgressInfo();
@@ -810,7 +810,7 @@
}
}
Collections.sort(list);
- renderRequest.setAttribute("jars", list);
+ renderRequest.setAttribute("availableJars", list);
}
private void renderConfirmURL(RenderRequest renderRequest, RenderResponse renderResponse) throws IOException, PortletException {
@@ -1054,35 +1054,19 @@
private static Class attemptDriverLoad(PortletRequest request, PoolData data) {
List list = new ArrayList();
try {
- org.apache.geronimo.kernel.repository.Artifact one = data.getJar1() == null ? null : org.apache.geronimo.kernel.repository.Artifact.create(data.getJar1());
- org.apache.geronimo.kernel.repository.Artifact two = data.getJar2() == null ? null : org.apache.geronimo.kernel.repository.Artifact.create(data.getJar2());
- org.apache.geronimo.kernel.repository.Artifact three = data.getJar3() == null ? null : org.apache.geronimo.kernel.repository.Artifact.create(data.getJar3());
-
+ String[] jars = data.getJars();
ListableRepository[] repos = PortletManager.getCurrentServer(request).getRepositories();
- for (int i = 0; i < repos.length; i++) {
- ListableRepository repo = repos[i];
- if(one != null) {
- File url = repo.getLocation(one);
- if(url != null) {
- list.add(url.toURL());
- one = null;
- }
- }
- if(two != null) {
- File url = repo.getLocation(two);
- if(url != null) {
- list.add(url.toURL());
- two = null;
+
+ for (int i=0; i<jars.length; i++) {
+ org.apache.geronimo.kernel.repository.Artifact artifact = org.apache.geronimo.kernel.repository.Artifact.create(jars[i]);
+ for (int j=0; j<repos.length; j++) {
+ ListableRepository repo = repos[j];
+ File url = repo.getLocation(artifact);
+ if (url != null) {
+ list.add(url.toURL());
}
- }
- if(three != null) {
- File url = repo.getLocation(three);
- if(url != null) {
- list.add(url.toURL());
- three = null;
- }
- }
- }
+ }
+ }
URLClassLoader loader = new URLClassLoader((URL[]) list.toArray(new URL[list.size()]), DatabasePoolPortlet.class.getClassLoader());
try {
return loader.loadClass(data.driverClass);
@@ -1157,9 +1141,7 @@
private String driverClass;
private String url;
private String urlPrototype;
- private String jar1;
- private String jar2;
- private String jar3;
+ private String[] jars;
private String minSize;
private String maxSize;
private String blockingTimeout;
@@ -1196,12 +1178,7 @@
}
urlPrototype = request.getParameter("urlPrototype");
if(urlPrototype != null && urlPrototype.equals("")) urlPrototype = null;
- jar1 = request.getParameter("jar1");
- if(jar1 != null && jar1.equals("")) jar1 = null;
- jar2 = request.getParameter("jar2");
- if(jar2 != null && jar2.equals("")) jar2 = null;
- jar3 = request.getParameter("jar3");
- if(jar3 != null && jar3.equals("")) jar3 = null;
+ jars = request.getParameterValues("jars");
minSize = request.getParameter("minSize");
if(minSize != null && minSize.equals("")) minSize = null;
maxSize = request.getParameter("maxSize");
@@ -1279,9 +1256,7 @@
}
}
if(urlPrototype != null) response.setRenderParameter("urlPrototype", urlPrototype);
- if(jar1 != null) response.setRenderParameter("jar1", jar1);
- if(jar2 != null) response.setRenderParameter("jar2", jar2);
- if(jar3 != null) response.setRenderParameter("jar3", jar3);
+ if(jars != null) response.setRenderParameter("jars", jars);
if(minSize != null) response.setRenderParameter("minSize", minSize);
if(maxSize != null) response.setRenderParameter("maxSize", maxSize);
if(blockingTimeout != null) response.setRenderParameter("blockingTimeout", blockingTimeout);
@@ -1337,27 +1312,8 @@
return url;
}
- public String getJar1() {
- return jar1;
- }
-
- public String getJar2() {
- return jar2;
- }
-
- public String getJar3() {
- return jar3;
- }
-
public String[] getJars() {
- ArrayList jars = new ArrayList();
- if (jar1!=null && !jar1.equals(""))
- jars.add(jar1);
- if (jar2!=null && !jar2.equals(""))
- jars.add(jar2);
- if (jar3!=null && !jar3.equals(""))
- jars.add(jar3);
- return (String[])jars.toArray(new String[jars.size()]);
+ return jars;
}
public String getMinSize() {
Modified: geronimo/sandbox/svkmerge/m2migration/applications/console/console-standard/src/webapp/WEB-INF/view/dbwizard/basicParams.jsp
URL: http://svn.apache.org/viewvc/geronimo/sandbox/svkmerge/m2migration/applications/console/console-standard/src/webapp/WEB-INF/view/dbwizard/basicParams.jsp?rev=424122&r1=424121&r2=424122&view=diff
==============================================================================
--- geronimo/sandbox/svkmerge/m2migration/applications/console/console-standard/src/webapp/WEB-INF/view/dbwizard/basicParams.jsp (original)
+++ geronimo/sandbox/svkmerge/m2migration/applications/console/console-standard/src/webapp/WEB-INF/view/dbwizard/basicParams.jsp Thu Jul 20 16:41:48 2006
@@ -12,8 +12,6 @@
<input type="hidden" name="dbtype" value="${pool.dbtype}" />
<input type="hidden" name="url" value="${pool.url}" />
<input type="hidden" name="urlPrototype" value="${pool.urlPrototype}" />
- <input type="hidden" name="jar2" value="${pool.jar2}" />
- <input type="hidden" name="jar3" value="${pool.jar3}" />
<input type="hidden" name="minSize" value="${pool.minSize}" />
<input type="hidden" name="maxSize" value="${pool.maxSize}" />
<input type="hidden" name="idleTimeout" value="${pool.idleTimeout}" />
@@ -41,17 +39,19 @@
<tr>
<th><div align="right">Driver JAR:</div></th>
<td>
- <select name="jar1">
- <option></option>
- <c:forEach var="jar" items="${jars}">
- <option <c:if test="${jar == pool.jar1}">selected</c:if>>${jar}</option>
- </c:forEach>
+ <select multiple name="jars" size="10">
+ <c:forEach var="availableJar" items="${availableJars}">
+ <option <c:forEach var="jar" items="${pool.jars}"><c:if test="${availableJar == jar}">selected</c:if></c:forEach>>
+ ${availableJar}
+ </option>
+ </c:forEach>
</select>
</td>
</tr>
<tr>
<td></td>
- <td>The JAR holding the selected JDBC driver. Should be installed under GERONIMO/repository/ (or
+ <td>The JAR(s) required to make a connection to the database. Use CTRL-click or SHIFT-click to select multiple jars.<br>
+ The JAR(s) should already be installed under GERONIMO/repository/ (or
<input type="button" value="Download a Driver" onclick="document.<portlet:namespace/>DatabaseForm.mode.value='download';document.<portlet:namespace/>DatabaseForm.submit();return false;" />)
</td>
</tr>
Modified: geronimo/sandbox/svkmerge/m2migration/applications/console/console-standard/src/webapp/WEB-INF/view/dbwizard/confirmURL.jsp
URL: http://svn.apache.org/viewvc/geronimo/sandbox/svkmerge/m2migration/applications/console/console-standard/src/webapp/WEB-INF/view/dbwizard/confirmURL.jsp?rev=424122&r1=424121&r2=424122&view=diff
==============================================================================
--- geronimo/sandbox/svkmerge/m2migration/applications/console/console-standard/src/webapp/WEB-INF/view/dbwizard/confirmURL.jsp (original)
+++ geronimo/sandbox/svkmerge/m2migration/applications/console/console-standard/src/webapp/WEB-INF/view/dbwizard/confirmURL.jsp Thu Jul 20 16:41:48 2006
@@ -61,10 +61,9 @@
<input type="hidden" name="password" value="${pool.password}" />
<input type="hidden" name="urlPrototype" value="${pool.urlPrototype}" />
<input type="hidden" name="driverClass" value="${pool.driverClass}" />
- <input type="hidden" name="jar1" value="${pool.jar1}" />
- <input type="hidden" name="jar2" value="${pool.jar2}" />
- <input type="hidden" name="jar3" value="${pool.jar3}" />
- <input type="hidden" name="adapterDisplayName" value="${pool.adapterDisplayName}" />
+ <c:forEach var="jar" items="${pool.jars}">
+ <input type="hidden" name="jars" value="${jar}" />
+ </c:forEach> <input type="hidden" name="adapterDisplayName" value="${pool.adapterDisplayName}" />
<input type="hidden" name="adapterDescription" value="${pool.adapterDescription}" />
<input type="hidden" name="rarPath" value="${pool.rarPath}" />
<c:forEach var="prop" items="${pool.properties}">
Modified: geronimo/sandbox/svkmerge/m2migration/applications/console/console-standard/src/webapp/WEB-INF/view/dbwizard/downloadStatus.jsp
URL: http://svn.apache.org/viewvc/geronimo/sandbox/svkmerge/m2migration/applications/console/console-standard/src/webapp/WEB-INF/view/dbwizard/downloadStatus.jsp?rev=424122&r1=424121&r2=424122&view=diff
==============================================================================
--- geronimo/sandbox/svkmerge/m2migration/applications/console/console-standard/src/webapp/WEB-INF/view/dbwizard/downloadStatus.jsp (original)
+++ geronimo/sandbox/svkmerge/m2migration/applications/console/console-standard/src/webapp/WEB-INF/view/dbwizard/downloadStatus.jsp Thu Jul 20 16:41:48 2006
@@ -16,9 +16,9 @@
<input type="hidden" name="driverClass" value="${pool.driverClass}" />
<input type="hidden" name="url" value="${pool.url}" />
<input type="hidden" name="urlPrototype" value="${pool.urlPrototype}" />
- <input type="hidden" name="jar1" value="${pool.jar1}" />
- <input type="hidden" name="jar2" value="${pool.jar2}" />
- <input type="hidden" name="jar3" value="${pool.jar3}" />
+ <c:forEach var="jar" items="${pool.jars}">
+ <input type="hidden" name="jars" value="${jar}" />
+ </c:forEach> <input type="hidden" name="adapterDisplayName" value="${pool.adapterDisplayName}" />
<input type="hidden" name="minSize" value="${pool.minSize}" />
<input type="hidden" name="maxSize" value="${pool.maxSize}" />
<input type="hidden" name="idleTimeout" value="${pool.idleTimeout}" />
Modified: geronimo/sandbox/svkmerge/m2migration/applications/console/console-standard/src/webapp/WEB-INF/view/dbwizard/edit.jsp
URL: http://svn.apache.org/viewvc/geronimo/sandbox/svkmerge/m2migration/applications/console/console-standard/src/webapp/WEB-INF/view/dbwizard/edit.jsp?rev=424122&r1=424121&r2=424122&view=diff
==============================================================================
--- geronimo/sandbox/svkmerge/m2migration/applications/console/console-standard/src/webapp/WEB-INF/view/dbwizard/edit.jsp (original)
+++ geronimo/sandbox/svkmerge/m2migration/applications/console/console-standard/src/webapp/WEB-INF/view/dbwizard/edit.jsp Thu Jul 20 16:41:48 2006
@@ -59,8 +59,9 @@
<input type="hidden" name="dbtype" value="${pool.dbtype}" />
<input type="hidden" name="urlPrototype" value="${pool.urlPrototype}" />
- <input type="hidden" name="jar2" value="${pool.jar2}" />
- <input type="hidden" name="jar3" value="${pool.jar3}" />
+ <c:forEach var="jar" items="${pool.jars}">
+ <input type="hidden" name="jars" value="${jar}" />
+ </c:forEach> <input type="hidden" name="adapterDisplayName" value="${pool.adapterDisplayName}" />
<c:forEach var="prop" items="${pool.urlProperties}">
<input type="hidden" name="${prop.key}" value="${prop.value}" />
</c:forEach>
@@ -132,23 +133,25 @@
<tr>
<th><div align="right">Driver JAR:</div></th>
<td>
- <select name="jar1">
- <option></option>
- <c:forEach var="jar" items="${jars}">
- <option <c:if test="${jar == pool.jar1}">selected</c:if>>${jar}</option>
- </c:forEach>
+ <select multiple name="jars" size="10">
+ <c:forEach var="availableJar" items="${availableJars}">
+ <option <c:forEach var="jar" items="${pool.jars}"><c:if test="${availableJar == jar}">selected</c:if></c:forEach>>
+ ${availableJar}
+ </option>
+ </c:forEach>
</select>
</td>
</tr>
<tr>
<td></td>
- <td>The JAR holding the selected JDBC driver. Should be installed under GERONIMO/repository/ (or
+ <td>The JAR(s) required to make a connection to the database. Use CTRL-click or SHIFT-click to select multiple jars.<br>
+ The JAR(s) should already be installed under GERONIMO/repository/ (or
<input type="button" value="Download a Driver" onclick="document.<portlet:namespace/>DatabaseForm.mode.value='download';document.<portlet:namespace/>DatabaseForm.submit();return false;" />)
</td>
</tr>
</c:when>
<c:otherwise>
- <input type="hidden" name="jar1" value="${pool.jar1}" />
+ <input type="hidden" name="jars" value="${pool.jars}" />
</c:otherwise>
</c:choose>
<!-- ENTRY FIELD: URL -->
@@ -192,23 +195,25 @@
<tr>
<th><div align="right">Driver JAR:</div></th>
<td>
- <select name="jar1">
- <option></option>
- <c:forEach var="jar" items="${jars}">
- <option <c:if test="${jar == pool.jar1}">selected</c:if>>${jar}</option>
- </c:forEach>
+ <select multiple name="jars" size="10">
+ <c:forEach var="availableJar" items="${availableJars}">
+ <option <c:forEach var="jar" items="${pool.jars}"><c:if test="${availableJar == jar}">selected</c:if></c:forEach>>
+ ${availableJar}
+ </option>
+ </c:forEach>
</select>
</td>
</tr>
<tr>
<td></td>
- <td>The JAR holding the selected JDBC driver. Should be installed under GERONIMO/repository/ (or
+ <td>The JAR(s) required to make a connection to the database. Use CTRL-click or SHIFT-click to select multiple jars.<br>
+ The JAR(s) should already be installed under GERONIMO/repository/ (or
<input type="button" value="Download a Driver" onclick="document.<portlet:namespace/>DatabaseForm.mode.value='download';document.<portlet:namespace/>DatabaseForm.submit();return false;" />)
</td>
</tr>
</c:when>
<c:otherwise>
- <input type="hidden" name="jar1" value="${pool.jar1}" />
+ <input type="hidden" name="jars" value="${pool.jars}" />
</c:otherwise>
</c:choose>
<c:forEach var="prop" items="${pool.properties}">
@@ -227,7 +232,7 @@
<input type="hidden" name="password" value="${pool.password}" />
<input type="hidden" name="driverClass" value="${pool.driverClass}" />
<input type="hidden" name="url" value="${pool.url}" />
- <input type="hidden" name="jar1" value="${pool.jar1}" />
+ <input type="hidden" name="jars" value="${pool.jars}" />
</td></tr>
</c:otherwise>
</c:choose>
Modified: geronimo/sandbox/svkmerge/m2migration/applications/console/console-standard/src/webapp/WEB-INF/view/dbwizard/selectDatabase.jsp
URL: http://svn.apache.org/viewvc/geronimo/sandbox/svkmerge/m2migration/applications/console/console-standard/src/webapp/WEB-INF/view/dbwizard/selectDatabase.jsp?rev=424122&r1=424121&r2=424122&view=diff
==============================================================================
--- geronimo/sandbox/svkmerge/m2migration/applications/console/console-standard/src/webapp/WEB-INF/view/dbwizard/selectDatabase.jsp (original)
+++ geronimo/sandbox/svkmerge/m2migration/applications/console/console-standard/src/webapp/WEB-INF/view/dbwizard/selectDatabase.jsp Thu Jul 20 16:41:48 2006
@@ -12,9 +12,9 @@
<input type="hidden" name="driverClass" value="${pool.driverClass}" />
<input type="hidden" name="url" value="${pool.url}" />
<input type="hidden" name="urlPrototype" value="${pool.urlPrototype}" />
- <input type="hidden" name="jar1" value="${pool.jar1}" />
- <input type="hidden" name="jar2" value="${pool.jar2}" />
- <input type="hidden" name="jar3" value="${pool.jar3}" />
+ <c:forEach var="jar" items="${pool.jars}">
+ <input type="hidden" name="jars" value="${jar}" />
+ </c:forEach> <input type="hidden" name="adapterDisplayName" value="${pool.adapterDisplayName}" />
<input type="hidden" name="minSize" value="${pool.minSize}" />
<input type="hidden" name="maxSize" value="${pool.maxSize}" />
<input type="hidden" name="idleTimeout" value="${pool.idleTimeout}" />
Modified: geronimo/sandbox/svkmerge/m2migration/applications/console/console-standard/src/webapp/WEB-INF/view/dbwizard/selectDownload.jsp
URL: http://svn.apache.org/viewvc/geronimo/sandbox/svkmerge/m2migration/applications/console/console-standard/src/webapp/WEB-INF/view/dbwizard/selectDownload.jsp?rev=424122&r1=424121&r2=424122&view=diff
==============================================================================
--- geronimo/sandbox/svkmerge/m2migration/applications/console/console-standard/src/webapp/WEB-INF/view/dbwizard/selectDownload.jsp (original)
+++ geronimo/sandbox/svkmerge/m2migration/applications/console/console-standard/src/webapp/WEB-INF/view/dbwizard/selectDownload.jsp Thu Jul 20 16:41:48 2006
@@ -22,9 +22,9 @@
<input type="hidden" name="driverClass" value="${pool.driverClass}" />
<input type="hidden" name="url" value="${pool.url}" />
<input type="hidden" name="urlPrototype" value="${pool.urlPrototype}" />
- <input type="hidden" name="jar1" value="${pool.jar1}" />
- <input type="hidden" name="jar2" value="${pool.jar2}" />
- <input type="hidden" name="jar3" value="${pool.jar3}" />
+ <c:forEach var="jar" items="${pool.jars}">
+ <input type="hidden" name="jars" value="${jar}" />
+ </c:forEach> <input type="hidden" name="adapterDisplayName" value="${pool.adapterDisplayName}" />
<input type="hidden" name="minSize" value="${pool.minSize}" />
<input type="hidden" name="maxSize" value="${pool.maxSize}" />
<input type="hidden" name="idleTimeout" value="${pool.idleTimeout}" />
Modified: geronimo/sandbox/svkmerge/m2migration/applications/console/console-standard/src/webapp/WEB-INF/view/dbwizard/showPlan.jsp
URL: http://svn.apache.org/viewvc/geronimo/sandbox/svkmerge/m2migration/applications/console/console-standard/src/webapp/WEB-INF/view/dbwizard/showPlan.jsp?rev=424122&r1=424121&r2=424122&view=diff
==============================================================================
--- geronimo/sandbox/svkmerge/m2migration/applications/console/console-standard/src/webapp/WEB-INF/view/dbwizard/showPlan.jsp (original)
+++ geronimo/sandbox/svkmerge/m2migration/applications/console/console-standard/src/webapp/WEB-INF/view/dbwizard/showPlan.jsp Thu Jul 20 16:41:48 2006
@@ -14,9 +14,9 @@
<input type="hidden" name="driverClass" value="${pool.driverClass}" />
<input type="hidden" name="url" value="${pool.url}" />
<input type="hidden" name="urlPrototype" value="${pool.urlPrototype}" />
- <input type="hidden" name="jar1" value="${pool.jar1}" />
- <input type="hidden" name="jar2" value="${pool.jar2}" />
- <input type="hidden" name="jar3" value="${pool.jar3}" />
+ <c:forEach var="jar" items="${pool.jars}">
+ <input type="hidden" name="jars" value="${jar}" />
+ </c:forEach> <input type="hidden" name="adapterDisplayName" value="${pool.adapterDisplayName}" />
<input type="hidden" name="minSize" value="${pool.minSize}" />
<input type="hidden" name="maxSize" value="${pool.maxSize}" />
<input type="hidden" name="idleTimeout" value="${pool.idleTimeout}" />
Modified: geronimo/sandbox/svkmerge/m2migration/applications/console/console-standard/src/webapp/WEB-INF/view/dbwizard/testConnection.jsp
URL: http://svn.apache.org/viewvc/geronimo/sandbox/svkmerge/m2migration/applications/console/console-standard/src/webapp/WEB-INF/view/dbwizard/testConnection.jsp?rev=424122&r1=424121&r2=424122&view=diff
==============================================================================
--- geronimo/sandbox/svkmerge/m2migration/applications/console/console-standard/src/webapp/WEB-INF/view/dbwizard/testConnection.jsp (original)
+++ geronimo/sandbox/svkmerge/m2migration/applications/console/console-standard/src/webapp/WEB-INF/view/dbwizard/testConnection.jsp Thu Jul 20 16:41:48 2006
@@ -14,9 +14,9 @@
<input type="hidden" name="driverClass" value="${pool.driverClass}" />
<input type="hidden" name="url" value="${pool.url}" />
<input type="hidden" name="urlPrototype" value="${pool.urlPrototype}" />
- <input type="hidden" name="jar1" value="${pool.jar1}" />
- <input type="hidden" name="jar2" value="${pool.jar2}" />
- <input type="hidden" name="jar3" value="${pool.jar3}" />
+ <c:forEach var="jar" items="${pool.jars}">
+ <input type="hidden" name="jars" value="${jar}" />
+ </c:forEach> <input type="hidden" name="adapterDisplayName" value="${pool.adapterDisplayName}" />
<input type="hidden" name="minSize" value="${pool.minSize}" />
<input type="hidden" name="maxSize" value="${pool.maxSize}" />
<input type="hidden" name="idleTimeout" value="${pool.idleTimeout}" />