inteligr8/alfresco-community-repo
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-community-repo.git synced 2025-08-07 17:49:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merged V3.1 to HEAD

Browse Source 
13033: Back end support for ETHREEOH-1179
   13038: JAWS-436 - refactor WCM submit dialog to use WCM sandbox service + update unit tests
   13046: Merged V3.0 to V3.1
      13043: Merged V2.2 to V3.0
         13016: Fix for ETWOTWO-1088 (reset layer using flatten rather than delete & add, users can flatten in stores they own but not delete)
   13049: Build/test fix (WCM AssetTest)
   13057: Merged V2.1-A to V3.1
      8770: Added Flex SDK module
      8771: Added Flex SDK binary (swc)
      DH: I'm not sure about the svn:eol-style property appearing here.  SVN Clients?
   13059: Added 'AIX' as a platform type, from Adobe V2.1A, missed checkin.
   13060: [no comments]
   13061: [no comments]
   13063: [no comments]
   13064: [no comments]
   13066: [no comments]
   13067: Add NodeService.getChildrenByName
   13072: Added new NodeService.getChildrenByName() method to public-services-security-context.
   ___________________________________________________________________
   Modified: svn:mergeinfo
      Merged /alfresco/BRANCHES/V3.0:r13043
      Merged /alfresco/BRANCHES/V2.2:r13016
      Merged /alfresco/BRANCHES/V3.1:r13033,13038,13046,13049,13057,13059-13061,13063-13064,13066-13067,13072


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@13552 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Derek Hulley
2009-03-11 04:21:44 +00:00
parent f1307fba20
commit 2c563871d8
38 changed files with 1264 additions and 412 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
source/java/org/alfresco/wcm/sandbox/SandboxService.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright (C) 2005-2008 Alfresco Software Limited.
* Copyright (C) 2005-2009 Alfresco Software Limited.
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
@@ -24,6 +24,7 @@
*/
package org.alfresco.wcm.sandbox;
import java.io.Serializable;
import java.util.Date;
import java.util.List;
import java.util.Map;
@@ -238,21 +239,6 @@ public interface SandboxService
*/
public void submitList(String sbStoreId, List<String> relativePaths, String submitLabel, String submitDescription);
/**
* Submit list of changed assets for given sandbox (eg. from user sandbox to staging sandbox)
*
* NOTE: for backwards compatibility - subject to change - hence deprecated for now
*
* @param sbStoreId sandbox store id
* @param assetPaths list of assets, as relative paths (eg. /www/avm_webapps/ROOT/MyFolderToSubmit)
* @param expirationDates map of AVM src paths to expiration dates
* @param submitLabel label for submitted snapshot
* @param submitDescription description for submitted snapshot
*
* @deprecated
*/
public void submitList(String sbStoreId, List<String> relativePaths, Map<String, Date> expirationDates, String submitLabel, String submitDescription);
/**
* Submit list of changed assets for given sandbox (eg. from user sandbox to staging sandbox)
*
@@ -266,13 +252,25 @@ public interface SandboxService
/**
* Submit list of changed assets for given sandbox (eg. from user sandbox to staging sandbox)
*
* NOTE: for backwards compatibility - subject to change - hence deprecated for now
*
* @param sbStoreId sandbox store id
* @param assets list of assets
* @param expirationDates map of <path, date> for those assets set with an expiration date, or can be null (if no expiration dates)
* @param assetPaths list of assets, as relative paths (eg. /www/avm_webapps/ROOT/MyFolderToSubmit)
* @param workflowName selected workflow name - if null, will use default submit direct workflow
* @param workflowParams configured workflow params
* @param submitLabel label for submitted snapshot
* @param submitDescription description for submitted snapshot
* @param expirationDates optional map of <path, date> for those assets set with an expiration date, or can be null (if no expiration dates)
* @param launchDate optional launch date
* @param validateLinks if true then will validate links (if link validation is enabled)
* @param autoDeploy if true then will auto-deploy on workflow approval
*
* @deprecated subject to change
*/
public void submitListAssets(String sbStoreId, List<AssetInfo> assets, Map<String, Date> expirationDates, String submitLabel, String submitDescription);
public void submitListAssets(String sbStoreId, List<String> relativePaths,
String workflowName, Map<QName, Serializable> workflowParams,
String submitLabel, String submitDescription,
Map<String, Date> expirationDates, Date launchDate, boolean validateLinks, boolean autoDeploy);
/**
* Revert all changed assets for given sandbox (eg. in user sandbox)