svn commit: r488865 - /shale/framework/trunk/shale-dialog-scxml/src/main/java/org/apache/shale/dialog/scxml/config/ConfigurationParser.java

[rahul]

Author: rahul
Date: Tue Dec 19 16:22:01 2006
New Revision: 488865

URL: http://svn.apache.org/viewvc?view=rev&rev=488865
Log:
Use URL instead of InputSource (cleaner code). Partly related to digester 
update (SHALE-349).

Modified:
    
shale/framework/trunk/shale-dialog-scxml/src/main/java/org/apache/shale/dialog/scxml/config/ConfigurationParser.java

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=488865&r1=488864&r2=488865
==============================================================================
--- 
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 Dec 19 16:22:01 2006
@@ -36,7 +36,6 @@
 import org.apache.shale.dialog.scxml.action.RedirectAction;
 import org.apache.shale.dialog.scxml.action.ViewAction;
 import org.apache.shale.dialog.scxml.config.DialogMetadata.SCXMLAction;
-import org.xml.sax.InputSource;
 import org.xml.sax.SAXException;
 
 /**
@@ -185,9 +184,7 @@
         Digester digester = digester();
         digester.clear();
         digester.push(metadata);
-        InputSource source = new InputSource(getResource().toExternalForm());
-        source.setByteStream(getResource().openStream());
-        digester.parse(source);
+        digester.parse(getResource());
 
         parseDialogs(metadata);
     }
@@ -309,13 +306,11 @@
                 }
 
                 URL resource = new URL(getResource(), scxmlconfig);
-                InputSource source = new 
InputSource(resource.toExternalForm());
-                source.setByteStream(resource.openStream());
 
                 SCXML dialog = null;
                 try {
                     // Parse document, with rules for custom actions in place
-                    dialog = SCXMLDigester.digest(source,
+                    dialog = SCXMLDigester.digest(resource,
                         new SimpleErrorHandler(), customDialogActions);
                 } catch (ModelException me) {
                     throw new SAXException(me.getMessage(), me);