geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ga...@apache.org
Subject svn commit: r742717 [3/3] - in /geronimo/server/branches/2.1/plugins: monitoring/mconsole-jetty/src/main/plan/ monitoring/mconsole-tomcat/src/main/plan/ monitoring/mconsole-war/ monitoring/mconsole-war/src/main/resources/ monitoring/mconsole-war/src/ma...
Date Mon, 09 Feb 2009 20:20:22 GMT
Modified: geronimo/server/branches/2.1/plugins/monitoring/mconsole-war/src/main/webapp/WEB-INF/view/monitoringViews.jsp
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/plugins/monitoring/mconsole-war/src/main/webapp/WEB-INF/view/monitoringViews.jsp?rev=742717&r1=742716&r2=742717&view=diff
==============================================================================
--- geronimo/server/branches/2.1/plugins/monitoring/mconsole-war/src/main/webapp/WEB-INF/view/monitoringViews.jsp (original)
+++ geronimo/server/branches/2.1/plugins/monitoring/mconsole-war/src/main/webapp/WEB-INF/view/monitoringViews.jsp Mon Feb  9 20:20:21 2009
@@ -17,6 +17,7 @@
 --%>
 <%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
 <%@ taglib uri="http://java.sun.com/portlet" prefix="portlet"%>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt"%>
 <%@ page import="java.util.ArrayList" %>
 <%@ page import="java.sql.Connection" %>
 <%@ page import="java.sql.DatabaseMetaData" %>
@@ -24,6 +25,7 @@
 <%@ page import="java.sql.ResultSet" %>
 <%@ page import="java.sql.SQLException" %>
 <%@ page import="org.apache.geronimo.monitoring.console.util.*" %>
+<fmt:setBundle basename="monitor-portlet"/>
 <portlet:defineObjects/>
 <%
     String message = (String) request.getAttribute("message"); 
@@ -40,13 +42,13 @@
        <td width="100%" align="left" valign="top">
 <table width="100%" style="border-style: solid;
 border-width: 1px;">
- <thead align="center"><strong>Views</strong></thead>
+ <thead align="center"><strong><fmt:message key="monitor.common.view"/></strong></thead>
  <tr>
-  <th class="DarkBackground" width="30%">Name</th>
-  <th class="DarkBackground" width="10%">Elements</th>
-  <th class="DarkBackground" width="10%">Created</th>
-  <th class="DarkBackground" width="10%">Modified</th>
-  <th class="DarkBackground" width="30%" colspan="2">Actions</th>
+  <th class="DarkBackground" width="30%"><fmt:message key="monitor.common.name"/></th>
+  <th class="DarkBackground" width="10%"><fmt:message key="monitor.view.element"/></th>
+  <th class="DarkBackground" width="10%"><fmt:message key="monitor.view.created"/></th>
+  <th class="DarkBackground" width="10%"><fmt:message key="monitor.view.modified"/></th>
+  <th class="DarkBackground" width="30%" colspan="2"><fmt:message key="monitor.common.action"/></th>
  </tr>
  <%
  DBManager DBase = new DBManager();
@@ -72,14 +74,14 @@
   <td class="${backgroundClass}" width="10%" align="center"><%=rs.getString("graph_count")%></td>
   <td class="${backgroundClass}" width="15%" align="center"><%=rs.getString("added").substring(0,16)%></td>
   <td class="${backgroundClass}" width="15%" align="center"><%=rs.getString("modified").substring(0,16)%></td>
-  <td class="${backgroundClass}" width="15%" align="center"><a href="<portlet:actionURL portletMode="edit"><portlet:param name="action" value="showEditView" /><portlet:param name="view_id" value='<%=rs.getString("view_id")%>' /></portlet:actionURL>"><img border=0 src="/monitoring/images/edit-b.png">Edit</a></td>
+  <td class="${backgroundClass}" width="15%" align="center"><a href="<portlet:actionURL portletMode="edit"><portlet:param name="action" value="showEditView" /><portlet:param name="view_id" value='<%=rs.getString("view_id")%>' /></portlet:actionURL>"><img border=0 src="/monitoring/images/edit-b.png"><fmt:message key="monitor.common.edit"/></a></td>
  </tr>
  <%
  }
  rs.close();
  %>
 </table>
-<div align="right"><a href="<portlet:actionURL portletMode="edit"><portlet:param name="action" value="showAddView" /></portlet:actionURL>"><img border=0 src="/monitoring/images/max-b.png">Create View</a></div>
+<div align="right"><a href="<portlet:actionURL portletMode="edit"><portlet:param name="action" value="showAddView" /></portlet:actionURL>"><img border=0 src="/monitoring/images/max-b.png"><fmt:message key="monitor.view.create"/></a></div>
 <%
  // close connection
  con.close();
@@ -94,17 +96,17 @@
             <table width="100%" style="border-bottom: 1px solid #2581c7;" cellspacing="1" cellpadding="1">
                 <tr>
                     <td class="DarkBackground" align="left" nowrap>
-                        <font face="Verdana" size="+1">Navigation</font>
+                        <font face="Verdana" size="+1"><fmt:message key="monitor.common.nav"/></font>
                     </td>
                 </tr>
                 <tr>
                     <td bgcolor="#FFFFFF" nowrap>
                         &nbsp;<br />
                         <ul>
-                        <li><a href="<portlet:actionURL portletMode="view"><portlet:param name="action" value="showHome" /></portlet:actionURL>">Home</a></li>
-                        <li><a href="<portlet:actionURL portletMode="view"><portlet:param name="action" value="showAllViews" /></portlet:actionURL>">Views</a></li>
-                        <li><a href="<portlet:actionURL portletMode="view"><portlet:param name="action" value="showAllServers" /></portlet:actionURL>">Servers</a></li>
-                        <li><a href="<portlet:actionURL portletMode="view"><portlet:param name="action" value="showAllGraphs" /></portlet:actionURL>">Graphs</a></li>
+                        <li><a href="<portlet:actionURL portletMode="view"><portlet:param name="action" value="showHome" /></portlet:actionURL>"><fmt:message key="monitor.common.home"/></a></li>
+                        <li><a href="<portlet:actionURL portletMode="view"><portlet:param name="action" value="showAllViews" /></portlet:actionURL>"><fmt:message key="monitor.common.view"/></a></li>
+                        <li><a href="<portlet:actionURL portletMode="view"><portlet:param name="action" value="showAllServers" /></portlet:actionURL>"><fmt:message key="monitor.common.server"/></a></li>
+                        <li><a href="<portlet:actionURL portletMode="view"><portlet:param name="action" value="showAllGraphs" /></portlet:actionURL>"><fmt:message key="monitor.common.graph"/></a></li>
                         </ul>
                         &nbsp;<br />
                     </td>   

Modified: geronimo/server/branches/2.1/plugins/plancreator/plancreator-console-jetty/src/main/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/plugins/plancreator/plancreator-console-jetty/src/main/plan/plan.xml?rev=742717&r1=742716&r2=742717&view=diff
==============================================================================
--- geronimo/server/branches/2.1/plugins/plancreator/plancreator-console-jetty/src/main/plan/plan.xml (original)
+++ geronimo/server/branches/2.1/plugins/plancreator/plancreator-console-jetty/src/main/plan/plan.xml Mon Feb  9 20:20:21 2009
@@ -30,6 +30,13 @@
         </role-mappings>
     </security>
     
+    <!-- i18n support -->
+    <gbean name="ConsoleResourceGBean" class="org.apache.geronimo.console.i18n.ConsoleResourceGBean">
+        <reference name="ConsoleResourceRegistry">
+            <name>ConsoleResourceRegistry</name>
+        </reference>
+    </gbean> 
+
     <!-- Start off a ACEGBean, this is the lifecycle for the portlet -->
     <gbean name="PlanCreator" class="org.apache.geronimo.pluto.AdminConsoleExtensionGBean">
         <attribute name="pageTitle">Applications/Plan Creator</attribute>

Modified: geronimo/server/branches/2.1/plugins/plancreator/plancreator-console-tomcat/src/main/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/plugins/plancreator/plancreator-console-tomcat/src/main/plan/plan.xml?rev=742717&r1=742716&r2=742717&view=diff
==============================================================================
--- geronimo/server/branches/2.1/plugins/plancreator/plancreator-console-tomcat/src/main/plan/plan.xml (original)
+++ geronimo/server/branches/2.1/plugins/plancreator/plancreator-console-tomcat/src/main/plan/plan.xml Mon Feb  9 20:20:21 2009
@@ -33,6 +33,13 @@
         </role-mappings>
     </security>
     
+    <!-- i18n support -->
+    <gbean name="ConsoleResourceGBean" class="org.apache.geronimo.console.i18n.ConsoleResourceGBean">
+        <reference name="ConsoleResourceRegistry">
+            <name>ConsoleResourceRegistry</name>
+        </reference>
+    </gbean> 
+
     <!-- Start off a ACEGBean, this is the lifecycle for the portlet -->
     <gbean name="PlanCreator" class="org.apache.geronimo.pluto.AdminConsoleExtensionGBean">
         <attribute name="pageTitle">Applications/Plan Creator</attribute>

Added: geronimo/server/branches/2.1/plugins/plancreator/plancreator-portlets/src/main/resources/plancreator-portlet.properties
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/plugins/plancreator/plancreator-portlets/src/main/resources/plancreator-portlet.properties?rev=742717&view=auto
==============================================================================
--- geronimo/server/branches/2.1/plugins/plancreator/plancreator-portlets/src/main/resources/plancreator-portlet.properties (added)
+++ geronimo/server/branches/2.1/plugins/plancreator/plancreator-portlets/src/main/resources/plancreator-portlet.properties Mon Feb  9 20:20:21 2009
@@ -0,0 +1,130 @@
+#=====================================================================
+#  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.
+#=====================================================================
+
+plancreator.archive.archive                   = Archive
+plancreator.archive.archiveErr                = The archive you provided is not a WAR. Please note that only WARs are supported as of now.
+plancreator.archive.config                    = Configure
+plancreator.common.action                     = Action
+plancreator.common.add                        = Add
+plancreator.common.addPort                    = AddPort
+plancreator.common.cancel                     = Cancel
+plancreator.common.class                      = Class
+plancreator.common.del                        = Delete
+plancreator.common.edit                       = Edit
+plancreator.common.finish                     = Finish
+plancreator.common.host                       = Host
+plancreator.common.id                         = Id
+plancreator.common.name                       = Name
+plancreator.common.next                       = Next
+plancreator.common.port                       = Port
+plancreator.common.portName                   = Port Name
+plancreator.common.previous                   = Previous
+plancreator.common.protocol                   = Protocol
+plancreator.common.type                       = Type
+plancreator.common.uri                        = URI
+plancreator.common.url                        = URL
+plancreator.dependency.dependency             = Dependencies
+plancreator.dependency.desc                   = All the modules available in the server repository are shown below. Select the ones on which your web-application is dependent. Default selections should be sufficient in most scenarios.
+plancreator.dependency.title                  = <b>WAR - Dependencies</b> -- Select the dependencies your Web Application has on other Modules
+plancreator.dependency.tree                   = Dependencies tree goes here
+plancreator.deploy.deploy                     = Deploy WAR
+plancreator.deploy.desc                       = The generated Geronimo Deployment Plan is shown below in an edit box. If you would like to make any changes (default should be enough in most scenarios), do it now and then press "Deploy WAR" to deploy the Web application.
+plancreator.deploy.plan                       = Deployment Plan
+plancreator.deploy.title                      = <b>Created Plan</b> -- Copy/Edit Deployment Plan
+plancreator.env.artifactId                    = Artifact Id
+plancreator.env.artifactIdDesc                = A name identifying the specific module within the group.
+plancreator.env.checked                       = CHECKED
+plancreator.env.classpathSetting              = Classpath Settings
+plancreator.env.context                       = Web Context Root
+plancreator.env.contextDesc                   = This is the first part of the URL used to access the Web application by the client. For example, if the context-root is entered as "HelloWorld", then a typical URL to the application would start with "http://host:port/HelloWorld/".
+plancreator.env.desc                          = Defaults in this page should suffice for typical scenarios.
+plancreator.env.groupId                       = Group Id
+plancreator.env.groupIdDesc                   = A name identifying a group of related modules. This may be a project name, a company name, etc. The important thing is that each artifactID should be unique within the group.
+plancreator.env.hiddenClasses                 = Hidden Classes
+plancreator.env.hiddenClassesDesc             = List packages or classes that may be in a parent class loader, but should not be exposed from there to the Web application. This is typically used when the Web plication wants to use a different version of a library than that of it's parent configuration (or Geronimo itself) uses. Separate multiple package/class names with a semicolon ';'
+plancreator.env.id                            = Web Application Identity
+plancreator.env.idDesc                        = Every module in Geronimo is uniquely identified by it's ModuleID which consists of four components: groupId/artifactId/version/type. Example: "org.apache.geronimo.plugins/plancreator-tomcat/2.1/car".
+plancreator.env.inverseClassLoading           = Inverse Class Loading
+plancreator.env.inverseClassLoadingDesc       = Normally (if this element is not checked), the module's class loader will work normally - classes will be loaded from the parent class loader if available before checking the current class loader. If this element is checked, that behavior is reversed and the current class loader will always be checked first before looking in the parent class loader. This is often enabled to give the JARs in WEB-INF/lib precedence over anything that might be in a parent class loader.
+plancreator.env.nonOverridableClass           = Non Overridable Classes
+plancreator.env.nonOverridableClassDesc       = List packages or classes that the Web application should always load from a parent class loader, and     never load from WEB-INF/lib or WEB-INF/classes. This might be used to force a Web application to share the same instance of a common library with other Web applications, even if they each include it in their own WAR. Separate multiple package/class names with a semicolon ';'
+plancreator.env.title                         = <b>WAR - Environment</b> -- Configure Web Application Identity and Class Path
+plancreator.env.type                          = Type
+plancreator.env.typeDesc                      = A module's type is normally either CAR (for a system module) or the file extension for an application module (ear,war,jar,etc).
+plancreator.env.version                       = Version
+plancreator.env.versionDesc                   = Version number for the module.
+plancreator.reference.desc                    = Map the references declared in your Web application to specific items available in the server environment. References declared in your web-app (ex. EJB, EJB Local, JDBC Connection Pool, JavaMail Session, JMS Connection Factory and JMS Destination references) are shown below to the left and the resources (available in the server environment) to which they can be linked are shown to the right.
+plancreator.reference.editor                  = Editors for references go here
+plancreator.reference.ejbDeployed             = EJBs Deployed
+plancreator.reference.ejbLocalRef             = EJB Local Ref
+plancreator.reference.ejbLocalReference       = EJB Local References
+plancreator.reference.ejbRef                  = EJB Ref
+plancreator.reference.ejbReference            = EJB References
+plancreator.reference.javamail                = Mail Sessions Available
+plancreator.reference.javamailRef             = Mail Session Ref
+plancreator.reference.javamailReference       = JavaMail Session References
+plancreator.reference.jdbc                    = JDBC Pools
+plancreator.reference.jdbcRef                 = JDBC Ref
+plancreator.reference.jdbcReference           = JDBC Pool References
+plancreator.reference.jms                     = JMS Destinations
+plancreator.reference.jmsConn                 = JMS Factories
+plancreator.reference.jmsConnRef              = JMS Ref
+plancreator.reference.jmsConnReference        = JMS Connection Factory References
+plancreator.reference.jmsRef                  = JMS Ref
+plancreator.reference.jmsReference            = JMS Destination References
+plancreator.reference.resolveErr              = Some of the references are not resolved. Please resolve them and only then press Next button.
+plancreator.reference.title                   = <b>WAR - References</b> -- Resolve EJB, EJB Local, JDBC Connection Pool, JavaMail Session, JMS Connection Factory, JMS Destination and Web Service References
+plancreator.reference.tree                    = EAR tree goes here
+plancreator.reference.wsDesc                  = Service references declared in your application are shown below to the left. If the WSDL doesn't contain the port information to contact the service or if that information is ambiguous, then resolve the service-ref by clicking on "Add Port".
+plancreator.reference.wsRef                   = Service Ref Name
+plancreator.reference.wsReference             = Web Service References
+plancreator.security.advancedSetting          = Advanced Settings
+plancreator.security.advancedSettingDesc      = Click Advanced Settings to enable specifying run-as-subject
+plancreator.security.credenitial              = Credentials
+plancreator.security.credenitialName          = Credentials Name
+plancreator.security.credentialStore          = Credential Store
+plancreator.security.credentialStoreSelection = Select the Credential Store which has the defaultSubject and runAsSubjects defined.
+plancreator.security.desc                     = Map security roles declared in web.xml deployment descriptor to specific users or groups in the security realms configured in Geronimo. You can also specify a default user or group to be used when the end user has not yet logged in.
+plancreator.security.distinguishedName        = Distinguished Name
+plancreator.security.doAsCurrentCaller        = Do as current caller
+plancreator.security.doAsCurrentCallerDesc    = Select this if the work is to be performed as the calling Subject/User instead of as Server.
+plancreator.security.domainName               = Domain Name
+plancreator.security.domainNameErr            = Please enter a domain name for this role
+plancreator.security.groupPrincipal           = Group Principal
+plancreator.security.loginDomainPrincipal     = Login Domain Principal
+plancreator.security.principal                = Principal
+plancreator.security.realm                    = Realm
+plancreator.security.realmName                = Realm-name
+plancreator.security.realmPrincipal           = Realm Principal
+plancreator.security.role                     = Role
+plancreator.security.roleMapping              = Security Role Mappings
+plancreator.security.roleMappingDesc          = Security roles declared in web.xml are shown below to the left. Map them to specific principals present in Geronimo's security realms by adding Principals, Login Domain Principals, Realm Principals and/or Distinguished Names.
+plancreator.security.roleMappingErr           = Please enter a unique principal name for this role
+plancreator.security.roleTree                 = Security roles tree
+plancreator.security.runAsSubjectDesc         = The run-as-subject is required when the module is to continue as if run by the specified subject when constrained to the specified role.
+plancreator.security.runAsSubjectsTree        = Run-as-subjects tree
+plancreator.security.securityRealmName        = Security Realm Name
+plancreator.security.securityRealmNameDesc    = Select the Geronimo security realm that will authenticate user logins.
+plancreator.security.specifyRunAsSubject      = Specify run-as-subject
+plancreator.security.subject                  = Default Subject
+plancreator.security.subjectDesc              = The defaultSubject is used whenever an unauthenticated user accesses an unsecured page. Typically, this is used so that an unsecured page can access a secured resource, a secured EJB for example. Realm is the realm name of the default subject and Id is the default subject's name within that realm.
+plancreator.security.title                    = <b>WAR - Security</b> -- Specify Security Realm and Role Mappings
+plancreator.security.useContextHandler        = Use context handler
+plancreator.security.useContextHandlerDesc    = Select this if the installed JACC policy contexts should use PolicyContextHandlers.
+plancreator.security.userPrincipal            = User Principal
+plancreator.status.detail                     = Show full details
+plancreator.status.launch                     = Launch Web App

Propchange: geronimo/server/branches/2.1/plugins/plancreator/plancreator-portlets/src/main/resources/plancreator-portlet.properties
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/server/branches/2.1/plugins/plancreator/plancreator-portlets/src/main/resources/plancreator-portlet.properties
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/server/branches/2.1/plugins/plancreator/plancreator-portlets/src/main/resources/plancreator-portlet.properties
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Added: geronimo/server/branches/2.1/plugins/plancreator/plancreator-portlets/src/main/resources/portletinfo.properties
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/plugins/plancreator/plancreator-portlets/src/main/resources/portletinfo.properties?rev=742717&view=auto
==============================================================================
--- geronimo/server/branches/2.1/plugins/plancreator/plancreator-portlets/src/main/resources/portletinfo.properties (added)
+++ geronimo/server/branches/2.1/plugins/plancreator/plancreator-portlets/src/main/resources/portletinfo.properties Mon Feb  9 20:20:21 2009
@@ -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.
+#=====================================================================
+
+Create\ Deployment\ Plan = Create Deployment Plan
+
+Plan\ Creator = Plan Creator

Propchange: geronimo/server/branches/2.1/plugins/plancreator/plancreator-portlets/src/main/resources/portletinfo.properties
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/server/branches/2.1/plugins/plancreator/plancreator-portlets/src/main/resources/portletinfo.properties
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/server/branches/2.1/plugins/plancreator/plancreator-portlets/src/main/resources/portletinfo.properties
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Modified: geronimo/server/branches/2.1/plugins/plancreator/plancreator-portlets/src/main/webapp/WEB-INF/portlet.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/plugins/plancreator/plancreator-portlets/src/main/webapp/WEB-INF/portlet.xml?rev=742717&r1=742716&r2=742717&view=diff
==============================================================================
--- geronimo/server/branches/2.1/plugins/plancreator/plancreator-portlets/src/main/webapp/WEB-INF/portlet.xml (original)
+++ geronimo/server/branches/2.1/plugins/plancreator/plancreator-portlets/src/main/webapp/WEB-INF/portlet.xml Mon Feb  9 20:20:21 2009
@@ -39,7 +39,7 @@
         <supported-locale>en</supported-locale>
 
         <portlet-info>
-            <title>Create Geronimo Deployment Plan</title>
+            <title>Create Deployment Plan</title>
             <short-title>Create Deployment Plan</short-title>
             <keywords>Create Deployment Plan</keywords>
         </portlet-info>

Modified: geronimo/server/branches/2.1/plugins/plancreator/plancreator-portlets/src/main/webapp/WEB-INF/view/configcreator/dependencies.jsp
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/plugins/plancreator/plancreator-portlets/src/main/webapp/WEB-INF/view/configcreator/dependencies.jsp?rev=742717&r1=742716&r2=742717&view=diff
==============================================================================
--- geronimo/server/branches/2.1/plugins/plancreator/plancreator-portlets/src/main/webapp/WEB-INF/view/configcreator/dependencies.jsp (original)
+++ geronimo/server/branches/2.1/plugins/plancreator/plancreator-portlets/src/main/webapp/WEB-INF/view/configcreator/dependencies.jsp Mon Feb  9 20:20:21 2009
@@ -19,12 +19,13 @@
 
 <%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c"%>
 <%@ taglib uri="http://java.sun.com/portlet" prefix="portlet"%>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt"%>
+<fmt:setBundle basename="plancreator-portlet"/>
 <portlet:defineObjects />
 
-<p><b>WAR - Dependencies</b> -- Select the dependencies your Web Application has on other Modules</p>
+<p><fmt:message key="plancreator.dependency.title"/></p>
 
-<p>All the modules available in the server repository are shown below. Select the ones on which your 
-web-application is dependent. Default selections should be sufficient in most scenarios.</p>
+<p><fmt:message key="plancreator.dependency.desc"/></p>
 
 <!--   FORM TO COLLECT DATA FOR THIS PAGE   -->
 <form name="<portlet:namespace/>DependenciesForm" action="<portlet:actionURL/>" method="POST">
@@ -36,7 +37,7 @@
     <th>
     <div align="right"></div>
     </th>
-    <td><input type="submit" value="Next" /></td>
+    <td><input type="submit" value='<fmt:message key="plancreator.common.next"/>' /></td>
   </tr>
 
   <!-- Dependencies -->
@@ -59,7 +60,7 @@
     <th>
     <div align="right"></div>
     </th>
-    <td><input type="submit" value="Next" /></td>
+    <td><input type="submit" value='<fmt:message key="plancreator.common.next"/>' /></td>
   </tr>
 </table>
 </form>
@@ -67,4 +68,4 @@
 
 <p><a href="<portlet:actionURL portletMode="view">
               <portlet:param name="mode" value="index-before" />
-            </portlet:actionURL>">Cancel</a></p>
+            </portlet:actionURL>"><fmt:message key="plancreator.common.cancel"/></a></p>

Modified: geronimo/server/branches/2.1/plugins/plancreator/plancreator-portlets/src/main/webapp/WEB-INF/view/configcreator/deployStatus.jsp
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/plugins/plancreator/plancreator-portlets/src/main/webapp/WEB-INF/view/configcreator/deployStatus.jsp?rev=742717&r1=742716&r2=742717&view=diff
==============================================================================
--- geronimo/server/branches/2.1/plugins/plancreator/plancreator-portlets/src/main/webapp/WEB-INF/view/configcreator/deployStatus.jsp (original)
+++ geronimo/server/branches/2.1/plugins/plancreator/plancreator-portlets/src/main/webapp/WEB-INF/view/configcreator/deployStatus.jsp Mon Feb  9 20:20:21 2009
@@ -19,6 +19,8 @@
 
 <%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c"%>
 <%@ taglib uri="http://java.sun.com/portlet" prefix="portlet"%>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt"%>
+<fmt:setBundle basename="plancreator-portlet"/>
 <portlet:defineObjects />
 
 <script>
@@ -38,7 +40,7 @@
     <div id="<portlet:namespace/>abbrStatusMessage" style="display:inline">
      ${abbrStatusMessage}<br/>
     <c:if test="${!(empty fullStatusMessage)}">
-    <button onclick="<portlet:namespace/>toggleDisplay('fullStatusMessage');<portlet:namespace/>toggleDisplay('abbrStatusMessage');return false;">Show full details</button>
+    <button onclick="<portlet:namespace/>toggleDisplay('fullStatusMessage');<portlet:namespace/>toggleDisplay('abbrStatusMessage');return false;"><fmt:message key="plancreator.status.detail"/></button>
     </c:if>
     </div>
 </c:if>
@@ -52,9 +54,9 @@
 </c:if>
 
 <c:if test="${empty fullStatusMessage}">
-<p><a href="/${data.contextRoot}">Launch Web App</a></p>
+<p><a href="/${data.contextRoot}"><fmt:message key="plancreator.status.launch"/></a></p>
 </c:if>
 
 <p><a href="<portlet:actionURL portletMode="view">
               <portlet:param name="mode" value="index-before" />
-            </portlet:actionURL>">Finish</a></p>
+            </portlet:actionURL>"><fmt:message key="plancreator.common.finish"/></a></p>

Modified: geronimo/server/branches/2.1/plugins/plancreator/plancreator-portlets/src/main/webapp/WEB-INF/view/configcreator/displayPlan.jsp
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/plugins/plancreator/plancreator-portlets/src/main/webapp/WEB-INF/view/configcreator/displayPlan.jsp?rev=742717&r1=742716&r2=742717&view=diff
==============================================================================
--- geronimo/server/branches/2.1/plugins/plancreator/plancreator-portlets/src/main/webapp/WEB-INF/view/configcreator/displayPlan.jsp (original)
+++ geronimo/server/branches/2.1/plugins/plancreator/plancreator-portlets/src/main/webapp/WEB-INF/view/configcreator/displayPlan.jsp Mon Feb  9 20:20:21 2009
@@ -19,12 +19,13 @@
 
 <%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c"%>
 <%@ taglib uri="http://java.sun.com/portlet" prefix="portlet"%>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt"%>
+<fmt:setBundle basename="plancreator-portlet"/>
 <portlet:defineObjects />
 
-<p><b>Created Plan</b> -- Copy/Edit Deployment Plan</p>
+<p><fmt:message key="plancreator.deploy.title"/></p>
 
-<p>The generated Geronimo Deployment Plan is shown below in an edit box. If you would like to make any changes 
-(default should be enough in most scenarios), do it now and then press "Deploy WAR" to deploy the Web application.</p>
+<p><fmt:message key="plancreator.deploy.desc"/></p>
 
 <!--   FORM TO COLLECT DATA FOR THIS PAGE   -->
 <form name="<portlet:namespace/>DisplayPlan" action="<portlet:actionURL/>" method="POST">
@@ -34,19 +35,19 @@
       <tr>
         <td></td>
         <td>
-            <input type="submit" value="Deploy WAR" />
+            <input type="submit" value='<fmt:message key="plancreator.deploy.deploy"/>' />
         </td>
       </tr>
     <!-- STATUS FIELD: Deployment Plan -->
       <tr>
-        <th valign="top" style="min-width: 140px"><div align="right">Deployment Plan:</div></th>
+        <th valign="top" style="min-width: 140px"><div align="right"><fmt:message key="plancreator.deploy.plan"/>:</div></th>
         <td><textarea rows="30" cols="60" name="deploymentPlanXml">${data.deploymentPlan}</textarea></td>
       </tr>
     <!-- SUBMIT BUTTON -->
       <tr>
         <td></td>
         <td>
-            <input type="submit" value="Deploy WAR" />
+            <input type="submit" value='<fmt:message key="plancreator.deploy.deploy"/>' />
         </td>
       </tr>
     </table>
@@ -55,4 +56,4 @@
 
 <p><a href="<portlet:actionURL portletMode="view">
               <portlet:param name="mode" value="index-before" />
-            </portlet:actionURL>">Cancel</a></p>
+            </portlet:actionURL>"><fmt:message key="plancreator.common.cancel"/></a></p>

Modified: geronimo/server/branches/2.1/plugins/plancreator/plancreator-portlets/src/main/webapp/WEB-INF/view/configcreator/environment.jsp
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/plugins/plancreator/plancreator-portlets/src/main/webapp/WEB-INF/view/configcreator/environment.jsp?rev=742717&r1=742716&r2=742717&view=diff
==============================================================================
--- geronimo/server/branches/2.1/plugins/plancreator/plancreator-portlets/src/main/webapp/WEB-INF/view/configcreator/environment.jsp (original)
+++ geronimo/server/branches/2.1/plugins/plancreator/plancreator-portlets/src/main/webapp/WEB-INF/view/configcreator/environment.jsp Mon Feb  9 20:20:21 2009
@@ -19,11 +19,13 @@
 
 <%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c"%>
 <%@ taglib uri="http://java.sun.com/portlet" prefix="portlet"%>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt"%>
+<fmt:setBundle basename="plancreator-portlet"/>
 <portlet:defineObjects />
 
-<p><b>WAR - Environment</b> -- Configure Web Application Identity and Class Path</p>
+<p><fmt:message key="plancreator.env.title"/></p>
 
-<p>Defaults in this page should suffice for typical scenarios.</p>
+<p><fmt:message key="plancreator.env.desc"/></p>
 
 <!--   FORM TO COLLECT DATA FOR THIS PAGE   -->
 <form name="<portlet:namespace/>EnvironmentForm" action="<portlet:actionURL/>" method="POST">
@@ -33,109 +35,94 @@
   <!-- SUBMIT BUTTON -->
   <tr>
     <td></td>
-    <td><input type="submit" value="Next" /></td>
+    <td><input type="submit" value='<fmt:message key="plancreator.common.next"/>' /></td>
   </tr>
 
   <!-- ENTRY FIELD: Context Root -->
   <tr>
-    <th><div align="right">Web Context Root:</div></th>
+    <th><div align="right"><fmt:message key="plancreator.env.context"/>:</div></th>
     <td><input name="contextRoot" type="text" size="25" value="${data.contextRoot}" /></td>
   </tr>
   <tr>
     <td></td>
-    <td>This is the first part of the URL used to access the Web application by the client.
-    For example, if the context-root is entered as "HelloWorld", then a typical URL to the application would 
-    start with "http://host:port/HelloWorld/".</td>
+    <td><fmt:message key="plancreator.env.contextDesc"/></td>
   </tr>
 
   <!-- ENTRY FIELD: Module Id -->
   <tr>
-    <th colspan="2">Web Application Identity</th>
+    <th colspan="2"><fmt:message key="plancreator.env.id"/></th>
   </tr>
   <tr>
     <td></td>
-    <td>Every module in Geronimo is uniquely identified by it's ModuleID which consists of four components: 
-    groupId/artifactId/version/type. Example: "org.apache.geronimo.plugins/plancreator-tomcat/2.1/car".</td>
+    <td><fmt:message key="plancreator.env.idDesc"/></td>
   </tr>
   <tr>
-    <th><div align="right">Group Id:</div></th>
+    <th><div align="right"><fmt:message key="plancreator.env.groupId"/>:</div></th>
     <td><input name="groupId" type="text" size="25" value="${data.groupId}" /></td>
   </tr>
   <tr>
     <td></td>
-    <td>A name identifying a group of related modules. This may be a project name, a company name, etc. 
-    The important thing is that each artifactID should be unique within the group.</td>
+    <td><fmt:message key="plancreator.env.groupIdDesc"/></td>
   </tr>
   <tr>
-    <th><div align="right">Artifact Id:</div></th>
+    <th><div align="right"><fmt:message key="plancreator.env.artifactId"/>:</div></th>
     <td><input name="artifactId" type="text" size="25" value="${data.artifactId}" /></td>
   </tr>
   <tr>
     <td></td>
-    <td>A name identifying the specific module within the group.</td>
+    <td><fmt:message key="plancreator.env.artifactIdDesc"/></td>
   </tr>
   <tr>
-    <th><div align="right">Version:</div></th>
+    <th><div align="right"><fmt:message key="plancreator.env.version"/>:</div></th>
     <td><input name="version" type="text" size="25" value="${data.version}" /></td>
   </tr>
   <tr>
     <td></td>
-    <td>Version number for the module.</td>
+    <td><fmt:message key="plancreator.env.versionDesc"/></td>
   </tr>
   <tr>
-    <th><div align="right">Type:</div></th>
+    <th><div align="right"><fmt:message key="plancreator.env.type"/>:</div></th>
     <td><input name="type" type="text" size="25" value="${data.type}" /></td>
   </tr>
   <tr>
     <td></td>
-    <td>A module's type is normally either CAR (for a system module) or the file extension for an application 
-    module (ear,war,jar,etc).</td>
+    <td><fmt:message key="plancreator.env.typeDesc"/></td>
   </tr>
 
   <!-- ENTRY FIELD: Hidden Classes, Non Overridable Classes and Inverse Class Loading -->
   <tr>
-    <th colspan="2">Class Path Settings</th>
+    <th colspan="2"><fmt:message key="plancreator.env.classpathSetting"/></th>
   </tr>
   <tr>
-    <th><div align="right">Hidden Classes:</div></th>
+    <th><div align="right"><fmt:message key="plancreator.env.hiddenClasses"/>:</div></th>
     <td><input name="hiddenClasses" type="text" size="25" value="${data.hiddenClasses}" /></td>
   </tr>
   <tr>
     <td></td>
-    <td>List packages or classes that may be in a parent class loader, but should not be exposed from there to 
-    the Web application. This is typically used when the Web application wants to use a different version of a 
-    library than that of it's parent configuration (or Geronimo itself) uses.
-    Separate multiple package/class names with a semicolon ';'</td>
+    <td><fmt:message key="plancreator.env.hiddenClassesDesc"/></td>
   </tr>
   <tr>
-    <th><div align="right">Non Overridable Classes:</div></th>
+    <th><div align="right"><fmt:message key="plancreator.env.nonOverridableClass"/>:</div></th>
     <td><input name="nonOverridableClasses" type="text" size="25" value="${data.nonOverridableClasses}" /></td>
   </tr>
   <tr>
     <td></td>
-    <td>List packages or classes that the Web application should always load from a parent class loader, and 
-    never load from WEB-INF/lib or WEB-INF/classes. This might be used to force a Web application to share the 
-    same instance of a common library with other Web applications, even if they each include it in their own WAR. 
-    Separate multiple package/class names with a semicolon ';'</td>
+    <td><fmt:message key="plancreator.env.nonOverridableClassDesc"/></td>
   </tr>
   <tr>
-    <th><div align="right">Inverse Class Loading:</div></th>
+    <th><div align="right"><fmt:message key="plancreator.env.inverseClassLoading"/>:</div></th>
     <td><input name="inverseClassLoading" type="checkbox" value="true" 
-      <c:if test="${data.inverseClassLoading}">CHECKED </c:if> /></td>
+      <c:if test="${data.inverseClassLoading}"><fmt:message key="plancreator.env.checked"/> </c:if> /></td>
   </tr>
   <tr>
     <td></td>
-    <td>Normally (if this element is not checked), the module's class loader will work normally - classes will be 
-    loaded from the parent class loader if available before checking the current class loader. If this element is 
-    checked, that behavior is reversed and the current class loader will always be checked first before looking 
-    in the parent class loader. This is often enabled to give the JARs in WEB-INF/lib precedence over anything 
-    that might be in a parent class loader. </td>
+    <td><fmt:message key="plancreator.env.inverseClassLoadingDesc"/></td>
   </tr>
 
   <!-- SUBMIT BUTTON -->
   <tr>
     <td></td>
-    <td><input type="submit" value="Next" /></td>
+    <td><input type="submit" value='<fmt:message key="plancreator.common.next"/>' /></td>
   </tr>
 </table>
 
@@ -144,4 +131,4 @@
 
 <p><a href="<portlet:actionURL portletMode="view">
               <portlet:param name="mode" value="index-before" />
-            </portlet:actionURL>">Cancel</a></p>
+            </portlet:actionURL>"><fmt:message key="plancreator.common.cancel"/></a></p>

Modified: geronimo/server/branches/2.1/plugins/plancreator/plancreator-portlets/src/main/webapp/WEB-INF/view/configcreator/getArchive.jsp
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/plugins/plancreator/plancreator-portlets/src/main/webapp/WEB-INF/view/configcreator/getArchive.jsp?rev=742717&r1=742716&r2=742717&view=diff
==============================================================================
--- geronimo/server/branches/2.1/plugins/plancreator/plancreator-portlets/src/main/webapp/WEB-INF/view/configcreator/getArchive.jsp (original)
+++ geronimo/server/branches/2.1/plugins/plancreator/plancreator-portlets/src/main/webapp/WEB-INF/view/configcreator/getArchive.jsp Mon Feb  9 20:20:21 2009
@@ -19,23 +19,25 @@
 
 <%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c"%>
 <%@ taglib uri="http://java.sun.com/portlet" prefix="portlet"%>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt"%>
+<fmt:setBundle basename="plancreator-portlet"/>
 <portlet:defineObjects />
 
 <!-- Archive uploaded is not a WAR -->
 <c:if test="${!(empty archiveNotSupported)}">
-  <br />The archive you provided is not a WAR. Please note that only WARs are supported as of now. <br /> <br />
+  <br /><fmt:message key="plancreator.archive.archiveErr"/> <br /> <br />
 </c:if>
 
 <form enctype="multipart/form-data" name="<portlet:namespace/>GetArchiveForm" action="<portlet:actionURL/>" method="POST">
   <input type="hidden" name="mode" value="index-after" />
 <table>
   <tr>
-    <th align="right">Archive:</th>
+    <th align="right"><fmt:message key="plancreator.archive.archive"/>:</th>
     <td><input type="file" name="moduleURI" value="" /></td>
   </tr>
   <tr></tr>
   <tr>
-    <td><input type="submit" value="Configure" value="" /></td>
+    <td><input type="submit" value='<fmt:message key="plancreator.archive.config"/>' /></td>
   </tr>
 </table>
 </form>

Modified: geronimo/server/branches/2.1/plugins/plancreator/plancreator-portlets/src/main/webapp/WEB-INF/view/configcreator/references.jsp
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/plugins/plancreator/plancreator-portlets/src/main/webapp/WEB-INF/view/configcreator/references.jsp?rev=742717&r1=742716&r2=742717&view=diff
==============================================================================
--- geronimo/server/branches/2.1/plugins/plancreator/plancreator-portlets/src/main/webapp/WEB-INF/view/configcreator/references.jsp (original)
+++ geronimo/server/branches/2.1/plugins/plancreator/plancreator-portlets/src/main/webapp/WEB-INF/view/configcreator/references.jsp Mon Feb  9 20:20:21 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="plancreator-portlet"/>
 <portlet:defineObjects />
 
 <script>
@@ -126,17 +128,13 @@
 }
 </script>
 
-<p><b>WAR - References</b> -- Resolve EJB, EJB Local, JDBC Connection Pool, JavaMail Session, JMS Connection Factory, 
- JMS Destination and Web Service References</p>
+<p><fmt:message key="plancreator.reference.title"/></p>
 
-<p>Map the references declared in your Web application to specific items available in the server environment. 
-References declared in your web-app (ex. EJB, EJB Local, JDBC Connection Pool, JavaMail Session, JMS Connection Factory and 
-JMS Destination references) are shown below to the left and the resources (available in the server environment) 
-to which they can be linked are shown to the right.</p>
+<p><fmt:message key="plancreator.reference.desc"/></p>
 
 <!-- References not resolved -->
 <c:if test="${data.referenceNotResolved}">
-  <p>Some of the references are not resolved. Please resolve them and only then press Next button.
+  <p><fmt:message key="plancreator.reference.resolveErr"/>
 </c:if>
 
 <!--   FORM TO COLLECT DATA FOR THIS PAGE   -->
@@ -145,11 +143,11 @@
 
 <!-- ENTRY FIELD: EJB References -->
 <c:if test="${!empty(data.ejbRefs)}">
-  <p><b>EJB References:</b></p>
+  <p><b><fmt:message key="plancreator.reference.ejbReference"/>:</b></p>
   <table border="0" width="100%">
     <tr>
-      <th class="DarkBackground" align="center">EJB Ref</th>
-      <th class="DarkBackground" align="center">EJBs Deployed</th>
+      <th class="DarkBackground" align="center"><fmt:message key="plancreator.reference.ejbRef"/></th>
+      <th class="DarkBackground" align="center"><fmt:message key="plancreator.reference.ejbDeployed"/></th>
     </tr>
     <c:set var="backgroundClass" value='MediumBackground'/>
     <c:forEach var="refData" items="${data.ejbRefs}" varStatus="status">
@@ -180,11 +178,11 @@
 
 <!-- ENTRY FIELD: EJB Local References -->
 <c:if test="${!empty(data.ejbLocalRefs)}">
-  <p><b>EJB Local References:</b></p>
+  <p><b><fmt:message key="plancreator.reference.ejbLocalReference"/>:</b></p>
   <table border="0" width="100%">
     <tr>
-      <th class="DarkBackground" align="center">EJB Local Ref</th>
-      <th class="DarkBackground" align="center">EJBs Deployed</th>
+      <th class="DarkBackground" align="center"><fmt:message key="plancreator.reference.ejbLocalRef"/></th>
+      <th class="DarkBackground" align="center"><fmt:message key="plancreator.reference.ejbDeployed"/></th>
     </tr>
     <c:set var="backgroundClass" value='MediumBackground'/>
     <c:forEach var="refData" items="${data.ejbLocalRefs}" varStatus="status">
@@ -215,11 +213,11 @@
 
 <!-- ENTRY FIELD: JDBC Connection Pool References -->
 <c:if test="${!empty(data.jdbcPoolRefs)}">
-  <p><b>JDBC Pool References:</b></p>
+  <p><b><fmt:message key="plancreator.reference.jdbcReference"/>:</b></p>
   <table border="0" width="100%">
     <tr>
-      <th class="DarkBackground" align="center">JDBC Ref</th>
-      <th class="DarkBackground" align="center">JDBC Pools</th>
+      <th class="DarkBackground" align="center"><fmt:message key="plancreator.reference.jdbcRef"/></th>
+      <th class="DarkBackground" align="center"><fmt:message key="plancreator.reference.jdbc"/></th>
     </tr>
     <c:set var="backgroundClass" value='MediumBackground'/>
     <c:forEach var="refData" items="${data.jdbcPoolRefs}" varStatus="status">
@@ -250,11 +248,11 @@
 
 <!-- ENTRY FIELD: JMS Connection Factory References -->
 <c:if test="${!empty(data.jmsConnectionFactoryRefs)}">
-  <p><b>JMS Connection Factory References:</b></p>
+  <p><b><fmt:message key="plancreator.reference.jmsConnReference"/>:</b></p>
   <table border="0" width="100%">
     <tr>
-      <th class="DarkBackground" align="center">JMS Ref</th>
-      <th class="DarkBackground" align="center">JMS Factories</th>
+      <th class="DarkBackground" align="center"><fmt:message key="plancreator.reference.jmsConnRef"/></th>
+      <th class="DarkBackground" align="center"><fmt:message key="plancreator.reference.jmsConn"/></th>
     </tr>
     <c:set var="backgroundClass" value='MediumBackground'/>
     <c:forEach var="refData" items="${data.jmsConnectionFactoryRefs}" varStatus="status">
@@ -285,11 +283,11 @@
 
 <!-- ENTRY FIELD: JMS Destination References -->
 <c:if test="${!empty(data.jmsDestinationRefs) || !empty(data.messageDestinations)}">
-  <p><b>JMS Destination References:</b></p>
+  <p><b><fmt:message key="plancreator.reference.jmsReference"/>:</b></p>
   <table border="0" width="100%">
     <tr>
-      <th class="DarkBackground" align="center">JMS Ref</th>
-      <th class="DarkBackground" align="center">JMS Destinations</th>
+      <th class="DarkBackground" align="center"><fmt:message key="plancreator.reference.jmsRef"/></th>
+      <th class="DarkBackground" align="center"><fmt:message key="plancreator.reference.jms"/></th>
     </tr>
     <c:set var="backgroundClass" value='MediumBackground'/>
     <c:forEach var="refData" items="${data.jmsDestinationRefs}" varStatus="status">
@@ -347,11 +345,11 @@
 
 <!-- ENTRY FIELD: JavaMail Session References -->
 <c:if test="${!empty(data.javaMailSessionRefs)}">
-  <p><b>JavaMail Session References:</b></p>
+  <p><b><fmt:message key="plancreator.reference.javamailReference"/>:</b></p>
   <table border="0" width="100%">
     <tr>
-      <th class="DarkBackground" align="center">Mail Session Ref</th>
-      <th class="DarkBackground" align="center">Mail Sessions Available</th>
+      <th class="DarkBackground" align="center"><fmt:message key="plancreator.reference.javamailRef"/></th>
+      <th class="DarkBackground" align="center"><fmt:message key="plancreator.reference.javamail"/></th>
     </tr>
     <c:set var="backgroundClass" value='MediumBackground'/>
     <c:forEach var="refData" items="${data.javaMailSessionRefs}" varStatus="status">
@@ -382,18 +380,16 @@
 
 <!-- ENTRY FIELD: Web Service References -->
 <c:if test="${!empty(data.webServiceRefs)}">
-  <p><b>Web Service References:</b></p>
-  <p>Service references declared in your application are shown below to the left. If the WSDL doesn't contain 
-  the port information to contact the service or if that information is ambiguous, then resolve the service-ref
-  by clicking on "Add Port".</p>
+  <p><b><fmt:message key="plancreator.reference.wsReference"/>:</b></p>
+  <p><fmt:message key="plancreator.reference.wsDesc"/></p>
   <table border="0" width="100%">
     <thead>
     <tr>
-      <th class="DarkBackground" align="center">Service Ref Name</th>
-      <th class="DarkBackground" align="center">Port Name</th>
-      <th class="DarkBackground" align="center">URL</th>
-      <th class="DarkBackground" align="center">Credentials</th>
-      <th class="DarkBackground" align="center">Actions</th>
+      <th class="DarkBackground" align="center"><fmt:message key="plancreator.reference.wsRef"/></th>
+      <th class="DarkBackground" align="center"><fmt:message key="plancreator.common.portName"/></th>
+      <th class="DarkBackground" align="center"><fmt:message key="plancreator.common.url"/></th>
+      <th class="DarkBackground" align="center"><fmt:message key="plancreator.security.credenitial"/></th>
+      <th class="DarkBackground" align="center"><fmt:message key="plancreator.common.action"/></th>
     </tr>
     </thead>
     <tfoot></tfoot>
@@ -422,40 +418,40 @@
         <tr id="<portlet:namespace/>${serviceRefId}.insertBefore">
           <td></td>
           <td colspan="4" align="left">
-            <input type="button" value="Add Port" 
+            <input type="button" value='<fmt:message key="plancreator.common.addPort"/>' 
               onclick="<portlet:namespace/>showElement('${serviceRefId}.addNewPort');"/>
             <div id="<portlet:namespace/>${serviceRefId}.addNewPort" style="display:none">
               <table border="0">
                 <tr>
-                  <th><div align="right">Port Name:</div></th>
+                  <th><div align="right"><fmt:message key="plancreator.common.portName"/>:</div></th>
                   <td><input type="text" id="<portlet:namespace/>${serviceRefId}.newPort.portName"/></td>
                 </tr>
                 <tr>
-                  <th><div align="right">Protocol:</div></th>
+                  <th><div align="right"><fmt:message key="plancreator.common.protocol"/>:</div></th>
                   <td><input type="text" id="<portlet:namespace/>${serviceRefId}.newPort.protocol"/></td>
                 </tr>
                 <tr>
-                  <th><div align="right">Host:</div></th>
+                  <th><div align="right"><fmt:message key="plancreator.common.host"/>:</div></th>
                   <td><input type="text" id="<portlet:namespace/>${serviceRefId}.newPort.host"/></td>
                 </tr>
                 <tr>
-                  <th><div align="right">Port:</div></th>
+                  <th><div align="right"><fmt:message key="plancreator.common.port"/>:</div></th>
                   <td><input type="text" id="<portlet:namespace/>${serviceRefId}.newPort.port"/></td>
                 </tr>
                 <tr>
-                  <th><div align="right">URI:</div></th>
+                  <th><div align="right"><fmt:message key="plancreator.common.uri"/>:</div></th>
                   <td><input type="text" id="<portlet:namespace/>${serviceRefId}.newPort.uri"/></td>
                 </tr>
                 <tr>
-                  <th><div align="right">Credentials Name:</div></th>
+                  <th><div align="right"><fmt:message key="plancreator.security.credenitialName"/>:</div></th>
                   <td><input type="text" id="<portlet:namespace/>${serviceRefId}.newPort.credentialsName"/></td>
                 </tr>
                 <tr>
                   <th><div align="right"></div></th>
                   <td>
-                    <input type="button" value="Add" 
+                    <input type="button" value='<fmt:message key="plancreator.common.add"/>' 
                       onclick="<portlet:namespace/>addPort('${serviceRefId}');"/>
-                    <input type="button" value="Cancel" 
+                    <input type="button" value='<fmt:message key="plancreator.common.cancel"/>' 
                       onclick="<portlet:namespace/>hideElement('${serviceRefId}.addNewPort');"/>
                   </td>
                 </tr>
@@ -474,7 +470,7 @@
     <th>
     <div align="right"></div>
     </th>
-    <td><input type="submit" value="Next" /></td>
+    <td><input type="submit" value='<fmt:message key="plancreator.common.next"/>' /></td>
   </tr>
 </table>
 </form>
@@ -482,4 +478,4 @@
 
 <p><a href="<portlet:actionURL portletMode="view">
               <portlet:param name="mode" value="index-before" />
-            </portlet:actionURL>">Cancel</a></p>
+            </portlet:actionURL>"><fmt:message key="plancreator.common.cancel"/></a></p>

Modified: geronimo/server/branches/2.1/plugins/plancreator/plancreator-portlets/src/main/webapp/WEB-INF/view/configcreator/security.jsp
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/plugins/plancreator/plancreator-portlets/src/main/webapp/WEB-INF/view/configcreator/security.jsp?rev=742717&r1=742716&r2=742717&view=diff
==============================================================================
--- geronimo/server/branches/2.1/plugins/plancreator/plancreator-portlets/src/main/webapp/WEB-INF/view/configcreator/security.jsp (original)
+++ geronimo/server/branches/2.1/plugins/plancreator/plancreator-portlets/src/main/webapp/WEB-INF/view/configcreator/security.jsp Mon Feb  9 20:20:21 2009
@@ -19,6 +19,8 @@
 
 <%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c"%>
 <%@ taglib uri="http://java.sun.com/portlet" prefix="portlet"%>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt"%>
+<fmt:setBundle basename="plancreator-portlet"/>
 <portlet:defineObjects />
 
 <script>
@@ -265,11 +267,9 @@
 }
 </script>
 
-<p><b>WAR - Security</b> -- Specify Security Realm and Role Mappings</p>
+<p><fmt:message key="plancreator.security.title"/></p>
 
-<p>Map security roles declared in web.xml deployment descriptor to specific users or groups in the security 
-realms configured in Geronimo. You can also specify a default user or group to be used when the end user has 
-not yet logged in.</p>
+<p><fmt:message key="plancreator.security.desc"/></p>
 
 <!--   FORM TO COLLECT DATA FOR THIS PAGE   -->
 <form name="<portlet:namespace/>SecurityForm" action="<portlet:actionURL/>" method="POST">
@@ -279,7 +279,7 @@
   <!-- ENTRY FIELD: Security Realm Name -->
   <tr>
     <th>
-    <div align="right">Security Realm Name:</div>
+    <div align="right"><fmt:message key="plancreator.security.securityRealmName"/>:</div>
     </th>
     <td>
       <select name="securityRealmName">
@@ -291,21 +291,21 @@
   </tr>
   <tr>
     <td></td>
-    <td>Select the Geronimo security realm that will authenticate user logins.</td>
+    <td><fmt:message key="plancreator.security.securityRealmNameDesc"/></td>
   </tr>
 </table>
 
 <div>
   <input type="checkbox" id="<portlet:namespace/>advancedSecuritySettingsCheckbox"
     onClick="<portlet:namespace/>toggleAdvancedSecuritySettings();"/>
-  <b>Advanced Settings</b>
+  <b><fmt:message key="plancreator.security.advancedSetting"/></b>
   <div id="<portlet:namespace/>advancedSecuritySettings" style="display:none">
     <input type="hidden" id="<portlet:namespace/>advancedSecuritySettingsFlag"
       name="security.advancedSettings.isPresent" value="false"/>
     <table border="0" class="MediumBackground">
       <!-- Credential Store Ref -->
       <tr>
-        <th><div align="left">Credential Store:</div></th>
+        <th><div align="left"><fmt:message key="plancreator.security.credentialStore"/>:</div></th>
         <td>
           <select name="security.credentialStoreRef">
             <c:forEach var="credentialStore" items="${deployedCredentialStores}">
@@ -316,49 +316,47 @@
       </tr>
       <tr>
         <th></th>
-        <td>Select the Credential Store which has the defaultSubject and runAsSubjects defined.</td>
+        <td><fmt:message key="plancreator.security.credentialStoreSelection"/></td>
       </tr>
 
       <!-- Default Subject -->
       <tr>
-        <td colspan="2"><div align="left"><b>Default Subject:</b></div></td>
+        <td colspan="2"><div align="left"><b><fmt:message key="plancreator.security.subject"/>:</b></div></td>
       </tr>
       <tr>
-        <th><div align="right">Realm:</div></th>
+        <th><div align="right"><fmt:message key="plancreator.security.realm"/>:</div></th>
         <td><input name="security.defaultSubject.realm" type="text" size="25"/></td>
       </tr>
       <tr>
-        <th><div align="right">Id:</div></th>
+        <th><div align="right"><fmt:message key="plancreator.common.id"/>:</div></th>
         <td><input name="security.defaultSubject.id" type="text" size="25"/></td>
       </tr>
       <tr>
         <th></th>
-        <td>The defaultSubject is used whenever an unauthenticated user accesses an unsecured page. Typically, 
-        this is used so that an unsecured page can access a secured resource, a secured EJB for example. 
-        Realm is the realm name of the default subject and Id is the default subject's name within that realm.</td>
+        <td><fmt:message key="plancreator.security.subjectDesc"/></td>
       </tr>
 
       <!-- doas-current-caller -->
       <tr>
         <td colspan="2" align="left">
-          <b>doas-current-caller:</b>
+          <b><fmt:message key="plancreator.security.doAsCurrentCaller"/>:</b>
           <input name="security.doasCurrentCaller" type="checkbox" value="true"/>
         </td>
       </tr>
       <tr>
         <th></th>
-        <td>Select this if the work is to be performed as the calling Subject/User instead of as Server.</td>
+        <td><fmt:message key="plancreator.security.doAsCurrentCallerDesc"/></td>
       </tr>
       <!-- use-context-handler -->
       <tr>
         <td colspan="2" align="left">
-          <b>use-context-handler:</b>
+          <b><fmt:message key="plancreator.security.useContextHandler"/>:</b>
           <input name="security.useContextHandler" type="checkbox" value="true"/>
         </td>
       </tr>
       <tr>
         <th></th>
-        <td>Select this if the installed JACC policy contexts should use PolicyContextHandlers.</td>
+        <td><fmt:message key="plancreator.security.useContextHandlerDesc"/></td>
       </tr>
     </table>
   </div>
@@ -367,11 +365,9 @@
 
 <!-- Security Role Mappings -->
 <p>
-<b>Security Role Mappings:</b>
+<b><fmt:message key="plancreator.security.roleMapping"/>:</b>
 <br><br>
-Security roles declared in web.xml are shown below to the left. Map them to specific principals present 
-in Geronimo's security realms by adding Principals, Login Domain Principals, Realm Principals and/or 
-Distinguished Names.
+<fmt:message key="plancreator.security.roleMappingDesc"/>
 </p>
 <table border="0">
   <c:set var="backgroundClass" value='MediumBackground'/>
@@ -393,14 +389,14 @@
         <div id="<portlet:namespace/>${roleId}.loginDomainPrincipal.placeHolder"></div>
         <div id="<portlet:namespace/>${roleId}.realmPrincipal.placeHolder"></div>
         <div id="<portlet:namespace/>${roleId}.distinguishedName.placeHolder"></div>
-        <div align="justify">Add: 
+        <div align="justify"><fmt:message key="plancreator.common.add"/>: 
         <select id="${roleId}.selectList" 
           onchange="<portlet:namespace/>handleAddClick('${roleId}', this.value)">
           <option value=""></option>
-          <option value="principal">Principal</option>
-          <option value="loginDomainPrincipal">Login Domain Principal</option>
-          <option value="realmPrincipal">Realm Principal</option>
-          <option value="distinguishedName">Distinguished Name</option>
+          <option value="principal"><fmt:message key="plancreator.security.principal"/></option>
+          <option value="loginDomainPrincipal"><fmt:message key="plancreator.security.loginDomainPrincipal"/></option>
+          <option value="realmPrincipal"><fmt:message key="plancreator.security.realmPrincipal"/></option>
+          <option value="distinguishedName"><fmt:message key="plancreator.security.distinguishedName"/></option>
         </select></div>
 
         <div id="<portlet:namespace/>${roleId}.principal.ui" style="display:none">
@@ -408,23 +404,23 @@
             name="${roleId}.principal.lastIndex" value="0">
           <table border="0">
             <tr>
-              <th><div align="right">Name:</div></th>
+              <th><div align="right"><fmt:message key="plancreator.common.name"/>:</div></th>
               <td><input type="text" id="<portlet:namespace/>${roleId}.principal.name"/></td>
             </tr>
             <tr>
-              <th><div align="right">Class:</div></th>
+              <th><div align="right"><fmt:message key="plancreator.common.class"/>:</div></th>
               <td>
                 <select id="<portlet:namespace/>${roleId}.principal.class">
-                  <option value="org.apache.geronimo.security.realm.providers.GeronimoGroupPrincipal">Group Principal</option>
-                  <option value="org.apache.geronimo.security.realm.providers.GeronimoUserPrincipal">User Principal</option>
+                  <option value="org.apache.geronimo.security.realm.providers.GeronimoGroupPrincipal"><fmt:message key="plancreator.security.groupPrincipal"/></option>
+                  <option value="org.apache.geronimo.security.realm.providers.GeronimoUserPrincipal"><fmt:message key="plancreator.security.userPrincipal"/></option>
                 </select>
               </td>
             </tr>
             <tr>
               <th><div align="right"></div></th>
               <td>
-                <input type="button" value="Add" onclick="<portlet:namespace/>addElement('${roleId}', 'principal')"/>
-                <input type="button" value="Cancel" 
+                <input type="button" value='<fmt:message key="plancreator.common.add"/>' onclick="<portlet:namespace/>addElement('${roleId}', 'principal')"/>
+                <input type="button" value='<fmt:message key="plancreator.common.cancel"/>' 
                   onclick="<portlet:namespace/>hideElement('${roleId}.principal.ui');
                   document.getElementById('${roleId}.selectList').selectedIndex = 0;"/>
               </td>
@@ -437,27 +433,27 @@
             name="${roleId}.loginDomainPrincipal.lastIndex" value="0">
           <table border="0">
             <tr>
-              <th><div align="right">Name:</div></th>
+              <th><div align="right"><fmt:message key="plancreator.common.name"/>:</div></th>
               <td><input type="text" id="<portlet:namespace/>${roleId}.loginDomainPrincipal.name"/></td>
             </tr>
             <tr>
-              <th><div align="right">Class:</div></th>
+              <th><div align="right"><fmt:message key="plancreator.common.class"/> :</div></th>
               <td>
                 <select id="<portlet:namespace/>${roleId}.loginDomainPrincipal.class">
-                  <option value="org.apache.geronimo.security.realm.providers.GeronimoGroupPrincipal">Group Principal</option>
-                  <option value="org.apache.geronimo.security.realm.providers.GeronimoUserPrincipal">User Principal</option>
+                  <option value="org.apache.geronimo.security.realm.providers.GeronimoGroupPrincipal"><fmt:message key="plancreator.security.groupPrincipal"/></option>
+                  <option value="org.apache.geronimo.security.realm.providers.GeronimoUserPrincipal"><fmt:message key="plancreator.security.userPrincipal"/></option>
                 </select>
               </td>
             </tr>
             <tr>
-              <th><div align="right">Domain Name:</div></th>
+              <th><div align="right"><fmt:message key="plancreator.security.domainName"/>:</div></th>
               <td><input type="text" id="<portlet:namespace/>${roleId}.loginDomainPrincipal.domainName"/></td>
             </tr>
             <tr>
               <th><div align="right"></div></th>
               <td>
-                <input type="button" value="Add" onclick="<portlet:namespace/>addElement('${roleId}', 'loginDomainPrincipal')"/>
-                <input type="button" value="Cancel" 
+                <input type="button" value='<fmt:message key="plancreator.common.add"/>' onclick="<portlet:namespace/>addElement('${roleId}', 'loginDomainPrincipal')"/>
+                <input type="button" value='<fmt:message key="plancreator.common.cancel"/>' 
                   onclick="<portlet:namespace/>hideElement('${roleId}.loginDomainPrincipal.ui');
                   document.getElementById('${roleId}.selectList').selectedIndex = 0;"/>
               </td>
@@ -470,24 +466,24 @@
             name="${roleId}.realmPrincipal.lastIndex" value="0">
           <table border="0">
             <tr>
-              <th><div align="right">Name:</div></th>
+              <th><div align="right"><fmt:message key="plancreator.common.name"/>:</div></th>
               <td><input type="text" id="<portlet:namespace/>${roleId}.realmPrincipal.name"/></td>
             </tr>
             <tr>
-              <th><div align="right">Class:</div></th>
+              <th><div align="right"><fmt:message key="plancreator.common.class"/>:</div></th>
               <td>
                 <select id="<portlet:namespace/>${roleId}.realmPrincipal.class">
-                  <option value="org.apache.geronimo.security.realm.providers.GeronimoGroupPrincipal">Group Principal</option>
-                  <option value="org.apache.geronimo.security.realm.providers.GeronimoUserPrincipal">User Principal</option>
+                  <option value="org.apache.geronimo.security.realm.providers.GeronimoGroupPrincipal"><fmt:message key="plancreator.security.groupPrincipal"/></option>
+                  <option value="org.apache.geronimo.security.realm.providers.GeronimoUserPrincipal"><fmt:message key="plancreator.security.userPrincipal"/></option>
                 </select>
               </td>
             </tr>
             <tr>
-              <th><div align="right">Domain Name:</div></th>
+              <th><div align="right"><fmt:message key="plancreator.security.domainName"/>:</div></th>
               <td><input type="text" id="<portlet:namespace/>${roleId}.realmPrincipal.domainName"/></td>
             </tr>
             <tr>
-              <th><div align="right">Realm Name:</div></th>
+              <th><div align="right"><fmt:message key="plancreator.security.realmName"/>:</div></th>
               <td>
                 <select id="<portlet:namespace/>${roleId}.realmPrincipal.realmName">
                   <c:forEach var="securityRealm" items="${deployedSecurityRealms}">
@@ -499,8 +495,8 @@
             <tr>
               <th><div align="right"></div></th>
               <td>
-                <input type="button" value="Add" onclick="<portlet:namespace/>addElement('${roleId}', 'realmPrincipal')"/>
-                <input type="button" value="Cancel" 
+                <input type="button" value='<fmt:message key="plancreator.common.add"/>' onclick="<portlet:namespace/>addElement('${roleId}', 'realmPrincipal')"/>
+                <input type="button" value='<fmt:message key="plancreator.common.cancel"/>' 
                   onclick="<portlet:namespace/>hideElement('${roleId}.realmPrincipal.ui');
                   document.getElementById('${roleId}.selectList').selectedIndex = 0;"/>
               </td>
@@ -513,14 +509,14 @@
             name="${roleId}.distinguishedName.lastIndex" value="0">
           <table border="0">
             <tr>
-              <th><div align="right">Name:</div></th>
+              <th><div align="right"><fmt:message key="plancreator.common.name"/>:</div></th>
               <td><input type="text" id="<portlet:namespace/>${roleId}.distinguishedName.name"/></td>
             </tr>
             <tr>
               <th><div align="right"></div></th>
               <td>
-                <input type="button" value="Add" onclick="<portlet:namespace/>addElement('${roleId}', 'distinguishedName')"/>
-                <input type="button" value="Cancel" 
+                <input type="button" value='<fmt:message key="plancreator.common.add"/>' onclick="<portlet:namespace/>addElement('${roleId}', 'distinguishedName')"/>
+                <input type="button" value='<fmt:message key="plancreator.common.cancel"/>' 
                   onclick="<portlet:namespace/>hideElement('${roleId}.distinguishedName.ui');
                   document.getElementById('${roleId}.selectList').selectedIndex = 0;"/>
               </td>
@@ -532,21 +528,20 @@
         <div id="<portlet:namespace/>${runAsSubjectId}.ui">
           <input type="checkbox" id="<portlet:namespace/>${runAsSubjectId}.checkBox" disabled="disabled" 
             onClick="<portlet:namespace/>toggleRunAsSubject('${runAsSubjectId}');"/>
-          Specify run-as-subject*
+          <fmt:message key="plancreator.security.specifyRunAsSubject"/>*
           <div id="<portlet:namespace/>${runAsSubjectId}.subElements" style="display:none">
             <table border="0">
               <tr>
-                <th><div align="right">Realm:</div></th>
+                <th><div align="right"><fmt:message key="plancreator.security.realm"/>:</div></th>
                 <td><input name="${runAsSubjectId}.realm" type="text" size="25"/></td>
               </tr>
               <tr>
-                <th><div align="right">Id:</div></th>
+                <th><div align="right"><fmt:message key="plancreator.common.id"/>:</div></th>
                 <td><input name="${runAsSubjectId}.id" type="text" size="25"/></td>
               </tr>
               <tr>
                 <th></th>
-                <td>The run-as-subject is required when the module is to continue as if run by the specified 
-                  subject when constrained to the specified role.</td>
+                <td><fmt:message key="plancreator.security.runAsSubjectDesc"/></td>
               </tr>
             </table>
           </div>
@@ -557,7 +552,7 @@
     </tr>
   </c:forEach>
   <tr>
-  <td colspan="2" align="left">* Click Advanced Settings to enable specifying run-as-subject</td>
+  <td colspan="2" align="left">* <fmt:message key="plancreator.security.advancedSettingDesc"/></td>
   </tr>
 </table>
 <br>
@@ -568,7 +563,7 @@
     <th>
     <div align="right"></div>
     </th>
-    <td><input type="submit" value="Next" /></td>
+    <td><input type="submit" value='<fmt:message key="plancreator.common.next"/>' /></td>
   </tr>
 </table>
 </form>
@@ -576,4 +571,4 @@
 
 <p><a href="<portlet:actionURL portletMode="view">
               <portlet:param name="mode" value="index-before" />
-            </portlet:actionURL>">Cancel</a></p>
+            </portlet:actionURL>"><fmt:message key="plancreator.common.cancel"/></a></p>



Mime
View raw message