Author: angelo.vandersijpt at luminis.eu
Date: Tue Dec 21 19:10:06 2010
New Revision: 527
Log:
Removed a few minor issues, going towards a more robust startup sequence.
Modified:
trunk/amdatu-opensocial/shindig/src/main/java/org/amdatu/opensocial/shindig/osgi/Activator.java
trunk/amdatu-opensocial/shindig/src/main/java/org/amdatu/opensocial/shindig/service/ShindigRegistrationServiceImpl.java
trunk/amdatu-web/jsp/src/main/java/org/amdatu/web/jsp/service/ResourceProviderJspServlet.java
trunk/amdatu-web/jsp/src/main/java/org/amdatu/web/jsp/service/ResourceProviderListener.java
Modified:
trunk/amdatu-opensocial/shindig/src/main/java/org/amdatu/opensocial/shindig/osgi/Activator.java
==============================================================================
---
trunk/amdatu-opensocial/shindig/src/main/java/org/amdatu/opensocial/shindig/osgi/Activator.java
(original)
+++
trunk/amdatu-opensocial/shindig/src/main/java/org/amdatu/opensocial/shindig/osgi/Activator.java
Tue Dec 21 19:10:06 2010
@@ -117,6 +117,7 @@
createComponent()
.setInterface(GuiceInjectorService.class.getName(), null)
.setImplementation(GuiceInjectorServiceImpl.class)
+ .setCallbacks("_init", "start", "stop", "_destroy")
.add(createServiceDependency().setService(LogService.class).setRequired(true))
.add(createServiceDependency().setService(SocialApiModule.class).setRequired(true))
.add(createServiceDependency().setService(OAuthModule.class).setRequired(true))
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
Tue Dec 21 19:10:06 2010
@@ -128,11 +128,6 @@
true));
m_dependencyManager.add(component);
- // Append a dependency on the GuiceInjectorServlet such that any
servlets registered later on
- // are not registered before the Guice injector is initialized
-
m_dependencyManager.createServiceDependency().setService(GuiceInjectorServlet.class.getName())
- .setRequired(true);
-
m_logService.log(LogService.LOG_INFO, getClass().getName() + " service
initialized");
}
@@ -277,9 +272,16 @@
}
servletProperties.put("alias", alias);
servletProperties.put("contextId", getResourceId());
- Component servletComponent = m_dependencyManager.createComponent();
- servletComponent.setImplementation(servlet);
- servletComponent.setInterface(Servlet.class.getName(),
servletProperties);
+
+
+
+
+ Component servletComponent = m_dependencyManager.createComponent()
+ .setImplementation(servlet)
+ .setInterface(Servlet.class.getName(), servletProperties)
+ .add(m_dependencyManager.createServiceDependency()
+ .setService(GuiceInjectorServlet.class)
+ .setRequired(true));
m_dependencyManager.add(servletComponent);
m_registeredServletPaths.add(alias);
}
Modified:
trunk/amdatu-web/jsp/src/main/java/org/amdatu/web/jsp/service/ResourceProviderJspServlet.java
==============================================================================
---
trunk/amdatu-web/jsp/src/main/java/org/amdatu/web/jsp/service/ResourceProviderJspServlet.java
(original)
+++
trunk/amdatu-web/jsp/src/main/java/org/amdatu/web/jsp/service/ResourceProviderJspServlet.java
Tue Dec 21 19:10:06 2010
@@ -70,7 +70,7 @@
m_resourceProvider = provider;
}
- public void init() {
+ public void _init() {
ClassLoader jcl = JasperClassLoader.class.getClassLoader();
// Look up the bundle that hosts the provider.
@@ -183,6 +183,7 @@
new Callable<Void>() {
public Void call() throws Exception {
m_jasperServlet.destroy();
+ // TODO How is this an error?
m_logService.log(LogService.LOG_ERROR, "JSP servlet for "
+ getResourceProvider().getResourceId() + " destroyed");
return null;
}
Modified:
trunk/amdatu-web/jsp/src/main/java/org/amdatu/web/jsp/service/ResourceProviderListener.java
==============================================================================
---
trunk/amdatu-web/jsp/src/main/java/org/amdatu/web/jsp/service/ResourceProviderListener.java
(original)
+++
trunk/amdatu-web/jsp/src/main/java/org/amdatu/web/jsp/service/ResourceProviderListener.java
Tue Dec 21 19:10:06 2010
@@ -117,12 +117,12 @@
// Instantiate new ResourceProviderJspServlet service
ResourceProviderJspServlet jspServlet = new
ResourceProviderJspServlet(provider);
- Component component = m_dependencyManager.createComponent();
- component.setImplementation(jspServlet);
-
- // Add service dependencies
-
component.add(m_dependencyManager.createServiceDependency().setService(LogService.class).setRequired(
- true));
+ Component component = m_dependencyManager.createComponent()
+ .setImplementation(jspServlet)
+ .add(m_dependencyManager.createServiceDependency()
+ .setService(LogService.class)
+ .setRequired(true))
+ .setCallbacks("_init", "start", "stop", "_destroy");
// Add the component to the dependency manager
m_components.put(normalizeResourceId(provider), component);
