Author: markt
Date: Fri Nov 24 15:00:06 2006
New Revision: 479033
URL: http://svn.apache.org/viewvc?view=rev&rev=479033
Log:
Code clean-up thanks to Eclipse for o.a.webapp.admin.context
- remove unused code
- removed unused imports
- don't use deprecated methods
Modified:
tomcat/container/tc5.5.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/context/AddContextAction.java
tomcat/container/tc5.5.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/context/ContextForm.java
tomcat/container/tc5.5.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/context/DeleteContextAction.java
tomcat/container/tc5.5.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/context/DeleteContextsAction.java
tomcat/container/tc5.5.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/context/SaveContextAction.java
Modified:
tomcat/container/tc5.5.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/context/AddContextAction.java
URL:
http://svn.apache.org/viewvc/tomcat/container/tc5.5.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/context/AddContextAction.java?view=diff&rev=479033&r1=479032&r2=479033
==============================================================================
---
tomcat/container/tc5.5.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/context/AddContextAction.java
(original)
+++
tomcat/container/tc5.5.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/context/AddContextAction.java
Fri Nov 24 15:00:06 2006
@@ -18,7 +18,6 @@
package org.apache.webapp.admin.context;
import java.io.IOException;
-import java.util.Locale;
import javax.servlet.ServletException;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
@@ -27,9 +26,9 @@
import org.apache.struts.action.ActionForm;
import org.apache.struts.action.ActionForward;
import org.apache.struts.action.ActionMapping;
-import org.apache.struts.util.MessageResources;
import org.apache.webapp.admin.Lists;
import org.apache.webapp.admin.TomcatTreeBuilder;
+
/**
* The <code>Action</code> that sets up <em>Add Context</em> transactions.
*
Modified:
tomcat/container/tc5.5.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/context/ContextForm.java
URL:
http://svn.apache.org/viewvc/tomcat/container/tc5.5.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/context/ContextForm.java?view=diff&rev=479033&r1=479032&r2=479033
==============================================================================
---
tomcat/container/tc5.5.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/context/ContextForm.java
(original)
+++
tomcat/container/tc5.5.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/context/ContextForm.java
Fri Nov 24 15:00:06 2006
@@ -19,10 +19,11 @@
package org.apache.webapp.admin.context;
import javax.servlet.http.HttpServletRequest;
-import org.apache.struts.action.ActionError;
import org.apache.struts.action.ActionErrors;
import org.apache.struts.action.ActionForm;
import org.apache.struts.action.ActionMapping;
+import org.apache.struts.action.ActionMessage;
+
import java.util.List;
/**
@@ -705,38 +706,26 @@
errors = new ActionErrors();
- String submit = request.getParameter("submit");
-
// front end validation when save is clicked.
- //if (submit != null) {
- // docBase cannot be null
- if ((docBase == null) || (docBase.length() < 1)) {
- errors.add("docBase", new
ActionError("error.docBase.required"));
- }
-
- // if path is empty, it's root context
- // validate context starting with "/" only at the time of context
creation.
- if ("Create".equalsIgnoreCase(adminAction) &&
!path.startsWith("/")) {
- errors.add("path", new ActionError("error.path.prefix"));
- }
+ // docBase cannot be null
+ if ((docBase == null) || (docBase.length() < 1)) {
+ errors.add("docBase", new ActionMessage("error.docBase.required"));
+ }
+
+ // if path is empty, it's root context
+ // validate context starting with "/" only at the time of context
creation.
+ if ("Create".equalsIgnoreCase(adminAction) && !path.startsWith("/")) {
+ errors.add("path", new ActionMessage("error.path.prefix"));
+ }
- //if ((workDir == null) || (workDir.length() < 1)) {
- // errors.add("workDir", new
ActionError("error.workDir.required"));
- //}
-
- // loader properties
- // FIXME-- verify if these ranges are ok.
- numberCheck("ldrCheckInterval", ldrCheckInterval , true, 0,
10000);
-
- // session manager properties
- numberCheck("mgrCheckInterval", mgrCheckInterval, true, 0, 10000);
- numberCheck("mgrMaxSessions", mgrMaxSessions, false, -1, 100);
-
- //if ((mgrSessionIDInit == null) || (mgrSessionIDInit.length() <
1)) {
- // errors.add("mgrSessionIDInit", new
ActionError("error.mgrSessionIDInit.required"));
- //}
- //}
+ // loader properties
+ // FIXME-- verify if these ranges are ok.
+ numberCheck("ldrCheckInterval", ldrCheckInterval , true, 0, 10000);
+
+ // session manager properties
+ numberCheck("mgrCheckInterval", mgrCheckInterval, true, 0, 10000);
+ numberCheck("mgrMaxSessions", mgrMaxSessions, false, -1, 100);
return errors;
}
@@ -759,7 +748,7 @@
// Check for 'is required'
if ((numText == null) || (numText.length() < 1)) {
- errors.add(field, new ActionError("error."+field+".required"));
+ errors.add(field, new ActionMessage("error."+field+".required"));
} else {
// check for 'must be a number' in the 'valid range'
@@ -769,11 +758,11 @@
if (rangeCheck) {
if ((num < min) || (num > max ))
errors.add( field,
- new ActionError("error."+ field +".range"));
+ new ActionMessage("error."+ field +".range"));
}
} catch (NumberFormatException e) {
errors.add(field,
- new ActionError("error."+ field + ".format"));
+ new ActionMessage("error."+ field + ".format"));
}
}
}
Modified:
tomcat/container/tc5.5.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/context/DeleteContextAction.java
URL:
http://svn.apache.org/viewvc/tomcat/container/tc5.5.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/context/DeleteContextAction.java?view=diff&rev=479033&r1=479032&r2=479033
==============================================================================
---
tomcat/container/tc5.5.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/context/DeleteContextAction.java
(original)
+++
tomcat/container/tc5.5.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/context/DeleteContextAction.java
Fri Nov 24 15:00:06 2006
@@ -26,7 +26,6 @@
import javax.servlet.ServletException;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
-import javax.servlet.http.HttpSession;
import org.apache.struts.action.Action;
import org.apache.struts.action.ActionForm;
import org.apache.struts.action.ActionForward;
@@ -79,7 +78,6 @@
// Acquire the resources that we need
- HttpSession session = request.getSession();
Locale locale = getLocale(request);
MessageResources resources = getResources(request);
Modified:
tomcat/container/tc5.5.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/context/DeleteContextsAction.java
URL:
http://svn.apache.org/viewvc/tomcat/container/tc5.5.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/context/DeleteContextsAction.java?view=diff&rev=479033&r1=479032&r2=479033
==============================================================================
---
tomcat/container/tc5.5.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/context/DeleteContextsAction.java
(original)
+++
tomcat/container/tc5.5.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/context/DeleteContextsAction.java
Fri Nov 24 15:00:06 2006
@@ -118,7 +118,6 @@
if (control != null) {
control.selectNode(null);
TreeControlNode node = control.findNode(contexts[i]);
- String domain = node.getDomain();
ObjectName fname = TomcatTreeBuilder.getMBeanFactory();
mBServer.invoke(fname, operation,
values, removeContextTypes);
Modified:
tomcat/container/tc5.5.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/context/SaveContextAction.java
URL:
http://svn.apache.org/viewvc/tomcat/container/tc5.5.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/context/SaveContextAction.java?view=diff&rev=479033&r1=479032&r2=479033
==============================================================================
---
tomcat/container/tc5.5.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/context/SaveContextAction.java
(original)
+++
tomcat/container/tc5.5.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/context/SaveContextAction.java
Fri Nov 24 15:00:06 2006
@@ -30,11 +30,11 @@
import javax.servlet.http.HttpSession;
import org.apache.commons.modeler.Registry;
import org.apache.struts.action.Action;
-import org.apache.struts.action.ActionError;
-import org.apache.struts.action.ActionErrors;
import org.apache.struts.action.ActionForm;
import org.apache.struts.action.ActionForward;
import org.apache.struts.action.ActionMapping;
+import org.apache.struts.action.ActionMessage;
+import org.apache.struts.action.ActionMessages;
import org.apache.struts.util.MessageResources;
import org.apache.webapp.admin.ApplicationServlet;
import org.apache.webapp.admin.TomcatTreeBuilder;
@@ -42,7 +42,6 @@
import org.apache.webapp.admin.TreeControlNode;
-
/**
* The <code>Action</code> that completes <em>Add Context</em> and
* <em>Edit Context</em> transactions.
@@ -160,9 +159,9 @@
",J2EEApplication=none,J2EEServer=none");
if (mBServer.isRegistered(oname)) {
- ActionErrors errors = new ActionErrors();
+ ActionMessages errors = new ActionMessages();
errors.add("contextName",
- new ActionError("error.contextName.exists"));
+ new ActionMessage("error.contextName.exists"));
saveErrors(request, errors);
return (new ActionForward(mapping.getInput()));
}
@@ -208,7 +207,8 @@
values[0] = cObjectName;
mBServer.invoke(fname, operation, values,
removeContextTypes);
- Registry.getRegistry().unregisterComponent(new
ObjectName(cObjectName));
+ Registry.getRegistry(null, null).unregisterComponent(
+ new ObjectName(cObjectName));
request.setAttribute("warning", "error.context.directory");
return (mapping.findForward("Save Unsuccessful"));
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
