Author: jvanzyl Date: Sat Dec 30 22:03:37 2006 New Revision: 491395 URL: http://svn.apache.org/viewvc?view=rev&rev=491395 Log: o Removing the LifecycleExecutor component, not used.
Modified: maven/components/trunk/maven-embedder/src/main/java/org/apache/maven/embedder/MavenEmbedder.java Modified: maven/components/trunk/maven-embedder/src/main/java/org/apache/maven/embedder/MavenEmbedder.java URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-embedder/src/main/java/org/apache/maven/embedder/MavenEmbedder.java?view=diff&rev=491395&r1=491394&r2=491395 ============================================================================== --- maven/components/trunk/maven-embedder/src/main/java/org/apache/maven/embedder/MavenEmbedder.java (original) +++ maven/components/trunk/maven-embedder/src/main/java/org/apache/maven/embedder/MavenEmbedder.java Sat Dec 30 22:03:37 2006 @@ -83,10 +83,6 @@ { public static final String userHome = System.getProperty( "user.home" ); - // ---------------------------------------------------------------------- - // Embedder - // ---------------------------------------------------------------------- - private PlexusContainer container; // ---------------------------------------------------------------------- @@ -97,8 +93,6 @@ private ArtifactRepositoryFactory artifactRepositoryFactory; - private LifecycleExecutor lifecycleExecutor; - private WagonManager wagonManager; private MavenXpp3Reader modelReader; @@ -226,12 +220,7 @@ private MavenExecutionRequest populateMavenExecutionRequestWithDefaults( MavenExecutionRequest request ) { - // populate the request from - // 1. embed request - // 2. defaults - - // Local repository - + // Local repository if ( request.getLocalRepository() == null ) { request.setLocalRepository( localRepository ); @@ -256,15 +245,11 @@ .setBasedir( baseDirectory ) .setGoals( goals ) .setLocalRepositoryPath( localRepositoryPath ) // default: ~/.m2/repository - .setProperties( executionProperties ) // optional .setReactorFailureBehavior( reactorFailureBehaviour ) // default: fail fast .setRecursive( recursive ) // default: false .setUseReactor( useReactor ) // default: true - .setPomFile( alternatePomFile ) // optional .setShowErrors( showErrors ) // default: false .setInteractiveMode( interactive ) // default: false - .addActiveProfiles( activeProfiles ) // optional - .addInactiveProfiles( inactiveProfiles ) // optional .setLoggingLevel( loggingLevel ) // default: info .setSettings( settings ) // default: ~/.m2/settings.xml .setTransferListener( transferListener ) // default: batch mode which goes along with interactive @@ -591,8 +576,6 @@ defaultArtifactRepositoryLayout = (ArtifactRepositoryLayout) container.lookup( ArtifactRepositoryLayout.ROLE, DEFAULT_LAYOUT_ID ); - lifecycleExecutor = (LifecycleExecutor) container.lookup( LifecycleExecutor.ROLE ); - wagonManager = (WagonManager) container.lookup( WagonManager.ROLE ); started = true; @@ -695,8 +678,6 @@ container.release( mavenProjectBuilder ); container.release( artifactRepositoryFactory ); - - container.release( lifecycleExecutor ); } catch ( ComponentLifecycleException e ) {