incubator-isis-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From danhayw...@apache.org
Subject svn commit: r1103073 - in /incubator/isis/trunk: ./ core/commons/src/main/java/org/apache/isis/core/commons/authentication/ runtimes/dflt/remoting/ runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/authentication/ security/ src/...
Date Sat, 14 May 2011 12:03:23 GMT
Author: danhaywood
Date: Sat May 14 12:03:22 2011
New Revision: 1103073

URL: http://svn.apache.org/viewvc?rev=1103073&view=rev
Log:
renaming Scimpi's UserlessSession to AnonymousSession and promoting up to core.common; minor
tidy up of some apt/docbkx docs

Added:
    incubator/isis/trunk/core/commons/src/main/java/org/apache/isis/core/commons/authentication/AnonymousSession.java
      - copied, changed from r1102752, incubator/isis/trunk/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/UserlessSession.java
    incubator/isis/trunk/src/site/apt/more-thanks.apt
Removed:
    incubator/isis/trunk/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/UserlessSession.java
Modified:
    incubator/isis/trunk/core/commons/src/main/java/org/apache/isis/core/commons/authentication/AuthenticationSessionAbstract.java
    incubator/isis/trunk/pom.xml
    incubator/isis/trunk/runtimes/dflt/remoting/pom.xml
    incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/authentication/AuthenticationManagerStandardForDfltRuntime.java
    incubator/isis/trunk/security/pom.xml
    incubator/isis/trunk/src/site/apt/documentation.apt
    incubator/isis/trunk/src/site/site.xml
    incubator/isis/trunk/viewer/bdd/pom.xml
    incubator/isis/trunk/viewer/dnd/pom.xml
    incubator/isis/trunk/viewer/html/pom.xml
    incubator/isis/trunk/viewer/restful/pom.xml
    incubator/isis/trunk/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/UserManager.java
    incubator/isis/trunk/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/action/ActionAction.java
    incubator/isis/trunk/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/view/logon/Logon.java
    incubator/isis/trunk/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/view/logon/Secure.java
    incubator/isis/trunk/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/view/logon/User.java
    incubator/isis/trunk/viewer/scimpi/pom.xml
    incubator/isis/trunk/viewer/wicket/src/docbkx/guide/isis-wicket-viewer.xml

Copied: incubator/isis/trunk/core/commons/src/main/java/org/apache/isis/core/commons/authentication/AnonymousSession.java
(from r1102752, incubator/isis/trunk/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/UserlessSession.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/commons/src/main/java/org/apache/isis/core/commons/authentication/AnonymousSession.java?p2=incubator/isis/trunk/core/commons/src/main/java/org/apache/isis/core/commons/authentication/AnonymousSession.java&p1=incubator/isis/trunk/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/UserlessSession.java&r1=1102752&r2=1103073&rev=1103073&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/UserlessSession.java
(original)
+++ incubator/isis/trunk/core/commons/src/main/java/org/apache/isis/core/commons/authentication/AnonymousSession.java
Sat May 14 12:03:22 2011
@@ -17,23 +17,33 @@
  *  under the License.
  */
 
-package org.apache.isis.viewer.scimpi.dispatcher;
+package org.apache.isis.core.commons.authentication;
 
 import java.io.IOException;
 import java.util.Arrays;
 
-import org.apache.isis.core.commons.authentication.AuthenticationSessionAbstract;
 import org.apache.isis.core.commons.encoding.DataInputExtended;
 
-public class UserlessSession extends AuthenticationSessionAbstract {
+/**
+ * Originally designed for webapp viewers that want to provide access without requiring that
the
+ * user logs on.
+ * 
+ * <p>
+ * For example, a webapp want to have a registration/sign-up page, or a 'lost password' page.
+ */
+public class AnonymousSession extends AuthenticationSessionAbstract {
 
     private static final long serialVersionUID = 1L;
 
-    public UserlessSession() {
-        super("__web_default", Arrays.asList(new String[] { "not-logged-in" }), "");
+    private static final String USER_NAME = "__web_default";
+    private static final String ROLE = "not-logged-in";
+    private static final String CODE = "";
+    
+    public AnonymousSession() {
+        super(USER_NAME, Arrays.asList( ROLE ), CODE);
     }
 
-    public UserlessSession(final DataInputExtended input) throws IOException {
+    public AnonymousSession(final DataInputExtended input) throws IOException {
         super(input);
     }
 

Modified: incubator/isis/trunk/core/commons/src/main/java/org/apache/isis/core/commons/authentication/AuthenticationSessionAbstract.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/commons/src/main/java/org/apache/isis/core/commons/authentication/AuthenticationSessionAbstract.java?rev=1103073&r1=1103072&r2=1103073&view=diff
==============================================================================
--- incubator/isis/trunk/core/commons/src/main/java/org/apache/isis/core/commons/authentication/AuthenticationSessionAbstract.java
(original)
+++ incubator/isis/trunk/core/commons/src/main/java/org/apache/isis/core/commons/authentication/AuthenticationSessionAbstract.java
Sat May 14 12:03:22 2011
@@ -38,7 +38,7 @@ public abstract class AuthenticationSess
 
     private final String name;
     private final List<String> roles = new ArrayList<String>();
-    private final String code;
+    private final String validationCode;
 
     private final Map<String, Object> attributeByName = new HashMap<String, Object>();
 
@@ -51,17 +51,17 @@ public abstract class AuthenticationSess
         this(name, Collections.EMPTY_LIST, code);
     }
 
-    public AuthenticationSessionAbstract(final String name, final List<String> roles,
final String code) {
+    public AuthenticationSessionAbstract(final String name, final List<String> roles,
final String validationCode) {
         this.name = name;
         this.roles.addAll(roles);
-        this.code = code;
+        this.validationCode = validationCode;
         initialized();
     }
 
     public AuthenticationSessionAbstract(final DataInputExtended input) throws IOException
{
         this.name = input.readUTF();
         this.roles.addAll(Arrays.asList(input.readUTFs()));
-        this.code = input.readUTF();
+        this.validationCode = input.readUTF();
         initialized();
     }
 
@@ -69,7 +69,7 @@ public abstract class AuthenticationSess
     public void encode(final DataOutputExtended output) throws IOException {
         output.writeUTF(getUserName());
         output.writeUTFs(roles.toArray(new String[] {}));
-        output.writeUTF(code);
+        output.writeUTF(validationCode);
     }
 
     private void initialized() {
@@ -103,12 +103,12 @@ public abstract class AuthenticationSess
     }
 
     // ///////////////////////////////////////////////////////
-    // Code
+    // Validation Code
     // ///////////////////////////////////////////////////////
 
     @Override
     public String getValidationCode() {
-        return code;
+        return validationCode;
     }
 
     // ///////////////////////////////////////////////////////

Modified: incubator/isis/trunk/pom.xml
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/pom.xml?rev=1103073&r1=1103072&r2=1103073&view=diff
==============================================================================
--- incubator/isis/trunk/pom.xml (original)
+++ incubator/isis/trunk/pom.xml Sat May 14 12:03:22 2011
@@ -786,8 +786,12 @@
 					<excludeSubProjects>false</excludeSubProjects>
 					<numUnapprovedLicenses>0</numUnapprovedLicenses>
 					<excludes>
-						<exclude>**/*.hsp</exclude>
-						<exclude>**/*.svg</exclude>
+						<exclude>*.hsp</exclude>
+						<exclude>.project</exclude>
+						<exclude>*.svg</exclude>
+                        <exclude>*.classpath</exclude>
+                        <exclude>*.project</exclude>
+                        <exclude>*.ucd</exclude>
 					</excludes>
 				</configuration>
 			</plugin>

Modified: incubator/isis/trunk/runtimes/dflt/remoting/pom.xml
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/runtimes/dflt/remoting/pom.xml?rev=1103073&r1=1103072&r2=1103073&view=diff
==============================================================================
--- incubator/isis/trunk/runtimes/dflt/remoting/pom.xml (original)
+++ incubator/isis/trunk/runtimes/dflt/remoting/pom.xml Sat May 14 12:03:22 2011
@@ -39,6 +39,7 @@
 		<relativeUrl>runtimes/dflt/remoting/</relativeUrl>
 
         <docbkxGuideTitle>Apache Isis Default Runtime Remoting Guide</docbkxGuideTitle>
+        <docbkxGuideSubTitle>Configuration and Deployment Guide</docbkxGuideSubTitle>
         <docbkxGuideName>isis-remoting</docbkxGuideName>
 	</properties>
 

Modified: incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/authentication/AuthenticationManagerStandardForDfltRuntime.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/authentication/AuthenticationManagerStandardForDfltRuntime.java?rev=1103073&r1=1103072&r2=1103073&view=diff
==============================================================================
--- incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/authentication/AuthenticationManagerStandardForDfltRuntime.java
(original)
+++ incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/authentication/AuthenticationManagerStandardForDfltRuntime.java
Sat May 14 12:03:22 2011
@@ -19,13 +19,33 @@
 
 package org.apache.isis.runtimes.dflt.runtime.authentication;
 
+import org.apache.isis.applib.fixtures.LogonFixture;
 import org.apache.isis.core.commons.authentication.AuthenticationSession;
 import org.apache.isis.core.commons.config.IsisConfiguration;
 import org.apache.isis.core.runtime.authentication.standard.AuthenticationManagerStandard;
 import org.apache.isis.runtimes.dflt.runtime.authentication.exploration.ExplorationAuthenticator;
+import org.apache.isis.runtimes.dflt.runtime.authentication.exploration.ExplorationSession;
 import org.apache.isis.runtimes.dflt.runtime.authentication.fixture.LogonFixtureAuthenticator;
+import org.apache.isis.runtimes.dflt.runtime.system.DeploymentType;
 import org.apache.isis.runtimes.dflt.runtime.system.context.IsisContext;
 
+/**
+ * A refinement of the {@link AuthenticationManagerStandard}, which adds support to make
it
+ * easier without the palava of logging in when running in either
+ * {@link DeploymentType#EXPLORATION exploration} mode or in {@link DeploymentType#PROTOTYPE
prototype}
+ * mode. 
+ * 
+ * <p>
+ * Specifically:
+ * <ul>
+ * <li>the {@link ExplorationAuthenticator} will always provide a special
+ * {@link ExplorationSession} if running in the {@link DeploymentType} of {@link DeploymentType#EXPLORATION}.
+ * <li>the {@link LogonFixtureAuthenticator} will set up a session using the
+ * login provided by a {@link LogonFixture}, but prov
+ * 
+ *
+ * @version $Rev$ $Date$
+ */
 public class AuthenticationManagerStandardForDfltRuntime extends AuthenticationManagerStandard
{
 
     public AuthenticationManagerStandardForDfltRuntime(final IsisConfiguration configuration)
{

Modified: incubator/isis/trunk/security/pom.xml
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/security/pom.xml?rev=1103073&r1=1103072&r2=1103073&view=diff
==============================================================================
--- incubator/isis/trunk/security/pom.xml (original)
+++ incubator/isis/trunk/security/pom.xml Sat May 14 12:03:22 2011
@@ -42,6 +42,7 @@
 		<relativeUrl>security/</relativeUrl>
 
         <docbkxGuideTitle>Apache Isis Security</docbkxGuideTitle>
+        <docbkxGuideSubTitle>Configuration and Deployment Guide</docbkxGuideSubTitle>
         <docbkxGuideName>isis-security</docbkxGuideName>
 	</properties>
 

Modified: incubator/isis/trunk/src/site/apt/documentation.apt
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/src/site/apt/documentation.apt?rev=1103073&r1=1103072&r2=1103073&view=diff
==============================================================================
--- incubator/isis/trunk/src/site/apt/documentation.apt (original)
+++ incubator/isis/trunk/src/site/apt/documentation.apt Sat May 14 12:03:22 2011
@@ -46,7 +46,7 @@ Documentation
 *--------------------------------*------------------------------------*------------------------------------------------*---------------------------------------------------------------------------------*------------------------------------------------------------------------------------------*----------*---------+
 |<<Module>>                      |<<Module Description>>        
     |<<Documentation Title/Subject>>                 |<<PDF>>   
                                                                      |<<HTML>>
                                                                                 |<<Status>>|<<Owner>>|
 *--------------------------------+------------------------------------+------------------------------------------------+---------------------------------------------------------------------------------*------------------------------------------------------------------------------------------*----------*---------+
-|applib                          |Application Library                 |Programming Model
Conventions                   |{{{./applib/docbkx/pdf/isis-applib.pdf}PDF}}              
                      |{{{./applib/docbkx/html/guide/isis-applib.html}HTML}}             
                       |Done      |Dan      |
+|applib                          |Application Library                 |Developing domain
driven applications           |{{{./applib/docbkx/pdf/isis-applib.pdf}PDF}}              
                      |{{{./applib/docbkx/html/guide/isis-applib.html}HTML}}             
                       |Done      |Dan      |
 *--------------------------------+------------------------------------+------------------------------------------------+---------------------------------------------------------------------------------*------------------------------------------------------------------------------------------*----------*---------+
 |core                            |Core Framework                      |Architecture, APIs
and Customization            |{{{./core/docbkx/pdf/isis-core.pdf}PDF}}                   
                     |{{{./core/docbkx/html/guide/isis-core.html}HTML}}                  
                      |95%       |Dan, Rob |
 *--------------------------------+------------------------------------+------------------------------------------------+---------------------------------------------------------------------------------*------------------------------------------------------------------------------------------*----------*---------+
@@ -66,19 +66,19 @@ Documentation
 *--------------------------------+------------------------------------+------------------------------------------------+---------------------------------------------------------------------------------*------------------------------------------------------------------------------------------*----------*---------+
 |runtimes.dflt:remoting          |Remoting (Client/Server) Deployment |Configuration and
Deployment Guide              |{{{./runtimes/dflt/remoting/docbkx/pdf/isis-remoting.pdf}PDF}}
                  |{{{./runtimes/dflt/remoting/docbkx/html/guide/isis-remoting.html}HTML}}
                  |20%       |Rob      |
 *--------------------------------+------------------------------------+------------------------------------------------+---------------------------------------------------------------------------------*------------------------------------------------------------------------------------------*----------*---------+
-|runtimes:embedded               |Embedded MetaModel Deployment       |Configuration and
Deployment Guide              |{{{./runtimes/embedded/docbkx/pdf/isis-embedded-deployment.pdf}PDF}}
            |{{{./runtimes/embedded/docbkx/html/guide/isis-embedded-deployment.html}HTML}}
            |0%        |Dan      |
+|runtimes:embedded               |Embedded MetaModel Deployment       |Programming, Configuration
and Deployment Guide |{{{./runtimes/embedded/docbkx/pdf/isis-embedded-deployment.pdf}PDF}}
            |{{{./runtimes/embedded/docbkx/html/guide/isis-embedded-runtime.html}HTML}   }
            |0%        |Dan      |
 *--------------------------------+------------------------------------+------------------------------------------------+---------------------------------------------------------------------------------*------------------------------------------------------------------------------------------*----------*---------+
-|viewers:dnd                     |Drag-n-drop Viewer                  |Configuration and
Deployment Guide              |{{{./viewer/dnd/docbkx/pdf/isis-dnd-viewer.pdf}PDF}}      
                      |{{{./viewer/dnd/docbkx/html/guide/isis-dnd-viewer.html}HTML}}     
                       |40%       |Rob      |
+|viewers:dnd                     |Drag-n-drop Viewer                  |Configuration, Customization
and Deployment Guide |{{{./viewer/dnd/docbkx/pdf/isis-dnd-viewer.pdf}PDF}}               
             |{{{./viewer/dnd/docbkx/html/guide/isis-dnd-viewer.html}HTML}}              
              |40%       |Rob      |
 *--------------------------------+------------------------------------+------------------------------------------------+---------------------------------------------------------------------------------*------------------------------------------------------------------------------------------*----------*---------+
-|viewers:html                    |HTML Viewer                         |Configuration and
Deployment Guide              |{{{./viewer/html/docbkx/pdf/isis-html-viewer.pdf}PDF}}    
                      |{{{./viewer/html/docbkx/html/guide/isis-html-viewer.html}HTML}}   
                       |0%        |Rob      |
+|viewers:html                    |HTML Viewer                         |Configuration, Customization
and Deployment Guide |{{{./viewer/html/docbkx/pdf/isis-html-viewer.pdf}PDF}}             
             |{{{./viewer/html/docbkx/html/guide/isis-html-viewer.html}HTML}}            
              |0%        |Rob      |
 *--------------------------------+------------------------------------+------------------------------------------------+---------------------------------------------------------------------------------*------------------------------------------------------------------------------------------*----------*---------+
-|viewers:scimpi                  |Scimpi Viewer                       |Configuration and
Deployment Guide              |{{{./viewer/scimpi/docbkx/pdf/isis-scimpi-viewer.pdf}PDF}}
                      |{{{./viewer/scimpi/docbkx/html/guide/isis-scimpi-viewer.html}HTML}}
                      |0%        |Rob      |
+|viewers:scimpi                  |Scimpi Viewer                       |Configuration, Customization
and Deployment Guide |{{{./viewer/scimpi/docbkx/pdf/isis-scimpi-viewer.pdf}PDF}}         
             |{{{./viewer/scimpi/docbkx/html/guide/isis-scimpi-viewer.html}HTML}}        
              |0%        |Rob      |
 *--------------------------------+------------------------------------+------------------------------------------------+---------------------------------------------------------------------------------*------------------------------------------------------------------------------------------*----------*---------+
-|viewers:wicket                  |Wicket Viewer                       |Configuration and
Deployment Guide              |{{{./viewer/wicket/docbkx/pdf/isis-wicket-viewer.pdf}PDF}}
                      |{{{./viewer/wicket/docbkx/html/guide/isis-wicket-viewer.html}HTML}}
                      |95%       |Dan      |
+|viewers:wicket                  |Wicket Viewer                       |Configuration, Customization
and Deployment Guide |{{{./viewer/wicket/docbkx/pdf/isis-wicket-viewer.pdf}PDF}}         
             |{{{./viewer/wicket/docbkx/html/guide/isis-wicket-viewer.html}HTML}}        
              |95%       |Dan      |
 *--------------------------------+------------------------------------+------------------------------------------------+---------------------------------------------------------------------------------*------------------------------------------------------------------------------------------*----------*---------+
-|viewers:restful                 |Restful Viewer                      |Configuration and
Deployment Guide              |{{{./viewer/restful/docbkx/pdf/isis-restful-viewer.pdf}PDF}}
                    |{{{./viewer/restful/docbkx/html/guide/isis-restful-viewer.html}HTML}}
                    |90%       |Dan      |
+|viewers:restful                 |Restful Viewer                      |Configuration, Customization
and Deployment Guide |{{{./viewer/restful/docbkx/pdf/isis-restful-viewer.pdf}PDF}}       
             |{{{./viewer/restful/docbkx/html/guide/isis-restful-viewer.html}HTML}}      
              |90%       |Dan      |
 *--------------------------------+------------------------------------+------------------------------------------------+---------------------------------------------------------------------------------*------------------------------------------------------------------------------------------*----------*---------+
-|viewers:junit                   |JUnit Support                       |Configuration and
Deployment Guide              |{{{./viewer/junit/docbkx/pdf/isis-junit-support.pdf}PDF}} 
                      |{{{./viewer/junit/docbkx/html/guide/isis-junit-support.html}HTML}}
                       |0%        |Dan      |
+|viewers:junit                   |JUnit Support                       |Acceptance Testing
using JUnit                  |{{{./viewer/junit/docbkx/pdf/isis-junit-support.pdf}PDF}}  
                     |{{{./viewer/junit/docbkx/html/guide/isis-junit-support.html}HTML}} 
                      |0%        |Dan      |
 *--------------------------------+------------------------------------+------------------------------------------------+---------------------------------------------------------------------------------*------------------------------------------------------------------------------------------*----------*---------+
-|viewers:bdd                     |BDD Integration                     |Configuration and
Deployment Guide              |{{{./viewer/bdd/docbkx/pdf/isis-bdd-integration.pdf}PDF}} 
                      |{{{./viewer/bdd/docbkx/html/guide/isis-bdd-integration.html}HTML}}
                       |Done      |Dan      |
+|viewers:bdd                     |BDD Integration                     |Acceptance Testing
using BDD Frameworks         |{{{./viewer/bdd/docbkx/pdf/isis-bdd-integration.pdf}PDF}}  
                     |{{{./viewer/bdd/docbkx/html/guide/isis-bdd-integration.html}HTML}} 
                      |Done      |Dan      |
 *--------------------------------+------------------------------------+------------------------------------------------+---------------------------------------------------------------------------------*------------------------------------------------------------------------------------------*----------*---------+

Added: incubator/isis/trunk/src/site/apt/more-thanks.apt
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/src/site/apt/more-thanks.apt?rev=1103073&view=auto
==============================================================================
--- incubator/isis/trunk/src/site/apt/more-thanks.apt (added)
+++ incubator/isis/trunk/src/site/apt/more-thanks.apt Sat May 14 12:03:22 2011
@@ -0,0 +1,33 @@
+~~  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.
+
+
+More Thanks
+
+  As well as thanking the {{{http://apache.org/foundation/thanks.html}sponsors of Apache
Software Foundation}}, 
+  we'd also like to thank:
+  
+  * {{{http://headwaysoftware.com}Headway Software}}
+  
+    for generously providing licenses of their product, Structure101, to allow us to document
Isis.
+    
+  * {{{http://scootersoftware.com.com}Scooter Software}}
+  
+    for providing copies of their file comparison software, BeyondCompare
+    
+  []
+  

Modified: incubator/isis/trunk/src/site/site.xml
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/src/site/site.xml?rev=1103073&r1=1103072&r2=1103073&view=diff
==============================================================================
--- incubator/isis/trunk/src/site/site.xml (original)
+++ incubator/isis/trunk/src/site/site.xml Sat May 14 12:03:22 2011
@@ -136,7 +136,6 @@
                 <item name="PDF" href="docbkx/pdf/${docbkxGuideName}.pdf" />
                 <item name="HTML" href="docbkx/html/guide/${docbkxGuideName}.html" />
             </item>
-            <item name="Jottings" href="jottings.html" />
         </menu>
 
         <menu name="Project Info" ref="reports"/>
@@ -146,6 +145,7 @@
             <item name="License" href="http://www.apache.org/licenses/" />
             <item name="Sponsorship" href="http://www.apache.org/foundation/sponsorship.html"
/>
             <item name="Thanks" href="http://apache.org/foundation/thanks.html" />
+            <item name="More thanks" href="more-thanks.html" />
         </menu>
 
 	</body>

Modified: incubator/isis/trunk/viewer/bdd/pom.xml
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/bdd/pom.xml?rev=1103073&r1=1103072&r2=1103073&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/bdd/pom.xml (original)
+++ incubator/isis/trunk/viewer/bdd/pom.xml Sat May 14 12:03:22 2011
@@ -39,6 +39,7 @@
 		<relativeUrl>viewer/bdd/</relativeUrl>
 
         <docbkxGuideTitle>Apache Isis BDD Testing Guide</docbkxGuideTitle>
+        <docbkxGuideSubTitle>Acceptance Testing using BDD Frameworks</docbkxGuideSubTitle>
         <docbkxGuideName>isis-bdd-integration</docbkxGuideName>
     </properties>
 

Modified: incubator/isis/trunk/viewer/dnd/pom.xml
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/dnd/pom.xml?rev=1103073&r1=1103072&r2=1103073&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/dnd/pom.xml (original)
+++ incubator/isis/trunk/viewer/dnd/pom.xml Sat May 14 12:03:22 2011
@@ -38,7 +38,7 @@
 		<relativeUrl>viewer/dnd/</relativeUrl>
 
 		<docbkxGuideTitle>Apache Isis DnD Viewer</docbkxGuideTitle>
-        <docbkxGuideSubTitle>Customization, Configuration and Deployment Guide</docbkxGuideSubTitle>
+        <docbkxGuideSubTitle>Configuration, Customization and Deployment Guide</docbkxGuideSubTitle>
 		<docbkxGuideName>isis-dnd-viewer</docbkxGuideName>
     </properties>
 

Modified: incubator/isis/trunk/viewer/html/pom.xml
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/html/pom.xml?rev=1103073&r1=1103072&r2=1103073&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/html/pom.xml (original)
+++ incubator/isis/trunk/viewer/html/pom.xml Sat May 14 12:03:22 2011
@@ -38,7 +38,7 @@
 		<relativeUrl>viewer/html/</relativeUrl>
 
 		<docbkxGuideTitle>Apache Isis HTML Viewer</docbkxGuideTitle>
-        <docbkxGuideSubTitle>Configuration and Deployment Guide</docbkxGuideSubTitle>
+        <docbkxGuideSubTitle>Configuration, Customization and Deployment Guide</docbkxGuideSubTitle>
 		<docbkxGuideName>isis-html-viewer</docbkxGuideName>
     </properties>
 

Modified: incubator/isis/trunk/viewer/restful/pom.xml
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/restful/pom.xml?rev=1103073&r1=1103072&r2=1103073&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/restful/pom.xml (original)
+++ incubator/isis/trunk/viewer/restful/pom.xml Sat May 14 12:03:22 2011
@@ -41,7 +41,7 @@
 		<relativeUrl>viewer/restful/</relativeUrl>
 
         <docbkxGuideTitle>Apache Isis Restful Viewer</docbkxGuideTitle>
-        <docbkxGuideSubTitle>Configuration and Deployment Guide</docbkxGuideSubTitle>
+        <docbkxGuideSubTitle>Programming, Configuration and Deployment Guide</docbkxGuideSubTitle>
         <docbkxGuideName>isis-restful-viewer</docbkxGuideName>
     </properties>
 	

Modified: incubator/isis/trunk/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/UserManager.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/UserManager.java?rev=1103073&r1=1103072&r2=1103073&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/UserManager.java
(original)
+++ incubator/isis/trunk/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/UserManager.java
Sat May 14 12:03:22 2011
@@ -20,6 +20,7 @@
 package org.apache.isis.viewer.scimpi.dispatcher;
 
 import org.apache.isis.core.commons.authentication.AuthenticationSession;
+import org.apache.isis.core.commons.authentication.AnonymousSession;
 import org.apache.isis.core.runtime.authentication.AuthenticationManager;
 import org.apache.isis.core.runtime.authentication.AuthenticationRequestPassword;
 import org.apache.isis.runtimes.dflt.runtime.system.context.IsisContext;
@@ -41,7 +42,7 @@ public class UserManager {
     public static AuthenticationSession startRequest(final RequestContext context) {
         AuthenticationSession session = context.getSession();
         if (session == null) {
-            session = new UserlessSession();
+            session = new AnonymousSession();
             LOG.info("start anonymous request: " + session);
         } else {
             LOG.info("start request for: " + session.getUserName());
@@ -75,7 +76,7 @@ public class UserManager {
         IsisContext.closeSession();
         getAuthenticationManager().closeSession(session);
 
-        final UserlessSession replacementSession = new UserlessSession();
+        final AnonymousSession replacementSession = new AnonymousSession();
         IsisContext.openSession(replacementSession);
     }
 

Modified: incubator/isis/trunk/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/action/ActionAction.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/action/ActionAction.java?rev=1103073&r1=1103072&r2=1103073&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/action/ActionAction.java
(original)
+++ incubator/isis/trunk/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/action/ActionAction.java
Sat May 14 12:03:22 2011
@@ -23,6 +23,7 @@ import java.io.IOException;
 import java.util.List;
 
 import org.apache.isis.core.commons.authentication.AuthenticationSession;
+import org.apache.isis.core.commons.authentication.AnonymousSession;
 import org.apache.isis.core.commons.debug.DebugBuilder;
 import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
 import org.apache.isis.core.metamodel.consent.Consent;
@@ -38,7 +39,6 @@ import org.apache.isis.runtimes.dflt.run
 import org.apache.isis.viewer.scimpi.dispatcher.Action;
 import org.apache.isis.viewer.scimpi.dispatcher.Dispatcher;
 import org.apache.isis.viewer.scimpi.dispatcher.NotLoggedInException;
-import org.apache.isis.viewer.scimpi.dispatcher.UserlessSession;
 import org.apache.isis.viewer.scimpi.dispatcher.context.RequestContext;
 import org.apache.isis.viewer.scimpi.dispatcher.context.RequestContext.Scope;
 import org.apache.isis.viewer.scimpi.dispatcher.edit.FieldEditState;
@@ -77,7 +77,7 @@ public class ActionAction implements Act
             entryState = validateParameters(context, action, object);
 
             final AuthenticationSession session = context.getSession();
-            if (session == null && action.isUsable(new UserlessSession(), object).isVetoed())
{
+            if (session == null && action.isUsable(new AnonymousSession(), object).isVetoed())
{
                 throw new NotLoggedInException();
             }
 

Modified: incubator/isis/trunk/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/view/logon/Logon.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/view/logon/Logon.java?rev=1103073&r1=1103072&r2=1103073&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/view/logon/Logon.java
(original)
+++ incubator/isis/trunk/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/view/logon/Logon.java
Sat May 14 12:03:22 2011
@@ -22,9 +22,9 @@ package org.apache.isis.viewer.scimpi.di
 import java.util.ArrayList;
 import java.util.List;
 
+import org.apache.isis.core.commons.authentication.AnonymousSession;
 import org.apache.isis.runtimes.dflt.runtime.system.context.IsisContext;
 import org.apache.isis.viewer.scimpi.dispatcher.AbstractElementProcessor;
-import org.apache.isis.viewer.scimpi.dispatcher.UserlessSession;
 import org.apache.isis.viewer.scimpi.dispatcher.edit.FieldEditState;
 import org.apache.isis.viewer.scimpi.dispatcher.edit.FormState;
 import org.apache.isis.viewer.scimpi.dispatcher.processor.Request;
@@ -41,7 +41,7 @@ public class Logon extends AbstractEleme
             view = (String) request.getContext().getVariable("login-path");
         }
 
-        final boolean isNotLoggedIn = IsisContext.getSession().getAuthenticationSession()
instanceof UserlessSession;
+        final boolean isNotLoggedIn = IsisContext.getSession().getAuthenticationSession()
instanceof AnonymousSession;
         if (isNotLoggedIn) {
             loginForm(request, view);
         }

Modified: incubator/isis/trunk/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/view/logon/Secure.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/view/logon/Secure.java?rev=1103073&r1=1103072&r2=1103073&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/view/logon/Secure.java
(original)
+++ incubator/isis/trunk/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/view/logon/Secure.java
Sat May 14 12:03:22 2011
@@ -19,9 +19,9 @@
 
 package org.apache.isis.viewer.scimpi.dispatcher.view.logon;
 
+import org.apache.isis.core.commons.authentication.AnonymousSession;
 import org.apache.isis.runtimes.dflt.runtime.system.context.IsisContext;
 import org.apache.isis.viewer.scimpi.dispatcher.AbstractElementProcessor;
-import org.apache.isis.viewer.scimpi.dispatcher.UserlessSession;
 import org.apache.isis.viewer.scimpi.dispatcher.processor.Request;
 
 public class Secure extends AbstractElementProcessor {
@@ -29,7 +29,7 @@ public class Secure extends AbstractElem
 
     @Override
     public void process(final Request request) {
-        final boolean isLoggedIn = !(IsisContext.getSession().getAuthenticationSession()
instanceof UserlessSession);
+        final boolean isLoggedIn = !(IsisContext.getSession().getAuthenticationSession()
instanceof AnonymousSession);
         if (!isLoggedIn) {
             IsisContext.getMessageBroker().addWarning(
                 "You are not currently logged in! Please log in so you can continue.");

Modified: incubator/isis/trunk/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/view/logon/User.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/view/logon/User.java?rev=1103073&r1=1103072&r2=1103073&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/view/logon/User.java
(original)
+++ incubator/isis/trunk/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/view/logon/User.java
Sat May 14 12:03:22 2011
@@ -19,10 +19,10 @@
 
 package org.apache.isis.viewer.scimpi.dispatcher.view.logon;
 
+import org.apache.isis.core.commons.authentication.AnonymousSession;
 import org.apache.isis.runtimes.dflt.runtime.system.context.IsisContext;
 import org.apache.isis.viewer.scimpi.dispatcher.AbstractElementProcessor;
 import org.apache.isis.viewer.scimpi.dispatcher.Dispatcher;
-import org.apache.isis.viewer.scimpi.dispatcher.UserlessSession;
 import org.apache.isis.viewer.scimpi.dispatcher.processor.Request;
 
 public class User extends AbstractElementProcessor {
@@ -33,7 +33,7 @@ public class User extends AbstractElemen
 
     @Override
     public void process(final Request request) {
-        final boolean isLoggedIn = !(IsisContext.getSession().getAuthenticationSession()
instanceof UserlessSession);
+        final boolean isLoggedIn = !(IsisContext.getSession().getAuthenticationSession()
instanceof AnonymousSession);
         request.appendHtml("<div class=\"user\">");
         if (isLoggedIn) {
             displayUserAndLogoutLink(request);

Modified: incubator/isis/trunk/viewer/scimpi/pom.xml
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/scimpi/pom.xml?rev=1103073&r1=1103072&r2=1103073&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/scimpi/pom.xml (original)
+++ incubator/isis/trunk/viewer/scimpi/pom.xml Sat May 14 12:03:22 2011
@@ -40,7 +40,7 @@
 		<relativeUrl>viewer/scimpi/</relativeUrl>
 
 		<docbkxGuideTitle>Apache Isis Scimpi</docbkxGuideTitle>
-        <docbkxGuideSubTitle>Customization, Configuration and Deployment Guide</docbkxGuideSubTitle>
+        <docbkxGuideSubTitle>Configuration, Customization and Deployment Guide</docbkxGuideSubTitle>
 		<docbkxGuideName>isis-scimpi-viewer</docbkxGuideName>
     </properties>
 

Modified: incubator/isis/trunk/viewer/wicket/src/docbkx/guide/isis-wicket-viewer.xml
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/wicket/src/docbkx/guide/isis-wicket-viewer.xml?rev=1103073&r1=1103072&r2=1103073&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/wicket/src/docbkx/guide/isis-wicket-viewer.xml (original)
+++ incubator/isis/trunk/viewer/wicket/src/docbkx/guide/isis-wicket-viewer.xml Sat May 14
12:03:22 2011
@@ -21,16 +21,13 @@
 "file:./src/docbkx/dtd-4.5/docbookx.dtd">
 <book>
   <bookinfo>
-    <title>Apache Isis Wicket Viewer</title>
-
-    <subtitle>Integration between Apache Isis and Apache Wicket</subtitle>
-
-    <releaseinfo>Version 0.1</releaseinfo>
+    <title><?eval ${docbkxGuideTitle}?></title>
+    <subtitle><?eval ${docbkxGuideSubTitle}?></subtitle>
+    <releaseinfo><?eval ${project.version}?></releaseinfo>
 
     <authorgroup>
       <author>
         <firstname>Dan</firstname>
-
         <surname>Haywood</surname>
       </author>
     </authorgroup>



Mime
View raw message