svn commit: r1079303 - /maven/plugins/branches/maven-site-plugin-3.x/src/main/java/org/apache/maven/plugins/site/AbstractDeployMojo.java

[lt...@apache.org]

Author: ltheussl
Date: Tue Mar  8 09:21:47 2011
New Revision: 1079303

URL: http://svn.apache.org/viewvc?rev=1079303&view=rev
Log:
restore r991010

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

Modified: maven/plugins/branches/maven-site-plugin-3.x/src/main/java/org/apache/maven/plugins/site/AbstractDeployMojo.java
URL: http://svn.apache.org/viewvc/maven/plugins/branches/maven-site-plugin-3.x/src/main/java/org/apache/maven/plugins/site/AbstractDeployMojo.java?rev=1079303&r1=1079302&r2=1079303&view=diff
==============================================================================
--- maven/plugins/branches/maven-site-plugin-3.x/src/main/java/org/apache/maven/plugins/site/AbstractDeployMojo.java (original)
+++ maven/plugins/branches/maven-site-plugin-3.x/src/main/java/org/apache/maven/plugins/site/AbstractDeployMojo.java Tue Mar  8 09:21:47 2011
@@ -55,17 +55,14 @@ import org.apache.maven.wagon.observers.
 import org.apache.maven.wagon.proxy.ProxyInfo;
 import org.apache.maven.wagon.repository.Repository;
 
-import org.codehaus.plexus.PlexusConstants;
 import org.codehaus.plexus.PlexusContainer;
+import org.codehaus.plexus.component.annotations.Requirement;
 import org.codehaus.plexus.component.configurator.ComponentConfigurationException;
 import org.codehaus.plexus.component.configurator.ComponentConfigurator;
 import org.codehaus.plexus.component.repository.exception.ComponentLifecycleException;
 import org.codehaus.plexus.component.repository.exception.ComponentLookupException;
 import org.codehaus.plexus.configuration.PlexusConfiguration;
 import org.codehaus.plexus.configuration.xml.XmlPlexusConfiguration;
-import org.codehaus.plexus.context.Context;
-import org.codehaus.plexus.context.ContextException;
-import org.codehaus.plexus.personality.plexus.lifecycle.phase.Contextualizable;
 import org.codehaus.plexus.util.StringUtils;
 import org.codehaus.plexus.util.xml.Xpp3Dom;
 
@@ -78,7 +75,7 @@ import org.codehaus.plexus.util.xml.Xpp3
  * @since 2.3
  */
 public abstract class AbstractDeployMojo
-    extends AbstractSiteMojo implements Contextualizable
+    extends AbstractSiteMojo
 {
     /**
      * Directory containing the generated project sites and report distributions.
@@ -145,7 +142,7 @@ public abstract class AbstractDeployMojo
      */
     private SettingsDecrypter settingsDecrypter;
 
-//    @Requirement
+    @Requirement
     private PlexusContainer container;
 
     /** {@inheritDoc} */
@@ -616,12 +613,6 @@ public abstract class AbstractDeployMojo
         }
     }
 
-    public void contextualize( Context context )
-        throws ContextException
-    {
-        container = (PlexusContainer) context.get( PlexusConstants.PLEXUS_KEY );
-    }
-
     /**
      * Find the top level parent in the reactor, i.e. the execution root.
      *