svn commit: r953477 - in /shindig/trunk: config/container.js java/server/src/test/java/org/apache/shindig/server/endtoend/EndToEndServer.java java/server/src/test/resources/endtoend/errorTest.xml

[li...@apache.org]

Author: lindner
Date: Thu Jun 10 22:13:56 2010
New Revision: 953477

URL: http://svn.apache.org/viewvc?rev=953477&view=rev
Log:
change default rpc endpoint to use combined rpc endpoint

Modified:
    shindig/trunk/config/container.js
    shindig/trunk/java/server/src/test/java/org/apache/shindig/server/endtoend/EndToEndServer.java
    shindig/trunk/java/server/src/test/resources/endtoend/errorTest.xml

Modified: shindig/trunk/config/container.js
URL: http://svn.apache.org/viewvc/shindig/trunk/config/container.js?rev=953477&r1=953476&r2=953477&view=diff
==============================================================================
--- shindig/trunk/config/container.js (original)
+++ shindig/trunk/config/container.js Thu Jun 10 22:13:56 2010
@@ -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",

Modified: shindig/trunk/java/server/src/test/java/org/apache/shindig/server/endtoend/EndToEndServer.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/server/src/test/java/org/apache/shindig/server/endtoend/EndToEndServer.java?rev=953477&r1=953476&r2=953477&view=diff
==============================================================================
--- shindig/trunk/java/server/src/test/java/org/apache/shindig/server/endtoend/EndToEndServer.java (original)
+++ shindig/trunk/java/server/src/test/java/org/apache/shindig/server/endtoend/EndToEndServer.java Thu Jun 10 22:13:56 2010
@@ -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);

Modified: shindig/trunk/java/server/src/test/resources/endtoend/errorTest.xml
URL: http://svn.apache.org/viewvc/shindig/trunk/java/server/src/test/resources/endtoend/errorTest.xml?rev=953477&r1=953476&r2=953477&view=diff
==============================================================================
--- shindig/trunk/java/server/src/test/resources/endtoend/errorTest.xml (original)
+++ shindig/trunk/java/server/src/test/resources/endtoend/errorTest.xml Thu Jun 10 22:13:56 2010
@@ -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());