maven-m2-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From br...@apache.org
Subject cvs commit: maven-components/maven-artifact/src/test/java/org/apache/maven/artifact/manager DefaultWagonManagerTest.java
Date Tue, 01 Mar 2005 06:20:30 GMT
brett       2005/02/28 22:20:30

  Modified:    maven-artifact/src/main/java/org/apache/maven/artifact/deployer
                        ArtifactDeployer.java
               maven-artifact/src/main/java/org/apache/maven/artifact/handler
                        JarHandler.java PluginHandler.java PomHandler.java
                        TestHandler.java
               maven-artifact/src/main/java/org/apache/maven/artifact/installer
                        ArtifactInstaller.java
               maven-artifact/src/main/java/org/apache/maven/artifact/repository
                        ArtifactRepository.java
               maven-artifact/src/main/java/org/apache/maven/artifact/request
                        ArtifactRequestTransformation.java
               maven-artifact/src/main/java/org/apache/maven/artifact/resolver
                        DefaultArtifactResolver.java
               maven-artifact/src/test/java/org/apache/maven/artifact/installer
                        ArtifactInstallerTest.java
               maven-artifact/src/test/java/org/apache/maven/artifact/manager
                        DefaultWagonManagerTest.java
  Log:
  some clean up from inspections
  
  Revision  Changes    Path
  1.2       +0 -1      maven-components/maven-artifact/src/main/java/org/apache/maven/artifact/deployer/ArtifactDeployer.java
  
  Index: ArtifactDeployer.java
  ===================================================================
  RCS file: /home/cvs/maven-components/maven-artifact/src/main/java/org/apache/maven/artifact/deployer/ArtifactDeployer.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- ArtifactDeployer.java	9 Aug 2004 18:37:32 -0000	1.1
  +++ ArtifactDeployer.java	1 Mar 2005 06:20:29 -0000	1.2
  @@ -18,7 +18,6 @@
   
   import org.apache.maven.artifact.Artifact;
   import org.apache.maven.artifact.repository.ArtifactRepository;
  -import org.apache.maven.artifact.repository.ArtifactRepository;
   
   import java.io.File;
   
  
  
  
  1.2       +1 -5      maven-components/maven-artifact/src/main/java/org/apache/maven/artifact/handler/JarHandler.java
  
  Index: JarHandler.java
  ===================================================================
  RCS file: /home/cvs/maven-components/maven-artifact/src/main/java/org/apache/maven/artifact/handler/JarHandler.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- JarHandler.java	9 Aug 2004 18:37:32 -0000	1.1
  +++ JarHandler.java	1 Mar 2005 06:20:29 -0000	1.2
  @@ -1,9 +1,5 @@
   package org.apache.maven.artifact.handler;
   
  -import org.apache.maven.artifact.Artifact;
  -
  -import java.io.File;
  -
   /*
    * Copyright 2001-2004 The Apache Software Foundation.
    *
  
  
  
  1.3       +1 -5      maven-components/maven-artifact/src/main/java/org/apache/maven/artifact/handler/PluginHandler.java
  
  Index: PluginHandler.java
  ===================================================================
  RCS file: /home/cvs/maven-components/maven-artifact/src/main/java/org/apache/maven/artifact/handler/PluginHandler.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- PluginHandler.java	1 Mar 2005 04:35:53 -0000	1.2
  +++ PluginHandler.java	1 Mar 2005 06:20:29 -0000	1.3
  @@ -16,10 +16,6 @@
    * limitations under the License.
    */
   
  -import org.apache.maven.artifact.Artifact;
  -
  -import java.io.File;
  -
   /**
    * @author <a href="mailto:jason@maven.org">Jason van Zyl</a>
    * @version $Id$
  
  
  
  1.3       +1 -5      maven-components/maven-artifact/src/main/java/org/apache/maven/artifact/handler/PomHandler.java
  
  Index: PomHandler.java
  ===================================================================
  RCS file: /home/cvs/maven-components/maven-artifact/src/main/java/org/apache/maven/artifact/handler/PomHandler.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- PomHandler.java	1 Mar 2005 04:35:53 -0000	1.2
  +++ PomHandler.java	1 Mar 2005 06:20:29 -0000	1.3
  @@ -16,10 +16,6 @@
    * limitations under the License.
    */
   
  -import org.apache.maven.artifact.Artifact;
  -
  -import java.io.File;
  -
   /**
    * @author <a href="mailto:jason@maven.org">Jason van Zyl</a>
    * @version $Id$
  
  
  
  1.3       +1 -5      maven-components/maven-artifact/src/main/java/org/apache/maven/artifact/handler/TestHandler.java
  
  Index: TestHandler.java
  ===================================================================
  RCS file: /home/cvs/maven-components/maven-artifact/src/main/java/org/apache/maven/artifact/handler/TestHandler.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- TestHandler.java	1 Mar 2005 04:35:54 -0000	1.2
  +++ TestHandler.java	1 Mar 2005 06:20:29 -0000	1.3
  @@ -16,10 +16,6 @@
    * limitations under the License.
    */
   
  -import org.apache.maven.artifact.Artifact;
  -
  -import java.io.File;
  -
   /**
    * @todo [BP] should be removed and replaced with scope if other design is approved
    * @author <a href="mailto:jason@maven.org">Jason van Zyl</a>
  
  
  
  1.2       +1 -2      maven-components/maven-artifact/src/main/java/org/apache/maven/artifact/installer/ArtifactInstaller.java
  
  Index: ArtifactInstaller.java
  ===================================================================
  RCS file: /home/cvs/maven-components/maven-artifact/src/main/java/org/apache/maven/artifact/installer/ArtifactInstaller.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- ArtifactInstaller.java	9 Aug 2004 18:37:33 -0000	1.1
  +++ ArtifactInstaller.java	1 Mar 2005 06:20:29 -0000	1.2
  @@ -18,7 +18,6 @@
   
   import org.apache.maven.artifact.Artifact;
   import org.apache.maven.artifact.repository.ArtifactRepository;
  -import org.apache.maven.artifact.repository.ArtifactRepository;
   
   import java.io.File;
   
  
  
  
  1.2       +1 -2      maven-components/maven-artifact/src/main/java/org/apache/maven/artifact/repository/ArtifactRepository.java
  
  Index: ArtifactRepository.java
  ===================================================================
  RCS file: /home/cvs/maven-components/maven-artifact/src/main/java/org/apache/maven/artifact/repository/ArtifactRepository.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- ArtifactRepository.java	9 Aug 2004 18:37:34 -0000	1.1
  +++ ArtifactRepository.java	1 Mar 2005 06:20:29 -0000	1.2
  @@ -17,7 +17,6 @@
    */
   
   import org.apache.maven.wagon.repository.Repository;
  -import org.codehaus.plexus.util.StringUtils;
   
   /**
    * This class is an abstraction of the location from/to resources
  
  
  
  1.2       +7 -8      maven-components/maven-artifact/src/main/java/org/apache/maven/artifact/request/ArtifactRequestTransformation.java
  
  Index: ArtifactRequestTransformation.java
  ===================================================================
  RCS file: /home/cvs/maven-components/maven-artifact/src/main/java/org/apache/maven/artifact/request/ArtifactRequestTransformation.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- ArtifactRequestTransformation.java	9 Aug 2004 18:37:33 -0000	1.1
  +++ ArtifactRequestTransformation.java	1 Mar 2005 06:20:30 -0000	1.2
  @@ -1,12 +1,5 @@
   package org.apache.maven.artifact.request;
   
  -import org.apache.maven.artifact.Artifact;
  -import org.apache.maven.artifact.repository.ArtifactRepository;
  -import org.apache.maven.artifact.repository.ArtifactRepository;
  -
  -import java.util.Map;
  -import java.util.Set;
  -
   /*
    * Copyright 2001-2004 The Apache Software Foundation.
    *
  @@ -23,6 +16,12 @@
    * limitations under the License.
    */
   
  +import org.apache.maven.artifact.Artifact;
  +import org.apache.maven.artifact.repository.ArtifactRepository;
  +
  +import java.util.Map;
  +import java.util.Set;
  +
   /**
    * @author <a href="mailto:jason@maven.org">Jason van Zyl</a>
    * @version $Id$
  
  
  
  1.11      +1 -1      maven-components/maven-artifact/src/main/java/org/apache/maven/artifact/resolver/DefaultArtifactResolver.java
  
  Index: DefaultArtifactResolver.java
  ===================================================================
  RCS file: /home/cvs/maven-components/maven-artifact/src/main/java/org/apache/maven/artifact/resolver/DefaultArtifactResolver.java,v
  retrieving revision 1.10
  retrieving revision 1.11
  diff -u -r1.10 -r1.11
  --- DefaultArtifactResolver.java	8 Feb 2005 04:30:30 -0000	1.10
  +++ DefaultArtifactResolver.java	1 Mar 2005 06:20:30 -0000	1.11
  @@ -62,7 +62,7 @@
           return artifact;
       }
   
  -    private String LS = System.getProperty( "line.separator" );
  +    private static final String LS = System.getProperty( "line.separator" );
   
       private String artifactNotFound( Artifact artifact, Set remoteRepositories )
       {
  
  
  
  1.3       +2 -3      maven-components/maven-artifact/src/test/java/org/apache/maven/artifact/installer/ArtifactInstallerTest.java
  
  Index: ArtifactInstallerTest.java
  ===================================================================
  RCS file: /home/cvs/maven-components/maven-artifact/src/test/java/org/apache/maven/artifact/installer/ArtifactInstallerTest.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- ArtifactInstallerTest.java	23 Oct 2004 13:33:59 -0000	1.2
  +++ ArtifactInstallerTest.java	1 Mar 2005 06:20:30 -0000	1.3
  @@ -16,9 +16,8 @@
    * limitations under the License.
    */
   
  -import org.apache.maven.artifact.ArtifactComponentTestCase;
   import org.apache.maven.artifact.Artifact;
  -import org.apache.maven.artifact.DefaultArtifact;
  +import org.apache.maven.artifact.ArtifactComponentTestCase;
   
   import java.io.File;
   
  
  
  
  1.2       +9 -18     maven-components/maven-artifact/src/test/java/org/apache/maven/artifact/manager/DefaultWagonManagerTest.java
  
  Index: DefaultWagonManagerTest.java
  ===================================================================
  RCS file: /home/cvs/maven-components/maven-artifact/src/test/java/org/apache/maven/artifact/manager/DefaultWagonManagerTest.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- DefaultWagonManagerTest.java	9 Aug 2004 18:37:34 -0000	1.1
  +++ DefaultWagonManagerTest.java	1 Mar 2005 06:20:30 -0000	1.2
  @@ -35,30 +35,21 @@
   
           Wagon wagon = null;
   
  -        try
  -        {
  -            wagon = (Wagon) wagonManager.getWagon( "a" );
  -
  -            assertNotNull( wagon );
  +        wagon = (Wagon) wagonManager.getWagon( "a" );
   
  -            wagon = (Wagon) wagonManager.getWagon( "b1" );
  +        assertNotNull( wagon );
   
  -            assertNotNull( wagon );
  +        wagon = (Wagon) wagonManager.getWagon( "b1" );
   
  -            wagon = (Wagon) wagonManager.getWagon( "b2" );
  +        assertNotNull( wagon );
   
  -            assertNotNull( wagon );
  +        wagon = (Wagon) wagonManager.getWagon( "b2" );
   
  -            wagon = (Wagon) wagonManager.getWagon( "c" );
  +        assertNotNull( wagon );
   
  -            assertNotNull( wagon );
  -        }
  -        catch ( Exception e )
  -        {
  -            e.printStackTrace();
  +        wagon = (Wagon) wagonManager.getWagon( "c" );
   
  -            fail( e.getMessage() );
  -        }
  +        assertNotNull( wagon );
   
           try
           {
  
  
  

Mime
View raw message