Author: hsaputra
Date: Fri Oct 5 16:38:10 2012
New Revision: 1394628
URL: http://svn.apache.org/viewvc?rev=1394628&view=rev
Log:
Remove duplicate call to HttpCllient.setHttpRequestRetryHandler
Modified:
shindig/trunk/features/src/main/javascript/features/core.io/io.js
shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/http/BasicHttpFetcher.java
shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/HttpRequestHandler.java
shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/MakeRequestHandler.java
shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/core/oauth2/OAuth2Servlet.java
Modified: shindig/trunk/features/src/main/javascript/features/core.io/io.js
URL:
http://svn.apache.org/viewvc/shindig/trunk/features/src/main/javascript/features/core.io/io.js?rev=1394628&r1=1394627&r2=1394628&view=diff
==============================================================================
--- shindig/trunk/features/src/main/javascript/features/core.io/io.js (original)
+++ shindig/trunk/features/src/main/javascript/features/core.io/io.js Fri Oct
5 16:38:10 2012
@@ -621,6 +621,7 @@ gadgets.io = function() {
* @const
**/
gadgets.io.RequestParameters = gadgets.util.makeEnum([
+ 'ALIAS',
'METHOD',
'CONTENT_TYPE',
'POST_DATA',
Modified:
shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/http/BasicHttpFetcher.java
URL:
http://svn.apache.org/viewvc/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/http/BasicHttpFetcher.java?rev=1394628&r1=1394627&r2=1394628&view=diff
==============================================================================
---
shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/http/BasicHttpFetcher.java
(original)
+++
shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/http/BasicHttpFetcher.java
Fri Oct 5 16:38:10 2012
@@ -220,7 +220,6 @@ public class BasicHttpFetcher implements
}
}
});
- client.setHttpRequestRetryHandler(new DefaultHttpRequestRetryHandler() );
// Disable automatic storage and sending of cookies (see SHINDIG-1382)
client.removeRequestInterceptorByClass(RequestAddCookies.class);
Modified:
shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/HttpRequestHandler.java
URL:
http://svn.apache.org/viewvc/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/HttpRequestHandler.java?rev=1394628&r1=1394627&r2=1394628&view=diff
==============================================================================
---
shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/HttpRequestHandler.java
(original)
+++
shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/HttpRequestHandler.java
Fri Oct 5 16:38:10 2012
@@ -386,7 +386,7 @@ public class HttpRequestHandler {
*/
public static class HttpApiRequest {
static final Set<String> KNOWN_PARAMETERS = ImmutableSet.of(
- "href", "headers", "body", "gadget", "authz", "sign_owner",
+ "alias", "href", "headers", "body", "gadget", "authz", "sign_owner",
"sign_viewer", "format", "refreshInterval", "noCache", "sanitize",
"summarize", "entryCount");
Modified:
shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/MakeRequestHandler.java
URL:
http://svn.apache.org/viewvc/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/MakeRequestHandler.java?rev=1394628&r1=1394627&r2=1394628&view=diff
==============================================================================
---
shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/MakeRequestHandler.java
(original)
+++
shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/MakeRequestHandler.java
Fri Oct 5 16:38:10 2012
@@ -72,6 +72,7 @@ import com.google.inject.Singleton;
@Singleton
public class MakeRequestHandler implements ContainerConfig.ConfigObserver {
// Relaxed visibility for ease of integration. Try to avoid relying on these.
+ public static final String ALIAS_PARAM = "alias";
public static final String POST_DATA_PARAM = "postData";
public static final String METHOD_PARAM = "httpMethod";
public static final String HEADERS_PARAM = "headers";
Modified:
shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/core/oauth2/OAuth2Servlet.java
URL:
http://svn.apache.org/viewvc/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/core/oauth2/OAuth2Servlet.java?rev=1394628&r1=1394627&r2=1394628&view=diff
==============================================================================
---
shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/core/oauth2/OAuth2Servlet.java
(original)
+++
shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/core/oauth2/OAuth2Servlet.java
Fri Oct 5 16:38:10 2012
@@ -86,7 +86,6 @@ public class OAuth2Servlet extends Injec
*
* @param servletResp is the servlet's response object
* @param normalizedResp maintains the headers and body fields to respond
with
- * @param createBody defines whether or not to create a body from the
response parameters
*/
private void sendOAuth2Response(HttpServletResponse servletResp,
OAuth2NormalizedResponse normalizedResp) {
