Author: rahul
Date: Tue Sep 12 15:29:12 2006
New Revision: 442739
URL: http://svn.apache.org/viewvc?view=rev&rev=442739
Log:
Replace the legacy dialog-config.xml with the SCXML dialog-config.xml and
individual dialog descriptors.
The files were created by a slightly modified version of the stylesheet
attached to SHALE-263, and then hand-edited for better indentation and order
(to match the order of states in the legacy dialog-config.xml for ease of
comparison).
Added:
shale/sandbox/shale-test-dialog2-scxml/src/main/webapp/WEB-INF/popup.xml
(with props)
shale/sandbox/shale-test-dialog2-scxml/src/main/webapp/WEB-INF/wizard.xml
(with props)
Modified:
shale/sandbox/shale-test-dialog2-scxml/src/main/webapp/WEB-INF/dialog-config.xml
Modified:
shale/sandbox/shale-test-dialog2-scxml/src/main/webapp/WEB-INF/dialog-config.xml
URL:
http://svn.apache.org/viewvc/shale/sandbox/shale-test-dialog2-scxml/src/main/webapp/WEB-INF/dialog-config.xml?view=diff&rev=442739&r1=442738&r2=442739
==============================================================================
---
shale/sandbox/shale-test-dialog2-scxml/src/main/webapp/WEB-INF/dialog-config.xml
(original)
+++
shale/sandbox/shale-test-dialog2-scxml/src/main/webapp/WEB-INF/dialog-config.xml
Tue Sep 12 15:29:12 2006
@@ -1,6 +1,5 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!--
+<?xml version="1.0" encoding="iso-8859-1"?>
+<!--
Copyright 2006 The Apache Software Foundation.
@@ -16,127 +15,17 @@
See the License for the specific language governing permissions and
limitations under the License.
+ $Id$
-->
-
<!--
-
- Dialog definitions for Shale Dialog2 Legacy Integration Tests
-
+This file was generated by a stylesheet.
-->
+<scxmldialogs>
-<!DOCTYPE dialogs PUBLIC
- "-//Apache Software Foundation//DTD Shale Dialog2 Configuration 1.1//EN"
- "http://shale.apache.org/dtds/dialog2-config_1_1.dtd";>
-
-<dialogs>
-
-
- <!-- Three Page Wizard Dialog -->
- <dialog name="wizard"
-
dataClassName="org.apache.shale.examples.test.dialog2.legacy.WizardData"
- start="setup">
-
- <action name="setup"
- method="#{wizard.setup}">
- <transition outcome="success"
- target="page1"/>
- </action>
-
- <view name="page1"
- viewId="/wizardpage1.jsp">
- <transition outcome="cancelled"
- target="cancelled"/>
- <transition outcome="finished"
- target="finished"/>
- <transition outcome="next"
- target="page2"/>
- <transition outcome="exit"
- target="exit"/>
- </view>
-
- <view name="page2"
- viewId="/wizardpage2.jsp">
- <transition outcome="cancelled"
- target="cancelled"/>
- <transition outcome="finished"
- target="finished"/>
- <transition outcome="next"
- target="page3"/>
- <transition outcome="previous"
- target="page1"/>
- <transition outcome="exit"
- target="exit"/>
- </view>
-
- <view name="page3"
- viewId="/wizardpage3.jsp">
- <transition outcome="cancelled"
- target="cancelled"/>
- <transition outcome="finished"
- target="finished"/>
- <transition outcome="previous"
- target="page2"/>
- <transition outcome="exit"
- target="exit"/>
- </view>
-
- <action name="cancel"
- method="#{wizard.cancel}">
- <transition outcome="cancelled"
- target="cancelled"/>
- </action>
-
- <view name="cancelled"
- viewId="/wizardcancelled.jsp">
- <transition outcome="success"
- target="exit"/>
- </view>
-
- <action name="finish"
- method="#{wizard.finish}">
- <transition outcome="finished"
- target="finished"/>
- </action>
-
- <view name="finished"
- viewId="/wizardfinished.jsp">
- <transition outcome="success"
- target="exit"/>
- </view>
-
- <end name="exit"
- viewId="/menu.jsp"/>
-
- </dialog>
-
-
- <!-- Pop Up Dialog for City/State/Zip Configuration -->
- <dialog name="popup"
-
dataClassName="org.apache.shale.examples.test.dialog2.legacy.PopupData"
- start="setup">
-
- <action name="setup"
- method="#{popup.setup}">
- <transition outcome="success"
- target="page1"/>
- </action>
-
- <view name="page1"
- viewId="/popuppage1.jsp">
- <transition outcome="cancelled"
- target="cancelled"/>
- <transition outcome="finished"
- target="finished"/>
- </view>
-
- <end name="cancelled"
- viewId="/popupCancelled.jsp"/>
-
- <end name="finished"
- viewId="/popupFinished.jsp"/>
-
- </dialog>
-
+ <dialog scxmlconfig="wizard.xml" name="wizard"
+
dataclassname="org.apache.shale.examples.test.dialog2.scxml.WizardData"/>
+ <dialog scxmlconfig="popup.xml" name="popup"
+
dataclassname="org.apache.shale.examples.test.dialog2.scxml.PopupData"/>
-</dialogs>
+</scxmldialogs>
Added: shale/sandbox/shale-test-dialog2-scxml/src/main/webapp/WEB-INF/popup.xml
URL:
http://svn.apache.org/viewvc/shale/sandbox/shale-test-dialog2-scxml/src/main/webapp/WEB-INF/popup.xml?view=auto&rev=442739
==============================================================================
--- shale/sandbox/shale-test-dialog2-scxml/src/main/webapp/WEB-INF/popup.xml
(added)
+++ shale/sandbox/shale-test-dialog2-scxml/src/main/webapp/WEB-INF/popup.xml
Tue Sep 12 15:29:12 2006
@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="iso-8859-1"?>
+<!--
+
+ 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$
+-->
+<!--
+This file was generated by a stylesheet.
+-->
+<scxml initialstate="setup" version="1.0">
+
+ <state id="setup">
+ <onentry>
+ <var expr="#{popup.setup}" name="outcome"/>
+ </onentry>
+ <transition target="popuppage1" cond="${outcome eq 'success'}"/>
+ </state>
+
+ <state id="popuppage1">
+ <transition target="popupCancelled" event="faces.outcome" cond="${outcome eq
'cancelled'}"/>
+ <transition target="popupFinished" event="faces.outcome" cond="${outcome eq
'finished'}"/>
+ </state>
+
+ <state final="true" id="popupCancelled"/>
+
+ <state final="true" id="popupFinished"/>
+
+</scxml>
Propchange:
shale/sandbox/shale-test-dialog2-scxml/src/main/webapp/WEB-INF/popup.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
shale/sandbox/shale-test-dialog2-scxml/src/main/webapp/WEB-INF/popup.xml
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Added: shale/sandbox/shale-test-dialog2-scxml/src/main/webapp/WEB-INF/wizard.xml
URL:
http://svn.apache.org/viewvc/shale/sandbox/shale-test-dialog2-scxml/src/main/webapp/WEB-INF/wizard.xml?view=auto&rev=442739
==============================================================================
--- shale/sandbox/shale-test-dialog2-scxml/src/main/webapp/WEB-INF/wizard.xml
(added)
+++ shale/sandbox/shale-test-dialog2-scxml/src/main/webapp/WEB-INF/wizard.xml
Tue Sep 12 15:29:12 2006
@@ -0,0 +1,78 @@
+<?xml version="1.0" encoding="iso-8859-1"?>
+<!--
+
+ 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$
+-->
+<!--
+This file was generated by a stylesheet.
+-->
+<scxml initialstate="setup" version="1.0">
+
+ <state id="setup">
+ <onentry>
+ <var expr="#{wizard.setup}" name="outcome"/>
+ </onentry>
+ <transition target="wizardpage1" cond="${outcome eq 'success'}"/>
+ </state>
+
+ <state id="wizardpage1">
+ <transition target="wizardcancelled" event="faces.outcome" cond="${outcome
eq 'cancelled'}"/>
+ <transition target="wizardfinished" event="faces.outcome" cond="${outcome eq
'finished'}"/>
+ <transition target="wizardpage2" event="faces.outcome" cond="${outcome eq
'next'}"/>
+ <transition target="menu" event="faces.outcome" cond="${outcome eq 'exit'}"/>
+ </state>
+
+ <state id="wizardpage2">
+ <transition target="wizardcancelled" event="faces.outcome" cond="${outcome
eq 'cancelled'}"/>
+ <transition target="wizardfinished" event="faces.outcome" cond="${outcome eq
'finished'}"/>
+ <transition target="wizardpage3" event="faces.outcome" cond="${outcome eq
'next'}"/>
+ <transition target="wizardpage1" event="faces.outcome" cond="${outcome eq
'previous'}"/>
+ <transition target="menu" event="faces.outcome" cond="${outcome eq 'exit'}"/>
+ </state>
+
+ <state id="wizardpage3">
+ <transition target="wizardcancelled" event="faces.outcome" cond="${outcome
eq 'cancelled'}"/>
+ <transition target="wizardfinished" event="faces.outcome" cond="${outcome eq
'finished'}"/>
+ <transition target="wizardpage2" event="faces.outcome" cond="${outcome eq
'previous'}"/>
+ <transition target="menu" event="faces.outcome" cond="${outcome eq 'exit'}"/>
+ </state>
+
+ <state id="cancel">
+ <onentry>
+ <var expr="#{wizard.cancel}" name="outcome"/>
+ </onentry>
+ <transition target="wizardcancelled" cond="${outcome eq 'cancelled'}"/>
+ </state>
+
+ <state id="wizardcancelled">
+ <transition target="menu" event="faces.outcome" cond="${outcome eq
'success'}"/>
+ </state>
+
+ <state id="finish">
+ <onentry>
+ <var expr="#{wizard.finish}" name="outcome"/>
+ </onentry>
+ <transition target="wizardfinished" cond="${outcome eq 'finished'}"/>
+ </state>
+
+ <state id="wizardfinished">
+ <transition target="menu" event="faces.outcome" cond="${outcome eq
'success'}"/>
+ </state>
+
+ <state final="true" id="menu"/>
+
+</scxml>
Propchange:
shale/sandbox/shale-test-dialog2-scxml/src/main/webapp/WEB-INF/wizard.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
shale/sandbox/shale-test-dialog2-scxml/src/main/webapp/WEB-INF/wizard.xml
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
