From wagon-commitsbelljames@example.org Sun Jul 27 14:27:46 2008 Return-Path: <wagon-commitsbelljames@example.org> Delivered-To: belljames@example.org Received: (qmail 48044 invoked from network); 27 Jul 2008 14:27:46 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (83.161.120.155) by minotaur.apache.org with SMTP; 27 Jul 2008 14:27:46 -0000 Received: (qmail 4887 invoked by uid 500); 27 Jul 2008 14:27:46 -0000 Delivered-To: belljames@example.org Received: (qmail 4858 invoked by uid 500); 27 Jul 2008 14:27:46 -0000 Mailing-List: contact belljames@example.org; run by ezmlm Precedence: bulk List-Help: <mailto:belljames@example.org> List-Unsubscribe: <mailto:belljames@example.org> List-Post: <mailto:belljames@example.org> List-Id: <wagon-commits.maven.apache.org> Reply-To: belljames@example.org Delivered-To: mailing list belljames@example.org Received: (qmail 4849 invoked by uid 99); 27 Jul 2008 14:27:46 -0000 Received: from athena.apache.org (HELO athena.apache.org) (83.161.120.155) by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 27 Jul 2008 07:27:46 -0700 X-ASF-Spam-Status: No, hits=-2000.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [83.161.120.155] (HELO eris.apache.org) (83.161.120.155) by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 27 Jul 2008 14:26:59 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id BD3CA2388989; Sun, 27 Jul 2008 07:26:55 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r680110 - in /maven/wagon/trunk/wagon-provider-api/src: main/java/org/apache/maven/wagon/AbstractWagon.java test/java/org/apache/maven/wagon/AbstractWagonTest.java Date: Sun, 27 Jul 2008 14:26:55 -0000 To: belljames@example.org From: belljames@example.org X-Mailer: svnmailer-1.0.8 Message-Id: <belljames@example.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: brett Date: Sun Jul 27 07:26:55 2008 New Revision: 680110 URL: http://svn.apache.org/viewvc?rev=680110&view=rev Log: [WAGON-225] make sure the proxyInfoProvider is used Modified: maven/wagon/trunk/wagon-provider-api/src/main/java/org/apache/maven/wagon/AbstractWagon.java maven/wagon/trunk/wagon-provider-api/src/test/java/org/apache/maven/wagon/AbstractWagonTest.java Modified: maven/wagon/trunk/wagon-provider-api/src/main/java/org/apache/maven/wagon/AbstractWagon.java URL: http://svn.apache.org/viewvc/maven/wagon/trunk/wagon-provider-api/src/main/java/org/apache/maven/wagon/AbstractWagon.java?rev=680110&r1=680109&r2=680110&view=diff ============================================================================== --- maven/wagon/trunk/wagon-provider-api/src/main/java/org/apache/maven/wagon/AbstractWagon.java (original) +++ maven/wagon/trunk/wagon-provider-api/src/main/java/org/apache/maven/wagon/AbstractWagon.java Sun Jul 27 07:26:55 2008 @@ -85,7 +85,7 @@ public ProxyInfo getProxyInfo() { - return proxyInfoProvider.getProxyInfo( null ); + return proxyInfoProvider != null ? proxyInfoProvider.getProxyInfo( null ) : null; } public AuthenticationInfo getAuthenticationInfo() @@ -150,7 +150,7 @@ { public ProxyInfo getProxyInfo( String protocol ) { - if ( proxy.getType().equalsIgnoreCase( protocol ) ) + if ( protocol == null || protocol.equalsIgnoreCase( proxy.getType() ) ) { return proxy; } @@ -200,6 +200,8 @@ // TODO: Do these needs to be fields, or are they only used in openConnection()? this.authenticationInfo = authenticationInfo; + this.proxyInfoProvider = proxyInfoProvider; + fireSessionOpening(); openConnection(); Modified: maven/wagon/trunk/wagon-provider-api/src/test/java/org/apache/maven/wagon/AbstractWagonTest.java URL: http://svn.apache.org/viewvc/maven/wagon/trunk/wagon-provider-api/src/test/java/org/apache/maven/wagon/AbstractWagonTest.java?rev=680110&r1=680109&r2=680110&view=diff ============================================================================== --- maven/wagon/trunk/wagon-provider-api/src/test/java/org/apache/maven/wagon/AbstractWagonTest.java (original) +++ maven/wagon/trunk/wagon-provider-api/src/test/java/org/apache/maven/wagon/AbstractWagonTest.java Sun Jul 27 07:26:55 2008 @@ -29,13 +29,15 @@ import org.apache.maven.wagon.authorization.AuthorizationException; import org.apache.maven.wagon.events.SessionListener; import org.apache.maven.wagon.events.TransferListener; +import org.apache.maven.wagon.proxy.ProxyInfo; +import org.apache.maven.wagon.proxy.ProxyInfoProvider; import org.apache.maven.wagon.repository.Repository; import org.codehaus.plexus.util.IOUtil; import org.easymock.MockControl; /** * @author <a href="belljames@example.org">Michal Maczka</a> - * @version $Id$ + * @version $Id: AbstractWagonTest.java 630808 2008-02-25 11:01:41Z brett $ */ public class AbstractWagonTest extends TestCase @@ -101,6 +103,65 @@ assertFalse( wagon.hasTransferListener( transferListener ) ); } + public void testNoProxyConfiguration() throws ConnectionException, AuthenticationException + { + Repository repository = new Repository(); + wagon.connect( repository ); + assertNull( wagon.getProxyInfo() ); + assertNull( wagon.getProxyInfo( "http", "www.example.com" ) ); + assertNull( wagon.getProxyInfo( "dav", "www.example.com" ) ); + assertNull( wagon.getProxyInfo( "scp", "www.example.com" ) ); + assertNull( wagon.getProxyInfo( "ftp", "www.example.com" ) ); + assertNull( wagon.getProxyInfo( "http", "localhost" ) ); + } + + public void testLegacyProxyConfiguration() throws ConnectionException, AuthenticationException + { + ProxyInfo proxyInfo = new ProxyInfo(); + proxyInfo.setType( "http" ); + + Repository repository = new Repository(); + wagon.connect( repository, proxyInfo ); + assertEquals( proxyInfo, wagon.getProxyInfo() ); + assertEquals( proxyInfo, wagon.getProxyInfo( "http", "www.example.com" ) ); + assertNull( wagon.getProxyInfo( "dav", "www.example.com" ) ); + assertNull( wagon.getProxyInfo( "scp", "www.example.com" ) ); + assertNull( wagon.getProxyInfo( "ftp", "www.example.com" ) ); + } + + public void testProxyConfiguration() throws ConnectionException, AuthenticationException + { + final ProxyInfo httpProxyInfo = new ProxyInfo(); + httpProxyInfo.setType( "http" ); + + final ProxyInfo socksProxyInfo = new ProxyInfo(); + socksProxyInfo.setType( "http" ); + + ProxyInfoProvider proxyInfoProvider = new ProxyInfoProvider() + { + public ProxyInfo getProxyInfo( String protocol ) + { + if ( "http".equals( protocol ) || "dav".equals( protocol )) + { + return httpProxyInfo; + } + else if ( "scp".equals( protocol ) ) + { + return socksProxyInfo; + } + return null; + } + }; + + Repository repository = new Repository(); + wagon.connect( repository, proxyInfoProvider ); + assertNull( wagon.getProxyInfo() ); + assertEquals( httpProxyInfo, wagon.getProxyInfo( "http", "www.example.com" ) ); + assertEquals( httpProxyInfo, wagon.getProxyInfo( "dav", "www.example.com" ) ); + assertEquals( socksProxyInfo, wagon.getProxyInfo( "scp", "www.example.com" ) ); + assertNull( wagon.getProxyInfo( "ftp", "www.example.com" ) ); + } + public void testSessionOpenEvents() throws Exception { --------------------------------------------------------------------- To unsubscribe, e-mail: belljames@example.org For additional commands, e-mail: belljames@example.org From wagon-commitsbelljames@example.org Sun Jul 27 14:33:39 2008 Return-Path: <wagon-commitsbelljames@example.org> Delivered-To: belljames@example.org Received: (qmail 50725 invoked from network); 27 Jul 2008 14:33:39 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (83.161.120.155) by minotaur.apache.org with SMTP; 27 Jul 2008 14:33:39 -0000 Received: (qmail 7024 invoked by uid 500); 27 Jul 2008 14:33:39 -0000 Delivered-To: belljames@example.org Received: (qmail 6997 invoked by uid 500); 27 Jul 2008 14:33:38 -0000 Mailing-List: contact belljames@example.org; run by ezmlm Precedence: bulk List-Help: <mailto:belljames@example.org> List-Unsubscribe: <mailto:belljames@example.org> List-Post: <mailto:belljames@example.org> List-Id: <wagon-commits.maven.apache.org> Reply-To: belljames@example.org Delivered-To: mailing list belljames@example.org Received: (qmail 6988 invoked by uid 99); 27 Jul 2008 14:33:38 -0000 Received: from athena.apache.org (HELO athena.apache.org) (83.161.120.155) by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 27 Jul 2008 07:33:38 -0700 X-ASF-Spam-Status: No, hits=-2000.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [83.161.120.155] (HELO eris.apache.org) (83.161.120.155) by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 27 Jul 2008 14:32:52 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 8E3652388989; Sun, 27 Jul 2008 07:32:48 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r680112 - in /maven/wagon/trunk/wagon-provider-api/src: main/java/org/apache/maven/wagon/AbstractWagon.java test/java/org/apache/maven/wagon/AbstractWagonTest.java Date: Sun, 27 Jul 2008 14:32:48 -0000 To: belljames@example.org From: belljames@example.org X-Mailer: svnmailer-1.0.8 Message-Id: <belljames@example.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: brett Date: Sun Jul 27 07:32:48 2008 New Revision: 680112 URL: http://svn.apache.org/viewvc?rev=680112&view=rev Log: [WAGON-225] guard against NPE Modified: maven/wagon/trunk/wagon-provider-api/src/main/java/org/apache/maven/wagon/AbstractWagon.java maven/wagon/trunk/wagon-provider-api/src/test/java/org/apache/maven/wagon/AbstractWagonTest.java Modified: maven/wagon/trunk/wagon-provider-api/src/main/java/org/apache/maven/wagon/AbstractWagon.java URL: http://svn.apache.org/viewvc/maven/wagon/trunk/wagon-provider-api/src/main/java/org/apache/maven/wagon/AbstractWagon.java?rev=680112&r1=680111&r2=680112&view=diff ============================================================================== --- maven/wagon/trunk/wagon-provider-api/src/main/java/org/apache/maven/wagon/AbstractWagon.java (original) +++ maven/wagon/trunk/wagon-provider-api/src/main/java/org/apache/maven/wagon/AbstractWagon.java Sun Jul 27 07:32:48 2008 @@ -150,7 +150,7 @@ { public ProxyInfo getProxyInfo( String protocol ) { - if ( protocol == null || protocol.equalsIgnoreCase( proxy.getType() ) ) + if ( protocol == null || proxy == null || protocol.equalsIgnoreCase( proxy.getType() ) ) { return proxy; } Modified: maven/wagon/trunk/wagon-provider-api/src/test/java/org/apache/maven/wagon/AbstractWagonTest.java URL: http://svn.apache.org/viewvc/maven/wagon/trunk/wagon-provider-api/src/test/java/org/apache/maven/wagon/AbstractWagonTest.java?rev=680112&r1=680111&r2=680112&view=diff ============================================================================== --- maven/wagon/trunk/wagon-provider-api/src/test/java/org/apache/maven/wagon/AbstractWagonTest.java (original) +++ maven/wagon/trunk/wagon-provider-api/src/test/java/org/apache/maven/wagon/AbstractWagonTest.java Sun Jul 27 07:32:48 2008 @@ -115,6 +115,18 @@ assertNull( wagon.getProxyInfo( "http", "localhost" ) ); } + public void testNullProxyConfiguration() throws ConnectionException, AuthenticationException + { + Repository repository = new Repository(); + wagon.connect( repository, (ProxyInfo) null ); + assertNull( wagon.getProxyInfo() ); + assertNull( wagon.getProxyInfo( "http", "www.example.com" ) ); + assertNull( wagon.getProxyInfo( "dav", "www.example.com" ) ); + assertNull( wagon.getProxyInfo( "scp", "www.example.com" ) ); + assertNull( wagon.getProxyInfo( "ftp", "www.example.com" ) ); + assertNull( wagon.getProxyInfo( "http", "localhost" ) ); + } + public void testLegacyProxyConfiguration() throws ConnectionException, AuthenticationException { ProxyInfo proxyInfo = new ProxyInfo(); --------------------------------------------------------------------- To unsubscribe, e-mail: belljames@example.org For additional commands, e-mail: belljames@example.org From wagon-commitsbelljames@example.org Mon Jul 28 02:07:05 2008 Return-Path: <wagon-commitsbelljames@example.org> Delivered-To: belljames@example.org Received: (qmail 61470 invoked from network); 28 Jul 2008 02:07:03 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (83.161.120.155) by minotaur.apache.org with SMTP; 28 Jul 2008 02:07:03 -0000 Received: (qmail 18736 invoked by uid 500); 28 Jul 2008 02:07:03 -0000 Delivered-To: belljames@example.org Received: (qmail 18716 invoked by uid 500); 28 Jul 2008 02:07:03 -0000 Mailing-List: contact belljames@example.org; run by ezmlm Precedence: bulk List-Help: <mailto:belljames@example.org> List-Unsubscribe: <mailto:belljames@example.org> List-Post: <mailto:belljames@example.org> List-Id: <wagon-commits.maven.apache.org> Reply-To: belljames@example.org Delivered-To: mailing list belljames@example.org Received: (qmail 18707 invoked by uid 99); 28 Jul 2008 02:07:03 -0000 Received: from athena.apache.org (HELO athena.apache.org) (83.161.120.155) by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 27 Jul 2008 19:07:03 -0700 X-ASF-Spam-Status: No, hits=-2000.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [83.161.120.155] (HELO eris.apache.org) (83.161.120.155) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 28 Jul 2008 02:06:17 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 075DA23889FF; Sun, 27 Jul 2008 19:06:43 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r680225 - in /maven/wagon/trunk/wagon-provider-api/src: main/java/org/apache/maven/wagon/observers/ChecksumObserver.java test/java/org/apache/maven/wagon/observers/ test/java/org/apache/maven/wagon/observers/ChecksumObserverTest.java Date: Mon, 28 Jul 2008 02:06:42 -0000 To: belljames@example.org From: belljames@example.org X-Mailer: svnmailer-1.0.8 Message-Id: <belljames@example.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: brett Date: Sun Jul 27 19:06:41 2008 New Revision: 680225 URL: http://svn.apache.org/viewvc?rev=680225&view=rev Log: [WAGON-224] do not throw a NPE on subsequent transfers if a previous transfer failed in error Added: maven/wagon/trunk/wagon-provider-api/src/test/java/org/apache/maven/wagon/observers/ maven/wagon/trunk/wagon-provider-api/src/test/java/org/apache/maven/wagon/observers/ChecksumObserverTest.java (with props) Modified: maven/wagon/trunk/wagon-provider-api/src/main/java/org/apache/maven/wagon/observers/ChecksumObserver.java Modified: maven/wagon/trunk/wagon-provider-api/src/main/java/org/apache/maven/wagon/observers/ChecksumObserver.java URL: http://svn.apache.org/viewvc/maven/wagon/trunk/wagon-provider-api/src/main/java/org/apache/maven/wagon/observers/ChecksumObserver.java?rev=680225&r1=680224&r2=680225&view=diff ============================================================================== --- maven/wagon/trunk/wagon-provider-api/src/main/java/org/apache/maven/wagon/observers/ChecksumObserver.java (original) +++ maven/wagon/trunk/wagon-provider-api/src/main/java/org/apache/maven/wagon/observers/ChecksumObserver.java Sun Jul 27 19:06:41 2008 @@ -83,7 +83,8 @@ public void transferError( TransferEvent transferEvent ) { - digester = null; + digester.reset(); + actualChecksum = null; } Added: maven/wagon/trunk/wagon-provider-api/src/test/java/org/apache/maven/wagon/observers/ChecksumObserverTest.java URL: http://svn.apache.org/viewvc/maven/wagon/trunk/wagon-provider-api/src/test/java/org/apache/maven/wagon/observers/ChecksumObserverTest.java?rev=680225&view=auto ============================================================================== --- maven/wagon/trunk/wagon-provider-api/src/test/java/org/apache/maven/wagon/observers/ChecksumObserverTest.java (added) +++ maven/wagon/trunk/wagon-provider-api/src/test/java/org/apache/maven/wagon/observers/ChecksumObserverTest.java Sun Jul 27 19:06:41 2008 @@ -0,0 +1,92 @@ +package org.apache.maven.wagon.observers; + +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ + +import java.io.File; +import java.io.IOException; +import java.security.NoSuchAlgorithmException; + +import junit.framework.TestCase; + +import org.apache.maven.wagon.ConnectionException; +import org.apache.maven.wagon.ResourceDoesNotExistException; +import org.apache.maven.wagon.TransferFailedException; +import org.apache.maven.wagon.Wagon; +import org.apache.maven.wagon.WagonMock; +import org.apache.maven.wagon.authorization.AuthorizationException; +import org.apache.maven.wagon.events.TransferListener; +import org.apache.maven.wagon.repository.Repository; + +public class ChecksumObserverTest + extends TestCase +{ + private Wagon wagon; + + public void setUp() + throws Exception + { + super.setUp(); + + wagon = new WagonMock( true ); + + Repository repository = new Repository(); + wagon.connect( repository ); + } + + public void tearDown() + throws ConnectionException + { + wagon.disconnect(); + } + + public void testSubsequentTransfersAfterTransferError() + throws NoSuchAlgorithmException, ResourceDoesNotExistException, + AuthorizationException, IOException + { + TransferListener listener = new ChecksumObserver(); + + wagon.addTransferListener( listener ); + + File testFile = File.createTempFile( "wagon", "tmp" ); + testFile.deleteOnExit(); + + try + { + wagon.get( "resource", testFile ); + fail(); + } + catch ( TransferFailedException e ) + { + assertTrue( true ); + } + + try + { + wagon.get( "resource", testFile ); + fail(); + } + catch ( TransferFailedException e ) + { + assertTrue( true ); + } + + testFile.delete(); + } +} Propchange: maven/wagon/trunk/wagon-provider-api/src/test/java/org/apache/maven/wagon/observers/ChecksumObserverTest.java ------------------------------------------------------------------------------ svn:eol-style = native --------------------------------------------------------------------- To unsubscribe, e-mail: belljames@example.org For additional commands, e-mail: belljames@example.org From wagon-commitsbelljames@example.org Mon Jul 28 03:02:54 2008 Return-Path: <wagon-commitsbelljames@example.org> Delivered-To: belljames@example.org Received: (qmail 88307 invoked from network); 28 Jul 2008 03:02:54 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (83.161.120.155) by minotaur.apache.org with SMTP; 28 Jul 2008 03:02:54 -0000 Received: (qmail 35655 invoked by uid 500); 28 Jul 2008 03:02:53 -0000 Delivered-To: belljames@example.org Received: (qmail 35633 invoked by uid 500); 28 Jul 2008 03:02:53 -0000 Mailing-List: contact belljames@example.org; run by ezmlm Precedence: bulk List-Help: <mailto:belljames@example.org> List-Unsubscribe: <mailto:belljames@example.org> List-Post: <mailto:belljames@example.org> List-Id: <wagon-commits.maven.apache.org> Reply-To: belljames@example.org Delivered-To: mailing list belljames@example.org Received: (qmail 35624 invoked by uid 99); 28 Jul 2008 03:02:53 -0000 Received: from athena.apache.org (HELO athena.apache.org) (83.161.120.155) by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 27 Jul 2008 20:02:53 -0700 X-ASF-Spam-Status: No, hits=-2000.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [83.161.120.155] (HELO eris.apache.org) (83.161.120.155) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 28 Jul 2008 03:02:07 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 8559F23889FF; Sun, 27 Jul 2008 20:02:03 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r680228 - /maven/wagon/trunk/wagon-providers/wagon-ftp/src/main/java/org/apache/maven/wagon/providers/ftp/FtpWagon.java Date: Mon, 28 Jul 2008 03:02:03 -0000 To: belljames@example.org From: belljames@example.org X-Mailer: svnmailer-1.0.8 Message-Id: <belljames@example.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: brett Date: Sun Jul 27 20:02:02 2008 New Revision: 680228 URL: http://svn.apache.org/viewvc?rev=680228&view=rev Log: [WAGON-226] filePermissions and directoryPermissions are not set correctly Submitted by: Matthieu Leclercq Modified: maven/wagon/trunk/wagon-providers/wagon-ftp/src/main/java/org/apache/maven/wagon/providers/ftp/FtpWagon.java Modified: maven/wagon/trunk/wagon-providers/wagon-ftp/src/main/java/org/apache/maven/wagon/providers/ftp/FtpWagon.java URL: http://svn.apache.org/viewvc/maven/wagon/trunk/wagon-providers/wagon-ftp/src/main/java/org/apache/maven/wagon/providers/ftp/FtpWagon.java?rev=680228&r1=680227&r2=680228&view=diff ============================================================================== --- maven/wagon/trunk/wagon-providers/wagon-ftp/src/main/java/org/apache/maven/wagon/providers/ftp/FtpWagon.java (original) +++ maven/wagon/trunk/wagon-providers/wagon-ftp/src/main/java/org/apache/maven/wagon/providers/ftp/FtpWagon.java Sun Jul 27 20:02:02 2008 @@ -189,13 +189,13 @@ if ( permissions != null && permissions.getGroup() != null ) { // ignore failures - ftp.sendSiteCommand( "CHGRP " + permissions.getGroup() ); + ftp.sendSiteCommand( "CHGRP " + permissions.getGroup() + " " + resource.getName() ); } if ( permissions != null && permissions.getFileMode() != null ) { // ignore failures - ftp.sendSiteCommand( "CHMOD " + permissions.getFileMode() ); + ftp.sendSiteCommand( "CHMOD " + permissions.getFileMode() + " " + resource.getName() ); } } catch ( IOException e ) @@ -274,13 +274,13 @@ if ( permissions != null && permissions.getGroup() != null ) { // ignore failures - ftp.sendSiteCommand( "CHGRP " + permissions.getGroup() ); + ftp.sendSiteCommand( "CHGRP " + permissions.getGroup() + " " + dirs[i] ); } if ( permissions != null && permissions.getDirectoryMode() != null ) { // ignore failures - ftp.sendSiteCommand( "CHMOD " + permissions.getDirectoryMode() ); + ftp.sendSiteCommand( "CHMOD " + permissions.getDirectoryMode() + " " + dirs[i] ); } dirChanged = ftp.changeWorkingDirectory( dirs[i] ); --------------------------------------------------------------------- To unsubscribe, e-mail: belljames@example.org For additional commands, e-mail: belljames@example.org From wagon-commitsbelljames@example.org Mon Jul 28 03:12:54 2008 Return-Path: <wagon-commitsbelljames@example.org> Delivered-To: belljames@example.org Received: (qmail 91695 invoked from network); 28 Jul 2008 03:12:54 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (83.161.120.155) by minotaur.apache.org with SMTP; 28 Jul 2008 03:12:54 -0000 Received: (qmail 39945 invoked by uid 500); 28 Jul 2008 03:12:53 -0000 Delivered-To: belljames@example.org Received: (qmail 39918 invoked by uid 500); 28 Jul 2008 03:12:53 -0000 Mailing-List: contact belljames@example.org; run by ezmlm Precedence: bulk List-Help: <mailto:belljames@example.org> List-Unsubscribe: <mailto:belljames@example.org> List-Post: <mailto:belljames@example.org> List-Id: <wagon-commits.maven.apache.org> Reply-To: belljames@example.org Delivered-To: mailing list belljames@example.org Received: (qmail 39908 invoked by uid 99); 28 Jul 2008 03:12:53 -0000 Received: from athena.apache.org (HELO athena.apache.org) (83.161.120.155) by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 27 Jul 2008 20:12:53 -0700 X-ASF-Spam-Status: No, hits=-2000.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [83.161.120.155] (HELO eris.apache.org) (83.161.120.155) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 28 Jul 2008 03:12:07 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 44A0623889FF; Sun, 27 Jul 2008 20:12:33 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r680230 - in /maven/wagon/trunk: ./ wagon-provider-api/ wagon-provider-test/ wagon-providers/ wagon-providers/wagon-file/ wagon-providers/wagon-ftp/ wagon-providers/wagon-http-lightweight/ wagon-providers/wagon-http-shared/ wagon-providers/... Date: Mon, 28 Jul 2008 03:12:32 -0000 To: belljames@example.org From: belljames@example.org X-Mailer: svnmailer-1.0.8 Message-Id: <belljames@example.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: brett Date: Sun Jul 27 20:12:31 2008 New Revision: 680230 URL: http://svn.apache.org/viewvc?rev=680230&view=rev Log: [maven-release-plugin] prepare release wagon-1.0-beta-4 Modified: maven/wagon/trunk/pom.xml maven/wagon/trunk/wagon-provider-api/pom.xml maven/wagon/trunk/wagon-provider-test/pom.xml maven/wagon/trunk/wagon-providers/pom.xml maven/wagon/trunk/wagon-providers/wagon-file/pom.xml maven/wagon/trunk/wagon-providers/wagon-ftp/pom.xml maven/wagon/trunk/wagon-providers/wagon-http-lightweight/pom.xml maven/wagon/trunk/wagon-providers/wagon-http-shared/pom.xml maven/wagon/trunk/wagon-providers/wagon-http/pom.xml maven/wagon/trunk/wagon-providers/wagon-scm/pom.xml maven/wagon/trunk/wagon-providers/wagon-ssh-common-test/pom.xml maven/wagon/trunk/wagon-providers/wagon-ssh-common/pom.xml maven/wagon/trunk/wagon-providers/wagon-ssh-external/pom.xml maven/wagon/trunk/wagon-providers/wagon-ssh/pom.xml maven/wagon/trunk/wagon-providers/wagon-webdav-jackrabbit/pom.xml Modified: maven/wagon/trunk/pom.xml URL: http://svn.apache.org/viewvc/maven/wagon/trunk/pom.xml?rev=680230&r1=680229&r2=680230&view=diff ============================================================================== --- maven/wagon/trunk/pom.xml (original) +++ maven/wagon/trunk/pom.xml Sun Jul 27 20:12:31 2008 @@ -10,7 +10,7 @@ <artifactId>wagon</artifactId> <packaging>pom</packaging> <name>Maven Wagon</name> - <version>1.0-SNAPSHOT</version> + <version>1.0-beta-4</version> <description>Tools to manage artifacts and deployment</description> <url>http://maven.apache.org/wagon</url> @@ -66,9 +66,9 @@ </developer> </developers> <scm> - <connection>scm:svn:http://svn.apache.org/repos/asf/maven/wagon/trunk</connection> - <developerConnection>scm:svn:https://svn.apache.org/repos/asf/maven/wagon/trunk</developerConnection> - <url>http://svn.apache.org/viewvc/maven/wagon/trunk</url> + <connection>scm:svn:http://svn.apache.org/repos/asf/maven/wagon/tags/wagon-1.0-beta-4</connection> + <developerConnection>scm:svn:https://svn.apache.org/repos/asf/maven/wagon/tags/wagon-1.0-beta-4</developerConnection> + <url>http://svn.apache.org/viewvc/maven/wagon/tags/wagon-1.0-beta-4</url> </scm> <build> <pluginManagement> @@ -133,22 +133,22 @@ <dependency> <groupId>org.apache.maven.wagon</groupId> <artifactId>wagon-provider-api</artifactId> - <version>1.0-SNAPSHOT</version> + <version>1.0-beta-4</version> </dependency> <dependency> <groupId>org.apache.maven.wagon</groupId> <artifactId>wagon-provider-test</artifactId> - <version>1.0-SNAPSHOT</version> + <version>1.0-beta-4</version> </dependency> <dependency> <groupId>org.apache.maven.wagon</groupId> <artifactId>wagon-ssh-common-test</artifactId> - <version>1.0-SNAPSHOT</version> + <version>1.0-beta-4</version> </dependency> <dependency> <groupId>org.apache.maven.wagon</groupId> <artifactId>wagon-ssh-common</artifactId> - <version>1.0-SNAPSHOT</version> + <version>1.0-beta-4</version> </dependency> <dependency> <groupId>junit</groupId> Modified: maven/wagon/trunk/wagon-provider-api/pom.xml URL: http://svn.apache.org/viewvc/maven/wagon/trunk/wagon-provider-api/pom.xml?rev=680230&r1=680229&r2=680230&view=diff ============================================================================== --- maven/wagon/trunk/wagon-provider-api/pom.xml (original) +++ maven/wagon/trunk/wagon-provider-api/pom.xml Sun Jul 27 20:12:31 2008 @@ -2,7 +2,7 @@ <parent> <artifactId>wagon</artifactId> <groupId>org.apache.maven.wagon</groupId> - <version>1.0-SNAPSHOT</version> + <version>1.0-beta-4</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>wagon-provider-api</artifactId> Modified: maven/wagon/trunk/wagon-provider-test/pom.xml URL: http://svn.apache.org/viewvc/maven/wagon/trunk/wagon-provider-test/pom.xml?rev=680230&r1=680229&r2=680230&view=diff ============================================================================== --- maven/wagon/trunk/wagon-provider-test/pom.xml (original) +++ maven/wagon/trunk/wagon-provider-test/pom.xml Sun Jul 27 20:12:31 2008 @@ -2,7 +2,7 @@ <parent> <artifactId>wagon</artifactId> <groupId>org.apache.maven.wagon</groupId> - <version>1.0-SNAPSHOT</version> + <version>1.0-beta-4</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>wagon-provider-test</artifactId> Modified: maven/wagon/trunk/wagon-providers/pom.xml URL: http://svn.apache.org/viewvc/maven/wagon/trunk/wagon-providers/pom.xml?rev=680230&r1=680229&r2=680230&view=diff ============================================================================== --- maven/wagon/trunk/wagon-providers/pom.xml (original) +++ maven/wagon/trunk/wagon-providers/pom.xml Sun Jul 27 20:12:31 2008 @@ -2,7 +2,7 @@ <parent> <artifactId>wagon</artifactId> <groupId>org.apache.maven.wagon</groupId> - <version>1.0-SNAPSHOT</version> + <version>1.0-beta-4</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>wagon-providers</artifactId> Modified: maven/wagon/trunk/wagon-providers/wagon-file/pom.xml URL: http://svn.apache.org/viewvc/maven/wagon/trunk/wagon-providers/wagon-file/pom.xml?rev=680230&r1=680229&r2=680230&view=diff ============================================================================== --- maven/wagon/trunk/wagon-providers/wagon-file/pom.xml (original) +++ maven/wagon/trunk/wagon-providers/wagon-file/pom.xml Sun Jul 27 20:12:31 2008 @@ -2,7 +2,7 @@ <parent> <artifactId>wagon-providers</artifactId> <groupId>org.apache.maven.wagon</groupId> - <version>1.0-SNAPSHOT</version> + <version>1.0-beta-4</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>wagon-file</artifactId> Modified: maven/wagon/trunk/wagon-providers/wagon-ftp/pom.xml URL: http://svn.apache.org/viewvc/maven/wagon/trunk/wagon-providers/wagon-ftp/pom.xml?rev=680230&r1=680229&r2=680230&view=diff ============================================================================== --- maven/wagon/trunk/wagon-providers/wagon-ftp/pom.xml (original) +++ maven/wagon/trunk/wagon-providers/wagon-ftp/pom.xml Sun Jul 27 20:12:31 2008 @@ -2,7 +2,7 @@ <parent> <artifactId>wagon-providers</artifactId> <groupId>org.apache.maven.wagon</groupId> - <version>1.0-SNAPSHOT</version> + <version>1.0-beta-4</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>wagon-ftp</artifactId> Modified: maven/wagon/trunk/wagon-providers/wagon-http-lightweight/pom.xml URL: http://svn.apache.org/viewvc/maven/wagon/trunk/wagon-providers/wagon-http-lightweight/pom.xml?rev=680230&r1=680229&r2=680230&view=diff ============================================================================== --- maven/wagon/trunk/wagon-providers/wagon-http-lightweight/pom.xml (original) +++ maven/wagon/trunk/wagon-providers/wagon-http-lightweight/pom.xml Sun Jul 27 20:12:31 2008 @@ -2,7 +2,7 @@ <parent> <artifactId>wagon-providers</artifactId> <groupId>org.apache.maven.wagon</groupId> - <version>1.0-SNAPSHOT</version> + <version>1.0-beta-4</version> </parent> <modelVersion>4.0.0</modelVersion> Modified: maven/wagon/trunk/wagon-providers/wagon-http-shared/pom.xml URL: http://svn.apache.org/viewvc/maven/wagon/trunk/wagon-providers/wagon-http-shared/pom.xml?rev=680230&r1=680229&r2=680230&view=diff ============================================================================== --- maven/wagon/trunk/wagon-providers/wagon-http-shared/pom.xml (original) +++ maven/wagon/trunk/wagon-providers/wagon-http-shared/pom.xml Sun Jul 27 20:12:31 2008 @@ -2,7 +2,7 @@ <parent> <artifactId>wagon-providers</artifactId> <groupId>org.apache.maven.wagon</groupId> - <version>1.0-SNAPSHOT</version> + <version>1.0-beta-4</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>wagon-http-shared</artifactId> Modified: maven/wagon/trunk/wagon-providers/wagon-http/pom.xml URL: http://svn.apache.org/viewvc/maven/wagon/trunk/wagon-providers/wagon-http/pom.xml?rev=680230&r1=680229&r2=680230&view=diff ============================================================================== --- maven/wagon/trunk/wagon-providers/wagon-http/pom.xml (original) +++ maven/wagon/trunk/wagon-providers/wagon-http/pom.xml Sun Jul 27 20:12:31 2008 @@ -2,7 +2,7 @@ <parent> <artifactId>wagon-providers</artifactId> <groupId>org.apache.maven.wagon</groupId> - <version>1.0-SNAPSHOT</version> + <version>1.0-beta-4</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>wagon-http</artifactId> @@ -15,7 +15,7 @@ <dependency> <groupId>${pom.groupId}</groupId> <artifactId>wagon-http-shared</artifactId> - <version>1.0-SNAPSHOT</version> + <version>1.0-beta-4</version> </dependency> <dependency> <groupId>plexus</groupId> Modified: maven/wagon/trunk/wagon-providers/wagon-scm/pom.xml URL: http://svn.apache.org/viewvc/maven/wagon/trunk/wagon-providers/wagon-scm/pom.xml?rev=680230&r1=680229&r2=680230&view=diff ============================================================================== --- maven/wagon/trunk/wagon-providers/wagon-scm/pom.xml (original) +++ maven/wagon/trunk/wagon-providers/wagon-scm/pom.xml Sun Jul 27 20:12:31 2008 @@ -2,7 +2,7 @@ <parent> <artifactId>wagon-providers</artifactId> <groupId>org.apache.maven.wagon</groupId> - <version>1.0-SNAPSHOT</version> + <version>1.0-beta-4</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>wagon-scm</artifactId> Modified: maven/wagon/trunk/wagon-providers/wagon-ssh-common-test/pom.xml URL: http://svn.apache.org/viewvc/maven/wagon/trunk/wagon-providers/wagon-ssh-common-test/pom.xml?rev=680230&r1=680229&r2=680230&view=diff ============================================================================== --- maven/wagon/trunk/wagon-providers/wagon-ssh-common-test/pom.xml (original) +++ maven/wagon/trunk/wagon-providers/wagon-ssh-common-test/pom.xml Sun Jul 27 20:12:31 2008 @@ -2,7 +2,7 @@ <parent> <artifactId>wagon-providers</artifactId> <groupId>org.apache.maven.wagon</groupId> - <version>1.0-SNAPSHOT</version> + <version>1.0-beta-4</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>wagon-ssh-common-test</artifactId> Modified: maven/wagon/trunk/wagon-providers/wagon-ssh-common/pom.xml URL: http://svn.apache.org/viewvc/maven/wagon/trunk/wagon-providers/wagon-ssh-common/pom.xml?rev=680230&r1=680229&r2=680230&view=diff ============================================================================== --- maven/wagon/trunk/wagon-providers/wagon-ssh-common/pom.xml (original) +++ maven/wagon/trunk/wagon-providers/wagon-ssh-common/pom.xml Sun Jul 27 20:12:31 2008 @@ -2,7 +2,7 @@ <parent> <artifactId>wagon-providers</artifactId> <groupId>org.apache.maven.wagon</groupId> - <version>1.0-SNAPSHOT</version> + <version>1.0-beta-4</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>wagon-ssh-common</artifactId> Modified: maven/wagon/trunk/wagon-providers/wagon-ssh-external/pom.xml URL: http://svn.apache.org/viewvc/maven/wagon/trunk/wagon-providers/wagon-ssh-external/pom.xml?rev=680230&r1=680229&r2=680230&view=diff ============================================================================== --- maven/wagon/trunk/wagon-providers/wagon-ssh-external/pom.xml (original) +++ maven/wagon/trunk/wagon-providers/wagon-ssh-external/pom.xml Sun Jul 27 20:12:31 2008 @@ -2,7 +2,7 @@ <parent> <artifactId>wagon-providers</artifactId> <groupId>org.apache.maven.wagon</groupId> - <version>1.0-SNAPSHOT</version> + <version>1.0-beta-4</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>wagon-ssh-external</artifactId> Modified: maven/wagon/trunk/wagon-providers/wagon-ssh/pom.xml URL: http://svn.apache.org/viewvc/maven/wagon/trunk/wagon-providers/wagon-ssh/pom.xml?rev=680230&r1=680229&r2=680230&view=diff ============================================================================== --- maven/wagon/trunk/wagon-providers/wagon-ssh/pom.xml (original) +++ maven/wagon/trunk/wagon-providers/wagon-ssh/pom.xml Sun Jul 27 20:12:31 2008 @@ -2,7 +2,7 @@ <parent> <artifactId>wagon-providers</artifactId> <groupId>org.apache.maven.wagon</groupId> - <version>1.0-SNAPSHOT</version> + <version>1.0-beta-4</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>wagon-ssh</artifactId> Modified: maven/wagon/trunk/wagon-providers/wagon-webdav-jackrabbit/pom.xml URL: http://svn.apache.org/viewvc/maven/wagon/trunk/wagon-providers/wagon-webdav-jackrabbit/pom.xml?rev=680230&r1=680229&r2=680230&view=diff ============================================================================== --- maven/wagon/trunk/wagon-providers/wagon-webdav-jackrabbit/pom.xml (original) +++ maven/wagon/trunk/wagon-providers/wagon-webdav-jackrabbit/pom.xml Sun Jul 27 20:12:31 2008 @@ -2,7 +2,7 @@ <parent> <artifactId>wagon-providers</artifactId> <groupId>org.apache.maven.wagon</groupId> - <version>1.0-SNAPSHOT</version> + <version>1.0-beta-4</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>wagon-webdav-jackrabbit</artifactId> @@ -26,7 +26,7 @@ <dependency> <groupId>${pom.groupId}</groupId> <artifactId>wagon-http-shared</artifactId> - <version>1.0-SNAPSHOT</version> + <version>1.0-beta-4</version> </dependency> <dependency> <groupId>org.apache.jackrabbit</groupId> --------------------------------------------------------------------- To unsubscribe, e-mail: belljames@example.org For additional commands, e-mail: belljames@example.org From wagon-commitsbelljames@example.org Mon Jul 28 03:13:29 2008 Return-Path: <wagon-commitsbelljames@example.org> Delivered-To: belljames@example.org Received: (qmail 91961 invoked from network); 28 Jul 2008 03:13:28 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (83.161.120.155) by minotaur.apache.org with SMTP; 28 Jul 2008 03:13:28 -0000 Received: (qmail 40074 invoked by uid 500); 28 Jul 2008 03:13:27 -0000 Delivered-To: belljames@example.org Received: (qmail 40049 invoked by uid 500); 28 Jul 2008 03:13:27 -0000 Mailing-List: contact belljames@example.org; run by ezmlm Precedence: bulk List-Help: <mailto:belljames@example.org> List-Unsubscribe: <mailto:belljames@example.org> List-Post: <mailto:belljames@example.org> List-Id: <wagon-commits.maven.apache.org> Reply-To: belljames@example.org Delivered-To: mailing list belljames@example.org Received: (qmail 40040 invoked by uid 99); 28 Jul 2008 03:13:27 -0000 Received: from athena.apache.org (HELO athena.apache.org) (83.161.120.155) by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 27 Jul 2008 20:13:27 -0700 X-ASF-Spam-Status: No, hits=-2000.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [83.161.120.155] (HELO eris.apache.org) (83.161.120.155) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 28 Jul 2008 03:12:41 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id A068E23889FF; Sun, 27 Jul 2008 20:13:07 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r680231 - in /maven/wagon/tags/wagon-1.0-beta-4: ./ wagon-provider-api/ wagon-provider-api/src/main/java/org/apache/maven/wagon/ wagon-provider-api/src/main/java/org/apache/maven/wagon/observers/ wagon-provider-api/src/test/java/org/apache/... Date: Mon, 28 Jul 2008 03:13:07 -0000 To: belljames@example.org From: belljames@example.org X-Mailer: svnmailer-1.0.8 Message-Id: <belljames@example.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: brett Date: Sun Jul 27 20:13:06 2008 New Revision: 680231 URL: http://svn.apache.org/viewvc?rev=680231&view=rev Log: [maven-release-plugin] copy for tag wagon-1.0-beta-4 Added: maven/wagon/tags/wagon-1.0-beta-4/ - copied from r680097, maven/wagon/trunk/ maven/wagon/tags/wagon-1.0-beta-4/pom.xml - copied unchanged from r680230, maven/wagon/trunk/pom.xml maven/wagon/tags/wagon-1.0-beta-4/wagon-provider-api/pom.xml - copied unchanged from r680230, maven/wagon/trunk/wagon-provider-api/pom.xml maven/wagon/tags/wagon-1.0-beta-4/wagon-provider-api/src/main/java/org/apache/maven/wagon/AbstractWagon.java - copied unchanged from r680112, maven/wagon/trunk/wagon-provider-api/src/main/java/org/apache/maven/wagon/AbstractWagon.java maven/wagon/tags/wagon-1.0-beta-4/wagon-provider-api/src/main/java/org/apache/maven/wagon/observers/ChecksumObserver.java - copied unchanged from r680225, maven/wagon/trunk/wagon-provider-api/src/main/java/org/apache/maven/wagon/observers/ChecksumObserver.java maven/wagon/tags/wagon-1.0-beta-4/wagon-provider-api/src/test/java/org/apache/maven/wagon/AbstractWagonTest.java - copied unchanged from r680112, maven/wagon/trunk/wagon-provider-api/src/test/java/org/apache/maven/wagon/AbstractWagonTest.java maven/wagon/tags/wagon-1.0-beta-4/wagon-provider-api/src/test/java/org/apache/maven/wagon/observers/ - copied from r680225, maven/wagon/trunk/wagon-provider-api/src/test/java/org/apache/maven/wagon/observers/ maven/wagon/tags/wagon-1.0-beta-4/wagon-provider-test/pom.xml - copied unchanged from r680230, maven/wagon/trunk/wagon-provider-test/pom.xml maven/wagon/tags/wagon-1.0-beta-4/wagon-providers/pom.xml - copied unchanged from r680230, maven/wagon/trunk/wagon-providers/pom.xml maven/wagon/tags/wagon-1.0-beta-4/wagon-providers/wagon-file/pom.xml - copied unchanged from r680230, maven/wagon/trunk/wagon-providers/wagon-file/pom.xml maven/wagon/tags/wagon-1.0-beta-4/wagon-providers/wagon-ftp/pom.xml - copied unchanged from r680230, maven/wagon/trunk/wagon-providers/wagon-ftp/pom.xml maven/wagon/tags/wagon-1.0-beta-4/wagon-providers/wagon-ftp/src/main/java/org/apache/maven/wagon/providers/ftp/FtpWagon.java - copied unchanged from r680228, maven/wagon/trunk/wagon-providers/wagon-ftp/src/main/java/org/apache/maven/wagon/providers/ftp/FtpWagon.java maven/wagon/tags/wagon-1.0-beta-4/wagon-providers/wagon-http-lightweight/pom.xml - copied unchanged from r680230, maven/wagon/trunk/wagon-providers/wagon-http-lightweight/pom.xml maven/wagon/tags/wagon-1.0-beta-4/wagon-providers/wagon-http-shared/pom.xml - copied unchanged from r680230, maven/wagon/trunk/wagon-providers/wagon-http-shared/pom.xml maven/wagon/tags/wagon-1.0-beta-4/wagon-providers/wagon-http/pom.xml - copied unchanged from r680230, maven/wagon/trunk/wagon-providers/wagon-http/pom.xml maven/wagon/tags/wagon-1.0-beta-4/wagon-providers/wagon-scm/pom.xml - copied unchanged from r680230, maven/wagon/trunk/wagon-providers/wagon-scm/pom.xml maven/wagon/tags/wagon-1.0-beta-4/wagon-providers/wagon-ssh-common-test/pom.xml - copied unchanged from r680230, maven/wagon/trunk/wagon-providers/wagon-ssh-common-test/pom.xml maven/wagon/tags/wagon-1.0-beta-4/wagon-providers/wagon-ssh-common/pom.xml - copied unchanged from r680230, maven/wagon/trunk/wagon-providers/wagon-ssh-common/pom.xml maven/wagon/tags/wagon-1.0-beta-4/wagon-providers/wagon-ssh-external/pom.xml - copied unchanged from r680230, maven/wagon/trunk/wagon-providers/wagon-ssh-external/pom.xml maven/wagon/tags/wagon-1.0-beta-4/wagon-providers/wagon-ssh/pom.xml - copied unchanged from r680230, maven/wagon/trunk/wagon-providers/wagon-ssh/pom.xml maven/wagon/tags/wagon-1.0-beta-4/wagon-providers/wagon-webdav-jackrabbit/pom.xml - copied unchanged from r680230, maven/wagon/trunk/wagon-providers/wagon-webdav-jackrabbit/pom.xml --------------------------------------------------------------------- To unsubscribe, e-mail: belljames@example.org For additional commands, e-mail: belljames@example.org From wagon-commitsbelljames@example.org Mon Jul 28 03:13:51 2008 Return-Path: <wagon-commitsbelljames@example.org> Delivered-To: belljames@example.org Received: (qmail 92144 invoked from network); 28 Jul 2008 03:13:51 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (83.161.120.155) by minotaur.apache.org with SMTP; 28 Jul 2008 03:13:51 -0000 Received: (qmail 40128 invoked by uid 500); 28 Jul 2008 03:13:51 -0000 Delivered-To: belljames@example.org Received: (qmail 40114 invoked by uid 500); 28 Jul 2008 03:13:51 -0000 Mailing-List: contact belljames@example.org; run by ezmlm Precedence: bulk List-Help: <mailto:belljames@example.org> List-Unsubscribe: <mailto:belljames@example.org> List-Post: <mailto:belljames@example.org> List-Id: <wagon-commits.maven.apache.org> Reply-To: belljames@example.org Delivered-To: mailing list belljames@example.org Received: (qmail 40105 invoked by uid 99); 28 Jul 2008 03:13:51 -0000 Received: from athena.apache.org (HELO athena.apache.org) (83.161.120.155) by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 27 Jul 2008 20:13:51 -0700 X-ASF-Spam-Status: No, hits=-2000.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [83.161.120.155] (HELO eris.apache.org) (83.161.120.155) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 28 Jul 2008 03:13:04 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id EBEEC2388A0C; Sun, 27 Jul 2008 20:13:30 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r680232 - in /maven/wagon/trunk: ./ wagon-provider-api/ wagon-provider-test/ wagon-providers/ wagon-providers/wagon-file/ wagon-providers/wagon-ftp/ wagon-providers/wagon-http-lightweight/ wagon-providers/wagon-http-shared/ wagon-providers/... Date: Mon, 28 Jul 2008 03:13:30 -0000 To: belljames@example.org From: belljames@example.org X-Mailer: svnmailer-1.0.8 Message-Id: <belljames@example.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: brett Date: Sun Jul 27 20:13:29 2008 New Revision: 680232 URL: http://svn.apache.org/viewvc?rev=680232&view=rev Log: [maven-release-plugin] prepare for next development iteration Modified: maven/wagon/trunk/pom.xml maven/wagon/trunk/wagon-provider-api/pom.xml maven/wagon/trunk/wagon-provider-test/pom.xml maven/wagon/trunk/wagon-providers/pom.xml maven/wagon/trunk/wagon-providers/wagon-file/pom.xml maven/wagon/trunk/wagon-providers/wagon-ftp/pom.xml maven/wagon/trunk/wagon-providers/wagon-http-lightweight/pom.xml maven/wagon/trunk/wagon-providers/wagon-http-shared/pom.xml maven/wagon/trunk/wagon-providers/wagon-http/pom.xml maven/wagon/trunk/wagon-providers/wagon-scm/pom.xml maven/wagon/trunk/wagon-providers/wagon-ssh-common-test/pom.xml maven/wagon/trunk/wagon-providers/wagon-ssh-common/pom.xml maven/wagon/trunk/wagon-providers/wagon-ssh-external/pom.xml maven/wagon/trunk/wagon-providers/wagon-ssh/pom.xml maven/wagon/trunk/wagon-providers/wagon-webdav-jackrabbit/pom.xml Modified: maven/wagon/trunk/pom.xml URL: http://svn.apache.org/viewvc/maven/wagon/trunk/pom.xml?rev=680232&r1=680231&r2=680232&view=diff ============================================================================== --- maven/wagon/trunk/pom.xml (original) +++ maven/wagon/trunk/pom.xml Sun Jul 27 20:13:29 2008 @@ -10,7 +10,7 @@ <artifactId>wagon</artifactId> <packaging>pom</packaging> <name>Maven Wagon</name> - <version>1.0-beta-4</version> + <version>1.0-beta-5-SNAPSHOT</version> <description>Tools to manage artifacts and deployment</description> <url>http://maven.apache.org/wagon</url> @@ -66,9 +66,9 @@ </developer> </developers> <scm> - <connection>scm:svn:http://svn.apache.org/repos/asf/maven/wagon/tags/wagon-1.0-beta-4</connection> - <developerConnection>scm:svn:https://svn.apache.org/repos/asf/maven/wagon/tags/wagon-1.0-beta-4</developerConnection> - <url>http://svn.apache.org/viewvc/maven/wagon/tags/wagon-1.0-beta-4</url> + <connection>scm:svn:http://svn.apache.org/repos/asf/maven/wagon/trunk</connection> + <developerConnection>scm:svn:https://svn.apache.org/repos/asf/maven/wagon/trunk</developerConnection> + <url>http://svn.apache.org/viewvc/maven/wagon/trunk</url> </scm> <build> <pluginManagement> @@ -133,22 +133,22 @@ <dependency> <groupId>org.apache.maven.wagon</groupId> <artifactId>wagon-provider-api</artifactId> - <version>1.0-beta-4</version> + <version>1.0-beta-5-SNAPSHOT</version> </dependency> <dependency> <groupId>org.apache.maven.wagon</groupId> <artifactId>wagon-provider-test</artifactId> - <version>1.0-beta-4</version> + <version>1.0-beta-5-SNAPSHOT</version> </dependency> <dependency> <groupId>org.apache.maven.wagon</groupId> <artifactId>wagon-ssh-common-test</artifactId> - <version>1.0-beta-4</version> + <version>1.0-beta-5-SNAPSHOT</version> </dependency> <dependency> <groupId>org.apache.maven.wagon</groupId> <artifactId>wagon-ssh-common</artifactId> - <version>1.0-beta-4</version> + <version>1.0-beta-5-SNAPSHOT</version> </dependency> <dependency> <groupId>junit</groupId> Modified: maven/wagon/trunk/wagon-provider-api/pom.xml URL: http://svn.apache.org/viewvc/maven/wagon/trunk/wagon-provider-api/pom.xml?rev=680232&r1=680231&r2=680232&view=diff ============================================================================== --- maven/wagon/trunk/wagon-provider-api/pom.xml (original) +++ maven/wagon/trunk/wagon-provider-api/pom.xml Sun Jul 27 20:13:29 2008 @@ -2,7 +2,7 @@ <parent> <artifactId>wagon</artifactId> <groupId>org.apache.maven.wagon</groupId> - <version>1.0-beta-4</version> + <version>1.0-beta-5-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>wagon-provider-api</artifactId> Modified: maven/wagon/trunk/wagon-provider-test/pom.xml URL: http://svn.apache.org/viewvc/maven/wagon/trunk/wagon-provider-test/pom.xml?rev=680232&r1=680231&r2=680232&view=diff ============================================================================== --- maven/wagon/trunk/wagon-provider-test/pom.xml (original) +++ maven/wagon/trunk/wagon-provider-test/pom.xml Sun Jul 27 20:13:29 2008 @@ -2,7 +2,7 @@ <parent> <artifactId>wagon</artifactId> <groupId>org.apache.maven.wagon</groupId> - <version>1.0-beta-4</version> + <version>1.0-beta-5-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>wagon-provider-test</artifactId> Modified: maven/wagon/trunk/wagon-providers/pom.xml URL: http://svn.apache.org/viewvc/maven/wagon/trunk/wagon-providers/pom.xml?rev=680232&r1=680231&r2=680232&view=diff ============================================================================== --- maven/wagon/trunk/wagon-providers/pom.xml (original) +++ maven/wagon/trunk/wagon-providers/pom.xml Sun Jul 27 20:13:29 2008 @@ -2,7 +2,7 @@ <parent> <artifactId>wagon</artifactId> <groupId>org.apache.maven.wagon</groupId> - <version>1.0-beta-4</version> + <version>1.0-beta-5-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>wagon-providers</artifactId> Modified: maven/wagon/trunk/wagon-providers/wagon-file/pom.xml URL: http://svn.apache.org/viewvc/maven/wagon/trunk/wagon-providers/wagon-file/pom.xml?rev=680232&r1=680231&r2=680232&view=diff ============================================================================== --- maven/wagon/trunk/wagon-providers/wagon-file/pom.xml (original) +++ maven/wagon/trunk/wagon-providers/wagon-file/pom.xml Sun Jul 27 20:13:29 2008 @@ -2,7 +2,7 @@ <parent> <artifactId>wagon-providers</artifactId> <groupId>org.apache.maven.wagon</groupId> - <version>1.0-beta-4</version> + <version>1.0-beta-5-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>wagon-file</artifactId> Modified: maven/wagon/trunk/wagon-providers/wagon-ftp/pom.xml URL: http://svn.apache.org/viewvc/maven/wagon/trunk/wagon-providers/wagon-ftp/pom.xml?rev=680232&r1=680231&r2=680232&view=diff ============================================================================== --- maven/wagon/trunk/wagon-providers/wagon-ftp/pom.xml (original) +++ maven/wagon/trunk/wagon-providers/wagon-ftp/pom.xml Sun Jul 27 20:13:29 2008 @@ -2,7 +2,7 @@ <parent> <artifactId>wagon-providers</artifactId> <groupId>org.apache.maven.wagon</groupId> - <version>1.0-beta-4</version> + <version>1.0-beta-5-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>wagon-ftp</artifactId> Modified: maven/wagon/trunk/wagon-providers/wagon-http-lightweight/pom.xml URL: http://svn.apache.org/viewvc/maven/wagon/trunk/wagon-providers/wagon-http-lightweight/pom.xml?rev=680232&r1=680231&r2=680232&view=diff ============================================================================== --- maven/wagon/trunk/wagon-providers/wagon-http-lightweight/pom.xml (original) +++ maven/wagon/trunk/wagon-providers/wagon-http-lightweight/pom.xml Sun Jul 27 20:13:29 2008 @@ -2,7 +2,7 @@ <parent> <artifactId>wagon-providers</artifactId> <groupId>org.apache.maven.wagon</groupId> - <version>1.0-beta-4</version> + <version>1.0-beta-5-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> Modified: maven/wagon/trunk/wagon-providers/wagon-http-shared/pom.xml URL: http://svn.apache.org/viewvc/maven/wagon/trunk/wagon-providers/wagon-http-shared/pom.xml?rev=680232&r1=680231&r2=680232&view=diff ============================================================================== --- maven/wagon/trunk/wagon-providers/wagon-http-shared/pom.xml (original) +++ maven/wagon/trunk/wagon-providers/wagon-http-shared/pom.xml Sun Jul 27 20:13:29 2008 @@ -2,7 +2,7 @@ <parent> <artifactId>wagon-providers</artifactId> <groupId>org.apache.maven.wagon</groupId> - <version>1.0-beta-4</version> + <version>1.0-beta-5-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>wagon-http-shared</artifactId> Modified: maven/wagon/trunk/wagon-providers/wagon-http/pom.xml URL: http://svn.apache.org/viewvc/maven/wagon/trunk/wagon-providers/wagon-http/pom.xml?rev=680232&r1=680231&r2=680232&view=diff ============================================================================== --- maven/wagon/trunk/wagon-providers/wagon-http/pom.xml (original) +++ maven/wagon/trunk/wagon-providers/wagon-http/pom.xml Sun Jul 27 20:13:29 2008 @@ -2,7 +2,7 @@ <parent> <artifactId>wagon-providers</artifactId> <groupId>org.apache.maven.wagon</groupId> - <version>1.0-beta-4</version> + <version>1.0-beta-5-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>wagon-http</artifactId> @@ -15,7 +15,7 @@ <dependency> <groupId>${pom.groupId}</groupId> <artifactId>wagon-http-shared</artifactId> - <version>1.0-beta-4</version> + <version>1.0-beta-5-SNAPSHOT</version> </dependency> <dependency> <groupId>plexus</groupId> Modified: maven/wagon/trunk/wagon-providers/wagon-scm/pom.xml URL: http://svn.apache.org/viewvc/maven/wagon/trunk/wagon-providers/wagon-scm/pom.xml?rev=680232&r1=680231&r2=680232&view=diff ============================================================================== --- maven/wagon/trunk/wagon-providers/wagon-scm/pom.xml (original) +++ maven/wagon/trunk/wagon-providers/wagon-scm/pom.xml Sun Jul 27 20:13:29 2008 @@ -2,7 +2,7 @@ <parent> <artifactId>wagon-providers</artifactId> <groupId>org.apache.maven.wagon</groupId> - <version>1.0-beta-4</version> + <version>1.0-beta-5-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>wagon-scm</artifactId> Modified: maven/wagon/trunk/wagon-providers/wagon-ssh-common-test/pom.xml URL: http://svn.apache.org/viewvc/maven/wagon/trunk/wagon-providers/wagon-ssh-common-test/pom.xml?rev=680232&r1=680231&r2=680232&view=diff ============================================================================== --- maven/wagon/trunk/wagon-providers/wagon-ssh-common-test/pom.xml (original) +++ maven/wagon/trunk/wagon-providers/wagon-ssh-common-test/pom.xml Sun Jul 27 20:13:29 2008 @@ -2,7 +2,7 @@ <parent> <artifactId>wagon-providers</artifactId> <groupId>org.apache.maven.wagon</groupId> - <version>1.0-beta-4</version> + <version>1.0-beta-5-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>wagon-ssh-common-test</artifactId> Modified: maven/wagon/trunk/wagon-providers/wagon-ssh-common/pom.xml URL: http://svn.apache.org/viewvc/maven/wagon/trunk/wagon-providers/wagon-ssh-common/pom.xml?rev=680232&r1=680231&r2=680232&view=diff ============================================================================== --- maven/wagon/trunk/wagon-providers/wagon-ssh-common/pom.xml (original) +++ maven/wagon/trunk/wagon-providers/wagon-ssh-common/pom.xml Sun Jul 27 20:13:29 2008 @@ -2,7 +2,7 @@ <parent> <artifactId>wagon-providers</artifactId> <groupId>org.apache.maven.wagon</groupId> - <version>1.0-beta-4</version> + <version>1.0-beta-5-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>wagon-ssh-common</artifactId> Modified: maven/wagon/trunk/wagon-providers/wagon-ssh-external/pom.xml URL: http://svn.apache.org/viewvc/maven/wagon/trunk/wagon-providers/wagon-ssh-external/pom.xml?rev=680232&r1=680231&r2=680232&view=diff ============================================================================== --- maven/wagon/trunk/wagon-providers/wagon-ssh-external/pom.xml (original) +++ maven/wagon/trunk/wagon-providers/wagon-ssh-external/pom.xml Sun Jul 27 20:13:29 2008 @@ -2,7 +2,7 @@ <parent> <artifactId>wagon-providers</artifactId> <groupId>org.apache.maven.wagon</groupId> - <version>1.0-beta-4</version> + <version>1.0-beta-5-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>wagon-ssh-external</artifactId> Modified: maven/wagon/trunk/wagon-providers/wagon-ssh/pom.xml URL: http://svn.apache.org/viewvc/maven/wagon/trunk/wagon-providers/wagon-ssh/pom.xml?rev=680232&r1=680231&r2=680232&view=diff ============================================================================== --- maven/wagon/trunk/wagon-providers/wagon-ssh/pom.xml (original) +++ maven/wagon/trunk/wagon-providers/wagon-ssh/pom.xml Sun Jul 27 20:13:29 2008 @@ -2,7 +2,7 @@ <parent> <artifactId>wagon-providers</artifactId> <groupId>org.apache.maven.wagon</groupId> - <version>1.0-beta-4</version> + <version>1.0-beta-5-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>wagon-ssh</artifactId> Modified: maven/wagon/trunk/wagon-providers/wagon-webdav-jackrabbit/pom.xml URL: http://svn.apache.org/viewvc/maven/wagon/trunk/wagon-providers/wagon-webdav-jackrabbit/pom.xml?rev=680232&r1=680231&r2=680232&view=diff ============================================================================== --- maven/wagon/trunk/wagon-providers/wagon-webdav-jackrabbit/pom.xml (original) +++ maven/wagon/trunk/wagon-providers/wagon-webdav-jackrabbit/pom.xml Sun Jul 27 20:13:29 2008 @@ -2,7 +2,7 @@ <parent> <artifactId>wagon-providers</artifactId> <groupId>org.apache.maven.wagon</groupId> - <version>1.0-beta-4</version> + <version>1.0-beta-5-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>wagon-webdav-jackrabbit</artifactId> @@ -26,7 +26,7 @@ <dependency> <groupId>${pom.groupId}</groupId> <artifactId>wagon-http-shared</artifactId> - <version>1.0-beta-4</version> + <version>1.0-beta-5-SNAPSHOT</version> </dependency> <dependency> <groupId>org.apache.jackrabbit</groupId> --------------------------------------------------------------------- To unsubscribe, e-mail: belljames@example.org For additional commands, e-mail: belljames@example.org From wagon-commitsbelljames@example.org Tue Jul 29 16:46:45 2008 Return-Path: <wagon-commitsbelljames@example.org> Delivered-To: belljames@example.org Received: (qmail 74743 invoked from network); 29 Jul 2008 16:46:45 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (83.161.120.155) by minotaur.apache.org with SMTP; 29 Jul 2008 16:46:45 -0000 Received: (qmail 19043 invoked by uid 500); 29 Jul 2008 16:46:45 -0000 Delivered-To: belljames@example.org Received: (qmail 19017 invoked by uid 500); 29 Jul 2008 16:46:45 -0000 Mailing-List: contact belljames@example.org; run by ezmlm Precedence: bulk List-Help: <mailto:belljames@example.org> List-Unsubscribe: <mailto:belljames@example.org> List-Post: <mailto:belljames@example.org> List-Id: <wagon-commits.maven.apache.org> Reply-To: belljames@example.org Delivered-To: mailing list belljames@example.org Received: (qmail 19007 invoked by uid 99); 29 Jul 2008 16:46:45 -0000 Received: from athena.apache.org (HELO athena.apache.org) (83.161.120.155) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 29 Jul 2008 09:46:45 -0700 X-ASF-Spam-Status: No, hits=-2000.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [83.161.120.155] (HELO eris.apache.org) (83.161.120.155) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 29 Jul 2008 16:45:58 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id B01DF238889F; Tue, 29 Jul 2008 09:45:54 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r680764 - in /maven/wagon/trunk/wagon-providers/wagon-http-lightweight/src: main/java/org/apache/maven/wagon/providers/http/LightweightHttpWagon.java test/java/org/apache/maven/wagon/providers/http/LightweightHttpWagonTest.java Date: Tue, 29 Jul 2008 16:45:53 -0000 To: belljames@example.org From: belljames@example.org X-Mailer: svnmailer-1.0.8 Message-Id: <belljames@example.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: brett Date: Tue Jul 29 09:45:51 2008 New Revision: 680764 URL: http://svn.apache.org/viewvc?rev=680764&view=rev Log: [WAGON-232] Lightweight HTTP wagon doesn't reset proxy settings correctly if they were not previously set Modified: maven/wagon/trunk/wagon-providers/wagon-http-lightweight/src/main/java/org/apache/maven/wagon/providers/http/LightweightHttpWagon.java maven/wagon/trunk/wagon-providers/wagon-http-lightweight/src/test/java/org/apache/maven/wagon/providers/http/LightweightHttpWagonTest.java Modified: maven/wagon/trunk/wagon-providers/wagon-http-lightweight/src/main/java/org/apache/maven/wagon/providers/http/LightweightHttpWagon.java URL: http://svn.apache.org/viewvc/maven/wagon/trunk/wagon-providers/wagon-http-lightweight/src/main/java/org/apache/maven/wagon/providers/http/LightweightHttpWagon.java?rev=680764&r1=680763&r2=680764&view=diff ============================================================================== --- maven/wagon/trunk/wagon-providers/wagon-http-lightweight/src/main/java/org/apache/maven/wagon/providers/http/LightweightHttpWagon.java (original) +++ maven/wagon/trunk/wagon-providers/wagon-http-lightweight/src/main/java/org/apache/maven/wagon/providers/http/LightweightHttpWagon.java Tue Jul 29 09:45:51 2008 @@ -223,6 +223,11 @@ System.setProperty( "http.nonProxyHosts", proxyInfo.getNonProxyHosts() ); } } + else + { + System.getProperties().remove( "http.proxyHost" ); + System.getProperties().remove( "http.proxyPort" ); + } final boolean hasProxy = ( proxyInfo != null && proxyInfo.getUserName() != null ); final boolean hasAuthentication = ( authenticationInfo != null && authenticationInfo.getUserName() != null ); @@ -271,14 +276,26 @@ { System.setProperty( "http.proxyHost", previousHttpProxyHost ); } + else + { + System.getProperties().remove( "http.proxyHost" ); + } if ( previousHttpProxyPort != null ) { System.setProperty( "http.proxyPort", previousHttpProxyPort ); } + else + { + System.getProperties().remove( "http.proxyPort" ); + } if ( previousProxyExclusions != null ) { System.setProperty( "http.nonProxyHosts", previousProxyExclusions ); } + else + { + System.getProperties().remove( "http.nonProxyHosts" ); + } } public List getFileList( String destinationDirectory ) Modified: maven/wagon/trunk/wagon-providers/wagon-http-lightweight/src/test/java/org/apache/maven/wagon/providers/http/LightweightHttpWagonTest.java URL: http://svn.apache.org/viewvc/maven/wagon/trunk/wagon-providers/wagon-http-lightweight/src/test/java/org/apache/maven/wagon/providers/http/LightweightHttpWagonTest.java?rev=680764&r1=680763&r2=680764&view=diff ============================================================================== --- maven/wagon/trunk/wagon-providers/wagon-http-lightweight/src/test/java/org/apache/maven/wagon/providers/http/LightweightHttpWagonTest.java (original) +++ maven/wagon/trunk/wagon-providers/wagon-http-lightweight/src/test/java/org/apache/maven/wagon/providers/http/LightweightHttpWagonTest.java Tue Jul 29 09:45:51 2008 @@ -23,6 +23,8 @@ import org.apache.maven.wagon.FileTestUtils; import org.apache.maven.wagon.StreamingWagonTestCase; +import org.apache.maven.wagon.Wagon; +import org.apache.maven.wagon.proxy.ProxyInfo; import org.apache.maven.wagon.repository.Repository; import org.apache.maven.wagon.resource.Resource; import org.codehaus.plexus.jetty.Httpd; @@ -86,4 +88,92 @@ File file = getTestFile( "target/test-output/http-repository", resource.getName() ); return file.lastModified(); } + + public void testProxyReset() + throws Exception + { + ProxyInfo proxyInfo = new ProxyInfo(); + proxyInfo.setType( "http" ); + proxyInfo.setHost( "proxyhost" ); + proxyInfo.setPort( 1234 ); + proxyInfo.setNonProxyHosts( "non" ); + + Repository repository = new Repository(); + + String proxyHost = System.getProperty( "http.proxyHost" ); + String proxyPort = System.getProperty( "http.proxyPort" ); + String nonProxyHosts = System.getProperty( "http.nonProxyHosts" ); + + System.getProperties().remove( "http.proxyHost" ); + System.getProperties().remove( "http.proxyPort" ); + + Wagon wagon = getWagon(); + + wagon.connect( repository, proxyInfo ); + + assertEquals( "proxyhost", System.getProperty( "http.proxyHost" ) ); + assertEquals( "1234", System.getProperty( "http.proxyPort" ) ); + assertEquals( "non", System.getProperty( "http.nonProxyHosts" ) ); + + wagon.disconnect(); + + assertNull( System.getProperty( "http.proxyHost" ) ); + assertNull( System.getProperty( "http.proxyPort" ) ); + + System.setProperty( "http.proxyHost", "host" ); + System.setProperty( "http.proxyPort", "port" ); + System.setProperty( "http.nonProxyHosts", "hosts" ); + + wagon = getWagon(); + + wagon.connect( repository, proxyInfo ); + + assertEquals( "proxyhost", System.getProperty( "http.proxyHost" ) ); + assertEquals( "1234", System.getProperty( "http.proxyPort" ) ); + assertEquals( "non", System.getProperty( "http.nonProxyHosts" ) ); + + wagon.disconnect(); + + assertEquals( "host", System.getProperty( "http.proxyHost" ) ); + assertEquals( "port", System.getProperty( "http.proxyPort" ) ); + assertEquals( "hosts", System.getProperty( "http.nonProxyHosts" ) ); + + wagon = getWagon(); + + wagon.connect( repository ); + + assertNull( System.getProperty( "http.proxyHost" ) ); + assertNull( System.getProperty( "http.proxyPort" ) ); + + wagon.disconnect(); + + assertEquals( "host", System.getProperty( "http.proxyHost" ) ); + assertEquals( "port", System.getProperty( "http.proxyPort" ) ); + assertEquals( "hosts", System.getProperty( "http.nonProxyHosts" ) ); + + if ( proxyHost != null ) + { + System.setProperty( "http.proxyHost", proxyHost ); + } + else + { + System.getProperties().remove( "http.proxyHost" ); + } + if ( proxyPort != null ) + { + System.setProperty( "http.proxyPort", proxyPort ); + } + else + { + System.getProperties().remove( "http.proxyPort" ); + } + if ( nonProxyHosts != null ) + { + System.setProperty( "http.nonProxyHosts", nonProxyHosts ); + } + else + { + System.getProperties().remove( "http.nonProxyHosts" ); + } + } } --------------------------------------------------------------------- To unsubscribe, e-mail: belljames@example.org For additional commands, e-mail: belljames@example.org From wagon-commitsbelljames@example.org Tue Jul 29 17:07:39 2008 Return-Path: <wagon-commitsbelljames@example.org> Delivered-To: belljames@example.org Received: (qmail 83836 invoked from network); 29 Jul 2008 17:07:39 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (83.161.120.155) by minotaur.apache.org with SMTP; 29 Jul 2008 17:07:39 -0000 Received: (qmail 42216 invoked by uid 500); 29 Jul 2008 17:07:39 -0000 Delivered-To: belljames@example.org Received: (qmail 42200 invoked by uid 500); 29 Jul 2008 17:07:39 -0000 Mailing-List: contact belljames@example.org; run by ezmlm Precedence: bulk List-Help: <mailto:belljames@example.org> List-Unsubscribe: <mailto:belljames@example.org> List-Post: <mailto:belljames@example.org> List-Id: <wagon-commits.maven.apache.org> Reply-To: belljames@example.org Delivered-To: mailing list belljames@example.org Received: (qmail 42191 invoked by uid 99); 29 Jul 2008 17:07:38 -0000 Received: from athena.apache.org (HELO athena.apache.org) (83.161.120.155) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 29 Jul 2008 10:07:38 -0700 X-ASF-Spam-Status: No, hits=-2000.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [83.161.120.155] (HELO eris.apache.org) (83.161.120.155) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 29 Jul 2008 17:06:52 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id A8B7023889E3; Tue, 29 Jul 2008 10:06:48 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r680774 - /maven/wagon/trunk/wagon-providers/wagon-http-lightweight/src/main/java/org/apache/maven/wagon/providers/http/LightweightHttpWagon.java Date: Tue, 29 Jul 2008 17:06:48 -0000 To: belljames@example.org From: belljames@example.org X-Mailer: svnmailer-1.0.8 Message-Id: <belljames@example.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: brett Date: Tue Jul 29 10:06:47 2008 New Revision: 680774 URL: http://svn.apache.org/viewvc?rev=680774&view=rev Log: include the cause in the exception message Modified: maven/wagon/trunk/wagon-providers/wagon-http-lightweight/src/main/java/org/apache/maven/wagon/providers/http/LightweightHttpWagon.java Modified: maven/wagon/trunk/wagon-providers/wagon-http-lightweight/src/main/java/org/apache/maven/wagon/providers/http/LightweightHttpWagon.java URL: http://svn.apache.org/viewvc/maven/wagon/trunk/wagon-providers/wagon-http-lightweight/src/main/java/org/apache/maven/wagon/providers/http/LightweightHttpWagon.java?rev=680774&r1=680773&r2=680774&view=diff ============================================================================== --- maven/wagon/trunk/wagon-providers/wagon-http-lightweight/src/main/java/org/apache/maven/wagon/providers/http/LightweightHttpWagon.java (original) +++ maven/wagon/trunk/wagon-providers/wagon-http-lightweight/src/main/java/org/apache/maven/wagon/providers/http/LightweightHttpWagon.java Tue Jul 29 10:06:47 2008 @@ -133,7 +133,7 @@ } catch ( IOException e ) { - throw new TransferFailedException( "Error transferring file", e ); + throw new TransferFailedException( "Error transferring file: " + e.getMessage(), e ); } } --------------------------------------------------------------------- To unsubscribe, e-mail: belljames@example.org For additional commands, e-mail: belljames@example.org From wagon-commitsbelljames@example.org Wed Jul 30 09:55:06 2008 Return-Path: <wagon-commitsbelljames@example.org> Delivered-To: belljames@example.org Received: (qmail 39978 invoked from network); 30 Jul 2008 09:55:05 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (83.161.120.155) by minotaur.apache.org with SMTP; 30 Jul 2008 09:55:05 -0000 Received: (qmail 97123 invoked by uid 500); 30 Jul 2008 09:55:05 -0000 Delivered-To: belljames@example.org Received: (qmail 97091 invoked by uid 500); 30 Jul 2008 09:55:05 -0000 Mailing-List: contact belljames@example.org; run by ezmlm Precedence: bulk List-Help: <mailto:belljames@example.org> List-Unsubscribe: <mailto:belljames@example.org> List-Post: <mailto:belljames@example.org> List-Id: <wagon-commits.maven.apache.org> Reply-To: belljames@example.org Delivered-To: mailing list belljames@example.org Received: (qmail 97078 invoked by uid 99); 30 Jul 2008 09:55:05 -0000 Received: from athena.apache.org (HELO athena.apache.org) (83.161.120.155) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 30 Jul 2008 02:55:05 -0700 X-ASF-Spam-Status: No, hits=-2000.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [83.161.120.155] (HELO eris.apache.org) (83.161.120.155) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 30 Jul 2008 09:54:17 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id DC820238898A; Wed, 30 Jul 2008 02:54:13 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r680954 - in /maven/wagon/trunk/wagon-provider-api/src: main/java/org/apache/maven/wagon/ main/java/org/apache/maven/wagon/events/ main/java/org/apache/maven/wagon/observers/ main/java/org/apache/maven/wagon/proxy/ test/java/org/apache/mave... Date: Wed, 30 Jul 2008 09:54:11 -0000 To: belljames@example.org From: belljames@example.org X-Mailer: svnmailer-1.0.8 Message-Id: <belljames@example.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: brett Date: Wed Jul 30 02:54:09 2008 New Revision: 680954 URL: http://svn.apache.org/viewvc?rev=680954&view=rev Log: completing test coverage of the API module Added: maven/wagon/trunk/wagon-provider-api/src/test/java/org/apache/maven/wagon/StreamWagonTest.java (with props) Modified: maven/wagon/trunk/wagon-provider-api/src/main/java/org/apache/maven/wagon/PathUtils.java maven/wagon/trunk/wagon-provider-api/src/main/java/org/apache/maven/wagon/PermissionModeUtils.java maven/wagon/trunk/wagon-provider-api/src/main/java/org/apache/maven/wagon/WagonUtils.java maven/wagon/trunk/wagon-provider-api/src/main/java/org/apache/maven/wagon/events/TransferEvent.java maven/wagon/trunk/wagon-provider-api/src/main/java/org/apache/maven/wagon/observers/Debug.java maven/wagon/trunk/wagon-provider-api/src/main/java/org/apache/maven/wagon/proxy/ProxyUtils.java maven/wagon/trunk/wagon-provider-api/src/test/java/org/apache/maven/wagon/AbstractWagonTest.java maven/wagon/trunk/wagon-provider-api/src/test/java/org/apache/maven/wagon/observers/ChecksumObserverTest.java Modified: maven/wagon/trunk/wagon-provider-api/src/main/java/org/apache/maven/wagon/PathUtils.java URL: http://svn.apache.org/viewvc/maven/wagon/trunk/wagon-provider-api/src/main/java/org/apache/maven/wagon/PathUtils.java?rev=680954&r1=680953&r2=680954&view=diff ============================================================================== --- maven/wagon/trunk/wagon-provider-api/src/main/java/org/apache/maven/wagon/PathUtils.java (original) +++ maven/wagon/trunk/wagon-provider-api/src/main/java/org/apache/maven/wagon/PathUtils.java Wed Jul 30 02:54:09 2008 @@ -28,8 +28,12 @@ * @author <a href="belljames@example.org">Michal Maczka</a> * @version $Id$ */ -public class PathUtils +public final class PathUtils { + private PathUtils() + { + } + /** * Returns the directory path portion of a file specification string. * Matches the equally named unix command. Modified: maven/wagon/trunk/wagon-provider-api/src/main/java/org/apache/maven/wagon/PermissionModeUtils.java URL: http://svn.apache.org/viewvc/maven/wagon/trunk/wagon-provider-api/src/main/java/org/apache/maven/wagon/PermissionModeUtils.java?rev=680954&r1=680953&r2=680954&view=diff ============================================================================== --- maven/wagon/trunk/wagon-provider-api/src/main/java/org/apache/maven/wagon/PermissionModeUtils.java (original) +++ maven/wagon/trunk/wagon-provider-api/src/main/java/org/apache/maven/wagon/PermissionModeUtils.java Wed Jul 30 02:54:09 2008 @@ -26,8 +26,12 @@ * @see PermissionModeUtils * @since Sep 3, 2005 */ -public class PermissionModeUtils +public final class PermissionModeUtils { + private PermissionModeUtils() + { + } + /** * See the System Interfaces volume of IEEE Std 1003.1-2001, umask(1) * Modified: maven/wagon/trunk/wagon-provider-api/src/main/java/org/apache/maven/wagon/WagonUtils.java URL: http://svn.apache.org/viewvc/maven/wagon/trunk/wagon-provider-api/src/main/java/org/apache/maven/wagon/WagonUtils.java?rev=680954&r1=680953&r2=680954&view=diff ============================================================================== --- maven/wagon/trunk/wagon-provider-api/src/main/java/org/apache/maven/wagon/WagonUtils.java (original) +++ maven/wagon/trunk/wagon-provider-api/src/main/java/org/apache/maven/wagon/WagonUtils.java Wed Jul 30 02:54:09 2008 @@ -29,10 +29,13 @@ /** * @author <a href="mailto:belljames@example.org">Michal Maczka</a> * @version $Id$ + * @deprecated */ -public class WagonUtils +public final class WagonUtils { - + private WagonUtils() + { + } public static String toString( String resource, Wagon wagon ) throws IOException, TransferFailedException, ResourceDoesNotExistException, AuthorizationException Modified: maven/wagon/trunk/wagon-provider-api/src/main/java/org/apache/maven/wagon/events/TransferEvent.java URL: http://svn.apache.org/viewvc/maven/wagon/trunk/wagon-provider-api/src/main/java/org/apache/maven/wagon/events/TransferEvent.java?rev=680954&r1=680953&r2=680954&view=diff ============================================================================== --- maven/wagon/trunk/wagon-provider-api/src/main/java/org/apache/maven/wagon/events/TransferEvent.java (original) +++ maven/wagon/trunk/wagon-provider-api/src/main/java/org/apache/maven/wagon/events/TransferEvent.java Wed Jul 30 02:54:09 2008 @@ -288,7 +288,7 @@ if ( other.exception != null ) return false; } - else if ( !exception.equals( other.exception ) ) + else if ( !exception.getClass().equals( other.exception.getClass() ) ) return false; if ( requestType != other.requestType ) return false; Modified: maven/wagon/trunk/wagon-provider-api/src/main/java/org/apache/maven/wagon/observers/Debug.java URL: http://svn.apache.org/viewvc/maven/wagon/trunk/wagon-provider-api/src/main/java/org/apache/maven/wagon/observers/Debug.java?rev=680954&r1=680953&r2=680954&view=diff ============================================================================== --- maven/wagon/trunk/wagon-provider-api/src/main/java/org/apache/maven/wagon/observers/Debug.java (original) +++ maven/wagon/trunk/wagon-provider-api/src/main/java/org/apache/maven/wagon/observers/Debug.java Wed Jul 30 02:54:09 2008 @@ -39,7 +39,6 @@ long transfer; - public Debug() { this( System.out ); @@ -199,4 +198,9 @@ } + public PrintStream getOut() + { + return out; + } + } Modified: maven/wagon/trunk/wagon-provider-api/src/main/java/org/apache/maven/wagon/proxy/ProxyUtils.java URL: http://svn.apache.org/viewvc/maven/wagon/trunk/wagon-provider-api/src/main/java/org/apache/maven/wagon/proxy/ProxyUtils.java?rev=680954&r1=680953&r2=680954&view=diff ============================================================================== --- maven/wagon/trunk/wagon-provider-api/src/main/java/org/apache/maven/wagon/proxy/ProxyUtils.java (original) +++ maven/wagon/trunk/wagon-provider-api/src/main/java/org/apache/maven/wagon/proxy/ProxyUtils.java Wed Jul 30 02:54:09 2008 @@ -24,8 +24,11 @@ /** * @author <a href="mailto:belljames@example.org">Thomas Champagne</a> */ -public class ProxyUtils +public final class ProxyUtils { + private ProxyUtils() + { + } /** * Check if the specified host is in the list of non proxy hosts. Modified: maven/wagon/trunk/wagon-provider-api/src/test/java/org/apache/maven/wagon/AbstractWagonTest.java URL: http://svn.apache.org/viewvc/maven/wagon/trunk/wagon-provider-api/src/test/java/org/apache/maven/wagon/AbstractWagonTest.java?rev=680954&r1=680953&r2=680954&view=diff ============================================================================== --- maven/wagon/trunk/wagon-provider-api/src/test/java/org/apache/maven/wagon/AbstractWagonTest.java (original) +++ maven/wagon/trunk/wagon-provider-api/src/test/java/org/apache/maven/wagon/AbstractWagonTest.java Wed Jul 30 02:54:09 2008 @@ -19,20 +19,28 @@ * under the License. */ +import java.io.ByteArrayOutputStream; import java.io.File; +import java.io.IOException; import java.io.InputStream; import java.io.OutputStream; import junit.framework.TestCase; import org.apache.maven.wagon.authentication.AuthenticationException; +import org.apache.maven.wagon.authentication.AuthenticationInfo; import org.apache.maven.wagon.authorization.AuthorizationException; import org.apache.maven.wagon.events.SessionListener; +import org.apache.maven.wagon.events.TransferEvent; import org.apache.maven.wagon.events.TransferListener; import org.apache.maven.wagon.proxy.ProxyInfo; import org.apache.maven.wagon.proxy.ProxyInfoProvider; import org.apache.maven.wagon.repository.Repository; +import org.apache.maven.wagon.repository.RepositoryPermissions; +import org.apache.maven.wagon.resource.Resource; +import org.codehaus.plexus.util.FileUtils; import org.codehaus.plexus.util.IOUtil; +import org.easymock.AbstractMatcher; import org.easymock.MockControl; /** @@ -42,6 +50,36 @@ public class AbstractWagonTest extends TestCase { + private static class TestWagon + extends AbstractWagon + { + protected void closeConnection() + throws ConnectionException + { + } + + protected void openConnectionInternal() + throws ConnectionException, AuthenticationException + { + } + + public void get( String resourceName, File destination ) + throws TransferFailedException, ResourceDoesNotExistException, AuthorizationException + { + } + + public boolean getIfNewer( String resourceName, File destination, long timestamp ) + throws TransferFailedException, ResourceDoesNotExistException, AuthorizationException + { + return false; + } + + public void put( File source, String destination ) + throws TransferFailedException, ResourceDoesNotExistException, AuthorizationException + { + } + }; + private String basedir; private WagonMock wagon = null; @@ -73,12 +111,12 @@ wagon = new WagonMock(); - sessionListenerControl = MockControl.createControl( SessionListener.class ); + sessionListenerControl = MockControl.createControl( SessionListener.class ); sessionListener = (SessionListener) sessionListenerControl.getMock(); wagon.addSessionListener( sessionListener ); - transferListenerControl = MockControl.createControl( TransferListener.class ); + transferListenerControl = MockControl.createControl( TransferListener.class ); transferListener = (TransferListener) transferListenerControl.getMock(); wagon.addTransferListener( transferListener ); @@ -103,7 +141,8 @@ assertFalse( wagon.hasTransferListener( transferListener ) ); } - public void testNoProxyConfiguration() throws ConnectionException, AuthenticationException + public void testNoProxyConfiguration() + throws ConnectionException, AuthenticationException { Repository repository = new Repository(); wagon.connect( repository ); @@ -115,7 +154,8 @@ assertNull( wagon.getProxyInfo( "http", "localhost" ) ); } - public void testNullProxyConfiguration() throws ConnectionException, AuthenticationException + public void testNullProxyConfiguration() + throws ConnectionException, AuthenticationException { Repository repository = new Repository(); wagon.connect( repository, (ProxyInfo) null ); @@ -125,13 +165,30 @@ assertNull( wagon.getProxyInfo( "scp", "www.example.com" ) ); assertNull( wagon.getProxyInfo( "ftp", "www.example.com" ) ); assertNull( wagon.getProxyInfo( "http", "localhost" ) ); + + wagon.connect( repository ); + assertNull( wagon.getProxyInfo() ); + assertNull( wagon.getProxyInfo( "http", "www.example.com" ) ); + assertNull( wagon.getProxyInfo( "dav", "www.example.com" ) ); + assertNull( wagon.getProxyInfo( "scp", "www.example.com" ) ); + assertNull( wagon.getProxyInfo( "ftp", "www.example.com" ) ); + assertNull( wagon.getProxyInfo( "http", "localhost" ) ); + + wagon.connect( repository, new AuthenticationInfo() ); + assertNull( wagon.getProxyInfo() ); + assertNull( wagon.getProxyInfo( "http", "www.example.com" ) ); + assertNull( wagon.getProxyInfo( "dav", "www.example.com" ) ); + assertNull( wagon.getProxyInfo( "scp", "www.example.com" ) ); + assertNull( wagon.getProxyInfo( "ftp", "www.example.com" ) ); + assertNull( wagon.getProxyInfo( "http", "localhost" ) ); } - public void testLegacyProxyConfiguration() throws ConnectionException, AuthenticationException + public void testLegacyProxyConfiguration() + throws ConnectionException, AuthenticationException { ProxyInfo proxyInfo = new ProxyInfo(); proxyInfo.setType( "http" ); - + Repository repository = new Repository(); wagon.connect( repository, proxyInfo ); assertEquals( proxyInfo, wagon.getProxyInfo() ); @@ -141,19 +198,20 @@ assertNull( wagon.getProxyInfo( "ftp", "www.example.com" ) ); } - public void testProxyConfiguration() throws ConnectionException, AuthenticationException + public void testProxyConfiguration() + throws ConnectionException, AuthenticationException { final ProxyInfo httpProxyInfo = new ProxyInfo(); httpProxyInfo.setType( "http" ); - - final ProxyInfo socksProxyInfo = new ProxyInfo(); + + final ProxyInfo socksProxyInfo = new ProxyInfo(); socksProxyInfo.setType( "http" ); - + ProxyInfoProvider proxyInfoProvider = new ProxyInfoProvider() { public ProxyInfo getProxyInfo( String protocol ) { - if ( "http".equals( protocol ) || "dav".equals( protocol )) + if ( "http".equals( protocol ) || "dav".equals( protocol ) ) { return httpProxyInfo; } @@ -164,7 +222,7 @@ return null; } }; - + Repository repository = new Repository(); wagon.connect( repository, proxyInfoProvider ); assertNull( wagon.getProxyInfo() ); @@ -183,14 +241,86 @@ sessionListener.sessionOpening( null ); sessionListener.sessionOpened( null ); sessionListenerControl.replay(); - + wagon.connect( repository ); - + sessionListenerControl.verify(); assertEquals( repository, wagon.getRepository() ); } + public void testSessionConnectionRefusedEventConnectionException() + throws Exception + { + final WagonException exception = new ConnectionException( "" ); + + try + { + runTestSessionConnectionRefusedEvent( exception ); + fail(); + } + catch ( ConnectionException e ) + { + assertTrue( true ); + } + } + + public void testSessionConnectionRefusedEventAuthenticationException() + throws Exception + { + final WagonException exception = new AuthenticationException( "" ); + + try + { + runTestSessionConnectionRefusedEvent( exception ); + fail(); + } + catch ( AuthenticationException e ) + { + assertTrue( true ); + } + } + + private void runTestSessionConnectionRefusedEvent( final WagonException exception ) + throws ConnectionException, AuthenticationException + { + Repository repository = new Repository(); + + sessionListenerControl.setDefaultMatcher( MockControl.ALWAYS_MATCHER ); + sessionListener.sessionOpening( null ); + sessionListener.sessionConnectionRefused( null ); + sessionListenerControl.replay(); + + Wagon wagon = new TestWagon() + { + protected void openConnectionInternal() + throws ConnectionException, AuthenticationException + { + if ( exception instanceof ConnectionException ) + { + throw (ConnectionException) exception; + } + if ( exception instanceof AuthenticationException ) + { + throw (AuthenticationException) exception; + } + } + }; + wagon.addSessionListener( sessionListener ); + + try + { + wagon.connect( repository ); + fail(); + } + finally + { + sessionListenerControl.verify(); + + assertEquals( repository, wagon.getRepository() ); + } + } + public void testSessionCloseEvents() throws Exception { @@ -198,12 +328,47 @@ sessionListener.sessionDisconnecting( null ); sessionListener.sessionDisconnected( null ); sessionListenerControl.replay(); - + wagon.disconnect(); - + sessionListenerControl.verify(); } + public void testSessionCloseRefusedEventConnectionException() + throws Exception + { + Repository repository = new Repository(); + + sessionListenerControl.setDefaultMatcher( MockControl.ALWAYS_MATCHER ); + sessionListener.sessionDisconnecting( null ); + sessionListener.sessionError( null ); + sessionListenerControl.replay(); + + Wagon wagon = new TestWagon() + { + protected void closeConnection() + throws ConnectionException + { + throw new ConnectionException( "" ); + } + }; + wagon.addSessionListener( sessionListener ); + + try + { + wagon.disconnect(); + fail(); + } + catch ( ConnectionException e ) + { + assertTrue( true ); + } + finally + { + sessionListenerControl.verify(); + } + } + public void testGetTransferEvents() throws Exception { @@ -217,14 +382,14 @@ transferListenerControl.setVoidCallable( 5 ); transferListener.transferCompleted( null ); transferListenerControl.replay(); - + wagon.fireTransferDebug( "fetch debug message" ); Repository repository = new Repository(); wagon.connect( repository ); wagon.get( artifact, destination ); - + transferListenerControl.verify(); } @@ -233,12 +398,12 @@ { transferListenerControl.setDefaultMatcher( MockControl.ALWAYS_MATCHER ); transferListener.transferInitiated( null ); - transferListener.transferStarted( null ); + transferListener.transferStarted( null ); transferListener.debug( null ); transferListenerControl.setVoidCallable( MockControl.ZERO_OR_MORE ); transferListener.transferError( null ); transferListenerControl.replay(); - + try { Repository repository = new Repository(); @@ -272,7 +437,7 @@ transferListener.transferProgress( null, null, 0 ); transferListener.transferCompleted( null ); transferListenerControl.replay(); - + wagon.fireTransferDebug( "deploy debug message" ); Repository repository = new Repository(); @@ -284,56 +449,156 @@ transferListenerControl.verify(); } - /* - public void testPutError() + public void testStreamShutdown() { - MockInputStream mockInputStream = new MockInputStream(); + IOUtil.close( (InputStream) null ); - //forced io error! - mockInputStream.setForcedError( true ); + IOUtil.close( (OutputStream) null ); - StreamSource result = new StreamSource( mockInputStream ); + InputStreamMock inputStream = new InputStreamMock(); + + assertFalse( inputStream.isClosed() ); + + IOUtil.close( inputStream ); + + assertTrue( inputStream.isClosed() ); + + OutputStreamMock outputStream = new OutputStreamMock(); + + assertFalse( outputStream.isClosed() ); + + IOUtil.close( outputStream ); + + assertTrue( outputStream.isClosed() ); + } + + public void testRepositoryPermissionsOverride() + throws ConnectionException, AuthenticationException + { + Repository repository = new Repository(); - PutRequest command = new PutRequest( result, "my favourite resource" ); + RepositoryPermissions original = new RepositoryPermissions(); + original.setFileMode( "664" ); + repository.setPermissions( original ); + + RepositoryPermissions override = new RepositoryPermissions(); + override.setFileMode( "644" ); + wagon.setPermissionsOverride( override ); + wagon.connect( repository ); + + assertEquals( override, repository.getPermissions() ); + assertEquals( "644", repository.getPermissions().getFileMode() ); + } + + public void testRepositoryUserName() + throws ConnectionException, AuthenticationException + { + Repository repository = new Repository( "id", "http://bporter:belljames@example.org/path/to/resource" ); + + AuthenticationInfo authenticationInfo = new AuthenticationInfo(); + authenticationInfo.setUserName( "brett" ); + authenticationInfo.setPassword( "pass" ); + wagon.connect( repository, authenticationInfo ); + + assertEquals( authenticationInfo, wagon.getAuthenticationInfo() ); + assertEquals( "brett", authenticationInfo.getUserName() ); + assertEquals( "pass", authenticationInfo.getPassword() ); + } + + public void testRepositoryUserNameNotGivenInCredentials() + throws ConnectionException, AuthenticationException + { + Repository repository = new Repository( "id", "http://bporter:belljames@example.org/path/to/resource" ); + + AuthenticationInfo authenticationInfo = new AuthenticationInfo(); + wagon.connect( repository, authenticationInfo ); + + assertEquals( authenticationInfo, wagon.getAuthenticationInfo() ); + assertEquals( "bporter", authenticationInfo.getUserName() ); + assertEquals( "password", authenticationInfo.getPassword() ); + } + + public void testConnectNullRepository() + throws ConnectionException, AuthenticationException + { try { - wagon.transfer( command ); - - fail( "Transfer error was expected during fetch" ); + wagon.connect( null ); + fail(); } - catch ( Exception e ) + catch ( IllegalStateException e ) { + assertTrue( true ); } - - assertTrue( transferListener.isTransferStartedCalled() ); - - assertTrue( transferListener.isTransferErrorCalled() ); - - assertFalse( transferListener.isTransferCompletedCalled() ); } - */ - public void testStreamShutdown() + public void testPostProcessListeners() + throws TransferFailedException, IOException { - IOUtil.close( (InputStream) null ); + File tempFile = File.createTempFile( "wagon", "tmp" ); + tempFile.deleteOnExit(); + String content = "content"; + FileUtils.fileWrite( tempFile.getAbsolutePath(), content ); - IOUtil.close( (OutputStream) null ); + Resource resource = new Resource( "resource" ); - InputStreamMock inputStream = new InputStreamMock(); + transferListener.transferInitiated( null ); + transferListenerControl.setMatcher( MockControl.ALWAYS_MATCHER ); + transferListener.transferStarted( null ); + transferListenerControl.setMatcher( MockControl.ALWAYS_MATCHER ); + TransferEvent event = + new TransferEvent( wagon, resource, TransferEvent.TRANSFER_PROGRESS, TransferEvent.REQUEST_PUT ); + event.setLocalFile( tempFile ); + transferListener.transferProgress( event, content.getBytes(), content.length() ); + ProgressArgumentMatcher matcher = new ProgressArgumentMatcher(); + transferListenerControl.setMatcher( matcher ); + transferListener.transferCompleted( null ); + transferListenerControl.setMatcher( MockControl.ALWAYS_MATCHER ); + transferListenerControl.replay(); - assertFalse( inputStream.isClosed() ); + wagon.postProcessListeners( resource, tempFile, TransferEvent.REQUEST_PUT ); - IOUtil.close( inputStream ); + assertEquals( content.length(), matcher.getSize() ); + assertEquals( new String( content.getBytes() ), new String( matcher.getBytes() ) ); - assertTrue( inputStream.isClosed() ); + tempFile.delete(); + } - OutputStreamMock outputStream = new OutputStreamMock(); + static final class ProgressArgumentMatcher + extends AbstractMatcher + { + private ByteArrayOutputStream baos = new ByteArrayOutputStream(); - assertFalse( outputStream.isClosed() ); + private int size; + + private byte[] lastArray; - IOUtil.close( outputStream ); + protected boolean argumentMatches( Object expected, Object actual ) + { + if ( actual instanceof byte[] ) + { + lastArray = (byte[]) actual; + return true; + } + if ( actual instanceof Integer ) + { + int length = ( (Integer) actual ).intValue(); + baos.write( lastArray, 0, length ); + size += length; + return true; + } + return super.argumentMatches( expected, actual ); + } - assertTrue( outputStream.isClosed() ); + public int getSize() + { + return size; + } + + public byte[] getBytes() + { + return baos.toByteArray(); + } } } Added: maven/wagon/trunk/wagon-provider-api/src/test/java/org/apache/maven/wagon/StreamWagonTest.java URL: http://svn.apache.org/viewvc/maven/wagon/trunk/wagon-provider-api/src/test/java/org/apache/maven/wagon/StreamWagonTest.java?rev=680954&view=auto ============================================================================== --- maven/wagon/trunk/wagon-provider-api/src/test/java/org/apache/maven/wagon/StreamWagonTest.java (added) +++ maven/wagon/trunk/wagon-provider-api/src/test/java/org/apache/maven/wagon/StreamWagonTest.java Wed Jul 30 02:54:09 2008 @@ -0,0 +1,552 @@ +package org.apache.maven.wagon; + +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ + +import java.io.File; +import java.io.IOException; +import java.io.InputStream; +import java.text.SimpleDateFormat; + +import junit.framework.TestCase; + +import org.apache.maven.wagon.authentication.AuthenticationException; +import org.apache.maven.wagon.authorization.AuthorizationException; +import org.apache.maven.wagon.events.TransferEvent; +import org.apache.maven.wagon.events.TransferListener; +import org.apache.maven.wagon.repository.Repository; +import org.apache.maven.wagon.resource.Resource; +import org.codehaus.plexus.util.FileUtils; +import org.codehaus.plexus.util.IOUtil; +import org.codehaus.plexus.util.StringInputStream; +import org.codehaus.plexus.util.StringOutputStream; +import org.easymock.MockControl; + +public class StreamWagonTest + extends TestCase +{ + private static class TestWagon + extends StreamWagon + { + public void closeConnection() + throws ConnectionException + { + } + + public void fillInputData( InputData inputData ) + throws TransferFailedException, ResourceDoesNotExistException, AuthorizationException + { + } + + public void fillOutputData( OutputData outputData ) + throws TransferFailedException + { + } + + protected void openConnectionInternal() + throws ConnectionException, AuthenticationException + { + } + } + + private Repository repository = new Repository( "id", "url" ); + + public void testNullInputStream() + throws Exception + { + StreamingWagon wagon = new TestWagon() + { + public void fillInputData( InputData inputData ) + { + inputData.setInputStream( null ); + } + }; + + MockControl control = MockControl.createControl( TransferListener.class ); + TransferListener listener = (TransferListener) control.getMock(); + listener.transferInitiated( null ); + control.setMatcher( MockControl.ALWAYS_MATCHER ); + TransferEvent transferEvent = + new TransferEvent( wagon, new Resource( "resource" ), new TransferFailedException( "" ), + TransferEvent.REQUEST_GET ); + listener.transferError( transferEvent ); + control.replay(); + + wagon.connect( repository ); + wagon.addTransferListener( listener ); + try + { + wagon.getToStream( "resource", new StringOutputStream() ); + fail(); + } + catch ( TransferFailedException e ) + { + assertTrue( true ); + } + finally + { + wagon.disconnect(); + } + + control.verify(); + } + + public void testNullOutputStream() + throws Exception + { + StreamingWagon wagon = new TestWagon() + { + public void fillOutputData( OutputData inputData ) + { + inputData.setOutputStream( null ); + } + }; + + MockControl control = MockControl.createControl( TransferListener.class ); + TransferListener listener = (TransferListener) control.getMock(); + listener.transferInitiated( null ); + control.setMatcher( MockControl.ALWAYS_MATCHER ); + TransferEvent transferEvent = + new TransferEvent( wagon, new Resource( "resource" ), new TransferFailedException( "" ), + TransferEvent.REQUEST_PUT ); + listener.transferError( transferEvent ); + control.replay(); + + wagon.connect( repository ); + wagon.addTransferListener( listener ); + try + { + wagon.putFromStream( new StringInputStream( "" ), "resource" ); + fail(); + } + catch ( TransferFailedException e ) + { + assertTrue( true ); + } + finally + { + wagon.disconnect(); + } + + control.verify(); + } + + public void testTransferFailedExceptionOnInput() + throws Exception + { + try + { + runTestTransferError( new TransferFailedException( "" ) ); + fail(); + } + catch ( TransferFailedException e ) + { + assertTrue( true ); + } + } + + public void testTransferFailedExceptionOnOutput() + throws Exception + { + StreamingWagon wagon = new TestWagon() + { + public void fillOutputData( OutputData inputData ) + throws TransferFailedException + { + throw (TransferFailedException) new TransferFailedException( "" ); + } + }; + + MockControl control = MockControl.createControl( TransferListener.class ); + TransferListener listener = (TransferListener) control.getMock(); + listener.transferInitiated( null ); + control.setMatcher( MockControl.ALWAYS_MATCHER ); + TransferEvent transferEvent = + new TransferEvent( wagon, new Resource( "resource" ), new TransferFailedException( "" ), + TransferEvent.REQUEST_PUT ); + listener.transferError( transferEvent ); + control.replay(); + + wagon.connect( repository ); + wagon.addTransferListener( listener ); + try + { + wagon.putFromStream( new StringInputStream( "" ), "resource" ); + fail(); + } + catch ( TransferFailedException e ) + { + assertTrue( true ); + } + finally + { + wagon.disconnect(); + control.verify(); + } + } + + public void testResourceDoesNotExistException() + throws Exception + { + try + { + runTestTransferError( new ResourceDoesNotExistException( "" ) ); + fail(); + } + catch ( ResourceDoesNotExistException e ) + { + assertTrue( true ); + } + } + + public void testAuthorizationException() + throws Exception + { + try + { + runTestTransferError( new AuthorizationException( "" ) ); + fail(); + } + catch ( AuthorizationException e ) + { + assertTrue( true ); + } + } + + private void runTestTransferError( final WagonException exception ) + throws ConnectionException, AuthenticationException, ResourceDoesNotExistException, AuthorizationException, + TransferFailedException + { + StreamingWagon wagon = new TestWagon() + { + public void fillInputData( InputData inputData ) + throws TransferFailedException, ResourceDoesNotExistException, AuthorizationException + { + if ( exception instanceof TransferFailedException ) + { + throw (TransferFailedException) exception; + } + if ( exception instanceof ResourceDoesNotExistException ) + { + throw (ResourceDoesNotExistException) exception; + } + if ( exception instanceof AuthorizationException ) + { + throw (AuthorizationException) exception; + } + } + }; + + MockControl control = MockControl.createControl( TransferListener.class ); + TransferListener listener = (TransferListener) control.getMock(); + listener.transferInitiated( null ); + control.setMatcher( MockControl.ALWAYS_MATCHER ); + TransferEvent transferEvent = + new TransferEvent( wagon, new Resource( "resource" ), exception, TransferEvent.REQUEST_GET
{'source': 'Apache Software Foundation Public Mail Archives'}