Author: vkumar
Date: Thu Jul 2 16:05:19 2009
New Revision: 790634
URL: http://svn.apache.org/viewvc?rev=790634&view=rev
Log:
Ensure portletAppDeploymentListener starts after PAM is injected with PAM
proxy; cleanup VersionedPortletApplicationManager spring configuration in
deployment.xml
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=790634&r1=790633&r2=790634&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:05:19 2009
@@ -76,7 +76,7 @@
</bean>
<!-- Inject PAM Proxy into PAM implementation -->
- <bean
class="org.springframework.beans.factory.config.MethodInvokingFactoryBean">
+ <bean id="PAMInjector"
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"
+
class="org.apache.jetspeed.deployment.impl.DeployPortletAppEventListener"
depends-on="PAMInjector"
>
<constructor-arg index="0"><ref bean="PAM"/></constructor-arg>
<constructor-arg index="1"><ref
bean="org.apache.jetspeed.components.portletregistry.PortletRegistry"/></constructor-arg>
@@ -118,8 +118,7 @@
-->
<bean id="deploymentManager"
class="org.apache.jetspeed.deployment.impl.StandardDeploymentManager"
- init-method="start" destroy-method="stop"
- >
+ init-method="start" destroy-method="stop">
<constructor-arg
><value>${autodeployment.staging.dir}/local</value></constructor-arg>
<constructor-arg type="long"
><value>${autodeployment.delay}</value></constructor-arg>
<constructor-arg >
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=790634&r1=790633&r2=790634&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:05:19 2009
@@ -95,7 +95,7 @@
</bean>
<!-- Inject PAM Proxy into PAM implementation -->
- <bean
class="org.springframework.beans.factory.config.MethodInvokingFactoryBean">
+ <bean id="PAMInjector"
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"
+
class="org.apache.jetspeed.deployment.impl.DeployPortletAppEventListener"
depends-on="PAMInjector"
>
<constructor-arg index="0"><ref bean="PAM"/></constructor-arg>
<constructor-arg index="1"><ref
bean="org.apache.jetspeed.components.portletregistry.PortletRegistry"/></constructor-arg>
@@ -137,8 +137,7 @@
-->
<bean id="deploymentManager"
class="org.apache.jetspeed.deployment.impl.StandardDeploymentManager"
- init-method="start" destroy-method="stop"
- >
+ init-method="start" destroy-method="stop">
<constructor-arg
><value>${autodeployment.staging.dir},${autodeployment.staging.dir}/local</value></constructor-arg>
<constructor-arg type="long"
><value>${autodeployment.delay}</value></constructor-arg>
<constructor-arg >
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
