cvs commit: jahia/core/src/java/org/jahia/services/importexport ImportHandler.java

[Cedric Mailleux]

cmailleux    2005/12/08 11:57:02 CET

  Modified files:
    core/src/java/org/jahia/services/importexport 
                                                  ImportHandler.java 
  Log:
  Avoid flushing of live content when adding or updating content
  
  Revision  Changes    Path
  1.54      +12 -14    
jahia/core/src/java/org/jahia/services/importexport/ImportHandler.java
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/core/src/java/org/jahia/services/importexport/ImportHandler.java.diff?r1=1.53&r2=1.54&f=h
  
  
  
  Index: ImportHandler.java
  ===================================================================
  RCS file: 
/home/cvs/repository/jahia/core/src/java/org/jahia/services/importexport/ImportHandler.java,v
  retrieving revision 1.53
  retrieving revision 1.54
  diff -u -r1.53 -r1.54
  --- ImportHandler.java        5 Dec 2005 14:59:47 -0000       1.53
  +++ ImportHandler.java        8 Dec 2005 10:57:01 -0000       1.54
  @@ -1,6 +1,7 @@
   package org.jahia.services.importexport;
   
   import org.apache.log4j.Logger;
  +import org.jahia.bin.Jahia;
   import org.jahia.content.*;
   import org.jahia.data.containers.*;
   import org.jahia.data.fields.*;
  @@ -17,11 +18,16 @@
   import org.jahia.services.acl.JahiaACLException;
   import org.jahia.services.acl.JahiaBaseACL;
   import org.jahia.services.cache.HtmlCache;
  +import org.jahia.services.categories.Category;
  +import org.jahia.services.categories.CategoryService;
   import org.jahia.services.containers.ContentContainer;
   import org.jahia.services.containers.ContentContainerList;
   import org.jahia.services.fields.ContentField;
   import org.jahia.services.fields.ContentFieldTypes;
   import org.jahia.services.fields.ContentPageField;
  +import org.jahia.services.lock.LockKey;
  +import org.jahia.services.lock.LockService;
  +import org.jahia.services.metadata.CoreMetadataConstant;
   import org.jahia.services.pages.ContentPage;
   import org.jahia.services.pages.JahiaPage;
   import org.jahia.services.pages.JahiaPageDefinition;
  @@ -29,21 +35,13 @@
   import org.jahia.services.sites.JahiaSite;
   import org.jahia.services.usermanager.JahiaGroup;
   import org.jahia.services.usermanager.JahiaUser;
  -import org.jahia.services.usermanager.JahiaUserManagerService;
  -import org.jahia.services.usermanager.JahiaGroupManagerService;
   import org.jahia.services.version.EntryLoadRequest;
   import org.jahia.services.version.StateModificationContext;
   import org.jahia.services.version.VersioningDifferenceStatus;
   import org.jahia.services.webdav.DAVFileAccess;
   import org.jahia.services.webdav.JahiaWebdavBaseService;
  -import org.jahia.services.categories.Category;
  -import org.jahia.services.categories.CategoryService;
  -import org.jahia.services.lock.LockService;
  -import org.jahia.services.lock.LockKey;
  -import org.jahia.services.metadata.CoreMetadataConstant;
   import org.jahia.services.workflow.WorkflowEvent;
   import org.jahia.utils.LanguageCodeConverters;
  -import org.jahia.bin.Jahia;
   import org.springframework.transaction.PlatformTransactionManager;
   import org.springframework.transaction.TransactionStatus;
   import 
org.springframework.transaction.support.TransactionCallbackWithoutResult;
  @@ -52,13 +50,13 @@
   import org.xml.sax.SAXException;
   import org.xml.sax.helpers.DefaultHandler;
   
  +import java.io.IOException;
  +import java.net.HttpURLConnection;
  +import java.net.URL;
   import java.text.DateFormat;
   import java.text.ParseException;
   import java.text.SimpleDateFormat;
   import java.util.*;
  -import java.net.URL;
  -import java.net.HttpURLConnection;
  -import java.io.IOException;
   
   /**
    * Created by IntelliJ IDEA.
  @@ -508,7 +506,7 @@
               setMetadata(object, atts);
               HtmlCache htmlCache = 
ServicesRegistry.getInstance().getCacheService().getHtmlCacheInstance();
               if (htmlCache != null) {
  -                htmlCache.invalidatePageEntries(Integer.toString(pageID));
  +                
htmlCache.invalidatePageEntries(Integer.toString(pageID),EntryLoadRequest.STAGING_WORKFLOW_STATE);
               }
   
               if (parent instanceof ContentContainerList) {
  @@ -522,7 +520,7 @@
                       while (pageRefIDs.hasNext()) {
                           Integer curPageID = (Integer) pageRefIDs.next();
                           if (htmlCache != null) {
  -                            
htmlCache.invalidatePageEntries(curPageID.toString());
  +                            
htmlCache.invalidatePageEntries(curPageID.toString(),EntryLoadRequest.STAGING_WORKFLOW_STATE);
                           }
                       }
                   } else {
  @@ -787,7 +785,7 @@
   
           HtmlCache htmlCache = 
ServicesRegistry.getInstance().getCacheService().getHtmlCacheInstance();
           if (htmlCache != null) {
  -            htmlCache.invalidatePageEntries(Integer.toString(pageID));
  +            
htmlCache.invalidatePageEntries(Integer.toString(pageID),EntryLoadRequest.STAGING_WORKFLOW_STATE);
           }
       }