You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@beehive.apache.org by cr...@apache.org on 2006/01/30 23:48:14 UTC
svn commit: r373618 - in /beehive/trunk/netui:
src/compiler-core/org/apache/beehive/netui/compiler/genmodel/
src/pageflow/org/apache/beehive/netui/pageflow/config/
test/webapps/drt/testRecorder/config/ test/webapps/drt/testRecorder/tests/
test/webapps/...
Author: crogers
Date: Mon Jan 30 14:47:50 2006
New Revision: 373618
URL: http://svn.apache.org/viewcvs?rev=373618&view=rev
Log:
Fix for http://issues.apache.org/jira/browse/BEEHIVE-1054 - Overriding Simple Action and changing the form bean use causes a null value object
This commit includes a new test cover this condition. See netui/test/webapps/drt/web/bugs/j1054/override/.
ests: bvt in netui, including compiler tests (WinXP)
Added:
beehive/trunk/netui/test/webapps/drt/testRecorder/tests/J1054.xml (with props)
beehive/trunk/netui/test/webapps/drt/web/bugs/j1054/
beehive/trunk/netui/test/webapps/drt/web/bugs/j1054/inherit/
beehive/trunk/netui/test/webapps/drt/web/bugs/j1054/inherit/Controller.java (with props)
beehive/trunk/netui/test/webapps/drt/web/bugs/j1054/inherit/index.jsp (with props)
beehive/trunk/netui/test/webapps/drt/web/bugs/j1054/override/
beehive/trunk/netui/test/webapps/drt/web/bugs/j1054/override/Controller.java (with props)
beehive/trunk/netui/test/webapps/drt/web/bugs/j1054/override/index.jsp (with props)
beehive/trunk/netui/test/webapps/drt/web/bugs/j1054/parent/
beehive/trunk/netui/test/webapps/drt/web/bugs/j1054/parent/Controller.java (with props)
beehive/trunk/netui/test/webapps/drt/web/bugs/j1054/parent/index.jsp (with props)
Modified:
beehive/trunk/netui/src/compiler-core/org/apache/beehive/netui/compiler/genmodel/DelegatingActionModel.java
beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/config/DelegatingActionMapping.java
beehive/trunk/netui/test/webapps/drt/testRecorder/config/testRecorder-tests.xml
Modified: beehive/trunk/netui/src/compiler-core/org/apache/beehive/netui/compiler/genmodel/DelegatingActionModel.java
URL: http://svn.apache.org/viewcvs/beehive/trunk/netui/src/compiler-core/org/apache/beehive/netui/compiler/genmodel/DelegatingActionModel.java?rev=373618&r1=373617&r2=373618&view=diff
==============================================================================
--- beehive/trunk/netui/src/compiler-core/org/apache/beehive/netui/compiler/genmodel/DelegatingActionModel.java (original)
+++ beehive/trunk/netui/src/compiler-core/org/apache/beehive/netui/compiler/genmodel/DelegatingActionModel.java Mon Jan 30 14:47:50 2006
@@ -69,15 +69,15 @@
// loginRequired - Set this to override the delegating action property
// only if loginRequired is set on the Controller annotation.
- AnnotationInstance controllerAnnotation = CompilerUtils.getAnnotation( jclass, CONTROLLER_TAG_NAME );
- Boolean loginRequired = CompilerUtils.getBoolean( controllerAnnotation, LOGIN_REQUIRED_ATTR, true );
+ AnnotationInstance controllerAnnotation = CompilerUtils.getAnnotation(jclass, CONTROLLER_TAG_NAME);
+ Boolean loginRequired = CompilerUtils.getBoolean(controllerAnnotation, LOGIN_REQUIRED_ATTR, true);
if (loginRequired != null) {
setLoginRequired(loginRequired);
}
// readOnly - Set this to override the delegating action property
// only if readOnly is set on the Controller annotation.
- Boolean readOnly = CompilerUtils.getBoolean( controllerAnnotation, READONLY_ATTR, true );
+ Boolean readOnly = CompilerUtils.getBoolean(controllerAnnotation, READONLY_ATTR, true);
if (readOnly != null) {
setReadonly(readOnly);
}
@@ -86,7 +86,7 @@
// If it's not set on this controller, check the action annotation, then the
// parent controller.
if (loginRequired == null) {
- loginRequired = CompilerUtils.getBoolean( annotation, LOGIN_REQUIRED_ATTR, true );
+ loginRequired = CompilerUtils.getBoolean(annotation, LOGIN_REQUIRED_ATTR, true);
if (loginRequired == null) {
loginRequired = parent.getFlowControllerInfo().getMergedControllerAnnotation().isLoginRequired();
}
@@ -94,6 +94,9 @@
if (loginRequired == null || loginRequired.booleanValue()) {
setRolesAllowed(annotation, jclass, parent);
}
+
+ // form bean member -- the page-flow-scoped form referenced by the action (a member variable)
+ setFormMember(CompilerUtils.getString(annotation, USE_FORM_BEAN_ATTR, true));
}
protected void addSetProperty(XmlModelWriter xw, Element element, String propertyName, String propertyValue) {
Modified: beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/config/DelegatingActionMapping.java
URL: http://svn.apache.org/viewcvs/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/config/DelegatingActionMapping.java?rev=373618&r1=373617&r2=373618&view=diff
==============================================================================
--- beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/config/DelegatingActionMapping.java (original)
+++ beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/config/DelegatingActionMapping.java Mon Jan 30 14:47:50 2006
@@ -152,14 +152,6 @@
return _delegate instanceof PageFlowActionMapping && ((PageFlowActionMapping) _delegate).isOverloaded();
}
- public String getFormMember() {
- return _delegate instanceof PageFlowActionMapping ? ((PageFlowActionMapping) _delegate).getFormMember() : null;
- }
-
- public String getFormClass() {
- return _delegate instanceof PageFlowActionMapping ? ((PageFlowActionMapping) _delegate).getFormClass() : null;
- }
-
public Map getConditionalForwardsMap() {
return _delegate instanceof PageFlowActionMapping ? ((PageFlowActionMapping) _delegate).getConditionalForwardsMap() : null;
}
@@ -184,14 +176,6 @@
return _delegate.getInputForward();
}
- public String getAttribute() {
- return _delegate.getAttribute();
- }
-
- public void setAttribute(String attribute) {
- _delegate.setAttribute(attribute);
- }
-
public String getForward() {
return _delegate.getForward();
}
@@ -206,10 +190,6 @@
public String getMultipartClass() {
return _delegate.getMultipartClass();
- }
-
- public String getName() {
- return _delegate.getName();
}
public String getPrefix() {
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=373618&r1=373617&r2=373618&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 Mon Jan 30 14:47:50 2006
@@ -5053,6 +5053,20 @@
</categories>
</test>
<test>
+ <name>J1054</name>
+ <description>Test that the desired form bean can be created correctly when inheriting or overriding a simple action with the useFormBean attribute.</description>
+ <webapp>coreWeb</webapp>
+ <categories>
+ <category>bvt</category>
+ <category>bvt.struts11</category>
+ <category>jiraBugs</category>
+ </categories>
+ <features>
+ <feature>PageFlow</feature>
+ <feature>Inheritance</feature>
+ </features>
+ </test>
+ <test>
<name>JpfScopedFormsTest49</name>
<description>JpfScopedFormsTest49</description>
<webapp>coreWeb</webapp>
Added: beehive/trunk/netui/test/webapps/drt/testRecorder/tests/J1054.xml
URL: http://svn.apache.org/viewcvs/beehive/trunk/netui/test/webapps/drt/testRecorder/tests/J1054.xml?rev=373618&view=auto
==============================================================================
--- beehive/trunk/netui/test/webapps/drt/testRecorder/tests/J1054.xml (added)
+++ beehive/trunk/netui/test/webapps/drt/testRecorder/tests/J1054.xml Mon Jan 30 14:47:50 2006
@@ -0,0 +1,355 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<recorderSession xmlns="http://beehive.apache.org/netui/tools/testrecorder/2004/session">
+<sessionName>J1054</sessionName>
+<tester>crogers</tester>
+<startDate>30 Jan 2006, 01:27:58.270 PM MST</startDate>
+<description>Test that the desired form bean can be created correctly when inheriting or overriding a simple action with the useFormBean attribute. </description>
+<tests>
+<test>
+<testNumber>1</testNumber>
+<request>
+<protocol>HTTP</protocol>
+<protocolVersion>1.1</protocolVersion>
+<host>localhost</host>
+<port>8080</port>
+<uri>/coreWeb/bugs/j1054/inherit/begin.do</uri>
+<method>GET</method>
+<parameters>
+</parameters>
+<cookies>
+<cookie>
+<name>JSESSIONID</name>
+<value>6B9F56D6FAA4A43A4A5B6030004AABD5</value>
+</cookie>
+</cookies>
+<headers>
+<header>
+<name>accept</name>
+<value>text/xml,application/xml,application/xhtml+xml,text/html;q=0.9,text/plain;q=0.8,image/png,*/*;q=0.5</value>
+</header>
+<header>
+<name>accept-charset</name>
+<value>UTF-8,*</value>
+</header>
+<header>
+<name>accept-encoding</name>
+<value>gzip,deflate</value>
+</header>
+<header>
+<name>accept-language</name>
+<value>en-us,en;q=0.5</value>
+</header>
+<header>
+<name>connection</name>
+<value>keep-alive</value>
+</header>
+<header>
+<name>cookie</name>
+<value>JSESSIONID=6B9F56D6FAA4A43A4A5B6030004AABD5</value>
+</header>
+<header>
+<name>host</name>
+<value>localhost:8080</value>
+</header>
+<header>
+<name>keep-alive</name>
+<value>300</value>
+</header>
+<header>
+<name>user-agent</name>
+<value>Mozilla/5.0 (Windows; U; Windows NT 5.1; en-US; rv:1.8) Gecko/20051111 Firefox/1.5</value>
+</header>
+</headers>
+</request>
+<response>
+<statusCode>200</statusCode>
+<reason></reason>
+<responseBody>
+<![CDATA[<html>
+<head>
+ <title>Page Flow Inheritance - Inherit useFormBean annotation attribute</title>
+</head>
+<body>
+ <h1>Page Flow Inheritance - Inherit useFormBean annotation attribute</h1>
+ <h3>Inherit Simple Action - useFormBean attribute set</h3>
+ <br/>
+ <form action="/coreWeb/bugs/j1054/inherit/actionOne.do" method="post">
+ <input type="text" name="{actionForm.name}" value="Form One"><br />
+ Input Value:<span>Form One</span><br />
+ <input type="submit" name="actionOverride:actionOne" value="Action One">
+ </form>
+ <br/>
+ <a href="/coreWeb/bugs/j1054/inherit/begin.do">begin</a>
+</body>
+</html>]]>
+</responseBody>
+</response>
+</test>
+<test>
+<testNumber>2</testNumber>
+<request>
+<protocol>HTTP</protocol>
+<protocolVersion>1.1</protocolVersion>
+<host>localhost</host>
+<port>8080</port>
+<uri>/coreWeb/bugs/j1054/override/begin.do</uri>
+<method>GET</method>
+<parameters>
+</parameters>
+<cookies>
+<cookie>
+<name>JSESSIONID</name>
+<value>6B9F56D6FAA4A43A4A5B6030004AABD5</value>
+</cookie>
+</cookies>
+<headers>
+<header>
+<name>accept</name>
+<value>text/xml,application/xml,application/xhtml+xml,text/html;q=0.9,text/plain;q=0.8,image/png,*/*;q=0.5</value>
+</header>
+<header>
+<name>accept-charset</name>
+<value>UTF-8,*</value>
+</header>
+<header>
+<name>accept-encoding</name>
+<value>gzip,deflate</value>
+</header>
+<header>
+<name>accept-language</name>
+<value>en-us,en;q=0.5</value>
+</header>
+<header>
+<name>connection</name>
+<value>keep-alive</value>
+</header>
+<header>
+<name>cookie</name>
+<value>JSESSIONID=6B9F56D6FAA4A43A4A5B6030004AABD5</value>
+</header>
+<header>
+<name>host</name>
+<value>localhost:8080</value>
+</header>
+<header>
+<name>keep-alive</name>
+<value>300</value>
+</header>
+<header>
+<name>user-agent</name>
+<value>Mozilla/5.0 (Windows; U; Windows NT 5.1; en-US; rv:1.8) Gecko/20051111 Firefox/1.5</value>
+</header>
+</headers>
+</request>
+<response>
+<statusCode>200</statusCode>
+<reason></reason>
+<responseBody>
+<![CDATA[<html>
+<head>
+ <title>Page Flow Inheritance - Override useFormBean annotation attribute</title>
+</head>
+<body>
+ <h1>Page Flow Inheritance - Override useFormBean annotation attribute</h1>
+ <h3>Override Simple Action - Remove useFormBean attribute</h3>
+ <br/>
+ <form action="/coreWeb/bugs/j1054/override/actionOne.do" method="post">
+ <input type="text" name="{actionForm.name}" value="Form One"><br />
+ Input Value:<span>Form One</span><br />
+ <input type="submit" name="actionOverride:actionOne" value="Action One">
+ </form>
+ <br/>
+ <a href="/coreWeb/bugs/j1054/override/begin.do">begin</a>
+</body>
+</html>]]>
+</responseBody>
+</response>
+</test>
+<test>
+<testNumber>3</testNumber>
+<request>
+<protocol>HTTP</protocol>
+<protocolVersion>1.1</protocolVersion>
+<host>localhost</host>
+<port>8080</port>
+<uri>/coreWeb/bugs/j1054/override/actionOne.do</uri>
+<method>POST</method>
+<parameters>
+<parameter>
+<name>actionOverride:actionOne</name>
+<value>Action One</value>
+</parameter>
+<parameter>
+<name>{actionForm.name}</name>
+<value>Override Action</value>
+</parameter>
+</parameters>
+<cookies>
+<cookie>
+<name>JSESSIONID</name>
+<value>6B9F56D6FAA4A43A4A5B6030004AABD5</value>
+</cookie>
+</cookies>
+<headers>
+<header>
+<name>accept</name>
+<value>text/xml,application/xml,application/xhtml+xml,text/html;q=0.9,text/plain;q=0.8,image/png,*/*;q=0.5</value>
+</header>
+<header>
+<name>accept-charset</name>
+<value>UTF-8,*</value>
+</header>
+<header>
+<name>accept-encoding</name>
+<value>gzip,deflate</value>
+</header>
+<header>
+<name>accept-language</name>
+<value>en-us,en;q=0.5</value>
+</header>
+<header>
+<name>connection</name>
+<value>keep-alive</value>
+</header>
+<header>
+<name>content-length</name>
+<value>75</value>
+</header>
+<header>
+<name>content-type</name>
+<value>application/x-www-form-urlencoded</value>
+</header>
+<header>
+<name>cookie</name>
+<value>JSESSIONID=6B9F56D6FAA4A43A4A5B6030004AABD5</value>
+</header>
+<header>
+<name>host</name>
+<value>localhost:8080</value>
+</header>
+<header>
+<name>keep-alive</name>
+<value>300</value>
+</header>
+<header>
+<name>referer</name>
+<value>http://localhost:8080/coreWeb/bugs/j1054/override/begin.do</value>
+</header>
+<header>
+<name>user-agent</name>
+<value>Mozilla/5.0 (Windows; U; Windows NT 5.1; en-US; rv:1.8) Gecko/20051111 Firefox/1.5</value>
+</header>
+</headers>
+</request>
+<response>
+<statusCode>200</statusCode>
+<reason></reason>
+<responseBody>
+<![CDATA[<html>
+<head>
+ <title>Page Flow Inheritance - Override useFormBean annotation attribute</title>
+</head>
+<body>
+ <h1>Page Flow Inheritance - Override useFormBean annotation attribute</h1>
+ <h3>Override Simple Action - Remove useFormBean attribute</h3>
+ <br/>
+ <form action="/coreWeb/bugs/j1054/override/actionOne.do" method="post">
+ <input type="text" name="{actionForm.name}" value="Override Action"><br />
+ Input Value:<span>Override Action</span><br />
+ <input type="submit" name="actionOverride:actionOne" value="Action One">
+ </form>
+ <br/>
+ <a href="/coreWeb/bugs/j1054/override/begin.do">begin</a>
+</body>
+</html>]]>
+</responseBody>
+</response>
+</test>
+<test>
+<testNumber>4</testNumber>
+<request>
+<protocol>HTTP</protocol>
+<protocolVersion>1.1</protocolVersion>
+<host>localhost</host>
+<port>8080</port>
+<uri>/coreWeb/bugs/j1054/override/begin.do</uri>
+<method>GET</method>
+<parameters>
+</parameters>
+<cookies>
+<cookie>
+<name>JSESSIONID</name>
+<value>6B9F56D6FAA4A43A4A5B6030004AABD5</value>
+</cookie>
+</cookies>
+<headers>
+<header>
+<name>accept</name>
+<value>text/xml,application/xml,application/xhtml+xml,text/html;q=0.9,text/plain;q=0.8,image/png,*/*;q=0.5</value>
+</header>
+<header>
+<name>accept-charset</name>
+<value>UTF-8,*</value>
+</header>
+<header>
+<name>accept-encoding</name>
+<value>gzip,deflate</value>
+</header>
+<header>
+<name>accept-language</name>
+<value>en-us,en;q=0.5</value>
+</header>
+<header>
+<name>connection</name>
+<value>keep-alive</value>
+</header>
+<header>
+<name>cookie</name>
+<value>JSESSIONID=6B9F56D6FAA4A43A4A5B6030004AABD5</value>
+</header>
+<header>
+<name>host</name>
+<value>localhost:8080</value>
+</header>
+<header>
+<name>keep-alive</name>
+<value>300</value>
+</header>
+<header>
+<name>referer</name>
+<value>http://localhost:8080/coreWeb/bugs/j1054/override/actionOne.do</value>
+</header>
+<header>
+<name>user-agent</name>
+<value>Mozilla/5.0 (Windows; U; Windows NT 5.1; en-US; rv:1.8) Gecko/20051111 Firefox/1.5</value>
+</header>
+</headers>
+</request>
+<response>
+<statusCode>200</statusCode>
+<reason></reason>
+<responseBody>
+<![CDATA[<html>
+<head>
+ <title>Page Flow Inheritance - Override useFormBean annotation attribute</title>
+</head>
+<body>
+ <h1>Page Flow Inheritance - Override useFormBean annotation attribute</h1>
+ <h3>Override Simple Action - Remove useFormBean attribute</h3>
+ <br/>
+ <form action="/coreWeb/bugs/j1054/override/actionOne.do" method="post">
+ <input type="text" name="{actionForm.name}" value="Form One"><br />
+ Input Value:<span>Form One</span><br />
+ <input type="submit" name="actionOverride:actionOne" value="Action One">
+ </form>
+ <br/>
+ <a href="/coreWeb/bugs/j1054/override/begin.do">begin</a>
+</body>
+</html>]]>
+</responseBody>
+</response>
+</test>
+</tests>
+<endDate>30 Jan 2006, 01:29:40.277 PM MST</endDate>
+<testCount>4</testCount>
+</recorderSession>
Propchange: beehive/trunk/netui/test/webapps/drt/testRecorder/tests/J1054.xml
------------------------------------------------------------------------------
svn:eol-style = native
Added: beehive/trunk/netui/test/webapps/drt/web/bugs/j1054/inherit/Controller.java
URL: http://svn.apache.org/viewcvs/beehive/trunk/netui/test/webapps/drt/web/bugs/j1054/inherit/Controller.java?rev=373618&view=auto
==============================================================================
--- beehive/trunk/netui/test/webapps/drt/web/bugs/j1054/inherit/Controller.java (added)
+++ beehive/trunk/netui/test/webapps/drt/web/bugs/j1054/inherit/Controller.java Mon Jan 30 14:47:50 2006
@@ -0,0 +1,27 @@
+/*
+ * Copyright 2006 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 bugs.j1054.inherit;
+
+import org.apache.beehive.netui.pageflow.annotations.Jpf;
+
+@Jpf.Controller(
+)
+public class Controller extends bugs.j1054.parent.Controller
+{
+}
+
Propchange: beehive/trunk/netui/test/webapps/drt/web/bugs/j1054/inherit/Controller.java
------------------------------------------------------------------------------
svn:eol-style = native
Added: beehive/trunk/netui/test/webapps/drt/web/bugs/j1054/inherit/index.jsp
URL: http://svn.apache.org/viewcvs/beehive/trunk/netui/test/webapps/drt/web/bugs/j1054/inherit/index.jsp?rev=373618&view=auto
==============================================================================
--- beehive/trunk/netui/test/webapps/drt/web/bugs/j1054/inherit/index.jsp (added)
+++ beehive/trunk/netui/test/webapps/drt/web/bugs/j1054/inherit/index.jsp Mon Jan 30 14:47:50 2006
@@ -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"%>
+
+<html>
+<head>
+ <title>Page Flow Inheritance - Inherit useFormBean annotation attribute</title>
+</head>
+<body>
+ <h1>Page Flow Inheritance - Inherit useFormBean annotation attribute</h1>
+ <h3>Inherit Simple Action - useFormBean attribute set</h3>
+ <br/>
+ <netui:form action="/actionOne">
+ <netui:textBox dataSource="actionForm.name" /><br />
+ Input Value:<netui:span value="${actionForm.name}" /><br />
+ <netui:button type="submit" action="actionOne" >Action One</netui:button>
+ </netui:form>
+ <br/>
+ <netui:anchor action="begin">begin</netui:anchor>
+</body>
+</html>
Propchange: beehive/trunk/netui/test/webapps/drt/web/bugs/j1054/inherit/index.jsp
------------------------------------------------------------------------------
svn:eol-style = native
Added: beehive/trunk/netui/test/webapps/drt/web/bugs/j1054/override/Controller.java
URL: http://svn.apache.org/viewcvs/beehive/trunk/netui/test/webapps/drt/web/bugs/j1054/override/Controller.java?rev=373618&view=auto
==============================================================================
--- beehive/trunk/netui/test/webapps/drt/web/bugs/j1054/override/Controller.java (added)
+++ beehive/trunk/netui/test/webapps/drt/web/bugs/j1054/override/Controller.java Mon Jan 30 14:47:50 2006
@@ -0,0 +1,33 @@
+/*
+ * Copyright 2006 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 bugs.j1054.override;
+
+import org.apache.beehive.netui.pageflow.annotations.Jpf;
+
+@Jpf.Controller(
+ simpleActions={
+ @Jpf.SimpleAction(
+ // removed the useFormBean attribute in this override
+ name="simpleActionOne",
+ path="index.jsp")
+ }
+)
+public class Controller extends bugs.j1054.parent.Controller
+{
+}
+
Propchange: beehive/trunk/netui/test/webapps/drt/web/bugs/j1054/override/Controller.java
------------------------------------------------------------------------------
svn:eol-style = native
Added: beehive/trunk/netui/test/webapps/drt/web/bugs/j1054/override/index.jsp
URL: http://svn.apache.org/viewcvs/beehive/trunk/netui/test/webapps/drt/web/bugs/j1054/override/index.jsp?rev=373618&view=auto
==============================================================================
--- beehive/trunk/netui/test/webapps/drt/web/bugs/j1054/override/index.jsp (added)
+++ beehive/trunk/netui/test/webapps/drt/web/bugs/j1054/override/index.jsp Mon Jan 30 14:47:50 2006
@@ -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"%>
+
+<html>
+<head>
+ <title>Page Flow Inheritance - Override useFormBean annotation attribute</title>
+</head>
+<body>
+ <h1>Page Flow Inheritance - Override useFormBean annotation attribute</h1>
+ <h3>Override Simple Action - Remove useFormBean attribute</h3>
+ <br/>
+ <netui:form action="/actionOne">
+ <netui:textBox dataSource="actionForm.name" /><br />
+ Input Value:<netui:span value="${actionForm.name}" /><br />
+ <netui:button type="submit" action="actionOne" >Action One</netui:button>
+ </netui:form>
+ <br/>
+ <netui:anchor action="begin">begin</netui:anchor>
+</body>
+</html>
Propchange: beehive/trunk/netui/test/webapps/drt/web/bugs/j1054/override/index.jsp
------------------------------------------------------------------------------
svn:eol-style = native
Added: beehive/trunk/netui/test/webapps/drt/web/bugs/j1054/parent/Controller.java
URL: http://svn.apache.org/viewcvs/beehive/trunk/netui/test/webapps/drt/web/bugs/j1054/parent/Controller.java?rev=373618&view=auto
==============================================================================
--- beehive/trunk/netui/test/webapps/drt/web/bugs/j1054/parent/Controller.java (added)
+++ beehive/trunk/netui/test/webapps/drt/web/bugs/j1054/parent/Controller.java Mon Jan 30 14:47:50 2006
@@ -0,0 +1,57 @@
+/*
+ * Copyright 2006 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 bugs.j1054.parent;
+
+import org.apache.beehive.netui.pageflow.PageFlowController;
+import org.apache.beehive.netui.pageflow.Forward;
+import org.apache.beehive.netui.pageflow.annotations.Jpf;
+
+import java.io.Serializable;
+
+@Jpf.Controller(
+ simpleActions={
+ @Jpf.SimpleAction(name="begin", path="index.jsp"),
+ @Jpf.SimpleAction(
+ useFormBean = "_formOne",
+ name="simpleActionOne",
+ path="index.jsp")
+ }
+)
+public class Controller extends PageFlowController
+{
+ protected FormOne _formOne = new FormOne();
+ public static class FormOne implements Serializable {
+ private String name = "Form One";
+ public String getName() {
+ return name;
+ }
+ public void setName(String n) {
+ name = n;
+ }
+ }
+
+ @Jpf.Action(
+ forwards = {
+ @Jpf.Forward(
+ name = "success",
+ path = "index.jsp")
+ })
+ public Forward actionOne(FormOne form) {
+ return new Forward("success");
+ }
+}
Propchange: beehive/trunk/netui/test/webapps/drt/web/bugs/j1054/parent/Controller.java
------------------------------------------------------------------------------
svn:eol-style = native
Added: beehive/trunk/netui/test/webapps/drt/web/bugs/j1054/parent/index.jsp
URL: http://svn.apache.org/viewcvs/beehive/trunk/netui/test/webapps/drt/web/bugs/j1054/parent/index.jsp?rev=373618&view=auto
==============================================================================
--- beehive/trunk/netui/test/webapps/drt/web/bugs/j1054/parent/index.jsp (added)
+++ beehive/trunk/netui/test/webapps/drt/web/bugs/j1054/parent/index.jsp Mon Jan 30 14:47:50 2006
@@ -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"%>
+
+<html>
+<head>
+ <title>Page Flow Inheritance - Override useFormBean annotation attribute</title>
+</head>
+<body>
+ <h1>Page Flow Inheritance - Override useFormBean annotation attribute</h1>
+ <h3>Parent Page Flow</h3>
+ <br/>
+ <netui:form action="/actionOne">
+ <netui:textBox dataSource="actionForm.name" /><br />
+ Input Value:<netui:span value="${actionForm.name}" /><br />
+ <netui:button type="submit" action="actionOne" >Action One</netui:button>
+ </netui:form>
+ <br/>
+ <netui:anchor action="begin">begin</netui:anchor>
+</body>
+</html>
Propchange: beehive/trunk/netui/test/webapps/drt/web/bugs/j1054/parent/index.jsp
------------------------------------------------------------------------------
svn:eol-style = native