costin 2003/03/16 23:50:13
Modified: webapps/admin/WEB-INF/classes/org/apache/webapp/admin
ApplicationLocales.java ApplicationServlet.java
Lists.java
webapps/admin/WEB-INF/classes/org/apache/webapp/admin/service
EditServiceAction.java
webapps/admin/WEB-INF/classes/org/apache/webapp/admin/valve
ValveUtil.java
Log:
A number of quick replaces and fixes.
It'll be much better after I finish moving all components to the new
domain - now some names are broken.
Revision Changes Path
1.2 +16 -11
jakarta-tomcat-catalina/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/ApplicationLocales.java
Index: ApplicationLocales.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-catalina/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/ApplicationLocales.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ApplicationLocales.java 18 Jul 2002 16:48:20 -0000 1.1
+++ ApplicationLocales.java 17 Mar 2003 07:50:12 -0000 1.2
@@ -102,14 +102,19 @@
return;
for (int i = 0; i < list.length; i++) {
- ResourceBundle bundle =
- ResourceBundle.getBundle(config, list[i]);
- if (bundle == null)
+ try {
+ ResourceBundle bundle =
+ ResourceBundle.getBundle(config, list[i]);
+ if (bundle == null)
+ continue;
+ if (list[i].equals(bundle.getLocale())) {
+ localeLabels.add(list[i].getDisplayName());
+ localeValues.add(list[i].toString());
+ supportedLocales.add(list[i]);
+ }
+ } catch( Exception ex ) {
+ servlet.log("Missing locale " + list[i] );
continue;
- if (list[i].equals(bundle.getLocale())) {
- localeLabels.add(list[i].getDisplayName());
- localeValues.add(list[i].toString());
- supportedLocales.add(list[i]);
}
}
1.3 +10 -8
jakarta-tomcat-catalina/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/ApplicationServlet.java
Index: ApplicationServlet.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-catalina/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/ApplicationServlet.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ApplicationServlet.java 20 Nov 2002 00:12:58 -0000 1.2
+++ ApplicationServlet.java 17 Mar 2003 07:50:12 -0000 1.3
@@ -188,8 +188,9 @@
*/
protected void initRegistry() throws ServletException {
- registry = (Registry) getServletContext().getAttribute
- ("org.apache.catalina.Registry");
+ registry = Registry.getRegistry();
+ //(Registry) getServletContext().getAttribute
+ // ("org.apache.catalina.Registry");
if (registry == null)
throw new UnavailableException("Registry is not available");
@@ -206,8 +207,9 @@
*/
protected void initServer() throws ServletException {
- server = (MBeanServer) getServletContext().getAttribute
- ("org.apache.catalina.MBeanServer");
+ server = Registry.getRegistry().getMBeanServer();
+ //(MBeanServer) getServletContext().getAttribute
+ // ("org.apache.catalina.MBeanServer");
if (server == null)
throw new UnavailableException("MBeanServer is not available");
1.4 +6 -28
jakarta-tomcat-catalina/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/Lists.java
Index: Lists.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-catalina/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/Lists.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- Lists.java 3 Feb 2003 23:16:52 -0000 1.3
+++ Lists.java 17 Mar 2003 07:50:12 -0000 1.4
@@ -184,9 +184,7 @@
throws Exception {
StringBuffer sb = new StringBuffer(service.getDomain());
- sb.append(":type=Connector,service=");
- sb.append(service.getKeyProperty("name"));
- sb.append(",*");
+ sb.append(":type=Connector,*");
ObjectName search = new ObjectName(sb.toString());
ArrayList connectors = new ArrayList();
Iterator names = mbserver.queryNames(search, null).iterator();
@@ -231,8 +229,6 @@
StringBuffer sb = new StringBuffer(host.getDomain());
sb.append(":type=Context,host=");
sb.append(host.getKeyProperty("host"));
- sb.append(",service=");
- sb.append(host.getKeyProperty("service"));
sb.append(",*");
ObjectName search = new ObjectName(sb.toString());
ArrayList contexts = new ArrayList();
@@ -296,10 +292,6 @@
if ("Service".equals(type)) {
service = container.getKeyProperty("name");
}
- if (service != null) {
- sb.append(",service=");
- sb.append(service);
- }
ObjectName search = new ObjectName(sb.toString());
ArrayList defaultContexts = new ArrayList();
Iterator names = mbserver.queryNames(search, null).iterator();
@@ -342,9 +334,7 @@
throws Exception {
StringBuffer sb = new StringBuffer(service.getDomain());
- sb.append(":type=Host,service=");
- sb.append(service.getKeyProperty("name"));
- sb.append(",*");
+ sb.append(":type=Host,*");
ObjectName search = new ObjectName(sb.toString());
ArrayList hosts = new ArrayList();
Iterator names = mbserver.queryNames(search, null).iterator();
@@ -407,10 +397,6 @@
if ("Service".equals(type)) {
service = container.getKeyProperty("name");
}
- if (service != null) {
- sb.append(",service=");
- sb.append(service);
- }
ObjectName search = new ObjectName(sb.toString());
ArrayList loggers = new ArrayList();
Iterator names = mbserver.queryNames(search, null).iterator();
@@ -474,10 +460,6 @@
if ("Service".equals(type)) {
service = container.getKeyProperty("name");
}
- if (service != null) {
- sb.append(",service=");
- sb.append(service);
- }
ObjectName search = new ObjectName(sb.toString());
ArrayList realms = new ArrayList();
Iterator names = mbserver.queryNames(search, null).iterator();
@@ -531,10 +513,6 @@
if ("Service".equals(type)) {
service = container.getKeyProperty("name");
- }
- if (service != null) {
- sb.append(",service=");
- sb.append(service);
}
ObjectName search = new ObjectName(sb.toString());
1.2 +5 -6
jakarta-tomcat-catalina/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/service/EditServiceAction.java
Index: EditServiceAction.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-catalina/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/service/EditServiceAction.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- EditServiceAction.java 18 Jul 2002 16:48:24 -0000 1.1
+++ EditServiceAction.java 17 Mar 2003 07:50:13 -0000 1.2
@@ -163,8 +163,7 @@
}
try {
sb = new StringBuffer(sname.getDomain());
- sb.append(":type=Engine,service=");
- sb.append(sname.getKeyProperty("name"));
+ sb.append(":type=Engine");
ename = new ObjectName(sb.toString());
} catch (Exception e) {
String message =
1.4 +5 -6
jakarta-tomcat-catalina/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/valve/ValveUtil.java
Index: ValveUtil.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-catalina/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/valve/ValveUtil.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- ValveUtil.java 11 Feb 2003 03:34:43 -0000 1.3
+++ ValveUtil.java 17 Mar 2003 07:50:13 -0000 1.4
@@ -150,8 +150,7 @@
// Parent in this case needs to be the container mBean for the service
try {
if ("Service".equalsIgnoreCase(pname.getKeyProperty("type"))) {
- sb.append(":type=Engine,service=");
- sb.append(pname.getKeyProperty("name"));
+ sb.append(":type=Engine");
parent = sb.toString();
}
} catch (Exception e) {
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
