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/09/07 17:04:46 UTC
svn commit: r279339 - in /beehive/trunk:
docs/forrest/release/src/documentation/content/xdocs/controls/
docs/forrest/release/src/documentation/content/xdocs/netui/
netui/src/compiler-core/org/apache/beehive/netui/compiler/grammar/
netui/src/webapp-temp...
Author: rich
Date: Wed Sep 7 08:04:23 2005
New Revision: 279339
URL: http://svn.apache.org/viewcvs?rev=279339&view=rev
Log:
Removed the @Jpf.SharedFlowField from the default Controller.java, and removed documentation that referenced it.
tests: build.release in docs/forrest
bb: build.dist.full, build.test.dist (linux)
Modified:
beehive/trunk/docs/forrest/release/src/documentation/content/xdocs/controls/tutorial_controls.xml
beehive/trunk/docs/forrest/release/src/documentation/content/xdocs/netui/sharedFlow.xml
beehive/trunk/docs/forrest/release/src/documentation/content/xdocs/netui/tutorial_pageflow.xml
beehive/trunk/netui/src/compiler-core/org/apache/beehive/netui/compiler/grammar/SimpleActionGrammar.java
beehive/trunk/netui/src/webapp-template/default/Controller.java
beehive/trunk/netui/src/webapp-template/default/WEB-INF/src/shared/SharedFlow.java
Modified: beehive/trunk/docs/forrest/release/src/documentation/content/xdocs/controls/tutorial_controls.xml
URL: http://svn.apache.org/viewcvs/beehive/trunk/docs/forrest/release/src/documentation/content/xdocs/controls/tutorial_controls.xml?rev=279339&r1=279338&r2=279339&view=diff
==============================================================================
--- beehive/trunk/docs/forrest/release/src/documentation/content/xdocs/controls/tutorial_controls.xml (original)
+++ beehive/trunk/docs/forrest/release/src/documentation/content/xdocs/controls/tutorial_controls.xml Wed Sep 7 08:04:23 2005
@@ -197,9 +197,6 @@
public class Controller
extends PageFlowController {
- @Jpf.SharedFlowField(name="shared")
- private shared.SharedFlow sharedFlow;
-
<strong>@Control
private Hello _helloControl;
Modified: beehive/trunk/docs/forrest/release/src/documentation/content/xdocs/netui/sharedFlow.xml
URL: http://svn.apache.org/viewcvs/beehive/trunk/docs/forrest/release/src/documentation/content/xdocs/netui/sharedFlow.xml?rev=279339&r1=279338&r2=279339&view=diff
==============================================================================
--- beehive/trunk/docs/forrest/release/src/documentation/content/xdocs/netui/sharedFlow.xml (original)
+++ beehive/trunk/docs/forrest/release/src/documentation/content/xdocs/netui/sharedFlow.xml Wed Sep 7 08:04:23 2005
@@ -213,7 +213,7 @@
)
public class SomeController extends PageFlowController
{
- @Jpf.SharedFlowRef(name="sharedFlowOne")
+ @Jpf.SharedFlowField(name="sharedFlowOne")
private example.SharedFlowClassOne mySharedFlow;
} </source>
<p>
Modified: beehive/trunk/docs/forrest/release/src/documentation/content/xdocs/netui/tutorial_pageflow.xml
URL: http://svn.apache.org/viewcvs/beehive/trunk/docs/forrest/release/src/documentation/content/xdocs/netui/tutorial_pageflow.xml?rev=279339&r1=279338&r2=279339&view=diff
==============================================================================
--- beehive/trunk/docs/forrest/release/src/documentation/content/xdocs/netui/tutorial_pageflow.xml (original)
+++ beehive/trunk/docs/forrest/release/src/documentation/content/xdocs/netui/tutorial_pageflow.xml Wed Sep 7 08:04:23 2005
@@ -235,9 +235,6 @@
public class Controller
extends PageFlowController
{
- @Jpf.SharedFlowField(name="shared")
- private shared.SharedFlow sharedFlow;
-
}</source>
<p>Open the file <code>pageflow_tutorial/index.jsp</code>.
</p>
@@ -487,8 +484,6 @@
)
public class Controller
extends PageFlowController {
- @Jpf.SharedFlowField(name="shared")
- private shared.SharedFlow sharedFlow;
<strong>@Jpf.Action(
forwards = {
@@ -789,9 +784,6 @@
)
public class Controller
extends PageFlowController {
-
- @Jpf.SharedFlowField(name="shared")
- private shared.SharedFlow sharedFlow;
<strong>private ProfileForm profileForm;
Modified: beehive/trunk/netui/src/compiler-core/org/apache/beehive/netui/compiler/grammar/SimpleActionGrammar.java
URL: http://svn.apache.org/viewcvs/beehive/trunk/netui/src/compiler-core/org/apache/beehive/netui/compiler/grammar/SimpleActionGrammar.java?rev=279339&r1=279338&r2=279339&view=diff
==============================================================================
--- beehive/trunk/netui/src/compiler-core/org/apache/beehive/netui/compiler/grammar/SimpleActionGrammar.java (original)
+++ beehive/trunk/netui/src/compiler-core/org/apache/beehive/netui/compiler/grammar/SimpleActionGrammar.java Wed Sep 7 08:04:23 2005
@@ -185,6 +185,11 @@
SimpleActionGrammar.this.getFlowControllerInfo() );
}
+ protected AnnotationMemberType getNameType() {
+ // We don't want to use the normal name type, which checks for duplicate names among *forwards*.
+ return new AnnotationMemberType( null, SimpleActionGrammar.this );
+ }
+
public String[][] getRequiredAttrs()
{
return REQUIRED_ATTRS;
Modified: beehive/trunk/netui/src/webapp-template/default/Controller.java
URL: http://svn.apache.org/viewcvs/beehive/trunk/netui/src/webapp-template/default/Controller.java?rev=279339&r1=279338&r2=279339&view=diff
==============================================================================
--- beehive/trunk/netui/src/webapp-template/default/Controller.java (original)
+++ beehive/trunk/netui/src/webapp-template/default/Controller.java Wed Sep 7 08:04:23 2005
@@ -32,9 +32,6 @@
public class Controller
extends PageFlowController
{
- @Jpf.SharedFlowField(name="shared")
- private shared.SharedFlow sharedFlow;
-
/**
* Callback that is invoked when this controller instance is created.
*/
Modified: beehive/trunk/netui/src/webapp-template/default/WEB-INF/src/shared/SharedFlow.java
URL: http://svn.apache.org/viewcvs/beehive/trunk/netui/src/webapp-template/default/WEB-INF/src/shared/SharedFlow.java?rev=279339&r1=279338&r2=279339&view=diff
==============================================================================
--- beehive/trunk/netui/src/webapp-template/default/WEB-INF/src/shared/SharedFlow.java (original)
+++ beehive/trunk/netui/src/webapp-template/default/WEB-INF/src/shared/SharedFlow.java Wed Sep 7 08:04:23 2005
@@ -59,6 +59,8 @@
* @Jpf.SharedFlowField(name="shared")
* private shared.SharedFlow _mySharedFlowReference;
* </pre>
+ * This is optional; it is useful if you need a hard reference to the shared flow
+ * controller.
* </li>
* </ul>
*/
@@ -90,7 +92,7 @@
* informative error pages to the response when the server is not in production mode, and it
* allows them to send an appropriate error on the response when the server is in production
* mode. To use the standard exception handler for these exceptions, simply remove this method
- * and the Jpf.Catch annotation that references it.
+ * and the <code>Jpf.Catch</code> annotation that references it.
*/
@Jpf.ExceptionHandler
public Forward handlePageFlowException(PageFlowException ex, String actionName, String message, Object form)