Author: etnu
Date: Tue May 13 01:15:32 2008
New Revision: 655772
URL: http://svn.apache.org/viewvc?rev=655772&view=rev
Log:
Moved gadgets.http package to gadgets.servlet to match other similarly named
packages and to allow gadgets.http to be re-used for http retrieval.
Added:
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/
- copied from r655689,
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/http/
incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/servlet/
- copied from r655689,
incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/http/
Removed:
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/http/
incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/http/
Modified:
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/AbstractContentCache.java
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/CajaContentFilter.java
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/GadgetRenderingServlet.java
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/GadgetRenderingTask.java
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/HttpGadgetContext.java
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/HttpGuiceModule.java
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/HttpUtil.java
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/JsServlet.java
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/JsonRpcGadgetContext.java
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/JsonRpcHandler.java
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/ProxyHandler.java
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/ProxyServlet.java
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/RpcException.java
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/RpcServlet.java
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/UrlGenerator.java
incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/servlet/GadgetRenderingTaskTest.java
incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/servlet/HttpGadgetContextTest.java
incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/servlet/HttpTestFixture.java
incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/servlet/HttpUtilTest.java
incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/servlet/JsonRpcGadgetContextTest.java
incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/servlet/JsonRpcHandlerTest.java
incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/servlet/ProxyHandlerTest.java
incubator/shindig/trunk/java/server/src/main/webapp/WEB-INF/web.full.xml
incubator/shindig/trunk/java/server/src/main/webapp/WEB-INF/web.gadgets.xml
incubator/shindig/trunk/java/server/src/main/webapp/WEB-INF/web.social.xml
incubator/shindig/trunk/java/server/src/main/webapp/WEB-INF/web.xml
Modified:
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/AbstractContentCache.java
URL:
http://svn.apache.org/viewvc/incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/AbstractContentCache.java?rev=655772&r1=655771&r2=655772&view=diff
==============================================================================
---
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/AbstractContentCache.java
(original)
+++
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/AbstractContentCache.java
Tue May 13 01:15:32 2008
@@ -17,7 +17,7 @@
*/
package org.apache.shindig.gadgets;
-import org.apache.shindig.gadgets.http.HttpUtil;
+import org.apache.shindig.gadgets.servlet.HttpUtil;
import java.net.URI;
import java.util.Arrays;
Modified:
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/CajaContentFilter.java
URL:
http://svn.apache.org/viewvc/incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/CajaContentFilter.java?rev=655772&r1=655689&r2=655772&view=diff
==============================================================================
---
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/CajaContentFilter.java
(original)
+++
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/CajaContentFilter.java
Tue May 13 01:15:32 2008
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.shindig.gadgets.http;
+package org.apache.shindig.gadgets.servlet;
import org.apache.shindig.gadgets.GadgetContentFilter;
import org.apache.shindig.gadgets.GadgetException;
Modified:
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/GadgetRenderingServlet.java
URL:
http://svn.apache.org/viewvc/incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/GadgetRenderingServlet.java?rev=655772&r1=655689&r2=655772&view=diff
==============================================================================
---
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/GadgetRenderingServlet.java
(original)
+++
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/GadgetRenderingServlet.java
Tue May 13 01:15:32 2008
@@ -15,7 +15,7 @@
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations under the License.
*/
-package org.apache.shindig.gadgets.http;
+package org.apache.shindig.gadgets.servlet;
import org.apache.shindig.common.servlet.InjectedServlet;
Modified:
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/GadgetRenderingTask.java
URL:
http://svn.apache.org/viewvc/incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/GadgetRenderingTask.java?rev=655772&r1=655689&r2=655772&view=diff
==============================================================================
---
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/GadgetRenderingTask.java
(original)
+++
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/GadgetRenderingTask.java
Tue May 13 01:15:32 2008
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.shindig.gadgets.http;
+package org.apache.shindig.gadgets.servlet;
import org.apache.shindig.common.SecurityTokenDecoder;
import org.apache.shindig.gadgets.ContainerConfig;
@@ -36,12 +36,13 @@
import org.apache.shindig.gadgets.spec.ModulePrefs;
import org.apache.shindig.gadgets.spec.Preload;
import org.apache.shindig.gadgets.spec.View;
+
+import com.google.inject.Inject;
+
import org.json.JSONArray;
import org.json.JSONException;
import org.json.JSONObject;
-import com.google.inject.Inject;
-
import java.io.IOException;
import java.net.URI;
import java.net.URISyntaxException;
@@ -154,22 +155,22 @@
}
}
- /**
+ /**
* Redirect a type=html gadget to a locked domain if necessary.
- *
+ *
* @param gadget
* @return true if the request was handled, false if the request can proceed
* @throws IOException
*/
private boolean mustRedirectToLockedDomain(Gadget gadget)
throws IOException {
-
- String host = request.getHeader("Host");
+
+ String host = request.getHeader("Host");
String container = context.getContainer();
if (domainLocker.gadgetCanRender(host, gadget, container)) {
return false;
}
-
+
// Gadget tried to render on wrong domain.
String gadgetUrl = context.getUrl().toString();
String required = domainLocker.getLockedDomainForGadget(
@@ -177,9 +178,9 @@
String redir =
request.getScheme() + "://" +
required +
- request.getServletPath() + "?" +
+ request.getServletPath() + "?" +
request.getQueryString();
- logger.info("Redirecting gadget " + context.getUrl() + " from domain " +
+ logger.info("Redirecting gadget " + context.getUrl() + " from domain " +
host + " to domain " + redir);
response.sendRedirect(redir);
@@ -199,7 +200,7 @@
if (mustRedirectToLockedDomain(gadget)) {
return;
}
-
+
response.setContentType("text/html; charset=UTF-8");
StringBuilder markup = new StringBuilder();
@@ -477,7 +478,7 @@
}
return container;
}
-
+
/**
* Validates that the parent parameter was acceptable.
*
Modified:
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/HttpGadgetContext.java
URL:
http://svn.apache.org/viewvc/incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/HttpGadgetContext.java?rev=655772&r1=655689&r2=655772&view=diff
==============================================================================
---
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/HttpGadgetContext.java
(original)
+++
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/HttpGadgetContext.java
Tue May 13 01:15:32 2008
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.shindig.gadgets.http;
+package org.apache.shindig.gadgets.servlet;
import org.apache.shindig.common.SecurityToken;
import org.apache.shindig.common.SecurityTokenDecoder;
Modified:
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/HttpGuiceModule.java
URL:
http://svn.apache.org/viewvc/incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/HttpGuiceModule.java?rev=655772&r1=655689&r2=655772&view=diff
==============================================================================
---
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/HttpGuiceModule.java
(original)
+++
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/HttpGuiceModule.java
Tue May 13 01:15:32 2008
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.shindig.gadgets.http;
+package org.apache.shindig.gadgets.servlet;
import org.apache.shindig.gadgets.DefaultGuiceModule;
Modified:
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/HttpUtil.java
URL:
http://svn.apache.org/viewvc/incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/HttpUtil.java?rev=655772&r1=655689&r2=655772&view=diff
==============================================================================
---
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/HttpUtil.java
(original)
+++
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/HttpUtil.java
Tue May 13 01:15:32 2008
@@ -16,14 +16,14 @@
* specific language governing permissions and limitations
* under the License.
*/
-
-package org.apache.shindig.gadgets.http;
+package org.apache.shindig.gadgets.servlet;
import org.apache.shindig.gadgets.ContainerConfig;
import org.apache.shindig.gadgets.Gadget;
import org.apache.shindig.gadgets.GadgetContext;
import org.apache.shindig.gadgets.spec.GadgetSpec;
import org.apache.shindig.gadgets.spec.View;
+
import org.joda.time.DateTimeZone;
import org.joda.time.format.DateTimeFormat;
import org.joda.time.format.DateTimeFormatter;
@@ -48,7 +48,7 @@
public static final long START_TIME = System.currentTimeMillis();
// 1 year.
private static final int DEFAULT_TTL = 60 * 60 * 24 * 365;
-
+
private static DateTimeFormatter httpDateFormatter = DateTimeFormat
.forPattern("EEE, dd MMM yyyy HH:mm:ss 'GMT'")
.withLocale(Locale.US)
@@ -87,11 +87,11 @@
// Firefox requires this for certain cases.
response.setDateHeader("Last-Modified", START_TIME);
}
-
+
/**
* Parses an HTTP date. Returns null if the date fails to parse for any
* reason.
- *
+ *
* @param dateStr
* @return the date
*/
@@ -103,10 +103,10 @@
return null;
}
}
-
+
/**
* Formats a date for use in HTTP headers.
- *
+ *
* @param date
* @return HTTP date string.
*/
@@ -176,7 +176,7 @@
newHeaders.put("Cache-Control",
Arrays.asList("public, max-age=" + (age / 1000L)));
-
+
return newHeaders;
}
Modified:
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/JsServlet.java
URL:
http://svn.apache.org/viewvc/incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/JsServlet.java?rev=655772&r1=655689&r2=655772&view=diff
==============================================================================
---
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/JsServlet.java
(original)
+++
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/JsServlet.java
Tue May 13 01:15:32 2008
@@ -15,7 +15,7 @@
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations under the License.
*/
-package org.apache.shindig.gadgets.http;
+package org.apache.shindig.gadgets.servlet;
import org.apache.shindig.common.SecurityTokenDecoder;
import org.apache.shindig.common.servlet.InjectedServlet;
Modified:
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/JsonRpcGadgetContext.java
URL:
http://svn.apache.org/viewvc/incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/JsonRpcGadgetContext.java?rev=655772&r1=655689&r2=655772&view=diff
==============================================================================
---
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/JsonRpcGadgetContext.java
(original)
+++
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/JsonRpcGadgetContext.java
Tue May 13 01:15:32 2008
@@ -16,8 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-
-package org.apache.shindig.gadgets.http;
+package org.apache.shindig.gadgets.servlet;
import org.apache.shindig.gadgets.GadgetContext;
import org.apache.shindig.gadgets.RenderingContext;
Modified:
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/JsonRpcHandler.java
URL:
http://svn.apache.org/viewvc/incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/JsonRpcHandler.java?rev=655772&r1=655689&r2=655772&view=diff
==============================================================================
---
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/JsonRpcHandler.java
(original)
+++
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/JsonRpcHandler.java
Tue May 13 01:15:32 2008
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.shindig.gadgets.http;
+package org.apache.shindig.gadgets.servlet;
import org.apache.shindig.gadgets.Gadget;
import org.apache.shindig.gadgets.GadgetContext;
Modified:
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/ProxyHandler.java
URL:
http://svn.apache.org/viewvc/incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/ProxyHandler.java?rev=655772&r1=655689&r2=655772&view=diff
==============================================================================
---
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/ProxyHandler.java
(original)
+++
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/ProxyHandler.java
Tue May 13 01:15:32 2008
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.shindig.gadgets.http;
+package org.apache.shindig.gadgets.servlet;
import org.apache.shindig.common.SecurityToken;
import org.apache.shindig.common.SecurityTokenDecoder;
Modified:
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/ProxyServlet.java
URL:
http://svn.apache.org/viewvc/incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/ProxyServlet.java?rev=655772&r1=655689&r2=655772&view=diff
==============================================================================
---
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/ProxyServlet.java
(original)
+++
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/ProxyServlet.java
Tue May 13 01:15:32 2008
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.shindig.gadgets.http;
+package org.apache.shindig.gadgets.servlet;
import org.apache.shindig.common.servlet.InjectedServlet;
import org.apache.shindig.gadgets.GadgetException;
Modified:
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/RpcException.java
URL:
http://svn.apache.org/viewvc/incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/RpcException.java?rev=655772&r1=655689&r2=655772&view=diff
==============================================================================
---
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/RpcException.java
(original)
+++
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/RpcException.java
Tue May 13 01:15:32 2008
@@ -16,8 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-
-package org.apache.shindig.gadgets.http;
+package org.apache.shindig.gadgets.servlet;
import org.apache.shindig.gadgets.GadgetContext;
Modified:
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/RpcServlet.java
URL:
http://svn.apache.org/viewvc/incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/RpcServlet.java?rev=655772&r1=655689&r2=655772&view=diff
==============================================================================
---
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/RpcServlet.java
(original)
+++
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/RpcServlet.java
Tue May 13 01:15:32 2008
@@ -16,8 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-
-package org.apache.shindig.gadgets.http;
+package org.apache.shindig.gadgets.servlet;
import org.apache.shindig.common.servlet.InjectedServlet;
import org.apache.shindig.common.util.InputStreamConsumer;
Modified:
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/UrlGenerator.java
URL:
http://svn.apache.org/viewvc/incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/UrlGenerator.java?rev=655772&r1=655689&r2=655772&view=diff
==============================================================================
---
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/UrlGenerator.java
(original)
+++
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/UrlGenerator.java
Tue May 13 01:15:32 2008
@@ -16,16 +16,16 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.shindig.gadgets.http;
+package org.apache.shindig.gadgets.servlet;
import org.apache.shindig.common.util.HashUtil;
+import org.apache.shindig.gadgets.ContainerConfig;
import org.apache.shindig.gadgets.Gadget;
import org.apache.shindig.gadgets.GadgetContext;
import org.apache.shindig.gadgets.GadgetFeature;
import org.apache.shindig.gadgets.GadgetFeatureFactory;
import org.apache.shindig.gadgets.GadgetFeatureRegistry;
import org.apache.shindig.gadgets.JsLibrary;
-import org.apache.shindig.gadgets.ContainerConfig;
import org.apache.shindig.gadgets.UserPrefs;
import org.apache.shindig.gadgets.spec.GadgetSpec;
import org.apache.shindig.gadgets.spec.UserPref;
Modified:
incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/servlet/GadgetRenderingTaskTest.java
URL:
http://svn.apache.org/viewvc/incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/servlet/GadgetRenderingTaskTest.java?rev=655772&r1=655689&r2=655772&view=diff
==============================================================================
---
incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/servlet/GadgetRenderingTaskTest.java
(original)
+++
incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/servlet/GadgetRenderingTaskTest.java
Tue May 13 01:15:32 2008
@@ -16,7 +16,10 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.shindig.gadgets.http;
+package org.apache.shindig.gadgets.servlet;
+
+import static org.easymock.EasyMock.expect;
+import static org.easymock.EasyMock.isA;
import org.apache.shindig.gadgets.ContainerConfig;
import org.apache.shindig.gadgets.Gadget;
@@ -24,10 +27,8 @@
import org.apache.shindig.gadgets.RemoteContent;
import org.apache.shindig.gadgets.RemoteContentRequest;
import org.apache.shindig.gadgets.spec.GadgetSpec;
-import org.easymock.EasyMock;
-import static org.easymock.EasyMock.expect;
-import static org.easymock.EasyMock.isA;
+import org.easymock.EasyMock;
import org.json.JSONArray;
import org.json.JSONObject;
@@ -83,31 +84,31 @@
writer.close();
return new String(baos.toByteArray(), "UTF-8");
}
-
+
private void expectParseRequestParams(String view) throws Exception {
expect(request.getParameter("url")).andReturn(SPEC_URL.toString());
expect(request.getParameter("view")).andReturn(view);
expect(request.getParameterNames()).andReturn(EMPTY_PARAMS);
expect(request.getParameter("container")).andReturn(null);
- expect(request.getHeader("Host")).andReturn("www.example.com");
+ expect(request.getHeader("Host")).andReturn("www.example.com");
}
-
+
private void expectLockedDomainCheck() throws Exception {
expect(lockedDomainService.gadgetCanRender(
EasyMock.eq("www.example.com"),
(Gadget)EasyMock.anyObject(),
- EasyMock.eq("default"))).andReturn(true);
+ EasyMock.eq("default"))).andReturn(true);
}
-
+
private void expectFetchGadget() throws Exception {
expect(fetcher.fetch(SPEC_REQUEST)).andReturn(new RemoteContent(SPEC_XML));
}
-
+
private void expectWriteResponse() throws Exception {
expect(request.getParameter("libs")).andReturn(LIBS);
- expect(response.getWriter()).andReturn(writer);
+ expect(response.getWriter()).andReturn(writer);
}
-
+
public void testStandardsMode() throws Exception {
String content = parseBasicGadget(GadgetSpec.DEFAULT_VIEW);
assertTrue(-1 != content.indexOf(GadgetRenderingTask.STRICT_MODE_DOCTYPE));
@@ -149,7 +150,7 @@
assertTrue(-1 != content.indexOf(ALT_CONTENT));
}
-
+
public void testLockedDomainFailure() throws Exception {
expectParseRequestParams(GadgetSpec.DEFAULT_VIEW);
expectFetchGadget();
@@ -172,7 +173,7 @@
expect(lockedDomainService.getLockedDomainForGadget(
SPEC_URL.toString(), "default")).andReturn("locked.example.com");
}
-
+
private void expectSendRedirect() throws Exception {
response.sendRedirect(
"http://locked.example.com/gadgets/ifr?stuff=foo%20bar";);
Modified:
incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/servlet/HttpGadgetContextTest.java
URL:
http://svn.apache.org/viewvc/incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/servlet/HttpGadgetContextTest.java?rev=655772&r1=655689&r2=655772&view=diff
==============================================================================
---
incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/servlet/HttpGadgetContextTest.java
(original)
+++
incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/servlet/HttpGadgetContextTest.java
Tue May 13 01:15:32 2008
@@ -15,12 +15,12 @@
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations under the License.
*/
+package org.apache.shindig.gadgets.servlet;
-package org.apache.shindig.gadgets.http;
+import static org.easymock.EasyMock.expect;
import org.apache.shindig.gadgets.GadgetContext;
import org.apache.shindig.gadgets.GadgetTestFixture;
-import static org.easymock.EasyMock.expect;
import java.util.Locale;
Modified:
incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/servlet/HttpTestFixture.java
URL:
http://svn.apache.org/viewvc/incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/servlet/HttpTestFixture.java?rev=655772&r1=655689&r2=655772&view=diff
==============================================================================
---
incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/servlet/HttpTestFixture.java
(original)
+++
incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/servlet/HttpTestFixture.java
Tue May 13 01:15:32 2008
@@ -16,13 +16,12 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.shindig.gadgets.http;
+package org.apache.shindig.gadgets.servlet;
import org.apache.shindig.gadgets.ContentFetcherFactory;
import org.apache.shindig.gadgets.GadgetTestFixture;
import org.apache.shindig.gadgets.LockedDomainService;
-
public abstract class HttpTestFixture extends GadgetTestFixture {
public final ProxyHandler proxyHandler;
public final GadgetRenderingTask gadgetRenderer;
Modified:
incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/servlet/HttpUtilTest.java
URL:
http://svn.apache.org/viewvc/incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/servlet/HttpUtilTest.java?rev=655772&r1=655689&r2=655772&view=diff
==============================================================================
---
incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/servlet/HttpUtilTest.java
(original)
+++
incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/servlet/HttpUtilTest.java
Tue May 13 01:15:32 2008
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.shindig.gadgets.http;
+package org.apache.shindig.gadgets.servlet;
import junit.framework.TestCase;
@@ -24,7 +24,7 @@
import java.util.Locale;
public class HttpUtilTest extends TestCase {
-
+
public void testFormatInWrongLocale() {
Locale orig = Locale.getDefault();
try {
@@ -34,12 +34,12 @@
Locale.setDefault(orig);
}
}
-
+
public void testParseDate_rfc1123() {
String expires = "Sun, 06 Nov 1994 08:49:37 GMT";
Date date = HttpUtil.parseDate(expires);
assertEquals(784111777000L, date.getTime());
-
+
date = HttpUtil.parseDate("Mon, 12 May 2008 17:00:18 GMT");
assertEquals(1210611618000L, date.getTime());
}
@@ -48,13 +48,13 @@
String expires = "Mon, 12 May 2008 09:23:29 PDT";
assertNull(HttpUtil.parseDate(expires));
}
-
+
public void testParseDate_rfc1036() {
// We don't support this, though RFC 2616 suggests we should
String expires = "Sunday, 06-Nov-94 08:49:37 GMT";
assertNull(HttpUtil.parseDate(expires));
}
-
+
public void testParseDate_asctime() {
// We don't support this, though RFC 2616 suggests we should
String expires = "Sun Nov 6 08:49:37 1994";
@@ -64,7 +64,7 @@
public void testFormatDate() {
Date date = new Date(784111777000L);
assertEquals("Sun, 06 Nov 1994 08:49:37 GMT", HttpUtil.formatDate(date));
-
+
date = new Date(1210611618000L);
assertEquals("Mon, 12 May 2008 17:00:18 GMT", HttpUtil.formatDate(date));
}
Modified:
incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/servlet/JsonRpcGadgetContextTest.java
URL:
http://svn.apache.org/viewvc/incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/servlet/JsonRpcGadgetContextTest.java?rev=655772&r1=655689&r2=655772&view=diff
==============================================================================
---
incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/servlet/JsonRpcGadgetContextTest.java
(original)
+++
incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/servlet/JsonRpcGadgetContextTest.java
Tue May 13 01:15:32 2008
@@ -16,8 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-
-package org.apache.shindig.gadgets.http;
+package org.apache.shindig.gadgets.servlet;
import org.json.JSONObject;
Modified:
incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/servlet/JsonRpcHandlerTest.java
URL:
http://svn.apache.org/viewvc/incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/servlet/JsonRpcHandlerTest.java?rev=655772&r1=655689&r2=655772&view=diff
==============================================================================
---
incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/servlet/JsonRpcHandlerTest.java
(original)
+++
incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/servlet/JsonRpcHandlerTest.java
Tue May 13 01:15:32 2008
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.shindig.gadgets.http;
+package org.apache.shindig.gadgets.servlet;
import static org.easymock.EasyMock.expect;
import static org.easymock.EasyMock.isA;
Modified:
incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/servlet/ProxyHandlerTest.java
URL:
http://svn.apache.org/viewvc/incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/servlet/ProxyHandlerTest.java?rev=655772&r1=655689&r2=655772&view=diff
==============================================================================
---
incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/servlet/ProxyHandlerTest.java
(original)
+++
incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/servlet/ProxyHandlerTest.java
Tue May 13 01:15:32 2008
@@ -16,8 +16,11 @@
* specific language governing permissions and limitations
* under the License.
*/
+package org.apache.shindig.gadgets.servlet;
-package org.apache.shindig.gadgets.http;
+import static org.easymock.EasyMock.eq;
+import static org.easymock.EasyMock.expect;
+import static org.easymock.EasyMock.isA;
import org.apache.shindig.common.SecurityToken;
import org.apache.shindig.gadgets.FakeGadgetToken;
@@ -27,9 +30,6 @@
import org.apache.shindig.gadgets.spec.Auth;
import org.apache.shindig.gadgets.spec.Preload;
-import static org.easymock.EasyMock.eq;
-import static org.easymock.EasyMock.expect;
-import static org.easymock.EasyMock.isA;
import org.json.JSONObject;
import java.io.ByteArrayOutputStream;
@@ -49,15 +49,15 @@
final ByteArrayOutputStream baos = new ByteArrayOutputStream();
final PrintWriter writer = new PrintWriter(baos);
-
+
final ServletOutputStream responseStream = new ServletOutputStream() {
@SuppressWarnings("unused")
@Override
public void write(int b) throws IOException {
- baos.write(b);
+ baos.write(b);
}
};
-
+
final static Enumeration<String> EMPTY_LIST = new Enumeration<String>() {
public boolean hasMoreElements() {
return false;
@@ -101,7 +101,7 @@
expect(request.getParameter("url")).andReturn(url).atLeastOnce();
expect(response.getWriter()).andReturn(writer).atLeastOnce();
}
-
+
private void setupProxyRequestMock(String host, String url) throws Exception
{
expect(request.getMethod()).andReturn("GET").atLeastOnce();
expect(request.getHeader("Host")).andReturn(host);
@@ -109,10 +109,10 @@
expect(request.getHeaderNames()).andReturn(EMPTY_LIST);
expect(response.getOutputStream()).andReturn(responseStream).atLeastOnce();
}
-
+
private void setupFailedProxyRequestMock(String host, String url)
throws Exception {
- expect(request.getHeader("Host")).andReturn(host);
+ expect(request.getHeader("Host")).andReturn(host);
}
private JSONObject readJSONResponse(String body) throws Exception {
@@ -133,7 +133,7 @@
assertEquals(200, info.getInt("rc"));
assertEquals(DATA_ONE, info.get("body"));
}
-
+
public void testLockedDomainEmbed() throws Exception {
setupProxyRequestMock("www.example.com", URL_ONE);
expect(lockedDomainService.embedCanRender("www.example.com"))
@@ -145,7 +145,7 @@
responseStream.close();
assertEquals(DATA_ONE, new String(baos.toByteArray()));
}
-
+
public void testLockedDomainFailedEmbed() throws Exception {
setupFailedProxyRequestMock("www.example.com", URL_ONE);
expect(lockedDomainService.embedCanRender("www.example.com"))
Modified:
incubator/shindig/trunk/java/server/src/main/webapp/WEB-INF/web.full.xml
URL:
http://svn.apache.org/viewvc/incubator/shindig/trunk/java/server/src/main/webapp/WEB-INF/web.full.xml?rev=655772&r1=655771&r2=655772&view=diff
==============================================================================
--- incubator/shindig/trunk/java/server/src/main/webapp/WEB-INF/web.full.xml
(original)
+++ incubator/shindig/trunk/java/server/src/main/webapp/WEB-INF/web.full.xml
Tue May 13 01:15:32 2008
@@ -26,7 +26,7 @@
<!-- If you have your own Guice module(s), put them here as a
colon-separated list. -->
<context-param>
<param-name>guice-modules</param-name>
-
<param-value>org.apache.shindig.common.CommonGuiceModule:org.apache.shindig.gadgets.http.HttpGuiceModule:org.apache.shindig.social.SocialApiGuiceModule</param-value>
+
<param-value>org.apache.shindig.common.CommonGuiceModule:org.apache.shindig.gadgets.servlet.HttpGuiceModule:org.apache.shindig.social.SocialApiGuiceModule</param-value>
</context-param>
<listener>
@@ -37,7 +37,7 @@
<servlet>
<servlet-name>xml-to-html</servlet-name>
<servlet-class>
- org.apache.shindig.gadgets.http.GadgetRenderingServlet
+ org.apache.shindig.gadgets.servlet.GadgetRenderingServlet
</servlet-class>
</servlet>
@@ -45,7 +45,7 @@
<servlet>
<servlet-name>proxy</servlet-name>
<servlet-class>
- org.apache.shindig.gadgets.http.ProxyServlet
+ org.apache.shindig.gadgets.servlet.ProxyServlet
</servlet-class>
</servlet>
@@ -53,7 +53,7 @@
<servlet>
<servlet-name>metadata</servlet-name>
<servlet-class>
- org.apache.shindig.gadgets.http.RpcServlet
+ org.apache.shindig.gadgets.servlet.RpcServlet
</servlet-class>
</servlet>
@@ -68,7 +68,7 @@
<!-- javascript serving -->
<servlet>
<servlet-name>js</servlet-name>
- <servlet-class>org.apache.shindig.gadgets.http.JsServlet</servlet-class>
+ <servlet-class>org.apache.shindig.gadgets.servlet.JsServlet</servlet-class>
</servlet>
<!-- Serve REST api -->
Modified:
incubator/shindig/trunk/java/server/src/main/webapp/WEB-INF/web.gadgets.xml
URL:
http://svn.apache.org/viewvc/incubator/shindig/trunk/java/server/src/main/webapp/WEB-INF/web.gadgets.xml?rev=655772&r1=655771&r2=655772&view=diff
==============================================================================
--- incubator/shindig/trunk/java/server/src/main/webapp/WEB-INF/web.gadgets.xml
(original)
+++ incubator/shindig/trunk/java/server/src/main/webapp/WEB-INF/web.gadgets.xml
Tue May 13 01:15:32 2008
@@ -26,7 +26,7 @@
<!-- If you have your own Guice module(s), put them here as a
colon-separated list. -->
<context-param>
<param-name>guice-modules</param-name>
-
<param-value>org.apache.shindig.common.CommonGuiceModule:org.apache.shindig.gadgets.http.HttpGuiceModule</param-value>
+
<param-value>org.apache.shindig.common.CommonGuiceModule:org.apache.shindig.gadgets.servlet.HttpGuiceModule</param-value>
</context-param>
<listener>
@@ -37,7 +37,7 @@
<servlet>
<servlet-name>xml-to-html</servlet-name>
<servlet-class>
- org.apache.shindig.gadgets.http.GadgetRenderingServlet
+ org.apache.shindig.gadgets.servlet.GadgetRenderingServlet
</servlet-class>
</servlet>
@@ -45,7 +45,7 @@
<servlet>
<servlet-name>proxy</servlet-name>
<servlet-class>
- org.apache.shindig.gadgets.http.ProxyServlet
+ org.apache.shindig.gadgets.servlet.ProxyServlet
</servlet-class>
</servlet>
@@ -53,14 +53,14 @@
<servlet>
<servlet-name>metadata</servlet-name>
<servlet-class>
- org.apache.shindig.gadgets.http.RpcServlet
+ org.apache.shindig.gadgets.servlet.RpcServlet
</servlet-class>
</servlet>
<!-- javascript serving -->
<servlet>
<servlet-name>js</servlet-name>
- <servlet-class>org.apache.shindig.gadgets.http.JsServlet</servlet-class>
+ <servlet-class>org.apache.shindig.gadgets.servlet.JsServlet</servlet-class>
</servlet>
<servlet-mapping>
Modified:
incubator/shindig/trunk/java/server/src/main/webapp/WEB-INF/web.social.xml
URL:
http://svn.apache.org/viewvc/incubator/shindig/trunk/java/server/src/main/webapp/WEB-INF/web.social.xml?rev=655772&r1=655771&r2=655772&view=diff
==============================================================================
--- incubator/shindig/trunk/java/server/src/main/webapp/WEB-INF/web.social.xml
(original)
+++ incubator/shindig/trunk/java/server/src/main/webapp/WEB-INF/web.social.xml
Tue May 13 01:15:32 2008
@@ -26,7 +26,7 @@
<!-- If you have your own Guice module(s), put them here as a
colon-separated list. -->
<context-param>
<param-name>guice-modules</param-name>
-
<param-value>org.apache.shindig.common.CommonGuiceModule:org.apache.shindig.gadgets.http.HttpGuiceModule:org.apache.shindig.social.SocialApiGuiceModule</param-value>
+
<param-value>org.apache.shindig.common.CommonGuiceModule:org.apache.shindig.social.SocialApiGuiceModule</param-value>
</context-param>
<listener>
Modified: incubator/shindig/trunk/java/server/src/main/webapp/WEB-INF/web.xml
URL:
http://svn.apache.org/viewvc/incubator/shindig/trunk/java/server/src/main/webapp/WEB-INF/web.xml?rev=655772&r1=655771&r2=655772&view=diff
==============================================================================
--- incubator/shindig/trunk/java/server/src/main/webapp/WEB-INF/web.xml
(original)
+++ incubator/shindig/trunk/java/server/src/main/webapp/WEB-INF/web.xml Tue May
13 01:15:32 2008
@@ -26,7 +26,7 @@
<!-- If you have your own Guice module(s), put them here as a
colon-separated list. -->
<context-param>
<param-name>guice-modules</param-name>
-
<param-value>org.apache.shindig.common.CommonGuiceModule:org.apache.shindig.gadgets.http.HttpGuiceModule:org.apache.shindig.social.SocialApiGuiceModule</param-value>
+
<param-value>org.apache.shindig.common.CommonGuiceModule:org.apache.shindig.gadgets.servlet.HttpGuiceModule:org.apache.shindig.social.SocialApiGuiceModule</param-value>
</context-param>
<listener>
@@ -37,7 +37,7 @@
<servlet>
<servlet-name>xml-to-html</servlet-name>
<servlet-class>
- org.apache.shindig.gadgets.http.GadgetRenderingServlet
+ org.apache.shindig.gadgets.servlet.GadgetRenderingServlet
</servlet-class>
</servlet>
@@ -45,7 +45,7 @@
<servlet>
<servlet-name>proxy</servlet-name>
<servlet-class>
- org.apache.shindig.gadgets.http.ProxyServlet
+ org.apache.shindig.gadgets.servlet.ProxyServlet
</servlet-class>
</servlet>
@@ -53,7 +53,7 @@
<servlet>
<servlet-name>metadata</servlet-name>
<servlet-class>
- org.apache.shindig.gadgets.http.RpcServlet
+ org.apache.shindig.gadgets.servlet.RpcServlet
</servlet-class>
</servlet>
@@ -68,7 +68,7 @@
<!-- javascript serving -->
<servlet>
<servlet-name>js</servlet-name>
- <servlet-class>org.apache.shindig.gadgets.http.JsServlet</servlet-class>
+ <servlet-class>org.apache.shindig.gadgets.servlet.JsServlet</servlet-class>
</servlet>
<!-- Serve REST api -->
