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:43:22 UTC
svn commit: r703583 - in /portals/jetspeed-2/portal:
branches/JS2-871-pluto-2.0-upgrade/jetspeed-portal-resources/src/main/resources/assembly/
branches/JS2-871-pluto-2.0-upgrade/jetspeed-portal-resources/src/main/resources/assembly/alternate/versioned-...
Author: taylor
Date: Fri Oct 10 14:43:22 2008
New Revision: 703583
URL: http://svn.apache.org/viewvc?rev=703583&view=rev
Log:
https://issues.apache.org/jira/browse/JS2-908
Modified:
portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/jetspeed-portal-resources/src/main/resources/assembly/alternate/versioned-deployment/deployment.xml
portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/jetspeed-portal-resources/src/main/resources/assembly/deployment.xml
portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/assembly/alternate/versioned-deployment/deployment.xml
portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/assembly/deployment.xml
Modified: portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/jetspeed-portal-resources/src/main/resources/assembly/alternate/versioned-deployment/deployment.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/jetspeed-portal-resources/src/main/resources/assembly/alternate/versioned-deployment/deployment.xml?rev=703583&r1=703582&r2=703583&view=diff
==============================================================================
--- portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/jetspeed-portal-resources/src/main/resources/assembly/alternate/versioned-deployment/deployment.xml (original)
+++ portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/jetspeed-portal-resources/src/main/resources/assembly/alternate/versioned-deployment/deployment.xml Fri Oct 10 14:43:22 2008
@@ -19,7 +19,7 @@
xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.5.xsd">
<bean id="deployFactory" class="org.apache.jetspeed.tools.deploy.JetspeedDeployFactory" />
- <bean id="PAM" class="org.apache.jetspeed.tools.pamanager.VersionedPortletApplicationManager" init-method="start"
+ <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" />
@@ -66,10 +66,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">
<constructor-arg index="0">
Modified: portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/jetspeed-portal-resources/src/main/resources/assembly/deployment.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/jetspeed-portal-resources/src/main/resources/assembly/deployment.xml?rev=703583&r1=703582&r2=703583&view=diff
==============================================================================
--- portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/jetspeed-portal-resources/src/main/resources/assembly/deployment.xml (original)
+++ portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/jetspeed-portal-resources/src/main/resources/assembly/deployment.xml Fri Oct 10 14:43:22 2008
@@ -45,7 +45,7 @@
<meta key="j2:cat" value="default" />
</bean>
- <bean id="PAM" class="org.apache.jetspeed.tools.pamanager.PortletApplicationManager" init-method="start"
+ <bean id="org.apache.jetspeed.tools.pamanager.PortletApplicationManager" class="org.apache.jetspeed.tools.pamanager.PortletApplicationManager" init-method="start"
destroy-method="stop">
<meta key="j2:cat" value="default" />
<constructor-arg>
@@ -96,10 +96,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">
<meta key="j2:cat" value="default" />
Modified: portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/assembly/alternate/versioned-deployment/deployment.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/assembly/alternate/versioned-deployment/deployment.xml?rev=703583&r1=703582&r2=703583&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/assembly/alternate/versioned-deployment/deployment.xml (original)
+++ portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/assembly/alternate/versioned-deployment/deployment.xml Fri Oct 10 14:43:22 2008
@@ -19,7 +19,7 @@
xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.5.xsd">
<bean id="deployFactory" class="org.apache.jetspeed.tools.deploy.JetspeedDeployFactory" />
- <bean id="PAM" class="org.apache.jetspeed.tools.pamanager.VersionedPortletApplicationManager" init-method="start"
+ <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" />
@@ -66,10 +66,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">
<constructor-arg index="0">
Modified: portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/assembly/deployment.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/assembly/deployment.xml?rev=703583&r1=703582&r2=703583&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/assembly/deployment.xml (original)
+++ portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/assembly/deployment.xml Fri Oct 10 14:43:22 2008
@@ -45,7 +45,7 @@
<meta key="j2:cat" value="default" />
</bean>
- <bean id="PAM" class="org.apache.jetspeed.tools.pamanager.PortletApplicationManager" init-method="start"
+ <bean id="org.apache.jetspeed.tools.pamanager.PortletApplicationManager" class="org.apache.jetspeed.tools.pamanager.PortletApplicationManager" init-method="start"
destroy-method="stop">
<meta key="j2:cat" value="default" />
<constructor-arg>
@@ -96,10 +96,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">
<meta key="j2:cat" value="default" />
---------------------------------------------------------------------
To unsubscribe, e-mail: jetspeed-dev-unsubscribe@portals.apache.org
For additional commands, e-mail: jetspeed-dev-help@portals.apache.org