Author: craigmcc
Date: Thu Oct 12 12:39:43 2006
New Revision: 463389
URL: http://svn.apache.org/viewvc?view=rev&rev=463389
Log:
Finish refactoring on shale-dialog-basic
SHALE-300
Added:
shale/framework/trunk/shale-dialog-basic/src/main/java/org/apache/shale/dialog/basic/BasicDialogContext.java
- copied, changed from r463378,
shale/framework/trunk/shale-dialog-basic/src/main/java/org/apache/shale/dialog/basic/LegacyDialogContext.java
shale/framework/trunk/shale-dialog-basic/src/main/java/org/apache/shale/dialog/basic/BasicDialogManager.java
- copied, changed from r463378,
shale/framework/trunk/shale-dialog-basic/src/main/java/org/apache/shale/dialog/basic/LegacyDialogManager.java
Removed:
shale/framework/trunk/shale-dialog-basic/src/main/java/org/apache/shale/dialog/basic/LegacyDialogContext.java
shale/framework/trunk/shale-dialog-basic/src/main/java/org/apache/shale/dialog/basic/LegacyDialogManager.java
Modified:
shale/framework/trunk/pom.xml
shale/framework/trunk/shale-dialog-basic/src/main/java/org/apache/shale/dialog/basic/Globals.java
shale/framework/trunk/shale-dialog-basic/src/main/java/org/apache/shale/dialog/basic/Position.java
shale/framework/trunk/shale-dialog-basic/src/main/java/org/apache/shale/dialog/basic/config/AbstractState.java
shale/framework/trunk/shale-dialog-basic/src/main/java/org/apache/shale/dialog/basic/config/ActionStateImpl.java
shale/framework/trunk/shale-dialog-basic/src/main/java/org/apache/shale/dialog/basic/config/ConfigurationParser.java
shale/framework/trunk/shale-dialog-basic/src/main/java/org/apache/shale/dialog/basic/config/DialogImpl.java
shale/framework/trunk/shale-dialog-basic/src/main/java/org/apache/shale/dialog/basic/config/EndStateImpl.java
shale/framework/trunk/shale-dialog-basic/src/main/java/org/apache/shale/dialog/basic/config/SubdialogStateImpl.java
shale/framework/trunk/shale-dialog-basic/src/main/java/org/apache/shale/dialog/basic/config/TransitionImpl.java
shale/framework/trunk/shale-dialog-basic/src/main/java/org/apache/shale/dialog/basic/config/ViewStateImpl.java
shale/framework/trunk/shale-dialog-basic/src/main/java/org/apache/shale/dialog/basic/model/ActionState.java
shale/framework/trunk/shale-dialog-basic/src/main/java/org/apache/shale/dialog/basic/model/Dialog.java
shale/framework/trunk/shale-dialog-basic/src/main/java/org/apache/shale/dialog/basic/model/EndState.java
shale/framework/trunk/shale-dialog-basic/src/main/java/org/apache/shale/dialog/basic/model/State.java
shale/framework/trunk/shale-dialog-basic/src/main/java/org/apache/shale/dialog/basic/model/SubdialogState.java
shale/framework/trunk/shale-dialog-basic/src/main/java/org/apache/shale/dialog/basic/model/Transition.java
shale/framework/trunk/shale-dialog-basic/src/main/java/org/apache/shale/dialog/basic/model/ViewState.java
shale/framework/trunk/shale-dialog/src/main/java/org/apache/shale/dialog/base/AbstractDialogListener.java
Modified: shale/framework/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/shale/framework/trunk/pom.xml?view=diff&rev=463389&r1=463388&r2=463389
==============================================================================
--- shale/framework/trunk/pom.xml (original)
+++ shale/framework/trunk/pom.xml Thu Oct 12 12:39:43 2006
@@ -140,6 +140,7 @@
<module>shale-clay</module>
<module>shale-core</module>
<module>shale-dialog</module>
+ <module>shale-dialog-basic</module>
<module>shale-remoting</module>
<module>shale-spring</module>
<module>shale-test</module>
Copied:
shale/framework/trunk/shale-dialog-basic/src/main/java/org/apache/shale/dialog/basic/BasicDialogContext.java
(from r463378,
shale/framework/trunk/shale-dialog-basic/src/main/java/org/apache/shale/dialog/basic/LegacyDialogContext.java)
URL:
http://svn.apache.org/viewvc/shale/framework/trunk/shale-dialog-basic/src/main/java/org/apache/shale/dialog/basic/BasicDialogContext.java?view=diff&rev=463389&p1=shale/framework/trunk/shale-dialog-basic/src/main/java/org/apache/shale/dialog/basic/LegacyDialogContext.java&r1=463378&p2=shale/framework/trunk/shale-dialog-basic/src/main/java/org/apache/shale/dialog/basic/BasicDialogContext.java&r2=463389
==============================================================================
---
shale/framework/trunk/shale-dialog-basic/src/main/java/org/apache/shale/dialog/basic/LegacyDialogContext.java
(original)
+++
shale/framework/trunk/shale-dialog-basic/src/main/java/org/apache/shale/dialog/basic/BasicDialogContext.java
Thu Oct 12 12:39:43 2006
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package org.apache.shale.dialog2.legacy;
+package org.apache.shale.dialog.basic;
import java.util.ArrayList;
import java.util.List;
@@ -25,20 +25,20 @@
import javax.faces.context.FacesContext;
import javax.faces.el.MethodBinding;
-import org.apache.shale.dialog2.DialogContext;
-import org.apache.shale.dialog2.DialogContextManager;
-import org.apache.shale.dialog2.base.AbstractDialogContext;
-import org.apache.shale.dialog2.legacy.model.ActionState;
-import org.apache.shale.dialog2.legacy.model.Dialog;
-import org.apache.shale.dialog2.legacy.model.EndState;
-import org.apache.shale.dialog2.legacy.model.State;
-import org.apache.shale.dialog2.legacy.model.SubdialogState;
-import org.apache.shale.dialog2.legacy.model.Transition;
-import org.apache.shale.dialog2.legacy.model.ViewState;
+import org.apache.shale.dialog.DialogContext;
+import org.apache.shale.dialog.DialogContextManager;
+import org.apache.shale.dialog.base.AbstractDialogContext;
+import org.apache.shale.dialog.basic.model.ActionState;
+import org.apache.shale.dialog.basic.model.Dialog;
+import org.apache.shale.dialog.basic.model.EndState;
+import org.apache.shale.dialog.basic.model.State;
+import org.apache.shale.dialog.basic.model.SubdialogState;
+import org.apache.shale.dialog.basic.model.Transition;
+import org.apache.shale.dialog.basic.model.ViewState;
/**
* <p>Implementation of [EMAIL PROTECTED] DialogContext} for integrating
- * legacy dialog support into the Shale Dialog Manager.</p>
+ * basic dialog support into the Shale Dialog Manager.</p>
*
* <p><strong>IMPLEMENTATION NOTE</strong> - Takes on the responsibilities
* of the <code>org.apache.shale.dialog.Status</code> implementation in the
@@ -46,7 +46,7 @@
*
* @since 1.0.4
*/
-final class LegacyDialogContext extends AbstractDialogContext {
+final class BasicDialogContext extends AbstractDialogContext {
// ------------------------------------------------------------
Constructors
@@ -61,8 +61,8 @@
* @param parentDialogId Dialog identifier of the parent DialogContext
* instance associated with this one (if any)
*/
- LegacyDialogContext(DialogContextManager manager, Dialog dialog,
- String id, String parentDialogId) {
+ BasicDialogContext(DialogContextManager manager, Dialog dialog,
+ String id, String parentDialogId) {
this.manager = manager;
this.dialog = dialog;
Copied:
shale/framework/trunk/shale-dialog-basic/src/main/java/org/apache/shale/dialog/basic/BasicDialogManager.java
(from r463378,
shale/framework/trunk/shale-dialog-basic/src/main/java/org/apache/shale/dialog/basic/LegacyDialogManager.java)
URL:
http://svn.apache.org/viewvc/shale/framework/trunk/shale-dialog-basic/src/main/java/org/apache/shale/dialog/basic/BasicDialogManager.java?view=diff&rev=463389&p1=shale/framework/trunk/shale-dialog-basic/src/main/java/org/apache/shale/dialog/basic/LegacyDialogManager.java&r1=463378&p2=shale/framework/trunk/shale-dialog-basic/src/main/java/org/apache/shale/dialog/basic/BasicDialogManager.java&r2=463389
==============================================================================
---
shale/framework/trunk/shale-dialog-basic/src/main/java/org/apache/shale/dialog/basic/LegacyDialogManager.java
(original)
+++
shale/framework/trunk/shale-dialog-basic/src/main/java/org/apache/shale/dialog/basic/BasicDialogManager.java
Thu Oct 12 12:39:43 2006
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package org.apache.shale.dialog2.legacy;
+package org.apache.shale.dialog.basic;
import java.io.Serializable;
import java.net.URL;
@@ -27,20 +27,20 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.apache.shale.dialog2.Constants;
-import org.apache.shale.dialog2.DialogContext;
-import org.apache.shale.dialog2.DialogContextManager;
-import org.apache.shale.dialog2.legacy.config.ConfigurationParser;
-import org.apache.shale.dialog2.legacy.model.Dialog;
+import org.apache.shale.dialog.Constants;
+import org.apache.shale.dialog.DialogContext;
+import org.apache.shale.dialog.DialogContextManager;
+import org.apache.shale.dialog.basic.config.ConfigurationParser;
+import org.apache.shale.dialog.basic.model.Dialog;
/**
* <p>Implementation of [EMAIL PROTECTED] DialogContextManager} for integrating
- * legacy dialog support into the Shale Dialog Manager.</p>
+ * basic dialog support into the Shale Dialog Manager.</p>
*
*
* @since 1.0.4
*/
-public final class LegacyDialogManager implements DialogContextManager,
Serializable {
+public final class BasicDialogManager implements DialogContextManager,
Serializable {
// ------------------------------------------------- DialogContext
Variables
@@ -123,8 +123,8 @@
}
// Configure a new LegacyDialogContext instance
- LegacyDialogContext instance = new LegacyDialogContext(this, dialog,
generateId(),
- parentDialogId);
+ BasicDialogContext instance = new BasicDialogContext(this, dialog,
generateId(),
+ parentDialogId);
map.put(instance.getId(), instance);
context.getExternalContext().getRequestMap().put(Constants.CONTEXT_BEAN,
instance);
return instance;
@@ -141,7 +141,7 @@
/** @{inheritDoc} */
public void remove(DialogContext instance) {
if (map.remove(instance.getId()) == instance) {
- ((LegacyDialogContext) instance).deactivate();
+ ((BasicDialogContext) instance).deactivate();
}
}
@@ -294,7 +294,7 @@
*/
private Log log() {
if (this.log == null) {
- this.log = LogFactory.getLog(LegacyDialogManager.class);
+ this.log = LogFactory.getLog(BasicDialogManager.class);
}
return this.log;
}
Modified:
shale/framework/trunk/shale-dialog-basic/src/main/java/org/apache/shale/dialog/basic/Globals.java
URL:
http://svn.apache.org/viewvc/shale/framework/trunk/shale-dialog-basic/src/main/java/org/apache/shale/dialog/basic/Globals.java?view=diff&rev=463389&r1=463388&r2=463389
==============================================================================
---
shale/framework/trunk/shale-dialog-basic/src/main/java/org/apache/shale/dialog/basic/Globals.java
(original)
+++
shale/framework/trunk/shale-dialog-basic/src/main/java/org/apache/shale/dialog/basic/Globals.java
Thu Oct 12 12:39:43 2006
@@ -14,12 +14,12 @@
* limitations under the License.
*/
-package org.apache.shale.dialog2.legacy;
+package org.apache.shale.dialog.basic;
-import org.apache.shale.dialog2.legacy.model.Dialog;
+import org.apache.shale.dialog.basic.model.Dialog;
/**
- * <p>Manifest constants for the legacy dialog state manager
implementation.</p>
+ * <p>Manifest constants for the basic dialog state manager implementation.</p>
*
* @since 1.0.4
*/
@@ -31,7 +31,7 @@
* list of configuration resources to be parsed exists.</p>
*/
public static final String CONFIGURATION =
- "org.apache.shale.dialog2.legacy.CONFIGURATION";
+ "org.apache.shale.dialog.legacy.CONFIGURATION";
/**
@@ -39,7 +39,7 @@
* [EMAIL PROTECTED] Dialog} definitions (keyed by dialog name) is
stored.</p>
*/
public static final String DIALOGS =
- "org.apache.shale.dialog2.legacy.DIALOGS";
+ "org.apache.shale.dialog.legacy.DIALOGS";
}
Modified:
shale/framework/trunk/shale-dialog-basic/src/main/java/org/apache/shale/dialog/basic/Position.java
URL:
http://svn.apache.org/viewvc/shale/framework/trunk/shale-dialog-basic/src/main/java/org/apache/shale/dialog/basic/Position.java?view=diff&rev=463389&r1=463388&r2=463389
==============================================================================
---
shale/framework/trunk/shale-dialog-basic/src/main/java/org/apache/shale/dialog/basic/Position.java
(original)
+++
shale/framework/trunk/shale-dialog-basic/src/main/java/org/apache/shale/dialog/basic/Position.java
Thu Oct 12 12:39:43 2006
@@ -14,15 +14,15 @@
* limitations under the License.
*/
-package org.apache.shale.dialog2.legacy;
+package org.apache.shale.dialog.basic;
import java.io.Serializable;
import java.util.Map;
import javax.faces.context.FacesContext;
-import org.apache.shale.dialog2.legacy.model.Dialog;
-import org.apache.shale.dialog2.legacy.model.State;
+import org.apache.shale.dialog.basic.model.Dialog;
+import org.apache.shale.dialog.basic.model.State;
/**
* <p>JavaBean that represents the current [EMAIL PROTECTED] State} within
Modified:
shale/framework/trunk/shale-dialog-basic/src/main/java/org/apache/shale/dialog/basic/config/AbstractState.java
URL:
http://svn.apache.org/viewvc/shale/framework/trunk/shale-dialog-basic/src/main/java/org/apache/shale/dialog/basic/config/AbstractState.java?view=diff&rev=463389&r1=463388&r2=463389
==============================================================================
---
shale/framework/trunk/shale-dialog-basic/src/main/java/org/apache/shale/dialog/basic/config/AbstractState.java
(original)
+++
shale/framework/trunk/shale-dialog-basic/src/main/java/org/apache/shale/dialog/basic/config/AbstractState.java
Thu Oct 12 12:39:43 2006
@@ -14,14 +14,14 @@
* limitations under the License.
*/
-package org.apache.shale.dialog2.legacy.config;
+package org.apache.shale.dialog.basic.config;
import java.util.HashMap;
import java.util.Iterator;
import java.util.Map;
-import org.apache.shale.dialog2.legacy.model.Dialog;
-import org.apache.shale.dialog2.legacy.model.State;
-import org.apache.shale.dialog2.legacy.model.Transition;
+import org.apache.shale.dialog.basic.model.Dialog;
+import org.apache.shale.dialog.basic.model.State;
+import org.apache.shale.dialog.basic.model.Transition;
/**
* <p>Abstract base class for [EMAIL PROTECTED] State} definitions. Each
state is owned
Modified:
shale/framework/trunk/shale-dialog-basic/src/main/java/org/apache/shale/dialog/basic/config/ActionStateImpl.java
URL:
http://svn.apache.org/viewvc/shale/framework/trunk/shale-dialog-basic/src/main/java/org/apache/shale/dialog/basic/config/ActionStateImpl.java?view=diff&rev=463389&r1=463388&r2=463389
==============================================================================
---
shale/framework/trunk/shale-dialog-basic/src/main/java/org/apache/shale/dialog/basic/config/ActionStateImpl.java
(original)
+++
shale/framework/trunk/shale-dialog-basic/src/main/java/org/apache/shale/dialog/basic/config/ActionStateImpl.java
Thu Oct 12 12:39:43 2006
@@ -14,9 +14,9 @@
* limitations under the License.
*/
-package org.apache.shale.dialog2.legacy.config;
+package org.apache.shale.dialog.basic.config;
-import org.apache.shale.dialog2.legacy.model.ActionState;
+import org.apache.shale.dialog.basic.model.ActionState;
/**
Modified:
shale/framework/trunk/shale-dialog-basic/src/main/java/org/apache/shale/dialog/basic/config/ConfigurationParser.java
URL:
http://svn.apache.org/viewvc/shale/framework/trunk/shale-dialog-basic/src/main/java/org/apache/shale/dialog/basic/config/ConfigurationParser.java?view=diff&rev=463389&r1=463388&r2=463389
==============================================================================
---
shale/framework/trunk/shale-dialog-basic/src/main/java/org/apache/shale/dialog/basic/config/ConfigurationParser.java
(original)
+++
shale/framework/trunk/shale-dialog-basic/src/main/java/org/apache/shale/dialog/basic/config/ConfigurationParser.java
Thu Oct 12 12:39:43 2006
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package org.apache.shale.dialog2.legacy.config;
+package org.apache.shale.dialog.basic.config;
import java.io.IOException;
import java.net.URL;
@@ -22,7 +22,7 @@
import org.apache.commons.digester.Digester;
import org.apache.commons.digester.Rule;
-import org.apache.shale.dialog2.legacy.model.Dialog;
+import org.apache.shale.dialog.basic.model.Dialog;
import org.xml.sax.InputSource;
import org.xml.sax.SAXException;
@@ -50,10 +50,10 @@
* <p>Registration information for the DTD we will use to validate.</p>
*/
private static final String[] REGISTRATIONS =
- { "-//Apache Software Foundation//DTD Shale Dialog2 Configuration 1.0//EN",
- "/org/apache/shale/dialog2/dialog2-config_1_0.dtd",
- "-//Apache Software Foundation//DTD Shale Dialog2 Configuration 1.1//EN",
- "/org/apache/shale/dialog2/dialog2-config_1_1.dtd" };
+ { "-//Apache Software Foundation//DTD Shale Dialog Configuration 1.0//EN",
+ "/org/apache/shale/dialog/dialog-config_1_0.dtd",
+ "-//Apache Software Foundation//DTD Shale Dialog Configuration 1.1//EN",
+ "/org/apache/shale/dialog/dialog-config_1_1.dtd" };
// --------------------------------------------------------------
Properties
@@ -205,7 +205,7 @@
digester.addSetProperties("dialogs/dialog/action");
digester.addSetProperty("dialogs/dialog/action/property", "name",
"value");
digester.addSetNext("dialogs/dialog/action",
- "addState",
"org.apache.shale.dialog2.legacy.model.State");
+ "addState",
"org.apache.shale.dialog.basic.model.State");
// dialogs/dialog/action/transition
digester.addObjectCreate("dialogs/dialog/action/transition",
"className",
@@ -213,7 +213,7 @@
digester.addSetProperties("dialogs/dialog/action/transition");
digester.addSetProperty("dialogs/dialog/action/transition/property",
"name", "value");
digester.addSetNext("dialogs/dialog/action/transition",
- "addTransition",
"org.apache.shale.dialog2.legacy.model.Transition");
+ "addTransition",
"org.apache.shale.dialog.basic.model.Transition");
// dialogs/dialog/end
digester.addObjectCreate("dialogs/dialog/end", "className",
@@ -221,7 +221,7 @@
digester.addSetProperties("dialogs/dialog/end");
digester.addSetProperty("dialogs/dialog/end/property", "name",
"value");
digester.addSetNext("dialogs/dialog/end",
- "addState",
"org.apache.shale.dialog2.legacy.model.State");
+ "addState",
"org.apache.shale.dialog.basic.model.State");
// dialogs/dialog/end/transition
digester.addObjectCreate("dialogs/dialog/end/transition", "className",
@@ -229,7 +229,7 @@
digester.addSetProperties("dialogs/dialog/end/transition");
digester.addSetProperty("dialogs/dialog/end/transition/property",
"name", "value");
digester.addSetNext("dialogs/dialog/end/transition",
- "addTransition",
"org.apache.shale.dialog2.legacy.model.Transition");
+ "addTransition",
"org.apache.shale.dialog.basic.model.Transition");
// dialogs/dialog/subdialog
digester.addObjectCreate("dialogs/dialog/subdialog", "className",
@@ -237,7 +237,7 @@
digester.addSetProperties("dialogs/dialog/subdialog");
digester.addSetProperty("dialogs/dialog/subdialog/property", "name",
"value");
digester.addSetNext("dialogs/dialog/subdialog",
- "addState",
"org.apache.shale.dialog2.legacy.model.State");
+ "addState",
"org.apache.shale.dialog.basic.model.State");
// dialogs/dialog/subdialog/transition
digester.addObjectCreate("dialogs/dialog/subdialog/transition",
"className",
@@ -245,7 +245,7 @@
digester.addSetProperties("dialogs/dialog/subdialog/transition");
digester.addSetProperty("dialogs/dialog/subdialog/transition/property", "name",
"value");
digester.addSetNext("dialogs/dialog/subdialog/transition",
- "addTransition",
"org.apache.shale.dialog2.legacy.model.Transition");
+ "addTransition",
"org.apache.shale.dialog.basic.model.Transition");
// dialogs/dialog/transition
digester.addObjectCreate("dialogs/dialog/transition", "className",
@@ -253,7 +253,7 @@
digester.addSetProperties("dialogs/dialog/transition");
digester.addSetProperty("dialogs/dialog/transition/property", "name",
"value");
digester.addSetNext("dialogs/dialog/transition",
- "addTransition",
"org.apache.shale.dialog2.legacy.model.Transition");
+ "addTransition",
"org.apache.shale.dialog.basic.model.Transition");
// dialogs/dialog/view
digester.addObjectCreate("dialogs/dialog/view", "className",
@@ -261,7 +261,7 @@
digester.addSetProperties("dialogs/dialog/view");
digester.addSetProperty("dialogs/dialog/view/property", "name",
"value");
digester.addSetNext("dialogs/dialog/view",
- "addState",
"org.apache.shale.dialog2.legacy.model.State");
+ "addState",
"org.apache.shale.dialog.basic.model.State");
// dialogs/dialog/view/transition
digester.addObjectCreate("dialogs/dialog/view/transition", "className",
@@ -269,7 +269,7 @@
digester.addSetProperties("dialogs/dialog/view/transition");
digester.addSetProperty("dialogs/dialog/view/transition/property",
"name", "value");
digester.addSetNext("dialogs/dialog/view/transition",
- "addTransition",
"org.apache.shale.dialog2.legacy.model.Transition");
+ "addTransition",
"org.apache.shale.dialog.basic.model.Transition");
return digester;
Modified:
shale/framework/trunk/shale-dialog-basic/src/main/java/org/apache/shale/dialog/basic/config/DialogImpl.java
URL:
http://svn.apache.org/viewvc/shale/framework/trunk/shale-dialog-basic/src/main/java/org/apache/shale/dialog/basic/config/DialogImpl.java?view=diff&rev=463389&r1=463388&r2=463389
==============================================================================
---
shale/framework/trunk/shale-dialog-basic/src/main/java/org/apache/shale/dialog/basic/config/DialogImpl.java
(original)
+++
shale/framework/trunk/shale-dialog-basic/src/main/java/org/apache/shale/dialog/basic/config/DialogImpl.java
Thu Oct 12 12:39:43 2006
@@ -14,14 +14,14 @@
* limitations under the License.
*/
-package org.apache.shale.dialog2.legacy.config;
+package org.apache.shale.dialog.basic.config;
import java.util.HashMap;
import java.util.Iterator;
import java.util.Map;
-import org.apache.shale.dialog2.legacy.model.Dialog;
-import org.apache.shale.dialog2.legacy.model.State;
-import org.apache.shale.dialog2.legacy.model.Transition;
+import org.apache.shale.dialog.basic.model.Dialog;
+import org.apache.shale.dialog.basic.model.State;
+import org.apache.shale.dialog.basic.model.Transition;
/**
* <p>[EMAIL PROTECTED] DialogImpl} is a basic implementation of [EMAIL
PROTECTED] Dialog}.</p>
Modified:
shale/framework/trunk/shale-dialog-basic/src/main/java/org/apache/shale/dialog/basic/config/EndStateImpl.java
URL:
http://svn.apache.org/viewvc/shale/framework/trunk/shale-dialog-basic/src/main/java/org/apache/shale/dialog/basic/config/EndStateImpl.java?view=diff&rev=463389&r1=463388&r2=463389
==============================================================================
---
shale/framework/trunk/shale-dialog-basic/src/main/java/org/apache/shale/dialog/basic/config/EndStateImpl.java
(original)
+++
shale/framework/trunk/shale-dialog-basic/src/main/java/org/apache/shale/dialog/basic/config/EndStateImpl.java
Thu Oct 12 12:39:43 2006
@@ -14,9 +14,9 @@
* limitations under the License.
*/
-package org.apache.shale.dialog2.legacy.config;
+package org.apache.shale.dialog.basic.config;
-import org.apache.shale.dialog2.legacy.model.EndState;
+import org.apache.shale.dialog.basic.model.EndState;
/**
* <p>[EMAIL PROTECTED] EndStateImpl} is a basic implementation of
Modified:
shale/framework/trunk/shale-dialog-basic/src/main/java/org/apache/shale/dialog/basic/config/SubdialogStateImpl.java
URL:
http://svn.apache.org/viewvc/shale/framework/trunk/shale-dialog-basic/src/main/java/org/apache/shale/dialog/basic/config/SubdialogStateImpl.java?view=diff&rev=463389&r1=463388&r2=463389
==============================================================================
---
shale/framework/trunk/shale-dialog-basic/src/main/java/org/apache/shale/dialog/basic/config/SubdialogStateImpl.java
(original)
+++
shale/framework/trunk/shale-dialog-basic/src/main/java/org/apache/shale/dialog/basic/config/SubdialogStateImpl.java
Thu Oct 12 12:39:43 2006
@@ -14,9 +14,9 @@
* limitations under the License.
*/
-package org.apache.shale.dialog2.legacy.config;
+package org.apache.shale.dialog.basic.config;
-import org.apache.shale.dialog2.legacy.model.SubdialogState;
+import org.apache.shale.dialog.basic.model.SubdialogState;
/**
* <p>[EMAIL PROTECTED] SubdialogStateImpl} is a basic implementation of
Modified:
shale/framework/trunk/shale-dialog-basic/src/main/java/org/apache/shale/dialog/basic/config/TransitionImpl.java
URL:
http://svn.apache.org/viewvc/shale/framework/trunk/shale-dialog-basic/src/main/java/org/apache/shale/dialog/basic/config/TransitionImpl.java?view=diff&rev=463389&r1=463388&r2=463389
==============================================================================
---
shale/framework/trunk/shale-dialog-basic/src/main/java/org/apache/shale/dialog/basic/config/TransitionImpl.java
(original)
+++
shale/framework/trunk/shale-dialog-basic/src/main/java/org/apache/shale/dialog/basic/config/TransitionImpl.java
Thu Oct 12 12:39:43 2006
@@ -14,9 +14,9 @@
* limitations under the License.
*/
-package org.apache.shale.dialog2.legacy.config;
+package org.apache.shale.dialog.basic.config;
-import org.apache.shale.dialog2.legacy.model.Transition;
+import org.apache.shale.dialog.basic.model.Transition;
/**
* <p>[EMAIL PROTECTED] TransitionImpl} is a basic implementation of
Modified:
shale/framework/trunk/shale-dialog-basic/src/main/java/org/apache/shale/dialog/basic/config/ViewStateImpl.java
URL:
http://svn.apache.org/viewvc/shale/framework/trunk/shale-dialog-basic/src/main/java/org/apache/shale/dialog/basic/config/ViewStateImpl.java?view=diff&rev=463389&r1=463388&r2=463389
==============================================================================
---
shale/framework/trunk/shale-dialog-basic/src/main/java/org/apache/shale/dialog/basic/config/ViewStateImpl.java
(original)
+++
shale/framework/trunk/shale-dialog-basic/src/main/java/org/apache/shale/dialog/basic/config/ViewStateImpl.java
Thu Oct 12 12:39:43 2006
@@ -14,9 +14,9 @@
* limitations under the License.
*/
-package org.apache.shale.dialog2.legacy.config;
+package org.apache.shale.dialog.basic.config;
-import org.apache.shale.dialog2.legacy.model.ViewState;
+import org.apache.shale.dialog.basic.model.ViewState;
/**
* <p>[EMAIL PROTECTED] ViewStateImpl} is a basic implementation of
Modified:
shale/framework/trunk/shale-dialog-basic/src/main/java/org/apache/shale/dialog/basic/model/ActionState.java
URL:
http://svn.apache.org/viewvc/shale/framework/trunk/shale-dialog-basic/src/main/java/org/apache/shale/dialog/basic/model/ActionState.java?view=diff&rev=463389&r1=463388&r2=463389
==============================================================================
---
shale/framework/trunk/shale-dialog-basic/src/main/java/org/apache/shale/dialog/basic/model/ActionState.java
(original)
+++
shale/framework/trunk/shale-dialog-basic/src/main/java/org/apache/shale/dialog/basic/model/ActionState.java
Thu Oct 12 12:39:43 2006
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package org.apache.shale.dialog2.legacy.model;
+package org.apache.shale.dialog.basic.model;
/**
* <p>An [EMAIL PROTECTED] ActionState} represents the execution of an action
method
Modified:
shale/framework/trunk/shale-dialog-basic/src/main/java/org/apache/shale/dialog/basic/model/Dialog.java
URL:
http://svn.apache.org/viewvc/shale/framework/trunk/shale-dialog-basic/src/main/java/org/apache/shale/dialog/basic/model/Dialog.java?view=diff&rev=463389&r1=463388&r2=463389
==============================================================================
---
shale/framework/trunk/shale-dialog-basic/src/main/java/org/apache/shale/dialog/basic/model/Dialog.java
(original)
+++
shale/framework/trunk/shale-dialog-basic/src/main/java/org/apache/shale/dialog/basic/model/Dialog.java
Thu Oct 12 12:39:43 2006
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package org.apache.shale.dialog2.legacy.model;
+package org.apache.shale.dialog.basic.model;
import java.util.Iterator;
Modified:
shale/framework/trunk/shale-dialog-basic/src/main/java/org/apache/shale/dialog/basic/model/EndState.java
URL:
http://svn.apache.org/viewvc/shale/framework/trunk/shale-dialog-basic/src/main/java/org/apache/shale/dialog/basic/model/EndState.java?view=diff&rev=463389&r1=463388&r2=463389
==============================================================================
---
shale/framework/trunk/shale-dialog-basic/src/main/java/org/apache/shale/dialog/basic/model/EndState.java
(original)
+++
shale/framework/trunk/shale-dialog-basic/src/main/java/org/apache/shale/dialog/basic/model/EndState.java
Thu Oct 12 12:39:43 2006
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package org.apache.shale.dialog2.legacy.model;
+package org.apache.shale.dialog.basic.model;
/**
* <p>[EMAIL PROTECTED] EndState} is a spacialized [EMAIL PROTECTED]
ViewState} that also marks
Modified:
shale/framework/trunk/shale-dialog-basic/src/main/java/org/apache/shale/dialog/basic/model/State.java
URL:
http://svn.apache.org/viewvc/shale/framework/trunk/shale-dialog-basic/src/main/java/org/apache/shale/dialog/basic/model/State.java?view=diff&rev=463389&r1=463388&r2=463389
==============================================================================
---
shale/framework/trunk/shale-dialog-basic/src/main/java/org/apache/shale/dialog/basic/model/State.java
(original)
+++
shale/framework/trunk/shale-dialog-basic/src/main/java/org/apache/shale/dialog/basic/model/State.java
Thu Oct 12 12:39:43 2006
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package org.apache.shale.dialog2.legacy.model;
+package org.apache.shale.dialog.basic.model;
import java.util.Iterator;
Modified:
shale/framework/trunk/shale-dialog-basic/src/main/java/org/apache/shale/dialog/basic/model/SubdialogState.java
URL:
http://svn.apache.org/viewvc/shale/framework/trunk/shale-dialog-basic/src/main/java/org/apache/shale/dialog/basic/model/SubdialogState.java?view=diff&rev=463389&r1=463388&r2=463389
==============================================================================
---
shale/framework/trunk/shale-dialog-basic/src/main/java/org/apache/shale/dialog/basic/model/SubdialogState.java
(original)
+++
shale/framework/trunk/shale-dialog-basic/src/main/java/org/apache/shale/dialog/basic/model/SubdialogState.java
Thu Oct 12 12:39:43 2006
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package org.apache.shale.dialog2.legacy.model;
+package org.apache.shale.dialog.basic.model;
/**
* <p>A [EMAIL PROTECTED] SubdialogState} represents the execution of a
separate
Modified:
shale/framework/trunk/shale-dialog-basic/src/main/java/org/apache/shale/dialog/basic/model/Transition.java
URL:
http://svn.apache.org/viewvc/shale/framework/trunk/shale-dialog-basic/src/main/java/org/apache/shale/dialog/basic/model/Transition.java?view=diff&rev=463389&r1=463388&r2=463389
==============================================================================
---
shale/framework/trunk/shale-dialog-basic/src/main/java/org/apache/shale/dialog/basic/model/Transition.java
(original)
+++
shale/framework/trunk/shale-dialog-basic/src/main/java/org/apache/shale/dialog/basic/model/Transition.java
Thu Oct 12 12:39:43 2006
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package org.apache.shale.dialog2.legacy.model;
+package org.apache.shale.dialog.basic.model;
/**
* <p>Description of a transition from the owning [EMAIL PROTECTED] State} to
another
Modified:
shale/framework/trunk/shale-dialog-basic/src/main/java/org/apache/shale/dialog/basic/model/ViewState.java
URL:
http://svn.apache.org/viewvc/shale/framework/trunk/shale-dialog-basic/src/main/java/org/apache/shale/dialog/basic/model/ViewState.java?view=diff&rev=463389&r1=463388&r2=463389
==============================================================================
---
shale/framework/trunk/shale-dialog-basic/src/main/java/org/apache/shale/dialog/basic/model/ViewState.java
(original)
+++
shale/framework/trunk/shale-dialog-basic/src/main/java/org/apache/shale/dialog/basic/model/ViewState.java
Thu Oct 12 12:39:43 2006
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package org.apache.shale.dialog2.legacy.model;
+package org.apache.shale.dialog.basic.model;
/**
* <p>A [EMAIL PROTECTED] ViewState} encapsulates the rendering of a
JavaServer Faces
Modified:
shale/framework/trunk/shale-dialog/src/main/java/org/apache/shale/dialog/base/AbstractDialogListener.java
URL:
http://svn.apache.org/viewvc/shale/framework/trunk/shale-dialog/src/main/java/org/apache/shale/dialog/base/AbstractDialogListener.java?view=diff&rev=463389&r1=463388&r2=463389
==============================================================================
---
shale/framework/trunk/shale-dialog/src/main/java/org/apache/shale/dialog/base/AbstractDialogListener.java
(original)
+++
shale/framework/trunk/shale-dialog/src/main/java/org/apache/shale/dialog/base/AbstractDialogListener.java
Thu Oct 12 12:39:43 2006
@@ -42,7 +42,7 @@
/**
* [EMAIL PROTECTED]
*
- * @see org.apache.shale.dialog2.DialogListener#onStart()
+ * @see org.apache.shale.dialog.DialogListener#onStart()
*/
public void onStart() {
@@ -53,7 +53,7 @@
/**
* [EMAIL PROTECTED]
*
- * @see org.apache.shale.dialog2.DialogListener#onStop()
+ * @see org.apache.shale.dialog.DialogListener#onStop()
*/
public void onStop() {
@@ -64,7 +64,7 @@
/**
* [EMAIL PROTECTED]
*
- * @see
org.apache.shale.dialog2.DialogListener#onException(java.lang.Exception)
+ * @see
org.apache.shale.dialog.DialogListener#onException(java.lang.Exception)
*/
public void onException(Exception e) {
@@ -75,7 +75,7 @@
/**
* [EMAIL PROTECTED]
*
- * @see org.apache.shale.dialog2.DialogListener#onEntry(java.lang.String)
+ * @see org.apache.shale.dialog.DialogListener#onEntry(java.lang.String)
*/
public void onEntry(String stateId) {
@@ -86,7 +86,7 @@
/**
* [EMAIL PROTECTED]
*
- * @see org.apache.shale.dialog2.DialogListener#onExit(java.lang.String)
+ * @see org.apache.shale.dialog.DialogListener#onExit(java.lang.String)
*/
public void onExit(String stateId) {
@@ -97,7 +97,7 @@
/**
* [EMAIL PROTECTED]
*
- * @see
org.apache.shale.dialog2.DialogListener#onTransition(java.lang.String,java.lang.String)
+ * @see
org.apache.shale.dialog.DialogListener#onTransition(java.lang.String,java.lang.String)
*/
public void onTransition(String fromStateId, String toStateId) {
@@ -108,7 +108,7 @@
/**
* [EMAIL PROTECTED]
*
- * @see org.apache.shale.dialog2.DialogListener#getDialogContext()
+ * @see org.apache.shale.dialog.DialogListener#getDialogContext()
*/
public DialogContext getDialogContext() {
@@ -119,7 +119,7 @@
/**
* [EMAIL PROTECTED]
*
- * @see
org.apache.shale.dialog2.DialogListener#setDialogContext(org.apache.shale.dialog2.DialogContext)
+ * @see
org.apache.shale.dialog.DialogListener#setDialogContext(org.apache.shale.dialog.DialogContext)
*/
public void setDialogContext(DialogContext dialogContext) {
