You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@shindig.apache.org by li...@apache.org on 2010/10/12 15:32:26 UTC
svn commit: r1021769 - in /shindig/branches/2.0.x/java/gadgets/src:
main/java/org/apache/shindig/gadgets/servlet/
test/java/org/apache/shindig/gadgets/servlet/
Author: lindner
Date: Tue Oct 12 13:32:26 2010
New Revision: 1021769
URL: http://svn.apache.org/viewvc?rev=1021769&view=rev
Log:
fix api compatibility
Modified:
shindig/branches/2.0.x/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/CajaContentRewriter.java
shindig/branches/2.0.x/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/GadgetsHandlerApi.java
shindig/branches/2.0.x/java/gadgets/src/test/java/org/apache/shindig/gadgets/servlet/GadgetHandlerServiceTest.java
Modified: shindig/branches/2.0.x/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/CajaContentRewriter.java
URL: http://svn.apache.org/viewvc/shindig/branches/2.0.x/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/CajaContentRewriter.java?rev=1021769&r1=1021768&r2=1021769&view=diff
==============================================================================
--- shindig/branches/2.0.x/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/CajaContentRewriter.java (original)
+++ shindig/branches/2.0.x/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/CajaContentRewriter.java Tue Oct 12 13:32:26 2010
@@ -199,7 +199,7 @@ public class CajaContentRewriter impleme
}
}
- protected boolean cajaEnabled(Gadget gadget) {
+ private boolean cajaEnabled(Gadget gadget) {
return (gadget.getAllFeatures().contains("caja") ||
"1".equals(gadget.getContext().getParameter("caja")));
}
Modified: shindig/branches/2.0.x/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/GadgetsHandlerApi.java
URL: http://svn.apache.org/viewvc/shindig/branches/2.0.x/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/GadgetsHandlerApi.java?rev=1021769&r1=1021768&r2=1021769&view=diff
==============================================================================
--- shindig/branches/2.0.x/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/GadgetsHandlerApi.java (original)
+++ shindig/branches/2.0.x/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/GadgetsHandlerApi.java Tue Oct 12 13:32:26 2010
@@ -72,7 +72,6 @@ public class GadgetsHandlerApi {
public ModulePrefs getModulePrefs();
public Map<String, UserPref> getUserPrefs();
public Map<String, View> getViews();
- public Boolean getNeedsTokenRefresh();
}
public enum ViewContentType {
Modified: shindig/branches/2.0.x/java/gadgets/src/test/java/org/apache/shindig/gadgets/servlet/GadgetHandlerServiceTest.java
URL: http://svn.apache.org/viewvc/shindig/branches/2.0.x/java/gadgets/src/test/java/org/apache/shindig/gadgets/servlet/GadgetHandlerServiceTest.java?rev=1021769&r1=1021768&r2=1021769&view=diff
==============================================================================
--- shindig/branches/2.0.x/java/gadgets/src/test/java/org/apache/shindig/gadgets/servlet/GadgetHandlerServiceTest.java (original)
+++ shindig/branches/2.0.x/java/gadgets/src/test/java/org/apache/shindig/gadgets/servlet/GadgetHandlerServiceTest.java Tue Oct 12 13:32:26 2010
@@ -81,7 +81,6 @@ public class GadgetHandlerServiceTest ex
replay();
GadgetsHandlerApi.MetadataResponse response = gadgetHandler.getMetadata(request);
assertEquals(FakeIframeUriManager.DEFAULT_IFRAME_URI.toString(), response.getIframeUrl());
- assertTrue(response.getNeedsTokenRefresh());
assertEquals(1, response.getViews().size());
assertTrue(response.getViews().get("default").getContent().contains("Hello, world" ));
assertEquals(FakeProcessor.SPEC_TITLE, response.getModulePrefs().getTitle());