amyroh 2002/06/13 16:17:57
Modified: webapps/admin/WEB-INF/classes/org/apache/webapp/admin/resources
EnvEntryForm.java ResourceUtils.java
ResourcesTreeBuilder.java SetUpEnvEntryAction.java
webapps/admin/resources envEntries.jspf listEnvEntries.jsp
listEnvEntries.jspf
Log:
Minor additon and fixes for Context resources.
Revision Changes Path
1.6 +23 -4
jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/resources/EnvEntryForm.java
Index: EnvEntryForm.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/resources/EnvEntryForm.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- EnvEntryForm.java 13 Jun 2002 18:19:48 -0000 1.5
+++ EnvEntryForm.java 13 Jun 2002 23:17:57 -0000 1.6
@@ -174,7 +174,26 @@
public void setParentName(String parentName) {
this.parentName = parentName;
}
+
+ /**
+ * The parent type of this environment entry.
+ */
+ private String parentType = null;
+
+ /**
+ * Return the parent type of the environment entry this bean refers to.
+ */
+ public String getParentType() {
+ return this.parentType;
+ }
+ /**
+ * Set the parent type of the environment entry this bean refers to.
+ */
+ public void setParentType(String parentType) {
+ this.parentType = parentType;
+ }
+
/**
* Precomputed list of entry type labels and values.
*/
1.6 +18 -17
jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/resources/ResourceUtils.java
Index: ResourceUtils.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/resources/ResourceUtils.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- ResourceUtils.java 13 Jun 2002 18:19:48 -0000 1.5
+++ ResourceUtils.java 13 Jun 2002 23:17:57 -0000 1.6
@@ -103,30 +103,31 @@
*/
public static EnvEntriesForm getEnvEntriesForm(MBeanServer mserver,
String parent, String parentType) throws Exception {
-
+
ObjectName ename = null;
if ((parent == null) || (parentType == null)) {
- ename = new ObjectName(NAMINGRESOURCES_TYPE);
+ ename = new ObjectName( ENVIRONMENT_TYPE + ",*");
} else {
- ename = new ObjectName( NAMINGRESOURCES_TYPE +
+ ename = new ObjectName( ENVIRONMENT_TYPE +
","+parentType+"=" + parent);
}
+
+ Iterator iterator = (mserver.queryMBeans(ename, null).iterator());
- String results[] = null;
- try {
- results = (String[]) mserver.getAttribute(ename, "environments");
- } catch (Exception e) {
- // leave results null return empty forms
- }
- if (results == null) {
- results = new String[0];
+ ArrayList results = new ArrayList();
+ while (iterator.hasNext()) {
+ ObjectInstance instance = (ObjectInstance) iterator.next();
+ results.add(instance.getObjectName().toString());
}
- Arrays.sort(results);
+
+ Collections.sort(results);
EnvEntriesForm envEntriesForm = new EnvEntriesForm();
- envEntriesForm.setEnvEntries(results);
+ envEntriesForm.setEnvEntries((String[])
+ results.toArray(new String[results.size()]));
envEntriesForm.setParentName(parent);
envEntriesForm.setParentType(parentType);
+
return (envEntriesForm);
}
1.7 +5 -6
jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/resources/ResourcesTreeBuilder.java
Index: ResourcesTreeBuilder.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/resources/ResourcesTreeBuilder.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- ResourcesTreeBuilder.java 13 Jun 2002 19:34:18 -0000 1.6
+++ ResourcesTreeBuilder.java 13 Jun 2002 23:17:57 -0000 1.7
@@ -150,8 +150,7 @@
"EnvironmentEntries.gif",
resources.getMessage("resources.env.entries"),
"resources/listEnvEntries.do?forward=" +
- URLEncoder.encode("EnvEntries List Setup") +
- "&parent=myParent&parentType=myParentType",
+ URLEncoder.encode("EnvEntries List Setup"),
"content",
false);
root.addChild(subtree);
1.4 +6 -4
jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/resources/SetUpEnvEntryAction.java
Index: SetUpEnvEntryAction.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/resources/SetUpEnvEntryAction.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- SetUpEnvEntryAction.java 13 Jun 2002 18:19:48 -0000 1.3
+++ SetUpEnvEntryAction.java 13 Jun 2002 23:17:57 -0000 1.4
@@ -152,6 +152,7 @@
Locale locale = (Locale) session.getAttribute(Action.LOCALE_KEY);
String parentName = request.getParameter("parent");
+ String parentType = request.getParameter("parentType");
// Set up the form bean based on the creating or editing state
String objectName = request.getParameter("objectName");
@@ -166,6 +167,7 @@
(resources.getMessage(locale, "resources.actions.env.edit"));
envEntryForm.setObjectName(objectName);
envEntryForm.setParentName(parentName);
+ envEntryForm.setParentType(parentType);
String attribute = null;
try {
1.7 +3 -1 jakarta-tomcat-4.0/webapps/admin/resources/envEntries.jspf
Index: envEntries.jspf
===================================================================
RCS file: /home/cvs/jakarta-tomcat-4.0/webapps/admin/resources/envEntries.jspf,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- envEntries.jspf 13 Jun 2002 19:44:42 -0000 1.6
+++ envEntries.jspf 13 Jun 2002 23:17:57 -0000 1.7
@@ -34,7 +34,9 @@
<html:link page='<%= "/resources/setUpEnvEntry.do?objectName=" +
URLEncoder.encode(envEntry) +
"&parent=" +
- URLEncoder.encode(parentInfo) %>'>
+ URLEncoder.encode(parentNameInfo) +
+ "&parentType="+
+ URLEncoder.encode(parentTypeInfo) %>'>
<controls:attribute name="envEntry" attribute="name"/>
</html:link>
</div></td>
1.5 +4 -1 jakarta-tomcat-4.0/webapps/admin/resources/listEnvEntries.jsp
Index: listEnvEntries.jsp
===================================================================
RCS file: /home/cvs/jakarta-tomcat-4.0/webapps/admin/resources/listEnvEntries.jsp,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- listEnvEntries.jsp 13 Jun 2002 19:31:30 -0000 1.4
+++ listEnvEntries.jsp 13 Jun 2002 23:17:57 -0000 1.5
@@ -18,10 +18,13 @@
<html:form action="/resources/listEnvEntries">
- <bean:define id="parentInfo" type="java.lang.String"
+ <bean:define id="parentNameInfo" type="java.lang.String"
name="envEntriesForm" property="parentName"/>
<html:hidden property="parentName"/>
+ <bean:define id="parentTypeInfo" type="java.lang.String"
+ name="envEntriesForm" property="parentType"/>
+ <html:hidden property="parentType"/>
<table width="100%" border="0" cellspacing="0" cellpadding="0">
<tr bgcolor="7171A5">
1.4 +2 -1 jakarta-tomcat-4.0/webapps/admin/resources/listEnvEntries.jspf
Index: listEnvEntries.jspf
===================================================================
RCS file: /home/cvs/jakarta-tomcat-4.0/webapps/admin/resources/listEnvEntries.jspf,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- listEnvEntries.jspf 13 Jun 2002 19:44:42 -0000 1.3
+++ listEnvEntries.jspf 13 Jun 2002 23:17:57 -0000 1.4
@@ -9,7 +9,8 @@
</controls:action>
<controls:action url='<%= "/resources/setUpEnvEntry.do?parent=" +
- URLEncoder.encode(parentInfo) %>'>
+ URLEncoder.encode(parentNameInfo) + "&parentType="+
+ URLEncoder.encode(parentTypeInfo) %>'>
<bean:message key="resources.actions.env.create"/>
</controls:action>
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
