From: David Paleino <dapal@debian.org>
Subject: port JOSM code to OAuth-Signpost 1.2

---
 src/org/openstreetmap/josm/data/oauth/OAuthParameters.java            |    6 +++---
 src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java |    4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

--- josm.orig/src/org/openstreetmap/josm/data/oauth/OAuthParameters.java
+++ josm/src/org/openstreetmap/josm/data/oauth/OAuthParameters.java
@@ -5,7 +5,7 @@ import oauth.signpost.OAuthConsumer;
 import oauth.signpost.OAuthProvider;
 import oauth.signpost.basic.DefaultOAuthConsumer;
 import oauth.signpost.basic.DefaultOAuthProvider;
-import oauth.signpost.signature.SignatureMethod;
+import oauth.signpost.signature.HmacSha1MessageSigner;
 
 import org.openstreetmap.josm.data.Preferences;
 import org.openstreetmap.josm.tools.CheckParameterUtil;
@@ -133,7 +133,8 @@ public class OAuthParameters {
      * @return the consumer
      */
     public OAuthConsumer buildConsumer() {
-        return new DefaultOAuthConsumer(consumerKey, consumerSecret, SignatureMethod.HMAC_SHA1);
+        OAuthConsumer consumer = new DefaultOAuthConsumer(consumerKey, consumerSecret);
+        return consumer;
     }
 
     /**
@@ -146,7 +147,6 @@ public class OAuthParameters {
     public OAuthProvider buildProvider(OAuthConsumer consumer) throws IllegalArgumentException {
         CheckParameterUtil.ensureParameterNotNull(consumer, "consumer");
         return new DefaultOAuthProvider(
-                consumer,
                 requestTokenUrl,
                 accessTokenUrl,
                 authoriseUrl
--- josm.orig/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java
+++ josm/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java
@@ -129,7 +129,7 @@ public class OsmOAuthAuthorizationClient
         try {
             monitor.beginTask("");
             monitor.indeterminateSubTask(tr("Retrieving OAuth Request Token from ''{0}''", oauthProviderParameters.getRequestTokenUrl()));
-            provider.retrieveRequestToken(null);
+            provider.retrieveRequestToken(consumer, null);
             return OAuthToken.createToken(consumer);
         } catch(OAuthCommunicationException e){
             if (canceled)
@@ -162,7 +162,7 @@ public class OsmOAuthAuthorizationClient
         try {
             monitor.beginTask("");
             monitor.indeterminateSubTask(tr("Retrieving OAuth Access Token from ''{0}''", oauthProviderParameters.getAccessTokenUrl()));
-            provider.retrieveAccessToken(null);
+            provider.retrieveAccessToken(consumer, null);
             return OAuthToken.createToken(consumer);
         } catch(OAuthCommunicationException e){
             if (canceled)