You are viewing a plain text version of this content. The canonical link for it is here.
Posted to jetspeed-dev@portals.apache.org by ta...@apache.org on 2008/10/10 23:41:03 UTC
svn commit: r703582 - in
/portals/jetspeed-2/portal/branches/JETSPEED-2.1.2-POSTRELEASE/src/webapp/WEB-INF/assembly:
alternate/versioned-deployment/deployment.xml deployment.xml
Author: taylor
Date: Fri Oct 10 14:41:03 2008
New Revision: 703582
URL: http://svn.apache.org/viewvc?rev=703582&view=rev
Log:
https://issues.apache.org/jira/browse/JS2-908, backport
Modified:
portals/jetspeed-2/portal/branches/JETSPEED-2.1.2-POSTRELEASE/src/webapp/WEB-INF/assembly/alternate/versioned-deployment/deployment.xml
portals/jetspeed-2/portal/branches/JETSPEED-2.1.2-POSTRELEASE/src/webapp/WEB-INF/assembly/deployment.xml
Modified: portals/jetspeed-2/portal/branches/JETSPEED-2.1.2-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.2-POSTRELEASE/src/webapp/WEB-INF/assembly/alternate/versioned-deployment/deployment.xml?rev=703582&r1=703581&r2=703582&view=diff
==============================================================================
--- portals/jetspeed-2/portal/branches/JETSPEED-2.1.2-POSTRELEASE/src/webapp/WEB-INF/assembly/alternate/versioned-deployment/deployment.xml (original)
+++ portals/jetspeed-2/portal/branches/JETSPEED-2.1.2-POSTRELEASE/src/webapp/WEB-INF/assembly/alternate/versioned-deployment/deployment.xml Fri Oct 10 14:41:03 2008
@@ -19,7 +19,7 @@
<beans>
<bean id="deployFactory" class="org.apache.jetspeed.tools.deploy.JetspeedDeployFactory"/>
- <bean id="PAM"
+ <bean id="org.apache.jetspeed.tools.pamanager.PortletApplicationManager"
class="org.apache.jetspeed.tools.pamanager.VersionedPortletApplicationManager" init-method="start" destroy-method="stop"
>
<constructor-arg><ref bean="portletFactory"/></constructor-arg>
@@ -53,10 +53,27 @@
see https://issues.apache.org/jira/browse/JS2-666
<property name="maxRetriedStarts"><value>10</value></property>
-->
-
-
</bean>
+ <bean id="PAM" parent="baseTransactionProxy">
+ <property name="proxyInterfaces">
+ <value>org.apache.jetspeed.tools.pamanager.PortletApplicationManagement</value>
+ </property>
+
+ <property name="target">
+ <ref bean="org.apache.jetspeed.tools.pamanager.PortletApplicationManager" />
+ </property>
+ <property name="transactionAttributes">
+ <props>
+ <prop key="start*">PROPAGATION_REQUIRED,-org.apache.jetspeed.components.portletregistry.RegistryException</prop>
+ <prop key="stop*">PROPAGATION_REQUIRED,-org.apache.jetspeed.components.portletregistry.RegistryException</prop>
+ <prop key="unregister*">PROPAGATION_REQUIRED,-org.apache.jetspeed.components.portletregistry.RegistryException</prop>
+ <prop key="register*">PROPAGATION_REQUIRED,-org.apache.jetspeed.components.portletregistry.RegistryException</prop>
+ <prop key="save*">PROPAGATION_REQUIRED,-org.apache.jetspeed.components.portletregistry.RegistryException</prop>
+ </props>
+ </property>
+ </bean>
+
<!-- Portlet Application and Decorator deployment event listeners -->
<bean id="portletAppDeploymentListener"
class="org.apache.jetspeed.deployment.impl.DeployPortletAppEventListener"
Modified: portals/jetspeed-2/portal/branches/JETSPEED-2.1.2-POSTRELEASE/src/webapp/WEB-INF/assembly/deployment.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/branches/JETSPEED-2.1.2-POSTRELEASE/src/webapp/WEB-INF/assembly/deployment.xml?rev=703582&r1=703581&r2=703582&view=diff
==============================================================================
--- portals/jetspeed-2/portal/branches/JETSPEED-2.1.2-POSTRELEASE/src/webapp/WEB-INF/assembly/deployment.xml (original)
+++ portals/jetspeed-2/portal/branches/JETSPEED-2.1.2-POSTRELEASE/src/webapp/WEB-INF/assembly/deployment.xml Fri Oct 10 14:41:03 2008
@@ -36,7 +36,7 @@
</bean>
<bean id="deployFactory" class="org.apache.jetspeed.tools.deploy.JetspeedDeployFactory"/>
- <bean id="PAM"
+ <bean id="org.apache.jetspeed.tools.pamanager.PortletApplicationManager"
class="org.apache.jetspeed.tools.pamanager.PortletApplicationManager" init-method="start" destroy-method="stop"
>
<constructor-arg><ref bean="portletFactory"/></constructor-arg>
@@ -59,16 +59,33 @@
<value>${applicationRoot}</value>
</constructor-arg>
-
<!-- optional configuration for automatic creation of not yet existing roles as defined in the deployed web.xml:
<property name="autoCreateRoles"><value>true</value></property>
-->
<!-- optional descriptor change monitor check interval in seconds (0: disabled, default: 10):
<property name="descriptorChangeMonitorInterval"><value>10</value></property>
- -->
-
+ -->
</bean>
+ <bean id="PAM" parent="baseTransactionProxy">
+ <property name="proxyInterfaces">
+ <value>org.apache.jetspeed.tools.pamanager.PortletApplicationManagement</value>
+ </property>
+
+ <property name="target">
+ <ref bean="org.apache.jetspeed.tools.pamanager.PortletApplicationManager" />
+ </property>
+ <property name="transactionAttributes">
+ <props>
+ <prop key="start*">PROPAGATION_REQUIRED,-org.apache.jetspeed.components.portletregistry.RegistryException</prop>
+ <prop key="stop*">PROPAGATION_REQUIRED,-org.apache.jetspeed.components.portletregistry.RegistryException</prop>
+ <prop key="unregister*">PROPAGATION_REQUIRED,-org.apache.jetspeed.components.portletregistry.RegistryException</prop>
+ <prop key="register*">PROPAGATION_REQUIRED,-org.apache.jetspeed.components.portletregistry.RegistryException</prop>
+ <prop key="save*">PROPAGATION_REQUIRED,-org.apache.jetspeed.components.portletregistry.RegistryException</prop>
+ </props>
+ </property>
+ </bean>
+
<!-- Portlet Application and Decorator deployment event listeners -->
<bean id="portletAppDeploymentListener"
class="org.apache.jetspeed.deployment.impl.DeployPortletAppEventListener"
---------------------------------------------------------------------
To unsubscribe, e-mail: jetspeed-dev-unsubscribe@portals.apache.org
For additional commands, e-mail: jetspeed-dev-help@portals.apache.org