You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@isis.apache.org by rm...@apache.org on 2013/03/19 22:16:11 UTC
[5/9] git commit: Isis-162 - redesigned Scimpi based archetype.
Isis-162 - redesigned Scimpi based archetype.
Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/8f59c0da
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/8f59c0da
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/8f59c0da
Branch: refs/heads/master
Commit: 8f59c0da51b22ebdaccc16c7073764c05b5af90f
Parents: 78b439c
Author: rmatthews <rm...@nakedobjects.org>
Authored: Tue Mar 19 15:44:10 2013 +0000
Committer: rmatthews <rm...@nakedobjects.org>
Committed: Tue Mar 19 19:38:09 2013 +0000
----------------------------------------------------------------------
.../quickstart_scimpi_nosql/dom/log4j.properties | 24 -
.../dom/src/main/java/dom/MyObject.java | 49 ++
.../dom/src/main/java/dom/Repository.java | 59 ++
.../dom/src/main/java/dom/todo/ToDoItem.java | 225 ------
.../dom/src/main/java/dom/todo/ToDoItems.java | 139 ----
.../dom/src/main/resources/images/AuditEntry.png | Bin 2215 -> 0 bytes
.../dom/src/main/resources/images/MyObject.png | Bin 0 -> 2215 bytes
.../dom/src/main/resources/images/ToDoItem.gif | Bin 1592 -> 0 bytes
.../src/main/java/fixture/InitialFixture.java | 47 ++
.../main/java/fixture/todo/ToDoItemsFixture.java | 74 --
.../fixture/todo/ToDoItemsFixturesService.java | 46 --
.../viewer-scimpi/getting started notes.txt | 182 +++++
.../eclipse/launch/quickstart-viewer-scimpi.launch | 1 -
.../viewer-scimpi/lib/.gitignore | 5 -
.../src/main/jettyconsole/isis-banner.pdn | Bin 64679 -> 0 bytes
.../src/main/resources/images/Default.png | Bin 3016 -> 0 bytes
.../src/main/webapp/ToDoItem/edit.shtml | 27 -
.../src/main/webapp/ToDoItem/object.shtml | 32 -
.../webapp/WEB-INF/authentication_file.passwords | 3 +-
.../webapp/WEB-INF/authentication_file.properties | 25 -
.../main/webapp/WEB-INF/authorization_file.allow | 28 -
.../webapp/WEB-INF/authorization_file.properties | 47 --
.../src/main/webapp/WEB-INF/config.xml | 26 +
.../src/main/webapp/WEB-INF/isis.properties | 162 +----
.../src/main/webapp/WEB-INF/logging.properties | 57 +--
.../webapp/WEB-INF/persistor_fileserver.properties | 25 -
.../webapp/WEB-INF/persistor_in-memory.properties | 25 -
.../webapp/WEB-INF/persistor_mongodb.properties | 47 --
.../main/webapp/WEB-INF/viewer_scimpi.properties | 25 -
.../viewer-scimpi/src/main/webapp/WEB-INF/web.xml | 56 +-
.../viewer-scimpi/src/main/webapp/debug.shtml | 23 -
.../src/main/webapp/debug/action.shtml | 27 +
.../src/main/webapp/debug/application.shtml | 31 +
.../src/main/webapp/debug/debug-page.css | 158 ++++
.../src/main/webapp/debug/debug-template.shtml | 55 ++
.../src/main/webapp/debug/debug-users.shtml | 26 +
.../src/main/webapp/debug/debug.shtml | 23 +
.../viewer-scimpi/src/main/webapp/debug/edit.shtml | 32 +
.../src/main/webapp/debug/object.shtml | 32 +
.../src/main/webapp/debug/services.shtml | 25 +
.../viewer-scimpi/src/main/webapp/error.shtml | 23 -
.../src/main/webapp/error/error-template.shtml | 49 ++
.../src/main/webapp/error/notfound_404.shtml | 33 +
.../src/main/webapp/error/security_403.shtml | 32 +
.../src/main/webapp/error/server_500.shtml | 60 ++
.../src/main/webapp/generic/action.shtml | 2 +-
.../src/main/webapp/generic/collection.shtml | 5 +-
.../src/main/webapp/generic/edit.shtml | 4 +-
.../src/main/webapp/generic/object.shtml | 5 +-
.../src/main/webapp/images/calendar.gif | Bin 0 -> 269 bytes
.../viewer-scimpi/src/main/webapp/images/logo.png | Bin 0 -> 6149 bytes
.../src/main/webapp/images/scimpi-logo.png | Bin 0 -> 7183 bytes
.../viewer-scimpi/src/main/webapp/index.shtml | 4 +-
.../viewer-scimpi/src/main/webapp/login.shtml | 33 +-
.../src/main/webapp/page-template.shtml | 29 +
.../src/main/webapp/scimpi/custom/new-todo.shtml | 26 -
.../src/main/webapp/scimpi/images/scimpi-logo.png | Bin 7183 -> 0 bytes
.../src/main/webapp/scimpi/style/reset.css | 68 --
.../src/main/webapp/scimpi/style/screen.css | 338 ---------
.../main/webapp/scimpi/style/site-template.shtml | 54 --
.../src/main/webapp/scimpi/style/template.shtml | 35 -
.../src/main/webapp/scripts/jquery-1.7.2.min.js | 4 +
.../webapp/scripts/jquery-ui-1.8.20.custom.min.js | 125 ++++
.../src/main/webapp/scripts/scimpi.js | 68 ++
.../src/main/webapp/site-template.shtml | 68 ++
.../viewer-scimpi/src/main/webapp/style/debug.css | 193 +++++
.../viewer-scimpi/src/main/webapp/style/reset.css | 49 ++
.../src/main/webapp/style/scimpi-base.css | 302 ++++++++
.../ui-bg_diagonals-thick_18_b81900_40x40.png | Bin 0 -> 260 bytes
.../ui-bg_diagonals-thick_20_666666_40x40.png | Bin 0 -> 251 bytes
.../images/ui-bg_flat_10_000000_40x100.png | Bin 0 -> 178 bytes
.../images/ui-bg_glass_100_f6f6f6_1x400.png | Bin 0 -> 104 bytes
.../images/ui-bg_glass_100_fdf5ce_1x400.png | Bin 0 -> 125 bytes
.../images/ui-bg_glass_65_ffffff_1x400.png | Bin 0 -> 105 bytes
.../images/ui-bg_gloss-wave_35_f6a828_500x100.png | Bin 0 -> 3762 bytes
.../ui-bg_highlight-soft_100_eeeeee_1x100.png | Bin 0 -> 90 bytes
.../ui-bg_highlight-soft_75_ffe45c_1x100.png | Bin 0 -> 129 bytes
.../images/ui-icons_222222_256x240.png | Bin 0 -> 4369 bytes
.../images/ui-icons_228ef1_256x240.png | Bin 0 -> 4369 bytes
.../images/ui-icons_ef8c08_256x240.png | Bin 0 -> 4369 bytes
.../images/ui-icons_ffd27a_256x240.png | Bin 0 -> 4369 bytes
.../images/ui-icons_ffffff_256x240.png | Bin 0 -> 4369 bytes
.../style/ui-lightness/jquery-ui-1.8.17.custom.css | 565 +++++++++++++++
83 files changed, 2428 insertions(+), 1614 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/isis/blob/8f59c0da/example/application/quickstart_scimpi_nosql/dom/log4j.properties
----------------------------------------------------------------------
diff --git a/example/application/quickstart_scimpi_nosql/dom/log4j.properties b/example/application/quickstart_scimpi_nosql/dom/log4j.properties
deleted file mode 100644
index 281bfb6..0000000
--- a/example/application/quickstart_scimpi_nosql/dom/log4j.properties
+++ /dev/null
@@ -1,24 +0,0 @@
-# LOG4J Configuration
-# ===================
-
-# Basic logging goes to "datanucleus.log"
-log4j.appender.A1=org.apache.log4j.FileAppender
-log4j.appender.A1.File=datanucleus.log
-log4j.appender.A1.layout=org.apache.log4j.PatternLayout
-log4j.appender.A1.layout.ConversionPattern=%d{HH:mm:ss,SSS} (%t) %-5p [%c] - %m%n
-#log4j.appender.A1.Threshold=INFO
-
-# Categories
-# Each category can be set to a "level", and to direct to an appender
-
-# Default to DEBUG level for all DataNucleus categories
-log4j.logger.DataNucleus = DEBUG, A1
-
-log4j.category.com.mchange.v2.c3p0=INFO, A1
-log4j.category.com.mchange.v2.resourcepool=INFO, A1
-log4j.category.org.logicalcobwebs.proxool=INFO,A1
-
-
-# Hbase libs logging
-log4j.category.org.apache.hadoop=INFO,A1
-log4j.category.org.apache.zookeeper=INFO,A1
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/isis/blob/8f59c0da/example/application/quickstart_scimpi_nosql/dom/src/main/java/dom/MyObject.java
----------------------------------------------------------------------
diff --git a/example/application/quickstart_scimpi_nosql/dom/src/main/java/dom/MyObject.java b/example/application/quickstart_scimpi_nosql/dom/src/main/java/dom/MyObject.java
new file mode 100644
index 0000000..2c6dcd9
--- /dev/null
+++ b/example/application/quickstart_scimpi_nosql/dom/src/main/java/dom/MyObject.java
@@ -0,0 +1,49 @@
+/*
+ * 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 dom;
+
+import org.apache.isis.applib.AbstractDomainObject;
+import org.apache.isis.applib.annotation.MemberOrder;
+import org.apache.isis.applib.annotation.ObjectType;
+import org.apache.isis.applib.util.TitleBuffer;
+
+@ObjectType("MOBJ")
+public class MyObject extends AbstractDomainObject {
+
+ public String title() {
+ final TitleBuffer title = new TitleBuffer();
+ title.append(name);
+ return title.toString();
+ }
+
+ // {{ Name
+ private String name;
+
+ @MemberOrder(sequence = "1.0")
+ public String getName() {
+ return name;
+ }
+
+ public void setName(final String description) {
+ this.name = description;
+ }
+ // }}
+
+}
http://git-wip-us.apache.org/repos/asf/isis/blob/8f59c0da/example/application/quickstart_scimpi_nosql/dom/src/main/java/dom/Repository.java
----------------------------------------------------------------------
diff --git a/example/application/quickstart_scimpi_nosql/dom/src/main/java/dom/Repository.java b/example/application/quickstart_scimpi_nosql/dom/src/main/java/dom/Repository.java
new file mode 100644
index 0000000..1912b43
--- /dev/null
+++ b/example/application/quickstart_scimpi_nosql/dom/src/main/java/dom/Repository.java
@@ -0,0 +1,59 @@
+/*
+ * 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 dom;
+
+import java.util.List;
+
+import org.apache.isis.applib.AbstractFactoryAndRepository;
+import org.apache.isis.applib.annotation.ActionSemantics;
+import org.apache.isis.applib.annotation.ActionSemantics.Of;
+import org.apache.isis.applib.annotation.MemberOrder;
+import org.apache.isis.applib.annotation.Named;
+
+
+public class Repository extends AbstractFactoryAndRepository {
+
+ // {{ Id, iconName
+ @Override
+ public String getId() {
+ return "repository";
+ }
+
+ // }}
+
+ // {{ allInstances (action)
+ @ActionSemantics(Of.SAFE)
+ @MemberOrder(sequence = "2")
+ public List<MyObject> allInstances() {
+ return allInstances(MyObject.class);
+ }
+
+ // }}
+
+ // {{ newToDo (action)
+ @MemberOrder(sequence = "2")
+ public MyObject newInstance(@Named("Name") String name) {
+ final MyObject newInstance = newTransientInstance(MyObject.class);
+ newInstance.setName(name);
+ persist(newInstance);
+ return newInstance;
+ }
+ // }}
+}
http://git-wip-us.apache.org/repos/asf/isis/blob/8f59c0da/example/application/quickstart_scimpi_nosql/dom/src/main/java/dom/todo/ToDoItem.java
----------------------------------------------------------------------
diff --git a/example/application/quickstart_scimpi_nosql/dom/src/main/java/dom/todo/ToDoItem.java b/example/application/quickstart_scimpi_nosql/dom/src/main/java/dom/todo/ToDoItem.java
deleted file mode 100644
index e8af026..0000000
--- a/example/application/quickstart_scimpi_nosql/dom/src/main/java/dom/todo/ToDoItem.java
+++ /dev/null
@@ -1,225 +0,0 @@
-/*
- * 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 dom.todo;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.apache.isis.applib.DomainObjectContainer;
-import org.apache.isis.applib.annotation.Disabled;
-import org.apache.isis.applib.annotation.Hidden;
-import org.apache.isis.applib.annotation.MemberGroups;
-import org.apache.isis.applib.annotation.MemberOrder;
-import org.apache.isis.applib.annotation.MultiLine;
-import org.apache.isis.applib.annotation.ObjectType;
-import org.apache.isis.applib.annotation.Optional;
-import org.apache.isis.applib.annotation.Resolve;
-import org.apache.isis.applib.annotation.Resolve.Type;
-import org.apache.isis.applib.annotation.Title;
-import org.apache.isis.applib.annotation.Where;
-import org.joda.time.LocalDate;
-
-@ObjectType("TODO")
-@MemberGroups({"General", "Detail"})
-public class ToDoItem {
-
- public static enum Category {
- Professional, Domestic, Other;
- }
-
- // {{ Description
- private String description;
-
- @Title
- @MemberOrder(sequence = "1")
- public String getDescription() {
- return description;
- }
-
- public void setDescription(final String description) {
- this.description = description;
- }
- // }}
-
- // {{ Category
- private Category category;
-
- @MemberOrder(sequence = "2")
- public Category getCategory() {
- return category;
- }
-
- public void setCategory(final Category category) {
- this.category = category;
- }
- // }}
-
- // {{ DueBy (property)
- private LocalDate dueBy;
-
- @MemberOrder(name="Detail", sequence = "3")
- @Optional
- public LocalDate getDueBy() {
- return dueBy;
- }
-
- public void setDueBy(final LocalDate dueBy) {
- this.dueBy = dueBy;
- }
- // }}
-
- // {{ Done
- private boolean done;
-
- @Disabled
- @MemberOrder(sequence = "4")
- public boolean getDone() {
- return done;
- }
-
- public void setDone(final boolean done) {
- this.done = done;
- }
- // }}
-
- // {{ Notes (property)
- private String notes;
-
- @Hidden(where=Where.ALL_TABLES)
- @Optional
- @MultiLine(numberOfLines=5)
- @MemberOrder(name="Detail", sequence = "6")
- public String getNotes() {
- return notes;
- }
-
- public void setNotes(final String notes) {
- this.notes = notes;
- }
- // }}
-
- // {{ OwnedBy (property, hidden)
- private String ownedBy;
-
- @Hidden
- public String getOwnedBy() {
- return ownedBy;
- }
-
- public void setOwnedBy(final String ownedBy) {
- this.ownedBy = ownedBy;
- }
- // }}
-
- // {{ markAsDone (action)
- @MemberOrder(sequence = "1")
- public ToDoItem markAsDone() {
- setDone(true);
- return this;
- }
-
- public String disableMarkAsDone() {
- return done ? "Already done" : null;
- }
- // }}
-
- // {{ markAsNotDone (action)
- @MemberOrder(sequence = "2")
- public ToDoItem markAsNotDone() {
- setDone(false);
- return this;
- }
-
- public String disableMarkAsNotDone() {
- return !done ? "Not yet done" : null;
- }
- // }}
-
- // {{ dependencies (Collection)
- private List<ToDoItem> dependencies = new ArrayList<ToDoItem>();
-
- @Disabled
- @MemberOrder(sequence = "1")
- @Resolve(Type.EAGERLY)
- public List<ToDoItem> getDependencies() {
- return dependencies;
- }
-
- public void setDependencies(final List<ToDoItem> dependencies) {
- this.dependencies = dependencies;
- }
- // }}
-
- // {{ add (action)
- @MemberOrder(name="dependencies", sequence = "3")
- public ToDoItem add(final ToDoItem toDoItem) {
- getDependencies().add(toDoItem);
- return this;
- }
- public String validateAdd(final ToDoItem toDoItem) {
- if(getDependencies().contains(toDoItem)) {
- return "Already a dependency";
- }
- if(toDoItem == this) {
- return "Can't set up a dependency to self";
- }
- return null;
- }
- // }}
-
- // {{ remove (action)
- @MemberOrder(name="dependencies", sequence = "4")
- public ToDoItem remove(final ToDoItem toDoItem) {
- getDependencies().remove(toDoItem);
- return this;
- }
- public String disableRemove(final ToDoItem toDoItem) {
- return getDependencies().isEmpty()? "No dependencies to remove": null;
- }
- public String validateRemove(final ToDoItem toDoItem) {
- if(!getDependencies().contains(toDoItem)) {
- return "Not a dependency";
- }
- return null;
- }
- public List<ToDoItem> choices0Remove() {
- return getDependencies();
- }
- // }}
-
- // {{ injected: DomainObjectContainer
- @SuppressWarnings("unused")
- private DomainObjectContainer container;
-
- public void setDomainObjectContainer(final DomainObjectContainer container) {
- this.container = container;
- }
- // }}
-
- // {{ injected: ToDoItems
- @SuppressWarnings("unused")
- private ToDoItems toDoItems;
-
- public void setToDoItems(final ToDoItems toDoItems) {
- this.toDoItems = toDoItems;
- }
- // }}
-
-}
http://git-wip-us.apache.org/repos/asf/isis/blob/8f59c0da/example/application/quickstart_scimpi_nosql/dom/src/main/java/dom/todo/ToDoItems.java
----------------------------------------------------------------------
diff --git a/example/application/quickstart_scimpi_nosql/dom/src/main/java/dom/todo/ToDoItems.java b/example/application/quickstart_scimpi_nosql/dom/src/main/java/dom/todo/ToDoItems.java
deleted file mode 100644
index 6d4c12d..0000000
--- a/example/application/quickstart_scimpi_nosql/dom/src/main/java/dom/todo/ToDoItems.java
+++ /dev/null
@@ -1,139 +0,0 @@
-/*
- * 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 dom.todo;
-
-import java.util.List;
-
-import com.google.common.base.Objects;
-
-import dom.todo.ToDoItem.Category;
-
-import org.apache.isis.applib.AbstractFactoryAndRepository;
-import org.apache.isis.applib.annotation.ActionSemantics;
-import org.apache.isis.applib.annotation.ActionSemantics.Of;
-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.NotInServiceMenu;
-import org.apache.isis.applib.filter.Filter;
-
-@Named("ToDos")
-public class ToDoItems extends AbstractFactoryAndRepository {
-
- // {{ Id, iconName
- @Override
- public String getId() {
- return "toDoItems";
- }
-
- public String iconName() {
- return "ToDoItem";
- }
- // }}
-
- // {{ notYetDone (action)
- @ActionSemantics(Of.SAFE)
- @MemberOrder(sequence = "1")
- public List<ToDoItem> notYetDone() {
- return allMatches(ToDoItem.class, new Filter<ToDoItem>() {
- @Override
- public boolean accept(final ToDoItem t) {
- return ownedByCurrentUser(t) && !t.getDone();
- }
- });
- }
- // }}
-
- // {{ done (action)
- @ActionSemantics(Of.SAFE)
- @MemberOrder(sequence = "2")
- public List<ToDoItem> done() {
- return allMatches(ToDoItem.class, new Filter<ToDoItem>() {
- @Override
- public boolean accept(final ToDoItem t) {
- return ownedByCurrentUser(t) && t.getDone();
- }
- });
- }
- // }}
-
- // {{ newToDo (action)
- @MemberOrder(sequence = "2")
- public ToDoItem newToDo(
- @Named("Description") String description,
- @Named("Category") Category category) {
- final String ownedBy = getContainer().getUser().getName();
- return newToDo(description, category, ownedBy);
- }
- // }}
-
- // {{ newToDo (hidden)
- @Hidden // for use by fixtures
- public ToDoItem newToDo(
- String description,
- Category category,
- String ownedBy) {
- final ToDoItem toDoItem = newTransientInstance(ToDoItem.class);
- toDoItem.setDescription(description);
- toDoItem.setCategory(category);
- toDoItem.setOwnedBy(ownedBy);
- persist(toDoItem);
- return toDoItem;
- }
- // }}
-
- // {{ similarTo (action)
- @NotInServiceMenu
- @ActionSemantics(Of.SAFE)
- @MemberOrder(sequence = "3")
- 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()) && Objects.equal(toDoItem.getOwnedBy(), t.getOwnedBy());
- }
- });
- }
- // }}
-
- // {{ autoComplete (hidden)
- @Hidden
- @MemberOrder(sequence = "1")
- public List<ToDoItem> autoComplete(final String description) {
- return allMatches(ToDoItem.class, new Filter<ToDoItem>() {
- @Override
- public boolean accept(final ToDoItem t) {
- return ownedByCurrentUser(t) && t.getDescription().contains(description);
- }
-
- });
- }
- // }}
-
- // {{ helpers
- protected boolean ownedByCurrentUser(final ToDoItem t) {
- return Objects.equal(t.getOwnedBy(), currentUserName());
- }
- protected String currentUserName() {
- return getContainer().getUser().getName();
- }
- // }}
-
-}
http://git-wip-us.apache.org/repos/asf/isis/blob/8f59c0da/example/application/quickstart_scimpi_nosql/dom/src/main/resources/images/AuditEntry.png
----------------------------------------------------------------------
diff --git a/example/application/quickstart_scimpi_nosql/dom/src/main/resources/images/AuditEntry.png b/example/application/quickstart_scimpi_nosql/dom/src/main/resources/images/AuditEntry.png
deleted file mode 100644
index 950d792..0000000
Binary files a/example/application/quickstart_scimpi_nosql/dom/src/main/resources/images/AuditEntry.png and /dev/null differ
http://git-wip-us.apache.org/repos/asf/isis/blob/8f59c0da/example/application/quickstart_scimpi_nosql/dom/src/main/resources/images/MyObject.png
----------------------------------------------------------------------
diff --git a/example/application/quickstart_scimpi_nosql/dom/src/main/resources/images/MyObject.png b/example/application/quickstart_scimpi_nosql/dom/src/main/resources/images/MyObject.png
new file mode 100644
index 0000000..950d792
Binary files /dev/null and b/example/application/quickstart_scimpi_nosql/dom/src/main/resources/images/MyObject.png differ
http://git-wip-us.apache.org/repos/asf/isis/blob/8f59c0da/example/application/quickstart_scimpi_nosql/dom/src/main/resources/images/ToDoItem.gif
----------------------------------------------------------------------
diff --git a/example/application/quickstart_scimpi_nosql/dom/src/main/resources/images/ToDoItem.gif b/example/application/quickstart_scimpi_nosql/dom/src/main/resources/images/ToDoItem.gif
deleted file mode 100644
index cc536e1..0000000
Binary files a/example/application/quickstart_scimpi_nosql/dom/src/main/resources/images/ToDoItem.gif and /dev/null differ
http://git-wip-us.apache.org/repos/asf/isis/blob/8f59c0da/example/application/quickstart_scimpi_nosql/fixture/src/main/java/fixture/InitialFixture.java
----------------------------------------------------------------------
diff --git a/example/application/quickstart_scimpi_nosql/fixture/src/main/java/fixture/InitialFixture.java b/example/application/quickstart_scimpi_nosql/fixture/src/main/java/fixture/InitialFixture.java
new file mode 100644
index 0000000..0ab177b
--- /dev/null
+++ b/example/application/quickstart_scimpi_nosql/fixture/src/main/java/fixture/InitialFixture.java
@@ -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.
+ */
+
+package fixture;
+
+import org.apache.isis.applib.fixtures.AbstractFixture;
+
+import dom.Repository;
+
+public class InitialFixture extends AbstractFixture {
+
+ // {{ injected: Repository
+ private Repository repository;
+
+ public void setRepository(final Repository repository) {
+ this.repository = repository;
+ }
+ // }}
+
+ @Override
+ public void install() {
+ addExampleObject();
+ }
+
+ private void addExampleObject() {
+ repository.newInstance("Instance One");
+ repository.newInstance("Instance Two");
+ repository.newInstance("Instance Three");
+ }
+
+}
http://git-wip-us.apache.org/repos/asf/isis/blob/8f59c0da/example/application/quickstart_scimpi_nosql/fixture/src/main/java/fixture/todo/ToDoItemsFixture.java
----------------------------------------------------------------------
diff --git a/example/application/quickstart_scimpi_nosql/fixture/src/main/java/fixture/todo/ToDoItemsFixture.java b/example/application/quickstart_scimpi_nosql/fixture/src/main/java/fixture/todo/ToDoItemsFixture.java
deleted file mode 100644
index b0c7b61..0000000
--- a/example/application/quickstart_scimpi_nosql/fixture/src/main/java/fixture/todo/ToDoItemsFixture.java
+++ /dev/null
@@ -1,74 +0,0 @@
-/*
- * 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 fixture.todo;
-
-import dom.todo.ToDoItem;
-import dom.todo.ToDoItem.Category;
-import dom.todo.ToDoItems;
-
-import org.apache.isis.applib.fixtures.AbstractFixture;
-
-public class ToDoItemsFixture extends AbstractFixture {
-
- @Override
- public void install() {
- createFiveFor("sven");
- createThreeFor("dick");
- createTwoFor("bob");
- createOneFor("joe");
-
- // for exploration user
- createFiveFor("exploration");
- }
-
- private void createFiveFor(String ownedBy) {
- createToDoItem("Buy milk", Category.Domestic, ownedBy);
- createToDoItem("Pick up laundry", Category.Domestic, ownedBy);
- createToDoItem("Buy stamps", Category.Domestic, ownedBy);
- createToDoItem("Write blog post", Category.Professional, ownedBy);
- createToDoItem("Organize brown bag", Category.Professional, ownedBy);
- }
-
- private void createThreeFor(String ownedBy) {
- createToDoItem("Book car in for service", Category.Domestic, ownedBy);
- createToDoItem("Buy birthday present for sven", Category.Domestic, ownedBy);
- createToDoItem("Write presentation for conference", Category.Professional, ownedBy);
- }
-
- private void createTwoFor(String ownedBy) {
- createToDoItem("Write thank you notes", Category.Domestic, ownedBy);
- createToDoItem("Look into solar panels", Category.Domestic, ownedBy);
- }
-
- private void createOneFor(String ownedBy) {
- createToDoItem("Pitch book idea to publisher", Category.Professional, ownedBy);
- }
-
- private ToDoItem createToDoItem(final String description, Category category, String ownedBy) {
- return toDoItems.newToDo(description, category, ownedBy);
- }
-
- private ToDoItems toDoItems;
-
- public void setToDoItems(final ToDoItems toDoItems) {
- this.toDoItems = toDoItems;
- }
-
-}
http://git-wip-us.apache.org/repos/asf/isis/blob/8f59c0da/example/application/quickstart_scimpi_nosql/fixture/src/main/java/fixture/todo/ToDoItemsFixturesService.java
----------------------------------------------------------------------
diff --git a/example/application/quickstart_scimpi_nosql/fixture/src/main/java/fixture/todo/ToDoItemsFixturesService.java b/example/application/quickstart_scimpi_nosql/fixture/src/main/java/fixture/todo/ToDoItemsFixturesService.java
deleted file mode 100644
index ddb1203..0000000
--- a/example/application/quickstart_scimpi_nosql/fixture/src/main/java/fixture/todo/ToDoItemsFixturesService.java
+++ /dev/null
@@ -1,46 +0,0 @@
-/*
- * 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 fixture.todo;
-
-import dom.todo.ToDoItems;
-
-import org.apache.isis.applib.AbstractService;
-import org.apache.isis.applib.annotation.Named;
-
-/**
- * Enables fixtures to be installed from the application.
- */
-@Named("Fixtures")
-public class ToDoItemsFixturesService extends AbstractService {
-
- public void install() {
- final ToDoItemsFixture fixture = new ToDoItemsFixture();
- fixture.setContainer(getContainer());
- fixture.setToDoItems(toDoItems);
- fixture.install();
- }
-
- private ToDoItems toDoItems;
-
- public void setToDoItems(final ToDoItems toDoItems) {
- this.toDoItems = toDoItems;
- }
-
-}
http://git-wip-us.apache.org/repos/asf/isis/blob/8f59c0da/example/application/quickstart_scimpi_nosql/viewer-scimpi/getting started notes.txt
----------------------------------------------------------------------
diff --git a/example/application/quickstart_scimpi_nosql/viewer-scimpi/getting started notes.txt b/example/application/quickstart_scimpi_nosql/viewer-scimpi/getting started notes.txt
new file mode 100644
index 0000000..4717a3f
--- /dev/null
+++ b/example/application/quickstart_scimpi_nosql/viewer-scimpi/getting started notes.txt
@@ -0,0 +1,182 @@
+# 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.
+
+
+#################################################################################
+#
+# 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 the persistor (object store) to use
+#
+# * in-memory requires no additional configuration, but stores object in-memory.
+# Only suitable for prototyping
+# * datanucleus uses JDO DataNucleus to persist objects to relational database.
+# for objectstore-specific properties, see persistor_datanucleus.properties
+# * fileserver uses a simple FileServer to persist objects as JSON documents. It requires the fileserver component to be running
+# for objectstore-specific properties, see persistor_fileserver.properties
+# * mongodb uses MongoDB to be persist objects as JSON documents. It requires MongoDB to be installed and running
+# for objectstore-specific properties, see persistor_fileserver.properties
+# * sql uses an RDBMS to persist objects as table rows.
+# for objectstore-specific properties, see persistor_sql.properties
+# * xml uses the XML ObjectStore to be persist objects to a set of XML files. Only suitable for prototyping.
+# for objectstore-specific properties, see persistor_xml.properties
+#
+# NOTE:
+# * if using non-naive implementations of services, edit isis.services (below) and
+# * if necessary, update the pom.xml to reference appropriate objstore-xxx module
+# * for sql and datanucleus objectstores, update the pom.xml to reference appropriate JDBC driver
+#
+
+isis.persistor=in-memory
+#isis.persistor=fileserver
+#isis.persistor=mongodb
+
+
+#
+# configure authentication mechanism to use (to logon to the system)
+# note:
+# - authentication is disabled if running in exploration mode
+# - the Scimpi viewer allows access to anonymous users
+#
+
+# default is file in SERVER mode, none in SERVER_EXPLORATION. Configure in web.xml
+#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
+#
+# configuring this component automatically refines the metamodel (installing a facet factory
+# which vetoes access as required)
+#
+
+# default is file in SERVER mode, none in SERVER_EXPLORATION. Configure in web.xml
+#isis.authorization=file
+
+
+
+#
+# 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
+
+
+
+
+#################################################################################
+#
+# MetaModel
+#
+# The metamodel typically does not require additional configuration, although
+# the system components (defined above) may refine the metamodel for their needs.
+#
+#################################################################################
+
+
+#
+# additional programming model facets
+#
+
+#isis.reflector.facets.include=
+#isis.reflector.facets.exclude=
+
+# normally these facets would be installed by virtue of configuring the JDO object store
+# need to be configured manually if running some other object store only because the
+# JDO enhancer is still configured to run on the DOM project.
+isis.reflector.facets.include=\
+ org.apache.isis.core.progmodel.facets.object.ignore.jdo.RemoveJdoEnhancementTypesFacetFactory,\
+ org.apache.isis.core.progmodel.facets.object.ignore.jdo.RemoveJdoPrefixedMethodsFacetFactory
+
+#
+# metamodel validator
+#
+
+#isis.reflector.validator=
+
+
+
+#################################################################################
+#
+# Application 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.
+#
+# The implementations depend on the configured (see isis.persistor above)
+#
+
+
+# if using the in-memory, XML, SQL, fileserver or mongo object stores:
+isis.services.prefix = dom
+isis.services = todo.ToDoItems
+
+
+# if using the DataNucleus object store
+# (with support for JDO's audit service, and installing fixtures using a domain service)
+#isis.services.prefix =
+#isis.services = objstore.jdo.todo.ToDoItemsJdo,\
+# fixture.todo.ToDoItemsFixturesService,\
+# dom.audit.AuditServiceDemo
+
+
+
+
+
+#
+# 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= todo.ToDoItemsFixture
+
http://git-wip-us.apache.org/repos/asf/isis/blob/8f59c0da/example/application/quickstart_scimpi_nosql/viewer-scimpi/ide/eclipse/launch/quickstart-viewer-scimpi.launch
----------------------------------------------------------------------
diff --git a/example/application/quickstart_scimpi_nosql/viewer-scimpi/ide/eclipse/launch/quickstart-viewer-scimpi.launch b/example/application/quickstart_scimpi_nosql/viewer-scimpi/ide/eclipse/launch/quickstart-viewer-scimpi.launch
index 53f6647..eaf9f9b 100644
--- a/example/application/quickstart_scimpi_nosql/viewer-scimpi/ide/eclipse/launch/quickstart-viewer-scimpi.launch
+++ b/example/application/quickstart_scimpi_nosql/viewer-scimpi/ide/eclipse/launch/quickstart-viewer-scimpi.launch
@@ -12,7 +12,6 @@
</mapAttribute>
<stringAttribute key="org.eclipse.debug.core.source_locator_id" value="org.eclipse.jdt.launching.sourceLocator.JavaSourceLookupDirector"/>
<booleanAttribute key="org.eclipse.jdt.debug.ui.INCLUDE_EXTERNAL_JARS" value="true"/>
-<stringAttribute key="org.eclipse.jdt.launching.CLASSPATH_PROVIDER" value="org.eclipse.m2e.launchconfig.classpathProvider"/>
<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="org.apache.isis.WebServer"/>
<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="quickstart_scimpi_nosql-viewer-scimpi"/>
<stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="--type server_exploration"/>
http://git-wip-us.apache.org/repos/asf/isis/blob/8f59c0da/example/application/quickstart_scimpi_nosql/viewer-scimpi/lib/.gitignore
----------------------------------------------------------------------
diff --git a/example/application/quickstart_scimpi_nosql/viewer-scimpi/lib/.gitignore b/example/application/quickstart_scimpi_nosql/viewer-scimpi/lib/.gitignore
deleted file mode 100644
index 70eee7e..0000000
--- a/example/application/quickstart_scimpi_nosql/viewer-scimpi/lib/.gitignore
+++ /dev/null
@@ -1,5 +0,0 @@
-#
-# explicitly ignoring Microsoft JDBC4 jar
-# (cannot redistribute, licensing)
-#
-sqljdbc4.jar
http://git-wip-us.apache.org/repos/asf/isis/blob/8f59c0da/example/application/quickstart_scimpi_nosql/viewer-scimpi/src/main/jettyconsole/isis-banner.pdn
----------------------------------------------------------------------
diff --git a/example/application/quickstart_scimpi_nosql/viewer-scimpi/src/main/jettyconsole/isis-banner.pdn b/example/application/quickstart_scimpi_nosql/viewer-scimpi/src/main/jettyconsole/isis-banner.pdn
deleted file mode 100644
index ee6b1c4..0000000
Binary files a/example/application/quickstart_scimpi_nosql/viewer-scimpi/src/main/jettyconsole/isis-banner.pdn and /dev/null differ
http://git-wip-us.apache.org/repos/asf/isis/blob/8f59c0da/example/application/quickstart_scimpi_nosql/viewer-scimpi/src/main/resources/images/Default.png
----------------------------------------------------------------------
diff --git a/example/application/quickstart_scimpi_nosql/viewer-scimpi/src/main/resources/images/Default.png b/example/application/quickstart_scimpi_nosql/viewer-scimpi/src/main/resources/images/Default.png
deleted file mode 100644
index 8409e46..0000000
Binary files a/example/application/quickstart_scimpi_nosql/viewer-scimpi/src/main/resources/images/Default.png and /dev/null differ
http://git-wip-us.apache.org/repos/asf/isis/blob/8f59c0da/example/application/quickstart_scimpi_nosql/viewer-scimpi/src/main/webapp/ToDoItem/edit.shtml
----------------------------------------------------------------------
diff --git a/example/application/quickstart_scimpi_nosql/viewer-scimpi/src/main/webapp/ToDoItem/edit.shtml b/example/application/quickstart_scimpi_nosql/viewer-scimpi/src/main/webapp/ToDoItem/edit.shtml
deleted file mode 100644
index e53f214..0000000
--- a/example/application/quickstart_scimpi_nosql/viewer-scimpi/src/main/webapp/ToDoItem/edit.shtml
+++ /dev/null
@@ -1,27 +0,0 @@
-<?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>
-
-
http://git-wip-us.apache.org/repos/asf/isis/blob/8f59c0da/example/application/quickstart_scimpi_nosql/viewer-scimpi/src/main/webapp/ToDoItem/object.shtml
----------------------------------------------------------------------
diff --git a/example/application/quickstart_scimpi_nosql/viewer-scimpi/src/main/webapp/ToDoItem/object.shtml b/example/application/quickstart_scimpi_nosql/viewer-scimpi/src/main/webapp/ToDoItem/object.shtml
deleted file mode 100644
index 14a1c97..0000000
--- a/example/application/quickstart_scimpi_nosql/viewer-scimpi/src/main/webapp/ToDoItem/object.shtml
+++ /dev/null
@@ -1,32 +0,0 @@
-<?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>
http://git-wip-us.apache.org/repos/asf/isis/blob/8f59c0da/example/application/quickstart_scimpi_nosql/viewer-scimpi/src/main/webapp/WEB-INF/authentication_file.passwords
----------------------------------------------------------------------
diff --git a/example/application/quickstart_scimpi_nosql/viewer-scimpi/src/main/webapp/WEB-INF/authentication_file.passwords b/example/application/quickstart_scimpi_nosql/viewer-scimpi/src/main/webapp/WEB-INF/authentication_file.passwords
index 97b228e..119f385 100644
--- a/example/application/quickstart_scimpi_nosql/viewer-scimpi/src/main/webapp/WEB-INF/authentication_file.passwords
+++ b/example/application/quickstart_scimpi_nosql/viewer-scimpi/src/main/webapp/WEB-INF/authentication_file.passwords
@@ -18,7 +18,6 @@
#
# configuration file for the file-based authentication
-# not used by the onlinedemo
#
# list of users, and their password, and optionally roles
@@ -26,3 +25,5 @@ sven:pass:role1|role2|role3
dick:pass
bob:pass
joe:pass
+
+webapp:pass
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/isis/blob/8f59c0da/example/application/quickstart_scimpi_nosql/viewer-scimpi/src/main/webapp/WEB-INF/authentication_file.properties
----------------------------------------------------------------------
diff --git a/example/application/quickstart_scimpi_nosql/viewer-scimpi/src/main/webapp/WEB-INF/authentication_file.properties b/example/application/quickstart_scimpi_nosql/viewer-scimpi/src/main/webapp/WEB-INF/authentication_file.properties
deleted file mode 100644
index 62b9dae..0000000
--- a/example/application/quickstart_scimpi_nosql/viewer-scimpi/src/main/webapp/WEB-INF/authentication_file.properties
+++ /dev/null
@@ -1,25 +0,0 @@
-# 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)
-#
http://git-wip-us.apache.org/repos/asf/isis/blob/8f59c0da/example/application/quickstart_scimpi_nosql/viewer-scimpi/src/main/webapp/WEB-INF/authorization_file.allow
----------------------------------------------------------------------
diff --git a/example/application/quickstart_scimpi_nosql/viewer-scimpi/src/main/webapp/WEB-INF/authorization_file.allow b/example/application/quickstart_scimpi_nosql/viewer-scimpi/src/main/webapp/WEB-INF/authorization_file.allow
deleted file mode 100644
index 4407ec2..0000000
--- a/example/application/quickstart_scimpi_nosql/viewer-scimpi/src/main/webapp/WEB-INF/authorization_file.allow
+++ /dev/null
@@ -1,28 +0,0 @@
-# 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
-#
-
-
-#
-# (intentionally empty)
-#
-
-
http://git-wip-us.apache.org/repos/asf/isis/blob/8f59c0da/example/application/quickstart_scimpi_nosql/viewer-scimpi/src/main/webapp/WEB-INF/authorization_file.properties
----------------------------------------------------------------------
diff --git a/example/application/quickstart_scimpi_nosql/viewer-scimpi/src/main/webapp/WEB-INF/authorization_file.properties b/example/application/quickstart_scimpi_nosql/viewer-scimpi/src/main/webapp/WEB-INF/authorization_file.properties
deleted file mode 100644
index f44bb6c..0000000
--- a/example/application/quickstart_scimpi_nosql/viewer-scimpi/src/main/webapp/WEB-INF/authorization_file.properties
+++ /dev/null
@@ -1,47 +0,0 @@
-# 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
-
http://git-wip-us.apache.org/repos/asf/isis/blob/8f59c0da/example/application/quickstart_scimpi_nosql/viewer-scimpi/src/main/webapp/WEB-INF/config.xml
----------------------------------------------------------------------
diff --git a/example/application/quickstart_scimpi_nosql/viewer-scimpi/src/main/webapp/WEB-INF/config.xml b/example/application/quickstart_scimpi_nosql/viewer-scimpi/src/main/webapp/WEB-INF/config.xml
new file mode 100644
index 0000000..ac6517d
--- /dev/null
+++ b/example/application/quickstart_scimpi_nosql/viewer-scimpi/src/main/webapp/WEB-INF/config.xml
@@ -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.
+-->
+<config>
+ <actions>
+ </actions>
+
+ <processors>
+ </processors>
+</config>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/isis/blob/8f59c0da/example/application/quickstart_scimpi_nosql/viewer-scimpi/src/main/webapp/WEB-INF/isis.properties
----------------------------------------------------------------------
diff --git a/example/application/quickstart_scimpi_nosql/viewer-scimpi/src/main/webapp/WEB-INF/isis.properties b/example/application/quickstart_scimpi_nosql/viewer-scimpi/src/main/webapp/WEB-INF/isis.properties
index 4717a3f..5756a85 100644
--- a/example/application/quickstart_scimpi_nosql/viewer-scimpi/src/main/webapp/WEB-INF/isis.properties
+++ b/example/application/quickstart_scimpi_nosql/viewer-scimpi/src/main/webapp/WEB-INF/isis.properties
@@ -16,167 +16,15 @@
# under the License.
-#################################################################################
-#
-# 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 the persistor (object store) to use
-#
-# * in-memory requires no additional configuration, but stores object in-memory.
-# Only suitable for prototyping
-# * datanucleus uses JDO DataNucleus to persist objects to relational database.
-# for objectstore-specific properties, see persistor_datanucleus.properties
-# * fileserver uses a simple FileServer to persist objects as JSON documents. It requires the fileserver component to be running
-# for objectstore-specific properties, see persistor_fileserver.properties
-# * mongodb uses MongoDB to be persist objects as JSON documents. It requires MongoDB to be installed and running
-# for objectstore-specific properties, see persistor_fileserver.properties
-# * sql uses an RDBMS to persist objects as table rows.
-# for objectstore-specific properties, see persistor_sql.properties
-# * xml uses the XML ObjectStore to be persist objects to a set of XML files. Only suitable for prototyping.
-# for objectstore-specific properties, see persistor_xml.properties
-#
-# NOTE:
-# * if using non-naive implementations of services, edit isis.services (below) and
-# * if necessary, update the pom.xml to reference appropriate objstore-xxx module
-# * for sql and datanucleus objectstores, update the pom.xml to reference appropriate JDBC driver
-#
-
isis.persistor=in-memory
-#isis.persistor=fileserver
#isis.persistor=mongodb
+#isis.persistor=fileserver
-
-#
-# configure authentication mechanism to use (to logon to the system)
-# note:
-# - authentication is disabled if running in exploration mode
-# - the Scimpi viewer allows access to anonymous users
-#
-
-# default is file in SERVER mode, none in SERVER_EXPLORATION. Configure in web.xml
-#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
-#
-# configuring this component automatically refines the metamodel (installing a facet factory
-# which vetoes access as required)
-#
-
-# default is file in SERVER mode, none in SERVER_EXPLORATION. Configure in web.xml
-#isis.authorization=file
-
-
-
-#
-# 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
-
-
-
-
-#################################################################################
-#
-# MetaModel
-#
-# The metamodel typically does not require additional configuration, although
-# the system components (defined above) may refine the metamodel for their needs.
-#
-#################################################################################
-
-
-#
-# additional programming model facets
-#
-
-#isis.reflector.facets.include=
-#isis.reflector.facets.exclude=
-
-# normally these facets would be installed by virtue of configuring the JDO object store
-# need to be configured manually if running some other object store only because the
-# JDO enhancer is still configured to run on the DOM project.
-isis.reflector.facets.include=\
- org.apache.isis.core.progmodel.facets.object.ignore.jdo.RemoveJdoEnhancementTypesFacetFactory,\
- org.apache.isis.core.progmodel.facets.object.ignore.jdo.RemoveJdoPrefixedMethodsFacetFactory
-
-#
-# metamodel validator
-#
-
-#isis.reflector.validator=
-
-
-
-#################################################################################
-#
-# Application 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.
-#
-# The implementations depend on the configured (see isis.persistor above)
-#
-
-
-# if using the in-memory, XML, SQL, fileserver or mongo object stores:
isis.services.prefix = dom
-isis.services = todo.ToDoItems
-
-
-# if using the DataNucleus object store
-# (with support for JDO's audit service, and installing fixtures using a domain service)
-#isis.services.prefix =
-#isis.services = objstore.jdo.todo.ToDoItemsJdo,\
-# fixture.todo.ToDoItemsFixturesService,\
-# dom.audit.AuditServiceDemo
-
+isis.services = Repository
-
-
-
-#
-# 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= todo.ToDoItemsFixture
+isis.fixtures= InitialFixture
+
+isis.scimpi.debug.mode=on
http://git-wip-us.apache.org/repos/asf/isis/blob/8f59c0da/example/application/quickstart_scimpi_nosql/viewer-scimpi/src/main/webapp/WEB-INF/logging.properties
----------------------------------------------------------------------
diff --git a/example/application/quickstart_scimpi_nosql/viewer-scimpi/src/main/webapp/WEB-INF/logging.properties b/example/application/quickstart_scimpi_nosql/viewer-scimpi/src/main/webapp/WEB-INF/logging.properties
index 50b23d7..48d4fa8 100644
--- a/example/application/quickstart_scimpi_nosql/viewer-scimpi/src/main/webapp/WEB-INF/logging.properties
+++ b/example/application/quickstart_scimpi_nosql/viewer-scimpi/src/main/webapp/WEB-INF/logging.properties
@@ -19,7 +19,7 @@
#
# Isis uses log4j is used to provide system logging
#
-log4j.rootCategory=INFO, Console
+log4j.rootCategory=INFO, Console, File
# The console appender
log4j.appender.Console=org.apache.log4j.ConsoleAppender
@@ -32,58 +32,3 @@ log4j.appender.File.file=isis.log
log4j.appender.File.append=false
log4j.appender.File.layout=org.apache.log4j.PatternLayout
log4j.appender.File.layout.ConversionPattern=%d [%-20c{1} %-10t %-5p] %m%n
-
-
-
-
-
-! turn on the internal log4j debugging flag so we can see what it is doing
-#log4j.debug=true
-
-
-log4j.logger.jdbc.sqlonly=DEBUG, sql, Console
-log4j.additivity.jdbc.sqlonly=false
-
-log4j.logger.jdbc.resultsettable=DEBUG, jdbc, Console
-log4j.additivity.jdbc.resultsettable=false
-
-
-
-log4j.logger.jdbc.audit=DEBUG,jdbc, Console
-log4j.additivity.jdbc.audit=false
-
-log4j.logger.jdbc.resultset=DEBUG,jdbc
-log4j.additivity.jdbc.resultset=false
-
-log4j.logger.jdbc.sqltiming=WARNING,sqltiming
-log4j.additivity.jdbc.sqltiming=false
-
-log4j.logger.jdbc.connection=FATAL,connection
-log4j.additivity.jdbc.connection=false
-
-
-
-log4j.appender.sql=org.apache.log4j.FileAppender
-log4j.appender.sql.File=./logs/sql.log
-log4j.appender.sql.Append=false
-log4j.appender.sql.layout=org.apache.log4j.PatternLayout
-log4j.appender.sql.layout.ConversionPattern=-----> %d{yyyy-MM-dd HH:mm:ss.SSS} %m%n%n
-
-log4j.appender.sqltiming=org.apache.log4j.FileAppender
-log4j.appender.sqltiming.File=./logs/sqltiming.log
-log4j.appender.sqltiming.Append=false
-log4j.appender.sqltiming.layout=org.apache.log4j.PatternLayout
-log4j.appender.sqltiming.layout.ConversionPattern=-----> %d{yyyy-MM-dd HH:mm:ss.SSS} %m%n%n
-
-log4j.appender.jdbc=org.apache.log4j.FileAppender
-log4j.appender.jdbc.File=./logs/jdbc.log
-log4j.appender.jdbc.Append=false
-log4j.appender.jdbc.layout=org.apache.log4j.PatternLayout
-log4j.appender.jdbc.layout.ConversionPattern=%d{yyyy-MM-dd HH:mm:ss.SSS} %m%n
-
-log4j.appender.connection=org.apache.log4j.FileAppender
-log4j.appender.connection.File=./logs/connection.log
-log4j.appender.connection.Append=false
-log4j.appender.connection.layout=org.apache.log4j.PatternLayout
-log4j.appender.connection.layout.ConversionPattern=%d{yyyy-MM-dd HH:mm:ss.SSS} %m%n
-
http://git-wip-us.apache.org/repos/asf/isis/blob/8f59c0da/example/application/quickstart_scimpi_nosql/viewer-scimpi/src/main/webapp/WEB-INF/persistor_fileserver.properties
----------------------------------------------------------------------
diff --git a/example/application/quickstart_scimpi_nosql/viewer-scimpi/src/main/webapp/WEB-INF/persistor_fileserver.properties b/example/application/quickstart_scimpi_nosql/viewer-scimpi/src/main/webapp/WEB-INF/persistor_fileserver.properties
deleted file mode 100644
index 8464b95..0000000
--- a/example/application/quickstart_scimpi_nosql/viewer-scimpi/src/main/webapp/WEB-INF/persistor_fileserver.properties
+++ /dev/null
@@ -1,25 +0,0 @@
-# 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 FileServer objectstore
-#
-
-
-#
-# (intentionally empty)
-#
http://git-wip-us.apache.org/repos/asf/isis/blob/8f59c0da/example/application/quickstart_scimpi_nosql/viewer-scimpi/src/main/webapp/WEB-INF/persistor_in-memory.properties
----------------------------------------------------------------------
diff --git a/example/application/quickstart_scimpi_nosql/viewer-scimpi/src/main/webapp/WEB-INF/persistor_in-memory.properties b/example/application/quickstart_scimpi_nosql/viewer-scimpi/src/main/webapp/WEB-INF/persistor_in-memory.properties
deleted file mode 100644
index f35b5bc..0000000
--- a/example/application/quickstart_scimpi_nosql/viewer-scimpi/src/main/webapp/WEB-INF/persistor_in-memory.properties
+++ /dev/null
@@ -1,25 +0,0 @@
-# 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)
-#
http://git-wip-us.apache.org/repos/asf/isis/blob/8f59c0da/example/application/quickstart_scimpi_nosql/viewer-scimpi/src/main/webapp/WEB-INF/persistor_mongodb.properties
----------------------------------------------------------------------
diff --git a/example/application/quickstart_scimpi_nosql/viewer-scimpi/src/main/webapp/WEB-INF/persistor_mongodb.properties b/example/application/quickstart_scimpi_nosql/viewer-scimpi/src/main/webapp/WEB-INF/persistor_mongodb.properties
deleted file mode 100644
index 79a6e53..0000000
--- a/example/application/quickstart_scimpi_nosql/viewer-scimpi/src/main/webapp/WEB-INF/persistor_mongodb.properties
+++ /dev/null
@@ -1,47 +0,0 @@
-# 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
-
-
http://git-wip-us.apache.org/repos/asf/isis/blob/8f59c0da/example/application/quickstart_scimpi_nosql/viewer-scimpi/src/main/webapp/WEB-INF/viewer_scimpi.properties
----------------------------------------------------------------------
diff --git a/example/application/quickstart_scimpi_nosql/viewer-scimpi/src/main/webapp/WEB-INF/viewer_scimpi.properties b/example/application/quickstart_scimpi_nosql/viewer-scimpi/src/main/webapp/WEB-INF/viewer_scimpi.properties
deleted file mode 100644
index 5e621a3..0000000
--- a/example/application/quickstart_scimpi_nosql/viewer-scimpi/src/main/webapp/WEB-INF/viewer_scimpi.properties
+++ /dev/null
@@ -1,25 +0,0 @@
-# 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)
-#
http://git-wip-us.apache.org/repos/asf/isis/blob/8f59c0da/example/application/quickstart_scimpi_nosql/viewer-scimpi/src/main/webapp/WEB-INF/web.xml
----------------------------------------------------------------------
diff --git a/example/application/quickstart_scimpi_nosql/viewer-scimpi/src/main/webapp/WEB-INF/web.xml b/example/application/quickstart_scimpi_nosql/viewer-scimpi/src/main/webapp/WEB-INF/web.xml
index d37ddcb..ca116b7 100644
--- a/example/application/quickstart_scimpi_nosql/viewer-scimpi/src/main/webapp/WEB-INF/web.xml
+++ b/example/application/quickstart_scimpi_nosql/viewer-scimpi/src/main/webapp/WEB-INF/web.xml
@@ -25,33 +25,37 @@
<welcome-file-list>
- <welcome-file>index.html</welcome-file>
+ <welcome-file>index.shtml</welcome-file>
</welcome-file-list>
+ <error-page>
+ <error-code>403</error-code>
+ <location>/error/security_403.shtml</location>
+ </error-page>
+
+ <error-page>
+ <error-code>500</error-code>
+ <location>/error/server_500.shtml</location>
+ </error-page>
+
+ <error-page>
+ <error-code>404</error-code>
+ <location>/error/notfound_404.shtml</location>
+ </error-page>
+
<context-param>
<param-name>deploymentType</param-name>
- <!--
- <param-value>SERVER</param-value>
- -->
+ <!-- change value to SERVER when deploying outside of development -->
<param-value>SERVER_EXPLORATION</param-value>
</context-param>
-
- <!--
- -
- -
- - config common to all viewer(s)
- -
- -
- -->
-
<!-- bootstrap the Isis metamodel and runtime -->
<listener>
<listener-class>org.apache.isis.core.webapp.IsisWebAppBootstrapper</listener-class>
</listener>
- <!-- which (optional) configuration file(s) to load -->
+ <!-- optional configuration file(s) to load -->
<context-param>
<param-name>isis.viewers</param-name>
<param-value>scimpi</param-value>
@@ -147,15 +151,29 @@
<!--
- -
- -
- - config specific to the scimpi-viewer
- -
- -
+ - scimpi-viewer config
-->
<servlet>
<servlet-name>ScimpiDispatcher</servlet-name>
<servlet-class>org.apache.isis.viewer.scimpi.servlet.DispatcherServlet</servlet-class>
+ <!--
+ The username and password parameters set up the webapp so that the user does not need to log in.
+ This section should be removed if the webapp need the user to login before doing
+ things with the application.
+ -->
+ <init-param>
+ <param-name>username</param-name>
+ <param-value>webapp</param-value>
+ </init-param>
+ <init-param>
+ <param-name>password</param-name>
+ <param-value>pass</param-value>
+ </init-param>
+ <init-param>
+ <param-name>config</param-name>
+ <param-value>config.xml</param-value>
+ </init-param>
+
<init-param>
<param-name>view</param-name>
<param-value>login.shtml</param-value>
http://git-wip-us.apache.org/repos/asf/isis/blob/8f59c0da/example/application/quickstart_scimpi_nosql/viewer-scimpi/src/main/webapp/debug.shtml
----------------------------------------------------------------------
diff --git a/example/application/quickstart_scimpi_nosql/viewer-scimpi/src/main/webapp/debug.shtml b/example/application/quickstart_scimpi_nosql/viewer-scimpi/src/main/webapp/debug.shtml
deleted file mode 100644
index 844557c..0000000
--- a/example/application/quickstart_scimpi_nosql/viewer-scimpi/src/main/webapp/debug.shtml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?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/>
-
http://git-wip-us.apache.org/repos/asf/isis/blob/8f59c0da/example/application/quickstart_scimpi_nosql/viewer-scimpi/src/main/webapp/debug/action.shtml
----------------------------------------------------------------------
diff --git a/example/application/quickstart_scimpi_nosql/viewer-scimpi/src/main/webapp/debug/action.shtml b/example/application/quickstart_scimpi_nosql/viewer-scimpi/src/main/webapp/debug/action.shtml
new file mode 100644
index 0000000..cd5e991
--- /dev/null
+++ b/example/application/quickstart_scimpi_nosql/viewer-scimpi/src/main/webapp/debug/action.shtml
@@ -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>Action <swf:action-name method="${_method}"/></swf:page-title>
+<swf:template file="./debug-template.shtml" />
+
+<h2>${title}</h2>
+<swf:action-form method="${_method}" view="object.shtml" ${_cancel-to:optional}/>
+
+
+
http://git-wip-us.apache.org/repos/asf/isis/blob/8f59c0da/example/application/quickstart_scimpi_nosql/viewer-scimpi/src/main/webapp/debug/application.shtml
----------------------------------------------------------------------
diff --git a/example/application/quickstart_scimpi_nosql/viewer-scimpi/src/main/webapp/debug/application.shtml b/example/application/quickstart_scimpi_nosql/viewer-scimpi/src/main/webapp/debug/application.shtml
new file mode 100644
index 0000000..7e9a5ac
--- /dev/null
+++ b/example/application/quickstart_scimpi_nosql/viewer-scimpi/src/main/webapp/debug/application.shtml
@@ -0,0 +1,31 @@
+<?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>Debug</swf:page-title>
+<swf:variable name="isDebugTab">yes</swf:variable>
+<swf:template file="./debug-template.shtml" />
+
+<swf:debug-access-check />
+
+<div class="debug">
+ <h1>Application</h1>
+
+ <p>[Use this page to show application specific information]</p>
+
+</div>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/isis/blob/8f59c0da/example/application/quickstart_scimpi_nosql/viewer-scimpi/src/main/webapp/debug/debug-page.css
----------------------------------------------------------------------
diff --git a/example/application/quickstart_scimpi_nosql/viewer-scimpi/src/main/webapp/debug/debug-page.css b/example/application/quickstart_scimpi_nosql/viewer-scimpi/src/main/webapp/debug/debug-page.css
new file mode 100644
index 0000000..9d2524a
--- /dev/null
+++ b/example/application/quickstart_scimpi_nosql/viewer-scimpi/src/main/webapp/debug/debug-page.css
@@ -0,0 +1,158 @@
+/*
+ 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.
+*/
+body {
+ margin: 0 0 10px;
+ min-width: 550px;
+ line-height: 1.4em;
+
+ font-size: 10pt;
+ font-family: "Lucida Grande", Helvetica, Arial, Verdana, Sans-Serif;
+ background-color: white;
+ background-image: url("images/background.png");
+ color: #000000;
+}
+
+#banner {
+ background-color: maroon;
+ color: white;
+ padding: 1em;
+
+ font-size: 160%
+}
+
+#content {
+ padding: 1em;
+}
+
+#menu {
+ margin-bottom: 1em;
+}
+
+h1 {
+ padding-bottom: 0.4em;
+ margin-top: 1em;
+ margin-bottom: 1em;
+
+ font-size: 160%;
+ border-bottom: 6px solid gray;
+}
+h2 {
+ xxmargin-top: 1em;
+ xxmargin-bottom: 1em;
+ xxxpadding: 16px 0 4px 10px;
+ font-size: 130%;
+ xxxbackground-color: #5755D9;
+ font-weight: bold;
+ xxxcolor: white;
+}
+h3 {
+ font-size: 140%;
+ border-top: 1px solid gray;
+ padding-top: 12px;
+ margin-bottom: 2em;
+}
+.debug table {
+ margin-bottom: 2em;
+}
+th.subtitle Context{
+ font-size: 110%;
+ font-weight: bold;
+ background-color: #9795ff;
+ color: white;
+ padding: 16px 0 6px 4px
+}
+th.subtitle em {
+ font-weight: normal;
+}
+tdiv.title {
+ font-size: 140%;
+ padding-bottom: 1em;
+}
+div.debug .generic {
+ margin-left: 14em;
+}
+div.debug div.field {
+ border-top: 1px dotted gray;
+}
+div.debug span.value {
+ display: inline-block;
+ padding-top:0.5em;
+}
+small {
+ font-size: 60%;
+}
+.debug .form {
+ padding-top: 2em;
+}
+.debug .form .title {
+ padding-bottom: 1em;
+}
+.debug span.field {
+ display: inline-block;
+ width: 80%;
+}
+img.small-icon {
+ color:#FFBEFA;
+ font-size:50%;
+ height:1em;
+ letter-spacing:-1px;
+ padding-right:3px;
+}
+.action {
+ padding-bottom: 1em;
+}
+div.debug.object {
+ background-color: #f8f8f8;
+ padding: 10px 0;
+ border: 1px dotted #ccc;
+ border-radius: 10px;
+}
+div.debug.object > * {
+ padding: 0 20px;
+}
+div.debug.object h2 {
+ margin-bottom: 1em;
+}
+div.debug.object div.actions {
+ border-top: 1px dotted #ccc;
+ padding-top: 1em;
+ margin-top: 2em;
+}
+form.action {
+ padding: 0;
+}
+.action {
+ padding-bottom: 1em;
+}
+.field > .required {
+ border: 1px solid red;
+}
+
+.field > .required {
+ border: 1px solid red;
+}
+
+.error {
+ color:red;
+ font-size: 80%;
+}
+a.help-link {
+ display: none;
+}
+
http://git-wip-us.apache.org/repos/asf/isis/blob/8f59c0da/example/application/quickstart_scimpi_nosql/viewer-scimpi/src/main/webapp/debug/debug-template.shtml
----------------------------------------------------------------------
diff --git a/example/application/quickstart_scimpi_nosql/viewer-scimpi/src/main/webapp/debug/debug-template.shtml b/example/application/quickstart_scimpi_nosql/viewer-scimpi/src/main/webapp/debug/debug-template.shtml
new file mode 100644
index 0000000..4be6d84
--- /dev/null
+++ b/example/application/quickstart_scimpi_nosql/viewer-scimpi/src/main/webapp/debug/debug-template.shtml
@@ -0,0 +1,55 @@
+<?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.
+-->
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
+<head>
+ <title>${title}</title>
+ <link rel="stylesheet" title="Default" href="${_context}/style/reset.css" type="text/css" media="all" />
+ <link rel="stylesheet" title="Default" href="${_context}/debug/debug-page.css" type="text/css" media="all" />
+ <link rel="stylesheet" title="Default" href="${_context}/style/debug.css" type="text/css" media="all" />
+</head>
+
+<body>
+ <swf:debug-access-check />
+ <div id="banner">Scimpi - Debugger</div>
+ <div id="content" class="debug">
+ <div id="menu">
+ <a href="/debug/application.shtml">Application</a>
+ | <a href="/debug/debug.shtml?type=system">System</a>
+ | <a href="/debug/debug.shtml?type=session">Session</a>
+ | <a href="/debug/debug.shtml?type=specifications">Specifications</a>
+ | <a href="/debug/debug.shtml?type=dispatcher">Dispatcher</a>
+ | <a href="/debug/debug.shtml?type=context">Context</a>
+ | <a href="/debug/debug.shtml?type=variables">Variables</a>
+ | <a href="/debug/services.shtml">Services</a>
+
+ | <a href="debug.app?action=list-i18n" target="new">I18N File</a>
+ | <a href="debug.app?action=list-authorization" target="new">Authorization File</a>
+ | <a href="/debug/debug-users.shtml">Debug Users</a>
+ | <swf:when variable-true="debug"><a href="/debug.app?mode=no-debug">Hide Debug</a></swf:when>
+ <swf:unless variable-true="debug"><a href="/debug.app?mode=debug">Show Debug</a></swf:unless>
+ </div>
+
+ <div class="details">
+ <swf:content />
+ </div>
+ </div>
+</body>
+</html>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/isis/blob/8f59c0da/example/application/quickstart_scimpi_nosql/viewer-scimpi/src/main/webapp/debug/debug-users.shtml
----------------------------------------------------------------------
diff --git a/example/application/quickstart_scimpi_nosql/viewer-scimpi/src/main/webapp/debug/debug-users.shtml b/example/application/quickstart_scimpi_nosql/viewer-scimpi/src/main/webapp/debug/debug-users.shtml
new file mode 100644
index 0000000..b3e358a
--- /dev/null
+++ b/example/application/quickstart_scimpi_nosql/viewer-scimpi/src/main/webapp/debug/debug-users.shtml
@@ -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>Debug Users</swf:page-title>
+<swf:template file="./debug-template.shtml" />
+
+<h1>Debug Users</h1>
+<div class="xdebug">
+ <swf:debug-users />
+</div>