[Amdatu-commits] SVN r531 - trunk/amdatu-opensocial/shindig/src/main/java/org/amdatu/opensocial/shindig/service

[subvers...@amdatu.org]

Author: angelo.vandersijpt at luminis.eu
Date: Wed Dec 22 13:09:52 2010
New Revision: 531

Log:
Partial revert of r527: it turns out not _all_ servlets registered from the 
shindig registration service should have a dependency on the 
GuiceInjectorServlet, especially since the GuiceInjectorServlet is one of those.

Modified:
   
trunk/amdatu-opensocial/shindig/src/main/java/org/amdatu/opensocial/shindig/service/ShindigRegistrationServiceImpl.java

Modified: 
trunk/amdatu-opensocial/shindig/src/main/java/org/amdatu/opensocial/shindig/service/ShindigRegistrationServiceImpl.java
==============================================================================
--- 
trunk/amdatu-opensocial/shindig/src/main/java/org/amdatu/opensocial/shindig/service/ShindigRegistrationServiceImpl.java
     (original)
+++ 
trunk/amdatu-opensocial/shindig/src/main/java/org/amdatu/opensocial/shindig/service/ShindigRegistrationServiceImpl.java
     Wed Dec 22 13:09:52 2010
@@ -278,10 +278,7 @@
 
         Component servletComponent = m_dependencyManager.createComponent()
                 .setImplementation(servlet)
-                .setInterface(Servlet.class.getName(), servletProperties)
-                .add(m_dependencyManager.createServiceDependency()
-                        .setService(GuiceInjectorServlet.class)
-                        .setRequired(true));
+                .setInterface(Servlet.class.getName(), servletProperties);
         m_dependencyManager.add(servletComponent);
         m_registeredServletPaths.add(alias);
     }