geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dwo...@apache.org
Subject svn commit: r732412 - in /geronimo/server/trunk/plugins/console: console-core/ console-jetty/src/main/history/ console-tomcat/src/main/history/ plugin-portlets/src/main/java/org/apache/geronimo/console/configmanager/ plugin-portlets/src/main/java/org/a...
Date Wed, 07 Jan 2009 18:14:14 GMT
Author: dwoods
Date: Wed Jan  7 10:14:14 2009
New Revision: 732412

URL: http://svn.apache.org/viewvc?rev=732412&view=rev
Log:
GERONIMO-4484 Extraction, localization and display of messages generated in portlets.  Applied
common-message-plugin.patch from Gang Yin, along with removing Tomcat API depends introduced
in early patch.

Added:
    geronimo/server/trunk/plugins/console/plugin-portlets/src/main/webapp/WEB-INF/CommonMsg.tld
  (with props)
Modified:
    geronimo/server/trunk/plugins/console/console-core/pom.xml
    geronimo/server/trunk/plugins/console/console-jetty/src/main/history/dependencies.xml
    geronimo/server/trunk/plugins/console/console-tomcat/src/main/history/dependencies.xml
    geronimo/server/trunk/plugins/console/plugin-portlets/src/main/java/org/apache/geronimo/console/configmanager/DeploymentPortlet.java
    geronimo/server/trunk/plugins/console/plugin-portlets/src/main/java/org/apache/geronimo/console/securitymanager/realm/SecurityRealmPortlet.java
    geronimo/server/trunk/plugins/console/plugin-portlets/src/main/resources/portletinfo.properties
    geronimo/server/trunk/plugins/console/plugin-portlets/src/main/resources/portletinfo_zh.properties
    geronimo/server/trunk/plugins/console/plugin-portlets/src/main/webapp/WEB-INF/portlet.xml
    geronimo/server/trunk/plugins/console/plugin-portlets/src/main/webapp/WEB-INF/view/car/results.jsp
    geronimo/server/trunk/plugins/console/plugin-portlets/src/main/webapp/WEB-INF/view/configmanager/deploy.jsp
    geronimo/server/trunk/plugins/console/plugin-portlets/src/main/webapp/WEB-INF/view/realmwizard/_sql.jsp
    geronimo/server/trunk/plugins/console/plugin-portlets/src/main/webapp/WEB-INF/view/realmwizard/configure.jsp

Modified: geronimo/server/trunk/plugins/console/console-core/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/console/console-core/pom.xml?rev=732412&r1=732411&r2=732412&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/console/console-core/pom.xml (original)
+++ geronimo/server/trunk/plugins/console/console-core/pom.xml Wed Jan  7 10:14:14 2009
@@ -78,9 +78,9 @@
         </dependency>
 
         <dependency>
-            <groupId>org.apache.tomcat</groupId>
-            <artifactId>jsp-api</artifactId>
-            <version>6.0.18</version>
+            <groupId>org.apache.geronimo.specs</groupId>
+            <artifactId>geronimo-jsp_2.1_spec</artifactId>
+            <scope>provided</scope>
         </dependency>
     </dependencies>
 

Modified: geronimo/server/trunk/plugins/console/console-jetty/src/main/history/dependencies.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/console/console-jetty/src/main/history/dependencies.xml?rev=732412&r1=732411&r2=732412&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/console/console-jetty/src/main/history/dependencies.xml
(original)
+++ geronimo/server/trunk/plugins/console/console-jetty/src/main/history/dependencies.xml
Wed Jan  7 10:14:14 2009
@@ -46,19 +46,4 @@
         <artifactId>console-core</artifactId>
         <type>jar</type>
     </dependency>
-    <dependency>
-        <groupId>org.apache.tomcat</groupId>
-        <artifactId>jsp-api</artifactId>
-        <type>jar</type>
-    </dependency>
-    <dependency>
-        <groupId>org.apache.tomcat</groupId>
-        <artifactId>el-api</artifactId>
-        <type>jar</type>
-    </dependency>
-    <dependency>
-        <groupId>org.apache.tomcat</groupId>
-        <artifactId>servlet-api</artifactId>
-        <type>jar</type>
-    </dependency>
 </plugin-artifact>

Modified: geronimo/server/trunk/plugins/console/console-tomcat/src/main/history/dependencies.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/console/console-tomcat/src/main/history/dependencies.xml?rev=732412&r1=732411&r2=732412&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/console/console-tomcat/src/main/history/dependencies.xml
(original)
+++ geronimo/server/trunk/plugins/console/console-tomcat/src/main/history/dependencies.xml
Wed Jan  7 10:14:14 2009
@@ -46,19 +46,4 @@
         <artifactId>console-core</artifactId>
         <type>jar</type>
     </dependency>
-    <dependency>
-        <groupId>org.apache.tomcat</groupId>
-        <artifactId>jsp-api</artifactId>
-        <type>jar</type>
-    </dependency>
-    <dependency>
-        <groupId>org.apache.tomcat</groupId>
-        <artifactId>el-api</artifactId>
-        <type>jar</type>
-    </dependency>
-    <dependency>
-        <groupId>org.apache.tomcat</groupId>
-        <artifactId>servlet-api</artifactId>
-        <type>jar</type>
-    </dependency>
 </plugin-artifact>

Modified: geronimo/server/trunk/plugins/console/plugin-portlets/src/main/java/org/apache/geronimo/console/configmanager/DeploymentPortlet.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/console/plugin-portlets/src/main/java/org/apache/geronimo/console/configmanager/DeploymentPortlet.java?rev=732412&r1=732411&r2=732412&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/console/plugin-portlets/src/main/java/org/apache/geronimo/console/configmanager/DeploymentPortlet.java
(original)
+++ geronimo/server/trunk/plugins/console/plugin-portlets/src/main/java/org/apache/geronimo/console/configmanager/DeploymentPortlet.java
Wed Jan  7 10:14:14 2009
@@ -154,7 +154,8 @@
                 String abbrStatusMessage;
                 String fullStatusMessage = null;
                 if(progress.getDeploymentStatus().isCompleted()) {
-                    abbrStatusMessage = "The application was successfully "+(isRedeploy ?
"re" : "")+"deployed.<br/>";
+                    abbrStatusMessage = getLocalizedString(!isRedeploy ? "infoMsg01" : "infoMsg02",
actionRequest);
+                    addInfoMessage(actionRequest, abbrStatusMessage);
                     // start installed app/s
                     if (!isRedeploy && startApp != null && !startApp.equals(""))
{
                         progress = mgr.start(progress.getResultTargetModuleIDs());
@@ -162,18 +163,20 @@
                             Thread.sleep(100);
                         }
                         if (progress.getDeploymentStatus().isCompleted()) {
-                            abbrStatusMessage += "The application was successfully started";
+                            abbrStatusMessage = getLocalizedString("infoMsg03", actionRequest);
+                            addInfoMessage(actionRequest, abbrStatusMessage);
                         } else {
-                            abbrStatusMessage += "The application was not successfully started";
+                            abbrStatusMessage = getLocalizedString("errorMsg02", actionRequest);
                             fullStatusMessage = progress.getDeploymentStatus().getMessage();
+                            addErrorMessage(actionRequest, abbrStatusMessage, fullStatusMessage);
                         }
                     }
                 } else {
                     fullStatusMessage = progress.getDeploymentStatus().getMessage();
                     // for the abbreviated status message clip off everything
-                    // after the first line, which in most cases means the gnarly stacktrace

-                    abbrStatusMessage = "Deployment failed:<br/>"
-                                      + fullStatusMessage.substring(0, fullStatusMessage.indexOf('\n'));
+                    // after the first line, which in most cases means the gnarly stacktrace
+                    abbrStatusMessage = getLocalizedString("errorMsg01", actionRequest);
+                    addErrorMessage(actionRequest, abbrStatusMessage, fullStatusMessage);
                     // try to provide an upgraded version of the plan
                     try {
                         if (planFile != null && planFile.exists()) {
@@ -200,10 +203,6 @@
                         // status message has already been provided in this case
                     }
                 }
-                // have to store the status messages in the portlet session
-                // because the buffer size for render parameters is sometimes not big enough
-                actionRequest.getPortletSession().setAttribute(FULL_STATUS_PARM, fullStatusMessage);
-                actionRequest.getPortletSession().setAttribute(ABBR_STATUS_PARM, abbrStatusMessage);
             } finally {
                 mgr.release();
                 if (fis!=null) fis.close();
@@ -264,8 +263,6 @@
         // session during the processAction phase and then copied into render
         // attributes here so the JSP has easier access to them. This seems
         // to only be an issue on tomcat.
-        copyRenderAttribute(renderRequest, FULL_STATUS_PARM);
-        copyRenderAttribute(renderRequest, ABBR_STATUS_PARM);
         copyRenderAttribute(renderRequest, MIGRATED_PLAN_PARM);
         copyRenderAttribute(renderRequest, ORIGINAL_PLAN_PARM);
         deployView.include(renderRequest, renderResponse);

Modified: geronimo/server/trunk/plugins/console/plugin-portlets/src/main/java/org/apache/geronimo/console/securitymanager/realm/SecurityRealmPortlet.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/console/plugin-portlets/src/main/java/org/apache/geronimo/console/securitymanager/realm/SecurityRealmPortlet.java?rev=732412&r1=732411&r2=732412&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/console/plugin-portlets/src/main/java/org/apache/geronimo/console/securitymanager/realm/SecurityRealmPortlet.java
(original)
+++ geronimo/server/trunk/plugins/console/plugin-portlets/src/main/java/org/apache/geronimo/console/securitymanager/realm/SecurityRealmPortlet.java
Wed Jan  7 10:14:14 2009
@@ -200,8 +200,8 @@
             if (error == null) {
                 actionResponse.setRenderParameter(MODE_KEY, ADVANCED_MODE);
             } else {
-                actionResponse.setRenderParameter("LoginModuleError", error);
                 actionResponse.setRenderParameter(MODE_KEY, CONFIGURE_MODE);
+                addErrorMessage(actionRequest, error);
             }
         } else if (mode.equals("process-" + ADVANCED_MODE)) {
             String test = actionRequest.getParameter("test");
@@ -590,10 +590,6 @@
     }
 
     private void renderConfigure(RenderRequest request, RenderResponse response, RealmData
data) throws IOException, PortletException {
-        // Pass errors through
-        if (request.getParameter("LoginModuleError") != null) {
-            request.setAttribute("LoginModuleError", request.getParameter("LoginModuleError"));
-        }
         // Clear out any cached modules
         data.modules = null;
         // Configure option list

Modified: geronimo/server/trunk/plugins/console/plugin-portlets/src/main/resources/portletinfo.properties
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/console/plugin-portlets/src/main/resources/portletinfo.properties?rev=732412&r1=732411&r2=732412&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/console/plugin-portlets/src/main/resources/portletinfo.properties
(original)
+++ geronimo/server/trunk/plugins/console/plugin-portlets/src/main/resources/portletinfo.properties
Wed Jan  7 10:14:14 2009
@@ -28,3 +28,13 @@
 Plugins = Plugins
 
 Security\ Realms = Security Realms
+
+errorMsg01 = Deployment Failed
+
+errorMsg02 = The application was not successfully started
+
+infoMsg01 = The application was successfully deployed.
+
+infoMsg02 = The application was successfully redeployed.
+
+infoMsg03 = The application was successfully started.

Modified: geronimo/server/trunk/plugins/console/plugin-portlets/src/main/resources/portletinfo_zh.properties
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/console/plugin-portlets/src/main/resources/portletinfo_zh.properties?rev=732412&r1=732411&r2=732412&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/console/plugin-portlets/src/main/resources/portletinfo_zh.properties
(original)
+++ geronimo/server/trunk/plugins/console/plugin-portlets/src/main/resources/portletinfo_zh.properties
Wed Jan  7 10:14:14 2009
@@ -28,3 +28,13 @@
 Plugins = \u63D2\u4EF6
 
 Security\ Realms = \u5B89\u5168\u57DF
+
+errorMsg01 = \u90E8\u7F72\u5931\u8D25
+
+errorMsg02 = \u672A\u6210\u529F\u542F\u52A8\u5E94\u7528
+
+infoMsg01 = \u6210\u529F\u90E8\u7F72\u5E94\u7528
+
+infoMsg02 = \u6210\u529F\u91CD\u65B0\u90E8\u7F72\u5E94\u7528
+
+infoMsg03 = \u6210\u529F\u542F\u52A8\u5E94\u7528

Added: geronimo/server/trunk/plugins/console/plugin-portlets/src/main/webapp/WEB-INF/CommonMsg.tld
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/console/plugin-portlets/src/main/webapp/WEB-INF/CommonMsg.tld?rev=732412&view=auto
==============================================================================
--- geronimo/server/trunk/plugins/console/plugin-portlets/src/main/webapp/WEB-INF/CommonMsg.tld
(added)
+++ geronimo/server/trunk/plugins/console/plugin-portlets/src/main/webapp/WEB-INF/CommonMsg.tld
Wed Jan  7 10:14:14 2009
@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!DOCTYPE taglib PUBLIC
+  "-//Sun Microsystems, Inc.//DTD JSP Tag Library 1.1//EN"
+  "http://java.sun.com/j2ee/dtds/web-jsptaglibrary_1_1.dtd">
+<!-- 
+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.
+-->
+
+<taglib>
+  
+  <tlibversion>1.0</tlibversion>
+  <jspversion>1.1</jspversion>
+  <shortname>pluto</shortname>
+  <uri>http://portals.apache.org/pluto</uri>
+
+    <tag>
+        <name>commonMsg</name>
+        <tagclass>
+            org.apache.geronimo.console.message.CommonMessageTag
+        </tagclass>
+        <bodycontent>empty</bodycontent>
+    </tag>
+
+</taglib>
+

Propchange: geronimo/server/trunk/plugins/console/plugin-portlets/src/main/webapp/WEB-INF/CommonMsg.tld
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: geronimo/server/trunk/plugins/console/plugin-portlets/src/main/webapp/WEB-INF/portlet.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/console/plugin-portlets/src/main/webapp/WEB-INF/portlet.xml?rev=732412&r1=732411&r2=732412&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/console/plugin-portlets/src/main/webapp/WEB-INF/portlet.xml
(original)
+++ geronimo/server/trunk/plugins/console/plugin-portlets/src/main/webapp/WEB-INF/portlet.xml
Wed Jan  7 10:14:14 2009
@@ -22,7 +22,6 @@
 
 <portlet-app version="1.0">
 
-
     <portlet>
         <description>Portlet for deploying applications</description>
         <portlet-name>Deployment</portlet-name>
@@ -35,6 +34,8 @@
             <portlet-mode>HELP</portlet-mode>
         </supports>
         <supported-locale>en</supported-locale>
+        <supported-locale>zh</supported-locale>
+        <resource-bundle>portletinfo</resource-bundle>
         <portlet-info>
             <title>Install New Applications</title>
             <short-title>Install Application</short-title>
@@ -55,6 +56,8 @@
             <portlet-mode>HELP</portlet-mode>
         </supports>
         <supported-locale>en</supported-locale>
+        <supported-locale>zh</supported-locale>
+        <resource-bundle>portletinfo</resource-bundle>
         <portlet-info>
             <title>Install Plugins</title>
             <short-title>Install Plugins</short-title>
@@ -74,6 +77,8 @@
             <portlet-mode>HELP</portlet-mode>
         </supports>
         <supported-locale>en</supported-locale>
+        <supported-locale>zh</supported-locale>
+        <resource-bundle>portletinfo</resource-bundle>
         <portlet-info>
             <title>Assemble Server</title>
             <short-title>Assemble Server</short-title>
@@ -93,6 +98,8 @@
             <portlet-mode>HELP</portlet-mode>
         </supports>
         <supported-locale>en</supported-locale>
+        <supported-locale>zh</supported-locale>
+        <resource-bundle>portletinfo</resource-bundle>
         <portlet-info>
             <title>Create Plugin</title>
             <short-title>Create Plugin</short-title>
@@ -111,6 +118,8 @@
             <portlet-mode>VIEW</portlet-mode>
         </supports>
         <supported-locale>en</supported-locale>
+        <supported-locale>zh</supported-locale>
+        <resource-bundle>portletinfo</resource-bundle>
         <portlet-info>
             <title>Security Realms</title>
             <short-title>Security Realms</short-title>

Modified: geronimo/server/trunk/plugins/console/plugin-portlets/src/main/webapp/WEB-INF/view/car/results.jsp
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/console/plugin-portlets/src/main/webapp/WEB-INF/view/car/results.jsp?rev=732412&r1=732411&r2=732412&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/console/plugin-portlets/src/main/webapp/WEB-INF/view/car/results.jsp
(original)
+++ geronimo/server/trunk/plugins/console/plugin-portlets/src/main/webapp/WEB-INF/view/car/results.jsp
Wed Jan  7 10:14:14 2009
@@ -21,9 +21,7 @@
 <%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt"%>
 <fmt:setBundle basename="pluginportlets"/>
 <portlet:defineObjects/>
-<p>
-<fmt:message key="car.results.titles" />
-</p>
+<p><b><fmt:message key="car.results.titles" />:</b></p>
 <% 
     String[] configIds = request.getParameterValues("configId");
     for(int j=0;j<configIds.length;j++){

Modified: geronimo/server/trunk/plugins/console/plugin-portlets/src/main/webapp/WEB-INF/view/configmanager/deploy.jsp
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/console/plugin-portlets/src/main/webapp/WEB-INF/view/configmanager/deploy.jsp?rev=732412&r1=732411&r2=732412&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/console/plugin-portlets/src/main/webapp/WEB-INF/view/configmanager/deploy.jsp
(original)
+++ geronimo/server/trunk/plugins/console/plugin-portlets/src/main/webapp/WEB-INF/view/configmanager/deploy.jsp
Wed Jan  7 10:14:14 2009
@@ -17,6 +17,7 @@
 <%@ 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="pluginportlets"/>
 <portlet:defineObjects/>
 
@@ -32,23 +33,7 @@
 }
 </script>
 
-<!-- Abbreviated status message -->
-<c:if test="${!(empty abbrStatusMessage)}">
-    <div id="<portlet:namespace/>abbrStatusMessage" style="display:inline">
-     ${abbrStatusMessage}<br/>
-    <c:if test="${!(empty fullStatusMessage)}">
-    <button onclick="<portlet:namespace/>toggleDisplay('fullStatusMessage');<portlet:namespace/>toggleDisplay('abbrStatusMessage');return
false;">Show full details</button>
-    </c:if>
-    </div>
-</c:if>
-<!-- Full status message -->
-<c:if test="${!(empty fullStatusMessage)}">
-    <div id="<portlet:namespace/>fullStatusMessage" style="display:none">
-    <pre>
-<c:out escapeXml="true" value="${fullStatusMessage}"/>
-    </pre>
-    </div>
-</c:if>
+<CommonMsg:commonMsg/>
 
 <P/>
 

Modified: geronimo/server/trunk/plugins/console/plugin-portlets/src/main/webapp/WEB-INF/view/realmwizard/_sql.jsp
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/console/plugin-portlets/src/main/webapp/WEB-INF/view/realmwizard/_sql.jsp?rev=732412&r1=732411&r2=732412&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/console/plugin-portlets/src/main/webapp/WEB-INF/view/realmwizard/_sql.jsp
(original)
+++ geronimo/server/trunk/plugins/console/plugin-portlets/src/main/webapp/WEB-INF/view/realmwizard/_sql.jsp
Wed Jan  7 10:14:14 2009
@@ -154,12 +154,12 @@
                    size="20" value="${realm.options['jdbcPassword']}"></td>
       </tr>
       <tr>
+        <td></td>
+        <td><fmt:message key="realmwizard._sql.JDBCPasswordExp" /></td>
+      </tr>
+      <tr>
         <th><div align="right"><label for="<portlet:namespace/>confirm-option-jdbcPassword"><fmt:message
key="consolebase.common.confirmPassword"/></label></div></th>
         <td><input name="confirm-option-jdbcPassword" id="<portlet:namespace/>confirm-option-jdbcPassword"
type="password"
                    size="20" value="${realm.options['jdbcPassword']}"></td>
       </tr>
-      <tr>
-        <td></td>
-        <td><fmt:message key="realmwizard._sql.JDBCPasswordExp" /></td>
-      </tr>
 

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=732412&r1=732411&r2=732412&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
Wed Jan  7 10:14:14 2009
@@ -21,6 +21,7 @@
 <%@ taglib uri="http://java.sun.com/jsp/jstl/functions" prefix="fn" %>
 <%@ 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="pluginportlets"/>
 <portlet:defineObjects/>
 
@@ -39,9 +40,9 @@
 }
 </script>
 
-<p><fmt:message key="realmwizard.configure.title" /></p>
+<CommonMsg:commonMsg/>
 
-<c:if test="${!(empty LoginModuleError)}"><p><font color="red"><b>Error:
${LoginModuleError}</b></font></p></c:if>
+<p><fmt:message key="realmwizard.configure.title" /></p>
 
 <!--   FORM TO COLLECT DATA FOR THIS PAGE   -->
 <form name="<portlet:namespace/>RealmForm" action="<portlet:actionURL/>">
@@ -100,6 +101,10 @@
                    type="<c:choose><c:when test="${optionMap[option].password}">password</c:when><c:otherwise>text</c:otherwise></c:choose>"
                    size="${optionMap[option].length}" value="${realm.options[option]}"></td>
       </tr>
+      <tr>
+        <td></td>
+        <td>${optionMap[option].description}</td>
+      </tr>
     <c:if test="${optionMap[option].password}">
       <tr>
         <th style="min-width: 140px"><div align="right"><label for="<portlet:namespace/>confirm-option-${option}">Confirm
password</label>:</div></th>
@@ -110,10 +115,6 @@
           <portlet:namespace/>passwordFields = <portlet:namespace/>passwordFields.concat(new
Array('option-${option}'))
       </script>
     </c:if>
-      <tr>
-        <td></td>
-        <td>${optionMap[option].description}</td>
-      </tr>
       <c:if test="${!optionMap[option].blankAllowed}">
         <script language="JavaScript">
           <portlet:namespace/>requiredFields = <portlet:namespace/>requiredFields.concat(new
Array('option-${option}'))



Mime
View raw message