You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@commons.apache.org by si...@apache.org on 2011/05/09 22:27:44 UTC
svn commit: r1101208 [5/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...
Copied: commons/sandbox/digester3/trunk/src/test/java/org/apache/commons/digester3/RuleTestCase.java (from r1101159, commons/sandbox/digester3/trunk/src/test/java/org/apache/commons/digester/RuleTestCase.java)
URL: http://svn.apache.org/viewvc/commons/sandbox/digester3/trunk/src/test/java/org/apache/commons/digester3/RuleTestCase.java?p2=commons/sandbox/digester3/trunk/src/test/java/org/apache/commons/digester3/RuleTestCase.java&p1=commons/sandbox/digester3/trunk/src/test/java/org/apache/commons/digester/RuleTestCase.java&r1=1101159&r2=1101208&rev=1101208&view=diff
==============================================================================
--- commons/sandbox/digester3/trunk/src/test/java/org/apache/commons/digester/RuleTestCase.java (original)
+++ commons/sandbox/digester3/trunk/src/test/java/org/apache/commons/digester3/RuleTestCase.java Mon May 9 20:27:33 2011
@@ -17,7 +17,7 @@
*/
-package org.apache.commons.digester;
+package org.apache.commons.digester3;
import static org.junit.Assert.assertEquals;
@@ -30,6 +30,9 @@ import java.io.IOException;
import java.io.InputStream;
import java.util.ArrayList;
+import org.apache.commons.digester3.Digester;
+import org.apache.commons.digester3.ExtendedBaseRules;
+import org.apache.commons.digester3.RuleSet;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
@@ -95,7 +98,7 @@ public class RuleTestCase {
// Configure the digester as required
digester.addObjectCreate("employee",
- "org.apache.commons.digester.Employee");
+ "org.apache.commons.digester3.Employee");
digester.addSetProperties("employee");
// Parse our test input.
@@ -130,7 +133,7 @@ public class RuleTestCase {
digester.addObjectCreate("employee", Employee.class);
digester.addSetProperties("employee");
digester.addObjectCreate("employee/address",
- "org.apache.commons.digester.Address");
+ "org.apache.commons.digester3.Address");
digester.addSetProperties("employee/address");
// Parse our test input.
@@ -165,7 +168,7 @@ public class RuleTestCase {
digester.addObjectCreate("employee", Employee.class);
digester.addSetProperties("employee");
digester.addObjectCreate("employee/address",
- "org.apache.commons.digester.Address");
+ "org.apache.commons.digester3.Address");
digester.addSetProperties("employee/address");
digester.addSetNext("employee/address",
"addAddress");
@@ -267,7 +270,7 @@ public class RuleTestCase {
digester.addObjectCreate("employee", Employee.class);
digester.addSetProperties("employee");
digester.addObjectCreate("employee/address",
- "org.apache.commons.digester.Address");
+ "org.apache.commons.digester3.Address");
digester.addSetProperties("employee/address");
digester.addSetNext("employee/address",
"addAddress");
@@ -411,10 +414,10 @@ public class RuleTestCase {
// Configure the digester as required
digester.addObjectCreate("employee",
- "org.apache.commons.digester.Employee");
+ "org.apache.commons.digester3.Employee");
digester.addSetProperties("employee");
digester.addObjectCreate("employee/address",
- "org.apache.commons.digester.Address");
+ "org.apache.commons.digester3.Address");
digester.addSetProperties("employee/address");
digester.addSetTop("employee/address", "setEmployee");
@@ -435,13 +438,13 @@ public class RuleTestCase {
// Configure the digester as required
digester.addObjectCreate("employee",
- "org.apache.commons.digester.Employee");
+ "org.apache.commons.digester3.Employee");
digester.addSetProperties("employee");
digester.addObjectCreate("employee/address",
- "org.apache.commons.digester.Address");
+ "org.apache.commons.digester3.Address");
digester.addSetProperties("employee/address");
digester.addSetTop("employee/address", "setEmployee",
- "org.apache.commons.digester.Employee");
+ "org.apache.commons.digester3.Employee");
// Parse our test input.
Object root = null;
@@ -631,7 +634,7 @@ public class RuleTestCase {
protected InputStream getInputStream(String name) throws IOException {
return (this.getClass().getResourceAsStream
- ("/org/apache/commons/digester/" + name));
+ ("/org/apache/commons/digester3/" + name));
}
Propchange: commons/sandbox/digester3/trunk/src/test/java/org/apache/commons/digester3/RuleTestCase.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: commons/sandbox/digester3/trunk/src/test/java/org/apache/commons/digester3/RuleTestCase.java
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Copied: commons/sandbox/digester3/trunk/src/test/java/org/apache/commons/digester3/RulesBaseTestCase.java (from r1101159, commons/sandbox/digester3/trunk/src/test/java/org/apache/commons/digester/RulesBaseTestCase.java)
URL: http://svn.apache.org/viewvc/commons/sandbox/digester3/trunk/src/test/java/org/apache/commons/digester3/RulesBaseTestCase.java?p2=commons/sandbox/digester3/trunk/src/test/java/org/apache/commons/digester3/RulesBaseTestCase.java&p1=commons/sandbox/digester3/trunk/src/test/java/org/apache/commons/digester/RulesBaseTestCase.java&r1=1101159&r2=1101208&rev=1101208&view=diff
==============================================================================
--- commons/sandbox/digester3/trunk/src/test/java/org/apache/commons/digester/RulesBaseTestCase.java (original)
+++ commons/sandbox/digester3/trunk/src/test/java/org/apache/commons/digester3/RulesBaseTestCase.java Mon May 9 20:27:33 2011
@@ -17,7 +17,7 @@
*/
-package org.apache.commons.digester;
+package org.apache.commons.digester3;
import static org.junit.Assert.assertEquals;
@@ -25,6 +25,10 @@ import static org.junit.Assert.assertEqu
import java.util.Iterator;
import java.util.List;
+import org.apache.commons.digester3.Digester;
+import org.apache.commons.digester3.Rule;
+import org.apache.commons.digester3.Rules;
+import org.apache.commons.digester3.RulesBase;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
Propchange: commons/sandbox/digester3/trunk/src/test/java/org/apache/commons/digester3/RulesBaseTestCase.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: commons/sandbox/digester3/trunk/src/test/java/org/apache/commons/digester3/RulesBaseTestCase.java
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Copied: commons/sandbox/digester3/trunk/src/test/java/org/apache/commons/digester3/SetNestedPropertiesRuleTestCase.java (from r1101159, commons/sandbox/digester3/trunk/src/test/java/org/apache/commons/digester/SetNestedPropertiesRuleTestCase.java)
URL: http://svn.apache.org/viewvc/commons/sandbox/digester3/trunk/src/test/java/org/apache/commons/digester3/SetNestedPropertiesRuleTestCase.java?p2=commons/sandbox/digester3/trunk/src/test/java/org/apache/commons/digester3/SetNestedPropertiesRuleTestCase.java&p1=commons/sandbox/digester3/trunk/src/test/java/org/apache/commons/digester/SetNestedPropertiesRuleTestCase.java&r1=1101159&r2=1101208&rev=1101208&view=diff
==============================================================================
--- commons/sandbox/digester3/trunk/src/test/java/org/apache/commons/digester/SetNestedPropertiesRuleTestCase.java (original)
+++ commons/sandbox/digester3/trunk/src/test/java/org/apache/commons/digester3/SetNestedPropertiesRuleTestCase.java Mon May 9 20:27:33 2011
@@ -17,7 +17,7 @@
*/
-package org.apache.commons.digester;
+package org.apache.commons.digester3;
import static org.junit.Assert.assertEquals;
@@ -28,6 +28,10 @@ import java.io.IOException;
import java.io.Reader;
import java.io.StringReader;
+import org.apache.commons.digester3.Digester;
+import org.apache.commons.digester3.Rule;
+import org.apache.commons.digester3.RulesBase;
+import org.apache.commons.digester3.SetNestedPropertiesRule;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
@@ -101,7 +105,7 @@ public class SetNestedPropertiesRuleTest
// going to be setting properties on a SimpleTestBean
digester.addObjectCreate("root",
- "org.apache.commons.digester.SimpleTestBean");
+ "org.apache.commons.digester3.SimpleTestBean");
// match all children of root with this rule
digester.addRule("root", new SetNestedPropertiesRule());
@@ -146,7 +150,7 @@ public class SetNestedPropertiesRuleTest
// going to be setting properties on a SimpleTestBean
digester.addObjectCreate("root",
- "org.apache.commons.digester.SimpleTestBean");
+ "org.apache.commons.digester3.SimpleTestBean");
// match all children of root with this rule
digester.addRule("root", new SetNestedPropertiesRule());
@@ -188,7 +192,7 @@ public class SetNestedPropertiesRuleTest
// going to be setting properties on a SimpleTestBean
digester.addObjectCreate("root",
- "org.apache.commons.digester.SimpleTestBean");
+ "org.apache.commons.digester3.SimpleTestBean");
// ignore the "alpha" element (target=null)
// don't remap the "beta" element
@@ -250,7 +254,7 @@ public class SetNestedPropertiesRuleTest
// going to be setting properties on a SimpleTestBean
digester.addObjectCreate("root",
- "org.apache.commons.digester.SimpleTestBean");
+ "org.apache.commons.digester3.SimpleTestBean");
// ignore the "alpha" element (target=null)
Rule rule = new SetNestedPropertiesRule("alpha", null);
@@ -305,7 +309,7 @@ public class SetNestedPropertiesRuleTest
// going to be setting properties on a SimpleTestBean
digester.addObjectCreate("root",
- "org.apache.commons.digester.SimpleTestBean");
+ "org.apache.commons.digester3.SimpleTestBean");
// map the contents of the alpha-alt xml child into the
// "alpha" java property.
@@ -371,7 +375,7 @@ public class SetNestedPropertiesRuleTest
// going to be setting properties on a SimpleTestBean
digester.addObjectCreate("root/testbean",
- "org.apache.commons.digester.SimpleTestBean");
+ "org.apache.commons.digester3.SimpleTestBean");
digester.addRule("root/testbean", new SetNestedPropertiesRule());
digester.addSetProperties("root/testbean");
@@ -428,7 +432,7 @@ public class SetNestedPropertiesRuleTest
// going to be setting properties on a SimpleTestBean
digester.addObjectCreate("root",
- "org.apache.commons.digester.SimpleTestBean");
+ "org.apache.commons.digester3.SimpleTestBean");
Rule rule = new SetNestedPropertiesRule();
digester.addRule("root", rule);
@@ -467,7 +471,7 @@ public class SetNestedPropertiesRuleTest
// going to be setting properties on a SimpleTestBean
digester.addObjectCreate("root",
- "org.apache.commons.digester.SimpleTestBean");
+ "org.apache.commons.digester3.SimpleTestBean");
SetNestedPropertiesRule rule = new SetNestedPropertiesRule();
rule.setAllowUnknownChildElements(true);
@@ -500,7 +504,7 @@ public class SetNestedPropertiesRuleTest
// going to be setting properties on a SimpleTestBean
digester.addObjectCreate("*/testbean",
- "org.apache.commons.digester.SimpleTestBean");
+ "org.apache.commons.digester3.SimpleTestBean");
SetNestedPropertiesRule rule = new SetNestedPropertiesRule();
rule.setAllowUnknownChildElements(true);
Propchange: commons/sandbox/digester3/trunk/src/test/java/org/apache/commons/digester3/SetNestedPropertiesRuleTestCase.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: commons/sandbox/digester3/trunk/src/test/java/org/apache/commons/digester3/SetNestedPropertiesRuleTestCase.java
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Copied: commons/sandbox/digester3/trunk/src/test/java/org/apache/commons/digester3/SetPropertiesRuleTestCase.java (from r1101159, commons/sandbox/digester3/trunk/src/test/java/org/apache/commons/digester/SetPropertiesRuleTestCase.java)
URL: http://svn.apache.org/viewvc/commons/sandbox/digester3/trunk/src/test/java/org/apache/commons/digester3/SetPropertiesRuleTestCase.java?p2=commons/sandbox/digester3/trunk/src/test/java/org/apache/commons/digester3/SetPropertiesRuleTestCase.java&p1=commons/sandbox/digester3/trunk/src/test/java/org/apache/commons/digester/SetPropertiesRuleTestCase.java&r1=1101159&r2=1101208&rev=1101208&view=diff
==============================================================================
--- commons/sandbox/digester3/trunk/src/test/java/org/apache/commons/digester/SetPropertiesRuleTestCase.java (original)
+++ commons/sandbox/digester3/trunk/src/test/java/org/apache/commons/digester3/SetPropertiesRuleTestCase.java Mon May 9 20:27:33 2011
@@ -17,7 +17,7 @@
*/
-package org.apache.commons.digester;
+package org.apache.commons.digester3;
import static org.junit.Assert.assertEquals;
@@ -28,6 +28,8 @@ import static org.junit.Assert.fail;
import java.io.Reader;
import java.io.StringReader;
+import org.apache.commons.digester3.Digester;
+import org.apache.commons.digester3.SetPropertiesRule;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
@@ -103,7 +105,7 @@ public class SetPropertiesRuleTestCase {
// Set up the rules we need
digester.addObjectCreate("root",
- "org.apache.commons.digester.SimpleTestBean");
+ "org.apache.commons.digester3.SimpleTestBean");
digester.addSetProperties("root");
// Parse the input
@@ -133,7 +135,7 @@ public class SetPropertiesRuleTestCase {
// Set up the rules we need
digester.addObjectCreate("root",
- "org.apache.commons.digester.SimpleTestBean");
+ "org.apache.commons.digester3.SimpleTestBean");
digester.addSetProperties("root");
// Parse the input
@@ -162,7 +164,7 @@ public class SetPropertiesRuleTestCase {
// Set up the rules we need
digester.addObjectCreate("root",
- "org.apache.commons.digester.SimpleTestBean");
+ "org.apache.commons.digester3.SimpleTestBean");
SetPropertiesRule rule = new SetPropertiesRule();
rule.setIgnoreMissingProperty(false);
digester.addRule("root", rule);
@@ -202,7 +204,7 @@ public class SetPropertiesRuleTestCase {
// Set up the rules we need
digester.addObjectCreate("root",
- "org.apache.commons.digester.SimpleTestBean");
+ "org.apache.commons.digester3.SimpleTestBean");
SetPropertiesRule rule = new SetPropertiesRule(new String[] {"ignore"}, new String[] {});
rule.setIgnoreMissingProperty(false);
digester.addRule("root", rule);
Propchange: commons/sandbox/digester3/trunk/src/test/java/org/apache/commons/digester3/SetPropertiesRuleTestCase.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: commons/sandbox/digester3/trunk/src/test/java/org/apache/commons/digester3/SetPropertiesRuleTestCase.java
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Copied: commons/sandbox/digester3/trunk/src/test/java/org/apache/commons/digester3/SetPropertyRuleTestCase.java (from r1101159, commons/sandbox/digester3/trunk/src/test/java/org/apache/commons/digester/SetPropertyRuleTestCase.java)
URL: http://svn.apache.org/viewvc/commons/sandbox/digester3/trunk/src/test/java/org/apache/commons/digester3/SetPropertyRuleTestCase.java?p2=commons/sandbox/digester3/trunk/src/test/java/org/apache/commons/digester3/SetPropertyRuleTestCase.java&p1=commons/sandbox/digester3/trunk/src/test/java/org/apache/commons/digester/SetPropertyRuleTestCase.java&r1=1101159&r2=1101208&rev=1101208&view=diff
==============================================================================
--- commons/sandbox/digester3/trunk/src/test/java/org/apache/commons/digester/SetPropertyRuleTestCase.java (original)
+++ commons/sandbox/digester3/trunk/src/test/java/org/apache/commons/digester3/SetPropertyRuleTestCase.java Mon May 9 20:27:33 2011
@@ -17,7 +17,7 @@
*/
-package org.apache.commons.digester;
+package org.apache.commons.digester3;
import static org.junit.Assert.assertEquals;
@@ -29,6 +29,7 @@ import java.io.Reader;
import java.io.StringReader;
import java.lang.reflect.InvocationTargetException;
+import org.apache.commons.digester3.Digester;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
@@ -105,7 +106,7 @@ public class SetPropertyRuleTestCase {
// Set up the rules we need
digester.addObjectCreate("root",
- "org.apache.commons.digester.SimpleTestBean");
+ "org.apache.commons.digester3.SimpleTestBean");
digester.addSetProperty("root/set", "name", "value");
// Parse the input
@@ -136,7 +137,7 @@ public class SetPropertyRuleTestCase {
// Set up the rules we need
digester.addObjectCreate("root",
- "org.apache.commons.digester.SimpleTestBean");
+ "org.apache.commons.digester3.SimpleTestBean");
digester.addSetProperty("root/set", "name", "value");
// Parse the input (should fail)
@@ -192,7 +193,7 @@ public class SetPropertyRuleTestCase {
String TEST_XML_3 = "<?xml version='1.0'?><root><set/></root>";
// Set up the rules we need
- digester.addObjectCreate("root", "org.apache.commons.digester.SimpleTestBean");
+ digester.addObjectCreate("root", "org.apache.commons.digester3.SimpleTestBean");
digester.addSetProperty("root/set", "name", "value");
// Parse the input - should not throw an exception
Propchange: commons/sandbox/digester3/trunk/src/test/java/org/apache/commons/digester3/SetPropertyRuleTestCase.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: commons/sandbox/digester3/trunk/src/test/java/org/apache/commons/digester3/SetPropertyRuleTestCase.java
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Copied: commons/sandbox/digester3/trunk/src/test/java/org/apache/commons/digester3/SimpleTestBean.java (from r1101159, commons/sandbox/digester3/trunk/src/test/java/org/apache/commons/digester/SimpleTestBean.java)
URL: http://svn.apache.org/viewvc/commons/sandbox/digester3/trunk/src/test/java/org/apache/commons/digester3/SimpleTestBean.java?p2=commons/sandbox/digester3/trunk/src/test/java/org/apache/commons/digester3/SimpleTestBean.java&p1=commons/sandbox/digester3/trunk/src/test/java/org/apache/commons/digester/SimpleTestBean.java&r1=1101159&r2=1101208&rev=1101208&view=diff
==============================================================================
--- commons/sandbox/digester3/trunk/src/test/java/org/apache/commons/digester/SimpleTestBean.java (original)
+++ commons/sandbox/digester3/trunk/src/test/java/org/apache/commons/digester3/SimpleTestBean.java Mon May 9 20:27:33 2011
@@ -17,7 +17,7 @@
*/
-package org.apache.commons.digester;
+package org.apache.commons.digester3;
/**
Propchange: commons/sandbox/digester3/trunk/src/test/java/org/apache/commons/digester3/SimpleTestBean.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: commons/sandbox/digester3/trunk/src/test/java/org/apache/commons/digester3/SimpleTestBean.java
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Copied: commons/sandbox/digester3/trunk/src/test/java/org/apache/commons/digester3/TestBean.java (from r1101159, commons/sandbox/digester3/trunk/src/test/java/org/apache/commons/digester/TestBean.java)
URL: http://svn.apache.org/viewvc/commons/sandbox/digester3/trunk/src/test/java/org/apache/commons/digester3/TestBean.java?p2=commons/sandbox/digester3/trunk/src/test/java/org/apache/commons/digester3/TestBean.java&p1=commons/sandbox/digester3/trunk/src/test/java/org/apache/commons/digester/TestBean.java&r1=1101159&r2=1101208&rev=1101208&view=diff
==============================================================================
--- commons/sandbox/digester3/trunk/src/test/java/org/apache/commons/digester/TestBean.java (original)
+++ commons/sandbox/digester3/trunk/src/test/java/org/apache/commons/digester3/TestBean.java Mon May 9 20:27:33 2011
@@ -17,7 +17,7 @@
*/
-package org.apache.commons.digester;
+package org.apache.commons.digester3;
/**
Propchange: commons/sandbox/digester3/trunk/src/test/java/org/apache/commons/digester3/TestBean.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: commons/sandbox/digester3/trunk/src/test/java/org/apache/commons/digester3/TestBean.java
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Copied: commons/sandbox/digester3/trunk/src/test/java/org/apache/commons/digester3/TestEntityResolution.java (from r1101159, commons/sandbox/digester3/trunk/src/test/java/org/apache/commons/digester/TestEntityResolution.java)
URL: http://svn.apache.org/viewvc/commons/sandbox/digester3/trunk/src/test/java/org/apache/commons/digester3/TestEntityResolution.java?p2=commons/sandbox/digester3/trunk/src/test/java/org/apache/commons/digester3/TestEntityResolution.java&p1=commons/sandbox/digester3/trunk/src/test/java/org/apache/commons/digester/TestEntityResolution.java&r1=1101159&r2=1101208&rev=1101208&view=diff
==============================================================================
--- commons/sandbox/digester3/trunk/src/test/java/org/apache/commons/digester/TestEntityResolution.java (original)
+++ commons/sandbox/digester3/trunk/src/test/java/org/apache/commons/digester3/TestEntityResolution.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;
+package org.apache.commons.digester3;
@@ -24,6 +24,7 @@ import java.io.File;
import javax.xml.parsers.SAXParser;
import javax.xml.parsers.SAXParserFactory;
+import org.apache.commons.digester3.Digester;
import org.junit.Test;
import org.xml.sax.helpers.DefaultHandler;
@@ -42,7 +43,7 @@ public class TestEntityResolution {
SAXParser parser = factory.newSAXParser();
parser.parse(
- new File("src/test/resources/org/apache/commons/digester/document-with-relative-dtd.xml"),
+ new File("src/test/resources/org/apache/commons/digester3/document-with-relative-dtd.xml"),
new DefaultHandler());
}
@@ -51,6 +52,6 @@ public class TestEntityResolution {
Digester digester = new Digester();
digester.setValidating(true);
digester.parse(
- new File("src/test/resources/org/apache/commons/digester/document-with-relative-dtd.xml"));
+ new File("src/test/resources/org/apache/commons/digester3/document-with-relative-dtd.xml"));
}
}
Propchange: commons/sandbox/digester3/trunk/src/test/java/org/apache/commons/digester3/TestEntityResolution.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: commons/sandbox/digester3/trunk/src/test/java/org/apache/commons/digester3/TestEntityResolution.java
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Copied: commons/sandbox/digester3/trunk/src/test/java/org/apache/commons/digester3/TestFactoryCreate.java (from r1101159, commons/sandbox/digester3/trunk/src/test/java/org/apache/commons/digester/TestFactoryCreate.java)
URL: http://svn.apache.org/viewvc/commons/sandbox/digester3/trunk/src/test/java/org/apache/commons/digester3/TestFactoryCreate.java?p2=commons/sandbox/digester3/trunk/src/test/java/org/apache/commons/digester3/TestFactoryCreate.java&p1=commons/sandbox/digester3/trunk/src/test/java/org/apache/commons/digester/TestFactoryCreate.java&r1=1101159&r2=1101208&rev=1101208&view=diff
==============================================================================
--- commons/sandbox/digester3/trunk/src/test/java/org/apache/commons/digester/TestFactoryCreate.java (original)
+++ commons/sandbox/digester3/trunk/src/test/java/org/apache/commons/digester3/TestFactoryCreate.java Mon May 9 20:27:33 2011
@@ -17,7 +17,7 @@
*/
-package org.apache.commons.digester;
+package org.apache.commons.digester3;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.fail;
@@ -26,6 +26,8 @@ import java.io.StringReader;
import java.util.ArrayList;
import java.util.List;
+import org.apache.commons.digester3.AbstractObjectCreationFactory;
+import org.apache.commons.digester3.Digester;
import org.junit.Test;
import org.xml.sax.Attributes;
@@ -126,7 +128,7 @@ public class TestFactoryCreate {
digester = new Digester();
digester.addFactoryCreate(
"root",
- "org.apache.commons.digester.ObjectCreationFactoryTestImpl",
+ "org.apache.commons.digester3.ObjectCreationFactoryTestImpl",
propagateExceptions);
digester.addSetNext("root", "add");
xml = new String (
@@ -155,7 +157,7 @@ public class TestFactoryCreate {
digester = new Digester();
digester.addFactoryCreate(
"root",
- "org.apache.commons.digester.ObjectCreationFactoryTestImpl",
+ "org.apache.commons.digester3.ObjectCreationFactoryTestImpl",
"override",
propagateExceptions);
digester.addSetNext("root", "add");
@@ -184,13 +186,13 @@ public class TestFactoryCreate {
digester = new Digester();
digester.addFactoryCreate(
"root",
- "org.apache.commons.digester.ObjectCreationFactoryTestImpl",
+ "org.apache.commons.digester3.ObjectCreationFactoryTestImpl",
"override",
propagateExceptions);
digester.addSetNext("root", "add");
xml = new String (
"<?xml version='1.0' ?><root one='good' two='bad' three='ugly' "
- + " override='org.apache.commons.digester.OtherTestObjectCreationFactory' >"
+ + " override='org.apache.commons.digester3.OtherTestObjectCreationFactory' >"
+ "<element/></root>");
list = new ArrayList<ObjectCreationFactoryTestImpl>();
digester.push(list);
@@ -201,7 +203,7 @@ public class TestFactoryCreate {
assertEquals(
"Attribute Override Failed (1)",
factory.getClass().getName() ,
- "org.apache.commons.digester.OtherTestObjectCreationFactory");
+ "org.apache.commons.digester3.OtherTestObjectCreationFactory");
assertEquals("Object create not called(4)[" + propagateExceptions + "]", factory.called , true);
assertEquals(
"Attribute not passed (10)[" + propagateExceptions + "]",
@@ -254,7 +256,7 @@ public class TestFactoryCreate {
digester.addSetNext("root", "add");
xml = new String (
"<?xml version='1.0' ?><root one='good' two='bad' three='ugly' "
- + " override='org.apache.commons.digester.OtherTestObjectCreationFactory' >"
+ + " override='org.apache.commons.digester3.OtherTestObjectCreationFactory' >"
+ "<element/></root>");
list = new ArrayList<ObjectCreationFactoryTestImpl>();
digester.push(list);
@@ -265,7 +267,7 @@ public class TestFactoryCreate {
assertEquals(
"Attribute Override Failed (2)",
factory.getClass().getName() ,
- "org.apache.commons.digester.OtherTestObjectCreationFactory");
+ "org.apache.commons.digester3.OtherTestObjectCreationFactory");
assertEquals("Object create not called(6)[" + propagateExceptions + "]", factory.called , true);
assertEquals(
"Attribute not passed (16)[" + propagateExceptions + "]",
Propchange: commons/sandbox/digester3/trunk/src/test/java/org/apache/commons/digester3/TestFactoryCreate.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: commons/sandbox/digester3/trunk/src/test/java/org/apache/commons/digester3/TestFactoryCreate.java
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Copied: commons/sandbox/digester3/trunk/src/test/java/org/apache/commons/digester3/TestRule.java (from r1101159, commons/sandbox/digester3/trunk/src/test/java/org/apache/commons/digester/TestRule.java)
URL: http://svn.apache.org/viewvc/commons/sandbox/digester3/trunk/src/test/java/org/apache/commons/digester3/TestRule.java?p2=commons/sandbox/digester3/trunk/src/test/java/org/apache/commons/digester3/TestRule.java&p1=commons/sandbox/digester3/trunk/src/test/java/org/apache/commons/digester/TestRule.java&r1=1101159&r2=1101208&rev=1101208&view=diff
==============================================================================
--- commons/sandbox/digester3/trunk/src/test/java/org/apache/commons/digester/TestRule.java (original)
+++ commons/sandbox/digester3/trunk/src/test/java/org/apache/commons/digester3/TestRule.java Mon May 9 20:27:33 2011
@@ -17,11 +17,12 @@
*/
-package org.apache.commons.digester;
+package org.apache.commons.digester3;
import java.util.List;
+import org.apache.commons.digester3.Rule;
import org.xml.sax.Attributes;
Propchange: commons/sandbox/digester3/trunk/src/test/java/org/apache/commons/digester3/TestRule.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: commons/sandbox/digester3/trunk/src/test/java/org/apache/commons/digester3/TestRule.java
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Copied: commons/sandbox/digester3/trunk/src/test/java/org/apache/commons/digester3/TestRuleSet.java (from r1101159, commons/sandbox/digester3/trunk/src/test/java/org/apache/commons/digester/TestRuleSet.java)
URL: http://svn.apache.org/viewvc/commons/sandbox/digester3/trunk/src/test/java/org/apache/commons/digester3/TestRuleSet.java?p2=commons/sandbox/digester3/trunk/src/test/java/org/apache/commons/digester3/TestRuleSet.java&p1=commons/sandbox/digester3/trunk/src/test/java/org/apache/commons/digester/TestRuleSet.java&r1=1101159&r2=1101208&rev=1101208&view=diff
==============================================================================
--- commons/sandbox/digester3/trunk/src/test/java/org/apache/commons/digester/TestRuleSet.java (original)
+++ commons/sandbox/digester3/trunk/src/test/java/org/apache/commons/digester3/TestRuleSet.java Mon May 9 20:27:33 2011
@@ -17,7 +17,10 @@
*/
-package org.apache.commons.digester;
+package org.apache.commons.digester3;
+
+import org.apache.commons.digester3.Digester;
+import org.apache.commons.digester3.RuleSetBase;
/**
@@ -104,7 +107,7 @@ public class TestRuleSet extends RuleSet
digester.addObjectCreate(prefix + "employee", Employee.class);
digester.addSetProperties(prefix + "employee");
digester.addObjectCreate("employee/address",
- "org.apache.commons.digester.Address");
+ "org.apache.commons.digester3.Address");
digester.addSetProperties(prefix + "employee/address");
digester.addSetNext(prefix + "employee/address",
"addAddress");
Propchange: commons/sandbox/digester3/trunk/src/test/java/org/apache/commons/digester3/TestRuleSet.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: commons/sandbox/digester3/trunk/src/test/java/org/apache/commons/digester3/TestRuleSet.java
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Copied: commons/sandbox/digester3/trunk/src/test/java/org/apache/commons/digester3/URLTestCase.java (from r1101159, commons/sandbox/digester3/trunk/src/test/java/org/apache/commons/digester/URLTestCase.java)
URL: http://svn.apache.org/viewvc/commons/sandbox/digester3/trunk/src/test/java/org/apache/commons/digester3/URLTestCase.java?p2=commons/sandbox/digester3/trunk/src/test/java/org/apache/commons/digester3/URLTestCase.java&p1=commons/sandbox/digester3/trunk/src/test/java/org/apache/commons/digester/URLTestCase.java&r1=1101159&r2=1101208&rev=1101208&view=diff
==============================================================================
--- commons/sandbox/digester3/trunk/src/test/java/org/apache/commons/digester/URLTestCase.java (original)
+++ commons/sandbox/digester3/trunk/src/test/java/org/apache/commons/digester3/URLTestCase.java Mon May 9 20:27:33 2011
@@ -17,12 +17,13 @@
*/
-package org.apache.commons.digester;
+package org.apache.commons.digester3;
import static org.junit.Assert.*;
import java.net.URL;
+import org.apache.commons.digester3.Digester;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
@@ -73,14 +74,14 @@ public class URLTestCase {
* <p>System identifier of the Digester Rules DTD.</p>
*/
private static final String DIGESTER_RULES_SYSTEM_ID =
- "/org/apache/commons/digester/xmlrules/digester-rules.dtd";
+ "/org/apache/commons/digester3/xmlrules/digester-rules.dtd";
/**
* <p>System identifier for the Digester Rules file that we will parse.</p>
*/
private static final String TEST_INPUT_SYSTEM_ID =
- "/org/apache/commons/digester/xmlrules/test-call-param-rules.xml";
+ "/org/apache/commons/digester3/xmlrules/test-call-param-rules.xml";
// ------------------------------------------------------ Instance Variables
Propchange: commons/sandbox/digester3/trunk/src/test/java/org/apache/commons/digester3/URLTestCase.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: commons/sandbox/digester3/trunk/src/test/java/org/apache/commons/digester3/URLTestCase.java
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Copied: commons/sandbox/digester3/trunk/src/test/java/org/apache/commons/digester3/WDRulesWrapperTestCase.java (from r1101159, commons/sandbox/digester3/trunk/src/test/java/org/apache/commons/digester/WDRulesWrapperTestCase.java)
URL: http://svn.apache.org/viewvc/commons/sandbox/digester3/trunk/src/test/java/org/apache/commons/digester3/WDRulesWrapperTestCase.java?p2=commons/sandbox/digester3/trunk/src/test/java/org/apache/commons/digester3/WDRulesWrapperTestCase.java&p1=commons/sandbox/digester3/trunk/src/test/java/org/apache/commons/digester/WDRulesWrapperTestCase.java&r1=1101159&r2=1101208&rev=1101208&view=diff
==============================================================================
--- commons/sandbox/digester3/trunk/src/test/java/org/apache/commons/digester/WDRulesWrapperTestCase.java (original)
+++ commons/sandbox/digester3/trunk/src/test/java/org/apache/commons/digester3/WDRulesWrapperTestCase.java Mon May 9 20:27:33 2011
@@ -16,13 +16,16 @@
* limitations under the License.
*/
-package org.apache.commons.digester;
+package org.apache.commons.digester3;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;
import java.util.List;
+import org.apache.commons.digester3.Rule;
+import org.apache.commons.digester3.RulesBase;
+import org.apache.commons.digester3.WithDefaultsRulesWrapper;
import org.junit.Test;
/**
Propchange: commons/sandbox/digester3/trunk/src/test/java/org/apache/commons/digester3/WDRulesWrapperTestCase.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: commons/sandbox/digester3/trunk/src/test/java/org/apache/commons/digester3/WDRulesWrapperTestCase.java
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Copied: commons/sandbox/digester3/trunk/src/test/java/org/apache/commons/digester3/XIncludeTestCase.java (from r1101159, commons/sandbox/digester3/trunk/src/test/java/org/apache/commons/digester/XIncludeTestCase.java)
URL: http://svn.apache.org/viewvc/commons/sandbox/digester3/trunk/src/test/java/org/apache/commons/digester3/XIncludeTestCase.java?p2=commons/sandbox/digester3/trunk/src/test/java/org/apache/commons/digester3/XIncludeTestCase.java&p1=commons/sandbox/digester3/trunk/src/test/java/org/apache/commons/digester/XIncludeTestCase.java&r1=1101159&r2=1101208&rev=1101208&view=diff
==============================================================================
--- commons/sandbox/digester3/trunk/src/test/java/org/apache/commons/digester/XIncludeTestCase.java (original)
+++ commons/sandbox/digester3/trunk/src/test/java/org/apache/commons/digester3/XIncludeTestCase.java Mon May 9 20:27:33 2011
@@ -17,7 +17,7 @@
*/
-package org.apache.commons.digester;
+package org.apache.commons.digester3;
import static org.junit.Assert.assertEquals;
@@ -26,6 +26,7 @@ import static org.junit.Assert.assertNot
import java.io.IOException;
import java.io.InputStream;
+import org.apache.commons.digester3.Digester;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
@@ -133,7 +134,7 @@ public class XIncludeTestCase {
protected InputStream getInputStream(String name) throws IOException {
return (this.getClass().getResourceAsStream
- ("/org/apache/commons/digester/" + name));
+ ("/org/apache/commons/digester3/" + name));
}
Propchange: commons/sandbox/digester3/trunk/src/test/java/org/apache/commons/digester3/XIncludeTestCase.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: commons/sandbox/digester3/trunk/src/test/java/org/apache/commons/digester3/XIncludeTestCase.java
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Copied: commons/sandbox/digester3/trunk/src/test/java/org/apache/commons/digester3/XMLSchemaTestCase.java (from r1101159, commons/sandbox/digester3/trunk/src/test/java/org/apache/commons/digester/XMLSchemaTestCase.java)
URL: http://svn.apache.org/viewvc/commons/sandbox/digester3/trunk/src/test/java/org/apache/commons/digester3/XMLSchemaTestCase.java?p2=commons/sandbox/digester3/trunk/src/test/java/org/apache/commons/digester3/XMLSchemaTestCase.java&p1=commons/sandbox/digester3/trunk/src/test/java/org/apache/commons/digester/XMLSchemaTestCase.java&r1=1101159&r2=1101208&rev=1101208&view=diff
==============================================================================
--- commons/sandbox/digester3/trunk/src/test/java/org/apache/commons/digester/XMLSchemaTestCase.java (original)
+++ commons/sandbox/digester3/trunk/src/test/java/org/apache/commons/digester3/XMLSchemaTestCase.java Mon May 9 20:27:33 2011
@@ -17,7 +17,7 @@
*/
-package org.apache.commons.digester;
+package org.apache.commons.digester3;
import static org.junit.Assert.assertEquals;
@@ -32,6 +32,7 @@ import javax.xml.XMLConstants;
import javax.xml.validation.Schema;
import javax.xml.validation.SchemaFactory;
+import org.apache.commons.digester3.Digester;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
@@ -72,7 +73,7 @@ public class XMLSchemaTestCase {
Schema test13schema = SchemaFactory.
newInstance(XMLConstants.W3C_XML_SCHEMA_NS_URI).
newSchema(this.getClass().getClassLoader().
- getResource("org/apache/commons/digester/Test13.xsd"));
+ getResource("org/apache/commons/digester3/Test13.xsd"));
digester.setXMLSchema(test13schema);
// Configure the digester as required
@@ -154,7 +155,7 @@ public class XMLSchemaTestCase {
protected InputStream getInputStream(String name) throws IOException {
return (this.getClass().getResourceAsStream
- ("/org/apache/commons/digester/" + name));
+ ("/org/apache/commons/digester3/" + name));
}
Propchange: commons/sandbox/digester3/trunk/src/test/java/org/apache/commons/digester3/XMLSchemaTestCase.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: commons/sandbox/digester3/trunk/src/test/java/org/apache/commons/digester3/XMLSchemaTestCase.java
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Copied: commons/sandbox/digester3/trunk/src/test/java/org/apache/commons/digester3/annotations/AbstractAnnotatedPojoTestCase.java (from r1101159, commons/sandbox/digester3/trunk/src/test/java/org/apache/commons/digester/annotations/AbstractAnnotatedPojoTestCase.java)
URL: http://svn.apache.org/viewvc/commons/sandbox/digester3/trunk/src/test/java/org/apache/commons/digester3/annotations/AbstractAnnotatedPojoTestCase.java?p2=commons/sandbox/digester3/trunk/src/test/java/org/apache/commons/digester3/annotations/AbstractAnnotatedPojoTestCase.java&p1=commons/sandbox/digester3/trunk/src/test/java/org/apache/commons/digester/annotations/AbstractAnnotatedPojoTestCase.java&r1=1101159&r2=1101208&rev=1101208&view=diff
==============================================================================
--- commons/sandbox/digester3/trunk/src/test/java/org/apache/commons/digester/annotations/AbstractAnnotatedPojoTestCase.java (original)
+++ commons/sandbox/digester3/trunk/src/test/java/org/apache/commons/digester3/annotations/AbstractAnnotatedPojoTestCase.java Mon May 9 20:27:33 2011
@@ -15,13 +15,15 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.commons.digester.annotations;
+package org.apache.commons.digester3.annotations;
import static org.junit.Assert.assertEquals;
import java.io.InputStream;
-import org.apache.commons.digester.Digester;
+import org.apache.commons.digester3.Digester;
+import org.apache.commons.digester3.annotations.DigesterLoader;
+import org.apache.commons.digester3.annotations.DigesterLoaderBuilder;
import org.junit.After;
import org.junit.Before;
Propchange: commons/sandbox/digester3/trunk/src/test/java/org/apache/commons/digester3/annotations/AbstractAnnotatedPojoTestCase.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: commons/sandbox/digester3/trunk/src/test/java/org/apache/commons/digester3/annotations/AbstractAnnotatedPojoTestCase.java
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Propchange: commons/sandbox/digester3/trunk/src/test/java/org/apache/commons/digester3/annotations/AbstractAnnotatedPojoTestCase.java
------------------------------------------------------------------------------
svn:mime-type = text/plain
Modified: commons/sandbox/digester3/trunk/src/test/java/org/apache/commons/digester3/annotations/addressbook/Address.java
URL: http://svn.apache.org/viewvc/commons/sandbox/digester3/trunk/src/test/java/org/apache/commons/digester3/annotations/addressbook/Address.java?rev=1101208&r1=1101159&r2=1101208&view=diff
==============================================================================
--- commons/sandbox/digester3/trunk/src/test/java/org/apache/commons/digester3/annotations/addressbook/Address.java (original)
+++ commons/sandbox/digester3/trunk/src/test/java/org/apache/commons/digester3/annotations/addressbook/Address.java Mon May 9 20:27:33 2011
@@ -15,10 +15,10 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.commons.digester.annotations.addressbook;
+package org.apache.commons.digester3.annotations.addressbook;
-import org.apache.commons.digester.annotations.rules.BeanPropertySetter;
-import org.apache.commons.digester.annotations.rules.ObjectCreate;
+import org.apache.commons.digester3.annotations.rules.BeanPropertySetter;
+import org.apache.commons.digester3.annotations.rules.ObjectCreate;
/**
*
Modified: commons/sandbox/digester3/trunk/src/test/java/org/apache/commons/digester3/annotations/addressbook/AddressBook.java
URL: http://svn.apache.org/viewvc/commons/sandbox/digester3/trunk/src/test/java/org/apache/commons/digester3/annotations/addressbook/AddressBook.java?rev=1101208&r1=1101159&r2=1101208&view=diff
==============================================================================
--- commons/sandbox/digester3/trunk/src/test/java/org/apache/commons/digester3/annotations/addressbook/AddressBook.java (original)
+++ commons/sandbox/digester3/trunk/src/test/java/org/apache/commons/digester3/annotations/addressbook/AddressBook.java Mon May 9 20:27:33 2011
@@ -15,13 +15,13 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.commons.digester.annotations.addressbook;
+package org.apache.commons.digester3.annotations.addressbook;
import java.util.ArrayList;
import java.util.List;
-import org.apache.commons.digester.annotations.rules.ObjectCreate;
-import org.apache.commons.digester.annotations.rules.SetNext;
+import org.apache.commons.digester3.annotations.rules.ObjectCreate;
+import org.apache.commons.digester3.annotations.rules.SetNext;
/**
*
Modified: commons/sandbox/digester3/trunk/src/test/java/org/apache/commons/digester3/annotations/addressbook/AddressBookTestCase.java
URL: http://svn.apache.org/viewvc/commons/sandbox/digester3/trunk/src/test/java/org/apache/commons/digester3/annotations/addressbook/AddressBookTestCase.java?rev=1101208&r1=1101159&r2=1101208&view=diff
==============================================================================
--- commons/sandbox/digester3/trunk/src/test/java/org/apache/commons/digester3/annotations/addressbook/AddressBookTestCase.java (original)
+++ commons/sandbox/digester3/trunk/src/test/java/org/apache/commons/digester3/annotations/addressbook/AddressBookTestCase.java Mon May 9 20:27:33 2011
@@ -15,9 +15,9 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.commons.digester.annotations.addressbook;
+package org.apache.commons.digester3.annotations.addressbook;
-import org.apache.commons.digester.annotations.AbstractAnnotatedPojoTestCase;
+import org.apache.commons.digester3.annotations.AbstractAnnotatedPojoTestCase;
import org.junit.Test;
/**
Modified: commons/sandbox/digester3/trunk/src/test/java/org/apache/commons/digester3/annotations/addressbook/Person.java
URL: http://svn.apache.org/viewvc/commons/sandbox/digester3/trunk/src/test/java/org/apache/commons/digester3/annotations/addressbook/Person.java?rev=1101208&r1=1101159&r2=1101208&view=diff
==============================================================================
--- commons/sandbox/digester3/trunk/src/test/java/org/apache/commons/digester3/annotations/addressbook/Person.java (original)
+++ commons/sandbox/digester3/trunk/src/test/java/org/apache/commons/digester3/annotations/addressbook/Person.java Mon May 9 20:27:33 2011
@@ -15,20 +15,20 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.commons.digester.annotations.addressbook;
+package org.apache.commons.digester3.annotations.addressbook;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
-import org.apache.commons.digester.annotations.rules.AttributeCallParam;
-import org.apache.commons.digester.annotations.rules.BeanPropertySetter;
-import org.apache.commons.digester.annotations.rules.CallMethod;
-import org.apache.commons.digester.annotations.rules.CallParam;
-import org.apache.commons.digester.annotations.rules.ObjectCreate;
-import org.apache.commons.digester.annotations.rules.SetNext;
-import org.apache.commons.digester.annotations.rules.SetProperty;
+import org.apache.commons.digester3.annotations.rules.AttributeCallParam;
+import org.apache.commons.digester3.annotations.rules.BeanPropertySetter;
+import org.apache.commons.digester3.annotations.rules.CallMethod;
+import org.apache.commons.digester3.annotations.rules.CallParam;
+import org.apache.commons.digester3.annotations.rules.ObjectCreate;
+import org.apache.commons.digester3.annotations.rules.SetNext;
+import org.apache.commons.digester3.annotations.rules.SetProperty;
/**
*
Modified: commons/sandbox/digester3/trunk/src/test/java/org/apache/commons/digester3/annotations/catalog/AudioVisual.java
URL: http://svn.apache.org/viewvc/commons/sandbox/digester3/trunk/src/test/java/org/apache/commons/digester3/annotations/catalog/AudioVisual.java?rev=1101208&r1=1101159&r2=1101208&view=diff
==============================================================================
--- commons/sandbox/digester3/trunk/src/test/java/org/apache/commons/digester3/annotations/catalog/AudioVisual.java (original)
+++ commons/sandbox/digester3/trunk/src/test/java/org/apache/commons/digester3/annotations/catalog/AudioVisual.java Mon May 9 20:27:33 2011
@@ -15,10 +15,10 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.commons.digester.annotations.catalog;
+package org.apache.commons.digester3.annotations.catalog;
-import org.apache.commons.digester.annotations.rules.ObjectCreate;
-import org.apache.commons.digester.annotations.rules.SetProperty;
+import org.apache.commons.digester3.annotations.rules.ObjectCreate;
+import org.apache.commons.digester3.annotations.rules.SetProperty;
/**
*
Modified: commons/sandbox/digester3/trunk/src/test/java/org/apache/commons/digester3/annotations/catalog/Book.java
URL: http://svn.apache.org/viewvc/commons/sandbox/digester3/trunk/src/test/java/org/apache/commons/digester3/annotations/catalog/Book.java?rev=1101208&r1=1101159&r2=1101208&view=diff
==============================================================================
--- commons/sandbox/digester3/trunk/src/test/java/org/apache/commons/digester3/annotations/catalog/Book.java (original)
+++ commons/sandbox/digester3/trunk/src/test/java/org/apache/commons/digester3/annotations/catalog/Book.java Mon May 9 20:27:33 2011
@@ -15,10 +15,10 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.commons.digester.annotations.catalog;
+package org.apache.commons.digester3.annotations.catalog;
-import org.apache.commons.digester.annotations.rules.BeanPropertySetter;
-import org.apache.commons.digester.annotations.rules.FactoryCreate;
+import org.apache.commons.digester3.annotations.rules.BeanPropertySetter;
+import org.apache.commons.digester3.annotations.rules.FactoryCreate;
/**
*
Modified: commons/sandbox/digester3/trunk/src/test/java/org/apache/commons/digester3/annotations/catalog/BookFactory.java
URL: http://svn.apache.org/viewvc/commons/sandbox/digester3/trunk/src/test/java/org/apache/commons/digester3/annotations/catalog/BookFactory.java?rev=1101208&r1=1101159&r2=1101208&view=diff
==============================================================================
--- commons/sandbox/digester3/trunk/src/test/java/org/apache/commons/digester3/annotations/catalog/BookFactory.java (original)
+++ commons/sandbox/digester3/trunk/src/test/java/org/apache/commons/digester3/annotations/catalog/BookFactory.java Mon May 9 20:27:33 2011
@@ -15,9 +15,9 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.commons.digester.annotations.catalog;
+package org.apache.commons.digester3.annotations.catalog;
-import org.apache.commons.digester.AbstractObjectCreationFactory;
+import org.apache.commons.digester3.AbstractObjectCreationFactory;
import org.xml.sax.Attributes;
/**
Modified: commons/sandbox/digester3/trunk/src/test/java/org/apache/commons/digester3/annotations/catalog/Catalog.java
URL: http://svn.apache.org/viewvc/commons/sandbox/digester3/trunk/src/test/java/org/apache/commons/digester3/annotations/catalog/Catalog.java?rev=1101208&r1=1101159&r2=1101208&view=diff
==============================================================================
--- commons/sandbox/digester3/trunk/src/test/java/org/apache/commons/digester3/annotations/catalog/Catalog.java (original)
+++ commons/sandbox/digester3/trunk/src/test/java/org/apache/commons/digester3/annotations/catalog/Catalog.java Mon May 9 20:27:33 2011
@@ -15,13 +15,13 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.commons.digester.annotations.catalog;
+package org.apache.commons.digester3.annotations.catalog;
import java.util.ArrayList;
import java.util.List;
-import org.apache.commons.digester.annotations.rules.ObjectCreate;
-import org.apache.commons.digester.annotations.rules.SetNext;
+import org.apache.commons.digester3.annotations.rules.ObjectCreate;
+import org.apache.commons.digester3.annotations.rules.SetNext;
/**
*
Modified: commons/sandbox/digester3/trunk/src/test/java/org/apache/commons/digester3/annotations/catalog/CatalogTestCase.java
URL: http://svn.apache.org/viewvc/commons/sandbox/digester3/trunk/src/test/java/org/apache/commons/digester3/annotations/catalog/CatalogTestCase.java?rev=1101208&r1=1101159&r2=1101208&view=diff
==============================================================================
--- commons/sandbox/digester3/trunk/src/test/java/org/apache/commons/digester3/annotations/catalog/CatalogTestCase.java (original)
+++ commons/sandbox/digester3/trunk/src/test/java/org/apache/commons/digester3/annotations/catalog/CatalogTestCase.java Mon May 9 20:27:33 2011
@@ -15,10 +15,10 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.commons.digester.annotations.catalog;
+package org.apache.commons.digester3.annotations.catalog;
-import org.apache.commons.digester.Digester;
-import org.apache.commons.digester.annotations.AbstractAnnotatedPojoTestCase;
+import org.apache.commons.digester3.Digester;
+import org.apache.commons.digester3.annotations.AbstractAnnotatedPojoTestCase;
import org.junit.Test;
/**
Modified: commons/sandbox/digester3/trunk/src/test/java/org/apache/commons/digester3/annotations/catalog/Item.java
URL: http://svn.apache.org/viewvc/commons/sandbox/digester3/trunk/src/test/java/org/apache/commons/digester3/annotations/catalog/Item.java?rev=1101208&r1=1101159&r2=1101208&view=diff
==============================================================================
--- commons/sandbox/digester3/trunk/src/test/java/org/apache/commons/digester3/annotations/catalog/Item.java (original)
+++ commons/sandbox/digester3/trunk/src/test/java/org/apache/commons/digester3/annotations/catalog/Item.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.annotations.catalog;
+package org.apache.commons.digester3.annotations.catalog;
/**
*
Modified: commons/sandbox/digester3/trunk/src/test/java/org/apache/commons/digester3/annotations/employee/Address.java
URL: http://svn.apache.org/viewvc/commons/sandbox/digester3/trunk/src/test/java/org/apache/commons/digester3/annotations/employee/Address.java?rev=1101208&r1=1101159&r2=1101208&view=diff
==============================================================================
--- commons/sandbox/digester3/trunk/src/test/java/org/apache/commons/digester3/annotations/employee/Address.java (original)
+++ commons/sandbox/digester3/trunk/src/test/java/org/apache/commons/digester3/annotations/employee/Address.java Mon May 9 20:27:33 2011
@@ -15,12 +15,12 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.commons.digester.annotations.employee;
+package org.apache.commons.digester3.annotations.employee;
-import org.apache.commons.digester.annotations.rules.BeanPropertySetter;
-import org.apache.commons.digester.annotations.rules.ObjectCreate;
-import org.apache.commons.digester.annotations.rules.SetProperty;
-import org.apache.commons.digester.annotations.rules.SetTop;
+import org.apache.commons.digester3.annotations.rules.BeanPropertySetter;
+import org.apache.commons.digester3.annotations.rules.ObjectCreate;
+import org.apache.commons.digester3.annotations.rules.SetProperty;
+import org.apache.commons.digester3.annotations.rules.SetTop;
/**
*
Modified: commons/sandbox/digester3/trunk/src/test/java/org/apache/commons/digester3/annotations/employee/Employee.java
URL: http://svn.apache.org/viewvc/commons/sandbox/digester3/trunk/src/test/java/org/apache/commons/digester3/annotations/employee/Employee.java?rev=1101208&r1=1101159&r2=1101208&view=diff
==============================================================================
--- commons/sandbox/digester3/trunk/src/test/java/org/apache/commons/digester3/annotations/employee/Employee.java (original)
+++ commons/sandbox/digester3/trunk/src/test/java/org/apache/commons/digester3/annotations/employee/Employee.java Mon May 9 20:27:33 2011
@@ -15,13 +15,13 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.commons.digester.annotations.employee;
+package org.apache.commons.digester3.annotations.employee;
import java.util.ArrayList;
import java.util.List;
-import org.apache.commons.digester.annotations.rules.ObjectCreate;
-import org.apache.commons.digester.annotations.rules.SetProperty;
+import org.apache.commons.digester3.annotations.rules.ObjectCreate;
+import org.apache.commons.digester3.annotations.rules.SetProperty;
/**
*
Modified: commons/sandbox/digester3/trunk/src/test/java/org/apache/commons/digester3/annotations/employee/EmployeeTestCase.java
URL: http://svn.apache.org/viewvc/commons/sandbox/digester3/trunk/src/test/java/org/apache/commons/digester3/annotations/employee/EmployeeTestCase.java?rev=1101208&r1=1101159&r2=1101208&view=diff
==============================================================================
--- commons/sandbox/digester3/trunk/src/test/java/org/apache/commons/digester3/annotations/employee/EmployeeTestCase.java (original)
+++ commons/sandbox/digester3/trunk/src/test/java/org/apache/commons/digester3/annotations/employee/EmployeeTestCase.java Mon May 9 20:27:33 2011
@@ -15,10 +15,10 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.commons.digester.annotations.employee;
+package org.apache.commons.digester3.annotations.employee;
-import org.apache.commons.digester.Digester;
-import org.apache.commons.digester.annotations.AbstractAnnotatedPojoTestCase;
+import org.apache.commons.digester3.Digester;
+import org.apache.commons.digester3.annotations.AbstractAnnotatedPojoTestCase;
import org.junit.Test;
/**
Modified: commons/sandbox/digester3/trunk/src/test/java/org/apache/commons/digester3/annotations/person/Person.java
URL: http://svn.apache.org/viewvc/commons/sandbox/digester3/trunk/src/test/java/org/apache/commons/digester3/annotations/person/Person.java?rev=1101208&r1=1101159&r2=1101208&view=diff
==============================================================================
--- commons/sandbox/digester3/trunk/src/test/java/org/apache/commons/digester3/annotations/person/Person.java (original)
+++ commons/sandbox/digester3/trunk/src/test/java/org/apache/commons/digester3/annotations/person/Person.java Mon May 9 20:27:33 2011
@@ -15,17 +15,17 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.commons.digester.annotations.person;
+package org.apache.commons.digester3.annotations.person;
import java.util.HashMap;
import java.util.Map;
-import org.apache.commons.digester.annotations.rules.AttributeCallParam;
-import org.apache.commons.digester.annotations.rules.BeanPropertySetter;
-import org.apache.commons.digester.annotations.rules.CallMethod;
-import org.apache.commons.digester.annotations.rules.CallParam;
-import org.apache.commons.digester.annotations.rules.ObjectCreate;
-import org.apache.commons.digester.annotations.rules.SetProperty;
+import org.apache.commons.digester3.annotations.rules.AttributeCallParam;
+import org.apache.commons.digester3.annotations.rules.BeanPropertySetter;
+import org.apache.commons.digester3.annotations.rules.CallMethod;
+import org.apache.commons.digester3.annotations.rules.CallParam;
+import org.apache.commons.digester3.annotations.rules.ObjectCreate;
+import org.apache.commons.digester3.annotations.rules.SetProperty;
/**
*
Modified: commons/sandbox/digester3/trunk/src/test/java/org/apache/commons/digester3/annotations/person/PersonTestCase.java
URL: http://svn.apache.org/viewvc/commons/sandbox/digester3/trunk/src/test/java/org/apache/commons/digester3/annotations/person/PersonTestCase.java?rev=1101208&r1=1101159&r2=1101208&view=diff
==============================================================================
--- commons/sandbox/digester3/trunk/src/test/java/org/apache/commons/digester3/annotations/person/PersonTestCase.java (original)
+++ commons/sandbox/digester3/trunk/src/test/java/org/apache/commons/digester3/annotations/person/PersonTestCase.java Mon May 9 20:27:33 2011
@@ -15,9 +15,9 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.commons.digester.annotations.person;
+package org.apache.commons.digester3.annotations.person;
-import org.apache.commons.digester.annotations.AbstractAnnotatedPojoTestCase;
+import org.apache.commons.digester3.annotations.AbstractAnnotatedPojoTestCase;
import org.junit.Test;
/**
Modified: commons/sandbox/digester3/trunk/src/test/java/org/apache/commons/digester3/annotations/rss/Channel.java
URL: http://svn.apache.org/viewvc/commons/sandbox/digester3/trunk/src/test/java/org/apache/commons/digester3/annotations/rss/Channel.java?rev=1101208&r1=1101159&r2=1101208&view=diff
==============================================================================
--- commons/sandbox/digester3/trunk/src/test/java/org/apache/commons/digester3/annotations/rss/Channel.java (original)
+++ commons/sandbox/digester3/trunk/src/test/java/org/apache/commons/digester3/annotations/rss/Channel.java Mon May 9 20:27:33 2011
@@ -15,14 +15,14 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.commons.digester.annotations.rss;
+package org.apache.commons.digester3.annotations.rss;
import java.util.ArrayList;
import java.util.List;
-import org.apache.commons.digester.annotations.rules.BeanPropertySetter;
-import org.apache.commons.digester.annotations.rules.ObjectCreate;
-import org.apache.commons.digester.annotations.rules.SetNext;
+import org.apache.commons.digester3.annotations.rules.BeanPropertySetter;
+import org.apache.commons.digester3.annotations.rules.ObjectCreate;
+import org.apache.commons.digester3.annotations.rules.SetNext;
/**
*
Modified: commons/sandbox/digester3/trunk/src/test/java/org/apache/commons/digester3/annotations/rss/Image.java
URL: http://svn.apache.org/viewvc/commons/sandbox/digester3/trunk/src/test/java/org/apache/commons/digester3/annotations/rss/Image.java?rev=1101208&r1=1101159&r2=1101208&view=diff
==============================================================================
--- commons/sandbox/digester3/trunk/src/test/java/org/apache/commons/digester3/annotations/rss/Image.java (original)
+++ commons/sandbox/digester3/trunk/src/test/java/org/apache/commons/digester3/annotations/rss/Image.java Mon May 9 20:27:33 2011
@@ -15,10 +15,10 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.commons.digester.annotations.rss;
+package org.apache.commons.digester3.annotations.rss;
-import org.apache.commons.digester.annotations.rules.BeanPropertySetter;
-import org.apache.commons.digester.annotations.rules.ObjectCreate;
+import org.apache.commons.digester3.annotations.rules.BeanPropertySetter;
+import org.apache.commons.digester3.annotations.rules.ObjectCreate;
/**
*
Modified: commons/sandbox/digester3/trunk/src/test/java/org/apache/commons/digester3/annotations/rss/Item.java
URL: http://svn.apache.org/viewvc/commons/sandbox/digester3/trunk/src/test/java/org/apache/commons/digester3/annotations/rss/Item.java?rev=1101208&r1=1101159&r2=1101208&view=diff
==============================================================================
--- commons/sandbox/digester3/trunk/src/test/java/org/apache/commons/digester3/annotations/rss/Item.java (original)
+++ commons/sandbox/digester3/trunk/src/test/java/org/apache/commons/digester3/annotations/rss/Item.java Mon May 9 20:27:33 2011
@@ -15,10 +15,10 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.commons.digester.annotations.rss;
+package org.apache.commons.digester3.annotations.rss;
-import org.apache.commons.digester.annotations.rules.BeanPropertySetter;
-import org.apache.commons.digester.annotations.rules.ObjectCreate;
+import org.apache.commons.digester3.annotations.rules.BeanPropertySetter;
+import org.apache.commons.digester3.annotations.rules.ObjectCreate;
/**
*
Modified: commons/sandbox/digester3/trunk/src/test/java/org/apache/commons/digester3/annotations/rss/RssTestCase.java
URL: http://svn.apache.org/viewvc/commons/sandbox/digester3/trunk/src/test/java/org/apache/commons/digester3/annotations/rss/RssTestCase.java?rev=1101208&r1=1101159&r2=1101208&view=diff
==============================================================================
--- commons/sandbox/digester3/trunk/src/test/java/org/apache/commons/digester3/annotations/rss/RssTestCase.java (original)
+++ commons/sandbox/digester3/trunk/src/test/java/org/apache/commons/digester3/annotations/rss/RssTestCase.java Mon May 9 20:27:33 2011
@@ -15,9 +15,9 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.commons.digester.annotations.rss;
+package org.apache.commons.digester3.annotations.rss;
-import org.apache.commons.digester.annotations.AbstractAnnotatedPojoTestCase;
+import org.apache.commons.digester3.annotations.AbstractAnnotatedPojoTestCase;
import org.junit.Test;
/**
Modified: commons/sandbox/digester3/trunk/src/test/java/org/apache/commons/digester3/annotations/servletbean/ServletBean.java
URL: http://svn.apache.org/viewvc/commons/sandbox/digester3/trunk/src/test/java/org/apache/commons/digester3/annotations/servletbean/ServletBean.java?rev=1101208&r1=1101159&r2=1101208&view=diff
==============================================================================
--- commons/sandbox/digester3/trunk/src/test/java/org/apache/commons/digester3/annotations/servletbean/ServletBean.java (original)
+++ commons/sandbox/digester3/trunk/src/test/java/org/apache/commons/digester3/annotations/servletbean/ServletBean.java Mon May 9 20:27:33 2011
@@ -15,15 +15,15 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.commons.digester.annotations.servletbean;
+package org.apache.commons.digester3.annotations.servletbean;
import java.util.HashMap;
import java.util.Map;
-import org.apache.commons.digester.annotations.rules.BeanPropertySetter;
-import org.apache.commons.digester.annotations.rules.CallMethod;
-import org.apache.commons.digester.annotations.rules.CallParam;
-import org.apache.commons.digester.annotations.rules.ObjectCreate;
+import org.apache.commons.digester3.annotations.rules.BeanPropertySetter;
+import org.apache.commons.digester3.annotations.rules.CallMethod;
+import org.apache.commons.digester3.annotations.rules.CallParam;
+import org.apache.commons.digester3.annotations.rules.ObjectCreate;
/**
*
Modified: commons/sandbox/digester3/trunk/src/test/java/org/apache/commons/digester3/annotations/servletbean/ServletBeanTestCase.java
URL: http://svn.apache.org/viewvc/commons/sandbox/digester3/trunk/src/test/java/org/apache/commons/digester3/annotations/servletbean/ServletBeanTestCase.java?rev=1101208&r1=1101159&r2=1101208&view=diff
==============================================================================
--- commons/sandbox/digester3/trunk/src/test/java/org/apache/commons/digester3/annotations/servletbean/ServletBeanTestCase.java (original)
+++ commons/sandbox/digester3/trunk/src/test/java/org/apache/commons/digester3/annotations/servletbean/ServletBeanTestCase.java Mon May 9 20:27:33 2011
@@ -15,9 +15,9 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.commons.digester.annotations.servletbean;
+package org.apache.commons.digester3.annotations.servletbean;
-import org.apache.commons.digester.annotations.AbstractAnnotatedPojoTestCase;
+import org.apache.commons.digester3.annotations.AbstractAnnotatedPojoTestCase;
import org.junit.Test;
/**
Modified: commons/sandbox/digester3/trunk/src/test/java/org/apache/commons/digester3/plugins/Container.java
URL: http://svn.apache.org/viewvc/commons/sandbox/digester3/trunk/src/test/java/org/apache/commons/digester3/plugins/Container.java?rev=1101208&r1=1101159&r2=1101208&view=diff
==============================================================================
--- commons/sandbox/digester3/trunk/src/test/java/org/apache/commons/digester3/plugins/Container.java (original)
+++ commons/sandbox/digester3/trunk/src/test/java/org/apache/commons/digester3/plugins/Container.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;
import java.util.List;
import java.util.LinkedList;
Modified: commons/sandbox/digester3/trunk/src/test/java/org/apache/commons/digester3/plugins/ContainerCustomRules.java
URL: http://svn.apache.org/viewvc/commons/sandbox/digester3/trunk/src/test/java/org/apache/commons/digester3/plugins/ContainerCustomRules.java?rev=1101208&r1=1101159&r2=1101208&view=diff
==============================================================================
--- commons/sandbox/digester3/trunk/src/test/java/org/apache/commons/digester3/plugins/ContainerCustomRules.java (original)
+++ commons/sandbox/digester3/trunk/src/test/java/org/apache/commons/digester3/plugins/ContainerCustomRules.java Mon May 9 20:27:33 2011
@@ -16,9 +16,11 @@
* 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;
+import org.apache.commons.digester3.plugins.PluginCreateRule;
+import org.apache.commons.digester3.plugins.PluginDeclarationRule;
public class ContainerCustomRules {
public static void addRules(Digester digester, String pattern) {
Modified: commons/sandbox/digester3/trunk/src/test/java/org/apache/commons/digester3/plugins/DumperRule.java
URL: http://svn.apache.org/viewvc/commons/sandbox/digester3/trunk/src/test/java/org/apache/commons/digester3/plugins/DumperRule.java?rev=1101208&r1=1101159&r2=1101208&view=diff
==============================================================================
--- commons/sandbox/digester3/trunk/src/test/java/org/apache/commons/digester3/plugins/DumperRule.java (original)
+++ commons/sandbox/digester3/trunk/src/test/java/org/apache/commons/digester3/plugins/DumperRule.java Mon May 9 20:27:33 2011
@@ -15,10 +15,10 @@
* 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 org.xml.sax.Attributes;
-import org.apache.commons.digester.Rule;
+import org.apache.commons.digester3.Rule;
/**
* Demonstrates the behaviour of the Delegate interface.
Modified: commons/sandbox/digester3/trunk/src/test/java/org/apache/commons/digester3/plugins/ObjectTestImpl.java
URL: http://svn.apache.org/viewvc/commons/sandbox/digester3/trunk/src/test/java/org/apache/commons/digester3/plugins/ObjectTestImpl.java?rev=1101208&r1=1101159&r2=1101208&view=diff
==============================================================================
--- commons/sandbox/digester3/trunk/src/test/java/org/apache/commons/digester3/plugins/ObjectTestImpl.java (original)
+++ commons/sandbox/digester3/trunk/src/test/java/org/apache/commons/digester3/plugins/ObjectTestImpl.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;
/**
* Test harness object for holding results of digestion.
Modified: commons/sandbox/digester3/trunk/src/test/java/org/apache/commons/digester3/plugins/Slider.java
URL: http://svn.apache.org/viewvc/commons/sandbox/digester3/trunk/src/test/java/org/apache/commons/digester3/plugins/Slider.java?rev=1101208&r1=1101159&r2=1101208&view=diff
==============================================================================
--- commons/sandbox/digester3/trunk/src/test/java/org/apache/commons/digester3/plugins/Slider.java (original)
+++ commons/sandbox/digester3/trunk/src/test/java/org/apache/commons/digester3/plugins/Slider.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 Slider implements Widget {
private String label = "nolabel";
Modified: commons/sandbox/digester3/trunk/src/test/java/org/apache/commons/digester3/plugins/TestConfigurablePluginAttributes.java
URL: http://svn.apache.org/viewvc/commons/sandbox/digester3/trunk/src/test/java/org/apache/commons/digester3/plugins/TestConfigurablePluginAttributes.java?rev=1101208&r1=1101159&r2=1101208&view=diff
==============================================================================
--- commons/sandbox/digester3/trunk/src/test/java/org/apache/commons/digester3/plugins/TestConfigurablePluginAttributes.java (original)
+++ commons/sandbox/digester3/trunk/src/test/java/org/apache/commons/digester3/plugins/TestConfigurablePluginAttributes.java Mon May 9 20:27:33 2011
@@ -17,14 +17,17 @@
*/
-package org.apache.commons.digester.plugins;
+package org.apache.commons.digester3.plugins;
import static org.junit.Assert.*;
import java.util.LinkedList;
import java.util.List;
-import org.apache.commons.digester.Digester;
+import org.apache.commons.digester3.Digester;
+import org.apache.commons.digester3.plugins.PluginCreateRule;
+import org.apache.commons.digester3.plugins.PluginDeclarationRule;
+import org.apache.commons.digester3.plugins.PluginRules;
import org.junit.Test;
/**
Modified: commons/sandbox/digester3/trunk/src/test/java/org/apache/commons/digester3/plugins/TestDeclaration.java
URL: http://svn.apache.org/viewvc/commons/sandbox/digester3/trunk/src/test/java/org/apache/commons/digester3/plugins/TestDeclaration.java?rev=1101208&r1=1101159&r2=1101208&view=diff
==============================================================================
--- commons/sandbox/digester3/trunk/src/test/java/org/apache/commons/digester3/plugins/TestDeclaration.java (original)
+++ commons/sandbox/digester3/trunk/src/test/java/org/apache/commons/digester3/plugins/TestDeclaration.java Mon May 9 20:27:33 2011
@@ -17,13 +17,16 @@
*/
-package org.apache.commons.digester.plugins;
+package org.apache.commons.digester3.plugins;
import static org.junit.Assert.*;
import java.util.List;
-import org.apache.commons.digester.Digester;
+import org.apache.commons.digester3.Digester;
+import org.apache.commons.digester3.plugins.PluginCreateRule;
+import org.apache.commons.digester3.plugins.PluginDeclarationRule;
+import org.apache.commons.digester3.plugins.PluginRules;
import org.junit.Test;
/**
Modified: commons/sandbox/digester3/trunk/src/test/java/org/apache/commons/digester3/plugins/TestDefaultPlugin.java
URL: http://svn.apache.org/viewvc/commons/sandbox/digester3/trunk/src/test/java/org/apache/commons/digester3/plugins/TestDefaultPlugin.java?rev=1101208&r1=1101159&r2=1101208&view=diff
==============================================================================
--- commons/sandbox/digester3/trunk/src/test/java/org/apache/commons/digester3/plugins/TestDefaultPlugin.java (original)
+++ commons/sandbox/digester3/trunk/src/test/java/org/apache/commons/digester3/plugins/TestDefaultPlugin.java Mon May 9 20:27:33 2011
@@ -17,13 +17,17 @@
*/
-package org.apache.commons.digester.plugins;
+package org.apache.commons.digester3.plugins;
import static org.junit.Assert.*;
import java.util.List;
-import org.apache.commons.digester.Digester;
+import org.apache.commons.digester3.Digester;
+import org.apache.commons.digester3.plugins.PluginConfigurationException;
+import org.apache.commons.digester3.plugins.PluginCreateRule;
+import org.apache.commons.digester3.plugins.PluginInvalidInputException;
+import org.apache.commons.digester3.plugins.PluginRules;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.impl.NoOpLog;
import org.junit.Test;
Modified: commons/sandbox/digester3/trunk/src/test/java/org/apache/commons/digester3/plugins/TestDelegate.java
URL: http://svn.apache.org/viewvc/commons/sandbox/digester3/trunk/src/test/java/org/apache/commons/digester3/plugins/TestDelegate.java?rev=1101208&r1=1101159&r2=1101208&view=diff
==============================================================================
--- commons/sandbox/digester3/trunk/src/test/java/org/apache/commons/digester3/plugins/TestDelegate.java (original)
+++ commons/sandbox/digester3/trunk/src/test/java/org/apache/commons/digester3/plugins/TestDelegate.java Mon May 9 20:27:33 2011
@@ -17,9 +17,10 @@
*/
-package org.apache.commons.digester.plugins;
+package org.apache.commons.digester3.plugins;
-import org.apache.commons.digester.Digester;
+import org.apache.commons.digester3.Digester;
+import org.apache.commons.digester3.plugins.PluginRules;
import org.junit.Test;
/**
Modified: commons/sandbox/digester3/trunk/src/test/java/org/apache/commons/digester3/plugins/TestInline.java
URL: http://svn.apache.org/viewvc/commons/sandbox/digester3/trunk/src/test/java/org/apache/commons/digester3/plugins/TestInline.java?rev=1101208&r1=1101159&r2=1101208&view=diff
==============================================================================
--- commons/sandbox/digester3/trunk/src/test/java/org/apache/commons/digester3/plugins/TestInline.java (original)
+++ commons/sandbox/digester3/trunk/src/test/java/org/apache/commons/digester3/plugins/TestInline.java Mon May 9 20:27:33 2011
@@ -17,13 +17,15 @@
*/
-package org.apache.commons.digester.plugins;
+package org.apache.commons.digester3.plugins;
import static org.junit.Assert.*;
import java.util.List;
-import org.apache.commons.digester.Digester;
+import org.apache.commons.digester3.Digester;
+import org.apache.commons.digester3.plugins.PluginCreateRule;
+import org.apache.commons.digester3.plugins.PluginRules;
import org.junit.Test;
/**
Modified: commons/sandbox/digester3/trunk/src/test/java/org/apache/commons/digester3/plugins/TestLocalRules.java
URL: http://svn.apache.org/viewvc/commons/sandbox/digester3/trunk/src/test/java/org/apache/commons/digester3/plugins/TestLocalRules.java?rev=1101208&r1=1101159&r2=1101208&view=diff
==============================================================================
--- commons/sandbox/digester3/trunk/src/test/java/org/apache/commons/digester3/plugins/TestLocalRules.java (original)
+++ commons/sandbox/digester3/trunk/src/test/java/org/apache/commons/digester3/plugins/TestLocalRules.java Mon May 9 20:27:33 2011
@@ -17,13 +17,16 @@
*/
-package org.apache.commons.digester.plugins;
+package org.apache.commons.digester3.plugins;
import static org.junit.Assert.*;
import java.util.List;
-import org.apache.commons.digester.Digester;
+import org.apache.commons.digester3.Digester;
+import org.apache.commons.digester3.plugins.PluginCreateRule;
+import org.apache.commons.digester3.plugins.PluginDeclarationRule;
+import org.apache.commons.digester3.plugins.PluginRules;
import org.junit.Test;
/**
Modified: commons/sandbox/digester3/trunk/src/test/java/org/apache/commons/digester3/plugins/TestRecursion.java
URL: http://svn.apache.org/viewvc/commons/sandbox/digester3/trunk/src/test/java/org/apache/commons/digester3/plugins/TestRecursion.java?rev=1101208&r1=1101159&r2=1101208&view=diff
==============================================================================
--- commons/sandbox/digester3/trunk/src/test/java/org/apache/commons/digester3/plugins/TestRecursion.java (original)
+++ commons/sandbox/digester3/trunk/src/test/java/org/apache/commons/digester3/plugins/TestRecursion.java Mon May 9 20:27:33 2011
@@ -17,13 +17,16 @@
*/
-package org.apache.commons.digester.plugins;
+package org.apache.commons.digester3.plugins;
import static org.junit.Assert.*;
import java.util.List;
-import org.apache.commons.digester.Digester;
+import org.apache.commons.digester3.Digester;
+import org.apache.commons.digester3.plugins.PluginCreateRule;
+import org.apache.commons.digester3.plugins.PluginDeclarationRule;
+import org.apache.commons.digester3.plugins.PluginRules;
import org.junit.Test;
/**
Modified: commons/sandbox/digester3/trunk/src/test/java/org/apache/commons/digester3/plugins/TestRuleInfo.java
URL: http://svn.apache.org/viewvc/commons/sandbox/digester3/trunk/src/test/java/org/apache/commons/digester3/plugins/TestRuleInfo.java?rev=1101208&r1=1101159&r2=1101208&view=diff
==============================================================================
--- commons/sandbox/digester3/trunk/src/test/java/org/apache/commons/digester3/plugins/TestRuleInfo.java (original)
+++ commons/sandbox/digester3/trunk/src/test/java/org/apache/commons/digester3/plugins/TestRuleInfo.java Mon May 9 20:27:33 2011
@@ -17,13 +17,16 @@
*/
-package org.apache.commons.digester.plugins;
+package org.apache.commons.digester3.plugins;
import static org.junit.Assert.*;
import java.util.List;
-import org.apache.commons.digester.Digester;
+import org.apache.commons.digester3.Digester;
+import org.apache.commons.digester3.plugins.PluginCreateRule;
+import org.apache.commons.digester3.plugins.PluginDeclarationRule;
+import org.apache.commons.digester3.plugins.PluginRules;
import org.junit.Test;
/**
Modified: commons/sandbox/digester3/trunk/src/test/java/org/apache/commons/digester3/plugins/TestXmlRuleInfo.java
URL: http://svn.apache.org/viewvc/commons/sandbox/digester3/trunk/src/test/java/org/apache/commons/digester3/plugins/TestXmlRuleInfo.java?rev=1101208&r1=1101159&r2=1101208&view=diff
==============================================================================
--- commons/sandbox/digester3/trunk/src/test/java/org/apache/commons/digester3/plugins/TestXmlRuleInfo.java (original)
+++ commons/sandbox/digester3/trunk/src/test/java/org/apache/commons/digester3/plugins/TestXmlRuleInfo.java Mon May 9 20:27:33 2011
@@ -17,13 +17,16 @@
*/
-package org.apache.commons.digester.plugins;
+package org.apache.commons.digester3.plugins;
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.plugins.PluginCreateRule;
+import org.apache.commons.digester3.plugins.PluginDeclarationRule;
+import org.apache.commons.digester3.plugins.PluginRules;
import org.junit.Test;
/**
@@ -44,8 +47,8 @@ public class TestXmlRuleInfo {
input.append("<root>");
input.append(" <plugin");
input.append(" id='testobject'");
- input.append(" class='org.apache.commons.digester.plugins.ObjectTestImpl'");
- input.append(" file='src/test/resources/org/apache/commons/digester/plugins/xmlrules1.xml'");
+ input.append(" class='org.apache.commons.digester3.plugins.ObjectTestImpl'");
+ input.append(" file='src/test/resources/org/apache/commons/digester3/plugins/xmlrules1.xml'");
input.append(" />");
input.append(" <object plugin-id='testobject'/>");
input.append("</root>");
@@ -84,8 +87,8 @@ public class TestXmlRuleInfo {
input.append("<root>");
input.append(" <plugin");
input.append(" id='testobject'");
- input.append(" class='org.apache.commons.digester.plugins.ObjectTestImpl'");
- input.append(" resource='org/apache/commons/digester/plugins/xmlrules2.xml'");
+ input.append(" class='org.apache.commons.digester3.plugins.ObjectTestImpl'");
+ input.append(" resource='org/apache/commons/digester3/plugins/xmlrules2.xml'");
input.append(" />");
input.append(" <object plugin-id='testobject'/>");
input.append("</root>");
@@ -124,7 +127,7 @@ public class TestXmlRuleInfo {
input.append("<root>");
input.append(" <plugin");
input.append(" id='testobject'");
- input.append(" class='org.apache.commons.digester.plugins.ObjectTestImpl'");
+ input.append(" class='org.apache.commons.digester3.plugins.ObjectTestImpl'");
input.append(" />");
input.append(" <object plugin-id='testobject'/>");
input.append("</root>");
Modified: commons/sandbox/digester3/trunk/src/test/java/org/apache/commons/digester3/plugins/TextLabel.java
URL: http://svn.apache.org/viewvc/commons/sandbox/digester3/trunk/src/test/java/org/apache/commons/digester3/plugins/TextLabel.java?rev=1101208&r1=1101159&r2=1101208&view=diff
==============================================================================
--- commons/sandbox/digester3/trunk/src/test/java/org/apache/commons/digester3/plugins/TextLabel.java (original)
+++ commons/sandbox/digester3/trunk/src/test/java/org/apache/commons/digester3/plugins/TextLabel.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;
public class TextLabel implements Widget {
private String id = "anonymous";