Changeset 3425 in josm for trunk


Ignore:
Timestamp:
2010-08-08T13:56:03+02:00 (14 years ago)
Author:
stoecker
Message:

fix #5244 - port to signpost 1.2 - patch by dpaleino

Location:
trunk
Files:
1 added
1 deleted
4 edited

Legend:

Unmodified
Added
Removed

  • trunk/.classpath

    r3416 r3425  
    1818        <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JDK 6"/>
    1919        <classpathentry exported="true" kind="con" path="GROOVY_SUPPORT"/>
    20         <classpathentry kind="lib" path="lib/signpost-core-1.1.jar"/>
     20        <classpathentry kind="lib" path="lib/signpost-core-1.2.1.1.jar"/>
    2121        <classpathentry kind="output" path="bin"/>
    2222</classpath>

  • trunk/build.xml

    r3222 r3425  
    100100                        <!-- All jar files necessary to run only JOSM (no tests) -->
    101101                        <zipfileset src="lib/metadata-extractor-2.3.1-nosun.jar" />
    102                         <zipfileset src="lib/signpost-core-1.1.jar" />
     102                        <zipfileset src="lib/signpost-core-1.2.1.1.jar" />
    103103                </jar>
    104104        </target>

  • trunk/src/org/openstreetmap/josm/data/oauth/OAuthParameters.java

    r3083 r3425  
    66import oauth.signpost.basic.DefaultOAuthConsumer;
    77import oauth.signpost.basic.DefaultOAuthProvider;
    8 import oauth.signpost.signature.SignatureMethod;
     8import oauth.signpost.signature.HmacSha1MessageSigner;
    99
    1010import org.openstreetmap.josm.data.Preferences;
    … …  
    134134     */
    135135    public OAuthConsumer buildConsumer() {
    136         return new DefaultOAuthConsumer(consumerKey, consumerSecret, SignatureMethod.HMAC_SHA1);
     136        OAuthConsumer consumer = new DefaultOAuthConsumer(consumerKey, consumerSecret);
     137        return consumer;
    137138    }
    138139
    … …  
    147148        CheckParameterUtil.ensureParameterNotNull(consumer, "consumer");
    148149        return new DefaultOAuthProvider(
    149                 consumer,
    150150                requestTokenUrl,
    151151                accessTokenUrl,

  • trunk/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java

    r3188 r3425  
    130130            monitor.beginTask("");
    131131            monitor.indeterminateSubTask(tr("Retrieving OAuth Request Token from ''{0}''", oauthProviderParameters.getRequestTokenUrl()));
    132             provider.retrieveRequestToken(null);
     132            provider.retrieveRequestToken(consumer, null);
    133133            return OAuthToken.createToken(consumer);
    134134        } catch(OAuthCommunicationException e){
    … …  
    163163            monitor.beginTask("");
    164164            monitor.indeterminateSubTask(tr("Retrieving OAuth Access Token from ''{0}''", oauthProviderParameters.getAccessTokenUrl()));
    165             provider.retrieveAccessToken(null);
     165            provider.retrieveAccessToken(consumer, null);
    166166            return OAuthToken.createToken(consumer);
    167167        } catch(OAuthCommunicationException e){
Note: See TracChangeset for help on using the changeset viewer.