commons-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From simonetrip...@apache.org
Subject svn commit: r1101208 [6/6] - in /commons/sandbox/digester3/trunk/src: examples/api/addressbook/ examples/api/catalog/ examples/api/dbinsert/ examples/api/document-markup/ examples/plugins/pipeline/ examples/rss/ examples/rss/src/java/org/apache/commons...
Date Mon, 09 May 2011 20:27:44 GMT
Modified: commons/sandbox/digester3/trunk/src/test/java/org/apache/commons/digester3/plugins/TextLabel2.java
URL: http://svn.apache.org/viewvc/commons/sandbox/digester3/trunk/src/test/java/org/apache/commons/digester3/plugins/TextLabel2.java?rev=1101208&r1=1101159&r2=1101208&view=diff
==============================================================================
--- commons/sandbox/digester3/trunk/src/test/java/org/apache/commons/digester3/plugins/TextLabel2.java
(original)
+++ commons/sandbox/digester3/trunk/src/test/java/org/apache/commons/digester3/plugins/TextLabel2.java
Mon May  9 20:27:33 2011
@@ -16,7 +16,7 @@
  * limitations under the License.
  */
 
-package org.apache.commons.digester.plugins;
+package org.apache.commons.digester3.plugins;
 
 public class TextLabel2 implements Widget {
     private String id = "anonymous";

Modified: commons/sandbox/digester3/trunk/src/test/java/org/apache/commons/digester3/plugins/TextLabel2RuleInfo.java
URL: http://svn.apache.org/viewvc/commons/sandbox/digester3/trunk/src/test/java/org/apache/commons/digester3/plugins/TextLabel2RuleInfo.java?rev=1101208&r1=1101159&r2=1101208&view=diff
==============================================================================
--- commons/sandbox/digester3/trunk/src/test/java/org/apache/commons/digester3/plugins/TextLabel2RuleInfo.java
(original)
+++ commons/sandbox/digester3/trunk/src/test/java/org/apache/commons/digester3/plugins/TextLabel2RuleInfo.java
Mon May  9 20:27:33 2011
@@ -16,9 +16,9 @@
  * limitations under the License.
  */
 
-package org.apache.commons.digester.plugins;
+package org.apache.commons.digester3.plugins;
 
-import org.apache.commons.digester.Digester;
+import org.apache.commons.digester3.Digester;
 
 public class TextLabel2RuleInfo {
     // define default rules

Modified: commons/sandbox/digester3/trunk/src/test/java/org/apache/commons/digester3/plugins/Utils.java
URL: http://svn.apache.org/viewvc/commons/sandbox/digester3/trunk/src/test/java/org/apache/commons/digester3/plugins/Utils.java?rev=1101208&r1=1101159&r2=1101208&view=diff
==============================================================================
--- commons/sandbox/digester3/trunk/src/test/java/org/apache/commons/digester3/plugins/Utils.java
(original)
+++ commons/sandbox/digester3/trunk/src/test/java/org/apache/commons/digester3/plugins/Utils.java
Mon May  9 20:27:33 2011
@@ -15,7 +15,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.digester.plugins;
+package org.apache.commons.digester3.plugins;
 
 import java.io.IOException;
 import java.io.InputStream;
@@ -39,6 +39,6 @@ public class Utils {
     public static InputStream getInputStream(Object caller, String name) 
     throws IOException {
         return (caller.getClass().getResourceAsStream
-                ("/org/apache/commons/digester/plugins/" + name));
+                ("/org/apache/commons/digester3/plugins/" + name));
     }
 }

Modified: commons/sandbox/digester3/trunk/src/test/java/org/apache/commons/digester3/plugins/Widget.java
URL: http://svn.apache.org/viewvc/commons/sandbox/digester3/trunk/src/test/java/org/apache/commons/digester3/plugins/Widget.java?rev=1101208&r1=1101159&r2=1101208&view=diff
==============================================================================
--- commons/sandbox/digester3/trunk/src/test/java/org/apache/commons/digester3/plugins/Widget.java
(original)
+++ commons/sandbox/digester3/trunk/src/test/java/org/apache/commons/digester3/plugins/Widget.java
Mon May  9 20:27:33 2011
@@ -16,7 +16,7 @@
  * limitations under the License.
  */
 
-package org.apache.commons.digester.plugins;
+package org.apache.commons.digester3.plugins;
 
 public interface Widget {
 }

Modified: commons/sandbox/digester3/trunk/src/test/java/org/apache/commons/digester3/substitution/VariableExpansionTestCase.java
URL: http://svn.apache.org/viewvc/commons/sandbox/digester3/trunk/src/test/java/org/apache/commons/digester3/substitution/VariableExpansionTestCase.java?rev=1101208&r1=1101159&r2=1101208&view=diff
==============================================================================
--- commons/sandbox/digester3/trunk/src/test/java/org/apache/commons/digester3/substitution/VariableExpansionTestCase.java
(original)
+++ commons/sandbox/digester3/trunk/src/test/java/org/apache/commons/digester3/substitution/VariableExpansionTestCase.java
Mon May  9 20:27:33 2011
@@ -17,7 +17,7 @@
  */
 
 
-package org.apache.commons.digester.substitution;
+package org.apache.commons.digester3.substitution;
 
 import static org.junit.Assert.*;
 
@@ -26,9 +26,11 @@ import java.io.StringReader;
 import java.util.HashMap;
 import java.util.LinkedList;
 
-import org.apache.commons.digester.CallMethodRule;
-import org.apache.commons.digester.Digester;
-import org.apache.commons.digester.SimpleTestBean;
+import org.apache.commons.digester3.CallMethodRule;
+import org.apache.commons.digester3.Digester;
+import org.apache.commons.digester3.SimpleTestBean;
+import org.apache.commons.digester3.substitution.MultiVariableExpander;
+import org.apache.commons.digester3.substitution.VariableSubstitutor;
 import org.junit.Test;
 import org.xml.sax.SAXException;
 

Modified: commons/sandbox/digester3/trunk/src/test/java/org/apache/commons/digester3/xmlrules/CallParamTestObject.java
URL: http://svn.apache.org/viewvc/commons/sandbox/digester3/trunk/src/test/java/org/apache/commons/digester3/xmlrules/CallParamTestObject.java?rev=1101208&r1=1101159&r2=1101208&view=diff
==============================================================================
--- commons/sandbox/digester3/trunk/src/test/java/org/apache/commons/digester3/xmlrules/CallParamTestObject.java
(original)
+++ commons/sandbox/digester3/trunk/src/test/java/org/apache/commons/digester3/xmlrules/CallParamTestObject.java
Mon May  9 20:27:33 2011
@@ -16,7 +16,7 @@
  * limitations under the License.
  */
 
-package org.apache.commons.digester.xmlrules;
+package org.apache.commons.digester3.xmlrules;
 
 
 

Modified: commons/sandbox/digester3/trunk/src/test/java/org/apache/commons/digester3/xmlrules/DigesterLoaderRulesTest.java
URL: http://svn.apache.org/viewvc/commons/sandbox/digester3/trunk/src/test/java/org/apache/commons/digester3/xmlrules/DigesterLoaderRulesTest.java?rev=1101208&r1=1101159&r2=1101208&view=diff
==============================================================================
--- commons/sandbox/digester3/trunk/src/test/java/org/apache/commons/digester3/xmlrules/DigesterLoaderRulesTest.java
(original)
+++ commons/sandbox/digester3/trunk/src/test/java/org/apache/commons/digester3/xmlrules/DigesterLoaderRulesTest.java
Mon May  9 20:27:33 2011
@@ -15,13 +15,14 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.digester.xmlrules;
+package org.apache.commons.digester3.xmlrules;
 
 import static org.junit.Assert.*;
 
 import java.io.StringReader;
 
-import org.apache.commons.digester.Digester;
+import org.apache.commons.digester3.Digester;
+import org.apache.commons.digester3.xmlrules.DigesterLoader;
 import org.junit.Test;
 import org.xml.sax.InputSource;
 

Modified: commons/sandbox/digester3/trunk/src/test/java/org/apache/commons/digester3/xmlrules/DigesterLoaderTest.java
URL: http://svn.apache.org/viewvc/commons/sandbox/digester3/trunk/src/test/java/org/apache/commons/digester3/xmlrules/DigesterLoaderTest.java?rev=1101208&r1=1101159&r2=1101208&view=diff
==============================================================================
--- commons/sandbox/digester3/trunk/src/test/java/org/apache/commons/digester3/xmlrules/DigesterLoaderTest.java
(original)
+++ commons/sandbox/digester3/trunk/src/test/java/org/apache/commons/digester3/xmlrules/DigesterLoaderTest.java
Mon May  9 20:27:33 2011
@@ -17,7 +17,7 @@
  */
 
 
-package org.apache.commons.digester.xmlrules;
+package org.apache.commons.digester3.xmlrules;
 
 
 import static org.junit.Assert.assertEquals;
@@ -31,9 +31,10 @@ import java.net.URL;
 import java.util.ArrayList;
 import java.util.List;
 
-import org.apache.commons.digester.Address;
-import org.apache.commons.digester.Digester;
-import org.apache.commons.digester.ObjectCreationFactoryTestImpl;
+import org.apache.commons.digester3.Address;
+import org.apache.commons.digester3.Digester;
+import org.apache.commons.digester3.ObjectCreationFactoryTestImpl;
+import org.apache.commons.digester3.xmlrules.DigesterLoader;
 import org.junit.Test;
 import org.w3c.dom.Node;
 import org.xml.sax.InputSource;
@@ -54,8 +55,8 @@ public class DigesterLoaderTest {
      */
     @Test
     public void testCreateDigester() throws Exception {
-        URL rules = getClass().getClassLoader().getResource("org/apache/commons/digester/xmlrules/testrules.xml");
-        URL input = getClass().getClassLoader().getResource("org/apache/commons/digester/xmlrules/test.xml");
+        URL rules = getClass().getClassLoader().getResource("org/apache/commons/digester3/xmlrules/testrules.xml");
+        URL input = getClass().getClassLoader().getResource("org/apache/commons/digester3/xmlrules/test.xml");
         assertNotNull("The test could not locate testrules.xml", rules);
         assertNotNull("The test could not locate test.xml", input);
         Digester digester = DigesterLoader.createDigester(rules);
@@ -72,8 +73,8 @@ public class DigesterLoaderTest {
     @Test
     public void testLoad1() throws Exception {
         ClassLoader classLoader = getClass().getClassLoader();
-        URL rules = classLoader.getResource("org/apache/commons/digester/xmlrules/testrules.xml");
-        URL input = classLoader.getResource("org/apache/commons/digester/xmlrules/test.xml");
+        URL rules = classLoader.getResource("org/apache/commons/digester3/xmlrules/testrules.xml");
+        URL input = classLoader.getResource("org/apache/commons/digester3/xmlrules/test.xml");
         assertNotNull("The test could not locate testrules.xml", rules);
         assertNotNull("The test could not locate test.xml", input);
         Object root = DigesterLoader.load(rules, classLoader, input, new ArrayList<Object>());
@@ -100,8 +101,8 @@ public class DigesterLoaderTest {
      */
     @Test
     public void testLoad2() throws Exception {
-        URL rules = getClass().getClassLoader().getResource("org/apache/commons/digester/xmlrules/testrules.xml");
-        InputStream input = getClass().getClassLoader().getResource("org/apache/commons/digester/xmlrules/test.xml").openStream();
+        URL rules = getClass().getClassLoader().getResource("org/apache/commons/digester3/xmlrules/testrules.xml");
+        InputStream input = getClass().getClassLoader().getResource("org/apache/commons/digester3/xmlrules/test.xml").openStream();
         Object root = DigesterLoader.load(rules, getClass().getClassLoader(), input, new
ArrayList<Object>());
         if (!(root instanceof ArrayList<?>)) {
             fail("Unexpected object returned from DigesterLoader. Expected ArrayList; got
" + root.getClass().getName());
@@ -121,7 +122,7 @@ public class DigesterLoaderTest {
      */
     @Test
     public void testCircularInclude1() {
-        URL rules = ClassLoader.getSystemResource("org/apache/commons/digester/xmlrules/testCircularRules.xml");
+        URL rules = ClassLoader.getSystemResource("org/apache/commons/digester3/xmlrules/testCircularRules.xml");
         try {
             Digester digester = DigesterLoader.createDigester(rules);
             assertNotNull(digester); // just to prevent compiler warning on unused var
@@ -137,9 +138,9 @@ public class DigesterLoaderTest {
     @Test
     public void testSetCustomProperties() throws Exception {
         URL rules = getClass().getClassLoader().getResource
-            ("org/apache/commons/digester/xmlrules/testPropertyAliasRules.xml");
+            ("org/apache/commons/digester3/xmlrules/testPropertyAliasRules.xml");
         InputStream input = getClass().getClassLoader().getResource
-            ("org/apache/commons/digester/Test7.xml").openStream();
+            ("org/apache/commons/digester3/Test7.xml").openStream();
             
         Object obj = DigesterLoader.load(
                                         rules, 
@@ -189,7 +190,7 @@ public class DigesterLoaderTest {
     @Test
    public void testFactoryCreateRule() throws Exception {
         URL rules = getClass().getClassLoader().getResource
-            ("org/apache/commons/digester/xmlrules/testfactory.xml");
+            ("org/apache/commons/digester3/xmlrules/testfactory.xml");
             
         String xml = "<?xml version='1.0' ?><root one='good' two='bad' three='ugly'><foo/></root>";
         Object obj = DigesterLoader.load(
@@ -225,7 +226,7 @@ public class DigesterLoaderTest {
 
         
         rules = getClass().getClassLoader().getResource
-            ("org/apache/commons/digester/xmlrules/testfactoryignore.xml");
+            ("org/apache/commons/digester3/xmlrules/testfactoryignore.xml");
             
         xml = "<?xml version='1.0' ?><root one='good' two='bad' three='ugly'><foo/></root>";
         try {
@@ -238,7 +239,7 @@ public class DigesterLoaderTest {
         }
         
         rules = getClass().getClassLoader().getResource
-            ("org/apache/commons/digester/xmlrules/testfactorynoignore.xml");
+            ("org/apache/commons/digester3/xmlrules/testfactorynoignore.xml");
             
         xml = "<?xml version='1.0' ?><root one='good' two='bad' three='ugly'><foo/></root>";
         try {
@@ -257,7 +258,7 @@ public class DigesterLoaderTest {
     public void testCallParamRule() throws Exception {
     
         URL rules = getClass().getClassLoader().getResource
-            ("org/apache/commons/digester/xmlrules/test-call-param-rules.xml");
+            ("org/apache/commons/digester3/xmlrules/test-call-param-rules.xml");
         
         String xml = "<?xml version='1.0' ?>"
                      + "<root><foo attr='long'><bar>short</bar><foobar><ping>tosh</ping></foobar></foo></root>";
@@ -314,8 +315,8 @@ public class DigesterLoaderTest {
     @Test
     public void testNodeCreateRule() throws Exception {
         
-        URL rules = getClass().getClassLoader().getResource("org/apache/commons/digester/xmlrules/test-node-create-rules.xml");
-        URL input = getClass().getClassLoader().getResource("org/apache/commons/digester/xmlrules/test-node-create-rules-input.xml");
+        URL rules = getClass().getClassLoader().getResource("org/apache/commons/digester3/xmlrules/test-node-create-rules.xml");
+        URL input = getClass().getClassLoader().getResource("org/apache/commons/digester3/xmlrules/test-node-create-rules-input.xml");
         assertNotNull("The test could not locate test-node-create-rules.xml", rules);
         assertNotNull("The test could not locate test-node-create-rules-input.xml", input);
         Digester digester = DigesterLoader.createDigester(rules);

Modified: commons/sandbox/digester3/trunk/src/test/java/org/apache/commons/digester3/xmlrules/DigesterPatternStackTest.java
URL: http://svn.apache.org/viewvc/commons/sandbox/digester3/trunk/src/test/java/org/apache/commons/digester3/xmlrules/DigesterPatternStackTest.java?rev=1101208&r1=1101159&r2=1101208&view=diff
==============================================================================
--- commons/sandbox/digester3/trunk/src/test/java/org/apache/commons/digester3/xmlrules/DigesterPatternStackTest.java
(original)
+++ commons/sandbox/digester3/trunk/src/test/java/org/apache/commons/digester3/xmlrules/DigesterPatternStackTest.java
Mon May  9 20:27:33 2011
@@ -16,11 +16,12 @@
  * limitations under the License.
  */
 
-package org.apache.commons.digester.xmlrules;
+package org.apache.commons.digester3.xmlrules;
 
 
 import static org.junit.Assert.*;
 
+import org.apache.commons.digester3.xmlrules.DigesterRuleParser;
 import org.junit.Before;
 import org.junit.Test;
 

Modified: commons/sandbox/digester3/trunk/src/test/java/org/apache/commons/digester3/xmlrules/DigesterRulesSourceTestImpl.java
URL: http://svn.apache.org/viewvc/commons/sandbox/digester3/trunk/src/test/java/org/apache/commons/digester3/xmlrules/DigesterRulesSourceTestImpl.java?rev=1101208&r1=1101159&r2=1101208&view=diff
==============================================================================
--- commons/sandbox/digester3/trunk/src/test/java/org/apache/commons/digester3/xmlrules/DigesterRulesSourceTestImpl.java
(original)
+++ commons/sandbox/digester3/trunk/src/test/java/org/apache/commons/digester3/xmlrules/DigesterRulesSourceTestImpl.java
Mon May  9 20:27:33 2011
@@ -17,10 +17,11 @@
  */
 
 
-package org.apache.commons.digester.xmlrules;
+package org.apache.commons.digester3.xmlrules;
 
 
-import org.apache.commons.digester.Digester;
+import org.apache.commons.digester3.Digester;
+import org.apache.commons.digester3.xmlrules.DigesterRulesSource;
 
 
 /**

Modified: commons/sandbox/digester3/trunk/src/test/java/org/apache/commons/digester3/xmlrules/FromXmlRuleSetTest.java
URL: http://svn.apache.org/viewvc/commons/sandbox/digester3/trunk/src/test/java/org/apache/commons/digester3/xmlrules/FromXmlRuleSetTest.java?rev=1101208&r1=1101159&r2=1101208&view=diff
==============================================================================
--- commons/sandbox/digester3/trunk/src/test/java/org/apache/commons/digester3/xmlrules/FromXmlRuleSetTest.java
(original)
+++ commons/sandbox/digester3/trunk/src/test/java/org/apache/commons/digester3/xmlrules/FromXmlRuleSetTest.java
Mon May  9 20:27:33 2011
@@ -17,14 +17,15 @@
  */
 
 
-package org.apache.commons.digester.xmlrules;
+package org.apache.commons.digester3.xmlrules;
 
 
 import static org.junit.Assert.*;
 
 import java.io.StringReader;
 
-import org.apache.commons.digester.Digester;
+import org.apache.commons.digester3.Digester;
+import org.apache.commons.digester3.xmlrules.FromXmlRuleSet;
 import org.junit.Test;
 import org.xml.sax.InputSource;
 

Modified: commons/sandbox/digester3/trunk/src/test/java/org/apache/commons/digester3/xmlrules/IncludeTest.java
URL: http://svn.apache.org/viewvc/commons/sandbox/digester3/trunk/src/test/java/org/apache/commons/digester3/xmlrules/IncludeTest.java?rev=1101208&r1=1101159&r2=1101208&view=diff
==============================================================================
--- commons/sandbox/digester3/trunk/src/test/java/org/apache/commons/digester3/xmlrules/IncludeTest.java
(original)
+++ commons/sandbox/digester3/trunk/src/test/java/org/apache/commons/digester3/xmlrules/IncludeTest.java
Mon May  9 20:27:33 2011
@@ -16,15 +16,17 @@
  * limitations under the License.
  */
 
-package org.apache.commons.digester.xmlrules;
+package org.apache.commons.digester3.xmlrules;
 
 import static org.junit.Assert.assertEquals;
 
 import java.io.StringReader;
 import java.util.ArrayList;
 
-import org.apache.commons.digester.Digester;
-import org.apache.commons.digester.Rule;
+import org.apache.commons.digester3.Digester;
+import org.apache.commons.digester3.Rule;
+import org.apache.commons.digester3.xmlrules.DigesterLoader;
+import org.apache.commons.digester3.xmlrules.DigesterRulesSource;
 import org.junit.Test;
 import org.xml.sax.InputSource;
 
@@ -50,7 +52,7 @@ public class IncludeTest {
         String rulesXml = "<?xml version='1.0'?>"
                 + "<digester-rules>"
                 + " <pattern value='root/foo'>"
-                + "   <include class='org.apache.commons.digester.xmlrules.IncludeTest$TestDigesterRuleSource'/>"
+                + "   <include class='org.apache.commons.digester3.xmlrules.IncludeTest$TestDigesterRuleSource'/>"
                 + " </pattern>"
                 + "</digester-rules>";
                 

Modified: commons/sandbox/digester3/trunk/src/test/java/org/apache/commons/digester3/xmlrules/ObjectTestImpl.java
URL: http://svn.apache.org/viewvc/commons/sandbox/digester3/trunk/src/test/java/org/apache/commons/digester3/xmlrules/ObjectTestImpl.java?rev=1101208&r1=1101159&r2=1101208&view=diff
==============================================================================
--- commons/sandbox/digester3/trunk/src/test/java/org/apache/commons/digester3/xmlrules/ObjectTestImpl.java
(original)
+++ commons/sandbox/digester3/trunk/src/test/java/org/apache/commons/digester3/xmlrules/ObjectTestImpl.java
Mon May  9 20:27:33 2011
@@ -16,7 +16,7 @@
  * limitations under the License.
  */
 
-package org.apache.commons.digester.xmlrules;
+package org.apache.commons.digester3.xmlrules;
 
 
 import java.util.ArrayList;

Modified: commons/sandbox/digester3/trunk/src/test/java/org/apache/commons/digester3/xmlrules/ThrowExceptionCreationFactory.java
URL: http://svn.apache.org/viewvc/commons/sandbox/digester3/trunk/src/test/java/org/apache/commons/digester3/xmlrules/ThrowExceptionCreationFactory.java?rev=1101208&r1=1101159&r2=1101208&view=diff
==============================================================================
--- commons/sandbox/digester3/trunk/src/test/java/org/apache/commons/digester3/xmlrules/ThrowExceptionCreationFactory.java
(original)
+++ commons/sandbox/digester3/trunk/src/test/java/org/apache/commons/digester3/xmlrules/ThrowExceptionCreationFactory.java
Mon May  9 20:27:33 2011
@@ -16,9 +16,9 @@
  * limitations under the License.
  */
 
-package org.apache.commons.digester.xmlrules;
+package org.apache.commons.digester3.xmlrules;
 
-import org.apache.commons.digester.AbstractObjectCreationFactory;
+import org.apache.commons.digester3.AbstractObjectCreationFactory;
 import org.xml.sax.Attributes;
 
 /**

Modified: commons/sandbox/digester3/trunk/src/test/resources/org/apache/commons/digester3/Test12.xml
URL: http://svn.apache.org/viewvc/commons/sandbox/digester3/trunk/src/test/resources/org/apache/commons/digester3/Test12.xml?rev=1101208&r1=1101159&r2=1101208&view=diff
==============================================================================
--- commons/sandbox/digester3/trunk/src/test/resources/org/apache/commons/digester3/Test12.xml
(original)
+++ commons/sandbox/digester3/trunk/src/test/resources/org/apache/commons/digester3/Test12.xml
Mon May  9 20:27:33 2011
@@ -17,7 +17,7 @@
  limitations under the License.
 -->
 
-<employee xml:base="src/test/resources/org/apache/commons/digester/"
+<employee xml:base="src/test/resources/org/apache/commons/digester3/"
           xmlns:xi="http://www.w3.org/2001/XInclude">
   <firstName>First Name</firstName>
   <lastName>Last Name</lastName>

Modified: commons/sandbox/digester3/trunk/src/test/resources/org/apache/commons/digester3/plugins/test1.xml
URL: http://svn.apache.org/viewvc/commons/sandbox/digester3/trunk/src/test/resources/org/apache/commons/digester3/plugins/test1.xml?rev=1101208&r1=1101159&r2=1101208&view=diff
==============================================================================
--- commons/sandbox/digester3/trunk/src/test/resources/org/apache/commons/digester3/plugins/test1.xml
(original)
+++ commons/sandbox/digester3/trunk/src/test/resources/org/apache/commons/digester3/plugins/test1.xml
Mon May  9 20:27:33 2011
@@ -16,6 +16,6 @@
 -->
 
 <root>
-  <widget plugin-class="org.apache.commons.digester.plugins.TextLabel" label="1"/>
-  <widget plugin-class="org.apache.commons.digester.plugins.TextLabel" id="L1" label="2"/>
+  <widget plugin-class="org.apache.commons.digester3.plugins.TextLabel" label="1"/>
+  <widget plugin-class="org.apache.commons.digester3.plugins.TextLabel" id="L1" label="2"/>
 </root>

Modified: commons/sandbox/digester3/trunk/src/test/resources/org/apache/commons/digester3/plugins/test2.xml
URL: http://svn.apache.org/viewvc/commons/sandbox/digester3/trunk/src/test/resources/org/apache/commons/digester3/plugins/test2.xml?rev=1101208&r1=1101159&r2=1101208&view=diff
==============================================================================
--- commons/sandbox/digester3/trunk/src/test/resources/org/apache/commons/digester3/plugins/test2.xml
(original)
+++ commons/sandbox/digester3/trunk/src/test/resources/org/apache/commons/digester3/plugins/test2.xml
Mon May  9 20:27:33 2011
@@ -17,7 +17,7 @@
 
 <root>
   <widget label="label1"/>
-  <widget plugin-class="org.apache.commons.digester.plugins.TextLabel" label="label2"/>
-  <widget plugin-class="org.apache.commons.digester.plugins.Slider" label="slider1"/>
+  <widget plugin-class="org.apache.commons.digester3.plugins.TextLabel" label="label2"/>
+  <widget plugin-class="org.apache.commons.digester3.plugins.Slider" label="slider1"/>
 </root>
 

Modified: commons/sandbox/digester3/trunk/src/test/resources/org/apache/commons/digester3/plugins/test3.xml
URL: http://svn.apache.org/viewvc/commons/sandbox/digester3/trunk/src/test/resources/org/apache/commons/digester3/plugins/test3.xml?rev=1101208&r1=1101159&r2=1101208&view=diff
==============================================================================
--- commons/sandbox/digester3/trunk/src/test/resources/org/apache/commons/digester3/plugins/test3.xml
(original)
+++ commons/sandbox/digester3/trunk/src/test/resources/org/apache/commons/digester3/plugins/test3.xml
Mon May  9 20:27:33 2011
@@ -16,7 +16,7 @@
 -->
 
 <root>
-  <plugin id="textlabel" class="org.apache.commons.digester.plugins.TextLabel"/>
+  <plugin id="textlabel" class="org.apache.commons.digester3.plugins.TextLabel"/>
   <widget plugin-id="textlabel" label="label1"/>
   <widget plugin-id="textlabel" label="label2"/>
 </root>

Modified: commons/sandbox/digester3/trunk/src/test/resources/org/apache/commons/digester3/plugins/test4a.xml
URL: http://svn.apache.org/viewvc/commons/sandbox/digester3/trunk/src/test/resources/org/apache/commons/digester3/plugins/test4a.xml?rev=1101208&r1=1101159&r2=1101208&view=diff
==============================================================================
--- commons/sandbox/digester3/trunk/src/test/resources/org/apache/commons/digester3/plugins/test4a.xml
(original)
+++ commons/sandbox/digester3/trunk/src/test/resources/org/apache/commons/digester3/plugins/test4a.xml
Mon May  9 20:27:33 2011
@@ -16,8 +16,8 @@
 -->
 
 <root>
-  <plugin id="slider" class="org.apache.commons.digester.plugins.Slider"/>
-  <plugin id="textlabel" class="org.apache.commons.digester.plugins.TextLabel"/>
+  <plugin id="slider" class="org.apache.commons.digester3.plugins.Slider"/>
+  <plugin id="textlabel" class="org.apache.commons.digester3.plugins.TextLabel"/>
 
   <widget plugin-id="slider" label="slider1">
     <min>1</min>

Modified: commons/sandbox/digester3/trunk/src/test/resources/org/apache/commons/digester3/plugins/test4b.xml
URL: http://svn.apache.org/viewvc/commons/sandbox/digester3/trunk/src/test/resources/org/apache/commons/digester3/plugins/test4b.xml?rev=1101208&r1=1101159&r2=1101208&view=diff
==============================================================================
--- commons/sandbox/digester3/trunk/src/test/resources/org/apache/commons/digester3/plugins/test4b.xml
(original)
+++ commons/sandbox/digester3/trunk/src/test/resources/org/apache/commons/digester3/plugins/test4b.xml
Mon May  9 20:27:33 2011
@@ -18,10 +18,10 @@
 <root>
   <plugin 
     id="slider" 
-    class="org.apache.commons.digester.plugins.Slider"
+    class="org.apache.commons.digester3.plugins.Slider"
     method="addRangeRules"/>
     
-  <plugin id="textlabel" class="org.apache.commons.digester.plugins.TextLabel"/>
+  <plugin id="textlabel" class="org.apache.commons.digester3.plugins.TextLabel"/>
 
   <widget plugin-id="slider" label="slider1">
     <min>1</min>

Modified: commons/sandbox/digester3/trunk/src/test/resources/org/apache/commons/digester3/plugins/test5a.xml
URL: http://svn.apache.org/viewvc/commons/sandbox/digester3/trunk/src/test/resources/org/apache/commons/digester3/plugins/test5a.xml?rev=1101208&r1=1101159&r2=1101208&view=diff
==============================================================================
--- commons/sandbox/digester3/trunk/src/test/resources/org/apache/commons/digester3/plugins/test5a.xml
(original)
+++ commons/sandbox/digester3/trunk/src/test/resources/org/apache/commons/digester3/plugins/test5a.xml
Mon May  9 20:27:33 2011
@@ -18,8 +18,8 @@
 <root>
   <plugin 
      id="textlabel2" 
-     class="org.apache.commons.digester.plugins.TextLabel2"
-     ruleclass="org.apache.commons.digester.plugins.TextLabel2RuleInfo"/>
+     class="org.apache.commons.digester3.plugins.TextLabel2"
+     ruleclass="org.apache.commons.digester3.plugins.TextLabel2RuleInfo"/>
 
   <widget plugin-id="textlabel2" id="badid">
     <label>std label</label>

Modified: commons/sandbox/digester3/trunk/src/test/resources/org/apache/commons/digester3/plugins/test5b.xml
URL: http://svn.apache.org/viewvc/commons/sandbox/digester3/trunk/src/test/resources/org/apache/commons/digester3/plugins/test5b.xml?rev=1101208&r1=1101159&r2=1101208&view=diff
==============================================================================
--- commons/sandbox/digester3/trunk/src/test/resources/org/apache/commons/digester3/plugins/test5b.xml
(original)
+++ commons/sandbox/digester3/trunk/src/test/resources/org/apache/commons/digester3/plugins/test5b.xml
Mon May  9 20:27:33 2011
@@ -18,8 +18,8 @@
 <root>
   <plugin 
      id="textlabel2" 
-     class="org.apache.commons.digester.plugins.TextLabel2"
-     ruleclass="org.apache.commons.digester.plugins.TextLabel2RuleInfo"
+     class="org.apache.commons.digester3.plugins.TextLabel2"
+     ruleclass="org.apache.commons.digester3.plugins.TextLabel2RuleInfo"
      method="addAltRules"/>
 
   <widget plugin-id="textlabel2" id="badid">

Modified: commons/sandbox/digester3/trunk/src/test/resources/org/apache/commons/digester3/plugins/test5c.xml
URL: http://svn.apache.org/viewvc/commons/sandbox/digester3/trunk/src/test/resources/org/apache/commons/digester3/plugins/test5c.xml?rev=1101208&r1=1101159&r2=1101208&view=diff
==============================================================================
--- commons/sandbox/digester3/trunk/src/test/resources/org/apache/commons/digester3/plugins/test5c.xml
(original)
+++ commons/sandbox/digester3/trunk/src/test/resources/org/apache/commons/digester3/plugins/test5c.xml
Mon May  9 20:27:33 2011
@@ -16,7 +16,7 @@
 -->
 
 <root>
-  <widget plugin-class="org.apache.commons.digester.plugins.TextLabel2" id="badid">
+  <widget plugin-class="org.apache.commons.digester3.plugins.TextLabel2" id="badid">
     <label>std label</label>
     <alt-label>alt label</alt-label>
   </widget>

Modified: commons/sandbox/digester3/trunk/src/test/resources/org/apache/commons/digester3/plugins/test6.xml
URL: http://svn.apache.org/viewvc/commons/sandbox/digester3/trunk/src/test/resources/org/apache/commons/digester3/plugins/test6.xml?rev=1101208&r1=1101159&r2=1101208&view=diff
==============================================================================
--- commons/sandbox/digester3/trunk/src/test/resources/org/apache/commons/digester3/plugins/test6.xml
(original)
+++ commons/sandbox/digester3/trunk/src/test/resources/org/apache/commons/digester3/plugins/test6.xml
Mon May  9 20:27:33 2011
@@ -17,8 +17,8 @@
 
 <root>
   <plugin id="container" 
-    class="org.apache.commons.digester.plugins.Container"
-    ruleclass="org.apache.commons.digester.plugins.ContainerCustomRules"/>
+    class="org.apache.commons.digester3.plugins.Container"
+    ruleclass="org.apache.commons.digester3.plugins.ContainerCustomRules"/>
     
   
   <widget plugin-id="container" id="1">
@@ -27,7 +27,7 @@
     
       <widget plugin-id="container" id="1.1.1">
         <widget plugin-id="container" id ="1.1.1.1">
-          <plugin id="textlabel" class="org.apache.commons.digester.plugins.TextLabel"/>
+          <plugin id="textlabel" class="org.apache.commons.digester3.plugins.TextLabel"/>
           <widget plugin-id="textlabel"/>
           <widget plugin-id="textlabel"/>
         </widget>
@@ -39,7 +39,7 @@
     </widget>
 
     <widget plugin-id="container" id="1.2">
-      <plugin id="textlabel" class="org.apache.commons.digester.plugins.TextLabel"/>
+      <plugin id="textlabel" class="org.apache.commons.digester3.plugins.TextLabel"/>
       <widget plugin-id="textlabel"/>
       <widget plugin-id="textlabel"/>
     </widget>

Modified: commons/sandbox/digester3/trunk/src/test/resources/org/apache/commons/digester3/plugins/test7.xml
URL: http://svn.apache.org/viewvc/commons/sandbox/digester3/trunk/src/test/resources/org/apache/commons/digester3/plugins/test7.xml?rev=1101208&r1=1101159&r2=1101208&view=diff
==============================================================================
--- commons/sandbox/digester3/trunk/src/test/resources/org/apache/commons/digester3/plugins/test7.xml
(original)
+++ commons/sandbox/digester3/trunk/src/test/resources/org/apache/commons/digester3/plugins/test7.xml
Mon May  9 20:27:33 2011
@@ -16,9 +16,9 @@
 -->
 
 <root xmlns:plugin="http://commons.apache.org/digester/plugins">
-  <plugin id="label" class="org.apache.commons.digester.plugins.TextLabel"/>
-  <plugin id="slider" class="org.apache.commons.digester.plugins.Slider"/>
-  <plugin id="label2" class="org.apache.commons.digester.plugins.TextLabel2"/>
+  <plugin id="label" class="org.apache.commons.digester3.plugins.TextLabel"/>
+  <plugin id="slider" class="org.apache.commons.digester3.plugins.Slider"/>
+  <plugin id="label2" class="org.apache.commons.digester3.plugins.TextLabel2"/>
   
   <widget plugin-id="label" id="slider" plugin:id="label2"/>
   <widget plugin-id="label" id="slider" plugin:id="label2"/>
@@ -26,23 +26,23 @@
   <gadget plugin-id="label" id="slider" plugin:id="label2"/>
 
   <widget 
-    plugin-class="org.apache.commons.digester.plugins.TextLabel" 
-    class="org.apache.commons.digester.plugins.Slider" 
-    plugin:class="org.apache.commons.digester.plugins.TextLabel2"/>
+    plugin-class="org.apache.commons.digester3.plugins.TextLabel" 
+    class="org.apache.commons.digester3.plugins.Slider" 
+    plugin:class="org.apache.commons.digester3.plugins.TextLabel2"/>
     
   <widget 
-    plugin-class="org.apache.commons.digester.plugins.TextLabel" 
-    class="org.apache.commons.digester.plugins.Slider" 
-    plugin:class="org.apache.commons.digester.plugins.TextLabel2"/>
+    plugin-class="org.apache.commons.digester3.plugins.TextLabel" 
+    class="org.apache.commons.digester3.plugins.Slider" 
+    plugin:class="org.apache.commons.digester3.plugins.TextLabel2"/>
     
   <gadget 
-    plugin-class="org.apache.commons.digester.plugins.TextLabel" 
-    class="org.apache.commons.digester.plugins.Slider" 
-    plugin:class="org.apache.commons.digester.plugins.TextLabel2"/>
+    plugin-class="org.apache.commons.digester3.plugins.TextLabel" 
+    class="org.apache.commons.digester3.plugins.Slider" 
+    plugin:class="org.apache.commons.digester3.plugins.TextLabel2"/>
     
   <gadget 
-    plugin-class="org.apache.commons.digester.plugins.TextLabel" 
-    class="org.apache.commons.digester.plugins.Slider" 
-    plugin:class="org.apache.commons.digester.plugins.TextLabel2"/>
+    plugin-class="org.apache.commons.digester3.plugins.TextLabel" 
+    class="org.apache.commons.digester3.plugins.Slider" 
+    plugin:class="org.apache.commons.digester3.plugins.TextLabel2"/>
 </root>
 

Modified: commons/sandbox/digester3/trunk/src/test/resources/org/apache/commons/digester3/xmlrules/testCircularRules.xml
URL: http://svn.apache.org/viewvc/commons/sandbox/digester3/trunk/src/test/resources/org/apache/commons/digester3/xmlrules/testCircularRules.xml?rev=1101208&r1=1101159&r2=1101208&view=diff
==============================================================================
--- commons/sandbox/digester3/trunk/src/test/resources/org/apache/commons/digester3/xmlrules/testCircularRules.xml
(original)
+++ commons/sandbox/digester3/trunk/src/test/resources/org/apache/commons/digester3/xmlrules/testCircularRules.xml
Mon May  9 20:27:33 2011
@@ -23,9 +23,9 @@
      
 <digester-rules>
   <pattern value="root/foo">
-    <object-create-rule classname="org.apache.commons.digester.xmlrules.ObjectTestImpl"/>
+    <object-create-rule classname="org.apache.commons.digester3.xmlrules.ObjectTestImpl"/>
     <set-next-rule methodname="add" paramtype="java.lang.Object"/>
     <set-properties-rule/>
-    <include path="org/apache/commons/digester/xmlrules/testCircularRules.xml"/>
+    <include path="org/apache/commons/digester3/xmlrules/testCircularRules.xml"/>
   </pattern>
 </digester-rules>

Modified: commons/sandbox/digester3/trunk/src/test/resources/org/apache/commons/digester3/xmlrules/testPropertyAliasRules.xml
URL: http://svn.apache.org/viewvc/commons/sandbox/digester3/trunk/src/test/resources/org/apache/commons/digester3/xmlrules/testPropertyAliasRules.xml?rev=1101208&r1=1101159&r2=1101208&view=diff
==============================================================================
--- commons/sandbox/digester3/trunk/src/test/resources/org/apache/commons/digester3/xmlrules/testPropertyAliasRules.xml
(original)
+++ commons/sandbox/digester3/trunk/src/test/resources/org/apache/commons/digester3/xmlrules/testPropertyAliasRules.xml
Mon May  9 20:27:33 2011
@@ -19,12 +19,12 @@
 
 <digester-rules>
   <pattern value="toplevel/one">
-    <object-create-rule classname="org.apache.commons.digester.Address"/>
+    <object-create-rule classname="org.apache.commons.digester3.Address"/>
     <set-next-rule methodname="add" paramtype="java.lang.Object"/>
     <set-properties-rule/>
   </pattern>    
   <pattern value="toplevel/two">
-    <object-create-rule classname="org.apache.commons.digester.Address"/>
+    <object-create-rule classname="org.apache.commons.digester3.Address"/>
     <set-next-rule methodname="add" paramtype="java.lang.Object"/>
     <set-properties-rule>
         <alias attr-name="alt-street" prop-name="street"/>
@@ -33,7 +33,7 @@
     </set-properties-rule>
   </pattern>       
   <pattern value="toplevel/three">
-    <object-create-rule classname="org.apache.commons.digester.Address"/>
+    <object-create-rule classname="org.apache.commons.digester3.Address"/>
     <set-next-rule methodname="add" paramtype="java.lang.Object"/>
     <set-properties-rule>
         <alias attr-name="aCity" prop-name="city"/>
@@ -41,7 +41,7 @@
     </set-properties-rule>
   </pattern>        
   <pattern value="toplevel/four">
-    <object-create-rule classname="org.apache.commons.digester.Address"/>
+    <object-create-rule classname="org.apache.commons.digester3.Address"/>
     <set-next-rule methodname="add" paramtype="java.lang.Object"/>
     <set-properties-rule>
         <alias attr-name="alt-city" prop-name="city"/>

Modified: commons/sandbox/digester3/trunk/src/test/resources/org/apache/commons/digester3/xmlrules/testfactory.xml
URL: http://svn.apache.org/viewvc/commons/sandbox/digester3/trunk/src/test/resources/org/apache/commons/digester3/xmlrules/testfactory.xml?rev=1101208&r1=1101159&r2=1101208&view=diff
==============================================================================
--- commons/sandbox/digester3/trunk/src/test/resources/org/apache/commons/digester3/xmlrules/testfactory.xml
(original)
+++ commons/sandbox/digester3/trunk/src/test/resources/org/apache/commons/digester3/xmlrules/testfactory.xml
Mon May  9 20:27:33 2011
@@ -20,7 +20,7 @@
 <digester-rules>
     <pattern value="root">
         <factory-create-rule 
-            classname="org.apache.commons.digester.ObjectCreationFactoryTestImpl"
+            classname="org.apache.commons.digester3.ObjectCreationFactoryTestImpl"
             ignore-exceptions='true'/>
         <set-next-rule methodname="add"/>
     </pattern>

Modified: commons/sandbox/digester3/trunk/src/test/resources/org/apache/commons/digester3/xmlrules/testfactoryignore.xml
URL: http://svn.apache.org/viewvc/commons/sandbox/digester3/trunk/src/test/resources/org/apache/commons/digester3/xmlrules/testfactoryignore.xml?rev=1101208&r1=1101159&r2=1101208&view=diff
==============================================================================
--- commons/sandbox/digester3/trunk/src/test/resources/org/apache/commons/digester3/xmlrules/testfactoryignore.xml
(original)
+++ commons/sandbox/digester3/trunk/src/test/resources/org/apache/commons/digester3/xmlrules/testfactoryignore.xml
Mon May  9 20:27:33 2011
@@ -21,7 +21,7 @@
 <digester-rules>
     <pattern value="root">
         <factory-create-rule 
-            classname="org.apache.commons.digester.xmlrules.ThrowExceptionCreationFactory"

+            classname="org.apache.commons.digester3.xmlrules.ThrowExceptionCreationFactory"

             ignore-exceptions='true'/>
     </pattern>
 </digester-rules>

Modified: commons/sandbox/digester3/trunk/src/test/resources/org/apache/commons/digester3/xmlrules/testfactorynoignore.xml
URL: http://svn.apache.org/viewvc/commons/sandbox/digester3/trunk/src/test/resources/org/apache/commons/digester3/xmlrules/testfactorynoignore.xml?rev=1101208&r1=1101159&r2=1101208&view=diff
==============================================================================
--- commons/sandbox/digester3/trunk/src/test/resources/org/apache/commons/digester3/xmlrules/testfactorynoignore.xml
(original)
+++ commons/sandbox/digester3/trunk/src/test/resources/org/apache/commons/digester3/xmlrules/testfactorynoignore.xml
Mon May  9 20:27:33 2011
@@ -20,6 +20,6 @@
 <!DOCTYPE digester-rules PUBLIC "-//Jakarta Apache //DTD digester-rules XML V1.0//EN"
"http://jakarta.apache.org/commons/digester/dtds/digester-rules.dtd">
 <digester-rules>
     <pattern value="root">
-        <factory-create-rule classname="org.apache.commons.digester.xmlrules.ThrowExceptionCreationFactory"/>
+        <factory-create-rule classname="org.apache.commons.digester3.xmlrules.ThrowExceptionCreationFactory"/>
     </pattern>
 </digester-rules>

Modified: commons/sandbox/digester3/trunk/src/test/resources/org/apache/commons/digester3/xmlrules/testrules.xml
URL: http://svn.apache.org/viewvc/commons/sandbox/digester3/trunk/src/test/resources/org/apache/commons/digester3/xmlrules/testrules.xml?rev=1101208&r1=1101159&r2=1101208&view=diff
==============================================================================
--- commons/sandbox/digester3/trunk/src/test/resources/org/apache/commons/digester3/xmlrules/testrules.xml
(original)
+++ commons/sandbox/digester3/trunk/src/test/resources/org/apache/commons/digester3/xmlrules/testrules.xml
Mon May  9 20:27:33 2011
@@ -20,11 +20,11 @@
 <!DOCTYPE digester-rules PUBLIC "-//Jakarta Apache //DTD digester-rules XML V1.0//EN"
"http://jakarta.apache.org/commons/digester/dtds/digester-rules.dtd">
 <digester-rules>
     <pattern value="root/foo">
-        <object-create-rule classname="org.apache.commons.digester.xmlrules.ObjectTestImpl"/>
+        <object-create-rule classname="org.apache.commons.digester3.xmlrules.ObjectTestImpl"/>
         <set-next-rule methodname="add" paramtype="java.lang.Object"/>
         <set-properties-rule/>
-        <include path="org/apache/commons/digester/xmlrules/testrulesinclude.xml"/>
-        <include class="org.apache.commons.digester.xmlrules.DigesterRulesSourceTestImpl"/>
+        <include path="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" paramcount="0"
paramtypes="java.lang.Long"/>
             <call-method-rule pattern="defaultParamType" methodname="setStringValue" paramcount="0"/>

Modified: commons/sandbox/digester3/trunk/src/test/resources/org/apache/commons/digester3/xmlrules/testrulesinclude.xml
URL: http://svn.apache.org/viewvc/commons/sandbox/digester3/trunk/src/test/resources/org/apache/commons/digester3/xmlrules/testrulesinclude.xml?rev=1101208&r1=1101159&r2=1101208&view=diff
==============================================================================
--- commons/sandbox/digester3/trunk/src/test/resources/org/apache/commons/digester3/xmlrules/testrulesinclude.xml
(original)
+++ commons/sandbox/digester3/trunk/src/test/resources/org/apache/commons/digester3/xmlrules/testrulesinclude.xml
Mon May  9 20:27:33 2011
@@ -19,7 +19,7 @@
 <digester-rules>
   <pattern value = "bar">
     <pattern value="foo">
-      <object-create-rule classname="org.apache.commons.digester.xmlrules.ObjectTestImpl"/>
+      <object-create-rule classname="org.apache.commons.digester3.xmlrules.ObjectTestImpl"/>
       <set-next-rule methodname="add" paramtype="java.lang.Object"/>
       <set-properties-rule/>
     </pattern>



Mime
View raw message