svn commit: r949054 - in /shindig/trunk/java: gadgets/src/main/java/org/apache/shindig/gadgets/oauth/testing/FakeOAuthServiceProvider.java social-api/src/main/java/org/apache/shindig/social/core/oauth/OAuthAuthenticationHandler.java

[li...@apache.org]

Author: lindner
Date: Fri May 28 01:08:39 2010
New Revision: 949054

URL: http://svn.apache.org/viewvc?rev=949054&view=rev
Log:
remove deprecated usage of OAuth libs

Modified:
    shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/oauth/testing/FakeOAuthServiceProvider.java
    shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/core/oauth/OAuthAuthenticationHandler.java

Modified: shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/oauth/testing/FakeOAuthServiceProvider.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/oauth/testing/FakeOAuthServiceProvider.java?rev=949054&r1=949053&r2=949054&view=diff
==============================================================================
--- shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/oauth/testing/FakeOAuthServiceProvider.java (original)
+++ shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/oauth/testing/FakeOAuthServiceProvider.java Fri May 28 01:08:39 2010
@@ -27,6 +27,7 @@ import net.oauth.OAuthConsumer;
 import net.oauth.OAuthException;
 import net.oauth.OAuthMessage;
 import net.oauth.OAuthServiceProvider;
+import net.oauth.OAuthValidator;
 import net.oauth.SimpleOAuthValidator;
 import net.oauth.OAuth.Parameter;
 import net.oauth.signature.RSA_SHA1;
@@ -721,7 +722,9 @@ public class FakeOAuthServiceProvider im
   
   private void validateMessage(OAuthAccessor accessor, MessageInfo info, boolean tokenEndpoint)
       throws OAuthException, IOException, URISyntaxException {
-    info.message.validateMessage(accessor, new FakeTimeOAuthValidator());
+    OAuthValidator validator = new FakeTimeOAuthValidator();
+    validator.validateMessage(info.message,accessor);
+    
     String bodyHash = info.message.getParameter("oauth_body_hash");
     if (tokenEndpoint && bodyHash != null) {
       throw new RuntimeException("Can't have body hash on token endpoints");

Modified: shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/core/oauth/OAuthAuthenticationHandler.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/core/oauth/OAuthAuthenticationHandler.java?rev=949054&r1=949053&r2=949054&view=diff
==============================================================================
--- shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/core/oauth/OAuthAuthenticationHandler.java (original)
+++ shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/core/oauth/OAuthAuthenticationHandler.java Fri May 28 01:08:39 2010
@@ -25,6 +25,7 @@ import net.oauth.OAuthAccessor;
 import net.oauth.OAuthConsumer;
 import net.oauth.OAuthException;
 import net.oauth.OAuthMessage;
+import net.oauth.OAuthValidator;
 import net.oauth.SimpleOAuthValidator;
 import net.oauth.OAuthProblemException;
 import net.oauth.server.OAuthServlet;
@@ -100,7 +101,8 @@ public class OAuthAuthenticationHandler 
     }
 
     try {
-      message.validateMessage(accessor, new SimpleOAuthValidator());
+      OAuthValidator validator = new SimpleOAuthValidator();
+      validator.validateMessage(message, accessor);
     } catch (OAuthProblemException e) {
       throw e;
     } catch (OAuthException e) {