portals-jetspeed-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From tay...@apache.org
Subject svn commit: r703581 - in /portals/jetspeed-2/portal/branches/JETSPEED-2.1.3-POSTRELEASE/src/webapp/WEB-INF/assembly: alternate/versioned-deployment/deployment.xml deployment.xml
Date Fri, 10 Oct 2008 21:39:46 GMT
Author: taylor
Date: Fri Oct 10 14:39:46 2008
New Revision: 703581

URL: http://svn.apache.org/viewvc?rev=703581&view=rev
Log:
https://issues.apache.org/jira/browse/JS2-908, backport

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=703581&r1=703580&r2=703581&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
Fri Oct 10 14:39:46 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.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=703581&r1=703580&r2=703581&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
Fri Oct 10 14:39:46 2008
@@ -36,7 +36,8 @@
   </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>
@@ -71,10 +72,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"   	   



---------------------------------------------------------------------
To unsubscribe, e-mail: jetspeed-dev-unsubscribe@portals.apache.org
For additional commands, e-mail: jetspeed-dev-help@portals.apache.org


Mime
View raw message