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/23 18:10:18 UTC
svn commit: r371598 [2/2] - in /beehive/trunk/netui:
src/compiler-core/org/apache/beehive/netui/compiler/
src/compiler-core/org/apache/beehive/netui/compiler/genmodel/
src/compiler-core/org/apache/beehive/netui/compiler/grammar/
src/compiler-core/org/a...
Added: beehive/trunk/netui/test/webapps/drt/web/pageFlowCore/inheritance/override/actions/derived1b/Derived1b.java
URL: http://svn.apache.org/viewcvs/beehive/trunk/netui/test/webapps/drt/web/pageFlowCore/inheritance/override/actions/derived1b/Derived1b.java?rev=371598&view=auto
==============================================================================
--- beehive/trunk/netui/test/webapps/drt/web/pageFlowCore/inheritance/override/actions/derived1b/Derived1b.java (added)
+++ beehive/trunk/netui/test/webapps/drt/web/pageFlowCore/inheritance/override/actions/derived1b/Derived1b.java Mon Jan 23 09:08:52 2006
@@ -0,0 +1,52 @@
+/*
+ * 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 pageFlowCore.inheritance.override.actions.derived1b;
+
+import org.apache.beehive.netui.pageflow.Forward;
+import org.apache.beehive.netui.pageflow.annotations.Jpf;
+
+import pageFlowCore.inheritance.override.actions.super1.Super1;
+
+@Jpf.Controller(
+ inheritLocalPaths=true,
+ rolesAllowed = {"role3", "role4"}
+)
+public class Derived1b extends Super1
+{
+ @Jpf.Action(
+ readOnly = false,
+ forwards = {
+ @Jpf.Forward(
+ name = "derivedSuccess",
+ path = "index.jsp")
+ })
+ public Forward actionThree() {
+ return new Forward("derivedSuccess");
+ }
+
+ @Jpf.Action(
+ loginRequired = false,
+ forwards = {
+ @Jpf.Forward(
+ name = "derivedSuccess",
+ path = "index.jsp")
+ })
+ public Forward loginThree() {
+ return new Forward("derivedSuccess");
+ }
+}
Propchange: beehive/trunk/netui/test/webapps/drt/web/pageFlowCore/inheritance/override/actions/derived1b/Derived1b.java
------------------------------------------------------------------------------
svn:eol-style = native
Added: beehive/trunk/netui/test/webapps/drt/web/pageFlowCore/inheritance/override/actions/derived1b/index.jsp
URL: http://svn.apache.org/viewcvs/beehive/trunk/netui/test/webapps/drt/web/pageFlowCore/inheritance/override/actions/derived1b/index.jsp?rev=371598&view=auto
==============================================================================
--- beehive/trunk/netui/test/webapps/drt/web/pageFlowCore/inheritance/override/actions/derived1b/index.jsp (added)
+++ beehive/trunk/netui/test/webapps/drt/web/pageFlowCore/inheritance/override/actions/derived1b/index.jsp Mon Jan 23 09:08:52 2006
@@ -0,0 +1,16 @@
+<%@ page contentType="text/html;charset=UTF-8" language="java" %>
+<%@ taglib uri="http://beehive.apache.org/netui/tags-html-1.0" prefix="netui" %>
+<html>
+<head>
+ <title>Page Flow Inheritance - Overriding Actions</title>
+</head>
+<body>
+ <h1>Page Flow Inheritance - Overriding Actions</h1>
+ <h3>Derived1b</h3>
+ ${pageFlow.actionInfo}
+ <br/>
+ <netui:anchor action="actionOne">Action One</netui:anchor>
+ <br/>
+ <a href="../begin.do">back to start</a>
+</body>
+</html>
Propchange: beehive/trunk/netui/test/webapps/drt/web/pageFlowCore/inheritance/override/actions/derived1b/index.jsp
------------------------------------------------------------------------------
svn:eol-style = native
Added: beehive/trunk/netui/test/webapps/drt/web/pageFlowCore/inheritance/override/actions/derived2a/Derived2a.java
URL: http://svn.apache.org/viewcvs/beehive/trunk/netui/test/webapps/drt/web/pageFlowCore/inheritance/override/actions/derived2a/Derived2a.java?rev=371598&view=auto
==============================================================================
--- beehive/trunk/netui/test/webapps/drt/web/pageFlowCore/inheritance/override/actions/derived2a/Derived2a.java (added)
+++ beehive/trunk/netui/test/webapps/drt/web/pageFlowCore/inheritance/override/actions/derived2a/Derived2a.java Mon Jan 23 09:08:52 2006
@@ -0,0 +1,60 @@
+/*
+ * 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 pageFlowCore.inheritance.override.actions.derived2a;
+
+import org.apache.beehive.netui.pageflow.Forward;
+import org.apache.beehive.netui.pageflow.annotations.Jpf;
+
+import pageFlowCore.inheritance.override.actions.super2.Super2;
+
+@Jpf.Controller(
+ inheritLocalPaths=true,
+ readOnly = true,
+ loginRequired = true,
+ rolesAllowed = {"role3", "role4"},
+ simpleActions={
+ @Jpf.SimpleAction(
+ name="begin",
+ path="index.jsp",
+ loginRequired = false)
+ }
+)
+public class Derived2a extends Super2
+{
+ @Jpf.Action(
+ loginRequired = false,
+ forwards = {
+ @Jpf.Forward(
+ name = "derivedSuccess",
+ path = "index.jsp")
+ })
+ public Forward actionThree() {
+ return new Forward("derivedSuccess");
+ }
+
+ @Jpf.Action(
+ readOnly = false,
+ forwards = {
+ @Jpf.Forward(
+ name = "derivedSuccess",
+ path = "index.jsp")
+ })
+ public Forward loginThree() {
+ return new Forward("derivedSuccess");
+ }
+}
Propchange: beehive/trunk/netui/test/webapps/drt/web/pageFlowCore/inheritance/override/actions/derived2a/Derived2a.java
------------------------------------------------------------------------------
svn:eol-style = native
Added: beehive/trunk/netui/test/webapps/drt/web/pageFlowCore/inheritance/override/actions/derived2a/index.jsp
URL: http://svn.apache.org/viewcvs/beehive/trunk/netui/test/webapps/drt/web/pageFlowCore/inheritance/override/actions/derived2a/index.jsp?rev=371598&view=auto
==============================================================================
--- beehive/trunk/netui/test/webapps/drt/web/pageFlowCore/inheritance/override/actions/derived2a/index.jsp (added)
+++ beehive/trunk/netui/test/webapps/drt/web/pageFlowCore/inheritance/override/actions/derived2a/index.jsp Mon Jan 23 09:08:52 2006
@@ -0,0 +1,16 @@
+<%@ page contentType="text/html;charset=UTF-8" language="java" %>
+<%@ taglib uri="http://beehive.apache.org/netui/tags-html-1.0" prefix="netui" %>
+<html>
+<head>
+ <title>Page Flow Inheritance - Overriding Actions</title>
+</head>
+<body>
+ <h1>Page Flow Inheritance - Overriding Actions</h1>
+ <h3>Derived2a</h3>
+ ${pageFlow.actionInfo}
+ <br/>
+ <netui:anchor action="actionOne">Action One</netui:anchor>
+ <br/>
+ <a href="../begin.do">back to start</a>
+</body>
+</html>
Propchange: beehive/trunk/netui/test/webapps/drt/web/pageFlowCore/inheritance/override/actions/derived2a/index.jsp
------------------------------------------------------------------------------
svn:eol-style = native
Added: beehive/trunk/netui/test/webapps/drt/web/pageFlowCore/inheritance/override/actions/derived2b/Derived2b.java
URL: http://svn.apache.org/viewcvs/beehive/trunk/netui/test/webapps/drt/web/pageFlowCore/inheritance/override/actions/derived2b/Derived2b.java?rev=371598&view=auto
==============================================================================
--- beehive/trunk/netui/test/webapps/drt/web/pageFlowCore/inheritance/override/actions/derived2b/Derived2b.java (added)
+++ beehive/trunk/netui/test/webapps/drt/web/pageFlowCore/inheritance/override/actions/derived2b/Derived2b.java Mon Jan 23 09:08:52 2006
@@ -0,0 +1,53 @@
+/*
+ * 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 pageFlowCore.inheritance.override.actions.derived2b;
+
+import org.apache.beehive.netui.pageflow.Forward;
+import org.apache.beehive.netui.pageflow.annotations.Jpf;
+
+import pageFlowCore.inheritance.override.actions.super2.Super2;
+
+@Jpf.Controller(
+ inheritLocalPaths=true,
+ readOnly = false,
+ loginRequired = false
+)
+public class Derived2b extends Super2
+{
+ @Jpf.Action(
+ readOnly = true,
+ forwards = {
+ @Jpf.Forward(
+ name = "derivedSuccess",
+ path = "index.jsp")
+ })
+ public Forward actionThree() {
+ return new Forward("derivedSuccess");
+ }
+
+ @Jpf.Action(
+ loginRequired = true,
+ forwards = {
+ @Jpf.Forward(
+ name = "derivedSuccess",
+ path = "index.jsp")
+ })
+ public Forward loginThree() {
+ return new Forward("derivedSuccess");
+ }
+}
Propchange: beehive/trunk/netui/test/webapps/drt/web/pageFlowCore/inheritance/override/actions/derived2b/Derived2b.java
------------------------------------------------------------------------------
svn:eol-style = native
Added: beehive/trunk/netui/test/webapps/drt/web/pageFlowCore/inheritance/override/actions/derived2b/index.jsp
URL: http://svn.apache.org/viewcvs/beehive/trunk/netui/test/webapps/drt/web/pageFlowCore/inheritance/override/actions/derived2b/index.jsp?rev=371598&view=auto
==============================================================================
--- beehive/trunk/netui/test/webapps/drt/web/pageFlowCore/inheritance/override/actions/derived2b/index.jsp (added)
+++ beehive/trunk/netui/test/webapps/drt/web/pageFlowCore/inheritance/override/actions/derived2b/index.jsp Mon Jan 23 09:08:52 2006
@@ -0,0 +1,16 @@
+<%@ page contentType="text/html;charset=UTF-8" language="java" %>
+<%@ taglib uri="http://beehive.apache.org/netui/tags-html-1.0" prefix="netui" %>
+<html>
+<head>
+ <title>Page Flow Inheritance - Overriding Actions</title>
+</head>
+<body>
+ <h1>Page Flow Inheritance - Overriding Actions</h1>
+ <h3>Derived2b</h3>
+ ${pageFlow.actionInfo}
+ <br/>
+ <netui:anchor action="actionOne">Action One</netui:anchor>
+ <br/>
+ <a href="../begin.do">back to start</a>
+</body>
+</html>
Propchange: beehive/trunk/netui/test/webapps/drt/web/pageFlowCore/inheritance/override/actions/derived2b/index.jsp
------------------------------------------------------------------------------
svn:eol-style = native
Added: beehive/trunk/netui/test/webapps/drt/web/pageFlowCore/inheritance/override/actions/index.jsp
URL: http://svn.apache.org/viewcvs/beehive/trunk/netui/test/webapps/drt/web/pageFlowCore/inheritance/override/actions/index.jsp?rev=371598&view=auto
==============================================================================
--- beehive/trunk/netui/test/webapps/drt/web/pageFlowCore/inheritance/override/actions/index.jsp (added)
+++ beehive/trunk/netui/test/webapps/drt/web/pageFlowCore/inheritance/override/actions/index.jsp Mon Jan 23 09:08:52 2006
@@ -0,0 +1,40 @@
+<%@ page contentType="text/html;charset=UTF-8" language="java" %>
+<%@ taglib uri="http://beehive.apache.org/netui/tags-html-1.0" prefix="netui" %>
+
+<html>
+<head>
+<title>Page Flow Inheritance - Overriding Actions and Attributes</title>
+</head>
+<body>
+ <h3>Page Flow Inheritance - Overriding Actions and Attributes</h3>
+
+ <p>
+ There are some attributes such as loginRequired, readOnly, and rolesAllowed that
+ can be set on both the Controller and the Action annotations. This set of tests
+ covers different scenarios of overriding actions and their attributes with
+ inheritance. The default behavior for loginRequired and readOnly is to not use a
+ <set-property> in the <action> of the generated struts module config
+ file if the attribute is false or not set. On the runtime, no property implies
+ false. However, if the property is not set for the delegating action, then the
+ runtime uses the property of the delegate. Explicitly setting the attribute to
+ false, should set the property and have a false value in the runtime.
+ </p>
+ <b>Test 1:</b>
+ <ul>
+ <li><a href="super1/begin.do">Controller attributes set to true</a></li>
+ <li><a href="derived1a/begin.do">extended Controller attributes changed to false</a></li>
+ <li><a href="derived1b/begin.do">extended Controller, no attributes changed</a></li>
+ </ul>
+ <b>Test 2:</b>
+ <ul>
+ <li><a href="super2/begin.do">Controller attributes not set explicitly</a></li>
+ <li><a href="derived2a/begin.do">extended Controller attributes set to true</a></li>
+ <li><a href="derived2b/begin.do">extended Controller attributes set to false</a></li>
+ </ul>
+</body>
+</html>
+
+
+
+
+
Propchange: beehive/trunk/netui/test/webapps/drt/web/pageFlowCore/inheritance/override/actions/index.jsp
------------------------------------------------------------------------------
svn:eol-style = native
Added: beehive/trunk/netui/test/webapps/drt/web/pageFlowCore/inheritance/override/actions/super1/Super1.java
URL: http://svn.apache.org/viewcvs/beehive/trunk/netui/test/webapps/drt/web/pageFlowCore/inheritance/override/actions/super1/Super1.java?rev=371598&view=auto
==============================================================================
--- beehive/trunk/netui/test/webapps/drt/web/pageFlowCore/inheritance/override/actions/super1/Super1.java (added)
+++ beehive/trunk/netui/test/webapps/drt/web/pageFlowCore/inheritance/override/actions/super1/Super1.java Mon Jan 23 09:08:52 2006
@@ -0,0 +1,117 @@
+/*
+ * 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 pageFlowCore.inheritance.override.actions.super1;
+
+import org.apache.beehive.netui.pageflow.Forward;
+import org.apache.beehive.netui.pageflow.annotations.Jpf;
+import org.apache.struts.action.ActionForm;
+
+import pageFlowCore.inheritance.override.base.Base;
+
+@Jpf.Controller(
+ inheritLocalPaths=true,
+ readOnly = true,
+ loginRequired = true,
+ rolesAllowed = {"role1", "role2"},
+ simpleActions={
+ @Jpf.SimpleAction(
+ name="begin",
+ path="index.jsp",
+ loginRequired = false)
+ }
+)
+public class Super1 extends Base
+{
+ public static class FormOne extends ActionForm {
+ private String name;
+ public String getName() {
+ return name;
+ }
+ public void setName(String n) {
+ name = n;
+ }
+ }
+
+ @Jpf.Action(
+ loginRequired = false,
+ forwards = {
+ @Jpf.Forward(
+ name = "noFormSuccess",
+ path = "index.jsp")
+ })
+ public Forward actionOne() {
+ return new Forward("noFormSuccess");
+ }
+
+ @Jpf.Action(
+ readOnly = false,
+ loginRequired = false,
+ forwards = {
+ @Jpf.Forward(
+ name = "formSuccess",
+ path = "index.jsp")
+ })
+ public Forward actionTwo(FormOne form) {
+ return new Forward("formSuccess");
+ }
+
+ @Jpf.Action(
+ readOnly = true,
+ forwards = {
+ @Jpf.Forward(
+ name = "Success",
+ path = "index.jsp")
+ })
+ public Forward actionThree() {
+ return new Forward("Success");
+ }
+
+ @Jpf.Action(
+ forwards = {
+ @Jpf.Forward(
+ name = "loginSuccess1",
+ path = "index.jsp")
+ })
+ public Forward loginOne() {
+ return new Forward("loginSuccess1");
+ }
+
+ @Jpf.Action(
+ readOnly = true,
+ loginRequired = true,
+ rolesAllowed = {"roleA"},
+ forwards = {
+ @Jpf.Forward(
+ name = "loginSuccess2",
+ path = "index.jsp")
+ })
+ public Forward loginTwo() {
+ return new Forward("loginSuccess2");
+ }
+
+ @Jpf.Action(
+ loginRequired = true,
+ forwards = {
+ @Jpf.Forward(
+ name = "loginSuccess3",
+ path = "index.jsp")
+ })
+ public Forward loginThree() {
+ return new Forward("loginSuccess3");
+ }
+}
Propchange: beehive/trunk/netui/test/webapps/drt/web/pageFlowCore/inheritance/override/actions/super1/Super1.java
------------------------------------------------------------------------------
svn:eol-style = native
Added: beehive/trunk/netui/test/webapps/drt/web/pageFlowCore/inheritance/override/actions/super1/index.jsp
URL: http://svn.apache.org/viewcvs/beehive/trunk/netui/test/webapps/drt/web/pageFlowCore/inheritance/override/actions/super1/index.jsp?rev=371598&view=auto
==============================================================================
--- beehive/trunk/netui/test/webapps/drt/web/pageFlowCore/inheritance/override/actions/super1/index.jsp (added)
+++ beehive/trunk/netui/test/webapps/drt/web/pageFlowCore/inheritance/override/actions/super1/index.jsp Mon Jan 23 09:08:52 2006
@@ -0,0 +1,16 @@
+<%@ page contentType="text/html;charset=UTF-8" language="java" %>
+<%@ taglib uri="http://beehive.apache.org/netui/tags-html-1.0" prefix="netui" %>
+<html>
+<head>
+ <title>Page Flow Inheritance - Overriding Actions</title>
+</head>
+<body>
+ <h1>Page Flow Inheritance - Overriding Actions</h1>
+ <h3>Super1</h3>
+ ${pageFlow.actionInfo}
+ <br/>
+ <netui:anchor action="actionOne">Action One</netui:anchor>
+ <br/>
+ <a href="../begin.do">back to start</a>
+</body>
+</html>
Propchange: beehive/trunk/netui/test/webapps/drt/web/pageFlowCore/inheritance/override/actions/super1/index.jsp
------------------------------------------------------------------------------
svn:eol-style = native
Added: beehive/trunk/netui/test/webapps/drt/web/pageFlowCore/inheritance/override/actions/super2/Super2.java
URL: http://svn.apache.org/viewcvs/beehive/trunk/netui/test/webapps/drt/web/pageFlowCore/inheritance/override/actions/super2/Super2.java?rev=371598&view=auto
==============================================================================
--- beehive/trunk/netui/test/webapps/drt/web/pageFlowCore/inheritance/override/actions/super2/Super2.java (added)
+++ beehive/trunk/netui/test/webapps/drt/web/pageFlowCore/inheritance/override/actions/super2/Super2.java Mon Jan 23 09:08:52 2006
@@ -0,0 +1,114 @@
+/*
+ * 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 pageFlowCore.inheritance.override.actions.super2;
+
+import org.apache.beehive.netui.pageflow.Forward;
+import org.apache.beehive.netui.pageflow.annotations.Jpf;
+import org.apache.struts.action.ActionForm;
+
+import pageFlowCore.inheritance.override.base.Base;
+
+@Jpf.Controller(
+ inheritLocalPaths=true,
+ simpleActions={
+ @Jpf.SimpleAction(
+ name="begin",
+ path="index.jsp",
+ loginRequired = false)
+ }
+)
+public class Super2 extends Base
+{
+ public static class FormOne extends ActionForm {
+ private String name;
+ public String getName() {
+ return name;
+ }
+ public void setName(String n) {
+ name = n;
+ }
+ }
+
+ @Jpf.Action(
+ loginRequired = false,
+ forwards = {
+ @Jpf.Forward(
+ name = "noFormSuccess",
+ path = "index.jsp")
+ })
+ public Forward actionOne() {
+ return new Forward("noFormSuccess");
+ }
+
+ @Jpf.Action(
+ readOnly = false,
+ loginRequired = false,
+ forwards = {
+ @Jpf.Forward(
+ name = "formSuccess",
+ path = "index.jsp")
+ })
+ public Forward actionTwo(FormOne form) {
+ return new Forward("formSuccess");
+ }
+
+ @Jpf.Action(
+ readOnly = true,
+ forwards = {
+ @Jpf.Forward(
+ name = "Success",
+ path = "index.jsp")
+ })
+ public Forward actionThree() {
+ return new Forward("Success");
+ }
+
+ @Jpf.Action(
+ forwards = {
+ @Jpf.Forward(
+ name = "loginSuccess1",
+ path = "index.jsp")
+ })
+ public Forward loginOne() {
+ return new Forward("loginSuccess1");
+ }
+
+ @Jpf.Action(
+ readOnly = true,
+ loginRequired = true,
+ rolesAllowed = {"roleA"},
+ forwards = {
+ @Jpf.Forward(
+ name = "loginSuccess2",
+ path = "index.jsp")
+ })
+ public Forward loginTwo() {
+ return new Forward("loginSuccess2");
+ }
+
+ @Jpf.Action(
+ loginRequired = true,
+ forwards = {
+ @Jpf.Forward(
+ name = "loginSuccess3",
+ path = "index.jsp")
+ })
+ public Forward loginThree() {
+ return new Forward("loginSuccess3");
+ }
+}
Propchange: beehive/trunk/netui/test/webapps/drt/web/pageFlowCore/inheritance/override/actions/super2/Super2.java
------------------------------------------------------------------------------
svn:eol-style = native
Added: beehive/trunk/netui/test/webapps/drt/web/pageFlowCore/inheritance/override/actions/super2/index.jsp
URL: http://svn.apache.org/viewcvs/beehive/trunk/netui/test/webapps/drt/web/pageFlowCore/inheritance/override/actions/super2/index.jsp?rev=371598&view=auto
==============================================================================
--- beehive/trunk/netui/test/webapps/drt/web/pageFlowCore/inheritance/override/actions/super2/index.jsp (added)
+++ beehive/trunk/netui/test/webapps/drt/web/pageFlowCore/inheritance/override/actions/super2/index.jsp Mon Jan 23 09:08:52 2006
@@ -0,0 +1,16 @@
+<%@ page contentType="text/html;charset=UTF-8" language="java" %>
+<%@ taglib uri="http://beehive.apache.org/netui/tags-html-1.0" prefix="netui" %>
+<html>
+<head>
+ <title>Page Flow Inheritance - Overriding Actions</title>
+</head>
+<body>
+ <h1>Page Flow Inheritance - Overriding Actions</h1>
+ <h3>Super2</h3>
+ ${pageFlow.actionInfo}
+ <br/>
+ <netui:anchor action="actionOne">Action One</netui:anchor>
+ <br/>
+ <a href="../begin.do">back to start</a>
+</body>
+</html>
Propchange: beehive/trunk/netui/test/webapps/drt/web/pageFlowCore/inheritance/override/actions/super2/index.jsp
------------------------------------------------------------------------------
svn:eol-style = native
Added: beehive/trunk/netui/test/webapps/drt/web/pageFlowCore/inheritance/override/base/Base.java
URL: http://svn.apache.org/viewcvs/beehive/trunk/netui/test/webapps/drt/web/pageFlowCore/inheritance/override/base/Base.java?rev=371598&view=auto
==============================================================================
--- beehive/trunk/netui/test/webapps/drt/web/pageFlowCore/inheritance/override/base/Base.java (added)
+++ beehive/trunk/netui/test/webapps/drt/web/pageFlowCore/inheritance/override/base/Base.java Mon Jan 23 09:08:52 2006
@@ -0,0 +1,89 @@
+/*
+ * 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 pageFlowCore.inheritance.override.base;
+
+import org.apache.beehive.netui.pageflow.PageFlowController;
+import org.apache.beehive.netui.pageflow.annotations.Jpf;
+import org.apache.beehive.netui.pageflow.config.DelegatingActionMapping;
+import org.apache.beehive.netui.pageflow.config.PageFlowActionMapping;
+import org.apache.struts.config.ActionConfig;
+import org.apache.struts.config.ModuleConfig;
+
+@Jpf.Controller(
+ simpleActions={
+ @Jpf.SimpleAction(name="begin", path="index.jsp")
+ })
+public class Base extends PageFlowController
+{
+ protected String _actionInfo;
+ public String getActionInfo(){
+ return _actionInfo;
+ }
+ public void setActionInfo(String value){
+ _actionInfo = value;
+ }
+
+ protected void onCreate()
+ {
+ setActionInfo(findActionInfo());
+ }
+
+ protected String findActionInfo() {
+ StringBuffer sb = new StringBuffer(1024);
+ String[] actions = getActions();
+ if (actions != null) {
+ for (int i = 0; i < actions.length; i++) {
+ sb.append("\n<pre>\n");
+ sb.append(getConfigData(actions[i]));
+ sb.append("\n</pre>");
+ }
+ }
+ return sb.toString();
+ }
+
+ protected String getConfigData(String actionName) {
+ StringBuffer sb = new StringBuffer(1024);
+ ModuleConfig mConfig = getModuleConfig();
+ if (mConfig == null) return "\n null ModuleConfig!";
+ ActionConfig aConfig = mConfig.findActionConfig("/" + actionName);
+ if (aConfig == null) return "\n No ActionConfig: " + actionName;
+
+ sb.append("\n actionName = ").append(aConfig.getName());
+ sb.append("\n actionPath = ").append(aConfig.getPath());
+ sb.append("\n actionParameter = ").append(aConfig.getParameter());
+ if (aConfig instanceof PageFlowActionMapping) {
+ PageFlowActionMapping pfam = (PageFlowActionMapping) aConfig;
+ sb.append("\n unqualifiedActionPath = ").append(pfam.getUnqualifiedActionPath());
+ sb.append("\n formClass = ").append(pfam.getFormClass());
+ sb.append("\n preventDoubleSubmit = ").append(pfam.isPreventDoubleSubmit());
+ sb.append("\n readOnly = ").append(pfam.isReadonly());
+ sb.append("\n loginRequired = ").append(pfam.isLoginRequired());
+ sb.append("\n rolesAllowed = ").append(aConfig.getRoles());
+ sb.append("\n doValidation = ").append(aConfig.getValidate());
+ if (aConfig instanceof DelegatingActionMapping) {
+ DelegatingActionMapping delegate = (DelegatingActionMapping) aConfig;
+ sb.insert(0, "(DelegatingActionMapping)");
+ sb.append("\n localPathsRelativeTo = ").append(delegate.getLocalPathsRelativeTo());
+ } else {
+ sb.insert(0, "(PageFlowActionMapping)");
+ }
+ }
+
+ return sb.toString();
+ }
+}
Propchange: beehive/trunk/netui/test/webapps/drt/web/pageFlowCore/inheritance/override/base/Base.java
------------------------------------------------------------------------------
svn:eol-style = native
Added: beehive/trunk/netui/test/webapps/drt/web/pageFlowCore/inheritance/override/base/index.jsp
URL: http://svn.apache.org/viewcvs/beehive/trunk/netui/test/webapps/drt/web/pageFlowCore/inheritance/override/base/index.jsp?rev=371598&view=auto
==============================================================================
(empty)
Propchange: beehive/trunk/netui/test/webapps/drt/web/pageFlowCore/inheritance/override/base/index.jsp
------------------------------------------------------------------------------
svn:eol-style = native
Added: beehive/trunk/netui/test/webapps/drt/web/pageFlowCore/inheritance/override/simpleActions/Controller.java
URL: http://svn.apache.org/viewcvs/beehive/trunk/netui/test/webapps/drt/web/pageFlowCore/inheritance/override/simpleActions/Controller.java?rev=371598&view=auto
==============================================================================
--- beehive/trunk/netui/test/webapps/drt/web/pageFlowCore/inheritance/override/simpleActions/Controller.java (added)
+++ beehive/trunk/netui/test/webapps/drt/web/pageFlowCore/inheritance/override/simpleActions/Controller.java Mon Jan 23 09:08:52 2006
@@ -0,0 +1,29 @@
+/*
+ * 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 pageFlowCore.inheritance.override.simpleActions;
+
+import org.apache.beehive.netui.pageflow.PageFlowController;
+import org.apache.beehive.netui.pageflow.annotations.Jpf;
+
+@Jpf.Controller(
+ simpleActions={
+ @Jpf.SimpleAction(name="begin", path="index.jsp")
+ })
+public class Controller extends PageFlowController
+{
+}
Propchange: beehive/trunk/netui/test/webapps/drt/web/pageFlowCore/inheritance/override/simpleActions/Controller.java
------------------------------------------------------------------------------
svn:eol-style = native
Added: beehive/trunk/netui/test/webapps/drt/web/pageFlowCore/inheritance/override/simpleActions/derived1a/Derived1a.java
URL: http://svn.apache.org/viewcvs/beehive/trunk/netui/test/webapps/drt/web/pageFlowCore/inheritance/override/simpleActions/derived1a/Derived1a.java?rev=371598&view=auto
==============================================================================
--- beehive/trunk/netui/test/webapps/drt/web/pageFlowCore/inheritance/override/simpleActions/derived1a/Derived1a.java (added)
+++ beehive/trunk/netui/test/webapps/drt/web/pageFlowCore/inheritance/override/simpleActions/derived1a/Derived1a.java Mon Jan 23 09:08:52 2006
@@ -0,0 +1,44 @@
+/*
+ * 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 pageFlowCore.inheritance.override.simpleActions.derived1a;
+
+import org.apache.beehive.netui.pageflow.Forward;
+import org.apache.beehive.netui.pageflow.annotations.Jpf;
+
+import pageFlowCore.inheritance.override.simpleActions.super1.Super1;
+
+@Jpf.Controller(
+ inheritLocalPaths=true,
+ readOnly = false,
+ loginRequired = false,
+ simpleActions={
+ @Jpf.SimpleAction(
+ name="actionThree",
+ path="index.jsp",
+ readOnly = true
+ ),
+ @Jpf.SimpleAction(
+ name="loginThree",
+ path="index.jsp",
+ loginRequired = true
+ )
+ }
+)
+public class Derived1a extends Super1
+{
+}
Propchange: beehive/trunk/netui/test/webapps/drt/web/pageFlowCore/inheritance/override/simpleActions/derived1a/Derived1a.java
------------------------------------------------------------------------------
svn:eol-style = native
Added: beehive/trunk/netui/test/webapps/drt/web/pageFlowCore/inheritance/override/simpleActions/derived1a/index.jsp
URL: http://svn.apache.org/viewcvs/beehive/trunk/netui/test/webapps/drt/web/pageFlowCore/inheritance/override/simpleActions/derived1a/index.jsp?rev=371598&view=auto
==============================================================================
--- beehive/trunk/netui/test/webapps/drt/web/pageFlowCore/inheritance/override/simpleActions/derived1a/index.jsp (added)
+++ beehive/trunk/netui/test/webapps/drt/web/pageFlowCore/inheritance/override/simpleActions/derived1a/index.jsp Mon Jan 23 09:08:52 2006
@@ -0,0 +1,16 @@
+<%@ page contentType="text/html;charset=UTF-8" language="java" %>
+<%@ taglib uri="http://beehive.apache.org/netui/tags-html-1.0" prefix="netui" %>
+<html>
+<head>
+ <title>Page Flow Inheritance - Overriding Simple Actions</title>
+</head>
+<body>
+ <h1>Page Flow Inheritance - Overriding Simple Actions</h1>
+ <h3>Derived1a</h3>
+ ${pageFlow.actionInfo}
+ <br/>
+ <netui:anchor action="actionOne">Action One</netui:anchor>
+ <br/>
+ <a href="../begin.do">back to start</a>
+</body>
+</html>
Propchange: beehive/trunk/netui/test/webapps/drt/web/pageFlowCore/inheritance/override/simpleActions/derived1a/index.jsp
------------------------------------------------------------------------------
svn:eol-style = native
Added: beehive/trunk/netui/test/webapps/drt/web/pageFlowCore/inheritance/override/simpleActions/derived1b/Derived1b.java
URL: http://svn.apache.org/viewcvs/beehive/trunk/netui/test/webapps/drt/web/pageFlowCore/inheritance/override/simpleActions/derived1b/Derived1b.java?rev=371598&view=auto
==============================================================================
--- beehive/trunk/netui/test/webapps/drt/web/pageFlowCore/inheritance/override/simpleActions/derived1b/Derived1b.java (added)
+++ beehive/trunk/netui/test/webapps/drt/web/pageFlowCore/inheritance/override/simpleActions/derived1b/Derived1b.java Mon Jan 23 09:08:52 2006
@@ -0,0 +1,43 @@
+/*
+ * 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 pageFlowCore.inheritance.override.simpleActions.derived1b;
+
+import org.apache.beehive.netui.pageflow.Forward;
+import org.apache.beehive.netui.pageflow.annotations.Jpf;
+
+import pageFlowCore.inheritance.override.simpleActions.super1.Super1;
+
+@Jpf.Controller(
+ inheritLocalPaths=true,
+ rolesAllowed = {"role3", "role4"},
+ simpleActions={
+ @Jpf.SimpleAction(
+ name="actionThree",
+ path="index.jsp",
+ readOnly = false
+ ),
+ @Jpf.SimpleAction(
+ name="loginThree",
+ path="index.jsp",
+ loginRequired = false
+ )
+ }
+)
+public class Derived1b extends Super1
+{
+}
Propchange: beehive/trunk/netui/test/webapps/drt/web/pageFlowCore/inheritance/override/simpleActions/derived1b/Derived1b.java
------------------------------------------------------------------------------
svn:eol-style = native
Added: beehive/trunk/netui/test/webapps/drt/web/pageFlowCore/inheritance/override/simpleActions/derived1b/index.jsp
URL: http://svn.apache.org/viewcvs/beehive/trunk/netui/test/webapps/drt/web/pageFlowCore/inheritance/override/simpleActions/derived1b/index.jsp?rev=371598&view=auto
==============================================================================
--- beehive/trunk/netui/test/webapps/drt/web/pageFlowCore/inheritance/override/simpleActions/derived1b/index.jsp (added)
+++ beehive/trunk/netui/test/webapps/drt/web/pageFlowCore/inheritance/override/simpleActions/derived1b/index.jsp Mon Jan 23 09:08:52 2006
@@ -0,0 +1,16 @@
+<%@ page contentType="text/html;charset=UTF-8" language="java" %>
+<%@ taglib uri="http://beehive.apache.org/netui/tags-html-1.0" prefix="netui" %>
+<html>
+<head>
+ <title>Page Flow Inheritance - Overriding Simple Actions</title>
+</head>
+<body>
+ <h1>Page Flow Inheritance - Overriding Simple Actions</h1>
+ <h3>Derived1b</h3>
+ ${pageFlow.actionInfo}
+ <br/>
+ <netui:anchor action="actionOne">Action One</netui:anchor>
+ <br/>
+ <a href="../begin.do">back to start</a>
+</body>
+</html>
Propchange: beehive/trunk/netui/test/webapps/drt/web/pageFlowCore/inheritance/override/simpleActions/derived1b/index.jsp
------------------------------------------------------------------------------
svn:eol-style = native
Added: beehive/trunk/netui/test/webapps/drt/web/pageFlowCore/inheritance/override/simpleActions/derived2a/Derived2a.java
URL: http://svn.apache.org/viewcvs/beehive/trunk/netui/test/webapps/drt/web/pageFlowCore/inheritance/override/simpleActions/derived2a/Derived2a.java?rev=371598&view=auto
==============================================================================
--- beehive/trunk/netui/test/webapps/drt/web/pageFlowCore/inheritance/override/simpleActions/derived2a/Derived2a.java (added)
+++ beehive/trunk/netui/test/webapps/drt/web/pageFlowCore/inheritance/override/simpleActions/derived2a/Derived2a.java Mon Jan 23 09:08:52 2006
@@ -0,0 +1,50 @@
+/*
+ * 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 pageFlowCore.inheritance.override.simpleActions.derived2a;
+
+import org.apache.beehive.netui.pageflow.Forward;
+import org.apache.beehive.netui.pageflow.annotations.Jpf;
+
+import pageFlowCore.inheritance.override.simpleActions.super2.Super2;
+
+@Jpf.Controller(
+ inheritLocalPaths=true,
+ readOnly = true,
+ loginRequired = true,
+ rolesAllowed = {"role3", "role4"},
+ simpleActions={
+ @Jpf.SimpleAction(
+ name="begin",
+ path="index.jsp",
+ loginRequired = false
+ ),
+ @Jpf.SimpleAction(
+ name="actionThree",
+ path="index.jsp",
+ loginRequired = false
+ ),
+ @Jpf.SimpleAction(
+ name="loginThree",
+ path="index.jsp",
+ readOnly = false
+ )
+ }
+)
+public class Derived2a extends Super2
+{
+}
Propchange: beehive/trunk/netui/test/webapps/drt/web/pageFlowCore/inheritance/override/simpleActions/derived2a/Derived2a.java
------------------------------------------------------------------------------
svn:eol-style = native
Added: beehive/trunk/netui/test/webapps/drt/web/pageFlowCore/inheritance/override/simpleActions/derived2a/index.jsp
URL: http://svn.apache.org/viewcvs/beehive/trunk/netui/test/webapps/drt/web/pageFlowCore/inheritance/override/simpleActions/derived2a/index.jsp?rev=371598&view=auto
==============================================================================
--- beehive/trunk/netui/test/webapps/drt/web/pageFlowCore/inheritance/override/simpleActions/derived2a/index.jsp (added)
+++ beehive/trunk/netui/test/webapps/drt/web/pageFlowCore/inheritance/override/simpleActions/derived2a/index.jsp Mon Jan 23 09:08:52 2006
@@ -0,0 +1,16 @@
+<%@ page contentType="text/html;charset=UTF-8" language="java" %>
+<%@ taglib uri="http://beehive.apache.org/netui/tags-html-1.0" prefix="netui" %>
+<html>
+<head>
+ <title>Page Flow Inheritance - Overriding Simple Actions</title>
+</head>
+<body>
+ <h1>Page Flow Inheritance - Overriding Simple Actions</h1>
+ <h3>Derived2a</h3>
+ ${pageFlow.actionInfo}
+ <br/>
+ <netui:anchor action="actionOne">Action One</netui:anchor>
+ <br/>
+ <a href="../begin.do">back to start</a>
+</body>
+</html>
Propchange: beehive/trunk/netui/test/webapps/drt/web/pageFlowCore/inheritance/override/simpleActions/derived2a/index.jsp
------------------------------------------------------------------------------
svn:eol-style = native
Added: beehive/trunk/netui/test/webapps/drt/web/pageFlowCore/inheritance/override/simpleActions/derived2b/Derived2b.java
URL: http://svn.apache.org/viewcvs/beehive/trunk/netui/test/webapps/drt/web/pageFlowCore/inheritance/override/simpleActions/derived2b/Derived2b.java?rev=371598&view=auto
==============================================================================
--- beehive/trunk/netui/test/webapps/drt/web/pageFlowCore/inheritance/override/simpleActions/derived2b/Derived2b.java (added)
+++ beehive/trunk/netui/test/webapps/drt/web/pageFlowCore/inheritance/override/simpleActions/derived2b/Derived2b.java Mon Jan 23 09:08:52 2006
@@ -0,0 +1,44 @@
+/*
+ * 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 pageFlowCore.inheritance.override.simpleActions.derived2b;
+
+import org.apache.beehive.netui.pageflow.Forward;
+import org.apache.beehive.netui.pageflow.annotations.Jpf;
+
+import pageFlowCore.inheritance.override.simpleActions.super2.Super2;
+
+@Jpf.Controller(
+ inheritLocalPaths=true,
+ readOnly = false,
+ loginRequired = false,
+ simpleActions={
+ @Jpf.SimpleAction(
+ name="actionThree",
+ path="index.jsp",
+ readOnly = true
+ ),
+ @Jpf.SimpleAction(
+ name="loginThree",
+ path="index.jsp",
+ loginRequired = true
+ )
+ }
+)
+public class Derived2b extends Super2
+{
+}
Propchange: beehive/trunk/netui/test/webapps/drt/web/pageFlowCore/inheritance/override/simpleActions/derived2b/Derived2b.java
------------------------------------------------------------------------------
svn:eol-style = native
Added: beehive/trunk/netui/test/webapps/drt/web/pageFlowCore/inheritance/override/simpleActions/derived2b/index.jsp
URL: http://svn.apache.org/viewcvs/beehive/trunk/netui/test/webapps/drt/web/pageFlowCore/inheritance/override/simpleActions/derived2b/index.jsp?rev=371598&view=auto
==============================================================================
--- beehive/trunk/netui/test/webapps/drt/web/pageFlowCore/inheritance/override/simpleActions/derived2b/index.jsp (added)
+++ beehive/trunk/netui/test/webapps/drt/web/pageFlowCore/inheritance/override/simpleActions/derived2b/index.jsp Mon Jan 23 09:08:52 2006
@@ -0,0 +1,16 @@
+<%@ page contentType="text/html;charset=UTF-8" language="java" %>
+<%@ taglib uri="http://beehive.apache.org/netui/tags-html-1.0" prefix="netui" %>
+<html>
+<head>
+ <title>Page Flow Inheritance - Overriding Simple Actions</title>
+</head>
+<body>
+ <h1>Page Flow Inheritance - Overriding Simple Actions</h1>
+ <h3>Derived2b</h3>
+ ${pageFlow.actionInfo}
+ <br/>
+ <netui:anchor action="actionOne">Action One</netui:anchor>
+ <br/>
+ <a href="../begin.do">back to start</a>
+</body>
+</html>
Propchange: beehive/trunk/netui/test/webapps/drt/web/pageFlowCore/inheritance/override/simpleActions/derived2b/index.jsp
------------------------------------------------------------------------------
svn:eol-style = native
Added: beehive/trunk/netui/test/webapps/drt/web/pageFlowCore/inheritance/override/simpleActions/index.jsp
URL: http://svn.apache.org/viewcvs/beehive/trunk/netui/test/webapps/drt/web/pageFlowCore/inheritance/override/simpleActions/index.jsp?rev=371598&view=auto
==============================================================================
--- beehive/trunk/netui/test/webapps/drt/web/pageFlowCore/inheritance/override/simpleActions/index.jsp (added)
+++ beehive/trunk/netui/test/webapps/drt/web/pageFlowCore/inheritance/override/simpleActions/index.jsp Mon Jan 23 09:08:52 2006
@@ -0,0 +1,40 @@
+<%@ page contentType="text/html;charset=UTF-8" language="java" %>
+<%@ taglib uri="http://beehive.apache.org/netui/tags-html-1.0" prefix="netui" %>
+
+<html>
+<head>
+<title>Page Flow Inheritance - Overriding Simple Actions and Attributes</title>
+</head>
+<body>
+ <h3>Page Flow Inheritance - Overriding Simple Actions and Attributes</h3>
+
+ <p>
+ There are some attributes such as loginRequired, readOnly, and rolesAllowed that
+ can be set on both the Controller and the Action annotations. This set of tests
+ covers different scenarios of overriding actions and their attributes with
+ inheritance. The default behavior for loginRequired and readOnly is to not use a
+ <set-property> in the <action> of the generated struts module config
+ file if the attribute is false or not set. On the runtime, no property implies
+ false. However, if the property is not set for the delegating action, then the
+ runtime uses the property of the delegate. Explicitly setting the attribute to
+ false, should set the property and have a false value in the runtime.
+ </p>
+ <b>Test 1:</b>
+ <ul>
+ <li><a href="super1/begin.do">Controller attributes set to true</a></li>
+ <li><a href="derived1a/begin.do">extended Controller attributes changed to false</a></li>
+ <li><a href="derived1b/begin.do">extended Controller, no attributes changed</a></li>
+ </ul>
+ <b>Test 2:</b>
+ <ul>
+ <li><a href="super2/begin.do">Controller attributes not set explicitly</a></li>
+ <li><a href="derived2a/begin.do">extended Controller attributes set to true</a></li>
+ <li><a href="derived2b/begin.do">extended Controller attributes set to false</a></li>
+ </ul>
+</body>
+</html>
+
+
+
+
+
Propchange: beehive/trunk/netui/test/webapps/drt/web/pageFlowCore/inheritance/override/simpleActions/index.jsp
------------------------------------------------------------------------------
svn:eol-style = native
Added: beehive/trunk/netui/test/webapps/drt/web/pageFlowCore/inheritance/override/simpleActions/super1/Super1.java
URL: http://svn.apache.org/viewcvs/beehive/trunk/netui/test/webapps/drt/web/pageFlowCore/inheritance/override/simpleActions/super1/Super1.java?rev=371598&view=auto
==============================================================================
--- beehive/trunk/netui/test/webapps/drt/web/pageFlowCore/inheritance/override/simpleActions/super1/Super1.java (added)
+++ beehive/trunk/netui/test/webapps/drt/web/pageFlowCore/inheritance/override/simpleActions/super1/Super1.java Mon Jan 23 09:08:52 2006
@@ -0,0 +1,80 @@
+/*
+ * 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 pageFlowCore.inheritance.override.simpleActions.super1;
+
+import org.apache.beehive.netui.pageflow.Forward;
+import org.apache.beehive.netui.pageflow.annotations.Jpf;
+import org.apache.struts.action.ActionForm;
+
+import pageFlowCore.inheritance.override.base.Base;
+
+@Jpf.Controller(
+ inheritLocalPaths=true,
+ readOnly = true,
+ loginRequired = true,
+ rolesAllowed = {"role1", "role2"},
+ simpleActions={
+ @Jpf.SimpleAction(
+ name="begin",
+ path="index.jsp",
+ loginRequired = false
+ ),
+ @Jpf.SimpleAction(
+ name="actionOne",
+ path="index.jsp",
+ loginRequired = false
+ ),
+ @Jpf.SimpleAction(
+ name="actionTwo",
+ path="index.jsp",
+ useFormBeanType=pageFlowCore.inheritance.override.simpleActions.super2.Super2.FormOne.class,
+ readOnly = false,
+ loginRequired = false
+ ),
+ @Jpf.SimpleAction(
+ name="actionThree",
+ path="index.jsp",
+ readOnly = true
+ ),
+ @Jpf.SimpleAction(name="loginOne", path="index.jsp"),
+ @Jpf.SimpleAction(
+ name="loginTwo",
+ path="index.jsp",
+ readOnly = true,
+ loginRequired = true,
+ rolesAllowed = {"roleA"}
+ ),
+ @Jpf.SimpleAction(
+ name="loginThree",
+ path="index.jsp",
+ loginRequired = true
+ )
+ }
+)
+public class Super1 extends Base
+{
+ public static class FormOne extends ActionForm {
+ private String name = "No Name Yet";
+ public String getName() {
+ return name;
+ }
+ public void setName(String n) {
+ name = n;
+ }
+ }
+}
Propchange: beehive/trunk/netui/test/webapps/drt/web/pageFlowCore/inheritance/override/simpleActions/super1/Super1.java
------------------------------------------------------------------------------
svn:eol-style = native
Added: beehive/trunk/netui/test/webapps/drt/web/pageFlowCore/inheritance/override/simpleActions/super1/index.jsp
URL: http://svn.apache.org/viewcvs/beehive/trunk/netui/test/webapps/drt/web/pageFlowCore/inheritance/override/simpleActions/super1/index.jsp?rev=371598&view=auto
==============================================================================
--- beehive/trunk/netui/test/webapps/drt/web/pageFlowCore/inheritance/override/simpleActions/super1/index.jsp (added)
+++ beehive/trunk/netui/test/webapps/drt/web/pageFlowCore/inheritance/override/simpleActions/super1/index.jsp Mon Jan 23 09:08:52 2006
@@ -0,0 +1,16 @@
+<%@ page contentType="text/html;charset=UTF-8" language="java" %>
+<%@ taglib uri="http://beehive.apache.org/netui/tags-html-1.0" prefix="netui" %>
+<html>
+<head>
+ <title>Page Flow Inheritance - Overriding Simple Actions</title>
+</head>
+<body>
+ <h1>Page Flow Inheritance - Overriding Simple Actions</h1>
+ <h3>Super1</h3>
+ ${pageFlow.actionInfo}
+ <br/>
+ <netui:anchor action="actionOne">Action One</netui:anchor>
+ <br/>
+ <a href="../begin.do">back to start</a>
+</body>
+</html>
Propchange: beehive/trunk/netui/test/webapps/drt/web/pageFlowCore/inheritance/override/simpleActions/super1/index.jsp
------------------------------------------------------------------------------
svn:eol-style = native
Added: beehive/trunk/netui/test/webapps/drt/web/pageFlowCore/inheritance/override/simpleActions/super2/Super2.java
URL: http://svn.apache.org/viewcvs/beehive/trunk/netui/test/webapps/drt/web/pageFlowCore/inheritance/override/simpleActions/super2/Super2.java?rev=371598&view=auto
==============================================================================
--- beehive/trunk/netui/test/webapps/drt/web/pageFlowCore/inheritance/override/simpleActions/super2/Super2.java (added)
+++ beehive/trunk/netui/test/webapps/drt/web/pageFlowCore/inheritance/override/simpleActions/super2/Super2.java Mon Jan 23 09:08:52 2006
@@ -0,0 +1,78 @@
+/*
+ * 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 pageFlowCore.inheritance.override.simpleActions.super2;
+
+import org.apache.beehive.netui.pageflow.Forward;
+import org.apache.beehive.netui.pageflow.annotations.Jpf;
+import org.apache.struts.action.ActionForm;
+
+import pageFlowCore.inheritance.override.base.Base;
+
+@Jpf.Controller(
+ inheritLocalPaths=true,
+ simpleActions={
+ @Jpf.SimpleAction(
+ name="begin",
+ path="index.jsp",
+ loginRequired = false
+ ),
+ @Jpf.SimpleAction(
+ name="actionOne",
+ path="index.jsp",
+ loginRequired = false
+ ),
+ @Jpf.SimpleAction(
+ name="actionTwo",
+ path="index.jsp",
+ useFormBeanType=pageFlowCore.inheritance.override.simpleActions.super2.Super2.FormOne.class,
+ readOnly = false,
+ loginRequired = false
+ ),
+ @Jpf.SimpleAction(
+ name="actionThree",
+ path="index.jsp",
+ readOnly = true
+ ),
+ @Jpf.SimpleAction(name="loginOne", path="index.jsp"),
+ @Jpf.SimpleAction(
+ name="loginTwo",
+ path="index.jsp",
+ readOnly = true,
+ loginRequired = true,
+ rolesAllowed = {"roleA"}
+ ),
+ @Jpf.SimpleAction(
+ name="loginThree",
+ path="index.jsp",
+ loginRequired = true
+ )
+ }
+)
+public class Super2 extends Base
+{
+ protected FormOne _form;
+ public static class FormOne extends ActionForm {
+ private String name = "No Name Yet";
+ public String getName() {
+ return name;
+ }
+ public void setName(String n) {
+ name = n;
+ }
+ }
+}
Propchange: beehive/trunk/netui/test/webapps/drt/web/pageFlowCore/inheritance/override/simpleActions/super2/Super2.java
------------------------------------------------------------------------------
svn:eol-style = native
Added: beehive/trunk/netui/test/webapps/drt/web/pageFlowCore/inheritance/override/simpleActions/super2/index.jsp
URL: http://svn.apache.org/viewcvs/beehive/trunk/netui/test/webapps/drt/web/pageFlowCore/inheritance/override/simpleActions/super2/index.jsp?rev=371598&view=auto
==============================================================================
--- beehive/trunk/netui/test/webapps/drt/web/pageFlowCore/inheritance/override/simpleActions/super2/index.jsp (added)
+++ beehive/trunk/netui/test/webapps/drt/web/pageFlowCore/inheritance/override/simpleActions/super2/index.jsp Mon Jan 23 09:08:52 2006
@@ -0,0 +1,16 @@
+<%@ page contentType="text/html;charset=UTF-8" language="java" %>
+<%@ taglib uri="http://beehive.apache.org/netui/tags-html-1.0" prefix="netui" %>
+<html>
+<head>
+ <title>Page Flow Inheritance - Overriding Simple Actions</title>
+</head>
+<body>
+ <h1>Page Flow Inheritance - Overriding Simple Actions</h1>
+ <h3>Super2</h3>
+ ${pageFlow.actionInfo}
+ <br/>
+ <netui:anchor action="actionOne">Action One</netui:anchor>
+ <br/>
+ <a href="../begin.do">back to start</a>
+</body>
+</html>
Propchange: beehive/trunk/netui/test/webapps/drt/web/pageFlowCore/inheritance/override/simpleActions/super2/index.jsp
------------------------------------------------------------------------------
svn:eol-style = native
Modified: beehive/trunk/netui/test/webapps/drt/web/strutsMerge/test4/Jsp2.jsp
URL: http://svn.apache.org/viewcvs/beehive/trunk/netui/test/webapps/drt/web/strutsMerge/test4/Jsp2.jsp?rev=371598&r1=371597&r2=371598&view=diff
==============================================================================
--- beehive/trunk/netui/test/webapps/drt/web/strutsMerge/test4/Jsp2.jsp (original)
+++ beehive/trunk/netui/test/webapps/drt/web/strutsMerge/test4/Jsp2.jsp Mon Jan 23 09:08:52 2006
@@ -10,7 +10,7 @@
<hr width="95%"/>
<br/>
<center>
- <netui:form action="jpfAction2_strutsMerge_test4_Form2">
+ <netui:form action="jpfAction2">
<table>
<tr>
<td>Field1</td>
@@ -20,7 +20,7 @@
</tr>
</table>
</netui:form>
- <netui:anchor action="jpfAction2_strutsMerge_test4_Form2">continue</netui:anchor>
+ <netui:anchor action="jpfAction2">continue</netui:anchor>
</center>
</body>
</html>