You are viewing a plain text version of this content. The canonical link for it is here.
Posted to wagon-commits@maven.apache.org by br...@apache.org on 2008/05/13 09:43:54 UTC
svn commit: r655763 - in /maven/wagon/trunk:
wagon-provider-api/src/main/java/org/apache/maven/wagon/
wagon-provider-api/src/test/java/org/apache/maven/wagon/
wagon-providers/wagon-file/src/main/java/org/apache/maven/wagon/providers/file/
wagon-provide...
Author: brett
Date: Tue May 13 00:43:53 2008
New Revision: 655763
URL: http://svn.apache.org/viewvc?rev=655763&view=rev
Log:
hide internal API method
Modified:
maven/wagon/trunk/wagon-provider-api/src/main/java/org/apache/maven/wagon/AbstractWagon.java
maven/wagon/trunk/wagon-provider-api/src/main/java/org/apache/maven/wagon/StreamWagon.java
maven/wagon/trunk/wagon-provider-api/src/test/java/org/apache/maven/wagon/WagonMock.java
maven/wagon/trunk/wagon-providers/wagon-file/src/main/java/org/apache/maven/wagon/providers/file/FileWagon.java
maven/wagon/trunk/wagon-providers/wagon-ftp/src/main/java/org/apache/maven/wagon/providers/ftp/FtpWagon.java
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/src/main/java/org/apache/maven/wagon/providers/http/HttpWagon.java
maven/wagon/trunk/wagon-providers/wagon-s3/src/main/java/org/apache/maven/wagon/providers/s3/AbstractS3Wagon.java
maven/wagon/trunk/wagon-providers/wagon-ssh-common/src/main/java/org/apache/maven/wagon/providers/ssh/AbstractSshWagon.java
maven/wagon/trunk/wagon-providers/wagon-ssh-external/src/main/java/org/apache/maven/wagon/providers/ssh/external/ScpExternalWagon.java
maven/wagon/trunk/wagon-providers/wagon-ssh-ganymed/src/main/java/org/apache/maven/wagon/providers/ssh/ganymed/AbstractGanymedWagon.java
maven/wagon/trunk/wagon-providers/wagon-ssh/src/main/java/org/apache/maven/wagon/providers/ssh/jsch/AbstractJschWagon.java
maven/wagon/trunk/wagon-providers/wagon-webdav/src/main/java/org/apache/maven/wagon/providers/webdav/WebDavWagon.java
maven/wagon/trunk/wagon-providers/wagon-webdav/src/test/java/org/apache/maven/wagon/providers/webdav/PutInputStreamTest.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=655763&r1=655762&r2=655763&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 Tue May 13 00:43:53 2008
@@ -93,6 +93,12 @@
// Connection
// ----------------------------------------------------------------------
+ public void openConnection()
+ throws ConnectionException, AuthenticationException
+ {
+ openConnectionInternal();
+ }
+
public void connect( Repository repository )
throws ConnectionException, AuthenticationException
{
@@ -145,11 +151,14 @@
fireSessionOpening();
- openConnection();
+ openConnectionInternal();
fireSessionOpened();
}
+ protected abstract void openConnectionInternal()
+ throws ConnectionException, AuthenticationException;
+
public void disconnect()
throws ConnectionException
{
Modified: maven/wagon/trunk/wagon-provider-api/src/main/java/org/apache/maven/wagon/StreamWagon.java
URL: http://svn.apache.org/viewvc/maven/wagon/trunk/wagon-provider-api/src/main/java/org/apache/maven/wagon/StreamWagon.java?rev=655763&r1=655762&r2=655763&view=diff
==============================================================================
--- maven/wagon/trunk/wagon-provider-api/src/main/java/org/apache/maven/wagon/StreamWagon.java (original)
+++ maven/wagon/trunk/wagon-provider-api/src/main/java/org/apache/maven/wagon/StreamWagon.java Tue May 13 00:43:53 2008
@@ -19,15 +19,14 @@
* under the License.
*/
-import org.apache.maven.wagon.authentication.AuthenticationException;
-import org.apache.maven.wagon.authorization.AuthorizationException;
-import org.apache.maven.wagon.resource.Resource;
-import org.codehaus.plexus.util.IOUtil;
-
import java.io.File;
import java.io.InputStream;
import java.io.OutputStream;
+import org.apache.maven.wagon.authorization.AuthorizationException;
+import org.apache.maven.wagon.resource.Resource;
+import org.codehaus.plexus.util.IOUtil;
+
/**
* Base class for wagon which provide stream based API.
*
@@ -47,9 +46,6 @@
public abstract void fillOutputData( OutputData outputData )
throws TransferFailedException;
- public abstract void openConnection()
- throws ConnectionException, AuthenticationException;
-
public abstract void closeConnection()
throws ConnectionException;
Modified: maven/wagon/trunk/wagon-provider-api/src/test/java/org/apache/maven/wagon/WagonMock.java
URL: http://svn.apache.org/viewvc/maven/wagon/trunk/wagon-provider-api/src/test/java/org/apache/maven/wagon/WagonMock.java?rev=655763&r1=655762&r2=655763&view=diff
==============================================================================
--- maven/wagon/trunk/wagon-provider-api/src/test/java/org/apache/maven/wagon/WagonMock.java (original)
+++ maven/wagon/trunk/wagon-provider-api/src/test/java/org/apache/maven/wagon/WagonMock.java Tue May 13 00:43:53 2008
@@ -104,7 +104,7 @@
return false;
}
- public void openConnection()
+ public void openConnectionInternal()
{
}
Modified: maven/wagon/trunk/wagon-providers/wagon-file/src/main/java/org/apache/maven/wagon/providers/file/FileWagon.java
URL: http://svn.apache.org/viewvc/maven/wagon/trunk/wagon-providers/wagon-file/src/main/java/org/apache/maven/wagon/providers/file/FileWagon.java?rev=655763&r1=655762&r2=655763&view=diff
==============================================================================
--- maven/wagon/trunk/wagon-providers/wagon-file/src/main/java/org/apache/maven/wagon/providers/file/FileWagon.java (original)
+++ maven/wagon/trunk/wagon-providers/wagon-file/src/main/java/org/apache/maven/wagon/providers/file/FileWagon.java Tue May 13 00:43:53 2008
@@ -105,7 +105,7 @@
outputData.setOutputStream( outputStream );
}
- public void openConnection()
+ protected void openConnectionInternal()
throws ConnectionException
{
if ( getRepository() == null )
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=655763&r1=655762&r2=655763&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 Tue May 13 00:43:53 2008
@@ -61,7 +61,7 @@
{
private FTPClient ftp;
- public void openConnection()
+ protected void openConnectionInternal()
throws ConnectionException, AuthenticationException
{
AuthenticationInfo authInfo = getAuthenticationInfo();
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=655763&r1=655762&r2=655763&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 May 13 00:43:53 2008
@@ -184,11 +184,9 @@
}
}
-
- public void openConnection()
+ protected void openConnectionInternal()
throws ConnectionException, AuthenticationException
{
-
previousHttpProxyHost = System.getProperty( "http.proxyHost" );
previousHttpProxyPort = System.getProperty( "http.proxyPort" );
previousProxyExclusions = System.getProperty( "http.nonProxyHosts" );
Modified: maven/wagon/trunk/wagon-providers/wagon-http/src/main/java/org/apache/maven/wagon/providers/http/HttpWagon.java
URL: http://svn.apache.org/viewvc/maven/wagon/trunk/wagon-providers/wagon-http/src/main/java/org/apache/maven/wagon/providers/http/HttpWagon.java?rev=655763&r1=655762&r2=655763&view=diff
==============================================================================
--- maven/wagon/trunk/wagon-providers/wagon-http/src/main/java/org/apache/maven/wagon/providers/http/HttpWagon.java (original)
+++ maven/wagon/trunk/wagon-providers/wagon-http/src/main/java/org/apache/maven/wagon/providers/http/HttpWagon.java Tue May 13 00:43:53 2008
@@ -69,7 +69,7 @@
private HttpConnectionManager connectionManager;
- public void openConnection()
+ protected void openConnectionInternal()
{
client = new HttpClient( connectionManager );
Modified: maven/wagon/trunk/wagon-providers/wagon-s3/src/main/java/org/apache/maven/wagon/providers/s3/AbstractS3Wagon.java
URL: http://svn.apache.org/viewvc/maven/wagon/trunk/wagon-providers/wagon-s3/src/main/java/org/apache/maven/wagon/providers/s3/AbstractS3Wagon.java?rev=655763&r1=655762&r2=655763&view=diff
==============================================================================
--- maven/wagon/trunk/wagon-providers/wagon-s3/src/main/java/org/apache/maven/wagon/providers/s3/AbstractS3Wagon.java (original)
+++ maven/wagon/trunk/wagon-providers/wagon-s3/src/main/java/org/apache/maven/wagon/providers/s3/AbstractS3Wagon.java Tue May 13 00:43:53 2008
@@ -63,7 +63,7 @@
private S3Bucket bucket;
- public void openConnection()
+ protected void openConnectionInternal()
throws ConnectionException, AuthenticationException
{
if( authenticationInfo == null )
Modified: maven/wagon/trunk/wagon-providers/wagon-ssh-common/src/main/java/org/apache/maven/wagon/providers/ssh/AbstractSshWagon.java
URL: http://svn.apache.org/viewvc/maven/wagon/trunk/wagon-providers/wagon-ssh-common/src/main/java/org/apache/maven/wagon/providers/ssh/AbstractSshWagon.java?rev=655763&r1=655762&r2=655763&view=diff
==============================================================================
--- maven/wagon/trunk/wagon-providers/wagon-ssh-common/src/main/java/org/apache/maven/wagon/providers/ssh/AbstractSshWagon.java (original)
+++ maven/wagon/trunk/wagon-providers/wagon-ssh-common/src/main/java/org/apache/maven/wagon/providers/ssh/AbstractSshWagon.java Tue May 13 00:43:53 2008
@@ -149,7 +149,7 @@
return new Resource( r );
}
- public void openConnection()
+ protected void openConnectionInternal()
throws AuthenticationException
{
if ( authenticationInfo == null )
@@ -163,6 +163,11 @@
}
}
+ public void closeConnection()
+ {
+ // nothing to disconnect
+ }
+
protected File getPrivateKey()
{
// If user don't define a password, he want to use a private key
Modified: maven/wagon/trunk/wagon-providers/wagon-ssh-external/src/main/java/org/apache/maven/wagon/providers/ssh/external/ScpExternalWagon.java
URL: http://svn.apache.org/viewvc/maven/wagon/trunk/wagon-providers/wagon-ssh-external/src/main/java/org/apache/maven/wagon/providers/ssh/external/ScpExternalWagon.java?rev=655763&r1=655762&r2=655763&view=diff
==============================================================================
--- maven/wagon/trunk/wagon-providers/wagon-ssh-external/src/main/java/org/apache/maven/wagon/providers/ssh/external/ScpExternalWagon.java (original)
+++ maven/wagon/trunk/wagon-providers/wagon-ssh-external/src/main/java/org/apache/maven/wagon/providers/ssh/external/ScpExternalWagon.java Tue May 13 00:43:53 2008
@@ -19,13 +19,16 @@
* under the License.
*/
+import java.io.File;
+import java.io.IOException;
+import java.util.List;
+
import org.apache.maven.wagon.CommandExecutionException;
import org.apache.maven.wagon.PathUtils;
import org.apache.maven.wagon.PermissionModeUtils;
import org.apache.maven.wagon.ResourceDoesNotExistException;
import org.apache.maven.wagon.Streams;
import org.apache.maven.wagon.TransferFailedException;
-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.providers.ssh.AbstractSshWagon;
@@ -37,10 +40,6 @@
import org.codehaus.plexus.util.cli.CommandLineUtils;
import org.codehaus.plexus.util.cli.Commandline;
-import java.io.File;
-import java.io.IOException;
-import java.util.List;
-
/**
* SCP deployer using "external" scp program. To allow for
* ssh-agent type behavior, until we can construct a Java SSH Agent and interface for JSch.
@@ -90,19 +89,6 @@
//
// ----------------------------------------------------------------------
- public void openConnection()
- throws AuthenticationException
- {
- super.openConnection();
-
- // nothing to connect to
- }
-
- public void closeConnection()
- {
- // nothing to disconnect
- }
-
public Streams executeCommand( String command, boolean ignoreFailures )
throws CommandExecutionException
{
Modified: maven/wagon/trunk/wagon-providers/wagon-ssh-ganymed/src/main/java/org/apache/maven/wagon/providers/ssh/ganymed/AbstractGanymedWagon.java
URL: http://svn.apache.org/viewvc/maven/wagon/trunk/wagon-providers/wagon-ssh-ganymed/src/main/java/org/apache/maven/wagon/providers/ssh/ganymed/AbstractGanymedWagon.java?rev=655763&r1=655762&r2=655763&view=diff
==============================================================================
--- maven/wagon/trunk/wagon-providers/wagon-ssh-ganymed/src/main/java/org/apache/maven/wagon/providers/ssh/ganymed/AbstractGanymedWagon.java (original)
+++ maven/wagon/trunk/wagon-providers/wagon-ssh-ganymed/src/main/java/org/apache/maven/wagon/providers/ssh/ganymed/AbstractGanymedWagon.java Tue May 13 00:43:53 2008
@@ -62,10 +62,10 @@
protected Connection connection;
- public void openConnection()
+ public void openConnectionInternal()
throws AuthenticationException
{
- super.openConnection();
+ super.openConnectionInternal();
String host = getRepository().getHost();
int port = getPort();
@@ -207,6 +207,8 @@
public void closeConnection()
{
+ super.closeConnection();
+
if ( connection != null )
{
connection.close();
Modified: maven/wagon/trunk/wagon-providers/wagon-ssh/src/main/java/org/apache/maven/wagon/providers/ssh/jsch/AbstractJschWagon.java
URL: http://svn.apache.org/viewvc/maven/wagon/trunk/wagon-providers/wagon-ssh/src/main/java/org/apache/maven/wagon/providers/ssh/jsch/AbstractJschWagon.java?rev=655763&r1=655762&r2=655763&view=diff
==============================================================================
--- maven/wagon/trunk/wagon-providers/wagon-ssh/src/main/java/org/apache/maven/wagon/providers/ssh/jsch/AbstractJschWagon.java (original)
+++ maven/wagon/trunk/wagon-providers/wagon-ssh/src/main/java/org/apache/maven/wagon/providers/ssh/jsch/AbstractJschWagon.java Tue May 13 00:43:53 2008
@@ -85,10 +85,10 @@
protected static final String EXEC_CHANNEL = "exec";
- public void openConnection()
+ public void openConnectionInternal()
throws AuthenticationException
{
- super.openConnection();
+ super.openConnectionInternal();
if ( !interactive )
{
@@ -231,6 +231,8 @@
public void closeConnection()
{
+ super.closeConnection();
+
if ( session != null )
{
session.disconnect();
Modified: maven/wagon/trunk/wagon-providers/wagon-webdav/src/main/java/org/apache/maven/wagon/providers/webdav/WebDavWagon.java
URL: http://svn.apache.org/viewvc/maven/wagon/trunk/wagon-providers/wagon-webdav/src/main/java/org/apache/maven/wagon/providers/webdav/WebDavWagon.java?rev=655763&r1=655762&r2=655763&view=diff
==============================================================================
--- maven/wagon/trunk/wagon-providers/wagon-webdav/src/main/java/org/apache/maven/wagon/providers/webdav/WebDavWagon.java (original)
+++ maven/wagon/trunk/wagon-providers/wagon-webdav/src/main/java/org/apache/maven/wagon/providers/webdav/WebDavWagon.java Tue May 13 00:43:53 2008
@@ -116,7 +116,7 @@
* @throws AuthenticationException
* @throws ConnectionException
*/
- public void openConnection()
+ public void openConnectionInternal()
throws AuthenticationException, ConnectionException
{
final boolean hasProxy = ( proxyInfo != null && proxyInfo.getUserName() != null );
Modified: maven/wagon/trunk/wagon-providers/wagon-webdav/src/test/java/org/apache/maven/wagon/providers/webdav/PutInputStreamTest.java
URL: http://svn.apache.org/viewvc/maven/wagon/trunk/wagon-providers/wagon-webdav/src/test/java/org/apache/maven/wagon/providers/webdav/PutInputStreamTest.java?rev=655763&r1=655762&r2=655763&view=diff
==============================================================================
--- maven/wagon/trunk/wagon-providers/wagon-webdav/src/test/java/org/apache/maven/wagon/providers/webdav/PutInputStreamTest.java (original)
+++ maven/wagon/trunk/wagon-providers/wagon-webdav/src/test/java/org/apache/maven/wagon/providers/webdav/PutInputStreamTest.java Tue May 13 00:43:53 2008
@@ -156,5 +156,11 @@
{
return false;
}
+
+ protected void openConnectionInternal()
+ throws ConnectionException, AuthenticationException
+ {
+
+ }
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: wagon-commits-unsubscribe@maven.apache.org
For additional commands, e-mail: wagon-commits-help@maven.apache.org