You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@isis.apache.org by da...@apache.org on 2012/02/16 23:20:38 UTC
svn commit: r1245214 - in /incubator/isis/trunk/examples/quickstart: ./
fixture/ objstore-default/ objstore-dflt/
objstore-dflt/src/main/java/objstore/dflt/todo/ objstore-mongodb/
objstore-mongodb/src/ objstore-mongodb/src/main/ objstore-mongodb/src/ma...
Author: danhaywood
Date: Thu Feb 16 22:20:36 2012
New Revision: 1245214
URL: http://svn.apache.org/viewvc?rev=1245214&view=rev
Log:
ISIS-189: further enhancements to the archetype (documentation to the quickstart example, splitting out multiple object store modules)
Added:
incubator/isis/trunk/examples/quickstart/objstore-dflt/
- copied from r1244793, incubator/isis/trunk/examples/quickstart/objstore-default/
incubator/isis/trunk/examples/quickstart/objstore-dflt/src/main/java/objstore/dflt/todo/ToDoItemsDefault.java
- copied unchanged from r1244795, incubator/isis/trunk/examples/quickstart/objstore-default/src/main/java/objstore/dflt/todo/ToDoItemsDefault.java
incubator/isis/trunk/examples/quickstart/objstore-mongodb/
incubator/isis/trunk/examples/quickstart/objstore-mongodb/pom.xml (with props)
incubator/isis/trunk/examples/quickstart/objstore-mongodb/src/
incubator/isis/trunk/examples/quickstart/objstore-mongodb/src/main/
incubator/isis/trunk/examples/quickstart/objstore-mongodb/src/main/java/
incubator/isis/trunk/examples/quickstart/objstore-mongodb/src/main/java/objstore/
incubator/isis/trunk/examples/quickstart/objstore-mongodb/src/main/java/objstore/dflt/
incubator/isis/trunk/examples/quickstart/objstore-mongodb/src/main/java/objstore/dflt/todo/
incubator/isis/trunk/examples/quickstart/objstore-mongodb/src/main/java/objstore/mongodb/
incubator/isis/trunk/examples/quickstart/objstore-mongodb/src/main/java/objstore/mongodb/todo/
incubator/isis/trunk/examples/quickstart/objstore-mongodb/src/main/java/objstore/mongodb/todo/ToDoItemsMongo.java (with props)
incubator/isis/trunk/examples/quickstart/objstore-sql/
incubator/isis/trunk/examples/quickstart/objstore-sql/pom.xml (with props)
incubator/isis/trunk/examples/quickstart/objstore-sql/src/
incubator/isis/trunk/examples/quickstart/objstore-sql/src/main/
incubator/isis/trunk/examples/quickstart/objstore-sql/src/main/java/
incubator/isis/trunk/examples/quickstart/objstore-sql/src/main/java/objstore/
incubator/isis/trunk/examples/quickstart/objstore-sql/src/main/java/objstore/dflt/
incubator/isis/trunk/examples/quickstart/objstore-sql/src/main/java/objstore/dflt/todo/
incubator/isis/trunk/examples/quickstart/objstore-sql/src/main/java/objstore/sql/
incubator/isis/trunk/examples/quickstart/objstore-sql/src/main/java/objstore/sql/todo/
incubator/isis/trunk/examples/quickstart/objstore-sql/src/main/java/objstore/sql/todo/ToDoItemsSql.java (with props)
incubator/isis/trunk/examples/quickstart/tests-bdd/src/test/java/viewer/bdd/common/BootstrapInPrototypeMode.java
- copied, changed from r1244793, incubator/isis/trunk/examples/quickstart/tests-bdd/src/test/java/viewer/bdd/common/BootstrapInExplorationMode.java
incubator/isis/trunk/examples/quickstart/tests-bdd/src/test/java/viewer/bdd/stories/todo/ScenarioMarkItemAsDone.java
- copied, changed from r1244793, incubator/isis/trunk/examples/quickstart/tests-bdd/src/test/java/viewer/bdd/stories/todo/ScenarioMarkItemAsComplete.java
incubator/isis/trunk/examples/quickstart/tests-bdd/src/test/resources/viewer/bdd/common/BootstrapInPrototypeMode.html
- copied, changed from r1244793, incubator/isis/trunk/examples/quickstart/tests-bdd/src/test/resources/viewer/bdd/common/BootstrapInExplorationMode.html
incubator/isis/trunk/examples/quickstart/tests-bdd/src/test/resources/viewer/bdd/stories/todo/ScenarioMarkItemAsDone.html
- copied, changed from r1244793, incubator/isis/trunk/examples/quickstart/tests-bdd/src/test/resources/viewer/bdd/stories/todo/ScenarioMarkItemAsComplete.html
incubator/isis/trunk/examples/quickstart/webapp/src/main/webapp/images/
Removed:
incubator/isis/trunk/examples/quickstart/objstore-default/
incubator/isis/trunk/examples/quickstart/tests-bdd/src/test/java/viewer/bdd/common/BootstrapInExplorationMode.java
incubator/isis/trunk/examples/quickstart/tests-bdd/src/test/java/viewer/bdd/stories/todo/ScenarioMarkItemAsComplete.java
incubator/isis/trunk/examples/quickstart/tests-bdd/src/test/resources/viewer/bdd/common/BootstrapInExplorationMode.html
incubator/isis/trunk/examples/quickstart/tests-bdd/src/test/resources/viewer/bdd/stories/todo/ScenarioMarkItemAsComplete.html
Modified:
incubator/isis/trunk/examples/quickstart/fixture/pom.xml
incubator/isis/trunk/examples/quickstart/objstore-dflt/pom.xml
incubator/isis/trunk/examples/quickstart/pom.xml
incubator/isis/trunk/examples/quickstart/tests-bdd/pom.xml
incubator/isis/trunk/examples/quickstart/tests-bdd/src/test/resources/viewer/bdd/common/ToDoItems.html
incubator/isis/trunk/examples/quickstart/tests-bdd/src/test/resources/viewer/bdd/stories/todo/Fixture.html
incubator/isis/trunk/examples/quickstart/tests-bdd/src/test/resources/viewer/bdd/stories/todo/Index.html
incubator/isis/trunk/examples/quickstart/tests-junit/isis.properties
incubator/isis/trunk/examples/quickstart/tests-junit/pom.xml
incubator/isis/trunk/examples/quickstart/tests-junit/src/test/java/junit/AbstractTest.java
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/pom.xml
incubator/isis/trunk/examples/quickstart/webapp/src/main/jettyconsole/isis-banner.pdn
incubator/isis/trunk/examples/quickstart/webapp/src/main/jettyconsole/isis-banner.png
incubator/isis/trunk/examples/quickstart/webapp/src/main/webapp/WEB-INF/authorization_file.properties
incubator/isis/trunk/examples/quickstart/webapp/src/main/webapp/WEB-INF/isis.properties
incubator/isis/trunk/examples/quickstart/webapp/src/main/webapp/WEB-INF/persistor_sql.properties
incubator/isis/trunk/examples/quickstart/webapp/src/main/webapp/WEB-INF/user-profile-store_in-memory.properties
incubator/isis/trunk/examples/quickstart/webapp/src/main/webapp/index.html
Modified: incubator/isis/trunk/examples/quickstart/fixture/pom.xml
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/examples/quickstart/fixture/pom.xml?rev=1245214&r1=1245213&r2=1245214&view=diff
==============================================================================
--- incubator/isis/trunk/examples/quickstart/fixture/pom.xml (original)
+++ incubator/isis/trunk/examples/quickstart/fixture/pom.xml Thu Feb 16 22:20:36 2012
@@ -32,7 +32,7 @@
<dependencies>
<dependency>
<groupId>${project.groupId}</groupId>
- <artifactId>quickstart-objstore-dflt</artifactId>
+ <artifactId>quickstart-dom</artifactId>
</dependency>
</dependencies>
Modified: incubator/isis/trunk/examples/quickstart/objstore-dflt/pom.xml
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/examples/quickstart/objstore-dflt/pom.xml?rev=1245214&r1=1244793&r2=1245214&view=diff
==============================================================================
--- incubator/isis/trunk/examples/quickstart/objstore-dflt/pom.xml (original)
+++ incubator/isis/trunk/examples/quickstart/objstore-dflt/pom.xml Thu Feb 16 22:20:36 2012
@@ -37,6 +37,11 @@
<artifactId>quickstart-dom</artifactId>
</dependency>
+ <dependency>
+ <groupId>org.apache.isis.runtimes.dflt.objectstores</groupId>
+ <artifactId>dflt</artifactId>
+ </dependency>
+
</dependencies>
</project>
Added: incubator/isis/trunk/examples/quickstart/objstore-mongodb/pom.xml
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/examples/quickstart/objstore-mongodb/pom.xml?rev=1245214&view=auto
==============================================================================
--- incubator/isis/trunk/examples/quickstart/objstore-mongodb/pom.xml (added)
+++ incubator/isis/trunk/examples/quickstart/objstore-mongodb/pom.xml Thu Feb 16 22:20:36 2012
@@ -0,0 +1,49 @@
+<?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.
+-->
+<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>
+ <groupId>org.apache.isis.examples</groupId>
+ <artifactId>quickstart</artifactId>
+ <version>0.2.0-incubating-SNAPSHOT</version>
+ </parent>
+
+ <artifactId>quickstart-objstore-mongodb</artifactId>
+ <name>Quickstart Repositories (for MongoDB)</name>
+
+ <dependencies>
+
+ <!-- other modules in this project -->
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>quickstart-dom</artifactId>
+ </dependency>
+
+
+ <!-- isis nosql-mongodb objectstore -->
+ <dependency>
+ <groupId>org.apache.isis.runtimes.dflt.objectstores</groupId>
+ <artifactId>nosql</artifactId>
+ </dependency>
+
+ </dependencies>
+
+</project>
Propchange: incubator/isis/trunk/examples/quickstart/objstore-mongodb/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Added: incubator/isis/trunk/examples/quickstart/objstore-mongodb/src/main/java/objstore/mongodb/todo/ToDoItemsMongo.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/examples/quickstart/objstore-mongodb/src/main/java/objstore/mongodb/todo/ToDoItemsMongo.java?rev=1245214&view=auto
==============================================================================
--- incubator/isis/trunk/examples/quickstart/objstore-mongodb/src/main/java/objstore/mongodb/todo/ToDoItemsMongo.java (added)
+++ incubator/isis/trunk/examples/quickstart/objstore-mongodb/src/main/java/objstore/mongodb/todo/ToDoItemsMongo.java Thu Feb 16 22:20:36 2012
@@ -0,0 +1,93 @@
+/*
+ * 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.
+ */
+
+package objstore.mongodb.todo;
+
+import java.util.List;
+
+import com.google.common.base.Objects;
+
+import dom.todo.ToDoItem;
+import dom.todo.ToDoItems;
+
+import org.apache.isis.applib.AbstractFactoryAndRepository;
+import org.apache.isis.applib.filter.Filter;
+
+public class ToDoItemsMongo extends AbstractFactoryAndRepository implements ToDoItems {
+
+ // {{ Id, iconName
+ @Override
+ public String getId() {
+ return "toDoItems";
+ }
+
+ public String iconName() {
+ return "ToDoItem";
+ }
+
+ // }}
+
+ @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 Objects.equal(t.getOwnedBy(), userName) && !t.isDone();
+ }
+ });
+ }
+
+ // {{ 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, 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()) ;
+ }
+ });
+ }
+ // }}
+
+
+}
Propchange: incubator/isis/trunk/examples/quickstart/objstore-mongodb/src/main/java/objstore/mongodb/todo/ToDoItemsMongo.java
------------------------------------------------------------------------------
svn:eol-style = native
Added: incubator/isis/trunk/examples/quickstart/objstore-sql/pom.xml
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/examples/quickstart/objstore-sql/pom.xml?rev=1245214&view=auto
==============================================================================
--- incubator/isis/trunk/examples/quickstart/objstore-sql/pom.xml (added)
+++ incubator/isis/trunk/examples/quickstart/objstore-sql/pom.xml Thu Feb 16 22:20:36 2012
@@ -0,0 +1,102 @@
+<?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.
+-->
+<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>
+ <groupId>org.apache.isis.examples</groupId>
+ <artifactId>quickstart</artifactId>
+ <version>0.2.0-incubating-SNAPSHOT</version>
+ </parent>
+
+ <artifactId>quickstart-objstore-sql</artifactId>
+ <name>Quickstart Repositories (for SQL)</name>
+
+ <dependencies>
+
+ <!-- other modules in this project -->
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>quickstart-dom</artifactId>
+ </dependency>
+
+ <!-- isis sql objectstore implementation -->
+ <dependency>
+ <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>
+ -->
+
+ </dependencies>
+
+</project>
Propchange: incubator/isis/trunk/examples/quickstart/objstore-sql/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Added: incubator/isis/trunk/examples/quickstart/objstore-sql/src/main/java/objstore/sql/todo/ToDoItemsSql.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/examples/quickstart/objstore-sql/src/main/java/objstore/sql/todo/ToDoItemsSql.java?rev=1245214&view=auto
==============================================================================
--- incubator/isis/trunk/examples/quickstart/objstore-sql/src/main/java/objstore/sql/todo/ToDoItemsSql.java (added)
+++ incubator/isis/trunk/examples/quickstart/objstore-sql/src/main/java/objstore/sql/todo/ToDoItemsSql.java Thu Feb 16 22:20:36 2012
@@ -0,0 +1,93 @@
+/*
+ * 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.
+ */
+
+package objstore.sql.todo;
+
+import java.util.List;
+
+import com.google.common.base.Objects;
+
+import dom.todo.ToDoItem;
+import dom.todo.ToDoItems;
+
+import org.apache.isis.applib.AbstractFactoryAndRepository;
+import org.apache.isis.applib.filter.Filter;
+
+public class ToDoItemsSql extends AbstractFactoryAndRepository implements ToDoItems {
+
+ // {{ Id, iconName
+ @Override
+ public String getId() {
+ return "toDoItems";
+ }
+
+ public String iconName() {
+ return "ToDoItem";
+ }
+
+ // }}
+
+ @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 Objects.equal(t.getOwnedBy(), userName) && !t.isDone();
+ }
+ });
+ }
+
+ // {{ 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, 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()) ;
+ }
+ });
+ }
+ // }}
+
+
+}
Propchange: incubator/isis/trunk/examples/quickstart/objstore-sql/src/main/java/objstore/sql/todo/ToDoItemsSql.java
------------------------------------------------------------------------------
svn:eol-style = native
Modified: incubator/isis/trunk/examples/quickstart/pom.xml
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/examples/quickstart/pom.xml?rev=1245214&r1=1245213&r2=1245214&view=diff
==============================================================================
--- incubator/isis/trunk/examples/quickstart/pom.xml (original)
+++ incubator/isis/trunk/examples/quickstart/pom.xml Thu Feb 16 22:20:36 2012
@@ -148,7 +148,9 @@
<modules>
<module>dom</module>
<module>fixture</module>
- <module>objstore-default</module>
+ <module>objstore-dflt</module>
+ <module>objstore-mongodb</module>
+ <module>objstore-sql</module>
<module>webapp</module>
<module>tests-junit</module>
<module>tests-bdd</module>
Modified: incubator/isis/trunk/examples/quickstart/tests-bdd/pom.xml
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/examples/quickstart/tests-bdd/pom.xml?rev=1245214&r1=1245213&r2=1245214&view=diff
==============================================================================
--- incubator/isis/trunk/examples/quickstart/tests-bdd/pom.xml (original)
+++ incubator/isis/trunk/examples/quickstart/tests-bdd/pom.xml Thu Feb 16 22:20:36 2012
@@ -60,13 +60,11 @@
<version>0.2.0-incubating-SNAPSHOT</version>
</dependency>
- <!-- isis core -->
+ <!-- isis -->
<dependency>
<groupId>org.apache.isis.core</groupId>
<artifactId>runtime</artifactId>
</dependency>
-
- <!-- isis default runtime -->
<dependency>
<groupId>org.apache.isis.runtimes.dflt.bytecode</groupId>
<artifactId>dflt</artifactId>
@@ -76,15 +74,9 @@
<artifactId>dflt</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.isis.runtimes.dflt.objectstores</groupId>
- <artifactId>xml</artifactId>
- </dependency>
- <dependency>
<groupId>org.apache.isis.runtimes.dflt.profilestores</groupId>
<artifactId>dflt</artifactId>
</dependency>
-
- <!-- isis defaults (other) -->
<dependency>
<groupId>org.apache.isis.progmodels</groupId>
<artifactId>dflt</artifactId>
@@ -93,6 +85,10 @@
<groupId>org.apache.isis.security</groupId>
<artifactId>dflt</artifactId>
</dependency>
+ <dependency>
+ <groupId>org.apache.isis.security</groupId>
+ <artifactId>file</artifactId>
+ </dependency>
<!-- BDD Viewers concordion dependencies -->
<dependency>
Copied: incubator/isis/trunk/examples/quickstart/tests-bdd/src/test/java/viewer/bdd/common/BootstrapInPrototypeMode.java (from r1244793, incubator/isis/trunk/examples/quickstart/tests-bdd/src/test/java/viewer/bdd/common/BootstrapInExplorationMode.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/examples/quickstart/tests-bdd/src/test/java/viewer/bdd/common/BootstrapInPrototypeMode.java?p2=incubator/isis/trunk/examples/quickstart/tests-bdd/src/test/java/viewer/bdd/common/BootstrapInPrototypeMode.java&p1=incubator/isis/trunk/examples/quickstart/tests-bdd/src/test/java/viewer/bdd/common/BootstrapInExplorationMode.java&r1=1244793&r2=1245214&rev=1245214&view=diff
==============================================================================
--- incubator/isis/trunk/examples/quickstart/tests-bdd/src/test/java/viewer/bdd/common/BootstrapInExplorationMode.java (original)
+++ incubator/isis/trunk/examples/quickstart/tests-bdd/src/test/java/viewer/bdd/common/BootstrapInPrototypeMode.java Thu Feb 16 22:20:36 2012
@@ -20,6 +20,6 @@ package viewer.bdd.common;
import org.apache.isis.viewer.bdd.concordion.AbstractIsisConcordionScenario;
-public class BootstrapInExplorationMode extends AbstractIsisConcordionScenario {
+public class BootstrapInPrototypeMode extends AbstractIsisConcordionScenario {
}
Copied: incubator/isis/trunk/examples/quickstart/tests-bdd/src/test/java/viewer/bdd/stories/todo/ScenarioMarkItemAsDone.java (from r1244793, incubator/isis/trunk/examples/quickstart/tests-bdd/src/test/java/viewer/bdd/stories/todo/ScenarioMarkItemAsComplete.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/examples/quickstart/tests-bdd/src/test/java/viewer/bdd/stories/todo/ScenarioMarkItemAsDone.java?p2=incubator/isis/trunk/examples/quickstart/tests-bdd/src/test/java/viewer/bdd/stories/todo/ScenarioMarkItemAsDone.java&p1=incubator/isis/trunk/examples/quickstart/tests-bdd/src/test/java/viewer/bdd/stories/todo/ScenarioMarkItemAsComplete.java&r1=1244793&r2=1245214&rev=1245214&view=diff
==============================================================================
--- incubator/isis/trunk/examples/quickstart/tests-bdd/src/test/java/viewer/bdd/stories/todo/ScenarioMarkItemAsComplete.java (original)
+++ incubator/isis/trunk/examples/quickstart/tests-bdd/src/test/java/viewer/bdd/stories/todo/ScenarioMarkItemAsDone.java Thu Feb 16 22:20:36 2012
@@ -20,6 +20,6 @@ package viewer.bdd.stories.todo;
import viewer.bdd.AbstractApplicationStory;
-public class ScenarioMarkItemAsComplete extends AbstractApplicationStory {
+public class ScenarioMarkItemAsDone extends AbstractApplicationStory {
}
Copied: incubator/isis/trunk/examples/quickstart/tests-bdd/src/test/resources/viewer/bdd/common/BootstrapInPrototypeMode.html (from r1244793, incubator/isis/trunk/examples/quickstart/tests-bdd/src/test/resources/viewer/bdd/common/BootstrapInExplorationMode.html)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/examples/quickstart/tests-bdd/src/test/resources/viewer/bdd/common/BootstrapInPrototypeMode.html?p2=incubator/isis/trunk/examples/quickstart/tests-bdd/src/test/resources/viewer/bdd/common/BootstrapInPrototypeMode.html&p1=incubator/isis/trunk/examples/quickstart/tests-bdd/src/test/resources/viewer/bdd/common/BootstrapInExplorationMode.html&r1=1244793&r2=1245214&rev=1245214&view=diff
==============================================================================
--- incubator/isis/trunk/examples/quickstart/tests-bdd/src/test/resources/viewer/bdd/common/BootstrapInExplorationMode.html (original)
+++ incubator/isis/trunk/examples/quickstart/tests-bdd/src/test/resources/viewer/bdd/common/BootstrapInPrototypeMode.html Thu Feb 16 22:20:36 2012
@@ -30,7 +30,7 @@ The system:
<p concordion:execute="#result=bootstrapIsis(#configDir,#deploymentType)">
<span concordion:assertTrue="#result">bootstrapped</span> from
config directory <span concordion:set="#configDir">../webapp/src/main/webapp/WEB-INF</span>
-and running in <span concordion:set="#deploymentType">exploration</span>
+and running in <span concordion:set="#deploymentType">prototype</span>
mode,
</p>
</li>
Modified: incubator/isis/trunk/examples/quickstart/tests-bdd/src/test/resources/viewer/bdd/common/ToDoItems.html
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/examples/quickstart/tests-bdd/src/test/resources/viewer/bdd/common/ToDoItems.html?rev=1245214&r1=1245213&r2=1245214&view=diff
==============================================================================
--- incubator/isis/trunk/examples/quickstart/tests-bdd/src/test/resources/viewer/bdd/common/ToDoItems.html (original)
+++ incubator/isis/trunk/examples/quickstart/tests-bdd/src/test/resources/viewer/bdd/common/ToDoItems.html Thu Feb 16 22:20:36 2012
@@ -25,41 +25,47 @@
<h3>Operational Data</h3>
<p>With to do items (<span concordion:set="#className">dom.todo.ToDoItem</span>):
</p>
-<table isis:execute="#result=setUpObject(#className, #alias, #description, #done)">
+<table isis:execute="#result=setUpObject(#className, #alias, #description, #ownedBy, #done)">
<tr>
<th concordion:set="#alias">Alias</th>
<th concordion:set="#description">Description</th>
<th concordion:set="#done">Done</th>
+ <th concordion:set="#ownedBy">Owned By</th>
<th concordion:assertEquals="#result"/>
</tr>
<tr>
<td>item1</td>
<td>Buy milk</td>
<td>false</td>
+ <td>sven</td>
<td>ok</td>
</tr>
<tr>
<td>item2</td>
<td>Pick up laundry</td>
- <td>false</td>
+ <td>false</td>
+ <td>sven</td>
<td>ok</td>
</tr>
<tr>
<td>item3</td>
<td>Buy stamps</td>
- <td>false</td>
+ <td>false</td>
+ <td>sven</td>
<td>ok</td>
</tr>
<tr>
<td>item4</td>
<td>Write blog post</td>
- <td>false</td>
+ <td>false</td>
+ <td>sven</td>
<td>ok</td>
</tr>
<tr>
<td>item5</td>
<td>Organize brown bag</td>
- <td>false</td>
+ <td>false</td>
+ <td>sven</td>
<td>ok</td>
</tr>
</table>
Modified: incubator/isis/trunk/examples/quickstart/tests-bdd/src/test/resources/viewer/bdd/stories/todo/Fixture.html
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/examples/quickstart/tests-bdd/src/test/resources/viewer/bdd/stories/todo/Fixture.html?rev=1245214&r1=1245213&r2=1245214&view=diff
==============================================================================
--- incubator/isis/trunk/examples/quickstart/tests-bdd/src/test/resources/viewer/bdd/stories/todo/Fixture.html (original)
+++ incubator/isis/trunk/examples/quickstart/tests-bdd/src/test/resources/viewer/bdd/stories/todo/Fixture.html Thu Feb 16 22:20:36 2012
@@ -28,7 +28,7 @@
<ul>
<li>
<p>bootstrapped in <a concordion:run="concordion"
- href="../../common/BootstrapInExplorationMode.html">exploration</a> mode</p>
+ href="../../common/BootstrapInPrototypeMode.html">prototype</a> mode</p>
</li>
<li>
<p concordion:execute="#result=usingDateFormat(#format)"><span
@@ -43,7 +43,7 @@
<li>
<p concordion:execute="#result=logonAs(#userName)"><span
concordion:assertTrue="#result">logged on</span> as <span
- concordion:set="#userName">fsmith</span></p>
+ concordion:set="#userName">sven</span></p>
</li>
<li>
<p>with <a concordion:run="concordion"
Modified: incubator/isis/trunk/examples/quickstart/tests-bdd/src/test/resources/viewer/bdd/stories/todo/Index.html
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/examples/quickstart/tests-bdd/src/test/resources/viewer/bdd/stories/todo/Index.html?rev=1245214&r1=1245213&r2=1245214&view=diff
==============================================================================
--- incubator/isis/trunk/examples/quickstart/tests-bdd/src/test/resources/viewer/bdd/stories/todo/Index.html (original)
+++ incubator/isis/trunk/examples/quickstart/tests-bdd/src/test/resources/viewer/bdd/stories/todo/Index.html Thu Feb 16 22:20:36 2012
@@ -29,7 +29,7 @@
<ul>
<li>
<p><a concordion:run="concordion"
- href="ScenarioMarkItemAsComplete.html">mark item as complete</a></p>
+ href="ScenarioMarkItemAsDone.html">mark item as done</a></p>
</li>
</ul>
Copied: incubator/isis/trunk/examples/quickstart/tests-bdd/src/test/resources/viewer/bdd/stories/todo/ScenarioMarkItemAsDone.html (from r1244793, incubator/isis/trunk/examples/quickstart/tests-bdd/src/test/resources/viewer/bdd/stories/todo/ScenarioMarkItemAsComplete.html)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/examples/quickstart/tests-bdd/src/test/resources/viewer/bdd/stories/todo/ScenarioMarkItemAsDone.html?p2=incubator/isis/trunk/examples/quickstart/tests-bdd/src/test/resources/viewer/bdd/stories/todo/ScenarioMarkItemAsDone.html&p1=incubator/isis/trunk/examples/quickstart/tests-bdd/src/test/resources/viewer/bdd/stories/todo/ScenarioMarkItemAsComplete.html&r1=1244793&r2=1245214&rev=1245214&view=diff
==============================================================================
--- incubator/isis/trunk/examples/quickstart/tests-bdd/src/test/resources/viewer/bdd/stories/todo/ScenarioMarkItemAsComplete.html (original)
+++ incubator/isis/trunk/examples/quickstart/tests-bdd/src/test/resources/viewer/bdd/stories/todo/ScenarioMarkItemAsDone.html Thu Feb 16 22:20:36 2012
@@ -24,7 +24,7 @@
<link href="../../concordion.css" rel="stylesheet" type="text/css" />
<body>
-<h1>Mark Item As Complete</h1>
+<h1>Mark Item As Done</h1>
<div class="example">
@@ -75,7 +75,7 @@ Given <a concordion:run="concordion"
<td>buyMilkItem</td>
<td></td>
<td>check property</td>
- <td>Complete</td>
+ <td>done</td>
<td>is</td>
<td>False</td>
<td>ok</td>
@@ -122,7 +122,7 @@ Given <a concordion:run="concordion"
<td>buyMilkItem</td>
<td></td>
<td>check property</td>
- <td>Complete</td>
+ <td>done</td>
<td>is</td>
<td>True</td>
<td>ok</td>
Modified: incubator/isis/trunk/examples/quickstart/tests-junit/isis.properties
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/examples/quickstart/tests-junit/isis.properties?rev=1245214&r1=1245213&r2=1245214&view=diff
==============================================================================
--- incubator/isis/trunk/examples/quickstart/tests-junit/isis.properties (original)
+++ incubator/isis/trunk/examples/quickstart/tests-junit/isis.properties Thu Feb 16 22:20:36 2012
@@ -15,30 +15,15 @@
# specific language governing permissions and limitations
# under the License.
isis.services.prefix = objstore.dflt
-isis.services = todo.ToDoItemRepositoryDefault
+isis.services = todo.ToDoItemsDefault
isis.fixtures.prefix= fixture
isis.fixtures= LogonAsSvenFixture,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.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
Modified: incubator/isis/trunk/examples/quickstart/tests-junit/pom.xml
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/examples/quickstart/tests-junit/pom.xml?rev=1245214&r1=1245213&r2=1245214&view=diff
==============================================================================
--- incubator/isis/trunk/examples/quickstart/tests-junit/pom.xml (original)
+++ incubator/isis/trunk/examples/quickstart/tests-junit/pom.xml Thu Feb 16 22:20:36 2012
@@ -37,16 +37,18 @@
<artifactId>quickstart-fixture</artifactId>
<version>0.2.0-incubating-SNAPSHOT</version>
</dependency>
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>quickstart-objstore-dflt</artifactId>
+ <version>0.2.0-incubating-SNAPSHOT</version>
+ </dependency>
+ <!-- isis -->
<dependency>
<groupId>org.apache.isis.core</groupId>
<artifactId>runtime</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.isis.runtimes.dflt</groupId>
- <artifactId>webserver</artifactId>
- </dependency>
- <dependency>
<groupId>org.apache.isis.runtimes.dflt.bytecode</groupId>
<artifactId>dflt</artifactId>
</dependency>
@@ -55,10 +57,6 @@
<artifactId>dflt</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.isis.runtimes.dflt.objectstores</groupId>
- <artifactId>xml</artifactId>
- </dependency>
- <dependency>
<groupId>org.apache.isis.runtimes.dflt.profilestores</groupId>
<artifactId>dflt</artifactId>
</dependency>
@@ -70,6 +68,10 @@
<groupId>org.apache.isis.security</groupId>
<artifactId>dflt</artifactId>
</dependency>
+ <dependency>
+ <groupId>org.apache.isis.security</groupId>
+ <artifactId>file</artifactId>
+ </dependency>
<!-- isis viewers -->
<dependency>
Modified: incubator/isis/trunk/examples/quickstart/tests-junit/src/test/java/junit/AbstractTest.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/examples/quickstart/tests-junit/src/test/java/junit/AbstractTest.java?rev=1245214&r1=1245213&r2=1245214&view=diff
==============================================================================
--- incubator/isis/trunk/examples/quickstart/tests-junit/src/test/java/junit/AbstractTest.java (original)
+++ incubator/isis/trunk/examples/quickstart/tests-junit/src/test/java/junit/AbstractTest.java Thu Feb 16 22:20:36 2012
@@ -35,7 +35,7 @@ import org.apache.isis.viewer.junit.Serv
import org.apache.isis.viewer.junit.Services;
@RunWith(IsisTestRunner.class)
-@ConfigDir("../webapp/src/main/webapp/WEB-INF")
+@ConfigDir("../webapp/src/main/webapp/WEB-INF") // acts as default, but can be overridden by annotations
@Services({ @Service(ToDoItemsDefault.class) })
public abstract class AbstractTest {
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=1245214&r1=1245213&r2=1245214&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 22:20:36 2012
@@ -28,6 +28,7 @@ import java.util.List;
import junit.AbstractTest;
import dom.todo.ToDoItem;
+import fixture.LogonAsSvenFixture;
import fixture.todo.ToDoItemsFixture;
import org.junit.Test;
@@ -35,7 +36,7 @@ import org.junit.Test;
import org.apache.isis.viewer.junit.Fixture;
import org.apache.isis.viewer.junit.Fixtures;
-@Fixtures({ @Fixture(ToDoItemsFixture.class) })
+@Fixtures({ @Fixture(ToDoItemsFixture.class), @Fixture(LogonAsSvenFixture.class) })
public class ToDoItemRepositoryTest extends AbstractTest {
@Test
@@ -46,7 +47,7 @@ public class ToDoItemRepositoryTest exte
@Test
public void canCreateToDoItem() throws Exception {
- final ToDoItem newItem = toDoItems.newToDo("item description", "Professional", "sven");
+ final ToDoItem newItem = toDoItems.newToDo("item description", "Professional");
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=1245214&r1=1245213&r2=1245214&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 22:20:36 2012
@@ -24,6 +24,7 @@ import static org.junit.Assert.assertTha
import static org.junit.Assert.fail;
import junit.AbstractTest;
import dom.todo.ToDoItem;
+import fixture.LogonAsSvenFixture;
import fixture.todo.ToDoItemsFixture;
import org.junit.Before;
@@ -33,7 +34,7 @@ import org.apache.isis.progmodel.wrapper
import org.apache.isis.viewer.junit.Fixture;
import org.apache.isis.viewer.junit.Fixtures;
-@Fixtures({ @Fixture(ToDoItemsFixture.class) })
+@Fixtures({ @Fixture(ToDoItemsFixture.class), @Fixture(LogonAsSvenFixture.class) })
public class ToDoItemTest extends AbstractTest {
private ToDoItem toDoItem;
Modified: incubator/isis/trunk/examples/quickstart/webapp/pom.xml
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/examples/quickstart/webapp/pom.xml?rev=1245214&r1=1245213&r2=1245214&view=diff
==============================================================================
--- incubator/isis/trunk/examples/quickstart/webapp/pom.xml (original)
+++ incubator/isis/trunk/examples/quickstart/webapp/pom.xml Thu Feb 16 22:20:36 2012
@@ -27,7 +27,7 @@
</parent>
<artifactId>quickstart-webapp</artifactId>
- <name>Quickstart Webapp with HTML+JSON Viewers</name>
+ <name>Quickstart Webapp</name>
<packaging>war</packaging>
@@ -87,104 +87,60 @@
</dependency>
- <!-- isis viewer -->
- <dependency>
- <groupId>org.apache.isis.viewer</groupId>
- <artifactId>html</artifactId>
- </dependency>
-
- <dependency>
- <groupId>org.apache.isis.viewer</groupId>
- <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>
+ <!-- domain service implementations -->
+ <!--
+ - uncomment in order to use in-memory objectstore
+ - (also edit isis.properties)
+ -
+ -->
<dependency>
- <groupId>org.apache.isis.runtimes.dflt.objectstores</groupId>
- <artifactId>dflt</artifactId>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>quickstart-objstore-dflt</artifactId>
</dependency>
<!--
- uncomment in order to use mongodb object store
+ - (also edit isis.properties)
-
<dependency>
- <groupId>org.apache.isis.runtimes.dflt.objectstores</groupId>
- <artifactId>nosql</artifactId>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>quickstart-objstore-mongbdo</artifactId>
</dependency>
-->
<!--
- uncomment in order to use sql object store
- -
+ - (also edit isis.properties)
+ -
<dependency>
- <groupId>org.apache.isis.runtimes.dflt.objectstores</groupId>
- <artifactId>sql-impl</artifactId>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>quickstart-objstore-sql</artifactId>
</dependency>
-->
- <!--
- - uncomment to use HSQLDB
- - in conjunction with sql object store
- -
+
+ <!-- isis viewer -->
+ <dependency>
+ <groupId>org.apache.isis.viewer</groupId>
+ <artifactId>html</artifactId>
+ </dependency>
+
<dependency>
- <groupId>org.hsqldb</groupId>
- <artifactId>hsqldb</artifactId>
- <version>1.8.0.10</version>
+ <groupId>org.apache.isis.viewer</groupId>
+ <artifactId>json-viewer</artifactId>
</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>
+ <groupId>org.apache.isis.viewer</groupId>
+ <artifactId>scimpi-servlet</artifactId>
</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
- -
+ <!-- isis runtime -->
<dependency>
- <groupId>com.ingres</groupId>
- <artifactId>iijdbc</artifactId>
- <version>10.0</version>
+ <groupId>org.apache.isis.runtimes.dflt.bytecode</groupId>
+ <artifactId>dflt</artifactId>
</dependency>
- -->
<dependency>
<groupId>org.apache.isis.runtimes.dflt.profilestores</groupId>
@@ -221,7 +177,6 @@
<version>1.2</version>
</dependency>
-
</dependencies>
</project>
Modified: incubator/isis/trunk/examples/quickstart/webapp/src/main/jettyconsole/isis-banner.pdn
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/examples/quickstart/webapp/src/main/jettyconsole/isis-banner.pdn?rev=1245214&r1=1245213&r2=1245214&view=diff
==============================================================================
Binary files - no diff available.
Modified: incubator/isis/trunk/examples/quickstart/webapp/src/main/jettyconsole/isis-banner.png
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/examples/quickstart/webapp/src/main/jettyconsole/isis-banner.png?rev=1245214&r1=1245213&r2=1245214&view=diff
==============================================================================
Binary files - no diff available.
Modified: 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=1245214&r1=1245213&r2=1245214&view=diff
==============================================================================
--- incubator/isis/trunk/examples/quickstart/webapp/src/main/webapp/WEB-INF/authorization_file.properties (original)
+++ incubator/isis/trunk/examples/quickstart/webapp/src/main/webapp/WEB-INF/authorization_file.properties Thu Feb 16 22:20:36 2012
@@ -25,7 +25,7 @@
# (value shown below is the default)
#
-# isis.authorization.file.whitelist=authorization_file.allow
+#isis.authorization.file.whitelist=authorization_file.allow
@@ -34,7 +34,7 @@
# (there is no default value; provide a filename)
#
-# isis.authorization.file.blacklist=
+#isis.authorization.file.blacklist=
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=1245214&r1=1245213&r2=1245214&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 22:20:36 2012
@@ -30,10 +30,30 @@
# 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.
#
+# The implementations depend on the configured objectstore.
+#
+
+
+# if using the in-memory object store:
+# (also edit isis.persistor below, and edit pom.xml)
isis.services.prefix = objstore.dflt
isis.services = todo.ToDoItemsDefault
+# if using the SQL object store:
+# (also edit isis.persistor below, and edit pom.xml)
+#isis.services.prefix = objstore.sql
+#isis.services = todo.ToDoItemsSql
+
+
+# if using the mongodb object store:
+# (also edit isis.persistor below, and edit pom.xml)
+#isis.services.prefix = objstore.mongodb
+#isis.services = todo.ToDoItemsMongo
+
+
+
+
#
# Specify the (optional) test fixtures
#
@@ -101,6 +121,8 @@ isis.authorization=file
# 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)
+#
+# also edit isis.services (above) and pom.xml
#
isis.persistor=in-memory
@@ -155,5 +177,3 @@ isis.persistor.object-factory=org.apache
# 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/persistor_sql.properties
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/examples/quickstart/webapp/src/main/webapp/WEB-INF/persistor_sql.properties?rev=1245214&r1=1245213&r2=1245214&view=diff
==============================================================================
--- incubator/isis/trunk/examples/quickstart/webapp/src/main/webapp/WEB-INF/persistor_sql.properties (original)
+++ incubator/isis/trunk/examples/quickstart/webapp/src/main/webapp/WEB-INF/persistor_sql.properties Thu Feb 16 22:20:36 2012
@@ -32,15 +32,23 @@ isis.persistor.sql.jdbc.password=
#
-#
+# configuration for MS SQL
+# (also edit pom.xml of objstore-mongodb)
#
#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=
+
+#
+# configuration for Ingres
+# (also edit pom.xml of objstore-mongodb)
+#
#isis.persistor.sql.jdbc.driver=com.ingres.jdbc.IngresDriver
#isis.persistor.sql.jdbc.connection=jdbc:ingres://localhost:II7/todoapp
+##isis.persistor.sql.jdbc.user=NOTUSED_IF_localhost
+##isis.persistor.sql.jdbc.password=NOTUSED_IF_localhost
#isis.persistor.sql.datatypes.datetime=TIMESTAMP
#isis.persistor.sql.datatypes.timestamp=TIMESTAMP
#isis.persistor.sql.datatypes.double=DOUBLE PRECISION
Modified: 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=1245214&r1=1245213&r2=1245214&view=diff
==============================================================================
--- incubator/isis/trunk/examples/quickstart/webapp/src/main/webapp/WEB-INF/user-profile-store_in-memory.properties (original)
+++ incubator/isis/trunk/examples/quickstart/webapp/src/main/webapp/WEB-INF/user-profile-store_in-memory.properties Thu Feb 16 22:20:36 2012
@@ -19,3 +19,7 @@
# configuration file for the in-memory user profile store
#
+
+#
+# (intentionally empty)
+#
Modified: 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=1245214&r1=1245213&r2=1245214&view=diff
==============================================================================
--- incubator/isis/trunk/examples/quickstart/webapp/src/main/webapp/index.html (original)
+++ incubator/isis/trunk/examples/quickstart/webapp/src/main/webapp/index.html Thu Feb 16 22:20:36 2012
@@ -61,11 +61,11 @@ th {
<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>NoSQL MongoDB 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>
+ <p>The in-memory objectstore is the default, as it takes no additional setup.</p>
<h2>What next?</h2>
@@ -74,14 +74,41 @@ th {
that you no longer need. You'll probably also want to delete this file, and remove the
<tt><filter>RedirectToDocsFilter</filter></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>Also, decide which objectstore you want to use to persist your domain objects. As noted above, the in-memory object store is the default.
+ If you decide to use the NoSQL (MongoDB) or SQL object stores, you'll need to make a number of configuration changes:
+ <ul>
+ <li>in the <tt>WEB-INF/isis.properties</tt> config file:
+ <ul>
+ <li>modify the <tt>isis.services</tt>/<tt>isis.services.prefix</tt> keys, to pick up the domain service implementation for the object store</li>
+ <li>modify the <tt>isis.persistor</tt> key, to specify the appropriate object store component
+ </ul>
+ </li>
+ <li>in the <tt>WEB-INF/persistor_xxx.properties</tt> file, verify the configuration of the server (hostname, port, etc)</li>
+ <li>modify the pom.xml, to depend on the corresponding <tt>objectstore-xxx</tt> module</li>
+ <li>if using SQL object store, modify the pom.xml of the corresponding <tt>objectstore-xxx</tt> to bring in JDBC drivers</li>
+ </ul>
- <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>
+ <p>While doing initial prototyping you may find that the default in-memory objectstore suffices; the <tt>isis.fixtures</tt> / <tt>isis.fixtures.prefix</tt>
+ properties in the <tt>WEB-INF/isis.properties</tt> configuration file define an the initial data set with which to seed the database.
+ <p>For both the NoSQL and SQL object stores, these fixtures are loaded the very first time that the system is bootstrapped, but are then
+ not loaded thereafter.
+
+ <h2>Running Tests</h2>
+
+ <p>In addition to app, the archetype also generates some simple tests:
+ <ul>
+ <li>JUnit tests exercise the domain objects using the JUnit viewer. Domain object are interacted with "as if" through the user interface;
+ a CGLib proxy wraps each domain object in order to enforce business rules and validation</li>
+ <li>BDD tests exercise the domain object through an integration with the <a href="http://concordion.org">Concordion</a> BDD framework.
+ These tests are specified using XHTML, and running them generates a browsable website that indicates whether the tests pass. By default
+ the site is generated in <tt>/tmp/concordion</tt> (specifically, <tt>/tmp/concordion/viewer/bdd/stories/todo/Index.html</tt>).</li>
+ </ul>
+ <p>These tests are configured to run within Maven (eg using <tt>mvn test</tt>).</p>
+
+ <h2>What if I need more help?</h2>
+
+ <p>If you get stuck, don't forget that there is more information at the <a href="http://incubator.apache.org/isis">Apache Isis website</a>, and you
+ can always find 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>
@@ -108,6 +135,9 @@ th {
<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/persistor_mongodb.properties</td><td>MongoDB objectstore configuration file</td></tr>
+ <tr><td>WEB-INF/persistor_sql.properties</td><td>SQL objectstore configuration file</td></tr>
+ <tr><td>WEB-INF/user-profile-store_in-memory.properties</td><td>In-memory user profile store 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>