Author: craigmcc
Date: Thu Oct 12 13:00:26 2006
New Revision: 463401
URL: http://svn.apache.org/viewvc?view=rev&rev=463401
Log:
Finished refactoring for shale-dialog-scxml, on to the apps.
SHALE-300
Modified:
shale/framework/trunk/pom.xml
shale/framework/trunk/shale-dialog-basic/src/main/java/org/apache/shale/dialog/basic/BasicDialogManager.java
shale/framework/trunk/shale-dialog-basic/src/main/java/org/apache/shale/dialog/basic/Globals.java
shale/framework/trunk/shale-dialog-scxml/src/main/java/org/apache/shale/dialog/scxml/Globals.java
shale/framework/trunk/shale-dialog-scxml/src/main/java/org/apache/shale/dialog/scxml/SCXMLDialogContext.java
shale/framework/trunk/shale-dialog-scxml/src/main/java/org/apache/shale/dialog/scxml/SCXMLDialogManager.java
shale/framework/trunk/shale-dialog-scxml/src/main/java/org/apache/shale/dialog/scxml/ShaleDialogELEvaluator.java
shale/framework/trunk/shale-dialog-scxml/src/main/java/org/apache/shale/dialog/scxml/config/ConfigurationParser.java
shale/framework/trunk/shale-dialog-scxml/src/main/java/org/apache/shale/dialog/scxml/config/DialogMetadata.java
shale/framework/trunk/shale-dialog-scxml/src/main/java/org/apache/shale/dialog/scxml/package.html
Modified: shale/framework/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/shale/framework/trunk/pom.xml?view=diff&rev=463401&r1=463400&r2=463401
==============================================================================
--- shale/framework/trunk/pom.xml (original)
+++ shale/framework/trunk/pom.xml Thu Oct 12 13:00:26 2006
@@ -141,6 +141,7 @@
<module>shale-core</module>
<module>shale-dialog</module>
<module>shale-dialog-basic</module>
+ <module>shale-dialog-scxml</module>
<module>shale-remoting</module>
<module>shale-spring</module>
<module>shale-test</module>
Modified:
shale/framework/trunk/shale-dialog-basic/src/main/java/org/apache/shale/dialog/basic/BasicDialogManager.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=463401&r1=463400&r2=463401
==============================================================================
---
shale/framework/trunk/shale-dialog-basic/src/main/java/org/apache/shale/dialog/basic/BasicDialogManager.java
(original)
+++
shale/framework/trunk/shale-dialog-basic/src/main/java/org/apache/shale/dialog/basic/BasicDialogManager.java
Thu Oct 12 13:00:26 2006
@@ -122,7 +122,7 @@
}
}
- // Configure a new LegacyDialogContext instance
+ // Configure a new BasicDialogContext instance
BasicDialogContext instance = new BasicDialogContext(this, dialog,
generateId(),
parentDialogId);
map.put(instance.getId(), instance);
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=463401&r1=463400&r2=463401
==============================================================================
---
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 13:00:26 2006
@@ -31,7 +31,7 @@
* list of configuration resources to be parsed exists.</p>
*/
public static final String CONFIGURATION =
- "org.apache.shale.dialog.legacy.CONFIGURATION";
+ "org.apache.shale.dialog.basic.CONFIGURATION";
/**
@@ -39,7 +39,7 @@
* [EMAIL PROTECTED] Dialog} definitions (keyed by dialog name) is
stored.</p>
*/
public static final String DIALOGS =
- "org.apache.shale.dialog.legacy.DIALOGS";
+ "org.apache.shale.dialog.basic.DIALOGS";
}
Modified:
shale/framework/trunk/shale-dialog-scxml/src/main/java/org/apache/shale/dialog/scxml/Globals.java
URL:
http://svn.apache.org/viewvc/shale/framework/trunk/shale-dialog-scxml/src/main/java/org/apache/shale/dialog/scxml/Globals.java?view=diff&rev=463401&r1=463400&r2=463401
==============================================================================
---
shale/framework/trunk/shale-dialog-scxml/src/main/java/org/apache/shale/dialog/scxml/Globals.java
(original)
+++
shale/framework/trunk/shale-dialog-scxml/src/main/java/org/apache/shale/dialog/scxml/Globals.java
Thu Oct 12 13:00:26 2006
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package org.apache.shale.dialog2.scxml;
+package org.apache.shale.dialog.scxml;
/**
* <p>Manifest constants and well known event names for the
@@ -30,7 +30,7 @@
* list of configuration resources to be parsed exists.</p>
*/
public static final String CONFIGURATION =
- "org.apache.shale.dialog2.scxml.CONFIGURATION";
+ "org.apache.shale.dialog.scxml.CONFIGURATION";
/**
@@ -40,7 +40,7 @@
* state machine.</p>
*/
public static final String DIALOGS =
- "org.apache.shale.dialog2.scxml.DIALOGS";
+ "org.apache.shale.dialog.scxml.DIALOGS";
/**
Modified:
shale/framework/trunk/shale-dialog-scxml/src/main/java/org/apache/shale/dialog/scxml/SCXMLDialogContext.java
URL:
http://svn.apache.org/viewvc/shale/framework/trunk/shale-dialog-scxml/src/main/java/org/apache/shale/dialog/scxml/SCXMLDialogContext.java?view=diff&rev=463401&r1=463400&r2=463401
==============================================================================
---
shale/framework/trunk/shale-dialog-scxml/src/main/java/org/apache/shale/dialog/scxml/SCXMLDialogContext.java
(original)
+++
shale/framework/trunk/shale-dialog-scxml/src/main/java/org/apache/shale/dialog/scxml/SCXMLDialogContext.java
Thu Oct 12 13:00:26 2006
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package org.apache.shale.dialog2.scxml;
+package org.apache.shale.dialog.scxml;
import java.util.Iterator;
@@ -32,11 +32,11 @@
import org.apache.commons.scxml.model.State;
import org.apache.commons.scxml.model.Transition;
import org.apache.commons.scxml.model.TransitionTarget;
-import org.apache.shale.dialog2.DialogContext;
-import org.apache.shale.dialog2.DialogContextManager;
-import org.apache.shale.dialog2.DialogListener;
-import org.apache.shale.dialog2.base.AbstractDialogContext;
-import org.apache.shale.dialog2.scxml.config.DialogMetadata;
+import org.apache.shale.dialog.DialogContext;
+import org.apache.shale.dialog.DialogContextManager;
+import org.apache.shale.dialog.DialogListener;
+import org.apache.shale.dialog.base.AbstractDialogContext;
+import org.apache.shale.dialog.scxml.config.DialogMetadata;
/**
* <p>Implementation of [EMAIL PROTECTED] DialogContextManager} for integrating
Modified:
shale/framework/trunk/shale-dialog-scxml/src/main/java/org/apache/shale/dialog/scxml/SCXMLDialogManager.java
URL:
http://svn.apache.org/viewvc/shale/framework/trunk/shale-dialog-scxml/src/main/java/org/apache/shale/dialog/scxml/SCXMLDialogManager.java?view=diff&rev=463401&r1=463400&r2=463401
==============================================================================
---
shale/framework/trunk/shale-dialog-scxml/src/main/java/org/apache/shale/dialog/scxml/SCXMLDialogManager.java
(original)
+++
shale/framework/trunk/shale-dialog-scxml/src/main/java/org/apache/shale/dialog/scxml/SCXMLDialogManager.java
Thu Oct 12 13:00:26 2006
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package org.apache.shale.dialog2.scxml;
+package org.apache.shale.dialog.scxml;
import java.io.Serializable;
import java.net.URL;
@@ -28,11 +28,11 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.commons.scxml.model.SCXML;
-import org.apache.shale.dialog2.Constants;
-import org.apache.shale.dialog2.DialogContext;
-import org.apache.shale.dialog2.DialogContextManager;
-import org.apache.shale.dialog2.scxml.config.ConfigurationParser;
-import org.apache.shale.dialog2.scxml.config.DialogMetadata;
+import org.apache.shale.dialog.Constants;
+import org.apache.shale.dialog.DialogContext;
+import org.apache.shale.dialog.DialogContextManager;
+import org.apache.shale.dialog.scxml.config.ConfigurationParser;
+import org.apache.shale.dialog.scxml.config.DialogMetadata;
/**
* <p>Implementation of [EMAIL PROTECTED] DialogContextManager} for integrating
Modified:
shale/framework/trunk/shale-dialog-scxml/src/main/java/org/apache/shale/dialog/scxml/ShaleDialogELEvaluator.java
URL:
http://svn.apache.org/viewvc/shale/framework/trunk/shale-dialog-scxml/src/main/java/org/apache/shale/dialog/scxml/ShaleDialogELEvaluator.java?view=diff&rev=463401&r1=463400&r2=463401
==============================================================================
---
shale/framework/trunk/shale-dialog-scxml/src/main/java/org/apache/shale/dialog/scxml/ShaleDialogELEvaluator.java
(original)
+++
shale/framework/trunk/shale-dialog-scxml/src/main/java/org/apache/shale/dialog/scxml/ShaleDialogELEvaluator.java
Thu Oct 12 13:00:26 2006
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package org.apache.shale.dialog2.scxml;
+package org.apache.shale.dialog.scxml;
import java.util.regex.Pattern;
@@ -156,4 +156,3 @@
}
}
-
Modified:
shale/framework/trunk/shale-dialog-scxml/src/main/java/org/apache/shale/dialog/scxml/config/ConfigurationParser.java
URL:
http://svn.apache.org/viewvc/shale/framework/trunk/shale-dialog-scxml/src/main/java/org/apache/shale/dialog/scxml/config/ConfigurationParser.java?view=diff&rev=463401&r1=463400&r2=463401
==============================================================================
---
shale/framework/trunk/shale-dialog-scxml/src/main/java/org/apache/shale/dialog/scxml/config/ConfigurationParser.java
(original)
+++
shale/framework/trunk/shale-dialog-scxml/src/main/java/org/apache/shale/dialog/scxml/config/ConfigurationParser.java
Thu Oct 12 13:00:26 2006
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package org.apache.shale.dialog2.scxml.config;
+package org.apache.shale.dialog.scxml.config;
import java.io.IOException;
import java.net.URL;
Modified:
shale/framework/trunk/shale-dialog-scxml/src/main/java/org/apache/shale/dialog/scxml/config/DialogMetadata.java
URL:
http://svn.apache.org/viewvc/shale/framework/trunk/shale-dialog-scxml/src/main/java/org/apache/shale/dialog/scxml/config/DialogMetadata.java?view=diff&rev=463401&r1=463400&r2=463401
==============================================================================
---
shale/framework/trunk/shale-dialog-scxml/src/main/java/org/apache/shale/dialog/scxml/config/DialogMetadata.java
(original)
+++
shale/framework/trunk/shale-dialog-scxml/src/main/java/org/apache/shale/dialog/scxml/config/DialogMetadata.java
Thu Oct 12 13:00:26 2006
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package org.apache.shale.dialog2.scxml.config;
+package org.apache.shale.dialog.scxml.config;
import java.io.Serializable;
@@ -137,4 +137,3 @@
}
}
-
Modified:
shale/framework/trunk/shale-dialog-scxml/src/main/java/org/apache/shale/dialog/scxml/package.html
URL:
http://svn.apache.org/viewvc/shale/framework/trunk/shale-dialog-scxml/src/main/java/org/apache/shale/dialog/scxml/package.html?view=diff&rev=463401&r1=463400&r2=463401
==============================================================================
---
shale/framework/trunk/shale-dialog-scxml/src/main/java/org/apache/shale/dialog/scxml/package.html
(original)
+++
shale/framework/trunk/shale-dialog-scxml/src/main/java/org/apache/shale/dialog/scxml/package.html
Thu Oct 12 13:00:26 2006
@@ -23,7 +23,7 @@
</head>
<body>
- <p>The Commons SCXML implementation of the Shale dialog2 module.</p>
+ <p>The Commons SCXML implementation of the Shale dialog module.</p>
</body>
</html>
