Reviewers: dev-remailer_shindig.apache.org,
Please review this at http://codereview.appspot.com/1613043/show
Affected files:
M config/container.js
M
java/server/src/test/java/org/apache/shindig/server/endtoend/EndToEndServer.java
java/server/src/test/resources/endtoend/errorTest.xml
Index: config/container.js
diff --git a/config/container.js b/config/container.js
index
d1d57fdae8111dd019e76dd1fc74cfb5c99df809..705b3daf415d0733e34dc71fd7b32cffbd0ea26b
100644
--- a/config/container.js
+++ b/config/container.js
@@ -155,7 +155,7 @@
"opensocial" : {
// Path to fetch opensocial data from
// Must be on the same domain as the gadget rendering server
- "path" : "http://%host%/social/rpc",
+ "path" : "http://%host%/rpc",
// Path to issue invalidate calls
"invalidatePath" : "http://%host%/rpc",
"domain" : "shindig",
Index:
java/server/src/test/java/org/apache/shindig/server/endtoend/EndToEndServer.java
diff --git
a/java/server/src/test/java/org/apache/shindig/server/endtoend/EndToEndServer.java
b/java/server/src/test/java/org/apache/shindig/server/endtoend/EndToEndServer.java
index
b9e29b9dba428bd625f6729baeada8e5df405dc4..4007fe199d7457e9959ff8fa2f61c1949450b927
100644
---
a/java/server/src/test/java/org/apache/shindig/server/endtoend/EndToEndServer.java
+++
b/java/server/src/test/java/org/apache/shindig/server/endtoend/EndToEndServer.java
@@ -144,19 +144,15 @@ public class EndToEndServer {
rpcServletHolder.setInitParameter("handlers", "org.apache.shindig.handlers");
context.addServlet(rpcServletHolder, SOCIAL_RPC_BASE);
context.addFilter(AuthenticationServletFilter.class, SOCIAL_RPC_BASE,
0);
+ context.addServlet(rpcServletHolder, GADGET_RPC_BASE);
+ context.addFilter(AuthenticationServletFilter.class, GADGET_RPC_BASE,
0);
+ context.addServlet(rpcServletHolder, RPC_BASE);
+ context.addFilter(AuthenticationServletFilter.class, RPC_BASE, 0);
// Attach the ConcatProxyServlet - needed for rewritten JS
ServletHolder concatHolder = new ServletHolder(new
ConcatProxyServlet());
context.addServlet(concatHolder, CONCAT_BASE);
- // Attach the Gadget
- ServletHolder gadgetsJsonRpcServletHolder = new ServletHolder(new
JsonRpcServlet());
-
gadgetsJsonRpcServletHolder.setInitParameter("handlers", "org.apache.shindig.handlers");
- context.addServlet(gadgetsJsonRpcServletHolder, GADGET_RPC_BASE);
- context.addFilter(AuthenticationServletFilter.class, GADGET_RPC_BASE,
0);
- context.addServlet(gadgetsJsonRpcServletHolder, RPC_BASE);
- context.addFilter(AuthenticationServletFilter.class, RPC_BASE, 0);
-
// Attach the JsServlet - needed for rewritten JS
ServletHolder jsHolder = new ServletHolder(new JsServlet());
context.addServlet(jsHolder, JS_BASE);
Index: java/server/src/test/resources/endtoend/errorTest.xml
diff --git a/java/server/src/test/resources/endtoend/errorTest.xml
b/java/server/src/test/resources/endtoend/errorTest.xml
index
ea649ed163b69734131a080a3b664ee596a7a52f..e21a04a161322ed11f27c7e53cd08b784c9afcae
100644
--- a/java/server/src/test/resources/endtoend/errorTest.xml
+++ b/java/server/src/test/resources/endtoend/errorTest.xml
@@ -56,7 +56,7 @@
req.add(req.newFetchPersonRequest("canonical"), "canonical");
function receivedData(response) {
- assertTrue("Expecting error", response.hadError());
+ assertTrue("Expecting error, got " +
gadgets.json.stringify(response), response.hadError());
var dataItem = response.get("canonical");
assertFalse("Expecting data item", dataItem == undefined);
assertTrue("Expecting item error", dataItem.hadError());