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=753026&r1=753025&r2=753026&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 Thu Mar 12 21:45:04 2009 @@ -43,29 +43,37 @@ <listener-class>org.apache.shindig.common.servlet.GuiceServletContextListener</listener-class> </listener> - <!-- Serve REST api --> + <!-- Serve social REST api --> <servlet> - <servlet-name>restapiServlet</servlet-name> + <servlet-name>socialRestapiServlet</servlet-name> <servlet-class> org.apache.shindig.protocol.DataServiceServlet </servlet-class> + <init-param> + <param-name>handlers</param-name> + <param-value>org.apache.shindig.social.handlers</param-value> + </init-param> </servlet> - <!-- Serve RPC api --> + <!-- Serve social RPC api --> <servlet> - <servlet-name>jsonRpcServlet</servlet-name> + <servlet-name>socialJsonRpcServlet</servlet-name> <servlet-class> org.apache.shindig.protocol.JsonRpcServlet </servlet-class> + <init-param> + <param-name>handlers</param-name> + <param-value>org.apache.shindig.social.handlers</param-value> + </init-param> </servlet> <servlet-mapping> - <servlet-name>restapiServlet</servlet-name> + <servlet-name>socialRestapiServlet</servlet-name> <url-pattern>/social/rest/*</url-pattern> </servlet-mapping> <servlet-mapping> - <servlet-name>jsonRpcServlet</servlet-name> + <servlet-name>socialJsonRpcServlet</servlet-name> <url-pattern>/social/rpc/*</url-pattern> </servlet-mapping> </web-app>
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=753026&r1=753025&r2=753026&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 Thu Mar 12 21:45:04 2009 @@ -55,6 +55,11 @@ <url-pattern>/gadgets/makeRequest</url-pattern> </filter-mapping> + <filter-mapping> + <filter-name>authFilter</filter-name> + <url-pattern>/gadgets/rpc/*</url-pattern> + </filter-mapping> + <listener> <listener-class>org.apache.shindig.common.servlet.GuiceServletContextListener</listener-class> </listener> @@ -113,20 +118,40 @@ <servlet-class>org.apache.shindig.gadgets.servlet.JsServlet</servlet-class> </servlet> - <!-- Serve REST api --> + <!-- Serve social REST api --> <servlet> - <servlet-name>restapiServlet</servlet-name> + <servlet-name>socialRestapiServlet</servlet-name> <servlet-class> org.apache.shindig.protocol.DataServiceServlet </servlet-class> + <init-param> + <param-name>handlers</param-name> + <param-value>org.apache.shindig.social.handlers</param-value> + </init-param> </servlet> - <!-- Serve RPC api --> + <!-- Serve social RPC api --> <servlet> - <servlet-name>jsonRpcServlet</servlet-name> + <servlet-name>socialJsonRpcServlet</servlet-name> <servlet-class> org.apache.shindig.protocol.JsonRpcServlet </servlet-class> + <init-param> + <param-name>handlers</param-name> + <param-value>org.apache.shindig.social.handlers</param-value> + </init-param> + </servlet> + + <!-- Serve gadgets RPC api --> + <servlet> + <servlet-name>gadgetsJsonRpcServlet</servlet-name> + <servlet-class> + org.apache.shindig.protocol.JsonRpcServlet + </servlet-class> + <init-param> + <param-name>handlers</param-name> + <param-value>org.apache.shindig.gadgets.handlers</param-value> + </init-param> </servlet> <!-- Serve sample OAuth apis --> @@ -153,6 +178,11 @@ </servlet-mapping> <servlet-mapping> + <servlet-name>gadgetsJsonRpcServlet</servlet-name> + <url-pattern>/gadgets/rpc/*</url-pattern> + </servlet-mapping> + + <servlet-mapping> <servlet-name>concat</servlet-name> <url-pattern>/gadgets/concat</url-pattern> </servlet-mapping> @@ -173,12 +203,12 @@ </servlet-mapping> <servlet-mapping> - <servlet-name>restapiServlet</servlet-name> + <servlet-name>socialRestapiServlet</servlet-name> <url-pattern>/social/rest/*</url-pattern> </servlet-mapping> <servlet-mapping> - <servlet-name>jsonRpcServlet</servlet-name> + <servlet-name>socialJsonRpcServlet</servlet-name> <url-pattern>/social/rpc/*</url-pattern> </servlet-mapping> 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=753026&r1=753025&r2=753026&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 Thu Mar 12 21:45:04 2009 @@ -34,6 +34,7 @@ import com.google.common.base.Join; import com.google.common.collect.Maps; + import org.mortbay.jetty.Server; import org.mortbay.jetty.servlet.Context; import org.mortbay.jetty.servlet.DefaultServlet; @@ -51,6 +52,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 GADGETS_RPC_BASE = "/gadgets/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"; @@ -106,14 +108,22 @@ ServletHolder makeRequestHolder = new ServletHolder(new MakeRequestServlet()); context.addServlet(makeRequestHolder, MAKEREQUEST_BASE); context.addFilter(AuthenticationServletFilter.class, MAKEREQUEST_BASE, 0); + + // Attach the gadgets rpc servlet + ServletHolder gadgetsRpcServletHolder = new ServletHolder(new JsonRpcServlet()); + gadgetsRpcServletHolder.setInitParameter("handlers", "org.apache.shindig.gadgets.handlers"); + context.addServlet(gadgetsRpcServletHolder, GADGETS_RPC_BASE); + context.addFilter(AuthenticationServletFilter.class, GADGETS_RPC_BASE, 0); // Attach DataServiceServlet ServletHolder restServletHolder = new ServletHolder(new DataServiceServlet()); + restServletHolder.setInitParameter("handlers", "org.apache.shindig.social.handlers"); context.addServlet(restServletHolder, REST_BASE); context.addFilter(AuthenticationServletFilter.class, REST_BASE, 0); // Attach JsonRpcServlet ServletHolder rpcServletHolder = new ServletHolder(new JsonRpcServlet()); + rpcServletHolder.setInitParameter("handlers", "org.apache.shindig.social.handlers"); context.addServlet(rpcServletHolder, JSON_RPC_BASE); context.addFilter(AuthenticationServletFilter.class, JSON_RPC_BASE, 0); Modified: incubator/shindig/trunk/java/server/src/test/java/org/apache/shindig/server/endtoend/EndToEndModule.java URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/java/server/src/test/java/org/apache/shindig/server/endtoend/EndToEndModule.java?rev=753026&r1=753025&r2=753026&view=diff ============================================================================== --- incubator/shindig/trunk/java/server/src/test/java/org/apache/shindig/server/endtoend/EndToEndModule.java (original) +++ incubator/shindig/trunk/java/server/src/test/java/org/apache/shindig/server/endtoend/EndToEndModule.java Thu Mar 12 21:45:04 2009 @@ -22,7 +22,6 @@ import org.apache.shindig.common.servlet.ParameterFetcher; import org.apache.shindig.config.ContainerConfig; import org.apache.shindig.config.JsonContainerConfig; -import org.apache.shindig.gadgets.http.InvalidationHandler; import org.apache.shindig.protocol.DataServiceServletFetcher; import org.apache.shindig.protocol.SystemHandler; import org.apache.shindig.protocol.conversion.BeanConverter; @@ -72,10 +71,10 @@ bind(new TypeLiteral<List<AuthenticationHandler>>(){}).toProvider( AuthenticationHandlerProvider.class); - bind(new TypeLiteral<Set<Object>>(){}).annotatedWith(Names.named("org.apache.shindig.handlers")) + bind(new TypeLiteral<Set<Object>>(){}).annotatedWith( + Names.named("org.apache.shindig.social.handlers")) .toInstance(ImmutableSet.<Object>of(ActivityHandler.class, AppDataHandler.class, - PersonHandler.class, SampleContainerHandler.class, SystemHandler.class, - InvalidationHandler.class)); + PersonHandler.class, SampleContainerHandler.class)); bind(ContainerConfig.class).to(JsonContainerConfig.class); } Modified: incubator/shindig/trunk/java/server/src/test/java/org/apache/shindig/server/endtoend/EndToEndServer.java URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/java/server/src/test/java/org/apache/shindig/server/endtoend/EndToEndServer.java?rev=753026&r1=753025&r2=753026&view=diff ============================================================================== --- incubator/shindig/trunk/java/server/src/test/java/org/apache/shindig/server/endtoend/EndToEndServer.java (original) +++ incubator/shindig/trunk/java/server/src/test/java/org/apache/shindig/server/endtoend/EndToEndServer.java Thu Mar 12 21:45:04 2009 @@ -30,12 +30,17 @@ import com.google.common.base.Join; import com.google.common.collect.Maps; + import org.mortbay.jetty.Server; import org.mortbay.jetty.handler.ResourceHandler; import org.mortbay.jetty.servlet.Context; import org.mortbay.jetty.servlet.ServletHolder; import org.mortbay.resource.Resource; +import java.io.IOException; +import java.net.URL; +import java.util.Map; + import javax.servlet.Servlet; import javax.servlet.ServletConfig; import javax.servlet.ServletException; @@ -44,9 +49,6 @@ import javax.servlet.http.HttpServlet; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import java.io.IOException; -import java.net.URL; -import java.util.Map; /** * Suite for running the end-to-end tests. The suite is responsible for starting up and shutting @@ -120,12 +122,14 @@ // Attach DataServiceServlet, wrapped in a proxy to fake errors ServletHolder restServletHolder = new ServletHolder(new ForceErrorServlet( new DataServiceServlet())); + restServletHolder.setInitParameter("handlers", "org.apache.shindig.social.handlers"); context.addServlet(restServletHolder, REST_BASE); context.addFilter(AuthenticationServletFilter.class, REST_BASE, 0); // Attach JsonRpcServlet, wrapped in a proxy to fake errors 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); Modified: incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/core/config/SocialApiGuiceModule.java URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/core/config/SocialApiGuiceModule.java?rev=753026&r1=753025&r2=753026&view=diff ============================================================================== --- incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/core/config/SocialApiGuiceModule.java (original) +++ incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/core/config/SocialApiGuiceModule.java Thu Mar 12 21:45:04 2009 @@ -81,6 +81,6 @@ bind(new TypeLiteral<Set<Object>>(){}).annotatedWith(Names.named("org.apache.shindig.handlers")) .toInstance(ImmutableSet.<Object>of(ActivityHandler.class, AppDataHandler.class, - PersonHandler.class, MessageHandler.class, SampleContainerHandler.class, SystemHandler.class)); + PersonHandler.class, MessageHandler.class, SampleContainerHandler.class)); } } Modified: incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/SocialApiTestsGuiceModule.java URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/SocialApiTestsGuiceModule.java?rev=753026&r1=753025&r2=753026&view=diff ============================================================================== --- incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/SocialApiTestsGuiceModule.java (original) +++ incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/SocialApiTestsGuiceModule.java Thu Mar 12 21:45:04 2009 @@ -59,9 +59,10 @@ bind(BeanConverter.class).annotatedWith(Names.named("shindig.bean.converter.json")).to( BeanJsonConverter.class); - bind(new TypeLiteral<Set<Object>>(){}).annotatedWith(Names.named("org.apache.shindig.handlers")) + bind(new TypeLiteral<Set<Object>>(){}).annotatedWith( + Names.named("org.apache.shindig.social.handlers")) .toInstance(ImmutableSet.<Object>of(ActivityHandler.class, AppDataHandler.class, - PersonHandler.class, SystemHandler.class, MessageHandler.class)); + PersonHandler.class, MessageHandler.class)); bind(String.class).annotatedWith( Names.named("shindig.containers.default")) Modified: incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/dataservice/integration/AbstractLargeRestfulTests.java URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/dataservice/integration/AbstractLargeRestfulTests.java?rev=753026&r1=753025&r2=753026&view=diff ============================================================================== --- incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/dataservice/integration/AbstractLargeRestfulTests.java (original) +++ incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/dataservice/integration/AbstractLargeRestfulTests.java Thu Mar 12 21:45:04 2009 @@ -34,6 +34,9 @@ import com.google.common.collect.ImmutableMap; import com.google.inject.Guice; import com.google.inject.Injector; +import com.google.inject.Key; +import com.google.inject.TypeLiteral; +import com.google.inject.name.Names; import org.easymock.EasyMock; import org.json.JSONObject; import org.w3c.dom.Node; @@ -53,6 +56,7 @@ import java.io.PrintWriter; import java.util.List; import java.util.Map; +import java.util.Set; public abstract class AbstractLargeRestfulTests extends EasyMockTestCase { protected static final String XMLSCHEMA = " xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\"; \n" @@ -88,7 +92,10 @@ servlet = new DataServiceServlet(); - servlet.setHandlerRegistry(injector.getInstance(HandlerRegistry.class)); + HandlerRegistry dispatcher = injector.getInstance(HandlerRegistry.class); + dispatcher.addHandlers(injector.getInstance(Key.get(new TypeLiteral<Set<Object>>(){}, + Names.named("org.apache.shindig.social.handlers")))); + servlet.setHandlerRegistry(dispatcher); servlet.setBeanConverters(new BeanJsonConverter(injector), new BeanXStreamConverter(new XStream081Configuration(injector)), new BeanXStreamAtomConverter(new XStream081Configuration(injector))); Modified: incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/opensocial/service/ActivityHandlerTest.java URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/opensocial/service/ActivityHandlerTest.java?rev=753026&r1=753025&r2=753026&view=diff ============================================================================== --- incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/opensocial/service/ActivityHandlerTest.java (original) +++ incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/opensocial/service/ActivityHandlerTest.java Thu Mar 12 21:45:04 2009 @@ -82,8 +82,9 @@ containerConfig = new JsonContainerConfig(config, new Expressions()); handler = new ActivityHandler(activityService, containerConfig); - registry = new DefaultHandlerRegistry(null, Sets.<Object>newHashSet(handler), converter, + registry = new DefaultHandlerRegistry(null, converter, new HandlerExecutionListener.NoOpHandlerExecutionListener()); + registry.addHandlers(Sets.<Object>newHashSet(handler)); } private void assertHandleGetForGroup(GroupId.Type group) throws Exception { Modified: incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/opensocial/service/AppDataHandlerTest.java URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/opensocial/service/AppDataHandlerTest.java?rev=753026&r1=753025&r2=753026&view=diff ============================================================================== --- incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/opensocial/service/AppDataHandlerTest.java (original) +++ incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/opensocial/service/AppDataHandlerTest.java Thu Mar 12 21:45:04 2009 @@ -68,8 +68,9 @@ converter = mock(BeanJsonConverter.class); appDataService = mock(AppDataService.class); AppDataHandler handler = new AppDataHandler(appDataService); - registry = new DefaultHandlerRegistry(null, Sets.<Object>newHashSet(handler), converter, + registry = new DefaultHandlerRegistry(null, converter, new HandlerExecutionListener.NoOpHandlerExecutionListener()); + registry.addHandlers(Sets.<Object>newHashSet(handler)); } private void assertHandleGetForGroup(GroupId.Type group) throws Exception { Modified: incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/opensocial/service/MessageHandlerTest.java URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/opensocial/service/MessageHandlerTest.java?rev=753026&r1=753025&r2=753026&view=diff ============================================================================== --- incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/opensocial/service/MessageHandlerTest.java (original) +++ incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/opensocial/service/MessageHandlerTest.java Thu Mar 12 21:45:04 2009 @@ -59,8 +59,9 @@ recipients = ImmutableList.of("second.recipient", "first.recipient"); handler = new MessageHandler(messageService); - registry = new DefaultHandlerRegistry(null, Sets.<Object>newHashSet(handler), converter, + registry = new DefaultHandlerRegistry(null, converter, new HandlerExecutionListener.NoOpHandlerExecutionListener()); + registry.addHandlers(Sets.<Object>newHashSet(handler)); } public void testPostMessage() Modified: incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/opensocial/service/PersonHandlerTest.java URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/opensocial/service/PersonHandlerTest.java?rev=753026&r1=753025&r2=753026&view=diff ============================================================================== --- incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/opensocial/service/PersonHandlerTest.java (original) +++ incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/opensocial/service/PersonHandlerTest.java Thu Mar 12 21:45:04 2009 @@ -38,7 +38,11 @@ import org.apache.shindig.social.opensocial.spi.PersonService; import org.apache.shindig.social.opensocial.spi.UserId; -import com.google.common.collect.*; +import com.google.common.collect.ImmutableList; +import com.google.common.collect.ImmutableSortedSet; +import com.google.common.collect.Lists; +import com.google.common.collect.Maps; +import com.google.common.collect.Sets; import static org.easymock.EasyMock.eq; import static org.easymock.EasyMock.expect; @@ -87,8 +91,9 @@ containerConfig = new JsonContainerConfig(config, new Expressions()); handler = new PersonHandler(personService, containerConfig); - registry = new DefaultHandlerRegistry(null, Sets.<Object>newHashSet(handler), converter, + registry = new DefaultHandlerRegistry(null, converter, new HandlerExecutionListener.NoOpHandlerExecutionListener()); + registry.addHandlers(Sets.<Object>newHashSet(handler)); } public void testHandleGetAllNoParams() throws Exception {
