geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ga...@apache.org
Subject svn commit: r742700 [2/3] - in /geronimo/server/branches/2.1/plugins: activemq/activemq-portlets/src/main/resources/ activemq/activemq-portlets/src/main/webapp/WEB-INF/view/jmswizard/ console/console-base-portlets/src/main/resources/ console/console-ba...
Date Mon, 09 Feb 2009 19:43:17 GMT
Modified: geronimo/server/branches/2.1/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/configmanager/normal.jsp
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/configmanager/normal.jsp?rev=742700&r1=742699&r2=742700&view=diff
==============================================================================
--- geronimo/server/branches/2.1/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/configmanager/normal.jsp (original)
+++ geronimo/server/branches/2.1/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/configmanager/normal.jsp Mon Feb  9 19:43:14 2009
@@ -216,11 +216,11 @@
 
 
 <form name="checkExpert" method="POST">
-<input type="checkbox" name="expertMode" onClick="toggleExpertMode();" />&nbsp;Expert User (enable all actions on Geronimo Provided Components)  
+<input type="checkbox" name="expertMode" id="<portlet:namespace/>expertMode" onClick="toggleExpertMode();" />&nbsp;<label for="<portlet:namespace/>expertMode"><fmt:message key="configmanager.normal.expertMode" /></label>  
 </form>
 
 <form name="showDependenciesForm" method="POST">
-<input type="checkbox" name="showDependenciesMode" onClick="toggleShowDependenciesMode();" />&nbsp;Show parent and child components
+<input type="checkbox" name="showDependenciesMode" id="<portlet:namespace/>showDependenciesMode" onClick="toggleShowDependenciesMode();" />&nbsp;<label for="<portlet:namespace/>showDependenciesMode"><fmt:message key="configmanager.normal.showDependencyMode" /></label>
 </form>
 
 <table width="100%">

Modified: geronimo/server/branches/2.1/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/infomanager/javaSysNormal.jsp
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/infomanager/javaSysNormal.jsp?rev=742700&r1=742699&r2=742700&view=diff
==============================================================================
--- geronimo/server/branches/2.1/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/infomanager/javaSysNormal.jsp (original)
+++ geronimo/server/branches/2.1/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/infomanager/javaSysNormal.jsp Mon Feb  9 19:43:14 2009
@@ -128,7 +128,7 @@
 <br>
 <table width="100%">
   <tr>
-    <td class="DarkBackground" width="100%" colspan="2" align="center">Virtual Machine</td>
+    <td class="DarkBackground" width="100%" colspan="2" align="center"><fmt:message key="infomanager.javaSysNormal.virtualMachine"/></td>
   </tr>
   <tr>
     <td class="LightBackground" width="20%" nowrap>java.vm.info</td>
@@ -162,7 +162,7 @@
 <br>
 <table width="100%">
   <tr>
-    <td class="DarkBackground" width="100%" colspan="2" align="center">Operating System</td>
+    <td class="DarkBackground" width="100%" colspan="2" align="center"><fmt:message key="infomanager.javaSysNormal.operatingSystem"/></td>
   </tr>
   <tr>
     <td class="LightBackground" width="20%" nowrap>os.arch</td>
@@ -234,7 +234,7 @@
 <br>
 <table width="100%">
   <tr>
-    <td class="DarkBackground" width="100%" colspan="2" align="center">User</td>
+    <td class="DarkBackground" width="100%" colspan="2" align="center"><fmt:message key="infomanager.javaSysNormal.user"/></td>
   </tr>
   <tr>
     <td class="LightBackground" width="20%" nowrap>user.country</td>
@@ -268,7 +268,7 @@
 <br>
 <table width="100%">
   <tr>
-    <td class="DarkBackground" width="100%" colspan="2" align="center">Etc</td>
+    <td class="DarkBackground" width="100%" colspan="2" align="center"><fmt:message key="infomanager.javaSysNormal.etc"/></td>
   </tr>
 <% String background = "LightBackground"; %>
 <%  // Crappy workaround because apparently Jetty's JSTL can't call getters on a Map subclass?!?

Modified: geronimo/server/branches/2.1/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/keystore/certificateDetails.jsp
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/keystore/certificateDetails.jsp?rev=742700&r1=742699&r2=742700&view=diff
==============================================================================
--- geronimo/server/branches/2.1/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/keystore/certificateDetails.jsp (original)
+++ geronimo/server/branches/2.1/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/keystore/certificateDetails.jsp Mon Feb  9 19:43:14 2009
@@ -56,7 +56,7 @@
 <portlet:param name="mode" value="changePassword-before" />
 <portlet:param name="keystore" value="${id}" />
 <portlet:param name="alias" value="${alias}" /></portlet:actionURL>">
-Change key password</a></td>
+<fmt:message key="keystore.certificateDetails.changeKeyPwd"/></a></td>
 </c:if>
 
 <td>

Modified: geronimo/server/branches/2.1/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/keystore/changePassword.jsp
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/keystore/changePassword.jsp?rev=742700&r1=742699&r2=742700&view=diff
==============================================================================
--- geronimo/server/branches/2.1/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/keystore/changePassword.jsp (original)
+++ geronimo/server/branches/2.1/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/keystore/changePassword.jsp Mon Feb  9 19:43:14 2009
@@ -82,12 +82,12 @@
                         <portlet:param name="mode" value="certificateDetails-before" />
                         <portlet:param name="id" value="${keystore}" />
                         <portlet:param name="alias" value="${alias}" />
-                    </portlet:actionURL>">Cancel</a></p>
+                    </portlet:actionURL>"><fmt:message key="consolebase.common.cancel"/></a></p>
     </c:when>
     <c:otherwise>
         <p><a href="<portlet:actionURL portletMode="view">
                         <portlet:param name="mode" value="viewKeystore-before" />
                         <portlet:param name="id" value="${keystore}" />
-                    </portlet:actionURL>">Cancel</a></p>
+                    </portlet:actionURL>"><fmt:message key="consolebase.common.cancel"/></a></p>
     </c:otherwise>
 </c:choose>

Modified: geronimo/server/branches/2.1/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/securityrealmmanager/se/groups/addmaximized.jsp
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/securityrealmmanager/se/groups/addmaximized.jsp?rev=742700&r1=742699&r2=742700&view=diff
==============================================================================
--- geronimo/server/branches/2.1/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/securityrealmmanager/se/groups/addmaximized.jsp (original)
+++ geronimo/server/branches/2.1/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/securityrealmmanager/se/groups/addmaximized.jsp Mon Feb  9 19:43:14 2009
@@ -70,7 +70,7 @@
       		<c:set var="Submit" value="Add"/>
        </c:when>
        <c:otherwise>
-			<b>UPDATE GROUP</b>
+			<b><fmt:message key="securityrealmmanager.se.groups.addmaximized.updateGroup" /></b>
       		<c:set var="GroupName" value="${group}"/>
       		<c:set var="Submit" value="Update"/>
        </c:otherwise>

Modified: geronimo/server/branches/2.1/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/webaccesslogmanager/view.jsp
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/webaccesslogmanager/view.jsp?rev=742700&r1=742699&r2=742700&view=diff
==============================================================================
--- geronimo/server/branches/2.1/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/webaccesslogmanager/view.jsp (original)
+++ geronimo/server/branches/2.1/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/webaccesslogmanager/view.jsp Mon Feb  9 19:43:14 2009
@@ -178,7 +178,7 @@
                     </tr>
                     <tr>
                         <td colspan="4" align="left">
-                            <input type="submit" value="Filter Log"/>
+                            <input type="submit" value="<fmt:message key="webaccesslogmanager.common.filterLog"/>"/>
                         </td>
                     </tr>
                 </table>

Modified: geronimo/server/branches/2.1/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/webmanager/connector/editConnector.jsp
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/webmanager/connector/editConnector.jsp?rev=742700&r1=742699&r2=742700&view=diff
==============================================================================
--- geronimo/server/branches/2.1/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/webmanager/connector/editConnector.jsp (original)
+++ geronimo/server/branches/2.1/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/webmanager/connector/editConnector.jsp Mon Feb  9 19:43:14 2009
@@ -16,8 +16,9 @@
 --%>
 <%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>
 <%@ taglib uri="http://java.sun.com/jsp/jstl/functions" prefix="fn" %>
-
+<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt"%>
 <%@ taglib prefix="portlet" uri="http://java.sun.com/portlet" %>
+<fmt:setBundle basename="consolebase"/>
 <portlet:defineObjects/>
 
 <script language="JavaScript">
@@ -66,20 +67,20 @@
 <!-- Current Task -->
 <c:choose>
   <c:when test="${mode eq 'add'}">
-    Add a new ${connectorType}
+    <fmt:message key="webmanager.connector.editConnector.addNew"/>&nbsp;${connectorType}
   </c:when>
   <c:otherwise>
-    Edit connector ${uniqueName}
+    <fmt:message key="webmanager.connector.editConnector.editConnector"/>&nbsp;${uniqueName}
   </c:otherwise>
 </c:choose>
 <p>
-(<strong>*</strong> denotes a required attribute)
+<fmt:message key="webmanager.connector.editConnector.requiredAttribute"/>
 <table border="0" cellpadding="3">
 <tr>
-  <th class="DarkBackground">Attribute</th>
-  <th class="DarkBackground">Type</th>
-  <th class="DarkBackground">Value</th>
-  <th class="DarkBackground">Description</th>
+  <th class="DarkBackground"><fmt:message key="webmanager.connector.editConnector.attribute"/></th>
+  <th class="DarkBackground"><fmt:message key="webmanager.connector.editConnector.type"/></th>
+  <th class="DarkBackground"><fmt:message key="webmanager.connector.editConnector.value"/></th>
+  <th class="DarkBackground"><fmt:message key="webmanager.connector.editConnector.desc"/></th>
 </tr>
 <tr>
   <td class="LightBackground"><strong>*uniqueName</strong></td>
@@ -94,7 +95,7 @@
         </c:otherwise>
       </c:choose>
   </td>
-  <td>A name that is different than the name for any other web connectors in the server (no spaces in the name please)</td>
+  <td><fmt:message key="webmanager.common.uniqueNameExp"/></td>
 </tr>
 <c:forEach var="connectorAttribute" items="${connectorAttributes}" varStatus="status">
   <c:set var="style" value="${status.index % 2 == 0 ? 'MediumBackground' : 'LightBackground'}"/>
@@ -142,17 +143,17 @@
     	     value="<c:out escapeXml="true" value="${connectorAttribute.stringValue}"/>"></td>
         </c:otherwise>
     </c:choose>
-    <td class="${style}">${connectorAttribute.description}</td>
+     <td class="${style}"><fmt:message key="${connectorAttribute.description}"/></td>
   </tr>
 </c:forEach>
 </table>
 <P>
 <!-- Submit Button -->
-<input name="submit" type="submit" value="Save" onClick="return <portlet:namespace/>validateForm()">
-<input name="reset" type="reset" value="Reset">
-<input name="submit" type="submit" value="Cancel">
+<input name="submit" type="submit" value="<fmt:message key="consolebase.common.save"/>" onClick="return <portlet:namespace/>validateForm()">
+<input name="reset" type="reset" value="<fmt:message key="consolebase.common.reset"/>">
+<input name="submit" type="submit" value="<fmt:message key="consolebase.common.cancel"/>">
 </form>
 <P>
 <a href='<portlet:actionURL portletMode="view">
            <portlet:param name="mode" value="list" />
-         </portlet:actionURL>'>List connectors</a>
+         </portlet:actionURL>'><fmt:message key="webmanager.common.listConnectors"/></a>

Modified: geronimo/server/branches/2.1/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/webmanager/connector/help.jsp
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/webmanager/connector/help.jsp?rev=742700&r1=742699&r2=742700&view=diff
==============================================================================
--- geronimo/server/branches/2.1/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/webmanager/connector/help.jsp (original)
+++ geronimo/server/branches/2.1/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/webmanager/connector/help.jsp Mon Feb  9 19:43:14 2009
@@ -14,4 +14,6 @@
    See the License for the specific language governing permissions and
    limitations under the License.
 --%>
-The Connector Manager displays connections of all types and provide the capability to modify connections for this web server. 
+<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt"%>
+<fmt:setBundle basename="consolebase"/>
+<fmt:message key="webmanager.connector.help.content"/> 

Modified: geronimo/server/branches/2.1/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/webmanager/connector/normal.jsp
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/webmanager/connector/normal.jsp?rev=742700&r1=742699&r2=742700&view=diff
==============================================================================
--- geronimo/server/branches/2.1/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/webmanager/connector/normal.jsp (original)
+++ geronimo/server/branches/2.1/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/webmanager/connector/normal.jsp Mon Feb  9 19:43:14 2009
@@ -20,6 +20,8 @@
 <%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
 <%@ taglib uri="http://java.sun.com/jsp/jstl/functions" prefix="fn" %>
 <%@ taglib uri="http://java.sun.com/portlet" prefix="portlet"%>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt"%>
+<fmt:setBundle basename="consolebase"/>
 <portlet:defineObjects/>
 
 <!-- Show existing connectors -->
@@ -33,12 +35,12 @@
           <c:otherwise>
 <table width="100%">
           <tr>
-            <th class="DarkBackground" align="left">Name</th>
-            <th class="DarkBackground" align="center">Protocol</th>
-            <th class="DarkBackground" align="center">Port</th>
-            <th class="DarkBackground" align="center">State</th>
-            <th class="DarkBackground" align="center">Actions</th>
-            <th class="DarkBackground" align="center">Type</th>
+            <th class="DarkBackground" align="left"><fmt:message key="consolebase.common.name"/></th>
+            <th class="DarkBackground" align="center"><fmt:message key="webmanager.common.protocol"/></th>
+            <th class="DarkBackground" align="center"><fmt:message key="webmanager.common.port"/></th>
+            <th class="DarkBackground" align="center"><fmt:message key="consolebase.common.state"/></th>
+            <th class="DarkBackground" align="center"><fmt:message key="consolebase.common.actions"/></th>
+            <th class="DarkBackground" align="center"><fmt:message key="consolebase.common.type"/></th>
           </tr>
 <c:set var="backgroundClass" value='MediumBackground'/>
 <c:forEach var="info" items="${container.connectors}">
@@ -65,7 +67,7 @@
                  <portlet:param name="containerURI" value="${container.containerURI}" />
                </portlet:actionURL>"
                  <c:if test="${info.port eq serverPort}"> onClick="return confirm('Console application will not be available if ${info.uniqueName} is stopped.  Stop ${info.uniqueName}?');"</c:if>>
-                 stop</a>
+                 <fmt:message key="consolebase.common.stop"/></a>
                <a href="<portlet:actionURL portletMode="view">
                  <portlet:param name="mode" value="restart" />
                  <portlet:param name="connectorURI" value="${info.connectorURI}" />
@@ -73,7 +75,7 @@
                  <portlet:param name="containerURI" value="${container.containerURI}" />
                </portlet:actionURL>"
                  <c:if test="${info.port eq serverPort}"> onClick="return confirm('It is recommeded that you restart ${info.uniqueName} while accessing the Console application on a different port if possible. Console application may not be available temporarily on port ${serverPort}, typically 3 to 5 minutes, if ${info.uniqueName} is restarted. Restart ${info.uniqueName}?');"</c:if>>
-                 restart</a>
+                 <fmt:message key="consolebase.common.restart"/></a>
                </c:when>
                <c:otherwise>
                <a href="<portlet:actionURL portletMode="view">
@@ -81,7 +83,7 @@
                  <portlet:param name="connectorURI" value="${info.connectorURI}" />
                  <portlet:param name="managerURI" value="${container.managerURI}" />
                  <portlet:param name="containerURI" value="${container.containerURI}" />
-               </portlet:actionURL>">start</a>
+               </portlet:actionURL>"><fmt:message key="consolebase.common.start"/></a>
                </c:otherwise>
              </c:choose>
                <a href="<portlet:actionURL portletMode="view">
@@ -89,13 +91,13 @@
                  <portlet:param name="connectorURI" value="${info.connectorURI}" />
                  <portlet:param name="managerURI" value="${container.managerURI}" />
                  <portlet:param name="containerURI" value="${container.containerURI}" />
-               </portlet:actionURL>">edit</a>
+               </portlet:actionURL>"><fmt:message key="consolebase.common.edit"/></a>
                <a href="<portlet:actionURL portletMode="view">
                  <portlet:param name="mode" value="delete" />
                  <portlet:param name="connectorURI" value="${info.connectorURI}" />
                  <portlet:param name="managerURI" value="${container.managerURI}" />
                  <portlet:param name="containerURI" value="${container.containerURI}" />
-               </portlet:actionURL>" onClick="return confirm('Are you sure you want to delete ${info.uniqueName}?');">delete</a>
+               </portlet:actionURL>" onClick="return confirm('Are you sure you want to delete ${info.uniqueName}?');"><fmt:message key="consolebase.common.delete"/></a>
             </td>
             <td class="${backgroundClass}">${info.description}</td>
           </tr>
@@ -106,7 +108,7 @@
 
 <P><HR><P>
 <!-- Links to add new connectors -->
-Add new:
+<fmt:message key="webmanager.connector.normal.addNew"/>:
 <ul>
 <c:forEach var="connectorType" items="${container.connectorTypes}">
 <li><a href="<portlet:actionURL portletMode="view">

Modified: geronimo/server/branches/2.1/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/webmanager/normal.jsp
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/webmanager/normal.jsp?rev=742700&r1=742699&r2=742700&view=diff
==============================================================================
--- geronimo/server/branches/2.1/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/webmanager/normal.jsp (original)
+++ geronimo/server/branches/2.1/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/webmanager/normal.jsp Mon Feb  9 19:43:14 2009
@@ -89,7 +89,7 @@
       <c:if test="${statsLazy}">
         <a href="<portlet:actionURL><portlet:param name="stats" value="false"/></portlet:actionURL>"><fmt:message key="webmanager.help.disable"/></a>&nbsp; 
       </c:if>
-      <a href="<portlet:renderURL/>">refresh</a>&nbsp; 
+      <a href="<portlet:renderURL/>"><fmt:message key="consolebase.common.refresh"/></a>&nbsp;        
       <a href="<portlet:actionURL><portlet:param name="resetStats" value="true"/></portlet:actionURL>"><fmt:message key="consolebase.common.reset"/></a> 
     </td>
   </tr>

Modified: geronimo/server/branches/2.1/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/welcome/welcomeNormal.jsp
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/welcome/welcomeNormal.jsp?rev=742700&r1=742699&r2=742700&view=diff
==============================================================================
--- geronimo/server/branches/2.1/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/welcome/welcomeNormal.jsp (original)
+++ geronimo/server/branches/2.1/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/welcome/welcomeNormal.jsp Mon Feb  9 19:43:14 2009
@@ -38,10 +38,10 @@
 
            <ul>
                <li><b><a href="mailto:user-subscribe@geronimo.apache.org">user@geronimo.apache.org</a></b>
-                   (<a href="http://geronimo.apache.org/redirects/userMailingList.html">archives</a>)
+                   (<a href="http://geronimo.apache.org/redirects/userMailingList.html"><fmt:message key="welcome.welcomeNormal.archive"/></a>)
                    <fmt:message key="welcome.welcomeNormal.forUsers"/></li>
                <li><b><a href="mailto:dev-subscribe@geronimo.apache.org">dev@geronimo.apache.org</a></b>
-                   (<a href="http://geronimo.apache.org/redirects/developerMailingList.html">archives</a>)
+                   (<a href="http://geronimo.apache.org/redirects/developerMailingList.html"><fmt:message key="welcome.welcomeNormal.archive"/></a>)
                    <fmt:message key="welcome.welcomeNormal.forDevelopers"/></li>
            </ul>
 

Modified: geronimo/server/branches/2.1/plugins/console/console-portal-driver/src/main/webapp/loginerror.jsp
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/plugins/console/console-portal-driver/src/main/webapp/loginerror.jsp?rev=742700&r1=742699&r2=742700&view=diff
==============================================================================
--- geronimo/server/branches/2.1/plugins/console/console-portal-driver/src/main/webapp/loginerror.jsp (original)
+++ geronimo/server/branches/2.1/plugins/console/console-portal-driver/src/main/webapp/loginerror.jsp Mon Feb  9 19:43:14 2009
@@ -117,14 +117,14 @@
         </tr>
 
         <tr>
-          <td><font size="1"><STRONG>Welcome to the Geronimo&#8482; Console</FONT></td>
+          <td><font size="1"><STRONG><fmt:message key="console.login.welcome"/></FONT></td>
         </TR>
         <tr>
           <TD>
           <table width="100%"  border="0" cellspacing="1" cellpadding="5">
             <tr>
               <td width="5">&nbsp;</td>
-              <td> <strong>GERONIMO&#8482;</strong> is a Java-certified, production-grade platform designed to allow developers to rapidly deploy and manage their applications. The result is an integrated, highly functional application platform that leverages the latest innovations from the open source community and simplifies application deployment and maintenance. </td>
+              <td><fmt:message key="console.login.introduction"/></td>
               <td width="5">&nbsp;</td>
             </tr>
 
@@ -136,18 +136,7 @@
 
             <tr>
               <td>&nbsp;</td>
-              <td> <strong>Geronimo&#8482;</strong> has integrated the following components:<BR/>
-                &nbsp;&nbsp;&#149;&nbsp; Application server (Apache Geronimo)<br/>
-                &nbsp;&nbsp;&#149;&nbsp; Web server and servlet engine (Tomcat)<br/>
-                &nbsp;&nbsp;&#149;&nbsp; Web server and servlet engine (Jetty)<br/>
-                &nbsp;&nbsp;&#149;&nbsp; JSP compiler (Jasper)<br/>
-                &nbsp;&nbsp;&#149;&nbsp; JAX-RPC Web Services engine (Apache Axis)<br/>
-                &nbsp;&nbsp;&#149;&nbsp; JAX-WS Web Services engine (Apache Axis2)<br/>
-                &nbsp;&nbsp;&#149;&nbsp; JAX-WS Web Services engine (Apache CXF)<br/>
-                &nbsp;&nbsp;&#149;&nbsp; Relational database (Apache Derby)<br/>
-                &nbsp;&nbsp;&#149;&nbsp; Messaging (ActiveMQ)<br/>
-                &nbsp;&nbsp;&#149;&nbsp; User management services<br/>
-                &nbsp;&nbsp;&#149;&nbsp; Centralized administration console<br/>
+              <td><fmt:message key="console.login.components"/></td>
               <td>&nbsp;</td>
             </tr>
           </table>

Modified: geronimo/server/branches/2.1/plugins/console/console-portal-driver/src/main/webapp/pluto.css
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/plugins/console/console-portal-driver/src/main/webapp/pluto.css?rev=742700&r1=742699&r2=742700&view=diff
==============================================================================
--- geronimo/server/branches/2.1/plugins/console/console-portal-driver/src/main/webapp/pluto.css (original)
+++ geronimo/server/branches/2.1/plugins/console/console-portal-driver/src/main/webapp/pluto.css Mon Feb  9 19:43:14 2009
@@ -253,6 +253,7 @@
   font-weight: bold;
 }
 
+/* removed by GERONIMO-4204
 label {
   clear: both;
   width: 40%;
@@ -260,6 +261,7 @@
   text-align: right;
   margin: 0px 5px 10px 0px;
 }
+*/
 /*
 input {
   color: #2E6794;

Modified: geronimo/server/branches/2.1/plugins/console/plugin-portlets/src/main/resources/pluginportlets.properties
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/plugins/console/plugin-portlets/src/main/resources/pluginportlets.properties?rev=742700&r1=742699&r2=742700&view=diff
==============================================================================
--- geronimo/server/branches/2.1/plugins/console/plugin-portlets/src/main/resources/pluginportlets.properties (original)
+++ geronimo/server/branches/2.1/plugins/console/plugin-portlets/src/main/resources/pluginportlets.properties Mon Feb  9 19:43:14 2009
@@ -22,6 +22,11 @@
 car.addRepository.downloadRunningCongfig      = You can also download running configurations from another Geronimo server just as if you're browsing and installing third-party plugins. If you want to point to a remote Geronimo server, enter a URL such as <tt>http://geronimo-server:8080/plugin/maven-repo/</tt>
 car.addRepository.howToAddPluginRepositories  = To add a new plugin repository to this list, enter the URL to the repository. The repository must have a <tt>geronimo-plugins.xml</tt> file in the root directory listing the available plugins in the repository.
 car.addRepository.title                       = Add Plugin Repository
+car.assemblyConfirm.description               = Description
+car.assemblyConfirm.fileLocation              = File Location
+car.assemblyConfirm.moduleId                  = Module ID
+car.assemblyConfirm.plugin                    = Plugin
+car.assemblyConfirm.successful                = Server Assembly Successful
 car.common.addRepository                      = Add Repository
 car.common.assemble                           = Assemble
 car.common.author                             = Author
@@ -33,6 +38,10 @@
 car.common.geronimoVersions                   = Geronimo Versions
 car.common.group                              = Group
 car.common.license                            = License
+car.common.listCategory                       = Category
+car.common.listInstallable                    = Installable
+car.common.listName                           = Name
+car.common.listVersion                        = Version
 car.common.moduleID                           = Module ID
 car.common.newRepository                      = New Repository
 car.common.obsoletes                          = Obsoletes
@@ -61,8 +70,8 @@
 car.download.foundDependencies                = Found the following dependencies for this plugin.  Any missing dependencies will be installed for you automatically if you proceed.
 car.download.processing                       = Processing {0}...
 car.downloadStatus.processing                 = Current file being operated on...
-car.index.assembleServerLong                  = Assemble a server from plugins in this one
 car.index.assembleServer                      = Assemble a server
+car.index.assembleServerLong                  = Assemble a server from plugins in this one
 car.index.createGeronimoPluginExp             = Choose a configuration in the current Geronimo server to export as a Geronimo plugin.  The configuration will be saved as a CAR file to your local filesystem. <i>Note: at present, you must manually add a <tt>META-INF/geronimo-plugin.xml</tt> file to the CAR  after you export it in order for it to be a valid plugin.</i>
 car.index.optionalAuthentication              = Optional Authentication
 car.index.removePluginsExp                    = To remove a plugin, use the categories under <b>Applications</b> to locate the plugin module and uninstall it.
@@ -73,6 +82,7 @@
 car.list.assemblyFormat                       = Assembly format:
 car.list.assemblyGroupId                      = Assembly groupId:
 car.list.assemblyPath                         = Assembly target path:
+car.list.assemblyServerName                   = Name the server to be assembled
 car.list.assemblyVersion                      = Assembly version:
 car.list.noPlugins                            = No plugins are listed at this repository.
 car.list.pluginLocal                          = Plugins in local server
@@ -96,8 +106,7 @@
 car.pluginParams.title                        = <b>Export Plugin</b> -- Configure Plugin Data
 car.pluginParams.uniqueIDExp                  = The globally unique ID for this plugin.  This is determined from the installation in the server you're exporting.  This defines the version number for the plugin, so make sure it's correct.
 car.results.filesProcessed                    = Files Processed
-car.results.title                             = The plugin {0} has been installed.
-car.results.titles                            = The following plugin(s) have been installed:
+car.results.titles                            = The following plugin(s) have been installed
 car.viewForDownload.author                    = Author
 car.viewForDownload.dependencies              = Dependencies
 car.viewForDownload.description               = Description
@@ -111,12 +120,6 @@
 car.viewForDownload.prerequisites             = Prerequisites
 car.viewForDownload.website                   = Web Site
 
-car.assemblyConfirm.moduleId                  = Module ID
-car.assemblyConfirm.description               = Description
-car.assemblyConfirm.plugin                    = Plugin
-
-
-
 configmanager.common.archive                     = Archive
 configmanager.common.plan                        = Plan
 configmanager.common.startAppAfterInstall        = Start app after install
@@ -141,6 +144,7 @@
 consolebase.common.delete          = Delete
 consolebase.common.deployedAs      = Deployed As
 consolebase.common.description     = Description
+consolebase.common.done            = Done
 consolebase.common.edit            = Edit
 consolebase.common.install         = Install
 consolebase.common.name            = Name
@@ -157,101 +161,146 @@
 consolebase.common.usage           = usage
 consolebase.common.user            = User
 consolebase.common.userName        = Username
-consolebase.common.done            = Done
 
-realmwizard._sql.JDBCDriverClassExp              = The fully-qualified JDBC driver class name.  This driver must be located in the JAR specified in the next field.
-realmwizard._sql.JDBCPasswordExp                 = The password used to connect to the database
-realmwizard._sql.JDBCUrlExp                      = The JDBC URL that specifies the details of the database to connect to.  This has a different form for each JDBC driver.
-realmwizard._sql.JDBCUsernameExp                 = The username used to connect to the database
-realmwizard._sql.databasePoolExp                 = A database pool that the login module will use to connect to the database.  If this is specified, none of the rest of the settings after this are necessary.
-realmwizard._sql.digestAlgorithmExp              = Message Digest algorithm (e.g. MD5, SHA1, etc.) used on the passwords.  Leave this field empty if no digest algorithm is used.
-realmwizard._sql.digestEncodingExp               = Encoding to use for digests (e.g. hex, base64).  This is used only if a Message Digest algorithm is specified.If no encoding is specified, hex will be used.
-realmwizard._sql.driverJARExp                    = The JAR holding the selected JDBC driver.  Should be installed under GERONIMO/repository/ to appear in this list.
-realmwizard._sql.eitherPoolOrJDBC                = A SQL security realm must either have a database pool or JDBC connectivity settings to  connect to the database.  Please select EITHER the database pool, OR the rest of the JDBC settings.
-realmwizard._sql.groupSelectSQLExp               = A SQL statement to load group information for a user.  It should return 2 columns, the first holding a username and the second holding a group name.  The statement may use the PreparedStatement syntax of ? for a parameter,  in which case the username will be set for every parameter.  A typical setting would be  <tt>SELECT username, group_name FROM user_groups WHERE username=?</tt> or  for a more normalized schema,   <tt>SELECT u.username, g.name FROM app_users u, groups g, user_groups ug WHERE ug.user_id=users.id AND ug.group_id=g.id AND u.username=?</tt>
-realmwizard._sql.selectDatabasePool              = A SQL security realm must either have a database pool or JDBC connectivity settings to  connect to the database.  Please select EITHER the database pool, OR the rest of the JDBC settings.
-realmwizard._sql.userSelectSQLExp                = A SQL statement to load user/password information.  It should return 2 columns, the first holding a username and the second holding a password.   The statement may use the PreparedStatement syntax of ? for a parameter,   in which case the username will be set for every parameter.    A typical setting would be <tt>SELECT username, password FROM app_users WHERE username=?</tt> 
-realmwizard.advanced.AuditEnabledExp             = If enabled, every login attempt will be recorded to the specified file.  The path should be relative to the Geronimo home directory (a typical value would be <tt>var/log/login-attempts.log</tt>).
-realmwizard.advanced.credentialName              = Credential Name
-realmwizard.advanced.credentialNameExp           = If enabled, the realm will store each username and password in a private credential in the Subject under a specified credential name.
-realmwizard.advanced.failuresWithin              = failures within
-realmwizard.advanced.failuresWithinSeconds       = seconds
-realmwizard.advanced.keepAccountLockedFor        = and keep the account locked for
-realmwizard.advanced.keepAccountLockedForSeconds = seconds
-realmwizard.advanced.lockUserAfter               = Lock a user after
-realmwizard.advanced.lockoutEnabledExp           = If enabled, a certain number of failed logins in a particular time frame will cause a user's account to be locked for a certain period of time.  This is a defense against brute force account cracking attacks.
-realmwizard.advanced.namedCredential             = Named Credential
-realmwizard.advanced.storePasswordEnabledExp     = If enabled, the realm will store each user's password in a private credential in the Subject. This will allow access to the password later after the login process has completed.  This is not normally required.
-realmwizard.advanced.title                       = <b>Create Security Realm</b> -- Step 3: Advanced Configuration
-realmwizard.common.JDBCDriverClass               = JDBC Driver Class
-realmwizard.common.JDBCPassword                  = JDBC Password
-realmwizard.common.JDBCUrl                       = JDBC URL
-realmwizard.common.JDBCUsername                  = JDBC Username
-realmwizard.common.addSecurityRealm              = Add new security realm
-realmwizard.common.addToEAR                      = Add to EAR
-realmwizard.common.configurationOptions          = Configuration Options
-realmwizard.common.controlFlag                   = Control Flag
-realmwizard.common.databasePool                  = Database Pool
-realmwizard.common.deploy                        = Deploy
-realmwizard.common.deployCommand                 = Deploy Command
-realmwizard.common.deployRealm                   = Deploy Realm
-realmwizard.common.deploymentPlan                = Deployment Plan
-realmwizard.common.digestAlgorithm               = Digest Algorithm
-realmwizard.common.digestEncoding                = Digest Encoding
-realmwizard.common.driverJAR                     = Driver JAR
-realmwizard.common.editRealm                     = Edit Realm
-realmwizard.common.editSettings                  = Edit Settings
-realmwizard.common.enableAuditing                = Enable Auditing
-realmwizard.common.enableLockout                 = Enable Lockout
-realmwizard.common.groupSelectSQL                = Group SELECT SQL
-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.principals                    = Principals
-realmwizard.common.realmName                     = Realm Name
-realmwizard.common.realmType                     = Realm Type
-realmwizard.common.serverSide                    = Server-Side
-realmwizard.common.serverWide                    = Server-wide
-realmwizard.common.showPlan                      = Show Plan
-realmwizard.common.skipTestAndDeploy             = Skip Test and Deploy
-realmwizard.common.skipTestAndShowPlan           = Skip Test and Show Plan
-realmwizard.common.storePassword                 = Store Password
-realmwizard.common.supportAdvancedMapping        = Support Advanced Mapping
-realmwizard.common.testAgain                     = Test Again
-realmwizard.common.testLogin                     = Test a Login
-realmwizard.common.userSelectSQL                 = User SELECT SQL
-realmwizard.configure.title                      = <b>Create Security Realm</b> -- Step 2: Configure Login Module
-realmwizard.edit.configurationOptionsExp         = Any configuration options necessary for the login module, in the standard Java properties format (one per line, <tt>name=value</tt>)
-realmwizard.edit.controlFlagExp                  = The control flag for the login module, which controls what happens to the overall login processing if this login module succeeds or fails.  For more information see 
-realmwizard.edit.ifLeaveBlank                    = If you don't need to use as many login modules as there are entries below,just leave the extra ones blank.
-realmwizard.edit.loginDomainExp                  = The login domain for this login module, which must be unique among all modules in the security realm. This can be used to distinguish principals from two otherwise identical login modules (for example, from two LDAP login modules pointing to two different LDAP servers)
-realmwizard.edit.loginModuleClassExp             = The fully-qualified class name for the login module.
-realmwizard.edit.loginModuleJAR                  = Login Module JAR
-realmwizard.edit.loginModuleJARExp               = The jar containing Login Module and Principal classes.
-realmwizard.edit.realmNameExp                    = A name that is different than the name for any other security realms in the server (no spaces in the name please). Other components will use this name to refer to the security realm.
-realmwizard.edit.serverSideExp                   = Server-side login modules are executed within the application server (this is normally correct).  Client-side login modules are executed in the client's environment, for example, in order to use single sign-on features of the client OS.
-realmwizard.edit.summary                         = <p>This page edits a new or existing security realm.</p><p>A security realm may have one or more login modules.  Many simple realms have only one login module.  Additional login modules may be used to access more underlying security information stores, or to add functionality such as auditing to a realm without affecting the authentication process for the realm.</p>
-realmwizard.edit.supportAdvancedMappingExp       = Normally Geronimo can't distinguish between two different principals that have the same name and same principal class but were produced by two different login modules.  If this option is enabled, Geronimo will "wrap" principals to track which login module and realm each principal came from. This lets you use the "realm-principal" and "login-domain-principal" elements in your security mapping in Geronimo deployment plans.
-realmwizard.list.noSecurityRealms                = There are no security realms defined
-realmwizard.list.seeExamples                     = For each realm listed, you can click the <b>usage</b> link to see examples of how to use the realm from your application.\r\n
-realmwizard.list.title                           = This page lists all the available security realms.  Server-wide security realms can be edited, while security realms deployed as part of a single application cannot (change the deployment plan in the application instead).
-realmwizard.selectType.nameOfSecurityRealmExp    = A name that is different than the name for any other security realms in the server (no spaces in the name please). Other components will use this name to refer to the security realm.
-realmwizard.selectType.realmTypeExp              = The type of login module used as the master for this security realm. Select "Other" for manual configuration options including custom login modules and realms that use multiple login modules to populate user principals.
-realmwizard.selectType.title                     = <b>Create Security Realm</b> -- Step 1: Select Name and Type
-realmwizard.showPlan.addToEARExp                 = Instead of deploying as a top-level security realm, you can deploy this realm as part of an EAR. To add a security realm to an EAR using this plan, create a <tt>META-INF/geronimo-application.xml</tt> file in your EAR that has the <tt>dependency</tt> elements (if any) and  <tt>gbean</tt> elements from the plan above.  It should look something like this:
-realmwizard.showPlan.deployCommandExp            = To deploy a security realm from the command line using this plan, copy and paste it to a file (say, <tt>security-realm.xml</tt>) and save it.  Then run a command like:
-realmwizard.showPlan.title                       = <b>Create Security Realm</b> -- Show Deployment Plan
-realmwizard.testLogin.passwordExp                = The password to use to log in to the realm.
-realmwizard.testLogin.summary                    = From here you can enter a username and password for the main login module in the realm, and see if the login is successful and which Principals are generated for the user. This is meant to be an indication of whether the settings for the main login module are correct.  It does not invoke advanced features such as auditing or lockout.
-realmwizard.testLogin.title                      = <b>Create Security Realm</b> -- Step 4: Test Login
-realmwizard.testLogin.usernameExp                = The username to use to log in to the realm.
-realmwizard.testResults.testResults              = Test Results
-realmwizard.testResults.title                    = <b>Create Security Realm</b> -- Step 5: Login Results
-realmwizard.usage.applicationCode                = Application Code
-realmwizard.usage.applicationCodeExp             = <p>No special application code is required to work with security roles.</p><p>If an application calls <tt>HttpServletRequest.getUserPrincipal()</tt>, Geronimo will return a principal where the principal class implements <tt>GeronimoCallerPrincipal</tt> -- normally a username (since <tt>GeronimoUserPrincipal</tt> implements <tt>GeronimoCallerPrincipal</tt>).  If you're using a custom login module and getting the wrong results for <tt>getUserPrincipal</tt>, try making your user principal class implement <tt>GeronimoCallerPrincipal</tt>.</p> <p>If an application calls <tt>HttpServletRequest.isUserInRole(role)</tt>, Geronimo will return true or false depending on whether any of the principals assigned to that user by the realm's login modules were listed in the role mapping above.</p>
-realmwizard.usage.geronimoWebXmlLater            = <p>This example indicated that {0} will be used to handle all logins to the web application.  Then it maps the <tt>admin</tt> role to a combination of one user (<tt>root</tt>) and one group (<tt>administrators</tt>), using a combination of the principal classes and principal names.  (Note that if {0} uses a custom login module, the principal classes may be different, but the ones listed above are used for users and groups by all the standard Geronimo login modules.)</p> <p>It's also possible to configure separate login modules to use separate login domain names,  and then use the login domain names in the role mapping (so a user "root" from login domain "Foo" is different from a user "root" from login domain "Bar"), but this is only important if you have multiple login modules assigning principals to the users.</p> <p> Finally, if the <tt>security</tt> section is declared in an EAR <tt>application.xml</tt> deployment descrip
 tor, there's no need to repeat it in any of the modules inside the EAR -- they'll all share the same role mapping information.</p>
-realmwizard.usage.geronimoWebXmlPreface          = <p>To configure the security realm and the members of each role, the web application needs to have a <tt>geronimo-web.xml</tt> deployment plan. That may be packaged in the WAR in the <tt>WEB-INF</tt> directory, or it may be provided separately on the command line to the deploy tool.</p> <p>The <tt>geronimo-web.xml</tt> plan should have a <tt>security-realm-name</tt> element indicating which realm will be used to authenticate logins to the web application. It also needs to have a <tt>security</tt> element listing the users or groups who should be members of each <tt>security-role</tt> listed in <tt>web.xml</tt>.</p>
-realmwizard.usage.title                          = This page talks about how to use the security realm {0} from a J2EE application. The example here is a web application, but other application modules would work similarly.
-realmwizard.usage.webXmlShouldHave               = <p>The <tt>web.xml</tt> should have</p><ul>  <li>One or more <tt>security-constraint</tt> blocks designating the protected pages or URLs</li>  <li>A <tt>login-config</tt> section configuring the login style for the application</li>  <li>One or more <tt>security-role</tt> blocks listing the security roles used by the application</li></ul>
+realmwizard._sql.JDBCDriverClassExp                          = The fully-qualified JDBC driver class name.  This driver must be located in the JAR specified in the next field.
+realmwizard._sql.JDBCPasswordExp                             = The password used to connect to the database
+realmwizard._sql.JDBCUrlExp                                  = The JDBC URL that specifies the details of the database to connect to.  This has a different form for each JDBC driver.
+realmwizard._sql.JDBCUsernameExp                             = The username used to connect to the database
+realmwizard._sql.databasePoolExp                             = A database pool that the login module will use to connect to the database.  If this is specified, none of the rest of the settings after this are necessary.
+realmwizard._sql.digestAlgorithmExp                          = Message Digest algorithm (e.g. MD5, SHA1, etc.) used on the passwords.  Leave this field empty if no digest algorithm is used.
+realmwizard._sql.digestEncodingExp                           = Encoding to use for digests (e.g. hex, base64).  This is used only if a Message Digest algorithm is specified.If no encoding is specified, hex will be used.
+realmwizard._sql.driverJARExp                                = The JAR holding the selected JDBC driver.  Should be installed under GERONIMO/repository/ to appear in this list.
+realmwizard._sql.eitherPoolOrJDBC                            = A SQL security realm must either have a database pool or JDBC connectivity settings to  connect to the database.  Please select EITHER the database pool, OR the rest of the JDBC settings.
+realmwizard._sql.groupSelectSQLExp                           = A SQL statement to load group information for a user.  It should return 2 columns, the first holding a username and the second holding a group name.  The statement may use the PreparedStatement syntax of ? for a parameter,  in which case the username will be set for every parameter.  A typical setting would be  <tt>SELECT username, group_name FROM user_groups WHERE username=?</tt> or  for a more normalized schema,   <tt>SELECT u.username, g.name FROM app_users u, groups g, user_groups ug WHERE ug.user_id=users.id AND ug.group_id=g.id AND u.username=?</tt>
+realmwizard._sql.selectDatabasePool                          = A SQL security realm must either have a database pool or JDBC connectivity settings to  connect to the database.  Please select EITHER the database pool, OR the rest of the JDBC settings.
+realmwizard._sql.userSelectSQLExp                            = A SQL statement to load user/password information.  It should return 2 columns, the first holding a username and the second holding a password.   The statement may use the PreparedStatement syntax of ? for a parameter,   in which case the username will be set for every parameter.    A typical setting would be <tt>SELECT username, password FROM app_users WHERE username=?</tt> 
+realmwizard.advanced.AuditEnabledExp                         = If enabled, every login attempt will be recorded to the specified file.  The path should be relative to the Geronimo home directory (a typical value would be <tt>var/log/login-attempts.log</tt>).
+realmwizard.advanced.credentialName                          = Credential Name
+realmwizard.advanced.credentialNameExp                       = If enabled, the realm will store each username and password in a private credential in the Subject under a specified credential name.
+realmwizard.advanced.failuresWithin                          = failures within
+realmwizard.advanced.failuresWithinSeconds                   = seconds
+realmwizard.advanced.keepAccountLockedFor                    = and keep the account locked for
+realmwizard.advanced.keepAccountLockedForSeconds             = seconds
+realmwizard.advanced.lockUserAfter                           = Lock a user after
+realmwizard.advanced.lockoutEnabledExp                       = If enabled, a certain number of failed logins in a particular time frame will cause a user's account to be locked for a certain period of time.  This is a defense against brute force account cracking attacks.
+realmwizard.advanced.namedCredential                         = Named Credential
+realmwizard.advanced.storePasswordEnabledExp                 = If enabled, the realm will store each user's password in a private credential in the Subject. This will allow access to the password later after the login process has completed.  This is not normally required.
+realmwizard.advanced.title                                   = <b>Create Security Realm</b> -- Step 3: Advanced Configuration
+realmwizard.common.JDBCDriverClass                           = JDBC Driver Class
+realmwizard.common.JDBCPassword                              = JDBC Password
+realmwizard.common.JDBCUrl                                   = JDBC URL
+realmwizard.common.JDBCUsername                              = JDBC Username
+realmwizard.common.addSecurityRealm                          = Add new security realm
+realmwizard.common.addToEAR                                  = Add to EAR
+realmwizard.common.configurationOptions                      = Configuration Options
+realmwizard.common.controlFlag                               = Control Flag
+realmwizard.common.controlFlag.optional                      = Optional
+realmwizard.common.controlFlag.required                      = Required
+realmwizard.common.controlFlag.requisite                     = Requisite
+realmwizard.common.controlFlag.sufficient                    = Sufficient
+realmwizard.common.databasePool                              = Database Pool
+realmwizard.common.deploy                                    = Deploy
+realmwizard.common.deployCommand                             = Deploy Command
+realmwizard.common.deployRealm                               = Deploy Realm
+realmwizard.common.deploymentPlan                            = Deployment Plan
+realmwizard.common.digestAlgorithm                           = Digest Algorithm
+realmwizard.common.digestEncoding                            = Digest Encoding
+realmwizard.common.driverJAR                                 = Driver JAR
+realmwizard.common.editRealm                                 = Edit Realm
+realmwizard.common.editSettings                              = Edit Settings
+realmwizard.common.enableAuditing                            = Enable Auditing
+realmwizard.common.enableLockout                             = Enable Lockout
+realmwizard.common.groupSelectSQL                            = Group SELECT SQL
+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.principals                                = Principals
+realmwizard.common.realmName                                 = Realm Name
+realmwizard.common.realmType                                 = Realm Type
+realmwizard.common.serverSide                                = Server-Side
+realmwizard.common.serverWide                                = Server-wide
+realmwizard.common.showPlan                                  = Show Plan
+realmwizard.common.skipTestAndDeploy                         = Skip Test and Deploy
+realmwizard.common.skipTestAndShowPlan                       = Skip Test and Show Plan
+realmwizard.common.storePassword                             = Store Password
+realmwizard.common.supportAdvancedMapping                    = Support Advanced Mapping
+realmwizard.common.supportAdvancedMapping.no                 = No
+realmwizard.common.supportAdvancedMapping.yes                = Yes
+realmwizard.common.testAgain                                 = Test Again
+realmwizard.common.testLogin                                 = Test a Login
+realmwizard.common.userSelectSQL                             = User SELECT SQL
+realmwizard.configure.certprops.groupsURI.description        = The location of a properties file (relative to the Geronimo home dir) holding group information. The format of each line should be <tt>group=user,user,...</tt>.
+realmwizard.configure.certprops.groupsURI.name               = Groups File URI
+realmwizard.configure.certprops.usersURI.description         = The location of a properties file (relative to the Geronimo home dir) holding certificate to user mapping information.  The format of each line should be <tt>username=certificatename</tt> where certificate name is <tt>X509Certificate.getSubjectX500Principal().getName()</tt>
+realmwizard.configure.certprops.usersURI.name                = Users File URI
+realmwizard.configure.ldap.authentication.description        = The security level to use, which can be <tt>none</tt>, <tt>simple</tt>, or <tt>strong</tt> (the usual value is <tt>simple</tt>.  If this property is unspecified, the behavior is determined by the service provider.
+realmwizard.configure.ldap.authentication.name               = Authentication
+realmwizard.configure.ldap.connectionPassword.description    = The password used to connect to the LDAP server.
+realmwizard.configure.ldap.connectionPassword.name           = Connect Password
+realmwizard.configure.ldap.connectionProtocol.description    = The connection protocol used to communicate with the LDAP server. Normally left blank, though it can be set to <tt>ssl</tt> if the server supports it.
+realmwizard.configure.ldap.connectionProtocol.name           = Connect Protocol
+realmwizard.configure.ldap.connectionURL.description         = A URL that describes how to connect to the LDAP server. Normally this would be <tt>ldap://ldap-server-hostname:389</tt> (or for the Apache directory server included with Geronimo, <tt>ldap://localhost:1389</tt>).
+realmwizard.configure.ldap.connectionURL.name                = Connection URL
+realmwizard.configure.ldap.connectionUsername.description    = The user name used to connect to the LDAP server. Should be an administrator or Directory manager that has access to examine other users' passwords.
+realmwizard.configure.ldap.connectionUsername.name           = Connect Username
+realmwizard.configure.ldap.initialContextFactory.description = The fully-qualified class name of the initial context factory. If you don't know what to use here, you should use <tt>com.sun.jndi.ldap.LdapCtxFactory</tt>.
+realmwizard.configure.ldap.initialContextFactory.name        = Initial Context Factory
+realmwizard.configure.ldap.roleBase.description              = The base LDAP context (location) to search for roles. The search may look in this location only, or there and all subcontexts, depending on the settings for "Role Search Subtree" below.
+realmwizard.configure.ldap.roleBase.name                     = Role Base
+realmwizard.configure.ldap.roleName.description              = The LDAP attribute type that corresponds to the the role name. Often set to <tt>cn</tt>.
+realmwizard.configure.ldap.roleName.name                     = Role Name
+realmwizard.configure.ldap.roleSearchMatching.description    = The LDAP attribute search string used on a role to find the users who are members of the role. This is used when the role has many attributes with the same name, but with different values (one per user).  Normally the parameter <tt>{0}</tt> is used to identify the username. A typical value would be <tt>(member={0})</tt> or <tt>(memberUID={0})</tt>.
+realmwizard.configure.ldap.roleSearchMatching.name           = Role User Search String
+realmwizard.configure.ldap.roleSearchSubtree.description     = If set to <tt>true</tt>, then subtrees under the "Role Base" will be searched for roles too. If set to <tt>false</tt>, then only the "Role Base" location itself will be searched.
+realmwizard.configure.ldap.roleSearchSubtree.name            = Role Search Subtree
+realmwizard.configure.ldap.userBase.description              = The base LDAP context (location) to search for users. The search may look in this location only, or there and all subcontexts, depending on the settings for "User Search Subtree" below.
+realmwizard.configure.ldap.userBase.name                     = User Base
+realmwizard.configure.ldap.userRoleName.description          = If the role entry does not have an attribute for users, but instead the user entry has an attribute for roles, this should be used instead of the "Role User Search String". It names the attribute on a user that lists a role that user is in. A typical value would be <tt>(memberOf={0})</tt>.
+realmwizard.configure.ldap.userRoleName.name                 = User Role Search String
+realmwizard.configure.ldap.userSearchMatching.description    = The LDAP attribute search string used to find the user. RFC 2254 filters are allowed, and normally the parameter <tt>{0}</tt> is used to identify the username. A typical value would be <tt>(uid={0})</tt> or <tt>(cn={0})</tt>.
+realmwizard.configure.ldap.userSearchMatching.name           = User Search Matching
+realmwizard.configure.ldap.userSearchSubtree.description     = If set to <tt>true</tt>, then subtrees under the "User Base" will be searched for users too. If set to <tt>false</tt>, then only the "User Base" location itself will be searched.
+realmwizard.configure.ldap.userSearchSubtree.name            = User Search Subtree
+realmwizard.configure.props.digest.description               = Message Digest algorithm (e.g. MD5, SHA1, etc.) used on the passwords.  Leave this field empty if no digest algorithm is used.
+realmwizard.configure.props.digest.name                      = Digest Algorithm
+realmwizard.configure.props.encoding.description             = Encoding to use for digests (e.g. hex, base64).  This is used only if a Message Digest algorithm is specified.  If no encoding is specified, hex will be used.
+realmwizard.configure.props.encoding.name                    = Digest Encoding
+realmwizard.configure.props.groupsURI.description            = The location of a properties file (relative to the Geronimo home dir) holding group information.  The format of each line should be <tt>group=user,user,...</tt>.
+realmwizard.configure.props.groupsURI.name                   = Groups File URI
+realmwizard.configure.props.usersURI.description             = The location of a properties file (relative to the Geronimo home dir) holding user/password information.  The format of each line should be <tt>username=password</tt>.
+realmwizard.configure.props.usersURI.name                    = Users File URI
+realmwizard.configure.title                                  = <b>Create Security Realm</b> -- Step 2: Configure Login Module
+realmwizard.edit.configurationOptionsExp                     = Any configuration options necessary for the login module, in the standard Java properties format (one per line, <tt>name=value</tt>)
+realmwizard.edit.controlFlagExp                              = The control flag for the login module, which controls what happens to the overall login processing if this login module succeeds or fails.  For more information see 
+realmwizard.edit.ifLeaveBlank                                = If you don't need to use as many login modules as there are entries below,just leave the extra ones blank.
+realmwizard.edit.loginDomainExp                              = The login domain for this login module, which must be unique among all modules in the security realm. This can be used to distinguish principals from two otherwise identical login modules (for example, from two LDAP login modules pointing to two different LDAP servers)
+realmwizard.edit.loginModuleClassExp                         = The fully-qualified class name for the login module.
+realmwizard.edit.loginModuleJAR                              = Login Module JAR
+realmwizard.edit.loginModuleJARExp                           = The jar containing Login Module and Principal classes.
+realmwizard.edit.realmNameExp                                = A name that is different than the name for any other security realms in the server (no spaces in the name please). Other components will use this name to refer to the security realm.
+realmwizard.edit.serverSideExp                               = Server-side login modules are executed within the application server (this is normally correct).  Client-side login modules are executed in the client's environment, for example, in order to use single sign-on features of the client OS.
+realmwizard.edit.summary                                     = <p>This page edits a new or existing security realm.</p><p>A security realm may have one or more login modules.  Many simple realms have only one login module.  Additional login modules may be used to access more underlying security information stores, or to add functionality such as auditing to a realm without affecting the authentication process for the realm.</p>
+realmwizard.edit.supportAdvancedMappingExp                   = Normally Geronimo can't distinguish between two different principals that have the same name and same principal class but were produced by two different login modules.  If this option is enabled, Geronimo will "wrap" principals to track which login module and realm each principal came from. This lets you use the "realm-principal" and "login-domain-principal" elements in your security mapping in Geronimo deployment plans.
+realmwizard.list.noSecurityRealms                            = There are no security realms defined
+realmwizard.list.seeExamples                                 = For each realm listed, you can click the <b>usage</b> link to see examples of how to use the realm from your application.\r\n
+realmwizard.list.title                                       = This page lists all the available security realms.  Server-wide security realms can be edited, while security realms deployed as part of a single application cannot (change the deployment plan in the application instead).
+realmwizard.selectType.nameOfSecurityRealmExp                = A name that is different than the name for any other security realms in the server (no spaces in the name please). Other components will use this name to refer to the security realm.
+realmwizard.selectType.realmTypeExp                          = The type of login module used as the master for this security realm. Select "Other" for manual configuration options including custom login modules and realms that use multiple login modules to populate user principals.
+realmwizard.selectType.title                                 = <b>Create Security Realm</b> -- Step 1: Select Name and Type
+realmwizard.showPlan.addToEARExp                             = Instead of deploying as a top-level security realm, you can deploy this realm as part of an EAR. To add a security realm to an EAR using this plan, create a <tt>META-INF/geronimo-application.xml</tt> file in your EAR that has the <tt>dependency</tt> elements (if any) and <tt>gbean</tt> elements from the plan above. It should look something like this:
+realmwizard.showPlan.deployCommandExp                        = To deploy a security realm from the command line using this plan, copy and paste it to a file (say, <tt>security-realm.xml</tt>) and save it.  Then run a command like:
+realmwizard.showPlan.title                                   = <b>Create Security Realm</b> -- Show Deployment Plan
+realmwizard.testLogin.passwordExp                            = The password to use to log in to the realm.
+realmwizard.testLogin.summary                                = From here you can enter a username and password for the main login module in the realm, and see if the login is successful and which Principals are generated for the user. This is meant to be an indication of whether the settings for the main login module are correct.  It does not invoke advanced features such as auditing or lockout.
+realmwizard.testLogin.title                                  = <b>Create Security Realm</b> -- Step 4: Test Login
+realmwizard.testLogin.usernameExp                            = The username to use to log in to the realm.
+realmwizard.testResults.testResults                          = Test Results
+realmwizard.testResults.title                                = <b>Create Security Realm</b> -- Step 5: Login Results
+realmwizard.usage.applicationCode                            = Application Code
+realmwizard.usage.applicationCodeExp                         = <p>No special application code is required to work with security roles.</p><p>If an application calls <tt>HttpServletRequest.getUserPrincipal()</tt>, Geronimo will return a principal where the principal class implements <tt>GeronimoCallerPrincipal</tt> -- normally a username (since <tt>GeronimoUserPrincipal</tt> implements <tt>GeronimoCallerPrincipal</tt>).  If you're using a custom login module and getting the wrong results for <tt>getUserPrincipal</tt>, try making your user principal class implement <tt>GeronimoCallerPrincipal</tt>.</p> <p>If an application calls <tt>HttpServletRequest.isUserInRole(role)</tt>, Geronimo will return true or false depending on whether any of the principals assigned to that user by the realm's login modules were listed in the role mapping above.</p>
+realmwizard.usage.geronimoWebXmlLater                        = <p>This example indicated that {0} will be used to handle all logins to the web application.  Then it maps the <tt>admin</tt> role to a combination of one user (<tt>root</tt>) and one group (<tt>administrators</tt>), using a combination of the principal classes and principal names.  (Note that if {0} uses a custom login module, the principal classes may be different, but the ones listed above are used for users and groups by all the standard Geronimo login modules.)</p> <p>It's also possible to configure separate login modules to use separate login domain names,  and then use the login domain names in the role mapping (so a user "root" from login domain "Foo" is different from a user "root" from login domain "Bar"), but this is only important if you have multiple login modules assigning principals to the users.</p> <p> Finally, if the <tt>security</tt> section is declared in an EAR <tt>application.xml</tt> deploy
 ment descriptor, there's no need to repeat it in any of the modules inside the EAR -- they'll all share the same role mapping information.</p>
+realmwizard.usage.geronimoWebXmlPreface                      = <p>To configure the security realm and the members of each role, the web application needs to have a <tt>geronimo-web.xml</tt> deployment plan. That may be packaged in the WAR in the <tt>WEB-INF</tt> directory, or it may be provided separately on the command line to the deploy tool.</p> <p>The <tt>geronimo-web.xml</tt> plan should have a <tt>security-realm-name</tt> element indicating which realm will be used to authenticate logins to the web application. It also needs to have a <tt>security</tt> element listing the users or groups who should be members of each <tt>security-role</tt> listed in <tt>web.xml</tt>.</p>
+realmwizard.usage.title                                      = This page talks about how to use the security realm {0} from a J2EE application. The example here is a web application, but other application modules would work similarly.
+realmwizard.usage.webXmlShouldHave                           = <p>The <tt>web.xml</tt> should have</p><ul>  <li>One or more <tt>security-constraint</tt> blocks designating the protected pages or URLs</li>  <li>A <tt>login-config</tt> section configuring the login style for the application</li>  <li>One or more <tt>security-role</tt> blocks listing the security roles used by the application</li></ul>

Modified: geronimo/server/branches/2.1/plugins/console/plugin-portlets/src/main/resources/portletinfo.properties
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/plugins/console/plugin-portlets/src/main/resources/portletinfo.properties?rev=742700&r1=742699&r2=742700&view=diff
==============================================================================
--- geronimo/server/branches/2.1/plugins/console/plugin-portlets/src/main/resources/portletinfo.properties (original)
+++ geronimo/server/branches/2.1/plugins/console/plugin-portlets/src/main/resources/portletinfo.properties Mon Feb  9 19:43:14 2009
@@ -14,12 +14,19 @@
 #  See the License for the specific language governing permissions and
 #  limitations under the License.
 #=====================================================================
+
+Assemble\ Server = Assemble Server
+
+Create\ Plugin = Create Plugin
+
 Create\ and\ Install\ Plugins = Create and Install Plugins
 
 Deploy\ New = Deploy New
 
 Install\ New\ Applications = Install New Applications
 
+Install\ Plugins = Install Plugins
+
 Plugins = Plugins
 
 Security\ Realms = Security Realms

Modified: geronimo/server/branches/2.1/plugins/console/plugin-portlets/src/main/webapp/WEB-INF/classes/login-modules.properties
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/plugins/console/plugin-portlets/src/main/webapp/WEB-INF/classes/login-modules.properties?rev=742700&r1=742699&r2=742700&view=diff
==============================================================================
--- geronimo/server/branches/2.1/plugins/console/plugin-portlets/src/main/webapp/WEB-INF/classes/login-modules.properties (original)
+++ geronimo/server/branches/2.1/plugins/console/plugin-portlets/src/main/webapp/WEB-INF/classes/login-modules.properties Mon Feb  9 19:43:14 2009
@@ -24,96 +24,96 @@
 module.props.name=Properties File Realm
 module.props.class=org.apache.geronimo.security.realm.providers.PropertiesFileLoginModule
 module.props.field.usersURI.displayOrder=1
-module.props.field.usersURI.displayName=Users File URI
-module.props.field.usersURI.description=The location of a properties file (relative to the Geronimo home dir) holding user/password information.  The format of each line should be <tt>username=password</tt>.
+module.props.field.usersURI.displayName=realmwizard.configure.props.usersURI.name
+module.props.field.usersURI.description=realmwizard.configure.props.usersURI.description
 module.props.field.usersURI.length=50
 module.props.field.groupsURI.displayOrder=2
-module.props.field.groupsURI.displayName=Groups File URI
-module.props.field.groupsURI.description=The location of a properties file (relative to the Geronimo home dir) holding group information.  The format of each line should be <tt>group=user,user,...</tt>.
+module.props.field.groupsURI.displayName=realmwizard.configure.props.groupsURI.name
+module.props.field.groupsURI.description=realmwizard.configure.props.groupsURI.description
 module.props.field.groupsURI.length=50
 module.props.field.digest.displayOrder=3
-module.props.field.digest.displayName=Digest Algorithm
-module.props.field.digest.description=Message Digest algorithm (e.g. MD5, SHA1, etc.) used on the passwords.  Leave this field empty if no digest algorithm is used.
+module.props.field.digest.displayName=realmwizard.configure.props.digest.name
+module.props.field.digest.description=realmwizard.configure.props.digest.description
 module.props.field.digest.length=10
 module.props.field.digest.blankAllowed=true
 module.props.field.encoding.displayOrder=4
-module.props.field.encoding.displayName=Digest Encoding
-module.props.field.encoding.description=Encoding to use for digests (e.g. hex, base64).  This is used only if a Message Digest algorithm is specified.  If no encoding is specified, hex will be used.
+module.props.field.encoding.displayName=realmwizard.configure.props.encoding.name
+module.props.field.encoding.description=realmwizard.configure.props.encoding.description
 module.props.field.encoding.length=10
 module.props.field.encoding.blankAllowed=true
 # LDAP
 module.ldap.name=LDAP Realm
 module.ldap.class=org.apache.geronimo.security.realm.providers.LDAPLoginModule
 module.ldap.field.initialContextFactory.displayOrder=1
-module.ldap.field.initialContextFactory.displayName=Initial Context Factory
-module.ldap.field.initialContextFactory.description=The fully-qualified class name of the initial context factory.  If you don't know what to use here, you should use <tt>com.sun.jndi.ldap.LdapCtxFactory</tt>.
+module.ldap.field.initialContextFactory.displayName=realmwizard.configure.ldap.initialContextFactory.name
+module.ldap.field.initialContextFactory.description=realmwizard.configure.ldap.initialContextFactory.description
 module.ldap.field.initialContextFactory.length=60
 module.ldap.field.connectionURL.displayOrder=2
-module.ldap.field.connectionURL.displayName=Connection URL
-module.ldap.field.connectionURL.description=A URL the describes how to connect to the LDAP server.  Normally this would be <tt>ldap://ldap-server-hostname:389</tt> (or for the Apache directory server included with Geronimo, <tt>ldap://localhost:1389</tt>).
+module.ldap.field.connectionURL.displayName=realmwizard.configure.ldap.connectionURL.name
+module.ldap.field.connectionURL.description=realmwizard.configure.ldap.connectionURL.description
 module.ldap.field.connectionURL.length=50
 module.ldap.field.connectionUsername.displayOrder=3
-module.ldap.field.connectionUsername.displayName=Connect Username
-module.ldap.field.connectionUsername.description=The user name used to connect to the LDAP server.  Should be an administrator or Directory manager that has access to examine other users' passwords.
+module.ldap.field.connectionUsername.displayName=realmwizard.configure.ldap.connectionUsername.name
+module.ldap.field.connectionUsername.description=realmwizard.configure.ldap.connectionUsername.description
 module.ldap.field.connectionUsername.length=20
 module.ldap.field.connectionPassword.displayOrder=4
-module.ldap.field.connectionPassword.displayName=Connect Password
+module.ldap.field.connectionPassword.displayName=realmwizard.configure.ldap.connectionPassword.name
 module.ldap.field.connectionPassword.password=true
-module.ldap.field.connectionPassword.description=The password used to connect to the LDAP server.
+module.ldap.field.connectionPassword.description=realmwizard.configure.ldap.connectionPassword.description
 module.ldap.field.connectionPassword.length=20
 module.ldap.field.connectionProtocol.displayOrder=5
-module.ldap.field.connectionProtocol.displayName=Connect Protocol
-module.ldap.field.connectionProtocol.description=The connection protocol used to communicate with the LDAP server.  Normally left blank, though it can be set to <tt>ssl</tt> if the server supports it.
+module.ldap.field.connectionProtocol.displayName=realmwizard.configure.ldap.connectionProtocol.name
+module.ldap.field.connectionProtocol.description=realmwizard.configure.ldap.connectionProtocol.description
 module.ldap.field.connectionProtocol.length=10
 module.ldap.field.connectionProtocol.blankAllowed=true
 module.ldap.field.authentication.displayOrder=6
-module.ldap.field.authentication.displayName=Authentication
-module.ldap.field.authentication.description=The security level to use, which can be <tt>none</tt>, <tt>simple</tt>, or <tt>strong</tt> (the usual value is <tt>simple</tt>.  If this property is unspecified, the behavior is determined by the service provider.
+module.ldap.field.authentication.displayName=realmwizard.configure.ldap.authentication.name
+module.ldap.field.authentication.description=realmwizard.configure.ldap.authentication.description
 module.ldap.field.authentication.length=10
 module.ldap.field.authentication.blankAllowed=true
 module.ldap.field.userBase.displayOrder=7
-module.ldap.field.userBase.displayName=User Base
-module.ldap.field.userBase.description=The base LDAP context (location) to search for users.  The search may look in this location only, or there and all subcontexts, depending on the settings for "User Search Subtree" below.
+module.ldap.field.userBase.displayName=realmwizard.configure.ldap.userBase.name
+module.ldap.field.userBase.description=realmwizard.configure.ldap.userBase.description
 module.ldap.field.userBase.length=40
 module.ldap.field.userSearchMatching.displayOrder=8
-module.ldap.field.userSearchMatching.displayName=User Search Matching
-module.ldap.field.userSearchMatching.description=The LDAP attribute search string used to find the user.  RFC 2254 filters are allowed, and normally the parameter <tt>{0}</tt> is used to identify the username.  A typical value would be <tt>(uid={0})</tt> or <tt>(cn={0})</tt>.
+module.ldap.field.userSearchMatching.displayName=realmwizard.configure.ldap.userSearchMatching.name
+module.ldap.field.userSearchMatching.description=realmwizard.configure.ldap.userSearchMatching.description
 module.ldap.field.userSearchMatching.length=20
 module.ldap.field.userSearchSubtree.displayOrder=9
-module.ldap.field.userSearchSubtree.displayName=User Search Subtree
-module.ldap.field.userSearchSubtree.description=If set to <tt>true</tt>, then subtrees under the "User Base" will be searched for users too.  If set to <tt>false</tt>, then only the "User Base" location itself will be searched.
+module.ldap.field.userSearchSubtree.displayName=realmwizard.configure.ldap.userSearchSubtree.name
+module.ldap.field.userSearchSubtree.description=realmwizard.configure.ldap.userSearchSubtree.description
 module.ldap.field.userSearchSubtree.length=10
 module.ldap.field.roleBase.displayOrder=10
-module.ldap.field.roleBase.displayName=Role Base
-module.ldap.field.roleBase.description=The base LDAP context (location) to search for roles.  The search may look in this location only, or there and all subcontexts, depending on the settings for "Role Search Subtree" below.
+module.ldap.field.roleBase.displayName=realmwizard.configure.ldap.roleBase.name
+module.ldap.field.roleBase.description=realmwizard.configure.ldap.roleBase.description
 module.ldap.field.roleBase.length=40
 module.ldap.field.roleName.displayOrder=11
-module.ldap.field.roleName.displayName=Role Name
-module.ldap.field.roleName.description=The LDAP attribute type that corresponds to the the role name.  Often set to <tt>cn</tt>.
+module.ldap.field.roleName.displayName=realmwizard.configure.ldap.roleName.name
+module.ldap.field.roleName.description=realmwizard.configure.ldap.roleName.description
 module.ldap.field.roleName.length=20
 module.ldap.field.roleSearchMatching.displayOrder=12
-module.ldap.field.roleSearchMatching.displayName=Role User Search String
-module.ldap.field.roleSearchMatching.description=The LDAP attribute search string used on a role to find the users who are members of the role.  This is used when the role has many attributes with the same name, but with different values (one per user).  Normally the parameter <tt>{0}</tt> is used to identify the username.  A typical value would be <tt>(member={0})</tt> or <tt>(memberUID={0})</tt>.
+module.ldap.field.roleSearchMatching.displayName=realmwizard.configure.ldap.roleSearchMatching.name
+module.ldap.field.roleSearchMatching.description=realmwizard.configure.ldap.roleSearchMatching.description
 module.ldap.field.roleSearchMatching.length=20
 module.ldap.field.roleSearchSubtree.displayOrder=13
-module.ldap.field.roleSearchSubtree.displayName=Role Search Subtree
-module.ldap.field.roleSearchSubtree.description=If set to <tt>true</tt>, then subtrees under the "Role Base" will be searched for roles too.  If set to <tt>false</tt>, then only the "Role Base" location itself will be searched.
+module.ldap.field.roleSearchSubtree.displayName=realmwizard.configure.ldap.roleSearchSubtree.name
+module.ldap.field.roleSearchSubtree.description=realmwizard.configure.ldap.roleSearchSubtree.description
 module.ldap.field.roleSearchSubtree.length=10
 module.ldap.field.userRoleName.displayOrder=14
-module.ldap.field.userRoleName.displayName=User Role Search String
-module.ldap.field.userRoleName.description=If the role entry does not have an attribute for users, but instead the user entry has an attribute for roles, this should be used instead of the "Role User Search String".  It names the attribute on a user that lists a role that user is in.  A typical value would be <tt>(memberOf={0})</tt>.
+module.ldap.field.userRoleName.displayName=realmwizard.configure.ldap.userRoleName.name
+module.ldap.field.userRoleName.description=realmwizard.configure.ldap.userRoleName.description
 module.ldap.field.userRoleName.length=20
 module.ldap.field.userRoleName.blankAllowed=true
 # Certificate Properties File
 module.certprops.name=Certificate Properties File Realm
 module.certprops.class=org.apache.geronimo.security.realm.providers.CertificatePropertiesFileLoginModule
 module.certprops.field.usersURI.displayOrder=1
-module.certprops.field.usersURI.displayName=Users File URI
-module.certprops.field.usersURI.description=The location of a properties file (relative to the Geronimo home dir) holding certificate to user mapping information.  The format of each line should be <tt>username=certificatename</tt> where certificate name is <tt>X509Certificate.getSubjectX500Principal().getName()</tt>
+module.certprops.field.usersURI.displayName=realmwizard.configure.certprops.usersURI.name
+module.certprops.field.usersURI.description=realmwizard.configure.certprops.usersURI.description
 module.certprops.field.usersURI.length=50
 module.certprops.field.groupsURI.displayOrder=2
-module.certprops.field.groupsURI.displayName=Groups File URI
-module.certprops.field.groupsURI.description=The location of a properties file (relative to the Geronimo home dir) holding group information.  The format of each line should be <tt>group=user,user,...</tt>.
+module.certprops.field.groupsURI.displayName=realmwizard.configure.certprops.groupsURI.name
+module.certprops.field.groupsURI.description=realmwizard.configure.certprops.groupsURI.description
 module.certprops.field.groupsURI.length=50
 # TODO: Sun Kerberos Login Module & Properties
 # Other realm has special edit logic; don't bother with much at all

Modified: geronimo/server/branches/2.1/plugins/console/plugin-portlets/src/main/webapp/WEB-INF/view/car/assemblyConfirm.jsp
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/plugins/console/plugin-portlets/src/main/webapp/WEB-INF/view/car/assemblyConfirm.jsp?rev=742700&r1=742699&r2=742700&view=diff
==============================================================================
--- geronimo/server/branches/2.1/plugins/console/plugin-portlets/src/main/webapp/WEB-INF/view/car/assemblyConfirm.jsp (original)
+++ geronimo/server/branches/2.1/plugins/console/plugin-portlets/src/main/webapp/WEB-INF/view/car/assemblyConfirm.jsp Mon Feb  9 19:43:14 2009
@@ -22,7 +22,7 @@
 <portlet:defineObjects/>
 <table border="0">
     <tr>
-        <td><h1>Server Assembly Successful</h1></td>
+        <td><h1><fmt:message key="car.assemblyConfirm.successful" /></h1></td>
     </tr>
     <c:forEach var="plugin" items="${plugins}">
     <c:set var="artifact" value="${plugin.pluginArtifact.moduleId}"/>
@@ -42,7 +42,7 @@
     </c:forEach>
 </table>
 <br>
-<p>File Location: ${absoluteDeployedPath}</p>
+<p><fmt:message key="car.assemblyConfirm.fileLocation" />: ${absoluteDeployedPath}</p>
 <br>
 <form method=POST">
 <input type="submit" value='<fmt:message key="consolebase.common.done" />' onclick="history.go(-3); return false;" />

Modified: geronimo/server/branches/2.1/plugins/console/plugin-portlets/src/main/webapp/WEB-INF/view/car/assemblylist.jsp
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/plugins/console/plugin-portlets/src/main/webapp/WEB-INF/view/car/assemblylist.jsp?rev=742700&r1=742699&r2=742700&view=diff
==============================================================================
--- geronimo/server/branches/2.1/plugins/console/plugin-portlets/src/main/webapp/WEB-INF/view/car/assemblylist.jsp (original)
+++ geronimo/server/branches/2.1/plugins/console/plugin-portlets/src/main/webapp/WEB-INF/view/car/assemblylist.jsp Mon Feb  9 19:43:14 2009
@@ -44,12 +44,12 @@
   <fmt:message key="car.list.noPlugins" />
   <p>
   <form method="POST">
-    <input type="submit" value="Cancel" onclick="history.go(-1); return false;" />
+    <input type="submit" value='<fmt:message key="consolebase.common.cancel"/>' onclick="history.go(-1); return false;" />
   </form>
 </c:when>
 <c:otherwise>
 <form name="frmlst" action="<portlet:actionURL/>" method="POST">
-    <h3>Name the server to be assembled</h3>
+    <h3><fmt:message key="car.list.assemblyServerName"/></h3>
     <input id="mode" type="hidden" name="mode" value="assemblyView-before"/>
     
 <table border="0" cellpadding="3">
@@ -87,7 +87,7 @@
   <th class="DarkBackground"><a href='<portlet:actionURL>
 	                                   <portlet:param name="column" value="${column}"/>
 	                                   <portlet:param name="mode" value="index-after"/>
-	                                  </portlet:actionURL>'>${column}</a></th>
+	                                  </portlet:actionURL>'><fmt:message key="car.common.list${column}" /></a></th>
   </c:forEach>
 </tr>
 <c:forEach var="plugin" items="${plugins}" varStatus="status">



Mime
View raw message