Author: tdraier
Date: Wed Aug 9 15:28:47 2006
New Revision: 14875
URL: https://svndev.jahia.net/websvn/listing.php?sc=1&rev=14875&repname=jahia
Log:
export all files
Modified:
branches/JAHIA-4-1-BRANCH/src/java/org/jahia/engines/importexport/ExportEngine.java
branches/JAHIA-4-1-BRANCH/src/java/org/jahia/services/importexport/ImportExportBaseService.java
branches/JAHIA-4-1-BRANCH/src/java/org/jahia/services/importexport/ImportExportService.java
Modified:
branches/JAHIA-4-1-BRANCH/src/java/org/jahia/engines/importexport/ExportEngine.java
URL:
https://svndev.jahia.net/websvn/diff.php?path=/branches/JAHIA-4-1-BRANCH/src/java/org/jahia/engines/importexport/ExportEngine.java&rev=14875&repname=jahia
==============================================================================
---
branches/JAHIA-4-1-BRANCH/src/java/org/jahia/engines/importexport/ExportEngine.java
(original)
+++
branches/JAHIA-4-1-BRANCH/src/java/org/jahia/engines/importexport/ExportEngine.java
Wed Aug 9 15:28:47 2006
@@ -6,13 +6,10 @@
import org.jahia.data.JahiaData;
import org.jahia.engines.EngineToolBox;
import org.jahia.engines.JahiaEngine;
-import org.jahia.engines.validation.EngineValidationHelper;
import org.jahia.exceptions.JahiaException;
import org.jahia.params.ParamBean;
import org.jahia.registries.ServicesRegistry;
import org.jahia.services.importexport.ImportExportService;
-import org.jahia.services.lock.LockKey;
-import org.jahia.services.lock.LockRegistry;
import org.jahia.services.sites.SiteLanguageSettings;
import org.jahia.services.version.EntryLoadRequest;
@@ -149,10 +146,10 @@
if ("zipfiles".equals(processingContext.getParameter("exportformat")))
{
resp.setContentType("application/zip");
params.put(ImportExportService.INCLUDE_FILES, Boolean.TRUE);
- ie.exportZip(object, languageCodes, outputStream,
processingContext, params);
+ ie.exportZip(object, languageCodes, outputStream,
processingContext, params, true);
} else if
("zipnofiles".equals(processingContext.getParameter("exportformat"))) {
resp.setContentType("application/zip");
- ie.exportZip(object, languageCodes, outputStream,
processingContext, params);
+ ie.exportZip(object, languageCodes, outputStream,
processingContext, params, false);
} else {
resp.setContentType("text/xml");
ie.exportFile(object, processingContext.getLocale().toString(),
outputStream, processingContext, params);
Modified:
branches/JAHIA-4-1-BRANCH/src/java/org/jahia/services/importexport/ImportExportBaseService.java
URL:
https://svndev.jahia.net/websvn/diff.php?path=/branches/JAHIA-4-1-BRANCH/src/java/org/jahia/services/importexport/ImportExportBaseService.java&rev=14875&repname=jahia
==============================================================================
---
branches/JAHIA-4-1-BRANCH/src/java/org/jahia/services/importexport/ImportExportBaseService.java
(original)
+++
branches/JAHIA-4-1-BRANCH/src/java/org/jahia/services/importexport/ImportExportBaseService.java
Wed Aug 9 15:28:47 2006
@@ -106,7 +106,31 @@
export(object, languageCode, dw, new HashSet(), jParams, params);
}
- public void exportZip(ContentObject object, Set languageCodes,
OutputStream out, ParamBean jParams, Map params) throws JahiaException,
SAXException, IOException {
+ private void getAllFiles(DAVFileAccess file, Set files) {
+ System.out.println("-"+file.getPath());
+ if (!file.isCollection()) {
+ files.add(file);
+ } else {
+ try {
+ List children = file.getChildren();
+ if (children != null && !children.isEmpty()) {
+ Iterator iterator = children.iterator();
+ while (iterator.hasNext()) {
+ DAVFileAccess child = (DAVFileAccess) iterator.next();
+ // avoid aliases
+ if (child.getPath().startsWith(file.getPath())) {
+ System.out.println("+"+file.getPath());
+ getAllFiles(child, files);
+ }
+ }
+ }
+ } catch (Exception e) {
+ logger.warn("Cannot get "+file.getPath());
+ }
+ }
+ }
+
+ public void exportZip(ContentObject object, Set languageCodes,
OutputStream out, ParamBean jParams, Map params, boolean allFiles) throws
JahiaException, SAXException, IOException {
Set files = new HashSet();
byte[] buffer = new byte[4096];
@@ -124,6 +148,11 @@
export(object, l, dw, files, jParams, params);
}
+ if (allFiles) {
+ files.clear();
+ getAllFiles(new DAVFileAccess(jParams.getSite(), "/"),files);
+ }
+
if (params != null && Boolean.TRUE.equals(params.get(INCLUDE_FILES))) {
DataWriter dw = new DataWriter(new OutputStreamWriter(zout,
"UTF-8"));
Modified:
branches/JAHIA-4-1-BRANCH/src/java/org/jahia/services/importexport/ImportExportService.java
URL:
https://svndev.jahia.net/websvn/diff.php?path=/branches/JAHIA-4-1-BRANCH/src/java/org/jahia/services/importexport/ImportExportService.java&rev=14875&repname=jahia
==============================================================================
---
branches/JAHIA-4-1-BRANCH/src/java/org/jahia/services/importexport/ImportExportService.java
(original)
+++
branches/JAHIA-4-1-BRANCH/src/java/org/jahia/services/importexport/ImportExportService.java
Wed Aug 9 15:28:47 2006
@@ -57,7 +57,7 @@
void exportFile(ContentObject object, String languageCode, OutputStream
out, ParamBean jParams, Map params) throws JahiaException, SAXException,
IOException;
- void exportZip(ContentObject object, Set languageCodes, OutputStream out,
ParamBean jParams, Map params) throws JahiaException, SAXException, IOException;
+ void exportZip(ContentObject object, Set languageCodes, OutputStream out,
ParamBean jParams, Map params, boolean allFiles) throws JahiaException,
SAXException, IOException;
void export(ContentObject object, String languageCodes, ContentHandler h,
Set files, ParamBean jParams, Map params) throws JahiaException, SAXException;
