You are viewing a plain text version of this content. The canonical link for it is here.
Posted to pluto-scm@portals.apache.org by dd...@apache.org on 2005/11/16 21:28:27 UTC
svn commit: r345104 - in
/portals/pluto/trunk/pluto-portal-driver/src/main/java/org/apache/pluto/driver:
PortalStartupListener.java config/DriverConfiguration.java
config/impl/DriverConfigurationImpl.java
services/container/ContainerServicesImpl.java
Author: ddewolf
Date: Wed Nov 16 12:28:24 2005
New Revision: 345104
URL: http://svn.apache.org/viewcvs?rev=345104&view=rev
Log:
refactoring configuration to support injection of container services
Modified:
portals/pluto/trunk/pluto-portal-driver/src/main/java/org/apache/pluto/driver/PortalStartupListener.java
portals/pluto/trunk/pluto-portal-driver/src/main/java/org/apache/pluto/driver/config/DriverConfiguration.java
portals/pluto/trunk/pluto-portal-driver/src/main/java/org/apache/pluto/driver/config/impl/DriverConfigurationImpl.java
portals/pluto/trunk/pluto-portal-driver/src/main/java/org/apache/pluto/driver/services/container/ContainerServicesImpl.java
Modified: portals/pluto/trunk/pluto-portal-driver/src/main/java/org/apache/pluto/driver/PortalStartupListener.java
URL: http://svn.apache.org/viewcvs/portals/pluto/trunk/pluto-portal-driver/src/main/java/org/apache/pluto/driver/PortalStartupListener.java?rev=345104&r1=345103&r2=345104&view=diff
==============================================================================
--- portals/pluto/trunk/pluto-portal-driver/src/main/java/org/apache/pluto/driver/PortalStartupListener.java (original)
+++ portals/pluto/trunk/pluto-portal-driver/src/main/java/org/apache/pluto/driver/PortalStartupListener.java Wed Nov 16 12:28:24 2005
@@ -86,14 +86,18 @@
+ config.getPortalName() + "/"
+ config.getPortalVersion() + "]...");
}
+
PortalContextImpl portalContext = new PortalContextImpl(config);
-
+
if (LOG.isDebugEnabled()) {
LOG.debug(" * Creating container services...");
}
ContainerServicesImpl containerServices =
- new ContainerServicesImpl(portalContext);
-
+ new ContainerServicesImpl(
+ portalContext,
+ config
+ );
+
if (LOG.isDebugEnabled()) {
LOG.debug(" * Creating portlet container...");
}
Modified: portals/pluto/trunk/pluto-portal-driver/src/main/java/org/apache/pluto/driver/config/DriverConfiguration.java
URL: http://svn.apache.org/viewcvs/portals/pluto/trunk/pluto-portal-driver/src/main/java/org/apache/pluto/driver/config/DriverConfiguration.java?rev=345104&r1=345103&r2=345104&view=diff
==============================================================================
--- portals/pluto/trunk/pluto-portal-driver/src/main/java/org/apache/pluto/driver/config/DriverConfiguration.java (original)
+++ portals/pluto/trunk/pluto-portal-driver/src/main/java/org/apache/pluto/driver/config/DriverConfiguration.java Wed Nov 16 12:28:24 2005
@@ -18,8 +18,13 @@
import org.apache.pluto.driver.services.impl.resource.PortletApplicationConfig;
import org.apache.pluto.driver.services.impl.resource.PortletWindowConfig;
import org.apache.pluto.driver.services.impl.resource.PageConfig;
+import org.apache.pluto.services.PortalCallbackService;
+import org.apache.pluto.services.PortletPreferencesService;
+import org.apache.pluto.services.OptionalPortletContainerServices;
+import org.apache.pluto.PortletContainerServices;
import javax.servlet.ServletContext;
+import javax.portlet.PortalContext;
import java.util.Collection;
/**
@@ -56,4 +61,11 @@
Collection getPages();
PageConfig getPageConfig(String pageId);
+
+//
+// Utility methods for the container
+//
+ PortalCallbackService getPortalCallbackService();
+
+ PortletPreferencesService getPortletPreferencesService();
}
Modified: portals/pluto/trunk/pluto-portal-driver/src/main/java/org/apache/pluto/driver/config/impl/DriverConfigurationImpl.java
URL: http://svn.apache.org/viewcvs/portals/pluto/trunk/pluto-portal-driver/src/main/java/org/apache/pluto/driver/config/impl/DriverConfigurationImpl.java?rev=345104&r1=345103&r2=345104&view=diff
==============================================================================
--- portals/pluto/trunk/pluto-portal-driver/src/main/java/org/apache/pluto/driver/config/impl/DriverConfigurationImpl.java (original)
+++ portals/pluto/trunk/pluto-portal-driver/src/main/java/org/apache/pluto/driver/config/impl/DriverConfigurationImpl.java Wed Nov 16 12:28:24 2005
@@ -19,8 +19,11 @@
import org.apache.pluto.driver.services.impl.resource.PortletWindowConfig;
import org.apache.pluto.driver.services.impl.resource.PageConfig;
import org.apache.pluto.driver.config.DriverConfiguration;
+import org.apache.pluto.services.PortalCallbackService;
+import org.apache.pluto.services.PortletPreferencesService;
import javax.servlet.ServletContext;
+import javax.portlet.PortalContext;
import java.util.Collection;
/**
@@ -36,12 +39,20 @@
private PortletRegistryService registryService;
private RenderConfigService renderService;
+ // Container Services
+ private PortalCallbackService portalCallbackService;
+ private PortletPreferencesService portletPreferencesService;
+
public DriverConfigurationImpl(PropertyConfigService propertyService,
PortletRegistryService registryService,
- RenderConfigService renderService) {
+ RenderConfigService renderService,
+ PortalCallbackService portalCallback,
+ PortletPreferencesService prefs) {
this.propertyService = propertyService;
this.registryService = registryService;
this.renderService = renderService;
+ this.portalCallbackService = portalCallback;
+ this.portletPreferencesService = prefs;
}
/**
@@ -126,6 +137,26 @@
this.propertyService.init(context);
this.registryService.init(context);
this.renderService.init(context);
+ }
+
+
+//
+// Container Services
+//
+ public PortalCallbackService getPortalCallbackService() {
+ return portalCallbackService;
+ }
+
+ public void setPortalCallbackService(PortalCallbackService portalCallbackService) {
+ this.portalCallbackService = portalCallbackService;
+ }
+
+ public PortletPreferencesService getPortletPreferencesService() {
+ return portletPreferencesService;
+ }
+
+ public void setPortletPreferencesService(PortletPreferencesService portletPreferencesService) {
+ this.portletPreferencesService = portletPreferencesService;
}
}
Modified: portals/pluto/trunk/pluto-portal-driver/src/main/java/org/apache/pluto/driver/services/container/ContainerServicesImpl.java
URL: http://svn.apache.org/viewcvs/portals/pluto/trunk/pluto-portal-driver/src/main/java/org/apache/pluto/driver/services/container/ContainerServicesImpl.java?rev=345104&r1=345103&r2=345104&view=diff
==============================================================================
--- portals/pluto/trunk/pluto-portal-driver/src/main/java/org/apache/pluto/driver/services/container/ContainerServicesImpl.java (original)
+++ portals/pluto/trunk/pluto-portal-driver/src/main/java/org/apache/pluto/driver/services/container/ContainerServicesImpl.java Wed Nov 16 12:28:24 2005
@@ -18,6 +18,7 @@
import org.apache.pluto.OptionalPortletContainerServices;
import org.apache.pluto.services.PortalCallbackService;
import org.apache.pluto.PortletContainerServices;
+import org.apache.pluto.driver.config.DriverConfiguration;
import org.apache.pluto.services.PortletPreferencesService;
import javax.portlet.PortalContext;
@@ -35,17 +36,16 @@
private PortalContextImpl context;
+ private DriverConfiguration driverConfig;
- private PortletPreferencesService preferencesFactory;
- private PortalCallbackService callback;
/**
* Default Constructor.
*/
- public ContainerServicesImpl(PortalContextImpl context) {
+ public ContainerServicesImpl(PortalContextImpl context,
+ DriverConfiguration driverConfig) {
this.context = context;
- preferencesFactory = new PortletPreferencesProviderImpl();
- callback = new PortalCallbackProviderImpl();
+ this.driverConfig = driverConfig;
}
/**
@@ -62,7 +62,7 @@
* @return a PortletPreferencesService instance.
*/
public PortletPreferencesService getPortletPreferencesService() {
- return preferencesFactory;
+ return driverConfig.getPortletPreferencesService();
}
/**
@@ -71,7 +71,7 @@
* @return a PortalCallbackService implementation.
*/
public PortalCallbackService getPortalCallbackService() {
- return callback;
+ return driverConfig.getPortalCallbackService();
}
}