incubator-isis-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From danhayw...@apache.org
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 GMT
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=<div id="site-header"><div id="site-logo">&nbsp;</div></div>
 isis.viewer.html.footer=<div id="page-footer"><small>Powered by Apache Isis</small></div>
+
+# 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 @@
 
     <style type="text/css">
         body {
-            background-color: #994422;
+            background-color: #1A467B;
             font-family: Verdana, Helvetica, Arial;
             font-size: 90%;
         }
@@ -29,7 +29,7 @@
 
       <li><a href="#rest">REST API</a></li>
 
-      <li><a>Next Steps</a></li>
+      <li><a href="#next-steps">Next Steps</a></li>
     </ul><h2><a name="intro">Introduction</a></h2><p><i>Apache
Isis</i> is a
   framework to let you rapidly develop domain-driven apps in Java. It defines
   a clean programming model, has <acronym>BDD</acronym> and JUnit testing
@@ -118,6 +118,18 @@
   indicating no arguments):</p><img alt="Invoke Request"
   src="restconsole-invoke-request.png" style="width:600px;" /><p>Submit this
   request, and the action will be invoked:</p><img alt="Invoke Response"
-  src="restconsole-invoke-response.png" style="width:600px;" /><p></p><p></p>
-  </div></body>
+  src="restconsole-invoke-response.png" style="width:600px;" /><h2><a
+  name="next-steps">Next Steps</a></h2><p>You can download the WAR file
<a
+  href="isis-onlinedemo.war">here</a>. It uses an in-memory objectstore, so
+  there is no set up (but note also: any data will be lost when you restart
+  the app).</p><p>To use the WAR, either:</p><ul>
+      <li>deploy in the usual way to a servlet container (eg copy to
+      <tt>webapps</tt> directory for Tomcat); or</li>
+
+      <li>because the WAR is self-hosting, simply start from the command line.
+      Use: <blockquote>java -jar isis-onlinedemo.war</blockquote>(add --help
+      for options)</li>
+    </ul><p>For further information, please subscribe to the <a
+  href="mailto:isis-dev-subscribe@incubator.apache.org">isis-dev</a> mailing
+  list.</p></div></body>
 </html>

Added: incubator/isis/trunk/examples/onlinedemo/webapp/src/main/webapp/index.html
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/examples/onlinedemo/webapp/src/main/webapp/index.html?rev=1208326&view=auto
==============================================================================
--- incubator/isis/trunk/examples/onlinedemo/webapp/src/main/webapp/index.html (added)
+++ incubator/isis/trunk/examples/onlinedemo/webapp/src/main/webapp/index.html Wed Nov 30
08:42:05 2011
@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+  <head>
+    <title>Apache Isis Online Demo</title>
+
+    <style type="text/css">
+        body {
+            background-color: #1A467B;
+            font-family: Verdana, Helvetica, Arial;
+            font-size: 90%;
+        }
+        #wrapper {
+            background-color: #ffffff;
+            width: 900px;
+            min-height: 900px;
+            margin: 8px auto;
+            padding: 12px;
+        }
+    </style>
+  </head>
+
+  <body><div id="wrapper"> <p>This is an online demo for <a href="http://incubator.apache.org/isis">Apache
Isis</a>.
+      It provides:</p>
+      <ul>
+      <li><p><a href="doc/index.html">Documentation</a></p>
+          <p>describing the domain model and the webapps</p>
+          </li>
+
+      <li><p>Access to the <a href="htmlviewer">HTML Viewer</a></p></li>
+
+      <li><p>Access to the REST API</p>
+          <p>nb: need to setup security HTTP headers first; see <a href="doc/index.html">docs</a></p>
+      </li>
+  </ul>
+
+  <p>For further information, please subscribe to the <a
+  href="mailto:isis-dev-subscribe@incubator.apache.org">isis-dev</a> mailing
+  list.</p>
+  </body>
+</html>

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



Mime
View raw message