[jboss-cvs] jboss-portal/cms/src/main/org/jboss/portal/cms/impl/jcr/composite ...

[Julien Viet]

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

  Modified:    cms/src/main/org/jboss/portal/cms/impl/jcr/composite 
                        UpdateFileCommand.java
  Log:
  - make cms cache work
  - improve portal object deployment in ha mode
  
  Revision  Changes    Path
  1.4       +26 -5     jboss-portal/cms/src/main/org/jboss/portal/cms/impl/jcr/composite/UpdateFileCommand.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: UpdateFileCommand.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-portal/cms/src/main/org/jboss/portal/cms/impl/jcr/composite/UpdateFileCommand.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -b -r1.3 -r1.4
  --- UpdateFileCommand.java	15 May 2006 12:47:06 -0000	1.3
  +++ UpdateFileCommand.java	11 Jul 2006 20:50:26 -0000	1.4
  @@ -28,6 +28,8 @@
   import org.jboss.portal.cms.model.Content;
   import org.jboss.portal.cms.model.File;
   
  +import java.util.Locale;
  +
   /**
    * @author <a href="mailto:theute at jboss.org">Thomas Heute</a>
    */
  @@ -37,14 +39,33 @@
      /** The serialVersionUID */
      private static final long serialVersionUID = -2790754339976591532L;
   
  +   /** . */
  +   private String path;
  +
  +   /** . */
  +   private Locale locale;
  +
  +   public String getPath()
  +   {
  +      return path;
  +   }
  +
  +   public Locale getLocale()
  +   {
  +      return locale;
  +   }
  +
      public UpdateFileCommand(File file, Content content, boolean makeLive)
      {
  -      setAttribute("file", file);
  -      setAttribute("content", content);
  -      setAttribute("live", new Boolean(makeLive));
  -      Command fileUpdateCMD = new FileUpdateCommand(file);
  +      path = file.getBasePath();
  +      locale = content.getLocale();
  +
  +      //
  +      FileUpdateCommand fileUpdateCMD = new FileUpdateCommand(file);
  +      ContentCreateNewVersionCommand verCMD = new ContentCreateNewVersionCommand(content, makeLive);
  +
  +      //
         commands.add(fileUpdateCMD);
  -      Command verCMD = new ContentCreateNewVersionCommand(content, makeLive);
         commands.add(verCMD);
      }