Author: fgiust
Date: Sun Jul 23 05:38:31 2006
New Revision: 424727
URL: http://svn.apache.org/viewvc?rev=424727&view=rev
Log:
update code for deprecations in HttpClient 3, minor changes
Modified:
maven/sandbox/plugins/maven-changes-plugin/src/main/java/org/apache/maven/plugin/announcement/AnnouncementMojo.java
maven/sandbox/plugins/maven-changes-plugin/src/main/java/org/apache/maven/plugin/announcement/JiraAnnouncementDownloader.java
maven/sandbox/plugins/maven-changes-plugin/src/main/java/org/apache/maven/plugin/changes/ChangesReportGenerator.java
maven/sandbox/plugins/maven-changes-plugin/src/main/java/org/apache/maven/plugin/jira/JiraDownloader2.java
Modified:
maven/sandbox/plugins/maven-changes-plugin/src/main/java/org/apache/maven/plugin/announcement/AnnouncementMojo.java
URL:
http://svn.apache.org/viewvc/maven/sandbox/plugins/maven-changes-plugin/src/main/java/org/apache/maven/plugin/announcement/AnnouncementMojo.java?rev=424727&r1=424726&r2=424727&view=diff
==============================================================================
---
maven/sandbox/plugins/maven-changes-plugin/src/main/java/org/apache/maven/plugin/announcement/AnnouncementMojo.java
(original)
+++
maven/sandbox/plugins/maven-changes-plugin/src/main/java/org/apache/maven/plugin/announcement/AnnouncementMojo.java
Sun Jul 23 05:38:31 2006
@@ -18,7 +18,6 @@
import java.io.File;
import java.io.FileWriter;
-import java.io.IOException;
import java.io.Writer;
import java.util.List;
@@ -294,10 +293,6 @@
{
throw new MojoExecutionException( ve.toString() );
}
- catch ( IOException ioe )
- {
- throw new MojoExecutionException( ioe.toString() );
- }
}
public void doGenerate( List releases )
@@ -346,10 +341,6 @@
{
throw new MojoExecutionException( ve.toString() );
}
- catch ( IOException ioe )
- {
- throw new MojoExecutionException( ioe.toString() );
- }
}
/**
@@ -401,7 +392,7 @@
* @throws ResourceNotFoundException, VelocityException, IOException
*/
public void processTemplate( Context context, String outputDirectory,
String template )
- throws ResourceNotFoundException, VelocityException, IOException,
MojoExecutionException
+ throws ResourceNotFoundException, VelocityException,
MojoExecutionException
{
File f;
Modified:
maven/sandbox/plugins/maven-changes-plugin/src/main/java/org/apache/maven/plugin/announcement/JiraAnnouncementDownloader.java
URL:
http://svn.apache.org/viewvc/maven/sandbox/plugins/maven-changes-plugin/src/main/java/org/apache/maven/plugin/announcement/JiraAnnouncementDownloader.java?rev=424727&r1=424726&r2=424727&view=diff
==============================================================================
---
maven/sandbox/plugins/maven-changes-plugin/src/main/java/org/apache/maven/plugin/announcement/JiraAnnouncementDownloader.java
(original)
+++
maven/sandbox/plugins/maven-changes-plugin/src/main/java/org/apache/maven/plugin/announcement/JiraAnnouncementDownloader.java
Sun Jul 23 05:38:31 2006
@@ -32,6 +32,7 @@
import org.apache.commons.httpclient.HttpStatus;
import org.apache.commons.httpclient.StatusLine;
import org.apache.commons.httpclient.UsernamePasswordCredentials;
+import org.apache.commons.httpclient.auth.AuthScope;
import org.apache.commons.httpclient.methods.GetMethod;
import org.apache.maven.plugin.jira.JiraHelper;
import org.apache.maven.plugin.logging.Log;
@@ -300,7 +301,7 @@
// check and prepare for basic authentication
if ( ( webUser != null ) && ( webUser.length() > 0 ) )
{
- client.getState().setAuthenticationPreemptive( true );
+ client.getParams().setAuthenticationPreemptive( true );
Credentials defaultcreds = new UsernamePasswordCredentials(
webUser, webPassword );
@@ -308,7 +309,8 @@
"Using username: " + webUser + " for Basic
Authentication against the webserver at "
+ jiraUrl );
- client.getState().setCredentials( null, null, defaultcreds );
+ client.getState().setCredentials( new AuthScope( null,
AuthScope.ANY_PORT, null, AuthScope.ANY_SCHEME ),
+ defaultcreds );
}
// log into JIRA if we have to
@@ -408,7 +410,9 @@
{
getLog().info( "Using proxy user: " + proxyUser );
- client.getState().setProxyCredentials( null, null,
+ client.getState().setProxyCredentials(
+ new AuthScope( null,
AuthScope.ANY_PORT, null,
+
AuthScope.ANY_SCHEME ),
new
UsernamePasswordCredentials( proxyUser, proxyPass ) );
}
}
Modified:
maven/sandbox/plugins/maven-changes-plugin/src/main/java/org/apache/maven/plugin/changes/ChangesReportGenerator.java
URL:
http://svn.apache.org/viewvc/maven/sandbox/plugins/maven-changes-plugin/src/main/java/org/apache/maven/plugin/changes/ChangesReportGenerator.java?rev=424727&r1=424726&r2=424727&view=diff
==============================================================================
---
maven/sandbox/plugins/maven-changes-plugin/src/main/java/org/apache/maven/plugin/changes/ChangesReportGenerator.java
(original)
+++
maven/sandbox/plugins/maven-changes-plugin/src/main/java/org/apache/maven/plugin/changes/ChangesReportGenerator.java
Sun Jul 23 05:38:31 2006
@@ -21,7 +21,6 @@
import org.apache.maven.doxia.sink.Sink;
import org.apache.maven.plugin.logging.Log;
-import org.apache.maven.reporting.MavenReportException;
/**
* Generates a changes report.
@@ -75,7 +74,6 @@
}
public void doGenerateReport( ResourceBundle bundle, Sink sink )
- throws MavenReportException
{
sinkBeginReport( sink, bundle );
Modified:
maven/sandbox/plugins/maven-changes-plugin/src/main/java/org/apache/maven/plugin/jira/JiraDownloader2.java
URL:
http://svn.apache.org/viewvc/maven/sandbox/plugins/maven-changes-plugin/src/main/java/org/apache/maven/plugin/jira/JiraDownloader2.java?rev=424727&r1=424726&r2=424727&view=diff
==============================================================================
---
maven/sandbox/plugins/maven-changes-plugin/src/main/java/org/apache/maven/plugin/jira/JiraDownloader2.java
(original)
+++
maven/sandbox/plugins/maven-changes-plugin/src/main/java/org/apache/maven/plugin/jira/JiraDownloader2.java
Sun Jul 23 05:38:31 2006
@@ -32,6 +32,7 @@
import org.apache.commons.httpclient.HttpStatus;
import org.apache.commons.httpclient.StatusLine;
import org.apache.commons.httpclient.UsernamePasswordCredentials;
+import org.apache.commons.httpclient.auth.AuthScope;
import org.apache.commons.httpclient.methods.GetMethod;
import org.apache.maven.plugin.logging.Log;
import org.apache.maven.project.MavenProject;
@@ -305,7 +306,7 @@
// check and prepare for basic authentication
if ( ( webUser != null ) && ( webUser.length() > 0 ) )
{
- client.getState().setAuthenticationPreemptive( true );
+ client.getParams().setAuthenticationPreemptive( true );
Credentials defaultcreds = new UsernamePasswordCredentials(
webUser, webPassword );
@@ -313,7 +314,8 @@
"Using username: " + webUser + " for Basic
Authentication against the webserver at "
+ jiraUrl );
- client.getState().setCredentials( null, null, defaultcreds );
+ client.getState().setCredentials( new AuthScope( null,
AuthScope.ANY_PORT, null, AuthScope.ANY_SCHEME ),
+ defaultcreds );
}
// log into JIRA if we have to
@@ -413,7 +415,9 @@
{
getLog().info( "Using proxy user: " + proxyUser );
- client.getState().setProxyCredentials( null, null,
+ client.getState().setProxyCredentials(
+ new AuthScope( null,
AuthScope.ANY_PORT, null,
+
AuthScope.ANY_SCHEME ),
new
UsernamePasswordCredentials( proxyUser, proxyPass ) );
}
}
