[jboss-cvs] jboss-portal/core/src/main/org/jboss/portal/core/deployment/jboss ...

[Julien Viet]

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

  Modified:    core/src/main/org/jboss/portal/core/deployment/jboss 
                        ObjectDeploymentFactory.java
  Log:
  - make cms cache work
  - improve portal object deployment in ha mode
  
  Revision  Changes    Path
  1.11      +24 -32    jboss-portal/core/src/main/org/jboss/portal/core/deployment/jboss/ObjectDeploymentFactory.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: ObjectDeploymentFactory.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-portal/core/src/main/org/jboss/portal/core/deployment/jboss/ObjectDeploymentFactory.java,v
  retrieving revision 1.10
  retrieving revision 1.11
  diff -u -b -r1.10 -r1.11
  --- ObjectDeploymentFactory.java	17 Mar 2006 18:13:48 -0000	1.10
  +++ ObjectDeploymentFactory.java	11 Jul 2006 20:50:26 -0000	1.11
  @@ -24,8 +24,8 @@
   import org.jboss.portal.server.deployment.PortalWebApp;
   import org.jboss.portal.server.deployment.jboss.AbstractDeploymentFactory;
   import org.jboss.portal.server.deployment.jboss.Deployment; 
  -import org.jboss.portal.core.model.instance.InstanceContainer;
   import org.jboss.portal.core.model.portal.PortalObjectContainer;
  +import org.jboss.portal.core.model.portal.Context;
   import org.jboss.portal.common.transaction.TransactionManagerProvider;
   import org.jboss.deployment.DeploymentException;
   
  @@ -38,16 +38,18 @@
   /**
    *
    * @author <a href="mailto:julien at jboss.org">Julien Viet</a>
  - * @version $Revision: 1.10 $
  + * @version $Revision: 1.11 $
    */
   public class ObjectDeploymentFactory extends AbstractDeploymentFactory
   {
   
      protected static final Pattern URL_PATTERN = Pattern.compile(".*-object\\.xml");
   
  +   /** . */
      protected URL setupURL;
  +
  +   /** . */
      protected PortalObjectContainer portalObjectContainer;
  -   protected org.jboss.portal.core.model.instance.InstanceContainer instanceContainer;
   
      public boolean accept(URL url)
      {
  @@ -79,33 +81,23 @@
         this.portalObjectContainer = portalObjectContainer;
      }
   
  -//   public PortalPolicyConfig getInstancePolicyConfig()
  -//   {
  -//      return instancePolicyConfig;
  -//   }
  -//
  -//   public void setInstancePolicyConfig(PortalPolicyConfig instancePolicyConfig)
  -//   {
  -//      this.instancePolicyConfig = instancePolicyConfig;
  -//   }
  -
  -   public InstanceContainer getInstanceContainer()
  -   {
  -      return instanceContainer;
  -   }
  -
  -   public void setInstanceContainer(InstanceContainer instanceContainer)
  -   {
  -      this.instanceContainer = instanceContainer;
  -   }
  -
  -//   public void setPortalObjectPolicyConfig (PortalPolicyConfig policyConfig)
  -//   {
  -//      this.portalObjectPolicyConfig = policyConfig;
  -//   }
  -//
  -//   public PortalPolicyConfig getPortalObjectPolicyConfig()
  -//   {
  -//      return portalObjectPolicyConfig;
  -//   }
  +   public void registerFactory()
  +   {
  +      createContextIfNotExist();
  +
  +      //
  +      super.registerFactory();
  +   }
  +
  +   public void createContextIfNotExist()
  +   {
  +      // Create context if not exist
  +      Context ctx = portalObjectContainer.getContext();
  +
  +      //
  +      if (ctx == null)
  +      {
  +         portalObjectContainer.createContext();
  +      }
  +   }
   }