maven-wagon-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jvan...@apache.org
Subject svn commit: r505639 - in /maven/wagon/trunk: ./ wagon-manager/ wagon-manager/src/main/java/org/apache/maven/wagon/manager/ wagon-manager/src/test/java/org/apache/maven/wagon/manager/
Date Sat, 10 Feb 2007 06:27:24 GMT
Author: jvanzyl
Date: Fri Feb  9 22:27:23 2007
New Revision: 505639

URL: http://svn.apache.org/viewvc?view=rev&rev=505639
Log:
o using plexus-utils which we already have in the core so that we don't need another 200k
for two methods
o put the ftp and dav providers in as test scope so that all the tests pass but they don't
wind up in the base
  maven distribution. this will screw people usings extensions and we are trying to move in
the other direction of not having
  to provide anything and have the container pick things up dynamically but for now we'll
keep the basic providers that we
  have in previous versions of maven


Modified:
    maven/wagon/trunk/pom.xml
    maven/wagon/trunk/wagon-manager/pom.xml
    maven/wagon/trunk/wagon-manager/src/main/java/org/apache/maven/wagon/manager/MirroredWagon.java
    maven/wagon/trunk/wagon-manager/src/main/java/org/apache/maven/wagon/manager/RepositorySettings.java
    maven/wagon/trunk/wagon-manager/src/test/java/org/apache/maven/wagon/manager/WagonManagerTest.java

Modified: maven/wagon/trunk/pom.xml
URL: http://svn.apache.org/viewvc/maven/wagon/trunk/pom.xml?view=diff&rev=505639&r1=505638&r2=505639
==============================================================================
--- maven/wagon/trunk/pom.xml (original)
+++ maven/wagon/trunk/pom.xml Fri Feb  9 22:27:23 2007
@@ -118,11 +118,6 @@
         <version>1.0-beta-3-SNAPSHOT</version>
       </dependency>
       <dependency>
-        <groupId>commons-lang</groupId>
-        <artifactId>commons-lang</artifactId>
-        <version>2.1</version>
-      </dependency>
-      <dependency>
         <groupId>junit</groupId>
         <artifactId>junit</artifactId>
         <version>3.8.1</version>

Modified: maven/wagon/trunk/wagon-manager/pom.xml
URL: http://svn.apache.org/viewvc/maven/wagon/trunk/wagon-manager/pom.xml?view=diff&rev=505639&r1=505638&r2=505639
==============================================================================
--- maven/wagon/trunk/wagon-manager/pom.xml (original)
+++ maven/wagon/trunk/wagon-manager/pom.xml Fri Feb  9 22:27:23 2007
@@ -26,10 +26,6 @@
       <scope>compile</scope>
     </dependency>
     <dependency>
-      <groupId>commons-lang</groupId>
-      <artifactId>commons-lang</artifactId>
-    </dependency>
-    <dependency>
       <groupId>org.apache.maven.wagon</groupId>
       <artifactId>wagon-provider-api</artifactId>
     </dependency>
@@ -43,6 +39,7 @@
       <groupId>org.apache.maven.wagon</groupId>
       <artifactId>wagon-ftp</artifactId>
       <version>1.0-beta-3-SNAPSHOT</version>
+      <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>org.apache.maven.wagon</groupId>
@@ -63,6 +60,7 @@
       <groupId>org.apache.maven.wagon</groupId>
       <artifactId>wagon-webdav</artifactId>
       <version>1.0-beta-3-SNAPSHOT</version>
+      <scope>test</scope>
     </dependency>
     <!-- TEST SCOPE -->
     <dependency>

Modified: maven/wagon/trunk/wagon-manager/src/main/java/org/apache/maven/wagon/manager/MirroredWagon.java
URL: http://svn.apache.org/viewvc/maven/wagon/trunk/wagon-manager/src/main/java/org/apache/maven/wagon/manager/MirroredWagon.java?view=diff&rev=505639&r1=505638&r2=505639
==============================================================================
--- maven/wagon/trunk/wagon-manager/src/main/java/org/apache/maven/wagon/manager/MirroredWagon.java
(original)
+++ maven/wagon/trunk/wagon-manager/src/main/java/org/apache/maven/wagon/manager/MirroredWagon.java
Fri Feb  9 22:27:23 2007
@@ -19,7 +19,6 @@
  * under the License.
  */
 
-import org.apache.commons.lang.StringUtils;
 import org.apache.maven.wagon.ConnectionException;
 import org.apache.maven.wagon.ResourceDoesNotExistException;
 import org.apache.maven.wagon.TransferFailedException;
@@ -33,6 +32,7 @@
 import org.apache.maven.wagon.proxy.ProxyInfo;
 import org.apache.maven.wagon.repository.Repository;
 import org.codehaus.plexus.logging.Logger;
+import org.codehaus.plexus.util.StringUtils;
 
 import java.io.File;
 import java.util.ArrayList;
@@ -311,7 +311,7 @@
         while ( it.hasNext() && !found )
         {
             String mirrorId = (String) it.next();
-            if ( StringUtils.equals( mirrorId, previous.getRepository().getId() ) )
+            if ( mirrorId.equals( previous.getRepository().getId() ) )
             {
                 // Found current mirror.  What's next?
 

Modified: maven/wagon/trunk/wagon-manager/src/main/java/org/apache/maven/wagon/manager/RepositorySettings.java
URL: http://svn.apache.org/viewvc/maven/wagon/trunk/wagon-manager/src/main/java/org/apache/maven/wagon/manager/RepositorySettings.java?view=diff&rev=505639&r1=505638&r2=505639
==============================================================================
--- maven/wagon/trunk/wagon-manager/src/main/java/org/apache/maven/wagon/manager/RepositorySettings.java
(original)
+++ maven/wagon/trunk/wagon-manager/src/main/java/org/apache/maven/wagon/manager/RepositorySettings.java
Fri Feb  9 22:27:23 2007
@@ -19,11 +19,11 @@
  * under the License.
  */
 
-import org.apache.commons.lang.StringUtils;
 import org.apache.maven.wagon.authentication.AuthenticationInfo;
 import org.apache.maven.wagon.proxy.ProxyInfo;
 import org.apache.maven.wagon.repository.RepositoryPermissions;
 import org.codehaus.plexus.configuration.xml.XmlPlexusConfiguration;
+import org.codehaus.plexus.util.StringUtils;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -126,7 +126,7 @@
     
     public boolean isMirror()
     {
-        return StringUtils.isNotBlank( mirrorOf );
+        return !StringUtils.isEmpty( mirrorOf );
     }
 
     public void setAuthentication( AuthenticationInfo authentication )

Modified: maven/wagon/trunk/wagon-manager/src/test/java/org/apache/maven/wagon/manager/WagonManagerTest.java
URL: http://svn.apache.org/viewvc/maven/wagon/trunk/wagon-manager/src/test/java/org/apache/maven/wagon/manager/WagonManagerTest.java?view=diff&rev=505639&r1=505638&r2=505639
==============================================================================
--- maven/wagon/trunk/wagon-manager/src/test/java/org/apache/maven/wagon/manager/WagonManagerTest.java
(original)
+++ maven/wagon/trunk/wagon-manager/src/test/java/org/apache/maven/wagon/manager/WagonManagerTest.java
Fri Feb  9 22:27:23 2007
@@ -211,7 +211,7 @@
         assertNotNull( protocols );
 
         String expectedProtocols[] = new String[] { "file", "ftp", "http", "https", "scp",
"scpexe", "sftp", "dav" };
-
+        
         assertEquals( "Supported Protocols : " + protocols, expectedProtocols.length, protocols.size()
);
     }
 



---------------------------------------------------------------------
To unsubscribe, e-mail: wagon-commits-unsubscribe@maven.apache.org
For additional commands, e-mail: wagon-commits-help@maven.apache.org


Mime
View raw message