You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by jv...@apache.org on 2007/02/10 03:01:43 UTC
svn commit: r505612 - in /maven/components/trunk/maven-embedder: ./
src/main/java/org/apache/maven/embedder/
src/main/java/org/apache/maven/embedder/execution/
src/main/java/org/apache/maven/embedder/user/
src/test/java/org/apache/maven/embedder/
Author: jvanzyl
Date: Fri Feb 9 18:01:42 2007
New Revision: 505612
URL: http://svn.apache.org/viewvc?view=rev&rev=505612
Log:
o fixes to the embedder for finding settings and cleaning up embedder initialization
Submitted by: Eugene Kuleshov
Modified:
maven/components/trunk/maven-embedder/pom.xml
maven/components/trunk/maven-embedder/src/main/java/org/apache/maven/embedder/AbstractMavenEmbedderLogger.java
maven/components/trunk/maven-embedder/src/main/java/org/apache/maven/embedder/DefaultMavenEmbedRequest.java
maven/components/trunk/maven-embedder/src/main/java/org/apache/maven/embedder/MavenEmbedRequest.java
maven/components/trunk/maven-embedder/src/main/java/org/apache/maven/embedder/MavenEmbedder.java
maven/components/trunk/maven-embedder/src/main/java/org/apache/maven/embedder/MavenEmbedderConsoleLogger.java
maven/components/trunk/maven-embedder/src/main/java/org/apache/maven/embedder/MavenEmbedderException.java
maven/components/trunk/maven-embedder/src/main/java/org/apache/maven/embedder/MavenEmbedderLogger.java
maven/components/trunk/maven-embedder/src/main/java/org/apache/maven/embedder/MavenEmbedderLoggerManager.java
maven/components/trunk/maven-embedder/src/main/java/org/apache/maven/embedder/PlexusLoggerAdapter.java
maven/components/trunk/maven-embedder/src/main/java/org/apache/maven/embedder/SummaryPluginDescriptor.java
maven/components/trunk/maven-embedder/src/main/java/org/apache/maven/embedder/execution/DefaultMavenExecutionRequestDefaultsPopulator.java
maven/components/trunk/maven-embedder/src/main/java/org/apache/maven/embedder/execution/MavenExecutionRequestDefaultsPopulator.java
maven/components/trunk/maven-embedder/src/main/java/org/apache/maven/embedder/user/SettingsAdapter.java
maven/components/trunk/maven-embedder/src/test/java/org/apache/maven/embedder/TestComponentOverride.java
Modified: maven/components/trunk/maven-embedder/pom.xml
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-embedder/pom.xml?view=diff&rev=505612&r1=505611&r2=505612
==============================================================================
--- maven/components/trunk/maven-embedder/pom.xml (original)
+++ maven/components/trunk/maven-embedder/pom.xml Fri Feb 9 18:01:42 2007
@@ -27,7 +27,7 @@
<artifactId>maven-embedder</artifactId>
<name>Maven Embedder</name>
<properties>
- <bundleVersion>2.1.0.v20070110-1023</bundleVersion>
+ <bundleVersion>2.1.0.v20070209-2050</bundleVersion>
</properties>
<build>
<resources>
Modified: maven/components/trunk/maven-embedder/src/main/java/org/apache/maven/embedder/AbstractMavenEmbedderLogger.java
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-embedder/src/main/java/org/apache/maven/embedder/AbstractMavenEmbedderLogger.java?view=diff&rev=505612&r1=505611&r2=505612
==============================================================================
--- maven/components/trunk/maven-embedder/src/main/java/org/apache/maven/embedder/AbstractMavenEmbedderLogger.java (original)
+++ maven/components/trunk/maven-embedder/src/main/java/org/apache/maven/embedder/AbstractMavenEmbedderLogger.java Fri Feb 9 18:01:42 2007
@@ -23,7 +23,7 @@
* @version $Id$
*/
public abstract class AbstractMavenEmbedderLogger
- implements MavenEmbedderLogger
+ implements MavenEmbedderLogger
{
private int threshold = MavenEmbedderLogger.LEVEL_INFO;
@@ -43,7 +43,7 @@
{
return name;
}
-
+
public void debug( String message )
{
debug( message, null );
Modified: maven/components/trunk/maven-embedder/src/main/java/org/apache/maven/embedder/DefaultMavenEmbedRequest.java
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-embedder/src/main/java/org/apache/maven/embedder/DefaultMavenEmbedRequest.java?view=diff&rev=505612&r1=505611&r2=505612
==============================================================================
--- maven/components/trunk/maven-embedder/src/main/java/org/apache/maven/embedder/DefaultMavenEmbedRequest.java (original)
+++ maven/components/trunk/maven-embedder/src/main/java/org/apache/maven/embedder/DefaultMavenEmbedRequest.java Fri Feb 9 18:01:42 2007
@@ -22,6 +22,7 @@
import java.util.Properties;
import org.apache.maven.settings.Settings;
+import org.codehaus.plexus.classworlds.ClassWorld;
/**
* Default implementation of MavenEmbedRequest intefrace.
@@ -45,14 +46,14 @@
private Properties systemProperties;
- /**
- * List<URL>.
- */
+ /** List<URL>. */
private List extensions = new ArrayList();
- /**
- * Creates a new instance of DefaultMavenEmbedRequest
- */
+ private MavenEmbedderLogger logger;
+
+ private ClassWorld classWorld;
+
+ /** Creates a new instance of DefaultMavenEmbedRequest */
public DefaultMavenEmbedRequest()
{
}
@@ -132,13 +133,13 @@
return customizer;
}
- public MavenEmbedRequest setSystemProperties(Properties properties)
+ public MavenEmbedRequest setSystemProperties( Properties properties )
{
systemProperties = properties;
return this;
}
- public Properties getSystemProperties()
+ public Properties getSystemProperties()
{
return systemProperties != null ? systemProperties : System.getProperties();
}
@@ -151,5 +152,33 @@
public List getExtensions()
{
return extensions;
+ }
+
+ public MavenEmbedRequest setMavenEmbedderLogger( MavenEmbedderLogger logger )
+ {
+ this.logger = logger;
+ return this;
+ }
+
+ public MavenEmbedderLogger getMavenEmbedderLogger()
+ {
+ return logger;
+ }
+
+ public ClassWorld getClassWorld()
+ {
+ return classWorld;
+ }
+
+ public MavenEmbedRequest setClassWorld( ClassWorld classWorld )
+ {
+ this.classWorld = classWorld;
+ return this;
+ }
+
+ public MavenEmbedRequest setClassLoader( ClassLoader loader )
+ {
+ this.classWorld = new ClassWorld( "plexus.core", loader );
+ return this;
}
}
Modified: maven/components/trunk/maven-embedder/src/main/java/org/apache/maven/embedder/MavenEmbedRequest.java
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-embedder/src/main/java/org/apache/maven/embedder/MavenEmbedRequest.java?view=diff&rev=505612&r1=505611&r2=505612
==============================================================================
--- maven/components/trunk/maven-embedder/src/main/java/org/apache/maven/embedder/MavenEmbedRequest.java (original)
+++ maven/components/trunk/maven-embedder/src/main/java/org/apache/maven/embedder/MavenEmbedRequest.java Fri Feb 9 18:01:42 2007
@@ -20,7 +20,7 @@
import java.util.List;
import java.util.Properties;
-import org.apache.maven.settings.Settings;
+import org.codehaus.plexus.classworlds.ClassWorld;
/**
* Configuration of embedder, used when starting up.
@@ -83,4 +83,14 @@
void addExtension( URL url );
List getExtensions();
+
+ public MavenEmbedRequest setMavenEmbedderLogger( MavenEmbedderLogger logger );
+
+ public MavenEmbedderLogger getMavenEmbedderLogger();
+
+ public ClassWorld getClassWorld();
+
+ public MavenEmbedRequest setClassWorld( ClassWorld classWorld );
+
+ public MavenEmbedRequest setClassLoader( ClassLoader loader );
}
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=505612&r1=505611&r2=505612
==============================================================================
--- 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 Fri Feb 9 18:01:42 2007
@@ -65,6 +65,7 @@
import org.codehaus.plexus.configuration.PlexusConfigurationException;
import org.codehaus.plexus.logging.LoggerManager;
import org.codehaus.plexus.util.xml.pull.XmlPullParserException;
+
import java.io.File;
import java.io.FileReader;
import java.io.IOException;
@@ -76,6 +77,7 @@
import java.util.Iterator;
import java.util.List;
import java.util.Map;
+
import org.apache.maven.model.Plugin;
import org.apache.maven.plugin.PluginManager;
import org.apache.maven.plugin.PluginManagerException;
@@ -156,28 +158,7 @@
MavenEmbedderLogger logger )
throws MavenEmbedderException
{
- this.classWorld = classWorld;
-
- this.logger = logger;
-
- // ----------------------------------------------------------------------------
- // Don't override any existing SecurityManager if one has been installed. Our
- // SecurityManager just checks to make sure
- // ----------------------------------------------------------------------------
-
- try
- {
- if ( System.getSecurityManager() == null && activateSystemManager )
- {
- System.setSecurityManager( new MavenEmbedderSecurityManager() );
- }
- }
- catch ( RuntimeException e )
- {
- logger.warn( "Error trying to set the SecurityManager: " + e.getMessage() );
- }
-
- start();
+ this( new DefaultMavenEmbedRequest().setClassWorld( classWorld ).setMavenEmbedderLogger( logger ) );
}
public MavenEmbedder( ClassLoader classLoader )
@@ -193,6 +174,12 @@
this( new ClassWorld( "plexus.core", classLoader ), logger );
}
+ public MavenEmbedder( MavenEmbedRequest req )
+ throws MavenEmbedderException
+ {
+ start( req );
+ }
+
// ----------------------------------------------------------------------
// Accessors
// ----------------------------------------------------------------------
@@ -247,30 +234,24 @@
{
return mavenProjectBuilder.build( mavenProject, localRepository, profileManager );
}
-
+
/**
* mkleint: protected so that IDE integrations can selectively allow downloading artifacts
- * from remote repositories (if they prohibit by default on project loading)
- */
- protected void verifyPlugin( Plugin plugin, MavenProject project )
- throws ComponentLookupException,
- ArtifactResolutionException,
- PluginVersionResolutionException,
- ArtifactNotFoundException,
- InvalidVersionSpecificationException,
- InvalidPluginException,
- PluginManagerException,
- PluginNotFoundException,
- PluginVersionNotFoundException
+ * from remote repositories (if they prohibit by default on project loading)
+ */
+ protected void verifyPlugin( Plugin plugin,
+ MavenProject project )
+ throws ComponentLookupException, ArtifactResolutionException, PluginVersionResolutionException,
+ ArtifactNotFoundException, InvalidVersionSpecificationException, InvalidPluginException, PluginManagerException,
+ PluginNotFoundException, PluginVersionNotFoundException
{
PluginManager pluginManager = (PluginManager) container.lookup( PluginManager.ROLE );
- pluginManager.verifyPlugin(plugin, project, settings, localRepository);
+ pluginManager.verifyPlugin( plugin, project, settings, localRepository );
}
-
- /**
- * protected for tests only..
- */
- protected Map getPluginExtensionComponents(Plugin plugin) throws PluginManagerException
+
+ /** protected for tests only.. */
+ protected Map getPluginExtensionComponents( Plugin plugin )
+ throws PluginManagerException
{
try
{
@@ -283,29 +264,27 @@
return new HashMap();
}
}
-
+
/**
* mkleint: copied from DefaultLifecycleExecutor
- *
+ *
* @todo Not particularly happy about this. Would like WagonManager and ArtifactTypeHandlerManager to be able to
* lookup directly, or have them passed in
- *
* @todo Move this sort of thing to the tail end of the project-building process
*/
private Map findArtifactTypeHandlers( MavenProject project )
throws Exception
{
Map map = new HashMap();
-
+
for ( Iterator i = project.getBuildPlugins().iterator(); i.hasNext(); )
{
Plugin plugin = (Plugin) i.next();
if ( plugin.isExtensions() )
{
- verifyPlugin( plugin, project);
- map.putAll( getPluginExtensionComponents(plugin));
-
+ verifyPlugin( plugin, project );
+ map.putAll( getPluginExtensionComponents( plugin ) );
// shudder...
for ( Iterator j = map.values().iterator(); j.hasNext(); )
@@ -320,7 +299,7 @@
}
return map;
}
-
+
/**
* This method is used to grab the list of dependencies that belong to a project so that a UI
@@ -334,18 +313,18 @@
try
{
request = defaultsPopulator.populateDefaults( request );
-
- project = readProject( new File (request.getPomFile()) );
+
+ project = readProject( new File( request.getPomFile() ) );
//mkleint: copied from DefaultLifecycleExecutor
Map handlers = findArtifactTypeHandlers( project );
//is this necessary in this context, I doubt it..mkleint
artifactHandlerManager.addHandlers( handlers );
-
+
project = mavenProjectBuilder.buildWithDependencies( new File( request.getPomFile() ),
request.getLocalRepository(), profileManager,
request.getTransferListener() );
}
- catch (PluginManagerException e)
+ catch ( PluginManagerException e )
{
return new DefaultMavenExecutionResult( project, Collections.singletonList( e ) );
}
@@ -370,7 +349,7 @@
return new DefaultMavenExecutionResult( project, Collections.singletonList( e ) );
}
//mkleint: why do we have so many various exception handlings with same result?
- catch (Exception e)
+ catch ( Exception e )
{
return new DefaultMavenExecutionResult( project, Collections.singletonList( e ) );
}
@@ -509,15 +488,30 @@
// Lifecycle
// ----------------------------------------------------------------------
- private void start()
+ private void start( MavenEmbedRequest req )
throws MavenEmbedderException
{
- start( new DefaultMavenEmbedRequest() );
- }
+ this.classWorld = req.getClassWorld();
+
+ this.logger = req.getMavenEmbedderLogger();
+
+ // ----------------------------------------------------------------------------
+ // Don't override any existing SecurityManager if one has been installed. Our
+ // SecurityManager just checks to make sure
+ // ----------------------------------------------------------------------------
+
+ try
+ {
+ if ( System.getSecurityManager() == null && activateSystemManager )
+ {
+ System.setSecurityManager( new MavenEmbedderSecurityManager() );
+ }
+ }
+ catch ( RuntimeException e )
+ {
+ logger.warn( "Error trying to set the SecurityManager: " + e.getMessage() );
+ }
- public void start( MavenEmbedRequest req )
- throws MavenEmbedderException
- {
this.embedderRequest = req;
try
@@ -670,11 +664,11 @@
{
LoggerManager loggerManager = container.getLoggerManager();
int oldThreshold = loggerManager.getThreshold();
-
+
try
{
loggerManager.setThresholds( request.getLoggingLevel() );
-
+
try
{
request = defaultsPopulator.populateDefaults( request );
Modified: maven/components/trunk/maven-embedder/src/main/java/org/apache/maven/embedder/MavenEmbedderConsoleLogger.java
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-embedder/src/main/java/org/apache/maven/embedder/MavenEmbedderConsoleLogger.java?view=diff&rev=505612&r1=505611&r2=505612
==============================================================================
--- maven/components/trunk/maven-embedder/src/main/java/org/apache/maven/embedder/MavenEmbedderConsoleLogger.java (original)
+++ maven/components/trunk/maven-embedder/src/main/java/org/apache/maven/embedder/MavenEmbedderConsoleLogger.java Fri Feb 9 18:01:42 2007
@@ -25,7 +25,8 @@
public final class MavenEmbedderConsoleLogger
extends AbstractMavenEmbedderLogger
{
- public void debug( String message, Throwable throwable )
+ public void debug( String message,
+ Throwable throwable )
{
if ( isDebugEnabled() )
{
@@ -39,7 +40,8 @@
}
}
- public void info( String message, Throwable throwable )
+ public void info( String message,
+ Throwable throwable )
{
if ( isInfoEnabled() )
{
@@ -53,7 +55,8 @@
}
}
- public void warn( String message, Throwable throwable )
+ public void warn( String message,
+ Throwable throwable )
{
if ( isWarnEnabled() )
{
@@ -67,7 +70,8 @@
}
}
- public void error( String message, Throwable throwable )
+ public void error( String message,
+ Throwable throwable )
{
if ( isErrorEnabled() )
{
@@ -81,7 +85,8 @@
}
}
- public void fatalError( String message, Throwable throwable )
+ public void fatalError( String message,
+ Throwable throwable )
{
if ( isFatalErrorEnabled() )
{
Modified: maven/components/trunk/maven-embedder/src/main/java/org/apache/maven/embedder/MavenEmbedderException.java
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-embedder/src/main/java/org/apache/maven/embedder/MavenEmbedderException.java?view=diff&rev=505612&r1=505611&r2=505612
==============================================================================
--- maven/components/trunk/maven-embedder/src/main/java/org/apache/maven/embedder/MavenEmbedderException.java (original)
+++ maven/components/trunk/maven-embedder/src/main/java/org/apache/maven/embedder/MavenEmbedderException.java Fri Feb 9 18:01:42 2007
@@ -33,7 +33,8 @@
super( cause );
}
- public MavenEmbedderException( String message, Throwable cause )
+ public MavenEmbedderException( String message,
+ Throwable cause )
{
super( message, cause );
}
Modified: maven/components/trunk/maven-embedder/src/main/java/org/apache/maven/embedder/MavenEmbedderLogger.java
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-embedder/src/main/java/org/apache/maven/embedder/MavenEmbedderLogger.java?view=diff&rev=505612&r1=505611&r2=505612
==============================================================================
--- maven/components/trunk/maven-embedder/src/main/java/org/apache/maven/embedder/MavenEmbedderLogger.java (original)
+++ maven/components/trunk/maven-embedder/src/main/java/org/apache/maven/embedder/MavenEmbedderLogger.java Fri Feb 9 18:01:42 2007
@@ -36,31 +36,36 @@
void debug( String message );
- void debug( String message, Throwable throwable );
+ void debug( String message,
+ Throwable throwable );
boolean isDebugEnabled();
void info( String message );
- void info( String message, Throwable throwable );
+ void info( String message,
+ Throwable throwable );
boolean isInfoEnabled();
void warn( String message );
- void warn( String message, Throwable throwable );
+ void warn( String message,
+ Throwable throwable );
boolean isWarnEnabled();
void error( String message );
- void error( String message, Throwable throwable );
+ void error( String message,
+ Throwable throwable );
boolean isErrorEnabled();
void fatalError( String message );
- void fatalError( String message, Throwable throwable );
+ void fatalError( String message,
+ Throwable throwable );
boolean isFatalErrorEnabled();
Modified: maven/components/trunk/maven-embedder/src/main/java/org/apache/maven/embedder/MavenEmbedderLoggerManager.java
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-embedder/src/main/java/org/apache/maven/embedder/MavenEmbedderLoggerManager.java?view=diff&rev=505612&r1=505611&r2=505612
==============================================================================
--- maven/components/trunk/maven-embedder/src/main/java/org/apache/maven/embedder/MavenEmbedderLoggerManager.java (original)
+++ maven/components/trunk/maven-embedder/src/main/java/org/apache/maven/embedder/MavenEmbedderLoggerManager.java Fri Feb 9 18:01:42 2007
@@ -85,29 +85,32 @@
logger.setThreshold( currentThreshold );
}
- /**
- * @return Returns the threshold.
- */
+ /** @return Returns the threshold. */
public int getThreshold()
{
return currentThreshold;
}
- public void setThreshold( String role, String roleHint, int threshold )
+ public void setThreshold( String role,
+ String roleHint,
+ int threshold )
{
}
- public int getThreshold( String role, String roleHint )
+ public int getThreshold( String role,
+ String roleHint )
{
return currentThreshold;
}
- public Logger getLoggerForComponent( String role, String roleHint )
+ public Logger getLoggerForComponent( String role,
+ String roleHint )
{
return logger;
}
- public void returnComponentLogger( String role, String roleHint )
+ public void returnComponentLogger( String role,
+ String roleHint )
{
}
Modified: maven/components/trunk/maven-embedder/src/main/java/org/apache/maven/embedder/PlexusLoggerAdapter.java
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-embedder/src/main/java/org/apache/maven/embedder/PlexusLoggerAdapter.java?view=diff&rev=505612&r1=505611&r2=505612
==============================================================================
--- maven/components/trunk/maven-embedder/src/main/java/org/apache/maven/embedder/PlexusLoggerAdapter.java (original)
+++ maven/components/trunk/maven-embedder/src/main/java/org/apache/maven/embedder/PlexusLoggerAdapter.java Fri Feb 9 18:01:42 2007
@@ -35,7 +35,8 @@
logger.debug( message );
}
- public void debug( String message, Throwable throwable )
+ public void debug( String message,
+ Throwable throwable )
{
logger.debug( message, throwable );
}
@@ -50,7 +51,8 @@
logger.info( message );
}
- public void info( String message, Throwable throwable )
+ public void info( String message,
+ Throwable throwable )
{
logger.info( message, throwable );
}
@@ -65,7 +67,8 @@
logger.warn( message );
}
- public void warn( String message, Throwable throwable )
+ public void warn( String message,
+ Throwable throwable )
{
logger.warn( message, throwable );
}
@@ -80,7 +83,8 @@
logger.error( message );
}
- public void error( String message, Throwable throwable )
+ public void error( String message,
+ Throwable throwable )
{
logger.error( message );
}
@@ -95,7 +99,8 @@
logger.fatalError( message );
}
- public void fatalError( String message, Throwable throwable )
+ public void fatalError( String message,
+ Throwable throwable )
{
logger.fatalError( message, throwable );
}
Modified: maven/components/trunk/maven-embedder/src/main/java/org/apache/maven/embedder/SummaryPluginDescriptor.java
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-embedder/src/main/java/org/apache/maven/embedder/SummaryPluginDescriptor.java?view=diff&rev=505612&r1=505611&r2=505612
==============================================================================
--- maven/components/trunk/maven-embedder/src/main/java/org/apache/maven/embedder/SummaryPluginDescriptor.java (original)
+++ maven/components/trunk/maven-embedder/src/main/java/org/apache/maven/embedder/SummaryPluginDescriptor.java Fri Feb 9 18:01:42 2007
@@ -26,7 +26,9 @@
private String name;
- public SummaryPluginDescriptor( String groupId, String artifactId, String name )
+ public SummaryPluginDescriptor( String groupId,
+ String artifactId,
+ String name )
{
this.groupId = groupId;
this.artifactId = artifactId;
Modified: maven/components/trunk/maven-embedder/src/main/java/org/apache/maven/embedder/execution/DefaultMavenExecutionRequestDefaultsPopulator.java
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-embedder/src/main/java/org/apache/maven/embedder/execution/DefaultMavenExecutionRequestDefaultsPopulator.java?view=diff&rev=505612&r1=505611&r2=505612
==============================================================================
--- maven/components/trunk/maven-embedder/src/main/java/org/apache/maven/embedder/execution/DefaultMavenExecutionRequestDefaultsPopulator.java (original)
+++ maven/components/trunk/maven-embedder/src/main/java/org/apache/maven/embedder/execution/DefaultMavenExecutionRequestDefaultsPopulator.java Fri Feb 9 18:01:42 2007
@@ -50,7 +50,7 @@
import java.util.Iterator;
/**
- * DefaultMavenExecutionRequestDefaultsPopulator
+ * DefaultMavenExecutionRequestDefaultsPopulator
*
* @version $Id$
*/
@@ -216,15 +216,15 @@
for ( Iterator i = settings.getMirrors().iterator(); i.hasNext(); )
{
Mirror mirror = (Mirror) i.next();
-
+
try
{
wagonManager.addRepositoryMirror( mirror.getMirrorOf(), mirror.getId(), mirror.getUrl() );
}
catch ( IllegalArgumentException e )
{
- throw new SettingsConfigurationException( "Unable to configure mirror " + mirror + ": "
- + e.getMessage(), e );
+ throw new SettingsConfigurationException(
+ "Unable to configure mirror " + mirror + ": " + e.getMessage(), e );
}
}
}
Modified: maven/components/trunk/maven-embedder/src/main/java/org/apache/maven/embedder/execution/MavenExecutionRequestDefaultsPopulator.java
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-embedder/src/main/java/org/apache/maven/embedder/execution/MavenExecutionRequestDefaultsPopulator.java?view=diff&rev=505612&r1=505611&r2=505612
==============================================================================
--- maven/components/trunk/maven-embedder/src/main/java/org/apache/maven/embedder/execution/MavenExecutionRequestDefaultsPopulator.java (original)
+++ maven/components/trunk/maven-embedder/src/main/java/org/apache/maven/embedder/execution/MavenExecutionRequestDefaultsPopulator.java Fri Feb 9 18:01:42 2007
@@ -3,10 +3,10 @@
import org.apache.maven.embedder.MavenEmbedderException;
import org.apache.maven.execution.MavenExecutionRequest;
-public interface MavenExecutionRequestDefaultsPopulator
+public interface MavenExecutionRequestDefaultsPopulator
{
String ROLE = MavenExecutionRequestDefaultsPopulator.class.getName();
-
+
MavenExecutionRequest populateDefaults( MavenExecutionRequest request )
- throws MavenEmbedderException;
+ throws MavenEmbedderException;
}
Modified: maven/components/trunk/maven-embedder/src/main/java/org/apache/maven/embedder/user/SettingsAdapter.java
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-embedder/src/main/java/org/apache/maven/embedder/user/SettingsAdapter.java?view=diff&rev=505612&r1=505611&r2=505612
==============================================================================
--- maven/components/trunk/maven-embedder/src/main/java/org/apache/maven/embedder/user/SettingsAdapter.java (original)
+++ maven/components/trunk/maven-embedder/src/main/java/org/apache/maven/embedder/user/SettingsAdapter.java Fri Feb 9 18:01:42 2007
@@ -6,7 +6,7 @@
import java.util.List;
/**
- * Adapt a {@link MavenExecutionRequest} to a {@link Settings} object for use in the Maven core.
+ * Adapt a {@link MavenExecutionRequest} to a {@link Settings} object for use in the Maven core.
*
* @author Jason van Zyl
*/
Modified: maven/components/trunk/maven-embedder/src/test/java/org/apache/maven/embedder/TestComponentOverride.java
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-embedder/src/test/java/org/apache/maven/embedder/TestComponentOverride.java?view=diff&rev=505612&r1=505611&r2=505612
==============================================================================
--- maven/components/trunk/maven-embedder/src/test/java/org/apache/maven/embedder/TestComponentOverride.java (original)
+++ maven/components/trunk/maven-embedder/src/test/java/org/apache/maven/embedder/TestComponentOverride.java Fri Feb 9 18:01:42 2007
@@ -8,11 +8,7 @@
import junit.framework.TestCase;
-/**
- *
- * @author <a href="mailto:kenney@apache.org">Kenney Westerhof</a>
- *
- */
+/** @author <a href="mailto:kenney@apache.org">Kenney Westerhof</a> */
public class TestComponentOverride
extends TestCase
{
@@ -27,10 +23,14 @@
{
basedir = System.getProperty( "basedir" );
- maven = new MavenEmbedder( Thread.currentThread().getContextClassLoader(), new MavenEmbedderConsoleLogger() );
+ ClassLoader loader = Thread.currentThread().getContextClassLoader();
MavenEmbedRequest request = new DefaultMavenEmbedRequest();
+ request.setClassLoader( loader );
+
+ request.setMavenEmbedderLogger( new MavenEmbedderConsoleLogger() );
+
request.addExtension( new File( basedir, "src/test/extensions" ).toURI().toURL() );
// register callback to get a hold of the container
@@ -42,7 +42,7 @@
}
} );
- maven.start( request );
+ maven = new MavenEmbedder( request );
}
public void testComponentOverride()