portals-jetspeed-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rwat...@apache.org
Subject svn commit: r770892 - in /portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/assembly: alternate/versioned-deployment/deployment.xml deployment.xml
Date Sat, 02 May 2009 05:29:04 GMT
Author: rwatler
Date: Sat May  2 05:29:03 2009
New Revision: 770892

URL: http://svn.apache.org/viewvc?rev=770892&view=rev
Log:
ensure StandardDeploymentManager starts after PAM is injected with PAM proxy; cleanup VersionedPortletApplicationManager
spring configuration in deployment.xml

Modified:
    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/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=770892&r1=770891&r2=770892&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
Sat May  2 05:29:03 2009
@@ -18,9 +18,9 @@
 <beans xmlns="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
   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="org.apache.jetspeed.tools.pamanager.PortletApplicationManager" class="org.apache.jetspeed.tools.pamanager.VersionedPortletApplicationManager"
init-method="start"
     destroy-method="stop">
+    <meta key="j2:cat" value="default" />
     <constructor-arg>
       <ref bean="portletFactory" />
     </constructor-arg>
@@ -48,7 +48,7 @@
       <value>${applicationRoot}</value>
     </constructor-arg>
 
-      <constructor-arg><ref bean="org.apache.jetspeed.descriptor.JetspeedDescriptorService"/></constructor-arg>
+    <constructor-arg><ref bean="org.apache.jetspeed.descriptor.JetspeedDescriptorService"/></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>
@@ -63,90 +63,4 @@
     -->
   </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="try*">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>
-
-  <!-- Inject PAM Proxy into PAM implementation -->
-  <bean class="org.springframework.beans.factory.config.MethodInvokingFactoryBean">
-    <meta key="j2:cat" value="default" />
-    <property name="targetObject">
-      <ref bean="org.apache.jetspeed.tools.pamanager.PortletApplicationManager" />
-    </property>
-    <property name="targetMethod">
-      <value>setPAMProxy</value>
-    </property>
-    <property name="arguments">
-      <list>
-        <ref bean="PAM" />
-      </list>
-    </property>
-  </bean>
-
-  <!-- Portlet Application and Decorator deployment event listeners -->
-  <bean id="portletAppDeploymentListener" class="org.apache.jetspeed.deployment.impl.DeployPortletAppEventListener">
-    <constructor-arg index="0">
-      <ref bean="PAM" />
-    </constructor-arg>
-    <constructor-arg index="1">
-      <ref bean="org.apache.jetspeed.components.portletregistry.PortletRegistry" />
-    </constructor-arg>
-    <constructor-arg index="2">
-      <value>${autodeployment.target.dir}</value>
-    </constructor-arg>
-    <constructor-arg index="3">
-      <value>${applicationRoot}/WEB-INF/apps</value>
-    </constructor-arg>
-    <constructor-arg index="4">
-      <value>${autodeployment.staging.dir}/local</value>
-    </constructor-arg>
-    <!-- strip commons-logging and/or log4j jars from war files: for JBoss set this to
true -->
-    <constructor-arg index="5">
-      <value>false</value>
-    </constructor-arg>
-  </bean>
-  <bean id="decoratorDeploymentRegistry"
-    class="org.apache.jetspeed.deployment.simpleregistry.impl.InMemoryRegistryImpl">
-  </bean>
-  <bean id="decoratorDeploymentListener" class="org.apache.jetspeed.deployment.impl.DeployDecoratorEventListener">
-    <constructor-arg>
-      <value>${applicationRoot}/decorations</value>
-    </constructor-arg>
-  </bean>
-
-  <!-- The deployment manager watches a specific staging directory for
-    deploying components.  What components get deployed depend of
-    DeploymentEventListeners registered to it.
-  -->
-  <bean id="deploymentManager" class="org.apache.jetspeed.deployment.impl.StandardDeploymentManager"
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>
-      <list>
-        <ref bean="portletAppDeploymentListener" />
-        <ref bean="decoratorDeploymentListener" />
-      </list>
-    </constructor-arg>
-  </bean>
-
 </beans>

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=770892&r1=770891&r2=770892&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
Sat May  2 05:29:03 2009
@@ -120,7 +120,7 @@
     </bean>
 
   <!-- Inject PAM Proxy into PAM implementation -->
-  <bean class="org.springframework.beans.factory.config.MethodInvokingFactoryBean">
+  <bean id="injectPAMProxyIntoPAM" class="org.springframework.beans.factory.config.MethodInvokingFactoryBean">
     <meta key="j2:cat" value="default" />
     <property name="targetObject">
       <ref bean="org.apache.jetspeed.tools.pamanager.PortletApplicationManager" />
@@ -174,7 +174,7 @@
     DeploymentEventListeners registered to it.
   -->
   <bean id="deploymentManager" class="org.apache.jetspeed.deployment.impl.StandardDeploymentManager"
init-method="start"
-    destroy-method="stop">
+    destroy-method="stop" depends-on="injectPAMProxyIntoPAM">
     <meta key="j2:cat" value="default" />
     <constructor-arg>
       <value>${autodeployment.staging.dir},${autodeployment.staging.dir}/local</value>



---------------------------------------------------------------------
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