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 2014/12/17 09:06:57 UTC
[2/6] isis git commit: ISIS-928: minor updates to todoapp and
simpleapp (doc changes, tiny bug fix)
ISIS-928: minor updates to todoapp and simpleapp (doc changes, tiny bug fix)
Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/649f1680
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/649f1680
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/649f1680
Branch: refs/heads/master
Commit: 649f1680b1fe7a5157f1ce3b5a1cdba659cbfca7
Parents: ba6d875
Author: Dan Haywood <da...@haywood-associates.co.uk>
Authored: Wed Dec 17 00:33:10 2014 +0000
Committer: Dan Haywood <da...@haywood-associates.co.uk>
Committed: Wed Dec 17 00:33:10 2014 +0000
----------------------------------------------------------------------
.../simpleapp/webapp/src/main/webapp/WEB-INF/isis.properties | 8 ++------
.../todoapp/dom/src/main/java/dom/todo/ToDoItem.java | 2 +-
.../webapp/src/main/java/webapp/CustomMementoService.java | 2 +-
.../todoapp/webapp/src/main/webapp/WEB-INF/isis.properties | 8 ++------
4 files changed, 6 insertions(+), 14 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/isis/blob/649f1680/example/application/simpleapp/webapp/src/main/webapp/WEB-INF/isis.properties
----------------------------------------------------------------------
diff --git a/example/application/simpleapp/webapp/src/main/webapp/WEB-INF/isis.properties b/example/application/simpleapp/webapp/src/main/webapp/WEB-INF/isis.properties
index b149d8f..9387f00 100644
--- a/example/application/simpleapp/webapp/src/main/webapp/WEB-INF/isis.properties
+++ b/example/application/simpleapp/webapp/src/main/webapp/WEB-INF/isis.properties
@@ -21,7 +21,7 @@
# 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)
+# in the org.apache.isis.core:isis-core-runtime JAR (in the org.apache.isis.core.runtime package)
#
# Although all configuration could reside in isis.properties, the recommendation is
# to split out into component specific files:
@@ -32,11 +32,7 @@
# * 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)
+# For example, viewer_wicket.properties holds configuration information specific to the Wicket viewer.
#
#################################################################################
http://git-wip-us.apache.org/repos/asf/isis/blob/649f1680/example/application/todoapp/dom/src/main/java/dom/todo/ToDoItem.java
----------------------------------------------------------------------
diff --git a/example/application/todoapp/dom/src/main/java/dom/todo/ToDoItem.java b/example/application/todoapp/dom/src/main/java/dom/todo/ToDoItem.java
index a4243d5..98dbe91 100644
--- a/example/application/todoapp/dom/src/main/java/dom/todo/ToDoItem.java
+++ b/example/application/todoapp/dom/src/main/java/dom/todo/ToDoItem.java
@@ -208,7 +208,7 @@ public class ToDoItem implements Categorized, Comparable<ToDoItem> {
Professional {
@Override
public List<Subcategory> subcategories() {
- return Arrays.asList(null, Subcategory.OpenSource, Subcategory.Consulting, Subcategory.Education);
+ return Arrays.asList(null, Subcategory.OpenSource, Subcategory.Consulting, Subcategory.Education, Subcategory.Marketing);
}
}, Domestic {
@Override
http://git-wip-us.apache.org/repos/asf/isis/blob/649f1680/example/application/todoapp/webapp/src/main/java/webapp/CustomMementoService.java
----------------------------------------------------------------------
diff --git a/example/application/todoapp/webapp/src/main/java/webapp/CustomMementoService.java b/example/application/todoapp/webapp/src/main/java/webapp/CustomMementoService.java
index 85f4ba3..82a8a18 100644
--- a/example/application/todoapp/webapp/src/main/java/webapp/CustomMementoService.java
+++ b/example/application/todoapp/webapp/src/main/java/webapp/CustomMementoService.java
@@ -32,7 +32,7 @@ import org.apache.isis.core.runtime.services.memento.MementoServiceDefault;
* <pre>
* isis.services = \
* ...,
- * 1:webapp.MyMementoService,
+ * 1:webapp.CustomMementoService,
* ...,
* </pre>
* <p>
http://git-wip-us.apache.org/repos/asf/isis/blob/649f1680/example/application/todoapp/webapp/src/main/webapp/WEB-INF/isis.properties
----------------------------------------------------------------------
diff --git a/example/application/todoapp/webapp/src/main/webapp/WEB-INF/isis.properties b/example/application/todoapp/webapp/src/main/webapp/WEB-INF/isis.properties
index 805a6c3..bb0d6dd 100644
--- a/example/application/todoapp/webapp/src/main/webapp/WEB-INF/isis.properties
+++ b/example/application/todoapp/webapp/src/main/webapp/WEB-INF/isis.properties
@@ -21,7 +21,7 @@
# 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)
+# in the org.apache.isis.core:isis-core-runtime JAR (in the org.apache.isis.core.runtime package)
#
# Although all configuration could reside in isis.properties, the recommendation is
# to split out into component specific files:
@@ -32,11 +32,7 @@
# * 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)
+# For example, viewer_wicket.properties holds configuration information specific to the Wicket viewer.
#
#################################################################################