incubator-isis-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From danhayw...@apache.org
Subject svn commit: r1199646 - in /incubator/isis/trunk/examples/webshop: ./ dom/ dom/src/main/java/org/apache/isis/examples/webshop/dom/baskets/ dom/src/main/java/org/apache/isis/examples/webshop/dom/catalog/categories/ dom/src/main/java/org/apache/isis/examp...
Date Wed, 09 Nov 2011 08:32:11 GMT
Author: danhaywood
Date: Wed Nov  9 08:32:09 2011
New Revision: 1199646

URL: http://svn.apache.org/viewvc?rev=1199646&view=rev
Log:
ISIS-120: minor changes to webshop example

Modified:
    incubator/isis/trunk/examples/webshop/   (props changed)
    incubator/isis/trunk/examples/webshop/dom/   (props changed)
    incubator/isis/trunk/examples/webshop/dom/pom.xml
    incubator/isis/trunk/examples/webshop/dom/src/main/java/org/apache/isis/examples/webshop/dom/baskets/Basket.java
    incubator/isis/trunk/examples/webshop/dom/src/main/java/org/apache/isis/examples/webshop/dom/baskets/BasketLineItem.java
    incubator/isis/trunk/examples/webshop/dom/src/main/java/org/apache/isis/examples/webshop/dom/catalog/categories/ProductCategories.java
    incubator/isis/trunk/examples/webshop/dom/src/main/java/org/apache/isis/examples/webshop/dom/catalog/categories/ProductCategory.java
    incubator/isis/trunk/examples/webshop/dom/src/main/java/org/apache/isis/examples/webshop/dom/catalog/products/Product.java
    incubator/isis/trunk/examples/webshop/dom/src/main/java/org/apache/isis/examples/webshop/dom/customers/Customer.java
    incubator/isis/trunk/examples/webshop/dom/src/main/java/org/apache/isis/examples/webshop/dom/orders/Order.java
    incubator/isis/trunk/examples/webshop/dom/src/main/java/org/apache/isis/examples/webshop/dom/orders/OrderLineItem.java
    incubator/isis/trunk/examples/webshop/fixture/   (props changed)
    incubator/isis/trunk/examples/webshop/fixture/pom.xml
    incubator/isis/trunk/examples/webshop/fixture/src/main/java/org/apache/isis/examples/webshop/fixture/catalog/categories/ProductCategoriesFixture.java
    incubator/isis/trunk/examples/webshop/objstore-default/   (props changed)
    incubator/isis/trunk/examples/webshop/objstore-default/pom.xml
    incubator/isis/trunk/examples/webshop/objstore-default/src/main/java/org/apache/isis/examples/webshop/objstore/dflt/catalog/categories/ProductCategoriesDefault.java
    incubator/isis/trunk/examples/webshop/objstore-default/src/main/java/org/apache/isis/examples/webshop/objstore/dflt/catalog/products/ProductsDefault.java
    incubator/isis/trunk/examples/webshop/objstore-default/src/main/java/org/apache/isis/examples/webshop/objstore/dflt/customers/CustomersDefault.java
    incubator/isis/trunk/examples/webshop/pom.xml
    incubator/isis/trunk/examples/webshop/quickrun/   (props changed)
    incubator/isis/trunk/examples/webshop/quickrun/pom.xml
    incubator/isis/trunk/examples/webshop/tests-bdd/   (props changed)
    incubator/isis/trunk/examples/webshop/tests-bdd/pom.xml
    incubator/isis/trunk/examples/webshop/tests-junit/   (props changed)
    incubator/isis/trunk/examples/webshop/tests-junit/pom.xml
    incubator/isis/trunk/examples/webshop/viewer-html/   (props changed)
    incubator/isis/trunk/examples/webshop/viewer-html/pom.xml
    incubator/isis/trunk/examples/webshop/viewer-json/   (props changed)
    incubator/isis/trunk/examples/webshop/viewer-json/ide/eclipse/launch/webshop-viewer-json.launch
    incubator/isis/trunk/examples/webshop/viewer-json/pom.xml
    incubator/isis/trunk/examples/webshop/viewer-scimpi/   (props changed)
    incubator/isis/trunk/examples/webshop/viewer-scimpi/pom.xml
    incubator/isis/trunk/examples/webshop/viewer-wicket/   (props changed)
    incubator/isis/trunk/examples/webshop/viewer-wicket/ide/eclipse/launch/webshop-viewer-wicket.launch
    incubator/isis/trunk/examples/webshop/viewer-wicket/pom.xml

Propchange: incubator/isis/trunk/examples/webshop/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Wed Nov  9 08:32:09 2011
@@ -0,0 +1,2 @@
+.settings
+.project

Propchange: incubator/isis/trunk/examples/webshop/dom/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Wed Nov  9 08:32:09 2011
@@ -0,0 +1,3 @@
+.settings
+.classpath
+.project

Modified: incubator/isis/trunk/examples/webshop/dom/pom.xml
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/examples/webshop/dom/pom.xml?rev=1199646&r1=1199645&r2=1199646&view=diff
==============================================================================
--- incubator/isis/trunk/examples/webshop/dom/pom.xml (original)
+++ incubator/isis/trunk/examples/webshop/dom/pom.xml Wed Nov  9 08:32:09 2011
@@ -22,7 +22,7 @@
 	<parent>
     	<groupId>org.apache.isis.examples</groupId>
     	<artifactId>webshop</artifactId>
-		<version>1.0-SNAPSHOT</version>
+		<version>0.2.0-incubating-SNAPSHOT</version>
 	</parent>
 
 	<artifactId>webshop-dom</artifactId>

Modified: incubator/isis/trunk/examples/webshop/dom/src/main/java/org/apache/isis/examples/webshop/dom/baskets/Basket.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/examples/webshop/dom/src/main/java/org/apache/isis/examples/webshop/dom/baskets/Basket.java?rev=1199646&r1=1199645&r2=1199646&view=diff
==============================================================================
--- incubator/isis/trunk/examples/webshop/dom/src/main/java/org/apache/isis/examples/webshop/dom/baskets/Basket.java
(original)
+++ incubator/isis/trunk/examples/webshop/dom/src/main/java/org/apache/isis/examples/webshop/dom/baskets/Basket.java
Wed Nov  9 08:32:09 2011
@@ -46,7 +46,7 @@ public class Basket extends AbstractDoma
     // }}
 
     // {{ add (action)
-    @MemberOrder(sequence = "1")
+    @MemberOrder(sequence = "3")
     public BasketLineItem add(final Product product) {
         final BasketLineItem lineItem = newTransientInstance(BasketLineItem.class);
         lineItem.setBasket(this);
@@ -62,7 +62,7 @@ public class Basket extends AbstractDoma
     // }}
 
     // {{ checkout (action)
-    @MemberOrder(sequence = "1")
+    @MemberOrder(sequence = "4")
     public Order checkout() {
         final Order order = orders.createOrder(getOwner());
         for (BasketLineItem bli : getLineItems()) {

Modified: incubator/isis/trunk/examples/webshop/dom/src/main/java/org/apache/isis/examples/webshop/dom/baskets/BasketLineItem.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/examples/webshop/dom/src/main/java/org/apache/isis/examples/webshop/dom/baskets/BasketLineItem.java?rev=1199646&r1=1199645&r2=1199646&view=diff
==============================================================================
--- incubator/isis/trunk/examples/webshop/dom/src/main/java/org/apache/isis/examples/webshop/dom/baskets/BasketLineItem.java
(original)
+++ incubator/isis/trunk/examples/webshop/dom/src/main/java/org/apache/isis/examples/webshop/dom/baskets/BasketLineItem.java
Wed Nov  9 08:32:09 2011
@@ -45,7 +45,6 @@ public class BasketLineItem extends Abst
 
     @Title(sequence="1", append="x")
     @MemberOrder(sequence = "3")
-    @Disabled
     public Integer getQuantity() {
         return quantity;
     }
@@ -62,14 +61,14 @@ public class BasketLineItem extends Abst
     // }}
     
     // {{ increment (action)
-    @MemberOrder(sequence = "1")
+    @MemberOrder(sequence = "4")
     public void increment() {
         setQuantity(getQuantity()+1);
     }
     // }}
 
     // {{ decrement (action)
-    @MemberOrder(sequence = "2")
+    @MemberOrder(sequence = "5")
     public void decrement() {
         setQuantity(getQuantity()-1);
         if(getQuantity() == 0) {

Modified: incubator/isis/trunk/examples/webshop/dom/src/main/java/org/apache/isis/examples/webshop/dom/catalog/categories/ProductCategories.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/examples/webshop/dom/src/main/java/org/apache/isis/examples/webshop/dom/catalog/categories/ProductCategories.java?rev=1199646&r1=1199645&r2=1199646&view=diff
==============================================================================
--- incubator/isis/trunk/examples/webshop/dom/src/main/java/org/apache/isis/examples/webshop/dom/catalog/categories/ProductCategories.java
(original)
+++ incubator/isis/trunk/examples/webshop/dom/src/main/java/org/apache/isis/examples/webshop/dom/catalog/categories/ProductCategories.java
Wed Nov  9 08:32:09 2011
@@ -12,14 +12,7 @@ import org.apache.isis.applib.annotation
 public interface ProductCategories {
 
     @QueryOnly
-    @MemberOrder(sequence="1")
-    public List<ProductCategory> list();
-
-    public ProductCategory newCategory(
-        @Named("Code") String code,
-        @Named("Name") String name);
-
-    @QueryOnly
+    @MemberOrder(sequence="3")
     public ProductCategory findByCode(
         @Named("Code") String code);
 

Modified: incubator/isis/trunk/examples/webshop/dom/src/main/java/org/apache/isis/examples/webshop/dom/catalog/categories/ProductCategory.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/examples/webshop/dom/src/main/java/org/apache/isis/examples/webshop/dom/catalog/categories/ProductCategory.java?rev=1199646&r1=1199645&r2=1199646&view=diff
==============================================================================
--- incubator/isis/trunk/examples/webshop/dom/src/main/java/org/apache/isis/examples/webshop/dom/catalog/categories/ProductCategory.java
(original)
+++ incubator/isis/trunk/examples/webshop/dom/src/main/java/org/apache/isis/examples/webshop/dom/catalog/categories/ProductCategory.java
Wed Nov  9 08:32:09 2011
@@ -2,6 +2,7 @@ package org.apache.isis.examples.webshop
 
 import org.apache.isis.applib.AbstractDomainObject;
 import org.apache.isis.applib.annotation.Bounded;
+import org.apache.isis.applib.annotation.Disabled;
 import org.apache.isis.applib.annotation.Ignore;
 import org.apache.isis.applib.annotation.MemberOrder;
 import org.apache.isis.applib.annotation.Title;
@@ -15,6 +16,7 @@ public class ProductCategory extends Abs
     private String code;
 
     @MemberOrder(sequence = "1.0")
+    @Disabled
     public String getCode() {
         return code;
     }
@@ -35,6 +37,7 @@ public class ProductCategory extends Abs
 
 	@MemberOrder(sequence = "2.0")
 	@Title
+    @Disabled
 	public String getName() {
 		return name;
 	}

Modified: incubator/isis/trunk/examples/webshop/dom/src/main/java/org/apache/isis/examples/webshop/dom/catalog/products/Product.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/examples/webshop/dom/src/main/java/org/apache/isis/examples/webshop/dom/catalog/products/Product.java?rev=1199646&r1=1199645&r2=1199646&view=diff
==============================================================================
--- incubator/isis/trunk/examples/webshop/dom/src/main/java/org/apache/isis/examples/webshop/dom/catalog/products/Product.java
(original)
+++ incubator/isis/trunk/examples/webshop/dom/src/main/java/org/apache/isis/examples/webshop/dom/catalog/products/Product.java
Wed Nov  9 08:32:09 2011
@@ -59,6 +59,7 @@ public class Product extends AbstractDom
     // {{ ImageUrl
     private String imageUrl;
 
+    @MemberOrder(sequence = "4.0")
     public String getImageUrl() {
         return imageUrl;
     }

Modified: incubator/isis/trunk/examples/webshop/dom/src/main/java/org/apache/isis/examples/webshop/dom/customers/Customer.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/examples/webshop/dom/src/main/java/org/apache/isis/examples/webshop/dom/customers/Customer.java?rev=1199646&r1=1199645&r2=1199646&view=diff
==============================================================================
--- incubator/isis/trunk/examples/webshop/dom/src/main/java/org/apache/isis/examples/webshop/dom/customers/Customer.java
(original)
+++ incubator/isis/trunk/examples/webshop/dom/src/main/java/org/apache/isis/examples/webshop/dom/customers/Customer.java
Wed Nov  9 08:32:09 2011
@@ -24,7 +24,7 @@ public class Customer extends AbstractDo
         }
     };
     
-    // {{ Ref (property, title)
+    // {{ Ref (property, key)
     private String ref;
 
     @Hidden
@@ -91,7 +91,7 @@ public class Customer extends AbstractDo
     // }}
 
     // {{ changeName (action)
-    @MemberOrder(sequence = "1")
+    @MemberOrder(sequence = "6.0")
     public void changeName(
         @Named("First name") final String firstName, 
         @Named("Last name") final String lastName) {
@@ -104,12 +104,8 @@ public class Customer extends AbstractDo
         if(!onlyAlpha(lastName)) return "Last name can only contain alphabetic characters";
         return null;
     }
-    private boolean onlyAlpha(String str) {
-        for(char c: str.toCharArray()) {
-            if(!Character.isLetter(c))
-                return false;
-        }
-        return true;
+    private static boolean onlyAlpha(String str) {
+        return str.matches("^[a-zA-Z]+$");
     }
     // }}
 

Modified: incubator/isis/trunk/examples/webshop/dom/src/main/java/org/apache/isis/examples/webshop/dom/orders/Order.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/examples/webshop/dom/src/main/java/org/apache/isis/examples/webshop/dom/orders/Order.java?rev=1199646&r1=1199645&r2=1199646&view=diff
==============================================================================
--- incubator/isis/trunk/examples/webshop/dom/src/main/java/org/apache/isis/examples/webshop/dom/orders/Order.java
(original)
+++ incubator/isis/trunk/examples/webshop/dom/src/main/java/org/apache/isis/examples/webshop/dom/orders/Order.java
Wed Nov  9 08:32:09 2011
@@ -28,7 +28,6 @@ public class Order extends AbstractDomai
     }
     // }}
 
-
     // {{ PlacedBy (property, title)
     private Customer placedBy;
 
@@ -43,7 +42,6 @@ public class Order extends AbstractDomai
         this.placedBy = customer;
     }
     // }}
-    
 
     // {{ PlacedOn (property)
     private Date date;
@@ -59,7 +57,6 @@ public class Order extends AbstractDomai
     }
     // }}
 
-
     // {{ LineItems (collection)
     private Set<OrderLineItem> lineItems = new LinkedHashSet<OrderLineItem>();
 
@@ -73,7 +70,6 @@ public class Order extends AbstractDomai
         this.lineItems = lineItems;
     }
     // }}
-
     
     // {{ helpers
     @Ignore // programmatic

Modified: incubator/isis/trunk/examples/webshop/dom/src/main/java/org/apache/isis/examples/webshop/dom/orders/OrderLineItem.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/examples/webshop/dom/src/main/java/org/apache/isis/examples/webshop/dom/orders/OrderLineItem.java?rev=1199646&r1=1199645&r2=1199646&view=diff
==============================================================================
--- incubator/isis/trunk/examples/webshop/dom/src/main/java/org/apache/isis/examples/webshop/dom/orders/OrderLineItem.java
(original)
+++ incubator/isis/trunk/examples/webshop/dom/src/main/java/org/apache/isis/examples/webshop/dom/orders/OrderLineItem.java
Wed Nov  9 08:32:09 2011
@@ -55,7 +55,7 @@ public class OrderLineItem extends Abstr
     // {{ Price (property)
     private Money price;
 
-    @MemberOrder(sequence = "1")
+    @MemberOrder(sequence = "4")
     @Disabled
     public Money getPrice() {
         return price;

Propchange: incubator/isis/trunk/examples/webshop/fixture/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Wed Nov  9 08:32:09 2011
@@ -0,0 +1,3 @@
+.settings
+.classpath
+.project

Modified: incubator/isis/trunk/examples/webshop/fixture/pom.xml
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/examples/webshop/fixture/pom.xml?rev=1199646&r1=1199645&r2=1199646&view=diff
==============================================================================
--- incubator/isis/trunk/examples/webshop/fixture/pom.xml (original)
+++ incubator/isis/trunk/examples/webshop/fixture/pom.xml Wed Nov  9 08:32:09 2011
@@ -22,7 +22,7 @@
     <parent>
     	<groupId>org.apache.isis.examples</groupId>
         <artifactId>webshop</artifactId>
-        <version>1.0-SNAPSHOT</version>
+        <version>0.2.0-incubating-SNAPSHOT</version>
     </parent>
 
 	<artifactId>webshop-fixture</artifactId>

Modified: incubator/isis/trunk/examples/webshop/fixture/src/main/java/org/apache/isis/examples/webshop/fixture/catalog/categories/ProductCategoriesFixture.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/examples/webshop/fixture/src/main/java/org/apache/isis/examples/webshop/fixture/catalog/categories/ProductCategoriesFixture.java?rev=1199646&r1=1199645&r2=1199646&view=diff
==============================================================================
--- incubator/isis/trunk/examples/webshop/fixture/src/main/java/org/apache/isis/examples/webshop/fixture/catalog/categories/ProductCategoriesFixture.java
(original)
+++ incubator/isis/trunk/examples/webshop/fixture/src/main/java/org/apache/isis/examples/webshop/fixture/catalog/categories/ProductCategoriesFixture.java
Wed Nov  9 08:32:09 2011
@@ -1,27 +1,26 @@
 package org.apache.isis.examples.webshop.fixture.catalog.categories;
 
 import org.apache.isis.applib.fixtures.AbstractFixture;
-import org.apache.isis.examples.webshop.dom.catalog.categories.ProductCategories;
+import org.apache.isis.examples.webshop.dom.catalog.categories.ProductCategory;
 
 
 public class ProductCategoriesFixture extends AbstractFixture {
 
     @Override
     public void install() {
-        categories.newCategory("CAM", "Camera & Photo");
-        categories.newCategory("CAR", "Sat Nav & Car Accessories");
-        categories.newCategory("SWR", "Software");
-        categories.newCategory("HWR", "Computer Components");
+        newCategory("CAM", "Camera & Photo");
+        newCategory("CAR", "Sat Nav & Car Accessories");
+        newCategory("SWR", "Software");
+        newCategory("HWR", "Computer Components");
     }
     
-    // {{ injected: ProductCategories
-    private ProductCategories categories;
-
-    public void setProductCategories(final ProductCategories categories) {
-        this.categories = categories;
+    private ProductCategory newCategory(String code, String name) {
+        final ProductCategory category = newTransientInstance(ProductCategory.class);
+        category.setCode(code);
+        category.setName(name);
+        persistIfNotAlready(category);
+        return category;
     }
-    // }}
-
 
     
 }

Propchange: incubator/isis/trunk/examples/webshop/objstore-default/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Wed Nov  9 08:32:09 2011
@@ -0,0 +1,3 @@
+.settings
+.classpath
+.project

Modified: incubator/isis/trunk/examples/webshop/objstore-default/pom.xml
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/examples/webshop/objstore-default/pom.xml?rev=1199646&r1=1199645&r2=1199646&view=diff
==============================================================================
--- incubator/isis/trunk/examples/webshop/objstore-default/pom.xml (original)
+++ incubator/isis/trunk/examples/webshop/objstore-default/pom.xml Wed Nov  9 08:32:09 2011
@@ -22,7 +22,7 @@
     <parent>
     	<groupId>org.apache.isis.examples</groupId>
         <artifactId>webshop</artifactId>
-        <version>1.0-SNAPSHOT</version>
+        <version>0.2.0-incubating-SNAPSHOT</version>
     </parent>
 
 	<artifactId>webshop-objstore-dflt</artifactId>

Modified: incubator/isis/trunk/examples/webshop/objstore-default/src/main/java/org/apache/isis/examples/webshop/objstore/dflt/catalog/categories/ProductCategoriesDefault.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/examples/webshop/objstore-default/src/main/java/org/apache/isis/examples/webshop/objstore/dflt/catalog/categories/ProductCategoriesDefault.java?rev=1199646&r1=1199645&r2=1199646&view=diff
==============================================================================
--- incubator/isis/trunk/examples/webshop/objstore-default/src/main/java/org/apache/isis/examples/webshop/objstore/dflt/catalog/categories/ProductCategoriesDefault.java
(original)
+++ incubator/isis/trunk/examples/webshop/objstore-default/src/main/java/org/apache/isis/examples/webshop/objstore/dflt/catalog/categories/ProductCategoriesDefault.java
Wed Nov  9 08:32:09 2011
@@ -1,7 +1,5 @@
 package org.apache.isis.examples.webshop.objstore.dflt.catalog.categories;
 
-import java.util.List;
-
 import org.apache.isis.applib.AbstractFactoryAndRepository;
 import org.apache.isis.applib.filter.Filter;
 import org.apache.isis.examples.webshop.dom.catalog.categories.ProductCategories;
@@ -22,21 +20,6 @@ public class ProductCategoriesDefault ex
 	// }}
 
     @Override
-    public List<ProductCategory> list() {
-        return allInstances(ProductCategory.class);
-    }
-
-
-    @Override
-    public ProductCategory newCategory(String code, String name) {
-        final ProductCategory category = newTransientInstance(ProductCategory.class);
-        category.setCode(code);
-        category.setName(name);
-        persistIfNotAlready(category);
-        return category;
-    }
-
-    @Override
     public ProductCategory findByCode(final String code) {
         return firstMatch(ProductCategory.class, new Filter<ProductCategory>(){
 

Modified: incubator/isis/trunk/examples/webshop/objstore-default/src/main/java/org/apache/isis/examples/webshop/objstore/dflt/catalog/products/ProductsDefault.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/examples/webshop/objstore-default/src/main/java/org/apache/isis/examples/webshop/objstore/dflt/catalog/products/ProductsDefault.java?rev=1199646&r1=1199645&r2=1199646&view=diff
==============================================================================
--- incubator/isis/trunk/examples/webshop/objstore-default/src/main/java/org/apache/isis/examples/webshop/objstore/dflt/catalog/products/ProductsDefault.java
(original)
+++ incubator/isis/trunk/examples/webshop/objstore-default/src/main/java/org/apache/isis/examples/webshop/objstore/dflt/catalog/products/ProductsDefault.java
Wed Nov  9 08:32:09 2011
@@ -3,6 +3,7 @@ package org.apache.isis.examples.webshop
 import java.util.List;
 
 import org.apache.isis.applib.AbstractFactoryAndRepository;
+import org.apache.isis.applib.annotation.MemberOrder;
 import org.apache.isis.applib.filter.Filter;
 import org.apache.isis.applib.value.Money;
 import org.apache.isis.examples.webshop.dom.catalog.categories.ProductCategory;
@@ -23,22 +24,19 @@ public class ProductsDefault extends Abs
     // }}
 
     @Override
-    public Product newProduct(String name, ProductCategory category, Money price, String
imagePath) {
+    @MemberOrder(sequence = "1.0")
+    public Product newProduct(String name, ProductCategory category, Money price, String
imageUrl) {
         final Product product = newTransientInstance(Product.class);
         product.setName(name);
         product.setCategory(category);
         product.setPrice(price);
-        product.setImageUrl(imagePath);
+        product.setImageUrl(imageUrl);
         persistIfNotAlready(product);
         return product;
     }
 
     @Override
-    public List<Product> all() {
-        return allInstances(Product.class);
-    }
-
-    @Override
+    @MemberOrder(sequence = "2.0")
     public List<Product> all(final ProductCategory productCategory) {
         return allMatches(Product.class, new Filter<Product>() {
 
@@ -49,5 +47,11 @@ public class ProductsDefault extends Abs
         });
     }
 
+    @Override
+    @MemberOrder(sequence = "3.0")
+    public List<Product> all() {
+        return allInstances(Product.class);
+    }
+
 
 }

Modified: incubator/isis/trunk/examples/webshop/objstore-default/src/main/java/org/apache/isis/examples/webshop/objstore/dflt/customers/CustomersDefault.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/examples/webshop/objstore-default/src/main/java/org/apache/isis/examples/webshop/objstore/dflt/customers/CustomersDefault.java?rev=1199646&r1=1199645&r2=1199646&view=diff
==============================================================================
--- incubator/isis/trunk/examples/webshop/objstore-default/src/main/java/org/apache/isis/examples/webshop/objstore/dflt/customers/CustomersDefault.java
(original)
+++ incubator/isis/trunk/examples/webshop/objstore-default/src/main/java/org/apache/isis/examples/webshop/objstore/dflt/customers/CustomersDefault.java
Wed Nov  9 08:32:09 2011
@@ -4,6 +4,7 @@ import java.util.Collections;
 import java.util.List;
 
 import org.apache.isis.applib.AbstractFactoryAndRepository;
+import org.apache.isis.applib.annotation.Exploration;
 import org.apache.isis.applib.annotation.Idempotent;
 import org.apache.isis.applib.annotation.QueryOnly;
 import org.apache.isis.applib.filter.Filter;
@@ -28,8 +29,8 @@ public class CustomersDefault extends Ab
 	// }}
 
 
-    private int id = 0;
-    
+
+	// {{ newCustomer
     @Override
     public Customer newCustomer(String firstName, String lastName, String email) {
         final Customer customer = newTransientInstance(Customer.class);
@@ -40,8 +41,14 @@ public class CustomersDefault extends Ab
         persistIfNotAlready(customer);
         return customer;
     }
+    private int id = 0;
+    private String nextRef() {
+        return "ID-" + (++id);
+    }
+    // }}
 
-    @Idempotent
+    // {{ findByEmail
+    @QueryOnly
     @Override
     public Customer findByEmail(final String email) {
         return firstMatch(Customer.class, new Filter<Customer>(){
@@ -53,23 +60,25 @@ public class CustomersDefault extends Ab
     public String default0FindByEmail() {
         return "joe@bloggs.com";
     }
+    // }}
 
+    // {{ all
     @QueryOnly
+    @Exploration
     @Override
     public List<Customer> all() {
         return allInstances(Customer.class);
     }
+    // }}
 
-    private String nextRef() {
-        return "ID-" + (++id);
-    }
-
+    // {{ recent
     @Override
     public List<Customer> recent() {
         final List<Customer> recent = Lists.newArrayList(all());
         Collections.sort(recent, Customer.REF_COMPARATOR);
         return recent;
     }
+    // }}
 
 
 

Modified: incubator/isis/trunk/examples/webshop/pom.xml
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/examples/webshop/pom.xml?rev=1199646&r1=1199645&r2=1199646&view=diff
==============================================================================
--- incubator/isis/trunk/examples/webshop/pom.xml (original)
+++ incubator/isis/trunk/examples/webshop/pom.xml Wed Nov  9 08:32:09 2011
@@ -21,7 +21,7 @@
 
     <groupId>org.apache.isis.examples</groupId>
     <artifactId>webshop</artifactId>
-    <version>1.0-SNAPSHOT</version>
+    <version>0.2.0-incubating-SNAPSHOT</version>
 
     <name>Webshop App</name>
 
@@ -143,37 +143,37 @@
             <dependency>
                 <groupId>${project.groupId}</groupId>
                 <artifactId>webshop-dom</artifactId>
-                <version>1.0-SNAPSHOT</version>
+                <version>0.2.0-incubating-SNAPSHOT</version>
             </dependency>
 
             <dependency>
                 <groupId>${project.groupId}</groupId>
                 <artifactId>webshop-domsvc</artifactId>
-                <version>1.0-SNAPSHOT</version>
+                <version>0.2.0-incubating-SNAPSHOT</version>
             </dependency>
 
             <dependency>
                 <groupId>${project.groupId}</groupId>
                 <artifactId>webshop-fixture</artifactId>
-                <version>1.0-SNAPSHOT</version>
+                <version>0.2.0-incubating-SNAPSHOT</version>
             </dependency>
 
             <dependency>
                 <groupId>${project.groupId}</groupId>
                 <artifactId>webshop-quickrun</artifactId>
-                <version>1.0-SNAPSHOT</version>
+                <version>0.2.0-incubating-SNAPSHOT</version>
             </dependency>
 
             <dependency>
                 <groupId>${project.groupId}</groupId>
                 <artifactId>webshop-objstore-dflt</artifactId>
-                <version>1.0-SNAPSHOT</version>
+                <version>0.2.0-incubating-SNAPSHOT</version>
             </dependency>
 
             <dependency>
                 <groupId>${project.groupId}</groupId>
                 <artifactId>webshop-viewer-dnd</artifactId>
-                <version>1.0-SNAPSHOT</version>
+                <version>0.2.0-incubating-SNAPSHOT</version>
             </dependency>
 
             <dependency>
@@ -185,37 +185,37 @@
             <dependency>
                 <groupId>${project.groupId}</groupId>
                 <artifactId>webshop-viewer-scimpi</artifactId>
-                <version>1.0-SNAPSHOT</version>
+                <version>0.2.0-incubating-SNAPSHOT</version>
             </dependency>
 
             <dependency>
                 <groupId>${project.groupId}</groupId>
                 <artifactId>webshop-viewer-wicket</artifactId>
-                <version>1.0-SNAPSHOT</version>
+                <version>0.2.0-incubating-SNAPSHOT</version>
             </dependency>
 
             <dependency>
                 <groupId>${project.groupId}</groupId>
                 <artifactId>webshop-viewer-json</artifactId>
-                <version>1.0-SNAPSHOT</version>
+                <version>0.2.0-incubating-SNAPSHOT</version>
             </dependency>
 
             <dependency>
                 <groupId>${project.groupId}</groupId>
                 <artifactId>webshop-viewer-xhtml</artifactId>
-                <version>1.0-SNAPSHOT</version>
+                <version>0.2.0-incubating-SNAPSHOT</version>
             </dependency>
 
             <dependency>
                 <groupId>${project.groupId}</groupId>
                 <artifactId>webshop-tests-bdd</artifactId>
-                <version>1.0-SNAPSHOT</version>
+                <version>0.2.0-incubating-SNAPSHOT</version>
             </dependency>
 
             <dependency>
                 <groupId>${project.groupId}</groupId>
                 <artifactId>tests-junit</artifactId>
-                <version>${project.version}</version>
+                <version>0.2.0-incubating-SNAPSHOT</version>
             </dependency>
 
             <dependency>

Propchange: incubator/isis/trunk/examples/webshop/quickrun/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Wed Nov  9 08:32:09 2011
@@ -0,0 +1,4 @@
+.settings
+logs
+.classpath
+.project

Modified: incubator/isis/trunk/examples/webshop/quickrun/pom.xml
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/examples/webshop/quickrun/pom.xml?rev=1199646&r1=1199645&r2=1199646&view=diff
==============================================================================
--- incubator/isis/trunk/examples/webshop/quickrun/pom.xml (original)
+++ incubator/isis/trunk/examples/webshop/quickrun/pom.xml Wed Nov  9 08:32:09 2011
@@ -29,7 +29,7 @@
     <parent>
         <groupId>org.apache.isis.examples</groupId>
         <artifactId>webshop</artifactId>
-        <version>1.0-SNAPSHOT</version>
+        <version>0.2.0-incubating-SNAPSHOT</version>
     </parent>
 
     <artifactId>webshop-quickrun</artifactId>

Propchange: incubator/isis/trunk/examples/webshop/tests-bdd/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Wed Nov  9 08:32:09 2011
@@ -0,0 +1,4 @@
+target
+.settings
+.classpath
+.project

Modified: incubator/isis/trunk/examples/webshop/tests-bdd/pom.xml
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/examples/webshop/tests-bdd/pom.xml?rev=1199646&r1=1199645&r2=1199646&view=diff
==============================================================================
--- incubator/isis/trunk/examples/webshop/tests-bdd/pom.xml (original)
+++ incubator/isis/trunk/examples/webshop/tests-bdd/pom.xml Wed Nov  9 08:32:09 2011
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.isis.examples</groupId>
         <artifactId>webshop</artifactId>
-        <version>1.0-SNAPSHOT</version>
+        <version>0.2.0-incubating-SNAPSHOT</version>
     </parent>
 
 	<artifactId>webshop-tests-bdd</artifactId>

Propchange: incubator/isis/trunk/examples/webshop/tests-junit/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Wed Nov  9 08:32:09 2011
@@ -0,0 +1,4 @@
+target
+.settings
+.classpath
+.project

Modified: incubator/isis/trunk/examples/webshop/tests-junit/pom.xml
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/examples/webshop/tests-junit/pom.xml?rev=1199646&r1=1199645&r2=1199646&view=diff
==============================================================================
--- incubator/isis/trunk/examples/webshop/tests-junit/pom.xml (original)
+++ incubator/isis/trunk/examples/webshop/tests-junit/pom.xml Wed Nov  9 08:32:09 2011
@@ -22,7 +22,7 @@
 	<parent>
     	<groupId>org.apache.isis.examples</groupId>
     	<artifactId>webshop</artifactId>
-		<version>1.0-SNAPSHOT</version>
+		<version>0.2.0-incubating-SNAPSHOT</version>
 	</parent>
 
 	<artifactId>webshop-tests-junit</artifactId>

Propchange: incubator/isis/trunk/examples/webshop/viewer-html/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Wed Nov  9 08:32:09 2011
@@ -0,0 +1,3 @@
+.settings
+.classpath
+.project

Modified: incubator/isis/trunk/examples/webshop/viewer-html/pom.xml
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/examples/webshop/viewer-html/pom.xml?rev=1199646&r1=1199645&r2=1199646&view=diff
==============================================================================
--- incubator/isis/trunk/examples/webshop/viewer-html/pom.xml (original)
+++ incubator/isis/trunk/examples/webshop/viewer-html/pom.xml Wed Nov  9 08:32:09 2011
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.isis.examples</groupId>
         <artifactId>webshop</artifactId>
-        <version>1.0-SNAPSHOT</version>
+        <version>0.2.0-incubating-SNAPSHOT</version>
     </parent>
 
 	<artifactId>webshop-viewer-html</artifactId>

Propchange: incubator/isis/trunk/examples/webshop/viewer-json/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Wed Nov  9 08:32:09 2011
@@ -0,0 +1,3 @@
+.settings
+.classpath
+.project

Modified: incubator/isis/trunk/examples/webshop/viewer-json/ide/eclipse/launch/webshop-viewer-json.launch
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/examples/webshop/viewer-json/ide/eclipse/launch/webshop-viewer-json.launch?rev=1199646&r1=1199645&r2=1199646&view=diff
==============================================================================
--- incubator/isis/trunk/examples/webshop/viewer-json/ide/eclipse/launch/webshop-viewer-json.launch
(original)
+++ incubator/isis/trunk/examples/webshop/viewer-json/ide/eclipse/launch/webshop-viewer-json.launch
Wed Nov  9 08:32:09 2011
@@ -12,6 +12,8 @@
 </mapAttribute>
 <stringAttribute key="org.eclipse.debug.core.source_locator_id" value="org.eclipse.jdt.launching.sourceLocator.JavaSourceLookupDirector"/>
 <booleanAttribute key="org.eclipse.jdt.debug.ui.INCLUDE_EXTERNAL_JARS" value="true"/>
+<stringAttribute key="org.eclipse.jdt.launching.CLASSPATH_PROVIDER" value="org.eclipse.m2e.launchconfig.classpathProvider"/>
 <stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="org.apache.isis.WebServer"/>
 <stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="webshop-viewer-json"/>
+<stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.m2e.launchconfig.sourcepathProvider"/>
 </launchConfiguration>

Modified: incubator/isis/trunk/examples/webshop/viewer-json/pom.xml
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/examples/webshop/viewer-json/pom.xml?rev=1199646&r1=1199645&r2=1199646&view=diff
==============================================================================
--- incubator/isis/trunk/examples/webshop/viewer-json/pom.xml (original)
+++ incubator/isis/trunk/examples/webshop/viewer-json/pom.xml Wed Nov  9 08:32:09 2011
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.isis.examples</groupId>
         <artifactId>webshop</artifactId>
-        <version>1.0-SNAPSHOT</version>
+        <version>0.2.0-incubating-SNAPSHOT</version>
     </parent>
 
 	<artifactId>webshop-viewer-json</artifactId>

Propchange: incubator/isis/trunk/examples/webshop/viewer-scimpi/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Wed Nov  9 08:32:09 2011
@@ -0,0 +1,4 @@
+target
+.settings
+.classpath
+.project

Modified: incubator/isis/trunk/examples/webshop/viewer-scimpi/pom.xml
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/examples/webshop/viewer-scimpi/pom.xml?rev=1199646&r1=1199645&r2=1199646&view=diff
==============================================================================
--- incubator/isis/trunk/examples/webshop/viewer-scimpi/pom.xml (original)
+++ incubator/isis/trunk/examples/webshop/viewer-scimpi/pom.xml Wed Nov  9 08:32:09 2011
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.isis.examples</groupId>
         <artifactId>webshop</artifactId>
-        <version>1.0-SNAPSHOT</version>
+        <version>0.2.0-incubating-SNAPSHOT</version>
     </parent>
 
 	<artifactId>webshop-viewer-scimpi</artifactId>

Propchange: incubator/isis/trunk/examples/webshop/viewer-wicket/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Wed Nov  9 08:32:09 2011
@@ -0,0 +1,3 @@
+.settings
+.classpath
+.project

Modified: incubator/isis/trunk/examples/webshop/viewer-wicket/ide/eclipse/launch/webshop-viewer-wicket.launch
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/examples/webshop/viewer-wicket/ide/eclipse/launch/webshop-viewer-wicket.launch?rev=1199646&r1=1199645&r2=1199646&view=diff
==============================================================================
--- incubator/isis/trunk/examples/webshop/viewer-wicket/ide/eclipse/launch/webshop-viewer-wicket.launch
(original)
+++ incubator/isis/trunk/examples/webshop/viewer-wicket/ide/eclipse/launch/webshop-viewer-wicket.launch
Wed Nov  9 08:32:09 2011
@@ -9,6 +9,8 @@
 </mapAttribute>
 <stringAttribute key="org.eclipse.debug.core.source_locator_id" value="org.eclipse.jdt.launching.sourceLocator.JavaSourceLookupDirector"/>
 <booleanAttribute key="org.eclipse.jdt.debug.ui.INCLUDE_EXTERNAL_JARS" value="true"/>
+<stringAttribute key="org.eclipse.jdt.launching.CLASSPATH_PROVIDER" value="org.eclipse.m2e.launchconfig.classpathProvider"/>
 <stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="org.apache.isis.WebServer"/>
 <stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="webshop-viewer-wicket"/>
+<stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.m2e.launchconfig.sourcepathProvider"/>
 </launchConfiguration>

Modified: incubator/isis/trunk/examples/webshop/viewer-wicket/pom.xml
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/examples/webshop/viewer-wicket/pom.xml?rev=1199646&r1=1199645&r2=1199646&view=diff
==============================================================================
--- incubator/isis/trunk/examples/webshop/viewer-wicket/pom.xml (original)
+++ incubator/isis/trunk/examples/webshop/viewer-wicket/pom.xml Wed Nov  9 08:32:09 2011
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.isis.examples</groupId>
         <artifactId>webshop</artifactId>
-        <version>1.0-SNAPSHOT</version>
+        <version>0.2.0-incubating-SNAPSHOT</version>
     </parent>
 
 	<name>Webshop Wicket Viewer</name>



Mime
View raw message