Author: jvanzyl
Date: Fri Jul  8 06:47:34 2005
New Revision: 209774

URL: http://svn.apache.org/viewcvs?rev=209774&view=rev
Log:
o adding a couple notes to m2 builder helper
o removing configuration for MavenSettings component which allows it to fall
  back to the defaults of the m2 installation on the machine.
  

Modified:
    maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/execution/maven/m2/DefaultMavenBuilderHelper.java
    maven/continuum/trunk/continuum-core/src/main/resources/META-INF/plexus/components.xml

Modified: maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/execution/maven/m2/DefaultMavenBuilderHelper.java
URL: http://svn.apache.org/viewcvs/maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/execution/maven/m2/DefaultMavenBuilderHelper.java?rev=209774&r1=209773&r2=209774&view=diff
==============================================================================
--- maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/execution/maven/m2/DefaultMavenBuilderHelper.java (original)
+++ maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/execution/maven/m2/DefaultMavenBuilderHelper.java Fri Jul  8 06:47:34 2005
@@ -89,9 +89,11 @@
 
         if ( StringUtils.isEmpty( continuumProject.getCommandLineArguments() ) )
         {
-            continuumProject.setCommandLineArguments( "-N -B" );
+            // ----------------------------------------------------------------------
+            // Run in non-interactive mode and non-recursive mode
+            // ----------------------------------------------------------------------
 
-//            continuumProject.setCommandLineArguments( "-N -B -Djline.terminal=jline.UnsupportedTerminal" );
+            continuumProject.setCommandLineArguments( "-N -B" );
         }
 
         if ( StringUtils.isEmpty( continuumProject.getGoals() ) )
@@ -268,6 +270,11 @@
 
     private ArtifactRepository getRepository()
     {
+        // ----------------------------------------------------------------------
+        // Set our configured location as the default but try to use the defaults
+        // as returned by the MavenSettings component.
+        // ----------------------------------------------------------------------
+
         String localRepository = this.localRepository;
 
         try

Modified: maven/continuum/trunk/continuum-core/src/main/resources/META-INF/plexus/components.xml
URL: http://svn.apache.org/viewcvs/maven/continuum/trunk/continuum-core/src/main/resources/META-INF/plexus/components.xml?rev=209774&r1=209773&r2=209774&view=diff
==============================================================================
--- maven/continuum/trunk/continuum-core/src/main/resources/META-INF/plexus/components.xml (original)
+++ maven/continuum/trunk/continuum-core/src/main/resources/META-INF/plexus/components.xml Fri Jul  8 06:47:34 2005
@@ -227,10 +227,6 @@
     <component>
       <role>org.apache.maven.settings.MavenSettingsBuilder</role>
       <implementation>org.apache.maven.settings.DefaultMavenSettingsBuilder</implementation>
-      <configuration>
-        <globalSettingsPath>${plexus.home}/conf/maven-global-settings.xml</globalSettingsPath>
-        <userSettingsPath>${plexus.home}/conf/maven-settings.xml</userSettingsPath>
-      </configuration>
     </component>
 
     <component>