svn commit: r1137463 - in /commons/proper/digester/trunk/src: main/java/org/apache/commons/digester3/xmlrules/ main/resources/org/apache/commons/digester3/xmlrules/ site/resources/dtds/ site/xdoc/guide/ test/resources/org/apache/commons/digester3/xmlru...

[simonetripodi]

Author: simonetripodi
Date: Sun Jun 19 22:50:56 2011
New Revision: 1137463

URL: http://svn.apache.org/viewvc?rev=1137463&view=rev
Log:
'path' attribute replaced by 'url', Include rule in XML is able to load 
resources from 'classpath:/' meta-scheme and traditional URLs - TODO: update 
the documentation site

Modified:
    
commons/proper/digester/trunk/src/main/java/org/apache/commons/digester3/xmlrules/IncludeRule.java
    
commons/proper/digester/trunk/src/main/resources/org/apache/commons/digester3/xmlrules/digester-rules.dtd
    commons/proper/digester/trunk/src/site/resources/dtds/digester-rules-3.0.dtd
    commons/proper/digester/trunk/src/site/xdoc/guide/xmlrules.xml
    
commons/proper/digester/trunk/src/test/resources/org/apache/commons/digester3/xmlrules/testCircularRules.xml
    
commons/proper/digester/trunk/src/test/resources/org/apache/commons/digester3/xmlrules/testrules.xml

Modified: 
commons/proper/digester/trunk/src/main/java/org/apache/commons/digester3/xmlrules/IncludeRule.java
URL: 
http://svn.apache.org/viewvc/commons/proper/digester/trunk/src/main/java/org/apache/commons/digester3/xmlrules/IncludeRule.java?rev=1137463&r1=1137462&r2=1137463&view=diff
==============================================================================
--- 
commons/proper/digester/trunk/src/main/java/org/apache/commons/digester3/xmlrules/IncludeRule.java
 (original)
+++ 
commons/proper/digester/trunk/src/main/java/org/apache/commons/digester3/xmlrules/IncludeRule.java
 Sun Jun 19 22:50:56 2011
@@ -58,7 +58,7 @@ final class IncludeRule
         throws Exception
     {
         // The path attribute gives the URI to another digester rules xml file
-        String fileName = attributes.getValue( "path" );
+        String fileName = attributes.getValue( "url" );
         if ( fileName != null && fileName.length() > 0 )
         {
             final URL xmlRulesResource;

Modified: 
commons/proper/digester/trunk/src/main/resources/org/apache/commons/digester3/xmlrules/digester-rules.dtd
URL: 
http://svn.apache.org/viewvc/commons/proper/digester/trunk/src/main/resources/org/apache/commons/digester3/xmlrules/digester-rules.dtd?rev=1137463&r1=1137462&r2=1137463&view=diff
==============================================================================
--- 
commons/proper/digester/trunk/src/main/resources/org/apache/commons/digester3/xmlrules/digester-rules.dtd
 (original)
+++ 
commons/proper/digester/trunk/src/main/resources/org/apache/commons/digester3/xmlrules/digester-rules.dtd
 Sun Jun 19 22:50:56 2011
@@ -79,7 +79,7 @@
 -->
 <!ELEMENT include EMPTY>
 <!ATTLIST include
-    path  CDATA #IMPLIED
+    url   CDATA #IMPLIED
     class CDATA #IMPLIED>
 
 

Modified: 
commons/proper/digester/trunk/src/site/resources/dtds/digester-rules-3.0.dtd
URL: 
http://svn.apache.org/viewvc/commons/proper/digester/trunk/src/site/resources/dtds/digester-rules-3.0.dtd?rev=1137463&r1=1137462&r2=1137463&view=diff
==============================================================================
--- 
commons/proper/digester/trunk/src/site/resources/dtds/digester-rules-3.0.dtd 
(original)
+++ 
commons/proper/digester/trunk/src/site/resources/dtds/digester-rules-3.0.dtd 
Sun Jun 19 22:50:56 2011
@@ -79,7 +79,7 @@
 -->
 <!ELEMENT include EMPTY>
 <!ATTLIST include
-    path  CDATA #IMPLIED
+    url   CDATA #IMPLIED
     class CDATA #IMPLIED>
 
 

Modified: commons/proper/digester/trunk/src/site/xdoc/guide/xmlrules.xml
URL: 
http://svn.apache.org/viewvc/commons/proper/digester/trunk/src/site/xdoc/guide/xmlrules.xml?rev=1137463&r1=1137462&r2=1137463&view=diff
==============================================================================
--- commons/proper/digester/trunk/src/site/xdoc/guide/xmlrules.xml (original)
+++ commons/proper/digester/trunk/src/site/xdoc/guide/xmlrules.xml Sun Jun 19 
22:50:56 2011
@@ -145,7 +145,7 @@ File rules1.xml:
   &lt;pattern value="root/foo"&gt;
     &lt;object-create-rule classname="Foo" /&gt;
 
-    &lt;include path="rules2.xml" /&gt;
+    &lt;include url="rules2.xml" /&gt;
   &lt;/pattern&gt;
 &lt;/digester-rules&gt;
 

Modified: 
commons/proper/digester/trunk/src/test/resources/org/apache/commons/digester3/xmlrules/testCircularRules.xml
URL: 
http://svn.apache.org/viewvc/commons/proper/digester/trunk/src/test/resources/org/apache/commons/digester3/xmlrules/testCircularRules.xml?rev=1137463&r1=1137462&r2=1137463&view=diff
==============================================================================
--- 
commons/proper/digester/trunk/src/test/resources/org/apache/commons/digester3/xmlrules/testCircularRules.xml
 (original)
+++ 
commons/proper/digester/trunk/src/test/resources/org/apache/commons/digester3/xmlrules/testCircularRules.xml
 Sun Jun 19 22:50:56 2011
@@ -25,6 +25,6 @@
     <object-create-rule 
classname="org.apache.commons.digester3.xmlrules.ObjectTestImpl" />
     <set-next-rule methodname="add" paramtype="java.lang.Object" />
     <set-properties-rule />
-    <include 
path="classpath:org/apache/commons/digester3/xmlrules/testCircularRules.xml" />
+    <include 
url="classpath:org/apache/commons/digester3/xmlrules/testCircularRules.xml" />
   </pattern>
 </digester-rules>

Modified: 
commons/proper/digester/trunk/src/test/resources/org/apache/commons/digester3/xmlrules/testrules.xml
URL: 
http://svn.apache.org/viewvc/commons/proper/digester/trunk/src/test/resources/org/apache/commons/digester3/xmlrules/testrules.xml?rev=1137463&r1=1137462&r2=1137463&view=diff
==============================================================================
--- 
commons/proper/digester/trunk/src/test/resources/org/apache/commons/digester3/xmlrules/testrules.xml
 (original)
+++ 
commons/proper/digester/trunk/src/test/resources/org/apache/commons/digester3/xmlrules/testrules.xml
 Sun Jun 19 22:50:56 2011
@@ -21,7 +21,7 @@
     <object-create-rule 
classname="org.apache.commons.digester3.xmlrules.ObjectTestImpl" />
     <set-next-rule methodname="add" paramtype="java.lang.Object" />
     <set-properties-rule />
-    <include 
path="classpath:org/apache/commons/digester3/xmlrules/testrulesinclude.xml" />
+    <include 
url="classpath:org/apache/commons/digester3/xmlrules/testrulesinclude.xml" />
     <include 
class="org.apache.commons.digester3.xmlrules.DigesterRulesSourceTestImpl" />
     <pattern value="call-method-rule-tests">
       <call-method-rule pattern="longValue" methodname="setLongValue" 
usingElementBodyAsArgument="true"