maven-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ol...@apache.org
Subject svn commit: r806870 - in /maven/plugins/branches/maven-site-plugin-3.x: pom.xml src/it/settings.xml src/main/java/org/apache/maven/plugins/site/AbstractSiteRenderingMojo.java
Date Sat, 22 Aug 2009 17:25:37 GMT
Author: olamy
Date: Sat Aug 22 17:25:37 2009
New Revision: 806870

URL: http://svn.apache.org/viewvc?rev=806870&view=rev
Log:
add some comments and FIXME

Modified:
    maven/plugins/branches/maven-site-plugin-3.x/pom.xml
    maven/plugins/branches/maven-site-plugin-3.x/src/it/settings.xml
    maven/plugins/branches/maven-site-plugin-3.x/src/main/java/org/apache/maven/plugins/site/AbstractSiteRenderingMojo.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=806870&r1=806869&r2=806870&view=diff
==============================================================================
--- maven/plugins/branches/maven-site-plugin-3.x/pom.xml (original)
+++ maven/plugins/branches/maven-site-plugin-3.x/pom.xml Sat Aug 22 17:25:37 2009
@@ -435,6 +435,7 @@
             <version>2.2-SNAPSHOT</version>          
           </plugin>
           <plugin>
+            <!-- SNAPSHOT use due to MJAVADOC-251  -->
             <groupId>org.apache.maven.plugins</groupId>
             <artifactId>maven-javadoc-plugin</artifactId>
             <version>2.6.1-SNAPSHOT</version>          

Modified: maven/plugins/branches/maven-site-plugin-3.x/src/it/settings.xml
URL: http://svn.apache.org/viewvc/maven/plugins/branches/maven-site-plugin-3.x/src/it/settings.xml?rev=806870&r1=806869&r2=806870&view=diff
==============================================================================
--- maven/plugins/branches/maven-site-plugin-3.x/src/it/settings.xml (original)
+++ maven/plugins/branches/maven-site-plugin-3.x/src/it/settings.xml Sat Aug 22 17:25:37 2009
@@ -60,6 +60,17 @@
             <enabled>true</enabled>
           </snapshots>
         </pluginRepository>
+        <pluginRepository>
+          <id>apache.snapshots</id>
+          <name>Apache Snapshot Repository</name>
+          <url>http://repository.apache.org/snapshots/</url>
+          <releases>
+            <enabled>false</enabled>
+          </releases>
+          <snapshots>
+            <enabled>true</enabled>
+          </snapshots>
+        </pluginRepository>        
       </pluginRepositories>
     </profile>
   </profiles>

Modified: maven/plugins/branches/maven-site-plugin-3.x/src/main/java/org/apache/maven/plugins/site/AbstractSiteRenderingMojo.java
URL: http://svn.apache.org/viewvc/maven/plugins/branches/maven-site-plugin-3.x/src/main/java/org/apache/maven/plugins/site/AbstractSiteRenderingMojo.java?rev=806870&r1=806869&r2=806870&view=diff
==============================================================================
--- maven/plugins/branches/maven-site-plugin-3.x/src/main/java/org/apache/maven/plugins/site/AbstractSiteRenderingMojo.java
(original)
+++ maven/plugins/branches/maven-site-plugin-3.x/src/main/java/org/apache/maven/plugins/site/AbstractSiteRenderingMojo.java
Sat Aug 22 17:25:37 2009
@@ -35,7 +35,6 @@
 import org.apache.maven.artifact.repository.DefaultRepositoryRequest;
 import org.apache.maven.artifact.repository.RepositoryRequest;
 import org.apache.maven.artifact.resolver.ArtifactResolver;
-import org.apache.maven.classrealm.ClassRealmManager;
 import org.apache.maven.doxia.sink.render.RenderingContext;
 import org.apache.maven.doxia.site.decoration.DecorationModel;
 import org.apache.maven.doxia.site.decoration.inheritance.DecorationModelInheritanceAssembler;
@@ -195,16 +194,6 @@
     protected MavenProject project;
     
     /**
-     * The component that is used to resolve/execure plugins.
-     * 
-     * @required
-     * @readonly
-     * @component
-     */
-    @Requirement
-    protected MavenPluginManager mavenPluginManager;
-    
-    /**
      * @parameter expression="${session}"
      * @required
      * @readonly
@@ -214,11 +203,16 @@
     Context context;
     
     PlexusContainer plexusContainer;
+   
+    // FIXME not injected ?
+    //Requirement
+    protected DefaultLifecycleExecutor lifecycleExecutor;
+
+    // FIXME not injected ? 
+    //Requirement
+    protected MavenPluginManager mavenPluginManager;
     
-    ClassRealmManager classRealmManager;
-    
-    LifecycleExecutor lifecycleExecutor;
-    
+    // FIXME remove to use direct injection 
     public void contextualize( Context context )
         throws ContextException
     {
@@ -226,7 +220,6 @@
         plexusContainer = (PlexusContainer) context.get( PlexusConstants.PLEXUS_KEY );
         try
         {
-            classRealmManager = plexusContainer.lookup( ClassRealmManager.class );
             lifecycleExecutor = (DefaultLifecycleExecutor) plexusContainer.lookup( LifecycleExecutor.class
);
             mavenPluginManager = plexusContainer.lookup( MavenPluginManager.class );
         }
@@ -247,7 +240,7 @@
         return buildMavenReports();
     }
     
-    Xpp3Dom convert( MojoDescriptor mojoDescriptor  )
+    private Xpp3Dom convert( MojoDescriptor mojoDescriptor  )
     {
         Xpp3Dom dom = new Xpp3Dom( "configuration" );
 
@@ -345,7 +338,6 @@
                     mojoExecution.setConfiguration( convert( mojoDescriptor ) );
                     mojoExecution.setMojoDescriptor( mojoDescriptor );
                     mavenPluginManager.setupPluginRealm( pluginDescriptor, mavenSession,
Thread.currentThread().getContextClassLoader(), imports );
-
                     MavenReport mavenReport = getConfiguredMavenReport( mojoExecution, pluginDescriptor
);
                     if (mavenReport != null)
                     {
@@ -370,6 +362,7 @@
         }
         try
         {
+            // FIXME here we need something to prevent MJAVADOC-251 config injection order
can be different from mvn < 3.x
             MavenReport mavenReport =
                 (MavenReport) mavenPluginManager.getConfiguredMojo( Mojo.class, this.mavenSession,
mojoExecution );
             return mavenReport;



Mime
View raw message