svn commit: r746421 - /incubator/shindig/trunk/java/server/src/test/java/org/apache/shindig/server/JettyLauncher.java

[aw...@apache.org]

Author: awiner
Date: Sat Feb 21 00:22:59 2009
New Revision: 746421

URL: http://svn.apache.org/viewvc?rev=746421&view=rev
Log:
Beef up the JettyLauncher a bit:
- Add makeRequest support
- Add the authentication handler to the gadget rendering servlet (for proxied rendering/pipeline support)

Modified:
    incubator/shindig/trunk/java/server/src/test/java/org/apache/shindig/server/JettyLauncher.java

Modified: incubator/shindig/trunk/java/server/src/test/java/org/apache/shindig/server/JettyLauncher.java
URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/java/server/src/test/java/org/apache/shindig/server/JettyLauncher.java?rev=746421&r1=746420&r2=746421&view=diff
==============================================================================
--- incubator/shindig/trunk/java/server/src/test/java/org/apache/shindig/server/JettyLauncher.java (original)
+++ incubator/shindig/trunk/java/server/src/test/java/org/apache/shindig/server/JettyLauncher.java Sat Feb 21 00:22:59 2009
@@ -25,6 +25,7 @@
 import org.apache.shindig.gadgets.servlet.ConcatProxyServlet;
 import org.apache.shindig.gadgets.servlet.GadgetRenderingServlet;
 import org.apache.shindig.gadgets.servlet.JsServlet;
+import org.apache.shindig.gadgets.servlet.MakeRequestServlet;
 import org.apache.shindig.gadgets.servlet.ProxyServlet;
 import org.apache.shindig.gadgets.servlet.RpcServlet;
 import org.apache.shindig.protocol.DataServiceServlet;
@@ -49,6 +50,7 @@
 
   private static final String GADGET_BASE = "/gadgets/ifr";
   private static final String PROXY_BASE = "/gadgets/proxy";
+  private static final String MAKEREQUEST_BASE = "/gadgets/makeRequest";
   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";
@@ -93,7 +95,13 @@
     // Attach the gadget rendering servlet
     ServletHolder gadgetServletHolder = new ServletHolder(new GadgetRenderingServlet());
     context.addServlet(gadgetServletHolder, GADGET_BASE);
+    context.addFilter(AuthenticationServletFilter.class, GADGET_BASE, 0);
 
+    // Attach the make-request servlet
+    ServletHolder makeRequestHolder = new ServletHolder(new MakeRequestServlet());
+    context.addServlet(makeRequestHolder, MAKEREQUEST_BASE);
+    context.addFilter(AuthenticationServletFilter.class, MAKEREQUEST_BASE, 0);
+    
     // Attach DataServiceServlet
     ServletHolder restServletHolder = new ServletHolder(new DataServiceServlet());
     context.addServlet(restServletHolder, REST_BASE);