You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@isis.apache.org by bu...@apache.org on 2013/02/15 11:32:11 UTC

svn commit: r850678 - in /websites/staging/isis/trunk: cgi-bin/ content/ content/core/about.html content/core/configuration-files.html content/core/deployment-type.html content/core/publishing-service.html content/documentation.html

Author: buildbot
Date: Fri Feb 15 10:32:10 2013
New Revision: 850678

Log:
Staging update by buildbot for isis

Added:
    websites/staging/isis/trunk/content/core/configuration-files.html
Modified:
    websites/staging/isis/trunk/cgi-bin/   (props changed)
    websites/staging/isis/trunk/content/   (props changed)
    websites/staging/isis/trunk/content/core/about.html
    websites/staging/isis/trunk/content/core/deployment-type.html
    websites/staging/isis/trunk/content/core/publishing-service.html
    websites/staging/isis/trunk/content/documentation.html

Propchange: websites/staging/isis/trunk/cgi-bin/
------------------------------------------------------------------------------
--- cms:source-revision (original)
+++ cms:source-revision Fri Feb 15 10:32:10 2013
@@ -1 +1 @@
-1446101
+1446499

Propchange: websites/staging/isis/trunk/content/
------------------------------------------------------------------------------
--- cms:source-revision (original)
+++ cms:source-revision Fri Feb 15 10:32:10 2013
@@ -1 +1 @@
-1446101
+1446499

Modified: websites/staging/isis/trunk/content/core/about.html
==============================================================================
--- websites/staging/isis/trunk/content/core/about.html (original)
+++ websites/staging/isis/trunk/content/core/about.html Fri Feb 15 10:32:10 2013
@@ -244,34 +244,35 @@
 <h3>Applib</h3>
 
 <ul>
-<li><a href="core/deployment-type.html">Deployment Types</a></li>
-<li><a href="core/applib.html">Applib</a></li>
+<li><a href="configuration-files.html">Configuration Files</a></li>
+<li><a href="deployment-type.html">Deployment Types</a></li>
+<li><a href="applib.html">Applib</a></li>
 </ul>
 
 <h3>Services</h3>
 
 <ul>
-<li><a href="core/publishing-service.html">Publishing Service</a> [not yet released]</li>
+<li><a href="publishing-service.html">Publishing Service</a> [not yet released]</li>
 </ul>
 
 <h3>Development</h3>
 
 <ul>
-<li><a href="core/unittestsupport.html">Unit Test Support</a> [stub]</li>
-<li><a href="core/integtestsupport.html">Integration Test Support</a> [stub]</li>
+<li><a href="unittestsupport.html">Unit Test Support</a> [stub]</li>
+<li><a href="integtestsupport.html">Integration Test Support</a> [stub]</li>
 </ul>
 
 <h3>Programming Model</h3>
 
 <ul>
-<li><a href="core/metamodel-finetuning-the-programming-model.html">Finetuning the Programming Model</a></li>
+<li><a href="metamodel-finetuning-the-programming-model.html">Finetuning the Programming Model</a></li>
 </ul>
 
 <h3>Runtime</h3>
 
 <ul>
-<li><a href="core/runtime.html">Core Runtime</a> [stub]</li>
-<li><a href="core/webserver.html">Webserver</a> [stub]</li>
+<li><a href="runtime.html">Core Runtime</a> [stub]</li>
+<li><a href="webserver.html">Webserver</a> [stub]</li>
 </ul>
 
 <h3>Bundled Components</h3>

Added: websites/staging/isis/trunk/content/core/configuration-files.html
==============================================================================
--- websites/staging/isis/trunk/content/core/configuration-files.html (added)
+++ websites/staging/isis/trunk/content/core/configuration-files.html Fri Feb 15 10:32:10 2013
@@ -0,0 +1,350 @@
+<!DOCTYPE html>
+<html lang="en">
+  <head>
+
+    <meta charset="utf-8">
+      <title>Configuration Files
</title>
+    <meta name="description" content="">
+    <meta name="author" content="">
+
+    <!-- Le HTML5 shim, for IE6-8 support of HTML elements -->
+    <!--[if lt IE 9]>
+      <script src="http://html5shim.googlecode.com/svn/trunk/html5.js"></script>
+    <![endif]-->
+
+    <!-- Le styles -->
+    <link href="./../bootstrap.css" rel="stylesheet">
+    <link href="./../prettify.css" rel="stylesheet">
+    <link href="./../bootstrap-mods.css" rel="stylesheet">
+
+    <style type="text/css">
+        body {
+          padding-top: 60px;
+        }
+        .sprite {
+            display: inline-block;
+            height: 20px;
+            margin: 0 auto 4px;
+            outline: medium none;
+            text-indent: -999em;
+            width: 24px;
+            background-image: url('./../images/sprites.png');
+            background-repeat: no-repeat;
+            overflow: hidden;
+            cursor: pointer;
+        }
+        .edit-page {
+            display: inline-block;
+            height: 20px;
+            margin: 0 auto 4px;
+            outline: medium none;
+            text-indent: -999em;
+            width: 24px;
+            background-image: url('./../images/edit.png');
+            background-repeat: no-repeat;
+            overflow: hidden;
+            cursor: pointer;
+        }
+        .fb-share {
+            background-position: 0px -40px;
+        }
+        .gp-share {
+            background-position: 0px 0px;
+        }
+        .tw-share {
+            background-position: 0px -80px;
+        }
+        .markdown-content {
+            min-height: 500px;
+        }
+        .book-image img {
+          border: 1px;
+          border-style: solid;
+        }
+        .release-matrix .heading {
+            background-color: #eeeeee;
+        }
+        .release-matrix .new {
+            color: #dd0000;
+            font-weight: bolder;
+        }
+        .stub,.note {
+            position: relative;
+            padding: 7px 15px;
+            margin-bottom: 18px;
+            color: #404040;
+            background-color: #eedc94;
+            background-repeat: repeat-x;
+            background-image: -khtml-gradient(linear, left top, left bottom, from(#fceec1), to(#eedc94));
+            background-image: -moz-linear-gradient(top, #fceec1, #eedc94);
+            background-image: -ms-linear-gradient(top, #fceec1, #eedc94);
+            background-image: -webkit-gradient(linear, left top, left bottom, color-stop(0%, #fceec1), color-stop(100%, #eedc94));
+            background-image: -webkit-linear-gradient(top, #fceec1, #eedc94);
+            background-image: -o-linear-gradient(top, #fceec1, #eedc94);
+            background-image: linear-gradient(top, #fceec1, #eedc94);
+            filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#fceec1', endColorstr='#eedc94', GradientType=0);
+            text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25);
+            border-color: #eedc94 #eedc94 #e4c652;
+            border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);
+            text-shadow: 0 1px 0 rgba(255, 255, 255, 0.5);
+            border-width: 1px;
+            border-style: solid;
+            -webkit-border-radius: 4px;
+            -moz-border-radius: 4px;
+            border-radius: 4px;
+            -webkit-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.25);
+            -moz-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.25);
+            box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.25);
+        }
+    </style>
+    <script type="text/javascript">
+      function fbshare () {
+          window.open(
+                  "http://www.facebook.com/sharer/sharer.php?u="+document.URL,
+                  'Share on Facebook',
+                  'width=640,height=426');
+      };
+      function gpshare () {
+          window.open(
+                  "https://plus.google.com/share?url="+document.URL,
+                  'Share on Google+',
+                  'width=584,height=385');
+      };
+      function twshare () {
+          window.open(
+                  "https://twitter.com/intent/tweet?url="+document.URL+"&text=Configuration Files
",
+                  'Share on Twitter',
+                  'width=800,height=526');
+      };
+    </script>
+
+    <!-- Le fav and touch icons -->
+    <link rel="shortcut icon" href="./../images/favicon.ico">
+    <link rel="apple-touch-icon" href="./../images/apple-touch-icon.png">
+    <link rel="apple-touch-icon" sizes="72x72" href="./../images/apple-touch-icon-72x72.png">
+    <link rel="apple-touch-icon" sizes="114x114" href="./../images/apple-touch-icon-114x114.png">
+
+    <script src="./../javascript/prettify.js" type="text/javascript"></script>
+    <script src="./../javascript/jquery-latest.js"></script>
+
+
+    <script src="http://platform.twitter.com/widgets.js" type="text/javascript"></script>
+    <script src="./../javascript/common.js"></script>
+    <script src="./../javascript/prettyprint.js"></script>
+
+    <script src="./../javascript/bootstrap-alert.js"></script>
+    <script src="./../javascript/bootstrap-dropdown.js"></script>
+    <script src="./../javascript/bootstrap-tooltip.js"></script>
+    <script src="./../javascript/bootstrap-alerts.js"></script>
+    <script src="./../javascript/bootstrap-modal.js"></script>
+    <script src="./../javascript/bootstrap-transition.js"></script>
+    <script src="./../javascript/bootstrap-button.js"></script>
+    <script src="./../javascript/bootstrap-popover.js"></script>
+    <script src="./../javascript/bootstrap-twipsy.js"></script>
+    <script src="./../javascript/bootstrap-buttons.js"></script>
+    <script src="./../javascript/bootstrap-scrollspy.js"></script>
+    <script src="./../javascript/bootstrap-typeahead.js"></script>
+    <script src="./../javascript/bootstrap-carousel.js"></script>
+    <script src="./../javascript/bootstrap-tab.js"></script>
+    <script src="./../javascript/bootstrap-collapse.js"></script>
+    <script src="./../javascript/bootstrap-tabs.js"></script>
+
+    
+    
+    
+
+    <script>
+    $(function () { prettyPrint() })
+    $().dropdown()
+    </script>
+
+    <!-- GAQ stuff removed here -->
+
+
+  </head>
+
+  <body>
+
+    <div class="topbar">
+      <div class="fill">
+        <div class="container">
+          <a class="brand" href="./../index.html">Apache Isis&trade;</a>
+          <ul class="nav">
+            <li><a href="./../index.html">Home</a></li>
+            <li><a href="./../download.html">Download</a></li>
+            <li class="dropdown">
+              <a href="#" class="dropdown-toggle" data-toggle="dropdown">Screenshots<b class="caret"></b></a>
+              <ul class="dropdown-menu">
+                <li><a href="./../getting-started/screenshots.html">Screenshots</a></li>
+                <li><a href="./../getting-started/screencasts.html">Screencasts</a></li>
+                <!--
+                <li><a href="#">Online Demo</a></li>
+                -->
+              </ul>
+            </li>
+            <li><a href="./../documentation.html">Docs</a></li>
+            <li><a href="./../support.html">Support</a></li>
+            <li class="dropdown">
+              <a href="#" class="dropdown-toggle" data-toggle="dropdown">Apache <b class="caret"></b></a>
+              <ul class="dropdown-menu">
+                <li>
+                  <a href="http://www.apache.org/">Apache Homepage <i class="icon-share-alt"></i></a>
+                </li>
+                <li>
+                  <a href="http://www.apache.org/licenses/">Licenses <i class="icon-share-alt"></i></a>
+                </li>
+                <li>
+                  <a href="http://www.apache.org/security/">Security <i class="icon-share-alt"></i></a>
+                </li>
+                <li>
+                  <a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship <i class="icon-share-alt"></i></a>
+                </li>
+                <li>
+                  <a href="http://www.apache.org/foundation/thanks.html">Thanks <i class="icon-share-alt"></i></a>
+                </li>
+              </ul>
+            </li>
+
+          </ul>
+
+            <!-- Google CSE Search Box Begins -->
+            <div style="float: right; position: relative; ">
+          <form action="http://www.google.com/cse" id="cse-search-box" _lpchecked="1">
+            <div>
+                <input type="hidden" name="cx" value="001500763902520246267:purt3m54z98">
+                <input type="hidden" name="ie" value="UTF-8">
+                <input type="text" name="q" size="31" style="border: 1px solid rgb(126, 157, 185); padding: 2px; background-color: rgb(255, 255, 255); background-position: 0% 50%; background-repeat: no-repeat no-repeat;">
+                <input type="submit" name="sa" value="Search">
+            </div>
+            <input name="siteurl" type="hidden" value="incubator.apache.org/isis/">
+            <input name="ref" type="hidden" value="">
+            <input name="ss" type="hidden" value="677j458329j2">
+        </form>
+        </div>
+            <!-- Google CSE Search Box Ends -->
+        </div>
+      </div>
+    </div>
+
+    <div class="container">
+      <div class="markdown-content">
+      
+
+<div class="page-header">
+<p><a href="./../documentation.html">Docs</a>&nbsp;&raquo&nbsp;<a href="./../core/about.html">Core</a></p>
+<h1>Configuration Files
+
+</h1>
+</div>
+
+<p>Isis has one mandatory configuration file, <code>isis.properties</code>.  For the webapp viewers, this typically lives alongside the <code>web.xml</code> file in the <code>WEB-INF</code> directory.  If necessary, though, it can be configured to live outside this directory; this is discussed later on in this article.</p>
+
+<p>In addition to the <code>isis.properties</code> file, Isis will also read from a number of supplementary configuration files.  For example:</p>
+
+<ul>
+<li>if the JDO (DataNucleus) objectstore is configured, then Isis will search for <code>persistor_datanucleus.proeprties</code>.</li>
+<li>Or, if the Shiro authentication has been configured, it will search for <code>authentication_shiro.properties</code>.</li>
+</ul>
+
+<p>This approach allows configuration to be partitioned by component.  To restate though, this is not mandatory: you can just use <code>isis.properties</code> for all configuration if you wish.</p>
+
+<h3>Specifying Components</h3>
+
+<p>A running Isis instance requires a persistor (aka objectstore), the authentication mechanism, the authorization mechanism, and a user profile store.  It also requires some sort of viewer or viewers.</p>
+
+<p>The persistor, authentication, authorization and profilestore are specified in the <code>isis.properties</code> file.  For example, this is the configuration of the <a href="../getting-started/quickstart-archetype.html">Wicket/Restful/JDO archetype</a>:</p>
+
+<pre>
+isis.persistor=datanucleus
+isis.authentication=shiro
+isis.authorization=shiro
+isis.user-profile-store=in-memory
+</pre>
+
+<p>The available values are registered in <a href="https://raw.github.com/apache/isis/master/core/runtime/src/main/resources/org/apache/isis/core/runtime/installer-registry.properties">installer-registry.properties</a>; alternatively the fully qualified class name can be specified.  In either case the appropriate component must also (of course) be added as a dependency to the <code>pom.xml</code> files.  </p>
+
+<p>The viewer is <em>not</em> specified in the <code>isis.properties</code> file; rather it is implied by the configuration of <code>WEB-INF/web.xml</code> file.  The archetypes are a good point of reference for the required servlet context listeners and servlets; every viewer has its own requirements.</p>
+
+<p>Some of the viewers have their own configuration properties.  These can also be moved out into their supplementary config files, provided that an additional entry is made in the <code>web.xml</code> file.  For example, to specify that the Wicket viewer and Restful Objects viewer config files should be read, add the following:</p>
+
+<pre>
+&lt;context-param&gt;
+    &lt;param-name&gt;isis.viewers&lt;/param-name&gt;
+    &lt;param-value&gt;wicket,restfulobjects&lt;/param-value&gt;
+&lt;/context-param&gt;
+</pre>
+
+<p>This will cause Isis to search and read for <code>viewer_wicket.properties</code> and <code>viewer_restfulobjects.properties</code>.</p>
+
+<p>(Note: this is only supported for the Wicket viewer for 1.2.0 on, see <a href="https://issues.apache.org/jira/browse/ISIS-342">ISIS-342</a>)</p>
+
+<h3>Specifying an external configuration directory</h3>
+
+<p>As noted above, by default Isis will look for configuration files in the <code>WEB-INF</code> directory.  If you wish to vary the configuration by environment (eg systest vs production), then this can be altered by specifying the <code>isis.config.dir</code> context parameter.</p>
+
+<p>If the external configuration directory will change from one environment to another, then specify the context parameter according to the documentation of your chosen servlet container.  For example, if using Tomcat 7.0, the context parameter can be specified by adding the following to the parameter:</p>
+
+<pre>
+&lt;Parameter name="isis.config.dir" value="/usr/local/tomcat/conf/"
+         override="true"/&gt;
+</pre>
+
+<p>For more detail see the <a href="http://tomcat.apache.org/tomcat-7.0-doc/config/context.html#Context_Parameters">Tomcat documentation</a>.</p>
+
+<p>If the external configuration directory is fixed for all environments, then you can specify within the <code>web.xml</code> itself:</p>
+
+<pre>
+&lt;context-param&gt;
+    &lt;param-name&gt;isis.config.dir&lt;/param-name&gt;
+    &lt;param-value&gt;location of external config directory&lt;/param-value&gt;
+&lt;/context-param&gt;
+</pre>
+
+<h3>Shiro</h3>
+
+<p>If using Shiro authentication and/or authorization, note that it reads from the <code>shiro.ini</code> configuration file.  By default this also resides in <code>WEB-INF</code>.</p>
+
+<p>Similar to Isis, Shiro lets this configuration directory be altered, by specifying the <code>shiroConfigLocations</code> context parameter.</p>
+
+<p>You can therefore override the default location using the same technique as described above for Isis' <code>isis.config.dir</code> context parameter.</p>
+
+
+
+      </div>
+
+        <div id="edit" class="modal hide fade in" style="display: none; ">
+            <div class="modal-header">
+                <a class="close" data-dismiss="modal">x</a>
+
+                <h3>Thank you for contributing to the documention!</h3>
+            </div>
+            <div class="modal-body">
+                <h4>Any help with the documentation is greatly appreciated.</h4>
+                <p>All edits are reviewed before going live, so feel free to do much more than fix typos or links.  If you see a page that could benefit from an entire rewrite, we'd be thrilled to review it.  Don't be surprised if we like it so much we ask you for help with other pages :)</p>
+                <small>NOTICE: unless indicated otherwise on the pages in question, all editable content available from apache.org is presumed to be licensed under the Apache License (AL) version 2.0 and hence all submissions to apache.org treated as formal Contributions under the license terms.</small>
+                <!--[if gt IE 6]>
+                <h4>Internet Explorer Users</h4>
+                <p>If you are not an Apache committer, click the Yes link and enter a <i>anonymous</i> for the username and leave the password empty</p>
+                <![endif]-->
+
+            </div>
+            <div class="modal-footer">
+                Do you have an Apache ID?
+                <a href="javascript:void(location.href='https://cms.apache.org/redirect?uri='+escape(location.href))" class="btn">Yes</a>
+                <a href="javascript:void(location.href='https://anonymous:@cms.apache.org/redirect?uri='+escape(location.href))" class="btn">No</a>
+            </div>
+        </div>
+        <script src="./../javascript/bootstrap-modal.js"></script>
+
+      <footer>
+        <p>
+        Copyright &copy; 2012~2013 The Apache Software Foundation, Licensed under the Apache License, Version 2.0.
+        <br/>
+        Apache Isis, Isis, Apache, the Apache feather logo, and the Apache Isis project logo are trademarks of The Apache Software Foundation.
+        </p>
+      </footer>
+
+    </div> <!-- /container -->
+
+  </body>
+</html>

Modified: websites/staging/isis/trunk/content/core/deployment-type.html
==============================================================================
--- websites/staging/isis/trunk/content/core/deployment-type.html (original)
+++ websites/staging/isis/trunk/content/core/deployment-type.html Fri Feb 15 10:32:10 2013
@@ -346,23 +346,6 @@ SINGLE_USER</td>
 
 <p>The default if not specified is <code>PROTOTYPE</code>.</p>
 
-<h2>Specifying components explicitly</h2>
-
-<p>To specify the various components explicitly, add an entry to <code>isis.properties</code> config file (in the <code>WEB-INF</code> directory for the web viewers, or the <code>config</code> directory for the DnD viewer).</p>
-
-<p>For example:</p>
-
-<pre>
-isis.authentication=ldap
-isis.authorization=file
-isis.persistor=datanucleus           # ie object store
-isis.user-profile-store=in-memory    # ie profile store
-</pre>
-
-<p>The available values are registered in <a href="https://raw.github.com/apache/isis/master/core/runtime/src/main/resources/org/apache/isis/core/runtime/installer-registry.properties">installer-registry.properties</a>; alternatively the fully qualified class name can be specified.  </p>
-
-<p>In either case the appropriate component must of course be added as a dependency to the <code>pom.xml</code> file.  </p>
-
 
 
       </div>

Modified: websites/staging/isis/trunk/content/core/publishing-service.html
==============================================================================
--- websites/staging/isis/trunk/content/core/publishing-service.html (original)
+++ websites/staging/isis/trunk/content/core/publishing-service.html Fri Feb 15 10:32:10 2013
@@ -381,7 +381,7 @@ isis.services=<i>...other services...</i
 <p>In addition, the <code>baseUrl</code> to use in hyperlinks must be specified, also in <code>isis.properties</code>; for example:</p>
 
 <pre>
-org.apache.isis.viewer.restfulobjects.rendering.eventserializer.RestfulObjectsSpecEventSerializer.baseUrl=https://myapp.mycompany.com:8080/restful/.
+isis.viewer.restfulobjects.RestfulObjectsSpecEventSerializer.baseUrl=https://myapp.mycompany.com:8080/restful/.
 </pre>
 
 <p>If no <code>baseUrl</code> is specified, then the default URL is <code>http://localhost:8080/restful/</code>.</p>

Modified: websites/staging/isis/trunk/content/documentation.html
==============================================================================
--- websites/staging/isis/trunk/content/documentation.html (original)
+++ websites/staging/isis/trunk/content/documentation.html Fri Feb 15 10:32:10 2013
@@ -308,6 +308,7 @@
 <h3>Applib</h3>
 
 <ul>
+<li><a href="core/configuration-files.html">Configuration Files</a></li>
 <li><a href="core/deployment-type.html">Deployment Types</a></li>
 <li><a href="core/applib.html">Applib</a></li>
 </ul>