Author: lindner
Date: Sat Jun 19 02:02:25 2010
New Revision: 956172
URL: http://svn.apache.org/viewvc?rev=956172&view=rev
Log:
small cleanups
Modified:
shindig/trunk/java/common/src/main/java/org/apache/shindig/common/util/HashUtil.java
shindig/trunk/java/common/src/main/java/org/apache/shindig/protocol/ContentTypes.java
shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/DefaultGadgetSpecFactory.java
shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/JsServlet.java
shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/JsonRpcGadgetContext.java
shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/sample/SampleModule.java
shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/sample/oauth/SampleOAuthServlet.java
Modified:
shindig/trunk/java/common/src/main/java/org/apache/shindig/common/util/HashUtil.java
URL:
http://svn.apache.org/viewvc/shindig/trunk/java/common/src/main/java/org/apache/shindig/common/util/HashUtil.java?rev=956172&r1=956171&r2=956172&view=diff
==============================================================================
---
shindig/trunk/java/common/src/main/java/org/apache/shindig/common/util/HashUtil.java
(original)
+++
shindig/trunk/java/common/src/main/java/org/apache/shindig/common/util/HashUtil.java
Sat Jun 19 02:02:25 2010
@@ -71,7 +71,7 @@ public final class HashUtil {
try {
md = MessageDigest.getInstance("SHA");
} catch (NoSuchAlgorithmException noSha) {
- throw new RuntimeException("No suitable MessageDigest found!");
+ throw new RuntimeException("No suitable MessageDigest found!", noSha);
}
}
return md;
Modified:
shindig/trunk/java/common/src/main/java/org/apache/shindig/protocol/ContentTypes.java
URL:
http://svn.apache.org/viewvc/shindig/trunk/java/common/src/main/java/org/apache/shindig/protocol/ContentTypes.java?rev=956172&r1=956171&r2=956172&view=diff
==============================================================================
---
shindig/trunk/java/common/src/main/java/org/apache/shindig/protocol/ContentTypes.java
(original)
+++
shindig/trunk/java/common/src/main/java/org/apache/shindig/protocol/ContentTypes.java
Sat Jun 19 02:02:25 2010
@@ -23,7 +23,6 @@ import org.apache.commons.lang.StringUti
import com.google.common.collect.ImmutableSet;
import java.util.Set;
-import java.util.logging.Logger;
/**
* Common mime content types and utilities
Modified:
shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/DefaultGadgetSpecFactory.java
URL:
http://svn.apache.org/viewvc/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/DefaultGadgetSpecFactory.java?rev=956172&r1=956171&r2=956172&view=diff
==============================================================================
---
shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/DefaultGadgetSpecFactory.java
(original)
+++
shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/DefaultGadgetSpecFactory.java
Sat Jun 19 02:02:25 2010
@@ -86,11 +86,12 @@ public class DefaultGadgetSpecFactory ex
return super.getSpec(query);
}
+ private static final String BOM_ENTITY = "";
+
@Override
protected GadgetSpec parse(String content, Query query) throws XmlException,
GadgetException {
// Allow BOM entity as first item on stream and ignore it:
- final String BOM_ENTITY = "";
- if (content.length() >= BOM_ENTITY.length() &&
+ if (content.length() >= BOM_ENTITY.length() &&
content.substring(0,
BOM_ENTITY.length()).equalsIgnoreCase(BOM_ENTITY)) {
content = content.substring(BOM_ENTITY.length());
}
Modified:
shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/JsServlet.java
URL:
http://svn.apache.org/viewvc/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/JsServlet.java?rev=956172&r1=956171&r2=956172&view=diff
==============================================================================
---
shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/JsServlet.java
(original)
+++
shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/JsServlet.java
Sat Jun 19 02:02:25 2010
@@ -173,8 +173,7 @@ public class JsServlet extends InjectedS
String onloadStr = req.getParameter("onload");
if (onloadStr != null) {
if (!ONLOAD_FN_PATTERN.matcher(onloadStr).matches()) {
- resp.sendError(HttpServletResponse.SC_BAD_REQUEST, "Invalid onload
callback: " +
- onloadStr);
+ resp.sendError(HttpServletResponse.SC_BAD_REQUEST, "Invalid onload
callback specified");
return;
}
jsData.append(String.format(ONLOAD_JS_TPL,
StringEscapeUtils.escapeJavaScript(onloadStr)));
Modified:
shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/JsonRpcGadgetContext.java
URL:
http://svn.apache.org/viewvc/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/JsonRpcGadgetContext.java?rev=956172&r1=956171&r2=956172&view=diff
==============================================================================
---
shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/JsonRpcGadgetContext.java
(original)
+++
shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/JsonRpcGadgetContext.java
Sat Jun 19 02:02:25 2010
@@ -18,7 +18,6 @@
*/
package org.apache.shindig.gadgets.servlet;
-import com.google.common.base.Preconditions;
import org.apache.shindig.common.uri.Uri;
import org.apache.shindig.gadgets.GadgetContext;
import org.apache.shindig.gadgets.RenderingContext;
Modified:
shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/sample/SampleModule.java
URL:
http://svn.apache.org/viewvc/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/sample/SampleModule.java?rev=956172&r1=956171&r2=956172&view=diff
==============================================================================
---
shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/sample/SampleModule.java
(original)
+++
shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/sample/SampleModule.java
Sat Jun 19 02:02:25 2010
@@ -26,7 +26,6 @@ import org.apache.shindig.social.sample.
import org.apache.shindig.social.sample.spi.JsonDbOpensocialService;
import com.google.inject.AbstractModule;
-import com.google.inject.multibindings.Multibinder;
import com.google.inject.name.Names;
/**
Modified:
shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/sample/oauth/SampleOAuthServlet.java
URL:
http://svn.apache.org/viewvc/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/sample/oauth/SampleOAuthServlet.java?rev=956172&r1=956171&r2=956172&view=diff
==============================================================================
---
shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/sample/oauth/SampleOAuthServlet.java
(original)
+++
shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/sample/oauth/SampleOAuthServlet.java
Sat Jun 19 02:02:25 2010
@@ -27,7 +27,6 @@ import javax.servlet.ServletException;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
-import org.apache.shindig.auth.OAuthConstants;
import org.apache.shindig.common.servlet.HttpUtil;
import org.apache.shindig.common.servlet.InjectedServlet;
import org.apache.shindig.social.opensocial.oauth.OAuthDataStore;
@@ -57,8 +56,6 @@ public class SampleOAuthServlet extends
public static final OAuthValidator VALIDATOR = new SimpleOAuthValidator();
private OAuthDataStore dataStore;
private String oauthAuthorizeAction;
- private boolean enableOAuth10;
- private boolean enableSignedCallbacks;
@Inject
public void setDataStore(OAuthDataStore dataStore) {
