You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by xu...@apache.org on 2009/03/13 09:21:06 UTC
svn commit: r753156 [6/6] - in /geronimo/server/trunk/plugins:
activemq/activemq-portlets/src/main/resources/
activemq/activemq-portlets/src/main/webapp/WEB-INF/
activemq/activemq-portlets/src/main/webapp/WEB-INF/view/jmsmanager/server/
activemq/active...
Modified: geronimo/server/trunk/plugins/system-database/sysdb-portlets/src/main/webapp/WEB-INF/view/dbwizard/importStatus.jsp
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/system-database/sysdb-portlets/src/main/webapp/WEB-INF/view/dbwizard/importStatus.jsp?rev=753156&r1=753155&r2=753156&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/system-database/sysdb-portlets/src/main/webapp/WEB-INF/view/dbwizard/importStatus.jsp (original)
+++ geronimo/server/trunk/plugins/system-database/sysdb-portlets/src/main/webapp/WEB-INF/view/dbwizard/importStatus.jsp Fri Mar 13 08:21:04 2009
@@ -17,16 +17,16 @@
<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
<%@ taglib uri="http://java.sun.com/portlet" prefix="portlet"%>
<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt"%>
+<%@ taglib uri="/WEB-INF/CommonMsg.tld" prefix="CommonMsg" %>
<fmt:setBundle basename="systemdatabase"/>
<portlet:defineObjects/>
+<CommonMsg:commonMsg/>
+
<p><fmt:message key="dbwizard.importStatus.title"/></p>
<p><fmt:message key="dbwizard.importStatus.summary"/></p>
-<c:choose>
- <c:when test="${empty(status.pools)}"><p><i><fmt:message key="dbwizard.importStatus.importFailed"/></i></p></c:when>
- <c:otherwise>
<table width="100%">
<tr>
<td class="DarkBackground"><fmt:message key="dbwizard.importStatus.originalJNDI"/></td>
@@ -61,8 +61,6 @@
</td>
</tr>
</table>
- </c:otherwise>
-</c:choose>
<hr />
@@ -72,12 +70,3 @@
<li>${pool.name}</li>
</c:forEach>
</ul>
-
-<hr />
-
-<p><fmt:message key="dbwizard.importStatus.importMessages"/>:</p>
-<ul>
-<c:forEach var="message" items="${status.original.messages}">
- <li>${message}</li>
-</c:forEach>
-</ul>
Modified: geronimo/server/trunk/plugins/system-database/sysdb-portlets/src/main/webapp/WEB-INF/view/dbwizard/list.jsp
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/system-database/sysdb-portlets/src/main/webapp/WEB-INF/view/dbwizard/list.jsp?rev=753156&r1=753155&r2=753156&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/system-database/sysdb-portlets/src/main/webapp/WEB-INF/view/dbwizard/list.jsp (original)
+++ geronimo/server/trunk/plugins/system-database/sysdb-portlets/src/main/webapp/WEB-INF/view/dbwizard/list.jsp Fri Mar 13 08:21:04 2009
@@ -22,9 +22,6 @@
<p><fmt:message key="dbwizard.list.summary"/></p>
-<c:choose>
- <c:when test="${empty(pools)}"><p><i><fmt:message key="dbwizard.list.noDatabasePools"/></i></p></c:when>
- <c:otherwise>
<p><fmt:message key="dbwizard.list.hasDatabasePools"/></p>
<table width="100%" class="TableLine" summary="Database Pools - List">
@@ -96,8 +93,6 @@
</tr>
</c:forEach>
</table>
- </c:otherwise>
-</c:choose>
<p><fmt:message key="dbwizard.list.createPool"/>:</p>
<ul>
Modified: geronimo/server/trunk/plugins/system-database/sysdb-portlets/src/main/webapp/WEB-INF/view/dbwizard/selectDatabase.jsp
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/system-database/sysdb-portlets/src/main/webapp/WEB-INF/view/dbwizard/selectDatabase.jsp?rev=753156&r1=753155&r2=753156&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/system-database/sysdb-portlets/src/main/webapp/WEB-INF/view/dbwizard/selectDatabase.jsp (original)
+++ geronimo/server/trunk/plugins/system-database/sysdb-portlets/src/main/webapp/WEB-INF/view/dbwizard/selectDatabase.jsp Fri Mar 13 08:21:04 2009
@@ -28,12 +28,16 @@
var <portlet:namespace/>formName = "<portlet:namespace/>DatabaseForm";
var <portlet:namespace/>requiredFields = new Array("name");
function <portlet:namespace/>validateForm(){
- if(!textElementsNotEmpty(<portlet:namespace/>formName,<portlet:namespace/>requiredFields))
+ if(!textElementsNotEmpty(<portlet:namespace/>formName,<portlet:namespace/>requiredFields)) {
+ addErrorMessage("<portlet:namespace/>", '<fmt:message key="dbwizard.common.emptyText"/>');
return false;
+ }
return true;
}
</script>
+<div id="<portlet:namespace/>CommonMsgContainer"></div>
+
<p><fmt:message key="dbwizard.selectDatabase.title"/></p>
<!-- FORM TO COLLECT DATA FOR THIS PAGE -->
Modified: geronimo/server/trunk/plugins/system-database/sysdb-portlets/src/main/webapp/WEB-INF/view/dbwizard/testConnection.jsp
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/system-database/sysdb-portlets/src/main/webapp/WEB-INF/view/dbwizard/testConnection.jsp?rev=753156&r1=753155&r2=753156&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/system-database/sysdb-portlets/src/main/webapp/WEB-INF/view/dbwizard/testConnection.jsp (original)
+++ geronimo/server/trunk/plugins/system-database/sysdb-portlets/src/main/webapp/WEB-INF/view/dbwizard/testConnection.jsp Fri Mar 13 08:21:04 2009
@@ -17,10 +17,13 @@
<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
<%@ taglib uri="http://java.sun.com/portlet" prefix="portlet"%>
<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt"%>
+<%@ taglib uri="/WEB-INF/CommonMsg.tld" prefix="CommonMsg" %>
<fmt:setBundle basename="systemdatabase"/>
<portlet:defineObjects/>
-<p><b><fmt:message key="dbwizard.testConnection.title"/></p>
+<CommonMsg:commonMsg/>
+
+<p><fmt:message key="dbwizard.testConnection.title"/></p>
<!-- FORM TO COLLECT DATA FOR THIS PAGE -->
<form name="<portlet:namespace/>DatabaseForm" action="<portlet:actionURL/>" method="POST">
@@ -50,26 +53,6 @@
<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"><fmt:message key="dbwizard.testConnection.testResult"/>:</div></th>
- <td>
- <c:choose>
- <c:when test="${empty connectResult}">
- <font color="red"><i><fmt:message key="dbwizard.testConnection.connectionError"/></i></font>
- </c:when><c:otherwise>
- <fmt:message key="dbwizard.testConnection.connectedTo"/> ${connectResult}
- </c:otherwise>
- </c:choose>
- </td>
- </tr>
- <!-- STATUS FIELD: Connection Errors -->
- <c:if test="${!(empty connectError)}">
- <tr>
- <th><div align="right"><label for="<portlet:namespace/>connectError"><fmt:message key="dbwizard.testConnection.testError"/></label>:</div></th>
- <td><textarea rows="30" cols="60" id="<portlet:namespace/>connectError" readonly>${connectError}</textarea></td>
- </tr>
- </c:if>
<!-- SUBMIT BUTTON -->
<tr>
<td></td>
Modified: geronimo/server/trunk/plugins/system-database/sysdb-portlets/src/main/webapp/WEB-INF/view/derbylogmanager/view.jsp
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/system-database/sysdb-portlets/src/main/webapp/WEB-INF/view/derbylogmanager/view.jsp?rev=753156&r1=753155&r2=753156&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/system-database/sysdb-portlets/src/main/webapp/WEB-INF/view/derbylogmanager/view.jsp (original)
+++ geronimo/server/trunk/plugins/system-database/sysdb-portlets/src/main/webapp/WEB-INF/view/derbylogmanager/view.jsp Fri Mar 13 08:21:04 2009
@@ -20,6 +20,22 @@
<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt"%>
<fmt:setBundle basename="systemdatabase"/>
+<script language="JavaScript">
+var <portlet:namespace/>formName = "<portlet:namespace/>searchForm";
+var <portlet:namespace/>integerFields = new Array("startPos", "endPos", "maxRows");
+function <portlet:namespace/>validateForm(){
+ for (i in <portlet:namespace/>integerFields) {
+ if("" != document.forms[<portlet:namespace/>formName].elements[<portlet:namespace/>integerFields[i]].value && !checkIntegral(<portlet:namespace/>formName,<portlet:namespace/>integerFields[i])) {
+ addErrorMessage("<portlet:namespace/>", '<fmt:message key="derbylogmanager.view.integer"/>');
+ return false;
+ }
+ }
+ return true;
+}
+</script>
+
+<div id="<portlet:namespace/>CommonMsgContainer"></div><br>
+
<table>
<tr>
<td><button onclick="location='<portlet:renderURL><portlet:param name="action" value="refresh"/></portlet:renderURL>'"><fmt:message key="derbylogmanager.view.refresh"/></button>
@@ -29,7 +45,7 @@
</tr>
<tr>
<td class="Smaller" valign="middle">
- <form action="<portlet:actionURL/>" name="<portlet:namespace/>searchForm" method="POST">
+ <form action="<portlet:actionURL/>" name="<portlet:namespace/>searchForm" method="POST" onsubmit="return <portlet:namespace/>validateForm();">
<b><fmt:message key="derbylogmanager.view.filterResults"/>:</b>
<input type="hidden" value="search" name="action"/>
<br/>
Modified: geronimo/server/trunk/plugins/system-database/sysdb-portlets/src/main/webapp/WEB-INF/view/internaldb/runSQLNormal.jsp
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/system-database/sysdb-portlets/src/main/webapp/WEB-INF/view/internaldb/runSQLNormal.jsp?rev=753156&r1=753155&r2=753156&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/system-database/sysdb-portlets/src/main/webapp/WEB-INF/view/internaldb/runSQLNormal.jsp (original)
+++ geronimo/server/trunk/plugins/system-database/sysdb-portlets/src/main/webapp/WEB-INF/view/internaldb/runSQLNormal.jsp Fri Mar 13 08:21:04 2009
@@ -31,7 +31,13 @@
function <portlet:namespace/>validateForm1(){
var action = document.forms[<portlet:namespace/>formName].elements['action'];
action.value="Create";
- return textElementsNotEmpty(<portlet:namespace/>formName, <portlet:namespace/>requiredFields);
+ var valid = textElementsNotEmpty(<portlet:namespace/>formName, <portlet:namespace/>requiredFields);
+ if (!valid) {
+ addErrorMessage("<portlet:namespace/>", '<fmt:message key="internaldb.common.emptyText"/>');
+ return false;
+ }
+ else
+ return true;
}
function <portlet:namespace/>validateForm2(){
var action = document.forms[<portlet:namespace/>formName].elements['action'];
@@ -41,11 +47,11 @@
function <portlet:namespace/>validateForm3(){
var action = document.forms[<portlet:namespace/>formName].elements['action'];
action.value="Run SQL";
- return textElementsNotEmpty(<portlet:namespace/>formName, <portlet:namespace/>requiredFields2);
+ return true;
}
</script>
-<CommonMsg:commonMsg/><br>
+<CommonMsg:commonMsg/><div id="<portlet:namespace/>CommonMsgContainer"></div><br>
<form name="<portlet:namespace/>DBForm" action="<portlet:actionURL portletMode='view'/>" method="post">
<input type="hidden" name="action" value="" />