You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by br...@apache.org on 2005/10/11 08:42:31 UTC
svn commit: r312818 - in /maven/components/trunk: ./ maven-artifact-manager/src/main/java/org/apache/maven/artifact/manager/ maven-core/ maven-core/src/main/java/org/apache/maven/cli/

Author: brett
Date: Mon Oct 10 23:42:21 2005
New Revision: 312818

URL: http://svn.apache.org/viewcvs?rev=312818&view=rev
Log:
enable batch mode on the wagon

Modified:
    maven/components/trunk/maven-artifact-manager/src/main/java/org/apache/maven/artifact/manager/DefaultWagonManager.java
    maven/components/trunk/maven-artifact-manager/src/main/java/org/apache/maven/artifact/manager/WagonManager.java
    maven/components/trunk/maven-core/pom.xml
    maven/components/trunk/maven-core/src/main/java/org/apache/maven/cli/MavenCli.java
    maven/components/trunk/pom.xml

Modified: maven/components/trunk/maven-artifact-manager/src/main/java/org/apache/maven/artifact/manager/DefaultWagonManager.java
URL: http://svn.apache.org/viewcvs/maven/components/trunk/maven-artifact-manager/src/main/java/org/apache/maven/artifact/manager/DefaultWagonManager.java?rev=312818&r1=312817&r2=312818&view=diff
==============================================================================
--- maven/components/trunk/maven-artifact-manager/src/main/java/org/apache/maven/artifact/manager/DefaultWagonManager.java (original)
+++ maven/components/trunk/maven-artifact-manager/src/main/java/org/apache/maven/artifact/manager/DefaultWagonManager.java Mon Oct 10 23:42:21 2005
@@ -75,6 +75,8 @@
 
     private ArtifactRepositoryFactory repositoryFactory;
 
+    private boolean interactive = true;
+
     public Wagon getWagon( String protocol )
         throws UnsupportedProtocolException
     {
@@ -83,6 +85,7 @@
         try
         {
             wagon = (Wagon) container.lookup( Wagon.ROLE, protocol );
+            wagon.setInteractive( interactive );
         }
         catch ( ComponentLookupException e )
         {
@@ -671,5 +674,10 @@
     public boolean isOnline()
     {
         return online;
+    }
+
+    public void setInteractive( boolean interactive )
+    {
+        this.interactive = interactive;
     }
 }

Modified: maven/components/trunk/maven-artifact-manager/src/main/java/org/apache/maven/artifact/manager/WagonManager.java
URL: http://svn.apache.org/viewcvs/maven/components/trunk/maven-artifact-manager/src/main/java/org/apache/maven/artifact/manager/WagonManager.java?rev=312818&r1=312817&r2=312818&view=diff
==============================================================================
--- maven/components/trunk/maven-artifact-manager/src/main/java/org/apache/maven/artifact/manager/WagonManager.java (original)
+++ maven/components/trunk/maven-artifact-manager/src/main/java/org/apache/maven/artifact/manager/WagonManager.java Mon Oct 10 23:42:21 2005
@@ -75,4 +75,6 @@
     ProxyInfo getProxy( String protocol );
 
     AuthenticationInfo getAuthenticationInfo( String id );
+
+    void setInteractive( boolean interactive );
 }

Modified: maven/components/trunk/maven-core/pom.xml
URL: http://svn.apache.org/viewcvs/maven/components/trunk/maven-core/pom.xml?rev=312818&r1=312817&r2=312818&view=diff
==============================================================================
--- maven/components/trunk/maven-core/pom.xml (original)
+++ maven/components/trunk/maven-core/pom.xml Mon Oct 10 23:42:21 2005
@@ -132,21 +132,10 @@
       <version>2.0-beta-4-SNAPSHOT</version>
     </dependency>
     <dependency>
-      <groupId>jsch</groupId>
-      <artifactId>jsch</artifactId>
-      <version>0.1.21</version>
-    </dependency>
-    <dependency>
       <groupId>org.apache.maven.wagon</groupId>
       <artifactId>wagon-ssh</artifactId>
       <version>1.0-alpha-5-SNAPSHOT</version>
       <scope>runtime</scope>
-      <exclusions>
-        <exclusion>
-          <groupId>plexus</groupId>
-          <artifactId>plexus-utils</artifactId>
-        </exclusion>
-      </exclusions>
     </dependency>
   </dependencies>
   <reporting>

Modified: maven/components/trunk/maven-core/src/main/java/org/apache/maven/cli/MavenCli.java
URL: http://svn.apache.org/viewcvs/maven/components/trunk/maven-core/src/main/java/org/apache/maven/cli/MavenCli.java?rev=312818&r1=312817&r2=312818&view=diff
==============================================================================
--- maven/components/trunk/maven-core/src/main/java/org/apache/maven/cli/MavenCli.java (original)
+++ maven/components/trunk/maven-core/src/main/java/org/apache/maven/cli/MavenCli.java Mon Oct 10 23:42:21 2005
@@ -459,6 +459,8 @@
             wagonManager.setDownloadMonitor( new BatchModeDownloadMonitor() );
         }
 
+        wagonManager.setInteractive( interactive );
+
         return (Maven) embedder.lookup( Maven.ROLE );
     }
 

Modified: maven/components/trunk/pom.xml
URL: http://svn.apache.org/viewcvs/maven/components/trunk/pom.xml?rev=312818&r1=312817&r2=312818&view=diff
==============================================================================
--- maven/components/trunk/pom.xml (original)
+++ maven/components/trunk/pom.xml Mon Oct 10 23:42:21 2005
@@ -219,15 +219,10 @@
   </dependencyManagement>
   <distributionManagement>
     <repository>
-      <id>repo1</id>
+      <id>localhost</id>
       <name>Maven Central Repository</name>
-      <url>scp://repo1.maven.org/home/projects/maven/repository-staging/to-ibiblio/maven2</url>
+      <url>scp://localhost/home/projects/maven/repository-staging/to-ibiblio/maven2</url>
     </repository>
-    <snapshotRepository>
-      <id>snapshots</id>
-      <name>Maven Central Development Repository</name>
-      <url>scp://repo1.maven.org/home/projects/maven/repository-staging/snapshots/maven2</url>
-    </snapshotRepository>
     <site>
       <id>website</id>
       <url>scp://minotaur.apache.org/www/maven.apache.org/maven2/</url>