geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dwo...@apache.org
Subject svn commit: r730224 [3/9] - in /geronimo/server/trunk/plugins: activemq/activemq-portlets/src/main/resources/ activemq/activemq-portlets/src/main/webapp/WEB-INF/view/jmsmanager/ activemq/activemq-portlets/src/main/webapp/WEB-INF/view/jmsmanager/activem...
Date Tue, 30 Dec 2008 19:51:36 GMT
Added: geronimo/server/trunk/plugins/console/console-base-portlets/src/main/resources/jms-resource-providers_zh.properties
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/console/console-base-portlets/src/main/resources/jms-resource-providers_zh.properties?rev=730224&view=auto
==============================================================================
--- geronimo/server/trunk/plugins/console/console-base-portlets/src/main/resources/jms-resource-providers_zh.properties (added)
+++ geronimo/server/trunk/plugins/console/console-base-portlets/src/main/resources/jms-resource-providers_zh.properties Tue Dec 30 11:51:33 2008
@@ -0,0 +1,20 @@
+#=====================================================================
+#  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.
+#=====================================================================
+
+provider.activemq.dependency = org.apache.geronimo.configs/activemq-broker//car
+provider.activemq.name       = ActiveMQ
+provider.activemq.rar        = org.apache.geronimo.modules/geronimo-activemq-ra//rar

Propchange: geronimo/server/trunk/plugins/console/console-base-portlets/src/main/resources/jms-resource-providers_zh.properties
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/ca/viewCertificate.jsp
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/ca/viewCertificate.jsp?rev=730224&r1=730223&r2=730224&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/ca/viewCertificate.jsp (original)
+++ geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/ca/viewCertificate.jsp Tue Dec 30 11:51:33 2008
@@ -138,7 +138,7 @@
             </c:otherwise>
         </c:choose>
         <tr>
-            <th class="${backgroundClass}" align="right">Finger prints:</th>
+            <th class="${backgroundClass}" align="right"><fmt:message key="ca.common.fingerPrintst"/>:</th>
             <td class="${backgroundClass}">
   <c:forEach items="${fingerPrints}" var="fp">
                 ${fp.key} = &nbsp; ${fp.value} <br/>
@@ -161,7 +161,7 @@
   <c:when test="${linkToListRequests}">
     <p><a href="<portlet:actionURL portletMode="view">
               <portlet:param name="mode" value="listRequestsIssue-before" />
-            </portlet:actionURL>">Back to Requests to be fulfilled</a></p>
+            </portlet:actionURL>"><fmt:message key="ca.viewCertificate.backToRequest"/></a></p>
   </c:when>
   <c:otherwise>
     <p><a href="<portlet:actionURL portletMode="view">

Modified: geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/configmanager/normal.jsp
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/configmanager/normal.jsp?rev=730224&r1=730223&r2=730224&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/configmanager/normal.jsp (original)
+++ geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/configmanager/normal.jsp Tue Dec 30 11:51:33 2008
@@ -216,11 +216,11 @@
 
 
 <form name="checkExpert">
-<input type="checkbox" name="expertMode" id="<portlet:namespace/>expertMode" onClick="toggleExpertMode();" />&nbsp;<label for="<portlet:namespace/>expertMode">Expert User (enable all actions on Geronimo Provided Components)</label>  
+<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">
-<input type="checkbox" name="showDependenciesMode" id="<portlet:namespace/>showDependenciesMode" onClick="toggleShowDependenciesMode();" />&nbsp;<label for="<portlet:namespace/>showDependenciesMode">Show parent and child components</label>
+<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/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/infomanager/javaSysNormal.jsp
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/infomanager/javaSysNormal.jsp?rev=730224&r1=730223&r2=730224&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/infomanager/javaSysNormal.jsp (original)
+++ geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/infomanager/javaSysNormal.jsp Tue Dec 30 11:51:33 2008
@@ -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="apache.javaSysNormal.vm"/></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="apache.javaSysNormal.os"/></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="apache.javaSysNormal.usr"/></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="apache.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/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/securityrealmmanager/se/groups/addmaximized.jsp
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/securityrealmmanager/se/groups/addmaximized.jsp?rev=730224&r1=730223&r2=730224&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/securityrealmmanager/se/groups/addmaximized.jsp (original)
+++ geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/securityrealmmanager/se/groups/addmaximized.jsp Tue Dec 30 11:51:33 2008
@@ -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/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/webmanager/connector/editConnector.jsp
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/webmanager/connector/editConnector.jsp?rev=730224&r1=730223&r2=730224&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/webmanager/connector/editConnector.jsp (original)
+++ geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/webmanager/connector/editConnector.jsp Tue Dec 30 11:51:33 2008
@@ -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/>
 <fmt:setBundle basename="consolebase"/>
 <script language="JavaScript">
@@ -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'}"/>
@@ -148,11 +149,11 @@
 </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/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/webmanager/connector/help.jsp
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/webmanager/connector/help.jsp?rev=730224&r1=730223&r2=730224&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/webmanager/connector/help.jsp (original)
+++ geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/webmanager/connector/help.jsp Tue Dec 30 11:51:33 2008
@@ -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/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/webmanager/connector/normal.jsp
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/webmanager/connector/normal.jsp?rev=730224&r1=730223&r2=730224&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/webmanager/connector/normal.jsp (original)
+++ geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/webmanager/connector/normal.jsp Tue Dec 30 11:51:33 2008
@@ -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/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/webmanager/normal.jsp
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/webmanager/normal.jsp?rev=730224&r1=730223&r2=730224&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/webmanager/normal.jsp (original)
+++ geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/webmanager/normal.jsp Tue Dec 30 11:51:33 2008
@@ -89,14 +89,14 @@
       <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>
 </table>
 </c:if>
 <c:if test="${!statsOn}">
-  ${statsMessage}<br/><br/>
+  ${statsMessage}
   <c:if test="${statsLazy}">
     <a href="<portlet:actionURL><portlet:param name="stats" value="true"/></portlet:actionURL>"><fmt:message key="consolebase.common.enable"/></a>
   </c:if>

Modified: geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/welcome/welcomeNormal.jsp
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/welcome/welcomeNormal.jsp?rev=730224&r1=730223&r2=730224&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/welcome/welcomeNormal.jsp (original)
+++ geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/welcome/welcomeNormal.jsp Tue Dec 30 11:51:33 2008
@@ -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/trunk/plugins/console/console-portal-driver/src/main/resources/ToolTips.properties
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/console/console-portal-driver/src/main/resources/ToolTips.properties?rev=730224&r1=730223&r2=730224&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/console/console-portal-driver/src/main/resources/ToolTips.properties (original)
+++ geronimo/server/trunk/plugins/console/console-portal-driver/src/main/resources/ToolTips.properties Tue Dec 30 11:51:33 2008
@@ -1,20 +1,19 @@
-# 
-# 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.
+#=====================================================================
+#  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.
+#=====================================================================
 
 tooltip.windowstate.maximized = Maximize
 tooltip.windowstate.minimized = Minimize

Added: geronimo/server/trunk/plugins/console/console-portal-driver/src/main/resources/ToolTips_zh.properties
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/console/console-portal-driver/src/main/resources/ToolTips_zh.properties?rev=730224&view=auto
==============================================================================
--- geronimo/server/trunk/plugins/console/console-portal-driver/src/main/resources/ToolTips_zh.properties (added)
+++ geronimo/server/trunk/plugins/console/console-portal-driver/src/main/resources/ToolTips_zh.properties Tue Dec 30 11:51:33 2008
@@ -0,0 +1,24 @@
+#=====================================================================
+#  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.
+#=====================================================================
+
+tooltip.css.classname         = \u5DE5\u5177\u63D0\u793A
+tooltip.mode.edit             = \u7F16\u8F91
+tooltip.mode.help             = \u5E2E\u52A9
+tooltip.mode.view             = \u67E5\u770B
+tooltip.windowstate.maximized = \u6700\u5927\u5316
+tooltip.windowstate.minimized = \u6700\u5C0F\u5316
+tooltip.windowstate.normal    = \u6B63\u5E38

Propchange: geronimo/server/trunk/plugins/console/console-portal-driver/src/main/resources/ToolTips_zh.properties
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: geronimo/server/trunk/plugins/console/console-portal-driver/src/main/resources/portaldriver.properties
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/console/console-portal-driver/src/main/resources/portaldriver.properties?rev=730224&r1=730223&r2=730224&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/console/console-portal-driver/src/main/resources/portaldriver.properties (original)
+++ geronimo/server/trunk/plugins/console/console-portal-driver/src/main/resources/portaldriver.properties Tue Dec 30 11:51:33 2008
@@ -14,8 +14,6 @@
 #  See the License for the specific language governing permissions and
 #  limitations under the License.
 #=====================================================================
-# $Rev$ $Date$
-
 console.common.ConsoleLogIn               = Geronimo Console Login
 console.common.login                      = Login
 console.common.loginToConsole             = Log in to the Geronimo Console

Modified: geronimo/server/trunk/plugins/console/console-portal-driver/src/main/resources/portaldriver_zh.properties
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/console/console-portal-driver/src/main/resources/portaldriver_zh.properties?rev=730224&r1=730223&r2=730224&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/console/console-portal-driver/src/main/resources/portaldriver_zh.properties (original)
+++ geronimo/server/trunk/plugins/console/console-portal-driver/src/main/resources/portaldriver_zh.properties Tue Dec 30 11:51:33 2008
@@ -14,20 +14,19 @@
 #  See the License for the specific language governing permissions and
 #  limitations under the License.
 #=====================================================================
-# $Rev$ $Date$
 
 console.common.ConsoleLogIn               = Geronimo\u63A7\u5236\u53F0\u767B\u5F55
+console.common.applications               = \u5E94\u7528
 console.common.login                      = \u767B\u5F55
 console.common.loginToConsole             = \u767B\u5F55Geronimo\u63A7\u5236\u53F0
+console.common.pages                      = \u9875\u9762
 console.common.password                   = \u5BC6\u7801
 console.common.username                   = \u7528\u6237\u540D
 console.head.title                        = Geronimo\u63A7\u5236\u53F0
-console.common.pages                      = \u9875\u9762
-console.common.applications 							= \u5e94\u7528
-console.login.components                  = <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/> 
-console.login.introduction                = <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.
+console.login.components                  = <strong>Geronimo&#8482;</strong> \u96C6\u6210\u4E86\u5982\u4E0B\u7EC4\u4EF6:<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/> 
+console.login.introduction                = <strong>GERONIMO&#8482;</strong>\u662F\u4E00\u4E2A\u901A\u8FC7\u4E86Java\u8BA4\u8BC1\u7684\u3001\u751F\u4EA7\u7EA7\u7684\u5E73\u53F0\u3002\u5176\u521D\u8877\u662F\u4E3A\u4E86\u8BA9\u5F00\u53D1\u8005\u80FD\u591F\u5FEB\u901F\u90E8\u7F72\u548C\u7BA1\u7406\u5176\u5E94\u7528\uFF0C\u7ED3\u679C\u4FBF\u8BDE\u751F\u4E86\u4E00\u4E2A\u5B8C\u6574\u5E76\u4E14\u529F\u80FD\u5F3A\u5927\u7684\u5E94\u7528\u5E73\u53F0\u3002\u5B83\u5229\u7528\u4E86\u5F00\u6E90\u793E\u7684\u6700\u65B0\u521B\u65B0\u4E14\u7B80\u5316\u4E86\u5E94\u7528\u7684\u90E8\u7F72\u548C\u7EF4\u62A4\u3002
 console.login.requireCookies              = \u6CE8\u610F\uFF1A\u9700\u8981\u6FC0\u6D3B\u6D4F\u89C8\u5668\u7684Cookie\u529F\u80FD\uFF0C\u624D\u80FD\u767B\u5F55\u5230Geronimo\u63A7\u5236\u53F0\u3002
-console.login.welcome                     = \u6B22\u8FCE\u5230Geronimo&#8482; \u7BA1\u7406\u63A7\u5236\u53F0
+console.login.welcome                     = \u6B22\u8FCE\u4F7F\u7528Geronimo&#8482; \u7BA1\u7406\u63A7\u5236\u53F0
 console.login_error.invalid               = \u65E0\u6548\u7684\u7528\u6237\u540D\u6216\u5BC6\u7801\uFF01
 console.login_success.loginSuccessful     = \u767B\u5F55\u6210\u529F
 console.login_success.returnToPortalTests = \u70B9\u51FB\u8FD9\u91CC\u8FD4\u56DE\u5230portal\u6D4B\u8BD5\u9875\u9762\u3002

Modified: geronimo/server/trunk/plugins/console/console-portal-driver/src/main/webapp/loginerror.jsp
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/console/console-portal-driver/src/main/webapp/loginerror.jsp?rev=730224&r1=730223&r2=730224&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/console/console-portal-driver/src/main/webapp/loginerror.jsp (original)
+++ geronimo/server/trunk/plugins/console/console-portal-driver/src/main/webapp/loginerror.jsp Tue Dec 30 11:51:33 2008
@@ -1,7 +1,3 @@
-<%@ page language="java" 
-         contentType="text/html; charset=UTF-8" %>
-<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt"%>
-<fmt:setBundle basename="portaldriver"/> 
 <%--
    Licensed to the Apache Software Foundation (ASF) under one or more
    contributor license agreements.  See the NOTICE file distributed with
@@ -21,6 +17,11 @@
 
 <%-- $Rev$ $Date$ --%>
 
+<%@ page language="java" 
+         contentType="text/html; charset=UTF-8" %>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt"%>
+<fmt:setBundle basename="portaldriver"/> 
+
 <html>
 <head>
 <title><fmt:message key="console.common.ConsoleLogIn"/></title>
@@ -123,7 +124,7 @@
           <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>
 
@@ -135,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/trunk/plugins/console/plugin-portlets/src/main/resources/pluginportlets.properties
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/console/plugin-portlets/src/main/resources/pluginportlets.properties?rev=730224&r1=730223&r2=730224&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/console/plugin-portlets/src/main/resources/pluginportlets.properties (original)
+++ geronimo/server/trunk/plugins/console/plugin-portlets/src/main/resources/pluginportlets.properties Tue Dec 30 11:51:33 2008
@@ -14,7 +14,6 @@
 #  See the License for the specific language governing permissions and
 #  limitations under the License.
 #=====================================================================
-# $Rev$ $Date$
 
 ajax.progressbar.processing = Processing...
 
@@ -22,6 +21,10 @@
 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.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
@@ -62,24 +65,28 @@
 car.download.processing                       = Processing {0}...
 car.downloadStatus.processing                 = Current file being operated on...
 car.help.return                               = To return to the main Plugin panel select the "view" link from the header of this portlet.
-car.index.assemblyHelp.desp                   = Assemble a server from geronimo plugins in the current server.   Please choose from one of the following 3 modes:
+car.index.assembleServer                      = Assemble a server
+car.index.assembleServerLong                  = Assemble a server from plugins in this one
 car.index.assemblyHelp.AppCentric.desp        = Choose the application plugins that suit your need and let your application plugins define the contents of your server.  Your server should be able to run your applications but may not be able to deploy anything.
+car.index.assemblyHelp.AppCentric.title       = Application Centric
 car.index.assemblyHelp.ExpertUser.desp        = Choose the application plugins and system plugins by configIds to construct your server.  Please only choose this mode when you are an expert user of Apache Geronimo, because you could end up with a server that is not able to start or deploy anything.
+car.index.assemblyHelp.ExpertUser.title       = Expert Users
 car.index.assemblyHelp.FuncCentric.desp       = Choose the functionalities that suit your needs, along with any deployed application plugins.
+car.index.assemblyHelp.FuncCentric.title      = Function Centric
+car.index.assemblyHelp.desp                   = Assemble a server from geronimo plugins in the current server.   Please choose from one of the following 3 modes:
 car.index.assemblyHelp.note                   = <p>Note this portlet only works with geronimo plugins.  If your application is not a geronimo plugin, you have the following options:</p><p>- Use the "Create Plugin" portlet from console to convert your application into a geronimo plugin<br/>- Use car-maven-plugin to convert your application into a geronimo plugin<br/>- Deploy your application after your server is assembled<br/></p>
 car.index.assemblyMode                        = Custom Assembly Mode: 
-car.index.assembleServerLong                  = Assemble a server from plugins in this one
-car.index.assembleServer                      = Assemble a server
 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.createPluginHelp.title              = Create geronimo plugins
 car.index.createPluginHelp.desp               = <p>Choose a configuration in the current Geronimo server to export as Geronimo plugin.   Fill out the plugin metadata information and save the plugin as a car file to your local file system.  The console will generate the <tt>geronimo-plugin.xml</tt> file that stores the plugin metadata information for your project and package it into a car file.   You can configure many plugin metadata via admin console, however, you will not be able to configure some of the advanced configuration, for example the <tt>config-xml-ceontent</tt> or <tt>config-substitution properties</tt>.</p><p>If you like to generate a geronimo plugin from command line, you can use the car-maven-plugin to generate a <tt>geronimo-plugin.xml</tt> file for your project, package your project as a car file, and add your project onto the geronimo plugin catalog (<tt>geronimo-plugins.xml</tt> file) automatically.</p>
-car.index.installPluginHelp.title             = Install geronimo plugins
+car.index.createPluginHelp.title              = Create geronimo plugins
 car.index.installPluginHelp.desp              = <p>Install geronimo plugins from a local or remote repository into the current Geronimo server.</p> <p>Click on the "Update Repository List" link to update the repository list to the latest recommended by the server.</p> <p>If you don't see your desired repository, click on the "Add Repository" link to add additional repository of your choice.  The repository must have a <tt>geronimo-plugins.xml</tt> file in the root directory listing the available plugins in the repository. </p>
+car.index.installPluginHelp.title             = Install geronimo plugins
 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.
 car.index.summary                             = <h2>Install Geronimo Plugins</h2> <p>This portlet lets you install Geronimo plugins. This can be used to install new features into a Geronimo server at runtime.</p> <p>Choose a local or remote repository to inspect for available Geronimo plugins.  The repository must have a <tt>geronimo-plugins.xml</tt> file in the root directory listing the available plugins in the repository.</p> <p>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>  and the enter the administrator username and password in the optional authentication fields.</p>
 car.index.updateRepositoryList                = Update Repository List
 car.index.validateConfig                      = Please select a configuration to export.
+car.list.PluginGroup                          = Plugin Groups in local server: 
 car.list.applicationPlugin                    = Application plugins in local server:
 car.list.assemblyArtifactId                   = Assembly artifactId:
 car.list.assemblyFormat                       = Assembly format:
@@ -90,18 +97,17 @@
 car.list.filterByCategoryAndName              = Filter by category and name: 
 car.list.nameServer                           = Name the server to be assembled: 
 car.list.noPlugins                            = No plugins are listed at this repository.
-car.list.PluginGroup                          = Plugin Groups in local server: 
 car.list.pluginRepo                           = Plugins listed at
 car.list.requiredPlugin                       = Required plugin in local server:
 car.list.selectPlugin                         = Select from plugins in current server:
 car.list.systemPlugin                         = System plugins in local server:
-car.pluginParams.JVMVersionsExp               = An optional list of JVM version prefixes supported by this plugin.  If no values are listed, the plugin can be installed in Geronimo running in any version of the JVM.  Otherwise, list one acceptable JVM version prefix per line, like "1.4.2&nbsp;\r\n&nbsp;1.5&nbsp;\r\n&nbsp;..." (ideally, of course, this means you've actually tested the plugin with Geronimo on each JVM version listed here).
+car.pluginParams.JVMVersionsExp               = An optional list of JVM version prefixes supported by this plugin.  If no values are listed, the plugin can be installed in Geronimo running in any version of the JVM.  Otherwise, list one acceptable JVM version prefix per line, like "1.4.2&nbsp;&nbsp;1.5&nbsp;&nbsp;..." (ideally, of course, this means you've actually tested the plugin with Geronimo on each JVM version listed here).
 car.pluginParams.authorExp                    = The author of the plug, which may be a person, company, open source project, etc.
 car.pluginParams.categoryExp                  = The category this plugin falls into.  Plugins in the same category will be listed together. If this plugin is intended to be listed on geronimoplugins.com then you should use one of the category names there if any of them fit.  Otherwise, you can select this freely, or according to the categories acceptable to the repository where you plan to post this.
 car.pluginParams.dependenciesExp              = A list of JARs or other module IDs that this plugin depends on.  These will be downloaded automatically when this plugin is installed.  Normally you shouldn't change this list.  However, you can move entries from the dependency list to the <b>prerequisite</b> list if the user must install the dependency manually before installing the plugin  (e.g. for a database pool where a plugin wouldn't know what server to connect to).<br /><br />  Each entry in this list should use the Unique ID format like is used for this plugin above. You may remove the version number if you'd like to work with any version of the dependency, though that may be risky. Each value should be on a separate line.
 car.pluginParams.descriptionExp               = A description of this plugin.  You should use plain text only, with blank lines to separate paragraphs.
 car.pluginParams.downloadRepositoriesExp      = A list of repositories to check for any dependencies that need to be downloaded. This should be a list of one URL per line, with values such as <tt>http://geronimoplugins.com/repository/</tt> and <tt>http://www.ibiblio.org/maven2/</tt>. Note that the repository this plugin is deployed to should typically be the first one listed.
-car.pluginParams.geronimoVersionsExp          = An optional list of Geronimo versions supported by this plugin.  If no values are listed, the plugin can be installed in any version of Geronimo. Otherwise, list one acceptable Geronimo version per line, like "1.1&nbsp;\r\n&nbsp;1.1.1&nbsp;\r\n&nbsp;1.1.2&nbsp;\r\n&nbsp;..." (ideally, of course, this means you've actually tested the plugin with each Geronimo version listed here).
+car.pluginParams.geronimoVersionsExp          = An optional list of Geronimo versions supported by this plugin.  If no values are listed, the plugin can be installed in any version of Geronimo. Otherwise, list one acceptable Geronimo version per line, like "1.1&nbsp;&nbsp;1.1.1&nbsp;&nbsp;1.1.2&nbsp;&nbsp;..." (ideally, of course, this means you've actually tested the plugin with each Geronimo version listed here).
 car.pluginParams.humanReadableName            = Human Readable Name
 car.pluginParams.humanReadableNameExp         = A human-readable name that will be displayed for this plugin.
 car.pluginParams.licenseExp                   = The name of the license that this plugin is covered by.  Ideally, it would be prefixed by the class of license, like "BSD -- (name)" or "GPL -- (name)".
@@ -129,12 +135,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
@@ -143,6 +143,7 @@
 configmanager.deploy.originalPlan                = Original plan
 configmanager.deploy.redeployApplication         = Redeploy application
 configmanager.deploy.saveLocally                 = Save this plan locally
+configmanager.deploy.showDetail                  = Show full details
 configmanager.deploy.showMigratedPlan            = Show Migrated plan
 configmanager.deploy.showOriginalPlan            = Show original plan
 configmanager.deployHelp.archiveExp              = Browse to select the war file in the Archive box.
@@ -159,6 +160,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
@@ -175,7 +177,6 @@
 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



Mime
View raw message