Author: ekoneil Date: Fri Dec 10 13:02:40 2004 New Revision: 111547 URL: http://svn.apache.org/viewcvs?view=rev&rev=111547 Log: Fixup the petstoreWeb application to reflect:
- changes in how SharedFlows are registered in JPFs - the removal of binding contexts from the netui-config.xml file BB: self DRT: none; petstoreWeb builds now Modified: incubator/beehive/trunk/samples/petstoreWeb/Controller.jpf incubator/beehive/trunk/samples/petstoreWeb/WEB-INF/netui-config.xml incubator/beehive/trunk/samples/petstoreWeb/account/create/Controller.jpf incubator/beehive/trunk/samples/petstoreWeb/account/edit/Controller.jpf incubator/beehive/trunk/samples/petstoreWeb/auth/Controller.jpf incubator/beehive/trunk/samples/petstoreWeb/checkout/Controller.jpf incubator/beehive/trunk/samples/petstoreWeb/shop/Controller.jpf Modified: incubator/beehive/trunk/samples/petstoreWeb/Controller.jpf Url: http://svn.apache.org/viewcvs/incubator/beehive/trunk/samples/petstoreWeb/Controller.jpf?view=diff&rev=111547&p1=incubator/beehive/trunk/samples/petstoreWeb/Controller.jpf&r1=111546&p2=incubator/beehive/trunk/samples/petstoreWeb/Controller.jpf&r2=111547 ============================================================================== --- incubator/beehive/trunk/samples/petstoreWeb/Controller.jpf (original) +++ incubator/beehive/trunk/samples/petstoreWeb/Controller.jpf Fri Dec 10 13:02:40 2004 @@ -19,11 +19,15 @@ import org.apache.beehive.netui.pageflow.Forward; import org.apache.beehive.netui.pageflow.annotations.Jpf; [EMAIL PROTECTED]() [EMAIL PROTECTED]( + sharedFlowRefs={ + @Jpf.SharedFlowRef(name="rootSharedFlow", type=webappRoot.SharedFlow.class) + } +) public class Controller extends PageFlowController { - @Jpf.SharedFlowField + @Jpf.SharedFlowField(name="rootSharedFlow") private webappRoot.SharedFlow _sharedFlow; @Jpf.Action( Modified: incubator/beehive/trunk/samples/petstoreWeb/WEB-INF/netui-config.xml Url: http://svn.apache.org/viewcvs/incubator/beehive/trunk/samples/petstoreWeb/WEB-INF/netui-config.xml?view=diff&rev=111547&p1=incubator/beehive/trunk/samples/petstoreWeb/WEB-INF/netui-config.xml&r1=111546&p2=incubator/beehive/trunk/samples/petstoreWeb/WEB-INF/netui-config.xml&r2=111547 ============================================================================== --- incubator/beehive/trunk/samples/petstoreWeb/WEB-INF/netui-config.xml (original) +++ incubator/beehive/trunk/samples/petstoreWeb/WEB-INF/netui-config.xml Fri Dec 10 13:02:40 2004 @@ -9,20 +9,7 @@ <expression-language> <name>netuiel</name> <factory-class>org.apache.beehive.netui.script.el.ExpressionEvaluatorImpl$NetUIELEngineFactory</factory-class> - <binding-contexts> - <binding-context> - <name>bundle</name> - <factory-class>org.apache.beehive.netui.databinding.script.el.BundleVariableResolver$BundleContextFactory</factory-class> - </binding-context> - <binding-context> - <name>container</name> - <factory-class>org.apache.beehive.netui.databinding.script.el.ContainerVariableResolver$ContainerContextFactory</factory-class> - </binding-context> - </binding-contexts> </expression-language> </expression-languages> - - <iterator-factories> - </iterator-factories> </netui-config> Modified: incubator/beehive/trunk/samples/petstoreWeb/account/create/Controller.jpf Url: http://svn.apache.org/viewcvs/incubator/beehive/trunk/samples/petstoreWeb/account/create/Controller.jpf?view=diff&rev=111547&p1=incubator/beehive/trunk/samples/petstoreWeb/account/create/Controller.jpf&r1=111546&p2=incubator/beehive/trunk/samples/petstoreWeb/account/create/Controller.jpf&r2=111547 ============================================================================== --- incubator/beehive/trunk/samples/petstoreWeb/account/create/Controller.jpf (original) +++ incubator/beehive/trunk/samples/petstoreWeb/account/create/Controller.jpf Fri Dec 10 13:02:40 2004 @@ -38,6 +38,9 @@ import org.apache.beehive.samples.petstore.model.Address; @Jpf.Controller( + sharedFlowRefs={ + @Jpf.SharedFlowRef(name="rootSharedFlow", type=webappRoot.SharedFlow.class) + }, [EMAIL PROTECTED](name = "org.apache.beehive.samples.petstore.resources.account")} ) public class Controller @@ -49,7 +52,7 @@ @org.apache.beehive.controls.api.bean.Control() protected AccountControl _accountControl; - @Jpf.SharedFlowField + @Jpf.SharedFlowField(name="rootSharedFlow") private webappRoot.SharedFlow _sharedFlow = null; private boolean _isUsernameTaken; Modified: incubator/beehive/trunk/samples/petstoreWeb/account/edit/Controller.jpf Url: http://svn.apache.org/viewcvs/incubator/beehive/trunk/samples/petstoreWeb/account/edit/Controller.jpf?view=diff&rev=111547&p1=incubator/beehive/trunk/samples/petstoreWeb/account/edit/Controller.jpf&r1=111546&p2=incubator/beehive/trunk/samples/petstoreWeb/account/edit/Controller.jpf&r2=111547 ============================================================================== --- incubator/beehive/trunk/samples/petstoreWeb/account/edit/Controller.jpf (original) +++ incubator/beehive/trunk/samples/petstoreWeb/account/edit/Controller.jpf Fri Dec 10 13:02:40 2004 @@ -35,6 +35,9 @@ import org.apache.beehive.samples.petstore.controller.AccountController; @Jpf.Controller( + sharedFlowRefs={ + @Jpf.SharedFlowRef(name="rootSharedFlow", type=webappRoot.SharedFlow.class) + }, messageResources = { @Jpf.MessageResource(name = "org.apache.beehive.samples.petstore.resources.account") }, @@ -51,7 +54,7 @@ @org.apache.beehive.controls.api.bean.Control() private AccountControl _accountControl; - @Jpf.SharedFlowField + @Jpf.SharedFlowField(name="rootSharedFlow") private webappRoot.SharedFlow _sharedFlow; private UpdateAccountForm _updateForm; Modified: incubator/beehive/trunk/samples/petstoreWeb/auth/Controller.jpf Url: http://svn.apache.org/viewcvs/incubator/beehive/trunk/samples/petstoreWeb/auth/Controller.jpf?view=diff&rev=111547&p1=incubator/beehive/trunk/samples/petstoreWeb/auth/Controller.jpf&r1=111546&p2=incubator/beehive/trunk/samples/petstoreWeb/auth/Controller.jpf&r2=111547 ============================================================================== --- incubator/beehive/trunk/samples/petstoreWeb/auth/Controller.jpf (original) +++ incubator/beehive/trunk/samples/petstoreWeb/auth/Controller.jpf Fri Dec 10 13:02:40 2004 @@ -24,11 +24,16 @@ import org.apache.beehive.samples.petstore.forms.ReturnToForm; [EMAIL PROTECTED](nested = true) [EMAIL PROTECTED]( + nested = true, + sharedFlowRefs={ + @Jpf.SharedFlowRef(name="rootSharedFlow", type=webappRoot.SharedFlow.class) + } +) public class Controller extends PageFlowController { - @Jpf.SharedFlowField + @Jpf.SharedFlowField(name="rootSharedFlow") private webappRoot.SharedFlow _sharedFlow = null; private ReturnToForm _initForm; Modified: incubator/beehive/trunk/samples/petstoreWeb/checkout/Controller.jpf Url: http://svn.apache.org/viewcvs/incubator/beehive/trunk/samples/petstoreWeb/checkout/Controller.jpf?view=diff&rev=111547&p1=incubator/beehive/trunk/samples/petstoreWeb/checkout/Controller.jpf&r1=111546&p2=incubator/beehive/trunk/samples/petstoreWeb/checkout/Controller.jpf&r2=111547 ============================================================================== --- incubator/beehive/trunk/samples/petstoreWeb/checkout/Controller.jpf (original) +++ incubator/beehive/trunk/samples/petstoreWeb/checkout/Controller.jpf Fri Dec 10 13:02:40 2004 @@ -35,6 +35,9 @@ @Jpf.Controller( nested=true, + sharedFlowRefs={ + @Jpf.SharedFlowRef(name="rootSharedFlow", type=webappRoot.SharedFlow.class) + }, messageResources={ @Jpf.MessageResource(name="org.apache.beehive.samples.petstore.resources.order") }, @@ -51,7 +54,7 @@ @org.apache.beehive.controls.api.bean.Control() private OrderControl _orderControl; - @Jpf.SharedFlowField + @Jpf.SharedFlowField(name="rootSharedFlow") private webappRoot.SharedFlow _sharedFlow; private Order _order = null; Modified: incubator/beehive/trunk/samples/petstoreWeb/shop/Controller.jpf Url: http://svn.apache.org/viewcvs/incubator/beehive/trunk/samples/petstoreWeb/shop/Controller.jpf?view=diff&rev=111547&p1=incubator/beehive/trunk/samples/petstoreWeb/shop/Controller.jpf&r1=111546&p2=incubator/beehive/trunk/samples/petstoreWeb/shop/Controller.jpf&r2=111547 ============================================================================== --- incubator/beehive/trunk/samples/petstoreWeb/shop/Controller.jpf (original) +++ incubator/beehive/trunk/samples/petstoreWeb/shop/Controller.jpf Fri Dec 10 13:02:40 2004 @@ -41,6 +41,9 @@ @Jpf.Forward(name = "cart", path = "cart.jsp"), @Jpf.Forward(name = "viewCart", path = "viewCart.do") }, + sharedFlowRefs={ + @Jpf.SharedFlowRef(name="rootSharedFlow", type=webappRoot.SharedFlow.class) + }, simpleActions={ @Jpf.SimpleAction(name="checkout", path="/checkout/Controller.jpf") } @@ -48,7 +51,7 @@ public class Controller extends PageFlowController { - @Jpf.SharedFlowField + @Jpf.SharedFlowField(name="rootSharedFlow") private webappRoot.SharedFlow _sharedFlow = null; @org.apache.beehive.controls.api.bean.Control()
