svn commit: r1125562 - in /maven/sandbox/trunk/mae: mae-api/src/main/java/org/apache/maven/mae/ mae-booter/src/main/java/org/apache/maven/mae/boot/services/

[jd...@apache.org]

Author: jdcasey
Date: Fri May 20 20:50:34 2011
New Revision: 1125562

URL: http://svn.apache.org/viewvc?rev=1125562&view=rev
Log:
fixing up population of repository system session from execution request.

Modified:
    maven/sandbox/trunk/mae/mae-api/src/main/java/org/apache/maven/mae/DefaultMAEExecutionRequest.java
    maven/sandbox/trunk/mae/mae-booter/src/main/java/org/apache/maven/mae/boot/services/DefaultMAEServiceManager.java
    maven/sandbox/trunk/mae/mae-booter/src/main/java/org/apache/maven/mae/boot/services/MAEServiceManager.java

Modified: maven/sandbox/trunk/mae/mae-api/src/main/java/org/apache/maven/mae/DefaultMAEExecutionRequest.java
URL: http://svn.apache.org/viewvc/maven/sandbox/trunk/mae/mae-api/src/main/java/org/apache/maven/mae/DefaultMAEExecutionRequest.java?rev=1125562&r1=1125561&r2=1125562&view=diff
==============================================================================
--- maven/sandbox/trunk/mae/mae-api/src/main/java/org/apache/maven/mae/DefaultMAEExecutionRequest.java (original)
+++ maven/sandbox/trunk/mae/mae-api/src/main/java/org/apache/maven/mae/DefaultMAEExecutionRequest.java Fri May 20 20:50:34 2011
@@ -41,6 +41,10 @@ public class DefaultMAEExecutionRequest
     private String password;
 
     private final DefaultMavenExecutionRequest embedded = new DefaultMavenExecutionRequest();
+    
+//    public DefautMAEExecutionRequest()
+//    {
+//    }
 
     public DefaultMAEExecutionRequest copyOf()
     {

Modified: maven/sandbox/trunk/mae/mae-booter/src/main/java/org/apache/maven/mae/boot/services/DefaultMAEServiceManager.java
URL: http://svn.apache.org/viewvc/maven/sandbox/trunk/mae/mae-booter/src/main/java/org/apache/maven/mae/boot/services/DefaultMAEServiceManager.java?rev=1125562&r1=1125561&r2=1125562&view=diff
==============================================================================
--- maven/sandbox/trunk/mae/mae-booter/src/main/java/org/apache/maven/mae/boot/services/DefaultMAEServiceManager.java (original)
+++ maven/sandbox/trunk/mae/mae-booter/src/main/java/org/apache/maven/mae/boot/services/DefaultMAEServiceManager.java Fri May 20 20:50:34 2011
@@ -35,6 +35,7 @@ import org.codehaus.plexus.component.ann
 import org.codehaus.plexus.component.annotations.Requirement;
 import org.codehaus.plexus.component.repository.exception.ComponentLookupException;
 import org.sonatype.aether.RepositorySystemSession;
+import org.sonatype.aether.util.DefaultRepositoryCache;
 
 @Component( role = MAEServiceManager.class )
 public class DefaultMAEServiceManager
@@ -131,9 +132,32 @@ public class DefaultMAEServiceManager
         }
     }
 
-    public RepositorySystemSession createAetherRepositorySystemSession( final MavenExecutionRequest request )
+    public RepositorySystemSession createAetherRepositorySystemSession( MavenExecutionRequest request )
+        throws MAEEmbeddingException
     {
-        return defaultMaven.newRepositorySession( request );
+        if ( request == null )
+        {
+            return createAetherRepositorySystemSession();
+        }
+        else
+        {
+            try
+            {
+                request = requestPopulator.populateDefaults( request );
+                if ( request.getRepositoryCache() == null )
+                {
+                    request.setRepositoryCache( new DefaultRepositoryCache() );
+                }
+            }
+            catch ( MavenExecutionRequestPopulationException e )
+            {
+                throw new MAEEmbeddingException( "Failed to populate default Maven execution request, "
+                                                 + " for use in constructing a repository system session." + "\nReason: %s", e,
+                                                                  e.getMessage() );
+            }
+            
+            return defaultMaven.newRepositorySession( request );
+        }
     }
 
     public synchronized ArtifactRepository defaultLocalRepository()

Modified: maven/sandbox/trunk/mae/mae-booter/src/main/java/org/apache/maven/mae/boot/services/MAEServiceManager.java
URL: http://svn.apache.org/viewvc/maven/sandbox/trunk/mae/mae-booter/src/main/java/org/apache/maven/mae/boot/services/MAEServiceManager.java?rev=1125562&r1=1125561&r2=1125562&view=diff
==============================================================================
--- maven/sandbox/trunk/mae/mae-booter/src/main/java/org/apache/maven/mae/boot/services/MAEServiceManager.java (original)
+++ maven/sandbox/trunk/mae/mae-booter/src/main/java/org/apache/maven/mae/boot/services/MAEServiceManager.java Fri May 20 20:50:34 2011
@@ -27,19 +27,23 @@ import org.sonatype.aether.RepositorySys
 public interface MAEServiceManager
 {
 
-    ProjectBuilder projectBuilder();
+    ProjectBuilder projectBuilder()
+        throws MAEEmbeddingException;
 
     DefaultProjectBuildingRequest createProjectBuildingRequest()
         throws MAEEmbeddingException;
 
-    RepositorySystem mavenRepositorySystem();
+    RepositorySystem mavenRepositorySystem()
+        throws MAEEmbeddingException;
 
-    org.sonatype.aether.RepositorySystem aetherRepositorySystem();
+    org.sonatype.aether.RepositorySystem aetherRepositorySystem()
+        throws MAEEmbeddingException;
 
     RepositorySystemSession createAetherRepositorySystemSession()
         throws MAEEmbeddingException;
 
-    RepositorySystemSession createAetherRepositorySystemSession( MavenExecutionRequest request );
+    RepositorySystemSession createAetherRepositorySystemSession( MavenExecutionRequest request )
+        throws MAEEmbeddingException;
 
     <T> T service( Class<T> type )
         throws MAEEmbeddingException;