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

[Thomas Draier]

tdraier     2005/11/30 16:06:31 CET

  Modified files:
    core/src/java/org/jahia/services/importexport 
                                                  ImportExportBaseService.java 
  Log:
  import as root
  
  Revision  Changes    Path
  1.52      +7 -0      
jahia/core/src/java/org/jahia/services/importexport/ImportExportBaseService.java
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/core/src/java/org/jahia/services/importexport/ImportExportBaseService.java.diff?r1=1.51&r2=1.52&f=h
  
  
  
  Index: ImportExportBaseService.java
  ===================================================================
  RCS file: 
/home/cvs/repository/jahia/core/src/java/org/jahia/services/importexport/ImportExportBaseService.java,v
  retrieving revision 1.51
  retrieving revision 1.52
  diff -u -r1.51 -r1.52
  --- ImportExportBaseService.java      25 Nov 2005 16:25:37 -0000      1.51
  +++ ImportExportBaseService.java      30 Nov 2005 15:06:30 -0000      1.52
  @@ -706,6 +706,7 @@
       }
   
       public ContentObject importDocument(ContentObject parent, String lang, 
ProcessingContext jParams, InputSource is, boolean updateOnly) {
  +        JahiaUser oldUser = jParams.getUser();
           try {
               SAXParserFactory factory;
   
  @@ -717,6 +718,10 @@
   
               SAXParser parser = factory.newSAXParser();
   
  +            JahiaGroup admins = 
ServicesRegistry.getInstance().getJahiaGroupManagerService().lookupGroup(jParams.getSiteID(),
 JahiaGroupManagerService.ADMINISTRATORS_GROUPNAME);
  +            JahiaUser user = (JahiaUser) admins.members().nextElement();
  +            jParams.setTheUser(user);
  +
               ImportHandler handler = new ImportHandler(parent,jParams, lang);
               handler.setUpdateOnly(updateOnly);
   
  @@ -725,6 +730,8 @@
           } catch (Exception e) {
               e.printStackTrace();  //To change body of catch statement use 
File | Settings | File Templates.
               return null;
  +        } finally {
  +            jParams.setTheUser(oldUser);            
           }
       }