[DebianGIS-dev] [SCM] josm branch, master, updated. debian/0.0.svn3376-1-11-geb7fce8

[David Paleino]

The following commit has been merged in the master branch:
commit 56355c37c320e60cc2c84e5ded2d58aac741f65c
Author: David Paleino <dapal at debian.org>
Date:   Tue Sep 7 09:41:41 2010 +0200

    debian/patches/60-port_oauth_1.2.patch removed, merged upstream

diff --git a/debian/changelog b/debian/changelog
index bdaa357..4add49f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,8 +2,9 @@ josm (0.0.svn3514-1) UNRELEASED; urgency=low
 
   * New upstream snapshot
   * debian/patches/* refreshed to cleanly apply to the new code
+  * debian/patches/60-port_oauth_1.2.patch removed, merged upstream
 
- -- David Paleino <dapal at debian.org>  Tue, 07 Sep 2010 09:40:14 +0200
+ -- David Paleino <dapal at debian.org>  Tue, 07 Sep 2010 09:41:17 +0200
 
 josm (0.0.svn3376-1) unstable; urgency=low
 
diff --git a/debian/patches/60-port_oauth_1.2.patch b/debian/patches/60-port_oauth_1.2.patch
deleted file mode 100644
index c794616..0000000
--- a/debian/patches/60-port_oauth_1.2.patch
+++ /dev/null
@@ -1,58 +0,0 @@
-From: David Paleino <dapal at debian.org>
-Subject: port JOSM code to OAuth-Signpost 1.2
-Forwarded: https://josm.openstreetmap.de/ticket/5244
-
----
- 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)
diff --git a/debian/patches/series b/debian/patches/series
index 6d571f1..e608444 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -3,6 +3,5 @@
 40-elemstyles.patch
 50-preferences_world_readable.patch
 #60-disable_oauth.patch
-60-port_oauth_1.2.patch
 70-default_look_and_feel.patch
 80-fix_images.patch

-- 
Java OpenStreetMap editor