rleland 2002/12/07 23:28:11
Modified: contrib/workflow ActivityAction.java RegistryServlet.java
Log:
Remove unused import statements &
remove old Digester detail call.
Revision Changes Path
1.2 +10 -10 jakarta-struts/contrib/workflow/ActivityAction.java
Index: ActivityAction.java
===================================================================
RCS file: /home/cvs/jakarta-struts/contrib/workflow/ActivityAction.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ActivityAction.java 4 Oct 2001 02:12:02 -0000 1.1
+++ ActivityAction.java 8 Dec 2002 07:28:11 -0000 1.2
@@ -63,9 +63,9 @@
import java.io.IOException;
-import javax.servlet.RequestDispatcher;
+
import javax.servlet.ServletException;
-import javax.servlet.ServletContext;
+
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpSession;
@@ -323,18 +323,18 @@
* missing or not found. Executes the next step of the actitivity.
*
* @param mapping The ActionMapping used to select this instance
- * @param actionForm The optional ActionForm bean for this request (if any)
+ * @param form The optional ActionForm bean for this request (if any)
* @param request The HTTP request we are processing
* @param response The HTTP response we are creating
*
* @exception IOException if an input/output error occurs
* @exception ServletException if a servlet exception occurs
*/
- public ActionForward perform(ActionMapping mapping,
+ public ActionForward execute(ActionMapping mapping,
ActionForm form,
HttpServletRequest request,
HttpServletResponse response)
- throws IOException, ServletException {
+ throws Exception {
ActionErrors errors = new ActionErrors();
@@ -345,7 +345,7 @@
validateInit(errors,context,activity);
- if (errors.empty()) {
+ if (errors.isEmpty()) {
executeContext(context,activity,
mapping,form,request,response);
1.2 +5 -23 jakarta-struts/contrib/workflow/RegistryServlet.java
Index: RegistryServlet.java
===================================================================
RCS file: /home/cvs/jakarta-struts/contrib/workflow/RegistryServlet.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- RegistryServlet.java 4 Oct 2001 02:12:02 -0000 1.1
+++ RegistryServlet.java 8 Dec 2002 07:28:11 -0000 1.2
@@ -63,14 +63,11 @@
import java.io.InputStream;
-import java.io.IOException;
+
import javax.servlet.ServletException;
import javax.servlet.UnavailableException;
import javax.servlet.http.HttpServlet;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import javax.servlet.http.HttpSession;
import org.apache.commons.digester.Digester;
import org.apache.commons.workflow.Activity;
@@ -196,11 +193,6 @@
private int debug = 0;
- /**
- * The debugging detail level for our Digester.
- */
- private int detail = 0;
-
// --------------------------------------------------------- Public Properties
@@ -349,15 +341,6 @@
("Debug initialization parameter must be an integer");
}
}
- String detail = getServletConfig().getInitParameter("detail");
- if (detail != null) {
- try {
- this.detail = Integer.parseInt(detail);
- } catch (NumberFormatException e) {
- throw new UnavailableException
- ("Detail initialization parameter must be an integer");
- }
- }
// Record the attribute name for our current Context
String contextKey = getServletConfig().getInitParameter("context-key");
@@ -405,7 +388,6 @@
// Configure a Digester instance to parse our definition file
Digester digester = new Digester();
- digester.setDebug(detail);
digester.setNamespaceAware(true);
digester.setValidating(false);
digester.push(this);
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
