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 2017/08/03 15:44:27 UTC

[2/9] isis git commit: isis-1686: further extensions to AppManifestAbstract, and updates to the properties in the two archetypes

isis-1686: further extensions to AppManifestAbstract, and updates to the properties in the two archetypes


Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/eae978ed
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/eae978ed
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/eae978ed

Branch: refs/heads/master
Commit: eae978ed413dbd5d4505348c0975c414d69860d3
Parents: a8ee04b
Author: Dan Haywood <da...@haywood-associates.co.uk>
Authored: Thu Aug 3 14:30:14 2017 +0100
Committer: Dan Haywood <da...@haywood-associates.co.uk>
Committed: Thu Aug 3 14:30:14 2017 +0100

----------------------------------------------------------------------
 .../apache/isis/applib/AppManifestAbstract.java |  18 +-
 .../application/HelloWorldAppManifest.java      |   7 +-
 .../application/isis-non-changing.properties    |  55 ---
 .../domainapp/application/isis.properties       |  55 +++
 .../src/main/webapp/WEB-INF/isis.properties     |   8 +-
 .../manifest/DomainAppAppManifest.java          |   7 +-
 .../manifest/authentication_shiro.properties    |  25 +
 .../manifest/isis-non-changing.properties       | 453 -------------------
 .../application/manifest/isis.properties        | 382 ++++++++++++++++
 .../manifest/persistor_datanucleus.properties   | 106 +++++
 .../manifest/viewer_restfulobjects.properties   |  64 +++
 .../manifest/viewer_wicket.properties           | 180 ++++++++
 .../WEB-INF/authentication_shiro.properties     |  25 -
 .../src/main/webapp/WEB-INF/isis.properties     | 100 +++-
 .../main/webapp/WEB-INF/persistor.properties    | 113 -----
 .../WEB-INF/viewer_restfulobjects.properties    |  66 ---
 .../webapp/WEB-INF/viewer_wicket.properties     | 178 --------
 17 files changed, 930 insertions(+), 912 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/isis/blob/eae978ed/core/applib/src/main/java/org/apache/isis/applib/AppManifestAbstract.java
----------------------------------------------------------------------
diff --git a/core/applib/src/main/java/org/apache/isis/applib/AppManifestAbstract.java b/core/applib/src/main/java/org/apache/isis/applib/AppManifestAbstract.java
index 78df5f3..54678a6 100644
--- a/core/applib/src/main/java/org/apache/isis/applib/AppManifestAbstract.java
+++ b/core/applib/src/main/java/org/apache/isis/applib/AppManifestAbstract.java
@@ -247,17 +247,23 @@ public abstract class AppManifestAbstract implements AppManifest {
             return this;
         }
 
-        public Builder withPropertiesFile(final String propertiesFile) {
-            return withPropertiesFile(propertiesFile, getClass());
+        public Builder withConfigurationPropertiesFile(final String propertiesFile) {
+            return withConfigurationPropertiesFile(getClass(), propertiesFile);
         }
 
-        public Builder withPropertiesFile(
-                final String propertiesFile,
-                final Class<?> propertiesFileContext) {
-            propertyResources.add(new PropertyResource(propertiesFileContext, propertiesFile));
+        public Builder withConfigurationPropertiesFile(
+                final Class<?> propertiesFileContext, final String propertiesFile, final String... furtherPropertiesFiles) {
+            addPropertyResource(propertiesFileContext, propertiesFile);
+            for (final String otherFile : furtherPropertiesFiles) {
+                addPropertyResource(propertiesFileContext, otherFile);
+            }
             return this;
         }
 
+        private void addPropertyResource(final Class<?> propertiesFileContext, final String propertiesFile) {
+            propertyResources.add(new PropertyResource(propertiesFileContext, propertiesFile));
+        }
+
         public Builder withConfigurationProperty(final String key, final String value) {
             individualConfigProps.add(new ConfigurationProperty(key,value));
             return this;

http://git-wip-us.apache.org/repos/asf/isis/blob/eae978ed/example/application/helloworld/src/main/java/domainapp/application/HelloWorldAppManifest.java
----------------------------------------------------------------------
diff --git a/example/application/helloworld/src/main/java/domainapp/application/HelloWorldAppManifest.java b/example/application/helloworld/src/main/java/domainapp/application/HelloWorldAppManifest.java
index b35c7f2..e14a1b4 100644
--- a/example/application/helloworld/src/main/java/domainapp/application/HelloWorldAppManifest.java
+++ b/example/application/helloworld/src/main/java/domainapp/application/HelloWorldAppManifest.java
@@ -27,9 +27,12 @@ import domainapp.dom.HelloWorldModule;
  */
 public class HelloWorldAppManifest extends AppManifestAbstract {
 
+    public static final Builder BUILDER = Builder
+            .forModules(HelloWorldModule.class)
+            .withConfigurationPropertiesFile(HelloWorldAppManifest.class, "isis.properties");
+
     public HelloWorldAppManifest() {
-        super(Builder.forModules(HelloWorldModule.class)
-                       .withPropertiesFile("isis-non-changing.properties"));
+        super(BUILDER);
     }
 
 }

http://git-wip-us.apache.org/repos/asf/isis/blob/eae978ed/example/application/helloworld/src/main/java/domainapp/application/isis-non-changing.properties
----------------------------------------------------------------------
diff --git a/example/application/helloworld/src/main/java/domainapp/application/isis-non-changing.properties b/example/application/helloworld/src/main/java/domainapp/application/isis-non-changing.properties
deleted file mode 100644
index 036d95d..0000000
--- a/example/application/helloworld/src/main/java/domainapp/application/isis-non-changing.properties
+++ /dev/null
@@ -1,55 +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.
-
-
-
-isis.reflector.validator.allowDeprecated=false
-isis.reflector.validator.noParamsOnly=true
-isis.reflector.validator.explicitObjectType=true
-isis.reflector.validator.serviceActionsOnly=true
-isis.reflector.validator.mixinsOnly=true
-
-
-isis.reflector.facet.cssClassFa.patterns=\
-                        new.*:fa-plus,\
-                        add.*:fa-plus-square,\
-                        create.*:fa-plus,\
-                        update.*:fa-edit,\
-                        delete.*:fa-trash,\
-                        find.*:fa-search,\
-                        list.*:fa-list
-
-isis.reflector.facet.cssClass.patterns=\
-                        delete.*:btn-danger
-
-isis.objects.editing=false
-
-
-isis.viewer.wicket.maxTitleLengthInStandaloneTables=0
-isis.viewer.wicket.maxTitleLengthInParentedTables=0
-
-
-isis.persistor.datanucleus.impl.datanucleus.schema.autoCreateAll=true
-isis.persistor.datanucleus.impl.datanucleus.schema.validateTables=true
-isis.persistor.datanucleus.impl.datanucleus.schema.validateConstraints=true
-
-
-isis.persistor.datanucleus.impl.datanucleus.persistenceByReachabilityAtCommit=false
-isis.persistor.datanucleus.impl.datanucleus.identifier.case=MixedCase
-isis.persistor.datanucleus.impl.datanucleus.cache.level2.type=none
-isis.persistor.datanucleus.impl.datanucleus.cache.level2.mode=ENABLE_SELECTIVE
-

http://git-wip-us.apache.org/repos/asf/isis/blob/eae978ed/example/application/helloworld/src/main/resources/domainapp/application/isis.properties
----------------------------------------------------------------------
diff --git a/example/application/helloworld/src/main/resources/domainapp/application/isis.properties b/example/application/helloworld/src/main/resources/domainapp/application/isis.properties
new file mode 100644
index 0000000..036d95d
--- /dev/null
+++ b/example/application/helloworld/src/main/resources/domainapp/application/isis.properties
@@ -0,0 +1,55 @@
+#  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.
+
+
+
+isis.reflector.validator.allowDeprecated=false
+isis.reflector.validator.noParamsOnly=true
+isis.reflector.validator.explicitObjectType=true
+isis.reflector.validator.serviceActionsOnly=true
+isis.reflector.validator.mixinsOnly=true
+
+
+isis.reflector.facet.cssClassFa.patterns=\
+                        new.*:fa-plus,\
+                        add.*:fa-plus-square,\
+                        create.*:fa-plus,\
+                        update.*:fa-edit,\
+                        delete.*:fa-trash,\
+                        find.*:fa-search,\
+                        list.*:fa-list
+
+isis.reflector.facet.cssClass.patterns=\
+                        delete.*:btn-danger
+
+isis.objects.editing=false
+
+
+isis.viewer.wicket.maxTitleLengthInStandaloneTables=0
+isis.viewer.wicket.maxTitleLengthInParentedTables=0
+
+
+isis.persistor.datanucleus.impl.datanucleus.schema.autoCreateAll=true
+isis.persistor.datanucleus.impl.datanucleus.schema.validateTables=true
+isis.persistor.datanucleus.impl.datanucleus.schema.validateConstraints=true
+
+
+isis.persistor.datanucleus.impl.datanucleus.persistenceByReachabilityAtCommit=false
+isis.persistor.datanucleus.impl.datanucleus.identifier.case=MixedCase
+isis.persistor.datanucleus.impl.datanucleus.cache.level2.type=none
+isis.persistor.datanucleus.impl.datanucleus.cache.level2.mode=ENABLE_SELECTIVE
+

http://git-wip-us.apache.org/repos/asf/isis/blob/eae978ed/example/application/helloworld/src/main/webapp/WEB-INF/isis.properties
----------------------------------------------------------------------
diff --git a/example/application/helloworld/src/main/webapp/WEB-INF/isis.properties b/example/application/helloworld/src/main/webapp/WEB-INF/isis.properties
index b03c5c4..5a42451 100644
--- a/example/application/helloworld/src/main/webapp/WEB-INF/isis.properties
+++ b/example/application/helloworld/src/main/webapp/WEB-INF/isis.properties
@@ -27,12 +27,8 @@ isis.appManifest=domainapp.application.HelloWorldAppManifest
 
 
 
-#
-# Remaining properties are loaded programmatically by the AppManifest
-# (they are unlikely to vary between dev/test/prod so can be "baked in")
-#
-
-isis.viewer.restfulobjects.RestfulObjectsSpecEventSerializer.baseUrl=http://localhost:8080/restful/
+#isis.services.eventbus.implementation=guava
+isis.services.eventbus.implementation=axon
 
 
 

http://git-wip-us.apache.org/repos/asf/isis/blob/eae978ed/example/application/simpleapp/application/src/main/java/domainapp/application/manifest/DomainAppAppManifest.java
----------------------------------------------------------------------
diff --git a/example/application/simpleapp/application/src/main/java/domainapp/application/manifest/DomainAppAppManifest.java b/example/application/simpleapp/application/src/main/java/domainapp/application/manifest/DomainAppAppManifest.java
index d0aedff..f10dfdd 100644
--- a/example/application/simpleapp/application/src/main/java/domainapp/application/manifest/DomainAppAppManifest.java
+++ b/example/application/simpleapp/application/src/main/java/domainapp/application/manifest/DomainAppAppManifest.java
@@ -34,7 +34,12 @@ public class DomainAppAppManifest extends AppManifestAbstract {
                     DomainAppApplicationModuleFixtureSubmodule.class,
                     DomainAppApplicationModuleServicesSubmodule.class
             )
-            .withPropertiesFile("isis-non-changing.properties", DomainAppAppManifest.class);
+            .withConfigurationPropertiesFile(DomainAppAppManifest.class,
+                    "isis.properties",
+                    "authentication_shiro.properties",
+                    "persistor_datanucleus.properties",
+                    "viewer_restfulobjects.properties", "viewer_wicket.properties"
+            );
 
     public DomainAppAppManifest() {
         super(BUILDER);

http://git-wip-us.apache.org/repos/asf/isis/blob/eae978ed/example/application/simpleapp/application/src/main/resources/domainapp/application/manifest/authentication_shiro.properties
----------------------------------------------------------------------
diff --git a/example/application/simpleapp/application/src/main/resources/domainapp/application/manifest/authentication_shiro.properties b/example/application/simpleapp/application/src/main/resources/domainapp/application/manifest/authentication_shiro.properties
new file mode 100644
index 0000000..552e840
--- /dev/null
+++ b/example/application/simpleapp/application/src/main/resources/domainapp/application/manifest/authentication_shiro.properties
@@ -0,0 +1,25 @@
+#  Licensed to the Apache Software Foundation (ASF) under one
+#  or more contributor license agreements.  See the NOTICE file
+#  distributed with this work for additional information
+#  regarding copyright ownership.  The ASF licenses this file
+#  to you under the Apache License, Version 2.0 (the
+#  "License"); you may not use this file except in compliance
+#  with the License.  You may obtain a copy of the License at
+#  
+#         http://www.apache.org/licenses/LICENSE-2.0
+#         
+#  Unless required by applicable law or agreed to in writing,
+#  software distributed under the License is distributed on an
+#  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+#  KIND, either express or implied.  See the License for the
+#  specific language governing permissions and limitations
+#  under the License.
+
+
+
+#
+# if the shiro Subject is still authenticated, then just reuse.
+# Prior to 1.13.0, we forced an auto-logout, so set to 'true' to reinstate this behaviour.
+# See this thread for further info: http://markmail.org/message/hsjljwgkhhrzxbrm
+#
+#isis.authentication.shiro.autoLogoutIfAlreadyAuthenticated=false

http://git-wip-us.apache.org/repos/asf/isis/blob/eae978ed/example/application/simpleapp/application/src/main/resources/domainapp/application/manifest/isis-non-changing.properties
----------------------------------------------------------------------
diff --git a/example/application/simpleapp/application/src/main/resources/domainapp/application/manifest/isis-non-changing.properties b/example/application/simpleapp/application/src/main/resources/domainapp/application/manifest/isis-non-changing.properties
deleted file mode 100644
index f7d4034..0000000
--- a/example/application/simpleapp/application/src/main/resources/domainapp/application/manifest/isis-non-changing.properties
+++ /dev/null
@@ -1,453 +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.
-
-
-
-#################################################################################
-#
-# 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 facet factories, or remove standard facet factories.
-# Comma separated list of fully qualified class names.
-#
-#isis.reflector.facets.include=
-#isis.reflector.facets.exclude=
-
-
-#
-# Metamodel validation (in addition to that automatically performed by the programming model facet factories)
-# Default implementation does nothing.
-#
-# Use a custom implementation to enforce additional constraints specific to your app/project/company.
-#
-#isis.reflector.validator=org.apache.isis.core.metamodel.metamodelvalidator.dflt.MetaModelValidatorDefault
-
-
-
-#
-# Whether to allow deprecated annotations/method prefixes (otherwise raise metamodel validation errors).
-# If not specified, default is to allow.
-#
-isis.reflector.validator.allowDeprecated=false
-
-
-#
-# Whether to check that JAXB view models are not abstract.  If not specified, default is to validate.
-#
-#isis.reflector.validator.jaxbViewModelNotAbstract=true
-
-#
-# Whether to check that JAXB view models are not inner classes.  If not specified, default is to validate.
-#
-#isis.reflector.validator.jaxbViewModelNotInnerClass=true
-
-#
-# Whether to check that JAXB view models have no-arg constructors.  If not specified, default is NOT to validate.
-#
-#isis.reflector.validator.jaxbViewModelNoArgConstructor=false
-
-#
-# Whether to check that, for JAXB view model with properties referencing persistent entities, that those entities
-# are annotated with @XmlJavaTypeAdapter.  If not specified, default is to validate.
-#
-#isis.reflector.validator.jaxbViewModelReferenceTypeAdapter=true
-
-#
-# Whether to check that, for JAXB view model with date/time properties, that those properties are annotated with
-# @XmlJavaTypeAdapter.  If not specified, default is to validate.
-#
-#isis.reflector.validator.jaxbViewModelDateTimeTypeAdapter=true
-
-
-#
-# Whether to validate JDOQL clauses.  If not specified, default is to validate.
-#
-#isis.reflector.validator.jdoqlFromClause=true
-#isis.reflector.validator.jdoqlVariablesClause=true
-
-
-#
-# Whether to only allow hideXxx() and disableXxx() methods with no params.
-# If not specified, defaults to false (ie will also search for methods with parameter types matching the action).
-#
-isis.reflector.validator.noParamsOnly=true
-
-
-#
-# Whether to require the object type to be specified explicitly for entities.
-# If not specified, defaults to false
-#
-isis.reflector.validator.explicitObjectType=true
-
-
-#
-# Whether to ignore or honour (at least some of the) deprecated annotations/method prefixes.
-# If not specified, default is to honour
-#
-#isis.reflector.facets.ignoreDeprecated=false
-
-
-#
-# Whether to enforce the rule that domain services can only declare actions, not properties and collections.
-# If not specified, defaults to false
-#
-isis.reflector.validator.serviceActionsOnly=true
-
-
-#
-# Whether to use only mixins, and no contributed services.
-# If not specified, defaults to false
-#
-isis.reflector.validator.mixinsOnly=true
-
-
-#
-# Implementation to use for reading dynamic layout.
-# Default implementation reads Xxx.layout.json files from classpath.
-#
-#isis.reflector.layoutMetadataReaders=org.apache.isis.core.metamodel.layoutmetadata.json.LayoutMetadataReaderFromJson
-
-
-#
-# patterns for applying CssClassFa facet (font-awesome icons), matching on action names
-#
-isis.reflector.facet.cssClassFa.patterns=\
-                        new.*:fa-plus,\
-                        add.*:fa-plus-square,\
-                        create.*:fa-plus,\
-                        update.*:fa-edit,\
-                        delete.*:fa-trash,\
-                        save.*:fa-floppy-o,\
-                        change.*:fa-edit,\
-                        edit.*:fa-pencil-square-o,\
-                        maintain.*:fa-edit,\
-                        remove.*:fa-minus-square,\
-                        copy.*:fa-copy,\
-                        move.*:fa-exchange,\
-                        first.*:fa-star,\
-                        find.*:fa-search,\
-                        lookup.*:fa-search,\
-                        search.*:fa-search,\
-                        view.*:fa-search,\
-                        clear.*:fa-remove,\
-                        previous.*:fa-step-backward,\
-                        next.*:fa-step-forward,\
-                        list.*:fa-list, \
-                        all.*:fa-list, \
-                        download.*:fa-download, \
-                        upload.*:fa-upload, \
-                        export.*:fa-download,\
-                        switch.*:fa-exchange,\
-                        import.*:fa-upload,\
-                        execute.*:fa-bolt, \
-                        run.*:fa-bolt, \
-                        calculate.*:fa-calculator, \
-                        verify.*:fa-check-circle, \
-                        refresh.*:fa-refresh, \
-                        install.*:fa-wrench,\
-                        stop.*:fa-stop,\
-                        terminate.*:fa-stop,\
-                        cancel.*:fa-stop,\
-                        discard.*:fa-trash-o,\
-                        pause.*:fa-pause,\
-                        suspend.*:fa-pause,\
-                        resume.*:fa-play,\
-                        renew.*:fa-repeat,\
-                        reset.*:fa-repeat,\
-                        categorise.*:fa-folder-open-o,\
-                        assign.*:fa-hand-o-right,\
-                        approve.*:fa-thumbs-o-up,\
-                        decline.*:fa-thumbs-o-down
-
-
-#
-# patterns for applying CssClass facet (CSS styles), matching on member names
-#
-isis.reflector.facet.cssClass.patterns=\
-                        delete.*:btn-danger,\
-                        discard.*:btn-warning,\
-                        remove.*:btn-warning
-
-
-#
-# whether to suppress posting of events if not specified (left as Xxx.Default); defaults to true
-#
-
-#isis.reflector.facet.actionAnnotation.domainEvent.postForDefault=false
-#isis.reflector.facet.collectionAnnotation.domainEvent.postForDefault=false
-#isis.reflector.facet.propertyAnnotation.domainEvent.postForDefault=false
-
-#isis.reflector.facet.domainObjectLayoutAnnotation.cssClassUiEvent.postForDefault=false
-#isis.reflector.facet.domainObjectLayoutAnnotation.iconUiEvent.postForDefault=false
-#isis.reflector.facet.domainObjectLayoutAnnotation.titleUiEvent.postForDefault=false
-
-isis.reflector.facet.domainObjectAnnotation.createdLifecycleEvent.postForDefault=false
-isis.reflector.facet.domainObjectAnnotation.persistingLifecycleEvent.postForDefault=false
-isis.reflector.facet.domainObjectAnnotation.persistedLifecycleEvent.postForDefault=false
-isis.reflector.facet.domainObjectAnnotation.loadedLifecycleEvent.postForDefault=false
-isis.reflector.facet.domainObjectAnnotation.updatingLifecycleEvent.postForDefault=false
-isis.reflector.facet.domainObjectAnnotation.updatedLifecycleEvent.postForDefault=false
-isis.reflector.facet.domainObjectAnnotation.removingLifecycleEvent.postForDefault=false
-
-#################################################################################
-#
-# Domain Service configuration
-#
-#################################################################################
-
-#
-# required by EmailServiceDefault
-#
-#isis.service.email.sender.address=some.valid@email.address
-#isis.service.email.sender.password=the.password.for-isis.service.email.sender.address
-
-
-#
-# whether ExceptionRecognizers should also log any recognized exceptions
-# (default false; enable for diagnostics/debugging)
-#
-#isis.services.exceprecog.logRecognizedExceptions=true
-
-
-#
-# disable to (automatically registered) ExceptionRecognizerCompositeForJdoObjectStore service
-# almost all of this service should be registered.  Since all exception recognizer implementations
-# are consulted in the event of an exception, it's not sufficient to override the implementation
-# (in isis.services); instead this configuration property disables this particular implementation.
-#
-#isis.services.ExceptionRecognizerCompositeForJdoObjectStore.disable=true
-
-
-################################################################################
-#
-# Auditing, Commands, Publishing
-#
-################################################################################
-
-#
-# Whether changes to objects should be audited; if not set, defaults to "none"
-# - if not set or set to "none", can explicitly enable using @DomainObject(auditing=Auditing.ENABLED)
-# - if set to "all", can explicitly disable using @Object(auditing=Auditing.DISABLED)
-#
-#isis.services.audit.objects=all|none
-isis.services.audit.objects=all
-
-
-#
-# Whether changes to objects should be published; if not set, defaults to "none"
-# - if not set or set to "none", can explicitly enable using @DomainObject(publishing=Publishing.ENABLED)
-# - if set to "all", can explicitly disable using @Object(publishing=Publishing.DISABLED)
-#
-#isis.services.publish.objects=all|none
-isis.services.publish.objects=all
-
-
-#
-# Whether all (or all non-query only) actions should be reified as commands; if not set, defaults to "none"
-# - if not set or set to "none", can explicitly enable using @Action(command=CommandReification.ENABLED)
-# - if set to "all", can explicitly disable using @Action(command=CommandReification.DISABLED)
-#
-#isis.services.command.actions=all|none|ignoreSafe
-isis.services.command.actions=ignoreSafe
-
-
-#
-# Whether all (or all non-query only) action invocations should be published; if not set, defaults to "none"
-# - if not set or set to "none", can explicitly enable using @Action(publishing=Publishing.ENABLED)
-# - if set to "all", can explicitly disable using @Action(publishing=Publishing.DISABLED)
-#
-#isis.services.publish.actions=all|none|ignoreSafe
-isis.services.publish.actions=all
-
-
-#
-# Whether all property edits sshould be published; if not set, defaults to "none"
-# - if not set or set to "none", can explicitly enable using @Property(publishing=Publishing.ENABLED)
-# - if set to "all", can explicitly disable using @Property(publishing=Publishing.DISABLED)
-#
-#isis.services.publish.properties=all|none
-isis.services.publish.properties=all
-
-
-
-#
-# Whether the ApplicationFeatureRepository should eagerly initialize itself (increasing start-up times)
-# or initialize itself lazily.  Default is lazy initialization.
-#
-#isis.services.applicationFeatures.init=lazy|eager
-
-
-#
-# Whether the framework supports inject...() and set...() styles of dependency injection.   By default the former
-# is disabled, the latter is enabled.  Disabling these settings can reduce application start-up times.
-#
-#isis.services.injector.injectPrefix=false|true
-#isis.services.injector.setPrefix=false|true
-isis.services.injector.setPrefix=false
-
-
-
-
-################################################################################
-#
-# Policies
-#
-#################################################################################
-
-#
-# Whether editing of object properties is allowed; if not set, defaults to "true"
-# - if not set or set to "true", can explicitly disable using @DomainObject(editing=Editing.DISABLED)
-# - if set to "false", can explicitly enable using @DomainObject(editing=Editing.ENABLED)
-#
-isis.objects.editing=false
-
-
-
-################################################################################
-#
-# i18n
-#
-#################################################################################
-
-#
-# force read translations, even if running in prototype mode
-#
-#isis.services.translation.po.mode=read
-
-
-
-################################################################################
-#
-# Viewer defaults
-#
-#################################################################################
-
-#
-# Specify viewer defaults
-# 
-#isis.viewers.paged.standalone=30
-#isis.viewers.paged.parented=10
-
-
-#isis.viewers.propertyLayout.labelPosition=LEFT
-#isis.viewers.parameterLayout.labelPosition=LEFT
-
-
-#################################################################################
-#
-# Value facet defaults
-#
-# (see also viewer-specific config files, eg viewer_wicket.properties)
-#
-#################################################################################
-
-# as used by @Title of a date
-isis.value.format.date=dd-MM-yyyy
-
-
-
-
-#################################################################################
-#
-# Persistor
-#
-#################################################################################
-
-
-
-# generally speaking this should not be enabled
-isis.persistor.disableConcurrencyChecking=false
-
-
-#
-# hook to perform additional initialization when JDO class metadata is loaded
-# default implementation will attempt to run 'create schema' for the specified schema.
-#
-# this implementation is installed by default:
-#isis.persistor.datanucleus.classMetadataLoadedListener=org.apache.isis.objectstore.jdo.datanucleus.CreateSchemaObjectFromClassMetadata
-
-
-# whether to persist the event data as a "clob" or as a "zipped" byte[]
-# default is "zipped"
-#isis.persistor.datanucleus.PublishingService.serializedForm=zipped
-
-
-
-
-#####################################################################
-#
-# DataNucleus' configuration
-#
-# The 'isis.persistor.datanucleus.impl' prefix is stripped off,
-# remainder is passed through to DataNucleus
-#
-#####################################################################
-
-isis.persistor.datanucleus.impl.datanucleus.schema.autoCreateAll=true
-isis.persistor.datanucleus.impl.datanucleus.schema.validateTables=true
-isis.persistor.datanucleus.impl.datanucleus.schema.validateConstraints=true
-
-
-#
-# Require explicit persistence (since entities are Comparable and using ObjectContracts#compareTo).
-# see http://www.datanucleus.org/products/accessplatform_3_0/jdo/transaction_types.html
-#
-isis.persistor.datanucleus.impl.datanucleus.persistenceByReachabilityAtCommit=false
-
-
-#
-# How column names are identified
-# (http://www.datanucleus.org/products/datanucleus/jdo/orm/datastore_identifiers.html)
-#
-isis.persistor.datanucleus.impl.datanucleus.identifier.case=MixedCase
-
-#
-# L2 cache
-# off except if explicitly marked as cacheable
-# http://www.datanucleus.org/products/datanucleus/jdo/cache.html
-#
-isis.persistor.datanucleus.impl.datanucleus.cache.level2.type=none
-isis.persistor.datanucleus.impl.datanucleus.cache.level2.mode=ENABLE_SELECTIVE
-
-
-
-#
-# uncomment to use JNDI rather than direct JDBC
-#
-#isis.persistor.datanucleus.impl.datanucleus.ConnectionFactoryName=java:comp/env/jdbc/quickstart
-
-#
-# uncomment to use JTA resource
-#
-#isis.persistor.datanucleus.impl.datanucleus.ConnectionFactory2Name=java:comp/env/jdbc/quickstart-nontx
-#isis.persistor.datanucleus.impl.javax.jdo.option.TransactionType=JTA
-
-
-
-#
-#
-# JDBC connection details
-# ... are in persistor.properties
-#
-#

http://git-wip-us.apache.org/repos/asf/isis/blob/eae978ed/example/application/simpleapp/application/src/main/resources/domainapp/application/manifest/isis.properties
----------------------------------------------------------------------
diff --git a/example/application/simpleapp/application/src/main/resources/domainapp/application/manifest/isis.properties b/example/application/simpleapp/application/src/main/resources/domainapp/application/manifest/isis.properties
new file mode 100644
index 0000000..18a429e
--- /dev/null
+++ b/example/application/simpleapp/application/src/main/resources/domainapp/application/manifest/isis.properties
@@ -0,0 +1,382 @@
+#  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.
+
+#################################################################################
+#
+# use AppManifest to specify modules, system components and fixtures
+#
+#################################################################################
+
+#
+# Specify the modules (= entities + services) and other components that make up
+# this application.
+#
+isis.appManifest=domainapp.application.manifest.DomainAppAppManifest
+
+
+
+
+#isis.services.eventbus.implementation=guava
+isis.services.eventbus.implementation=axon
+
+
+#################################################################################
+#
+# 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 facet factories, or remove standard facet factories.
+# Comma separated list of fully qualified class names.
+#
+#isis.reflector.facets.include=
+#isis.reflector.facets.exclude=
+
+
+#
+# Metamodel validation (in addition to that automatically performed by the programming model facet factories)
+# Default implementation does nothing.
+#
+# Use a custom implementation to enforce additional constraints specific to your app/project/company.
+#
+#isis.reflector.validator=org.apache.isis.core.metamodel.metamodelvalidator.dflt.MetaModelValidatorDefault
+
+
+
+#
+# Whether to allow deprecated annotations/method prefixes (otherwise raise metamodel validation errors).
+# If not specified, default is to allow.
+#
+isis.reflector.validator.allowDeprecated=false
+
+
+#
+# Whether to check that JAXB view models are not abstract.  If not specified, default is to validate.
+#
+#isis.reflector.validator.jaxbViewModelNotAbstract=true
+
+#
+# Whether to check that JAXB view models are not inner classes.  If not specified, default is to validate.
+#
+#isis.reflector.validator.jaxbViewModelNotInnerClass=true
+
+#
+# Whether to check that JAXB view models have no-arg constructors.  If not specified, default is NOT to validate.
+#
+#isis.reflector.validator.jaxbViewModelNoArgConstructor=false
+
+#
+# Whether to check that, for JAXB view model with properties referencing persistent entities, that those entities
+# are annotated with @XmlJavaTypeAdapter.  If not specified, default is to validate.
+#
+#isis.reflector.validator.jaxbViewModelReferenceTypeAdapter=true
+
+#
+# Whether to check that, for JAXB view model with date/time properties, that those properties are annotated with
+# @XmlJavaTypeAdapter.  If not specified, default is to validate.
+#
+#isis.reflector.validator.jaxbViewModelDateTimeTypeAdapter=true
+
+
+#
+# Whether to validate JDOQL clauses.  If not specified, default is to validate.
+#
+#isis.reflector.validator.jdoqlFromClause=true
+#isis.reflector.validator.jdoqlVariablesClause=true
+
+
+#
+# Whether to only allow hideXxx() and disableXxx() methods with no params.
+# If not specified, defaults to false (ie will also search for methods with parameter types matching the action).
+#
+isis.reflector.validator.noParamsOnly=true
+
+
+#
+# Whether to require the object type to be specified explicitly for entities.
+# If not specified, defaults to false
+#
+isis.reflector.validator.explicitObjectType=true
+
+
+#
+# Whether to ignore or honour (at least some of the) deprecated annotations/method prefixes.
+# If not specified, default is to honour
+#
+#isis.reflector.facets.ignoreDeprecated=false
+
+
+#
+# Whether to enforce the rule that domain services can only declare actions, not properties and collections.
+# If not specified, defaults to false
+#
+isis.reflector.validator.serviceActionsOnly=true
+
+
+#
+# Whether to use only mixins, and no contributed services.
+# If not specified, defaults to false
+#
+isis.reflector.validator.mixinsOnly=true
+
+
+
+
+#
+# patterns for applying CssClassFa facet (font-awesome icons), matching on action names
+#
+isis.reflector.facet.cssClassFa.patterns=\
+                        new.*:fa-plus,\
+                        add.*:fa-plus-square,\
+                        create.*:fa-plus,\
+                        update.*:fa-edit,\
+                        delete.*:fa-trash,\
+                        save.*:fa-floppy-o,\
+                        change.*:fa-edit,\
+                        edit.*:fa-pencil-square-o,\
+                        maintain.*:fa-edit,\
+                        remove.*:fa-minus-square,\
+                        copy.*:fa-copy,\
+                        move.*:fa-exchange,\
+                        first.*:fa-star,\
+                        find.*:fa-search,\
+                        lookup.*:fa-search,\
+                        search.*:fa-search,\
+                        view.*:fa-search,\
+                        clear.*:fa-remove,\
+                        previous.*:fa-step-backward,\
+                        next.*:fa-step-forward,\
+                        list.*:fa-list, \
+                        all.*:fa-list, \
+                        download.*:fa-download, \
+                        upload.*:fa-upload, \
+                        export.*:fa-download,\
+                        switch.*:fa-exchange,\
+                        import.*:fa-upload,\
+                        execute.*:fa-bolt, \
+                        run.*:fa-bolt, \
+                        calculate.*:fa-calculator, \
+                        verify.*:fa-check-circle, \
+                        refresh.*:fa-refresh, \
+                        install.*:fa-wrench,\
+                        stop.*:fa-stop,\
+                        terminate.*:fa-stop,\
+                        cancel.*:fa-stop,\
+                        discard.*:fa-trash-o,\
+                        pause.*:fa-pause,\
+                        suspend.*:fa-pause,\
+                        resume.*:fa-play,\
+                        renew.*:fa-repeat,\
+                        reset.*:fa-repeat,\
+                        categorise.*:fa-folder-open-o,\
+                        assign.*:fa-hand-o-right,\
+                        approve.*:fa-thumbs-o-up,\
+                        decline.*:fa-thumbs-o-down
+
+
+#
+# patterns for applying CssClass facet (CSS styles), matching on member names
+#
+isis.reflector.facet.cssClass.patterns=\
+                        delete.*:btn-danger,\
+                        discard.*:btn-warning,\
+                        remove.*:btn-warning
+
+
+#
+# whether to suppress posting of events if not specified (left as Xxx.Default); defaults to true
+#
+
+#isis.reflector.facet.actionAnnotation.domainEvent.postForDefault=false
+#isis.reflector.facet.collectionAnnotation.domainEvent.postForDefault=false
+#isis.reflector.facet.propertyAnnotation.domainEvent.postForDefault=false
+
+#isis.reflector.facet.domainObjectLayoutAnnotation.cssClassUiEvent.postForDefault=false
+#isis.reflector.facet.domainObjectLayoutAnnotation.iconUiEvent.postForDefault=false
+#isis.reflector.facet.domainObjectLayoutAnnotation.titleUiEvent.postForDefault=false
+
+#isis.reflector.facet.domainObjectAnnotation.createdLifecycleEvent.postForDefault=false
+#isis.reflector.facet.domainObjectAnnotation.persistingLifecycleEvent.postForDefault=false
+#isis.reflector.facet.domainObjectAnnotation.persistedLifecycleEvent.postForDefault=false
+#isis.reflector.facet.domainObjectAnnotation.loadedLifecycleEvent.postForDefault=false
+#isis.reflector.facet.domainObjectAnnotation.updatingLifecycleEvent.postForDefault=false
+#isis.reflector.facet.domainObjectAnnotation.updatedLifecycleEvent.postForDefault=false
+#isis.reflector.facet.domainObjectAnnotation.removingLifecycleEvent.postForDefault=false
+
+#################################################################################
+#
+# Domain Service configuration
+#
+#################################################################################
+
+#
+# required by EmailServiceDefault
+#
+#isis.service.email.sender.address=some.valid@email.address
+#isis.service.email.sender.password=the.password.for-isis.service.email.sender.address
+
+
+#
+# whether ExceptionRecognizers should also log any recognized exceptions
+# (default false; enable for diagnostics/debugging)
+#
+#isis.services.exceprecog.logRecognizedExceptions=true
+
+
+#
+# disable to (automatically registered) ExceptionRecognizerCompositeForJdoObjectStore service
+# almost all of this service should be registered.  Since all exception recognizer implementations
+# are consulted in the event of an exception, it's not sufficient to override the implementation
+# (in isis.services); instead this configuration property disables this particular implementation.
+#
+#isis.services.ExceptionRecognizerCompositeForJdoObjectStore.disable=true
+
+
+################################################################################
+#
+# Auditing, Commands, Publishing
+#
+################################################################################
+
+#
+# Whether changes to objects should be audited; if not set, defaults to "none"
+# - if not set or set to "none", can explicitly enable using @DomainObject(auditing=Auditing.ENABLED)
+# - if set to "all", can explicitly disable using @Object(auditing=Auditing.DISABLED)
+#
+#isis.services.audit.objects=all|none
+isis.services.audit.objects=all
+
+
+#
+# Whether all (or all non-query only) actions should be reified as commands; if not set, defaults to "none"
+# - if not set or set to "none", can explicitly enable using @Action(command=CommandReification.ENABLED)
+# - if set to "all", can explicitly disable using @Action(command=CommandReification.DISABLED)
+#
+#isis.services.command.actions=all|none|ignoreSafe
+isis.services.command.actions=ignoreSafe
+
+
+#
+# Whether changes to objects should be published; if not set, defaults to "none"
+# - if not set or set to "none", can explicitly enable using @DomainObject(publishing=Publishing.ENABLED)
+# - if set to "all", can explicitly disable using @Object(publishing=Publishing.DISABLED)
+#
+#isis.services.publish.objects=all|none
+isis.services.publish.objects=all
+
+
+#
+# Whether all (or all non-query only) action invocations should be published; if not set, defaults to "none"
+# - if not set or set to "none", can explicitly enable using @Action(publishing=Publishing.ENABLED)
+# - if set to "all", can explicitly disable using @Action(publishing=Publishing.DISABLED)
+#
+#isis.services.publish.actions=all|none|ignoreSafe
+isis.services.publish.actions=all
+
+
+#
+# Whether all property edits sshould be published; if not set, defaults to "none"
+# - if not set or set to "none", can explicitly enable using @Property(publishing=Publishing.ENABLED)
+# - if set to "all", can explicitly disable using @Property(publishing=Publishing.DISABLED)
+#
+#isis.services.publish.properties=all|none
+isis.services.publish.properties=all
+
+
+
+#
+# Whether the ApplicationFeatureRepository should eagerly initialize itself (increasing start-up times)
+# or initialize itself lazily.  Default is lazy initialization.
+#
+#isis.services.applicationFeatures.init=lazy|eager
+
+
+#
+# Whether the framework supports inject...() and set...() styles of dependency injection.   By default the former
+# is disabled, the latter is enabled.  Disabling these settings can reduce application start-up times.
+#
+#isis.services.injector.injectPrefix=false|true
+#isis.services.injector.setPrefix=false|true
+isis.services.injector.setPrefix=false
+
+
+
+
+################################################################################
+#
+# Policies
+#
+#################################################################################
+
+#
+# Whether editing of object properties is allowed; if not set, defaults to "true"
+# - if not set or set to "true", can explicitly disable using @DomainObject(editing=Editing.DISABLED)
+# - if set to "false", can explicitly enable using @DomainObject(editing=Editing.ENABLED)
+#
+#isis.objects.editing=true|false
+isis.objects.editing=false
+
+
+
+################################################################################
+#
+# i18n
+#
+#################################################################################
+
+#
+# force read translations, even if running in prototype mode
+#
+#isis.services.translation.po.mode=read
+
+
+
+################################################################################
+#
+# Viewer defaults
+#
+#################################################################################
+
+#
+# Specify viewer defaults
+# 
+#isis.viewers.paged.standalone=30
+#isis.viewers.paged.parented=10
+
+
+#isis.viewers.propertyLayout.labelPosition=LEFT
+#isis.viewers.parameterLayout.labelPosition=LEFT
+
+
+#################################################################################
+#
+# Value facet defaults
+#
+# (see also viewer-specific config files, eg viewer_wicket.properties)
+#
+#################################################################################
+
+# as used by @Title of a date
+isis.value.format.date=dd-MM-yyyy
+
+
+

http://git-wip-us.apache.org/repos/asf/isis/blob/eae978ed/example/application/simpleapp/application/src/main/resources/domainapp/application/manifest/persistor_datanucleus.properties
----------------------------------------------------------------------
diff --git a/example/application/simpleapp/application/src/main/resources/domainapp/application/manifest/persistor_datanucleus.properties b/example/application/simpleapp/application/src/main/resources/domainapp/application/manifest/persistor_datanucleus.properties
new file mode 100644
index 0000000..48e3a35
--- /dev/null
+++ b/example/application/simpleapp/application/src/main/resources/domainapp/application/manifest/persistor_datanucleus.properties
@@ -0,0 +1,106 @@
+#  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 JDO/DataNucleus objectstore
+#
+
+
+
+#################################################################################
+#
+# Persistor
+#
+#################################################################################
+
+
+
+# generally speaking this should not be enabled
+isis.persistor.disableConcurrencyChecking=false
+
+
+#
+# hook to perform additional initialization when JDO class metadata is loaded
+# default implementation will attempt to run 'create schema' for the specified schema.
+#
+# this implementation is installed by default:
+#isis.persistor.datanucleus.classMetadataLoadedListener=org.apache.isis.objectstore.jdo.datanucleus.CreateSchemaObjectFromClassMetadata
+
+
+# whether to persist the event data as a "clob" or as a "zipped" byte[]
+# default is "zipped"
+#isis.persistor.datanucleus.PublishingService.serializedForm=zipped
+
+
+
+
+#####################################################################
+#
+# DataNucleus' configuration
+#
+# The 'isis.persistor.datanucleus.impl' prefix is stripped off,
+# remainder is passed through to DataNucleus
+#
+#####################################################################
+
+isis.persistor.datanucleus.impl.datanucleus.schema.autoCreateAll=true
+isis.persistor.datanucleus.impl.datanucleus.schema.validateTables=true
+isis.persistor.datanucleus.impl.datanucleus.schema.validateConstraints=true
+
+
+#
+# Require explicit persistence (since entities are Comparable and using ObjectContracts#compareTo).
+# see http://www.datanucleus.org/products/accessplatform_3_0/jdo/transaction_types.html
+#
+isis.persistor.datanucleus.impl.datanucleus.persistenceByReachabilityAtCommit=false
+
+
+#
+# How column names are identified
+# (http://www.datanucleus.org/products/datanucleus/jdo/orm/datastore_identifiers.html)
+#
+isis.persistor.datanucleus.impl.datanucleus.identifier.case=MixedCase
+
+#
+# L2 cache
+# off except if explicitly marked as cacheable
+# http://www.datanucleus.org/products/datanucleus/jdo/cache.html
+#
+isis.persistor.datanucleus.impl.datanucleus.cache.level2.type=none
+isis.persistor.datanucleus.impl.datanucleus.cache.level2.mode=ENABLE_SELECTIVE
+
+
+
+#
+# uncomment to use JNDI rather than direct JDBC
+#
+#isis.persistor.datanucleus.impl.datanucleus.ConnectionFactoryName=java:comp/env/jdbc/quickstart
+
+#
+# uncomment to use JTA resource
+#
+#isis.persistor.datanucleus.impl.datanucleus.ConnectionFactory2Name=java:comp/env/jdbc/quickstart-nontx
+#isis.persistor.datanucleus.impl.javax.jdo.option.TransactionType=JTA
+
+
+
+#
+#
+# JDBC connection details
+# ... are in persistor.properties
+#
+#

http://git-wip-us.apache.org/repos/asf/isis/blob/eae978ed/example/application/simpleapp/application/src/main/resources/domainapp/application/manifest/viewer_restfulobjects.properties
----------------------------------------------------------------------
diff --git a/example/application/simpleapp/application/src/main/resources/domainapp/application/manifest/viewer_restfulobjects.properties b/example/application/simpleapp/application/src/main/resources/domainapp/application/manifest/viewer_restfulobjects.properties
new file mode 100644
index 0000000..e6124fc
--- /dev/null
+++ b/example/application/simpleapp/application/src/main/resources/domainapp/application/manifest/viewer_restfulobjects.properties
@@ -0,0 +1,64 @@
+#  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 Restful Objects viewer
+#
+
+
+# renders param details in the (incorrect) form that they were for GSOC2013 viewers
+# isis.viewer.restfulobjects.gsoc2013.legacyParamDetails=true
+
+# whether to honor UI hints, in particular Render(EAGERLY).  Defaults to false.
+#isis.viewer.restfulobjects.honorUiHints=false
+
+
+
+###############################################################################
+# Non-standard configuration settings.
+#
+# If enabled of the following are enabled then the viewer is deviating from the
+# RO spec standard; compatibility may be compromised with RO clients.
+###############################################################################
+
+# whether to show only object properties for object members
+# (on the object representation only)
+# Takes precedence over the other 'suppress' below.
+#isis.viewer.restfulobjects.objectPropertyValuesOnly=true
+
+# whether to suppress "describedby" links.  Defaults to false.
+#isis.viewer.restfulobjects.suppressDescribedByLinks=true
+
+# whether to suppress "update" links.  Defaults to false.
+#isis.viewer.restfulobjects.suppressUpdateLink=true
+
+# whether to suppress "id" json-prop for object members.  Defaults to false.
+#isis.viewer.restfulobjects.suppressMemberId=true
+
+# whether to suppress "links" json-prop for object members
+# (on the object representation only).  Defaults to false.
+#isis.viewer.restfulobjects.suppressMemberLinks=true
+
+# whether to suppress "extensions" json-prop for object members
+# (on the object representation only).  Defaults to false.
+#isis.viewer.restfulobjects.suppressMemberExtensions=true
+
+# whether to suppress "disabledReason" json-prop for object members
+# (on the object representation only).  Defaults to false.
+#isis.viewer.restfulobjects.suppressMemberDisabledReason=true
+
+###############################################################################

http://git-wip-us.apache.org/repos/asf/isis/blob/eae978ed/example/application/simpleapp/application/src/main/resources/domainapp/application/manifest/viewer_wicket.properties
----------------------------------------------------------------------
diff --git a/example/application/simpleapp/application/src/main/resources/domainapp/application/manifest/viewer_wicket.properties b/example/application/simpleapp/application/src/main/resources/domainapp/application/manifest/viewer_wicket.properties
new file mode 100644
index 0000000..245bfdf
--- /dev/null
+++ b/example/application/simpleapp/application/src/main/resources/domainapp/application/manifest/viewer_wicket.properties
@@ -0,0 +1,180 @@
+    #  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 Wicket viewer
+#
+
+#
+# The maximum length of titles to display in standalone or parented tables.
+# Titles longer than this length will be truncated with trailing ellipses (...)
+#
+# For example, if set to 12, the title
+# "Buy milk on 15-Feb-13" will be truncated to "Buy milk ..."
+#
+# If set to 0, then only the icon will be shown.
+#
+isis.viewer.wicket.maxTitleLengthInStandaloneTables=0
+isis.viewer.wicket.maxTitleLengthInParentedTables=0
+
+
+#
+# in Firefox and more recent versions of Chrome 54+, cannot copy out of disabled fields; instead we use the
+# readonly attribute (https://www.w3.org/TR/2014/REC-html5-20141028/forms.html#the-readonly-attribute)
+# This behaviour is enabled by default but can be disabled using this flag
+#
+#isis.viewer.wicket.replaceDisabledTagWithReadonlyTag=true
+
+
+#
+# Whether to disable buttons after it has been clicked (for both form submit and no-arg actions), to prevent users
+# causing an error if they do a double click.
+# Also, whether to show an indicator alongside the button.
+#
+# This behaviour is enabled by default, but can be disabled using this flag.
+#
+#isis.viewer.wicket.preventDoubleClickForFormSubmit=true
+#isis.viewer.wicket.preventDoubleClickForNoArgAction=true
+#isis.viewer.wicket.useIndicatorForFormSubmit=true
+#isis.viewer.wicket.useIndicatorForNoArgAction=true
+
+
+#isis.viewer.wicket.datePicker.minDate=1900-01-01T00:00:00.000Z
+#isis.viewer.wicket.datePicker.maxDate=2100-01-01T00:00:00.000Z
+
+#isis.viewer.wicket.datePattern=dd-MM-yyyy
+#isis.viewer.wicket.dateTimePattern=dd-MM-yyyy HH:mm
+
+#isis.viewer.wicket.datePattern=dd/MM/yy
+#isis.viewer.wicket.dateTimePattern=dd/MM/yy HH:mm
+
+
+#
+# whether to strip wicket tags from markup (default is true, as they may break some CSS rules)
+#
+#isis.viewer.wicket.stripWicketTags=false
+
+
+#
+# whether to suppress the 'rememberMe' checkbox on the login page (default is false)
+#
+#isis.viewer.wicket.rememberMe.suppress=false
+
+
+#
+# Encryption key is used to encrypt the rememberMe user/password.  It should be set to a unique and private value.
+# If a hard-coded and publicly known value is used, then it would be possible for rememberMe user/password to be
+# intercepted and decrypted, compromising access.
+#
+# If no value is set then (for safety) a random UUID will be used as the encryption key.  The net effect of this
+# default is that 'rememberMe' will work, but only until the webapp is restarted (after which the end-user will
+# have to log in again).
+#
+#isis.viewer.wicket.rememberMe.encryptionKey=myEncryptionKey
+
+
+#
+# if user attempts to access a protected URL before signing in, then as a convenience the viewer will continue
+# through to that destination after successful login.  If you consider this to be a security risk then this flag
+# disables that behaviour (default is false).
+#
+#isis.viewer.wicket.clearOriginalDestination=true
+
+
+#
+# whether to show the Wicket debug bar and any other development utilities
+# (default depends on whether running in prototype mode or not; this property overrides that)
+#
+#isis.viewer.wicket.developmentUtilities.enable=true
+isis.viewer.wicket.developmentUtilities.enable=true
+
+
+
+#
+# whether to show bookmarks (defaults to true)
+#
+#isis.viewer.wicket.bookmarkedPages.showChooser=true
+isis.viewer.wicket.bookmarkedPages.showChooser=false
+
+
+
+#
+# the maximum number of pages to list in bookmark (default is 15)
+#
+#isis.viewer.wicket.bookmarkedPages.maxSize=15
+
+
+#
+# whether to show breadcrumbs (defaults to true)
+#
+#isis.viewer.wicket.breadcrumbs.showChooser=true
+
+
+
+
+
+#
+# whether to show the bootstrap theme chooser (defaults false)
+#
+#isis.viewer.wicket.themes.showChooser=false
+isis.viewer.wicket.themes.showChooser=true
+
+
+#
+# comma-separated list of themes to choose from (default is to show all themes from bootswatch.com).
+#
+#isis.viewer.wicket.themes.enabled=bootstrap-theme,Cosmo,Flatly,Darkly,Sandstone,United
+
+# ISIS-1520 Temporarily disable the broken Amelia theme and list all other themes
+isis.viewer.wicket.themes.enabled=bootstrap-theme, Cerulean, Cosmo, Cyborg, Darkly, Flatly, Journal, Lumen, Paper, Readable, Sandstone, Simplex, Slate, Spacelab, Superhero, United, Yeti
+
+#
+# whether to automatically select dependent choice when the choice it depends upon changes.
+#
+#isis.viewer.wicket.disableDependentChoiceAutoSelection=false
+
+
+#
+# enable liveReload.  For example, use with gradle -t -b liveReload.gradle --offline &
+#
+#isis.viewer.wicket.liveReloadUrl=http://localhost:35729/livereload.js?snipver=1
+
+
+
+#
+# cookie key holding the (encrypted) 'rememberMe' user/password.
+# If not specified then the cookie key 'isisWicketRememberMe' will be used; there is generally no need to change this.
+#
+#isis.viewer.wicket.rememberMe.cookieKey=isisWicketRememberMe
+
+
+#
+# specifies whether an INLINE or DIALOG prompt should be used for property edits and for action invocations (of actions
+# associated with a property).  This is a fallback where not specified on a case-by-case using @PropertyLayout or
+# @ActionLayout (or equivalents in the Xxx.layout.xml file).
+#
+# If not specified then the default is an inline prompt.
+#
+#isis.viewer.wicket.promptStyle=INLINE
+
+
+#
+# If set then reverts to pre-1.15.0 behaviour of redirecting to a new page on any action invocation or property edit.
+# If left to its default then the page will be updated if the same object is rendered, making for a smoother user
+# experience.
+#
+#isis.viewer.wicket.redirectEvenIfSameObject=false

http://git-wip-us.apache.org/repos/asf/isis/blob/eae978ed/example/application/simpleapp/webapp/src/main/webapp/WEB-INF/authentication_shiro.properties
----------------------------------------------------------------------
diff --git a/example/application/simpleapp/webapp/src/main/webapp/WEB-INF/authentication_shiro.properties b/example/application/simpleapp/webapp/src/main/webapp/WEB-INF/authentication_shiro.properties
deleted file mode 100644
index 552e840..0000000
--- a/example/application/simpleapp/webapp/src/main/webapp/WEB-INF/authentication_shiro.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.
-
-
-
-#
-# if the shiro Subject is still authenticated, then just reuse.
-# Prior to 1.13.0, we forced an auto-logout, so set to 'true' to reinstate this behaviour.
-# See this thread for further info: http://markmail.org/message/hsjljwgkhhrzxbrm
-#
-#isis.authentication.shiro.autoLogoutIfAlreadyAuthenticated=false

http://git-wip-us.apache.org/repos/asf/isis/blob/eae978ed/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 5f1b54f..e0185d1 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
@@ -16,21 +16,107 @@
 #  under the License.
 
 
+#
+# All other properties are loaded programmatically by the AppManifest
+# (they are unlikely to vary between dev/test/prod so can be "baked in")
+#
+
+
+
+# the baseUrl for hrefs in the events generated by the RO EventSerializer
+isis.viewer.restfulobjects.RestfulObjectsSpecEventSerializer.baseUrl=http://localhost:8080/restful/
+
+
+
+
+#################################################################################
+#
+# JDBC configuration
+#
+#################################################################################
+
 
+#
+# JDBC connection details
+# (also update the pom.xml to reference the appropriate JDBC driver)
+#
 
 #
-# Specify the modules (= entities + services) and other components that make up
-# this application.
+# HSQLDB in-memory
 #
+isis.persistor.datanucleus.impl.javax.jdo.option.ConnectionDriverName=org.hsqldb.jdbcDriver
+isis.persistor.datanucleus.impl.javax.jdo.option.ConnectionURL=jdbc:hsqldb:mem:test
+isis.persistor.datanucleus.impl.javax.jdo.option.ConnectionUserName=sa
+isis.persistor.datanucleus.impl.javax.jdo.option.ConnectionPassword=
 
-isis.appManifest=domainapp.application.manifest.DomainAppAppManifest
-#isis.appManifest=domainapp.application.manifest.DomainAppAppManifestBypassSecurity
-#isis.appManifest=domainapp.application.manifest.DomainAppAppManifestWithFixtures
+
+#
+# HSQLDB in-memory (using log4jdbc-remix)
+#
+#isis.persistor.datanucleus.impl.javax.jdo.option.ConnectionDriverName=net.sf.log4jdbc.DriverSpy
+#isis.persistor.datanucleus.impl.javax.jdo.option.ConnectionURL=jdbc:log4jdbc:hsqldb:mem:test
+#isis.persistor.datanucleus.impl.javax.jdo.option.ConnectionUserName=sa
+#isis.persistor.datanucleus.impl.javax.jdo.option.ConnectionPassword=
 
 
 
 #
-# Remaining properties are loaded programmatically by the AppManifest
-# (they are unlikely to vary between dev/test/prod so can be "baked in")
+# HSQLDB to file
+#
+#isis.persistor.datanucleus.impl.javax.jdo.option.ConnectionDriverName=org.hsqldb.jdbcDriver
+#isis.persistor.datanucleus.impl.javax.jdo.option.ConnectionURL=jdbc:hsqldb:file:/tmp/isis-simple-app/hsql-db;hsqldb.write_delay=false;shutdown=true
+#isis.persistor.datanucleus.impl.javax.jdo.option.ConnectionUserName=sa
+#isis.persistor.datanucleus.impl.javax.jdo.option.ConnectionPassword=
+
+#
+# HSQLDB to file (using log4jdbc-remix)
+#
+#isis.persistor.datanucleus.impl.javax.jdo.option.ConnectionDriverName=net.sf.log4jdbc.DriverSpy
+#isis.persistor.datanucleus.impl.javax.jdo.option.ConnectionURL=jdbc:log4jdbc:hsqldb:file:/tmp/isis-simple-app/hsql-db;hsqldb.write_delay=false;shutdown=true
+#isis.persistor.datanucleus.impl.javax.jdo.option.ConnectionUserName=sa
+#isis.persistor.datanucleus.impl.javax.jdo.option.ConnectionPassword=
+
+
+
+#
+# PostgreSQL Server
+#
+#isis.persistor.datanucleus.impl.javax.jdo.option.ConnectionDriverName=org.postgresql.Driver
+#isis.persistor.datanucleus.impl.javax.jdo.option.ConnectionURL=jdbc:postgresql://localhost:5432/isis
+#isis.persistor.datanucleus.impl.javax.jdo.option.ConnectionUserName=isis
+#isis.persistor.datanucleus.impl.javax.jdo.option.ConnectionPassword=isis
+
+#
+# PostgreSQL Server (using log4jdbc-remix)
+#
+#isis.persistor.datanucleus.impl.javax.jdo.option.ConnectionDriverName=net.sf.log4jdbc.DriverSpy
+#isis.persistor.datanucleus.impl.javax.jdo.option.ConnectionURL=jdbc:log4jdbc:postgresql://localhost:5432/isis
+#isis.persistor.datanucleus.impl.javax.jdo.option.ConnectionUserName=isis
+#isis.persistor.datanucleus.impl.javax.jdo.option.ConnectionPassword=isis
+
+
+
+#
+# MS SQL Server
+#
+#isis.persistor.datanucleus.impl.javax.jdo.option.ConnectionDriverName=com.microsoft.sqlserver.jdbc.SQLServerDriver
+#isis.persistor.datanucleus.impl.javax.jdo.option.ConnectionURL=jdbc:sqlserver://127.0.0.1:1433;instance=.;databaseName=simple
+#isis.persistor.datanucleus.impl.javax.jdo.option.ConnectionUserName=sa
+#isis.persistor.datanucleus.impl.javax.jdo.option.ConnectionPassword=p4ssword
+
+#
+# MS SQL Server (using log4jdbc-remix)
+#
+#isis.persistor.datanucleus.impl.javax.jdo.option.ConnectionDriverName=net.sf.log4jdbc.DriverSpy
+#isis.persistor.datanucleus.impl.javax.jdo.option.ConnectionURL=jdbc:log4jdbc:sqlserver://127.0.0.1:1433;instance=SQLEXPRESS;databaseName=jdo
+#isis.persistor.datanucleus.impl.javax.jdo.option.ConnectionUserName=jdo
+#isis.persistor.datanucleus.impl.javax.jdo.option.ConnectionPassword=jdopass
+
+
+
+#
+# neo4j
+# (experimental; run with -P neo4j profile in webapp project)
 #
+#isis.persistor.datanucleus.impl.javax.jdo.option.ConnectionURL=neo4j:neo4j_DB
 

http://git-wip-us.apache.org/repos/asf/isis/blob/eae978ed/example/application/simpleapp/webapp/src/main/webapp/WEB-INF/persistor.properties
----------------------------------------------------------------------
diff --git a/example/application/simpleapp/webapp/src/main/webapp/WEB-INF/persistor.properties b/example/application/simpleapp/webapp/src/main/webapp/WEB-INF/persistor.properties
deleted file mode 100644
index 763f17e..0000000
--- a/example/application/simpleapp/webapp/src/main/webapp/WEB-INF/persistor.properties
+++ /dev/null
@@ -1,113 +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.
-
-
-
-#################################################################################
-#
-# JDBC configuration
-#
-#################################################################################
-
-#
-# configuration file holding the JDO objectstore's JDBC configuration
-#
-
-
-#
-# JDBC connection details
-# (also update the pom.xml to reference the appropriate JDBC driver)
-#
-
-#
-# HSQLDB in-memory
-#
-isis.persistor.datanucleus.impl.javax.jdo.option.ConnectionDriverName=org.hsqldb.jdbcDriver
-isis.persistor.datanucleus.impl.javax.jdo.option.ConnectionURL=jdbc:hsqldb:mem:test
-isis.persistor.datanucleus.impl.javax.jdo.option.ConnectionUserName=sa
-isis.persistor.datanucleus.impl.javax.jdo.option.ConnectionPassword=
-
-#
-# HSQLDB in-memory (using log4jdbc-remix)
-#
-#isis.persistor.datanucleus.impl.javax.jdo.option.ConnectionDriverName=net.sf.log4jdbc.DriverSpy
-#isis.persistor.datanucleus.impl.javax.jdo.option.ConnectionURL=jdbc:log4jdbc:hsqldb:mem:test
-#isis.persistor.datanucleus.impl.javax.jdo.option.ConnectionUserName=sa
-#isis.persistor.datanucleus.impl.javax.jdo.option.ConnectionPassword=
-
-
-
-#
-# HSQLDB to file
-#
-#isis.persistor.datanucleus.impl.javax.jdo.option.ConnectionDriverName=org.hsqldb.jdbcDriver
-#isis.persistor.datanucleus.impl.javax.jdo.option.ConnectionURL=jdbc:hsqldb:file:/tmp/isis-simple-app/hsql-db;hsqldb.write_delay=false;shutdown=true
-#isis.persistor.datanucleus.impl.javax.jdo.option.ConnectionUserName=sa
-#isis.persistor.datanucleus.impl.javax.jdo.option.ConnectionPassword=
-
-#
-# HSQLDB to file (using log4jdbc-remix)
-#
-#isis.persistor.datanucleus.impl.javax.jdo.option.ConnectionDriverName=net.sf.log4jdbc.DriverSpy
-#isis.persistor.datanucleus.impl.javax.jdo.option.ConnectionURL=jdbc:log4jdbc:hsqldb:file:/tmp/isis-simple-app/hsql-db;hsqldb.write_delay=false;shutdown=true
-#isis.persistor.datanucleus.impl.javax.jdo.option.ConnectionUserName=sa
-#isis.persistor.datanucleus.impl.javax.jdo.option.ConnectionPassword=
-
-
-
-#
-# PostgreSQL Server 
-#
-#isis.persistor.datanucleus.impl.javax.jdo.option.ConnectionDriverName=org.postgresql.Driver
-#isis.persistor.datanucleus.impl.javax.jdo.option.ConnectionURL=jdbc:postgresql://localhost:5432/isis
-#isis.persistor.datanucleus.impl.javax.jdo.option.ConnectionUserName=isis
-#isis.persistor.datanucleus.impl.javax.jdo.option.ConnectionPassword=isis
-
-#
-# PostgreSQL Server (using log4jdbc-remix)
-#
-#isis.persistor.datanucleus.impl.javax.jdo.option.ConnectionDriverName=net.sf.log4jdbc.DriverSpy
-#isis.persistor.datanucleus.impl.javax.jdo.option.ConnectionURL=jdbc:log4jdbc:postgresql://localhost:5432/isis
-#isis.persistor.datanucleus.impl.javax.jdo.option.ConnectionUserName=isis
-#isis.persistor.datanucleus.impl.javax.jdo.option.ConnectionPassword=isis
-
-
-
-#
-# MS SQL Server
-#
-#isis.persistor.datanucleus.impl.javax.jdo.option.ConnectionDriverName=com.microsoft.sqlserver.jdbc.SQLServerDriver
-#isis.persistor.datanucleus.impl.javax.jdo.option.ConnectionURL=jdbc:sqlserver://127.0.0.1:1433;instance=.;databaseName=simple
-#isis.persistor.datanucleus.impl.javax.jdo.option.ConnectionUserName=sa
-#isis.persistor.datanucleus.impl.javax.jdo.option.ConnectionPassword=p4ssword
-
-#
-# MS SQL Server (using log4jdbc-remix)
-#
-#isis.persistor.datanucleus.impl.javax.jdo.option.ConnectionDriverName=net.sf.log4jdbc.DriverSpy
-#isis.persistor.datanucleus.impl.javax.jdo.option.ConnectionURL=jdbc:log4jdbc:sqlserver://127.0.0.1:1433;instance=SQLEXPRESS;databaseName=jdo
-#isis.persistor.datanucleus.impl.javax.jdo.option.ConnectionUserName=jdo
-#isis.persistor.datanucleus.impl.javax.jdo.option.ConnectionPassword=jdopass
-
-
-
-#
-# neo4j
-# (experimental; run with -P neo4j profile in webapp project)
-#
-#isis.persistor.datanucleus.impl.javax.jdo.option.ConnectionURL=neo4j:neo4j_DB
-

http://git-wip-us.apache.org/repos/asf/isis/blob/eae978ed/example/application/simpleapp/webapp/src/main/webapp/WEB-INF/viewer_restfulobjects.properties
----------------------------------------------------------------------
diff --git a/example/application/simpleapp/webapp/src/main/webapp/WEB-INF/viewer_restfulobjects.properties b/example/application/simpleapp/webapp/src/main/webapp/WEB-INF/viewer_restfulobjects.properties
deleted file mode 100644
index 0a85fb6..0000000
--- a/example/application/simpleapp/webapp/src/main/webapp/WEB-INF/viewer_restfulobjects.properties
+++ /dev/null
@@ -1,66 +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 Restful Objects viewer
-#
-
-# the baseUrl for hrefs in the events generated by the RO EventSerializer 
-isis.viewer.restfulobjects.RestfulObjectsSpecEventSerializer.baseUrl=http://localhost:8080/restful/
-
-# renders param details in the (incorrect) form that they were for GSOC2013 viewers
-# isis.viewer.restfulobjects.gsoc2013.legacyParamDetails=true
-
-# whether to honor UI hints, in particular Render(EAGERLY).  Defaults to false.
-#isis.viewer.restfulobjects.honorUiHints=false
-
-
-
-###############################################################################
-# Non-standard configuration settings.
-#
-# If enabled of the following are enabled then the viewer is deviating from the
-# RO spec standard; compatibility may be compromised with RO clients.
-###############################################################################
-
-# whether to show only object properties for object members
-# (on the object representation only)
-# Takes precedence over the other 'suppress' below.
-#isis.viewer.restfulobjects.objectPropertyValuesOnly=true
-
-# whether to suppress "describedby" links.  Defaults to false.
-#isis.viewer.restfulobjects.suppressDescribedByLinks=true
-
-# whether to suppress "update" links.  Defaults to false.
-#isis.viewer.restfulobjects.suppressUpdateLink=true
-
-# whether to suppress "id" json-prop for object members.  Defaults to false.
-#isis.viewer.restfulobjects.suppressMemberId=true
-
-# whether to suppress "links" json-prop for object members
-# (on the object representation only).  Defaults to false.
-#isis.viewer.restfulobjects.suppressMemberLinks=true
-
-# whether to suppress "extensions" json-prop for object members
-# (on the object representation only).  Defaults to false.
-#isis.viewer.restfulobjects.suppressMemberExtensions=true
-
-# whether to suppress "disabledReason" json-prop for object members
-# (on the object representation only).  Defaults to false.
-#isis.viewer.restfulobjects.suppressMemberDisabledReason=true
-
-###############################################################################

http://git-wip-us.apache.org/repos/asf/isis/blob/eae978ed/example/application/simpleapp/webapp/src/main/webapp/WEB-INF/viewer_wicket.properties
----------------------------------------------------------------------
diff --git a/example/application/simpleapp/webapp/src/main/webapp/WEB-INF/viewer_wicket.properties b/example/application/simpleapp/webapp/src/main/webapp/WEB-INF/viewer_wicket.properties
deleted file mode 100644
index c6ce045..0000000
--- a/example/application/simpleapp/webapp/src/main/webapp/WEB-INF/viewer_wicket.properties
+++ /dev/null
@@ -1,178 +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 Wicket viewer
-#
-
-#
-# The maximum length of titles to display in standalone or parented tables.
-# Titles longer than this length will be truncated with trailing ellipses (...)
-#
-# For example, if set to 12, the title
-# "Buy milk on 15-Feb-13" will be truncated to "Buy milk ..."
-#
-# If set to 0, then only the icon will be shown.
-#
-isis.viewer.wicket.maxTitleLengthInStandaloneTables=0
-isis.viewer.wicket.maxTitleLengthInParentedTables=0
-
-
-#
-# in Firefox and more recent versions of Chrome 54+, cannot copy out of disabled fields; instead we use the
-# readonly attribute (https://www.w3.org/TR/2014/REC-html5-20141028/forms.html#the-readonly-attribute)
-# This behaviour is enabled by default but can be disabled using this flag
-#
-#isis.viewer.wicket.replaceDisabledTagWithReadonlyTag=true
-
-
-#
-# Whether to disable buttons after it has been clicked (for both form submit and no-arg actions), to prevent users
-# causing an error if they do a double click.
-# Also, whether to show an indicator alongside the button.
-#
-# This behaviour is enabled by default, but can be disabled using this flag.
-#
-#isis.viewer.wicket.preventDoubleClickForFormSubmit=true
-#isis.viewer.wicket.preventDoubleClickForNoArgAction=true
-#isis.viewer.wicket.useIndicatorForFormSubmit=true
-#isis.viewer.wicket.useIndicatorForNoArgAction=true
-
-
-#isis.viewer.wicket.datePicker.minDate=1900-01-01T00:00:00.000Z
-#isis.viewer.wicket.datePicker.maxDate=2100-01-01T00:00:00.000Z
-
-#isis.viewer.wicket.datePattern=dd-MM-yyyy
-#isis.viewer.wicket.dateTimePattern=dd-MM-yyyy HH:mm
-
-#isis.viewer.wicket.datePattern=dd/MM/yy
-#isis.viewer.wicket.dateTimePattern=dd/MM/yy HH:mm
-
-
-#
-# whether to strip wicket tags from markup (default is true, as they may break some CSS rules)
-#
-#isis.viewer.wicket.stripWicketTags=false
-
-
-#
-# whether to suppress the 'rememberMe' checkbox on the login page (default is false)
-#
-#isis.viewer.wicket.rememberMe.suppress=false
-
-
-#
-# Encryption key is used to encrypt the rememberMe user/password.  It should be set to a unique and private value.
-# If a hard-coded and publicly known value is used, then it would be possible for rememberMe user/password to be
-# intercepted and decrypted, compromising access.
-#
-# If no value is set then (for safety) a random UUID will be used as the encryption key.  The net effect of this
-# default is that 'rememberMe' will work, but only until the webapp is restarted (after which the end-user will
-# have to log in again).
-#
-#isis.viewer.wicket.rememberMe.encryptionKey=myEncryptionKey
-
-
-#
-# if user attempts to access a protected URL before signing in, then as a convenience the viewer will continue
-# through to that destination after successful login.  If you consider this to be a security risk then this flag
-# disables that behaviour (default is false).
-#
-#isis.viewer.wicket.clearOriginalDestination=true
-
-
-#
-# whether to show the Wicket debug bar and any other development utilities
-# (default depends on whether running in prototype mode or not; this property overrides that)
-#
-#isis.viewer.wicket.developmentUtilities.enable=true
-isis.viewer.wicket.developmentUtilities.enable=true
-
-
-
-#
-# whether to show bookmarks (defaults to true)
-#
-#isis.viewer.wicket.bookmarkedPages.showChooser=true
-isis.viewer.wicket.bookmarkedPages.showChooser=false
-
-
-
-#
-# the maximum number of pages to list in bookmark (default is 15)
-#
-#isis.viewer.wicket.bookmarkedPages.maxSize=15
-
-
-#
-# whether to show breadcrumbs (defaults to true)
-#
-#isis.viewer.wicket.breadcrumbs.showChooser=true
-isis.viewer.wicket.breadcrumbs.showChooser=false
-
-
-
-
-#
-# whether to show the bootstrap theme chooser (defaults false)
-#
-#isis.viewer.wicket.themes.showChooser=false
-isis.viewer.wicket.themes.showChooser=true
-
-
-#
-# comma-separated list of themes to choose from (default is to show all themes from bootswatch.com).
-#
-#isis.viewer.wicket.themes.enabled=bootstrap-theme,Cosmo,Flatly,Darkly,Sandstone,United
-
-
-#
-# whether to automatically select dependent choice when the choice it depends upon changes.
-#
-#isis.viewer.wicket.disableDependentChoiceAutoSelection=false
-
-
-#
-# enable liveReload.  For example, use with gradle -t -b liveReload.gradle --offline &
-#
-#isis.viewer.wicket.liveReloadUrl=http://localhost:35729/livereload.js?snipver=1
-
-
-
-#
-# cookie key holding the (encrypted) 'rememberMe' user/password.
-# If not specified then the cookie key 'isisWicketRememberMe' will be used; there is generally no need to change this.
-#
-#isis.viewer.wicket.rememberMe.cookieKey=isisWicketRememberMe
-
-
-#
-# specifies whether an INLINE or DIALOG prompt should be used for property edits and for action invocations (of actions
-# associated with a property).  This is a fallback where not specified on a case-by-case using @PropertyLayout or
-# @ActionLayout (or equivalents in the Xxx.layout.xml file).
-#
-# If not specified then the default is an inline prompt.
-#
-#isis.viewer.wicket.promptStyle=INLINE
-
-
-#
-# If set then reverts to pre-1.15.0 behaviour of redirecting to a new page on any action invocation or property edit.
-# If left to its default then the page will be updated if the same object is rendered, making for a smoother user
-# experience.
-#
-#isis.viewer.wicket.redirectEvenIfSameObject=false