Author: dolander
Date: Wed Aug 11 11:38:36 2004
New Revision: 36240
Modified:
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/miniTests/pageFlowUtils/index.jsp
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/miniTests/pageFlowUtils/security.jsp
incubator/beehive/trunk/netui/test/webapps/drt/testRecorder/tests/PageFlowUtils.xml
Log:
Update the PageFlowUtils test so that is compiles. The test still fails due to
security issues, but at least it runs.
Modified:
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/miniTests/pageFlowUtils/index.jsp
==============================================================================
---
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/miniTests/pageFlowUtils/index.jsp
(original)
+++
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/miniTests/pageFlowUtils/index.jsp
Wed Aug 11 11:38:36 2004
@@ -1,6 +1,7 @@
<!--Generated by WebLogic Workshop-->
<%@ page language="java" contentType="text/html;charset=UTF-8"%>
-<[EMAIL PROTECTED]
import="org.apache.beehive.netui.pageflow.PageFlowController"%>
+<[EMAIL PROTECTED]
import="org.apache.beehive.netui.pageflow.PageFlowController,
+ org.apache.beehive.netui.pageflow.internal.InternalUtils"%>
<[EMAIL PROTECTED] import="org.apache.beehive.netui.pageflow.PageFlowUtils"%>
<[EMAIL PROTECTED] import="org.apache.beehive.netui.util.FileUtils"%>
<[EMAIL PROTECTED]
import="miniTests.pageFlowUtils.pageFlowUtilsController.TestForm"%>
@@ -46,10 +47,10 @@
<%= PageFlowUtils.getBeginActionURI(
"/coreWeb/miniTests/pageFlowUtils/pageFlowUtilsController.jpf" ) %><br>
<code>ensureCurrentPageFlow( request, response )</code>:
- <%= PageFlowUtils.ensureCurrentPageFlow( request, response
).getClass().getName() %><br>
+ <%= InternalUtils.ensureCurrentPageFlow( request, response
).getClass().getName() %><br>
<code>ensureCurrentPageFlow( request, response, servletContext
)</code>:
- <%= PageFlowUtils.ensureCurrentPageFlow( request, response, cxt
).getClass().getName() %><br>
+ <%= InternalUtils.ensureCurrentPageFlow( request, response, cxt
).getClass().getName() %><br>
<code>getCurrentPageFlow( request )</code>:
<%= PageFlowUtils.getCurrentPageFlow( request
).getClass().getName() %><br>
@@ -58,10 +59,10 @@
<%= PageFlowUtils.getCurrentActionResolver( request
).getClass().getName() %><br>
<code>ensureGlobalApp( request, response )</code>:
- <%= PageFlowUtils.ensureGlobalApp( request, response
).getClass().getName() %><br>
+ <%= InternalUtils.ensureGlobalApp( request, response
).getClass().getName() %><br>
<code>ensureGlobalApp( request, response, cxt )</code>:
- <%= PageFlowUtils.ensureGlobalApp( request, response, cxt
).getClass().getName() %><br>
+ <%= InternalUtils.ensureGlobalApp( request, response, cxt
).getClass().getName() %><br>
<code>getGlobalApp( request )</code>:
<%= PageFlowUtils.getGlobalApp( request ).getClass().getName()
%><br>
@@ -91,16 +92,17 @@
<%= PageFlowUtils.getModuleConfPath( "" ) %><br>
<code>getActionURI( request )</code>:
- <%= PageFlowUtils.getActionURI( request ) %><br>
+ <%= PageFlowUtils.getActionURI(
(javax.servlet.http.HttpServletRequest) request ) %><br>
<code>getGlobalAppConfig( servletContext ).getPrefix()</code>:
- <%= PageFlowUtils.getGlobalAppConfig( cxt ).getPrefix() %><br>
+ <%= InternalUtils.getGlobalAppConfig( cxt ).getPrefix() %><br>
<code>ensureModuleConfig( "/miniTests/pageFlowUtils/another", request,
servletContext ).getPrefix()</code>:
- <%= PageFlowUtils.ensureModuleConfig(
"/miniTests/pageFlowUtils/another", request, cxt ).getPrefix() %><br>
+ <%= InternalUtils.ensureModuleConfig(
"/miniTests/pageFlowUtils/another",
+ (javax.servlet.http.HttpServletRequest) request, cxt
).getPrefix() %><br>
<code>getModuleConfig( "/miniTests/pageFlowUtils/another",
servletContext )</code>:
- <%= PageFlowUtils.getModuleConfig(
"/miniTests/pageFlowUtils/another", cxt ).getClass().getName() %><br>
+ <%= InternalUtils.getModuleConfig(
"/miniTests/pageFlowUtils/another", cxt ).getClass().getName() %><br>
<code>isAbsoluteURI( "foo" )</code>:
<%= FileUtils.isAbsoluteURI( "foo" ) %><br>
Modified:
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/miniTests/pageFlowUtils/security.jsp
==============================================================================
---
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/miniTests/pageFlowUtils/security.jsp
(original)
+++
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/miniTests/pageFlowUtils/security.jsp
Wed Aug 11 11:38:36 2004
@@ -12,37 +12,38 @@
</head>
<body>
<% ServletContext servletContext = pageContext.getServletContext(); %>
-
+ <% HttpServletRequest req = (HttpServletRequest)
pageContext.getRequest(); %>
+
<code>isSecureResource( "/miniTests/pageFlowUtils/secure/foo.jsp",
servletContext )</code>:
- <%= PageFlowUtils.isSecureResource(
"/miniTests/pageFlowUtils/secure/foo.jsp", servletContext ) %><br>
+ <%= PageFlowUtils.isSecureResource(
"/miniTests/pageFlowUtils/secure/foo.jsp", servletContext, req) %><br>
<code>isSecureResource( "/miniTests/pageFlowUtils/secureFoo.do",
servletContext )</code>:
- <%= PageFlowUtils.isSecureResource(
"/miniTests/pageFlowUtils/secureFoo.do", servletContext ) %><br>
+ <%= PageFlowUtils.isSecureResource(
"/miniTests/pageFlowUtils/secureFoo.do", servletContext, req ) %><br>
<code>isSecureResource(
"/miniTests/pageFlowUtils/foo.pageFlowUtilsSecure", servletContext )</code>:
- <%= PageFlowUtils.isSecureResource(
"/miniTests/pageFlowUtils/foo.pageFlowUtilsSecure", servletContext ) %><br>
+ <%= PageFlowUtils.isSecureResource(
"/miniTests/pageFlowUtils/foo.pageFlowUtilsSecure", servletContext, req ) %><br>
<br>
<code>isSecureResource( "/miniTests/pageFlowUtils/unsecure/foo.jsp",
servletContext )</code>:
- <%= PageFlowUtils.isSecureResource(
"/miniTests/pageFlowUtils/unsecure/foo.jsp", servletContext ) %><br>
+ <%= PageFlowUtils.isSecureResource(
"/miniTests/pageFlowUtils/unsecure/foo.jsp", servletContext, req ) %><br>
<code>isSecureResource( "/miniTests/pageFlowUtils/unsecureFoo.do",
servletContext )</code>:
- <%= PageFlowUtils.isSecureResource(
"/miniTests/pageFlowUtils/unsecureFoo.do", servletContext ) %><br>
+ <%= PageFlowUtils.isSecureResource(
"/miniTests/pageFlowUtils/unsecureFoo.do", servletContext, req ) %><br>
<code>isSecureResource(
"/miniTests/pageFlowUtils/foo.pageFlowUtilsUnsecure", servletContext )</code>:
- <%= PageFlowUtils.isSecureResource(
"/miniTests/pageFlowUtils/foo.pageFlowUtilsUnsecure", servletContext ) %><br>
+ <%= PageFlowUtils.isSecureResource(
"/miniTests/pageFlowUtils/foo.pageFlowUtilsUnsecure", servletContext, req )
%><br>
<br>
<code>isSecureResource( "/miniTests/pageFlowUtils/nothing/foo.jsp",
servletContext )</code>:
- <%= PageFlowUtils.isSecureResource(
"/miniTests/pageFlowUtils/nothing/foo.jsp", servletContext ) %><br>
+ <%= PageFlowUtils.isSecureResource(
"/miniTests/pageFlowUtils/nothing/foo.jsp", servletContext, req ) %><br>
<code>isSecureResource( "/miniTests/pageFlowUtils/nothingFoo.do",
servletContext )</code>:
- <%= PageFlowUtils.isSecureResource(
"/miniTests/pageFlowUtils/nothingFoo.do", servletContext ) %><br>
+ <%= PageFlowUtils.isSecureResource(
"/miniTests/pageFlowUtils/nothingFoo.do", servletContext, req ) %><br>
<code>isSecureResource(
"/miniTests/pageFlowUtils/foo.pageFlowUtilsNothing", servletContext )</code>:
- <%= PageFlowUtils.isSecureResource(
"/miniTests/pageFlowUtils/foo.pageFlowUtilsNothing", servletContext ) %><br>
+ <%= PageFlowUtils.isSecureResource(
"/miniTests/pageFlowUtils/foo.pageFlowUtilsNothing", servletContext, req )
%><br>
Modified:
incubator/beehive/trunk/netui/test/webapps/drt/testRecorder/tests/PageFlowUtils.xml
==============================================================================
---
incubator/beehive/trunk/netui/test/webapps/drt/testRecorder/tests/PageFlowUtils.xml
(original)
+++
incubator/beehive/trunk/netui/test/webapps/drt/testRecorder/tests/PageFlowUtils.xml
Wed Aug 11 11:38:36 2004
@@ -103,6 +103,7 @@
+
<!DOCTYPE HTML PUBLIC "//W3C//DTD HTML 4.01 Transitional//EN"
"http://www.w3.org/TR/html4/loose.dtd";>
<html lang="en">
@@ -450,6 +451,7 @@
+
<!DOCTYPE HTML PUBLIC "//W3C//DTD HTML 4.01 Transitional//EN"
"http://www.w3.org/TR/html4/loose.dtd";>
<html lang="en">
@@ -682,6 +684,7 @@
<body>
+
<code>isSecureResource( "/miniTests/pageFlowUtils/secure/foo.jsp",
servletContext )</code>:
true<br>
@@ -815,6 +818,7 @@
<statusCode>200</statusCode>
<reason></reason>
<responseBody><