husted 01/12/16 08:45:13
Modified: src/share/org/apache/struts/action ContextHelper.java
ActionServlet.java Action.java
Log:
Ooops, add @since 1.1 notations.
Add ContextHelper to action package, and
corresponding support for the class to Action and ActionServlet. See Bugzilla issue
#5395.
Revision Changes Path
1.2 +5 -4
jakarta-struts/src/share/org/apache/struts/action/ContextHelper.java
Index: ContextHelper.java
===================================================================
RCS file:
/home/cvs/jakarta-struts/src/share/org/apache/struts/action/ContextHelper.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ContextHelper.java 2001/12/16 16:41:21 1.1
+++ ContextHelper.java 2001/12/16 16:45:13 1.2
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-struts/src/share/org/apache/struts/action/ContextHelper.java,v 1.1
2001/12/16 16:41:21 husted Exp $
- * $Revision: 1.1 $
- * $Date: 2001/12/16 16:41:21 $
+ * $Header:
/home/cvs/jakarta-struts/src/share/org/apache/struts/action/ContextHelper.java,v 1.2
2001/12/16 16:45:13 husted Exp $
+ * $Revision: 1.2 $
+ * $Date: 2001/12/16 16:45:13 $
*
* ====================================================================
*
@@ -98,8 +98,9 @@
* from under the context and key used by the Struts
* ActionServlet when the resources are created.
*
+ * @since 1.1
* @author Ted Husted
- * @version $Revision: 1.1 $ $Date: 2001/12/16 16:41:21 $
+ * @version $Revision: 1.2 $ $Date: 2001/12/16 16:45:13 $
*/
public class ContextHelper {
1.78 +10 -5
jakarta-struts/src/share/org/apache/struts/action/ActionServlet.java
Index: ActionServlet.java
===================================================================
RCS file:
/home/cvs/jakarta-struts/src/share/org/apache/struts/action/ActionServlet.java,v
retrieving revision 1.77
retrieving revision 1.78
diff -u -r1.77 -r1.78
--- ActionServlet.java 2001/12/16 16:41:21 1.77
+++ ActionServlet.java 2001/12/16 16:45:13 1.78
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-struts/src/share/org/apache/struts/action/ActionServlet.java,v 1.77
2001/12/16 16:41:21 husted Exp $
- * $Revision: 1.77 $
- * $Date: 2001/12/16 16:41:21 $
+ * $Header:
/home/cvs/jakarta-struts/src/share/org/apache/struts/action/ActionServlet.java,v 1.78
2001/12/16 16:45:13 husted Exp $
+ * $Revision: 1.78 $
+ * $Date: 2001/12/16 16:45:13 $
*
* ====================================================================
*
@@ -166,7 +166,7 @@
* to be set on each response; may be overridden by a forwarded-to
* servlet or JSP page. [text/html]</li>
* <li><strong>context</strong> - The request attribute name under which our
- * ContextHelper is stored.[org.apache.struts.action.CONTEXT_HELPER]</li>
+ * ContextHelper is stored. Since 1.1.
[org.apache.struts.action.CONTEXT_HELPER]</li>
* <li><strong>debug</strong> - The debugging detail level for this
* servlet, which controls how much information is logged. [0]</li>
* <li><strong>detail</strong> - The debugging detail level for the Digester
@@ -233,7 +233,7 @@
*
* @author Craig R. McClanahan
* @author Ted Husted
- * @version $Revision: 1.77 $ $Date: 2001/12/16 16:41:21 $
+ * @version $Revision: 1.78 $ $Date: 2001/12/16 16:45:13 $
*/
public class ActionServlet
@@ -271,6 +271,7 @@
/**
* The request attribute name for our ContextHelper object.
+ * @since 1.1
*/
protected String contextHelper = Action.CONTEXT_HELPER_KEY;
@@ -1309,6 +1310,7 @@
if (value != null)
content = value;
+ // @since 1.1
value = getServletConfig().getInitParameter("context");
if (value != null)
contextHelper = value;
@@ -1460,6 +1462,7 @@
throws IOException, ServletException {
// Insert ContextHelper object before processing request
+ // @since 1.1
ContextHelper context = processContext(request,response);
String contentType = request.getContentType();
@@ -1707,6 +1710,7 @@
}
// Update ContextHelper object before forwarding request
+ // @since 1.1
ContextHelper context = (ContextHelper)
request.getAttribute(contextHelper);
if (context!=null)
@@ -1750,6 +1754,7 @@
/**
* Instantiate an ContextHelper object for this request.
*
+ * @since 1.1
* @param request The request we are processing
* @param response The response we are processing
*/
1.27 +5 -4 jakarta-struts/src/share/org/apache/struts/action/Action.java
Index: Action.java
===================================================================
RCS file: /home/cvs/jakarta-struts/src/share/org/apache/struts/action/Action.java,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- Action.java 2001/12/16 16:41:21 1.26
+++ Action.java 2001/12/16 16:45:13 1.27
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-struts/src/share/org/apache/struts/action/Action.java,v 1.26
2001/12/16 16:41:21 husted Exp $
- * $Revision: 1.26 $
- * $Date: 2001/12/16 16:41:21 $
+ * $Header:
/home/cvs/jakarta-struts/src/share/org/apache/struts/action/Action.java,v 1.27
2001/12/16 16:45:13 husted Exp $
+ * $Revision: 1.27 $
+ * $Date: 2001/12/16 16:45:13 $
*
* ====================================================================
*
@@ -108,7 +108,7 @@
* by this Action.
*
* @author Craig R. McClanahan
- * @version $Revision: 1.26 $ $Date: 2001/12/16 16:41:21 $
+ * @version $Revision: 1.27 $ $Date: 2001/12/16 16:45:13 $
*/
public class Action {
@@ -240,6 +240,7 @@
/**
* The request attributes key under which our ActionContext is
* normally stored, unless overridden when initializing our ActionServlet.
+ * @since 1.1
*/
public static final String CONTEXT_HELPER_KEY =
"org.apache.struts.action.CONTEXT_HELPER";
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
