svn commit: r924012 - /shindig/trunk/java/server/src/test/java/org/apache/shindig/server/endtoend/EndToEndServer.java

[li...@apache.org]

Author: lindner
Date: Tue Mar 16 21:56:19 2010
New Revision: 924012

URL: http://svn.apache.org/viewvc?rev=924012&view=rev
Log:
add missing gadgets rpc servlet

Modified:
    shindig/trunk/java/server/src/test/java/org/apache/shindig/server/endtoend/EndToEndServer.java

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=924012&r1=924011&r2=924012&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 Tue Mar 16 21:56:19 2010
@@ -59,6 +59,7 @@ import com.google.common.collect.Maps;
 public class EndToEndServer {
   private static final int JETTY_PORT = 9003;
   private static final String GADGET_BASE = "/gadgets/ifr";
+  private static final String GADGET_RPC_BASE = "/gadgets/api/rpc/*";
   private static final String REST_BASE = "/social/rest/*";
   private static final String JSON_RPC_BASE = "/social/rpc/*";
   private static final String CONCAT_BASE = "/gadgets/concat";
@@ -131,8 +132,7 @@ public class EndToEndServer {
     context.addFilter(AuthenticationServletFilter.class, REST_BASE, 0);
 
     // Attach JsonRpcServlet, wrapped in a proxy to fake errors
-    ServletHolder rpcServletHolder = new ServletHolder(new ForceErrorServlet(
-        new JsonRpcServlet()));
+    ServletHolder rpcServletHolder = new ServletHolder(new ForceErrorServlet(new JsonRpcServlet()));
     rpcServletHolder.setInitParameter("handlers", "org.apache.shindig.social.handlers");
     context.addServlet(rpcServletHolder, JSON_RPC_BASE);
     context.addFilter(AuthenticationServletFilter.class, JSON_RPC_BASE, 0);
@@ -141,6 +141,12 @@ public class EndToEndServer {
     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.gadgets.handlers");
+    context.addServlet(gadgetsJsonRpcServletHolder, GADGET_RPC_BASE);
+    context.addFilter(AuthenticationServletFilter.class, GADGET_RPC_BASE, 0);
+
     // Attach the JsServlet - needed for rewritten JS
     ServletHolder jsHolder = new ServletHolder(new JsServlet());
     context.addServlet(jsHolder, JS_BASE);