Return-Path: X-Original-To: apmail-incubator-isis-commits-archive@minotaur.apache.org Delivered-To: apmail-incubator-isis-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id D07349051 for ; Wed, 30 Nov 2011 08:42:31 +0000 (UTC) Received: (qmail 69095 invoked by uid 500); 30 Nov 2011 08:42:31 -0000 Delivered-To: apmail-incubator-isis-commits-archive@incubator.apache.org Received: (qmail 69081 invoked by uid 500); 30 Nov 2011 08:42:31 -0000 Mailing-List: contact isis-commits-help@incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: isis-dev@incubator.apache.org Delivered-To: mailing list isis-commits@incubator.apache.org Received: (qmail 69074 invoked by uid 99); 30 Nov 2011 08:42:31 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 30 Nov 2011 08:42:31 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 30 Nov 2011 08:42:30 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 00F1D2388993; Wed, 30 Nov 2011 08:42:10 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1208326 - in /incubator/isis/trunk/examples: claims/viewer-html/src/main/webapp/ claims/viewer-html/src/main/webapp/WEB-INF/ onlinedemo/webapp/src/main/webapp/ onlinedemo/webapp/src/main/webapp/WEB-INF/ onlinedemo/webapp/src/main/webapp/do... Date: Wed, 30 Nov 2011 08:42:09 -0000 To: isis-commits@incubator.apache.org From: danhaywood@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20111130084210.00F1D2388993@eris.apache.org> Author: danhaywood Date: Wed Nov 30 08:42:05 2011 New Revision: 1208326 URL: http://svn.apache.org/viewvc?rev=1208326&view=rev Log: ISIS-130: updates to examples to go with ISIS-137 regression Added: incubator/isis/trunk/examples/onlinedemo/webapp/src/main/webapp/index.html Modified: incubator/isis/trunk/examples/claims/viewer-html/src/main/webapp/WEB-INF/isis.properties incubator/isis/trunk/examples/claims/viewer-html/src/main/webapp/default.css incubator/isis/trunk/examples/onlinedemo/webapp/src/main/webapp/WEB-INF/isis.properties incubator/isis/trunk/examples/onlinedemo/webapp/src/main/webapp/WEB-INF/logging.properties incubator/isis/trunk/examples/onlinedemo/webapp/src/main/webapp/WEB-INF/security_file.allow incubator/isis/trunk/examples/onlinedemo/webapp/src/main/webapp/WEB-INF/security_file.passwords incubator/isis/trunk/examples/onlinedemo/webapp/src/main/webapp/WEB-INF/viewer_html.properties incubator/isis/trunk/examples/onlinedemo/webapp/src/main/webapp/doc/index.html incubator/isis/trunk/examples/quickstart/viewer-html/src/main/webapp/WEB-INF/isis.properties incubator/isis/trunk/examples/quickstart/viewer-html/src/main/webapp/default.css Modified: incubator/isis/trunk/examples/claims/viewer-html/src/main/webapp/WEB-INF/isis.properties URL: http://svn.apache.org/viewvc/incubator/isis/trunk/examples/claims/viewer-html/src/main/webapp/WEB-INF/isis.properties?rev=1208326&r1=1208325&r2=1208326&view=diff ============================================================================== --- incubator/isis/trunk/examples/claims/viewer-html/src/main/webapp/WEB-INF/isis.properties (original) +++ incubator/isis/trunk/examples/claims/viewer-html/src/main/webapp/WEB-INF/isis.properties Wed Nov 30 08:42:05 2011 @@ -35,6 +35,9 @@ isis.persistor.object-factory=org.apache isis.persistor.domain-object-container=org.apache.isis.core.metamodel.services.container.DomainObjectContainerDefault #isis.persistor.domain-object-container=org.apache.isis.progmodel.wrapper.metamodel.DomainObjectContainerWrapperFactory + +isis.authentication=org.apache.isis.security.file.authentication.FileAuthenticationManagerInstaller + #isis.reflector.facets.include=org.apache.isis.runtimes.dflt.runtime.authorization.standard.AuthorizationFacetFactoryImpl #isis.authorization.learn=true Modified: incubator/isis/trunk/examples/claims/viewer-html/src/main/webapp/default.css URL: http://svn.apache.org/viewvc/incubator/isis/trunk/examples/claims/viewer-html/src/main/webapp/default.css?rev=1208326&r1=1208325&r2=1208326&view=diff ============================================================================== --- incubator/isis/trunk/examples/claims/viewer-html/src/main/webapp/default.css (original) +++ incubator/isis/trunk/examples/claims/viewer-html/src/main/webapp/default.css Wed Nov 30 08:42:05 2011 @@ -425,7 +425,7 @@ DIV#body DIV#view { /* Start of Message Header */ DIV.message-header { position: relative; - top: 10px; + top: 40px; padding: 5px 25px 5px 25px; margin: 0 50px 0 255px; vertical-align: middle; @@ -931,3 +931,8 @@ SPAN.user { display: block; padding: 4px; } +.nav-link { + display: block; + padding: 10px; + font-size: 75%; +} \ No newline at end of file Modified: incubator/isis/trunk/examples/onlinedemo/webapp/src/main/webapp/WEB-INF/isis.properties URL: http://svn.apache.org/viewvc/incubator/isis/trunk/examples/onlinedemo/webapp/src/main/webapp/WEB-INF/isis.properties?rev=1208326&r1=1208325&r2=1208326&view=diff ============================================================================== --- incubator/isis/trunk/examples/onlinedemo/webapp/src/main/webapp/WEB-INF/isis.properties (original) +++ incubator/isis/trunk/examples/onlinedemo/webapp/src/main/webapp/WEB-INF/isis.properties Wed Nov 30 08:42:05 2011 @@ -14,32 +14,62 @@ # KIND, either express or implied. See the License for the # specific language governing permissions and limitations # under the License. + + +# these are the services/repositories that are instantiated by the +# framework. These are automatically injected into any domain object +# that declares a dependency. Those that are not hidden are also +# shown in the user interface. isis.services.prefix = org.apache.isis.examples.onlinedemo -isis.services = objstore.dflt.items.ToDoItemsDefault, objstore.dflt.items.CategoriesDefault, fixture.items.DemoFixturesDefault +isis.services = objstore.dflt.items.ToDoItemsDefault,\ + objstore.dflt.items.CategoriesDefault,\ + fixture.items.DemoFixturesDefault + +# the online demo does not use the framework to setup fixtures; +# instead users can install their own fixtures isis.fixtures.prefix= org.apache.isis.examples.onlinedemo //isis.fixtures= fixture.LogonAsSvenFixture,fixture.items.ToDoItemsFixture -#isis.exploration.users=sven, dick, bob - - +# related to the lazy loading feature (below); helps the framework identify the "real" +# class that is in use. both cglib and javassist implementations are provided, or it can be switched off. isis.reflector.class-substitutor=org.apache.isis.runtimes.dflt.bytecode.dflt.classsubstitutor.CglibClassSubstitutor #isis.reflector.class-substitutor=org.apache.isis.runtimes.dflt.bytecode.javassist.classsubstitutor.JavassistClassSubstitutor #isis.reflector.class-substitutor=org.apache.isis.runtimes.dflt.bytecode.identity.classsubstitutor.ClassSubstitutorIdentity +# used to support lazy loading, both cglib and javassist implementations are provided, +# or it can be switched off (because some object store implementations do this implicitly) isis.persistor.object-factory=org.apache.isis.runtimes.dflt.bytecode.dflt.objectfactory.CglibObjectFactory #isis.persistor.object-factory=org.apache.isis.runtimes.dflt.bytecode.javassist.objectfactory.JavassistObjectFactory #isis.persistor.object-factory=org.apache.isis.runtimes.dflt.bytecode.identity.objectfactory.ObjectFactoryBasic +# the implementation of the container to inject into every domain object. +# this is not usually changed. isis.persistor.domain-object-container=org.apache.isis.core.metamodel.services.container.DomainObjectContainerDefault + +# the authentication mechanism is configurable. the onlinedemo uses its own implementation, +# which uses an in-memory list of registered users. isis.authentication=org.apache.isis.examples.onlinedemo.auth.AuthenticationManagerSupportingInMemoryRegistrationInstaller + +# the framework supports authorization; the usual implementation maps roles to permissions. +# this is switched off for the onlinedemo, however #isis.reflector.facets.include=org.apache.isis.runtimes.dflt.runtime.authorization.standard.AuthorizationFacetFactoryImpl + + +# the default authorization mechanism can be put into "learn" mode, so that it allows all +# requests through, and writes out the permission entries that were checked. #isis.authorization.learn=true + +# configure the profile store. this facility is not supported by the viewers used in +# the onlinedemo, so is included here for completeness only isis.user-profile-store=in-memory + + +# configure the object store. using the inmemory objectstore means that all data will +# be lost when the app is restarted. it is commonly used for prototyping and testing isis.persistor=in-memory -#isis.xmlos.dir=/tmp/xml \ No newline at end of file Modified: incubator/isis/trunk/examples/onlinedemo/webapp/src/main/webapp/WEB-INF/logging.properties URL: http://svn.apache.org/viewvc/incubator/isis/trunk/examples/onlinedemo/webapp/src/main/webapp/WEB-INF/logging.properties?rev=1208326&r1=1208325&r2=1208326&view=diff ============================================================================== --- incubator/isis/trunk/examples/onlinedemo/webapp/src/main/webapp/WEB-INF/logging.properties (original) +++ incubator/isis/trunk/examples/onlinedemo/webapp/src/main/webapp/WEB-INF/logging.properties Wed Nov 30 08:42:05 2011 @@ -14,7 +14,9 @@ # KIND, either express or implied. See the License for the # specific language governing permissions and limitations # under the License. -# apache's log4j is used to provide system logging. + + +# the framework uses log4j is used to provide system logging. log4j.rootCategory=INFO, Console # The console appender Modified: incubator/isis/trunk/examples/onlinedemo/webapp/src/main/webapp/WEB-INF/security_file.allow URL: http://svn.apache.org/viewvc/incubator/isis/trunk/examples/onlinedemo/webapp/src/main/webapp/WEB-INF/security_file.allow?rev=1208326&r1=1208325&r2=1208326&view=diff ============================================================================== --- incubator/isis/trunk/examples/onlinedemo/webapp/src/main/webapp/WEB-INF/security_file.allow (original) +++ incubator/isis/trunk/examples/onlinedemo/webapp/src/main/webapp/WEB-INF/security_file.allow Wed Nov 30 08:42:05 2011 @@ -14,3 +14,10 @@ # 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 +# not used by the onlinedemo +# + Modified: incubator/isis/trunk/examples/onlinedemo/webapp/src/main/webapp/WEB-INF/security_file.passwords URL: http://svn.apache.org/viewvc/incubator/isis/trunk/examples/onlinedemo/webapp/src/main/webapp/WEB-INF/security_file.passwords?rev=1208326&r1=1208325&r2=1208326&view=diff ============================================================================== --- incubator/isis/trunk/examples/onlinedemo/webapp/src/main/webapp/WEB-INF/security_file.passwords (original) +++ incubator/isis/trunk/examples/onlinedemo/webapp/src/main/webapp/WEB-INF/security_file.passwords Wed Nov 30 08:42:05 2011 @@ -14,7 +14,15 @@ # KIND, either express or implied. See the License for the # specific language governing permissions and limitations # under the License. -sven:pass + + +# +# configuration file for the file-based authentication +# not used by the onlinedemo +# + +# list of users, and their password, and optionally roles +sven:pass:role1|role2|role3 dick:pass bob:pass joe:pass Modified: incubator/isis/trunk/examples/onlinedemo/webapp/src/main/webapp/WEB-INF/viewer_html.properties URL: http://svn.apache.org/viewvc/incubator/isis/trunk/examples/onlinedemo/webapp/src/main/webapp/WEB-INF/viewer_html.properties?rev=1208326&r1=1208325&r2=1208326&view=diff ============================================================================== --- incubator/isis/trunk/examples/onlinedemo/webapp/src/main/webapp/WEB-INF/viewer_html.properties (original) +++ incubator/isis/trunk/examples/onlinedemo/webapp/src/main/webapp/WEB-INF/viewer_html.properties Wed Nov 30 08:42:05 2011 @@ -14,6 +14,14 @@ # KIND, either express or implied. See the License for the # specific language governing permissions and limitations # under the License. + +# +# configuration file for the HTML viewer +# + +# customization for the header and footer isis.viewer.html.header= isis.viewer.html.footer=
Powered by Apache Isis
+ +# not used by the onlinedemo; deploy the WAR as usual isis.viewer.html.port=8080 Modified: incubator/isis/trunk/examples/onlinedemo/webapp/src/main/webapp/doc/index.html URL: http://svn.apache.org/viewvc/incubator/isis/trunk/examples/onlinedemo/webapp/src/main/webapp/doc/index.html?rev=1208326&r1=1208325&r2=1208326&view=diff ============================================================================== --- incubator/isis/trunk/examples/onlinedemo/webapp/src/main/webapp/doc/index.html (original) +++ incubator/isis/trunk/examples/onlinedemo/webapp/src/main/webapp/doc/index.html Wed Nov 30 08:42:05 2011 @@ -7,7 +7,7 @@ + + +

This is an online demo for Apache Isis. + It provides:

+
    +

  • Documentation

    +

    describing the domain model and the webapps

    +
    • + +

  • Access to the HTML Viewer

    • + +

  • Access to the REST API

    +

    nb: need to setup security HTTP headers first; see docs

    +
    • +
+ +

For further information, please subscribe to the isis-dev mailing + list.

+ + Modified: incubator/isis/trunk/examples/quickstart/viewer-html/src/main/webapp/WEB-INF/isis.properties URL: http://svn.apache.org/viewvc/incubator/isis/trunk/examples/quickstart/viewer-html/src/main/webapp/WEB-INF/isis.properties?rev=1208326&r1=1208325&r2=1208326&view=diff ============================================================================== --- incubator/isis/trunk/examples/quickstart/viewer-html/src/main/webapp/WEB-INF/isis.properties (original) +++ incubator/isis/trunk/examples/quickstart/viewer-html/src/main/webapp/WEB-INF/isis.properties Wed Nov 30 08:42:05 2011 @@ -18,7 +18,8 @@ isis.services.prefix = objstore.dflt isis.services = todo.ToDoItemRepositoryDefault isis.fixtures.prefix= fixture -isis.fixtures= LogonAsSvenFixture,todo.ToDoItemsFixture +isis.fixtures= LogonAsSvenFixture,todo.ToDoItemsFixture +#isis.fixtures= todo.ToDoItemsFixture isis.exploration.users=sven, dick, bob @@ -35,9 +36,13 @@ isis.persistor.object-factory=org.apache isis.persistor.domain-object-container=org.apache.isis.core.metamodel.services.container.DomainObjectContainerDefault #isis.persistor.domain-object-container=org.apache.isis.progmodel.wrapper.metamodel.DomainObjectContainerWrapperFactory + +isis.authentication=org.apache.isis.security.file.authentication.FileAuthenticationManagerInstaller + #isis.reflector.facets.include=org.apache.isis.runtimes.dflt.runtime.authorization.standard.AuthorizationFacetFactoryImpl #isis.authorization.learn=true + isis.user-profile-store=in-memory isis.persistor=in-memory Modified: incubator/isis/trunk/examples/quickstart/viewer-html/src/main/webapp/default.css URL: http://svn.apache.org/viewvc/incubator/isis/trunk/examples/quickstart/viewer-html/src/main/webapp/default.css?rev=1208326&r1=1208325&r2=1208326&view=diff ============================================================================== --- incubator/isis/trunk/examples/quickstart/viewer-html/src/main/webapp/default.css (original) +++ incubator/isis/trunk/examples/quickstart/viewer-html/src/main/webapp/default.css Wed Nov 30 08:42:05 2011 @@ -425,7 +425,7 @@ DIV#body DIV#view { /* Start of Message Header */ DIV.message-header { position: relative; - top: 10px; + top: 40px; padding: 5px 25px 5px 25px; margin: 0 50px 0 255px; vertical-align: middle; @@ -931,3 +931,9 @@ SPAN.user { display: block; padding: 4px; } + +.nav-link { + display: block; + padding: 10px; + font-size: 75%; +} \ No newline at end of file