svn commit: r881947 - in /maven/plugins/branches/maven-site-plugin-3.x: pom.xml src/it/full-reporting/pom.xml src/main/java/org/apache/maven/plugins/site/DefaultMavenReportExecutor.java

[olamy]

Author: olamy
Date: Wed Nov 18 21:46:32 2009
New Revision: 881947

URL: http://svn.apache.org/viewvc?rev=881947&view=rev
Log:
exclude some artifacts when loading report plugin classloader.

Modified:
    maven/plugins/branches/maven-site-plugin-3.x/pom.xml
    maven/plugins/branches/maven-site-plugin-3.x/src/it/full-reporting/pom.xml
    
maven/plugins/branches/maven-site-plugin-3.x/src/main/java/org/apache/maven/plugins/site/DefaultMavenReportExecutor.java

Modified: maven/plugins/branches/maven-site-plugin-3.x/pom.xml
URL: 
http://svn.apache.org/viewvc/maven/plugins/branches/maven-site-plugin-3.x/pom.xml?rev=881947&r1=881946&r2=881947&view=diff
==============================================================================
--- maven/plugins/branches/maven-site-plugin-3.x/pom.xml (original)
+++ maven/plugins/branches/maven-site-plugin-3.x/pom.xml Wed Nov 18 21:46:32 
2009
@@ -157,7 +157,7 @@
   <properties>
     <doxiaVersion>1.1.2-SNAPSHOT</doxiaVersion>
     <doxiaSitetoolsVersion>1.1.2-SNAPSHOT</doxiaSitetoolsVersion>
-    <mavenVersion>3.0-alpha-4</mavenVersion>
+    <mavenVersion>3.0-SNAPSHOT</mavenVersion>
     <wagonVersion>1.0-beta-6</wagonVersion>
     <plexusVersion>1.5.1</plexusVersion>
     <javadocPluginVersion>2.6.1</javadocPluginVersion>

Modified: 
maven/plugins/branches/maven-site-plugin-3.x/src/it/full-reporting/pom.xml
URL: 
http://svn.apache.org/viewvc/maven/plugins/branches/maven-site-plugin-3.x/src/it/full-reporting/pom.xml?rev=881947&r1=881946&r2=881947&view=diff
==============================================================================
--- maven/plugins/branches/maven-site-plugin-3.x/src/it/full-reporting/pom.xml 
(original)
+++ maven/plugins/branches/maven-site-plugin-3.x/src/it/full-reporting/pom.xml 
Wed Nov 18 21:46:32 2009
@@ -64,7 +64,7 @@
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-javadoc-plugin</artifactId>
         <version>${javadocPluginVersion}</version>          
-      </plugin>  
+      </plugin> 
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-checkstyle-plugin</artifactId>

Modified: 
maven/plugins/branches/maven-site-plugin-3.x/src/main/java/org/apache/maven/plugins/site/DefaultMavenReportExecutor.java
URL: 
http://svn.apache.org/viewvc/maven/plugins/branches/maven-site-plugin-3.x/src/main/java/org/apache/maven/plugins/site/DefaultMavenReportExecutor.java?rev=881947&r1=881946&r2=881947&view=diff
==============================================================================
--- 
maven/plugins/branches/maven-site-plugin-3.x/src/main/java/org/apache/maven/plugins/site/DefaultMavenReportExecutor.java
 (original)
+++ 
maven/plugins/branches/maven-site-plugin-3.x/src/main/java/org/apache/maven/plugins/site/DefaultMavenReportExecutor.java
 Wed Nov 18 21:46:32 2009
@@ -20,11 +20,15 @@
  */
 
 import java.util.ArrayList;
+import java.util.HashSet;
 import java.util.List;
+import java.util.Set;
 
 import org.apache.maven.artifact.repository.ArtifactRepository;
 import org.apache.maven.artifact.repository.DefaultRepositoryRequest;
 import org.apache.maven.artifact.repository.RepositoryRequest;
+import org.apache.maven.artifact.resolver.filter.ExclusionSetFilter;
+import org.apache.maven.doxia.site.decoration.DecorationModel;
 import org.apache.maven.lifecycle.LifecycleExecutor;
 import org.apache.maven.model.Plugin;
 import org.apache.maven.model.ReportPlugin;
@@ -85,6 +89,7 @@
         }
         List<String> imports = new ArrayList<String>();
 
+        
         imports.add( "org.apache.maven.reporting.MavenReport" );
         imports.add( "org.apache.maven.doxia.siterenderer.Renderer" );
         imports.add( "org.apache.maven.doxia.sink.SinkFactory" );
@@ -92,6 +97,13 @@
         imports.add( "org.apache.maven.doxia.sink.Sink" );
         imports.add( "org.apache.maven.doxia.sink.SinkEventAttributes" );
        
+        Set<String> excludes = new HashSet<String>( 1 );
+        //excludes.add( "maven-reporting-impl");
+        excludes.add( "doxia-site-renderer" );
+        excludes.add( "doxia-sink-api" );
+        
+        ExclusionSetFilter exclusionSetFilter = new 
ExclusionSetFilter(excludes);         
+        
         RepositoryRequest repositoryRequest = new DefaultRepositoryRequest();
         repositoryRequest.setLocalRepository( 
mavenReportExecutorRequest.getLocalRepository() );
         repositoryRequest.setRemoteRepositories( 
mavenReportExecutorRequest.getProject().getPluginArtifactRepositories() );
@@ -148,9 +160,11 @@
 
                     mojoExecution.setMojoDescriptor( mojoDescriptor );
 
+
+                    
                     mavenPluginManager.setupPluginRealm( pluginDescriptor,
                                                          
mavenReportExecutorRequest.getMavenSession(),
-                                                         
Thread.currentThread().getContextClassLoader(), imports );
+                                                         
Thread.currentThread().getContextClassLoader(), imports, exclusionSetFilter );
 
                     MavenReport mavenReport =
                         getConfiguredMavenReport( mojoExecution, 
pluginDescriptor, mavenReportExecutorRequest );