cvs commit: jahia/core/src/java/org/jahia/services/webdav/listeners CMSSlideContentListener.java

[Serge Huber]

shuber      2005/02/15 14:36:54 CET

  Modified files:
    core/src/java/org/jahia/services/webdav/listeners 
                                                      
CMSSlideContentListener.java 
  Log:
  Oops missed the creation of an entryloadrequest for rename operation.
  
  Revision  Changes    Path
  1.10      +10 -10    
jahia/core/src/java/org/jahia/services/webdav/listeners/CMSSlideContentListener.java
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/core/src/java/org/jahia/services/webdav/listeners/CMSSlideContentListener.java.diff?r1=1.9&r2=1.10&f=h
  
  
  
  Index: CMSSlideContentListener.java
  ===================================================================
  RCS file: 
/home/cvs/repository/jahia/core/src/java/org/jahia/services/webdav/listeners/CMSSlideContentListener.java,v
  retrieving revision 1.9
  retrieving revision 1.10
  diff -u -r1.9 -r1.10
  --- CMSSlideContentListener.java      15 Feb 2005 13:12:20 -0000      1.9
  +++ CMSSlideContentListener.java      15 Feb 2005 13:36:53 -0000      1.10
  @@ -8,6 +8,7 @@
   import java.util.Properties;
   import java.util.StringTokenizer;
   
  +import org.apache.slide.content.NodeRevisionDescriptor;
   import org.apache.slide.event.ContentEvent;
   import org.apache.slide.event.ContentListener;
   import org.apache.slide.event.MacroEvent;
  @@ -23,7 +24,10 @@
   import org.jahia.data.fields.JahiaField;
   import org.jahia.data.fields.JahiaPageField;
   import org.jahia.data.fields.LoadFlags;
  +import org.jahia.data.files.JahiaFile;
  +import org.jahia.data.files.JahiaFileField;
   import org.jahia.exceptions.JahiaException;
  +import org.jahia.exceptions.JahiaPageNotFoundException;
   import org.jahia.params.ParamBean;
   import org.jahia.params.SoapParamBean;
   import org.jahia.registries.JahiaContainerDefinitionsRegistry;
  @@ -35,13 +39,7 @@
   import org.jahia.services.sites.JahiaSite;
   import org.jahia.services.usermanager.JahiaUser;
   import org.jahia.services.version.EntryLoadRequest;
  -import org.jahia.data.files.JahiaFileField;
   import org.jahia.urls.URI;
  -import org.jahia.data.files.JahiaFile;
  -import org.apache.slide.content.NodeRevisionDescriptor;
  -import org.jahia.services.webdav.DAVFileAccess;
  -import org.jahia.services.webdav.JahiaWebdavBaseService;
  -import org.jahia.exceptions.JahiaPageNotFoundException;
   
   /**
    * Created by IntelliJ IDEA.
  @@ -50,10 +48,10 @@
    * Time: 15:23:17
    * <p/>
    * $Author: shuber $
  - * $Date: 2005/02/15 13:12:20 $
  - * $Id: CMSSlideContentListener.java,v 1.9 2005/02/15 13:12:20 shuber Exp $
  + * $Date: 2005/02/15 13:36:53 $
  + * $Id: CMSSlideContentListener.java,v 1.10 2005/02/15 13:36:53 shuber Exp $
    * $RCSfile: CMSSlideContentListener.java,v $
  - * $Revision: 1.9 $
  + * $Revision: 1.10 $
    * $Source: 
/home/cvs/repository/jahia/core/src/java/org/jahia/services/webdav/listeners/CMSSlideContentListener.java,v
 $
    * $State: Exp $
    */
  @@ -492,7 +490,9 @@
               SoapParamBean jParams = new SoapParamBean(Jahia.
                   getStaticServletConfig().getServletContext(), 
Jahia.getSettings(),
                   System.currentTimeMillis(), site, user);
  -            jParams.setSubstituteEntryLoadRequest(EntryLoadRequest.CURRENT);
  +            EntryLoadRequest loadRequest = new 
EntryLoadRequest(EntryLoadRequest.STAGING_WORKFLOW_STATE, 0, 
jParams.getLocales());
  +            logger.debug("Using locales for site " + jParams.getLocales());
  +            jParams.setSubstituteEntryLoadRequest(loadRequest);
               Jahia.setThreadParamBean(jParams);
               JahiaContainersService jahiaContainersService = ServicesRegistry.
                   getInstance().getJahiaContainersService();