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

[Cedric Mailleux]

cmailleux    2005/09/02 15:02:20 CEST

  Modified files:
    core/src/java/org/jahia/services/importexport 
                                                  ImportExportBaseService.java 
  Log:
  Call export directly wihout calling services registry first
  
  Revision  Changes    Path
  1.19      +2 -3      
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.18&r2=1.19&f=h
  
  
  
  Index: ImportExportBaseService.java
  ===================================================================
  RCS file: 
/home/cvs/repository/jahia/core/src/java/org/jahia/services/importexport/ImportExportBaseService.java,v
  retrieving revision 1.18
  retrieving revision 1.19
  diff -u -r1.18 -r1.19
  --- ImportExportBaseService.java      2 Sep 2005 10:26:21 -0000       1.18
  +++ ImportExportBaseService.java      2 Sep 2005 13:02:20 -0000       1.19
  @@ -814,13 +814,12 @@
           if (previousCall != null) {
               from = new 
EntryLoadRequest(EntryLoadRequest.ACTIVE_WORKFLOW_STATE, new 
Long(previousCall.getTime()).intValue(), 
site.getLanguageSettingsAsLocales(true));
           }
  -        ImportExportService importExportService = 
ServicesRegistry.getInstance().getImportExportService();
           File tempFile = File.createTempFile("exportFromSite_" + 
site.getSiteKey() + "_" +
                                               dateOfExport, ".zip");
           FileOutputStream out = new FileOutputStream(tempFile);
           ProcessingContext threadParamBean = new ProcessingContext(null, 
exportTime.getTime(), site, member, site.getHomeContentPage());
  -        importExportService.export(site.getHomeContentPage(), 
getSiteLanguages(site), out,
  -                                   threadParamBean, null, true, 
EntryLoadRequest.CURRENT, from);
  +        export(site.getHomeContentPage(), getSiteLanguages(site), out,
  +               threadParamBean, null, true, EntryLoadRequest.CURRENT, from);
           out.close();
           FileInputStream inputStream = new FileInputStream(tempFile);
           webdavSession.putMethod(inputStream);