You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@beehive.apache.org by ek...@apache.org on 2005/05/05 17:31:39 UTC

svn commit: r168344 - in /incubator/beehive/trunk/samples/petstoreWeb: ./ WEB-INF/src/org/apache/beehive/samples/petstore/controls/ WEB-INF/src/org/apache/beehive/samples/petstore/controls/data/ WEB-INF/src/org/apache/beehive/samples/petstore/controls/internal/ account/addresses/ account/create/ account/edit/ auth/ checkout/ search/ shop/ webappRoot/

Author: ekoneil
Date: Thu May  5 08:31:38 2005
New Revision: 168344

URL: http://svn.apache.org/viewcvs?rev=168344&view=rev
Log:
petstoreWeb samples work.

- rename the page flows and controls from *.jpf / *.jcs / *.jcx to *.java
- fix a bug in checkout that was throwing a type mismatch on the action output

BB: self
DRT: none
Test: ran the build of petstoreWeb from the distribution.  also built a cart and checked out.


Added:
    incubator/beehive/trunk/samples/petstoreWeb/Controller.java
      - copied unchanged from r168071, incubator/beehive/trunk/samples/petstoreWeb/Controller.jpf
    incubator/beehive/trunk/samples/petstoreWeb/WEB-INF/src/org/apache/beehive/samples/petstore/controls/AccountControlImpl.java
      - copied unchanged from r168071, incubator/beehive/trunk/samples/petstoreWeb/WEB-INF/src/org/apache/beehive/samples/petstore/controls/AccountControlImpl.jcs
    incubator/beehive/trunk/samples/petstoreWeb/WEB-INF/src/org/apache/beehive/samples/petstore/controls/AddressControlImpl.java
      - copied unchanged from r168071, incubator/beehive/trunk/samples/petstoreWeb/WEB-INF/src/org/apache/beehive/samples/petstore/controls/AddressControlImpl.jcs
    incubator/beehive/trunk/samples/petstoreWeb/WEB-INF/src/org/apache/beehive/samples/petstore/controls/CatalogControlImpl.java
      - copied unchanged from r168071, incubator/beehive/trunk/samples/petstoreWeb/WEB-INF/src/org/apache/beehive/samples/petstore/controls/CatalogControlImpl.jcs
    incubator/beehive/trunk/samples/petstoreWeb/WEB-INF/src/org/apache/beehive/samples/petstore/controls/OrderControlImpl.java
      - copied unchanged from r168071, incubator/beehive/trunk/samples/petstoreWeb/WEB-INF/src/org/apache/beehive/samples/petstore/controls/OrderControlImpl.jcs
    incubator/beehive/trunk/samples/petstoreWeb/WEB-INF/src/org/apache/beehive/samples/petstore/controls/data/AccountDBControl.java
      - copied unchanged from r168071, incubator/beehive/trunk/samples/petstoreWeb/WEB-INF/src/org/apache/beehive/samples/petstore/controls/data/AccountDBControl.jcx
    incubator/beehive/trunk/samples/petstoreWeb/WEB-INF/src/org/apache/beehive/samples/petstore/controls/data/AddressDBControl.java
      - copied unchanged from r168071, incubator/beehive/trunk/samples/petstoreWeb/WEB-INF/src/org/apache/beehive/samples/petstore/controls/data/AddressDBControl.jcx
    incubator/beehive/trunk/samples/petstoreWeb/WEB-INF/src/org/apache/beehive/samples/petstore/controls/data/CatalogDBControl.java
      - copied unchanged from r168071, incubator/beehive/trunk/samples/petstoreWeb/WEB-INF/src/org/apache/beehive/samples/petstore/controls/data/CatalogDBControl.jcx
    incubator/beehive/trunk/samples/petstoreWeb/WEB-INF/src/org/apache/beehive/samples/petstore/controls/data/OrderDBControl.java
      - copied unchanged from r168071, incubator/beehive/trunk/samples/petstoreWeb/WEB-INF/src/org/apache/beehive/samples/petstore/controls/data/OrderDBControl.jcx
    incubator/beehive/trunk/samples/petstoreWeb/account/addresses/Controller.java
      - copied unchanged from r168071, incubator/beehive/trunk/samples/petstoreWeb/account/addresses/Controller.jpf
    incubator/beehive/trunk/samples/petstoreWeb/account/create/Controller.java
      - copied unchanged from r168071, incubator/beehive/trunk/samples/petstoreWeb/account/create/Controller.jpf
    incubator/beehive/trunk/samples/petstoreWeb/account/edit/Controller.java
      - copied unchanged from r168071, incubator/beehive/trunk/samples/petstoreWeb/account/edit/Controller.jpf
    incubator/beehive/trunk/samples/petstoreWeb/auth/Controller.java
      - copied unchanged from r168071, incubator/beehive/trunk/samples/petstoreWeb/auth/Controller.jpf
    incubator/beehive/trunk/samples/petstoreWeb/checkout/Controller.java
      - copied, changed from r168071, incubator/beehive/trunk/samples/petstoreWeb/checkout/Controller.jpf
    incubator/beehive/trunk/samples/petstoreWeb/search/Controller.java
      - copied unchanged from r168071, incubator/beehive/trunk/samples/petstoreWeb/search/Controller.jpf
    incubator/beehive/trunk/samples/petstoreWeb/shop/Controller.java
      - copied unchanged from r168071, incubator/beehive/trunk/samples/petstoreWeb/shop/Controller.jpf
    incubator/beehive/trunk/samples/petstoreWeb/webappRoot/SharedFlow.java
      - copied unchanged from r168071, incubator/beehive/trunk/samples/petstoreWeb/webappRoot/SharedFlow.jpfs
Removed:
    incubator/beehive/trunk/samples/petstoreWeb/Controller.jpf
    incubator/beehive/trunk/samples/petstoreWeb/WEB-INF/src/org/apache/beehive/samples/petstore/controls/AccountControlImpl.jcs
    incubator/beehive/trunk/samples/petstoreWeb/WEB-INF/src/org/apache/beehive/samples/petstore/controls/AddressControlImpl.jcs
    incubator/beehive/trunk/samples/petstoreWeb/WEB-INF/src/org/apache/beehive/samples/petstore/controls/CatalogControlImpl.jcs
    incubator/beehive/trunk/samples/petstoreWeb/WEB-INF/src/org/apache/beehive/samples/petstore/controls/OrderControlImpl.jcs
    incubator/beehive/trunk/samples/petstoreWeb/WEB-INF/src/org/apache/beehive/samples/petstore/controls/data/AccountDBControl.jcx
    incubator/beehive/trunk/samples/petstoreWeb/WEB-INF/src/org/apache/beehive/samples/petstore/controls/data/AddressDBControl.jcx
    incubator/beehive/trunk/samples/petstoreWeb/WEB-INF/src/org/apache/beehive/samples/petstore/controls/data/CatalogDBControl.jcx
    incubator/beehive/trunk/samples/petstoreWeb/WEB-INF/src/org/apache/beehive/samples/petstore/controls/data/OrderDBControl.jcx
    incubator/beehive/trunk/samples/petstoreWeb/WEB-INF/src/org/apache/beehive/samples/petstore/controls/internal/
    incubator/beehive/trunk/samples/petstoreWeb/account/addresses/Controller.jpf
    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/search/Controller.jpf
    incubator/beehive/trunk/samples/petstoreWeb/shop/Controller.jpf
    incubator/beehive/trunk/samples/petstoreWeb/webappRoot/SharedFlow.jpfs

Copied: incubator/beehive/trunk/samples/petstoreWeb/checkout/Controller.java (from r168071, incubator/beehive/trunk/samples/petstoreWeb/checkout/Controller.jpf)
URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/samples/petstoreWeb/checkout/Controller.java?p2=incubator/beehive/trunk/samples/petstoreWeb/checkout/Controller.java&p1=incubator/beehive/trunk/samples/petstoreWeb/checkout/Controller.jpf&r1=168071&r2=168344&rev=168344&view=diff
==============================================================================
--- incubator/beehive/trunk/samples/petstoreWeb/checkout/Controller.jpf (original)
+++ incubator/beehive/trunk/samples/petstoreWeb/checkout/Controller.java Thu May  5 08:31:38 2005
@@ -132,7 +132,7 @@
             @Jpf.Forward(name="confirm", path="confirm.jsp",
                          actionOutputs = { 
 		                    @Jpf.ActionOutput(name = "lineItems",
-		                            type = org.apache.beehive.samples.petstore.model.LineItem[].class,
+		                            type = java.util.List.class,
 		                            required = true),
 		                    @Jpf.ActionOutput(name = "order",
 		                            type = org.apache.beehive.samples.petstore.model.Order.class,