You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@shale.apache.org by cr...@apache.org on 2006/08/29 01:48:49 UTC

svn commit: r437879 - in /shale/sandbox/shale-dialog2: ./ src/ src/main/ src/main/java/ src/main/java/org/ src/main/java/org/apache/ src/main/java/org/apache/shale/ src/main/java/org/apache/shale/dialog2/ src/main/java/org/apache/shale/dialog2/faces/ s...

Author: craigmcc
Date: Mon Aug 28 16:48:48 2006
New Revision: 437879

URL: http://svn.apache.org/viewvc?rev=437879&view=rev
Log:
Beginnings of experiments on improving the Dialog functionality in
Shale.

Abstract out the basic interfaces required to operate in a dialog
environment from the implementation of the state machine.  The primary
interface is o.a.s.dialog2.Context, which is instantiated (in request
scope) once per active dialog for a user.  It plays a similar role to
what Status does in the current implementation (but does not suffer from
"one active dialog per user" problems).  In addition, there is a
simplified Dialog2NavigationHandler that utilizes the new approach to
start up a Context based on a logical outcome with a matching prefix,
but it will also be possible to start a dialog instance
programmatically, by interacting with a o.a.s.dialog2.Contexts (note the
trailing "s") instance provided by a state machine implementation.

This API is packaged in a separate package (org.apache.shale.dialog2),
and uses unique attribute keys for everything, so that it should not
interfere with the existing functionality while we are experimenting.
In fact, as you can see from the POM, it has no direct dependency on the
rest of Shale at the moment either.  All you'd need to add is this JAR,
plus the state machine implementation for your favorite version (see
upcoming submits).

WARNING:  This code has been desk checked, and compiles clean, but has
not been tested for real yet.  I'm committing now for feedback on the
design approach, and so we can all experiment.

SHALE-10 SHALE-48 SHALE-61


Added:
    shale/sandbox/shale-dialog2/
    shale/sandbox/shale-dialog2/pom.xml
    shale/sandbox/shale-dialog2/src/
    shale/sandbox/shale-dialog2/src/main/
    shale/sandbox/shale-dialog2/src/main/java/
    shale/sandbox/shale-dialog2/src/main/java/org/
    shale/sandbox/shale-dialog2/src/main/java/org/apache/
    shale/sandbox/shale-dialog2/src/main/java/org/apache/shale/
    shale/sandbox/shale-dialog2/src/main/java/org/apache/shale/dialog2/
    shale/sandbox/shale-dialog2/src/main/java/org/apache/shale/dialog2/Constants.java
    shale/sandbox/shale-dialog2/src/main/java/org/apache/shale/dialog2/Context.java
    shale/sandbox/shale-dialog2/src/main/java/org/apache/shale/dialog2/Contexts.java
    shale/sandbox/shale-dialog2/src/main/java/org/apache/shale/dialog2/faces/
    shale/sandbox/shale-dialog2/src/main/java/org/apache/shale/dialog2/faces/Dialog2NavigationHandler.java
    shale/sandbox/shale-dialog2/src/main/java/org/apache/shale/dialog2/faces/Dialog2PhaseListener.java
    shale/sandbox/shale-dialog2/src/main/resources/
    shale/sandbox/shale-dialog2/src/main/resources/META-INF/
    shale/sandbox/shale-dialog2/src/main/resources/META-INF/LICENSE.txt
    shale/sandbox/shale-dialog2/src/main/resources/META-INF/NOTICE.txt
    shale/sandbox/shale-dialog2/src/main/resources/META-INF/faces-config.xml
    shale/sandbox/shale-dialog2/src/test/
    shale/sandbox/shale-dialog2/src/test/java/
    shale/sandbox/shale-dialog2/src/test/resources/

Added: shale/sandbox/shale-dialog2/pom.xml
URL: http://svn.apache.org/viewvc/shale/sandbox/shale-dialog2/pom.xml?rev=437879&view=auto
==============================================================================
--- shale/sandbox/shale-dialog2/pom.xml (added)
+++ shale/sandbox/shale-dialog2/pom.xml Mon Aug 28 16:48:48 2006
@@ -0,0 +1,52 @@
+<!--
+/*
+ * Copyright 2006 The Apache Software Foundation.
+ *
+ * Licensed 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.
+ *
+ * $Id: pom.xml 160258 2006-05-21 01:56:12Z wsmoak $
+ */
+-->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+
+    <parent>
+        <groupId>org.apache.shale</groupId>
+        <artifactId>shale-parent</artifactId>
+        <version>1.0.4-SNAPSHOT</version>
+    </parent>
+
+    <artifactId>shale-dialog2</artifactId>
+    <packaging>jar</packaging>
+    <name>Shale Dialog Manager Integration</name>
+
+    <dependencies>
+
+        <dependency>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+            <scope>test</scope>
+        </dependency>
+
+<!--
+        <dependency>
+            <groupId>org.apache.shale</groupId>
+            <artifactId>shale-core</artifactId>
+            <version>${pom.version}</version>
+        </dependency>
+-->
+
+    </dependencies>
+
+</project>

Added: shale/sandbox/shale-dialog2/src/main/java/org/apache/shale/dialog2/Constants.java
URL: http://svn.apache.org/viewvc/shale/sandbox/shale-dialog2/src/main/java/org/apache/shale/dialog2/Constants.java?rev=437879&view=auto
==============================================================================
--- shale/sandbox/shale-dialog2/src/main/java/org/apache/shale/dialog2/Constants.java (added)
+++ shale/sandbox/shale-dialog2/src/main/java/org/apache/shale/dialog2/Constants.java Mon Aug 28 16:48:48 2006
@@ -0,0 +1,68 @@
+/*
+ * Copyright 2006 The Apache Software Foundation.
+ *
+ * Licensed 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.
+ */
+
+package org.apache.shale.dialog2;
+
+/**
+ * <p>Manifest constants related to the integration of state machine
+ * implementations into the Shale Dialog Manager.</p>
+ *
+ * @since 1.0.4
+ */
+public final class Constants {
+
+
+    /**
+     * <p>Request scoped attribute under which the {@link Context} instance
+     * for the dialog that is active for this view (if any) is stored.</p>
+     *
+     * <p>FIXME - review this value if this class is promoted out of
+     * the sandbox.</p>
+     */
+    public static final String CONTEXT_BEAN = "dialog2";
+
+
+    /**
+     * <p>Session scoped attribute under which the {@link Contexts} instance
+     * for this user (if any) is stored.  A particular integration will
+     * typically declare itself to be a session scoped managed bean with
+     * this name.</p>
+     */
+    public static final String CONTEXTS_BEAN =
+            "org.apache.shale.dialog2.CONTEXTS";
+
+
+    /**
+     * <p>Generic attribute name (on the view root component of the current
+     * JSF component tree) under which the context identifier for the
+     * dialog instance that is current for this view (if any) should be
+     * stored and retrieved.</p>
+     *
+     * <p>FIXME - review this value if this class is promoted out of
+     * the sandbox.</p>
+     */
+    public static final String CONTEXT_ID_ATTR =
+            "org.apache.shale.dialog2.CONTEXT_ID";
+
+
+    /**
+     * <p>Prefix on a logical outcome that indicates a new dialog instance
+     * should be initiated.</p>
+     */
+    public static final String DIALOG_PREFIX = "dialog2:";
+
+
+}
\ No newline at end of file

Added: shale/sandbox/shale-dialog2/src/main/java/org/apache/shale/dialog2/Context.java
URL: http://svn.apache.org/viewvc/shale/sandbox/shale-dialog2/src/main/java/org/apache/shale/dialog2/Context.java?rev=437879&view=auto
==============================================================================
--- shale/sandbox/shale-dialog2/src/main/java/org/apache/shale/dialog2/Context.java (added)
+++ shale/sandbox/shale-dialog2/src/main/java/org/apache/shale/dialog2/Context.java Mon Aug 28 16:48:48 2006
@@ -0,0 +1,91 @@
+/*
+ * Copyright 2006 The Apache Software Foundation.
+ *
+ * Licensed 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.
+ */
+
+package org.apache.shale.dialog2;
+
+import javax.faces.context.FacesContext;
+
+/**
+ * <p>Interface describing the current state of a particular dialog manager
+ * {@link Context}.  If successful, it is likely that this
+ * interface would be defined in the <code>org.apache.shale.dialog</code>
+ * package.</p>
+ * 
+ * <p><strong>IMPLEMENTATION NOTE</strong> - Implementations of this interface
+ * will be stored in session scope, so they should be serializable.</p>
+ * 
+ * @since 1.0.4
+ */
+public interface Context {
+
+
+    // ----------------------------------------------------- Context Properties
+
+
+    /**
+     * <p>Return <code>true</code> if this {@link Context} is currently
+     * active (created but not yet removed).</p>
+     */
+    public boolean isActive();
+
+
+    /**
+     * <p>Return the generic data object representing model state for this
+     * dialog instance.</p>
+     */
+    public Object getData();
+
+
+
+    /**
+     * <p>Set the generic data object representing model state for this
+     * dialog instance.
+     *
+     * @param data The new data instance
+     */
+    public void setData(Object data);
+
+
+    /**
+     * <p>Return the context identifier for this instance of the specified
+     * dialog.</p>
+     */
+    public String getId();
+
+
+    /**
+     * <p>Return the logical name of the dialog being executed by this instance.<?p>
+     */
+    public String getName();
+
+
+    // -------------------------------------------------------- Context Methods
+
+
+    /**
+     * <p>Advance the execution of the state machine underlying this dialog
+     * instance, until an interaction with the user is required.  At that
+     * point, return the view identifier to which navigation should occur.</p>
+     *
+     * @param context FacesContext for the current request
+     * @param outcome Logical outcome to use for driving a transition
+     *  out of a state that was waiting for user input, or <code>null</code>
+     *  if no transition should be performed
+     */
+    public String advance(FacesContext context, String outcome);
+
+
+}

Added: shale/sandbox/shale-dialog2/src/main/java/org/apache/shale/dialog2/Contexts.java
URL: http://svn.apache.org/viewvc/shale/sandbox/shale-dialog2/src/main/java/org/apache/shale/dialog2/Contexts.java?rev=437879&view=auto
==============================================================================
--- shale/sandbox/shale-dialog2/src/main/java/org/apache/shale/dialog2/Contexts.java (added)
+++ shale/sandbox/shale-dialog2/src/main/java/org/apache/shale/dialog2/Contexts.java Mon Aug 28 16:48:48 2006
@@ -0,0 +1,71 @@
+/*
+ * Copyright 2006 The Apache Software Foundation.
+ *
+ * Licensed 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.
+ */
+
+package org.apache.shale.dialog2;
+
+import javax.faces.context.FacesContext;
+
+/**
+ * <p>Accessor utility for the various {@link Context} instances that have
+ * been activated within thw scope of the current user's session.</p>
+ * 
+ * <p><strong>IMPLEMENTATION NOTE</strong> - Implementations of this interface
+ * will be stored in session scope, so they should be serializable.</p>
+ * 
+ * @since 1.0.4
+ */
+public interface Contexts {
+    
+
+    /**
+     * <p>Start a new instance of the specified dialog configuration, returning
+     * the newly started instance.  This instance will include an
+     * <code>id</code> property guaranteed to be unique among all active
+     * instances for the current user.  It shall also have been stored as
+     * a request scope attribute under key <code>Constants.INSTANCE_BEAN</code>.
+     * For ease of development, the newly created {@link Context} SHOULD
+     * have been assigned a <code>data<code> property of an empty
+     * <code>java.util.Map</code> (unless a particular dialog implementation
+     * prefers to provide some more implementation specific default).</p>
+     * 
+     * @param context FacesContext for the current request
+     * @param name Logical name of the dialog to be executed
+     *
+     * @exception IllegalArgumentException if no dialog definition
+     * can be found for the specified logical name
+     */
+    public Context create(FacesContext context, String name);
+
+
+    /**
+     * <p>Return the {@link Context} for the specified dialog identifier;
+     * otherwise, return null.</p>
+     * 
+     * @param id Dialog identifier for which to return an instance
+     */
+    public Context get(String id);
+
+
+    /**
+     * <p>Remove the specified {@link Context} from the set of active
+     * instances for the current user.</p>
+     * 
+     * @param instance Context to be removed
+     */
+    public void remove(Context instance);
+
+
+}

Added: shale/sandbox/shale-dialog2/src/main/java/org/apache/shale/dialog2/faces/Dialog2NavigationHandler.java
URL: http://svn.apache.org/viewvc/shale/sandbox/shale-dialog2/src/main/java/org/apache/shale/dialog2/faces/Dialog2NavigationHandler.java?rev=437879&view=auto
==============================================================================
--- shale/sandbox/shale-dialog2/src/main/java/org/apache/shale/dialog2/faces/Dialog2NavigationHandler.java (added)
+++ shale/sandbox/shale-dialog2/src/main/java/org/apache/shale/dialog2/faces/Dialog2NavigationHandler.java Mon Aug 28 16:48:48 2006
@@ -0,0 +1,166 @@
+/*
+ * Copyright 2006 The Apache Software Foundation.
+ *
+ * Licensed 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.
+ */
+
+package org.apache.shale.dialog2.faces;
+
+import javax.faces.application.NavigationHandler;
+import javax.faces.application.ViewHandler;
+import javax.faces.component.UIViewRoot;
+import javax.faces.context.FacesContext;
+import org.apache.shale.dialog2.Constants;
+import org.apache.shale.dialog2.Context;
+import org.apache.shale.dialog2.Contexts;
+
+/**
+ * <p><code>NavigationHandler</code> implementation that allows dialogs to
+ * be started via a logical outcome that returns with a specified prefix.
+ * This is not the only way to start a dialog (applications can also do this
+ * programmatically), but it is convenient in many cases.</p>
+ *
+ * @since 1.0.4
+ */
+public final class Dialog2NavigationHandler extends NavigationHandler {
+
+
+    // ------------------------------------------------------------ Constructors
+
+
+    /**
+     * <p>Creates a new instance of Dialog2NavigationHandler that delegates
+     * to the specified original handler.</p>
+     *
+     * @param original Original NavigationHandler
+     */
+    public Dialog2NavigationHandler(NavigationHandler original) {
+        this.original = original;
+    }
+    
+
+    // ------------------------------------------------------ Context Variables
+
+
+    /**
+     * <p>The original <code>NavigationHandler</code> we delegate to.</p>
+     */
+    private NavigationHandler original = null;
+
+
+    // ----------------------------------------------- NavigationHandler Methods
+
+
+    /**
+     * <p>Handle a navigation request from the application.  The following
+     * rules are applied:</p>
+     * <ul>
+     * <li>If this view is <strong>NOT</strong> currently executing
+     *     a dialog {@link Context}:
+     *     <ul>
+     *         <li>If the logical outcome begins with the prefix identified
+     *             by <code>Constants.DIALOG_PREFIX</code>, create a new
+     *             dialog and advance its progress until it returns a
+     *             view identifier that should be displayed.  A corresponding
+     *             view is created, and control is returned to the application.</li>
+     *         <li>Otherwise, delegate control to the original navigation
+     *             handler passed to our constructor.</li>
+     *     </ul></li>
+     * <li>If this view is currently executing a dialog {@link Context},
+     *     advance its progress until it returns a view identifier that should
+     *     be displayed.  A corresponding view is created, and control is
+     *     returned to the application.</li>
+     * </ul>
+     * 
+     * @param context FacesContext for the current request
+     * @param fromAction Action that was invoked
+     * @param outcome Logical outcome from the invoked action
+     */
+    public void handleNavigation(FacesContext context, String fromAction,
+                                 String outcome) {
+
+        String viewId = null;
+        Context instance = (Context)
+          context.getExternalContext().getRequestMap().get(Constants.CONTEXT_BEAN);
+        if (instance == null) {
+            if ((outcome != null) && outcome.startsWith(Constants.DIALOG_PREFIX)) {
+                instance = create(context, outcome.substring(Constants.DIALOG_PREFIX.length()));
+                viewId = advance(context, instance, null);
+            } else {
+                original.handleNavigation(context, fromAction, outcome);
+                return;
+            }
+        } else {
+            viewId = advance(context, instance, outcome);
+        }
+        navigate(context, viewId);
+
+    }
+
+
+    // --------------------------------------------------------- Private Methods
+
+
+    /**
+     * <p>Advance the progress of the specified {@link Context}, until it
+     * returns a view identifier to which we should navigate.</p>
+     * 
+     * @param context FacesContext for the current request
+     * @param instance Dialog instance being processed
+     * @param outcome Logical outcome to drive this advance
+     */
+    private String advance(FacesContext context, Context instance, String outcome) {
+
+        return instance.advance(context, outcome);
+
+    }
+
+
+    /**
+     * <p>Create a new dialog {@link Context}, returning it for further
+     * processing.</p>
+     * 
+     * @param context FacesContext for the current request
+     * @param name Logical name of the dialog to be started
+     */
+    private Context create(FacesContext context, String name) {
+
+        Contexts instances = (Contexts)
+          context.getApplication().getVariableResolver().
+          resolveVariable(context, Constants.CONTEXTS_BEAN);
+        if (instances != null) {
+            return instances.create(context, name);
+        } else {
+            return null;
+        }
+
+    }
+
+
+    /**
+     * <p>Navigate to the specified view identifier.</p>
+     *
+     * @param context FacesContext for the current request
+     * @param viewId View identifier to navigate to
+     */
+    private void navigate(FacesContext context, String viewId) {
+
+        ViewHandler vh = context.getApplication().getViewHandler();
+        UIViewRoot view = vh.createView(context, viewId);
+        view.setViewId(viewId);
+        context.setViewRoot(view);
+
+    }
+
+
+}

Added: shale/sandbox/shale-dialog2/src/main/java/org/apache/shale/dialog2/faces/Dialog2PhaseListener.java
URL: http://svn.apache.org/viewvc/shale/sandbox/shale-dialog2/src/main/java/org/apache/shale/dialog2/faces/Dialog2PhaseListener.java?rev=437879&view=auto
==============================================================================
--- shale/sandbox/shale-dialog2/src/main/java/org/apache/shale/dialog2/faces/Dialog2PhaseListener.java (added)
+++ shale/sandbox/shale-dialog2/src/main/java/org/apache/shale/dialog2/faces/Dialog2PhaseListener.java Mon Aug 28 16:48:48 2006
@@ -0,0 +1,100 @@
+/*
+ * Copyright 2006 The Apache Software Foundation.
+ *
+ * Licensed 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.
+ */
+
+package org.apache.shale.dialog2.faces;
+
+import java.util.Map;
+import javax.faces.context.FacesContext;
+import javax.faces.event.PhaseEvent;
+import javax.faces.event.PhaseId;
+import javax.faces.event.PhaseListener;
+import org.apache.shale.dialog2.Constants;
+import org.apache.shale.dialog2.Context;
+import org.apache.shale.dialog2.Contexts;
+
+/**
+ * <p>Phase listener that saves and restores the dialog identifier for the
+ * currently active dialog, if any.</p>
+ *
+ * @since 1.0.4
+ */
+public final class Dialog2PhaseListener implements PhaseListener {
+    
+
+    /**
+     * <p>Return the phase identifier we are interested in.</p>
+     */
+    public PhaseId getPhaseId() {
+        return PhaseId.ANY_PHASE;
+    }
+
+
+    /**
+     * <p>After the <em>Restore View</em> phase, retrieve the current
+     * dialog identifier (if any), and restore the corresponding
+     * {@link Context}.</p>
+     * 
+     * @param event The phase event to be processed
+     */
+    public void afterPhase(PhaseEvent event) {
+
+        if (PhaseId.RESTORE_VIEW.equals(event.getPhaseId())) {
+            FacesContext context = event.getFacesContext();
+            String id = (String)
+              context.getViewRoot().getAttributes().get(Constants.CONTEXT_ID_ATTR);
+            if (id == null) {
+                return;
+            }
+            Contexts instances = (Contexts)
+              context.getApplication().getVariableResolver().
+                    resolveVariable(context, Constants.CONTEXTS_BEAN);
+            if (instances == null) {
+                return;
+            }
+            Context instance = instances.get(id);
+            if (instance == null) {
+                return;
+            }
+            context.getExternalContext().getRequestMap().put(Constants.CONTEXT_BEAN, instance);
+        }
+
+    }
+
+
+    /**
+     * <p>Before the <em>Render Response</em> phase, acquire the current
+     * dialog identifier (if any), and store it in the view.</p>
+     *
+     * @param event The phase event to be processed
+     */
+    public void beforePhase(PhaseEvent event) {
+
+        if (PhaseId.RENDER_RESPONSE.equals(event.getPhaseId())) {
+            FacesContext context = event.getFacesContext();
+            Context instance = (Context)
+              context.getExternalContext().getRequestMap().get(Constants.CONTEXT_BEAN);
+            Map map = context.getViewRoot().getAttributes();
+            if ((instance != null) && instance.isActive()) {
+                map.put(Constants.CONTEXT_ID_ATTR, instance);
+            } else {
+                map.remove(Constants.CONTEXT_ID_ATTR);
+            }
+        }
+
+    }
+
+
+}

Added: shale/sandbox/shale-dialog2/src/main/resources/META-INF/LICENSE.txt
URL: http://svn.apache.org/viewvc/shale/sandbox/shale-dialog2/src/main/resources/META-INF/LICENSE.txt?rev=437879&view=auto
==============================================================================
--- shale/sandbox/shale-dialog2/src/main/resources/META-INF/LICENSE.txt (added)
+++ shale/sandbox/shale-dialog2/src/main/resources/META-INF/LICENSE.txt Mon Aug 28 16:48:48 2006
@@ -0,0 +1,202 @@
+
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "[]"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright [yyyy] [name of copyright owner]
+
+   Licensed 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.

Added: shale/sandbox/shale-dialog2/src/main/resources/META-INF/NOTICE.txt
URL: http://svn.apache.org/viewvc/shale/sandbox/shale-dialog2/src/main/resources/META-INF/NOTICE.txt?rev=437879&view=auto
==============================================================================
--- shale/sandbox/shale-dialog2/src/main/resources/META-INF/NOTICE.txt (added)
+++ shale/sandbox/shale-dialog2/src/main/resources/META-INF/NOTICE.txt Mon Aug 28 16:48:48 2006
@@ -0,0 +1,6 @@
+This product includes software developed by
+The Apache Software Foundation (http://www.apache.org/).
+
+This product contains code written by David Geary and Cay Horstmann
+for the first edition of Core JavaServer Faces. 
+

Added: shale/sandbox/shale-dialog2/src/main/resources/META-INF/faces-config.xml
URL: http://svn.apache.org/viewvc/shale/sandbox/shale-dialog2/src/main/resources/META-INF/faces-config.xml?rev=437879&view=auto
==============================================================================
--- shale/sandbox/shale-dialog2/src/main/resources/META-INF/faces-config.xml (added)
+++ shale/sandbox/shale-dialog2/src/main/resources/META-INF/faces-config.xml Mon Aug 28 16:48:48 2006
@@ -0,0 +1,38 @@
+<?xml version="1.0"?>
+
+
+<!DOCTYPE faces-config PUBLIC
+  "-//Sun Microsystems, Inc.//DTD JavaServer Faces Config 1.1//EN"
+  "http://java.sun.com/dtd/web-facesconfig_1_1.dtd">
+
+
+<!--
+
+ Copyright 2006 The Apache Software Foundation.
+ 
+ Licensed 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.
+
+-->
+
+
+<faces-config>
+
+    <application>
+        <navigation-handler>org.apache.shale.dialog2.faces.Dialog2NavigationHandler</navigation-handler>
+    </application>
+
+    <lifecycle>
+        <listener>org.apache.shale.dialog2.faces.Dialog2PhaseListener</listener>
+    </lifecycle>
+
+</faces-config>