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/02/11 15:24:59 UTC

svn commit: r1069810 - in /commons/sandbox/digester3/trunk/src: main/java/org/apache/commons/digester3/ main/java/org/apache/commons/digester3/internal/rulesbinder/ main/java/org/apache/commons/digester3/rule/ main/java/org/apache/commons/digester3/spi...

Author: simonetripodi
Date: Fri Feb 11 14:24:57 2011
New Revision: 1069810

URL: http://svn.apache.org/viewvc?rev=1069810&view=rev
Log:
Digester EDSL related stuff erroneously moved to Rule implementation package

Added:
    commons/sandbox/digester3/trunk/src/main/java/org/apache/commons/digester3/AbstractRulesModule.java   (contents, props changed)
      - copied, changed from r1069805, commons/sandbox/digester3/trunk/src/main/java/org/apache/commons/digester3/rule/AbstractRulesModule.java
    commons/sandbox/digester3/trunk/src/main/java/org/apache/commons/digester3/RulesBinder.java   (contents, props changed)
      - copied, changed from r1069805, commons/sandbox/digester3/trunk/src/main/java/org/apache/commons/digester3/rule/RulesBinder.java
    commons/sandbox/digester3/trunk/src/main/java/org/apache/commons/digester3/RulesModule.java   (contents, props changed)
      - copied, changed from r1069805, commons/sandbox/digester3/trunk/src/main/java/org/apache/commons/digester3/rule/RulesModule.java
Removed:
    commons/sandbox/digester3/trunk/src/main/java/org/apache/commons/digester3/rule/AbstractRulesModule.java
    commons/sandbox/digester3/trunk/src/main/java/org/apache/commons/digester3/rule/RulesBinder.java
    commons/sandbox/digester3/trunk/src/main/java/org/apache/commons/digester3/rule/RulesModule.java
Modified:
    commons/sandbox/digester3/trunk/src/main/java/org/apache/commons/digester3/DigesterLoader.java
    commons/sandbox/digester3/trunk/src/main/java/org/apache/commons/digester3/internal/rulesbinder/AbstractBackToLinkedRuleBuilder.java
    commons/sandbox/digester3/trunk/src/main/java/org/apache/commons/digester3/internal/rulesbinder/AbstractParamTypeBuilder.java
    commons/sandbox/digester3/trunk/src/main/java/org/apache/commons/digester3/internal/rulesbinder/BeanPropertySetterBuilderImpl.java
    commons/sandbox/digester3/trunk/src/main/java/org/apache/commons/digester3/internal/rulesbinder/ByRuleBuilderImpl.java
    commons/sandbox/digester3/trunk/src/main/java/org/apache/commons/digester3/internal/rulesbinder/ByRuleProviderBuilderImpl.java
    commons/sandbox/digester3/trunk/src/main/java/org/apache/commons/digester3/internal/rulesbinder/CallMethodBuilderImpl.java
    commons/sandbox/digester3/trunk/src/main/java/org/apache/commons/digester3/internal/rulesbinder/CallParamBuilderImpl.java
    commons/sandbox/digester3/trunk/src/main/java/org/apache/commons/digester3/internal/rulesbinder/ErrorMessage.java
    commons/sandbox/digester3/trunk/src/main/java/org/apache/commons/digester3/internal/rulesbinder/FactoryCreateBuilderImpl.java
    commons/sandbox/digester3/trunk/src/main/java/org/apache/commons/digester3/internal/rulesbinder/LinkedRuleBuilderImpl.java
    commons/sandbox/digester3/trunk/src/main/java/org/apache/commons/digester3/internal/rulesbinder/NestedPropertiesBuilderImpl.java
    commons/sandbox/digester3/trunk/src/main/java/org/apache/commons/digester3/internal/rulesbinder/ObjectCreateBuilderImpl.java
    commons/sandbox/digester3/trunk/src/main/java/org/apache/commons/digester3/internal/rulesbinder/ObjectParamBuilderImpl.java
    commons/sandbox/digester3/trunk/src/main/java/org/apache/commons/digester3/internal/rulesbinder/PathCallParamBuilderImpl.java
    commons/sandbox/digester3/trunk/src/main/java/org/apache/commons/digester3/internal/rulesbinder/RulesBinderImpl.java
    commons/sandbox/digester3/trunk/src/main/java/org/apache/commons/digester3/internal/rulesbinder/SetNextBuilderImpl.java
    commons/sandbox/digester3/trunk/src/main/java/org/apache/commons/digester3/internal/rulesbinder/SetPropertiesBuilderImpl.java
    commons/sandbox/digester3/trunk/src/main/java/org/apache/commons/digester3/internal/rulesbinder/SetPropertyBuilderImpl.java
    commons/sandbox/digester3/trunk/src/main/java/org/apache/commons/digester3/internal/rulesbinder/SetRootBuilderImpl.java
    commons/sandbox/digester3/trunk/src/main/java/org/apache/commons/digester3/internal/rulesbinder/SetTopBuilderImpl.java
    commons/sandbox/digester3/trunk/src/main/java/org/apache/commons/digester3/spi/ObjectCreationFactory.java
    commons/sandbox/digester3/trunk/src/test/java/org/apache/commons/digester3/AbstractTestCase.java
    commons/sandbox/digester3/trunk/src/test/java/org/apache/commons/digester3/BeanPropertySetterRuleTestCase.java
    commons/sandbox/digester3/trunk/src/test/java/org/apache/commons/digester3/DigesterTestCase.java
    commons/sandbox/digester3/trunk/src/test/java/org/apache/commons/digester3/EmployeeModule.java
    commons/sandbox/digester3/trunk/src/test/java/org/apache/commons/digester3/NamespaceSnapshotTestCase.java
    commons/sandbox/digester3/trunk/src/test/java/org/apache/commons/digester3/ObjectParamRuleTestCase.java
    commons/sandbox/digester3/trunk/src/test/java/org/apache/commons/digester3/SetNestedPropertiesRuleTestCase.java
    commons/sandbox/digester3/trunk/src/test/java/org/apache/commons/digester3/SetPropertiesRuleTestCase.java
    commons/sandbox/digester3/trunk/src/test/java/org/apache/commons/digester3/SetPropertyRuleTestCase.java
    commons/sandbox/digester3/trunk/src/test/java/org/apache/commons/digester3/TestFactoryCreate.java
    commons/sandbox/digester3/trunk/src/test/java/org/apache/commons/digester3/URLTestCase.java
    commons/sandbox/digester3/trunk/src/test/java/org/apache/commons/digester3/substitution/VariableExpansionTestCase.java

Copied: commons/sandbox/digester3/trunk/src/main/java/org/apache/commons/digester3/AbstractRulesModule.java (from r1069805, commons/sandbox/digester3/trunk/src/main/java/org/apache/commons/digester3/rule/AbstractRulesModule.java)
URL: http://svn.apache.org/viewvc/commons/sandbox/digester3/trunk/src/main/java/org/apache/commons/digester3/AbstractRulesModule.java?p2=commons/sandbox/digester3/trunk/src/main/java/org/apache/commons/digester3/AbstractRulesModule.java&p1=commons/sandbox/digester3/trunk/src/main/java/org/apache/commons/digester3/rule/AbstractRulesModule.java&r1=1069805&r2=1069810&rev=1069810&view=diff
==============================================================================
--- commons/sandbox/digester3/trunk/src/main/java/org/apache/commons/digester3/rule/AbstractRulesModule.java (original)
+++ commons/sandbox/digester3/trunk/src/main/java/org/apache/commons/digester3/AbstractRulesModule.java Fri Feb 11 14:24:57 2011
@@ -15,7 +15,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.digester3.rule;
+package org.apache.commons.digester3;
 
 import org.apache.commons.digester3.rulesbinder.ConverterBuilder;
 import org.apache.commons.digester3.rulesbinder.LinkedRuleBuilder;

Propchange: commons/sandbox/digester3/trunk/src/main/java/org/apache/commons/digester3/AbstractRulesModule.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: commons/sandbox/digester3/trunk/src/main/java/org/apache/commons/digester3/AbstractRulesModule.java
------------------------------------------------------------------------------
    svn:keywords = Date Author Id Revision HeadURL

Propchange: commons/sandbox/digester3/trunk/src/main/java/org/apache/commons/digester3/AbstractRulesModule.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Modified: commons/sandbox/digester3/trunk/src/main/java/org/apache/commons/digester3/DigesterLoader.java
URL: http://svn.apache.org/viewvc/commons/sandbox/digester3/trunk/src/main/java/org/apache/commons/digester3/DigesterLoader.java?rev=1069810&r1=1069809&r2=1069810&view=diff
==============================================================================
--- commons/sandbox/digester3/trunk/src/main/java/org/apache/commons/digester3/DigesterLoader.java (original)
+++ commons/sandbox/digester3/trunk/src/main/java/org/apache/commons/digester3/DigesterLoader.java Fri Feb 11 14:24:57 2011
@@ -32,8 +32,6 @@ import javax.xml.validation.Schema;
 
 import org.apache.commons.digester3.internal.DigesterImpl;
 import org.apache.commons.digester3.internal.rulesbinder.RulesBinderImpl;
-import org.apache.commons.digester3.rule.RulesBinder;
-import org.apache.commons.digester3.rule.RulesModule;
 import org.apache.commons.digester3.rules.BaseRules;
 import org.apache.commons.digester3.spi.Rules;
 import org.apache.commons.digester3.spi.Substitutor;

Copied: commons/sandbox/digester3/trunk/src/main/java/org/apache/commons/digester3/RulesBinder.java (from r1069805, commons/sandbox/digester3/trunk/src/main/java/org/apache/commons/digester3/rule/RulesBinder.java)
URL: http://svn.apache.org/viewvc/commons/sandbox/digester3/trunk/src/main/java/org/apache/commons/digester3/RulesBinder.java?p2=commons/sandbox/digester3/trunk/src/main/java/org/apache/commons/digester3/RulesBinder.java&p1=commons/sandbox/digester3/trunk/src/main/java/org/apache/commons/digester3/rule/RulesBinder.java&r1=1069805&r2=1069810&rev=1069810&view=diff
==============================================================================
--- commons/sandbox/digester3/trunk/src/main/java/org/apache/commons/digester3/rule/RulesBinder.java (original)
+++ commons/sandbox/digester3/trunk/src/main/java/org/apache/commons/digester3/RulesBinder.java Fri Feb 11 14:24:57 2011
@@ -15,7 +15,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.digester3.rule;
+package org.apache.commons.digester3;
 
 import org.apache.commons.digester3.rulesbinder.ConverterBuilder;
 import org.apache.commons.digester3.rulesbinder.LinkedRuleBuilder;

Propchange: commons/sandbox/digester3/trunk/src/main/java/org/apache/commons/digester3/RulesBinder.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: commons/sandbox/digester3/trunk/src/main/java/org/apache/commons/digester3/RulesBinder.java
------------------------------------------------------------------------------
    svn:keywords = Date Author Id Revision HeadURL

Propchange: commons/sandbox/digester3/trunk/src/main/java/org/apache/commons/digester3/RulesBinder.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Copied: commons/sandbox/digester3/trunk/src/main/java/org/apache/commons/digester3/RulesModule.java (from r1069805, commons/sandbox/digester3/trunk/src/main/java/org/apache/commons/digester3/rule/RulesModule.java)
URL: http://svn.apache.org/viewvc/commons/sandbox/digester3/trunk/src/main/java/org/apache/commons/digester3/RulesModule.java?p2=commons/sandbox/digester3/trunk/src/main/java/org/apache/commons/digester3/RulesModule.java&p1=commons/sandbox/digester3/trunk/src/main/java/org/apache/commons/digester3/rule/RulesModule.java&r1=1069805&r2=1069810&rev=1069810&view=diff
==============================================================================
--- commons/sandbox/digester3/trunk/src/main/java/org/apache/commons/digester3/rule/RulesModule.java (original)
+++ commons/sandbox/digester3/trunk/src/main/java/org/apache/commons/digester3/RulesModule.java Fri Feb 11 14:24:57 2011
@@ -15,7 +15,8 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.digester3.rule;
+package org.apache.commons.digester3;
+
 
 /**
  * A module is the Digester rule bindings provider.

Propchange: commons/sandbox/digester3/trunk/src/main/java/org/apache/commons/digester3/RulesModule.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: commons/sandbox/digester3/trunk/src/main/java/org/apache/commons/digester3/RulesModule.java
------------------------------------------------------------------------------
    svn:keywords = Date Author Id Revision HeadURL

Propchange: commons/sandbox/digester3/trunk/src/main/java/org/apache/commons/digester3/RulesModule.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Modified: commons/sandbox/digester3/trunk/src/main/java/org/apache/commons/digester3/internal/rulesbinder/AbstractBackToLinkedRuleBuilder.java
URL: http://svn.apache.org/viewvc/commons/sandbox/digester3/trunk/src/main/java/org/apache/commons/digester3/internal/rulesbinder/AbstractBackToLinkedRuleBuilder.java?rev=1069810&r1=1069809&r2=1069810&view=diff
==============================================================================
--- commons/sandbox/digester3/trunk/src/main/java/org/apache/commons/digester3/internal/rulesbinder/AbstractBackToLinkedRuleBuilder.java (original)
+++ commons/sandbox/digester3/trunk/src/main/java/org/apache/commons/digester3/internal/rulesbinder/AbstractBackToLinkedRuleBuilder.java Fri Feb 11 14:24:57 2011
@@ -18,7 +18,7 @@
 package org.apache.commons.digester3.internal.rulesbinder;
 
 import org.apache.commons.digester3.Rule;
-import org.apache.commons.digester3.rule.RulesBinder;
+import org.apache.commons.digester3.RulesBinder;
 import org.apache.commons.digester3.rulesbinder.BackToLinkedRuleBuilder;
 import org.apache.commons.digester3.rulesbinder.LinkedRuleBuilder;
 

Modified: commons/sandbox/digester3/trunk/src/main/java/org/apache/commons/digester3/internal/rulesbinder/AbstractParamTypeBuilder.java
URL: http://svn.apache.org/viewvc/commons/sandbox/digester3/trunk/src/main/java/org/apache/commons/digester3/internal/rulesbinder/AbstractParamTypeBuilder.java?rev=1069810&r1=1069809&r2=1069810&view=diff
==============================================================================
--- commons/sandbox/digester3/trunk/src/main/java/org/apache/commons/digester3/internal/rulesbinder/AbstractParamTypeBuilder.java (original)
+++ commons/sandbox/digester3/trunk/src/main/java/org/apache/commons/digester3/internal/rulesbinder/AbstractParamTypeBuilder.java Fri Feb 11 14:24:57 2011
@@ -18,7 +18,7 @@
 package org.apache.commons.digester3.internal.rulesbinder;
 
 import org.apache.commons.digester3.Rule;
-import org.apache.commons.digester3.rule.RulesBinder;
+import org.apache.commons.digester3.RulesBinder;
 import org.apache.commons.digester3.rulesbinder.ParamTypeBuilder;
 
 /**

Modified: commons/sandbox/digester3/trunk/src/main/java/org/apache/commons/digester3/internal/rulesbinder/BeanPropertySetterBuilderImpl.java
URL: http://svn.apache.org/viewvc/commons/sandbox/digester3/trunk/src/main/java/org/apache/commons/digester3/internal/rulesbinder/BeanPropertySetterBuilderImpl.java?rev=1069810&r1=1069809&r2=1069810&view=diff
==============================================================================
--- commons/sandbox/digester3/trunk/src/main/java/org/apache/commons/digester3/internal/rulesbinder/BeanPropertySetterBuilderImpl.java (original)
+++ commons/sandbox/digester3/trunk/src/main/java/org/apache/commons/digester3/internal/rulesbinder/BeanPropertySetterBuilderImpl.java Fri Feb 11 14:24:57 2011
@@ -17,8 +17,8 @@
  */
 package org.apache.commons.digester3.internal.rulesbinder;
 
+import org.apache.commons.digester3.RulesBinder;
 import org.apache.commons.digester3.rule.BeanPropertySetterRule;
-import org.apache.commons.digester3.rule.RulesBinder;
 import org.apache.commons.digester3.rulesbinder.BeanPropertySetterBuilder;
 
 /**

Modified: commons/sandbox/digester3/trunk/src/main/java/org/apache/commons/digester3/internal/rulesbinder/ByRuleBuilderImpl.java
URL: http://svn.apache.org/viewvc/commons/sandbox/digester3/trunk/src/main/java/org/apache/commons/digester3/internal/rulesbinder/ByRuleBuilderImpl.java?rev=1069810&r1=1069809&r2=1069810&view=diff
==============================================================================
--- commons/sandbox/digester3/trunk/src/main/java/org/apache/commons/digester3/internal/rulesbinder/ByRuleBuilderImpl.java (original)
+++ commons/sandbox/digester3/trunk/src/main/java/org/apache/commons/digester3/internal/rulesbinder/ByRuleBuilderImpl.java Fri Feb 11 14:24:57 2011
@@ -18,7 +18,7 @@
 package org.apache.commons.digester3.internal.rulesbinder;
 
 import org.apache.commons.digester3.Rule;
-import org.apache.commons.digester3.rule.RulesBinder;
+import org.apache.commons.digester3.RulesBinder;
 import org.apache.commons.digester3.rulesbinder.ByRuleBuilder;
 
 final class ByRuleBuilderImpl<R extends Rule> extends AbstractBackToLinkedRuleBuilder<R> implements ByRuleBuilder<R> {

Modified: commons/sandbox/digester3/trunk/src/main/java/org/apache/commons/digester3/internal/rulesbinder/ByRuleProviderBuilderImpl.java
URL: http://svn.apache.org/viewvc/commons/sandbox/digester3/trunk/src/main/java/org/apache/commons/digester3/internal/rulesbinder/ByRuleProviderBuilderImpl.java?rev=1069810&r1=1069809&r2=1069810&view=diff
==============================================================================
--- commons/sandbox/digester3/trunk/src/main/java/org/apache/commons/digester3/internal/rulesbinder/ByRuleProviderBuilderImpl.java (original)
+++ commons/sandbox/digester3/trunk/src/main/java/org/apache/commons/digester3/internal/rulesbinder/ByRuleProviderBuilderImpl.java Fri Feb 11 14:24:57 2011
@@ -18,7 +18,7 @@
 package org.apache.commons.digester3.internal.rulesbinder;
 
 import org.apache.commons.digester3.Rule;
-import org.apache.commons.digester3.rule.RulesBinder;
+import org.apache.commons.digester3.RulesBinder;
 import org.apache.commons.digester3.rulesbinder.ByRuleProviderBuilder;
 import org.apache.commons.digester3.spi.RuleProvider;
 

Modified: commons/sandbox/digester3/trunk/src/main/java/org/apache/commons/digester3/internal/rulesbinder/CallMethodBuilderImpl.java
URL: http://svn.apache.org/viewvc/commons/sandbox/digester3/trunk/src/main/java/org/apache/commons/digester3/internal/rulesbinder/CallMethodBuilderImpl.java?rev=1069810&r1=1069809&r2=1069810&view=diff
==============================================================================
--- commons/sandbox/digester3/trunk/src/main/java/org/apache/commons/digester3/internal/rulesbinder/CallMethodBuilderImpl.java (original)
+++ commons/sandbox/digester3/trunk/src/main/java/org/apache/commons/digester3/internal/rulesbinder/CallMethodBuilderImpl.java Fri Feb 11 14:24:57 2011
@@ -19,8 +19,8 @@ package org.apache.commons.digester3.int
 
 import java.util.Arrays;
 
+import org.apache.commons.digester3.RulesBinder;
 import org.apache.commons.digester3.rule.CallMethodRule;
-import org.apache.commons.digester3.rule.RulesBinder;
 import org.apache.commons.digester3.rulesbinder.CallMethodBuilder;
 
 /**

Modified: commons/sandbox/digester3/trunk/src/main/java/org/apache/commons/digester3/internal/rulesbinder/CallParamBuilderImpl.java
URL: http://svn.apache.org/viewvc/commons/sandbox/digester3/trunk/src/main/java/org/apache/commons/digester3/internal/rulesbinder/CallParamBuilderImpl.java?rev=1069810&r1=1069809&r2=1069810&view=diff
==============================================================================
--- commons/sandbox/digester3/trunk/src/main/java/org/apache/commons/digester3/internal/rulesbinder/CallParamBuilderImpl.java (original)
+++ commons/sandbox/digester3/trunk/src/main/java/org/apache/commons/digester3/internal/rulesbinder/CallParamBuilderImpl.java Fri Feb 11 14:24:57 2011
@@ -17,8 +17,8 @@
  */
 package org.apache.commons.digester3.internal.rulesbinder;
 
+import org.apache.commons.digester3.RulesBinder;
 import org.apache.commons.digester3.rule.CallParamRule;
-import org.apache.commons.digester3.rule.RulesBinder;
 import org.apache.commons.digester3.rulesbinder.CallParamBuilder;
 
 /**

Modified: commons/sandbox/digester3/trunk/src/main/java/org/apache/commons/digester3/internal/rulesbinder/ErrorMessage.java
URL: http://svn.apache.org/viewvc/commons/sandbox/digester3/trunk/src/main/java/org/apache/commons/digester3/internal/rulesbinder/ErrorMessage.java?rev=1069810&r1=1069809&r2=1069810&view=diff
==============================================================================
--- commons/sandbox/digester3/trunk/src/main/java/org/apache/commons/digester3/internal/rulesbinder/ErrorMessage.java (original)
+++ commons/sandbox/digester3/trunk/src/main/java/org/apache/commons/digester3/internal/rulesbinder/ErrorMessage.java Fri Feb 11 14:24:57 2011
@@ -20,7 +20,7 @@ package org.apache.commons.digester3.int
 /**
  * An error message and the context in which it occurred. Messages are usually created internally by
  * {@code Digester} and its extensions. Messages can be created explicitly in a module using
- * {@link org.apache.commons.digester3.rule.RulesBinder#addError(Throwable) addError()} statement:
+ * {@link org.apache.commons.digester3.RulesBinder#addError(Throwable) addError()} statement:
  * <pre>try {
  *   bindRulesFromFile();
  * } catch (IOException e) {

Modified: commons/sandbox/digester3/trunk/src/main/java/org/apache/commons/digester3/internal/rulesbinder/FactoryCreateBuilderImpl.java
URL: http://svn.apache.org/viewvc/commons/sandbox/digester3/trunk/src/main/java/org/apache/commons/digester3/internal/rulesbinder/FactoryCreateBuilderImpl.java?rev=1069810&r1=1069809&r2=1069810&view=diff
==============================================================================
--- commons/sandbox/digester3/trunk/src/main/java/org/apache/commons/digester3/internal/rulesbinder/FactoryCreateBuilderImpl.java (original)
+++ commons/sandbox/digester3/trunk/src/main/java/org/apache/commons/digester3/internal/rulesbinder/FactoryCreateBuilderImpl.java Fri Feb 11 14:24:57 2011
@@ -17,8 +17,8 @@
  */
 package org.apache.commons.digester3.internal.rulesbinder;
 
+import org.apache.commons.digester3.RulesBinder;
 import org.apache.commons.digester3.rule.FactoryCreateRule;
-import org.apache.commons.digester3.rule.RulesBinder;
 import org.apache.commons.digester3.rulesbinder.FactoryCreateBuilder;
 import org.apache.commons.digester3.spi.ObjectCreationFactory;
 

Modified: commons/sandbox/digester3/trunk/src/main/java/org/apache/commons/digester3/internal/rulesbinder/LinkedRuleBuilderImpl.java
URL: http://svn.apache.org/viewvc/commons/sandbox/digester3/trunk/src/main/java/org/apache/commons/digester3/internal/rulesbinder/LinkedRuleBuilderImpl.java?rev=1069810&r1=1069809&r2=1069810&view=diff
==============================================================================
--- commons/sandbox/digester3/trunk/src/main/java/org/apache/commons/digester3/internal/rulesbinder/LinkedRuleBuilderImpl.java (original)
+++ commons/sandbox/digester3/trunk/src/main/java/org/apache/commons/digester3/internal/rulesbinder/LinkedRuleBuilderImpl.java Fri Feb 11 14:24:57 2011
@@ -20,7 +20,7 @@ package org.apache.commons.digester3.int
 import java.util.Collection;
 
 import org.apache.commons.digester3.Rule;
-import org.apache.commons.digester3.rule.RulesBinder;
+import org.apache.commons.digester3.RulesBinder;
 import org.apache.commons.digester3.rulesbinder.BeanPropertySetterBuilder;
 import org.apache.commons.digester3.rulesbinder.ByRuleBuilder;
 import org.apache.commons.digester3.rulesbinder.ByRuleProviderBuilder;

Modified: commons/sandbox/digester3/trunk/src/main/java/org/apache/commons/digester3/internal/rulesbinder/NestedPropertiesBuilderImpl.java
URL: http://svn.apache.org/viewvc/commons/sandbox/digester3/trunk/src/main/java/org/apache/commons/digester3/internal/rulesbinder/NestedPropertiesBuilderImpl.java?rev=1069810&r1=1069809&r2=1069810&view=diff
==============================================================================
--- commons/sandbox/digester3/trunk/src/main/java/org/apache/commons/digester3/internal/rulesbinder/NestedPropertiesBuilderImpl.java (original)
+++ commons/sandbox/digester3/trunk/src/main/java/org/apache/commons/digester3/internal/rulesbinder/NestedPropertiesBuilderImpl.java Fri Feb 11 14:24:57 2011
@@ -20,7 +20,7 @@ package org.apache.commons.digester3.int
 import java.util.HashMap;
 import java.util.Map;
 
-import org.apache.commons.digester3.rule.RulesBinder;
+import org.apache.commons.digester3.RulesBinder;
 import org.apache.commons.digester3.rule.SetNestedPropertiesRule;
 import org.apache.commons.digester3.rulesbinder.NestedPropertiesBuilder;
 

Modified: commons/sandbox/digester3/trunk/src/main/java/org/apache/commons/digester3/internal/rulesbinder/ObjectCreateBuilderImpl.java
URL: http://svn.apache.org/viewvc/commons/sandbox/digester3/trunk/src/main/java/org/apache/commons/digester3/internal/rulesbinder/ObjectCreateBuilderImpl.java?rev=1069810&r1=1069809&r2=1069810&view=diff
==============================================================================
--- commons/sandbox/digester3/trunk/src/main/java/org/apache/commons/digester3/internal/rulesbinder/ObjectCreateBuilderImpl.java (original)
+++ commons/sandbox/digester3/trunk/src/main/java/org/apache/commons/digester3/internal/rulesbinder/ObjectCreateBuilderImpl.java Fri Feb 11 14:24:57 2011
@@ -17,8 +17,8 @@
  */
 package org.apache.commons.digester3.internal.rulesbinder;
 
+import org.apache.commons.digester3.RulesBinder;
 import org.apache.commons.digester3.rule.ObjectCreateRule;
-import org.apache.commons.digester3.rule.RulesBinder;
 import org.apache.commons.digester3.rulesbinder.ObjectCreateBuilder;
 
 /**

Modified: commons/sandbox/digester3/trunk/src/main/java/org/apache/commons/digester3/internal/rulesbinder/ObjectParamBuilderImpl.java
URL: http://svn.apache.org/viewvc/commons/sandbox/digester3/trunk/src/main/java/org/apache/commons/digester3/internal/rulesbinder/ObjectParamBuilderImpl.java?rev=1069810&r1=1069809&r2=1069810&view=diff
==============================================================================
--- commons/sandbox/digester3/trunk/src/main/java/org/apache/commons/digester3/internal/rulesbinder/ObjectParamBuilderImpl.java (original)
+++ commons/sandbox/digester3/trunk/src/main/java/org/apache/commons/digester3/internal/rulesbinder/ObjectParamBuilderImpl.java Fri Feb 11 14:24:57 2011
@@ -17,8 +17,8 @@
  */
 package org.apache.commons.digester3.internal.rulesbinder;
 
+import org.apache.commons.digester3.RulesBinder;
 import org.apache.commons.digester3.rule.ObjectParamRule;
-import org.apache.commons.digester3.rule.RulesBinder;
 import org.apache.commons.digester3.rulesbinder.ObjectParamBuilder;
 
 /**

Modified: commons/sandbox/digester3/trunk/src/main/java/org/apache/commons/digester3/internal/rulesbinder/PathCallParamBuilderImpl.java
URL: http://svn.apache.org/viewvc/commons/sandbox/digester3/trunk/src/main/java/org/apache/commons/digester3/internal/rulesbinder/PathCallParamBuilderImpl.java?rev=1069810&r1=1069809&r2=1069810&view=diff
==============================================================================
--- commons/sandbox/digester3/trunk/src/main/java/org/apache/commons/digester3/internal/rulesbinder/PathCallParamBuilderImpl.java (original)
+++ commons/sandbox/digester3/trunk/src/main/java/org/apache/commons/digester3/internal/rulesbinder/PathCallParamBuilderImpl.java Fri Feb 11 14:24:57 2011
@@ -17,8 +17,8 @@
  */
 package org.apache.commons.digester3.internal.rulesbinder;
 
+import org.apache.commons.digester3.RulesBinder;
 import org.apache.commons.digester3.rule.PathCallParamRule;
-import org.apache.commons.digester3.rule.RulesBinder;
 import org.apache.commons.digester3.rulesbinder.PathCallParamBuilder;
 
 /**

Modified: commons/sandbox/digester3/trunk/src/main/java/org/apache/commons/digester3/internal/rulesbinder/RulesBinderImpl.java
URL: http://svn.apache.org/viewvc/commons/sandbox/digester3/trunk/src/main/java/org/apache/commons/digester3/internal/rulesbinder/RulesBinderImpl.java?rev=1069810&r1=1069809&r2=1069810&view=diff
==============================================================================
--- commons/sandbox/digester3/trunk/src/main/java/org/apache/commons/digester3/internal/rulesbinder/RulesBinderImpl.java (original)
+++ commons/sandbox/digester3/trunk/src/main/java/org/apache/commons/digester3/internal/rulesbinder/RulesBinderImpl.java Fri Feb 11 14:24:57 2011
@@ -26,8 +26,8 @@ import java.util.List;
 
 import org.apache.commons.digester3.DigesterLoadingException;
 import org.apache.commons.digester3.Rule;
-import org.apache.commons.digester3.rule.RulesBinder;
-import org.apache.commons.digester3.rule.RulesModule;
+import org.apache.commons.digester3.RulesBinder;
+import org.apache.commons.digester3.RulesModule;
 import org.apache.commons.digester3.rulesbinder.ConverterBuilder;
 import org.apache.commons.digester3.rulesbinder.LinkedRuleBuilder;
 import org.apache.commons.digester3.spi.Rules;

Modified: commons/sandbox/digester3/trunk/src/main/java/org/apache/commons/digester3/internal/rulesbinder/SetNextBuilderImpl.java
URL: http://svn.apache.org/viewvc/commons/sandbox/digester3/trunk/src/main/java/org/apache/commons/digester3/internal/rulesbinder/SetNextBuilderImpl.java?rev=1069810&r1=1069809&r2=1069810&view=diff
==============================================================================
--- commons/sandbox/digester3/trunk/src/main/java/org/apache/commons/digester3/internal/rulesbinder/SetNextBuilderImpl.java (original)
+++ commons/sandbox/digester3/trunk/src/main/java/org/apache/commons/digester3/internal/rulesbinder/SetNextBuilderImpl.java Fri Feb 11 14:24:57 2011
@@ -17,7 +17,7 @@
  */
 package org.apache.commons.digester3.internal.rulesbinder;
 
-import org.apache.commons.digester3.rule.RulesBinder;
+import org.apache.commons.digester3.RulesBinder;
 import org.apache.commons.digester3.rule.SetNextRule;
 import org.apache.commons.digester3.rulesbinder.SetNextBuilder;
 

Modified: commons/sandbox/digester3/trunk/src/main/java/org/apache/commons/digester3/internal/rulesbinder/SetPropertiesBuilderImpl.java
URL: http://svn.apache.org/viewvc/commons/sandbox/digester3/trunk/src/main/java/org/apache/commons/digester3/internal/rulesbinder/SetPropertiesBuilderImpl.java?rev=1069810&r1=1069809&r2=1069810&view=diff
==============================================================================
--- commons/sandbox/digester3/trunk/src/main/java/org/apache/commons/digester3/internal/rulesbinder/SetPropertiesBuilderImpl.java (original)
+++ commons/sandbox/digester3/trunk/src/main/java/org/apache/commons/digester3/internal/rulesbinder/SetPropertiesBuilderImpl.java Fri Feb 11 14:24:57 2011
@@ -20,7 +20,7 @@ package org.apache.commons.digester3.int
 import java.util.HashMap;
 import java.util.Map;
 
-import org.apache.commons.digester3.rule.RulesBinder;
+import org.apache.commons.digester3.RulesBinder;
 import org.apache.commons.digester3.rule.SetPropertiesRule;
 import org.apache.commons.digester3.rulesbinder.SetPropertiesBuilder;
 

Modified: commons/sandbox/digester3/trunk/src/main/java/org/apache/commons/digester3/internal/rulesbinder/SetPropertyBuilderImpl.java
URL: http://svn.apache.org/viewvc/commons/sandbox/digester3/trunk/src/main/java/org/apache/commons/digester3/internal/rulesbinder/SetPropertyBuilderImpl.java?rev=1069810&r1=1069809&r2=1069810&view=diff
==============================================================================
--- commons/sandbox/digester3/trunk/src/main/java/org/apache/commons/digester3/internal/rulesbinder/SetPropertyBuilderImpl.java (original)
+++ commons/sandbox/digester3/trunk/src/main/java/org/apache/commons/digester3/internal/rulesbinder/SetPropertyBuilderImpl.java Fri Feb 11 14:24:57 2011
@@ -17,7 +17,7 @@
  */
 package org.apache.commons.digester3.internal.rulesbinder;
 
-import org.apache.commons.digester3.rule.RulesBinder;
+import org.apache.commons.digester3.RulesBinder;
 import org.apache.commons.digester3.rule.SetPropertyRule;
 import org.apache.commons.digester3.rulesbinder.SetPropertyBuilder;
 

Modified: commons/sandbox/digester3/trunk/src/main/java/org/apache/commons/digester3/internal/rulesbinder/SetRootBuilderImpl.java
URL: http://svn.apache.org/viewvc/commons/sandbox/digester3/trunk/src/main/java/org/apache/commons/digester3/internal/rulesbinder/SetRootBuilderImpl.java?rev=1069810&r1=1069809&r2=1069810&view=diff
==============================================================================
--- commons/sandbox/digester3/trunk/src/main/java/org/apache/commons/digester3/internal/rulesbinder/SetRootBuilderImpl.java (original)
+++ commons/sandbox/digester3/trunk/src/main/java/org/apache/commons/digester3/internal/rulesbinder/SetRootBuilderImpl.java Fri Feb 11 14:24:57 2011
@@ -17,7 +17,7 @@
  */
 package org.apache.commons.digester3.internal.rulesbinder;
 
-import org.apache.commons.digester3.rule.RulesBinder;
+import org.apache.commons.digester3.RulesBinder;
 import org.apache.commons.digester3.rule.SetRootRule;
 import org.apache.commons.digester3.rulesbinder.SetRootBuilder;
 

Modified: commons/sandbox/digester3/trunk/src/main/java/org/apache/commons/digester3/internal/rulesbinder/SetTopBuilderImpl.java
URL: http://svn.apache.org/viewvc/commons/sandbox/digester3/trunk/src/main/java/org/apache/commons/digester3/internal/rulesbinder/SetTopBuilderImpl.java?rev=1069810&r1=1069809&r2=1069810&view=diff
==============================================================================
--- commons/sandbox/digester3/trunk/src/main/java/org/apache/commons/digester3/internal/rulesbinder/SetTopBuilderImpl.java (original)
+++ commons/sandbox/digester3/trunk/src/main/java/org/apache/commons/digester3/internal/rulesbinder/SetTopBuilderImpl.java Fri Feb 11 14:24:57 2011
@@ -17,7 +17,7 @@
  */
 package org.apache.commons.digester3.internal.rulesbinder;
 
-import org.apache.commons.digester3.rule.RulesBinder;
+import org.apache.commons.digester3.RulesBinder;
 import org.apache.commons.digester3.rule.SetTopRule;
 import org.apache.commons.digester3.rulesbinder.SetTopBuilder;
 

Modified: commons/sandbox/digester3/trunk/src/main/java/org/apache/commons/digester3/spi/ObjectCreationFactory.java
URL: http://svn.apache.org/viewvc/commons/sandbox/digester3/trunk/src/main/java/org/apache/commons/digester3/spi/ObjectCreationFactory.java?rev=1069810&r1=1069809&r2=1069810&view=diff
==============================================================================
--- commons/sandbox/digester3/trunk/src/main/java/org/apache/commons/digester3/spi/ObjectCreationFactory.java (original)
+++ commons/sandbox/digester3/trunk/src/main/java/org/apache/commons/digester3/spi/ObjectCreationFactory.java Fri Feb 11 14:24:57 2011
@@ -23,7 +23,7 @@ import org.xml.sax.Attributes;
 
 /**
  * Interface for use with {@link FactoryCreateRule}.
- * The rule calls {@link org.apache.commons.digester3.rule.RulesBinder#createObject} to create an object
+ * The rule calls {@link org.apache.commons.digester3.RulesBinder#createObject} to create an object
  * to be pushed onto the {@code Digester} stack whenever it is matched.
  */
 public interface ObjectCreationFactory<T> {

Modified: commons/sandbox/digester3/trunk/src/test/java/org/apache/commons/digester3/AbstractTestCase.java
URL: http://svn.apache.org/viewvc/commons/sandbox/digester3/trunk/src/test/java/org/apache/commons/digester3/AbstractTestCase.java?rev=1069810&r1=1069809&r2=1069810&view=diff
==============================================================================
--- commons/sandbox/digester3/trunk/src/test/java/org/apache/commons/digester3/AbstractTestCase.java (original)
+++ commons/sandbox/digester3/trunk/src/test/java/org/apache/commons/digester3/AbstractTestCase.java Fri Feb 11 14:24:57 2011
@@ -22,7 +22,6 @@ import static org.apache.commons.digeste
 import java.io.IOException;
 import java.io.InputStream;
 
-import org.apache.commons.digester3.rule.RulesModule;
 
 /**
  * Define some common utility methods shared between Digester tests.

Modified: commons/sandbox/digester3/trunk/src/test/java/org/apache/commons/digester3/BeanPropertySetterRuleTestCase.java
URL: http://svn.apache.org/viewvc/commons/sandbox/digester3/trunk/src/test/java/org/apache/commons/digester3/BeanPropertySetterRuleTestCase.java?rev=1069810&r1=1069809&r2=1069810&view=diff
==============================================================================
--- commons/sandbox/digester3/trunk/src/test/java/org/apache/commons/digester3/BeanPropertySetterRuleTestCase.java (original)
+++ commons/sandbox/digester3/trunk/src/test/java/org/apache/commons/digester3/BeanPropertySetterRuleTestCase.java Fri Feb 11 14:24:57 2011
@@ -30,7 +30,6 @@ import java.lang.reflect.InvocationTarge
 import java.util.ArrayList;
 import java.util.List;
 
-import org.apache.commons.digester3.rule.AbstractRulesModule;
 import org.apache.commons.digester3.rules.ExtendedBaseRules;
 import org.junit.Test;
 import org.xml.sax.SAXException;

Modified: commons/sandbox/digester3/trunk/src/test/java/org/apache/commons/digester3/DigesterTestCase.java
URL: http://svn.apache.org/viewvc/commons/sandbox/digester3/trunk/src/test/java/org/apache/commons/digester3/DigesterTestCase.java?rev=1069810&r1=1069809&r2=1069810&view=diff
==============================================================================
--- commons/sandbox/digester3/trunk/src/test/java/org/apache/commons/digester3/DigesterTestCase.java (original)
+++ commons/sandbox/digester3/trunk/src/test/java/org/apache/commons/digester3/DigesterTestCase.java Fri Feb 11 14:24:57 2011
@@ -34,7 +34,6 @@ import java.net.URL;
 import java.util.EmptyStackException;
 import java.util.Map;
 
-import org.apache.commons.digester3.rule.AbstractRulesModule;
 import org.apache.commons.digester3.spi.Substitutor;
 import org.junit.Test;
 import org.xml.sax.Attributes;

Modified: commons/sandbox/digester3/trunk/src/test/java/org/apache/commons/digester3/EmployeeModule.java
URL: http://svn.apache.org/viewvc/commons/sandbox/digester3/trunk/src/test/java/org/apache/commons/digester3/EmployeeModule.java?rev=1069810&r1=1069809&r2=1069810&view=diff
==============================================================================
--- commons/sandbox/digester3/trunk/src/test/java/org/apache/commons/digester3/EmployeeModule.java (original)
+++ commons/sandbox/digester3/trunk/src/test/java/org/apache/commons/digester3/EmployeeModule.java Fri Feb 11 14:24:57 2011
@@ -17,7 +17,6 @@
  */
 package org.apache.commons.digester3;
 
-import org.apache.commons.digester3.rule.AbstractRulesModule;
 
 /**
  * Shared module that contains rules for parsing Employee/Address entities.

Modified: commons/sandbox/digester3/trunk/src/test/java/org/apache/commons/digester3/NamespaceSnapshotTestCase.java
URL: http://svn.apache.org/viewvc/commons/sandbox/digester3/trunk/src/test/java/org/apache/commons/digester3/NamespaceSnapshotTestCase.java?rev=1069810&r1=1069809&r2=1069810&view=diff
==============================================================================
--- commons/sandbox/digester3/trunk/src/test/java/org/apache/commons/digester3/NamespaceSnapshotTestCase.java (original)
+++ commons/sandbox/digester3/trunk/src/test/java/org/apache/commons/digester3/NamespaceSnapshotTestCase.java Fri Feb 11 14:24:57 2011
@@ -24,7 +24,6 @@ import static org.junit.Assert.assertNot
 import java.util.List;
 import java.util.Map;
 
-import org.apache.commons.digester3.rule.AbstractRulesModule;
 import org.junit.Test;
 import org.xml.sax.Attributes;
 

Modified: commons/sandbox/digester3/trunk/src/test/java/org/apache/commons/digester3/ObjectParamRuleTestCase.java
URL: http://svn.apache.org/viewvc/commons/sandbox/digester3/trunk/src/test/java/org/apache/commons/digester3/ObjectParamRuleTestCase.java?rev=1069810&r1=1069809&r2=1069810&view=diff
==============================================================================
--- commons/sandbox/digester3/trunk/src/test/java/org/apache/commons/digester3/ObjectParamRuleTestCase.java (original)
+++ commons/sandbox/digester3/trunk/src/test/java/org/apache/commons/digester3/ObjectParamRuleTestCase.java Fri Feb 11 14:24:57 2011
@@ -25,7 +25,6 @@ import java.io.IOException;
 import java.io.StringReader;
 import java.util.ArrayList;
 
-import org.apache.commons.digester3.rule.AbstractRulesModule;
 import org.junit.Test;
 import org.xml.sax.SAXException;
 

Modified: commons/sandbox/digester3/trunk/src/test/java/org/apache/commons/digester3/SetNestedPropertiesRuleTestCase.java
URL: http://svn.apache.org/viewvc/commons/sandbox/digester3/trunk/src/test/java/org/apache/commons/digester3/SetNestedPropertiesRuleTestCase.java?rev=1069810&r1=1069809&r2=1069810&view=diff
==============================================================================
--- commons/sandbox/digester3/trunk/src/test/java/org/apache/commons/digester3/SetNestedPropertiesRuleTestCase.java (original)
+++ commons/sandbox/digester3/trunk/src/test/java/org/apache/commons/digester3/SetNestedPropertiesRuleTestCase.java Fri Feb 11 14:24:57 2011
@@ -25,7 +25,6 @@ import java.io.IOException;
 import java.io.Reader;
 import java.io.StringReader;
 
-import org.apache.commons.digester3.rule.AbstractRulesModule;
 import org.apache.commons.digester3.rules.BaseRules;
 import org.junit.Test;
 import org.xml.sax.SAXException;

Modified: commons/sandbox/digester3/trunk/src/test/java/org/apache/commons/digester3/SetPropertiesRuleTestCase.java
URL: http://svn.apache.org/viewvc/commons/sandbox/digester3/trunk/src/test/java/org/apache/commons/digester3/SetPropertiesRuleTestCase.java?rev=1069810&r1=1069809&r2=1069810&view=diff
==============================================================================
--- commons/sandbox/digester3/trunk/src/test/java/org/apache/commons/digester3/SetPropertiesRuleTestCase.java (original)
+++ commons/sandbox/digester3/trunk/src/test/java/org/apache/commons/digester3/SetPropertiesRuleTestCase.java Fri Feb 11 14:24:57 2011
@@ -25,7 +25,6 @@ import static org.junit.Assert.fail;
 import java.io.Reader;
 import java.io.StringReader;
 
-import org.apache.commons.digester3.rule.AbstractRulesModule;
 import org.junit.Test;
 import org.xml.sax.SAXException;
 

Modified: commons/sandbox/digester3/trunk/src/test/java/org/apache/commons/digester3/SetPropertyRuleTestCase.java
URL: http://svn.apache.org/viewvc/commons/sandbox/digester3/trunk/src/test/java/org/apache/commons/digester3/SetPropertyRuleTestCase.java?rev=1069810&r1=1069809&r2=1069810&view=diff
==============================================================================
--- commons/sandbox/digester3/trunk/src/test/java/org/apache/commons/digester3/SetPropertyRuleTestCase.java (original)
+++ commons/sandbox/digester3/trunk/src/test/java/org/apache/commons/digester3/SetPropertyRuleTestCase.java Fri Feb 11 14:24:57 2011
@@ -26,7 +26,6 @@ import java.io.Reader;
 import java.io.StringReader;
 import java.lang.reflect.InvocationTargetException;
 
-import org.apache.commons.digester3.rule.AbstractRulesModule;
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;

Modified: commons/sandbox/digester3/trunk/src/test/java/org/apache/commons/digester3/TestFactoryCreate.java
URL: http://svn.apache.org/viewvc/commons/sandbox/digester3/trunk/src/test/java/org/apache/commons/digester3/TestFactoryCreate.java?rev=1069810&r1=1069809&r2=1069810&view=diff
==============================================================================
--- commons/sandbox/digester3/trunk/src/test/java/org/apache/commons/digester3/TestFactoryCreate.java (original)
+++ commons/sandbox/digester3/trunk/src/test/java/org/apache/commons/digester3/TestFactoryCreate.java Fri Feb 11 14:24:57 2011
@@ -27,7 +27,6 @@ import java.util.Collection;
 import java.util.List;
 
 import org.apache.commons.digester3.rule.AbstractObjectCreationFactory;
-import org.apache.commons.digester3.rule.AbstractRulesModule;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.junit.runners.Parameterized;

Modified: commons/sandbox/digester3/trunk/src/test/java/org/apache/commons/digester3/URLTestCase.java
URL: http://svn.apache.org/viewvc/commons/sandbox/digester3/trunk/src/test/java/org/apache/commons/digester3/URLTestCase.java?rev=1069810&r1=1069809&r2=1069810&view=diff
==============================================================================
--- commons/sandbox/digester3/trunk/src/test/java/org/apache/commons/digester3/URLTestCase.java (original)
+++ commons/sandbox/digester3/trunk/src/test/java/org/apache/commons/digester3/URLTestCase.java Fri Feb 11 14:24:57 2011
@@ -21,8 +21,6 @@ import static org.junit.Assert.assertNot
 
 import java.net.URL;
 
-import org.apache.commons.digester3.rule.RulesBinder;
-import org.apache.commons.digester3.rule.RulesModule;
 import org.junit.Test;
 
 /**

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=1069810&r1=1069809&r2=1069810&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 Fri Feb 11 14:24:57 2011
@@ -27,11 +27,11 @@ import java.io.StringReader;
 import java.util.HashMap;
 import java.util.LinkedList;
 
+import org.apache.commons.digester3.AbstractRulesModule;
 import org.apache.commons.digester3.Digester;
+import org.apache.commons.digester3.RulesBinder;
+import org.apache.commons.digester3.RulesModule;
 import org.apache.commons.digester3.SimpleTestBean;
-import org.apache.commons.digester3.rule.AbstractRulesModule;
-import org.apache.commons.digester3.rule.RulesBinder;
-import org.apache.commons.digester3.rule.RulesModule;
 import org.junit.Test;
 import org.xml.sax.SAXException;