dgraham 2003/07/01 20:09:48
Modified: src/test/org/apache/struts/util TestRequestUtils.java
src/share/org/apache/struts/util RequestUtils.java
Log:
Removed deprecated "application" methods in favor of "module" methods.
Revision Changes Path
1.19 +8 -8
jakarta-struts/src/test/org/apache/struts/util/TestRequestUtils.java
Index: TestRequestUtils.java
===================================================================
RCS file:
/home/cvs/jakarta-struts/src/test/org/apache/struts/util/TestRequestUtils.java,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- TestRequestUtils.java 4 May 2003 22:41:13 -0000 1.18
+++ TestRequestUtils.java 2 Jul 2003 03:09:47 -0000 1.19
@@ -1490,7 +1490,7 @@
public void testSelectApplication1a() {
request.setPathElements("/myapp", "/noform.do", null, null);
- RequestUtils.selectApplication(request, context);
+ RequestUtils.selectModule(request, context);
ApplicationConfig appConfig = (ApplicationConfig)
request.getAttribute(Globals.MODULE_KEY);
assertNotNull("Selected an application", appConfig);
@@ -1505,7 +1505,7 @@
public void testSelectApplication1b() {
request.setPathElements("/myapp", "/2/noform.do", null, null);
- RequestUtils.selectApplication(request, context);
+ RequestUtils.selectModule(request, context);
ApplicationConfig appConfig = (ApplicationConfig)
request.getAttribute(Globals.MODULE_KEY);
assertNotNull("Selected an application", appConfig);
@@ -1522,7 +1522,7 @@
request.setPathElements("/myapp", "/2/noform.do", null, null);
request.setAttribute(RequestProcessor.INCLUDE_SERVLET_PATH,
"/noform.do");
- RequestUtils.selectApplication(request, context);
+ RequestUtils.selectModule(request, context);
ApplicationConfig appConfig = (ApplicationConfig)
request.getAttribute(Globals.MODULE_KEY);
assertNotNull("Selected an application", appConfig);
@@ -1539,7 +1539,7 @@
request.setPathElements("/myapp", "/noform.do", null, null);
request.setAttribute(RequestProcessor.INCLUDE_SERVLET_PATH,
"/2/noform.do");
- RequestUtils.selectApplication(request, context);
+ RequestUtils.selectModule(request, context);
ApplicationConfig appConfig = (ApplicationConfig)
request.getAttribute(Globals.MODULE_KEY);
assertNotNull("Selected an application", appConfig);
1.106 +4 -45
jakarta-struts/src/share/org/apache/struts/util/RequestUtils.java
Index: RequestUtils.java
===================================================================
RCS file:
/home/cvs/jakarta-struts/src/share/org/apache/struts/util/RequestUtils.java,v
retrieving revision 1.105
retrieving revision 1.106
diff -u -r1.105 -r1.106
--- RequestUtils.java 28 Jun 2003 00:20:07 -0000 1.105
+++ RequestUtils.java 2 Jul 2003 03:09:47 -0000 1.106
@@ -1704,22 +1704,6 @@
* @param prefix The module prefix of the desired module
* @param request The servlet request we are processing
* @param context The ServletContext for this web application
- * @deprecated use [EMAIL PROTECTED]
#selectModule(String,HttpServletRequest,ServletContext)}
- */
- public static void selectApplication(
- String prefix,
- HttpServletRequest request,
- ServletContext context) {
- selectModule(prefix, request, context);
- }
-
- /**
- * Select the module to which the specified request belongs, and
- * add corresponding request attributes to this request.
- *
- * @param prefix The module prefix of the desired module
- * @param request The servlet request we are processing
- * @param context The ServletContext for this web application
* @since struts 1.1
*/
public static void selectModule(
@@ -1750,18 +1734,6 @@
*
* @param request The servlet request we are processing
* @param context The ServletContext for this web application
- * @deprecated use [EMAIL PROTECTED]
#selectModule(HttpServletRequest,ServletContext)}
- */
- public static void selectApplication(HttpServletRequest request, ServletContext
context) {
- selectModule(request, context);
- }
-
- /**
- * Select the module to which the specified request belongs, and
- * add corresponding request attributes to this request.
- *
- * @param request The servlet request we are processing
- * @param context The ServletContext for this web application
*/
public static void selectModule(HttpServletRequest request, ServletContext
context) {
// Compute module name
@@ -1868,19 +1840,6 @@
return getModuleConfig(
(HttpServletRequest) pageContext.getRequest(),
pageContext.getServletContext());
- }
-
- /**
- * Return the list of module prefixes that are defined for
- * this web application, creating it if necessary. <strong>NOTE</strong> -
- * the "" prefix for the default module is not included in this list.
- *
- * @param context The ServletContext for this web application
- * @return an array of module prefixes
- * @deprecated Use getModulePrefixes(ServletContext) instead.
- */
- public static String[] getApplicationPrefixes(ServletContext context) {
- return getModulePrefixes(context);
}
/**
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
