Author: [email protected]
Date: Fri Oct 7 09:50:09 2011
New Revision: 1450
Log:
[AMDATUOPENSOCIAL-55] Replaced service references to be injected by regular
service dependencies
Modified:
trunk/amdatu-opensocial/opensocial-shindig/src/main/java/org/amdatu/opensocial/shindig/service/GuiceInjectorServletImpl.java
trunk/amdatu-opensocial/opensocial-shindig/src/main/java/org/amdatu/opensocial/shindig/service/ShindigRegistrationServiceImpl.java
Modified:
trunk/amdatu-opensocial/opensocial-shindig/src/main/java/org/amdatu/opensocial/shindig/service/GuiceInjectorServletImpl.java
==============================================================================
---
trunk/amdatu-opensocial/opensocial-shindig/src/main/java/org/amdatu/opensocial/shindig/service/GuiceInjectorServletImpl.java
(original)
+++
trunk/amdatu-opensocial/opensocial-shindig/src/main/java/org/amdatu/opensocial/shindig/service/GuiceInjectorServletImpl.java
Fri Oct 7 09:50:09 2011
@@ -82,27 +82,7 @@
public GuiceInjectorServletImpl() {
}
-
- public void setLogService(LogService logService) {
- m_logService = logService;
- }
-
- public void setSocialApiModule(SocialApiModule socialApiModule) {
- m_socialApiModule = socialApiModule;
- }
-
- public void setoAuthModule(OAuthModule oAuthModule) {
- m_oAuthModule = oAuthModule;
- }
-
- public void setShindigConfigurationModule(ConfigurationAdminGuiceModule
shindigConfigurationModule) {
- m_shindigConfigurationModule = shindigConfigurationModule;
- }
-
- public void setDependencyManager(DependencyManager dependencyManager) {
- m_dependencyManager = dependencyManager;
- }
-
+
public ServletConfig getServletConfig() {
return null;
}
Modified:
trunk/amdatu-opensocial/opensocial-shindig/src/main/java/org/amdatu/opensocial/shindig/service/ShindigRegistrationServiceImpl.java
==============================================================================
---
trunk/amdatu-opensocial/opensocial-shindig/src/main/java/org/amdatu/opensocial/shindig/service/ShindigRegistrationServiceImpl.java
(original)
+++
trunk/amdatu-opensocial/opensocial-shindig/src/main/java/org/amdatu/opensocial/shindig/service/ShindigRegistrationServiceImpl.java
Fri Oct 7 09:50:09 2011
@@ -38,6 +38,7 @@
import org.amdatu.web.httpcontext.ResourceProvider;
import org.apache.felix.dm.Component;
import org.apache.felix.dm.DependencyManager;
+import org.apache.felix.dm.ServiceDependency;
import org.apache.shindig.auth.AuthenticationServletFilter;
import org.apache.shindig.gadgets.servlet.ConcatProxyServlet;
import org.apache.shindig.gadgets.servlet.GadgetRenderingServlet;
@@ -191,23 +192,27 @@
}
private void registerInjectorServlet() {
- GuiceInjectorServletImpl guiceInjectorServlet = new
GuiceInjectorServletImpl();
- guiceInjectorServlet.setDependencyManager(m_dependencyManager);
- guiceInjectorServlet.setLogService(m_logService);
- guiceInjectorServlet.setoAuthModule(m_OAuthModule);
-
guiceInjectorServlet.setShindigConfigurationModule(m_shindigConfigurationModule);
- guiceInjectorServlet.setSocialApiModule(m_socialApiModule);
-
+ GuiceInjectorServletImpl guiceInjectorServlet = new
GuiceInjectorServletImpl();
Properties servletProperties = new Properties();
servletProperties.put(DispatcherService.ALIAS_KEY,
GuiceInjectorServletImpl.SERVLET_ALIAS);
servletProperties.put(DispatcherService.CONTEXT_ID_KEY,
Activator.CONTEXTID);
Component servletComponent = m_dependencyManager.createComponent()
.setImplementation(guiceInjectorServlet)
- .setInterface(Servlet.class.getName(), servletProperties);
+ .setInterface(Servlet.class.getName(), servletProperties);
+
+ // Add the service dependencies
+ List<ServiceDependency> dependencies = new
ArrayList<ServiceDependency>();
+
dependencies.add(m_dependencyManager.createServiceDependency().setService(LogService.class).setRequired(true).setInstanceBound(true));
+
dependencies.add(m_dependencyManager.createServiceDependency().setService(SocialApiModule.class).setRequired(true).setInstanceBound(true));
+
dependencies.add(m_dependencyManager.createServiceDependency().setService(OAuthModule.class).setRequired(true).setInstanceBound(true));
+
dependencies.add(m_dependencyManager.createServiceDependency().setService(ConfigurationAdminGuiceModule.class).setRequired(true).setInstanceBound(true));
+ servletComponent.add(dependencies);
+
m_dependencyManager.add(servletComponent);
m_registeredServletComponents.add(servletComponent);
- }
+ }
+
private void registerAuthenticationFilter() {
String baseMatch = "[/\\?]?.*";
_______________________________________________
Amdatu-commits mailing list
[email protected]
http://lists.amdatu.org/mailman/listinfo/amdatu-commits
