patrickl 01/11/18 15:54:36
Modified: webapps/admin/WEB-INF/classes/org/apache/webapp/admin
ApplicationServlet.java
TreeControlTestListener.java
Removed: webapps/admin/WEB-INF/classes/org/apache/webapp/admin
TreeBuilders.java
Log:
Reverting latests revisions to previous revisions. Latest revisions were only test
code and are not needed.
Revision Changes Path
1.4 +0 -41
jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/ApplicationServlet.java
Index: ApplicationServlet.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/ApplicationServlet.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- ApplicationServlet.java 2001/11/18 21:09:12 1.3
+++ ApplicationServlet.java 2001/11/18 23:54:36 1.4
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/ApplicationServlet.java,v
1.3 2001/11/18 21:09:12 patrickl Exp $
- * $Revision: 1.3 $
- * $Date: 2001/11/18 21:09:12 $
+ * $Header:
/home/cvs/jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/ApplicationServlet.java,v
1.4 2001/11/18 23:54:36 patrickl Exp $
+ * $Revision: 1.4 $
+ * $Date: 2001/11/18 23:54:36 $
*
* ====================================================================
*
@@ -79,7 +79,7 @@
* ApplicationLocales class.
*
* @author Patrick Luby
- * @version $Revision: 1.3 $ $Date: 2001/11/18 21:09:12 $
+ * @version $Revision: 1.4 $ $Date: 2001/11/18 23:54:36 $
*/
public class ApplicationServlet extends ActionServlet {
@@ -95,13 +95,6 @@
public static final String LOCALES_KEY = "applicationLocales";
- /**
- * The application scope key under which we store our
- * <code>TreeBuilders</code> instance.
- */
- public static final String TREEBUILDERS_KEY = "treeBuilders";
-
-
// ----------------------------------------------------- Instance Variables
@@ -161,9 +154,6 @@
// Perform initialization specific to this application
initApplicationLocales();
- // Perform initialization of list of TreeBuilder classes
- initTreeBuilders();
-
}
@@ -178,37 +168,6 @@
ApplicationLocales locales = new ApplicationLocales(this);
getServletContext().setAttribute(LOCALES_KEY, locales);
-
- }
-
-
- /**
- * Create and initialize the TreeBuilders object, and make it
- * available as a servlet context attribute.
- */
- protected void initTreeBuilders() {
-
- // Get the list of tree nodes that we must build from web.xml
- String value = getServletConfig().getInitParameter("treebuilders");
- if (value == null || value.length() < 1 )
- return;
-
- // Parse each comma-delimited entry
- int start = 0;
- int end = 0;
- while (true) {
-
- // Extract the next comma-delimited entry
- end = value.lastIndexOf(",", start);
- if (end == -1)
- end = value.length();
- String entry = value.substring(start, end).trim();
- TreeBuilders.treeBuilders.add(value);
- if (end == value.length())
- break;
- start = end; // For the following entry
-
- }
}
1.3 +1 -24
jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/TreeControlTestListener.java
Index: TreeControlTestListener.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/TreeControlTestListener.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- TreeControlTestListener.java 2001/11/18 21:09:12 1.2
+++ TreeControlTestListener.java 2001/11/18 23:54:36 1.3
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/TreeControlTestListener.java,v
1.2 2001/11/18 21:09:12 patrickl Exp $
- * $Revision: 1.2 $
- * $Date: 2001/11/18 21:09:12 $
+ * $Header:
/home/cvs/jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/TreeControlTestListener.java,v
1.3 2001/11/18 23:54:36 patrickl Exp $
+ * $Revision: 1.3 $
+ * $Date: 2001/11/18 23:54:36 $
*
* ====================================================================
*
@@ -63,12 +63,9 @@
package org.apache.webapp.admin;
-import java.util.List;
-import java.util.Iterator;
import javax.servlet.http.HttpSession;
import javax.servlet.http.HttpSessionEvent;
import javax.servlet.http.HttpSessionListener;
-import org.apache.struts.action.ActionServlet;
/**
@@ -76,8 +73,7 @@
* for the tree control test.
*
* @author Craig R. McClanahan
- * @author Patrick Luby
- * @version $Revision: 1.2 $ $Date: 2001/11/18 21:09:12 $
+ * @version $Revision: 1.3 $ $Date: 2001/11/18 23:54:36 $
*/
public class TreeControlTestListener implements HttpSessionListener {
@@ -95,33 +91,15 @@
HttpSession session = event.getSession();
- // Create the ROOT-NODE
TreeControlNode root =
new TreeControlNode("ROOT-NODE",
null, "Root Node",
"treeControlTest.do?select=ROOT-NODE",
null, true);
TreeControl control = new TreeControl(root);
- control.selectNode("ROOT-NODE");
TreeControlNode parent = null;
TreeControlNode child = null;
- // Create child nodes based on the servlet's init parameter
- List treeBuilders = TreeBuilders.getTreeBuilders();
-
- Iterator iterator = treeBuilders.iterator();
- while (iterator.hasNext()) {
-
- String currentBuilder = (String)(iterator.next());
- if (currentBuilder == null || currentBuilder.length() < 1)
- continue;
-
- // FIXME: We need to dynamically load the class name that
- // currentBuilder is set to and invoke its buildTree method.
- // However, right now, we only invoke the hard-code tree below
- if (!currentBuilder.equals("org.apache.webapp.admin.TomcatTreeBuilder"))
- continue;
-
parent =
new TreeControlNode("CATALINA",
"folder_16_pad.gif", "Tomcat Server",
@@ -159,6 +137,7 @@
"treeControlTest.do?select=SERVICE-TOMCAT-APACHE",
null, true);
parent.addChild(child);
+ control.selectNode("SERVICE-TOMCAT-APACHE");
parent = child;
child =
@@ -183,8 +162,6 @@
"treeControlTest.do?select=RESOURCES",
null, true);
parent.addChild(child);
- // FIXME: end of hard-coding that needs to be replaced
- }
event.getSession().getServletContext().log
("TreeControlTestListener: Session " +
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
