Author: brianf
Date: Fri Aug 31 18:59:22 2007
New Revision: 571669
URL: http://svn.apache.org/viewvc?rev=571669&view=rev
Log:
more refactor
Added:
maven/enforcer/trunk/enforcer-api/
- copied from r571655, maven/enforcer/trunk/maven-enforcer-rule-api/
maven/enforcer/trunk/enforcer-api/pom.xml
- copied, changed from r571667,
maven/enforcer/trunk/maven-enforcer-rule-api/pom.xml
Removed:
maven/enforcer/trunk/maven-enforcer-rule-api/
Modified:
maven/enforcer/trunk/enforcer-api/src/custom-rule-sample/pom.xml
maven/enforcer/trunk/enforcer-api/src/custom-rule-sample/src/main/java/org/apache/maven/shared/rule/myCustomRule.java
maven/enforcer/trunk/enforcer-api/src/custom-rule-sample/src/usage-pom.xml
maven/enforcer/trunk/enforcer-api/src/custom-rule-sample/usage-pom.xml
maven/enforcer/trunk/enforcer-api/src/site/resources/custom-rule.zip
maven/enforcer/trunk/pom.xml
Copied: maven/enforcer/trunk/enforcer-api/pom.xml (from r571667,
maven/enforcer/trunk/maven-enforcer-rule-api/pom.xml)
URL:
http://svn.apache.org/viewvc/maven/enforcer/trunk/enforcer-api/pom.xml?p2=maven/enforcer/trunk/enforcer-api/pom.xml&p1=maven/enforcer/trunk/maven-enforcer-rule-api/pom.xml&r1=571667&r2=571669&rev=571669&view=diff
==============================================================================
--- maven/enforcer/trunk/maven-enforcer-rule-api/pom.xml (original)
+++ maven/enforcer/trunk/enforcer-api/pom.xml Fri Aug 31 18:59:22 2007
@@ -26,11 +26,11 @@
<version>1-SNAPSHOT</version>
</parent>
- <artifactId>maven-enforcer-rule-api</artifactId>
+ <artifactId>enforcer-api</artifactId>
<packaging>jar</packaging>
<version>1.0-alpha-3-SNAPSHOT</version>
- <name>Maven Enforcer Rule API</name>
+ <name>Enforcer API</name>
<description>This component provides the generic interfaces needed to
implement custom rules for the maven-enforcer-plugin.</description>
<build>
<plugins>
Modified: maven/enforcer/trunk/enforcer-api/src/custom-rule-sample/pom.xml
URL:
http://svn.apache.org/viewvc/maven/enforcer/trunk/enforcer-api/src/custom-rule-sample/pom.xml?rev=571669&r1=571655&r2=571669&view=diff
==============================================================================
--- maven/enforcer/trunk/enforcer-api/src/custom-rule-sample/pom.xml (original)
+++ maven/enforcer/trunk/enforcer-api/src/custom-rule-sample/pom.xml Fri Aug 31
18:59:22 2007
@@ -11,9 +11,9 @@
</build>
<dependencies>
<dependency>
- <groupId>org.apache.maven.shared</groupId>
- <artifactId>maven-enforcer-rule-api</artifactId>
- <version>1.0-alpha-1</version>
+ <groupId>org.apache.maven.enforcer</groupId>
+ <artifactId>enforcer-api</artifactId>
+ <version>1.0-alpha-3</version>
</dependency>
<dependency>
<groupId>org.apache.maven</groupId>
Modified:
maven/enforcer/trunk/enforcer-api/src/custom-rule-sample/src/main/java/org/apache/maven/shared/rule/myCustomRule.java
URL:
http://svn.apache.org/viewvc/maven/enforcer/trunk/enforcer-api/src/custom-rule-sample/src/main/java/org/apache/maven/shared/rule/myCustomRule.java?rev=571669&r1=571655&r2=571669&view=diff
==============================================================================
---
maven/enforcer/trunk/enforcer-api/src/custom-rule-sample/src/main/java/org/apache/maven/shared/rule/myCustomRule.java
(original)
+++
maven/enforcer/trunk/enforcer-api/src/custom-rule-sample/src/main/java/org/apache/maven/shared/rule/myCustomRule.java
Fri Aug 31 18:59:22 2007
@@ -1,4 +1,4 @@
-package org.apache.maven.shared.rule;
+package org.apache.maven.enforcer.rule;
import java.io.File;
@@ -7,9 +7,9 @@
import org.apache.maven.execution.RuntimeInformation;
import org.apache.maven.plugin.logging.Log;
import org.apache.maven.project.MavenProject;
-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;
import
org.codehaus.plexus.component.configurator.expression.ExpressionEvaluationException;
import
org.codehaus.plexus.component.repository.exception.ComponentLookupException;
Modified:
maven/enforcer/trunk/enforcer-api/src/custom-rule-sample/src/usage-pom.xml
URL:
http://svn.apache.org/viewvc/maven/enforcer/trunk/enforcer-api/src/custom-rule-sample/src/usage-pom.xml?rev=571669&r1=571655&r2=571669&view=diff
==============================================================================
--- maven/enforcer/trunk/enforcer-api/src/custom-rule-sample/src/usage-pom.xml
(original)
+++ maven/enforcer/trunk/enforcer-api/src/custom-rule-sample/src/usage-pom.xml
Fri Aug 31 18:59:22 2007
@@ -27,13 +27,13 @@
<requireMavenVersion>
<version>2.0.6</version>
</requireMavenVersion>
- <myCustomRule
implementation="org.apache.maven.shared.rule.myCustomRule">
+ <myCustomRule
implementation="org.apache.maven.enforcer.rule.myCustomRule">
<shouldIfail>false</shouldIfail>
</myCustomRule>
</rules>
</configuration>
<goals>
-
<goal>enforce-once</goal>
+ <goal>enforce</goal>
</goals>
</execution>
</executions>
Modified: maven/enforcer/trunk/enforcer-api/src/custom-rule-sample/usage-pom.xml
URL:
http://svn.apache.org/viewvc/maven/enforcer/trunk/enforcer-api/src/custom-rule-sample/usage-pom.xml?rev=571669&r1=571655&r2=571669&view=diff
==============================================================================
--- maven/enforcer/trunk/enforcer-api/src/custom-rule-sample/usage-pom.xml
(original)
+++ maven/enforcer/trunk/enforcer-api/src/custom-rule-sample/usage-pom.xml Fri
Aug 31 18:59:22 2007
@@ -33,7 +33,7 @@
</rules>
</configuration>
<goals>
-
<goal>enforce-once</goal>
+ <goal>enforce</goal>
</goals>
</execution>
</executions>
Modified: maven/enforcer/trunk/enforcer-api/src/site/resources/custom-rule.zip
URL:
http://svn.apache.org/viewvc/maven/enforcer/trunk/enforcer-api/src/site/resources/custom-rule.zip?rev=571669&r1=571655&r2=571669&view=diff
==============================================================================
Binary files - no diff available.
Modified: maven/enforcer/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/maven/enforcer/trunk/pom.xml?rev=571669&r1=571668&r2=571669&view=diff
==============================================================================
--- maven/enforcer/trunk/pom.xml (original)
+++ maven/enforcer/trunk/pom.xml Fri Aug 31 18:59:22 2007
@@ -151,7 +151,8 @@
</repositories>
<modules>
- <module>maven-enforcer-rule-api</module>
+ <module>enforcer-api</module>
+ <module>enforcer-rules</module>
<module>maven-enforcer-plugin</module>
</modules>
