Author: vkumar
Date: Thu Jul 2 16:41:25 2009
New Revision: 790660
URL: http://svn.apache.org/viewvc?rev=790660&view=rev
Log:
Ensure portletAppDeploymentListener and decoratorDeploymentListener starts
after PAM is injected with PAM proxy; making jetspeed 2.1.3 and jetspeed 2.2.1
in sync
Modified:
portals/jetspeed-2/portal/branches/JETSPEED-2.1.3-POSTRELEASE/src/webapp/WEB-INF/assembly/alternate/versioned-deployment/deployment.xml
portals/jetspeed-2/portal/branches/JETSPEED-2.1.3-POSTRELEASE/src/webapp/WEB-INF/assembly/deployment.xml
Modified:
portals/jetspeed-2/portal/branches/JETSPEED-2.1.3-POSTRELEASE/src/webapp/WEB-INF/assembly/alternate/versioned-deployment/deployment.xml
URL:
http://svn.apache.org/viewvc/portals/jetspeed-2/portal/branches/JETSPEED-2.1.3-POSTRELEASE/src/webapp/WEB-INF/assembly/alternate/versioned-deployment/deployment.xml?rev=790660&r1=790659&r2=790660&view=diff
==============================================================================
---
portals/jetspeed-2/portal/branches/JETSPEED-2.1.3-POSTRELEASE/src/webapp/WEB-INF/assembly/alternate/versioned-deployment/deployment.xml
(original)
+++
portals/jetspeed-2/portal/branches/JETSPEED-2.1.3-POSTRELEASE/src/webapp/WEB-INF/assembly/alternate/versioned-deployment/deployment.xml
Thu Jul 2 16:41:25 2009
@@ -76,7 +76,7 @@
</bean>
<!-- Inject PAM Proxy into PAM implementation -->
- <bean id="PAMInjector"
class="org.springframework.beans.factory.config.MethodInvokingFactoryBean">
+ <bean id="injectPAMProxyIntoPAM"
class="org.springframework.beans.factory.config.MethodInvokingFactoryBean">
<property name="targetObject">
<ref
bean="org.apache.jetspeed.tools.pamanager.PortletApplicationManager" />
</property>
@@ -92,7 +92,7 @@
<!-- Portlet Application and Decorator deployment event listeners -->
<bean id="portletAppDeploymentListener"
-
class="org.apache.jetspeed.deployment.impl.DeployPortletAppEventListener"
depends-on="PAMInjector"
+
class="org.apache.jetspeed.deployment.impl.DeployPortletAppEventListener"
depends-on="injectPAMProxyIntoPAM"
>
<constructor-arg index="0"><ref bean="PAM"/></constructor-arg>
<constructor-arg index="1"><ref
bean="org.apache.jetspeed.components.portletregistry.PortletRegistry"/></constructor-arg>
@@ -107,7 +107,7 @@
>
</bean>
<bean id="decoratorDeploymentListener"
-
class="org.apache.jetspeed.deployment.impl.DeployDecoratorEventListener"
+
class="org.apache.jetspeed.deployment.impl.DeployDecoratorEventListener"
depends-on="injectPAMProxyIntoPAM"
>
<constructor-arg
><value>${applicationRoot}/decorations</value></constructor-arg>
</bean>
Modified:
portals/jetspeed-2/portal/branches/JETSPEED-2.1.3-POSTRELEASE/src/webapp/WEB-INF/assembly/deployment.xml
URL:
http://svn.apache.org/viewvc/portals/jetspeed-2/portal/branches/JETSPEED-2.1.3-POSTRELEASE/src/webapp/WEB-INF/assembly/deployment.xml?rev=790660&r1=790659&r2=790660&view=diff
==============================================================================
---
portals/jetspeed-2/portal/branches/JETSPEED-2.1.3-POSTRELEASE/src/webapp/WEB-INF/assembly/deployment.xml
(original)
+++
portals/jetspeed-2/portal/branches/JETSPEED-2.1.3-POSTRELEASE/src/webapp/WEB-INF/assembly/deployment.xml
Thu Jul 2 16:41:25 2009
@@ -95,7 +95,7 @@
</bean>
<!-- Inject PAM Proxy into PAM implementation -->
- <bean id="PAMInjector"
class="org.springframework.beans.factory.config.MethodInvokingFactoryBean">
+ <bean id="injectPAMProxyIntoPAM"
class="org.springframework.beans.factory.config.MethodInvokingFactoryBean">
<property name="targetObject">
<ref
bean="org.apache.jetspeed.tools.pamanager.PortletApplicationManager" />
</property>
@@ -111,7 +111,7 @@
<!-- Portlet Application and Decorator deployment event listeners -->
<bean id="portletAppDeploymentListener"
-
class="org.apache.jetspeed.deployment.impl.DeployPortletAppEventListener"
depends-on="PAMInjector"
+
class="org.apache.jetspeed.deployment.impl.DeployPortletAppEventListener"
depends-on="injectPAMProxyIntoPAM"
>
<constructor-arg index="0"><ref bean="PAM"/></constructor-arg>
<constructor-arg index="1"><ref
bean="org.apache.jetspeed.components.portletregistry.PortletRegistry"/></constructor-arg>
@@ -126,7 +126,7 @@
>
</bean>
<bean id="decoratorDeploymentListener"
-
class="org.apache.jetspeed.deployment.impl.DeployDecoratorEventListener"
+
class="org.apache.jetspeed.deployment.impl.DeployDecoratorEventListener"
depends-on="injectPAMProxyIntoPAM"
>
<constructor-arg
><value>${applicationRoot}/decorations</value></constructor-arg>
</bean>
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
