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 [2/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/console/console-base-portlets/src/main/webapp/WEB-INF/view/configmanager/normal.jsp
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/configmanager/normal.jsp?rev=753156&r1=753155&r2=753156&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/configmanager/normal.jsp (original)
+++ geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/configmanager/normal.jsp Fri Mar 13 08:21:04 2009
@@ -21,6 +21,8 @@
<fmt:setBundle basename="consolebase"/>
<portlet:defineObjects/>
+<CommonMsg:confirmMsg/>
+
<script>
var EXPERT_COOKIE = "org.apache.geronimo.configmanager.expertmode";
var SHOW_DEPENDENCIES_COOKIE = "org.apache.geronimo.configmanager.showDependencies";
@@ -31,29 +33,18 @@
// that depend on them (like the console itself) from functioning properly.
// If the component is not safe to stop then prompt to make sure that
// the user really intends to stop the component prior to any action.
-function promptIfUnsafeToStop(configId,expertConfig, type) {
+function promptIfUnsafeToStop(target, configId, expertConfig, type) {
// if the component is a Geronimo "expert" service then provide a stern warning
if ((type == 'SERVICE') && (expertConfig == 'true')) {
- return confirm( configId + " is an Apache Geronimo service.\r\n \r\n" +
- "Stopping this component may prevent the server or the "+
- "administration console from functioning properly. " +
- "All dependent components and subsequent dependencies will also be stopped. " +
- "Reference the 'Child Components' list in the view for directly affected components.\r\n \r\n" +
- "Proceed with this action?");
+ return showConfirmMessage(target, configId + '<fmt:message key="configmanager.normal.confirmMsg01"/>', '<fmt:message key="configmanager.normal.ok"/>', '<fmt:message key="configmanager.normal.cancel"/>');
}
// if the component is the web console provide an appropriate warning
- if (configId.indexOf("org.apache.geronimo.configs/webconsole-") == 0) {
- return confirm( configId + " provides the administration console interface " +
- "that you are currently viewing.\r\n \r\n Stopping it will cause the interface " +
- "to become unavailable and manual action will be required to restore the function.\r\n \r\n" +
- "Proceed with this action?");
+ if (configId.indexOf("org.apache.geronimo.plugins") == 0 && configId.indexOf("console") > 0) {
+ return showConfirmMessage(target, configId + '<fmt:message key="configmanager.normal.confirmMsg02"/>', '<fmt:message key="configmanager.normal.ok"/>', '<fmt:message key="configmanager.normal.cancel"/>');
}
// if the component is any other Geronimo "expert" component provide an appropriate warning
if (expertConfig == 'true') {
- return confirm( configId + " is provided by Apache Geronimo and may be required by other " +
- "modules (reference the 'Child Components' listed in the view).\r\n \r\n " +
- "All dependent components and subsequent dependencies will also be stopped. \r\n \r\n" +
- "Proceed with this action?");
+ return showConfirmMessage(target, configId + '<fmt:message key="configmanager.normal.confirmMsg03"/>', '<fmt:message key="configmanager.normal.ok"/>', '<fmt:message key="configmanager.normal.cancel"/>');
}
// otherwise don't challenge the stop operation
return true;
@@ -66,30 +57,18 @@
// that depend on them (like the console itself) from functioning properly.
// If the component is not safe to stop then prompt to make sure that
// the user really intends to stop the component prior to any action.
-function promptIfUnsafeToRestart(configId,expertConfig, type) {
+function promptIfUnsafeToRestart(target, configId, expertConfig, type) {
// if the component is a Geronimo "expert" service then provide a stern warning
if ((type == 'SERVICE') && (expertConfig == 'true')) {
- return confirm( configId + " is an Apache Geronimo service.\r\n \r\n " +
- "Restarting this component may prevent the server or the "+
- "administration console from functioning properly. " +
- "As part of the stop action, all dependent components and subsequent dependencies will also be stopped. " +
- "Only this component will be restarted. " +
- "Reference the 'Child Components' list in the view for directly affected components.\r\n \r\n " +
- "Proceed with this action?");
+ return showConfirmMessage(target, configId + '<fmt:message key="configmanager.normal.confirmMsg04"/>', '<fmt:message key="configmanager.normal.ok"/>', '<fmt:message key="configmanager.normal.cancel"/>');
}
// if the component is the web console provide an appropriate warning
- if (configId.indexOf("org.apache.geronimo.configs/webconsole-") == 0) {
- return confirm( configId + " provides the administration console interface " +
- "that you are currently viewing.\r\n \r\n Restarting it will cause the interface " +
- "to become unavailable and manual action may be necessary to restore the console function.\r\n \r\n" +
- "Proceed with this action?");
+ if (configId.indexOf("org.apache.geronimo.plugins") == 0 && configId.indexOf("console") > 0) {
+ return showConfirmMessage(target, configId + '<fmt:message key="configmanager.normal.confirmMsg05"/>', '<fmt:message key="configmanager.normal.ok"/>', '<fmt:message key="configmanager.normal.cancel"/>');
}
// if the component is a Geronimo "expert" component then provide an appropriate warning
if (expertConfig == 'true') {
- return confirm( configId + " is provided by Apache Geronimo and may be required by other " +
- "modules (reference the 'Child Components' listed in the view).\r\n \r\n " +
- "As part of the stop action, all dependent components and subsequent dependencies will also be stopped. \r\n \r\n" +
- "Proceed with this action?");
+ return showConfirmMessage(target, configId + '<fmt:message key="configmanager.normal.confirmMsg06"/>', '<fmt:message key="configmanager.normal.ok"/>', '<fmt:message key="configmanager.normal.cancel"/>');
}
// otherwise don't challenge the restart operation
return true;
@@ -102,31 +81,21 @@
// dependencies of the web console or dependencies of other core server
// modules. In such cases. it may leave the server in a state where it
// cannot be restarted. These situations require more stringent warnings.
-function uninstallPrompt(configId,expertConfig, type) {
+function uninstallPrompt(target, configId, expertConfig, type) {
// if the component is a geronimo "expert" service always provide the most stern warning
if ((type == 'SERVICE') && (expertConfig == 'true')) {
- return confirm( configId + " is an Apache Geronimo service.\r\n \r\n" +
- "Uninstalling this component may have unexpected results "+
- "such as rendering the administration web console or even the "+
- "server itself unstable. Reference the 'Child Components' view " +
- "for directly affected components. \r\n \r\n" +
- "Are you certain you wish to proceed with this uninstall?");
+ return showConfirmMessage(target, configId + '<fmt:message key="configmanager.normal.confirmMsg07"/>', '<fmt:message key="configmanager.normal.ok"/>', '<fmt:message key="configmanager.normal.cancel"/>');
}
// if the component is a the web console itself then provide an appropriate warning
- if (configId.indexOf("org.apache.geronimo.configs/webconsole-") == 0) {
- return confirm( configId + " provides the administration console user interface " +
- "that you are currently viewing.\r\n \r\n Uninstalling it will cause the interface " +
- "to become unavailable and manual action will be required to restore the function.\r\n \r\n " +
- "Are you certain you wish to proceed with this uninstall?");
+ if (configId.indexOf("org.apache.geronimo.plugins") == 0 && configId.indexOf("console") > 0) {
+ return showConfirmMessage(target, configId + '<fmt:message key="configmanager.normal.confirmMsg08"/>', '<fmt:message key="configmanager.normal.ok"/>', '<fmt:message key="configmanager.normal.cancel"/>');
}
// if the component is any other Apache Geronimo "expert" component then provide an appropriate warning
if (expertConfig == 'true') {
- return confirm( configId + " is provided by Apache Geronimo and may be required by other " +
- "modules (reference the 'Child Components' listed in the view). \r\n \r\n" +
- "Are you certain you wish to proceed with this uninstall?");
+ return showConfirmMessage(target, configId + '<fmt:message key="configmanager.normal.confirmMsg09"/>', '<fmt:message key="configmanager.normal.ok"/>', '<fmt:message key="configmanager.normal.cancel"/>');
}
// if the component is none of the above provide a standard warning
- return confirm("Are you certain you wish to uninstall " + configId + " ?");
+ return showConfirmMessage(target, '<fmt:message key="configmanager.normal.confirmMsg10"/>' + configId + '?', '<fmt:message key="configmanager.normal.ok"/>', '<fmt:message key="configmanager.normal.cancel"/>');
}
// Toggle expert mode on and off with onClick
@@ -278,7 +247,7 @@
<td width="75" class="${backgroundClass}">
<c:if test="${moduleDetails.state.running || moduleDetails.state.failed}">
<span <c:if test="${moduleDetails.expertConfig}"> name=expert </c:if>>
- <a href="<portlet:actionURL><portlet:param name='configId' value='${moduleDetails.configId}'/><portlet:param name='action' value='stop'/></portlet:actionURL>" onClick="return promptIfUnsafeToStop('${moduleDetails.configId}','${moduleDetails.expertConfig}','${moduleDetails.type.name}');"><fmt:message key="consolebase.common.stop"/></a>
+ <a href="<portlet:actionURL><portlet:param name='configId' value='${moduleDetails.configId}'/><portlet:param name='action' value='stop'/></portlet:actionURL>" onClick="return promptIfUnsafeToStop(this, '${moduleDetails.configId}','${moduleDetails.expertConfig}','${moduleDetails.type.name}');"><fmt:message key="consolebase.common.stop"/></a>
</span>
</c:if>
<c:if test="${moduleDetails.expertConfig && (moduleDetails.state.running || moduleDetails.state.failed)}">
@@ -295,7 +264,7 @@
<td width="75" class="${backgroundClass}">
<c:if test="${moduleDetails.state.running}">
<span <c:if test="${moduleDetails.expertConfig}"> name=expert </c:if>>
- <a href="<portlet:actionURL><portlet:param name='configId' value='${moduleDetails.configId}'/><portlet:param name='action' value='restart'/></portlet:actionURL>" onClick="return promptIfUnsafeToRestart('${moduleDetails.configId}','${moduleDetails.expertConfig}','${moduleDetails.type.name}');"><fmt:message key="consolebase.common.restart"/></a>
+ <a href="<portlet:actionURL><portlet:param name='configId' value='${moduleDetails.configId}'/><portlet:param name='action' value='restart'/></portlet:actionURL>" onClick="return promptIfUnsafeToRestart(this, '${moduleDetails.configId}','${moduleDetails.expertConfig}','${moduleDetails.type.name}');"><fmt:message key="consolebase.common.restart"/></a>
</span>
</c:if>
<c:if test="${moduleDetails.expertConfig && moduleDetails.state.running}">
@@ -308,7 +277,7 @@
<!-- Uninstall action -->
<td width="75" class="${backgroundClass}">
<span <c:if test="${moduleDetails.expertConfig}"> name=expert </c:if>>
- <a href="<portlet:actionURL><portlet:param name='configId' value='${moduleDetails.configId}'/><portlet:param name='action' value='uninstall'/></portlet:actionURL>" onClick="return uninstallPrompt('${moduleDetails.configId}','${moduleDetails.expertConfig}','${moduleDetails.type.name}');"><fmt:message key="consolebase.common.uninstall"/></a>
+ <a href="<portlet:actionURL><portlet:param name='configId' value='${moduleDetails.configId}'/><portlet:param name='action' value='uninstall'/></portlet:actionURL>" onClick="return uninstallPrompt(this, '${moduleDetails.configId}','${moduleDetails.expertConfig}','${moduleDetails.type.name}');"><fmt:message key="consolebase.common.uninstall"/></a>
</span>
<c:if test="${moduleDetails.expertConfig}">
<span name=nonexpert>
Modified: geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/keystore/changePassword.jsp
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/keystore/changePassword.jsp?rev=753156&r1=753155&r2=753156&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/keystore/changePassword.jsp (original)
+++ geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/keystore/changePassword.jsp Fri Mar 13 08:21:04 2009
@@ -29,16 +29,21 @@
var <portlet:namespace/>requiredFields = new Array("password", "newPassword");
var <portlet:namespace/>passwordFields = new Array("newPassword");
function <portlet:namespace/>validateForm(){
- if(!textElementsNotEmpty(<portlet:namespace/>formName,<portlet:namespace/>requiredFields))
- return false;
+ if(!textElementsNotEmpty(<portlet:namespace/>formName,<portlet:namespace/>requiredFields)) {
+ addErrorMessage("<portlet:namespace/>", '<fmt:message key="keystore.common.emptyText"/>');
+ return false;
+ }
if(!passwordElementsConfirm(<portlet:namespace/>formName, <portlet:namespace/>passwordFields)) {
+ addErrorMessage("<portlet:namespace/>", '<fmt:message key="keystore.common.passwordMismatch"/>');
return false;
}
return true;
}
</script>
-<jsp:include page="_header.jsp" /><br>
+<jsp:include page="_header.jsp" />
+
+<div id="<portlet:namespace/>CommonMsgContainer"></div><br>
<c:choose>
<c:when test="${!empty(alias)}">
Modified: geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/keystore/configureKey.jsp
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/keystore/configureKey.jsp?rev=753156&r1=753155&r2=753156&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/keystore/configureKey.jsp (original)
+++ geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/keystore/configureKey.jsp Fri Mar 13 08:21:04 2009
@@ -26,23 +26,31 @@
<script language="JavaScript">
var <portlet:namespace/>formName = "<portlet:namespace/>KeystoreForm";
-var <portlet:namespace/>requiredFields = new Array("alias", "password", "certCN", "certO", "certOU", "certL", "certST", "certC");
-var <portlet:namespace/>numericFields = new Array("valid");
+var <portlet:namespace/>requiredFields = new Array("alias", "password", "valid", "certCN", "certO", "certOU", "certL", "certST", "certC");
+var <portlet:namespace/>integerFields = new Array("valid");
var <portlet:namespace/>passwordFields = new Array("password");
function <portlet:namespace/>validateForm(){
- if(!textElementsNotEmpty(<portlet:namespace/>formName,<portlet:namespace/>requiredFields))
- return false;
- for(i in <portlet:namespace/>numericFields) {
- if(!checkIntegral(<portlet:namespace/>formName, <portlet:namespace/>numericFields[i]))
- return false;
+ if(!textElementsNotEmpty(<portlet:namespace/>formName,<portlet:namespace/>requiredFields)) {
+ addErrorMessage("<portlet:namespace/>", '<fmt:message key="keystore.common.emptyText"/>');
+ return false;
}
if(!passwordElementsConfirm(<portlet:namespace/>formName, <portlet:namespace/>passwordFields)) {
+ addErrorMessage("<portlet:namespace/>", '<fmt:message key="keystore.common.passwordMismatch"/>');
return false;
}
+ for(i in <portlet:namespace/>integerFields) {
+ if(!checkIntegral(<portlet:namespace/>formName, <portlet:namespace/>integerFields[i])) {
+ addErrorMessage("<portlet:namespace/>", '<fmt:message key="keystore.common.integer"/>');
+ return false;
+ }
+ }
+
return true;
}
</script>
+<div id="<portlet:namespace/>CommonMsgContainer"></div>
+
<p><fmt:message key="keystore.configureKey.title"/></p>
<form name="<portlet:namespace/>KeystoreForm" action="<portlet:actionURL/>" method="POST">
Modified: geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/keystore/createKeystore.jsp
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/keystore/createKeystore.jsp?rev=753156&r1=753155&r2=753156&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/keystore/createKeystore.jsp (original)
+++ geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/keystore/createKeystore.jsp Fri Mar 13 08:21:04 2009
@@ -30,15 +30,19 @@
var <portlet:namespace/>passwordFields = new Array("password");
function <portlet:namespace/>validateForm(){
if(!textElementsNotEmpty(<portlet:namespace/>formName, <portlet:namespace/>requiredFields)) {
+ addErrorMessage("<portlet:namespace/>", '<fmt:message key="keystore.common.emptyText"/>');
return false;
}
if(!passwordElementsConfirm(<portlet:namespace/>formName, <portlet:namespace/>passwordFields)) {
+ addErrorMessage("<portlet:namespace/>", '<fmt:message key="keystore.common.passwordMismatch"/>');
return false;
}
return true;
}
</script>
+<div id="<portlet:namespace/>CommonMsgContainer"></div><br>
+
<form name="<portlet:namespace/>KeystoreForm" action="<portlet:actionURL/>" method="POST">
<input type="hidden" name="mode" value="createKeystore-after" />
<table border="0">
Modified: geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/keystore/uploadCertificate.jsp
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/keystore/uploadCertificate.jsp?rev=753156&r1=753155&r2=753156&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/keystore/uploadCertificate.jsp (original)
+++ geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/keystore/uploadCertificate.jsp Fri Mar 13 08:21:04 2009
@@ -25,7 +25,12 @@
var <portlet:namespace/>formName = "<portlet:namespace/>KeystoreForm";
var <portlet:namespace/>requiredFields = new Array("certificate", "alias");
function <portlet:namespace/>validateForm(){
- return textElementsNotEmpty(<portlet:namespace/>formName,<portlet:namespace/>requiredFields);
+ if(!textElementsNotEmpty(<portlet:namespace/>formName, <portlet:namespace/>requiredFields)) {
+ addErrorMessage("<portlet:namespace/>", '<fmt:message key="keystore.common.emptyText"/>');
+ return false;
+ }
+
+ return true;
}
</script>
@@ -34,6 +39,9 @@
certificate file and specify an alias to store it under in the keystore. The next
step will be to review the certificate before committing it to the keystore.</p>
-->
+
+<div id="<portlet:namespace/>CommonMsgContainer"></div>
+
<p><fmt:message key="keystore.uploadCertificate.title"/></p>
<form enctype="multipart/form-data" method="POST" name="<portlet:namespace/>KeystoreForm" action="<portlet:actionURL/>">
Modified: geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/logmanager/search.jsp
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/logmanager/search.jsp?rev=753156&r1=753155&r2=753156&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/logmanager/search.jsp (original)
+++ geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/logmanager/search.jsp Fri Mar 13 08:21:04 2009
@@ -21,6 +21,18 @@
<fmt:setBundle basename="consolebase"/>
<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="logmanager.common.integer"/>');
+ return false;
+ }
+ }
+ return true;
+}
+
var numbers = new Array(0,1,2,3,4,5,6,7,8,9);
var max = ${lineCount};
function <portlet:namespace/>binarySearch(criteria, arr, left, right){
@@ -34,39 +46,10 @@
function <portlet:namespace/>search(criteria, arr){
return <portlet:namespace/>binarySearch(criteria, arr, 0, arr.length)
}
-
-function <portlet:namespace/>isNumeric(candidate){
- for (i = 0; i < candidate.length; i++) {
- if (<portlet:namespace/>search(candidate.charAt(i),numbers) < 0) {
- return false;
- }
- }
- return true;
-}
-
-function <portlet:namespace/>validateForm(){
- var startPos = document.<portlet:namespace/>searchForm.startPos.value;
- var endPos = document.<portlet:namespace/>searchForm.endPos.value;
- var maxRows = document.<portlet:namespace/>searchForm.maxRows.value;
- if (!<portlet:namespace/>isNumeric(startPos)) {
- alert("Start Position must be a number.");
- document.<portlet:namespace/>searchForm.startPos.focus();
- return false;
- }
- if (!<portlet:namespace/>isNumeric(endPos)) {
- alert("End Position must be a number.");
- document.<portlet:namespace/>searchForm.endPos.focus();
- return false;
- }
- if (!<portlet:namespace/>isNumeric(maxRows)) {
- alert("Maximum results must be a number.");
- document.<portlet:namespace/>searchForm.maxRows.focus();
- 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="consolebase.common.refresh"/></button>
Modified: geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/logmanager/view.jsp
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/logmanager/view.jsp?rev=753156&r1=753155&r2=753156&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/logmanager/view.jsp (original)
+++ geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/logmanager/view.jsp Fri Mar 13 08:21:04 2009
@@ -22,37 +22,39 @@
<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt"%>
<fmt:setBundle basename="consolebase"/>
-<script>
-function trim(str){
- if(!str) return "";
- else if(str.charAt(0) == " "){
- return trim(str.substring(1));
- }else if(str.charAt(str.length-1) == " "){
- return trim(str.substring(0,str.length-1));
- }else return str;
-}
+<script language="JavaScript">
+var <portlet:namespace/>formName = "<portlet:namespace/>update";
+var <portlet:namespace/>requiredFields = new Array("configFile");
+var <portlet:namespace/>integerFields = new Array("refreshPeriod");
function <portlet:namespace/>validateForm(){
- with(document.<portlet:namespace/>update){
- if(trim(logFile.value).length == ""){
- alert("Please input the log file name.");
- logFile.value="";
- logFile.focus();
- return false;
+ if(!textElementsNotEmpty(<portlet:namespace/>formName,<portlet:namespace/>requiredFields)) {
+ addErrorMessage("<portlet:namespace/>", '<fmt:message key="logmanager.common.emptyText"/>');
+ return false;
+ }
+ for (i in <portlet:namespace/>integerFields) {
+ if(!checkIntegral(<portlet:namespace/>formName,<portlet:namespace/>integerFields[i])) {
+ addErrorMessage("<portlet:namespace/>", '<fmt:message key="logmanager.common.integer"/>');
+ return false;
}
- if(trim(layoutPattern.value) == ""){
- alert("Please input layout pattern.");
- layoutPattern.value="";
- layoutPattern.focus();
+ }
+ return <portlet:namespace/>validate();
+}
+
+function <portlet:namespace/>validate() {
+ with(document.<portlet:namespace/>update){
+ if(parseInt(refreshPeriod.value) < 5) {
+ addErrorMessage("<portlet:namespace/>", '<fmt:message key="logmanager.common.refreshPeriodTooShort"/>');
return false;
- }
-
+ }
}
return true;
}
</script>
-<fmt:message key="logmanager.common.title"/>
-<p/>
+<div id="<portlet:namespace/>CommonMsgContainer"></div>
+
+<p><fmt:message key="logmanager.common.title"/></p>
+
<form name="<portlet:namespace/>update" action="<portlet:actionURL/>" onsubmit="return <portlet:namespace/>validateForm()" method="POST">
<input type="hidden" name="action" value="update"/>
<table width="680">
Modified: geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/repository/normal.jsp
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/repository/normal.jsp?rev=753156&r1=753155&r2=753156&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/repository/normal.jsp (original)
+++ geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/repository/normal.jsp Fri Mar 13 08:21:04 2009
@@ -37,29 +37,40 @@
</style>
<script language="JavaScript">
+var <portlet:namespace/>formName = "<portlet:namespace/>fileSelect";
+var <portlet:namespace/>requiredFields = new Array("local", "group", "artifact", "version", "fileType");
function <portlet:namespace/>validateForm() {
- var illegalChars= /[\.]{2}|[()<>,;:\\/"']/ ;
- if (! (document.<portlet:namespace/>fileSelect.local.value
- && document.<portlet:namespace/>fileSelect.group.value
- && document.<portlet:namespace/>fileSelect.artifact.value
- && document.<portlet:namespace/>fileSelect.version.value
- && document.<portlet:namespace/>fileSelect.fileType.value))
- {
- alert("File, Group, Artifact, Version, and Type are all required fields");
- return false;
- } else if (document.<portlet:namespace/>fileSelect.group.value.match(illegalChars)) {
- alert("Group contains invalid characters");
- return false;
- } else if (document.<portlet:namespace/>fileSelect.artifact.value.match(illegalChars)) {
- alert("Artifact contains invalid characters");
- return false;
- } else if (document.<portlet:namespace/>fileSelect.version.value.match(illegalChars)) {
- alert("Version contains invalid characters");
- return false;
- } else if (document.<portlet:namespace/>fileSelect.fileType.value.match(illegalChars)) {
- alert("File type contains invalid characters");
- return false;
- }
+ if(!textElementsNotEmpty(<portlet:namespace/>formName,<portlet:namespace/>requiredFields)) {
+ addErrorMessage("<portlet:namespace/>", '<fmt:message key="repository.normal.emptyText"/>');
+ return false;
+ }
+
+ return <portlet:namespace/>validate();
+}
+
+function <portlet:namespace/>validate() {
+ with(document.<portlet:namespace/>fileSelect){
+ var illegalChars= /[\.]{2}|[()<>,;:\\/"']/ ;
+ if (group.value.match(illegalChars)) {
+ group.focus();
+ addErrorMessage("<portlet:namespace/>", '<fmt:message key="repository.normal.invalidChar"/>');
+ return false;
+ } else if (artifact.value.match(illegalChars)) {
+ artifact.focus();
+ addErrorMessage("<portlet:namespace/>", '<fmt:message key="repository.normal.invalidChar"/>');
+ return false;
+ } else if (version.value.match(illegalChars)) {
+ version.focus();
+ addErrorMessage("<portlet:namespace/>", '<fmt:message key="repository.normal.invalidChar"/>');
+ return false;
+ } else if (fileType.value.match(illegalChars)) {
+ fileType.focus();
+ addErrorMessage("<portlet:namespace/>", '<fmt:message key="repository.normal.invalidChar"/>');
+ return false;
+ }
+ }
+
+ return true;
}
function <portlet:namespace/>parse(localFile) {
@@ -104,6 +115,8 @@
</script>
+<div id="<portlet:namespace/>CommonMsgContainer"></div><br>
+
<table width="100%">
<tr>
<td align="center">
Modified: geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/securityrealmmanager/se/groups/addmaximized.jsp
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/securityrealmmanager/se/groups/addmaximized.jsp?rev=753156&r1=753155&r2=753156&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/securityrealmmanager/se/groups/addmaximized.jsp (original)
+++ geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/securityrealmmanager/se/groups/addmaximized.jsp Fri Mar 13 08:21:04 2009
@@ -27,8 +27,14 @@
var <portlet:namespace/>formName = "<portlet:namespace/>addgroup";
var <portlet:namespace/>requiredFields = new Array("group");
function <portlet:namespace/>validateForm(){
- return (textElementsNotEmpty(<portlet:namespace/>formName,<portlet:namespace/>requiredFields));
+ if(!textElementsNotEmpty(<portlet:namespace/>formName,<portlet:namespace/>requiredFields)) {
+ addErrorMessage("<portlet:namespace/>", '<fmt:message key="securityrealmmanager.common.emptyText"/>');
+ return false;
+ }
+
+ return true;
}
+
function <portlet:namespace/>move(formName, from, to){
var objFrom = eval("document." + formName + "." + from);
var objTo = eval("document." + formName + "." + to);
@@ -41,6 +47,7 @@
}
}
}
+
function <portlet:namespace/>removeAt(obj,pos){
for(var i = pos; i < obj.options.length-1; i++){
obj.options[i].value = obj.options[i+1].value;
@@ -58,6 +65,9 @@
}
</script>
+
+<div id="<portlet:namespace/>CommonMsgContainer"></div><br>
+
<c:set var="add" value="${group == null}"/>
<form name="<portlet:namespace/>addgroup" action="<portlet:actionURL portletMode="view"/>" method="POST">
<table cellspacing="5">
@@ -67,12 +77,12 @@
<c:when test="${add}">
<b><fmt:message key="securityrealmmanager.se.groups.addmaximized.addGroup" /></b>
<c:set var="GroupName" value=""/>
- <c:set var="Submit" value="Add"/>
+ <c:set var="Submit" value="securityrealmmanager.common.add"/>
</c:when>
<c:otherwise>
<b><fmt:message key="securityrealmmanager.se.groups.addmaximized.updateGroup" /></b>
<c:set var="GroupName" value="${group}"/>
- <c:set var="Submit" value="Update"/>
+ <c:set var="Submit" value="securityrealmmanager.common.update"/>
</c:otherwise>
</c:choose>
</td>
@@ -83,7 +93,7 @@
<c:choose>
<c:when test="${add}">
<input type="hidden" name="action" value="add">
- <input type="text" name="group" title='<fmt:message key="consolebase.common.groupName"/>' value="">
+ <input type="text" name="group" title='Submit' value="">
</c:when>
<c:otherwise>
<input type="hidden" name="action" value="update">
@@ -119,12 +129,12 @@
</td>
<td align="center" valign="middle">
<input type = "button"
- value=" Add >> "
+ value="<fmt:message key="securityrealmmanager.common.add"/> >>"
onclick="<portlet:namespace/>move('<portlet:namespace/>addgroup','availusers','users');"
/>
<br/>
- <input type = "button" value="<< Remove"
+ <input type = "button" value="<< <fmt:message key="securityrealmmanager.common.remove"/>"
onclick="<portlet:namespace/>move('<portlet:namespace/>addgroup','users','availusers');"
/>
</td>
@@ -155,7 +165,7 @@
</tr>
<tr>
<td> </td><td align="left" class="formElement">
- <input type="submit" value="${Submit}"
+ <input type="submit" value="<fmt:message key="${Submit}"/>"
onclick="return <portlet:namespace/>validateForm() && <portlet:namespace/>selectAll('<portlet:namespace/>addgroup', 'users');">
<input type="submit" name="cancel" value="<fmt:message key="consolebase.common.cancel"/>">
</td>
Modified: geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/securityrealmmanager/se/users/addmaximized.jsp
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/securityrealmmanager/se/users/addmaximized.jsp?rev=753156&r1=753155&r2=753156&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/securityrealmmanager/se/users/addmaximized.jsp (original)
+++ geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/securityrealmmanager/se/users/addmaximized.jsp Fri Mar 13 08:21:04 2009
@@ -24,19 +24,23 @@
<script language="JavaScript">
var <portlet:namespace/>formName = "adduser";
var <portlet:namespace/>requiredFields = new Array("userId","password");
+var <portlet:namespace/>passwordFields = new Array("password");
function <portlet:namespace/>validateForm(){
- return (textElementsNotEmpty(<portlet:namespace/>formName,<portlet:namespace/>requiredFields) && <portlet:namespace/>passwordMatch());
-}
-function <portlet:namespace/>passwordMatch(){
- with(document.adduser){
- if(password.value != confirmpassword.value){
- alert("Password and confirm password do not match!");
- password.focus();
- return false;
- }
+ if(!textElementsNotEmpty(<portlet:namespace/>formName,<portlet:namespace/>requiredFields)) {
+ addErrorMessage("<portlet:namespace/>", '<fmt:message key="securityrealmmanager.common.emptyText"/>');
+ return false;
+ }
+ if(!passwordElementsConfirm(<portlet:namespace/>formName, <portlet:namespace/>passwordFields)) {
+ addErrorMessage("<portlet:namespace/>", '<fmt:message key="securityrealmmanager.common.passwordMismatch"/>');
+ return false;
}
+
+ return true;
}
</script>
+
+<div id="<portlet:namespace/>CommonMsgContainer"></div><br>
+
<c:set var="add" value="${userID == null}"/>
<form name="adduser" action="<portlet:actionURL portletMode="view"/>" method="POST">
<table cellspacing="5">
@@ -47,13 +51,13 @@
<b><fmt:message key="securityrealmmanager.se.users.addmaximized.addUser" /></b>
<c:set var="UserName" value=""/>
<c:set var="Action" value="add"/>
- <c:set var="Submit" value="Add"/>
+ <c:set var="Submit" value="securityrealmmanager.common.add"/>
</c:when>
<c:otherwise>
<b><fmt:message key="securityrealmmanager.se.users.addmaximized.updateUser" /></b>
<c:set var="UserName" value="${userID}"/>
<c:set var="Action" value="update"/>
- <c:set var="Submit" value="Update"/>
+ <c:set var="Submit" value="securityrealmmanager.common.update"/>
</c:otherwise>
</c:choose>
</td>
@@ -96,10 +100,10 @@
</tr>
<tr>
<td width="200"><label for="<portlet:namespace/>confirmpassword"><fmt:message key="consolebase.common.confirmPassword"/></label></td>
- <td><input type="password" name="confirmpassword" id="<portlet:namespace/>confirmpassword" value=""></td>
+ <td><input type="password" name="confirm-password" id="<portlet:namespace/>confirmpassword" value=""></td>
</tr>
<tr>
- <td> </td> <td align="left" class="formElement"><input type="submit" value="${Submit}" onclick="return <portlet:namespace/>validateForm()"> <input type="submit" name="cancel" value="<fmt:message key="consolebase.common.cancel"/>"></td>
+ <td> </td> <td align="left" class="formElement"><input type="submit" value="<fmt:message key="${Submit}"/>" onclick="return <portlet:namespace/>validateForm()"> <input type="submit" name="cancel" value="<fmt:message key="consolebase.common.cancel"/>"></td>
</tr>
</table>
</form>
Modified: geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/servermanager/normal.jsp
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/servermanager/normal.jsp?rev=753156&r1=753155&r2=753156&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/servermanager/normal.jsp (original)
+++ geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/servermanager/normal.jsp Fri Mar 13 08:21:04 2009
@@ -14,19 +14,21 @@
See the License for the specific language governing permissions and
limitations under the License.
--%>
-<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
+<%@ 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="consolebase"/>
-<portlet:defineObjects/>
+<fmt:setBundle basename="consolebase" />
+<portlet:defineObjects />
-<table width="100%" border="0" cellspacing="0" cellpadding="0">
- <tr>
- <td width="25%" > </td>
- <td><CommonMsg:commonMsg/></td>
- <td width="25%" > </td>
- </tr>
+<CommonMsg:confirmMsg/>
+
+<table width="100%" border="0" cellspacing="0" cellpadding="0">
+ <tr>
+ <td width="25%"> </td>
+ <td><CommonMsg:commonMsg /></td>
+ <td width="25%"> </td>
+ </tr>
</table>
<%-- Removed until a better mechanism for rebooting the server is created
<table width="100%">
@@ -37,9 +39,16 @@
--%>
<br />
<table width="100%">
-<form action="<portlet:actionURL/>" method="POST">
-<tr><td align="center"><input type="submit" value='<fmt:message key="servermanager.normal.shutdown"/>' name="shutdown"
-onClick="return confirm('<fmt:message key="servermanager.normal.areYouSure"/>');" /></td></tr>
-</form>
+ <tbody>
+ <tr>
+ <td align="center">
+ <form action="<portlet:actionURL/>" method="POST">
+ <input type="hidden" name="shutdown" value="shutdown" />
+ <input type="button" value='<fmt:message key="servermanager.normal.shutdown"/>'
+ onClick="showConfirmMessage(this, '<fmt:message key="servermanager.normal.comfirmMsg01"/>', '<fmt:message key="servermanager.normal.ok"/>', '<fmt:message key="servermanager.normal.cancel"/>');" />
+ </form>
+ </td>
+ </tr>
+ </tbody>
</table>
<br />
Modified: geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/webaccesslogmanager/view.jsp
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/webaccesslogmanager/view.jsp?rev=753156&r1=753155&r2=753156&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/webaccesslogmanager/view.jsp (original)
+++ geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/webaccesslogmanager/view.jsp Fri Mar 13 08:21:04 2009
@@ -27,24 +27,29 @@
var <portlet:namespace/>formName = "<portlet:namespace/>searchForm";
var <portlet:namespace/>dateFields = new Array("fromDate", "toDate");
-function <portlet:namespace/>validateForm(){
+function <portlet:namespace/>validateForm(){
if (document.forms[<portlet:namespace/>formName].ignoreDates.checked)
return true;
for (i in <portlet:namespace/>dateFields) {
- if (!checkDateMMDDYYYY(<portlet:namespace/>formName, <portlet:namespace/>dateFields[i]))
+ if (!checkDateMMDDYYYY(<portlet:namespace/>formName, <portlet:namespace/>dateFields[i])) {
+ addErrorMessage("<portlet:namespace/>", '<fmt:message key="webaccesslogmanager.common.mmddyyyy"/>');
return false;
+ }
}
// Check if to date is after from date
var fromDate = new Date(document.forms[<portlet:namespace/>formName].fromDate.value);
var toDate = new Date(document.forms[<portlet:namespace/>formName].toDate.value);
if (fromDate > toDate) {
- alert('to date must be after from date.');
+ addErrorMessage("<portlet:namespace/>", '<fmt:message key="webaccesslogmanager.view.wrongDate"/>');
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="consolebase.common.refresh" /></button>
Modified: geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/webmanager/connector/editConnector.jsp
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/webmanager/connector/editConnector.jsp?rev=753156&r1=753155&r2=753156&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/webmanager/connector/editConnector.jsp (original)
+++ geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/webmanager/connector/editConnector.jsp Fri Mar 13 08:21:04 2009
@@ -22,38 +22,43 @@
<portlet:defineObjects/>
<script language="JavaScript">
// validate the form submission
+var <portlet:namespace/>formName = "<portlet:namespace/>Form";
+var <portlet:namespace/>requiredFields = new Array("uniqueName");
function <portlet:namespace/>validateForm(){
- var attributeName;
- var element;
-
- element = document.forms['<portlet:namespace/>Form'].elements['uniqueName'];
- if(element.value.length < 1){
- alert("uniqueName must not be empty.");
- return false;
+ if(!textElementsNotEmpty(<portlet:namespace/>formName,<portlet:namespace/>requiredFields)) {
+ addErrorMessage("<portlet:namespace/>", '<fmt:message key="webmanager.common.emptyText"/>');
+ return false;
}
-<c:forEach var="connectorAttribute" items="${connectorAttributes}">
- attributeName = '${connectorAttribute.attributeName}';
- element = document.forms['<portlet:namespace/>Form'].elements[attributeName];
- <c:if test="${connectorAttribute.required && connectorAttribute.attributeClass.simpleName ne 'Boolean'}">
- //validate the required attribute has a value
- if(element.value.length < 1){
- alert(attributeName + " must not be empty.");
- return false;
- }
- </c:if>
- <c:if test="${connectorAttribute.attributeClass.simpleName eq 'Integer'}">
- //validate the Integer attribute has a numeric value
- if(element.value.length > 0 && !checkIntegral('<portlet:namespace/>Form', attributeName)) {
- return false;
+ return <portlet:namespace/>validate();
+}
+
+function <portlet:namespace/>validate() {
+ with(document.<portlet:namespace/>Form){
+ <c:forEach var="connectorAttribute" items="${connectorAttributes}">
+ <c:if test="${connectorAttribute.required && connectorAttribute.attributeClass.simpleName ne 'Boolean'}">
+ //validate the required attribute has a value
+ if(${connectorAttribute.attributeName}.value.length < 1){
+ addErrorMessage("<portlet:namespace/>", '<fmt:message key="webmanager.common.emptyText"/>');
+ return false;
+ }
+ </c:if>
+ <c:if test="${connectorAttribute.attributeClass.simpleName eq 'Integer'}">
+ //validate the Integer attribute has a numeric value
+ if(!checkIntegral('<portlet:namespace/>Form', '${connectorAttribute.attributeName}')) {
+ addErrorMessage("<portlet:namespace/>", '<fmt:message key="webmanager.common.integer"/>');
+ return false;
+ }
+ </c:if>
+ </c:forEach>
}
- </c:if>
-</c:forEach>
return true;
}
</script>
+<div id="<portlet:namespace/>CommonMsgContainer"></div><br>
+
<form method="POST" name="<portlet:namespace/>Form" action="<portlet:actionURL/>">
<input type="hidden" name="mode" value="${mode}">
<input type="hidden" name="connectorType" value="${connectorType}">
Modified: geronimo/server/trunk/plugins/console/console-core/src/main/java/org/apache/geronimo/console/BaseRemoteProxy.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/console/console-core/src/main/java/org/apache/geronimo/console/BaseRemoteProxy.java?rev=753156&r1=753155&r2=753156&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/console/console-core/src/main/java/org/apache/geronimo/console/BaseRemoteProxy.java (original)
+++ geronimo/server/trunk/plugins/console/console-core/src/main/java/org/apache/geronimo/console/BaseRemoteProxy.java Fri Mar 13 08:21:04 2009
@@ -37,7 +37,7 @@
}
}
- public final String getLocalizedString(HttpServletRequest request, ClassLoader loader, String bundleName, String key, Object... vars) {
+ public final String getLocalizedString(HttpServletRequest request, String bundleName, String key, Object... vars) {
String value = resourceRegistry.handleGetObject(bundleName, request.getLocale(), key);
if (null == value || 0 == value.length()) return key;
return MessageFormat.format(value, vars);
Modified: geronimo/server/trunk/plugins/console/console-core/src/main/java/org/apache/geronimo/console/i18n/ConsoleResourceRegistry.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/console/console-core/src/main/java/org/apache/geronimo/console/i18n/ConsoleResourceRegistry.java?rev=753156&r1=753155&r2=753156&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/console/console-core/src/main/java/org/apache/geronimo/console/i18n/ConsoleResourceRegistry.java (original)
+++ geronimo/server/trunk/plugins/console/console-core/src/main/java/org/apache/geronimo/console/i18n/ConsoleResourceRegistry.java Fri Mar 13 08:21:04 2009
@@ -72,20 +72,20 @@
locale = localeMap.get(locale.getLanguage());
}
for (ClassLoader classloader : classloaders) {
- ResourceBundle rb = ResourceBundle.getBundle(basename, locale, classloader);
- if (!locale.getLanguage().equals(rb.getLocale().getLanguage())) {
- localeMap.put(locale.getLanguage(), defaultLocale);
- rb = ResourceBundle.getBundle(basename, defaultLocale, classloader);
- }
try {
- if (rb != null) {
+ ResourceBundle rb = ResourceBundle.getBundle(basename, locale, classloader);
+ if (null != rb) {
+ if (!locale.getLanguage().equals(rb.getLocale().getLanguage())) {
+ localeMap.put(locale.getLanguage(), defaultLocale);
+ rb = ResourceBundle.getBundle(basename, defaultLocale, classloader);
+ }
String value = rb.getString(key);
- if (value != null) {
+ if (null != value) {
return value;
}
}
} catch (MissingResourceException e) {
- //nothing to do
+ continue;
}
}
Added: geronimo/server/trunk/plugins/console/console-core/src/main/java/org/apache/geronimo/console/message/ConfirmMessageTag.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/console/console-core/src/main/java/org/apache/geronimo/console/message/ConfirmMessageTag.java?rev=753156&view=auto
==============================================================================
--- geronimo/server/trunk/plugins/console/console-core/src/main/java/org/apache/geronimo/console/message/ConfirmMessageTag.java (added)
+++ geronimo/server/trunk/plugins/console/console-core/src/main/java/org/apache/geronimo/console/message/ConfirmMessageTag.java Fri Mar 13 08:21:04 2009
@@ -0,0 +1,53 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.geronimo.console.message;
+
+import java.io.IOException;
+
+import javax.servlet.jsp.JspException;
+import javax.servlet.jsp.JspWriter;
+import javax.servlet.jsp.tagext.TagSupport;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+public final class ConfirmMessageTag extends TagSupport {
+
+ private static final long serialVersionUID = 0L;
+ private static final Logger log = LoggerFactory.getLogger(ConfirmMessageTag.class);
+
+ @Override
+ public int doStartTag() throws JspException {
+ JspWriter out = pageContext.getOut();
+ try {
+ out.println("<style type=\"text/css\">");
+ out.println("@import \"/dojo/dijit/themes/soria/soria.css\";");
+ out.println("@import \"/dojo/dojo/resources/dojo.css\";");
+ out.println(".soria .dijitDialog {background:#F7F7F7; border:3px solid #88A4D7; width:450px; padding:10px; font-family:Verdana,Helvetica,sans-serif;}");
+ out.println(".soria .dijitDialog .dijitDialogPaneContent {background:#F7F7F7; border:0; padding:0;}");
+ out.println(".soria .dijitDialogUnderlay {background:#000000; opacity:0.5;}");
+ out.println(".soria .dijitDialogTitleBar {display:none;}");
+ out.println(".soria .dijitButtonNode {background:#F7F7F7; border:2px solid #88A4D7; padding:0.2em; font-family:Verdana,Helvetica,sans-serif;}");
+ out.println("</style>");
+ out.println(" <script type=\"text/javascript\" src=\"/dojo/dojo/dojo.js\" djConfig=\"parseOnLoad:true\"></script>");
+ } catch (IOException e) {
+ log.error("Unable to display confirm messages");
+ }
+ return SKIP_BODY;
+ }
+
+}
Propchange: geronimo/server/trunk/plugins/console/console-core/src/main/java/org/apache/geronimo/console/message/ConfirmMessageTag.java
------------------------------------------------------------------------------
svn:eol-style = native
Modified: geronimo/server/trunk/plugins/console/console-portal-driver/src/main/webapp/CommonMsg.js
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/console/console-portal-driver/src/main/webapp/CommonMsg.js?rev=753156&r1=753155&r2=753156&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/console/console-portal-driver/src/main/webapp/CommonMsg.js (original)
+++ geronimo/server/trunk/plugins/console/console-portal-driver/src/main/webapp/CommonMsg.js Fri Mar 13 08:21:04 2009
@@ -37,6 +37,14 @@
function addCommonMessage(namespace, msg){
var container = document.getElementById(namespace+"CommonMsgContainer");
+ var pre = container.previousSibling;
+ while (pre) {
+ if (pre.className=="messagePortlet") {
+ container.parentNode.removeChild(pre);
+ break;
+ }
+ pre = pre.previousSibling;
+ }
while(container.firstChild) {
container.removeChild(container.firstChild);
}
@@ -120,6 +128,71 @@
}
}
+function showConfirmMessage() {
+ dojo.require("dijit.Dialog");
+ dojo.require("dijit.form.Button");
+ document.body.className = "soria";
+ var target = arguments[0];
+ var submit = new dojo.Deferred();
+ submit.addCallback(function(){
+ switch (target.nodeName.toLowerCase()) {
+ case "input":
+ var formNode = target.parentNode;
+ while (formNode) {
+ if (formNode.nodeName.toLowerCase() == "form") {
+ break;
+ }
+ formNode = formNode.parentNode;
+ }
+ if (formNode) {
+ formNode.submit();
+ }
+ break;
+ case "a":
+ location.href=target.href;
+ break;
+ default:
+ }
+ });
+ var d = new dijit.Dialog();
+ dojo.style(d.closeButtonNode, "visibility", "hidden");
+ var table = document.createElement("table");
+ table.width="100%";
+ var tbody = document.createElement("tbody");
+ table.appendChild(tbody);
+ var tr1 = document.createElement("tr");
+ tbody.appendChild(tr1);
+ var tr2 = document.createElement("tr");
+ tbody.appendChild(tr2);
+ var td11 = document.createElement("td");
+ tr1.appendChild(td11);
+ td11.colSpan="2"; td11.style.paddingBottom="10px"; td11.align="left";
+ var img = document.createElement("img");
+ td11.appendChild(img);
+ td11.appendChild(document.createTextNode(arguments[1]));
+ img.height="16"; img.width="16"; img.style.marginRight="8"; img.align="baseline"; img.src="/console/images/msg_warn.gif"; img.alt="Warn"; img.title="Warning";
+ var td21 = document.createElement("td");
+ tr2.appendChild(td21);
+ td21.align="right";
+ var td22 = document.createElement("td");
+ tr2.appendChild(td22);
+ td22.align="left";
+ var b1 = new dijit.form.Button({label: arguments[2], tabIndex: "2"});
+ td21.appendChild(b1.domNode);
+ dojo.connect(b1, "onClick", function() {
+ d.hide();
+ submit.callback();
+ });
+ var b2 = new dijit.form.Button({label: arguments[3], tabIndex: "1"});
+ td22.appendChild(b2.domNode);
+ dojo.connect(b2, "onClick", function() {
+ d.hide();
+ });
+ d.setContent(table);
+ d.show();
+ return false;
+}
+
function showHideSection(id){
if(document.getElementById(id)!=null){
if(document.getElementById(id).style.display=="none"){
@@ -135,4 +208,4 @@
}
}
}
-}
\ No newline at end of file
+}
Modified: geronimo/server/trunk/plugins/console/console-portal-driver/src/main/webapp/js/forms.js
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/console/console-portal-driver/src/main/webapp/js/forms.js?rev=753156&r1=753155&r2=753156&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/console/console-portal-driver/src/main/webapp/js/forms.js (original)
+++ geronimo/server/trunk/plugins/console/console-portal-driver/src/main/webapp/js/forms.js Fri Mar 13 08:21:04 2009
@@ -23,7 +23,6 @@
var elem = elementNameArray[i];
obj = eval("document.forms['" + formName + "'].elements['"+ elem +"']");
if(isEmptyString(obj.value)){
- alert(elem + " must not be empty.");
obj.focus();
return false;
}
@@ -37,7 +36,6 @@
var obj = eval("document.forms['" + formName + "'].elements['"+ elementName +"']");
if(isIntegral(obj.value)) return true;
else{
- alert(elementName + " must be an integer.");
obj.focus();
return false;
}
@@ -58,9 +56,8 @@
function checkDateMMDDYYYY(formName, elementName) {
var obj = eval("document.forms['" + formName + "'].elements['"+ elementName +"']");
- if(validDateMMDDYYYY(obj.value)) return true;
+ if(obj.value.length==10 && validDateMMDDYYYY(obj.value)) return true;
else{
- alert(elementName + " must be a date in MM/DD/YYYY format.");
obj.focus();
return false;
}
@@ -68,9 +65,8 @@
function checkDateMMDDYY(formName, elementName) {
var obj = eval("document.forms['" + formName + "'].elements['"+ elementName +"']");
- if(validDateMMDDYY(obj.value)) return true;
+ if(obj.value.length==8 && validDateMMDDYY(obj.value)) return true;
else{
- alert(elementName + " must be a date in MM/DD/YY format.");
obj.focus();
return false;
}
@@ -101,11 +97,10 @@
pwd = eval("document.forms['" + formName + "'].elements['"+ elem +"']");
cnf = eval("document.forms['" + formName + "'].elements['confirm-"+ elem +"']");
if(pwd.value != cnf.value){
- alert(elem + " and confirm password do not match.");
pwd.focus();
return false;
}
}
return true;
}
-
\ No newline at end of file
+
Modified: geronimo/server/trunk/plugins/console/plugin-portlets/src/main/resources/pluginportlets.properties
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/console/plugin-portlets/src/main/resources/pluginportlets.properties?rev=753156&r1=753155&r2=753156&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/console/plugin-portlets/src/main/resources/pluginportlets.properties (original)
+++ geronimo/server/trunk/plugins/console/plugin-portlets/src/main/resources/pluginportlets.properties Fri Mar 13 08:21:04 2009
@@ -1,3 +1,4 @@
+#Generated by ResourceBundle Editor (http://eclipse-rbe.sourceforge.net)
#=====================================================================
# Licensed to the Apache Software Foundation (ASF) under one or more
# contributor license agreements. See the NOTICE file distributed with
@@ -97,7 +98,9 @@
car.list.filterByCategoryAndName = Filter by category and name:
car.list.nameServer = Name the server to be assembled:
car.list.noPlugins = No plugins are listed at this repository.
+car.list.nothing = You must choose at least one plugin to install.
car.list.pluginRepo = Plugins listed at
+car.list.requireArtifactId = You must provide an Artifact Id Name.
car.list.requiredPlugin = Required plugin in local server:
car.list.selectPlugin = Select from plugins in current server:
car.list.systemPlugin = System plugins in local server:
@@ -220,14 +223,17 @@
realmwizard.common.driverJAR = Driver JAR
realmwizard.common.editRealm = Edit Realm
realmwizard.common.editSettings = Edit Settings
+realmwizard.common.emptyText = The focussed field must not be empty.
realmwizard.common.enableAuditing = Enable Auditing
realmwizard.common.enableLockout = Enable Lockout
realmwizard.common.groupSelectSQL = Group SELECT SQL
+realmwizard.common.integer = The focussed field must be an integer.
realmwizard.common.logFile = Log File
realmwizard.common.loginDomainName = Login Domain Name
realmwizard.common.loginModule = Login Module
realmwizard.common.loginModuleClass = Login Module Class
realmwizard.common.nameOfSecurityRealm = Name of Security Realm
+realmwizard.common.passwordMismatch = Password does not match.
realmwizard.common.principals = Principals
realmwizard.common.realmName = Realm Name
realmwizard.common.realmType = Realm Type
Modified: geronimo/server/trunk/plugins/console/plugin-portlets/src/main/resources/pluginportlets_zh.properties
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/console/plugin-portlets/src/main/resources/pluginportlets_zh.properties?rev=753156&r1=753155&r2=753156&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/console/plugin-portlets/src/main/resources/pluginportlets_zh.properties (original)
+++ geronimo/server/trunk/plugins/console/plugin-portlets/src/main/resources/pluginportlets_zh.properties Fri Mar 13 08:21:04 2009
@@ -1,3 +1,4 @@
+#Generated by ResourceBundle Editor (http://eclipse-rbe.sourceforge.net)
#=====================================================================
# Licensed to the Apache Software Foundation (ASF) under one or more
# contributor license agreements. See the NOTICE file distributed with
@@ -97,7 +98,9 @@
car.list.filterByCategoryAndName = \u6309\u7167\u79CD\u7C7B\u548C\u540D\u79F0\u8FC7\u6EE4:
car.list.nameServer = \u547D\u540D\u8981\u7EC4\u88C5\u7684\u65B0\u670D\u52A1\u5668:
car.list.noPlugins = \u6B64\u5B58\u50A8\u5E93\u4E2D\u6CA1\u6709\u63D2\u4EF6.
+car.list.nothing = \u4F60\u81F3\u5C11\u8981\u9009\u62E9\u4E00\u4E2A\u63D2\u4EF6\u4EE5\u5B89\u88C5\u3002
car.list.pluginRepo = \u63D2\u4EF6\u4F4D\u4E8E
+car.list.requireArtifactId = \u4F60\u5FC5\u987B\u63D0\u4F9B\u5DE5\u4EF6ID\u3002
car.list.requiredPlugin = \u672C\u5730\u670D\u52A1\u5668\u6240\u9700\u63D2\u4EF6:
car.list.selectPlugin = \u4ECE\u5F53\u524D\u670D\u52A1\u5668\u9009\u62E9\u63D2\u4EF6:
car.list.systemPlugin = \u672C\u5730\u670D\u52A1\u5668\u7684\u7CFB\u7EDF\u63D2\u4EF6:
@@ -221,14 +224,17 @@
realmwizard.common.driverJAR = \u9A71\u52A8JAR
realmwizard.common.editRealm = \u7F16\u8F91\u5B89\u5168\u57DF
realmwizard.common.editSettings = \u7F16\u8F91\u8BBE\u7F6E
+realmwizard.common.emptyText = \u7126\u70B9\u6240\u5728\u5B57\u6BB5\u4E0D\u80FD\u4E3A\u7A7A\u3002
realmwizard.common.enableAuditing = \u6253\u5F00\u5BA1\u6838\u529F\u80FD
realmwizard.common.enableLockout = \u6253\u5F00\u9501\u5B9A\u529F\u80FD
realmwizard.common.groupSelectSQL = Group SELECT SQL
+realmwizard.common.integer = \u7126\u70B9\u6240\u5728\u5B57\u6BB5\u5FC5\u987B\u4E3A\u6574\u6570\u3002
realmwizard.common.logFile = \u65E5\u5FD7\u6587\u4EF6
realmwizard.common.loginDomainName = \u767B\u5F55\u57DF\u540D
realmwizard.common.loginModule = \u767B\u5F55\u6A21\u5757
realmwizard.common.loginModuleClass = \u767B\u5F55\u6A21\u5757\u7C7B
realmwizard.common.nameOfSecurityRealm = \u5B89\u5168\u57DF\u540D\u79F0
+realmwizard.common.passwordMismatch = \u5BC6\u7801\u4E0D\u5339\u914D\u3002
realmwizard.common.principals = \u4E3B\u4F53
realmwizard.common.realmName = \u5B89\u5168\u57DF\u540D\u79F0
realmwizard.common.realmType = \u5B89\u5168\u57DF\u7C7B\u578B
Modified: geronimo/server/trunk/plugins/console/plugin-portlets/src/main/webapp/WEB-INF/view/car/assemblyName.jsp
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/console/plugin-portlets/src/main/webapp/WEB-INF/view/car/assemblyName.jsp?rev=753156&r1=753155&r2=753156&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/console/plugin-portlets/src/main/webapp/WEB-INF/view/car/assemblyName.jsp (original)
+++ geronimo/server/trunk/plugins/console/plugin-portlets/src/main/webapp/WEB-INF/view/car/assemblyName.jsp Fri Mar 13 08:21:04 2009
@@ -24,13 +24,14 @@
<script language="javascript" type="text/javascript">
function checkArtifactId() {
if(document.frmlst.artifactId.value == "") {
- alert("You must provide an Artifact Id Name.");
+ addErrorMessage("<portlet:namespace/>", '<fmt:message key="car.list.requireArtifactId"/>');
return false;
}
return true;
}
</script>
+<div id="<portlet:namespace/>CommonMsgContainer"></div>
<c:choose>
<c:when test="${!containsPlugin}">
Modified: geronimo/server/trunk/plugins/console/plugin-portlets/src/main/webapp/WEB-INF/view/car/assemblylist.jsp
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/console/plugin-portlets/src/main/webapp/WEB-INF/view/car/assemblylist.jsp?rev=753156&r1=753155&r2=753156&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/console/plugin-portlets/src/main/webapp/WEB-INF/view/car/assemblylist.jsp (original)
+++ geronimo/server/trunk/plugins/console/plugin-portlets/src/main/webapp/WEB-INF/view/car/assemblylist.jsp Fri Mar 13 08:21:04 2009
@@ -30,7 +30,7 @@
return true;
}
}
- alert("You must choose at least one plugin to install.");
+ addErrorMessage("<portlet:namespace/>", '<fmt:message key="car.list.nothing"/>');
return false;
}
@@ -134,6 +134,8 @@
}
</script>
+<div id="<portlet:namespace/>CommonMsgContainer"></div>
+
<form name="frmlst" action="<portlet:actionURL/>" method="POST">
<input id="mode" type="hidden" name="mode" value="assemblyView-before"/>
Modified: geronimo/server/trunk/plugins/console/plugin-portlets/src/main/webapp/WEB-INF/view/car/createPluginIndex.jsp
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/console/plugin-portlets/src/main/webapp/WEB-INF/view/car/createPluginIndex.jsp?rev=753156&r1=753155&r2=753156&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/console/plugin-portlets/src/main/webapp/WEB-INF/view/car/createPluginIndex.jsp (original)
+++ geronimo/server/trunk/plugins/console/plugin-portlets/src/main/webapp/WEB-INF/view/car/createPluginIndex.jsp Fri Mar 13 08:21:04 2009
@@ -25,7 +25,7 @@
with(document.<portlet:namespace/>ExportForm){
selected = configId.options[configId.selectedIndex].text;
if (selected==null || selected=="") {
- alert("<fmt:message key="car.index.validateConfig"/>");
+ addErrorMessage("<portlet:namespace/>", '<fmt:message key="car.index.validateConfig"/>');
return false;
}
}
@@ -35,6 +35,8 @@
<portlet:defineObjects/>
+<div id="<portlet:namespace/>CommonMsgContainer"></div>
+
<h2><fmt:message key="car.common.createGeronimoPlugin"/></h2>
<p><label for="<portlet:namespace/>configId"><fmt:message key="car.index.createGeronimoPluginExp"/></label></p>
Modified: geronimo/server/trunk/plugins/console/plugin-portlets/src/main/webapp/WEB-INF/view/car/list.jsp
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/console/plugin-portlets/src/main/webapp/WEB-INF/view/car/list.jsp?rev=753156&r1=753155&r2=753156&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/console/plugin-portlets/src/main/webapp/WEB-INF/view/car/list.jsp (original)
+++ geronimo/server/trunk/plugins/console/plugin-portlets/src/main/webapp/WEB-INF/view/car/list.jsp Fri Mar 13 08:21:04 2009
@@ -30,11 +30,13 @@
return true;
}
}
- alert("You must choose at least one plugin to install.");
+ addErrorMessage("<portlet:namespace/>", '<fmt:message key="car.list.nothing"/>');
return false;
}
</script>
+<div id="<portlet:namespace/>CommonMsgContainer"></div>
+
<h3><fmt:message key="car.list.pluginRepo" /> <a href='${repository}'>${repository}</a></h3>
<c:choose>
Modified: geronimo/server/trunk/plugins/console/plugin-portlets/src/main/webapp/WEB-INF/view/realmwizard/advanced.jsp
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/console/plugin-portlets/src/main/webapp/WEB-INF/view/realmwizard/advanced.jsp?rev=753156&r1=753155&r2=753156&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/console/plugin-portlets/src/main/webapp/WEB-INF/view/realmwizard/advanced.jsp (original)
+++ geronimo/server/trunk/plugins/console/plugin-portlets/src/main/webapp/WEB-INF/view/realmwizard/advanced.jsp Fri Mar 13 08:21:04 2009
@@ -26,28 +26,38 @@
<script language="JavaScript">
var <portlet:namespace/>formName = "<portlet:namespace/>RealmForm";
function <portlet:namespace/>validateForm(){
- var valid = true;
- var realmForm = document.forms[<portlet:namespace/>formName];
- if(realmForm.elements['enableAuditing'].checked)
- valid = textElementsNotEmpty(<portlet:namespace/>formName, new Array('auditPath'));
- if(!valid) return false;
-
- if(realmForm.elements['enableLockout'].checked) {
- var fields = new Array('lockoutCount', 'lockoutWindow', 'lockoutDuration');
- for(i in fields) {
- valid = checkIntegral(<portlet:namespace/>formName, fields[i]);
- if(!valid) return false;
+ with(document.forms[<portlet:namespace/>formName]) {
+ if(enableAuditing.checked) {
+ var requiredFields = new Array('auditPath');
+ if (!textElementsNotEmpty(<portlet:namespace/>formName, requiredFields)) {
+ addErrorMessage("<portlet:namespace/>", '<fmt:message key="realmwizard.common.emptyText"/>');
+ return false;
+ }
+ }
+ if(enableLockout.checked) {
+ var integerFields = new Array('lockoutCount', 'lockoutWindow', 'lockoutDuration');
+ for(i in integerFields) {
+ if (!checkIntegral(<portlet:namespace/>formName, integerFields[i])) {
+ addErrorMessage("<portlet:namespace/>", '<fmt:message key="realmwizard.common.integer"/>');
+ return false;
+ }
+ }
}
+ if(namedUPC.checked) {
+ var requiredFields = new Array('credentialName');
+ if (!textElementsNotEmpty(<portlet:namespace/>formName, requiredFields)) {
+ addErrorMessage("<portlet:namespace/>", '<fmt:message key="realmwizard.common.emptyText"/>');
+ return false;
+ }
+ }
}
-
- if(realmForm.elements['namedUPC'].checked)
- valid = textElementsNotEmpty(<portlet:namespace/>formName, new Array('credentialName'));
- if(!valid) return false;
-
+
return true;
}
</script>
+<div id="<portlet:namespace/>CommonMsgContainer"></div>
+
<p><fmt:message key="realmwizard.advanced.title" /></p>
<c:if test="${!(empty AdvancedError)}"><p><font color="red"><b>Error: ${AdvancedError}</b></font></p></c:if>
Modified: geronimo/server/trunk/plugins/console/plugin-portlets/src/main/webapp/WEB-INF/view/realmwizard/configure.jsp
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/console/plugin-portlets/src/main/webapp/WEB-INF/view/realmwizard/configure.jsp?rev=753156&r1=753155&r2=753156&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/console/plugin-portlets/src/main/webapp/WEB-INF/view/realmwizard/configure.jsp (original)
+++ geronimo/server/trunk/plugins/console/plugin-portlets/src/main/webapp/WEB-INF/view/realmwizard/configure.jsp Fri Mar 13 08:21:04 2009
@@ -31,9 +31,11 @@
var <portlet:namespace/>passwordFields;
function <portlet:namespace/>validateForm(){
if(!textElementsNotEmpty(<portlet:namespace/>formName,<portlet:namespace/>requiredFields)) {
+ addErrorMessage("<portlet:namespace/>", '<fmt:message key="realmwizard.common.emptyText"/>');
return false;
}
if(!passwordElementsConfirm(<portlet:namespace/>formName, <portlet:namespace/>passwordFields)) {
+ addErrorMessage("<portlet:namespace/>", '<fmt:message key="realmwizard.common.passwordMismatch"/>');
return false;
}
return true;
@@ -41,6 +43,7 @@
</script>
<CommonMsg:commonMsg/>
+<div id="<portlet:namespace/>CommonMsgContainer"></div>
<p><fmt:message key="realmwizard.configure.title" /></p>
Modified: geronimo/server/trunk/plugins/console/plugin-portlets/src/main/webapp/WEB-INF/view/realmwizard/list.jsp
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/console/plugin-portlets/src/main/webapp/WEB-INF/view/realmwizard/list.jsp?rev=753156&r1=753155&r2=753156&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/console/plugin-portlets/src/main/webapp/WEB-INF/view/realmwizard/list.jsp (original)
+++ geronimo/server/trunk/plugins/console/plugin-portlets/src/main/webapp/WEB-INF/view/realmwizard/list.jsp Fri Mar 13 08:21:04 2009
@@ -22,9 +22,6 @@
<p><fmt:message key="realmwizard.list.title" /></p>
-<c:choose>
- <c:when test="${empty(realms)}"><p><i><fmt:message key="realmwizard.list.noSecurityRealms" /></i></p></c:when>
- <c:otherwise>
<p><fmt:message key="realmwizard.list.seeExamples" /></p>
<table width="100%" class="TableLine" summary="Security Realms - List">
@@ -86,8 +83,6 @@
</tr>
</c:forEach>
</table>
- </c:otherwise>
-</c:choose>
<p><a href="<portlet:actionURL portletMode="view">
<portlet:param name="mode" value="type" />
Modified: geronimo/server/trunk/plugins/console/plugin-portlets/src/main/webapp/WEB-INF/view/realmwizard/selectType.jsp
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/console/plugin-portlets/src/main/webapp/WEB-INF/view/realmwizard/selectType.jsp?rev=753156&r1=753155&r2=753156&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/console/plugin-portlets/src/main/webapp/WEB-INF/view/realmwizard/selectType.jsp (original)
+++ geronimo/server/trunk/plugins/console/plugin-portlets/src/main/webapp/WEB-INF/view/realmwizard/selectType.jsp Fri Mar 13 08:21:04 2009
@@ -27,10 +27,16 @@
var <portlet:namespace/>formName = "<portlet:namespace/>RealmForm";
var <portlet:namespace/>requiredFields = new Array("name");
function <portlet:namespace/>validateForm(){
- return textElementsNotEmpty(<portlet:namespace/>formName,<portlet:namespace/>requiredFields);
+ if(!textElementsNotEmpty(<portlet:namespace/>formName,<portlet:namespace/>requiredFields)) {
+ addErrorMessage("<portlet:namespace/>", '<fmt:message key="realmwizard.common.emptyText"/>');
+ return false;
+ }
+ return true;
}
</script>
+<div id="<portlet:namespace/>CommonMsgContainer"></div>
+
<p><fmt:message key="realmwizard.selectType.title" /></p>
<!-- FORM TO COLLECT DATA FOR THIS PAGE -->
Modified: geronimo/server/trunk/plugins/console/plugin-portlets/src/main/webapp/WEB-INF/view/realmwizard/testLogin.jsp
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/console/plugin-portlets/src/main/webapp/WEB-INF/view/realmwizard/testLogin.jsp?rev=753156&r1=753155&r2=753156&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/console/plugin-portlets/src/main/webapp/WEB-INF/view/realmwizard/testLogin.jsp (original)
+++ geronimo/server/trunk/plugins/console/plugin-portlets/src/main/webapp/WEB-INF/view/realmwizard/testLogin.jsp Fri Mar 13 08:21:04 2009
@@ -27,10 +27,16 @@
var <portlet:namespace/>formName = "<portlet:namespace/>RealmForm";
var <portlet:namespace/>requiredFields = new Array('username');
function <portlet:namespace/>validateForm(){
- return textElementsNotEmpty(<portlet:namespace/>formName,<portlet:namespace/>requiredFields);
+ if(!textElementsNotEmpty(<portlet:namespace/>formName, <portlet:namespace/>requiredFields)) {
+ addErrorMessage("<portlet:namespace/>", '<fmt:message key="realmwizard.common.emptyText"/>');
+ return false;
+ }
+ return true;
}
</script>
+<div id="<portlet:namespace/>CommonMsgContainer"></div>
+
<p><fmt:message key="realmwizard.testLogin.title" /></p>
<p><fmt:message key="realmwizard.testLogin.summary" /></p>
Modified: geronimo/server/trunk/plugins/corba/geronimo-yoko/src/main/java/org/apache/geronimo/yoko/ORBConfigAdapter.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/corba/geronimo-yoko/src/main/java/org/apache/geronimo/yoko/ORBConfigAdapter.java?rev=753156&r1=753155&r2=753156&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/corba/geronimo-yoko/src/main/java/org/apache/geronimo/yoko/ORBConfigAdapter.java (original)
+++ geronimo/server/trunk/plugins/corba/geronimo-yoko/src/main/java/org/apache/geronimo/yoko/ORBConfigAdapter.java Fri Mar 13 08:21:04 2009
@@ -171,17 +171,25 @@
public Object createNameService(String host, int port) throws ConfigException {
try {
// create a name service using the supplied host and publish under the name "NameService"
- TransientNameService service = new TransientNameService(host, port, "NameService");
- // Create an ORB object
- java.util.Properties props = new Properties();
- props.putAll(System.getProperties());
- props.put("org.omg.CORBA.ORBServerId", "1000000" ) ;
- props.put("org.omg.CORBA.ORBClass", "org.apache.yoko.orb.CORBA.ORB");
- props.put("org.omg.CORBA.ORBSingletonClass", "org.apache.yoko.orb.CORBA.ORBSingleton");
- props.put("yoko.orb.oa.endpoint", "iiop --bind " + host + " --host " + host + " --port " + port );
- log.debug("Creating ORB endpoint with host=" + host + ", port=" + port);
- ORB createdOrb = ORB.init((String[])null, props) ;
- service.initialize(createdOrb);
+ TransientNameService service = new TransientNameService(host, port, "NameService") {
+ public void run() throws TransientServiceException {
+ // Create an ORB object
+ java.util.Properties props = new Properties();
+ props.putAll(System.getProperties());
+
+ props.put("org.omg.CORBA.ORBServerId", "1000000" ) ;
+ props.put("org.omg.CORBA.ORBClass", "org.apache.yoko.orb.CORBA.ORB");
+ props.put("org.omg.CORBA.ORBSingletonClass", "org.apache.yoko.orb.CORBA.ORBSingleton");
+ props.put("yoko.orb.oa.endpoint", "iiop --bind " + host + " --host " + host + " --port " + port );
+
+ createdOrb = ORB.init((String[])null, props) ;
+
+ // now initialize the service
+ initialize(createdOrb);
+ }
+ };
+ service.run();
+ log.debug("Creating ORB endpoint with host=" + host + ", port=" + port);
// the service instance is returned as an opaque object.
return service;
} catch (TransientServiceException e) {