svn commit: r469653 - in /shale/framework/trunk: shale-apps/shale-test-dialog-scxml/src/main/webapp/WEB-INF/dialog-config.xml shale-dialog-scxml/src/main/java/org/apache/shale/dialog/scxml/config/ConfigurationParser.java

[rahul]

Author: rahul
Date: Tue Oct 31 13:15:12 2006
New Revision: 469653

URL: http://svn.apache.org/viewvc?view=rev&rev=469653
Log:
Change root element of the dialog config (SCXML impl) to <dialogs>. Some 
attribute rearrangement in dialog-config.xml for test app.
SHALE-263

Modified:
    
shale/framework/trunk/shale-apps/shale-test-dialog-scxml/src/main/webapp/WEB-INF/dialog-config.xml
    
shale/framework/trunk/shale-dialog-scxml/src/main/java/org/apache/shale/dialog/scxml/config/ConfigurationParser.java

Modified: 
shale/framework/trunk/shale-apps/shale-test-dialog-scxml/src/main/webapp/WEB-INF/dialog-config.xml
URL: 
http://svn.apache.org/viewvc/shale/framework/trunk/shale-apps/shale-test-dialog-scxml/src/main/webapp/WEB-INF/dialog-config.xml?view=diff&rev=469653&r1=469652&r2=469653
==============================================================================
--- 
shale/framework/trunk/shale-apps/shale-test-dialog-scxml/src/main/webapp/WEB-INF/dialog-config.xml
 (original)
+++ 
shale/framework/trunk/shale-apps/shale-test-dialog-scxml/src/main/webapp/WEB-INF/dialog-config.xml
 Tue Oct 31 13:15:12 2006
@@ -21,12 +21,12 @@
 <!--
 This file was generated by a stylesheet.
 -->
-<scxmldialogs>
+<dialogs>
 
- <dialog scxmlconfig="wizard.xml" name="wizard"
+ <dialog name="wizard" scxmlconfig="wizard.xml"
          
dataclassname="org.apache.shale.examples.test.dialog.scxml.WizardData"/>
 
- <dialog scxmlconfig="popup.xml" name="popup"
+ <dialog name="popup" scxmlconfig="popup.xml"
          
dataclassname="org.apache.shale.examples.test.dialog.scxml.PopupData"/>
 
-</scxmldialogs>
+</dialogs>

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=469653&r1=469652&r2=469653
==============================================================================
--- 
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
 Tue Oct 31 13:15:12 2006
@@ -43,16 +43,15 @@
  * SCXML document, with additional dialog "metadata" file(s)
  * that serve as the entry point for the Shale Dialog Manager.</p>
  *
- * <p>The analogy to the legacy dialog-config.xml file(s) are
- * scxml-config.xml(s) that look like this:
+ * <p>These dialog-config.xml file(s) look like this:
  * <pre>
- * &lt;scxmldialogs&gt;
+ * &lt;dialogs&gt;
  *     &lt;dialog name="Foo" scxmlconfig="foo.scxml" /&gt;
  *     &lt;dialog name="Bar" scxmlconfig="bar.scxml"
  *             dataclassname="org.apache.shale.examples.Bar" /&gt;
  *     &lt;dialog name="Baz" scxmlconfig="baz.scxml" /&gt;
  *     &lt;!-- etc. --&gt;
- * &lt;/scxmldialogs&gt;
+ * &lt;/dialogs&gt;
  * </pre>
  * </p>
  *
@@ -209,8 +208,8 @@
 
         // Configure processing rules
 
-        // scxmldialogs/dialog
-        digester.addRule("scxmldialogs/dialog", new AddDialogMetadataRule());
+        // dialogs/dialog
+        digester.addRule("dialogs/dialog", new AddDialogMetadataRule());
 
        return digester;