svn commit: r519021 - in /maven/plugins/trunk/maven-pmd-plugin: ./ src/main/java/org/apache/maven/plugin/pmd/ src/test/java/org/apache/maven/plugin/pmd/stubs/

[dkulp]

Author: dkulp
Date: Fri Mar 16 08:56:16 2007
New Revision: 519021

URL: http://svn.apache.org/viewvc?view=rev&rev=519021
Log:
Fixes for URL usage for ruleset locations

Modified:
    maven/plugins/trunk/maven-pmd-plugin/   (props changed)
    maven/plugins/trunk/maven-pmd-plugin/pom.xml
    
maven/plugins/trunk/maven-pmd-plugin/src/main/java/org/apache/maven/plugin/pmd/PmdReport.java
    
maven/plugins/trunk/maven-pmd-plugin/src/test/java/org/apache/maven/plugin/pmd/stubs/CustomConfigurationMavenProjectStub.java
    
maven/plugins/trunk/maven-pmd-plugin/src/test/java/org/apache/maven/plugin/pmd/stubs/DefaultConfigurationMavenProjectStub.java
    
maven/plugins/trunk/maven-pmd-plugin/src/test/java/org/apache/maven/plugin/pmd/stubs/InvalidFormatMavenProjectStub.java

Propchange: maven/plugins/trunk/maven-pmd-plugin/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Fri Mar 16 08:56:16 2007
@@ -5,3 +5,4 @@
 .wtpmodules
 .classpath
 .project
+.settings

Modified: maven/plugins/trunk/maven-pmd-plugin/pom.xml
URL: 
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-pmd-plugin/pom.xml?view=diff&rev=519021&r1=519020&r2=519021
==============================================================================
--- maven/plugins/trunk/maven-pmd-plugin/pom.xml (original)
+++ maven/plugins/trunk/maven-pmd-plugin/pom.xml Fri Mar 16 08:56:16 2007
@@ -28,7 +28,7 @@
   <artifactId>maven-pmd-plugin</artifactId>
   <packaging>maven-plugin</packaging>
   <name>Maven PMD Plugin</name>
-  <version>2.3-SNAPSHOT</version>
+  <version>2.2-SNAPSHOT</version>
   <inceptionYear>2005</inceptionYear>
   <issueManagement>
     <system>JIRA</system>

Modified: 
maven/plugins/trunk/maven-pmd-plugin/src/main/java/org/apache/maven/plugin/pmd/PmdReport.java
URL: 
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-pmd-plugin/src/main/java/org/apache/maven/plugin/pmd/PmdReport.java?view=diff&rev=519021&r1=519020&r2=519021
==============================================================================
--- 
maven/plugins/trunk/maven-pmd-plugin/src/main/java/org/apache/maven/plugin/pmd/PmdReport.java
 (original)
+++ 
maven/plugins/trunk/maven-pmd-plugin/src/main/java/org/apache/maven/plugin/pmd/PmdReport.java
 Fri Mar 16 08:56:16 2007
@@ -55,6 +55,7 @@
 import org.codehaus.doxia.sink.Sink;
 import org.codehaus.plexus.resource.ResourceManager;
 import org.codehaus.plexus.resource.loader.FileResourceCreationException;
+import org.codehaus.plexus.resource.loader.FileResourceLoader;
 import org.codehaus.plexus.resource.loader.ResourceNotFoundException;
 import org.codehaus.plexus.util.FileUtils;
 
@@ -132,6 +133,11 @@
     public void executeReport( Locale locale )
         throws MavenReportException
     {
+        //configure ResourceManager
+        locator.addSearchPath( FileResourceLoader.ID, 
project.getFile().getParentFile().getAbsolutePath() );
+        locator.addSearchPath( "url", "" );
+        locator.setOutputDirectory( new File( 
project.getBuild().getDirectory() ) );
+
         if ( !skip && canGenerateReport() )
         {
             ClassLoader origLoader = 
Thread.currentThread().getContextClassLoader();
@@ -291,7 +297,7 @@
             loc = loc.substring( loc.lastIndexOf( '\\' ) + 1 );
         }
         getLog().debug( "Before: " + name + " After: " + loc );
-        return project.getBuild().getDirectory() + File.separator + loc;
+        return loc;
     }
 
     /**

Modified: 
maven/plugins/trunk/maven-pmd-plugin/src/test/java/org/apache/maven/plugin/pmd/stubs/CustomConfigurationMavenProjectStub.java
URL: 
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-pmd-plugin/src/test/java/org/apache/maven/plugin/pmd/stubs/CustomConfigurationMavenProjectStub.java?view=diff&rev=519021&r1=519020&r2=519021
==============================================================================
--- 
maven/plugins/trunk/maven-pmd-plugin/src/test/java/org/apache/maven/plugin/pmd/stubs/CustomConfigurationMavenProjectStub.java
 (original)
+++ 
maven/plugins/trunk/maven-pmd-plugin/src/test/java/org/apache/maven/plugin/pmd/stubs/CustomConfigurationMavenProjectStub.java
 Fri Mar 16 08:56:16 2007
@@ -85,6 +85,7 @@
         artifact.setArtifactHandler( new DefaultArtifactHandlerStub() );
         setArtifact( artifact );
 
+        setFile(new File(getBasedir().getAbsolutePath() + "/pom.xml"));
     }
 
     public void setBuild( Build build )

Modified: 
maven/plugins/trunk/maven-pmd-plugin/src/test/java/org/apache/maven/plugin/pmd/stubs/DefaultConfigurationMavenProjectStub.java
URL: 
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-pmd-plugin/src/test/java/org/apache/maven/plugin/pmd/stubs/DefaultConfigurationMavenProjectStub.java?view=diff&rev=519021&r1=519020&r2=519021
==============================================================================
--- 
maven/plugins/trunk/maven-pmd-plugin/src/test/java/org/apache/maven/plugin/pmd/stubs/DefaultConfigurationMavenProjectStub.java
 (original)
+++ 
maven/plugins/trunk/maven-pmd-plugin/src/test/java/org/apache/maven/plugin/pmd/stubs/DefaultConfigurationMavenProjectStub.java
 Fri Mar 16 08:56:16 2007
@@ -80,6 +80,9 @@
         List compileSourceRoots = new ArrayList();
         compileSourceRoots.add( basedir + 
"/src/test/resources/unit/default-configuration/def/configuration" );
         setCompileSourceRoots( compileSourceRoots );
+        
+        File file = new File(getBasedir().getAbsolutePath() + "/pom.xml");
+        setFile(file);
 
         Artifact artifact = new PmdPluginArtifactStub( getGroupId(), 
getArtifactId(), getVersion(), getPackaging() );
         artifact.setArtifactHandler( new DefaultArtifactHandlerStub() );

Modified: 
maven/plugins/trunk/maven-pmd-plugin/src/test/java/org/apache/maven/plugin/pmd/stubs/InvalidFormatMavenProjectStub.java
URL: 
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-pmd-plugin/src/test/java/org/apache/maven/plugin/pmd/stubs/InvalidFormatMavenProjectStub.java?view=diff&rev=519021&r1=519020&r2=519021
==============================================================================
--- 
maven/plugins/trunk/maven-pmd-plugin/src/test/java/org/apache/maven/plugin/pmd/stubs/InvalidFormatMavenProjectStub.java
 (original)
+++ 
maven/plugins/trunk/maven-pmd-plugin/src/test/java/org/apache/maven/plugin/pmd/stubs/InvalidFormatMavenProjectStub.java
 Fri Mar 16 08:56:16 2007
@@ -80,6 +80,8 @@
         Artifact artifact = new PmdPluginArtifactStub( getGroupId(), 
getArtifactId(), getVersion(), getPackaging() );
         artifact.setArtifactHandler( new DefaultArtifactHandlerStub() );
         setArtifact( artifact );
+        
+        setFile(new File(getBasedir().getAbsolutePath() + "/pom.xml"));
 
     }