Merge from head.

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/WCM-DEV2/root@3314 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Britt Park
2006-07-13 07:06:30 +00:00
parent b601821d98
commit fae76d7896
41 changed files with 1354 additions and 147 deletions

View File

@@ -18,6 +18,8 @@ package org.alfresco.service.cmr.view;
import java.io.OutputStream;
import org.alfresco.service.Auditable;
/**
* Exporter Service
@@ -36,6 +38,7 @@ public interface ExporterService
* @param parameters export parameters
* @param progress exporter callback for tracking progress of export
*/
@Auditable(parameters = {"viewWriter", "parameters", "progress"})
public void exportView(OutputStream viewWriter, ExporterCrawlerParameters parameters, Exporter progress)
throws ExporterException;
@@ -48,6 +51,7 @@ public interface ExporterService
* @param parameters export parameters
* @param progress exporter callback for tracking progress of export
*/
@Auditable(parameters = {"exportHandler", "parameters", "progress"})
public void exportView(ExportPackageHandler exportHandler, ExporterCrawlerParameters parameters, Exporter progress)
throws ExporterException;
@@ -59,6 +63,7 @@ public interface ExporterService
* @param parameters export parameters
* @param progress exporter callback for tracking progress of export
*/
@Auditable(parameters = {"exporter", "parameters", "progress"})
public void exportView(Exporter exporter, ExporterCrawlerParameters parameters, Exporter progress);
}

View File

@@ -18,6 +18,8 @@ package org.alfresco.service.cmr.view;
import java.io.Reader;
import org.alfresco.service.Auditable;
/**
* Importer Service. Entry point for importing xml data sources into the Repository.
@@ -36,6 +38,7 @@ public interface ImporterService
* @param binding property values used for binding property place holders in import stream
* @param progress progress monitor (optional)
*/
@Auditable(parameters = {"viewReader", "location", "binding", "progress"})
public void importView(Reader viewReader, Location location, ImporterBinding binding, ImporterProgress progress)
throws ImporterException;
@@ -50,6 +53,7 @@ public interface ImporterService
* @param binding property values used for binding property place holders in import stream
* @param progress progress monitor (optional)
*/
@Auditable(parameters = {"importHandler", "location", "binding", "progress"})
public void importView(ImportPackageHandler importHandler, Location location, ImporterBinding binding, ImporterProgress progress)
throws ImporterException;

View File

@@ -18,6 +18,7 @@ package org.alfresco.service.cmr.view;
import java.io.File;
import org.alfresco.service.Auditable;
import org.alfresco.service.cmr.repository.NodeRef;
import org.alfresco.service.cmr.repository.StoreRef;
@@ -38,6 +39,7 @@ public interface RepositoryExporterService
* @param packageName package name prefix for export .acp files
* @return list of temporary export files
*/
@Auditable(parameters = {"packageName"})
public FileExportHandle[] export(String packageName);
/**
@@ -49,6 +51,7 @@ public interface RepositoryExporterService
* @param packageName package name prefix for export .acp files
* @return list of repository held export files
*/
@Auditable(key = Auditable.Key.ARG_0, parameters = {"repositoryDestination", "packageName"})
public RepositoryExportHandle[] export(NodeRef repositoryDestination, String packageName);
/**
@@ -58,6 +61,7 @@ public interface RepositoryExporterService
* @param packageName package name prefix for export .acp files
* @return list of export files
*/
@Auditable(parameters = {"directoryDestination", "packageName"})
public FileExportHandle[] export(File directoryDestination, String packageName);