You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by hb...@apache.org on 2013/11/02 18:41:05 UTC

svn commit: r1538241 - in /maven/sandbox/trunk/dist-tools/dist-tool-plugin/src/main: java/org/apache/maven/dist/tools/AbstractDistCheckMojo.java resources/db/ resources/dist-tool.conf

Author: hboutemy
Date: Sat Nov  2 17:41:04 2013
New Revision: 1538241

URL: http://svn.apache.org/r1538241
Log:
renamed mavendb.txt to dist-tool.conf

Added:
    maven/sandbox/trunk/dist-tools/dist-tool-plugin/src/main/resources/dist-tool.conf
      - copied unchanged from r1538210, maven/sandbox/trunk/dist-tools/dist-tool-plugin/src/main/resources/db/mavendb.txt
Removed:
    maven/sandbox/trunk/dist-tools/dist-tool-plugin/src/main/resources/db/
Modified:
    maven/sandbox/trunk/dist-tools/dist-tool-plugin/src/main/java/org/apache/maven/dist/tools/AbstractDistCheckMojo.java

Modified: maven/sandbox/trunk/dist-tools/dist-tool-plugin/src/main/java/org/apache/maven/dist/tools/AbstractDistCheckMojo.java
URL: http://svn.apache.org/viewvc/maven/sandbox/trunk/dist-tools/dist-tool-plugin/src/main/java/org/apache/maven/dist/tools/AbstractDistCheckMojo.java?rev=1538241&r1=1538240&r2=1538241&view=diff
==============================================================================
--- maven/sandbox/trunk/dist-tools/dist-tool-plugin/src/main/java/org/apache/maven/dist/tools/AbstractDistCheckMojo.java (original)
+++ maven/sandbox/trunk/dist-tools/dist-tool-plugin/src/main/java/org/apache/maven/dist/tools/AbstractDistCheckMojo.java Sat Nov  2 17:41:04 2013
@@ -58,7 +58,7 @@ import org.codehaus.plexus.util.xml.pull
 public abstract class AbstractDistCheckMojo
     extends AbstractMavenReport
 {
-    private static final String MAVEN_DB = "db/mavendb.txt";
+    private static final String CONF = "dist-tool.conf";
 
     private static final String EOL = System.getProperty( "line.separator" );
 
@@ -138,11 +138,11 @@ public abstract class AbstractDistCheckM
         return project;
     }
 
-    private void loadMavenDb()
+    private void loadConfiguration()
         throws MojoExecutionException
     {
-        URL mavenDb = Thread.currentThread().getContextClassLoader().getResource( MAVEN_DB );
-        try ( BufferedReader in = new BufferedReader( new InputStreamReader( mavenDb.openStream() ) ) )
+        URL configuration = Thread.currentThread().getContextClassLoader().getResource( CONF );
+        try ( BufferedReader in = new BufferedReader( new InputStreamReader( configuration.openStream() ) ) )
         {
             String text;
             while ( ( text = in.readLine() ) != null )
@@ -152,7 +152,7 @@ public abstract class AbstractDistCheckM
         }
         catch ( IOException e )
         {
-            throw new MojoExecutionException( "error while reading " + mavenDb, e );
+            throw new MojoExecutionException( "error while reading " + configuration, e );
         }
     }
 
@@ -172,7 +172,7 @@ public abstract class AbstractDistCheckM
 
         if ( configurationLines.isEmpty() )
         {
-            loadMavenDb();
+            loadConfiguration();
         }
 
         File failures = getFailuresFile();