continuum-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From eveni...@apache.org
Subject svn commit: r765353 - /continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/DefaultContinuum.java
Date Wed, 15 Apr 2009 20:52:28 GMT
Author: evenisse
Date: Wed Apr 15 20:52:28 2009
New Revision: 765353

URL: http://svn.apache.org/viewvc?rev=765353&view=rev
Log:
[CONTINUUM-1982] merge -r 764861:764862 from 1.3.x branch

Modified:
    continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/DefaultContinuum.java

Modified: continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/DefaultContinuum.java
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/DefaultContinuum.java?rev=765353&r1=765352&r2=765353&view=diff
==============================================================================
--- continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/DefaultContinuum.java
(original)
+++ continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/DefaultContinuum.java
Wed Apr 15 20:52:28 2009
@@ -92,14 +92,9 @@
 import org.apache.maven.continuum.store.ContinuumStoreException;
 import org.apache.maven.continuum.utils.ContinuumUrlValidator;
 import org.apache.maven.continuum.utils.WorkingDirectoryService;
-import org.codehaus.plexus.PlexusConstants;
-import org.codehaus.plexus.PlexusContainer;
 import org.codehaus.plexus.action.Action;
 import org.codehaus.plexus.action.ActionManager;
 import org.codehaus.plexus.action.ActionNotFoundException;
-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.personality.plexus.lifecycle.phase.Initializable;
 import org.codehaus.plexus.personality.plexus.lifecycle.phase.InitializationException;
 import org.codehaus.plexus.personality.plexus.lifecycle.phase.Startable;
@@ -120,7 +115,7 @@
  * @plexus.component role="org.apache.maven.continuum.Continuum" role-hint="default"
  */
 public class DefaultContinuum
-    implements Continuum, Contextualizable, Initializable, Startable
+    implements Continuum, Initializable, Startable
 {
     private Logger log = LoggerFactory.getLogger( DefaultContinuum.class );
 
@@ -228,8 +223,6 @@
      */
     private BuildExecutorManager executorManager;
 
-    private PlexusContainer container;
-
     /**
      * @plexus.requirement role-hint="continuumUrl"
      */
@@ -2559,12 +2552,6 @@
     // --------------------------------
     //  Plexus Lifecycle
     // --------------------------------
-    public void contextualize( Context context )
-        throws ContextException
-    {
-        container = (PlexusContainer) context.get( PlexusConstants.PLEXUS_KEY );
-    }
-
     public void start()
         throws StartingException
     {
@@ -2991,7 +2978,7 @@
         {
             Properties properties = new Properties();
 
-            String name = "META-INF/maven/org.apache.maven.continuum/continuum-core/pom.properties";
+            String name = "META-INF/maven/org.apache.continuum/continuum-core/pom.properties";
 
             InputStream resourceAsStream = getClass().getClassLoader().getResourceAsStream(
name );
 



Mime
View raw message