[gatein-commits] gatein SVN: r1822 - portal/trunk/component/wsrp/src/main/java/org/gatein/portal/wsrp.
Author: mwringe
Date: 2010-02-23 10:42:06 -0500 (Tue, 23 Feb 2010)
New Revision: 1822
Modified:
portal/trunk/component/wsrp/src/main/java/org/gatein/portal/wsrp/ExoKernelIntegration.java
Log:
Add missing NodeHierarchyCreator dependency, without this it can cause the portal to not
deploy due to a missing jcr repository. This issue may not occur when using the Sun JDK,
but does when using the IBM one (GTNPORTAL-636).
Modified:
portal/trunk/component/wsrp/src/main/java/org/gatein/portal/wsrp/ExoKernelIntegration.java
===================================================================
---
portal/trunk/component/wsrp/src/main/java/org/gatein/portal/wsrp/ExoKernelIntegration.java 2010-02-23
15:06:34 UTC (rev 1821)
+++
portal/trunk/component/wsrp/src/main/java/org/gatein/portal/wsrp/ExoKernelIntegration.java 2010-02-23
15:42:06 UTC (rev 1822)
@@ -27,6 +27,7 @@
import org.exoplatform.container.ExoContainerContext;
import org.exoplatform.container.configuration.ConfigurationManager;
import org.exoplatform.container.xml.InitParams;
+import org.exoplatform.services.jcr.ext.hierarchy.NodeHierarchyCreator;
import org.gatein.common.logging.Logger;
import org.gatein.common.logging.LoggerFactory;
import org.gatein.pc.api.PortletInvoker;
@@ -87,9 +88,9 @@
private static final String WSRP_ADMIN_GUI_CONTEXT_PATH =
"/wsrp-admin-gui";
public ExoKernelIntegration(ExoContainerContext context, InitParams params,
ConfigurationManager configurationManager,
- org.exoplatform.portal.pc.ExoKernelIntegration pc) throws
Exception
+ org.exoplatform.portal.pc.ExoKernelIntegration pc,
NodeHierarchyCreator nhc) throws Exception
{
- // IMPORTANT: even though PC ExoKernelIntegration is not used anywhere in the code,
it's still needed for pico
+ // IMPORTANT: even though PC ExoKernelIntegration and NodeHierarchyCreator is not
used anywhere in the code, it's still needed for pico
// to properly make sure that this service is started after the PC one. Yes, Pico
is crap. :/
// todo: we currently only allow the service to go through initialization if we are
running in the default portal