You are viewing a plain text version of this content. The canonical link for it is here.
Posted to wagon-commits@maven.apache.org by jv...@apache.org on 2004/07/31 17:04:23 UTC

cvs commit: maven-wagon/wagon-providers/http/src/test/java/org/apache/maven/wagon/providers/http HttpWagonTest.java

jvanzyl     2004/07/31 08:04:23

  Modified:    wagon-providers/http pom.xml
               wagon-providers/http/src/main/java/org/apache/maven/wagon/providers/http
                        HttpWagon.java
               wagon-providers/http/src/test/java/org/apache/maven/wagon/providers/http
                        HttpWagonTest.java
  Log:
  o updating for changes in wagon-api
  
  Revision  Changes    Path
  1.3       +3 -3      maven-wagon/wagon-providers/http/pom.xml
  
  Index: pom.xml
  ===================================================================
  RCS file: /home/cvs/maven-wagon/wagon-providers/http/pom.xml,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- pom.xml	16 Jul 2004 00:01:04 -0000	1.2
  +++ pom.xml	31 Jul 2004 15:04:22 -0000	1.3
  @@ -5,12 +5,12 @@
     <parent>
       <groupId>maven</groupId>
       <artifactId>wagon</artifactId>
  -    <version>0.9-SNAPSHOT</version>
  +    <version>1.0-alpha-1-SNAPSHOT</version>
     </parent>
     <groupId>maven</groupId>
     <artifactId>wagon-http</artifactId>
     <name>Wagon HTTP provider</name>
  -  <version>0.9-SNAPSHOT</version>
  +  <version>1.0-alpha-1-SNAPSHOT</version>
     <shortDescription>Wagon Provider for HTTP/HTTPS protocols based on jakarta-commons-httpclient</shortDescription>
     <package>org.apache.maven.wagon.providers.http</package>
     <inceptionYear>2003</inceptionYear>
  @@ -36,7 +36,7 @@
       <dependency>
         <groupId>maven</groupId>
         <artifactId>wagon-api</artifactId>
  -      <version>0.9-SNAPSHOT</version>
  +      <version>1.0-alpha-1-SNAPSHOT</version>
       </dependency>
       <dependency>
         <groupId>commons-httpclient</groupId>
  
  
  
  1.11      +1 -17     maven-wagon/wagon-providers/http/src/main/java/org/apache/maven/wagon/providers/http/HttpWagon.java
  
  Index: HttpWagon.java
  ===================================================================
  RCS file: /home/cvs/maven-wagon/wagon-providers/http/src/main/java/org/apache/maven/wagon/providers/http/HttpWagon.java,v
  retrieving revision 1.10
  retrieving revision 1.11
  diff -u -r1.10 -r1.11
  --- HttpWagon.java	3 Jul 2004 12:52:22 -0000	1.10
  +++ HttpWagon.java	31 Jul 2004 15:04:22 -0000	1.11
  @@ -30,7 +30,6 @@
   import org.apache.maven.wagon.LazyFileOutputStream;
   import org.apache.maven.wagon.ResourceDoesNotExistException;
   import org.apache.maven.wagon.TransferFailedException;
  -import org.apache.maven.wagon.artifact.Artifact;
   import org.apache.maven.wagon.authentication.AuthenticationInfo;
   import org.apache.maven.wagon.authorization.AuthorizationException;
   import org.apache.maven.wagon.proxy.ProxyInfo;
  @@ -111,12 +110,6 @@
           client.setHostConfiguration( hc );
       }
   
  -    public void put( File source, Artifact artifact )
  -        throws TransferFailedException, ResourceDoesNotExistException, AuthorizationException
  -    {
  -        put( source, artifactPath( artifact ) );
  -    }
  -
       // put
       public void put( File source, String resource )
           throws TransferFailedException, ResourceDoesNotExistException, AuthorizationException
  @@ -201,15 +194,6 @@
   
       public void closeConnection()
       {
  -    }
  -
  -
  -
  -    // get
  -    public void get( Artifact artifact, File destination )
  -        throws TransferFailedException, ResourceDoesNotExistException, AuthorizationException
  -    {
  -        get( artifactPath( artifact ), destination );
       }
   
       public void get( String resource, File destination )
  
  
  
  1.7       +3 -7      maven-wagon/wagon-providers/http/src/test/java/org/apache/maven/wagon/providers/http/HttpWagonTest.java
  
  Index: HttpWagonTest.java
  ===================================================================
  RCS file: /home/cvs/maven-wagon/wagon-providers/http/src/test/java/org/apache/maven/wagon/providers/http/HttpWagonTest.java,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- HttpWagonTest.java	5 Jul 2004 12:09:15 -0000	1.6
  +++ HttpWagonTest.java	31 Jul 2004 15:04:23 -0000	1.7
  @@ -18,7 +18,6 @@
   
   import org.apache.maven.wagon.WagonTestCase;
   import org.apache.maven.wagon.FileTestUtils;
  -import org.apache.maven.wagon.artifact.Artifact;
   import org.apache.maven.wagon.repository.Repository;
   import org.codehaus.plexus.jetty.Httpd;
   
  @@ -58,7 +57,7 @@
   
           // File round trip testing
           
  -        File file =  FileTestUtils.createUniqueFile( "local-repository", "test-resource.txt" ) ;//new File( basedir, "/target/http-repository/test-resource.txt" );
  +        File file =  FileTestUtils.createUniqueFile( "local-repository", "test-resource.txt" ) ;
   
           file.delete();
   
  @@ -70,10 +69,7 @@
           // default so we must place a dummy artifact in the http repo first before
           // the actual PUT operation.
   
  -        // Artifact round trip testing
  -        Artifact artifact = getTestArtifact();
  -
  -        File f = new File( FileTestUtils.createDir( "http-repository"),  new Repository().artifactPath( artifact ) );
  +        File f = new File( FileTestUtils.createDir( "http-repository"),  "test-resource.txt" );
   
           f.delete();
   
  
  
  

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