geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jlaskow...@apache.org
Subject svn commit: r393787 [16/22] - in /geronimo/trunk/applications: ./ console/ console/console-core/ console/console-core/src/ console/console-core/src/java/ console/console-core/src/java/org/ console/console-core/src/java/org/apache/ console/console-core/...
Date Thu, 13 Apr 2006 11:36:26 GMT
Added: geronimo/trunk/applications/console/console-standard/src/webapp/WEB-INF/view/certmanager/viewKeyStoreHelp.jsp
URL: http://svn.apache.org/viewcvs/geronimo/trunk/applications/console/console-standard/src/webapp/WEB-INF/view/certmanager/viewKeyStoreHelp.jsp?rev=393787&view=auto
==============================================================================
--- geronimo/trunk/applications/console/console-standard/src/webapp/WEB-INF/view/certmanager/viewKeyStoreHelp.jsp (added)
+++ geronimo/trunk/applications/console/console-standard/src/webapp/WEB-INF/view/certmanager/viewKeyStoreHelp.jsp Thu Apr 13 04:34:08 2006
@@ -0,0 +1,87 @@
+ <p>This portlet allows the user to list public key certificates, import trusted certificates, generate a key pair, generate a Certificate Signing Request (CSR) and import a Certificate Authority (CA) reply. This portlet also provides information about the type of keystore, the number of key pairs and trusted certificates stored in the keystore (the keystore size), and the location of the keystore.<br>
+  <br>
+  From the main portlet, the user can &quot;view&quot; a trusted certificate or 
+  key pair. <br>
+  <br>
+  <span style="padding: 10px 10px 10px 5px; font-size: 10px; color: #546BC7; text-decoration: underline; font-weight: bold;">import trusted certificate</span></p>
+<table width="100%"  border="0" cellspacing="0" cellpadding="0">
+  <tr>
+    <td width="20">&nbsp;</td>
+    <td>If the user has a trusted certificate, it can be imported using the&quot;import trusted certificate&quot; tool. Browse for the certificate file, click on the &quot;View Certificate&quot; button, enter an alias, in the&quot;Alias&quot; text box, then click on the &quot;Import&quot; button. &quot;Cancel&quot; at any time before clicking on &quot;Import.&quot; </td>
+  </tr>
+</table>
+<p><span style="padding: 10px 10px 10px 5px; font-size: 10px; color: #546BC7; text-decoration: underline; font-weight: bold;">generate key pair</span></p>
+<table width="100%"  border="0" cellspacing="0" cellpadding="0">
+  <tr>
+    <td width="20">&nbsp;</td>
+    <td><p>This tool allows the user to generate a public/private key pair. This key pair could be used later to create a trusted certificate. Fill in the text boxes and click on the &quot;submit&quot; button to generate the key pair. All fields can be blanked out by clicking &quot;reset.&quot; To generate the key pair, click on &quot;submit.&quot; The fields are defined as follows:</p>
+      <table width="100%"  border="0" cellspacing="0" cellpadding="0">
+        <tr>
+          <td class="MediumBackground" style="padding: 10px 10px 10px 5px; color: #1E1E52;" width="150" align="right" valign="top">Alias</td>
+          <td class="LightBackground" style="padding: 10px 5px 10px 10px" valign="top">A name to identify the key pair.</td>
+        </tr>
+        <tr>
+          <td class="MediumBackground" style="padding: 10px 10px 10px 5px; color: #1E1E52;" width="150" align="right" valign="top">Validity</td>
+          <td class="LightBackground" style="padding: 10px 5px 10px 10px" valign="top">The number of days the key pair will remain valid. This field requires a number to be entered.</td>
+        </tr>
+      </table>
+      <p> The following fields are X.500 Distinguished Names.</p>
+      <table width="100%"  border="0" cellspacing="0" cellpadding="0">
+        <tr>
+          <td class="MediumBackground" style="padding: 10px 10px 10px 5px; color: #1E1E52;" width="150" align="right" valign="top">Common Name (CN)</td>
+          <td class="LightBackground" style="padding: 10px 5px 10px 10px" valign="top">Common name of a person, such as, Joe Smith.</td>
+        </tr>
+        <tr>
+          <td class="MediumBackground" style="padding: 10px 10px 10px 5px; color: #1E1E52;" align="right" valign="top"> Organizational Unit(OU)</td>
+          <td class="LightBackground" style="padding: 10px 5px 10px 10px" valign="top">Small organization, e.g., department or division, for example, Sales.</td>
+        </tr>
+        <tr>
+          <td class="MediumBackground" style="padding: 10px 10px 10px 5px; color: #1E1E52;" width="150" align="right" valign="top"> Organization Name(ON)</td>
+          <td class="LightBackground" style="padding: 10px 5px 10px 10px" valign="top">Large organization, such as the company name.</td>
+        </tr>
+        <tr>
+          <td class="MediumBackground" style="padding: 10px 10px 10px 5px; color: #1E1E52;" width="150" align="right" valign="top"> Locality (L)</td>
+          <td class="LightBackground" style="padding: 10px 5px 10px 10px" valign="top">City name, e.g., El Segundo.</td>
+        </tr>
+        <tr>
+          <td class="MediumBackground" style="padding: 10px 10px 10px 5px; color: #1E1E52;" width="150" align="right" valign="top"> State (ST)</td>
+          <td class="LightBackground" style="padding: 10px 5px 10px 10px" valign="top">State name, e.g., California or CA.</td>
+        </tr>
+        <tr>
+          <td class="MediumBackground" style="padding: 10px 10px 10px 5px; color: #1E1E52;" width="150" align="right" valign="top"> Country (C)</td>
+          <td class="LightBackground" style="padding: 10px 5px 10px 10px" valign="top">Two-letter country code, e.g., US.</td>
+        </tr>
+      </table>    </td>
+  </tr>
+</table>
+<p><span style="padding: 10px 10px 10px 5px; font-size: 10px; color: #546BC7; text-decoration: underline; font-weight: bold;">view</span></p>
+<table width="100%"  border="0" cellspacing="0" cellpadding="0">
+  <tr>
+    <td width="20">&nbsp;</td>
+    <td><p>To view a key pair or certificate, click on the &quot;view&quot; link to the left of it. If the user is viewing a key pair, the &quot;view&quot; pane provides access to three more links &quot;generate CSR&quot;, &quot;import CA reply&quot;, and &quot;keystore list&quot; which are defined next:</p>
+	  <br /><span style="padding: 10px 10px 10px 5px; font-size: 10px; color: #546BC7; text-decoration: underline; font-weight: bold;">generate CSR</span><br />
+      <table width="100%"  border="0" cellspacing="0" cellpadding="0">
+        <tr>
+          <td width="20">&nbsp;</td>
+          <td>This tool generates a Certificate Signing Request. The CSR can be sent to a Certificate Authority (CA), such as Verisign. To submit the CSR to a CA follow the CA's instructions. After the CA sends back a reply, the Gluecode Standard Edition console can be used to import it via the &quot;import CA reply&quot; tool.</td>
+        </tr>
+      </table>
+	  <br /><span style="padding: 10px 10px 10px 5px; font-size: 10px; color: #546BC7; text-decoration: underline; font-weight: bold;">import CA reply</span><br />
+      <table width="100%"  border="0" cellspacing="0" cellpadding="0">
+        <tr>
+          <td width="20">&nbsp;</td>
+          <td>After the Certificate Authority (CA) has sent back a signed, trusted certificate, it can be imported into the Gluecode Standard Edition server. Cut and paste the Certificate Authority's reply in this window and click on &quot;Save.&quot; To cancel an import click on &quot;Cancel&quot; before doing a &quot;Save.&quot; </td>
+        </tr>
+      </table>
+	  <br /><span style="padding: 10px 10px 10px 5px; font-size: 10px; color: #546BC7; text-decoration: underline; font-weight: bold;">keystore list</span><br />
+      <table width="100%"  border="0" cellspacing="0" cellpadding="0">
+        <tr>
+          <td width="20">&nbsp;</td>
+          <td>This link returns the user to the main Certificate management portlet.</td>
+        </tr>
+      </table>
+    </td>
+  </tr>
+</table>
+<p><br>
+</p>

Propchange: geronimo/trunk/applications/console/console-standard/src/webapp/WEB-INF/view/certmanager/viewKeyStoreHelp.jsp
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/trunk/applications/console/console-standard/src/webapp/WEB-INF/view/certmanager/viewKeyStoreHelp.jsp
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Propchange: geronimo/trunk/applications/console/console-standard/src/webapp/WEB-INF/view/certmanager/viewKeyStoreHelp.jsp
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Added: geronimo/trunk/applications/console/console-standard/src/webapp/WEB-INF/view/certmanager/viewKeyStoreNormal.jsp
URL: http://svn.apache.org/viewcvs/geronimo/trunk/applications/console/console-standard/src/webapp/WEB-INF/view/certmanager/viewKeyStoreNormal.jsp?rev=393787&view=auto
==============================================================================
--- geronimo/trunk/applications/console/console-standard/src/webapp/WEB-INF/view/certmanager/viewKeyStoreNormal.jsp (added)
+++ geronimo/trunk/applications/console/console-standard/src/webapp/WEB-INF/view/certmanager/viewKeyStoreNormal.jsp Thu Apr 13 04:34:08 2006
@@ -0,0 +1,70 @@
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
+<%@ taglib uri="http://java.sun.com/portlet" prefix="portlet" %>
+
+<portlet:defineObjects/>
+
+<c:set var="ksinfo" value="${requestScope['org.apache.geronimo.console.keystore.infobean']}"/>
+
+<table cellpadding="1%">
+<th>keystore-type</th>
+<th>keystore-provider</th>
+<th>keystore-location</th>
+<th>keystore-size</th>
+<tr>
+<td align="center"><c:out value="${requestScope['org.apache.geronimo.console.keystore.type']}"/></td>
+<td align="center"><c:out value="${requestScope['org.apache.geronimo.console.keystore.provider']}"/></td>
+<td align="center"><c:out value="${requestScope['org.apache.geronimo.console.keystore.location']}"/></td>
+<td align="center"><c:out value="${requestScope['org.apache.geronimo.console.keystore.size']}"/></td>
+</tr>
+</table>
+
+<br/>
+
+<table cellspacing="5">
+<tr>
+<td><b>Tools:</b></td>
+<td>
+<a href="<portlet:renderURL><portlet:param name='action' value='tools-import-trusted-certificate'/>
+import trusted certificate
+</portlet:renderURL>">import trusted certificate</a>
+</td>
+<td>
+<a href="<portlet:renderURL><portlet:param name='action' value='tools-generate-key-pair'/>
+generate key pair
+</portlet:renderURL>">generate key pair</a>&nbsp;
+</td>
+<%--
+<td>
+<a href="<portlet:renderURL><portlet:param name='action' value='tools-change-keystore-password'/>
+change keystore password
+</portlet:renderURL>">change keystore password</a>&nbsp;
+</td>
+--%>
+</tr>
+</table>
+
+<br/>
+
+<%--
+<c:set var="ksitems" value="${ksinfo.keystoreEntries}"/>
+--%>
+
+<c:set var="ksitems" value="${requestScope['org.apache.geronimo.console.keystore.list']}"/>
+
+<table cellspacing="5">
+<th>details</th>
+<th>alias-name</th>
+<th>alias-type</th>
+<th>modified</th>
+<c:forEach items="${ksitems}" var="ksi">
+<tr>
+<td align="center" valign="top"><a href="<portlet:renderURL>
+<portlet:param name="action" value="view-keystore-entry-details"/>
+<portlet:param name="alias" value="${ksi.alias}"/>
+</portlet:renderURL>">view</a></td>
+<td align="center" valign="top"><c:out value="${ksi.alias}"/></td>
+<td align="center" valign="top"><c:out value="${ksi.type}"/></td>
+<td align="center" valign="top"><c:out value="${ksi.created}"/></td>
+</tr>
+</c:forEach>
+</table>
\ No newline at end of file

Propchange: geronimo/trunk/applications/console/console-standard/src/webapp/WEB-INF/view/certmanager/viewKeyStoreNormal.jsp
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/trunk/applications/console/console-standard/src/webapp/WEB-INF/view/certmanager/viewKeyStoreNormal.jsp
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Propchange: geronimo/trunk/applications/console/console-standard/src/webapp/WEB-INF/view/certmanager/viewKeyStoreNormal.jsp
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Added: geronimo/trunk/applications/console/console-standard/src/webapp/WEB-INF/view/configmanager/deploy.jsp
URL: http://svn.apache.org/viewcvs/geronimo/trunk/applications/console/console-standard/src/webapp/WEB-INF/view/configmanager/deploy.jsp?rev=393787&view=auto
==============================================================================
--- geronimo/trunk/applications/console/console-standard/src/webapp/WEB-INF/view/configmanager/deploy.jsp (added)
+++ geronimo/trunk/applications/console/console-standard/src/webapp/WEB-INF/view/configmanager/deploy.jsp Thu Apr 13 04:34:08 2006
@@ -0,0 +1,20 @@
+<%@ page import="java.io.PrintWriter"%>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
+<%@ taglib uri="http://java.sun.com/portlet" prefix="portlet"%>
+<portlet:defineObjects/>
+
+<c:if test="${! outcome}"><pre>${outcome}</pre></c:if>
+<form enctype="multipart/form-data" method="POST" action="<portlet:actionURL><portlet:param name="action" value="deploy"/></portlet:actionURL>">
+<table>
+  <tr><th align="right">Archive: </th><td><input type="file" name="module" /></td></tr>
+  <tr><th align="right">Plan: </th><td><input type="file" name="plan" /></td></tr>
+  <tr>
+    <td></td>
+    <td><input name="startApp" type="checkbox" value="yes" checked>Start app after install</td>
+  </tr>
+  <tr>
+    <td></td>
+    <td><input type="submit" value="Install" /></td>
+  </tr>
+</table>
+</form>
\ No newline at end of file

Propchange: geronimo/trunk/applications/console/console-standard/src/webapp/WEB-INF/view/configmanager/deploy.jsp
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/trunk/applications/console/console-standard/src/webapp/WEB-INF/view/configmanager/deploy.jsp
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Propchange: geronimo/trunk/applications/console/console-standard/src/webapp/WEB-INF/view/configmanager/deploy.jsp
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Added: geronimo/trunk/applications/console/console-standard/src/webapp/WEB-INF/view/configmanager/deployHelp.jsp
URL: http://svn.apache.org/viewcvs/geronimo/trunk/applications/console/console-standard/src/webapp/WEB-INF/view/configmanager/deployHelp.jsp?rev=393787&view=auto
==============================================================================
--- geronimo/trunk/applications/console/console-standard/src/webapp/WEB-INF/view/configmanager/deployHelp.jsp (added)
+++ geronimo/trunk/applications/console/console-standard/src/webapp/WEB-INF/view/configmanager/deployHelp.jsp Thu Apr 13 04:34:08 2006
@@ -0,0 +1,21 @@
+<portlet:defineObjects/>
+<p>This portlet allows the user to deploy new applications on Geronimo. Web applications require deployment plans, which are either packaged with the war file or kept in a separate file which is typically called geronimo-web.xml.<br>
+</p>
+<table width="100%"  border="0" cellspacing="0" cellpadding="0">
+  <tr>
+    <td width="150" align="right" valign="top" class="MediumBackground" style="padding: 10px 10px 5px 10px"><strong>Archive</strong></td>
+    <td class="LightBackground" style="padding: 10px 5px 10px 10px">Browse to select the war file in the Archive box. </td>
+  </tr>
+  <tr>
+    <td width="150" align="right" valign="top" class="MediumBackground" style="padding: 10px 10px 5px 10px"><strong>Plan</strong></td>
+    <td class="LightBackground" style="padding: 10px 5px 10px 10px">If the deployment plan is separate from the war file, then browse to select it.</td>
+  </tr>
+  <tr>
+    <td width="150" align="right" valign="top" class="MediumBackground" style="padding: 10px 10px 10px 5px; color: #1E1E52;">Start app after install</td>
+    <td class="LightBackground" style="padding: 10px 5px 10px 10px">Check this to automatically start the application when it is installed. Otherwise, the user can start the application by clicking on the associated &quot;Start&quot; toggle in the&quot;Installed Applications&quot; window. By default this checkbox is checked and newly installed applications will automatically be started.</td>
+  </tr>
+  <tr>
+    <td width="150" align="right" valign="top" class="MediumBackground" style="padding: 10px 10px 5px 10px"><img src="/console/images/install.gif" /></td>
+    <td class="LightBackground" style="padding: 10px 5px 10px 10px">Click on Install to install the application in the Geronimo server.</td>
+  </tr>
+</table>

Propchange: geronimo/trunk/applications/console/console-standard/src/webapp/WEB-INF/view/configmanager/deployHelp.jsp
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/trunk/applications/console/console-standard/src/webapp/WEB-INF/view/configmanager/deployHelp.jsp
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Propchange: geronimo/trunk/applications/console/console-standard/src/webapp/WEB-INF/view/configmanager/deployHelp.jsp
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Added: geronimo/trunk/applications/console/console-standard/src/webapp/WEB-INF/view/configmanager/help.jsp
URL: http://svn.apache.org/viewcvs/geronimo/trunk/applications/console/console-standard/src/webapp/WEB-INF/view/configmanager/help.jsp?rev=393787&view=auto
==============================================================================
--- geronimo/trunk/applications/console/console-standard/src/webapp/WEB-INF/view/configmanager/help.jsp (added)
+++ geronimo/trunk/applications/console/console-standard/src/webapp/WEB-INF/view/configmanager/help.jsp Thu Apr 13 04:34:08 2006
@@ -0,0 +1,11 @@
+ <p>This page lists the applications that have been installed in the server and whether they are running or stopped. There are four columns; two provide information and the other two allow user action. The first column indicates the state of the application, either &quot;stopped&quot; or &quot;running.&quot; The fourth column shows the configID of the application. The two remaining columns are:</p>
+<table width="100%"  border="0" cellspacing="0" cellpadding="0">
+  <tr>
+    <td width="150" align="right" valign="top" class="MediumBackground" style="padding: 10px 10px 10px 5px; font-size: 10px; color: #546BC7; text-decoration: underline; font-weight: bold;">Stop/Start</td>
+    <td class="LightBackground" style="padding: 10px 5px 10px 10px">The stop/start toggle can be clicked to stop or start an application. If the toggle says &quot;Stop&quot; the application is running so clicking on the Stop toggle will stop the application and vice versa.</td>
+  </tr>
+  <tr>
+    <td width="150" align="right" valign="top" class="MediumBackground" style="padding: 10px 10px 10px 5px; font-size: 10px; color: #546BC7; text-decoration: underline; font-weight: bold;">Uninstall</td>
+    <td class="LightBackground" style="padding: 10px 5px 10px 10px">The uninstall link will undeploy/remove the application from Geronimo.</td>
+  </tr>
+</table>

Propchange: geronimo/trunk/applications/console/console-standard/src/webapp/WEB-INF/view/configmanager/help.jsp
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/trunk/applications/console/console-standard/src/webapp/WEB-INF/view/configmanager/help.jsp
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Propchange: geronimo/trunk/applications/console/console-standard/src/webapp/WEB-INF/view/configmanager/help.jsp
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Added: geronimo/trunk/applications/console/console-standard/src/webapp/WEB-INF/view/configmanager/maximized.jsp
URL: http://svn.apache.org/viewcvs/geronimo/trunk/applications/console/console-standard/src/webapp/WEB-INF/view/configmanager/maximized.jsp?rev=393787&view=auto
==============================================================================
--- geronimo/trunk/applications/console/console-standard/src/webapp/WEB-INF/view/configmanager/maximized.jsp (added)
+++ geronimo/trunk/applications/console/console-standard/src/webapp/WEB-INF/view/configmanager/maximized.jsp Thu Apr 13 04:34:08 2006
@@ -0,0 +1,15 @@
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
+<%@ taglib uri="http://java.sun.com/portlet" prefix="portlet"%>
+<portlet:defineObjects/>
+<table width="100%">
+    <c:forEach var="configInfo" items="${configurations}">
+        <tr>
+            <td width="500">${configInfo.state}</td>
+            <td>
+<c:if test="${configInfo.state.running}"><a href="<portlet:actionURL><portlet:param name="configId" value="${configInfo.configID}"/><portlet:param name="action" value="stop"/></portlet:actionURL>">Stop</a></c:if>
+<c:if test="${configInfo.state.stopped}"><a href="<portlet:actionURL><portlet:param name="configId" value="${configInfo.configID}"/><portlet:param name="action" value="start"/></portlet:actionURL>">Start</a></c:if>
+</td>
+            <td>${configInfo.configID}</td>
+        </tr>
+    </c:forEach>
+</table>

Propchange: geronimo/trunk/applications/console/console-standard/src/webapp/WEB-INF/view/configmanager/maximized.jsp
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/trunk/applications/console/console-standard/src/webapp/WEB-INF/view/configmanager/maximized.jsp
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Propchange: geronimo/trunk/applications/console/console-standard/src/webapp/WEB-INF/view/configmanager/maximized.jsp
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Added: geronimo/trunk/applications/console/console-standard/src/webapp/WEB-INF/view/configmanager/normal.jsp
URL: http://svn.apache.org/viewcvs/geronimo/trunk/applications/console/console-standard/src/webapp/WEB-INF/view/configmanager/normal.jsp?rev=393787&view=auto
==============================================================================
--- geronimo/trunk/applications/console/console-standard/src/webapp/WEB-INF/view/configmanager/normal.jsp (added)
+++ geronimo/trunk/applications/console/console-standard/src/webapp/WEB-INF/view/configmanager/normal.jsp Thu Apr 13 04:34:08 2006
@@ -0,0 +1,36 @@
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
+<%@ taglib uri="http://java.sun.com/portlet" prefix="portlet"%>
+<portlet:defineObjects/>
+
+<br />
+<br />
+<table width="100%">
+    <tr class="DarkBackground">
+        <th align="left">&nbsp;Component Name</th><th>&nbsp;State</th><th align="center" colspan="2">Commands</th>
+    </tr>
+  <c:set var="backgroundClass" value='MediumBackground'/>
+  <c:forEach var="configInfo" items="${configurations}">
+        <c:choose>
+            <c:when test="${backgroundClass == 'MediumBackground'}" >
+                <c:set var="backgroundClass" value='LightBackground'/>
+            </c:when>
+            <c:otherwise>
+                <c:set var="backgroundClass" value='MediumBackground'/>
+            </c:otherwise>
+        </c:choose>
+    <tr>
+        <td class="${backgroundClass}">&nbsp;${configInfo.configID}</td>
+        <td width="100" class="${backgroundClass}">&nbsp;${configInfo.state}</td>
+        <td width="100" class="${backgroundClass}">
+<c:if test="${configInfo.state.running}">&nbsp;<a href="<portlet:actionURL><portlet:param name="configId" value="${configInfo.configID}"/><portlet:param name="action" value="stop"/></portlet:actionURL>">Stop</a></c:if>
+<c:if test="${configInfo.state.stopped && (configInfo.type.name ne 'CAR')}">&nbsp;<a href="<portlet:actionURL><portlet:param name="configId" value="${configInfo.configID}"/><portlet:param name="action" value="start"/></portlet:actionURL>">Start</a></c:if>
+<c:if test="${configInfo.state.failed}">&nbsp;<a href="<portlet:actionURL><portlet:param name="configId" value="${configInfo.configID}"/><portlet:param name="action" value="stop"/></portlet:actionURL>">Stop</a></c:if>
+        </td>
+        <td width="100" class="${backgroundClass}">
+            <a href="<portlet:actionURL><portlet:param name="configId" value="${configInfo.configID}"/><portlet:param name="action" value="uninstall"/></portlet:actionURL>">Uninstall</a>
+        </td>
+    </tr>
+  </c:forEach>
+</table>
+
+<p>${messageInstalled} ${messageStatus}</p>

Propchange: geronimo/trunk/applications/console/console-standard/src/webapp/WEB-INF/view/configmanager/normal.jsp
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/trunk/applications/console/console-standard/src/webapp/WEB-INF/view/configmanager/normal.jsp
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Propchange: geronimo/trunk/applications/console/console-standard/src/webapp/WEB-INF/view/configmanager/normal.jsp
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Added: geronimo/trunk/applications/console/console-standard/src/webapp/WEB-INF/view/dbwizard/basicParams.jsp
URL: http://svn.apache.org/viewcvs/geronimo/trunk/applications/console/console-standard/src/webapp/WEB-INF/view/dbwizard/basicParams.jsp?rev=393787&view=auto
==============================================================================
--- geronimo/trunk/applications/console/console-standard/src/webapp/WEB-INF/view/dbwizard/basicParams.jsp (added)
+++ geronimo/trunk/applications/console/console-standard/src/webapp/WEB-INF/view/dbwizard/basicParams.jsp Thu Apr 13 04:34:08 2006
@@ -0,0 +1,106 @@
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/functions" prefix="fn" %>
+<%@ taglib uri="http://java.sun.com/portlet" prefix="portlet"%>
+<portlet:defineObjects/>
+
+<p><b>Create Database Pool</b> -- Step 2: Select Driver, JAR, Parameters</p>
+
+<!--   FORM TO COLLECT DATA FOR THIS PAGE   -->
+<form name="<portlet:namespace/>DatabaseForm" action="<portlet:actionURL/>" method="POST">
+    <input type="hidden" name="mode" value="process-params" />
+    <input type="hidden" name="name" value="${pool.name}" />
+    <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}" />
+    <input type="hidden" name="blockingTimeout" value="${pool.blockingTimeout}" />
+    <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}">
+    <input type="hidden" name="${prop.key}" value="${prop.value}" />
+  </c:forEach>
+    <table border="0">
+    <!-- ENTRY FIELD: Driver Class -->
+      <tr>
+        <th style="min-width: 140px"><div align="right">JDBC Driver Class:</div></th>
+        <td><input name="driverClass" type="text" size="30" value="${pool.driverClass}"></td>
+      </tr>
+      <tr>
+        <td></td>
+        <td>
+          <c:if test="${!(empty driverError)}"><font color="red"><b>Unable to load driver from selected JARs!</b></font></c:if>
+          See the documentation for your JDBC driver.
+        </td>
+      </tr>
+    <!-- ENTRY FIELD: Driver JAR -->
+      <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>
+        </td>
+      </tr>
+      <tr>
+        <td></td>
+        <td>The JAR holding the selected JDBC driver.  Should 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>
+    <!-- ENTRY FIELD: Username -->
+      <tr>
+        <th><div align="right">DB User Name:</div></th>
+        <td><input name="user" type="text" size="20" value="${pool.user}"></td>
+      </tr>
+      <tr>
+        <td></td>
+        <td>The username used to connect to the database</td>
+      </tr>
+    <!-- ENTRY FIELD: Password -->
+      <tr>
+        <th><div align="right">DB Password:</div></th>
+        <td><input name="password" type="password" size="20" value="${pool.password}"></td>
+      </tr>
+      <tr>
+        <td></td>
+        <td>The password used to connect to the database</td>
+      </tr>
+    <!-- ENTRY FIELD: URL Properties -->
+      <tr>
+        <th colspan="2">Driver Connection Properties</th>
+      </tr>
+      <tr>
+        <th><div align="right">Typical JDBC URL:</div></th>
+        <td><c:out value="${pool.urlPrototype}" /></td>
+      </tr>
+  <c:forEach var="prop" items="${pool.urlProperties}">
+      <tr>
+        <th><div align="right">${fn:substringAfter(prop.key,"urlproperty-")}:</div></th>
+        <td><input name="${prop.key}" type="text" size="20" value="${prop.value}"></td>
+      </tr>
+      <tr>
+        <td></td>
+        <td>A property used to connect to ${pool.dbtype}.  May be optional (see JDBC driver documentation).</td>
+      </tr>
+  </c:forEach>
+    <!-- SUBMIT BUTTON -->
+      <tr>
+        <td></td>
+        <td><input type="submit" value="Next" /></td>
+      </tr>
+    </table>
+</form>
+<!--   END OF FORM TO COLLECT DATA FOR THIS PAGE   -->
+
+
+<p><a href="<portlet:actionURL portletMode="view">
+              <portlet:param name="mode" value="list" />
+            </portlet:actionURL>">Cancel</a></p>

Propchange: geronimo/trunk/applications/console/console-standard/src/webapp/WEB-INF/view/dbwizard/basicParams.jsp
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/trunk/applications/console/console-standard/src/webapp/WEB-INF/view/dbwizard/basicParams.jsp
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Propchange: geronimo/trunk/applications/console/console-standard/src/webapp/WEB-INF/view/dbwizard/basicParams.jsp
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Added: geronimo/trunk/applications/console/console-standard/src/webapp/WEB-INF/view/dbwizard/confirmURL.jsp
URL: http://svn.apache.org/viewcvs/geronimo/trunk/applications/console/console-standard/src/webapp/WEB-INF/view/dbwizard/confirmURL.jsp?rev=393787&view=auto
==============================================================================
--- geronimo/trunk/applications/console/console-standard/src/webapp/WEB-INF/view/dbwizard/confirmURL.jsp (added)
+++ geronimo/trunk/applications/console/console-standard/src/webapp/WEB-INF/view/dbwizard/confirmURL.jsp Thu Apr 13 04:34:08 2006
@@ -0,0 +1,146 @@
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
+<%@ taglib uri="http://java.sun.com/portlet" prefix="portlet"%>
+<portlet:defineObjects/>
+
+<p><b>Create Database Pool</b> -- Step 3: Final Pool Configuration</p>
+
+<script language="JavaScript">
+function <portlet:namespace/>validate() {
+
+   if (document.<portlet:namespace/>DatabaseForm.minSize.value == "") {
+      document.<portlet:namespace/>DatabaseForm.minSize.value = 0;
+   }
+   if (document.<portlet:namespace/>DatabaseForm.maxSize.value == "") {
+      document.<portlet:namespace/>DatabaseForm.maxSize.value = 10;
+   }
+
+   var min = parseInt(document.<portlet:namespace/>DatabaseForm.minSize.value); 
+   var max = parseInt(document.<portlet:namespace/>DatabaseForm.maxSize.value); 
+   result = true;
+
+   if (isNaN(min)) {
+      alert("Min pool size must be a number. Defaulted to 0");
+      min = document.<portlet:namespace/>DatabaseForm.minSize.value = 0;
+      result = false;
+   }
+   if (min < 0)
+   {
+      alert("Min pool size must be non-negative. Defaulted to 0");
+      min = document.<portlet:namespace/>DatabaseForm.minSize.value = 0;
+      result = false;
+   }
+
+   if (isNaN(max)) {
+      alert("Max pool size must be a number. Defaulted to 10");
+      max = document.<portlet:namespace/>DatabaseForm.maxSize.value = 10;
+      result = false;
+   }
+   if (max <= 0)
+   {
+      alert("Max pool size must be greater than zero. Defaulted to 10" );
+      max = document.<portlet:namespace/>DatabaseForm.maxSize.value = 10;
+      result = false;
+   } 
+
+   if (min > max) {
+      alert("Max pool size must be greater than Min pool size." );
+      return false;
+   }
+
+   return result;
+}
+</script>
+
+<!--   FORM TO COLLECT DATA FOR THIS PAGE   -->
+<form name="<portlet:namespace/>DatabaseForm" action="<portlet:actionURL/>" method="POST">
+    <input type="hidden" name="mode" value="process-url" />
+    <input type="hidden" name="test" value="true" />
+    <input type="hidden" name="name" value="${pool.name}" />
+    <input type="hidden" name="dbtype" value="${pool.dbtype}" />
+    <input type="hidden" name="user" value="${pool.user}" />
+    <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}" />
+    <input type="hidden" name="adapterDescription" value="${pool.adapterDescription}" />
+    <input type="hidden" name="rarPath" value="${pool.rarPath}" />
+  <c:forEach var="prop" items="${pool.properties}">
+    <input type="hidden" name="${prop.key}" value="${prop.value}" />
+  </c:forEach>
+  <c:forEach var="prop" items="${pool.urlProperties}">
+    <input type="hidden" name="${prop.key}" value="${prop.value}" />
+  </c:forEach>
+    <table border="0">
+    <!-- ENTRY FIELD: URL -->
+      <tr>
+        <th style="min-width: 140px"><div align="right">JDBC Connect URL:</div></th>
+        <td><input name="url" type="text" size="50" value="${pool.url}"></td>
+      </tr>
+      <tr>
+        <td></td>
+        <td>Make sure the generated URL fits the syntax for your JDBC driver.</td>
+      </tr>
+    <!-- STATUS FIELD: Driver Load -->
+      <tr>
+        <th><div align="right">Driver Status:</div></th>
+        <td><i>Loaded Successfully</i></td>
+      </tr>
+    <!-- HEADER -->
+      <tr>
+        <th colspan="2">Connection Pool Parameters</th>
+      </tr>
+    <!-- ENTRY FIELD: Min Size -->
+      <tr>
+        <th><div align="right">Pool Min Size:</div></th>
+        <td><input name="minSize" type="text" size="5" value="${pool.minSize}"></td>
+      </tr>
+      <tr>
+        <td></td>
+        <td>The minimum number of connections in the pool.  Leave blank for default.</td>
+      </tr>
+    <!-- ENTRY FIELD: Max Size -->
+      <tr>
+        <th><div align="right">Pool Max Size:</div></th>
+        <td><input name="maxSize" type="text" size="5" value="${pool.maxSize}"></td>
+      </tr>
+      <tr>
+        <td></td>
+        <td>The maximum number of connections in the pool.  Leave blank for default.</td>
+      </tr>
+    <!-- ENTRY FIELD: Blocking Timeout -->
+      <tr>
+        <th><div align="right">Blocking Timeout:</div></th>
+        <td><input name="blockingTimeout" type="text" size="7" value="${pool.blockingTimeout}"> (in milliseconds)</td>
+      </tr>
+      <tr>
+        <td></td>
+        <td>The length of time a caller will wait for a connection.  Leave blank for default.</td>
+      </tr>
+    <!-- ENTRY FIELD: Idle timeout -->
+      <tr>
+        <th><div align="right">Idle Timeout:</div></th>
+        <td><input name="idleTimeout" type="text" size="5" value="${pool.idleTimeout}"> (in minutes)</td>
+      </tr>
+      <tr>
+        <td></td>
+        <td>How long a connection can be idle before being closed.  Leave blank for default.</td>
+      </tr>
+    <!-- SUBMIT BUTTON -->
+      <tr>
+        <td></td>
+        <td>
+          <input type="button" value="Test Connection" onclick="if (<portlet:namespace/>validate()){document.<portlet:namespace/>DatabaseForm.test.value='true';document.<portlet:namespace/>DatabaseForm.submit();}" />
+          <input type="button" value="Skip Test and Deploy" onclick="if (<portlet:namespace/>validate()){document.<portlet:namespace/>DatabaseForm.test.value='false';document.<portlet:namespace/>DatabaseForm.submit();return false;}" />
+          <input type="button" value="Skip Test and Show Plan" onclick="if (<portlet:namespace/>validate()){document.<portlet:namespace/>DatabaseForm.mode.value='plan';document.<portlet:namespace/>DatabaseForm.submit();return false;}" />
+        </td>
+      </tr>
+    </table>
+</form>
+<!--   END OF FORM TO COLLECT DATA FOR THIS PAGE   -->
+
+<p><a href="<portlet:actionURL portletMode="view">
+              <portlet:param name="mode" value="list" />
+            </portlet:actionURL>">Cancel</a></p>

Propchange: geronimo/trunk/applications/console/console-standard/src/webapp/WEB-INF/view/dbwizard/confirmURL.jsp
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/trunk/applications/console/console-standard/src/webapp/WEB-INF/view/dbwizard/confirmURL.jsp
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Propchange: geronimo/trunk/applications/console/console-standard/src/webapp/WEB-INF/view/dbwizard/confirmURL.jsp
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Added: geronimo/trunk/applications/console/console-standard/src/webapp/WEB-INF/view/dbwizard/edit.jsp
URL: http://svn.apache.org/viewcvs/geronimo/trunk/applications/console/console-standard/src/webapp/WEB-INF/view/dbwizard/edit.jsp?rev=393787&view=auto
==============================================================================
--- geronimo/trunk/applications/console/console-standard/src/webapp/WEB-INF/view/dbwizard/edit.jsp (added)
+++ geronimo/trunk/applications/console/console-standard/src/webapp/WEB-INF/view/dbwizard/edit.jsp Thu Apr 13 04:34:08 2006
@@ -0,0 +1,289 @@
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/functions" prefix="fn" %>
+<%@ taglib uri="http://java.sun.com/portlet" prefix="portlet"%>
+<portlet:defineObjects/>
+
+<p>This page edits a new or existing database pool.</p>
+
+<script language="JavaScript">
+function <portlet:namespace/>validate() {
+
+   if (document.<portlet:namespace/>DatabaseForm.minSize.value == "") {
+      document.<portlet:namespace/>DatabaseForm.minSize.value = 0;
+   }
+   if (document.<portlet:namespace/>DatabaseForm.maxSize.value == "") {
+      document.<portlet:namespace/>DatabaseForm.maxSize.value = 10;
+   }
+
+   var min = parseInt(document.<portlet:namespace/>DatabaseForm.minSize.value); 
+   var max = parseInt(document.<portlet:namespace/>DatabaseForm.maxSize.value); 
+   result = true;
+
+   if (isNaN(min)) {
+      alert("Min pool size must be a number. Defaulted to 0");
+      min = document.<portlet:namespace/>DatabaseForm.minSize.value = 0;
+      result = false;
+   }
+   if (min < 0)
+   {
+      alert("Min pool size must be non-negative. Defaulted to 0");
+      min = document.<portlet:namespace/>DatabaseForm.minSize.value = 0;
+      result = false;
+   }
+
+   if (isNaN(max)) {
+      alert("Max pool size must be a number. Defaulted to 10");
+      max = document.<portlet:namespace/>DatabaseForm.maxSize.value = 10;
+      result = false;
+   }
+   if (max <= 0)
+   {
+      alert("Max pool size must be greater than zero. Defaulted to 10" );
+      max = document.<portlet:namespace/>DatabaseForm.maxSize.value = 10;
+      result = false;
+   } 
+
+   if (min > max) {
+      alert("Max pool size must be greater than Min pool size." );
+      return false;
+   }
+
+   return result;
+}
+</script>
+
+<!--   FORM TO COLLECT DATA FOR THIS PAGE   -->
+<form name="<portlet:namespace/>DatabaseForm" action="<portlet:actionURL/>" method="POST">
+    <input type="hidden" name="mode" value="process-url" />
+    <input type="hidden" name="test" value="true" />
+
+    <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="prop" items="${pool.urlProperties}">
+    <input type="hidden" name="${prop.key}" value="${prop.value}" />
+  </c:forEach>
+    <input type="hidden" name="objectName" value="${pool.objectName}" />
+    <input type="hidden" name="adapterDisplayName" value="${pool.adapterDisplayName}" />
+    <input type="hidden" name="adapterDescription" value="${pool.adapterDescription}" />
+    <input type="hidden" name="rarPath" value="${pool.rarPath}" />
+
+    <table border="0">
+    <!-- ENTRY FIELD: NAME -->
+      <tr>
+        <th style="min-width: 140px"><div align="right">Pool Name:</div></th>
+        <td>
+      <c:choose> <%-- Can't change the pool name after deployment because it's wired into all the ObjectNames --%>
+        <c:when test="${empty pool.objectName}">
+          <input name="name" type="text" size="30" value="${pool.name}">
+        </c:when>
+        <c:otherwise>
+          <input name="name" type="hidden" value="${pool.name}" />
+          <b><c:out value="${pool.name}" /></b>
+        </c:otherwise>
+      </c:choose>
+        </td>
+      </tr>
+      <tr>
+        <td></td>
+        <td>A name that is different than the name for any other database pools in the server (no spaces in the name please).</td>
+      </tr>
+    <!-- STATUS FIELD: Display Name -->
+      <tr>
+        <th><div align="right">Pool Type:</div></th>
+        <td><i><c:out value="${pool.adapterDisplayName}" /></i></td>
+      </tr>
+      <tr>
+        <td />
+        <td><c:out value="${pool.adapterDescription}" /></td>
+      </tr>
+    <!-- HEADER -->
+      <tr>
+        <th colspan="2">Basic Connection Properties</th>
+      </tr>
+<c:choose>
+  <c:when test="${pool.generic}"> <%-- This is a standard TranQL JDBC pool -- we know what parameters it wants --%>
+    <!-- ENTRY FIELD: Driver Class -->
+      <tr>
+        <th><div align="right">JDBC Driver Class:</div></th>
+        <td>
+      <c:choose>
+        <c:when test="${empty pool.objectName}">
+          <input name="driverClass" type="text" size="30" value="${pool.driverClass}">
+        </c:when>
+        <c:otherwise>
+          <input type="hidden" name="driverClass" value="${pool.driverClass}" />
+          <i><c:out value="${pool.driverClass}" /></i>
+        </c:otherwise>
+      </c:choose>
+        </td>
+      </tr>
+      <tr>
+        <td></td>
+        <td>
+          <c:if test="${!(empty driverError)}"><font color="red"><b>Unable to load driver from selected JARs!</b></font></c:if>
+          See the documentation for your JDBC driver.
+        </td>
+      </tr>
+    <!-- ENTRY FIELD: Driver JAR -->
+  <c:choose> <%-- Can't set JAR after deployment because we don't know how to dig through dependencies yet --%>
+    <c:when test="${empty pool.objectName}">
+      <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>
+        </td>
+      </tr>
+      <tr>
+        <td></td>
+        <td>The JAR holding the selected JDBC driver.  Should 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}" />
+    </c:otherwise>
+  </c:choose>
+    <!-- ENTRY FIELD: URL -->
+      <tr>
+        <th><div align="right">JDBC Connect URL:</div></th>
+        <td><input name="url" type="text" size="50" value="${pool.url}"></td>
+      </tr>
+      <tr>
+        <td></td>
+        <td>Make sure the generated URL fits the syntax for your JDBC driver.</td>
+      </tr>
+    <!-- ENTRY FIELD: Username -->
+      <tr>
+        <th><div align="right">DB User Name:</div></th>
+        <td><input name="user" type="text" size="20" value="${pool.user}"></td>
+      </tr>
+      <tr>
+        <td></td>
+        <td>The username used to connect to the database</td>
+      </tr>
+    <!-- ENTRY FIELD: Password -->
+      <tr>
+        <th><div align="right">DB Password:</div></th>
+        <td><input name="password" type="password" size="20" value="${pool.password}"></td>
+      </tr>
+      <tr>
+        <td></td>
+        <td>The password used to connect to the database
+
+        <%-- Just to be safe, save all the non-Generic properties since we're not going to edit them here --%>
+  <c:forEach var="prop" items="${pool.properties}">
+    <input type="hidden" name="${prop.key}" value="${prop.value}" />
+  </c:forEach>
+        </td>
+      </tr>
+  </c:when>
+  <c:otherwise> <%-- This is an XA or other connection factory that we don't have special parameter handling for --%>
+    <c:forEach var="prop" items="${pool.properties}">
+      <tr>
+        <th><div align="right">${pool.propertyNames[prop.key]}:</div></th>
+        <td><input name="${prop.key}" type="<c:choose><c:when test="${fn:containsIgnoreCase(prop.key, 'password')}">password</c:when><c:otherwise>text</c:otherwise></c:choose>" size="20" value="${prop.value}"></td>
+      </tr>
+      <tr>
+        <td></td>
+        <td>${ConfigParams[prop.key].description}</td>
+      </tr>
+    </c:forEach>
+      <tr><td colspan="2">
+        <%-- Just to be safe, save all the Generic properties since we're not going to edit them here --%>
+        <input type="hidden" name="user" value="${pool.user}" />
+        <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}" />
+      </td></tr>
+  </c:otherwise>
+</c:choose>
+    <!-- HEADER -->
+      <tr>
+        <th colspan="2">Connection Pool Parameters</th>
+      </tr>
+    <!-- ENTRY FIELD: Min Size -->
+      <tr>
+        <th><div align="right">Pool Min Size:</div></th>
+        <td><input name="minSize" type="text" size="5" value="${pool.minSize}"></td>
+      </tr>
+      <tr>
+        <td></td>
+        <td>The minimum number of connections in the pool.  The default is 0.</td>
+      </tr>
+    <!-- ENTRY FIELD: Max Size -->
+      <tr>
+        <th><div align="right">Pool Max Size:</div></th>
+        <td><input name="maxSize" type="text" size="5" value="${pool.maxSize}"></td>
+      </tr>
+      <tr>
+        <td></td>
+        <td>The maximum number of connections in the pool.  The default is 10.</td>
+      </tr>
+    <!-- ENTRY FIELD: Blocking Timeout -->
+      <tr>
+        <th><div align="right">Blocking Timeout:</div></th>
+        <td><input name="blockingTimeout" type="text" size="7" value="${pool.blockingTimeout}"> (in milliseconds)</td>
+      </tr>
+      <tr>
+        <td></td>
+        <td>The length of time a caller will wait for a connection.  The default is 5000.</td>
+      </tr>
+    <!-- ENTRY FIELD: Idle timeout -->
+      <tr>
+        <th><div align="right">Idle Timeout:</div></th>
+        <td><input name="idleTimeout" type="text" size="5" value="${pool.idleTimeout}"> (in minutes)</td>
+      </tr>
+      <tr>
+        <td></td>
+        <td>How long a connection can be idle before being closed.  The default is 15.</td>
+      </tr>
+
+    <!-- SUBMIT BUTTON -->
+      <tr>
+        <td></td>
+        <td>
+<c:choose> <%-- Don't know how to test a non-generic pool, so you can only save it --%>
+  <c:when test="${pool.generic}">
+    <c:choose> <%-- Can't test after deployment because we don't know what JAR to put on the ClassPath, can't show plan becasue we can't update a plan --%>
+      <c:when test="${empty pool.objectName}">
+          <input type="button" value="Test Connection" onclick="if (<portlet:namespace/>validate()){document.<portlet:namespace/>DatabaseForm.test.value='true';document.<portlet:namespace/>DatabaseForm.submit();}" />
+          <input type="button" value="Skip Test and Deploy" onclick="if (<portlet:namespace/>validate()){document.<portlet:namespace/>DatabaseForm.test.value='false';document.<portlet:namespace/>DatabaseForm.submit();return false;}" />
+          <input type="button" value="Skip Test and Show Plan" onclick="if (<portlet:namespace/>validate()){document.<portlet:namespace/>DatabaseForm.mode.value='plan';document.<portlet:namespace/>DatabaseForm.submit();return false;}" />
+      </c:when>
+      <c:otherwise>
+          <input type="button" value="Save" onclick="if (<portlet:namespace/>validate()){document.<portlet:namespace/>DatabaseForm.mode.value='save';document.<portlet:namespace/>DatabaseForm.submit();return false;}" />
+      </c:otherwise>
+    </c:choose>
+  </c:when>
+  <c:otherwise> <%-- Not a generic JDBC pool --%>
+    <c:choose>
+      <c:when test="${empty pool.objectName}"> <%-- If it's new we can preview the plan or save/deploy --%>
+          <input type="button" value="Deploy" onclick="if (<portlet:namespace/>validate()){document.<portlet:namespace/>DatabaseForm.mode.value='save';document.<portlet:namespace/>DatabaseForm.submit();return false;}" />
+          <input type="button" value="Show Plan" onclick="if (<portlet:namespace/>validate()){document.<portlet:namespace/>DatabaseForm.mode.value='plan';document.<portlet:namespace/>DatabaseForm.submit();return false;}" />
+      </c:when>
+      <c:otherwise> <%-- If it's existing we can only save --%>
+          <input type="button" value="Save" onclick="if (<portlet:namespace/>validate()){document.<portlet:namespace/>DatabaseForm.mode.value='save';document.<portlet:namespace/>DatabaseForm.submit();return false;}" />
+      </c:otherwise>
+    </c:choose>
+  </c:otherwise>
+</c:choose>
+        </td>
+      </tr>
+    </table>
+</form>
+<!--   END OF FORM TO COLLECT DATA FOR THIS PAGE   -->
+
+
+
+<p><a href="<portlet:actionURL portletMode="view">
+              <portlet:param name="mode" value="list" />
+            </portlet:actionURL>">Cancel</a></p>

Propchange: geronimo/trunk/applications/console/console-standard/src/webapp/WEB-INF/view/dbwizard/edit.jsp
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/trunk/applications/console/console-standard/src/webapp/WEB-INF/view/dbwizard/edit.jsp
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Propchange: geronimo/trunk/applications/console/console-standard/src/webapp/WEB-INF/view/dbwizard/edit.jsp
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Added: geronimo/trunk/applications/console/console-standard/src/webapp/WEB-INF/view/dbwizard/importStatus.jsp
URL: http://svn.apache.org/viewcvs/geronimo/trunk/applications/console/console-standard/src/webapp/WEB-INF/view/dbwizard/importStatus.jsp?rev=393787&view=auto
==============================================================================
--- geronimo/trunk/applications/console/console-standard/src/webapp/WEB-INF/view/dbwizard/importStatus.jsp (added)
+++ geronimo/trunk/applications/console/console-standard/src/webapp/WEB-INF/view/dbwizard/importStatus.jsp Thu Apr 13 04:34:08 2006
@@ -0,0 +1,68 @@
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
+<%@ taglib uri="http://java.sun.com/portlet" prefix="portlet"%>
+<portlet:defineObjects/>
+
+<p><b>Import Database Pools</b> -- Step 2: Review Imported Data</p>
+
+<p>The list of recognized database pools appears below.  You can deploy any pools to
+  Geronimo that were configured as plain JDBC pools, or XA pools where Geronimo has
+  a supported XA adapter.  Below the pool list is the list of status messages from
+  the import process.</p>
+
+<c:choose>
+  <c:when test="${empty(status.pools)}"><p><i>The import failed or did not discover any usable database pools!</i></p></c:when>
+  <c:otherwise>
+<table width="100%">
+  <tr>
+    <td class="DarkBackground">Original Name</td>
+    <td class="DarkBackground" align="center">Original JNDI</td>
+    <td class="DarkBackground" align="center">Import Status</td>
+    <td class="DarkBackground" align="center">Actions</td>
+  </tr>
+<c:forEach var="pool" items="${status.pools}" varStatus="loop" >
+  <tr>
+    <td>${pool.pool.name}</td>
+    <td>${pool.pool.jndiName}</td>
+    <td>${pool.status}</td>
+    <td>
+  <c:choose>
+    <c:when test="${pool.skipped || pool.finished}">
+    </c:when>
+    <c:otherwise>
+      <a href="<portlet:actionURL portletMode="view">
+        <portlet:param name="mode" value="importEdit" />
+        <portlet:param name="importIndex" value="${loop.index}" />
+      </portlet:actionURL>">Confirm and Deploy</a>
+    </c:otherwise>
+  </c:choose>
+    </td>
+  </tr>
+</c:forEach>
+  <tr>
+    <td colspan="4" align="center">
+      <a href="<portlet:actionURL portletMode="view">
+        <portlet:param name="mode" value="importComplete" />
+      </portlet:actionURL>"><c:choose><c:when test="${status.finished}">Finish</c:when><c:otherwise>Skip Remaining Pools</c:otherwise></c:choose></a>
+    </td>
+  </tr>
+</table>
+  </c:otherwise>
+</c:choose>
+
+<hr />
+
+<p>Current Pools in Server:</p>
+<ul>
+<c:forEach var="pool" items="${pools}">
+  <li>${pool.name}</li>
+</c:forEach>
+</ul>
+
+<hr />
+
+<p>Import Messages:</p>
+<ul>
+<c:forEach var="message" items="${status.original.messages}">
+  <li>${message}</li>
+</c:forEach>
+</ul>

Propchange: geronimo/trunk/applications/console/console-standard/src/webapp/WEB-INF/view/dbwizard/importStatus.jsp
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/trunk/applications/console/console-standard/src/webapp/WEB-INF/view/dbwizard/importStatus.jsp
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Propchange: geronimo/trunk/applications/console/console-standard/src/webapp/WEB-INF/view/dbwizard/importStatus.jsp
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Added: geronimo/trunk/applications/console/console-standard/src/webapp/WEB-INF/view/dbwizard/importUpload.jsp
URL: http://svn.apache.org/viewcvs/geronimo/trunk/applications/console/console-standard/src/webapp/WEB-INF/view/dbwizard/importUpload.jsp?rev=393787&view=auto
==============================================================================
--- geronimo/trunk/applications/console/console-standard/src/webapp/WEB-INF/view/dbwizard/importUpload.jsp (added)
+++ geronimo/trunk/applications/console/console-standard/src/webapp/WEB-INF/view/dbwizard/importUpload.jsp Thu Apr 13 04:34:08 2006
@@ -0,0 +1,85 @@
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
+<%@ taglib uri="http://java.sun.com/portlet" prefix="portlet"%>
+<portlet:defineObjects/>
+
+
+<p><b>Import Database Pools</b> -- Step 1: Upload Configuration File</p>
+
+<p>This page starts the process of importing database pools from another application server.
+To do the import, you'll need to upload a configuration file from the other server using the
+fields below.  After that, we'll convert the values we can, and ask you to confirm the
+configuration for each pool we find in the configuration.</p>
+
+<form enctype="multipart/form-data" method="POST" name="<portlet:namespace/>ImportForm"
+      action="<portlet:actionURL><portlet:param name="mode" value="importUpload"/><portlet:param name="importSource" value="${pool.importSource}"/></portlet:actionURL>">
+    <table width="100%">
+      <tr>
+        <td class="DarkBackground" colspan="2">${pool.importSource} Import</td>
+      </tr>
+      <tr>
+        <th align="right" style="min-width: 140px">Config File:</th>
+        <td><input type="file" name="configFile" /></td>
+      </tr>
+      <tr>
+        <td></td>
+        <td>Please select the ${from}.</td>
+      </tr>
+    <!-- SUBMIT BUTTON -->
+      <tr>
+        <td></td>
+        <td><input type="submit" value="Next" /></td>
+      </tr>
+    </table>
+</form>
+
+<c:if test="${pool.importSource eq 'WebLogic 8.1'}">
+<br />
+<br />
+<br />
+<form name="<portlet:namespace/>WebLogicImportForm" action="<portlet:actionURL/>">
+    <input type="hidden" name="mode" value="weblogicImport" />
+    <input type="hidden" name="importSource" value="${pool.importSource}" />
+    <input type="hidden" name="from" value="${from}" />
+    <table width="100%">
+      <tr>
+        <td class="DarkBackground" colspan="2">Alternate ${pool.importSource} Import</td>
+      </tr>
+      <tr>
+        <td colspan="2">If WebLogic 8.1 is installed on the same machine as Geronimo, and the
+WebLogic domain directory is readable by the user running Geronimo, you
+can also point directly to the WebLogic installation and domain directories.
+This has the advantage that the import process can read the database
+passwords, whereas if you just import a <tt>config.xml</tt> above you'll
+need to re-enter all the passwords.</td>
+      </tr>
+      <tr>
+        <th align="right" style="min-width: 140px">Domain directory path:</th>
+        <td><input type="text" name="weblogicDomainDir" size="40" /></td>
+      </tr>
+      <tr>
+        <td></td>
+        <td>Please enter the full path to the WebLogic domain directory (containing the
+          <tt>config.xml</tt> file) for your WebLogic domain (e.g. C:\bea\user_projects\domains\mydomain).</td>
+      </tr>
+      <tr>
+        <th align="right"><tt>weblogic81/server/lib</tt> path:</th>
+        <td><input type="text" name="weblogicLibDir" size="40" /></td>
+      </tr>
+      <tr>
+        <td></td>
+        <td>Please enter the full path to the <tt>weblogic81/server/lib</tt> directory
+          for your WebLogic 8.1 installation (e.g. C:\bea\weblogic81\server\lib).</td>
+      </tr>
+    <!-- SUBMIT BUTTON -->
+      <tr>
+        <td></td>
+        <td><input type="submit" value="Next" /></td>
+      </tr>
+    </table>
+</form>
+</c:if>
+
+
+<p><a href="<portlet:actionURL portletMode="view">
+              <portlet:param name="mode" value="list" />
+            </portlet:actionURL>">Cancel</a></p>

Propchange: geronimo/trunk/applications/console/console-standard/src/webapp/WEB-INF/view/dbwizard/importUpload.jsp
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/trunk/applications/console/console-standard/src/webapp/WEB-INF/view/dbwizard/importUpload.jsp
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Propchange: geronimo/trunk/applications/console/console-standard/src/webapp/WEB-INF/view/dbwizard/importUpload.jsp
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Added: geronimo/trunk/applications/console/console-standard/src/webapp/WEB-INF/view/dbwizard/list.jsp
URL: http://svn.apache.org/viewcvs/geronimo/trunk/applications/console/console-standard/src/webapp/WEB-INF/view/dbwizard/list.jsp?rev=393787&view=auto
==============================================================================
--- geronimo/trunk/applications/console/console-standard/src/webapp/WEB-INF/view/dbwizard/list.jsp (added)
+++ geronimo/trunk/applications/console/console-standard/src/webapp/WEB-INF/view/dbwizard/list.jsp Thu Apr 13 04:34:08 2006
@@ -0,0 +1,91 @@
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
+<%@ taglib uri="http://java.sun.com/portlet" prefix="portlet"%>
+<portlet:defineObjects/>
+
+<p>This page lists all the available database pools.</p>
+
+<c:choose>
+  <c:when test="${empty(pools)}"><p><i>There are no database pools defined</i></p></c:when>
+  <c:otherwise>
+<p>For each pool listed, you can click the <b>usage</b> link to see examples of how
+  to use the pool from your application.</p>
+
+<table width="100%">
+  <tr>
+    <td class="DarkBackground">Name</td>
+    <td class="DarkBackground" align="center">Deployed As</td>
+    <td class="DarkBackground" align="center">State</td>
+    <td class="DarkBackground" align="center">Actions</td>
+  </tr>
+<c:forEach var="pool" items="${pools}">
+  <tr>
+    <td>${pool.name}</td>
+    <td>
+      <c:choose>
+        <c:when test="${empty pool.parentName}">
+          Server-wide
+        </c:when>
+        <c:otherwise>
+          ${pool.parentName}  <%-- todo: make this a link to an application portlet --%>
+        </c:otherwise>
+      </c:choose>
+    </td>
+    <td>${pool.stateName}</td>
+    <td>
+         <%--<c:choose>
+               <c:when test="${info.stateName eq 'running'}">
+               <a href="<portlet:actionURL portletMode="view">
+                 <portlet:param name="mode" value="stop" />
+                 <portlet:param name="name" value="${info.objectName}" />
+                 <portlet:param name="managerObjectName" value="${container.managerObjectName}" />
+                 <portlet:param name="containerObjectName" value="${container.containerObjectName}" />
+               </portlet:actionURL>">stop</a>
+               </c:when>
+               <c:otherwise>
+               <a href="<portlet:actionURL portletMode="view">
+                 <portlet:param name="mode" value="start" />
+                 <portlet:param name="name" value="${info.objectName}" />
+                 <portlet:param name="managerObjectName" value="${container.managerObjectName}" />
+                 <portlet:param name="containerObjectName" value="${container.containerObjectName}" />
+               </portlet:actionURL>">start</a>
+               </c:otherwise>
+             </c:choose>--%>
+      <a href="<portlet:actionURL portletMode="view">
+        <portlet:param name="mode" value="editExisting" />
+        <portlet:param name="adapterObjectName" value="${pool.adapterObjectName}" />
+        <portlet:param name="objectName" value="${pool.factoryObjectName}" />
+      </portlet:actionURL>">edit</a>
+      <a href="<portlet:actionURL portletMode="view">
+        <portlet:param name="mode" value="usage" />
+        <portlet:param name="name" value="${pool.name}" />
+        <portlet:param name="objectName" value="${pool.factoryObjectName}" />
+      </portlet:actionURL>">usage</a>
+           <%--<a href="<portlet:actionURL portletMode="view">
+                 <portlet:param name="mode" value="delete" />
+                 <portlet:param name="name" value="${info.objectName}" />
+                 <portlet:param name="managerObjectName" value="${container.managerObjectName}" />
+                 <portlet:param name="containerObjectName" value="${container.containerObjectName}" />
+               </portlet:actionURL>">delete</a>--%>
+    </td>
+  </tr>
+</c:forEach>
+</table>
+  </c:otherwise>
+</c:choose>
+
+<p>Create a new database pool:</p>
+<ul>
+  <li><a href="<portlet:actionURL portletMode="view">
+              <portlet:param name="mode" value="rdbms" />
+            </portlet:actionURL>">Using the Geronimo database pool wizard</a></li>
+  <li><a href="<portlet:actionURL portletMode="view">
+              <portlet:param name="mode" value="startImport" />
+              <portlet:param name="importSource" value="JBoss 4" />
+              <portlet:param name="from" value="<tt>*-ds.xml</tt> file from the <tt>jboss4/server/name/deploy</tt> directory" />
+            </portlet:actionURL>">Import from JBoss 4</a></li>
+  <li><a href="<portlet:actionURL portletMode="view">
+              <portlet:param name="mode" value="startImport" />
+              <portlet:param name="importSource" value="WebLogic 8.1" />
+              <portlet:param name="from" value="<tt>config.xml</tt> file from the WebLogic domain directory" />
+            </portlet:actionURL>">Import from WebLogic 8.1</a></li>
+</ul>
\ No newline at end of file

Propchange: geronimo/trunk/applications/console/console-standard/src/webapp/WEB-INF/view/dbwizard/list.jsp
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/trunk/applications/console/console-standard/src/webapp/WEB-INF/view/dbwizard/list.jsp
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Propchange: geronimo/trunk/applications/console/console-standard/src/webapp/WEB-INF/view/dbwizard/list.jsp
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Added: geronimo/trunk/applications/console/console-standard/src/webapp/WEB-INF/view/dbwizard/selectDatabase.jsp
URL: http://svn.apache.org/viewcvs/geronimo/trunk/applications/console/console-standard/src/webapp/WEB-INF/view/dbwizard/selectDatabase.jsp?rev=393787&view=auto
==============================================================================
--- geronimo/trunk/applications/console/console-standard/src/webapp/WEB-INF/view/dbwizard/selectDatabase.jsp (added)
+++ geronimo/trunk/applications/console/console-standard/src/webapp/WEB-INF/view/dbwizard/selectDatabase.jsp Thu Apr 13 04:34:08 2006
@@ -0,0 +1,75 @@
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
+<%@ taglib uri="http://java.sun.com/portlet" prefix="portlet"%>
+<portlet:defineObjects/>
+
+<p><b>Create Database Pool</b> -- Step 1: Select Name and Database</p>
+
+<!--   FORM TO COLLECT DATA FOR THIS PAGE   -->
+<form name="<portlet:namespace/>" action="<portlet:actionURL/>" method="POST">
+    <input type="hidden" name="mode" value="process-rdbms" />
+    <input type="hidden" name="user" value="${pool.user}" />
+    <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="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}" />
+    <input type="hidden" name="minSize" value="${pool.minSize}" />
+    <input type="hidden" name="maxSize" value="${pool.maxSize}" />
+    <input type="hidden" name="idleTimeout" value="${pool.idleTimeout}" />
+    <input type="hidden" name="blockingTimeout" value="${pool.blockingTimeout}" />
+    <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}">
+    <input type="hidden" name="${prop.key}" value="${prop.value}" />
+  </c:forEach>
+  <c:forEach var="prop" items="${pool.urlProperties}">
+    <input type="hidden" name="${prop.key}" value="${prop.value}" />
+  </c:forEach>
+    <table border="0">
+    <!-- ENTRY FIELD: NAME -->
+      <tr>
+        <th style="min-width: 140px"><div align="right">Name of Database Pool:</div></th>
+        <td><input name="name" type="text" size="30" value="${pool.name}"></td>
+      </tr>
+      <tr>
+        <td></td>
+        <td>A name that is different than the name for any other database pools in the server (no spaces in the name please).</td>
+      </tr>
+    <!-- ENTRY FIELD: DB TYPE -->
+      <tr>
+        <th><div align="right">Database Type:</div></th>
+        <td>
+          <select name="dbtype">
+        <c:forEach var="db" items="${databases}">
+            <option <c:if test="${db.name == pool.dbtype}">selected</c:if>>${db.name}</option>
+        </c:forEach>
+          </select>
+        </td>
+      </tr>
+      <tr>
+        <td></td>
+        <td>The type of database the pool will connect to.</td>
+      </tr>
+      <tr>
+        <td></td>
+        <td><input type="submit" value="Next" /></td>
+      </tr>
+    </table>
+</form>
+<!--   END OF FORM TO COLLECT DATA FOR THIS PAGE   -->
+
+<%--
+<p><a href="<portlet:actionURL portletMode="view">
+              <portlet:param name="mode" value="params" />
+            </portlet:actionURL>">Select predefined database</a></p>
+<p><a href="<portlet:actionURL portletMode="view">
+              <portlet:param name="mode" value="edit" />
+            </portlet:actionURL>">Select "other" database</a></p>
+--%>
+
+<p><a href="<portlet:actionURL portletMode="view">
+              <portlet:param name="mode" value="list" />
+            </portlet:actionURL>">Cancel</a></p>

Propchange: geronimo/trunk/applications/console/console-standard/src/webapp/WEB-INF/view/dbwizard/selectDatabase.jsp
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/trunk/applications/console/console-standard/src/webapp/WEB-INF/view/dbwizard/selectDatabase.jsp
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Propchange: geronimo/trunk/applications/console/console-standard/src/webapp/WEB-INF/view/dbwizard/selectDatabase.jsp
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Added: geronimo/trunk/applications/console/console-standard/src/webapp/WEB-INF/view/dbwizard/selectDownload.jsp
URL: http://svn.apache.org/viewcvs/geronimo/trunk/applications/console/console-standard/src/webapp/WEB-INF/view/dbwizard/selectDownload.jsp?rev=393787&view=auto
==============================================================================
--- geronimo/trunk/applications/console/console-standard/src/webapp/WEB-INF/view/dbwizard/selectDownload.jsp (added)
+++ geronimo/trunk/applications/console/console-standard/src/webapp/WEB-INF/view/dbwizard/selectDownload.jsp Thu Apr 13 04:34:08 2006
@@ -0,0 +1,95 @@
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
+<%@ taglib uri="http://java.sun.com/portlet" prefix="portlet"%>
+<portlet:defineObjects/>
+
+<p><b>Create Database Pool</b> -- Step 2: Select Driver, JAR, Parameters</p>
+
+<p>This page lets you automatically download a driver for a database where the
+driver JARs are available online without login or registration.</p>
+
+<p><i>If this page took a very long time to load and there are no drivers listed in the box below,
+it probably means your Geronimo installation can't connect to apache.org to retrieve the driver
+download configuration file.  Sorry for the inconvenience, you'll have to try again later or
+install the driver by hand (copy it to a directory under geronimo/repository/)</i></p>
+
+<!--   FORM TO COLLECT DATA FOR THIS PAGE   -->
+<form name="<portlet:namespace/>DatabaseForm" action="<portlet:actionURL/>" method="POST">
+    <input type="hidden" name="mode" value="process-download" />
+    <input type="hidden" name="name" value="${pool.name}" />
+    <input type="hidden" name="dbtype" value="${pool.dbtype}" />
+    <input type="hidden" name="user" value="${pool.user}" />
+    <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="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}" />
+    <input type="hidden" name="minSize" value="${pool.minSize}" />
+    <input type="hidden" name="maxSize" value="${pool.maxSize}" />
+    <input type="hidden" name="idleTimeout" value="${pool.idleTimeout}" />
+    <input type="hidden" name="blockingTimeout" value="${pool.blockingTimeout}" />
+    <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}">
+    <input type="hidden" name="${prop.key}" value="${prop.value}" />
+  </c:forEach>
+  <c:forEach var="prop" items="${pool.urlProperties}">
+    <input type="hidden" name="${prop.key}" value="${prop.value}" />
+  </c:forEach>
+    <table border="0">
+    <!-- ENTRY FIELD: DRIVER TYPE -->
+      <tr>
+        <th style="min-width: 140px"><div align="right">Select Driver:</div></th>
+        <td>
+          <select name="driverName">
+        <c:forEach var="driver" items="${drivers}">
+            <option>${driver.name}</option>
+        </c:forEach>
+          </select>
+        </td>
+      </tr>
+      <tr>
+        <td></td>
+        <td>A driver that Geronimo can download automatically for you.</td>
+      </tr>
+      <tr>
+        <td></td>
+        <td>
+          <input type="submit" value="Next" />
+          <input type="button" value="Cancel" onclick="document.<portlet:namespace/>DatabaseForm.mode.value='params';document.<portlet:namespace/>DatabaseForm.submit();return false;" />
+        </td>
+      </tr>
+    </table>
+</form>
+<!--   END OF FORM TO COLLECT DATA FOR THIS PAGE   -->
+
+<%--
+<p><a href="<portlet:actionURL portletMode="view">
+              <portlet:param name="mode" value="params" />
+            </portlet:actionURL>">Select predefined database</a></p>
+<p><a href="<portlet:actionURL portletMode="view">
+              <portlet:param name="mode" value="edit" />
+            </portlet:actionURL>">Select "other" database</a></p>
+--%>
+
+<p><a href="<portlet:actionURL portletMode="view">
+              <portlet:param name="mode" value="list" />
+            </portlet:actionURL>">Return to List</a></p>
+
+<p><br /><br /><br />Here are some other JDBC drivers you might want to download on your own (just save them somewhere under geronimo/repository/):</p>
+<ul>
+  <li><a href="http://www.daffodildb.com/download/index.jsp">DaffodilDB</a></li>
+  <li><a href="http://www.frontbase.com/cgi-bin/WebObjects/FrontBase">FrontBase</a></li>
+  <li><a href="http://www.datadirect.com/products/jdbc/index.ssp">DataDirect SQL Server, DB2, Oracle, Informix, Sybase</a></li>
+  <li><a href="http://www-306.ibm.com/software/data/informix/tools/jdbc/">Informix</a></li>
+  <li><a href="http://www.intersystems.com/cache/downloads/index.html">InterSystems Cache</a></li>
+  <li><a href="http://www.borland.com/products/downloads/download_jdatastore.html">JDataStore</a></li>
+  <li><a href="http://developer.mimer.com/downloads/index.htm">Mimer</a></li>
+  <li><a href="http://www.oracle.com/technology/software/tech/java/sqlj_jdbc/index.html">Oracle</a></li>
+  <li><a href="http://www.pervasive.com/developerzone/access_methods/jdbc.asp">Pervasive</a></li>
+  <li><a href="http://www.pointbase.com/products/downloads/">Pointbase</a></li>
+  <li><a href="http://www.progress.com/esd/index.ssp">Progress</a></li>
+  <li><a href="http://www.microsoft.com/technet/prodtechnol/sql/2005/downloads/jdbc.mspx">Microsoft SQL Server</a></li>
+</ul>
\ No newline at end of file

Propchange: geronimo/trunk/applications/console/console-standard/src/webapp/WEB-INF/view/dbwizard/selectDownload.jsp
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/trunk/applications/console/console-standard/src/webapp/WEB-INF/view/dbwizard/selectDownload.jsp
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Propchange: geronimo/trunk/applications/console/console-standard/src/webapp/WEB-INF/view/dbwizard/selectDownload.jsp
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Added: geronimo/trunk/applications/console/console-standard/src/webapp/WEB-INF/view/dbwizard/showPlan.jsp
URL: http://svn.apache.org/viewcvs/geronimo/trunk/applications/console/console-standard/src/webapp/WEB-INF/view/dbwizard/showPlan.jsp?rev=393787&view=auto
==============================================================================
--- geronimo/trunk/applications/console/console-standard/src/webapp/WEB-INF/view/dbwizard/showPlan.jsp (added)
+++ geronimo/trunk/applications/console/console-standard/src/webapp/WEB-INF/view/dbwizard/showPlan.jsp Thu Apr 13 04:34:08 2006
@@ -0,0 +1,91 @@
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
+<%@ taglib uri="http://java.sun.com/portlet" prefix="portlet"%>
+<portlet:defineObjects/>
+
+<p><b>Create Database Pool</b> -- Show Deployment Plan</p>
+
+<!--   FORM TO COLLECT DATA FOR THIS PAGE   -->
+<form name="<portlet:namespace/>DatabaseForm" action="<portlet:actionURL/>" method="POST">
+    <input type="hidden" name="mode" value="save" />
+    <input type="hidden" name="user" value="${pool.user}" />
+    <input type="hidden" name="name" value="${pool.name}" />
+    <input type="hidden" name="dbtype" value="${pool.dbtype}" />
+    <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="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}" />
+    <input type="hidden" name="minSize" value="${pool.minSize}" />
+    <input type="hidden" name="maxSize" value="${pool.maxSize}" />
+    <input type="hidden" name="idleTimeout" value="${pool.idleTimeout}" />
+    <input type="hidden" name="blockingTimeout" value="${pool.blockingTimeout}" />
+    <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}">
+    <input type="hidden" name="${prop.key}" value="${prop.value}" />
+  </c:forEach>
+  <c:forEach var="prop" items="${pool.urlProperties}">
+    <input type="hidden" name="${prop.key}" value="${prop.value}" />
+  </c:forEach>
+    <table border="0">
+    <!-- STATUS FIELD: Deployment Plan -->
+      <tr>
+        <th valign="top" style="min-width: 140px"><div align="right">Deployment Plan:</div></th>
+        <td><textarea rows="30" cols="60" readonly>${deploymentPlan}</textarea></td>
+      </tr>
+    <!-- SUBMIT BUTTON -->
+      <tr>
+        <td></td>
+        <td>
+<input type="submit" value="Deploy Pool" />
+<input type="button" value="Edit Settings" onclick="document.<portlet:namespace/>DatabaseForm.mode.value='edit';document.<portlet:namespace/>DatabaseForm.submit();return false;" />
+        </td>
+      </tr>
+    <!-- STATUS FIELD: Command-line guidance -->
+      <tr>
+        <th valign="top"><div align="right">Deploy Command:</div></th>
+        <td>To deploy a database pool from the command line using this plan,
+          copy and paste it to a file (say, <tt>plan-file.xml</tt>) and save
+          it.  Then run a command like:<br />
+<pre>
+cd GERONIMO_HOME
+java -jar bin/deployer.jar deploy plan-file.xml \
+        ${rarRelativePath}
+</pre></td>
+      </tr>
+    <!-- STATUS FIELD: Embed in EAR guidance -->
+      <tr>
+        <th valign="top"><div align="right">Add to EAR:</div></th>
+        <td>Instead of deploying as a top-level database pool, you
+          can deploy this pool as part of an EAR.  To add a database
+          pool to an EAR using this plan:
+<ol>
+  <li>Copy and paste the plan to a file</li>
+  <li>Save the plan file to the top level of your EAR</li>
+  <li>Copy the RAR file from <tt>GERONIMO_HOME/${rarRelativePath}</tt>
+    to the top level of your EAR</li>
+  <li>Create a <tt>META-INF/geronimo-application.xml</tt> file in your EAR
+    that has a <tt>module</tt> entry like this (substituting the correct
+    RAR file name and plan file name):</li>
+</ol>
+<pre>
+&lt;application
+   xmlns="http://geronimo.apache.org/xml/ns/j2ee/application-1.0"
+   configId="MyApplication"&gt;
+  &lt;module&gt;
+    &lt;connector&gt;rar-file-name.rar&lt;/connector&gt;
+    &lt;alt-dd&gt;plan-file-name.xml&lt;/alt-dd&gt;
+  &lt;/module&gt;
+&lt;/application&gt;
+</pre></td>
+      </tr>
+    </table>
+</form>
+<!--   END OF FORM TO COLLECT DATA FOR THIS PAGE   -->
+
+<p><a href="<portlet:actionURL portletMode="view">
+              <portlet:param name="mode" value="list" />
+            </portlet:actionURL>">Cancel</a></p>

Propchange: geronimo/trunk/applications/console/console-standard/src/webapp/WEB-INF/view/dbwizard/showPlan.jsp
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/trunk/applications/console/console-standard/src/webapp/WEB-INF/view/dbwizard/showPlan.jsp
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Propchange: geronimo/trunk/applications/console/console-standard/src/webapp/WEB-INF/view/dbwizard/showPlan.jsp
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Added: geronimo/trunk/applications/console/console-standard/src/webapp/WEB-INF/view/dbwizard/testConnection.jsp
URL: http://svn.apache.org/viewcvs/geronimo/trunk/applications/console/console-standard/src/webapp/WEB-INF/view/dbwizard/testConnection.jsp?rev=393787&view=auto
==============================================================================
--- geronimo/trunk/applications/console/console-standard/src/webapp/WEB-INF/view/dbwizard/testConnection.jsp (added)
+++ geronimo/trunk/applications/console/console-standard/src/webapp/WEB-INF/view/dbwizard/testConnection.jsp Thu Apr 13 04:34:08 2006
@@ -0,0 +1,76 @@
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
+<%@ taglib uri="http://java.sun.com/portlet" prefix="portlet"%>
+<portlet:defineObjects/>
+
+<p><b>Create Database Pool</b> -- Step 4: Test Connection</p>
+
+<!--   FORM TO COLLECT DATA FOR THIS PAGE   -->
+<form name="<portlet:namespace/>DatabaseForm" action="<portlet:actionURL/>" method="POST">
+    <input type="hidden" name="mode" value="save" />
+    <input type="hidden" name="user" value="${pool.user}" />
+    <input type="hidden" name="name" value="${pool.name}" />
+    <input type="hidden" name="dbtype" value="${pool.dbtype}" />
+    <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="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}" />
+    <input type="hidden" name="minSize" value="${pool.minSize}" />
+    <input type="hidden" name="maxSize" value="${pool.maxSize}" />
+    <input type="hidden" name="idleTimeout" value="${pool.idleTimeout}" />
+    <input type="hidden" name="blockingTimeout" value="${pool.blockingTimeout}" />
+    <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}">
+    <input type="hidden" name="${prop.key}" value="${prop.value}" />
+  </c:forEach>
+  <c:forEach var="prop" items="${pool.urlProperties}">
+    <input type="hidden" name="${prop.key}" value="${prop.value}" />
+  </c:forEach>
+    <table border="0">
+    <!-- STATUS FIELD: Conection Result -->
+      <tr>
+        <th style="min-width: 140px"><div align="right">Test Result:</div></th>
+        <td>
+          <c:choose>
+            <c:when test="${empty connectResult}">
+              <font color="red"><i>Connection Error (see below)</i></font>
+            </c:when><c:otherwise>
+              Connected to ${connectResult}
+            </c:otherwise>
+          </c:choose>
+        </td>
+      </tr>
+    <!-- STATUS FIELD: Connection Errors -->
+    <c:if test="${!(empty connectError)}">
+      <tr>
+        <th><div align="right">Test Error:</div></th>
+        <td><textarea rows="30" cols="60" readonly>${connectError}</textarea></td>
+      </tr>
+    </c:if>
+    <!-- SUBMIT BUTTON -->
+      <tr>
+        <td></td>
+        <td>
+          <c:choose>
+            <c:when test="${empty connectResult}">
+<input type="submit" value="Deploy Anyway" />
+<input type="button" value="Edit Settings" onclick="document.<portlet:namespace/>DatabaseForm.mode.value='edit';document.<portlet:namespace/>DatabaseForm.submit();return false;" />
+<input type="button" value="Test Again" onclick="document.<portlet:namespace/>DatabaseForm.mode.value='process-url';document.<portlet:namespace/>DatabaseForm.submit();return false;" />
+            </c:when><c:otherwise>
+<input type="submit" value="Deploy" />
+<input type="button" value="Show Plan" onclick="document.<portlet:namespace/>DatabaseForm.mode.value='plan';document.<portlet:namespace/>DatabaseForm.submit();return false;" />
+            </c:otherwise>
+          </c:choose>
+        </td>
+      </tr>
+    </table>
+</form>
+<!--   END OF FORM TO COLLECT DATA FOR THIS PAGE   -->
+
+<p><a href="<portlet:actionURL portletMode="view">
+              <portlet:param name="mode" value="list" />
+            </portlet:actionURL>">Cancel</a></p>

Propchange: geronimo/trunk/applications/console/console-standard/src/webapp/WEB-INF/view/dbwizard/testConnection.jsp
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/trunk/applications/console/console-standard/src/webapp/WEB-INF/view/dbwizard/testConnection.jsp
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Propchange: geronimo/trunk/applications/console/console-standard/src/webapp/WEB-INF/view/dbwizard/testConnection.jsp
------------------------------------------------------------------------------
    svn:mime-type = text/plain



Mime
View raw message