You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by jd...@apache.org on 2011/05/18 00:08:49 UTC
svn commit: r1104595 - in /maven/sandbox/trunk/mae:
mae-app/src/main/java/org/commonjava/emb/app/
mae-booter/src/main/java/org/apache/maven/mae/boot/embed/
mae-booter/src/main/java/org/apache/maven/mae/boot/main/
mae-booter/src/main/java/org/apache/mav...
Author: jdcasey
Date: Tue May 17 22:08:49 2011
New Revision: 1104595
URL: http://svn.apache.org/viewvc?rev=1104595&view=rev
Log:
renaming some lingering classes to MAE
Added:
maven/sandbox/trunk/mae/mae-booter/src/main/java/org/apache/maven/mae/boot/embed/MAEEmbedder.java (contents, props changed)
- copied, changed from r1104405, maven/sandbox/trunk/mae/mae-booter/src/main/java/org/apache/maven/mae/boot/embed/EMBEmbedder.java
maven/sandbox/trunk/mae/mae-booter/src/main/java/org/apache/maven/mae/boot/embed/MAEEmbedderBuilder.java (contents, props changed)
- copied, changed from r1104405, maven/sandbox/trunk/mae/mae-booter/src/main/java/org/apache/maven/mae/boot/embed/EMBEmbedderBuilder.java
maven/sandbox/trunk/mae/mae-booter/src/main/java/org/apache/maven/mae/boot/embed/MAEEmbeddingException.java (contents, props changed)
- copied, changed from r1104405, maven/sandbox/trunk/mae/mae-booter/src/main/java/org/apache/maven/mae/boot/embed/EMBEmbeddingException.java
maven/sandbox/trunk/mae/mae-booter/src/main/java/org/apache/maven/mae/boot/main/MAECLIManager.java (contents, props changed)
- copied, changed from r1104405, maven/sandbox/trunk/mae/mae-booter/src/main/java/org/apache/maven/mae/boot/main/EMBCLIManager.java
maven/sandbox/trunk/mae/mae-booter/src/main/java/org/apache/maven/mae/boot/main/MAEMain.java (contents, props changed)
- copied, changed from r1104405, maven/sandbox/trunk/mae/mae-booter/src/main/java/org/apache/maven/mae/boot/main/EMBMain.java
maven/sandbox/trunk/mae/mae-booter/src/main/java/org/apache/maven/mae/boot/services/DefaultMAEServiceManager.java (contents, props changed)
- copied, changed from r1104405, maven/sandbox/trunk/mae/mae-booter/src/main/java/org/apache/maven/mae/boot/services/DefaultEMBServiceManager.java
maven/sandbox/trunk/mae/mae-booter/src/main/java/org/apache/maven/mae/boot/services/MAEServiceManager.java (contents, props changed)
- copied, changed from r1104405, maven/sandbox/trunk/mae/mae-booter/src/main/java/org/apache/maven/mae/boot/services/EMBServiceManager.java
Removed:
maven/sandbox/trunk/mae/mae-booter/src/main/java/org/apache/maven/mae/boot/embed/EMBEmbedder.java
maven/sandbox/trunk/mae/mae-booter/src/main/java/org/apache/maven/mae/boot/embed/EMBEmbedderBuilder.java
maven/sandbox/trunk/mae/mae-booter/src/main/java/org/apache/maven/mae/boot/embed/EMBEmbeddingException.java
maven/sandbox/trunk/mae/mae-booter/src/main/java/org/apache/maven/mae/boot/main/EMBCLIManager.java
maven/sandbox/trunk/mae/mae-booter/src/main/java/org/apache/maven/mae/boot/main/EMBMain.java
maven/sandbox/trunk/mae/mae-booter/src/main/java/org/apache/maven/mae/boot/services/DefaultEMBServiceManager.java
maven/sandbox/trunk/mae/mae-booter/src/main/java/org/apache/maven/mae/boot/services/EMBServiceManager.java
Modified:
maven/sandbox/trunk/mae/mae-app/src/main/java/org/commonjava/emb/app/AbstractEMBApplication.java
maven/sandbox/trunk/mae/mae-booter/src/main/java/org/apache/maven/mae/boot/main/CliRequest.java
maven/sandbox/trunk/mae/mae-booter/src/main/java/org/apache/maven/mae/boot/services/UnauthorizedServiceException.java
Modified: maven/sandbox/trunk/mae/mae-app/src/main/java/org/commonjava/emb/app/AbstractEMBApplication.java
URL: http://svn.apache.org/viewvc/maven/sandbox/trunk/mae/mae-app/src/main/java/org/commonjava/emb/app/AbstractEMBApplication.java?rev=1104595&r1=1104594&r2=1104595&view=diff
==============================================================================
--- maven/sandbox/trunk/mae/mae-app/src/main/java/org/commonjava/emb/app/AbstractEMBApplication.java (original)
+++ maven/sandbox/trunk/mae/mae-app/src/main/java/org/commonjava/emb/app/AbstractEMBApplication.java Tue May 17 22:08:49 2011
@@ -18,7 +18,7 @@ package org.commonjava.emb.app;
import org.apache.log4j.Logger;
import org.apache.maven.mae.MAEException;
-import org.apache.maven.mae.boot.embed.EMBEmbedderBuilder;
+import org.apache.maven.mae.boot.embed.MAEEmbedderBuilder;
import org.apache.maven.mae.conf.MAEConfiguration;
import org.apache.maven.mae.conf.MAELibrary;
import org.apache.maven.mae.conf.VersionProvider;
@@ -74,7 +74,7 @@ public abstract class AbstractEMBApplica
return this;
}
- final EMBEmbedderBuilder builder = new EMBEmbedderBuilder().withLibraryLoader( new InstanceLibraryLoader( additionalLibraries ) );
+ final MAEEmbedderBuilder builder = new MAEEmbedderBuilder().withLibraryLoader( new InstanceLibraryLoader( additionalLibraries ) );
beforeLoading();
configureBuilder( builder );
@@ -131,7 +131,7 @@ public abstract class AbstractEMBApplica
getInstanceRegistry().setVirtualInstance( virtualKey, instance );
}
- protected void configureBuilder( final EMBEmbedderBuilder builder )
+ protected void configureBuilder( final MAEEmbedderBuilder builder )
throws MAEException
{
}
Copied: maven/sandbox/trunk/mae/mae-booter/src/main/java/org/apache/maven/mae/boot/embed/MAEEmbedder.java (from r1104405, maven/sandbox/trunk/mae/mae-booter/src/main/java/org/apache/maven/mae/boot/embed/EMBEmbedder.java)
URL: http://svn.apache.org/viewvc/maven/sandbox/trunk/mae/mae-booter/src/main/java/org/apache/maven/mae/boot/embed/MAEEmbedder.java?p2=maven/sandbox/trunk/mae/mae-booter/src/main/java/org/apache/maven/mae/boot/embed/MAEEmbedder.java&p1=maven/sandbox/trunk/mae/mae-booter/src/main/java/org/apache/maven/mae/boot/embed/EMBEmbedder.java&r1=1104405&r2=1104595&rev=1104595&view=diff
==============================================================================
--- maven/sandbox/trunk/mae/mae-booter/src/main/java/org/apache/maven/mae/boot/embed/EMBEmbedder.java (original)
+++ maven/sandbox/trunk/mae/mae-booter/src/main/java/org/apache/maven/mae/boot/embed/MAEEmbedder.java Tue May 17 22:08:49 2011
@@ -30,8 +30,8 @@ import org.apache.maven.execution.MavenE
import org.apache.maven.lifecycle.LifecycleExecutionException;
import org.apache.maven.mae.MAEExecutionRequest;
import org.apache.maven.mae.boot.log.EventLogger;
-import org.apache.maven.mae.boot.main.EMBMain;
-import org.apache.maven.mae.boot.services.EMBServiceManager;
+import org.apache.maven.mae.boot.main.MAEMain;
+import org.apache.maven.mae.boot.services.MAEServiceManager;
import org.apache.maven.mae.conf.MAEConfiguration;
import org.apache.maven.mae.conf.MAELibrary;
import org.apache.maven.mae.conf.loader.MAELibraryLoader;
@@ -74,8 +74,8 @@ import java.util.Map;
import java.util.Properties;
import java.util.Set;
-@Component( role = EMBEmbedder.class )
-public class EMBEmbedder
+@Component( role = MAEEmbedder.class )
+public class MAEEmbedder
{
private static boolean embInfoShown;
@@ -100,15 +100,15 @@ public class EMBEmbedder
private final DefaultSecDispatcher securityDispatcher;
- private transient final EMBServiceManager serviceManager;
+ private transient final MAEServiceManager serviceManager;
private final List<MAELibraryLoader> libraryLoaders;
private boolean infoPrinted = false;
- EMBEmbedder( final Maven maven, final MAEConfiguration embConfiguration, final ExtrudablePlexusContainer container,
+ MAEEmbedder( final Maven maven, final MAEConfiguration embConfiguration, final ExtrudablePlexusContainer container,
final SettingsBuilder settingsBuilder, final MavenExecutionRequestPopulator executionRequestPopulator,
- final DefaultSecDispatcher securityDispatcher, final EMBServiceManager serviceManager,
+ final DefaultSecDispatcher securityDispatcher, final MAEServiceManager serviceManager,
final List<MAELibraryLoader> libraryLoaders, final PrintStream standardOut, final Logger logger,
final boolean shouldShowErrors, final boolean showVersion )
{
@@ -128,28 +128,28 @@ public class EMBEmbedder
}
public synchronized Injector injector()
- throws EMBEmbeddingException
+ throws MAEEmbeddingException
{
printInfo( null );
return container.getInjector();
}
public synchronized Map<Object, Throwable> wire( final Object... instances )
- throws EMBEmbeddingException
+ throws MAEEmbeddingException
{
printInfo( null );
return container.extrudeDependencies( instances );
}
- public synchronized EMBServiceManager serviceManager()
- throws EMBEmbeddingException
+ public synchronized MAEServiceManager serviceManager()
+ throws MAEEmbeddingException
{
printInfo( null );
return serviceManager;
}
public MavenExecutionResult execute( final MAEExecutionRequest request )
- throws EMBEmbeddingException
+ throws MAEEmbeddingException
{
final PrintStream oldOut = System.out;
try
@@ -173,7 +173,7 @@ public class EMBEmbedder
}
public String encryptMasterPassword( final MAEExecutionRequest request )
- throws EMBEmbeddingException
+ throws MAEEmbeddingException
{
printInfo( null );
@@ -194,12 +194,12 @@ public class EMBEmbedder
}
catch ( final PlexusCipherException e )
{
- throw new EMBEmbeddingException( "Failed to encrypt master password: {0}", e, e.getMessage() );
+ throw new MAEEmbeddingException( "Failed to encrypt master password: {0}", e, e.getMessage() );
}
}
public String encryptPassword( final MAEExecutionRequest request )
- throws EMBEmbeddingException
+ throws MAEEmbeddingException
{
printInfo( null );
@@ -240,16 +240,16 @@ public class EMBEmbedder
}
catch ( final PlexusCipherException e )
{
- throw new EMBEmbeddingException( "Failed to encrypt password: {0}", e, e.getMessage() );
+ throw new MAEEmbeddingException( "Failed to encrypt password: {0}", e, e.getMessage() );
}
catch ( final SecDispatcherException e )
{
- throw new EMBEmbeddingException( "Failed to encrypt password: {0}", e, e.getMessage() );
+ throw new MAEEmbeddingException( "Failed to encrypt password: {0}", e, e.getMessage() );
}
}
protected void doExecutionStarting()
- throws EMBEmbeddingException
+ throws MAEEmbeddingException
{
for ( final MAELibrary library : embConfiguration.getLibraries() )
{
@@ -266,7 +266,7 @@ public class EMBEmbedder
}
catch ( final ComponentLookupException e )
{
- throw new EMBEmbeddingException(
+ throw new MAEEmbeddingException(
"Failed to lookup load-on-start component for initialization: %s.\nReason: %s",
e, key, e.getMessage() );
}
@@ -301,7 +301,7 @@ public class EMBEmbedder
}
protected synchronized void injectEnvironment( final MAEExecutionRequest request )
- throws EMBEmbeddingException
+ throws MAEEmbeddingException
{
injectLogSettings( request );
@@ -338,11 +338,11 @@ public class EMBEmbedder
protected void injectFromProperties( final MAEExecutionRequest request )
{
- String localRepoProperty = request.getUserProperties().getProperty( EMBMain.LOCAL_REPO_PROPERTY );
+ String localRepoProperty = request.getUserProperties().getProperty( MAEMain.LOCAL_REPO_PROPERTY );
if ( localRepoProperty == null )
{
- localRepoProperty = request.getSystemProperties().getProperty( EMBMain.LOCAL_REPO_PROPERTY );
+ localRepoProperty = request.getSystemProperties().getProperty( MAEMain.LOCAL_REPO_PROPERTY );
}
if ( localRepoProperty != null )
@@ -409,7 +409,7 @@ public class EMBEmbedder
}
protected void injectSettings( final MAEExecutionRequest request )
- throws EMBEmbeddingException
+ throws MAEEmbeddingException
{
Settings settings = request.getSettings();
SettingsBuildingResult settingsResult = null;
@@ -428,7 +428,7 @@ public class EMBEmbedder
}
catch ( final SettingsBuildingException e )
{
- throw new EMBEmbeddingException(
+ throw new MAEEmbeddingException(
"Failed to build settings; {0}\nGlobal settings: {1}\nUser settings: {2}",
e, e.getMessage(), request.getGlobalSettingsFile(),
request.getUserSettingsFile() );
@@ -443,7 +443,7 @@ public class EMBEmbedder
}
catch ( final MavenExecutionRequestPopulationException e )
{
- throw new EMBEmbeddingException( "Failed to populate request from settings; {0}", e, e.getMessage() );
+ throw new MAEEmbeddingException( "Failed to populate request from settings; {0}", e, e.getMessage() );
}
if ( !settingsResult.getProblems().isEmpty() && logger.isWarnEnabled() )
Propchange: maven/sandbox/trunk/mae/mae-booter/src/main/java/org/apache/maven/mae/boot/embed/MAEEmbedder.java
------------------------------------------------------------------------------
svn:eol-style = native
Copied: maven/sandbox/trunk/mae/mae-booter/src/main/java/org/apache/maven/mae/boot/embed/MAEEmbedderBuilder.java (from r1104405, maven/sandbox/trunk/mae/mae-booter/src/main/java/org/apache/maven/mae/boot/embed/EMBEmbedderBuilder.java)
URL: http://svn.apache.org/viewvc/maven/sandbox/trunk/mae/mae-booter/src/main/java/org/apache/maven/mae/boot/embed/MAEEmbedderBuilder.java?p2=maven/sandbox/trunk/mae/mae-booter/src/main/java/org/apache/maven/mae/boot/embed/MAEEmbedderBuilder.java&p1=maven/sandbox/trunk/mae/mae-booter/src/main/java/org/apache/maven/mae/boot/embed/EMBEmbedderBuilder.java&r1=1104405&r2=1104595&rev=1104595&view=diff
==============================================================================
--- maven/sandbox/trunk/mae/mae-booter/src/main/java/org/apache/maven/mae/boot/embed/EMBEmbedderBuilder.java (original)
+++ maven/sandbox/trunk/mae/mae-booter/src/main/java/org/apache/maven/mae/boot/embed/MAEEmbedderBuilder.java Tue May 17 22:08:49 2011
@@ -23,7 +23,7 @@ import org.apache.maven.Maven;
import org.apache.maven.cli.MavenLoggerManager;
import org.apache.maven.cli.PrintStreamLogger;
import org.apache.maven.execution.MavenExecutionRequestPopulator;
-import org.apache.maven.mae.boot.services.EMBServiceManager;
+import org.apache.maven.mae.boot.services.MAEServiceManager;
import org.apache.maven.mae.conf.CoreLibrary;
import org.apache.maven.mae.conf.MAEConfiguration;
import org.apache.maven.mae.conf.MAELibrary;
@@ -62,7 +62,7 @@ import java.util.LinkedHashSet;
import java.util.List;
import java.util.Set;
-public class EMBEmbedderBuilder
+public class MAEEmbedderBuilder
{
private static final MAELibraryLoader CORE_LOADER = new MAELibraryLoader()
@@ -111,13 +111,13 @@ public class EMBEmbedderBuilder
private DefaultSecDispatcher securityDispatcher;
- private EMBServiceManager serviceManager;
+ private MAEServiceManager serviceManager;
private transient String mavenHome;
private transient boolean loggerAutoCreated = false;
- private EMBEmbedder embedder;
+ private MAEEmbedder embedder;
private String[] debugLogHandles;
@@ -143,9 +143,9 @@ public class EMBEmbedderBuilder
private List<MAELibraryLoader> libraryLoaders;
- private final VirtualInstance<EMBEmbedder> embVirtual = new VirtualInstance<EMBEmbedder>( EMBEmbedder.class );
+ private final VirtualInstance<MAEEmbedder> embVirtual = new VirtualInstance<MAEEmbedder>( MAEEmbedder.class );
- public synchronized EMBEmbedderBuilder withSettingsBuilder( final SettingsBuilder settingsBuilder )
+ public synchronized MAEEmbedderBuilder withSettingsBuilder( final SettingsBuilder settingsBuilder )
{
this.settingsBuilder = settingsBuilder;
settingsBuilderProvided = true;
@@ -153,7 +153,7 @@ public class EMBEmbedderBuilder
}
public synchronized SettingsBuilder settingsBuilder()
- throws EMBEmbeddingException
+ throws MAEEmbeddingException
{
if ( settingsBuilder == null )
{
@@ -163,7 +163,7 @@ public class EMBEmbedderBuilder
return settingsBuilder;
}
- public synchronized EMBEmbedderBuilder withSecurityDispatcher( final DefaultSecDispatcher securityDispatcher )
+ public synchronized MAEEmbedderBuilder withSecurityDispatcher( final DefaultSecDispatcher securityDispatcher )
{
this.securityDispatcher = securityDispatcher;
securityDispatcherProvided = true;
@@ -171,7 +171,7 @@ public class EMBEmbedderBuilder
}
public synchronized DefaultSecDispatcher securityDispatcher()
- throws EMBEmbeddingException
+ throws MAEEmbeddingException
{
if ( securityDispatcher == null )
{
@@ -181,25 +181,25 @@ public class EMBEmbedderBuilder
return securityDispatcher;
}
- public synchronized EMBEmbedderBuilder withServiceManager( final EMBServiceManager serviceManager )
+ public synchronized MAEEmbedderBuilder withServiceManager( final MAEServiceManager serviceManager )
{
this.serviceManager = serviceManager;
serviceManagerProvided = true;
return this;
}
- public synchronized EMBServiceManager serviceManager()
- throws EMBEmbeddingException
+ public synchronized MAEServiceManager serviceManager()
+ throws MAEEmbeddingException
{
if ( serviceManager == null )
{
- serviceManager = lookup( EMBServiceManager.class );
+ serviceManager = lookup( MAEServiceManager.class );
serviceManagerProvided = true;
}
return serviceManager;
}
- public synchronized EMBEmbedderBuilder withExecutionRequestPopulator( final MavenExecutionRequestPopulator executionRequestPopulator )
+ public synchronized MAEEmbedderBuilder withExecutionRequestPopulator( final MavenExecutionRequestPopulator executionRequestPopulator )
{
this.executionRequestPopulator = executionRequestPopulator;
executionRequestPopulatorProvided = true;
@@ -207,7 +207,7 @@ public class EMBEmbedderBuilder
}
public synchronized MavenExecutionRequestPopulator executionRequestPopulator()
- throws EMBEmbeddingException
+ throws MAEEmbeddingException
{
if ( executionRequestPopulator == null )
{
@@ -218,13 +218,13 @@ public class EMBEmbedderBuilder
return executionRequestPopulator;
}
- public synchronized EMBEmbedderBuilder withCoreClassLoader( final ClassLoader classLoader )
+ public synchronized MAEEmbedderBuilder withCoreClassLoader( final ClassLoader classLoader )
{
coreClassLoader = classLoader;
return this;
}
- public synchronized EMBEmbedderBuilder withCoreClassLoader( final ClassLoader root, final Object... constituents )
+ public synchronized MAEEmbedderBuilder withCoreClassLoader( final ClassLoader root, final Object... constituents )
throws MalformedURLException
{
if ( constituents != null && constituents.length > 0 )
@@ -294,7 +294,7 @@ public class EMBEmbedderBuilder
return this;
}
- public synchronized EMBEmbedderBuilder withClassWorld( final ClassWorld classWorld )
+ public synchronized MAEEmbedderBuilder withClassWorld( final ClassWorld classWorld )
{
this.classWorld = classWorld;
return this;
@@ -320,7 +320,7 @@ public class EMBEmbedderBuilder
return classWorld;
}
- public synchronized EMBEmbedderBuilder withContainerConfiguration( final ContainerConfiguration containerConfiguration )
+ public synchronized MAEEmbedderBuilder withContainerConfiguration( final ContainerConfiguration containerConfiguration )
{
this.containerConfiguration = containerConfiguration;
return this;
@@ -339,7 +339,7 @@ public class EMBEmbedderBuilder
return containerConfiguration;
}
- public synchronized EMBEmbedderBuilder withClassScanningEnabled( final boolean classScanningEnabled )
+ public synchronized MAEEmbedderBuilder withClassScanningEnabled( final boolean classScanningEnabled )
{
this.classScanningEnabled = classScanningEnabled;
return this;
@@ -350,7 +350,7 @@ public class EMBEmbedderBuilder
return classScanningEnabled;
}
- public synchronized EMBEmbedderBuilder withMaven( final Maven maven )
+ public synchronized MAEEmbedderBuilder withMaven( final Maven maven )
{
this.maven = maven;
mavenProvided = true;
@@ -358,7 +358,7 @@ public class EMBEmbedderBuilder
}
public synchronized Maven maven()
- throws EMBEmbeddingException
+ throws MAEEmbeddingException
{
if ( maven == null )
{
@@ -368,7 +368,7 @@ public class EMBEmbedderBuilder
return maven;
}
- public synchronized EMBEmbedderBuilder withModelProcessor( final ModelProcessor modelProcessor )
+ public synchronized MAEEmbedderBuilder withModelProcessor( final ModelProcessor modelProcessor )
{
this.modelProcessor = modelProcessor;
modelProcessorProvided = true;
@@ -376,7 +376,7 @@ public class EMBEmbedderBuilder
}
public synchronized ModelProcessor modelProcessor()
- throws EMBEmbeddingException
+ throws MAEEmbeddingException
{
if ( modelProcessor == null )
{
@@ -388,7 +388,7 @@ public class EMBEmbedderBuilder
}
private <T> T lookup( final Class<T> cls )
- throws EMBEmbeddingException
+ throws MAEEmbeddingException
{
try
{
@@ -396,13 +396,13 @@ public class EMBEmbedderBuilder
}
catch ( final ComponentLookupException e )
{
- throw new EMBEmbeddingException( "Failed to lookup component: %s. Reason: %s", e, cls.getName(),
+ throw new MAEEmbeddingException( "Failed to lookup component: %s. Reason: %s", e, cls.getName(),
e.getMessage() );
}
}
private <T> T lookup( final Class<T> cls, final String hint )
- throws EMBEmbeddingException
+ throws MAEEmbeddingException
{
try
{
@@ -410,12 +410,12 @@ public class EMBEmbedderBuilder
}
catch ( final ComponentLookupException e )
{
- throw new EMBEmbeddingException( "Failed to lookup component: {0} with hint: {1}. Reason: {2}", e,
+ throw new MAEEmbeddingException( "Failed to lookup component: {0} with hint: {1}. Reason: {2}", e,
cls.getName(), hint, e.getMessage() );
}
}
- public synchronized EMBEmbedderBuilder withContainer( final ExtrudablePlexusContainer container )
+ public synchronized MAEEmbedderBuilder withContainer( final ExtrudablePlexusContainer container )
{
this.container = container;
resetContainer();
@@ -460,7 +460,7 @@ public class EMBEmbedderBuilder
}
public synchronized ExtrudablePlexusContainer container()
- throws EMBEmbeddingException
+ throws MAEEmbeddingException
{
// Need to switch to using: org.codehaus.plexus.MutablePlexusContainer.addPlexusInjector(List<PlexusBeanModule>,
// Module...)
@@ -469,7 +469,7 @@ public class EMBEmbedderBuilder
final ContainerConfiguration cc = containerConfiguration();
final InstanceRegistry reg = new InstanceRegistry( instanceRegistry() );
- reg.addVirtual( new ComponentKey<EMBEmbedder>( EMBEmbedder.class ), embVirtual );
+ reg.addVirtual( new ComponentKey<MAEEmbedder>( MAEEmbedder.class ), embVirtual );
MAEContainer c;
try
@@ -478,7 +478,7 @@ public class EMBEmbedderBuilder
}
catch ( final PlexusContainerException e )
{
- throw new EMBEmbeddingException( "Failed to initialize component container: {0}", e, e.getMessage() );
+ throw new MAEEmbeddingException( "Failed to initialize component container: {0}", e, e.getMessage() );
}
c.setLoggerManager( new MavenLoggerManager( logger ) );
@@ -499,7 +499,7 @@ public class EMBEmbedderBuilder
return embConfiguration().getInstanceRegistry();
}
- public EMBEmbedderBuilder withEMBConfiguration( final MAEConfiguration config )
+ public MAEEmbedderBuilder withEMBConfiguration( final MAEConfiguration config )
{
embConfiguration = config;
embConfigurationProvided = true;
@@ -542,7 +542,7 @@ public class EMBEmbedderBuilder
if ( debugLogHandles != null
&& Arrays.binarySearch( debugLogHandles, MAEConfiguration.STANDARD_LOG_HANDLE_CORE ) > -1 )
{
- EMBEmbedder.showEMBInfo( embConfiguration, loaders, standardOut() );
+ MAEEmbedder.showEMBInfo( embConfiguration, loaders, standardOut() );
}
}
catch ( final IOException e )
@@ -557,7 +557,7 @@ public class EMBEmbedderBuilder
return embConfiguration;
}
- public EMBEmbedderBuilder withServiceLibraryLoader( final boolean enabled )
+ public MAEEmbedderBuilder withServiceLibraryLoader( final boolean enabled )
{
boolean found = false;
final Collection<? extends MAELibraryLoader> loaders = libraryLoadersInternal();
@@ -598,13 +598,13 @@ public class EMBEmbedderBuilder
return false;
}
- public EMBEmbedderBuilder withLibraryLoader( final MAELibraryLoader loader )
+ public MAEEmbedderBuilder withLibraryLoader( final MAELibraryLoader loader )
{
libraryLoadersInternal().add( loader );
return this;
}
- public EMBEmbedderBuilder withLibraryLoader( final MAELibraryLoader loader, final int offset )
+ public MAEEmbedderBuilder withLibraryLoader( final MAELibraryLoader loader, final int offset )
{
final List<MAELibraryLoader> loaders = libraryLoadersInternal();
if ( offset < 0 )
@@ -644,7 +644,7 @@ public class EMBEmbedderBuilder
return loaders;
}
- public EMBEmbedderBuilder withVersion( final boolean showVersion )
+ public MAEEmbedderBuilder withVersion( final boolean showVersion )
{
this.showVersion = showVersion;
return this;
@@ -655,7 +655,7 @@ public class EMBEmbedderBuilder
return showVersion;
}
- public EMBEmbedderBuilder withLogFile( final File logFile )
+ public MAEEmbedderBuilder withLogFile( final File logFile )
{
this.logFile = logFile;
return this;
@@ -666,7 +666,7 @@ public class EMBEmbedderBuilder
return logFile;
}
- public EMBEmbedderBuilder withQuietMode( final boolean quiet )
+ public MAEEmbedderBuilder withQuietMode( final boolean quiet )
{
this.quiet = quiet;
return this;
@@ -677,7 +677,7 @@ public class EMBEmbedderBuilder
return quiet;
}
- public EMBEmbedderBuilder withDebugMode( final boolean debug )
+ public MAEEmbedderBuilder withDebugMode( final boolean debug )
{
this.debug = debug;
return this;
@@ -688,7 +688,7 @@ public class EMBEmbedderBuilder
return debug;
}
- public EMBEmbedderBuilder withErrorMode( final boolean showErrors )
+ public MAEEmbedderBuilder withErrorMode( final boolean showErrors )
{
this.showErrors = showErrors;
return this;
@@ -699,7 +699,7 @@ public class EMBEmbedderBuilder
return showErrors;
}
- public synchronized EMBEmbedderBuilder withStandardOut( final PrintStream stdout )
+ public synchronized MAEEmbedderBuilder withStandardOut( final PrintStream stdout )
{
this.stdout = stdout;
@@ -716,7 +716,7 @@ public class EMBEmbedderBuilder
return stdout;
}
- public EMBEmbedderBuilder withStandardErr( final PrintStream stderr )
+ public MAEEmbedderBuilder withStandardErr( final PrintStream stderr )
{
this.stderr = stderr;
return this;
@@ -727,7 +727,7 @@ public class EMBEmbedderBuilder
return stderr;
}
- public EMBEmbedderBuilder withStandardIn( final InputStream stdin )
+ public MAEEmbedderBuilder withStandardIn( final InputStream stdin )
{
this.stdin = stdin;
return this;
@@ -738,7 +738,7 @@ public class EMBEmbedderBuilder
return stdin;
}
- public EMBEmbedderBuilder withLogger( final Logger logger )
+ public MAEEmbedderBuilder withLogger( final Logger logger )
{
this.logger = logger;
return this;
@@ -797,11 +797,11 @@ public class EMBEmbedderBuilder
logger();
}
- protected synchronized EMBEmbedder createEmbedder()
- throws EMBEmbeddingException
+ protected synchronized MAEEmbedder createEmbedder()
+ throws MAEEmbeddingException
{
- final EMBEmbedder embedder =
- new EMBEmbedder( maven(), embConfiguration(), container(), settingsBuilder(), executionRequestPopulator(),
+ final MAEEmbedder embedder =
+ new MAEEmbedder( maven(), embConfiguration(), container(), settingsBuilder(), executionRequestPopulator(),
securityDispatcher(), serviceManager(), libraryLoaders(), standardOut(), logger(),
shouldShowErrors(), showVersion() );
@@ -810,8 +810,8 @@ public class EMBEmbedderBuilder
return embedder;
}
- public synchronized EMBEmbedder build()
- throws EMBEmbeddingException
+ public synchronized MAEEmbedder build()
+ throws MAEEmbeddingException
{
if ( embedder == null )
{
@@ -826,7 +826,7 @@ public class EMBEmbedderBuilder
return embedder;
}
- public EMBEmbedderBuilder withDebugLogHandles( final String[] debugLogHandles )
+ public MAEEmbedderBuilder withDebugLogHandles( final String[] debugLogHandles )
{
this.debugLogHandles = debugLogHandles;
logHandlesConfigured = false;
Propchange: maven/sandbox/trunk/mae/mae-booter/src/main/java/org/apache/maven/mae/boot/embed/MAEEmbedderBuilder.java
------------------------------------------------------------------------------
svn:eol-style = native
Copied: maven/sandbox/trunk/mae/mae-booter/src/main/java/org/apache/maven/mae/boot/embed/MAEEmbeddingException.java (from r1104405, maven/sandbox/trunk/mae/mae-booter/src/main/java/org/apache/maven/mae/boot/embed/EMBEmbeddingException.java)
URL: http://svn.apache.org/viewvc/maven/sandbox/trunk/mae/mae-booter/src/main/java/org/apache/maven/mae/boot/embed/MAEEmbeddingException.java?p2=maven/sandbox/trunk/mae/mae-booter/src/main/java/org/apache/maven/mae/boot/embed/MAEEmbeddingException.java&p1=maven/sandbox/trunk/mae/mae-booter/src/main/java/org/apache/maven/mae/boot/embed/EMBEmbeddingException.java&r1=1104405&r2=1104595&rev=1104595&view=diff
==============================================================================
--- maven/sandbox/trunk/mae/mae-booter/src/main/java/org/apache/maven/mae/boot/embed/EMBEmbeddingException.java (original)
+++ maven/sandbox/trunk/mae/mae-booter/src/main/java/org/apache/maven/mae/boot/embed/MAEEmbeddingException.java Tue May 17 22:08:49 2011
@@ -18,28 +18,28 @@ package org.apache.maven.mae.boot.embed;
import org.apache.maven.mae.MAEException;
-public class EMBEmbeddingException
+public class MAEEmbeddingException
extends MAEException
{
private static final long serialVersionUID = 2L;
- public EMBEmbeddingException( final String message, final Throwable cause )
+ public MAEEmbeddingException( final String message, final Throwable cause )
{
super( message, cause );
}
- public EMBEmbeddingException( final String message )
+ public MAEEmbeddingException( final String message )
{
super( message );
}
- public EMBEmbeddingException( final String message, final Throwable cause, final Object... params )
+ public MAEEmbeddingException( final String message, final Throwable cause, final Object... params )
{
super( message, cause, params );
}
- public EMBEmbeddingException( final String message, final Object... params )
+ public MAEEmbeddingException( final String message, final Object... params )
{
super( message, params );
}
Propchange: maven/sandbox/trunk/mae/mae-booter/src/main/java/org/apache/maven/mae/boot/embed/MAEEmbeddingException.java
------------------------------------------------------------------------------
svn:eol-style = native
Modified: maven/sandbox/trunk/mae/mae-booter/src/main/java/org/apache/maven/mae/boot/main/CliRequest.java
URL: http://svn.apache.org/viewvc/maven/sandbox/trunk/mae/mae-booter/src/main/java/org/apache/maven/mae/boot/main/CliRequest.java?rev=1104595&r1=1104594&r2=1104595&view=diff
==============================================================================
--- maven/sandbox/trunk/mae/mae-booter/src/main/java/org/apache/maven/mae/boot/main/CliRequest.java (original)
+++ maven/sandbox/trunk/mae/mae-booter/src/main/java/org/apache/maven/mae/boot/main/CliRequest.java Tue May 17 22:08:49 2011
@@ -19,7 +19,7 @@ package org.apache.maven.mae.boot.main;
import org.apache.commons.cli.CommandLine;
import org.apache.maven.mae.DefaultMAEExecutionRequest;
import org.apache.maven.mae.MAEExecutionRequest;
-import org.apache.maven.mae.boot.embed.EMBEmbedderBuilder;
+import org.apache.maven.mae.boot.embed.MAEEmbedderBuilder;
import org.codehaus.plexus.classworlds.ClassWorld;
import java.io.PrintStream;
@@ -41,12 +41,12 @@ public final class CliRequest
public MAEExecutionRequest request;
- public EMBEmbedderBuilder builder;
+ public MAEEmbedderBuilder builder;
public CliRequest( final String[] args, final ClassWorld classWorld )
{
this.args = args;
- builder = new EMBEmbedderBuilder().withClassWorld( classWorld );
+ builder = new MAEEmbedderBuilder().withClassWorld( classWorld );
request = new DefaultMAEExecutionRequest();
}
Copied: maven/sandbox/trunk/mae/mae-booter/src/main/java/org/apache/maven/mae/boot/main/MAECLIManager.java (from r1104405, maven/sandbox/trunk/mae/mae-booter/src/main/java/org/apache/maven/mae/boot/main/EMBCLIManager.java)
URL: http://svn.apache.org/viewvc/maven/sandbox/trunk/mae/mae-booter/src/main/java/org/apache/maven/mae/boot/main/MAECLIManager.java?p2=maven/sandbox/trunk/mae/mae-booter/src/main/java/org/apache/maven/mae/boot/main/MAECLIManager.java&p1=maven/sandbox/trunk/mae/mae-booter/src/main/java/org/apache/maven/mae/boot/main/EMBCLIManager.java&r1=1104405&r2=1104595&rev=1104595&view=diff
==============================================================================
--- maven/sandbox/trunk/mae/mae-booter/src/main/java/org/apache/maven/mae/boot/main/EMBCLIManager.java (original)
+++ maven/sandbox/trunk/mae/mae-booter/src/main/java/org/apache/maven/mae/boot/main/MAECLIManager.java Tue May 17 22:08:49 2011
@@ -30,7 +30,7 @@ import java.io.PrintWriter;
import java.util.ArrayList;
import java.util.List;
-public class EMBCLIManager
+public class MAECLIManager
{
public static final String XAVEN_DEBUG_LOG_HANDLES = "ZX";
@@ -38,7 +38,7 @@ public class EMBCLIManager
private final Options options;
@SuppressWarnings( "static-access" )
- public EMBCLIManager()
+ public MAECLIManager()
{
options = new Options();
Propchange: maven/sandbox/trunk/mae/mae-booter/src/main/java/org/apache/maven/mae/boot/main/MAECLIManager.java
------------------------------------------------------------------------------
svn:eol-style = native
Copied: maven/sandbox/trunk/mae/mae-booter/src/main/java/org/apache/maven/mae/boot/main/MAEMain.java (from r1104405, maven/sandbox/trunk/mae/mae-booter/src/main/java/org/apache/maven/mae/boot/main/EMBMain.java)
URL: http://svn.apache.org/viewvc/maven/sandbox/trunk/mae/mae-booter/src/main/java/org/apache/maven/mae/boot/main/MAEMain.java?p2=maven/sandbox/trunk/mae/mae-booter/src/main/java/org/apache/maven/mae/boot/main/MAEMain.java&p1=maven/sandbox/trunk/mae/mae-booter/src/main/java/org/apache/maven/mae/boot/main/EMBMain.java&r1=1104405&r2=1104595&rev=1104595&view=diff
==============================================================================
--- maven/sandbox/trunk/mae/mae-booter/src/main/java/org/apache/maven/mae/boot/main/EMBMain.java (original)
+++ maven/sandbox/trunk/mae/mae-booter/src/main/java/org/apache/maven/mae/boot/main/MAEMain.java Tue May 17 22:08:49 2011
@@ -24,8 +24,8 @@ import org.apache.maven.execution.MavenE
import org.apache.maven.execution.MavenExecutionResult;
import org.apache.maven.lifecycle.internal.LifecycleWeaveBuilder;
import org.apache.maven.mae.MAEExecutionRequest;
-import org.apache.maven.mae.boot.embed.EMBEmbedder;
-import org.apache.maven.mae.boot.embed.EMBEmbeddingException;
+import org.apache.maven.mae.boot.embed.MAEEmbedder;
+import org.apache.maven.mae.boot.embed.MAEEmbeddingException;
import org.apache.maven.mae.boot.log.BatchTransferListener;
import org.apache.maven.mae.boot.log.InteractiveTransferListener;
import org.apache.maven.model.building.ModelProcessor;
@@ -46,7 +46,7 @@ import java.util.List;
import java.util.Properties;
import java.util.StringTokenizer;
-public class EMBMain
+public class MAEMain
{
public static final String LOCAL_REPO_PROPERTY = "maven.repo.local";
@@ -67,13 +67,13 @@ public class EMBMain
private final ClassWorld classWorld;
- public EMBMain()
+ public MAEMain()
{
this( null );
}
// This supports painless invocation by the Verifier during embedded execution of the core ITs
- public EMBMain( final ClassWorld classWorld )
+ public MAEMain( final ClassWorld classWorld )
{
this.classWorld = classWorld;
}
@@ -88,13 +88,13 @@ public class EMBMain
/** @noinspection ConfusingMainMethod */
public static int main( final String[] args, final ClassWorld classWorld )
{
- final EMBMain cli = new EMBMain();
+ final MAEMain cli = new MAEMain();
return cli.doMain( new CliRequest( args, classWorld ) );
}
public static int doMain( final String[] args, final ClassWorld classWorld )
{
- final EMBMain cli = new EMBMain();
+ final MAEMain cli = new MAEMain();
return cli.doMain( new CliRequest( args, classWorld ) );
}
@@ -157,7 +157,7 @@ public class EMBMain
protected void cli( final CliRequest cliRequest )
throws Exception
{
- final EMBCLIManager cliManager = new EMBCLIManager();
+ final MAECLIManager cliManager = new MAECLIManager();
try
{
@@ -175,9 +175,9 @@ public class EMBMain
cliRequest.builder.withDebugMode( cliRequest.commandLine.hasOption( CLIManager.DEBUG ) );
cliRequest.builder.withQuietMode( cliRequest.commandLine.hasOption( CLIManager.QUIET ) );
cliRequest.builder.withVersion( cliRequest.commandLine.hasOption( CLIManager.SHOW_VERSION ) );
- if ( cliRequest.commandLine.hasOption( EMBCLIManager.XAVEN_DEBUG_LOG_HANDLES ) )
+ if ( cliRequest.commandLine.hasOption( MAECLIManager.XAVEN_DEBUG_LOG_HANDLES ) )
{
- cliRequest.builder.withDebugLogHandles( cliRequest.commandLine.getOptionValue( EMBCLIManager.XAVEN_DEBUG_LOG_HANDLES )
+ cliRequest.builder.withDebugLogHandles( cliRequest.commandLine.getOptionValue( MAECLIManager.XAVEN_DEBUG_LOG_HANDLES )
.split( "\\s*,\\s*" ) );
}
@@ -198,7 +198,7 @@ public class EMBMain
{
try
{
- EMBEmbedder.showVersion( cliRequest.builder.embConfiguration(), cliRequest.builder.libraryLoaders(),
+ MAEEmbedder.showVersion( cliRequest.builder.embConfiguration(), cliRequest.builder.libraryLoaders(),
cliRequest.builder.standardOut() );
}
catch ( final IOException e )
@@ -243,9 +243,9 @@ public class EMBMain
}
protected int execute( final CliRequest cliRequest )
- throws EMBEmbeddingException
+ throws MAEEmbeddingException
{
- final EMBEmbedder embedder = cliRequest.builder.build();
+ final MAEEmbedder embedder = cliRequest.builder.build();
final MavenExecutionResult result = embedder.execute( cliRequest.request );
return embedder.formatErrorOutput( cliRequest.request, result );
@@ -304,7 +304,7 @@ public class EMBMain
}
protected MAEExecutionRequest populateRequest( final CliRequest cliRequest )
- throws EMBEmbeddingException
+ throws MAEEmbeddingException
{
// cliRequest.builder.build();
@@ -471,7 +471,7 @@ public class EMBMain
}
else
{
- userToolchainsFile = EMBMain.DEFAULT_USER_TOOLCHAINS_FILE;
+ userToolchainsFile = MAEMain.DEFAULT_USER_TOOLCHAINS_FILE;
}
request.setBaseDirectory( baseDirectory )
@@ -546,11 +546,11 @@ public class EMBMain
request.setMakeBehavior( MavenExecutionRequest.REACTOR_MAKE_BOTH );
}
- String localRepoProperty = request.getUserProperties().getProperty( EMBMain.LOCAL_REPO_PROPERTY );
+ String localRepoProperty = request.getUserProperties().getProperty( MAEMain.LOCAL_REPO_PROPERTY );
if ( localRepoProperty == null )
{
- localRepoProperty = request.getSystemProperties().getProperty( EMBMain.LOCAL_REPO_PROPERTY );
+ localRepoProperty = request.getSystemProperties().getProperty( MAEMain.LOCAL_REPO_PROPERTY );
}
if ( localRepoProperty != null )
@@ -560,7 +560,7 @@ public class EMBMain
final String threadConfiguration =
commandLine.hasOption( CLIManager.THREADS ) ? commandLine.getOptionValue( CLIManager.THREADS )
- : request.getSystemProperties().getProperty( EMBMain.THREADS_DEPRECATED ); // TODO: Remove
+ : request.getSystemProperties().getProperty( MAEMain.THREADS_DEPRECATED ); // TODO: Remove
// this setting.
// Note that the
// int-tests use
Propchange: maven/sandbox/trunk/mae/mae-booter/src/main/java/org/apache/maven/mae/boot/main/MAEMain.java
------------------------------------------------------------------------------
svn:eol-style = native
Copied: maven/sandbox/trunk/mae/mae-booter/src/main/java/org/apache/maven/mae/boot/services/DefaultMAEServiceManager.java (from r1104405, maven/sandbox/trunk/mae/mae-booter/src/main/java/org/apache/maven/mae/boot/services/DefaultEMBServiceManager.java)
URL: http://svn.apache.org/viewvc/maven/sandbox/trunk/mae/mae-booter/src/main/java/org/apache/maven/mae/boot/services/DefaultMAEServiceManager.java?p2=maven/sandbox/trunk/mae/mae-booter/src/main/java/org/apache/maven/mae/boot/services/DefaultMAEServiceManager.java&p1=maven/sandbox/trunk/mae/mae-booter/src/main/java/org/apache/maven/mae/boot/services/DefaultEMBServiceManager.java&r1=1104405&r2=1104595&rev=1104595&view=diff
==============================================================================
--- maven/sandbox/trunk/mae/mae-booter/src/main/java/org/apache/maven/mae/boot/services/DefaultEMBServiceManager.java (original)
+++ maven/sandbox/trunk/mae/mae-booter/src/main/java/org/apache/maven/mae/boot/services/DefaultMAEServiceManager.java Tue May 17 22:08:49 2011
@@ -24,7 +24,7 @@ import org.apache.maven.execution.MavenE
import org.apache.maven.execution.MavenExecutionRequestPopulationException;
import org.apache.maven.execution.MavenExecutionRequestPopulator;
import org.apache.maven.mae.DefaultMAEExecutionRequest;
-import org.apache.maven.mae.boot.embed.EMBEmbeddingException;
+import org.apache.maven.mae.boot.embed.MAEEmbeddingException;
import org.apache.maven.mae.internal.container.ServiceAuthorizer;
import org.apache.maven.model.building.ModelBuildingRequest;
import org.apache.maven.project.DefaultProjectBuildingRequest;
@@ -36,9 +36,9 @@ import org.codehaus.plexus.component.ann
import org.codehaus.plexus.component.repository.exception.ComponentLookupException;
import org.sonatype.aether.RepositorySystemSession;
-@Component( role = EMBServiceManager.class )
-public class DefaultEMBServiceManager
- implements EMBServiceManager/* , Contextualizable */
+@Component( role = MAEServiceManager.class )
+public class DefaultMAEServiceManager
+ implements MAEServiceManager/* , Contextualizable */
{
// private final Logger logger = Logger.getLogger( EMBConfiguration.STANDARD_LOG_HANDLE_CORE );
@@ -89,7 +89,7 @@ public class DefaultEMBServiceManager
}
public DefaultProjectBuildingRequest createProjectBuildingRequest()
- throws EMBEmbeddingException
+ throws MAEEmbeddingException
{
final DefaultProjectBuildingRequest req = new DefaultProjectBuildingRequest();
req.setLocalRepository( defaultLocalRepository() );
@@ -114,7 +114,7 @@ public class DefaultEMBServiceManager
}
public RepositorySystemSession createAetherRepositorySystemSession()
- throws EMBEmbeddingException
+ throws MAEEmbeddingException
{
try
{
@@ -125,7 +125,7 @@ public class DefaultEMBServiceManager
}
catch ( final MavenExecutionRequestPopulationException e )
{
- throw new EMBEmbeddingException( "Failed to populate default Maven execution request, "
+ throw new MAEEmbeddingException( "Failed to populate default Maven execution request, "
+ " for use in constructing a repository system session." + "\nReason: %s", e,
e.getMessage() );
}
@@ -137,7 +137,7 @@ public class DefaultEMBServiceManager
}
public synchronized ArtifactRepository defaultLocalRepository()
- throws EMBEmbeddingException
+ throws MAEEmbeddingException
{
if ( defaultLocalRepo == null )
{
@@ -147,7 +147,7 @@ public class DefaultEMBServiceManager
}
catch ( final InvalidRepositoryException e )
{
- throw new EMBEmbeddingException( "Failed to create default local-repository instance: {0}", e,
+ throw new MAEEmbeddingException( "Failed to create default local-repository instance: {0}", e,
e.getMessage() );
}
}
@@ -157,11 +157,11 @@ public class DefaultEMBServiceManager
@Override
public <T> T service( final Class<T> type )
- throws EMBEmbeddingException
+ throws MAEEmbeddingException
{
if ( type == null )
{
- throw new EMBEmbeddingException( "Invalid service: null" );
+ throw new MAEEmbeddingException( "Invalid service: null" );
}
if ( !authorizer.isAvailable( type ) )
@@ -175,18 +175,18 @@ public class DefaultEMBServiceManager
}
catch ( final ComponentLookupException e )
{
- throw new EMBEmbeddingException( "Failed to retrieve service: %s. Reason: %s", e, type.getName(),
+ throw new MAEEmbeddingException( "Failed to retrieve service: %s. Reason: %s", e, type.getName(),
e.getMessage() );
}
}
@Override
public <T> T service( final Class<T> type, final String hint )
- throws EMBEmbeddingException
+ throws MAEEmbeddingException
{
if ( type == null )
{
- throw new EMBEmbeddingException( "Invalid service: null" );
+ throw new MAEEmbeddingException( "Invalid service: null" );
}
if ( !authorizer.isAvailable( type, hint ) )
@@ -200,7 +200,7 @@ public class DefaultEMBServiceManager
}
catch ( final ComponentLookupException e )
{
- throw new EMBEmbeddingException( "Failed to retrieve service: %s with hint: %s. Reason: %s", e,
+ throw new MAEEmbeddingException( "Failed to retrieve service: %s with hint: %s. Reason: %s", e,
type.getName(), hint, e.getMessage() );
}
}
Propchange: maven/sandbox/trunk/mae/mae-booter/src/main/java/org/apache/maven/mae/boot/services/DefaultMAEServiceManager.java
------------------------------------------------------------------------------
svn:eol-style = native
Copied: maven/sandbox/trunk/mae/mae-booter/src/main/java/org/apache/maven/mae/boot/services/MAEServiceManager.java (from r1104405, maven/sandbox/trunk/mae/mae-booter/src/main/java/org/apache/maven/mae/boot/services/EMBServiceManager.java)
URL: http://svn.apache.org/viewvc/maven/sandbox/trunk/mae/mae-booter/src/main/java/org/apache/maven/mae/boot/services/MAEServiceManager.java?p2=maven/sandbox/trunk/mae/mae-booter/src/main/java/org/apache/maven/mae/boot/services/MAEServiceManager.java&p1=maven/sandbox/trunk/mae/mae-booter/src/main/java/org/apache/maven/mae/boot/services/EMBServiceManager.java&r1=1104405&r2=1104595&rev=1104595&view=diff
==============================================================================
--- maven/sandbox/trunk/mae/mae-booter/src/main/java/org/apache/maven/mae/boot/services/EMBServiceManager.java (original)
+++ maven/sandbox/trunk/mae/mae-booter/src/main/java/org/apache/maven/mae/boot/services/MAEServiceManager.java Tue May 17 22:08:49 2011
@@ -18,36 +18,36 @@ package org.apache.maven.mae.boot.servic
import org.apache.maven.artifact.repository.ArtifactRepository;
import org.apache.maven.execution.MavenExecutionRequest;
-import org.apache.maven.mae.boot.embed.EMBEmbeddingException;
+import org.apache.maven.mae.boot.embed.MAEEmbeddingException;
import org.apache.maven.project.DefaultProjectBuildingRequest;
import org.apache.maven.project.ProjectBuilder;
import org.apache.maven.repository.RepositorySystem;
import org.sonatype.aether.RepositorySystemSession;
-public interface EMBServiceManager
+public interface MAEServiceManager
{
ProjectBuilder projectBuilder();
DefaultProjectBuildingRequest createProjectBuildingRequest()
- throws EMBEmbeddingException;
+ throws MAEEmbeddingException;
RepositorySystem mavenRepositorySystem();
org.sonatype.aether.RepositorySystem aetherRepositorySystem();
RepositorySystemSession createAetherRepositorySystemSession()
- throws EMBEmbeddingException;
+ throws MAEEmbeddingException;
RepositorySystemSession createAetherRepositorySystemSession( MavenExecutionRequest request );
<T> T service( Class<T> type )
- throws EMBEmbeddingException;
+ throws MAEEmbeddingException;
<T> T service( Class<T> type, String hint )
- throws EMBEmbeddingException;
+ throws MAEEmbeddingException;
ArtifactRepository defaultLocalRepository()
- throws EMBEmbeddingException;
+ throws MAEEmbeddingException;
}
Propchange: maven/sandbox/trunk/mae/mae-booter/src/main/java/org/apache/maven/mae/boot/services/MAEServiceManager.java
------------------------------------------------------------------------------
svn:eol-style = native
Modified: maven/sandbox/trunk/mae/mae-booter/src/main/java/org/apache/maven/mae/boot/services/UnauthorizedServiceException.java
URL: http://svn.apache.org/viewvc/maven/sandbox/trunk/mae/mae-booter/src/main/java/org/apache/maven/mae/boot/services/UnauthorizedServiceException.java?rev=1104595&r1=1104594&r2=1104595&view=diff
==============================================================================
--- maven/sandbox/trunk/mae/mae-booter/src/main/java/org/apache/maven/mae/boot/services/UnauthorizedServiceException.java (original)
+++ maven/sandbox/trunk/mae/mae-booter/src/main/java/org/apache/maven/mae/boot/services/UnauthorizedServiceException.java Tue May 17 22:08:49 2011
@@ -16,10 +16,10 @@
package org.apache.maven.mae.boot.services;
-import org.apache.maven.mae.boot.embed.EMBEmbeddingException;
+import org.apache.maven.mae.boot.embed.MAEEmbeddingException;
public class UnauthorizedServiceException
- extends EMBEmbeddingException
+ extends MAEEmbeddingException
{
private static final long serialVersionUID = 1L;