incubator-isis-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From danhayw...@apache.org
Subject svn commit: r1244795 [1/6] - in /incubator/isis/trunk/examples/quickstart: ./ dom/src/main/java/dom/todo/ fixture/src/main/java/fixture/todo/ objstore-default/src/main/java/objstore/dflt/todo/ tests-junit/src/test/java/junit/todo/ webapp/ webapp/ide/ec...
Date Thu, 16 Feb 2012 00:02:09 GMT
Author: danhaywood
Date: Thu Feb 16 00:02:06 2012
New Revision: 1244795

URL: http://svn.apache.org/viewvc?rev=1244795&view=rev
Log:
ISIS-189: add Scimpi into archetype

Added:
    incubator/isis/trunk/examples/quickstart/webapp/src/main/webapp/ToDoItem/
    incubator/isis/trunk/examples/quickstart/webapp/src/main/webapp/ToDoItem/edit.shtml
    incubator/isis/trunk/examples/quickstart/webapp/src/main/webapp/ToDoItem/object.shtml
    incubator/isis/trunk/examples/quickstart/webapp/src/main/webapp/WEB-INF/authentication_file.passwords
      - copied unchanged from r1228333, incubator/isis/trunk/examples/quickstart/webapp/src/main/webapp/WEB-INF/security_file.passwords
    incubator/isis/trunk/examples/quickstart/webapp/src/main/webapp/WEB-INF/authentication_file.properties   (with props)
    incubator/isis/trunk/examples/quickstart/webapp/src/main/webapp/WEB-INF/authorization_file.allow
      - copied, changed from r1228333, incubator/isis/trunk/examples/quickstart/webapp/src/main/webapp/WEB-INF/security_file.allow
    incubator/isis/trunk/examples/quickstart/webapp/src/main/webapp/WEB-INF/authorization_file.properties   (with props)
    incubator/isis/trunk/examples/quickstart/webapp/src/main/webapp/WEB-INF/persistor_in-memory.properties   (with props)
    incubator/isis/trunk/examples/quickstart/webapp/src/main/webapp/WEB-INF/persistor_mongodb.properties   (with props)
    incubator/isis/trunk/examples/quickstart/webapp/src/main/webapp/WEB-INF/persistor_sql.properties   (with props)
    incubator/isis/trunk/examples/quickstart/webapp/src/main/webapp/WEB-INF/user-profile-store_in-memory.properties   (with props)
    incubator/isis/trunk/examples/quickstart/webapp/src/main/webapp/WEB-INF/viewer_json.properties   (with props)
    incubator/isis/trunk/examples/quickstart/webapp/src/main/webapp/WEB-INF/viewer_scimpi.properties   (with props)
    incubator/isis/trunk/examples/quickstart/webapp/src/main/webapp/debug.shtml
    incubator/isis/trunk/examples/quickstart/webapp/src/main/webapp/error.shtml
    incubator/isis/trunk/examples/quickstart/webapp/src/main/webapp/generic/
    incubator/isis/trunk/examples/quickstart/webapp/src/main/webapp/generic/action.shtml
    incubator/isis/trunk/examples/quickstart/webapp/src/main/webapp/generic/collection.shtml
    incubator/isis/trunk/examples/quickstart/webapp/src/main/webapp/generic/edit.shtml
    incubator/isis/trunk/examples/quickstart/webapp/src/main/webapp/generic/object.shtml
    incubator/isis/trunk/examples/quickstart/webapp/src/main/webapp/htmlviewer/
    incubator/isis/trunk/examples/quickstart/webapp/src/main/webapp/htmlviewer/images/
    incubator/isis/trunk/examples/quickstart/webapp/src/main/webapp/htmlviewer/images/banner-bg.png
      - copied unchanged from r1228333, incubator/isis/trunk/examples/quickstart/webapp/src/main/webapp/images/banner-bg.png
    incubator/isis/trunk/examples/quickstart/webapp/src/main/webapp/htmlviewer/images/banner.png
      - copied unchanged from r1228333, incubator/isis/trunk/examples/quickstart/webapp/src/main/webapp/images/banner.png
    incubator/isis/trunk/examples/quickstart/webapp/src/main/webapp/htmlviewer/style/
    incubator/isis/trunk/examples/quickstart/webapp/src/main/webapp/htmlviewer/style/default.css
      - copied, changed from r1228333, incubator/isis/trunk/examples/quickstart/webapp/src/main/webapp/default.css
    incubator/isis/trunk/examples/quickstart/webapp/src/main/webapp/index.html   (with props)
    incubator/isis/trunk/examples/quickstart/webapp/src/main/webapp/index.shtml
    incubator/isis/trunk/examples/quickstart/webapp/src/main/webapp/jquery/
    incubator/isis/trunk/examples/quickstart/webapp/src/main/webapp/jquery.mobile/
    incubator/isis/trunk/examples/quickstart/webapp/src/main/webapp/jquery.mobile/images/
    incubator/isis/trunk/examples/quickstart/webapp/src/main/webapp/jquery.mobile/images/ajax-loader.png   (with props)
    incubator/isis/trunk/examples/quickstart/webapp/src/main/webapp/jquery.mobile/images/icons-18-black.png   (with props)
    incubator/isis/trunk/examples/quickstart/webapp/src/main/webapp/jquery.mobile/images/icons-18-white.png   (with props)
    incubator/isis/trunk/examples/quickstart/webapp/src/main/webapp/jquery.mobile/images/icons-36-black.png   (with props)
    incubator/isis/trunk/examples/quickstart/webapp/src/main/webapp/jquery.mobile/images/icons-36-white.png   (with props)
    incubator/isis/trunk/examples/quickstart/webapp/src/main/webapp/jquery.mobile/jquery.mobile-1.0.css   (with props)
    incubator/isis/trunk/examples/quickstart/webapp/src/main/webapp/jquery.mobile/jquery.mobile-1.0.js   (with props)
    incubator/isis/trunk/examples/quickstart/webapp/src/main/webapp/jquery.mobile/jquery.mobile.structure-1.0.css   (with props)
    incubator/isis/trunk/examples/quickstart/webapp/src/main/webapp/jquery.tmpl/
    incubator/isis/trunk/examples/quickstart/webapp/src/main/webapp/jquery.tmpl/jquery.tmpl-vBeta1.0.0.js   (with props)
    incubator/isis/trunk/examples/quickstart/webapp/src/main/webapp/jquery.tmpl/jquery.tmpl-vBeta1.0.0.min.js   (with props)
    incubator/isis/trunk/examples/quickstart/webapp/src/main/webapp/jquery/jquery-1.6.4.js   (with props)
    incubator/isis/trunk/examples/quickstart/webapp/src/main/webapp/login.shtml
    incubator/isis/trunk/examples/quickstart/webapp/src/main/webapp/mobile/
    incubator/isis/trunk/examples/quickstart/webapp/src/main/webapp/mobile/app.css   (with props)
    incubator/isis/trunk/examples/quickstart/webapp/src/main/webapp/mobile/app.js   (with props)
    incubator/isis/trunk/examples/quickstart/webapp/src/main/webapp/mobile/generic.js   (with props)
    incubator/isis/trunk/examples/quickstart/webapp/src/main/webapp/mobile/index.html   (with props)
    incubator/isis/trunk/examples/quickstart/webapp/src/main/webapp/mobile/namespace.js   (with props)
    incubator/isis/trunk/examples/quickstart/webapp/src/main/webapp/mobile/util.js   (with props)
    incubator/isis/trunk/examples/quickstart/webapp/src/main/webapp/scimpi/
    incubator/isis/trunk/examples/quickstart/webapp/src/main/webapp/scimpi/custom/
    incubator/isis/trunk/examples/quickstart/webapp/src/main/webapp/scimpi/custom/new-todo.shtml
    incubator/isis/trunk/examples/quickstart/webapp/src/main/webapp/scimpi/images/
    incubator/isis/trunk/examples/quickstart/webapp/src/main/webapp/scimpi/images/scimpi-logo.png   (with props)
    incubator/isis/trunk/examples/quickstart/webapp/src/main/webapp/scimpi/style/
    incubator/isis/trunk/examples/quickstart/webapp/src/main/webapp/scimpi/style/reset.css   (with props)
    incubator/isis/trunk/examples/quickstart/webapp/src/main/webapp/scimpi/style/screen.css   (with props)
    incubator/isis/trunk/examples/quickstart/webapp/src/main/webapp/scimpi/style/site-template.shtml
    incubator/isis/trunk/examples/quickstart/webapp/src/main/webapp/scimpi/style/template.shtml
Removed:
    incubator/isis/trunk/examples/quickstart/webapp/src/main/webapp/WEB-INF/security_file.allow
    incubator/isis/trunk/examples/quickstart/webapp/src/main/webapp/WEB-INF/security_file.passwords
    incubator/isis/trunk/examples/quickstart/webapp/src/main/webapp/default.css
    incubator/isis/trunk/examples/quickstart/webapp/src/main/webapp/images/
Modified:
    incubator/isis/trunk/examples/quickstart/dom/src/main/java/dom/todo/ToDoItem.java
    incubator/isis/trunk/examples/quickstart/dom/src/main/java/dom/todo/ToDoItems.java
    incubator/isis/trunk/examples/quickstart/fixture/src/main/java/fixture/todo/ToDoItemsFixture.java
    incubator/isis/trunk/examples/quickstart/objstore-default/src/main/java/objstore/dflt/todo/ToDoItemsDefault.java
    incubator/isis/trunk/examples/quickstart/pom.xml
    incubator/isis/trunk/examples/quickstart/tests-junit/src/test/java/junit/todo/ToDoItemRepositoryTest.java
    incubator/isis/trunk/examples/quickstart/tests-junit/src/test/java/junit/todo/ToDoItemTest.java
    incubator/isis/trunk/examples/quickstart/webapp/ide/eclipse/launch/quickstart-webapp.launch
    incubator/isis/trunk/examples/quickstart/webapp/pom.xml
    incubator/isis/trunk/examples/quickstart/webapp/src/main/webapp/WEB-INF/isis.properties
    incubator/isis/trunk/examples/quickstart/webapp/src/main/webapp/WEB-INF/logging.properties
    incubator/isis/trunk/examples/quickstart/webapp/src/main/webapp/WEB-INF/viewer_html.properties
    incubator/isis/trunk/examples/quickstart/webapp/src/main/webapp/WEB-INF/web.xml

Modified: incubator/isis/trunk/examples/quickstart/dom/src/main/java/dom/todo/ToDoItem.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/examples/quickstart/dom/src/main/java/dom/todo/ToDoItem.java?rev=1244795&r1=1244794&r2=1244795&view=diff
==============================================================================
--- incubator/isis/trunk/examples/quickstart/dom/src/main/java/dom/todo/ToDoItem.java (original)
+++ incubator/isis/trunk/examples/quickstart/dom/src/main/java/dom/todo/ToDoItem.java Thu Feb 16 00:02:06 2012
@@ -19,12 +19,19 @@
 
 package dom.todo;
 
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.List;
+
 import org.apache.isis.applib.AbstractDomainObject;
 import org.apache.isis.applib.annotation.Disabled;
+import org.apache.isis.applib.annotation.Hidden;
 import org.apache.isis.applib.annotation.MemberOrder;
 
 public class ToDoItem extends AbstractDomainObject {
 
+    public static final List<String> CATEGORIES = Collections.unmodifiableList(Arrays.asList("Professional", "Domestic", "Other"));
+
     // {{ Title
     public String title() {
         return getDescription();
@@ -43,7 +50,22 @@ public class ToDoItem extends AbstractDo
     public void setDescription(final String description) {
         this.description = description;
     }
+    // }}
+
+    // {{ Category
+    private String category;
+
+    @MemberOrder(sequence = "2")
+    public String getCategory() {
+        return category;
+    }
 
+    public void setCategory(final String category) {
+        this.category = category;
+    }
+    public List<String> choicesCategory() {
+        return CATEGORIES;
+    }
     // }}
 
     // {{ Done
@@ -51,7 +73,7 @@ public class ToDoItem extends AbstractDo
 
     @Disabled
     @MemberOrder(sequence = "3")
-    public boolean isComplete() {
+    public boolean isDone() {
         return done;
     }
 
@@ -60,23 +82,38 @@ public class ToDoItem extends AbstractDo
     }
 
     // }}
+    
+    // {{ OwnedBy (property)
+    private String ownedBy;
+
+    @Hidden
+    public String getOwnedBy() {
+        return ownedBy;
+    }
+
+    public void setOwnedBy(final String ownedBy) {
+        this.ownedBy = ownedBy;
+    }
+    // }}
+
 
     // {{ markAsDone
     @MemberOrder(sequence = "1")
-    public void markAsDone() {
+    public ToDoItem markAsDone() {
         setDone(true);
+        return this;
     }
 
     public String disableMarkAsDone() {
         return done ? "Already done" : null;
     }
-
     // }}
 
     // {{ markAsNotDone
     @MemberOrder(sequence = "2")
-    public void markAsNotDone() {
+    public ToDoItem markAsNotDone() {
         setDone(false);
+        return this;
     }
 
     public String disableMarkAsNotDone() {
@@ -84,4 +121,12 @@ public class ToDoItem extends AbstractDo
     }
     // }}
 
+    // {{ injected: ToDoItems
+    private ToDoItems toDoItems;
+
+    public void setToDoItems(final ToDoItems toDoItems) {
+        this.toDoItems = toDoItems;
+    }
+    // }}
+
 }

Modified: incubator/isis/trunk/examples/quickstart/dom/src/main/java/dom/todo/ToDoItems.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/examples/quickstart/dom/src/main/java/dom/todo/ToDoItems.java?rev=1244795&r1=1244794&r2=1244795&view=diff
==============================================================================
--- incubator/isis/trunk/examples/quickstart/dom/src/main/java/dom/todo/ToDoItems.java (original)
+++ incubator/isis/trunk/examples/quickstart/dom/src/main/java/dom/todo/ToDoItems.java Thu Feb 16 00:02:06 2012
@@ -21,16 +21,31 @@ package dom.todo;
 
 import java.util.List;
 
+import org.apache.isis.applib.annotation.Hidden;
 import org.apache.isis.applib.annotation.MemberOrder;
 import org.apache.isis.applib.annotation.Named;
+import org.apache.isis.applib.annotation.QueryOnly;
 
 @Named("ToDos")
 public interface ToDoItems {
 
+    @QueryOnly
     @MemberOrder(sequence = "1")
     public List<ToDoItem> notYetDone();
 
     @MemberOrder(sequence = "2")
-    public ToDoItem newToDo(@Named("Description") String description);
+    public ToDoItem newToDo(
+            @Named("Description") String description, 
+            @Named("Category") String category);
+
+    @Hidden // for use by fixtures
+    public ToDoItem newToDo(
+            String description, 
+            String category, 
+            String ownedBy);
+
+    @QueryOnly
+    @MemberOrder(sequence = "3")
+    public List<ToDoItem> similarTo(ToDoItem toDoItem);
 
 }

Modified: incubator/isis/trunk/examples/quickstart/fixture/src/main/java/fixture/todo/ToDoItemsFixture.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/examples/quickstart/fixture/src/main/java/fixture/todo/ToDoItemsFixture.java?rev=1244795&r1=1244794&r2=1244795&view=diff
==============================================================================
--- incubator/isis/trunk/examples/quickstart/fixture/src/main/java/fixture/todo/ToDoItemsFixture.java (original)
+++ incubator/isis/trunk/examples/quickstart/fixture/src/main/java/fixture/todo/ToDoItemsFixture.java Thu Feb 16 00:02:06 2012
@@ -28,15 +28,16 @@ public class ToDoItemsFixture extends Ab
 
     @Override
     public void install() {
-        createToDoItem("Buy milk");
-        createToDoItem("Pick up laundry");
-        createToDoItem("Buy stamps");
-        createToDoItem("Write blog post");
-        createToDoItem("Organize brown bag");
+        String ownedBy = "sven";
+        createToDoItem("Buy milk", "Domestic", ownedBy);
+        createToDoItem("Pick up laundry", "Domestic", ownedBy);
+        createToDoItem("Buy stamps", "Domestic", ownedBy);
+        createToDoItem("Write blog post", "Professional", ownedBy);
+        createToDoItem("Organize brown bag", "Professional", ownedBy);
     }
 
-    private ToDoItem createToDoItem(final String description) {
-        return toDoItems.newToDo(description);
+    private ToDoItem createToDoItem(final String description, String category, String ownedBy) {
+        return toDoItems.newToDo(description, category, ownedBy);
     }
 
     private ToDoItems toDoItems;

Modified: incubator/isis/trunk/examples/quickstart/objstore-default/src/main/java/objstore/dflt/todo/ToDoItemsDefault.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/examples/quickstart/objstore-default/src/main/java/objstore/dflt/todo/ToDoItemsDefault.java?rev=1244795&r1=1244794&r2=1244795&view=diff
==============================================================================
--- incubator/isis/trunk/examples/quickstart/objstore-default/src/main/java/objstore/dflt/todo/ToDoItemsDefault.java (original)
+++ incubator/isis/trunk/examples/quickstart/objstore-default/src/main/java/objstore/dflt/todo/ToDoItemsDefault.java Thu Feb 16 00:02:06 2012
@@ -21,6 +21,8 @@ package objstore.dflt.todo;
 
 import java.util.List;
 
+import com.google.common.base.Objects;
+
 import dom.todo.ToDoItem;
 import dom.todo.ToDoItems;
 
@@ -43,22 +45,49 @@ public class ToDoItemsDefault extends Ab
 
     @Override
     public List<ToDoItem> notYetDone() {
+        final String userName = getContainer().getUser().getName();
         return allMatches(ToDoItem.class, new Filter<ToDoItem>() {
             @Override
             public boolean accept(final ToDoItem t) {
-                return !t.isComplete();
+                return Objects.equal(t.getOwnedBy(), userName) && !t.isDone();
             }
         });
     }
 
-    // {{ NewToDo
+    // {{ NewToDo  (action)
+    @Override
+    public ToDoItem newToDo(final String description, String category) {
+        final String ownedBy = getContainer().getUser().getName();
+        return newToDo(description, category, ownedBy);
+    }
+    public List<String> choices1NewToDo() {
+        return ToDoItem.CATEGORIES;
+    }
+    // }}
+
+    // {{ NewToDo  (hidden)
     @Override
-    public ToDoItem newToDo(final String description) {
+    public ToDoItem newToDo(final String description, String category, String ownedBy) {
         final ToDoItem toDoItem = newTransientInstance(ToDoItem.class);
         toDoItem.setDescription(description);
+        toDoItem.setCategory(category);
+        toDoItem.setOwnedBy(ownedBy);
         persist(toDoItem);
         return toDoItem;
     }
     // }}
 
+    // {{ SimilarTo (action)
+    @Override
+    public List<ToDoItem> similarTo(final ToDoItem toDoItem) {
+        return allMatches(ToDoItem.class, new Filter<ToDoItem>() {
+            @Override
+            public boolean accept(ToDoItem t) {
+                return t != toDoItem && Objects.equal(toDoItem.getCategory(), t.getCategory()) ;
+            }
+        });
+    }
+    // }}
+
+
 }

Modified: incubator/isis/trunk/examples/quickstart/pom.xml
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/examples/quickstart/pom.xml?rev=1244795&r1=1244794&r2=1244795&view=diff
==============================================================================
--- incubator/isis/trunk/examples/quickstart/pom.xml (original)
+++ incubator/isis/trunk/examples/quickstart/pom.xml Thu Feb 16 00:02:06 2012
@@ -152,11 +152,6 @@
         <module>webapp</module>
         <module>tests-junit</module>
         <module>tests-bdd</module>
-        <!-- 
-        <module>quickrun</module>
-        <module>viewer-scimpi</module>
-        <module>viewer-wicket</module>
-        -->
     </modules>
 
     <dependencyManagement>
@@ -199,26 +194,6 @@
                 <version>${project.version}</version>
             </dependency>
 
-            <!-- 
-            <dependency>
-                <groupId>${project.groupId}</groupId>
-                <artifactId>quickstart-quickrun</artifactId>
-                <version>${project.version}</version>
-            </dependency>
-
-            <dependency>
-                <groupId>${project.groupId}</groupId>
-                <artifactId>quickstart-viewer-scimpi</artifactId>
-                <version>${project.version}</version>
-            </dependency>
-
-            <dependency>
-                <groupId>${project.groupId}</groupId>
-                <artifactId>quickstart-viewer-wicket</artifactId>
-                <version>${project.version}</version>
-            </dependency>
-            -->
-
 
             <!-- isis: applib -->
             <dependency>
@@ -381,13 +356,11 @@
             </dependency>
 
             <!-- isis: runtimes-dflt: objectstores: nosql -->
-            <!-- 
             <dependency>
                 <groupId>org.apache.isis.runtimes.dflt.objectstores</groupId>
                 <artifactId>nosql</artifactId>
                 <version>${isis.version}</version>
             </dependency>
-            -->
 
 
             <!-- isis: runtimes-dflt: profilestores: dflt -->
@@ -513,7 +486,6 @@
 
 
             <!-- isis: viewer: scimpi -->
-            <!-- 
             <dependency>
                 <groupId>org.apache.isis.viewer</groupId>
                 <artifactId>scimpi</artifactId>
@@ -529,7 +501,6 @@
                 <artifactId>scimpi-servlet</artifactId>
                 <version>${isis.version}</version>
             </dependency>
-            -->
 
 
             <!-- isis: viewer: dnd -->

Modified: incubator/isis/trunk/examples/quickstart/tests-junit/src/test/java/junit/todo/ToDoItemRepositoryTest.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/examples/quickstart/tests-junit/src/test/java/junit/todo/ToDoItemRepositoryTest.java?rev=1244795&r1=1244794&r2=1244795&view=diff
==============================================================================
--- incubator/isis/trunk/examples/quickstart/tests-junit/src/test/java/junit/todo/ToDoItemRepositoryTest.java (original)
+++ incubator/isis/trunk/examples/quickstart/tests-junit/src/test/java/junit/todo/ToDoItemRepositoryTest.java Thu Feb 16 00:02:06 2012
@@ -46,7 +46,7 @@ public class ToDoItemRepositoryTest exte
 
     @Test
     public void canCreateToDoItem() throws Exception {
-        final ToDoItem newItem = toDoItems.newToDo("item description");
+        final ToDoItem newItem = toDoItems.newToDo("item description", "Professional", "sven");
         assertThat(newItem, is(not(nullValue())));
         assertThat(newItem.getDescription(), is("item description"));
         assertThat(getDomainObjectContainer().isPersistent(newItem), is(true));

Modified: incubator/isis/trunk/examples/quickstart/tests-junit/src/test/java/junit/todo/ToDoItemTest.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/examples/quickstart/tests-junit/src/test/java/junit/todo/ToDoItemTest.java?rev=1244795&r1=1244794&r2=1244795&view=diff
==============================================================================
--- incubator/isis/trunk/examples/quickstart/tests-junit/src/test/java/junit/todo/ToDoItemTest.java (original)
+++ incubator/isis/trunk/examples/quickstart/tests-junit/src/test/java/junit/todo/ToDoItemTest.java Thu Feb 16 00:02:06 2012
@@ -48,7 +48,7 @@ public class ToDoItemTest extends Abstra
     @Test
     public void canMarkAsDone() throws Exception {
         toDoItem.markAsDone();
-        assertThat(toDoItem.isComplete(), is(true));
+        assertThat(toDoItem.isDone(), is(true));
     }
 
     @Test

Modified: incubator/isis/trunk/examples/quickstart/webapp/ide/eclipse/launch/quickstart-webapp.launch
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/examples/quickstart/webapp/ide/eclipse/launch/quickstart-webapp.launch?rev=1244795&r1=1244794&r2=1244795&view=diff
==============================================================================
--- incubator/isis/trunk/examples/quickstart/webapp/ide/eclipse/launch/quickstart-webapp.launch (original)
+++ incubator/isis/trunk/examples/quickstart/webapp/ide/eclipse/launch/quickstart-webapp.launch Thu Feb 16 00:02:06 2012
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <launchConfiguration type="org.eclipse.jdt.launching.localJavaApplication">
 <listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS">
-<listEntry value="/quickstart-webapp"/>
+<listEntry value="/org.apache.isis.runtimes.dflt.webserver/src/main/java/org/apache/isis/WebServer.java"/>
 </listAttribute>
 <listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES">
-<listEntry value="4"/>
+<listEntry value="1"/>
 </listAttribute>
 <mapAttribute key="org.eclipse.debug.core.preferred_launchers">
 <mapEntry key="[debug]" value="org.eclipse.jdt.launching.localJavaApplication"/>

Modified: incubator/isis/trunk/examples/quickstart/webapp/pom.xml
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/examples/quickstart/webapp/pom.xml?rev=1244795&r1=1244794&r2=1244795&view=diff
==============================================================================
--- incubator/isis/trunk/examples/quickstart/webapp/pom.xml (original)
+++ incubator/isis/trunk/examples/quickstart/webapp/pom.xml Thu Feb 16 00:02:06 2012
@@ -16,7 +16,8 @@
   KIND, either express or implied.  See the License for the
   specific language governing permissions and limitations
   under the License.
---><project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+-->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
 	<modelVersion>4.0.0</modelVersion>
 
     <parent>
@@ -97,26 +98,97 @@
             <artifactId>json-viewer</artifactId>
         </dependency>
 
+        <dependency>
+            <groupId>org.apache.isis.viewer</groupId>
+            <artifactId>scimpi-servlet</artifactId>
+        </dependency>
+
         <!-- isis runtime -->
         <dependency>
             <groupId>org.apache.isis.runtimes.dflt.bytecode</groupId>
             <artifactId>dflt</artifactId>
         </dependency>
+        
         <dependency>
             <groupId>org.apache.isis.runtimes.dflt.objectstores</groupId>
             <artifactId>dflt</artifactId>
         </dependency>
+        
+        <!--
+         - uncomment in order to use mongodb object store
+         - 
         <dependency>
             <groupId>org.apache.isis.runtimes.dflt.objectstores</groupId>
-            <artifactId>xml</artifactId>
+            <artifactId>nosql</artifactId>
         </dependency>
+        -->
+        
+        <!--
+         - uncomment in order to use sql object store
+         - 
         <dependency>
-            <groupId>org.apache.isis.runtimes.dflt.profilestores</groupId>
-            <artifactId>dflt</artifactId>
+            <groupId>org.apache.isis.runtimes.dflt.objectstores</groupId>
+            <artifactId>sql-impl</artifactId>
+        </dependency>
+        -->
+
+        <!--
+         - uncomment to use HSQLDB
+         - in conjunction with sql object store
+         - 
+        <dependency>
+            <groupId>org.hsqldb</groupId>
+            <artifactId>hsqldb</artifactId>
+            <version>1.8.0.10</version>
+        </dependency>
+        -->
+
+        <!--
+         - uncomment to use MS SQL Server JDBC driver
+         - in conjunction with sql object store
+         -
+         - since this JDBC driver is not available via Maven central repo, it must
+         - also be installed into your local .m2 repository, using:
+         -
+           mvn install:install-file         \
+              -D groupId=com.microsoft      \
+              -D artifactId=sqljdbc4        \
+              -D version=3.0                \
+              -D packaging=jar              \
+              -D file=/path/to/sqljdbc4.jar 
+         - 
+        <dependency>
+            <groupId>com.microsoft</groupId>
+            <artifactId>sqljdbc4</artifactId>
+            <version>3.0</version>
+        </dependency>
+        -->        
+
+
+        <!--
+         - uncomment to use Ingres JDBC driver
+         - in conjunction with sql object store
+         - 
+         - since this JDBC driver is not available via Maven central repo, it must
+         - also be installed into your local .m2 repository, using:
+         -
+           mvn install:install-file         \
+              -D groupId=com.ingres         \
+              -D artifactId=iijdbc          \
+              -D version=10.0               \
+              -D packaging=jar              \
+              -D file=/path/to/iijdbc.jar 
+         - 
+        <dependency>
+            <groupId>com.ingres</groupId>
+            <artifactId>iijdbc</artifactId>
+            <version>10.0</version>
         </dependency>
+         -->
+
         <dependency>
             <groupId>org.apache.isis.runtimes.dflt.profilestores</groupId>
-            <artifactId>xml</artifactId>
+            <artifactId>dflt</artifactId>
         </dependency>
         
         <!-- isis progmodel -->
@@ -149,6 +221,7 @@
             <version>1.2</version>
         </dependency>
 
+
 	</dependencies>
 
 </project>

Added: incubator/isis/trunk/examples/quickstart/webapp/src/main/webapp/ToDoItem/edit.shtml
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/examples/quickstart/webapp/src/main/webapp/ToDoItem/edit.shtml?rev=1244795&view=auto
==============================================================================
--- incubator/isis/trunk/examples/quickstart/webapp/src/main/webapp/ToDoItem/edit.shtml (added)
+++ incubator/isis/trunk/examples/quickstart/webapp/src/main/webapp/ToDoItem/edit.shtml Thu Feb 16 00:02:06 2012
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  Licensed to the Apache Software Foundation (ASF) under one
+  or more contributor license agreements.  See the NOTICE file
+  distributed with this work for additional information
+  regarding copyright ownership.  The ASF licenses this file
+  to you 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.
+-->
+<swf:page-title>Edit <swf:title icon="no" /></swf:page-title>
+<swf:template  file="../scimpi/style/template.shtml" />
+
+<swf:edit title="Change Item">
+    <swf:exclude name="done" />
+</swf:edit>
+
+

Added: incubator/isis/trunk/examples/quickstart/webapp/src/main/webapp/ToDoItem/object.shtml
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/examples/quickstart/webapp/src/main/webapp/ToDoItem/object.shtml?rev=1244795&view=auto
==============================================================================
--- incubator/isis/trunk/examples/quickstart/webapp/src/main/webapp/ToDoItem/object.shtml (added)
+++ incubator/isis/trunk/examples/quickstart/webapp/src/main/webapp/ToDoItem/object.shtml Thu Feb 16 00:02:06 2012
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  Licensed to the Apache Software Foundation (ASF) under one
+  or more contributor license agreements.  See the NOTICE file
+  distributed with this work for additional information
+  regarding copyright ownership.  The ASF licenses this file
+  to you 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.
+-->
+<swf:page-title><swf:title-string /></swf:page-title>
+<swf:template  file="../scimpi/style/template.shtml" />
+
+<h2>To Do: <em><swf:title-string /></em></h2>
+<swf:short-form title=""/>
+
+<swf:edit-link show-as-button="true" container-class="action">Change Item</swf:edit-link>
+<swf:action-button method="markAsDone" />
+<swf:action-button method="markAsNotDone" />
+
+<p class="alternative">View object in <a href="/generic/object.shtml?_result=${_result}">generic page</a></p>
+
+<P>.</P>

Added: incubator/isis/trunk/examples/quickstart/webapp/src/main/webapp/WEB-INF/authentication_file.properties
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/examples/quickstart/webapp/src/main/webapp/WEB-INF/authentication_file.properties?rev=1244795&view=auto
==============================================================================
--- incubator/isis/trunk/examples/quickstart/webapp/src/main/webapp/WEB-INF/authentication_file.properties (added)
+++ incubator/isis/trunk/examples/quickstart/webapp/src/main/webapp/WEB-INF/authentication_file.properties Thu Feb 16 00:02:06 2012
@@ -0,0 +1,25 @@
+#  Licensed to the Apache Software Foundation (ASF) under one
+#  or more contributor license agreements.  See the NOTICE file
+#  distributed with this work for additional information
+#  regarding copyright ownership.  The ASF licenses this file
+#  to you 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.
+
+#
+# configuration file for the File-based authentication mechanism
+#
+
+
+#
+# (intentionally empty)
+#

Propchange: incubator/isis/trunk/examples/quickstart/webapp/src/main/webapp/WEB-INF/authentication_file.properties
------------------------------------------------------------------------------
    svn:eol-style = native

Copied: incubator/isis/trunk/examples/quickstart/webapp/src/main/webapp/WEB-INF/authorization_file.allow (from r1228333, incubator/isis/trunk/examples/quickstart/webapp/src/main/webapp/WEB-INF/security_file.allow)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/examples/quickstart/webapp/src/main/webapp/WEB-INF/authorization_file.allow?p2=incubator/isis/trunk/examples/quickstart/webapp/src/main/webapp/WEB-INF/authorization_file.allow&p1=incubator/isis/trunk/examples/quickstart/webapp/src/main/webapp/WEB-INF/security_file.allow&r1=1228333&r2=1244795&rev=1244795&view=diff
==============================================================================
--- incubator/isis/trunk/examples/quickstart/webapp/src/main/webapp/WEB-INF/security_file.allow (original)
+++ incubator/isis/trunk/examples/quickstart/webapp/src/main/webapp/WEB-INF/authorization_file.allow Thu Feb 16 00:02:06 2012
@@ -18,6 +18,11 @@
 
 #
 # configuration file for the file-based authorization
-# not used by the onlinedemo
 #
 
+
+#
+# (intentionally empty)
+#
+
+

Added: incubator/isis/trunk/examples/quickstart/webapp/src/main/webapp/WEB-INF/authorization_file.properties
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/examples/quickstart/webapp/src/main/webapp/WEB-INF/authorization_file.properties?rev=1244795&view=auto
==============================================================================
--- incubator/isis/trunk/examples/quickstart/webapp/src/main/webapp/WEB-INF/authorization_file.properties (added)
+++ incubator/isis/trunk/examples/quickstart/webapp/src/main/webapp/WEB-INF/authorization_file.properties Thu Feb 16 00:02:06 2012
@@ -0,0 +1,47 @@
+#  Licensed to the Apache Software Foundation (ASF) under one
+#  or more contributor license agreements.  See the NOTICE file
+#  distributed with this work for additional information
+#  regarding copyright ownership.  The ASF licenses this file
+#  to you 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.
+
+#
+# configuration file for the File-based authorization mechanism
+#
+
+
+#
+# the whitelist file
+# (value shown below is the default)
+#
+
+# isis.authorization.file.whitelist=authorization_file.allow
+
+
+
+#
+# the blacklist file
+# (there is no default value; provide a filename)
+#
+
+# isis.authorization.file.blacklist=
+
+
+
+#
+# switch on "learning mode".  In this mode the authorization mechanism
+# will grant all requests, and log those requests into the allow file.
+#
+
+#isis.authorization.learn=true
+

Propchange: incubator/isis/trunk/examples/quickstart/webapp/src/main/webapp/WEB-INF/authorization_file.properties
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: incubator/isis/trunk/examples/quickstart/webapp/src/main/webapp/WEB-INF/isis.properties
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/examples/quickstart/webapp/src/main/webapp/WEB-INF/isis.properties?rev=1244795&r1=1244794&r2=1244795&view=diff
==============================================================================
--- incubator/isis/trunk/examples/quickstart/webapp/src/main/webapp/WEB-INF/isis.properties (original)
+++ incubator/isis/trunk/examples/quickstart/webapp/src/main/webapp/WEB-INF/isis.properties Thu Feb 16 00:02:06 2012
@@ -14,36 +14,146 @@
 #  KIND, either express or implied.  See the License for the
 #  specific language governing permissions and limitations
 #  under the License.
+
+
+#################################################################################
+#
+# Services and fixtures
+#
+#################################################################################
+
+#
+# Specify the domain services.
+# 
+# These are the most important configuration properties in the system, as they define
+# the set of the classes for Isis to instantiate as domain service singletons.
+# From these domain service instances the rest of the metamodel is discovered, while the 
+# end-user gains access to other domain objects by invoking the actions of the domain services.
+#
 isis.services.prefix = objstore.dflt
 isis.services = todo.ToDoItemsDefault
-
+
+
+#
+# Specify the (optional) test fixtures
+#
+# Fixtures are used to seed the object store with an initial set of data.  For the 
+# in-memory object store, the fixtures are installed on every run.  For other
+# object stores, they are used only when the object store is first initialized.
+#
 isis.fixtures.prefix= fixture
-isis.fixtures= LogonAsSvenFixture,todo.ToDoItemsFixture
-#isis.fixtures= todo.ToDoItemsFixture
-
-isis.exploration.users=sven, dick, bob
-
-
-isis.reflector.class-substitutor=org.apache.isis.runtimes.dflt.bytecode.dflt.classsubstitutor.CglibClassSubstitutor
-#isis.reflector.class-substitutor=org.apache.isis.runtimes.dflt.bytecode.javassist.classsubstitutor.JavassistClassSubstitutor
-#isis.reflector.class-substitutor=org.apache.isis.runtimes.dflt.bytecode.identity.classsubstitutor.ClassSubstitutorIdentity
-
-isis.persistor.object-factory=org.apache.isis.runtimes.dflt.bytecode.dflt.objectfactory.CglibObjectFactory
-#isis.persistor.object-factory=org.apache.isis.runtimes.dflt.bytecode.javassist.objectfactory.JavassistObjectFactory
-#isis.persistor.object-factory=org.apache.isis.runtimes.dflt.bytecode.identity.objectfactory.ObjectFactoryBasic
-
-
-isis.persistor.domain-object-container=org.apache.isis.core.metamodel.services.container.DomainObjectContainerDefault
-#isis.persistor.domain-object-container=org.apache.isis.progmodel.wrapper.metamodel.DomainObjectContainerWrapperFactory
-
-
-isis.authentication=org.apache.isis.security.file.authentication.FileAuthenticationManagerInstaller
-
-
-#isis.reflector.facets.include=org.apache.isis.runtimes.dflt.runtime.authorization.standard.AuthorizationFacetFactoryImpl
-#isis.authorization.learn=true
-
-
-isis.user-profile-store=in-memory
-isis.persistor=in-memory
-#isis.xmlos.dir=/tmp/xml
\ No newline at end of file
+isis.fixtures= todo.ToDoItemsFixture
+
+
+#################################################################################
+#
+# specify system components.
+#
+# The values correspond to the named components in the installer-registry.properties file
+# in the org.apache.isis.runtimes.dflt:runtime JAR (in the org.apache.isis.runtimes.dflt.runtime package)
+#
+# Although all configuration could reside in isis.properties, the recommendation is
+# to split out into component specific files:
+# 
+#    xxx_yyy.properties files
+#
+# where
+#    * xxx is the component type, and
+#    * yyy is the component name.
+#
+# For example, persistor_sql.properties holds configuration information specific to the
+#
+#
+# If the components are changed, also remember to edit pom.xml (further comments can be 
+# found in the persistor_xxx.properties files)
+#
+#################################################################################
+
+
+#
+# configure authentication mechanis to use (to logon to the system)
+# note that the Scimpi view allows access to anonymous users
+# 
+isis.authentication=file
+
+
+#
+# configure authorization mechanism to use
+
+# The authorization mechanism define each users' permissions to view/edit object properties 
+# or collections, and to view/invoke object actions
+#
+# >>>
+# >>> NB: authorization also requires a "facet decorator" to be installed, 
+# >>> see 'miscellaneous' settings below.
+# >>> 
+# 
+isis.authorization=file
+
+
+
+#
+# configure the persistor (object store) to use
+#
+# * in-memory   requires no additional configuration, but stores object in-memory 
+#               and so is only suitable for prototyping
+# * mongodb     uses MongDB to be persist objects as JSON documents.  It requires MongoDB
+#               to be installed first (see persistor_mongodb.properties) 
+# * sql         uses an RDBMS to persist objects as table rows.  It requires a suitable RDBMS
+#               supporting JDBC to be installed (see persistor_sql.properties)
+# 
+
+isis.persistor=in-memory
+#isis.persistor=mongodb
+#isis.persistor=sql
+
+
+
+#
+# configure the user profile store to use.
+# 
+# the user profile store is supported by some viewers as a way to store 
+# user-specific settings (eg colours, themes etc)
+# 
+isis.user-profile-store=in-memory
+
+
+
+#################################################################################
+#
+# Miscellaneous
+#
+#################################################################################
+
+#
+# enable authorization
+#
+# authorization requires that a "facet decorator" be installed; this intercepts every
+# request and delegates to the configured authorization mechanism.  
+#
+
+#isis.reflector.facets.include=org.apache.isis.runtimes.dflt.runtime.authorization.standard.AuthorizationFacetFactoryImpl
+
+
+#
+# enable Isis' built-in support for lazy loading/object dirtying.
+#
+# This configuration causes every domain entity to be "enhanced" so that objects graphs
+# can be traversed transparent, and modified objects are automatically saved back to the
+# object store.
+#
+# Note that this setting isn't required by some persistors (though it is required for the 
+# in-memory, mongodb and sql persistors listed above)
+#
+isis.persistor.object-factory=org.apache.isis.runtimes.dflt.bytecode.dflt.objectfactory.CglibObjectFactory
+
+
+#
+# enable class substitution in the meta model
+#
+# The reflector (Isis metamodel) must be instructed to ignore the side-effects of enabling lazy-loading;
+# specifically it ignores any cglib-generated subclasses. 
+#
+isis.reflector.class-substitutor=org.apache.isis.runtimes.dflt.bytecode.dflt.classsubstitutor.CglibClassSubstitutor
+
+

Modified: incubator/isis/trunk/examples/quickstart/webapp/src/main/webapp/WEB-INF/logging.properties
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/examples/quickstart/webapp/src/main/webapp/WEB-INF/logging.properties?rev=1244795&r1=1244794&r2=1244795&view=diff
==============================================================================
--- incubator/isis/trunk/examples/quickstart/webapp/src/main/webapp/WEB-INF/logging.properties (original)
+++ incubator/isis/trunk/examples/quickstart/webapp/src/main/webapp/WEB-INF/logging.properties Thu Feb 16 00:02:06 2012
@@ -16,7 +16,9 @@
 #  under the License.
 
 
-# the framework uses log4j is used to provide system logging.
+#
+# Isis uses log4j is used to provide system logging
+#
 log4j.rootCategory=INFO, Console
 
 # The console appender

Added: incubator/isis/trunk/examples/quickstart/webapp/src/main/webapp/WEB-INF/persistor_in-memory.properties
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/examples/quickstart/webapp/src/main/webapp/WEB-INF/persistor_in-memory.properties?rev=1244795&view=auto
==============================================================================
--- incubator/isis/trunk/examples/quickstart/webapp/src/main/webapp/WEB-INF/persistor_in-memory.properties (added)
+++ incubator/isis/trunk/examples/quickstart/webapp/src/main/webapp/WEB-INF/persistor_in-memory.properties Thu Feb 16 00:02:06 2012
@@ -0,0 +1,25 @@
+#  Licensed to the Apache Software Foundation (ASF) under one
+#  or more contributor license agreements.  See the NOTICE file
+#  distributed with this work for additional information
+#  regarding copyright ownership.  The ASF licenses this file
+#  to you 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.
+
+#
+# configuration file for the In-memory objectstore
+#
+
+
+#
+# (intentionally empty)
+#

Propchange: incubator/isis/trunk/examples/quickstart/webapp/src/main/webapp/WEB-INF/persistor_in-memory.properties
------------------------------------------------------------------------------
    svn:eol-style = native

Added: incubator/isis/trunk/examples/quickstart/webapp/src/main/webapp/WEB-INF/persistor_mongodb.properties
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/examples/quickstart/webapp/src/main/webapp/WEB-INF/persistor_mongodb.properties?rev=1244795&view=auto
==============================================================================
--- incubator/isis/trunk/examples/quickstart/webapp/src/main/webapp/WEB-INF/persistor_mongodb.properties (added)
+++ incubator/isis/trunk/examples/quickstart/webapp/src/main/webapp/WEB-INF/persistor_mongodb.properties Thu Feb 16 00:02:06 2012
@@ -0,0 +1,47 @@
+#  Licensed to the Apache Software Foundation (ASF) under one
+#  or more contributor license agreements.  See the NOTICE file
+#  distributed with this work for additional information
+#  regarding copyright ownership.  The ASF licenses this file
+#  to you 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.
+
+#
+# configuration file for the NoSQL (mongo) objectstore
+#
+
+
+
+#
+# The hostname that the MongoDB instance is running on
+# 
+# as per "new com.mongodb.Mongo(host, port)"
+#
+#isis.nosql.mongodb.host=localhost
+
+
+#
+# The port number that the MongoDB instance is running on
+#
+# as per "new com.mongodb.Mongo(host, port)"
+#
+#isis.nosql.mongodb.port=0
+
+
+#
+# the name of the mongodb database
+#
+# as in the 'show dbs' and 'use' command
+#
+isis.nosql.mongodb.name=todoapp
+
+

Propchange: incubator/isis/trunk/examples/quickstart/webapp/src/main/webapp/WEB-INF/persistor_mongodb.properties
------------------------------------------------------------------------------
    svn:eol-style = native

Added: incubator/isis/trunk/examples/quickstart/webapp/src/main/webapp/WEB-INF/persistor_sql.properties
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/examples/quickstart/webapp/src/main/webapp/WEB-INF/persistor_sql.properties?rev=1244795&view=auto
==============================================================================
--- incubator/isis/trunk/examples/quickstart/webapp/src/main/webapp/WEB-INF/persistor_sql.properties (added)
+++ incubator/isis/trunk/examples/quickstart/webapp/src/main/webapp/WEB-INF/persistor_sql.properties Thu Feb 16 00:02:06 2012
@@ -0,0 +1,47 @@
+#  Licensed to the Apache Software Foundation (ASF) under one
+#  or more contributor license agreements.  See the NOTICE file
+#  distributed with this work for additional information
+#  regarding copyright ownership.  The ASF licenses this file
+#  to you 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.
+
+#
+# configuration file for the SQL objectstore
+#
+
+
+#
+# configuration for HSQLDB
+#
+# 
+#
+isis.persistor.sql.jdbc.driver=org.hsqldb.jdbcDriver
+isis.persistor.sql.jdbc.connection=jdbc:hsqldb:file:hsql-db/tests
+isis.persistor.sql.jdbc.user=sa
+isis.persistor.sql.jdbc.password=
+
+
+#
+#
+#
+#isis.persistor.sql.jdbc.driver=com.microsoft.sqlserver.jdbc.SQLServerDriver
+#isis.persistor.sql.jdbc.connection=jdbc:sqlserver://localhost:1433;databaseName=todoapp;integratedSecurity=true;
+#isis.persistor.sql.jdbc.user=sa
+#isis.persistor.sql.jdbc.password=
+
+#isis.persistor.sql.jdbc.driver=com.ingres.jdbc.IngresDriver
+#isis.persistor.sql.jdbc.connection=jdbc:ingres://localhost:II7/todoapp
+#isis.persistor.sql.datatypes.datetime=TIMESTAMP
+#isis.persistor.sql.datatypes.timestamp=TIMESTAMP
+#isis.persistor.sql.datatypes.double=DOUBLE PRECISION
+

Propchange: incubator/isis/trunk/examples/quickstart/webapp/src/main/webapp/WEB-INF/persistor_sql.properties
------------------------------------------------------------------------------
    svn:eol-style = native

Added: incubator/isis/trunk/examples/quickstart/webapp/src/main/webapp/WEB-INF/user-profile-store_in-memory.properties
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/examples/quickstart/webapp/src/main/webapp/WEB-INF/user-profile-store_in-memory.properties?rev=1244795&view=auto
==============================================================================
--- incubator/isis/trunk/examples/quickstart/webapp/src/main/webapp/WEB-INF/user-profile-store_in-memory.properties (added)
+++ incubator/isis/trunk/examples/quickstart/webapp/src/main/webapp/WEB-INF/user-profile-store_in-memory.properties Thu Feb 16 00:02:06 2012
@@ -0,0 +1,21 @@
+#  Licensed to the Apache Software Foundation (ASF) under one
+#  or more contributor license agreements.  See the NOTICE file
+#  distributed with this work for additional information
+#  regarding copyright ownership.  The ASF licenses this file
+#  to you 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.
+
+#
+# configuration file for the in-memory user profile store
+#
+

Propchange: incubator/isis/trunk/examples/quickstart/webapp/src/main/webapp/WEB-INF/user-profile-store_in-memory.properties
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: incubator/isis/trunk/examples/quickstart/webapp/src/main/webapp/WEB-INF/viewer_html.properties
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/examples/quickstart/webapp/src/main/webapp/WEB-INF/viewer_html.properties?rev=1244795&r1=1244794&r2=1244795&view=diff
==============================================================================
--- incubator/isis/trunk/examples/quickstart/webapp/src/main/webapp/WEB-INF/viewer_html.properties (original)
+++ incubator/isis/trunk/examples/quickstart/webapp/src/main/webapp/WEB-INF/viewer_html.properties Thu Feb 16 00:02:06 2012
@@ -19,9 +19,13 @@
 # configuration file for the HTML viewer
 #
 
+#
 # customization for the header and footer
+#
 isis.viewer.html.header=<div id="site-header"><div id="site-logo">&nbsp;</div></div>
-isis.viewer.html.footer=<div id="page-footer"><small>Powered by Apache Isis</small></div>
+isis.viewer.html.footer=<div id="page-footer"><small>Powered by Apache Isis</small><div><small><a href="index.html">home</a>&nbsp;|&nbsp;<a href="index.shtml">scimpi</a>&nbsp;|&nbsp;<a href="services">rest</a>&nbsp;|&nbsp;<a href="mobile/index.html">mobile</a></small></div></div>
 
-# not used by the onlinedemo; deploy the WAR as usual
-isis.viewer.html.port=8080
+#
+# stylesheet
+#
+isis.viewer.html.style-sheet=htmlviewer/style/default.css

Added: incubator/isis/trunk/examples/quickstart/webapp/src/main/webapp/WEB-INF/viewer_json.properties
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/examples/quickstart/webapp/src/main/webapp/WEB-INF/viewer_json.properties?rev=1244795&view=auto
==============================================================================
--- incubator/isis/trunk/examples/quickstart/webapp/src/main/webapp/WEB-INF/viewer_json.properties (added)
+++ incubator/isis/trunk/examples/quickstart/webapp/src/main/webapp/WEB-INF/viewer_json.properties Thu Feb 16 00:02:06 2012
@@ -0,0 +1,25 @@
+#  Licensed to the Apache Software Foundation (ASF) under one
+#  or more contributor license agreements.  See the NOTICE file
+#  distributed with this work for additional information
+#  regarding copyright ownership.  The ASF licenses this file
+#  to you 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.
+
+#
+# configuration file for the Json (restful) viewer
+#
+
+
+#
+# (intentionally empty)
+#

Propchange: incubator/isis/trunk/examples/quickstart/webapp/src/main/webapp/WEB-INF/viewer_json.properties
------------------------------------------------------------------------------
    svn:eol-style = native

Added: incubator/isis/trunk/examples/quickstart/webapp/src/main/webapp/WEB-INF/viewer_scimpi.properties
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/examples/quickstart/webapp/src/main/webapp/WEB-INF/viewer_scimpi.properties?rev=1244795&view=auto
==============================================================================
--- incubator/isis/trunk/examples/quickstart/webapp/src/main/webapp/WEB-INF/viewer_scimpi.properties (added)
+++ incubator/isis/trunk/examples/quickstart/webapp/src/main/webapp/WEB-INF/viewer_scimpi.properties Thu Feb 16 00:02:06 2012
@@ -0,0 +1,25 @@
+#  Licensed to the Apache Software Foundation (ASF) under one
+#  or more contributor license agreements.  See the NOTICE file
+#  distributed with this work for additional information
+#  regarding copyright ownership.  The ASF licenses this file
+#  to you 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.
+
+#
+# configuration file for the Scimpi viewer
+#
+
+
+#
+# (intentionally empty)
+#

Propchange: incubator/isis/trunk/examples/quickstart/webapp/src/main/webapp/WEB-INF/viewer_scimpi.properties
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: incubator/isis/trunk/examples/quickstart/webapp/src/main/webapp/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/examples/quickstart/webapp/src/main/webapp/WEB-INF/web.xml?rev=1244795&r1=1244794&r2=1244795&view=diff
==============================================================================
--- incubator/isis/trunk/examples/quickstart/webapp/src/main/webapp/WEB-INF/web.xml (original)
+++ incubator/isis/trunk/examples/quickstart/webapp/src/main/webapp/WEB-INF/web.xml Thu Feb 16 00:02:06 2012
@@ -24,6 +24,39 @@
     <display-name>Apache Isis Webapp</display-name>
 
 
+    <welcome-file-list>
+        <welcome-file>index.html</welcome-file>
+    </welcome-file-list>
+    
+    <context-param>
+        <param-name>deploymentType</param-name>
+        <param-value>SERVER</param-value>
+    </context-param>
+    
+    
+   <!--
+    -
+    -
+    - config for archetype only
+    -
+    -
+    -->
+
+    <!-- redirect to /doc/index.html if accessing "/" using web browser -->
+    <filter>
+        <filter-name>RedirectToDocsFilter</filter-name>
+        <filter-class>org.apache.isis.core.webapp.routing.RedirectToDocsFilter</filter-class>
+        <init-param>
+            <param-name>redirectTo</param-name>
+            <param-value>/index.html</param-value>
+        </init-param>
+    </filter>
+    <filter-mapping>
+        <filter-name>RedirectToDocsFilter</filter-name>
+        <url-pattern>/</url-pattern>
+    </filter-mapping>
+    
+    
     <!--
     -
     -
@@ -40,7 +73,7 @@
     <!-- which (optional) configuration file(s) to load -->
     <context-param>
         <param-name>isis.viewers</param-name>
-        <param-value>html,json</param-value>
+        <param-value>html,json,scimpi</param-value>
     </context-param>
 
     <!-- cache static resources for 1 day -->
@@ -159,11 +192,12 @@
     </filter>
     <filter-mapping>
         <filter-name>IsisSessionFilterForHtml</filter-name>
-        <url-pattern>*.htmlviewer</url-pattern>
+        <servlet-name>HtmlLogin</servlet-name>
+        <servlet-name>HtmlDispatcher</servlet-name>
     </filter-mapping>
 
     <servlet>
-        <servlet-name>Logon</servlet-name>
+        <servlet-name>HtmlLogon</servlet-name>
         <servlet-class>org.apache.isis.viewer.html.servlet.LogonServlet</servlet-class>
         <init-param>
             <param-name>authenticationSessionStrategy</param-name>
@@ -175,16 +209,16 @@
         </init-param>
     </servlet>
     <servlet-mapping>
-        <servlet-name>Logon</servlet-name>
+        <servlet-name>HtmlLogon</servlet-name>
         <url-pattern>/logon.htmlviewer</url-pattern>
     </servlet-mapping>
 
     <servlet>
-        <servlet-name>Controller</servlet-name>
+        <servlet-name>HtmlDispatcher</servlet-name>
         <servlet-class>org.apache.isis.viewer.html.servlet.ControllerServlet</servlet-class>
     </servlet>
     <servlet-mapping>
-        <servlet-name>Controller</servlet-name>
+        <servlet-name>HtmlDispatcher</servlet-name>
         <url-pattern>*.htmlviewer</url-pattern>
     </servlet-mapping>
 
@@ -194,6 +228,31 @@
     <!--
     -
     -
+    - config specific to the scimpi-viewer
+    -
+    -
+    -->
+    <servlet>
+        <servlet-name>ScimpiDispatcher</servlet-name>
+        <servlet-class>org.apache.isis.viewer.scimpi.servlet.DispatcherServlet</servlet-class>
+        <load-on-startup>1</load-on-startup>
+        <init-param>
+             <param-name>view</param-name>
+             <param-value>login.shtml</param-value>
+        </init-param>
+    </servlet>
+    <servlet-mapping>
+        <servlet-name>ScimpiDispatcher</servlet-name>
+        <url-pattern>*.shtml</url-pattern>
+        <url-pattern>*.app</url-pattern>
+    </servlet-mapping>
+
+
+
+
+    <!--
+    -
+    -
     - config specific to the json-viewer
     -
     -
@@ -224,26 +283,21 @@
             <param-name>whenNoSession</param-name>
             <param-value>basicAuthChallenge</param-value>
         </init-param>
-        <init-param>
-            <!-- ignores any requests to the HTML viewer resources -->
-            <param-name>ignoreExtensions</param-name>
-            <param-value>htmlviewer</param-value>
-        </init-param>
     </filter>
     <filter-mapping>
         <!-- this is mapped to the entire app; however the IsisSessionFilter will "notice" if the session filter has already been
              executed for the request pipeline, and if so will do nothing -->
         <filter-name>IsisSessionFilterForJson</filter-name>
-        <url-pattern>*</url-pattern>
+        <servlet-name>JsonDispatcher</servlet-name>
     </filter-mapping>
 
 
     <servlet>
-        <servlet-name>RestEasy</servlet-name>
+        <servlet-name>JsonDispatcher</servlet-name>
         <servlet-class>org.jboss.resteasy.plugins.server.servlet.HttpServletDispatcher</servlet-class>
     </servlet>
     <servlet-mapping>
-        <servlet-name>RestEasy</servlet-name>
+        <servlet-name>JsonDispatcher</servlet-name>
         <url-pattern>/</url-pattern>
     </servlet-mapping>
 	

Added: incubator/isis/trunk/examples/quickstart/webapp/src/main/webapp/debug.shtml
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/examples/quickstart/webapp/src/main/webapp/debug.shtml?rev=1244795&view=auto
==============================================================================
--- incubator/isis/trunk/examples/quickstart/webapp/src/main/webapp/debug.shtml (added)
+++ incubator/isis/trunk/examples/quickstart/webapp/src/main/webapp/debug.shtml Thu Feb 16 00:02:06 2012
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  Licensed to the Apache Software Foundation (ASF) under one
+  or more contributor license agreements.  See the NOTICE file
+  distributed with this work for additional information
+  regarding copyright ownership.  The ASF licenses this file
+  to you 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.
+-->
+<swf:template file="scimpi/style/template.shtml"/>
+
+<swf:services/>
+

Added: incubator/isis/trunk/examples/quickstart/webapp/src/main/webapp/error.shtml
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/examples/quickstart/webapp/src/main/webapp/error.shtml?rev=1244795&view=auto
==============================================================================
--- incubator/isis/trunk/examples/quickstart/webapp/src/main/webapp/error.shtml (added)
+++ incubator/isis/trunk/examples/quickstart/webapp/src/main/webapp/error.shtml Thu Feb 16 00:02:06 2012
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  Licensed to the Apache Software Foundation (ASF) under one
+  or more contributor license agreements.  See the NOTICE file
+  distributed with this work for additional information
+  regarding copyright ownership.  The ASF licenses this file
+  to you 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.
+-->
+<swf:page-title>Error!</swf:page-title>
+
+<swf:template  file="scimpi/style/template.shtml" />
+

Added: incubator/isis/trunk/examples/quickstart/webapp/src/main/webapp/generic/action.shtml
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/examples/quickstart/webapp/src/main/webapp/generic/action.shtml?rev=1244795&view=auto
==============================================================================
--- incubator/isis/trunk/examples/quickstart/webapp/src/main/webapp/generic/action.shtml (added)
+++ incubator/isis/trunk/examples/quickstart/webapp/src/main/webapp/generic/action.shtml Thu Feb 16 00:02:06 2012
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  Licensed to the Apache Software Foundation (ASF) under one
+  or more contributor license agreements.  See the NOTICE file
+  distributed with this work for additional information
+  regarding copyright ownership.  The ASF licenses this file
+  to you 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.
+-->
+<swf:page-title>Action <swf:action-name method="${_method}"/></swf:page-title>
+<swf:template  file="../scimpi/style/template.shtml" />
+
+<swf:action-form method="${_method}" view="_generic.shtml" ${_cancel-to:optional}/>
+
+
+

Added: incubator/isis/trunk/examples/quickstart/webapp/src/main/webapp/generic/collection.shtml
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/examples/quickstart/webapp/src/main/webapp/generic/collection.shtml?rev=1244795&view=auto
==============================================================================
--- incubator/isis/trunk/examples/quickstart/webapp/src/main/webapp/generic/collection.shtml (added)
+++ incubator/isis/trunk/examples/quickstart/webapp/src/main/webapp/generic/collection.shtml Thu Feb 16 00:02:06 2012
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  Licensed to the Apache Software Foundation (ASF) under one
+  or more contributor license agreements.  See the NOTICE file
+  distributed with this work for additional information
+  regarding copyright ownership.  The ASF licenses this file
+  to you 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.
+-->
+<swf:page-title><swf:element-type /> Listing</swf:page-title>
+<swf:template  file="../scimpi/style/template.shtml" />
+
+<h2>${title}</h2>
+<swf:table xxtitle="My Little Table" xxxno-columns="7" xxheader="no"  footer="yes" link="_generic.shtml" />
+ 
+

Added: incubator/isis/trunk/examples/quickstart/webapp/src/main/webapp/generic/edit.shtml
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/examples/quickstart/webapp/src/main/webapp/generic/edit.shtml?rev=1244795&view=auto
==============================================================================
--- incubator/isis/trunk/examples/quickstart/webapp/src/main/webapp/generic/edit.shtml (added)
+++ incubator/isis/trunk/examples/quickstart/webapp/src/main/webapp/generic/edit.shtml Thu Feb 16 00:02:06 2012
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  Licensed to the Apache Software Foundation (ASF) under one
+  or more contributor license agreements.  See the NOTICE file
+  distributed with this work for additional information
+  regarding copyright ownership.  The ASF licenses this file
+  to you 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.
+-->
+<swf:page-title>Edit <swf:title-string /></swf:page-title>
+<swf:template  file="../scimpi/style/template.shtml" />
+
+<h2>Edit <swf:title /></h2>
+<swf:edit />
+
+

Added: incubator/isis/trunk/examples/quickstart/webapp/src/main/webapp/generic/object.shtml
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/examples/quickstart/webapp/src/main/webapp/generic/object.shtml?rev=1244795&view=auto
==============================================================================
--- incubator/isis/trunk/examples/quickstart/webapp/src/main/webapp/generic/object.shtml (added)
+++ incubator/isis/trunk/examples/quickstart/webapp/src/main/webapp/generic/object.shtml Thu Feb 16 00:02:06 2012
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  Licensed to the Apache Software Foundation (ASF) under one
+  or more contributor license agreements.  See the NOTICE file
+  distributed with this work for additional information
+  regarding copyright ownership.  The ASF licenses this file
+  to you 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.
+-->
+<swf:page-title><swf:title-string /></swf:page-title>
+<swf:template  file="../scimpi/style/template.shtml" />
+
+<h2><swf:title /></h2>
+<swf:long-form link="_generic.shtml" title="" />
+
+<swf:methods />
+
+

Copied: incubator/isis/trunk/examples/quickstart/webapp/src/main/webapp/htmlviewer/style/default.css (from r1228333, incubator/isis/trunk/examples/quickstart/webapp/src/main/webapp/default.css)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/examples/quickstart/webapp/src/main/webapp/htmlviewer/style/default.css?p2=incubator/isis/trunk/examples/quickstart/webapp/src/main/webapp/htmlviewer/style/default.css&p1=incubator/isis/trunk/examples/quickstart/webapp/src/main/webapp/default.css&r1=1228333&r2=1244795&rev=1244795&view=diff
==============================================================================
--- incubator/isis/trunk/examples/quickstart/webapp/src/main/webapp/default.css (original)
+++ incubator/isis/trunk/examples/quickstart/webapp/src/main/webapp/htmlviewer/style/default.css Thu Feb 16 00:02:06 2012
@@ -40,12 +40,6 @@ BODY {
 	font-family: Arial, Sans-Serif;
 	margin: 0 0 10px 0;
 	color: black;
-
-/*
-	background: url(default-images/poweredby-logo.png);
-	background-repeat: no-repeat;
-	background-position: 95% 95%;
-*/
 }
 
 IMG {
@@ -73,7 +67,7 @@ div#site-header:after {
 }
 
 div#site-header {
-	background: url(images/banner-bg.png); 
+	background: url(../images/banner-bg.png); 
 	background-repeat: repeat-x white-space :   nowrap;
 	list-style: none;
 	margin: 0px;
@@ -81,7 +75,7 @@ div#site-header {
 }
 
 div#site-logo {
-	background: url(images/banner.png);
+	background: url(../images/banner.png);
 	background-repeat: no-repeat;
 	background-position: left;
 	position: absolute;
@@ -91,7 +85,7 @@ div#site-logo {
 }
 
 div#page-header {
-	display: none;
+	/*display: none;*/
 }
 
 /* END Heading */
@@ -415,6 +409,10 @@ div#help-bar {
 	height: 22px;
 }
 */
+#view {
+    min-height: 400px;
+}
+
 DIV#body DIV#view {
 	position: relative;
 	top: 0px;
@@ -822,7 +820,6 @@ DIV.submenu-item DIV.menu-item a:hover {
 
 /* End of Object Menu */
 DIV.page-footer {
-	position: absolute;
 	right: 10px;
 	bottom: 10px;
 	font-size: 50%;
@@ -902,10 +899,6 @@ DIV#debug DIV.detail {
 	margin: 0 5px 0 10px;
 }
 
-DIV#page-footer {
-	display: none;
-}
-
 SPAN.message {
 	position: relative;
 	top: 30px;
@@ -914,11 +907,6 @@ SPAN.message {
 	margin: 40px 0 0 0;
 	padding: 10px;
 }
-/* Think this is now redundant
-DIV.items {
-	position: relative;
-} 
-*/
 
 
 SPAN.about {

Added: incubator/isis/trunk/examples/quickstart/webapp/src/main/webapp/index.html
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/examples/quickstart/webapp/src/main/webapp/index.html?rev=1244795&view=auto
==============================================================================
--- incubator/isis/trunk/examples/quickstart/webapp/src/main/webapp/index.html (added)
+++ incubator/isis/trunk/examples/quickstart/webapp/src/main/webapp/index.html Thu Feb 16 00:02:06 2012
@@ -0,0 +1,119 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<!--
+  Licensed to the Apache Software Foundation (ASF) under one
+  or more contributor license agreements.  See the NOTICE file
+  distributed with this work for additional information
+  regarding copyright ownership.  The ASF licenses this file
+  to you 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.
+-->
+<html>
+    <head>
+        <title>Apache Isis quickstart</title>
+        <style type="text/css">
+h2,p,li,td,th {
+    font-family: Arial
+}
+table {
+    border-collapse: collapse;
+    margin-top: 10px;
+    font-size: small;
+}
+th,td {
+    border: 1px solid green;
+    padding: 4px;
+}
+th {
+    background-color:green;
+    color:white;
+}
+</style>
+    </head>
+    <body>
+        <h2>Congratulations!</h2>
+        <p>Congratulations, you've successfully run the <a href="http://incubator.apache.org/isis">Apache Isis</a> quickstart archetype
+           and are now running the generated application.</p>
+
+        <p>The app has the following viewers are configured:</p>
+        <table>
+            <tr><th>Viewer</th><th>Description</th><th>Further Documentation</th></tr>
+            <tr><td><a href="htmlviewer">HTML viewer</a></td><td>for building simple, non-customizable webapps</td><td>(none currently)</td></tr>
+            <tr><td><a href="login.shtml">Scimpi viewer</a></td><td>which supports optional customization</td><td><a href="http://incubator.apache.org/isis/viewer/scimpi/docbkx/html/guide/isis-scimpi-viewer.html">Developers' guide</a></td></tr>
+            <tr><td><a href="services">JSON viewer</a></td><td>which exposes a REST API to supporting custom UIs (eg Javascript) and integration scenarios</td><td><a href="http://restfulobjects.org">Restful Objects spec</a></td></tr>
+            <tr><td><a href="mobile/index.html">JQueryMobile demo</a></td><td>which is a demo mobile webapp that can be used browse the REST API</td><td>(none)</td></tr>
+        </table>
+
+        <p>Follow the links above to explore these viewers, using username: <tt>sven</tt>, password: <tt>pass</tt>.</p>
+        
+        <p>It also has the following objectstores (databases) configured:</p>
+        <table>
+            <tr><th>Object Store</th><th>Description</th><th>Further Documentation</th></tr>
+            <tr><td>In-memory objectstore</td><td>for rapid prototyping</td><td>(none)</td></tr>
+            <tr><td>NoSQL objectstore</td><td>for persisting to a MongoDB instance</td><td>(none currently)</td></tr>
+            <tr><td>SQL objectstore</td><td>for persisting to a relational database</td><td><a href="http://incubator.apache.org/isis/runtimes/dflt/objectstores/sql/docbkx/html/guide/isis-sql-objectstore.html">Config and Deployment guide</a></td></tr>
+        </table>
+        
+        <p>The in-memory objectstore is the default (as it takes no additional setup).</p>
+
+        <h2>What next?</h2>
+
+        <p>Decide which viewer(s) you want to provide for accessing your domain objects, and
+        then comment out/delete the relevant entries from the <tt>WEB-INF/web.xml</tt> and delete the <a href="#toc">static resources</a>
+        that you no longer need.  You'll probably also want to delete this file, and remove the 
+        <tt>&lt;filter&gt;RedirectToDocsFilter&lt;/filter&gt;</tt> entry in <tt>web.xml</tt>.
+        
+        <p>Then, decide which objectstore you want to use. While doing initial prototyping you may find
+        that the default in-memory objectstore suffices; the <tt>isis.fixtures</tt> property in
+        the <tt>WEB-INF/isis.properties</tt> configuration file the initial data set that is used to
+        seed the database.  If you decide to use the NoSQL or SQL databases, follow the more detailed comments in
+        the <tt>WEB-INF/isis.properties</tt> config file.
+
+        <p>Finally, don't forget that there is more information at the <a href="http://incubator.apache.org/isis">Apache Isis website</a>, and more help on the
+        Apache Isis mailing lists (<a href="mailto:isis-users-subscribe@incubator.apache.org">subscribe here</a>, <a href="mailto:isis-users@incubator.apache.org">post here</a>)</p>        
+        
+        <h2><a id="toc">Static Resources</a></h2>
+        
+        <table>
+            <tr><th>File</th><th>Description</th></tr>
+            <tr><td>index.html</td><td>This file</td></tr>
+            <tr><td>htmlviewer</td><td>HTML viewer styles and images</td></tr>
+            <tr><td>debug.shtml</td><td>Scimpi viewer debug page</td></tr>
+            <tr><td>error.shtml</td><td>Scimpi viewer error page</td></tr>
+            <tr><td>generic</td><td>Scimpi viewer generic views</td></tr>
+            <tr><td>index.shtml</td><td>Scimpi viewer home page</td></tr>
+            <tr><td>login.shtml</td><td>Scimpi viewer login page</td></tr>
+            <tr><td>scimpi</td><td>Scimpi viewer styles and images</td></tr>
+            <tr><td>ToDoItem</td><td>Scimpi viewer customisation for ToDoItem class</td></tr>
+            <tr><td>jquery</td><td>JQuery library (used by Mobile demo app)</td></tr>
+            <tr><td>jquery.mobile</td><td>JQueryMobile library (used by Mobile demo app)</td></tr>
+            <tr><td>jquery.tmpl</td><td>JQueryTmpl library (used by Mobile demo app)</td></tr>
+            <tr><td>mobile</td><td>Mobile demo app</td></tr>
+            <tr><td>WEB-INF/web.xml</td><td>Servlet container's web.xml, bootstrapping Isis and defining its filters and servlets</td></tr>
+            <tr><td>WEB-INF/isis.properties</td><td>Isis' main configuration file</td></tr>
+            <tr><td>WEB-INF/logging.properties</td><td>Log4j configuration</td></tr>
+            <tr><td>WEB-INF/authentication_file.properties</td><td>File-based authentication mechanism's configuration file</td></tr>
+            <tr><td>WEB-INF/authentication_file.passwords</td><td>File-based authentication mechanism supporting configuration file</td></tr>
+            <tr><td>WEB-INF/authorization_file.properties</td><td>File-based authorization mechanism's configuration file</td></tr>
+            <tr><td>WEB-INF/authorization_file.allow</td><td>File-based authorization mechanism's supporting configuration file (whitelist)</td></tr>
+            <tr><td>WEB-INF/persistor_in-memory.properties</td><td>In-memory objectstore configuration file</td></tr>
+            <tr><td>WEB-INF/viewer_html.properties</td><td>HTML viewer configuration file</td></tr>
+            <tr><td>WEB-INF/viewer_json.properties</td><td>JSON viewer configuration file</td></tr>
+            <tr><td>WEB-INF/viewer_scimpi.properties</td><td>Scimpi viewer configuration file</td></tr>
+        </table>        .
+        
+    </body>
+</html>
+
+

Propchange: incubator/isis/trunk/examples/quickstart/webapp/src/main/webapp/index.html
------------------------------------------------------------------------------
    svn:eol-style = native

Added: incubator/isis/trunk/examples/quickstart/webapp/src/main/webapp/index.shtml
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/examples/quickstart/webapp/src/main/webapp/index.shtml?rev=1244795&view=auto
==============================================================================
--- incubator/isis/trunk/examples/quickstart/webapp/src/main/webapp/index.shtml (added)
+++ incubator/isis/trunk/examples/quickstart/webapp/src/main/webapp/index.shtml Thu Feb 16 00:02:06 2012
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  Licensed to the Apache Software Foundation (ASF) under one
+  or more contributor license agreements.  See the NOTICE file
+  distributed with this work for additional information
+  regarding copyright ownership.  The ASF licenses this file
+  to you 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.
+-->
+<swf:page-title>ToDo App</swf:page-title>
+
+<swf:template  file="scimpi/style/template.shtml" />

Added: incubator/isis/trunk/examples/quickstart/webapp/src/main/webapp/jquery.mobile/images/ajax-loader.png
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/examples/quickstart/webapp/src/main/webapp/jquery.mobile/images/ajax-loader.png?rev=1244795&view=auto
==============================================================================
Binary file - no diff available.

Propchange: incubator/isis/trunk/examples/quickstart/webapp/src/main/webapp/jquery.mobile/images/ajax-loader.png
------------------------------------------------------------------------------
    svn:mime-type = image/png

Added: incubator/isis/trunk/examples/quickstart/webapp/src/main/webapp/jquery.mobile/images/icons-18-black.png
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/examples/quickstart/webapp/src/main/webapp/jquery.mobile/images/icons-18-black.png?rev=1244795&view=auto
==============================================================================
Binary file - no diff available.

Propchange: incubator/isis/trunk/examples/quickstart/webapp/src/main/webapp/jquery.mobile/images/icons-18-black.png
------------------------------------------------------------------------------
    svn:mime-type = image/png

Added: incubator/isis/trunk/examples/quickstart/webapp/src/main/webapp/jquery.mobile/images/icons-18-white.png
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/examples/quickstart/webapp/src/main/webapp/jquery.mobile/images/icons-18-white.png?rev=1244795&view=auto
==============================================================================
Binary file - no diff available.

Propchange: incubator/isis/trunk/examples/quickstart/webapp/src/main/webapp/jquery.mobile/images/icons-18-white.png
------------------------------------------------------------------------------
    svn:mime-type = image/png

Added: incubator/isis/trunk/examples/quickstart/webapp/src/main/webapp/jquery.mobile/images/icons-36-black.png
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/examples/quickstart/webapp/src/main/webapp/jquery.mobile/images/icons-36-black.png?rev=1244795&view=auto
==============================================================================
Binary file - no diff available.

Propchange: incubator/isis/trunk/examples/quickstart/webapp/src/main/webapp/jquery.mobile/images/icons-36-black.png
------------------------------------------------------------------------------
    svn:mime-type = image/png

Added: incubator/isis/trunk/examples/quickstart/webapp/src/main/webapp/jquery.mobile/images/icons-36-white.png
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/examples/quickstart/webapp/src/main/webapp/jquery.mobile/images/icons-36-white.png?rev=1244795&view=auto
==============================================================================
Binary file - no diff available.

Propchange: incubator/isis/trunk/examples/quickstart/webapp/src/main/webapp/jquery.mobile/images/icons-36-white.png
------------------------------------------------------------------------------
    svn:mime-type = image/png



Mime
View raw message