svn commit: r571677 - in /maven/enforcer/trunk/maven-enforcer-plugin: ./ src/test/java/org/apache/maven/plugin/ src/test/java/org/apache/maven/plugins/ src/test/java/org/apache/maven/plugins/enforcer/

[brianf]

Author: brianf
Date: Fri Aug 31 20:30:08 2007
New Revision: 571677

URL: http://svn.apache.org/viewvc?rev=571677&view=rev
Log:
more refactor

Added:
    
maven/enforcer/trunk/maven-enforcer-plugin/src/test/java/org/apache/maven/plugins/
      - copied from r571670, 
maven/enforcer/trunk/maven-enforcer-plugin/src/test/java/org/apache/maven/plugin/
Removed:
    
maven/enforcer/trunk/maven-enforcer-plugin/src/test/java/org/apache/maven/plugin/
    
maven/enforcer/trunk/maven-enforcer-plugin/src/test/java/org/apache/maven/plugins/enforcer/EnforcerTestUtils.java
    
maven/enforcer/trunk/maven-enforcer-plugin/src/test/java/org/apache/maven/plugins/enforcer/MockPathTranslator.java
    
maven/enforcer/trunk/maven-enforcer-plugin/src/test/java/org/apache/maven/plugins/enforcer/MockPlexusContainer.java
    
maven/enforcer/trunk/maven-enforcer-plugin/src/test/java/org/apache/maven/plugins/enforcer/MockProject.java
    
maven/enforcer/trunk/maven-enforcer-plugin/src/test/java/org/apache/maven/plugins/enforcer/MockRuntimeInformation.java
    
maven/enforcer/trunk/maven-enforcer-plugin/src/test/java/org/apache/maven/plugins/enforcer/TestAbstractVersionEnforcer.java
    
maven/enforcer/trunk/maven-enforcer-plugin/src/test/java/org/apache/maven/plugins/enforcer/TestBannedDependencies.java
    
maven/enforcer/trunk/maven-enforcer-plugin/src/test/java/org/apache/maven/plugins/enforcer/TestEvaluateBeanshell.java
    
maven/enforcer/trunk/maven-enforcer-plugin/src/test/java/org/apache/maven/plugins/enforcer/TestMavenVersion.java
    
maven/enforcer/trunk/maven-enforcer-plugin/src/test/java/org/apache/maven/plugins/enforcer/TestNoSnapshots.java
    
maven/enforcer/trunk/maven-enforcer-plugin/src/test/java/org/apache/maven/plugins/enforcer/TestRequireJavaVersion.java
    
maven/enforcer/trunk/maven-enforcer-plugin/src/test/java/org/apache/maven/plugins/enforcer/TestRequireOS.java
    
maven/enforcer/trunk/maven-enforcer-plugin/src/test/java/org/apache/maven/plugins/enforcer/TestRequirePluginVersions.java
    
maven/enforcer/trunk/maven-enforcer-plugin/src/test/java/org/apache/maven/plugins/enforcer/TestRequireProperty.java
Modified:
    maven/enforcer/trunk/maven-enforcer-plugin/pom.xml
    
maven/enforcer/trunk/maven-enforcer-plugin/src/test/java/org/apache/maven/plugins/enforcer/MockEnforcerRule.java
    
maven/enforcer/trunk/maven-enforcer-plugin/src/test/java/org/apache/maven/plugins/enforcer/TestDefaultEnforcementRuleHelper.java
    
maven/enforcer/trunk/maven-enforcer-plugin/src/test/java/org/apache/maven/plugins/enforcer/TestEnforceMojo.java

Modified: maven/enforcer/trunk/maven-enforcer-plugin/pom.xml
URL: 
http://svn.apache.org/viewvc/maven/enforcer/trunk/maven-enforcer-plugin/pom.xml?rev=571677&r1=571676&r2=571677&view=diff
==============================================================================
--- maven/enforcer/trunk/maven-enforcer-plugin/pom.xml (original)
+++ maven/enforcer/trunk/maven-enforcer-plugin/pom.xml Fri Aug 31 20:30:08 2007
@@ -123,8 +123,20 @@
         </dependency>
         <dependency>
             <groupId>org.apache.maven.enforcer</groupId>
-            <artifactId>maven-enforcer-rule-api</artifactId>
+            <artifactId>enforcer-api</artifactId>
                        <version>1.0-alpha-3-SNAPSHOT</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.maven.enforcer</groupId>
+            <artifactId>enforcer-rules</artifactId>
+                       <version>1.0-SNAPSHOT</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.maven.enforcer</groupId>
+            <artifactId>enforcer-rules</artifactId>
+            <version>1.0-SNAPSHOT</version>
+            <classifier>tests</classifier>
+            <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>org.beanshell</groupId>

Modified: 
maven/enforcer/trunk/maven-enforcer-plugin/src/test/java/org/apache/maven/plugins/enforcer/MockEnforcerRule.java
URL: 
http://svn.apache.org/viewvc/maven/enforcer/trunk/maven-enforcer-plugin/src/test/java/org/apache/maven/plugins/enforcer/MockEnforcerRule.java?rev=571677&r1=571670&r2=571677&view=diff
==============================================================================
--- 
maven/enforcer/trunk/maven-enforcer-plugin/src/test/java/org/apache/maven/plugins/enforcer/MockEnforcerRule.java
 (original)
+++ 
maven/enforcer/trunk/maven-enforcer-plugin/src/test/java/org/apache/maven/plugins/enforcer/MockEnforcerRule.java
 Fri Aug 31 20:30:08 2007
@@ -1,4 +1,4 @@
-package org.apache.maven.plugin.enforcer;
+package org.apache.maven.plugins.enforcer;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
@@ -19,9 +19,9 @@
  * under the License.
  */
 
-import org.apache.maven.shared.enforcer.rule.api.EnforcerRule;
-import org.apache.maven.shared.enforcer.rule.api.EnforcerRuleException;
-import org.apache.maven.shared.enforcer.rule.api.EnforcerRuleHelper;
+import org.apache.maven.enforcer.rule.api.EnforcerRule;
+import org.apache.maven.enforcer.rule.api.EnforcerRuleException;
+import org.apache.maven.enforcer.rule.api.EnforcerRuleHelper;
 
 /**
  * @author <a href="mailto:[EMAIL PROTECTED]">Brian Fox</a>

Modified: 
maven/enforcer/trunk/maven-enforcer-plugin/src/test/java/org/apache/maven/plugins/enforcer/TestDefaultEnforcementRuleHelper.java
URL: 
http://svn.apache.org/viewvc/maven/enforcer/trunk/maven-enforcer-plugin/src/test/java/org/apache/maven/plugins/enforcer/TestDefaultEnforcementRuleHelper.java?rev=571677&r1=571670&r2=571677&view=diff
==============================================================================
--- 
maven/enforcer/trunk/maven-enforcer-plugin/src/test/java/org/apache/maven/plugins/enforcer/TestDefaultEnforcementRuleHelper.java
 (original)
+++ 
maven/enforcer/trunk/maven-enforcer-plugin/src/test/java/org/apache/maven/plugins/enforcer/TestDefaultEnforcementRuleHelper.java
 Fri Aug 31 20:30:08 2007
@@ -1,4 +1,4 @@
-package org.apache.maven.plugin.enforcer;
+package org.apache.maven.plugins.enforcer;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one

Modified: 
maven/enforcer/trunk/maven-enforcer-plugin/src/test/java/org/apache/maven/plugins/enforcer/TestEnforceMojo.java
URL: 
http://svn.apache.org/viewvc/maven/enforcer/trunk/maven-enforcer-plugin/src/test/java/org/apache/maven/plugins/enforcer/TestEnforceMojo.java?rev=571677&r1=571670&r2=571677&view=diff
==============================================================================
--- 
maven/enforcer/trunk/maven-enforcer-plugin/src/test/java/org/apache/maven/plugins/enforcer/TestEnforceMojo.java
 (original)
+++ 
maven/enforcer/trunk/maven-enforcer-plugin/src/test/java/org/apache/maven/plugins/enforcer/TestEnforceMojo.java
 Fri Aug 31 20:30:08 2007
@@ -1,4 +1,4 @@
-package org.apache.maven.plugin.enforcer;
+package org.apache.maven.plugins.enforcer;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
@@ -21,8 +21,8 @@
 
 import junit.framework.TestCase;
 
+import org.apache.maven.enforcer.rule.api.EnforcerRule;
 import org.apache.maven.plugin.MojoExecutionException;
-import org.apache.maven.shared.enforcer.rule.api.EnforcerRule;
 
 /**
  * Exhaustively check the enforcer mojo.