[jboss-cvs] jboss-portal/core/src/resources/portal-core-sar/META-INF ...

[Julien Viet]

  User: julien  
  Date: 06/07/11 16:50:27

  Modified:    core/src/resources/portal-core-sar/META-INF 
                        jboss-service.xml
  Log:
  - make cms cache work
  - improve portal object deployment in ha mode
  
  Revision  Changes    Path
  1.129     +23 -20    jboss-portal/core/src/resources/portal-core-sar/META-INF/jboss-service.xml
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: jboss-service.xml
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-portal/core/src/resources/portal-core-sar/META-INF/jboss-service.xml,v
  retrieving revision 1.128
  retrieving revision 1.129
  diff -u -b -r1.128 -r1.129
  --- jboss-service.xml	11 Jul 2006 13:16:25 -0000	1.128
  +++ jboss-service.xml	11 Jul 2006 20:50:27 -0000	1.129
  @@ -519,7 +519,6 @@
            optional-attribute-name="PortalEventListenerRegistry"
            proxy-type="attribute">portal:service=ListenerRegistry</depends>
         <attribute name="SessionFactoryJNDIName">java:/portal/PortalObjectSessionFactory</attribute>
  -      <attribute name="CreateRootOnStartup">true</attribute>
      </mbean>
   
      <!-- Command factories -->
  @@ -700,7 +699,25 @@
            proxy-type="attribute">portal:service=Server</depends>
      </mbean>
   
  -   <!-- Deployment factories -->
  +   <!-- Portal object deployment factory -->
  +   <!--
  +      | Uncomment in cluster mode : have the deployment of objects run as a clustered singleton
  +      @portal.single.xml.close@
  +      <mbean
  +      code="org.jboss.portal.core.system.LifecycleInvoker"
  +      name="portal:service=Controller,target=ObjectDeploymentFactory"
  +      xmbean-dd=""
  +      xmbean-code="org.jboss.portal.common.system.JBossServiceModelMBean">
  +      <xmbean/>
  +      <depends>jboss.ha:service=HASingletonDeployer,type=Barrier</depends>
  +      <depends>jboss:service=${jboss.partition.name:DefaultPartition}</depends>
  +      <depends>portal:container=PortalObject</depends>
  +      <attribute name="Target">portal:deploymentFactory=Object</attribute>
  +      <attribute name="OnStart">registerFactory</attribute>
  +      <attribute name="OnStop">unregisterFactory</attribute>
  +      </mbean>
  +   @portal.single.xml.open@
  +   -->
      <mbean
         code="org.jboss.portal.core.deployment.jboss.ObjectDeploymentFactory"
         name="portal:deploymentFactory=Object"
  @@ -713,11 +730,12 @@
         <depends
            optional-attribute-name="PortalObjectContainer"
            proxy-type="attribute">portal:container=PortalObject</depends>
  -      <depends
  -         optional-attribute-name="InstanceContainer"
  -         proxy-type="attribute">portal:container=Instance</depends>
         <attribute name="SetupLocation">conf/data/default-object.xml</attribute>
  +      <!-- Set to false in clustered mode, otherwise set to true -->
  +      <attribute name="RegistrationControlledByService">@portal.single@</attribute>
      </mbean>
  +
  +   <!--  -->
      <mbean
         code="org.jboss.portal.core.deployment.jboss.PortletAppDeploymentFactory"
         name="portal:deploymentFactory=PortletApp"
  @@ -801,19 +819,4 @@
            optional-attribute-name="Deployer"
            proxy-type="attribute">portal:deployer=PortalWebApp</depends>
      </mbean>
  -   
  -   <!--
  -      | Uncomment in cluster mode : have the deployment of objects run as a clustered singleton
  -      @portal.single.xml.close@
  -      <mbean
  -      code="org.jboss.ha.singleton.HASingletonController"
  -      name="portal:service=Controller,target=ObjectDeploymentFactory">
  -      <depends>jboss:service=${jboss.partition.name:DefaultPartition}</depends>
  -      <depends>portal:deploymentFactory=Object</depends>
  -      <attribute name="TargetName">portal:deploymentFactory=Object</attribute>
  -      <attribute name="TargetStartMethod">registerFactory</attribute>
  -      <attribute name="TargetStopMethod">unregisterFactory</attribute>
  -      </mbean>
  -   @portal.single.xml.open@
  -   -->
   </server>