You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@beehive.apache.org by ri...@apache.org on 2005/08/30 22:25:13 UTC

svn commit: r264849 - in /beehive/trunk/netui: src/compiler-core/org/apache/beehive/netui/compiler/grammar/ src/pageflow/org/apache/beehive/netui/pageflow/ test/webapps/drt/coreWeb/pageFlowCore/inheritActions/ test/webapps/drt/coreWeb/pageFlowCore/inhe...

Author: rich
Date: Tue Aug 30 13:24:39 2005
New Revision: 264849

URL: http://svn.apache.org/viewcvs?rev=264849&view=rev
Log:
Fix for http://issues.apache.org/jira/browse/BEEHIVE-901 : Cannot forward to an inherited simple action

Also un-deprecated a setLocale() method on FlowController which was accidentally deprecated.

tests: bvt in netui (WinXP)
BB: self (linux)


Added:
    beehive/trunk/netui/test/webapps/drt/coreWeb/pageFlowCore/inheritActions/
    beehive/trunk/netui/test/webapps/drt/coreWeb/pageFlowCore/inheritActions/base/
    beehive/trunk/netui/test/webapps/drt/coreWeb/pageFlowCore/inheritActions/base/Controller.jpf   (with props)
    beehive/trunk/netui/test/webapps/drt/coreWeb/pageFlowCore/inheritActions/base/index.jsp   (with props)
    beehive/trunk/netui/test/webapps/drt/coreWeb/pageFlowCore/inheritActions/derived/
    beehive/trunk/netui/test/webapps/drt/coreWeb/pageFlowCore/inheritActions/derived/Controller.jpf   (with props)
    beehive/trunk/netui/test/webapps/drt/coreWeb/pageFlowCore/inheritActions/derived/index.jsp   (with props)
    beehive/trunk/netui/test/webapps/drt/testRecorder/tests/InheritActions.xml   (with props)
Modified:
    beehive/trunk/netui/src/compiler-core/org/apache/beehive/netui/compiler/grammar/WebappPathOrActionType.java
    beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/FlowController.java
    beehive/trunk/netui/test/webapps/drt/testRecorder/config/testRecorder-tests.xml

Modified: beehive/trunk/netui/src/compiler-core/org/apache/beehive/netui/compiler/grammar/WebappPathOrActionType.java
URL: http://svn.apache.org/viewcvs/beehive/trunk/netui/src/compiler-core/org/apache/beehive/netui/compiler/grammar/WebappPathOrActionType.java?rev=264849&r1=264848&r2=264849&view=diff
==============================================================================
--- beehive/trunk/netui/src/compiler-core/org/apache/beehive/netui/compiler/grammar/WebappPathOrActionType.java (original)
+++ beehive/trunk/netui/src/compiler-core/org/apache/beehive/netui/compiler/grammar/WebappPathOrActionType.java Tue Aug 30 13:24:39 2005
@@ -66,7 +66,7 @@
                 int extensionPos = stringValue.lastIndexOf( ACTION_EXTENSION_DOT );
                 String actionMethodName = stringValue.substring( 0, extensionPos );
                 FlowControllerInfo fcInfo = getFlowControllerInfo();
-                boolean foundIt = actionExists( actionMethodName, outerType, null, getEnv(), fcInfo, false );
+                boolean foundIt = actionExists( actionMethodName, outerType, null, getEnv(), fcInfo, true );
 
                 if ( ! foundIt && actionMethodName.length() > 0 )
                 {
@@ -83,7 +83,7 @@
                         if ( sfTypeDecl != null )
                         {
                             actionMethodName = actionMethodName.substring( dot + 1 );
-                            foundIt = actionExists( actionMethodName, sfTypeDecl, null, getEnv(), fcInfo, false );
+                            foundIt = actionExists( actionMethodName, sfTypeDecl, null, getEnv(), fcInfo, true );
                         }
                     }
                 }
@@ -146,33 +146,31 @@
                 }
             }
             
-            ClassType superType = classDecl.getSuperclass();
-            classDecl = superType != null ? superType.getClassTypeDeclaration() : null;
-        } while ( classDecl != null );
-        
-        //
-        // Next, look through the simple actions (annotations).
-        //
-        MergedControllerAnnotation mca = fcInfo.getMergedControllerAnnotation();
-        Collection simpleActionAnnotations = 
-                checkInheritedActions
-                ? mca.getSimpleActions()
-                : CompilerUtils.getAnnotationArrayValue( type, CONTROLLER_TAG_NAME, SIMPLE_ACTIONS_ATTR, true );
-        
-        if ( simpleActionAnnotations != null )
-        {
-            for ( Iterator ii = simpleActionAnnotations.iterator(); ii.hasNext(); )  
+            //
+            // Next, look through the simple actions (annotations).
+            //
+            Collection simpleActionAnnotations = 
+                CompilerUtils.getAnnotationArrayValue( classDecl, CONTROLLER_TAG_NAME, SIMPLE_ACTIONS_ATTR, true );
+            
+            if ( simpleActionAnnotations != null )
             {
-                AnnotationInstance ann = ( AnnotationInstance ) ii.next();
-                String name = CompilerUtils.getString( ann, NAME_ATTR, false );
-                
-                if ( actionName.equals( name )
-                     && ! CompilerUtils.annotationsAreEqual( ann, annotationToIgnore, false, env ) )
+                for ( Iterator i = simpleActionAnnotations.iterator(); i.hasNext(); )  
                 {
-                    return true;
+                    AnnotationInstance ann = ( AnnotationInstance ) i.next();
+                    String name = CompilerUtils.getString( ann, NAME_ATTR, false );
+                
+                    if ( actionName.equals( name )
+                            && ! CompilerUtils.annotationsAreEqual( ann, annotationToIgnore, false, env ) )
+                    {
+                        return true;
+                    }
                 }
             }
-        }
+            
+            ClassType superType = classDecl.getSuperclass();
+            classDecl = superType != null ? superType.getClassTypeDeclaration() : null;
+        } while ( checkInheritedActions && classDecl != null );
+        
         
         return false;
     }

Modified: beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/FlowController.java
URL: http://svn.apache.org/viewcvs/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/FlowController.java?rev=264849&r1=264848&r2=264849&view=diff
==============================================================================
--- beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/FlowController.java (original)
+++ beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/FlowController.java Tue Aug 30 13:24:39 2005
@@ -1901,7 +1901,6 @@
      * Set the user's currently selected Locale.
      *
      * @param locale  The user's selected Locale to be set, or null to select the server's default Locale
-     * @deprecated Use {@link #setLocale(Locale)}.
      */
     protected void setLocale( Locale locale )
     {

Added: beehive/trunk/netui/test/webapps/drt/coreWeb/pageFlowCore/inheritActions/base/Controller.jpf
URL: http://svn.apache.org/viewcvs/beehive/trunk/netui/test/webapps/drt/coreWeb/pageFlowCore/inheritActions/base/Controller.jpf?rev=264849&view=auto
==============================================================================
--- beehive/trunk/netui/test/webapps/drt/coreWeb/pageFlowCore/inheritActions/base/Controller.jpf (added)
+++ beehive/trunk/netui/test/webapps/drt/coreWeb/pageFlowCore/inheritActions/base/Controller.jpf Tue Aug 30 13:24:39 2005
@@ -0,0 +1,40 @@
+/*
+ * Copyright 2004 The Apache Software Foundation.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ * $Header:$
+ */
+package pageFlowCore.inheritActions.base;
+
+import org.apache.beehive.netui.pageflow.PageFlowController;
+import org.apache.beehive.netui.pageflow.Forward;
+import org.apache.beehive.netui.pageflow.annotations.Jpf;
+
+@Jpf.Controller(
+    simpleActions={
+        @Jpf.SimpleAction(name="simpleAction", path="index.jsp")
+    }
+)
+public abstract class Controller extends PageFlowController
+{
+    @Jpf.Action(
+        forwards={
+            @Jpf.Forward(name="index", path="index.jsp")
+        }
+    )
+    public Forward methodAction()
+    {
+        return new Forward( "index" );
+    }
+}

Propchange: beehive/trunk/netui/test/webapps/drt/coreWeb/pageFlowCore/inheritActions/base/Controller.jpf
------------------------------------------------------------------------------
    svn:eol-style = native

Added: beehive/trunk/netui/test/webapps/drt/coreWeb/pageFlowCore/inheritActions/base/index.jsp
URL: http://svn.apache.org/viewcvs/beehive/trunk/netui/test/webapps/drt/coreWeb/pageFlowCore/inheritActions/base/index.jsp?rev=264849&view=auto
==============================================================================
--- beehive/trunk/netui/test/webapps/drt/coreWeb/pageFlowCore/inheritActions/base/index.jsp (added)
+++ beehive/trunk/netui/test/webapps/drt/coreWeb/pageFlowCore/inheritActions/base/index.jsp Tue Aug 30 13:24:39 2005
@@ -0,0 +1,25 @@
+<%@ page language="java" contentType="text/html;charset=UTF-8"%>
+<%@ taglib prefix="netui" uri="http://beehive.apache.org/netui/tags-html-1.0"%>
+<%@ taglib prefix="netui-data" uri="http://beehive.apache.org/netui/tags-databinding-1.0"%>
+<%@ taglib prefix="netui-template" uri="http://beehive.apache.org/netui/tags-template-1.0"%>
+
+
+<netui:html>
+    <head>
+        <netui:base/>
+    </head>
+    <netui:body>
+        <h3>${pageFlow.URI}</h3>
+
+        <netui:anchor action="begin">begin</netui:anchor>
+
+        <netui:form action="submit">
+            foo: <netui:textBox dataSource="actionForm.foo"/><netui:error key="foo"/>
+            <br/>
+            <netui:button value="submit"/>
+        </netui:form>
+    </netui:body>
+</netui:html>
+
+  
+

Propchange: beehive/trunk/netui/test/webapps/drt/coreWeb/pageFlowCore/inheritActions/base/index.jsp
------------------------------------------------------------------------------
    svn:eol-style = native

Added: beehive/trunk/netui/test/webapps/drt/coreWeb/pageFlowCore/inheritActions/derived/Controller.jpf
URL: http://svn.apache.org/viewcvs/beehive/trunk/netui/test/webapps/drt/coreWeb/pageFlowCore/inheritActions/derived/Controller.jpf?rev=264849&view=auto
==============================================================================
--- beehive/trunk/netui/test/webapps/drt/coreWeb/pageFlowCore/inheritActions/derived/Controller.jpf (added)
+++ beehive/trunk/netui/test/webapps/drt/coreWeb/pageFlowCore/inheritActions/derived/Controller.jpf Tue Aug 30 13:24:39 2005
@@ -0,0 +1,52 @@
+/*
+ * Copyright 2004 The Apache Software Foundation.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ * $Header:$
+ */
+package pageFlowCore.inheritActions.derived;
+
+import org.apache.beehive.netui.pageflow.PageFlowController;
+import org.apache.beehive.netui.pageflow.Forward;
+import org.apache.beehive.netui.pageflow.annotations.Jpf;
+
+@Jpf.Controller(
+    simpleActions={
+        @Jpf.SimpleAction(name="begin", path="index.jsp"),
+        @Jpf.SimpleAction(name="delegateSimple1", action="simpleAction"),
+        @Jpf.SimpleAction(name="delegateMethod1", action="methodAction")
+    }
+)
+public class Controller extends pageFlowCore.inheritActions.base.Controller
+{
+    @Jpf.Action(
+        forwards={
+            @Jpf.Forward(name="delegateSimple", action="simpleAction")
+        }
+    )
+    public Forward delegateSimple2()
+    {
+        return new Forward( "delegateSimple" );
+    }
+
+    @Jpf.Action(
+        forwards={
+            @Jpf.Forward(name="delegateMethod", action="methodAction")
+        }
+    )
+    public Forward delegateMethod2()
+    {
+        return new Forward( "delegateMethod" );
+    }
+}

Propchange: beehive/trunk/netui/test/webapps/drt/coreWeb/pageFlowCore/inheritActions/derived/Controller.jpf
------------------------------------------------------------------------------
    svn:eol-style = native

Added: beehive/trunk/netui/test/webapps/drt/coreWeb/pageFlowCore/inheritActions/derived/index.jsp
URL: http://svn.apache.org/viewcvs/beehive/trunk/netui/test/webapps/drt/coreWeb/pageFlowCore/inheritActions/derived/index.jsp?rev=264849&view=auto
==============================================================================
--- beehive/trunk/netui/test/webapps/drt/coreWeb/pageFlowCore/inheritActions/derived/index.jsp (added)
+++ beehive/trunk/netui/test/webapps/drt/coreWeb/pageFlowCore/inheritActions/derived/index.jsp Tue Aug 30 13:24:39 2005
@@ -0,0 +1,20 @@
+<%@ page language="java" contentType="text/html;charset=UTF-8"%>
+<%@ taglib prefix="netui" uri="http://beehive.apache.org/netui/tags-html-1.0"%>
+<%@ taglib prefix="netui-data" uri="http://beehive.apache.org/netui/tags-databinding-1.0"%>
+<%@ taglib prefix="netui-template" uri="http://beehive.apache.org/netui/tags-template-1.0"%>
+
+
+<netui:html>
+    <head>
+        <netui:base/>
+    </head>
+    <netui:body>
+        <h3>${pageFlow.URI}</h3>
+
+        <netui:anchor action="delegateSimple1">delegateSimple1</netui:anchor><br/>
+        <netui:anchor action="delegateSimple2">delegateSimple2</netui:anchor><br/>
+        <netui:anchor action="delegateMethod1">delegateMethod1</netui:anchor><br/>
+        <netui:anchor action="delegateMethod2">delegateMethod2</netui:anchor><br/>
+
+    </netui:body>
+</netui:html>

Propchange: beehive/trunk/netui/test/webapps/drt/coreWeb/pageFlowCore/inheritActions/derived/index.jsp
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: beehive/trunk/netui/test/webapps/drt/testRecorder/config/testRecorder-tests.xml
URL: http://svn.apache.org/viewcvs/beehive/trunk/netui/test/webapps/drt/testRecorder/config/testRecorder-tests.xml?rev=264849&r1=264848&r2=264849&view=diff
==============================================================================
--- beehive/trunk/netui/test/webapps/drt/testRecorder/config/testRecorder-tests.xml (original)
+++ beehive/trunk/netui/test/webapps/drt/testRecorder/config/testRecorder-tests.xml Tue Aug 30 13:24:39 2005
@@ -4307,6 +4307,20 @@
          </features>
       </test>
       <test>
+         <name>InheritActions</name>
+         <description>Test to ensure that you can forward to an inherited action using the 'action' attribute on @Jpf.SimpleAction or @Jpf.Forward.</description>
+         <webapp>coreWeb</webapp>
+         <categories>
+            <category>bvt</category>
+            <category>bvt.struts11</category>
+            <category>corePageFlow</category>
+         </categories>
+         <features>
+            <feature>PageFlow</feature>
+            <feature>Inheritance</feature>
+         </features>
+      </test>
+      <test>
          <name>InheritControls</name>
          <description>Test of inheriting control member fields.</description>
          <webapp>coreWeb</webapp>

Added: beehive/trunk/netui/test/webapps/drt/testRecorder/tests/InheritActions.xml
URL: http://svn.apache.org/viewcvs/beehive/trunk/netui/test/webapps/drt/testRecorder/tests/InheritActions.xml?rev=264849&view=auto
==============================================================================
--- beehive/trunk/netui/test/webapps/drt/testRecorder/tests/InheritActions.xml (added)
+++ beehive/trunk/netui/test/webapps/drt/testRecorder/tests/InheritActions.xml Tue Aug 30 13:24:39 2005
@@ -0,0 +1,517 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ses:recorderSession xmlns:ses="http://beehive.apache.org/netui/tools/testrecorder/2004/session">
+   <ses:sessionName>InheritActions</ses:sessionName>
+   <ses:tester>rich</ses:tester>
+   <ses:startDate>30 Aug 2005, 11:29:39.714 AM MDT</ses:startDate>
+   <ses:description>Test to ensure that you can forward to an inherited action using the 'action' attribute on @Jpf.SimpleAction or @Jpf.Forward.</ses:description>
+   <ses:tests>
+      <ses:test>
+         <ses:testNumber>1</ses:testNumber>
+         <ses:request>
+            <ses:protocol>HTTP</ses:protocol>
+            <ses:protocolVersion>1.1</ses:protocolVersion>
+            <ses:host>localhost</ses:host>
+            <ses:port>8080</ses:port>
+            <ses:uri>/coreWeb/pageFlowCore/inheritActions/derived/Controller.jpf</ses:uri>
+            <ses:method>GET</ses:method>
+            <ses:parameters/>
+            <ses:cookies>
+               <ses:cookie>
+                  <ses:name>JSESSIONID</ses:name>
+                  <ses:value>A710F45278DB392E877E987105A3D45B</ses:value>
+               </ses:cookie>
+               <ses:cookie>
+                  <ses:name>Language</ses:name>
+                  <ses:value>en</ses:value>
+               </ses:cookie>
+               <ses:cookie>
+                  <ses:name>Country</ses:name>
+                  <ses:value>US</ses:value>
+               </ses:cookie>
+               <ses:cookie>
+                  <ses:name>nde-textsize</ses:name>
+                  <ses:value>16px</ses:value>
+               </ses:cookie>
+               <ses:cookie>
+                  <ses:name>JSESSIONID</ses:name>
+                  <ses:value>DJ4TTRnnh0zcXCvHHKLF6pKWz38bTKGBYchhLzym84RxGjYQT6GJ!2114912058</ses:value>
+               </ses:cookie>
+               <ses:cookie>
+                  <ses:name>ADMINCONSOLESESSION</ses:name>
+                  <ses:value>DTlC7sKxY4hHTTGfmB83G7npfbypLmfHzQMMDzJ5Btl3ylJ1jk4y!-1363440010</ses:value>
+               </ses:cookie>
+            </ses:cookies>
+            <ses:headers>
+               <ses:header>
+                  <ses:name>accept</ses:name>
+                  <ses:value>text/xml,application/xml,application/xhtml+xml,text/html;q=0.9,text/plain;q=0.8,image/png,*/*;q=0.5</ses:value>
+               </ses:header>
+               <ses:header>
+                  <ses:name>accept-charset</ses:name>
+                  <ses:value>ISO-8859-1,utf-8;q=0.7,*;q=0.7</ses:value>
+               </ses:header>
+               <ses:header>
+                  <ses:name>accept-encoding</ses:name>
+                  <ses:value>gzip,deflate</ses:value>
+               </ses:header>
+               <ses:header>
+                  <ses:name>accept-language</ses:name>
+                  <ses:value>en-us,en;q=0.7,ja;q=0.3</ses:value>
+               </ses:header>
+               <ses:header>
+                  <ses:name>connection</ses:name>
+                  <ses:value>keep-alive</ses:value>
+               </ses:header>
+               <ses:header>
+                  <ses:name>cookie</ses:name>
+                  <ses:value>JSESSIONID=A710F45278DB392E877E987105A3D45B; Language=en; Country=US; nde-textsize=16px; JSESSIONID=DJ4TTRnnh0zcXCvHHKLF6pKWz38bTKGBYchhLzym84RxGjYQT6GJ!2114912058; ADMINCONSOLESESSION=DTlC7sKxY4hHTTGfmB83G7npfbypLmfHzQMMDzJ5Btl3ylJ1jk4y!-1363440010</ses:value>
+               </ses:header>
+               <ses:header>
+                  <ses:name>host</ses:name>
+                  <ses:value>localhost:8080</ses:value>
+               </ses:header>
+               <ses:header>
+                  <ses:name>keep-alive</ses:name>
+                  <ses:value>300</ses:value>
+               </ses:header>
+               <ses:header>
+                  <ses:name>user-agent</ses:name>
+                  <ses:value>Mozilla/5.0 (Windows; U; Windows NT 5.1; en-US; rv:1.7.10) Gecko/20050716 Firefox/1.0.6</ses:value>
+               </ses:header>
+            </ses:headers>
+         </ses:request>
+         <ses:response>
+            <ses:statusCode>200</ses:statusCode>
+            <ses:reason/>
+            <ses:responseBody><![CDATA[<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
+	"http://www.w3.org/TR/html4/loose.dtd">
+<html lang="en">
+
+    <head>
+        <base href="http://localhost:8080/coreWeb/pageFlowCore/inheritActions/derived/index.jsp">
+    </head>
+    <body>
+        <h3>/pageFlowCore/inheritActions/derived/Controller.jpf</h3>
+
+        <a href="/coreWeb/pageFlowCore/inheritActions/derived/delegateSimple1.do">delegateSimple1</a><br/>
+        <a href="/coreWeb/pageFlowCore/inheritActions/derived/delegateSimple2.do">delegateSimple2</a><br/>
+        <a href="/coreWeb/pageFlowCore/inheritActions/derived/delegateMethod1.do">delegateMethod1</a><br/>
+        <a href="/coreWeb/pageFlowCore/inheritActions/derived/delegateMethod2.do">delegateMethod2</a><br/>
+
+    </body>
+
+</html>]]></ses:responseBody>
+         </ses:response>
+      </ses:test>
+      <ses:test>
+         <ses:testNumber>2</ses:testNumber>
+         <ses:request>
+            <ses:protocol>HTTP</ses:protocol>
+            <ses:protocolVersion>1.1</ses:protocolVersion>
+            <ses:host>localhost</ses:host>
+            <ses:port>8080</ses:port>
+            <ses:uri>/coreWeb/pageFlowCore/inheritActions/derived/delegateSimple1.do</ses:uri>
+            <ses:method>GET</ses:method>
+            <ses:parameters/>
+            <ses:cookies>
+               <ses:cookie>
+                  <ses:name>JSESSIONID</ses:name>
+                  <ses:value>A710F45278DB392E877E987105A3D45B</ses:value>
+               </ses:cookie>
+               <ses:cookie>
+                  <ses:name>Language</ses:name>
+                  <ses:value>en</ses:value>
+               </ses:cookie>
+               <ses:cookie>
+                  <ses:name>Country</ses:name>
+                  <ses:value>US</ses:value>
+               </ses:cookie>
+               <ses:cookie>
+                  <ses:name>nde-textsize</ses:name>
+                  <ses:value>16px</ses:value>
+               </ses:cookie>
+               <ses:cookie>
+                  <ses:name>JSESSIONID</ses:name>
+                  <ses:value>DJ4TTRnnh0zcXCvHHKLF6pKWz38bTKGBYchhLzym84RxGjYQT6GJ!2114912058</ses:value>
+               </ses:cookie>
+               <ses:cookie>
+                  <ses:name>ADMINCONSOLESESSION</ses:name>
+                  <ses:value>DTlC7sKxY4hHTTGfmB83G7npfbypLmfHzQMMDzJ5Btl3ylJ1jk4y!-1363440010</ses:value>
+               </ses:cookie>
+            </ses:cookies>
+            <ses:headers>
+               <ses:header>
+                  <ses:name>accept</ses:name>
+                  <ses:value>text/xml,application/xml,application/xhtml+xml,text/html;q=0.9,text/plain;q=0.8,image/png,*/*;q=0.5</ses:value>
+               </ses:header>
+               <ses:header>
+                  <ses:name>accept-charset</ses:name>
+                  <ses:value>ISO-8859-1,utf-8;q=0.7,*;q=0.7</ses:value>
+               </ses:header>
+               <ses:header>
+                  <ses:name>accept-encoding</ses:name>
+                  <ses:value>gzip,deflate</ses:value>
+               </ses:header>
+               <ses:header>
+                  <ses:name>accept-language</ses:name>
+                  <ses:value>en-us,en;q=0.7,ja;q=0.3</ses:value>
+               </ses:header>
+               <ses:header>
+                  <ses:name>connection</ses:name>
+                  <ses:value>keep-alive</ses:value>
+               </ses:header>
+               <ses:header>
+                  <ses:name>cookie</ses:name>
+                  <ses:value>JSESSIONID=A710F45278DB392E877E987105A3D45B; Language=en; Country=US; nde-textsize=16px; JSESSIONID=DJ4TTRnnh0zcXCvHHKLF6pKWz38bTKGBYchhLzym84RxGjYQT6GJ!2114912058; ADMINCONSOLESESSION=DTlC7sKxY4hHTTGfmB83G7npfbypLmfHzQMMDzJ5Btl3ylJ1jk4y!-1363440010</ses:value>
+               </ses:header>
+               <ses:header>
+                  <ses:name>host</ses:name>
+                  <ses:value>localhost:8080</ses:value>
+               </ses:header>
+               <ses:header>
+                  <ses:name>keep-alive</ses:name>
+                  <ses:value>300</ses:value>
+               </ses:header>
+               <ses:header>
+                  <ses:name>referer</ses:name>
+                  <ses:value>http://localhost:8080/coreWeb/pageFlowCore/inheritActions/derived/Controller.jpf</ses:value>
+               </ses:header>
+               <ses:header>
+                  <ses:name>user-agent</ses:name>
+                  <ses:value>Mozilla/5.0 (Windows; U; Windows NT 5.1; en-US; rv:1.7.10) Gecko/20050716 Firefox/1.0.6</ses:value>
+               </ses:header>
+            </ses:headers>
+         </ses:request>
+         <ses:response>
+            <ses:statusCode>200</ses:statusCode>
+            <ses:reason/>
+            <ses:responseBody><![CDATA[<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
+	"http://www.w3.org/TR/html4/loose.dtd">
+<html lang="en">
+
+    <head>
+        <base href="http://localhost:8080/coreWeb/pageFlowCore/inheritActions/derived/index.jsp">
+    </head>
+    <body>
+        <h3>/pageFlowCore/inheritActions/derived/Controller.jpf</h3>
+
+        <a href="/coreWeb/pageFlowCore/inheritActions/derived/delegateSimple1.do">delegateSimple1</a><br/>
+        <a href="/coreWeb/pageFlowCore/inheritActions/derived/delegateSimple2.do">delegateSimple2</a><br/>
+        <a href="/coreWeb/pageFlowCore/inheritActions/derived/delegateMethod1.do">delegateMethod1</a><br/>
+        <a href="/coreWeb/pageFlowCore/inheritActions/derived/delegateMethod2.do">delegateMethod2</a><br/>
+
+    </body>
+
+</html>]]></ses:responseBody>
+         </ses:response>
+      </ses:test>
+      <ses:test>
+         <ses:testNumber>3</ses:testNumber>
+         <ses:request>
+            <ses:protocol>HTTP</ses:protocol>
+            <ses:protocolVersion>1.1</ses:protocolVersion>
+            <ses:host>localhost</ses:host>
+            <ses:port>8080</ses:port>
+            <ses:uri>/coreWeb/pageFlowCore/inheritActions/derived/delegateSimple2.do</ses:uri>
+            <ses:method>GET</ses:method>
+            <ses:parameters/>
+            <ses:cookies>
+               <ses:cookie>
+                  <ses:name>JSESSIONID</ses:name>
+                  <ses:value>A710F45278DB392E877E987105A3D45B</ses:value>
+               </ses:cookie>
+               <ses:cookie>
+                  <ses:name>Language</ses:name>
+                  <ses:value>en</ses:value>
+               </ses:cookie>
+               <ses:cookie>
+                  <ses:name>Country</ses:name>
+                  <ses:value>US</ses:value>
+               </ses:cookie>
+               <ses:cookie>
+                  <ses:name>nde-textsize</ses:name>
+                  <ses:value>16px</ses:value>
+               </ses:cookie>
+               <ses:cookie>
+                  <ses:name>JSESSIONID</ses:name>
+                  <ses:value>DJ4TTRnnh0zcXCvHHKLF6pKWz38bTKGBYchhLzym84RxGjYQT6GJ!2114912058</ses:value>
+               </ses:cookie>
+               <ses:cookie>
+                  <ses:name>ADMINCONSOLESESSION</ses:name>
+                  <ses:value>DTlC7sKxY4hHTTGfmB83G7npfbypLmfHzQMMDzJ5Btl3ylJ1jk4y!-1363440010</ses:value>
+               </ses:cookie>
+            </ses:cookies>
+            <ses:headers>
+               <ses:header>
+                  <ses:name>accept</ses:name>
+                  <ses:value>text/xml,application/xml,application/xhtml+xml,text/html;q=0.9,text/plain;q=0.8,image/png,*/*;q=0.5</ses:value>
+               </ses:header>
+               <ses:header>
+                  <ses:name>accept-charset</ses:name>
+                  <ses:value>ISO-8859-1,utf-8;q=0.7,*;q=0.7</ses:value>
+               </ses:header>
+               <ses:header>
+                  <ses:name>accept-encoding</ses:name>
+                  <ses:value>gzip,deflate</ses:value>
+               </ses:header>
+               <ses:header>
+                  <ses:name>accept-language</ses:name>
+                  <ses:value>en-us,en;q=0.7,ja;q=0.3</ses:value>
+               </ses:header>
+               <ses:header>
+                  <ses:name>connection</ses:name>
+                  <ses:value>keep-alive</ses:value>
+               </ses:header>
+               <ses:header>
+                  <ses:name>cookie</ses:name>
+                  <ses:value>JSESSIONID=A710F45278DB392E877E987105A3D45B; Language=en; Country=US; nde-textsize=16px; JSESSIONID=DJ4TTRnnh0zcXCvHHKLF6pKWz38bTKGBYchhLzym84RxGjYQT6GJ!2114912058; ADMINCONSOLESESSION=DTlC7sKxY4hHTTGfmB83G7npfbypLmfHzQMMDzJ5Btl3ylJ1jk4y!-1363440010</ses:value>
+               </ses:header>
+               <ses:header>
+                  <ses:name>host</ses:name>
+                  <ses:value>localhost:8080</ses:value>
+               </ses:header>
+               <ses:header>
+                  <ses:name>keep-alive</ses:name>
+                  <ses:value>300</ses:value>
+               </ses:header>
+               <ses:header>
+                  <ses:name>referer</ses:name>
+                  <ses:value>http://localhost:8080/coreWeb/pageFlowCore/inheritActions/derived/delegateSimple1.do</ses:value>
+               </ses:header>
+               <ses:header>
+                  <ses:name>user-agent</ses:name>
+                  <ses:value>Mozilla/5.0 (Windows; U; Windows NT 5.1; en-US; rv:1.7.10) Gecko/20050716 Firefox/1.0.6</ses:value>
+               </ses:header>
+            </ses:headers>
+         </ses:request>
+         <ses:response>
+            <ses:statusCode>200</ses:statusCode>
+            <ses:reason/>
+            <ses:responseBody><![CDATA[<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
+	"http://www.w3.org/TR/html4/loose.dtd">
+<html lang="en">
+
+    <head>
+        <base href="http://localhost:8080/coreWeb/pageFlowCore/inheritActions/derived/index.jsp">
+    </head>
+    <body>
+        <h3>/pageFlowCore/inheritActions/derived/Controller.jpf</h3>
+
+        <a href="/coreWeb/pageFlowCore/inheritActions/derived/delegateSimple1.do">delegateSimple1</a><br/>
+        <a href="/coreWeb/pageFlowCore/inheritActions/derived/delegateSimple2.do">delegateSimple2</a><br/>
+        <a href="/coreWeb/pageFlowCore/inheritActions/derived/delegateMethod1.do">delegateMethod1</a><br/>
+        <a href="/coreWeb/pageFlowCore/inheritActions/derived/delegateMethod2.do">delegateMethod2</a><br/>
+
+    </body>
+
+</html>]]></ses:responseBody>
+         </ses:response>
+      </ses:test>
+      <ses:test>
+         <ses:testNumber>4</ses:testNumber>
+         <ses:request>
+            <ses:protocol>HTTP</ses:protocol>
+            <ses:protocolVersion>1.1</ses:protocolVersion>
+            <ses:host>localhost</ses:host>
+            <ses:port>8080</ses:port>
+            <ses:uri>/coreWeb/pageFlowCore/inheritActions/derived/delegateMethod1.do</ses:uri>
+            <ses:method>GET</ses:method>
+            <ses:parameters/>
+            <ses:cookies>
+               <ses:cookie>
+                  <ses:name>JSESSIONID</ses:name>
+                  <ses:value>A710F45278DB392E877E987105A3D45B</ses:value>
+               </ses:cookie>
+               <ses:cookie>
+                  <ses:name>Language</ses:name>
+                  <ses:value>en</ses:value>
+               </ses:cookie>
+               <ses:cookie>
+                  <ses:name>Country</ses:name>
+                  <ses:value>US</ses:value>
+               </ses:cookie>
+               <ses:cookie>
+                  <ses:name>nde-textsize</ses:name>
+                  <ses:value>16px</ses:value>
+               </ses:cookie>
+               <ses:cookie>
+                  <ses:name>JSESSIONID</ses:name>
+                  <ses:value>DJ4TTRnnh0zcXCvHHKLF6pKWz38bTKGBYchhLzym84RxGjYQT6GJ!2114912058</ses:value>
+               </ses:cookie>
+               <ses:cookie>
+                  <ses:name>ADMINCONSOLESESSION</ses:name>
+                  <ses:value>DTlC7sKxY4hHTTGfmB83G7npfbypLmfHzQMMDzJ5Btl3ylJ1jk4y!-1363440010</ses:value>
+               </ses:cookie>
+            </ses:cookies>
+            <ses:headers>
+               <ses:header>
+                  <ses:name>accept</ses:name>
+                  <ses:value>text/xml,application/xml,application/xhtml+xml,text/html;q=0.9,text/plain;q=0.8,image/png,*/*;q=0.5</ses:value>
+               </ses:header>
+               <ses:header>
+                  <ses:name>accept-charset</ses:name>
+                  <ses:value>ISO-8859-1,utf-8;q=0.7,*;q=0.7</ses:value>
+               </ses:header>
+               <ses:header>
+                  <ses:name>accept-encoding</ses:name>
+                  <ses:value>gzip,deflate</ses:value>
+               </ses:header>
+               <ses:header>
+                  <ses:name>accept-language</ses:name>
+                  <ses:value>en-us,en;q=0.7,ja;q=0.3</ses:value>
+               </ses:header>
+               <ses:header>
+                  <ses:name>connection</ses:name>
+                  <ses:value>keep-alive</ses:value>
+               </ses:header>
+               <ses:header>
+                  <ses:name>cookie</ses:name>
+                  <ses:value>JSESSIONID=A710F45278DB392E877E987105A3D45B; Language=en; Country=US; nde-textsize=16px; JSESSIONID=DJ4TTRnnh0zcXCvHHKLF6pKWz38bTKGBYchhLzym84RxGjYQT6GJ!2114912058; ADMINCONSOLESESSION=DTlC7sKxY4hHTTGfmB83G7npfbypLmfHzQMMDzJ5Btl3ylJ1jk4y!-1363440010</ses:value>
+               </ses:header>
+               <ses:header>
+                  <ses:name>host</ses:name>
+                  <ses:value>localhost:8080</ses:value>
+               </ses:header>
+               <ses:header>
+                  <ses:name>keep-alive</ses:name>
+                  <ses:value>300</ses:value>
+               </ses:header>
+               <ses:header>
+                  <ses:name>referer</ses:name>
+                  <ses:value>http://localhost:8080/coreWeb/pageFlowCore/inheritActions/derived/delegateSimple2.do</ses:value>
+               </ses:header>
+               <ses:header>
+                  <ses:name>user-agent</ses:name>
+                  <ses:value>Mozilla/5.0 (Windows; U; Windows NT 5.1; en-US; rv:1.7.10) Gecko/20050716 Firefox/1.0.6</ses:value>
+               </ses:header>
+            </ses:headers>
+         </ses:request>
+         <ses:response>
+            <ses:statusCode>200</ses:statusCode>
+            <ses:reason/>
+            <ses:responseBody><![CDATA[<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
+	"http://www.w3.org/TR/html4/loose.dtd">
+<html lang="en">
+
+    <head>
+        <base href="http://localhost:8080/coreWeb/pageFlowCore/inheritActions/derived/index.jsp">
+    </head>
+    <body>
+        <h3>/pageFlowCore/inheritActions/derived/Controller.jpf</h3>
+
+        <a href="/coreWeb/pageFlowCore/inheritActions/derived/delegateSimple1.do">delegateSimple1</a><br/>
+        <a href="/coreWeb/pageFlowCore/inheritActions/derived/delegateSimple2.do">delegateSimple2</a><br/>
+        <a href="/coreWeb/pageFlowCore/inheritActions/derived/delegateMethod1.do">delegateMethod1</a><br/>
+        <a href="/coreWeb/pageFlowCore/inheritActions/derived/delegateMethod2.do">delegateMethod2</a><br/>
+
+    </body>
+
+</html>]]></ses:responseBody>
+         </ses:response>
+      </ses:test>
+      <ses:test>
+         <ses:testNumber>5</ses:testNumber>
+         <ses:request>
+            <ses:protocol>HTTP</ses:protocol>
+            <ses:protocolVersion>1.1</ses:protocolVersion>
+            <ses:host>localhost</ses:host>
+            <ses:port>8080</ses:port>
+            <ses:uri>/coreWeb/pageFlowCore/inheritActions/derived/delegateMethod2.do</ses:uri>
+            <ses:method>GET</ses:method>
+            <ses:parameters/>
+            <ses:cookies>
+               <ses:cookie>
+                  <ses:name>JSESSIONID</ses:name>
+                  <ses:value>A710F45278DB392E877E987105A3D45B</ses:value>
+               </ses:cookie>
+               <ses:cookie>
+                  <ses:name>Language</ses:name>
+                  <ses:value>en</ses:value>
+               </ses:cookie>
+               <ses:cookie>
+                  <ses:name>Country</ses:name>
+                  <ses:value>US</ses:value>
+               </ses:cookie>
+               <ses:cookie>
+                  <ses:name>nde-textsize</ses:name>
+                  <ses:value>16px</ses:value>
+               </ses:cookie>
+               <ses:cookie>
+                  <ses:name>JSESSIONID</ses:name>
+                  <ses:value>DJ4TTRnnh0zcXCvHHKLF6pKWz38bTKGBYchhLzym84RxGjYQT6GJ!2114912058</ses:value>
+               </ses:cookie>
+               <ses:cookie>
+                  <ses:name>ADMINCONSOLESESSION</ses:name>
+                  <ses:value>DTlC7sKxY4hHTTGfmB83G7npfbypLmfHzQMMDzJ5Btl3ylJ1jk4y!-1363440010</ses:value>
+               </ses:cookie>
+            </ses:cookies>
+            <ses:headers>
+               <ses:header>
+                  <ses:name>accept</ses:name>
+                  <ses:value>text/xml,application/xml,application/xhtml+xml,text/html;q=0.9,text/plain;q=0.8,image/png,*/*;q=0.5</ses:value>
+               </ses:header>
+               <ses:header>
+                  <ses:name>accept-charset</ses:name>
+                  <ses:value>ISO-8859-1,utf-8;q=0.7,*;q=0.7</ses:value>
+               </ses:header>
+               <ses:header>
+                  <ses:name>accept-encoding</ses:name>
+                  <ses:value>gzip,deflate</ses:value>
+               </ses:header>
+               <ses:header>
+                  <ses:name>accept-language</ses:name>
+                  <ses:value>en-us,en;q=0.7,ja;q=0.3</ses:value>
+               </ses:header>
+               <ses:header>
+                  <ses:name>connection</ses:name>
+                  <ses:value>keep-alive</ses:value>
+               </ses:header>
+               <ses:header>
+                  <ses:name>cookie</ses:name>
+                  <ses:value>JSESSIONID=A710F45278DB392E877E987105A3D45B; Language=en; Country=US; nde-textsize=16px; JSESSIONID=DJ4TTRnnh0zcXCvHHKLF6pKWz38bTKGBYchhLzym84RxGjYQT6GJ!2114912058; ADMINCONSOLESESSION=DTlC7sKxY4hHTTGfmB83G7npfbypLmfHzQMMDzJ5Btl3ylJ1jk4y!-1363440010</ses:value>
+               </ses:header>
+               <ses:header>
+                  <ses:name>host</ses:name>
+                  <ses:value>localhost:8080</ses:value>
+               </ses:header>
+               <ses:header>
+                  <ses:name>keep-alive</ses:name>
+                  <ses:value>300</ses:value>
+               </ses:header>
+               <ses:header>
+                  <ses:name>referer</ses:name>
+                  <ses:value>http://localhost:8080/coreWeb/pageFlowCore/inheritActions/derived/delegateMethod1.do</ses:value>
+               </ses:header>
+               <ses:header>
+                  <ses:name>user-agent</ses:name>
+                  <ses:value>Mozilla/5.0 (Windows; U; Windows NT 5.1; en-US; rv:1.7.10) Gecko/20050716 Firefox/1.0.6</ses:value>
+               </ses:header>
+            </ses:headers>
+         </ses:request>
+         <ses:response>
+            <ses:statusCode>200</ses:statusCode>
+            <ses:reason/>
+            <ses:responseBody><![CDATA[<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
+	"http://www.w3.org/TR/html4/loose.dtd">
+<html lang="en">
+
+    <head>
+        <base href="http://localhost:8080/coreWeb/pageFlowCore/inheritActions/derived/index.jsp">
+    </head>
+    <body>
+        <h3>/pageFlowCore/inheritActions/derived/Controller.jpf</h3>
+
+        <a href="/coreWeb/pageFlowCore/inheritActions/derived/delegateSimple1.do">delegateSimple1</a><br/>
+        <a href="/coreWeb/pageFlowCore/inheritActions/derived/delegateSimple2.do">delegateSimple2</a><br/>
+        <a href="/coreWeb/pageFlowCore/inheritActions/derived/delegateMethod1.do">delegateMethod1</a><br/>
+        <a href="/coreWeb/pageFlowCore/inheritActions/derived/delegateMethod2.do">delegateMethod2</a><br/>
+
+    </body>
+
+</html>]]></ses:responseBody>
+         </ses:response>
+      </ses:test>
+   </ses:tests>
+   <ses:endDate>30 Aug 2005, 11:29:49.689 AM MDT</ses:endDate>
+   <ses:testCount>5</ses:testCount>
+</ses:recorderSession>

Propchange: beehive/trunk/netui/test/webapps/drt/testRecorder/tests/InheritActions.xml
------------------------------------------------------------------------------
    svn:eol-style = native