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 [2/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...
Modified: geronimo/server/trunk/plugins/monitoring/mconsole-war/src/main/java/org/apache/geronimo/monitoring/console/MonitoringPortlet.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/monitoring/mconsole-war/src/main/java/org/apache/geronimo/monitoring/console/MonitoringPortlet.java?rev=750949&r1=750948&r2=750949&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/monitoring/mconsole-war/src/main/java/org/apache/geronimo/monitoring/console/MonitoringPortlet.java (original)
+++ geronimo/server/trunk/plugins/monitoring/mconsole-war/src/main/java/org/apache/geronimo/monitoring/console/MonitoringPortlet.java Fri Mar 6 15:59:53 2009
@@ -258,9 +258,9 @@
String password, int port, String protocol, PortletRequest request) {
try {
new MRCConnector(ip, username, password, port, protocol);
- addInfoMessage(request, getLocalizedString(request, "infoMsg01"));
+ addInfoMessage(request, getLocalizedString(request, "mconsole.infoMsg01"));
} catch (Exception e) {
- addInfoMessage(request, getLocalizedString(request, "errorMsg01"), e.getMessage());
+ addInfoMessage(request, getLocalizedString(request, "mconsole.errorMsg01"), e.getMessage());
}
}
@@ -274,17 +274,17 @@
userTransaction.commit();
}
if (enable) {
- addInfoMessage(request, getLocalizedString(request, "infoMsg02", server_id));
+ addInfoMessage(request, getLocalizedString(request, "mconsole.infoMsg02", server_id));
}
else {
- addInfoMessage(request, getLocalizedString(request, "infoMsg03", server_id));
+ addInfoMessage(request, getLocalizedString(request, "mconsole.infoMsg03", server_id));
}
} catch (Exception e) {
if (enable) {
- addErrorMessage(request, getLocalizedString(request, "errorMsg02", server_id), e.getMessage());
+ addErrorMessage(request, getLocalizedString(request, "mconsole.errorMsg02", server_id), e.getMessage());
}
else {
- addErrorMessage(request, getLocalizedString(request, "errorMsg03", server_id), e.getMessage());
+ addErrorMessage(request, getLocalizedString(request, "mconsole.errorMsg03", server_id), e.getMessage());
}
}
}
@@ -571,9 +571,9 @@
} finally {
userTransaction.commit();
}
- addInfoMessage(actionRequest, getLocalizedString(actionRequest, "infoMsg08", actionRequest.getParameter("name")));
+ addInfoMessage(actionRequest, getLocalizedString(actionRequest, "mconsole.infoMsg08", actionRequest.getParameter("name")));
} catch (Exception e) {
- addErrorMessage(actionRequest, getLocalizedString(actionRequest, "errorMsg11", actionRequest.getParameter("name")), e.getMessage());
+ addErrorMessage(actionRequest, getLocalizedString(actionRequest, "mconsole.errorMsg11", actionRequest.getParameter("name")), e.getMessage());
}
}
@@ -600,9 +600,9 @@
} finally {
userTransaction.commit();
}
- addInfoMessage(actionRequest, getLocalizedString(actionRequest, "infoMsg09", name));
+ addInfoMessage(actionRequest, getLocalizedString(actionRequest, "mconsole.infoMsg09", name));
} catch (Exception e) {
- addErrorMessage(actionRequest, getLocalizedString(actionRequest, "errorMsg12", name), e.getMessage());
+ addErrorMessage(actionRequest, getLocalizedString(actionRequest, "mconsole.errorMsg12", name), e.getMessage());
}
}
@@ -637,9 +637,9 @@
} finally {
userTransaction.commit();
}
- addInfoMessage(actionRequest, getLocalizedString(actionRequest, "infoMsg10"));
+ addInfoMessage(actionRequest, getLocalizedString(actionRequest, "mconsole.infoMsg10"));
} catch (Exception e) {
- addErrorMessage(actionRequest, getLocalizedString(actionRequest, "errorMsg13"), e.getMessage());
+ addErrorMessage(actionRequest, getLocalizedString(actionRequest, "mconsole.errorMsg13"), e.getMessage());
}
}
@@ -665,9 +665,9 @@
} finally {
userTransaction.commit();
}
- addInfoMessage(actionRequest, getLocalizedString(actionRequest, "infoMsg11", name, host));
+ addInfoMessage(actionRequest, getLocalizedString(actionRequest, "mconsole.infoMsg11", name, host));
} catch (Exception e) {
- addErrorMessage(actionRequest, getLocalizedString(actionRequest, "errorMsg14"), e.getMessage());
+ addErrorMessage(actionRequest, getLocalizedString(actionRequest, "mconsole.errorMsg14"), e.getMessage());
}
}
@@ -684,9 +684,9 @@
} finally {
userTransaction.commit();
}
- addInfoMessage(actionRequest, getLocalizedString(actionRequest, "infoMsg12"));
+ addInfoMessage(actionRequest, getLocalizedString(actionRequest, "mconsole.infoMsg12"));
} catch (Exception e) {
- addErrorMessage(actionRequest, getLocalizedString(actionRequest, "errorMsg15"), e.getMessage());
+ addErrorMessage(actionRequest, getLocalizedString(actionRequest, "mconsole.errorMsg15"), e.getMessage());
}
}
@@ -703,9 +703,9 @@
} finally {
userTransaction.commit();
}
- addInfoMessage(actionRequest, getLocalizedString(actionRequest, "infoMsg13"));
+ addInfoMessage(actionRequest, getLocalizedString(actionRequest, "mconsole.infoMsg13"));
} catch (Exception e) {
- addErrorMessage(actionRequest, getLocalizedString(actionRequest, "errorMsg16"), e.getMessage());
+ addErrorMessage(actionRequest, getLocalizedString(actionRequest, "mconsole.errorMsg16"), e.getMessage());
}
}
@@ -723,9 +723,9 @@
} finally {
userTransaction.commit();
}
- addInfoMessage(actionRequest, getLocalizedString(actionRequest, "infoMsg14", graph.getGraphName1()));
+ addInfoMessage(actionRequest, getLocalizedString(actionRequest, "mconsole.infoMsg14", graph.getGraphName1()));
} catch (Exception e) {
- addErrorMessage(actionRequest, getLocalizedString(actionRequest, "errorMsg17"), e.getMessage());
+ addErrorMessage(actionRequest, getLocalizedString(actionRequest, "mconsole.errorMsg17"), e.getMessage());
}
}
@@ -762,14 +762,14 @@
Node node = entityManager.find(Node.class, actionRequest.getParameter("server_id"));
graph.setNode(node);
updateGraphFromRequest(actionRequest, graph);
- addInfoMessage(actionRequest, getLocalizedString(actionRequest, "infoMsg15", graph.getGraphName1()));
+ addInfoMessage(actionRequest, getLocalizedString(actionRequest, "mconsole.infoMsg15", graph.getGraphName1()));
} finally {
userTransaction.commit();
}
} catch (Exception e) {
log.info("error updating graph", e);
- addErrorMessage(actionRequest, getLocalizedString(actionRequest, "errorMsg18"), e.getMessage());
+ addErrorMessage(actionRequest, getLocalizedString(actionRequest, "mconsole.errorMsg18"), e.getMessage());
}
}
@@ -782,14 +782,14 @@
try {
Graph graph = entityManager.find(Graph.class, Integer.parseInt(graph_id));
entityManager.remove(graph);
- addInfoMessage(actionRequest, getLocalizedString(actionRequest, "infoMsg16", graph.getGraphName1()));
+ addInfoMessage(actionRequest, getLocalizedString(actionRequest, "mconsole.infoMsg16", graph.getGraphName1()));
} finally {
userTransaction.commit();
}
} catch (Exception e) {
log.info("error deleting graph", e);
- addErrorMessage(actionRequest, getLocalizedString(actionRequest, "errorMsg19"), e.getMessage());
+ addErrorMessage(actionRequest, getLocalizedString(actionRequest, "mconsole.errorMsg19"), e.getMessage());
}
}
@@ -798,14 +798,14 @@
try {
node = getNodeByName(server_id);
} catch (PortletException e) {
- addInfoMessage(request, getLocalizedString(request, "errorMsg04"), e.getMessage());
+ addInfoMessage(request, getLocalizedString(request, "mconsole.errorMsg04"), e.getMessage());
return;
}
MRCConnector mrc;
try {
mrc = new MRCConnector(node);
} catch (Exception e) {
- addErrorMessage(request, getLocalizedString(request, "errorMsg05", node.getHost()), e.getMessage());
+ addErrorMessage(request, getLocalizedString(request, "mconsole.errorMsg05", node.getHost()), e.getMessage());
return;
}
@@ -813,13 +813,13 @@
try {
if (mrc.startTrackingMbean(mbean)) {
String mbarr[] = mbean.split("name=");
- addInfoMessage(request, getLocalizedString(request, "infoMsg04", mbarr[1], node.getHost()));
+ addInfoMessage(request, getLocalizedString(request, "mconsole.infoMsg04", mbarr[1], node.getHost()));
} else {
String mbarr[] = mbean.split("name=");
- addErrorMessage(request, getLocalizedString(request, "errorMsg06", mbarr[1], node.getHost()));
+ addErrorMessage(request, getLocalizedString(request, "mconsole.errorMsg06", mbarr[1], node.getHost()));
}
} catch (Exception e) {
- addErrorMessage(request, getLocalizedString(request, "errorMsg06", mbean, node.getHost()), e.getMessage());
+ addErrorMessage(request, getLocalizedString(request, "mconsole.errorMsg06", mbean, node.getHost()), e.getMessage());
}
}
@@ -828,14 +828,14 @@
try {
node = getNodeByName(server_id);
} catch (PortletException e) {
- addInfoMessage(request, getLocalizedString(request, "errorMsg04"), e.getMessage());
+ addInfoMessage(request, getLocalizedString(request, "mconsole.errorMsg04"), e.getMessage());
return;
}
MRCConnector mrc;
try {
mrc = new MRCConnector(node);
} catch (Exception e) {
- addErrorMessage(request, getLocalizedString(request, "errorMsg05", node.getHost()), e.getMessage());
+ addErrorMessage(request, getLocalizedString(request, "mconsole.errorMsg05", node.getHost()), e.getMessage());
return;
}
@@ -843,13 +843,13 @@
try {
if (mrc.stopTrackingMbean(mbean)) {
String mbarr[] = mbean.split("name=");
- addInfoMessage(request, getLocalizedString(request, "infoMsg05", mbarr[1], node.getHost()));
+ addInfoMessage(request, getLocalizedString(request, "mconsole.infoMsg05", mbarr[1], node.getHost()));
} else {
String mbarr[] = mbean.split("name=");
- addErrorMessage(request, getLocalizedString(request, "errorMsg06", mbarr[1], node.getHost()));
+ addErrorMessage(request, getLocalizedString(request, "mconsole.errorMsg06", mbarr[1], node.getHost()));
}
} catch (Exception e) {
- addErrorMessage(request, getLocalizedString(request, "errorMsg06", mbean, node.getHost()), e.getMessage());
+ addErrorMessage(request, getLocalizedString(request, "mconsole.errorMsg06", mbean, node.getHost()), e.getMessage());
}
}
@@ -859,18 +859,18 @@
node = getNodeByName(server_id);
} catch (PortletException e) {
log.info("error", e);
- addErrorMessage(request, getLocalizedString(request, "errorMsg08", server_id), e.getMessage());
+ addErrorMessage(request, getLocalizedString(request, "mconsole.errorMsg08", server_id), e.getMessage());
return;
}
try {
MRCConnector mrc = new MRCConnector(node);
if (mrc.stopSnapshotThread()) {
- addInfoMessage(request, getLocalizedString(request, "infoMsg06", server_id));
+ addInfoMessage(request, getLocalizedString(request, "mconsole.infoMsg06", server_id));
} else {
- addErrorMessage(request, getLocalizedString(request, "errorMsg09", server_id));
+ addErrorMessage(request, getLocalizedString(request, "mconsole.errorMsg09", server_id));
}
} catch (Exception e) {
- addErrorMessage(request, getLocalizedString(request, "errorMsg09", server_id), e.getMessage());
+ addErrorMessage(request, getLocalizedString(request, "mconsole.errorMsg09", server_id), e.getMessage());
}
}
@@ -880,18 +880,18 @@
node = getNodeByName(server_id);
} catch (PortletException e) {
log.info("error", e);
- addErrorMessage(request, getLocalizedString(request, "errorMsg08", server_id), e.getMessage());
+ addErrorMessage(request, getLocalizedString(request, "mconsole.errorMsg08", server_id), e.getMessage());
return;
}
try {
MRCConnector mrc = new MRCConnector(node);
if (mrc.startSnapshotThread(snapshotDuration)) {
- addInfoMessage(request, getLocalizedString(request, "infoMsg07", server_id));
+ addInfoMessage(request, getLocalizedString(request, "mconsole.infoMsg07", server_id));
} else {
- addErrorMessage(request, getLocalizedString(request, "errorMsg10", server_id));
+ addErrorMessage(request, getLocalizedString(request, "mconsole.errorMsg10", server_id));
}
} catch (Exception e) {
- addErrorMessage(request, getLocalizedString(request, "errorMsg10", server_id), e.getMessage());
+ addErrorMessage(request, getLocalizedString(request, "mconsole.errorMsg10", server_id), e.getMessage());
}
}
Modified: geronimo/server/trunk/plugins/monitoring/mconsole-war/src/main/resources/portletinfo.properties
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/monitoring/mconsole-war/src/main/resources/portletinfo.properties?rev=750949&r1=750948&r2=750949&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/monitoring/mconsole-war/src/main/resources/portletinfo.properties (original)
+++ geronimo/server/trunk/plugins/monitoring/mconsole-war/src/main/resources/portletinfo.properties Fri Mar 6 15:59:53 2009
@@ -17,72 +17,38 @@
Monitoring = Monitoring
-errorMsg01 = Failed to create a connection to server.
-
-errorMsg02 = Server with server_id = <b>{0}</b> could not be enabled.
-
-errorMsg03 = Server with server_id = <b>{0}</b> could not be disabled.
-
-errorMsg04 = DATABASE ERROR.
-
-errorMsg05 = Unable to connect to server <b>{0}</b>.
-
-errorMsg06 = MBean <b>{0}</b> could <b>NOT</b> be tracked on server <b>{1}</b>.
-
-errorMsg07 = MBean <b>{0}</b> could <b>NOT</b> be removed from tracking on server <b>{1}</b>.
-
-errorMsg08 = Server id <b>{0}</b> not found in database.
-
-errorMsg09 = Snapshot thread could <b>NOT</b> be stopped on server <b>{0}</b>.
-
-errorMsg10 = Snapshot thread could <b>NOT</b> be started on server <b>{0}</b>.
-
-errorMsg11 = Error encountered while updating view <b>{0}</b>.
-
-errorMsg12 = Error encountered while adding view <b>{0}</b>.
-
-errorMsg13 = Error encountered while updating server.
-
-errorMsg14 = Error encountered while adding server.
-
-errorMsg15 = Error encountered while deleting server.
-
-errorMsg16 = Error encountered while deleting view.
-
-errorMsg17 = Error encountered while adding graph.
-
-errorMsg18 = Error encountered while updating graph.
-
-errorMsg19 = Error encountered while deleting graph.
-
-infoMsg01 = Connection was successfully established.
-
-infoMsg02 = Server <b>{0}</b> was successfully enabled.
-
-infoMsg03 = Server <b>{0}</b> was successfully disabled.
-
-infoMsg04 = MBean <b>{0}</b> tracking on server <b>{1}</b>.
-
-infoMsg05 = MBean <b>{0}</b> removed from tracking on server <b>{1}</b>.
-
-infoMsg06 = Snapshot thread stopped on server <b>{0}</b>.
-
-infoMsg07 = Snapshot thread started on server <b>{0}</b>.
-
-infoMsg08 = View <b>{0}</b> has been updated.
-
-infoMsg09 = View <b>{0}</b> has been added.
-
-infoMsg10 = Server has been updated.
-
-infoMsg11 = Server <b>{0}</b> at <b>{1}</b> has been added.
-
-infoMsg12 = Server and associated graphs have been deleted.
-
-infoMsg13 = View has been deleted.
-
-infoMsg14 = Graph <b>{0}</b> has been added.
-
-infoMsg15 = Graph <b>{0}</b> has been updated.
-
-infoMsg16 = Graph <b>{0}</b> has been deleted.
+mconsole.errorMsg01 = Failed to create a connection to server.
+mconsole.errorMsg02 = Server with server_id = <b>{0}</b> could not be enabled.
+mconsole.errorMsg03 = Server with server_id = <b>{0}</b> could not be disabled.
+mconsole.errorMsg04 = DATABASE ERROR.
+mconsole.errorMsg05 = Unable to connect to server <b>{0}</b>.
+mconsole.errorMsg06 = MBean <b>{0}</b> could <b>NOT</b> be tracked on server <b>{1}</b>.
+mconsole.errorMsg07 = MBean <b>{0}</b> could <b>NOT</b> be removed from tracking on server <b>{1}</b>.
+mconsole.errorMsg08 = Server id <b>{0}</b> not found in database.
+mconsole.errorMsg09 = Snapshot thread could <b>NOT</b> be stopped on server <b>{0}</b>.
+mconsole.errorMsg10 = Snapshot thread could <b>NOT</b> be started on server <b>{0}</b>.
+mconsole.errorMsg11 = Error encountered while updating view <b>{0}</b>.
+mconsole.errorMsg12 = Error encountered while adding view <b>{0}</b>.
+mconsole.errorMsg13 = Error encountered while updating server.
+mconsole.errorMsg14 = Error encountered while adding server.
+mconsole.errorMsg15 = Error encountered while deleting server.
+mconsole.errorMsg16 = Error encountered while deleting view.
+mconsole.errorMsg17 = Error encountered while adding graph.
+mconsole.errorMsg18 = Error encountered while updating graph.
+mconsole.errorMsg19 = Error encountered while deleting graph.
+mconsole.infoMsg01 = Connection was successfully established.
+mconsole.infoMsg02 = Server <b>{0}</b> was successfully enabled.
+mconsole.infoMsg03 = Server <b>{0}</b> was successfully disabled.
+mconsole.infoMsg04 = MBean <b>{0}</b> tracking on server <b>{1}</b>.
+mconsole.infoMsg05 = MBean <b>{0}</b> removed from tracking on server <b>{1}</b>.
+mconsole.infoMsg06 = Snapshot thread stopped on server <b>{0}</b>.
+mconsole.infoMsg07 = Snapshot thread started on server <b>{0}</b>.
+mconsole.infoMsg08 = View <b>{0}</b> has been updated.
+mconsole.infoMsg09 = View <b>{0}</b> has been added.
+mconsole.infoMsg10 = Server has been updated.
+mconsole.infoMsg11 = Server <b>{0}</b> at <b>{1}</b> has been added.
+mconsole.infoMsg12 = Server and associated graphs have been deleted.
+mconsole.infoMsg13 = View has been deleted.
+mconsole.infoMsg14 = Graph <b>{0}</b> has been added.
+mconsole.infoMsg15 = Graph <b>{0}</b> has been updated.
+mconsole.infoMsg16 = Graph <b>{0}</b> has been deleted.
Modified: geronimo/server/trunk/plugins/monitoring/mconsole-war/src/main/resources/portletinfo_zh.properties
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/monitoring/mconsole-war/src/main/resources/portletinfo_zh.properties?rev=750949&r1=750948&r2=750949&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/monitoring/mconsole-war/src/main/resources/portletinfo_zh.properties (original)
+++ geronimo/server/trunk/plugins/monitoring/mconsole-war/src/main/resources/portletinfo_zh.properties Fri Mar 6 15:59:53 2009
@@ -17,72 +17,38 @@
Monitoring = \u76D1\u63A7\u5668
-errorMsg01 = \u5230\u670D\u52A1\u5668\u7684\u8FDE\u63A5\u521B\u5EFA\u5931\u8D25\u3002
-
-errorMsg02 = server_id\u4E3A<b>{0}</b>\u7684\u670D\u52A1\u5668\u65E0\u6CD5\u542F\u7528\u3002
-
-errorMsg03 = server_id\u4E3A<b>{0}</b>\u7684\u670D\u52A1\u5668\u65E0\u6CD5\u7981\u7528\u3002
-
-errorMsg04 = \u6570\u636E\u5E93\u53D1\u751F\u9519\u8BEF\u3002
-
-errorMsg05 = \u65E0\u6CD5\u8FDE\u63A5\u5230\u670D\u52A1\u5668<b>{0}</b>\u3002
-
-errorMsg06 = \u65E0\u6CD5\u8DDF\u8E2A\u670D\u52A1\u5668<b>{1}</b>\u4E0A\u7684MBean<b>{0}</b>\u3002
-
-errorMsg07 = \u65E0\u6CD5\u505C\u6B62\u8DDF\u8E2A\u670D\u52A1\u5668<b>{1}</b>\u4E0A\u7684MBean<b>{0}</b>\u3002
-
-errorMsg08 = \u6570\u636E\u5E93\u4E2D\u4E0D\u5B58\u5728id\u4E3A<b>{0}</b>\u7684\u670D\u52A1\u5668\u3002
-
-errorMsg09 = \u65E0\u6CD5\u505C\u6B62\u670D\u52A1\u5668<b>{0}</b>\u4E0A\u7684\u5FEB\u7167\u7EBF\u7A0B\u3002
-
-errorMsg10 = \u65E0\u6CD5\u5F00\u542F\u670D\u52A1\u5668<b>{0}</b>\u4E0A\u7684\u5FEB\u7167\u7EBF\u7A0B\u3002
-
-errorMsg11 = \u66F4\u65B0\u89C6\u56FE<b>{0}</b>\u65F6\u9047\u5230\u9519\u8BEF\u3002
-
-errorMsg12 = \u6DFB\u52A0\u89C6\u56FE<b>{0}</b>\u65F6\u9047\u5230\u9519\u8BEF\u3002
-
-errorMsg13 = \u66F4\u65B0\u670D\u52A1\u5668\u65F6\u9047\u5230\u9519\u8BEF\u3002
-
-errorMsg14 = \u6DFB\u52A0\u670D\u52A1\u5668\u65F6\u9047\u5230\u9519\u8BEF\u3002
-
-errorMsg15 = \u5220\u9664\u670D\u52A1\u5668\u65F6\u9047\u5230\u9519\u8BEF\u3002
-
-errorMsg16 = \u5220\u9664\u89C6\u56FE\u65F6\u9047\u5230\u9519\u8BEF\u3002
-
-errorMsg17 = \u6DFB\u52A0\u56FE\u5F62\u65F6\u9047\u5230\u9519\u8BEF\u3002
-
-errorMsg18 = \u66F4\u65B0\u56FE\u5F62\u65F6\u9047\u5230\u9519\u8BEF\u3002
-
-errorMsg19 = \u5220\u9664\u56FE\u5F62\u65F6\u9047\u5230\u9519\u8BEF\u3002
-
-infoMsg01 = \u6210\u529F\u5EFA\u7ACB\u8FDE\u63A5\u3002
-
-infoMsg02 = \u6210\u529F\u542F\u7528\u670D\u52A1\u5668<b>{0}</b>\u3002
-
-infoMsg03 = \u6210\u529F\u7981\u7528\u670D\u52A1\u5668<b>{0}</b>\u3002
-
-infoMsg04 = \u5F00\u59CB\u8DDF\u8E2A\u670D\u52A1\u5668<b>{1}</b>\u4E0A\u7684MBean<b>{0}</b>\u3002
-
-infoMsg05 = \u505C\u6B62\u8DDF\u8E2A\u670D\u52A1\u5668<b>{1}</b>\u4E0A\u7684MBean<b>{0}</b>\u3002
-
-infoMsg06 = \u5DF2\u505C\u6B62\u670D\u52A1\u5668<b>{0}</b>\u4E0A\u7684\u5FEB\u7167\u7EBF\u7A0B\u3002
-
-infoMsg07 = \u5DF2\u5F00\u542F\u670D\u52A1\u5668<b>{0}</b>\u4E0A\u7684\u5FEB\u7167\u7EBF\u7A0B\u3002
-
-infoMsg08 = \u5DF2\u66F4\u65B0\u89C6\u56FE<b>{0}</b>\u3002
-
-infoMsg09 = \u5DF2\u6DFB\u52A0\u89C6\u56FE<b>{0}</b>\u3002
-
-infoMsg10 = \u5DF2\u66F4\u65B0\u670D\u52A1\u5668\u3002
-
-infoMsg11 = \u5DF2\u6DFB\u52A0<b>{1}</b>\u4E0A\u7684\u670D\u52A1\u5668<b>{0}</b>\u3002
-
-infoMsg12 = \u5DF2\u5220\u9664\u670D\u52A1\u5668\u548C\u76F8\u5173\u8054\u7684\u56FE\u5F62\u3002
-
-infoMsg13 = \u5DF2\u5220\u9664\u89C6\u56FE\u3002
-
-infoMsg14 = \u5DF2\u6DFB\u52A0\u56FE\u5F62<b>{0}</b>\u3002
-
-infoMsg15 = \u5DF2\u66F4\u65B0\u56FE\u5F62<b>{0}</b>\u3002
-
-infoMsg16 = \u5DF2\u5220\u9664\u56FE\u5F62<b>{0}</b>\u3002
+mconsole.errorMsg01 = \u5230\u670D\u52A1\u5668\u7684\u8FDE\u63A5\u521B\u5EFA\u5931\u8D25\u3002
+mconsole.errorMsg02 = server_id\u4E3A<b>{0}</b>\u7684\u670D\u52A1\u5668\u65E0\u6CD5\u542F\u7528\u3002
+mconsole.errorMsg03 = server_id\u4E3A<b>{0}</b>\u7684\u670D\u52A1\u5668\u65E0\u6CD5\u7981\u7528\u3002
+mconsole.errorMsg04 = \u6570\u636E\u5E93\u53D1\u751F\u9519\u8BEF\u3002
+mconsole.errorMsg05 = \u65E0\u6CD5\u8FDE\u63A5\u5230\u670D\u52A1\u5668<b>{0}</b>\u3002
+mconsole.errorMsg06 = \u65E0\u6CD5\u8DDF\u8E2A\u670D\u52A1\u5668<b>{1}</b>\u4E0A\u7684MBean<b>{0}</b>\u3002
+mconsole.errorMsg07 = \u65E0\u6CD5\u505C\u6B62\u8DDF\u8E2A\u670D\u52A1\u5668<b>{1}</b>\u4E0A\u7684MBean<b>{0}</b>\u3002
+mconsole.errorMsg08 = \u6570\u636E\u5E93\u4E2D\u4E0D\u5B58\u5728id\u4E3A<b>{0}</b>\u7684\u670D\u52A1\u5668\u3002
+mconsole.errorMsg09 = \u65E0\u6CD5\u505C\u6B62\u670D\u52A1\u5668<b>{0}</b>\u4E0A\u7684\u5FEB\u7167\u7EBF\u7A0B\u3002
+mconsole.errorMsg10 = \u65E0\u6CD5\u5F00\u542F\u670D\u52A1\u5668<b>{0}</b>\u4E0A\u7684\u5FEB\u7167\u7EBF\u7A0B\u3002
+mconsole.errorMsg11 = \u66F4\u65B0\u89C6\u56FE<b>{0}</b>\u65F6\u9047\u5230\u9519\u8BEF\u3002
+mconsole.errorMsg12 = \u6DFB\u52A0\u89C6\u56FE<b>{0}</b>\u65F6\u9047\u5230\u9519\u8BEF\u3002
+mconsole.errorMsg13 = \u66F4\u65B0\u670D\u52A1\u5668\u65F6\u9047\u5230\u9519\u8BEF\u3002
+mconsole.errorMsg14 = \u6DFB\u52A0\u670D\u52A1\u5668\u65F6\u9047\u5230\u9519\u8BEF\u3002
+mconsole.errorMsg15 = \u5220\u9664\u670D\u52A1\u5668\u65F6\u9047\u5230\u9519\u8BEF\u3002
+mconsole.errorMsg16 = \u5220\u9664\u89C6\u56FE\u65F6\u9047\u5230\u9519\u8BEF\u3002
+mconsole.errorMsg17 = \u6DFB\u52A0\u56FE\u5F62\u65F6\u9047\u5230\u9519\u8BEF\u3002
+mconsole.errorMsg18 = \u66F4\u65B0\u56FE\u5F62\u65F6\u9047\u5230\u9519\u8BEF\u3002
+mconsole.errorMsg19 = \u5220\u9664\u56FE\u5F62\u65F6\u9047\u5230\u9519\u8BEF\u3002
+mconsole.infoMsg01 = \u6210\u529F\u5EFA\u7ACB\u8FDE\u63A5\u3002
+mconsole.infoMsg02 = \u6210\u529F\u542F\u7528\u670D\u52A1\u5668<b>{0}</b>\u3002
+mconsole.infoMsg03 = \u6210\u529F\u7981\u7528\u670D\u52A1\u5668<b>{0}</b>\u3002
+mconsole.infoMsg04 = \u5F00\u59CB\u8DDF\u8E2A\u670D\u52A1\u5668<b>{1}</b>\u4E0A\u7684MBean<b>{0}</b>\u3002
+mconsole.infoMsg05 = \u505C\u6B62\u8DDF\u8E2A\u670D\u52A1\u5668<b>{1}</b>\u4E0A\u7684MBean<b>{0}</b>\u3002
+mconsole.infoMsg06 = \u5DF2\u505C\u6B62\u670D\u52A1\u5668<b>{0}</b>\u4E0A\u7684\u5FEB\u7167\u7EBF\u7A0B\u3002
+mconsole.infoMsg07 = \u5DF2\u5F00\u542F\u670D\u52A1\u5668<b>{0}</b>\u4E0A\u7684\u5FEB\u7167\u7EBF\u7A0B\u3002
+mconsole.infoMsg08 = \u5DF2\u66F4\u65B0\u89C6\u56FE<b>{0}</b>\u3002
+mconsole.infoMsg09 = \u5DF2\u6DFB\u52A0\u89C6\u56FE<b>{0}</b>\u3002
+mconsole.infoMsg10 = \u5DF2\u66F4\u65B0\u670D\u52A1\u5668\u3002
+mconsole.infoMsg11 = \u5DF2\u6DFB\u52A0<b>{1}</b>\u4E0A\u7684\u670D\u52A1\u5668<b>{0}</b>\u3002
+mconsole.infoMsg12 = \u5DF2\u5220\u9664\u670D\u52A1\u5668\u548C\u76F8\u5173\u8054\u7684\u56FE\u5F62\u3002
+mconsole.infoMsg13 = \u5DF2\u5220\u9664\u89C6\u56FE\u3002
+mconsole.infoMsg14 = \u5DF2\u6DFB\u52A0\u56FE\u5F62<b>{0}</b>\u3002
+mconsole.infoMsg15 = \u5DF2\u66F4\u65B0\u56FE\u5F62<b>{0}</b>\u3002
+mconsole.infoMsg16 = \u5DF2\u5220\u9664\u56FE\u5F62<b>{0}</b>\u3002
Modified: geronimo/server/trunk/plugins/system-database/sysdb-portlets/src/main/java/org/apache/geronimo/console/internaldb/RunSQLHelper.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/system-database/sysdb-portlets/src/main/java/org/apache/geronimo/console/internaldb/RunSQLHelper.java?rev=750949&r1=750948&r2=750949&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/system-database/sysdb-portlets/src/main/java/org/apache/geronimo/console/internaldb/RunSQLHelper.java (original)
+++ geronimo/server/trunk/plugins/system-database/sysdb-portlets/src/main/java/org/apache/geronimo/console/internaldb/RunSQLHelper.java Fri Mar 6 15:59:53 2009
@@ -52,10 +52,10 @@
try {
conn = DerbyConnectionUtil.getDerbyConnection(dbName,
DerbyConnectionUtil.CREATE_DB_PROP);
- portlet.addInfoMessage(request, portlet.getLocalizedString(request, "infoMsg01", dbName));
+ portlet.addInfoMessage(request, portlet.getLocalizedString(request, "sysdb.infoMsg01", dbName));
return true;
} catch (Throwable e) {
- portlet.addErrorMessage(request, portlet.getLocalizedString(request, "errorMsg01"), e.getMessage());
+ portlet.addErrorMessage(request, portlet.getLocalizedString(request, "sysdb.errorMsg01"), e.getMessage());
return false;
} finally {
// close DB connection
@@ -64,7 +64,7 @@
conn.close();
}
} catch (SQLException e) {
- portlet.addErrorMessage(request, portlet.getLocalizedString(request, "errorMsg02"), e.getMessage());
+ portlet.addErrorMessage(request, portlet.getLocalizedString(request, "sysdb.errorMsg02"), e.getMessage());
}
}
}
@@ -80,7 +80,7 @@
public boolean deleteDB(String derbyHome, String dbName, PortletRequest request) {
// shutdown database before deleting it
if (!shutdownDB(dbName)) {
- portlet.addErrorMessage(request, portlet.getLocalizedString(request, "errorMsg03"));
+ portlet.addErrorMessage(request, portlet.getLocalizedString(request, "sysdb.errorMsg03"));
return false;
}
@@ -90,7 +90,7 @@
+ PARENT_FOLDER + File.separatorChar + DERBY_BACKUP_FOLDER);
if (!derbyBackupFolder.exists()) {
if (!derbyBackupFolder.mkdirs()) {
- portlet.addErrorMessage(request, portlet.getLocalizedString(request, "errorMsg04"));
+ portlet.addErrorMessage(request, portlet.getLocalizedString(request, "sysdb.errorMsg04"));
return false;
}
}
@@ -110,23 +110,23 @@
if (newDBFolder.mkdirs()) {
if (!oldDBFolder.renameTo(new File(newDBFolder,
oldDBFolder.getName()))) {
- portlet.addErrorMessage(request, portlet.getLocalizedString(request, "errorMsg05"));
+ portlet.addErrorMessage(request, portlet.getLocalizedString(request, "sysdb.errorMsg05"));
return false;
}
}
}
}
- portlet.addInfoMessage(request, portlet.getLocalizedString(request, "infoMsg02", dbName));
+ portlet.addInfoMessage(request, portlet.getLocalizedString(request, "sysdb.infoMsg02", dbName));
return true;
} catch (Exception e) {
- portlet.addErrorMessage(request, portlet.getLocalizedString(request, "errorMsg06"), e.getMessage());
+ portlet.addErrorMessage(request, portlet.getLocalizedString(request, "sysdb.errorMsg06"), e.getMessage());
return false;
}
}
public boolean runSQL(String connName, String sql, Boolean dsConn, PortletRequest request) {
if ((sql == null) || (sql.trim().length() == 0)) {
- portlet.addErrorMessage(request, portlet.getLocalizedString(request, "errorMsg07"));
+ portlet.addErrorMessage(request, portlet.getLocalizedString(request, "sysdb.errorMsg07"));
return false;
}
@@ -150,17 +150,17 @@
}
}
conn.commit();
- portlet.addInfoMessage(request, portlet.getLocalizedString(request, "infoMsg03"));
+ portlet.addInfoMessage(request, portlet.getLocalizedString(request, "sysdb.infoMsg03"));
return true;
} catch (SQLException e) {
try {
conn.rollback();
} catch (Exception unHandledException) {
}
- portlet.addErrorMessage(request, portlet.getLocalizedString(request, "errorMsg08"), e.getMessage());
+ portlet.addErrorMessage(request, portlet.getLocalizedString(request, "sysdb.errorMsg08"), e.getMessage());
return false;
} catch (Throwable e) {
- portlet.addErrorMessage(request, portlet.getLocalizedString(request, "errorMsg08"), e.getMessage());
+ portlet.addErrorMessage(request, portlet.getLocalizedString(request, "sysdb.errorMsg08"), e.getMessage());
return false;
} finally {
// close DB connection
@@ -173,7 +173,7 @@
conn.close();
}
} catch (SQLException e) {
- portlet.addErrorMessage(request, portlet.getLocalizedString(request, "errorMsg02"), e.getMessage());
+ portlet.addErrorMessage(request, portlet.getLocalizedString(request, "sysdb.errorMsg02"), e.getMessage());
}
}
}
Modified: geronimo/server/trunk/plugins/system-database/sysdb-portlets/src/main/resources/portletinfo.properties
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/system-database/sysdb-portlets/src/main/resources/portletinfo.properties?rev=750949&r1=750948&r2=750949&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/system-database/sysdb-portlets/src/main/resources/portletinfo.properties (original)
+++ geronimo/server/trunk/plugins/system-database/sysdb-portlets/src/main/resources/portletinfo.properties Fri Mar 6 15:59:53 2009
@@ -29,24 +29,14 @@
Run\ SQL = Run SQL
-errorMsg01 = Error encountered while creating database.
-
-errorMsg02 = Error encountered while closing database connection.
-
-errorMsg03 = Error encountered while shutting down database.
-
-errorMsg04 = Error encountered while backing up database.
-
-errorMsg05 = Error encountered while renaming database folder.
-
-errorMsg06 = Error encountered while deleting database.
-
-errorMsg07 = SQL command can't be empty.
-
-errorMsg08 = Error encountered while executing SQL command(s).
-
-infoMsg01 = Database created: <b>{0}</b>.
-
-infoMsg02 = Database deleted: <b>{0}</b>.
-
-infoMsg03 = SQL command(s) executed successfully.
+sysdb.errorMsg01 = Error encountered while creating database.
+sysdb.errorMsg02 = Error encountered while closing database connection.
+sysdb.errorMsg03 = Error encountered while shutting down database.
+sysdb.errorMsg04 = Error encountered while backing up database.
+sysdb.errorMsg05 = Error encountered while renaming database folder.
+sysdb.errorMsg06 = Error encountered while deleting database.
+sysdb.errorMsg07 = SQL command can't be empty.
+sysdb.errorMsg08 = Error encountered while executing SQL command(s).
+sysdb.infoMsg01 = Database created: <b>{0}</b>.
+sysdb.infoMsg02 = Database deleted: <b>{0}</b>.
+sysdb.infoMsg03 = SQL command(s) executed successfully.
Modified: geronimo/server/trunk/plugins/system-database/sysdb-portlets/src/main/resources/portletinfo_zh.properties
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/system-database/sysdb-portlets/src/main/resources/portletinfo_zh.properties?rev=750949&r1=750948&r2=750949&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/system-database/sysdb-portlets/src/main/resources/portletinfo_zh.properties (original)
+++ geronimo/server/trunk/plugins/system-database/sysdb-portlets/src/main/resources/portletinfo_zh.properties Fri Mar 6 15:59:53 2009
@@ -29,24 +29,14 @@
Run\ SQL = \u8FD0\u884CSQL
-errorMsg01 = \u521B\u5EFA\u6570\u636E\u5E93\u65F6\u9047\u5230\u9519\u8BEF\u3002
-
-errorMsg02 = \u5173\u95ED\u6570\u636E\u5E93\u8FDE\u63A5\u65F6\u9047\u5230\u9519\u8BEF\u3002
-
-errorMsg03 = \u5173\u95ED\u6570\u636E\u5E93\u65F6\u9047\u5230\u9519\u8BEF\u3002
-
-errorMsg04 = \u5907\u4EFD\u6570\u636E\u5E93\u65F6\u9047\u5230\u9519\u8BEF\u3002
-
-errorMsg05 = \u91CD\u547D\u540D\u6570\u636E\u5E93\u6587\u4EF6\u5939\u65F6\u9047\u5230\u9519\u8BEF\u3002
-
-errorMsg06 = \u5220\u9664\u6570\u636E\u5E93\u65F6\u9047\u5230\u9519\u8BEF\u3002
-
-errorMsg07 = \u7A7ASQL\u547D\u4EE4\u3002
-
-errorMsg08 = \u6267\u884CSQL\u547D\u4EE4\u65F6\u9047\u5230\u9519\u8BEF\u3002
-
-infoMsg01 = \u5DF2\u521B\u5EFA\u6570\u636E\u5E93\uFF1A<b>{0}</b>\u3002
-
-infoMsg02 = \u5DF2\u5220\u9664\u6570\u636E\u5E93\uFF1A<b>{0}</b>\u3002
-
-infoMsg03 = SQL\u547D\u4EE4\u6267\u884C\u6210\u529F\u3002
+sysdb.errorMsg01 = \u521B\u5EFA\u6570\u636E\u5E93\u65F6\u9047\u5230\u9519\u8BEF\u3002
+sysdb.errorMsg02 = \u5173\u95ED\u6570\u636E\u5E93\u8FDE\u63A5\u65F6\u9047\u5230\u9519\u8BEF\u3002
+sysdb.errorMsg03 = \u5173\u95ED\u6570\u636E\u5E93\u65F6\u9047\u5230\u9519\u8BEF\u3002
+sysdb.errorMsg04 = \u5907\u4EFD\u6570\u636E\u5E93\u65F6\u9047\u5230\u9519\u8BEF\u3002
+sysdb.errorMsg05 = \u91CD\u547D\u540D\u6570\u636E\u5E93\u6587\u4EF6\u5939\u65F6\u9047\u5230\u9519\u8BEF\u3002
+sysdb.errorMsg06 = \u5220\u9664\u6570\u636E\u5E93\u65F6\u9047\u5230\u9519\u8BEF\u3002
+sysdb.errorMsg07 = \u7A7ASQL\u547D\u4EE4\u3002
+sysdb.errorMsg08 = \u6267\u884CSQL\u547D\u4EE4\u65F6\u9047\u5230\u9519\u8BEF\u3002
+sysdb.infoMsg01 = \u5DF2\u521B\u5EFA\u6570\u636E\u5E93\uFF1A<b>{0}</b>\u3002
+sysdb.infoMsg02 = \u5DF2\u5220\u9664\u6570\u636E\u5E93\uFF1A<b>{0}</b>\u3002
+sysdb.infoMsg03 = SQL\u547D\u4EE4\u6267\u884C\u6210\u529F\u3002