You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by jb...@apache.org on 2009/03/06 16:59:54 UTC
svn commit: r750949 [1/2] - in /geronimo/server/trunk/plugins:
console/console-base-portlets/src/main/java/org/apache/geronimo/console/ca/
console/console-base-portlets/src/main/java/org/apache/geronimo/console/configmanager/
console/console-base-portl...
Author: jbohn
Date: Fri Mar 6 15:59:53 2009
New Revision: 750949
URL: http://svn.apache.org/viewvc?rev=750949&view=rev
Log:
GERONIMO-4507 Admin console should honor the priority of user agent's language setting - patch by Gang Yin
Modified:
geronimo/server/trunk/plugins/console/console-base-portlets/src/main/java/org/apache/geronimo/console/ca/CADetailsHandler.java
geronimo/server/trunk/plugins/console/console-base-portlets/src/main/java/org/apache/geronimo/console/ca/CertReqDetailsHandler.java
geronimo/server/trunk/plugins/console/console-base-portlets/src/main/java/org/apache/geronimo/console/ca/ConfirmCAHandler.java
geronimo/server/trunk/plugins/console/console-base-portlets/src/main/java/org/apache/geronimo/console/ca/ConfirmCertReqHandler.java
geronimo/server/trunk/plugins/console/console-base-portlets/src/main/java/org/apache/geronimo/console/ca/ConfirmClientCertHandler.java
geronimo/server/trunk/plugins/console/console-base-portlets/src/main/java/org/apache/geronimo/console/ca/IntroHandler.java
geronimo/server/trunk/plugins/console/console-base-portlets/src/main/java/org/apache/geronimo/console/ca/ListRequestsIssueHandler.java
geronimo/server/trunk/plugins/console/console-base-portlets/src/main/java/org/apache/geronimo/console/ca/ListRequestsVerifyHandler.java
geronimo/server/trunk/plugins/console/console-base-portlets/src/main/java/org/apache/geronimo/console/ca/ProcessCSRHandler.java
geronimo/server/trunk/plugins/console/console-base-portlets/src/main/java/org/apache/geronimo/console/ca/SetupCAHandler.java
geronimo/server/trunk/plugins/console/console-base-portlets/src/main/java/org/apache/geronimo/console/ca/UnlockCAHandler.java
geronimo/server/trunk/plugins/console/console-base-portlets/src/main/java/org/apache/geronimo/console/ca/ViewCertificateHandler.java
geronimo/server/trunk/plugins/console/console-base-portlets/src/main/java/org/apache/geronimo/console/configmanager/ConfigManagerPortlet.java
geronimo/server/trunk/plugins/console/console-base-portlets/src/main/java/org/apache/geronimo/console/keystores/ChangePasswordHandler.java
geronimo/server/trunk/plugins/console/console-base-portlets/src/main/java/org/apache/geronimo/console/keystores/EditKeystoreHandler.java
geronimo/server/trunk/plugins/console/console-base-portlets/src/main/java/org/apache/geronimo/console/keystores/LockEditKeystoreHandler.java
geronimo/server/trunk/plugins/console/console-base-portlets/src/main/java/org/apache/geronimo/console/keystores/LockKeystoreHandler.java
geronimo/server/trunk/plugins/console/console-base-portlets/src/main/java/org/apache/geronimo/console/keystores/UnlockKeyHandler.java
geronimo/server/trunk/plugins/console/console-base-portlets/src/main/java/org/apache/geronimo/console/keystores/UnlockKeystoreHandler.java
geronimo/server/trunk/plugins/console/console-base-portlets/src/main/java/org/apache/geronimo/console/securitymanager/SEGroupsPortlet.java
geronimo/server/trunk/plugins/console/console-base-portlets/src/main/java/org/apache/geronimo/console/securitymanager/SEUsersPortlet.java
geronimo/server/trunk/plugins/console/console-base-portlets/src/main/java/org/apache/geronimo/console/servermanager/ServerManagerPortlet.java
geronimo/server/trunk/plugins/console/console-base-portlets/src/main/java/org/apache/geronimo/console/webmanager/WebManagerPortlet.java
geronimo/server/trunk/plugins/console/console-base-portlets/src/main/resources/portletinfo.properties
geronimo/server/trunk/plugins/console/console-base-portlets/src/main/resources/portletinfo_zh.properties
geronimo/server/trunk/plugins/console/console-core/src/main/java/org/apache/geronimo/console/BasePortlet.java
geronimo/server/trunk/plugins/console/console-core/src/main/java/org/apache/geronimo/console/BaseRemoteProxy.java
geronimo/server/trunk/plugins/console/console-core/src/main/java/org/apache/geronimo/console/i18n/ConsoleResourceRegistry.java
geronimo/server/trunk/plugins/console/plugin-portlets/src/main/java/org/apache/geronimo/console/configmanager/DeploymentPortlet.java
geronimo/server/trunk/plugins/console/plugin-portlets/src/main/resources/portletinfo.properties
geronimo/server/trunk/plugins/console/plugin-portlets/src/main/resources/portletinfo_zh.properties
geronimo/server/trunk/plugins/monitoring/mconsole-war/src/main/java/org/apache/geronimo/monitoring/console/MonitoringPortlet.java
geronimo/server/trunk/plugins/monitoring/mconsole-war/src/main/resources/portletinfo.properties
geronimo/server/trunk/plugins/monitoring/mconsole-war/src/main/resources/portletinfo_zh.properties
geronimo/server/trunk/plugins/system-database/sysdb-portlets/src/main/java/org/apache/geronimo/console/internaldb/RunSQLHelper.java
geronimo/server/trunk/plugins/system-database/sysdb-portlets/src/main/resources/portletinfo.properties
geronimo/server/trunk/plugins/system-database/sysdb-portlets/src/main/resources/portletinfo_zh.properties
Modified: geronimo/server/trunk/plugins/console/console-base-portlets/src/main/java/org/apache/geronimo/console/ca/CADetailsHandler.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/console/console-base-portlets/src/main/java/org/apache/geronimo/console/ca/CADetailsHandler.java?rev=750949&r1=750948&r2=750949&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/console/console-base-portlets/src/main/java/org/apache/geronimo/console/ca/CADetailsHandler.java (original)
+++ geronimo/server/trunk/plugins/console/console-base-portlets/src/main/java/org/apache/geronimo/console/ca/CADetailsHandler.java Fri Mar 6 15:59:53 2009
@@ -81,7 +81,7 @@
fingerPrints.put("SHA1", CertificateUtil.generateFingerprint(caCert, "SHA1"));
request.setAttribute("fingerPrints", fingerPrints);
} catch (Exception e) {
- portlet.addErrorMessage(request, portlet.getLocalizedString(request, "errorMsg15"), e.getMessage());
+ portlet.addErrorMessage(request, portlet.getLocalizedString(request, "consolebase.errorMsg15"), e.getMessage());
log.error("Errors while trying to view CA Details.", e);
}
}
Modified: geronimo/server/trunk/plugins/console/console-base-portlets/src/main/java/org/apache/geronimo/console/ca/CertReqDetailsHandler.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/console/console-base-portlets/src/main/java/org/apache/geronimo/console/ca/CertReqDetailsHandler.java?rev=750949&r1=750948&r2=750949&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/console/console-base-portlets/src/main/java/org/apache/geronimo/console/ca/CertReqDetailsHandler.java (original)
+++ geronimo/server/trunk/plugins/console/console-base-portlets/src/main/java/org/apache/geronimo/console/ca/CertReqDetailsHandler.java Fri Mar 6 15:59:53 2009
@@ -64,7 +64,7 @@
response.setRenderParameter("sNo", sNo);
} catch (Exception e) {
log.error("Unable to get next serial number from CA.", e);
- portlet.addErrorMessage(request, portlet.getLocalizedString(request, "errorMsg21"), e.getMessage());
+ portlet.addErrorMessage(request, portlet.getLocalizedString(request, "consolebase.errorMsg21"), e.getMessage());
}
}
return getMode();
@@ -115,7 +115,7 @@
// Go to client certificate confirmation page
return CONFIRM_CLIENT_CERT_MODE+BEFORE_ACTION;
} catch(Exception e) {
- portlet.addErrorMessage(request, portlet.getLocalizedString(request, "errorMsg22"), e.getMessage());
+ portlet.addErrorMessage(request, portlet.getLocalizedString(request, "consolebase.errorMsg22"), e.getMessage());
log.error("Errors in user input while processing a CSR.", e);
}
return getMode()+BEFORE_ACTION;
Modified: geronimo/server/trunk/plugins/console/console-base-portlets/src/main/java/org/apache/geronimo/console/ca/ConfirmCAHandler.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/console/console-base-portlets/src/main/java/org/apache/geronimo/console/ca/ConfirmCAHandler.java?rev=750949&r1=750948&r2=750949&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/console/console-base-portlets/src/main/java/org/apache/geronimo/console/ca/ConfirmCAHandler.java (original)
+++ geronimo/server/trunk/plugins/console/console-base-portlets/src/main/java/org/apache/geronimo/console/ca/ConfirmCAHandler.java Fri Mar 6 15:59:53 2009
@@ -130,13 +130,13 @@
// CA Setup is succeessful.
// Load a page to show CA details.
- portlet.addInfoMessage(request, portlet.getLocalizedString(request, "infoMsg15"));
+ portlet.addInfoMessage(request, portlet.getLocalizedString(request, "consolebase.infoMsg15"));
log.info("CA Setup is successful.");
return CADETAILS_MODE+BEFORE_ACTION;
} catch(Exception e) {
// An error occurred. Go back to CA details entry page so that user can correct the errors.
- portlet.addErrorMessage(request, portlet.getLocalizedString(request, "infoMsg07"), e.getMessage());
+ portlet.addErrorMessage(request, portlet.getLocalizedString(request, "consolebase.infoMsg07"), e.getMessage());
log.error("Errors in CA Setup process.", e);
}
Modified: geronimo/server/trunk/plugins/console/console-base-portlets/src/main/java/org/apache/geronimo/console/ca/ConfirmCertReqHandler.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/console/console-base-portlets/src/main/java/org/apache/geronimo/console/ca/ConfirmCertReqHandler.java?rev=750949&r1=750948&r2=750949&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/console/console-base-portlets/src/main/java/org/apache/geronimo/console/ca/ConfirmCertReqHandler.java (original)
+++ geronimo/server/trunk/plugins/console/console-base-portlets/src/main/java/org/apache/geronimo/console/ca/ConfirmCertReqHandler.java Fri Mar 6 15:59:53 2009
@@ -61,10 +61,10 @@
String reject = request.getParameter("reject");
if(approve != null) {
getCertificateRequestStore(request).setRequestVerified(requestId);
- portlet.addInfoMessage(request, portlet.getLocalizedString(request, "infoMsg16", requestId));
+ portlet.addInfoMessage(request, portlet.getLocalizedString(request, "consolebase.infoMsg16", requestId));
} else if(reject != null) {
getCertificateRequestStore(request).deleteRequest(requestId);
- portlet.addInfoMessage(request, portlet.getLocalizedString(request, "infoMsg17", requestId));
+ portlet.addInfoMessage(request, portlet.getLocalizedString(request, "consolebase.infoMsg17", requestId));
}
return LIST_REQUESTS_VERIFY_MODE+BEFORE_ACTION;
}
Modified: geronimo/server/trunk/plugins/console/console-base-portlets/src/main/java/org/apache/geronimo/console/ca/ConfirmClientCertHandler.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/console/console-base-portlets/src/main/java/org/apache/geronimo/console/ca/ConfirmClientCertHandler.java?rev=750949&r1=750948&r2=750949&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/console/console-base-portlets/src/main/java/org/apache/geronimo/console/ca/ConfirmClientCertHandler.java (original)
+++ geronimo/server/trunk/plugins/console/console-base-portlets/src/main/java/org/apache/geronimo/console/ca/ConfirmClientCertHandler.java Fri Mar 6 15:59:53 2009
@@ -83,7 +83,7 @@
// This may happen if the user clicks on "Issue Certificate" button a second time
log.warn("Second request to issue certificate with serial number'"+sNo+"'. A certificate has already been issued.");
response.setRenderParameter("sNo", sNo.toString());
- portlet.addWarningMessage(request, portlet.getLocalizedString(request, "warnMsg06", sNo));
+ portlet.addWarningMessage(request, portlet.getLocalizedString(request, "consolebase.warnMsg06", sNo));
return VIEW_CERT_MODE;
}
@@ -153,12 +153,12 @@
// Set the serial number and forward to view certificate page
response.setRenderParameter("sNo", sNo.toString());
- portlet.addInfoMessage(request, portlet.getLocalizedString(request, "infoMsg18", sNo));
+ portlet.addInfoMessage(request, portlet.getLocalizedString(request, "consolebase.infoMsg18", sNo));
log.info("Certificate with serial number '"+sNo+"' issued to "+subject);
return VIEW_CERT_MODE;
} catch(Exception e) {
// An error occurred. Go back to previous screen to let the user correct the errors.
- portlet.addErrorMessage(request, portlet.getLocalizedString(request, "errorMsg23"), e.getMessage());
+ portlet.addErrorMessage(request, portlet.getLocalizedString(request, "consolebase.errorMsg23"), e.getMessage());
log.error("Errors in issuing certificate.", e);
}
return CERT_REQ_DETAILS_MODE+BEFORE_ACTION;
Modified: geronimo/server/trunk/plugins/console/console-base-portlets/src/main/java/org/apache/geronimo/console/ca/IntroHandler.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/console/console-base-portlets/src/main/java/org/apache/geronimo/console/ca/IntroHandler.java?rev=750949&r1=750948&r2=750949&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/console/console-base-portlets/src/main/java/org/apache/geronimo/console/ca/IntroHandler.java (original)
+++ geronimo/server/trunk/plugins/console/console-base-portlets/src/main/java/org/apache/geronimo/console/ca/IntroHandler.java Fri Mar 6 15:59:53 2009
@@ -63,20 +63,20 @@
CertificationAuthority ca = getCertificationAuthority(request);
if(ca == null) {
log.warn("CA is not running or CA may not have been initialized. Unable to lock CA.");
- portlet.addWarningMessage(request, portlet.getLocalizedString(request, "warnMsg05"));
+ portlet.addWarningMessage(request, portlet.getLocalizedString(request, "consolebase.warnMsg05"));
} else {
ca.lock();
log.info("CA is now locked.");
- portlet.addInfoMessage(request, portlet.getLocalizedString(request, "infoMsg12"));
+ portlet.addInfoMessage(request, portlet.getLocalizedString(request, "consolebase.infoMsg12"));
}
} else if(request.getParameter("publish") != null) {
CertificationAuthority ca = getCertificationAuthority(request);
try {
getCertificateStore(request).storeCACertificate(ca.getCertificate());
- portlet.addInfoMessage(request, portlet.getLocalizedString(request, "infoMsg13"));
+ portlet.addInfoMessage(request, portlet.getLocalizedString(request, "consolebase.infoMsg13"));
} catch (Exception e) {
log.error("Error while publishing CA's certificate to Certificate Store", e);
- portlet.addErrorMessage(request, portlet.getLocalizedString(request, "errorMsg13"), e.getMessage());
+ portlet.addErrorMessage(request, portlet.getLocalizedString(request, "consolebase.errorMsg13"), e.getMessage());
}
}
return getMode()+BEFORE_ACTION;
Modified: geronimo/server/trunk/plugins/console/console-base-portlets/src/main/java/org/apache/geronimo/console/ca/ListRequestsIssueHandler.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/console/console-base-portlets/src/main/java/org/apache/geronimo/console/ca/ListRequestsIssueHandler.java?rev=750949&r1=750948&r2=750949&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/console/console-base-portlets/src/main/java/org/apache/geronimo/console/ca/ListRequestsIssueHandler.java (original)
+++ geronimo/server/trunk/plugins/console/console-base-portlets/src/main/java/org/apache/geronimo/console/ca/ListRequestsIssueHandler.java Fri Mar 6 15:59:53 2009
@@ -89,7 +89,7 @@
}
return CERT_REQ_DETAILS_MODE+BEFORE_ACTION;
} catch(Exception e) {
- portlet.addErrorMessage(request, portlet.getLocalizedString(request, "errorMsg17", requestId), e.getMessage());
+ portlet.addErrorMessage(request, portlet.getLocalizedString(request, "consolebase.errorMsg17", requestId), e.getMessage());
log.error("Errors while processing a Certificate Request. id="+requestId, e);
}
return getMode()+BEFORE_ACTION;
Modified: geronimo/server/trunk/plugins/console/console-base-portlets/src/main/java/org/apache/geronimo/console/ca/ListRequestsVerifyHandler.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/console/console-base-portlets/src/main/java/org/apache/geronimo/console/ca/ListRequestsVerifyHandler.java?rev=750949&r1=750948&r2=750949&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/console/console-base-portlets/src/main/java/org/apache/geronimo/console/ca/ListRequestsVerifyHandler.java (original)
+++ geronimo/server/trunk/plugins/console/console-base-portlets/src/main/java/org/apache/geronimo/console/ca/ListRequestsVerifyHandler.java Fri Mar 6 15:59:53 2009
@@ -89,7 +89,7 @@
}
return CONFIRM_CERT_REQ_MODE+BEFORE_ACTION;
} catch(Exception e) {
- portlet.addErrorMessage(request, portlet.getLocalizedString(request, "errorMsg18", requestId), e.getMessage());
+ portlet.addErrorMessage(request, portlet.getLocalizedString(request, "consolebase.errorMsg18", requestId), e.getMessage());
log.error("Errors while verifying Certificate Request. id="+requestId, e);
}
return getMode()+BEFORE_ACTION;
Modified: geronimo/server/trunk/plugins/console/console-base-portlets/src/main/java/org/apache/geronimo/console/ca/ProcessCSRHandler.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/console/console-base-portlets/src/main/java/org/apache/geronimo/console/ca/ProcessCSRHandler.java?rev=750949&r1=750948&r2=750949&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/console/console-base-portlets/src/main/java/org/apache/geronimo/console/ca/ProcessCSRHandler.java (original)
+++ geronimo/server/trunk/plugins/console/console-base-portlets/src/main/java/org/apache/geronimo/console/ca/ProcessCSRHandler.java Fri Mar 6 15:59:53 2009
@@ -62,7 +62,7 @@
response.setRenderParameter("publickey", certReqMap.get(CaUtils.CERT_REQ_PUBLICKEY_OBJ).toString());
return CERT_REQ_DETAILS_MODE+BEFORE_ACTION;
} catch(Exception e) {
- portlet.addErrorMessage(request, portlet.getLocalizedString(request, "errorMsg20"), e.getMessage());
+ portlet.addErrorMessage(request, portlet.getLocalizedString(request, "consolebase.errorMsg20"), e.getMessage());
log.error("Errors while processing a CSR.", e);
}
return getMode()+BEFORE_ACTION;
Modified: geronimo/server/trunk/plugins/console/console-base-portlets/src/main/java/org/apache/geronimo/console/ca/SetupCAHandler.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/console/console-base-portlets/src/main/java/org/apache/geronimo/console/ca/SetupCAHandler.java?rev=750949&r1=750948&r2=750949&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/console/console-base-portlets/src/main/java/org/apache/geronimo/console/ca/SetupCAHandler.java (original)
+++ geronimo/server/trunk/plugins/console/console-base-portlets/src/main/java/org/apache/geronimo/console/ca/SetupCAHandler.java Fri Mar 6 15:59:53 2009
@@ -102,7 +102,7 @@
// Load page to confirm CA details
return CONFIRM_CA_MODE+BEFORE_ACTION;
} catch(Exception e) {
- portlet.addErrorMessage(request, portlet.getLocalizedString(request, "errorMsg19"), e.getMessage());
+ portlet.addErrorMessage(request, portlet.getLocalizedString(request, "consolebase.errorMsg19"), e.getMessage());
log.error("", e);
}
return getMode()+BEFORE_ACTION;
Modified: geronimo/server/trunk/plugins/console/console-base-portlets/src/main/java/org/apache/geronimo/console/ca/UnlockCAHandler.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/console/console-base-portlets/src/main/java/org/apache/geronimo/console/ca/UnlockCAHandler.java?rev=750949&r1=750948&r2=750949&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/console/console-base-portlets/src/main/java/org/apache/geronimo/console/ca/UnlockCAHandler.java (original)
+++ geronimo/server/trunk/plugins/console/console-base-portlets/src/main/java/org/apache/geronimo/console/ca/UnlockCAHandler.java Fri Mar 6 15:59:53 2009
@@ -63,12 +63,12 @@
ca.unlock(password.toCharArray());
// Return to CA's index page
- portlet.addInfoMessage(request, portlet.getLocalizedString(request, "infoMsg14"));
+ portlet.addInfoMessage(request, portlet.getLocalizedString(request, "consolebase.infoMsg14"));
log.info("CA has been unlocked successfully!");
return INDEX_MODE+BEFORE_ACTION;
} catch(Exception e) {
// An error occurred. Set the error message and load the page again.
- portlet.addErrorMessage(request, portlet.getLocalizedString(request, "errorMsg14"), e.getMessage());
+ portlet.addErrorMessage(request, portlet.getLocalizedString(request, "consolebase.errorMsg14"), e.getMessage());
log.error("Errors in unlocking CA.", e);
}
return getMode()+BEFORE_ACTION;
Modified: geronimo/server/trunk/plugins/console/console-base-portlets/src/main/java/org/apache/geronimo/console/ca/ViewCertificateHandler.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/console/console-base-portlets/src/main/java/org/apache/geronimo/console/ca/ViewCertificateHandler.java?rev=750949&r1=750948&r2=750949&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/console/console-base-portlets/src/main/java/org/apache/geronimo/console/ca/ViewCertificateHandler.java (original)
+++ geronimo/server/trunk/plugins/console/console-base-portlets/src/main/java/org/apache/geronimo/console/ca/ViewCertificateHandler.java Fri Mar 6 15:59:53 2009
@@ -90,7 +90,7 @@
if("true".equalsIgnoreCase(request.getParameter("linkToListRequests")))
request.setAttribute("linkToListRequests", Boolean.TRUE);
} catch (Exception e) {
- portlet.addErrorMessage(request, portlet.getLocalizedString(request, "errorMsg16", sNo), e.getMessage());
+ portlet.addErrorMessage(request, portlet.getLocalizedString(request, "consolebase.errorMsg16", sNo), e.getMessage());
log.error("Errors trying to view certificate with serial number '"+sNo+"'", e);
}
}
Modified: geronimo/server/trunk/plugins/console/console-base-portlets/src/main/java/org/apache/geronimo/console/configmanager/ConfigManagerPortlet.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/console/console-base-portlets/src/main/java/org/apache/geronimo/console/configmanager/ConfigManagerPortlet.java?rev=750949&r1=750948&r2=750949&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/console/console-base-portlets/src/main/java/org/apache/geronimo/console/configmanager/ConfigManagerPortlet.java (original)
+++ geronimo/server/trunk/plugins/console/console-base-portlets/src/main/java/org/apache/geronimo/console/configmanager/ConfigManagerPortlet.java Fri Mar 6 15:59:53 2009
@@ -151,7 +151,7 @@
}
if(!configurationManager.isRunning(configId)) {
org.apache.geronimo.kernel.config.LifecycleResults lcresult = configurationManager.startConfiguration(configId);
- addInfoMessage(actionRequest, getLocalizedString(actionRequest, "infoMsg01") + printResults(lcresult.getStarted()));
+ addInfoMessage(actionRequest, getLocalizedString(actionRequest, "consolebase.infoMsg01") + printResults(lcresult.getStarted()));
}
} else if (STOP_ACTION.equals(action)) {
if(configurationManager.isRunning(configId)) {
@@ -159,28 +159,28 @@
}
if(configurationManager.isLoaded(configId)) {
LifecycleResults lcresult = configurationManager.unloadConfiguration(configId);
- addInfoMessage(actionRequest, getLocalizedString(actionRequest, "infoMsg02") + printResults(lcresult.getStarted()));
+ addInfoMessage(actionRequest, getLocalizedString(actionRequest, "consolebase.infoMsg02") + printResults(lcresult.getStarted()));
}
} else if (UNINSTALL_ACTION.equals(action)) {
configurationManager.uninstallConfiguration(configId);
- addInfoMessage(actionRequest, getLocalizedString(actionRequest, "infoMsg04") + "<br />" + configId);
+ addInfoMessage(actionRequest, getLocalizedString(actionRequest, "consolebase.infoMsg04") + "<br />" + configId);
} else if (RESTART_ACTION.equals(action)) {
LifecycleResults lcresult = configurationManager.restartConfiguration(configId);
- addInfoMessage(actionRequest, getLocalizedString(actionRequest, "infoMsg03") + printResults(lcresult.getStarted()));
+ addInfoMessage(actionRequest, getLocalizedString(actionRequest, "consolebase.infoMsg03") + printResults(lcresult.getStarted()));
} else {
- addWarningMessage(actionRequest, getLocalizedString(actionRequest, "warnMsg01") + action + "<br />");
+ addWarningMessage(actionRequest, getLocalizedString(actionRequest, "consolebase.warnMsg01") + action + "<br />");
throw new PortletException("Invalid value for changeState: " + action);
}
} catch (NoSuchConfigException e) {
// ignore this for now
- addErrorMessage(actionRequest, getLocalizedString(actionRequest, "errorMsg01"));
+ addErrorMessage(actionRequest, getLocalizedString(actionRequest, "consolebase.errorMsg01"));
logger.error("Configuration not found", e);
} catch (LifecycleException e) {
// todo we have a much more detailed report now
- addErrorMessage(actionRequest, getLocalizedString(actionRequest, "errorMsg02"));
+ addErrorMessage(actionRequest, getLocalizedString(actionRequest, "consolebase.errorMsg02"));
logger.error("Lifecycle operation failed ", e);
} catch (Throwable e) {
- addErrorMessage(actionRequest, getLocalizedString(actionRequest, "errorMsg03"));
+ addErrorMessage(actionRequest, getLocalizedString(actionRequest, "consolebase.errorMsg03"));
logger.error("Exception", e);
}
}
@@ -307,7 +307,7 @@
renderRequest.setAttribute("showWebInfo", Boolean.valueOf(showWebInfo()));
renderRequest.setAttribute("showDependencies", Boolean.valueOf(showDependencies));
if (moduleDetails.size() == 0) {
- addWarningMessage(renderRequest, getLocalizedString(renderRequest, "warnMsg02"));
+ addWarningMessage(renderRequest, getLocalizedString(renderRequest, "consolebase.warnMsg02"));
}
if (WindowState.NORMAL.equals(renderRequest.getWindowState())) {
normalView.include(renderRequest, renderResponse);
Modified: geronimo/server/trunk/plugins/console/console-base-portlets/src/main/java/org/apache/geronimo/console/keystores/ChangePasswordHandler.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/console/console-base-portlets/src/main/java/org/apache/geronimo/console/keystores/ChangePasswordHandler.java?rev=750949&r1=750948&r2=750949&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/console/console-base-portlets/src/main/java/org/apache/geronimo/console/keystores/ChangePasswordHandler.java (original)
+++ geronimo/server/trunk/plugins/console/console-base-portlets/src/main/java/org/apache/geronimo/console/keystores/ChangePasswordHandler.java Fri Mar 6 15:59:53 2009
@@ -78,24 +78,24 @@
// Keystore password is to be changed.
data.changeKeystorePassword(password.toCharArray(), newPassword.toCharArray());
response.setRenderParameter("id", keystore);
- portlet.addInfoMessage(request, portlet.getLocalizedString(request, "infoMsg10", keystore));
+ portlet.addInfoMessage(request, portlet.getLocalizedString(request, "consolebase.infoMsg10", keystore));
return VIEW_KEYSTORE+BEFORE_ACTION;
} else {
// Private key password is to be changed.
data.changeKeyPassword(alias, password.toCharArray(), newPassword.toCharArray());
response.setRenderParameter("id", keystore);
response.setRenderParameter("alias", alias);
- portlet.addInfoMessage(request, portlet.getLocalizedString(request, "infoMsg11", alias));
+ portlet.addInfoMessage(request, portlet.getLocalizedString(request, "consolebase.infoMsg11", alias));
return CERTIFICATE_DETAILS;
}
} catch (Exception e) {
String message = "";
if(alias == null || alias.equals("")) {
message = "Unable to change password for keystore " + keystore + ".";
- portlet.addErrorMessage(request, portlet.getLocalizedString(request, "errorMsg11", keystore), e.getMessage());
+ portlet.addErrorMessage(request, portlet.getLocalizedString(request, "consolebase.errorMsg11", keystore), e.getMessage());
} else {
message = "Unable to change password for private key " + alias + ".";
- portlet.addErrorMessage(request, portlet.getLocalizedString(request, "errorMsg12", alias), e.getMessage());
+ portlet.addErrorMessage(request, portlet.getLocalizedString(request, "consolebase.errorMsg12", alias), e.getMessage());
}
log.error(message, e);
return getMode()+BEFORE_ACTION;
Modified: geronimo/server/trunk/plugins/console/console-base-portlets/src/main/java/org/apache/geronimo/console/keystores/EditKeystoreHandler.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/console/console-base-portlets/src/main/java/org/apache/geronimo/console/keystores/EditKeystoreHandler.java?rev=750949&r1=750948&r2=750949&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/console/console-base-portlets/src/main/java/org/apache/geronimo/console/keystores/EditKeystoreHandler.java (original)
+++ geronimo/server/trunk/plugins/console/console-base-portlets/src/main/java/org/apache/geronimo/console/keystores/EditKeystoreHandler.java Fri Mar 6 15:59:53 2009
@@ -68,11 +68,11 @@
try {
data.unlockEdit(storePass);
} catch (KeystoreException e) {
- portlet.addErrorMessage(request, portlet.getLocalizedString(request, "errorMsg08", keystore), e.getMessage());
+ portlet.addErrorMessage(request, portlet.getLocalizedString(request, "consolebase.errorMsg08", keystore), e.getMessage());
log.error("Unable to unlock keystore "+keystore+" for editing.", e);
return getMode()+BEFORE_ACTION;
}
- portlet.addInfoMessage(request, portlet.getLocalizedString(request, "infoMsg05", keystore));
+ portlet.addInfoMessage(request, portlet.getLocalizedString(request, "consolebase.infoMsg05", keystore));
return LIST_MODE+BEFORE_ACTION;
}
}
Modified: geronimo/server/trunk/plugins/console/console-base-portlets/src/main/java/org/apache/geronimo/console/keystores/LockEditKeystoreHandler.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/console/console-base-portlets/src/main/java/org/apache/geronimo/console/keystores/LockEditKeystoreHandler.java?rev=750949&r1=750948&r2=750949&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/console/console-base-portlets/src/main/java/org/apache/geronimo/console/keystores/LockEditKeystoreHandler.java (original)
+++ geronimo/server/trunk/plugins/console/console-base-portlets/src/main/java/org/apache/geronimo/console/keystores/LockEditKeystoreHandler.java Fri Mar 6 15:59:53 2009
@@ -40,7 +40,7 @@
String keystore = request.getParameter("keystore");
KeystoreData data = ((KeystoreData) request.getPortletSession(true).getAttribute(KEYSTORE_DATA_PREFIX + keystore));
data.lockEdit();
- portlet.addInfoMessage(request, portlet.getLocalizedString(request, "infoMsg06", keystore));
+ portlet.addInfoMessage(request, portlet.getLocalizedString(request, "consolebase.infoMsg06", keystore));
return LIST_MODE+BEFORE_ACTION;
}
Modified: geronimo/server/trunk/plugins/console/console-base-portlets/src/main/java/org/apache/geronimo/console/keystores/LockKeystoreHandler.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/console/console-base-portlets/src/main/java/org/apache/geronimo/console/keystores/LockKeystoreHandler.java?rev=750949&r1=750948&r2=750949&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/console/console-base-portlets/src/main/java/org/apache/geronimo/console/keystores/LockKeystoreHandler.java (original)
+++ geronimo/server/trunk/plugins/console/console-base-portlets/src/main/java/org/apache/geronimo/console/keystores/LockKeystoreHandler.java Fri Mar 6 15:59:53 2009
@@ -42,7 +42,7 @@
KeystoreData data = ((KeystoreData) request.getPortletSession(true).getAttribute(KEYSTORE_DATA_PREFIX + keystore));
try {
data.lockUse();
- portlet.addInfoMessage(request, portlet.getLocalizedString(request, "infoMsg08", keystore));
+ portlet.addInfoMessage(request, portlet.getLocalizedString(request, "consolebase.infoMsg08", keystore));
} catch (KeystoreException e) {
throw new PortletException(e);
}
Modified: geronimo/server/trunk/plugins/console/console-base-portlets/src/main/java/org/apache/geronimo/console/keystores/UnlockKeyHandler.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/console/console-base-portlets/src/main/java/org/apache/geronimo/console/keystores/UnlockKeyHandler.java?rev=750949&r1=750948&r2=750949&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/console/console-base-portlets/src/main/java/org/apache/geronimo/console/keystores/UnlockKeyHandler.java (original)
+++ geronimo/server/trunk/plugins/console/console-base-portlets/src/main/java/org/apache/geronimo/console/keystores/UnlockKeyHandler.java Fri Mar 6 15:59:53 2009
@@ -72,11 +72,11 @@
} catch (KeystoreException e) {
response.setRenderParameter("keystore", keystore);
response.setRenderParameter("password", password);
- portlet.addErrorMessage(request, portlet.getLocalizedString(request, "errorMsg10", alias), e.getMessage());
+ portlet.addErrorMessage(request, portlet.getLocalizedString(request, "consolebase.errorMsg10", alias), e.getMessage());
log.error("Unable to unlock key '"+alias+"'.", e);
return getMode()+BEFORE_ACTION;
}
- portlet.addInfoMessage(request, portlet.getLocalizedString(request, "infoMsg09", alias, keystore));
+ portlet.addInfoMessage(request, portlet.getLocalizedString(request, "consolebase.infoMsg09", alias, keystore));
return LIST_MODE+BEFORE_ACTION;
}
}
Modified: geronimo/server/trunk/plugins/console/console-base-portlets/src/main/java/org/apache/geronimo/console/keystores/UnlockKeystoreHandler.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/console/console-base-portlets/src/main/java/org/apache/geronimo/console/keystores/UnlockKeystoreHandler.java?rev=750949&r1=750948&r2=750949&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/console/console-base-portlets/src/main/java/org/apache/geronimo/console/keystores/UnlockKeystoreHandler.java (original)
+++ geronimo/server/trunk/plugins/console/console-base-portlets/src/main/java/org/apache/geronimo/console/keystores/UnlockKeystoreHandler.java Fri Mar 6 15:59:53 2009
@@ -81,11 +81,11 @@
return UNLOCK_KEY+BEFORE_ACTION;
} // otherwise it has no keys
} catch (Exception e) {
- portlet.addErrorMessage(request, portlet.getLocalizedString(request, "errorMsg09", keystore), e.getMessage());
+ portlet.addErrorMessage(request, portlet.getLocalizedString(request, "consolebase.errorMsg09", keystore), e.getMessage());
log.error("Unable to unlock keystore '"+keystore+"' for availability.", e);
return getMode()+BEFORE_ACTION;
}
- portlet.addInfoMessage(request, portlet.getLocalizedString(request, "infoMsg07", keystore));
+ portlet.addInfoMessage(request, portlet.getLocalizedString(request, "consolebase.infoMsg07", keystore));
return LIST_MODE+BEFORE_ACTION;
}
}
Modified: geronimo/server/trunk/plugins/console/console-base-portlets/src/main/java/org/apache/geronimo/console/securitymanager/SEGroupsPortlet.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/console/console-base-portlets/src/main/java/org/apache/geronimo/console/securitymanager/SEGroupsPortlet.java?rev=750949&r1=750948&r2=750949&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/console/console-base-portlets/src/main/java/org/apache/geronimo/console/securitymanager/SEGroupsPortlet.java (original)
+++ geronimo/server/trunk/plugins/console/console-base-portlets/src/main/java/org/apache/geronimo/console/securitymanager/SEGroupsPortlet.java Fri Mar 6 15:59:53 2009
@@ -123,7 +123,7 @@
try {
SERealmGroupHelper.addGroup(group, users);
} catch (Exception e) {
- addErrorMessage(actionRequest, getLocalizedString(actionRequest, "errorMsg07"), e.getMessage());
+ addErrorMessage(actionRequest, getLocalizedString(actionRequest, "consolebase.errorMsg07"), e.getMessage());
}
} else if ("new".equals(action)) {
currAction = "new";
@@ -135,7 +135,7 @@
actionResponse.setRenderParameter("group", group);
}
} catch (Exception e) {
- addErrorMessage(actionRequest, getLocalizedString(actionRequest, "errorMsg06"), e.getMessage());
+ addErrorMessage(actionRequest, getLocalizedString(actionRequest, "consolebase.errorMsg06"), e.getMessage());
}
}
}
\ No newline at end of file
Modified: geronimo/server/trunk/plugins/console/console-base-portlets/src/main/java/org/apache/geronimo/console/securitymanager/SEUsersPortlet.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/console/console-base-portlets/src/main/java/org/apache/geronimo/console/securitymanager/SEUsersPortlet.java?rev=750949&r1=750948&r2=750949&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/console/console-base-portlets/src/main/java/org/apache/geronimo/console/securitymanager/SEUsersPortlet.java (original)
+++ geronimo/server/trunk/plugins/console/console-base-portlets/src/main/java/org/apache/geronimo/console/securitymanager/SEUsersPortlet.java Fri Mar 6 15:59:53 2009
@@ -144,7 +144,7 @@
}
SERealmUserHelper.deleteUser(user);
} catch (Exception e) {
- addErrorMessage(actionRequest, getLocalizedString(actionRequest, "errorMsg04"), e.getMessage());
+ addErrorMessage(actionRequest, getLocalizedString(actionRequest, "consolebase.errorMsg04"), e.getMessage());
}
} else if ("update".equals(action)) {
if(password != null && !password.equals("")) {
@@ -161,7 +161,7 @@
SERealmGroupHelper.updateGroup(group, groupUsers);
}
} catch (Exception e) {
- addErrorMessage(actionRequest, getLocalizedString(actionRequest, "errorMsg05"), e.getMessage());
+ addErrorMessage(actionRequest, getLocalizedString(actionRequest, "consolebase.errorMsg05"), e.getMessage());
}
} else if ("new".equals(action)) {
currAction = "new";
@@ -173,7 +173,7 @@
actionResponse.setRenderParameter("user", user);
}
} catch (Exception e) {
- addErrorMessage(actionRequest, getLocalizedString(actionRequest, "errorMsg06"), e.getMessage());
+ addErrorMessage(actionRequest, getLocalizedString(actionRequest, "consolebase.errorMsg06"), e.getMessage());
}
}
Modified: geronimo/server/trunk/plugins/console/console-base-portlets/src/main/java/org/apache/geronimo/console/servermanager/ServerManagerPortlet.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/console/console-base-portlets/src/main/java/org/apache/geronimo/console/servermanager/ServerManagerPortlet.java?rev=750949&r1=750948&r2=750949&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/console/console-base-portlets/src/main/java/org/apache/geronimo/console/servermanager/ServerManagerPortlet.java (original)
+++ geronimo/server/trunk/plugins/console/console-base-portlets/src/main/java/org/apache/geronimo/console/servermanager/ServerManagerPortlet.java Fri Mar 6 15:59:53 2009
@@ -69,7 +69,7 @@
protected void doView(RenderRequest request, RenderResponse response)
throws PortletException, IOException {
- addWarningMessage(request, getLocalizedString(request, "warnMsg07"));
+ addWarningMessage(request, getLocalizedString(request, "consolebase.warnMsg07"));
normalView.include(request, response);
}
Modified: geronimo/server/trunk/plugins/console/console-base-portlets/src/main/java/org/apache/geronimo/console/webmanager/WebManagerPortlet.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/console/console-base-portlets/src/main/java/org/apache/geronimo/console/webmanager/WebManagerPortlet.java?rev=750949&r1=750948&r2=750949&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/console/console-base-portlets/src/main/java/org/apache/geronimo/console/webmanager/WebManagerPortlet.java (original)
+++ geronimo/server/trunk/plugins/console/console-base-portlets/src/main/java/org/apache/geronimo/console/webmanager/WebManagerPortlet.java Fri Mar 6 15:59:53 2009
@@ -122,7 +122,7 @@
populateStats = true; // this is a Lazy provider and stats are enabled so populate the stats
} else {
renderRequest.setAttribute("statsOn", Boolean.FALSE); // indicate that stats are currently disabled
- addWarningMessage(renderRequest, getLocalizedString(renderRequest, "warnMsg04"));
+ addWarningMessage(renderRequest, getLocalizedString(renderRequest, "consolebase.warnMsg04"));
}
} else {
renderRequest.setAttribute("statsLazy", Boolean.FALSE); // indicate that enable/disable should not be shown for this container
@@ -156,7 +156,7 @@
}
} else {
renderRequest.setAttribute("statsSupported", Boolean.FALSE); // indicate that statistics are not supported for this container
- addWarningMessage(renderRequest, getLocalizedString(renderRequest, "warnMsg03"));
+ addWarningMessage(renderRequest, getLocalizedString(renderRequest, "consolebase.warnMsg03"));
}
} else {
log.error("Error attempting to retrieve the web containers");
Modified: geronimo/server/trunk/plugins/console/console-base-portlets/src/main/resources/portletinfo.properties
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/console/console-base-portlets/src/main/resources/portletinfo.properties?rev=750949&r1=750948&r2=750949&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/console/console-base-portlets/src/main/resources/portletinfo.properties (original)
+++ geronimo/server/trunk/plugins/console/console-base-portlets/src/main/resources/portletinfo.properties Fri Mar 6 15:59:53 2009
@@ -107,100 +107,52 @@
Welcome = Welcome
-errorMsg01 = Configuration not found
-
-errorMsg02 = Lifecycle operation failed
-
-errorMsg03 = Encountered an unhandled exception
-
-errorMsg04 = Error encountered while deleting user.
-
-errorMsg05 = Error encountered while adding user.
-
-errorMsg06 = Error encountered.
-
-errorMsg07 = Error encountered while adding group.
-
-errorMsg08 = Unable to unlock keystore <b>{0} </b> for editing.
-
-errorMsg09 = Unable to unlock keystore <b>{0}</b> for availability.
-
-errorMsg10 = Unable to unlock key <b>{0}</b>.
-
-errorMsg11 = Unable to change password for keystore <b>{0}</b>.
-
-errorMsg12 = Unable to change password for private key <b>{0}</b>.
-
-errorMsg13 = Error encountered while publishing CA's certificate to Certificate Store.
-
-errorMsg14 = Errors encountered while unlocking CA.
-
-errorMsg15 = Errors encountered while trying to view CA Details.
-
-errorMsg16 = Errors encountered while trying to view certificate with serial number <b>{0}</b>.
-
-errorMsg17 = Errors encountered while processing a Certificate Request. id=<b>{0}</b>.
-
-errorMsg18 = Errors while verifying Certificate Request. id=<b>{0}</b>.
-
-errorMsg19 = Error in user input during CA Setup.
-
-errorMsg20 = Errors encountered while processing a CSR.
-
-errorMsg21 = Unable to get next serial number from CA.
-
-errorMsg22 = Errors in user input while processing a CSR.
-
-errorMsg23 = Errors encountered while issuing certificate.
-
-infoMsg01 = Started application
-
-infoMsg02 = Stopped application
-
-infoMsg03 = Restarted application
-
-infoMsg04 = Uninstalled application
-
-infoMsg05 = Keystore <b>{0}</b> successfully unlocked for editing.
-
-infoMsg06 = Keystore <b>{0}</b> is now edit locked.
-
-infoMsg07 = Successfully unlocked keystore <b>{0}</b> for availability.
-
-infoMsg08 = Availability of keystore <b>{0}</b> is locked.
-
-infoMsg09 = Successfully unlocked key <b>{0}</b> in keystore <b>{1}</b>.
-
-infoMsg10 = Password changed for keystore <b>{0}</b>.
-
-infoMsg11 = Password changed for private key <b>{0}</b>.
-
-infoMsg12 = CA has been locked!
-
-infoMsg13 = CA's certificate published to Certificate Store
-
-infoMsg14 = CA has been unlocked successfully!
-
-infoMsg15 = CA Setup is successful !
-
-infoMsg16 = Approved CSR. id = <b>{0}</b>.
-
-infoMsg17 = Rejected and deleted CSR. id = <b>{0}</b>.
-
-infoMsg18 = Certificate Issued successfully. This Certificate details can also be viewed using the serial number <b>{0}</b> with the 'View Issued Certificate' link provided in the CA home screen.
-
-warnMsg01 = Invalid value for changeState:
-
-warnMsg02 = No modules found of this type
-
-warnMsg03 = Web statistics are not supported for the current web container.
-
-warnMsg04 = Statistics are not currently being collected.
-
-warnMsg05 = CA is not running or CA may not have been initialized. Unable to lock CA.
-
-warnMsg06 = A certificate with the serial number <b>{0}</b> has already been issued. You may be seeing this message since you have clicked on 'Issue Certificate' button a second time.
-
-warnMsg07 = <p style='font-size:120%;'><b>A shutdown of the server will disable this Web Console! Proceed only if you are certain you want to terminate the server.</b></p>
-
-warnMsg08 = There are no Web Containers defined.
+consolebase.errorMsg01 = Configuration not found
+consolebase.errorMsg02 = Lifecycle operation failed
+consolebase.errorMsg03 = Encountered an unhandled exception
+consolebase.errorMsg04 = Error encountered while deleting user.
+consolebase.errorMsg05 = Error encountered while adding user.
+consolebase.errorMsg06 = Error encountered.
+consolebase.errorMsg07 = Error encountered while adding group.
+consolebase.errorMsg08 = Unable to unlock keystore <b>{0} </b> for editing.
+consolebase.errorMsg09 = Unable to unlock keystore <b>{0}</b> for availability.
+consolebase.errorMsg10 = Unable to unlock key <b>{0}</b>.
+consolebase.errorMsg11 = Unable to change password for keystore <b>{0}</b>.
+consolebase.errorMsg12 = Unable to change password for private key <b>{0}</b>.
+consolebase.errorMsg13 = Error encountered while publishing CA's certificate to Certificate Store.
+consolebase.errorMsg14 = Errors encountered while unlocking CA.
+consolebase.errorMsg15 = Errors encountered while trying to view CA Details.
+consolebase.errorMsg16 = Errors encountered while trying to view certificate with serial number <b>{0}</b>.
+consolebase.errorMsg17 = Errors encountered while processing a Certificate Request. id=<b>{0}</b>.
+consolebase.errorMsg18 = Errors while verifying Certificate Request. id=<b>{0}</b>.
+consolebase.errorMsg19 = Error in user input during CA Setup.
+consolebase.errorMsg20 = Errors encountered while processing a CSR.
+consolebase.errorMsg21 = Unable to get next serial number from CA.
+consolebase.errorMsg22 = Errors in user input while processing a CSR.
+consolebase.errorMsg23 = Errors encountered while issuing certificate.
+consolebase.infoMsg01 = Started application
+consolebase.infoMsg02 = Stopped application
+consolebase.infoMsg03 = Restarted application
+consolebase.infoMsg04 = Uninstalled application
+consolebase.infoMsg05 = Keystore <b>{0}</b> successfully unlocked for editing.
+consolebase.infoMsg06 = Keystore <b>{0}</b> is now edit locked.
+consolebase.infoMsg07 = Successfully unlocked keystore <b>{0}</b> for availability.
+consolebase.infoMsg08 = Availability of keystore <b>{0}</b> is locked.
+consolebase.infoMsg09 = Successfully unlocked key <b>{0}</b> in keystore <b>{1}</b>.
+consolebase.infoMsg10 = Password changed for keystore <b>{0}</b>.
+consolebase.infoMsg11 = Password changed for private key <b>{0}</b>.
+consolebase.infoMsg12 = CA has been locked!
+consolebase.infoMsg13 = CA's certificate published to Certificate Store
+consolebase.infoMsg14 = CA has been unlocked successfully!
+consolebase.infoMsg15 = CA Setup is successful !
+consolebase.infoMsg16 = Approved CSR. id = <b>{0}</b>.
+consolebase.infoMsg17 = Rejected and deleted CSR. id = <b>{0}</b>.
+consolebase.infoMsg18 = Certificate Issued successfully. This Certificate details can also be viewed using the serial number <b>{0}</b> with the 'View Issued Certificate' link provided in the CA home screen.
+consolebase.warnMsg01 = Invalid value for changeState:
+consolebase.warnMsg02 = No modules found of this type
+consolebase.warnMsg03 = Web statistics are not supported for the current web container.
+consolebase.warnMsg04 = Statistics are not currently being collected.
+consolebase.warnMsg05 = CA is not running or CA may not have been initialized. Unable to lock CA.
+consolebase.warnMsg06 = A certificate with the serial number <b>{0}</b> has already been issued. You may be seeing this message since you have clicked on 'Issue Certificate' button a second time.
+consolebase.warnMsg07 = <p style='font-size:120%;'><b>A shutdown of the server will disable this Web Console! Proceed only if you are certain you want to terminate the server.</b></p>
+consolebase.warnMsg08 = There are no Web Containers defined.
Modified: geronimo/server/trunk/plugins/console/console-base-portlets/src/main/resources/portletinfo_zh.properties
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/console/console-base-portlets/src/main/resources/portletinfo_zh.properties?rev=750949&r1=750948&r2=750949&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/console/console-base-portlets/src/main/resources/portletinfo_zh.properties (original)
+++ geronimo/server/trunk/plugins/console/console-base-portlets/src/main/resources/portletinfo_zh.properties Fri Mar 6 15:59:53 2009
@@ -107,100 +107,52 @@
Welcome = \u6B22\u8FCE
-errorMsg01 = \u914D\u7F6E\u672A\u627E\u5230
-
-errorMsg02 = \u751F\u547D\u5468\u671F\u64CD\u4F5C\u5931\u8D25
-
-errorMsg03 = \u9047\u5230\u672A\u5904\u7406\u7684\u5F02\u5E38
-
-errorMsg04 = \u5220\u9664\u7528\u6237\u65F6\u9047\u5230\u9519\u8BEF\u3002
-
-errorMsg05 = \u6DFB\u52A0\u7528\u6237\u65F6\u9047\u5230\u9519\u8BEF\u3002
-
-errorMsg06 = \u9047\u5230\u9519\u8BEF\u3002
-
-errorMsg07 = \u6DFB\u52A0\u7528\u6237\u7EC4\u65F6\u9047\u5230\u9519\u8BEF\u3002
-
-errorMsg08 = \u65E0\u6CD5\u89E3\u9501\u5BC6\u94A5\u5E93<b>{0}</b>\u4EE5\u4F9B\u7F16\u8F91\u3002
-
-errorMsg09 = \u65E0\u6CD5\u89E3\u9501\u5BC6\u94A5\u5E93<b>{0}</b>\u4EE5\u4F9B\u6B63\u5E38\u5DE5\u4F5C\u3002
-
-errorMsg10 = \u65E0\u6CD5\u89E3\u9501\u5BC6\u94A5<b>{0}</b>\u3002
-
-errorMsg11 = \u65E0\u6CD5\u4FEE\u6539\u5BC6\u94A5\u5E93<b>{0}</b>\u7684\u5BC6\u7801\u3002
-
-errorMsg12 = \u65E0\u6CD5\u4FEE\u6539\u79C1\u94A5<b>{0}</b>\u7684\u5BC6\u7801\u3002
-
-errorMsg13 = \u53D1\u5E03CA\u7684\u8BC1\u4E66\u81F3\u8BC1\u4E66\u5E93\u65F6\u9047\u5230\u9519\u8BEF\u3002
-
-errorMsg14 = \u89E3\u9501CA\u65F6\u9047\u5230\u9519\u8BEF\u3002
-
-errorMsg15 = \u5C1D\u8BD5\u67E5\u770BCA\u8BE6\u60C5\u65F6\u9047\u5230\u9519\u8BEF\u3002
-
-errorMsg16 = \u5C1D\u8BD5\u67E5\u770B\u5E8F\u5217\u53F7\u4E3A<b>{0}</b>\u7684\u8BC1\u4E66\u65F6\u9047\u5230\u9519\u8BEF\u3002
-
-errorMsg17 = \u5904\u7406id\u4E3A<b>{0}</b>\u7684\u8BC1\u4E66\u8BF7\u6C42\u65F6\u9047\u5230\u9519\u8BEF\u3002
-
-errorMsg18 = \u6838\u5B9Eid\u4E3A<b>{0}</b>\u7684\u8BC1\u4E66\u8BF7\u6C42\u65F6\u9047\u5230\u9519\u8BEF\u3002
-
-errorMsg19 = \u8BBE\u7F6ECA\u65F6\u7528\u6237\u8F93\u5165\u6709\u9519\u8BEF\u3002
-
-errorMsg20 = \u5904\u7406CSR\u65F6\u9047\u5230\u9519\u8BEF\u3002
-
-errorMsg21 = \u65E0\u6CD5\u4ECECA\u5F97\u5230\u4E0B\u4E00\u4E2A\u5E8F\u5217\u53F7\u3002
-
-errorMsg22 = \u5904\u7406CSR\u65F6\u7528\u6237\u8F93\u5165\u9519\u8BEF\u3002
-
-errorMsg23 = \u9881\u53D1\u8BC1\u4E66\u65F6\u9047\u5230\u9519\u8BEF\u3002
-
-infoMsg01 = \u5DF2\u542F\u52A8\u5E94\u7528
-
-infoMsg02 = \u5DF2\u505C\u6B62\u5E94\u7528
-
-infoMsg03 = \u5DF2\u91CD\u542F\u5E94\u7528
-
-infoMsg04 = \u5DF2\u5378\u8F7D\u5E94\u7528
-
-infoMsg05 = \u6210\u529F\u89E3\u9501\u5BC6\u94A5\u5E93<b>{0}</b>\u4EE5\u4F9B\u7F16\u8F91\u3002
-
-infoMsg06 = \u5BC6\u94A5\u5E93<b>{0}</b>\u5DF2\u88AB\u9501\uFF0C\u65E0\u6CD5\u7F16\u8F91\u3002
-
-infoMsg07 = \u6210\u529F\u89E3\u9501\u5BC6\u94A5\u5E93<b>{0}</b>\u4EE5\u4F9B\u6B63\u5E38\u5DE5\u4F5C\u3002
-
-infoMsg08 = \u5BC6\u94A5\u5E93<b>{0}</b>\u5DF2\u88AB\u9501\uFF0C\u65E0\u6CD5\u6B63\u5E38\u5DE5\u4F5C\u3002
-
-infoMsg09 = \u6210\u529F\u89E3\u9501\u5BC6\u94A5\u5E93<b>{1}</b>\u4E2D\u7684\u5BC6\u94A5<b>{0}</b>\u3002
-
-infoMsg10 = \u5BC6\u94A5\u5E93<b>{0}</b>\u7684\u5BC6\u7801\u5DF2\u4FEE\u6539\u3002
-
-infoMsg11 = \u79C1\u94A5<b>{0}</b>\u7684\u5BC6\u7801\u5DF2\u4FEE\u6539\u3002
-
-infoMsg12 = CA\u88AB\u9501\u5B9A\uFF01
-
-infoMsg13 = CA\u7684\u8BC1\u4E66\u5DF2\u53D1\u5E03\u81F3\u8BC1\u4E66\u5E93\u3002
-
-infoMsg14 = \u6210\u529F\u89E3\u9501CA\uFF01
-
-infoMsg15 = CA\u8BBE\u7F6E\u6210\u529F\uFF01
-
-infoMsg16 = \u6279\u51C6\u4E86id\u4E3A<b>{0}</b>\u7684CSR.
-
-infoMsg17 = \u62D2\u7EDD\u5E76\u5220\u9664\u4E86id\u4E3A<b>{0}</b>\u7684CSR.
-
-infoMsg18 = \u6210\u529F\u53D1\u5E03\u8BC1\u4E66\u3002\u5728CA\u7684\u4E3B\u9875\u9762\u70B9\u51FB'\u67E5\u770B\u5DF2\u53D1\u5E03\u8BC1\u4E66'\u94FE\u63A5\u5E76\u4F7F\u7528\u5E8F\u5217\u53F7<b>{0}</b>\uFF0C\u4E5F\u53EF\u4EE5\u67E5\u770B\u8BC1\u4E66\u8BE6\u60C5\u3002
-
-warnMsg01 = \u65E0\u6548\u7684\u6539\u53D8\u72B6\u6001\u503C\uFF1A
-
-warnMsg02 = \u672A\u627E\u5230\u8BE5\u7C7B\u578B\u7684\u6A21\u5757
-
-warnMsg03 = \u8BE5Web\u5BB9\u5668\u4E0D\u652F\u6301Web\u7EDF\u8BA1\u6570\u636E
-
-warnMsg04 = \u5F53\u524D\u5C1A\u672A\u6536\u96C6\u7EDF\u8BA1\u6570\u636E\u3002
-
-warnMsg05 = CA\u672A\u5904\u4E8E\u8FD0\u884C\u72B6\u6001\u6216\u8005CA\u5C1A\u672A\u521D\u59CB\u5316\u3002\u65E0\u6CD5\u9501\u5B9ACA\u3002
-
-warnMsg06 = \u5E8F\u5217\u53F7\u4E3A<b>{0}</b>\u7684\u8BC1\u4E66\u5148\u524D\u5DF2\u88AB\u53D1\u5E03\uFF0C\u5F53\u4F60\u70B9\u51FB\u4E86'\u53D1\u5E03\u8BC1\u4E66'\u6309\u94AE\u4E24\u6B21\u65F6\u4F60\u53EF\u80FD\u4F1A\u770B\u5230\u8FD9\u6761\u6D88\u606F\u3002
-
-warnMsg07 = <p style='font-size:120%;'><b>\u5173\u95ED\u670D\u52A1\u5668\u5C06\u4F1A\u4F7FWeb\u63A7\u5236\u53F0\u4E0D\u53EF\u7528\uFF01\u53EA\u6709\u5F53\u4F60\u786E\u5B9A\u8981\u5173\u95ED\u670D\u52A1\u5668\u65F6\uFF0C\u624D\u7EE7\u7EED\u3002</b></p>
-
-warnMsg08 = \u672A\u5B9A\u4E49\u4EFB\u4F55Web\u5BB9\u5668\u3002
+consolebase.errorMsg01 = \u914D\u7F6E\u672A\u627E\u5230
+consolebase.errorMsg02 = \u751F\u547D\u5468\u671F\u64CD\u4F5C\u5931\u8D25
+consolebase.errorMsg03 = \u9047\u5230\u672A\u5904\u7406\u7684\u5F02\u5E38
+consolebase.errorMsg04 = \u5220\u9664\u7528\u6237\u65F6\u9047\u5230\u9519\u8BEF\u3002
+consolebase.errorMsg05 = \u6DFB\u52A0\u7528\u6237\u65F6\u9047\u5230\u9519\u8BEF\u3002
+consolebase.errorMsg06 = \u9047\u5230\u9519\u8BEF\u3002
+consolebase.errorMsg07 = \u6DFB\u52A0\u7528\u6237\u7EC4\u65F6\u9047\u5230\u9519\u8BEF\u3002
+consolebase.errorMsg08 = \u65E0\u6CD5\u89E3\u9501\u5BC6\u94A5\u5E93<b>{0}</b>\u4EE5\u4F9B\u7F16\u8F91\u3002
+consolebase.errorMsg09 = \u65E0\u6CD5\u89E3\u9501\u5BC6\u94A5\u5E93<b>{0}</b>\u4EE5\u4F9B\u6B63\u5E38\u5DE5\u4F5C\u3002
+consolebase.errorMsg10 = \u65E0\u6CD5\u89E3\u9501\u5BC6\u94A5<b>{0}</b>\u3002
+consolebase.errorMsg11 = \u65E0\u6CD5\u4FEE\u6539\u5BC6\u94A5\u5E93<b>{0}</b>\u7684\u5BC6\u7801\u3002
+consolebase.errorMsg12 = \u65E0\u6CD5\u4FEE\u6539\u79C1\u94A5<b>{0}</b>\u7684\u5BC6\u7801\u3002
+consolebase.errorMsg13 = \u53D1\u5E03CA\u7684\u8BC1\u4E66\u81F3\u8BC1\u4E66\u5E93\u65F6\u9047\u5230\u9519\u8BEF\u3002
+consolebase.errorMsg14 = \u89E3\u9501CA\u65F6\u9047\u5230\u9519\u8BEF\u3002
+consolebase.errorMsg15 = \u5C1D\u8BD5\u67E5\u770BCA\u8BE6\u60C5\u65F6\u9047\u5230\u9519\u8BEF\u3002
+consolebase.errorMsg16 = \u5C1D\u8BD5\u67E5\u770B\u5E8F\u5217\u53F7\u4E3A<b>{0}</b>\u7684\u8BC1\u4E66\u65F6\u9047\u5230\u9519\u8BEF\u3002
+consolebase.errorMsg17 = \u5904\u7406id\u4E3A<b>{0}</b>\u7684\u8BC1\u4E66\u8BF7\u6C42\u65F6\u9047\u5230\u9519\u8BEF\u3002
+consolebase.errorMsg18 = \u6838\u5B9Eid\u4E3A<b>{0}</b>\u7684\u8BC1\u4E66\u8BF7\u6C42\u65F6\u9047\u5230\u9519\u8BEF\u3002
+consolebase.errorMsg19 = \u8BBE\u7F6ECA\u65F6\u7528\u6237\u8F93\u5165\u6709\u9519\u8BEF\u3002
+consolebase.errorMsg20 = \u5904\u7406CSR\u65F6\u9047\u5230\u9519\u8BEF\u3002
+consolebase.errorMsg21 = \u65E0\u6CD5\u4ECECA\u5F97\u5230\u4E0B\u4E00\u4E2A\u5E8F\u5217\u53F7\u3002
+consolebase.errorMsg22 = \u5904\u7406CSR\u65F6\u7528\u6237\u8F93\u5165\u9519\u8BEF\u3002
+consolebase.errorMsg23 = \u9881\u53D1\u8BC1\u4E66\u65F6\u9047\u5230\u9519\u8BEF\u3002
+consolebase.infoMsg01 = \u5DF2\u542F\u52A8\u5E94\u7528
+consolebase.infoMsg02 = \u5DF2\u505C\u6B62\u5E94\u7528
+consolebase.infoMsg03 = \u5DF2\u91CD\u542F\u5E94\u7528
+consolebase.infoMsg04 = \u5DF2\u5378\u8F7D\u5E94\u7528
+consolebase.infoMsg05 = \u6210\u529F\u89E3\u9501\u5BC6\u94A5\u5E93<b>{0}</b>\u4EE5\u4F9B\u7F16\u8F91\u3002
+consolebase.infoMsg06 = \u5BC6\u94A5\u5E93<b>{0}</b>\u5DF2\u88AB\u9501\uFF0C\u65E0\u6CD5\u7F16\u8F91\u3002
+consolebase.infoMsg07 = \u6210\u529F\u89E3\u9501\u5BC6\u94A5\u5E93<b>{0}</b>\u4EE5\u4F9B\u6B63\u5E38\u5DE5\u4F5C\u3002
+consolebase.infoMsg08 = \u5BC6\u94A5\u5E93<b>{0}</b>\u5DF2\u88AB\u9501\uFF0C\u65E0\u6CD5\u6B63\u5E38\u5DE5\u4F5C\u3002
+consolebase.infoMsg09 = \u6210\u529F\u89E3\u9501\u5BC6\u94A5\u5E93<b>{1}</b>\u4E2D\u7684\u5BC6\u94A5<b>{0}</b>\u3002
+consolebase.infoMsg10 = \u5BC6\u94A5\u5E93<b>{0}</b>\u7684\u5BC6\u7801\u5DF2\u4FEE\u6539\u3002
+consolebase.infoMsg11 = \u79C1\u94A5<b>{0}</b>\u7684\u5BC6\u7801\u5DF2\u4FEE\u6539\u3002
+consolebase.infoMsg12 = CA\u88AB\u9501\u5B9A\uFF01
+consolebase.infoMsg13 = CA\u7684\u8BC1\u4E66\u5DF2\u53D1\u5E03\u81F3\u8BC1\u4E66\u5E93\u3002
+consolebase.infoMsg14 = \u6210\u529F\u89E3\u9501CA\uFF01
+consolebase.infoMsg15 = CA\u8BBE\u7F6E\u6210\u529F\uFF01
+consolebase.infoMsg16 = \u6279\u51C6\u4E86id\u4E3A<b>{0}</b>\u7684CSR.
+consolebase.infoMsg17 = \u62D2\u7EDD\u5E76\u5220\u9664\u4E86id\u4E3A<b>{0}</b>\u7684CSR.
+consolebase.infoMsg18 = \u6210\u529F\u53D1\u5E03\u8BC1\u4E66\u3002\u5728CA\u7684\u4E3B\u9875\u9762\u70B9\u51FB'\u67E5\u770B\u5DF2\u53D1\u5E03\u8BC1\u4E66'\u94FE\u63A5\u5E76\u4F7F\u7528\u5E8F\u5217\u53F7<b>{0}</b>\uFF0C\u4E5F\u53EF\u4EE5\u67E5\u770B\u8BC1\u4E66\u8BE6\u60C5\u3002
+consolebase.warnMsg01 = \u65E0\u6548\u7684\u6539\u53D8\u72B6\u6001\u503C\uFF1A
+consolebase.warnMsg02 = \u672A\u627E\u5230\u8BE5\u7C7B\u578B\u7684\u6A21\u5757
+consolebase.warnMsg03 = \u8BE5Web\u5BB9\u5668\u4E0D\u652F\u6301Web\u7EDF\u8BA1\u6570\u636E
+consolebase.warnMsg04 = \u5F53\u524D\u5C1A\u672A\u6536\u96C6\u7EDF\u8BA1\u6570\u636E\u3002
+consolebase.warnMsg05 = CA\u672A\u5904\u4E8E\u8FD0\u884C\u72B6\u6001\u6216\u8005CA\u5C1A\u672A\u521D\u59CB\u5316\u3002\u65E0\u6CD5\u9501\u5B9ACA\u3002
+consolebase.warnMsg06 = \u5E8F\u5217\u53F7\u4E3A<b>{0}</b>\u7684\u8BC1\u4E66\u5148\u524D\u5DF2\u88AB\u53D1\u5E03\uFF0C\u5F53\u4F60\u70B9\u51FB\u4E86'\u53D1\u5E03\u8BC1\u4E66'\u6309\u94AE\u4E24\u6B21\u65F6\u4F60\u53EF\u80FD\u4F1A\u770B\u5230\u8FD9\u6761\u6D88\u606F\u3002
+consolebase.warnMsg07 = <p style='font-size:120%;'><b>\u5173\u95ED\u670D\u52A1\u5668\u5C06\u4F1A\u4F7FWeb\u63A7\u5236\u53F0\u4E0D\u53EF\u7528\uFF01\u53EA\u6709\u5F53\u4F60\u786E\u5B9A\u8981\u5173\u95ED\u670D\u52A1\u5668\u65F6\uFF0C\u624D\u7EE7\u7EED\u3002</b></p>
+consolebase.warnMsg08 = \u672A\u5B9A\u4E49\u4EFB\u4F55Web\u5BB9\u5668\u3002
Modified: geronimo/server/trunk/plugins/console/console-core/src/main/java/org/apache/geronimo/console/BasePortlet.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/console/console-core/src/main/java/org/apache/geronimo/console/BasePortlet.java?rev=750949&r1=750948&r2=750949&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/console/console-core/src/main/java/org/apache/geronimo/console/BasePortlet.java (original)
+++ geronimo/server/trunk/plugins/console/console-core/src/main/java/org/apache/geronimo/console/BasePortlet.java Fri Mar 6 15:59:53 2009
@@ -20,10 +20,9 @@
import java.lang.ref.SoftReference;
import java.lang.reflect.Method;
import java.lang.reflect.Modifier;
+import java.text.MessageFormat;
import java.util.ArrayList;
import java.util.List;
-import java.util.Locale;
-import java.text.MessageFormat;
import javax.portlet.ActionRequest;
import javax.portlet.GenericPortlet;
@@ -32,15 +31,14 @@
import javax.portlet.RenderRequest;
import javax.portlet.RenderResponse;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import org.apache.geronimo.console.util.PortletManager;
-import org.apache.geronimo.management.geronimo.WebContainer;
+import org.apache.geronimo.console.i18n.ConsoleResourceRegistry;
import org.apache.geronimo.console.message.CommonMessage;
import org.apache.geronimo.console.message.ErrorMessage;
import org.apache.geronimo.console.message.InfoMessage;
import org.apache.geronimo.console.message.WarnMessage;
+import org.apache.geronimo.console.util.PortletManager;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* Superclass with some generic functionality for console portlets
@@ -54,6 +52,16 @@
protected final static String WEB_SERVER_GENERIC = "generic";
private static final String COMMON_MESSAGES = "commonMessages";
private static final String FMT_LOCALE = "javax.servlet.jsp.jstl.fmt.locale.request";
+ private static final String BASENAME = "portletinfo";
+ private static ConsoleResourceRegistry resourceRegistry;
+
+ static {
+ try {
+ resourceRegistry = (ConsoleResourceRegistry) PortletManager.getKernel().getGBean(ConsoleResourceRegistry.class);
+ } catch (Exception e) {
+ log.error("Cannot get the console resource registery service", e);
+ }
+ }
protected final static String getWebServerType(Class cls) {
Class[] intfs = cls.getInterfaces();
@@ -158,7 +166,7 @@
}
public final String getLocalizedString(PortletRequest request, String key, Object... vars) {
- String value = getResourceBundle(request.getLocale()).getString(key);
+ String value = resourceRegistry.handleGetObject(BASENAME, request.getLocale(), key);
if (null == value || 0 == value.length()) return key;
return MessageFormat.format(value, vars);
}
Modified: geronimo/server/trunk/plugins/console/console-core/src/main/java/org/apache/geronimo/console/BaseRemoteProxy.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/console/console-core/src/main/java/org/apache/geronimo/console/BaseRemoteProxy.java?rev=750949&r1=750948&r2=750949&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/console/console-core/src/main/java/org/apache/geronimo/console/BaseRemoteProxy.java (original)
+++ geronimo/server/trunk/plugins/console/console-core/src/main/java/org/apache/geronimo/console/BaseRemoteProxy.java Fri Mar 6 15:59:53 2009
@@ -17,14 +17,28 @@
package org.apache.geronimo.console;
import java.text.MessageFormat;
-import java.util.ResourceBundle;
import javax.servlet.http.HttpServletRequest;
+import org.apache.geronimo.console.i18n.ConsoleResourceRegistry;
+import org.apache.geronimo.console.util.PortletManager;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
public class BaseRemoteProxy {
+ private static final Logger log = LoggerFactory.getLogger(BaseRemoteProxy.class);
+ private static ConsoleResourceRegistry resourceRegistry;
+ static {
+ try {
+ resourceRegistry = (ConsoleResourceRegistry) PortletManager.getKernel().getGBean(ConsoleResourceRegistry.class);
+ } catch (Exception e) {
+ log.error("Cannot get the console resource registery service", e);
+ }
+ }
+
public final String getLocalizedString(HttpServletRequest request, ClassLoader loader, String bundleName, String key, Object... vars) {
- String value = ResourceBundle.getBundle(bundleName, request.getLocale(), loader).getString(key);
+ String value = resourceRegistry.handleGetObject(bundleName, request.getLocale(), key);
if (null == value || 0 == value.length()) return key;
return MessageFormat.format(value, vars);
}
Modified: geronimo/server/trunk/plugins/console/console-core/src/main/java/org/apache/geronimo/console/i18n/ConsoleResourceRegistry.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/console/console-core/src/main/java/org/apache/geronimo/console/i18n/ConsoleResourceRegistry.java?rev=750949&r1=750948&r2=750949&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/console/console-core/src/main/java/org/apache/geronimo/console/i18n/ConsoleResourceRegistry.java (original)
+++ geronimo/server/trunk/plugins/console/console-core/src/main/java/org/apache/geronimo/console/i18n/ConsoleResourceRegistry.java Fri Mar 6 15:59:53 2009
@@ -18,8 +18,10 @@
package org.apache.geronimo.console.i18n;
import java.util.ArrayList;
+import java.util.HashMap;
import java.util.List;
import java.util.Locale;
+import java.util.Map;
import java.util.MissingResourceException;
import java.util.ResourceBundle;
@@ -31,6 +33,13 @@
* console-portal-driver can load the resource bundle for the above classloader.
*/
public class ConsoleResourceRegistry {
+
+ private static final Locale defaultLocale = new Locale("");
+ private static Map<String, Locale> localeMap;
+
+ static {
+ localeMap = new HashMap<String, Locale>();
+ }
private List<ClassLoader> classloaders = new ArrayList<ClassLoader>();
@@ -59,8 +68,15 @@
* @param key key for desired string
*/
public String handleGetObject(String basename, Locale locale, String key) {
+ if (localeMap.containsKey(locale.getLanguage())) {
+ locale = localeMap.get(locale.getLanguage());
+ }
for (ClassLoader classloader : classloaders) {
ResourceBundle rb = ResourceBundle.getBundle(basename, locale, classloader);
+ if (!locale.getLanguage().equals(rb.getLocale().getLanguage())) {
+ localeMap.put(locale.getLanguage(), defaultLocale);
+ rb = ResourceBundle.getBundle(basename, defaultLocale, classloader);
+ }
try {
if (rb != null) {
String value = rb.getString(key);
Modified: geronimo/server/trunk/plugins/console/plugin-portlets/src/main/java/org/apache/geronimo/console/configmanager/DeploymentPortlet.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/console/plugin-portlets/src/main/java/org/apache/geronimo/console/configmanager/DeploymentPortlet.java?rev=750949&r1=750948&r2=750949&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/console/plugin-portlets/src/main/java/org/apache/geronimo/console/configmanager/DeploymentPortlet.java (original)
+++ geronimo/server/trunk/plugins/console/plugin-portlets/src/main/java/org/apache/geronimo/console/configmanager/DeploymentPortlet.java Fri Mar 6 15:59:53 2009
@@ -154,7 +154,7 @@
String abbrStatusMessage;
String fullStatusMessage = null;
if(progress.getDeploymentStatus().isCompleted()) {
- abbrStatusMessage = getLocalizedString(actionRequest, !isRedeploy ? "infoMsg01" : "infoMsg02");
+ abbrStatusMessage = getLocalizedString(actionRequest, !isRedeploy ? "plugin.infoMsg01" : "plugin.infoMsg02");
addInfoMessage(actionRequest, abbrStatusMessage);
// start installed app/s
if (!isRedeploy && startApp != null && !startApp.equals("")) {
@@ -163,10 +163,10 @@
Thread.sleep(100);
}
if (progress.getDeploymentStatus().isCompleted()) {
- abbrStatusMessage = getLocalizedString(actionRequest, "infoMsg03");
+ abbrStatusMessage = getLocalizedString(actionRequest, "plugin.infoMsg03");
addInfoMessage(actionRequest, abbrStatusMessage);
} else {
- abbrStatusMessage = getLocalizedString(actionRequest, "errorMsg02");
+ abbrStatusMessage = getLocalizedString(actionRequest, "plugin.errorMsg02");
fullStatusMessage = progress.getDeploymentStatus().getMessage();
addErrorMessage(actionRequest, abbrStatusMessage, fullStatusMessage);
}
@@ -175,7 +175,7 @@
fullStatusMessage = progress.getDeploymentStatus().getMessage();
// for the abbreviated status message clip off everything
// after the first line, which in most cases means the gnarly stacktrace
- abbrStatusMessage = getLocalizedString(actionRequest, "errorMsg01");
+ abbrStatusMessage = getLocalizedString(actionRequest, "plugin.errorMsg01");
addErrorMessage(actionRequest, abbrStatusMessage, fullStatusMessage);
// try to provide an upgraded version of the plan
try {
Modified: geronimo/server/trunk/plugins/console/plugin-portlets/src/main/resources/portletinfo.properties
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/console/plugin-portlets/src/main/resources/portletinfo.properties?rev=750949&r1=750948&r2=750949&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/console/plugin-portlets/src/main/resources/portletinfo.properties (original)
+++ geronimo/server/trunk/plugins/console/plugin-portlets/src/main/resources/portletinfo.properties Fri Mar 6 15:59:53 2009
@@ -29,12 +29,8 @@
Security\ Realms = Security Realms
-errorMsg01 = Deployment Failed
-
-errorMsg02 = The application was not successfully started
-
-infoMsg01 = The application was successfully deployed.
-
-infoMsg02 = The application was successfully redeployed.
-
-infoMsg03 = The application was successfully started.
+plugin.errorMsg01 = Deployment Failed
+plugin.errorMsg02 = The application was not successfully started
+plugin.infoMsg01 = The application was successfully deployed.
+plugin.infoMsg02 = The application was successfully redeployed.
+plugin.infoMsg03 = The application was successfully started.
Modified: geronimo/server/trunk/plugins/console/plugin-portlets/src/main/resources/portletinfo_zh.properties
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/console/plugin-portlets/src/main/resources/portletinfo_zh.properties?rev=750949&r1=750948&r2=750949&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/console/plugin-portlets/src/main/resources/portletinfo_zh.properties (original)
+++ geronimo/server/trunk/plugins/console/plugin-portlets/src/main/resources/portletinfo_zh.properties Fri Mar 6 15:59:53 2009
@@ -29,12 +29,8 @@
Security\ Realms = \u5B89\u5168\u57DF
-errorMsg01 = \u90E8\u7F72\u5931\u8D25
-
-errorMsg02 = \u672A\u6210\u529F\u542F\u52A8\u5E94\u7528
-
-infoMsg01 = \u6210\u529F\u90E8\u7F72\u5E94\u7528
-
-infoMsg02 = \u6210\u529F\u91CD\u65B0\u90E8\u7F72\u5E94\u7528
-
-infoMsg03 = \u6210\u529F\u542F\u52A8\u5E94\u7528
+plugin.errorMsg01 = \u90E8\u7F72\u5931\u8D25
+plugin.errorMsg02 = \u672A\u6210\u529F\u542F\u52A8\u5E94\u7528
+plugin.infoMsg01 = \u6210\u529F\u90E8\u7F72\u5E94\u7528
+plugin.infoMsg02 = \u6210\u529F\u91CD\u65B0\u90E8\u7F72\u5E94\u7528
+plugin.infoMsg03 = \u6210\u529F\u542F\u52A8\u5E94\u7528