You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by st...@apache.org on 2011/06/09 20:15:36 UTC
svn commit: r1134022 - in /maven/wagon/trunk:
wagon-provider-test/src/main/java/org/apache/maven/wagon/
wagon-providers/wagon-http-shared/src/main/java/org/apache/maven/wagon/shared/http/
wagon-providers/wagon-http-shared4/src/main/java/org/apache/mave...
Author: struberg
Date: Thu Jun 9 18:15:35 2011
New Revision: 1134022
URL: http://svn.apache.org/viewvc?rev=1134022&view=rev
Log:
remove obsolete code and unused Exceptions
Modified:
maven/wagon/trunk/wagon-provider-test/src/main/java/org/apache/maven/wagon/StreamingWagonTestCase.java
maven/wagon/trunk/wagon-provider-test/src/main/java/org/apache/maven/wagon/WagonTestCase.java
maven/wagon/trunk/wagon-providers/wagon-http-shared/src/main/java/org/apache/maven/wagon/shared/http/AbstractHttpClientWagon.java
maven/wagon/trunk/wagon-providers/wagon-http-shared4/src/main/java/org/apache/maven/wagon/shared/http/AbstractHttpClientWagon.java
maven/wagon/trunk/wagon-providers/wagon-ssh-common/src/main/java/org/apache/maven/wagon/providers/ssh/CommandExecutorStreamProcessor.java
maven/wagon/trunk/wagon-providers/wagon-webdav-jackrabbit/src/main/java/org/apache/maven/wagon/providers/webdav/WebDavWagon.java
Modified: maven/wagon/trunk/wagon-provider-test/src/main/java/org/apache/maven/wagon/StreamingWagonTestCase.java
URL: http://svn.apache.org/viewvc/maven/wagon/trunk/wagon-provider-test/src/main/java/org/apache/maven/wagon/StreamingWagonTestCase.java?rev=1134022&r1=1134021&r2=1134022&view=diff
==============================================================================
--- maven/wagon/trunk/wagon-provider-test/src/main/java/org/apache/maven/wagon/StreamingWagonTestCase.java (original)
+++ maven/wagon/trunk/wagon-provider-test/src/main/java/org/apache/maven/wagon/StreamingWagonTestCase.java Thu Jun 9 18:15:35 2011
@@ -142,8 +142,7 @@ public abstract class StreamingWagonTest
}
private void getIfNewerToStream( long timestamp, boolean expectedResult, int expectedSize )
- throws Exception, NoSuchAlgorithmException, IOException, ConnectionException, AuthenticationException,
- TransferFailedException, ResourceDoesNotExistException, AuthorizationException
+ throws Exception
{
StreamingWagon wagon = (StreamingWagon) getWagon();
Modified: maven/wagon/trunk/wagon-provider-test/src/main/java/org/apache/maven/wagon/WagonTestCase.java
URL: http://svn.apache.org/viewvc/maven/wagon/trunk/wagon-provider-test/src/main/java/org/apache/maven/wagon/WagonTestCase.java?rev=1134022&r1=1134021&r2=1134022&view=diff
==============================================================================
--- maven/wagon/trunk/wagon-provider-test/src/main/java/org/apache/maven/wagon/WagonTestCase.java (original)
+++ maven/wagon/trunk/wagon-provider-test/src/main/java/org/apache/maven/wagon/WagonTestCase.java Thu Jun 9 18:15:35 2011
@@ -288,8 +288,7 @@ public abstract class WagonTestCase
}
private void getIfNewer( long timestamp, boolean expectedResult, int expectedSize )
- throws Exception, NoSuchAlgorithmException, IOException, ConnectionException, AuthenticationException,
- TransferFailedException, ResourceDoesNotExistException, AuthorizationException
+ throws Exception
{
Wagon wagon = getWagon();
Modified: maven/wagon/trunk/wagon-providers/wagon-http-shared/src/main/java/org/apache/maven/wagon/shared/http/AbstractHttpClientWagon.java
URL: http://svn.apache.org/viewvc/maven/wagon/trunk/wagon-providers/wagon-http-shared/src/main/java/org/apache/maven/wagon/shared/http/AbstractHttpClientWagon.java?rev=1134022&r1=1134021&r2=1134022&view=diff
==============================================================================
--- maven/wagon/trunk/wagon-providers/wagon-http-shared/src/main/java/org/apache/maven/wagon/shared/http/AbstractHttpClientWagon.java (original)
+++ maven/wagon/trunk/wagon-providers/wagon-http-shared/src/main/java/org/apache/maven/wagon/shared/http/AbstractHttpClientWagon.java Thu Jun 9 18:15:35 2011
@@ -24,7 +24,6 @@ import org.apache.commons.httpclient.Hea
import org.apache.commons.httpclient.HostConfiguration;
import org.apache.commons.httpclient.HttpClient;
import org.apache.commons.httpclient.HttpConnectionManager;
-import org.apache.commons.httpclient.HttpException;
import org.apache.commons.httpclient.HttpMethod;
import org.apache.commons.httpclient.HttpStatus;
import org.apache.commons.httpclient.MultiThreadedHttpConnectionManager;
@@ -383,6 +382,7 @@ public abstract class AbstractHttpClient
protected void mkdirs( String dirname ) throws IOException
{
+ // do nothing as default.
}
public boolean resourceExists( String resourceName )
@@ -438,7 +438,7 @@ public abstract class AbstractHttpClient
protected int execute( HttpMethod httpMethod ) throws IOException
{
- int statusCode = SC_NULL;
+ int statusCode;
setParameters( httpMethod );
setHeaders( httpMethod );
Modified: maven/wagon/trunk/wagon-providers/wagon-http-shared4/src/main/java/org/apache/maven/wagon/shared/http/AbstractHttpClientWagon.java
URL: http://svn.apache.org/viewvc/maven/wagon/trunk/wagon-providers/wagon-http-shared4/src/main/java/org/apache/maven/wagon/shared/http/AbstractHttpClientWagon.java?rev=1134022&r1=1134021&r2=1134022&view=diff
==============================================================================
--- maven/wagon/trunk/wagon-providers/wagon-http-shared4/src/main/java/org/apache/maven/wagon/shared/http/AbstractHttpClientWagon.java (original)
+++ maven/wagon/trunk/wagon-providers/wagon-http-shared4/src/main/java/org/apache/maven/wagon/shared/http/AbstractHttpClientWagon.java Thu Jun 9 18:15:35 2011
@@ -268,25 +268,11 @@ public abstract class AbstractHttpClient
client.getParams().setParameter(ConnRoutePNames.DEFAULT_PROXY, proxy);
}
}
-
- /*X original
- hc.setHost( host );
-
- //start a session with the webserver
- client.setHostConfiguration( hc );
- */
}
public void closeConnection()
{
connectionManager.shutdown();
-
- /*X original
- if ( connectionManager instanceof MultiThreadedHttpConnectionManager )
- {
- ( (MultiThreadedHttpConnectionManager) connectionManager ).shutdown();
- }
- */
}
public void put( File source, String resourceName )
@@ -417,6 +403,7 @@ public abstract class AbstractHttpClient
protected void mkdirs( String dirname ) throws HttpException, IOException
{
+ // nothing to do
}
public boolean resourceExists( String resourceName )
@@ -479,7 +466,7 @@ public abstract class AbstractHttpClient
protected HttpResponse execute( HttpUriRequest httpMethod ) throws HttpException, IOException
{
int statusCode = SC_NULL;
-
+
setParameters( httpMethod );
setHeaders( httpMethod );
@@ -538,18 +525,6 @@ public abstract class AbstractHttpClient
return repository.getUrl();
}
-/*X original
- protected HttpClient getClient()
- {
- return client;
- }
-
- public void setConnectionManager( HttpConnectionManager connectionManager )
- {
- this.connectionManager = connectionManager;
- }
-*/
-
public HttpConfiguration getHttpConfiguration()
{
return httpConfiguration;
@@ -644,7 +619,7 @@ public abstract class AbstractHttpClient
}
}
- InputStream is = null;
+ InputStream is;
Header contentLengthHeader = response.getFirstHeader("Content-Length");
@@ -689,7 +664,6 @@ public abstract class AbstractHttpClient
try
{
- //X original is = getMethod.getResponseBodyAsStream();
is = response.getEntity().getContent();
if ( isGZipped )
Modified: maven/wagon/trunk/wagon-providers/wagon-ssh-common/src/main/java/org/apache/maven/wagon/providers/ssh/CommandExecutorStreamProcessor.java
URL: http://svn.apache.org/viewvc/maven/wagon/trunk/wagon-providers/wagon-ssh-common/src/main/java/org/apache/maven/wagon/providers/ssh/CommandExecutorStreamProcessor.java?rev=1134022&r1=1134021&r2=1134022&view=diff
==============================================================================
--- maven/wagon/trunk/wagon-providers/wagon-ssh-common/src/main/java/org/apache/maven/wagon/providers/ssh/CommandExecutorStreamProcessor.java (original)
+++ maven/wagon/trunk/wagon-providers/wagon-ssh-common/src/main/java/org/apache/maven/wagon/providers/ssh/CommandExecutorStreamProcessor.java Thu Jun 9 18:15:35 2011
@@ -19,7 +19,6 @@ package org.apache.maven.wagon.providers
* under the License.
*/
-import org.apache.maven.wagon.CommandExecutionException;
import org.apache.maven.wagon.Streams;
import java.io.BufferedReader;
@@ -39,7 +38,7 @@ public class CommandExecutorStreamProces
}
public static Streams processStreams( BufferedReader stderrReader, BufferedReader stdoutReader )
- throws IOException, CommandExecutionException
+ throws IOException
{
Streams streams = new Streams();
Modified: maven/wagon/trunk/wagon-providers/wagon-webdav-jackrabbit/src/main/java/org/apache/maven/wagon/providers/webdav/WebDavWagon.java
URL: http://svn.apache.org/viewvc/maven/wagon/trunk/wagon-providers/wagon-webdav-jackrabbit/src/main/java/org/apache/maven/wagon/providers/webdav/WebDavWagon.java?rev=1134022&r1=1134021&r2=1134022&view=diff
==============================================================================
--- maven/wagon/trunk/wagon-providers/wagon-webdav-jackrabbit/src/main/java/org/apache/maven/wagon/providers/webdav/WebDavWagon.java (original)
+++ maven/wagon/trunk/wagon-providers/wagon-webdav-jackrabbit/src/main/java/org/apache/maven/wagon/providers/webdav/WebDavWagon.java Thu Jun 9 18:15:35 2011
@@ -102,7 +102,7 @@ public class WebDavWagon
* @throws HttpException
* @throws TransferFailedException
*/
- protected void mkdirs( String dir ) throws HttpException, IOException
+ protected void mkdirs( String dir ) throws IOException
{
Repository repository = getRepository();
String basedir = repository.getBasedir();
@@ -145,7 +145,7 @@ public class WebDavWagon
}
}
- private int doMkCol( String url ) throws HttpException, IOException
+ private int doMkCol( String url ) throws IOException
{
MkColMethod method = null;
try