maven-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ol...@apache.org
Subject svn commit: r806940 - in /maven/plugins/branches/maven-site-plugin-3.x/src/main/java/org/apache/maven/plugins/site: AbstractSiteRenderingMojo.java SiteStageDeployMojo.java
Date Sun, 23 Aug 2009 07:11:59 GMT
Author: olamy
Date: Sun Aug 23 07:11:59 2009
New Revision: 806940

URL: http://svn.apache.org/viewvc?rev=806940&view=rev
Log:
fix NPE 

Modified:
    maven/plugins/branches/maven-site-plugin-3.x/src/main/java/org/apache/maven/plugins/site/AbstractSiteRenderingMojo.java
    maven/plugins/branches/maven-site-plugin-3.x/src/main/java/org/apache/maven/plugins/site/SiteStageDeployMojo.java

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=806940&r1=806939&r2=806940&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
Sun Aug 23 07:11:59 2009
@@ -206,7 +206,7 @@
    
     // FIXME not injected ?
     //Requirement
-    protected DefaultLifecycleExecutor lifecycleExecutor;
+    //protected DefaultLifecycleExecutor lifecycleExecutor;
 
     // FIXME not injected ? 
     //Requirement
@@ -220,7 +220,7 @@
         plexusContainer = (PlexusContainer) context.get( PlexusConstants.PLEXUS_KEY );
         try
         {
-            lifecycleExecutor = (DefaultLifecycleExecutor) plexusContainer.lookup( LifecycleExecutor.class
);
+            //lifecycleExecutor = (DefaultLifecycleExecutor) plexusContainer.lookup( LifecycleExecutor.class
);
             mavenPluginManager = plexusContainer.lookup( MavenPluginManager.class );
         }
         catch ( ComponentLookupException e )

Modified: maven/plugins/branches/maven-site-plugin-3.x/src/main/java/org/apache/maven/plugins/site/SiteStageDeployMojo.java
URL: http://svn.apache.org/viewvc/maven/plugins/branches/maven-site-plugin-3.x/src/main/java/org/apache/maven/plugins/site/SiteStageDeployMojo.java?rev=806940&r1=806939&r2=806940&view=diff
==============================================================================
--- maven/plugins/branches/maven-site-plugin-3.x/src/main/java/org/apache/maven/plugins/site/SiteStageDeployMojo.java
(original)
+++ maven/plugins/branches/maven-site-plugin-3.x/src/main/java/org/apache/maven/plugins/site/SiteStageDeployMojo.java
Sun Aug 23 07:11:59 2009
@@ -122,8 +122,6 @@
      */
     private Settings settings;
 
-    private PlexusContainer container;
-
     /**
      * {@inheritDoc}
      */
@@ -155,7 +153,7 @@
         try
         {
             wagon = wagonManager.getWagon( repository );
-            SiteDeployMojo.configureWagon( wagon, stagingRepositoryId, settings, container,
getLog() );
+            SiteDeployMojo.configureWagon( wagon, stagingRepositoryId, settings, plexusContainer,
getLog() );
         }
         catch ( UnsupportedProtocolException e )
         {
@@ -237,12 +235,6 @@
         }
     }
 
-    public void contextualize( Context context )
-        throws ContextException
-    {
-        container = (PlexusContainer) context.get( PlexusConstants.PLEXUS_KEY );
-    }
-
     /**
      * Find the URL where staging will take place.
      *



Mime
View raw message