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

WCM: consolidate getWebProject & deleteSandbox (also precursor for SAIL-359)

Browse Source 
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@19378 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Jan Vonka
2010-03-18 17:33:21 +00:00
parent b9ae66b146
commit 49856600ae
11 changed files with 459 additions and 439 deletions
Download Patch File Download Diff File Expand all files Collapse all files

49
source/java/org/alfresco/repo/avm/AVMInterpreter.java
View File

@@ -1,20 +1,21 @@
/*
* Copyright (C) 2005-2010 Alfresco Software Limited.
*
* This file is part of Alfresco
*
* Alfresco is free software: you can redistribute it and/or modify
* it under the terms of the GNU Lesser General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* Alfresco is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public License
* along with Alfresco. If not, see <http://www.gnu.org/licenses/>. */
* Copyright (C) 2005-2010 Alfresco Software Limited.
*
* This file is part of Alfresco
*
* Alfresco is free software: you can redistribute it and/or modify
* it under the terms of the GNU Lesser General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* Alfresco is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public License
* along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
*/
package org.alfresco.repo.avm;
@@ -51,9 +52,9 @@ import org.alfresco.service.cmr.repository.NodeRef;
import org.alfresco.service.cmr.repository.StoreRef;
import org.alfresco.service.cmr.security.PermissionService;
import org.alfresco.service.namespace.QName;
import org.springframework.extensions.surf.util.ISO8601DateFormat;
import org.alfresco.wcm.util.WCMUtil;
import org.springframework.context.support.FileSystemXmlApplicationContext;
import org.springframework.extensions.surf.util.ISO8601DateFormat;
/**
* An interactive console for the AVM repository.
@@ -433,7 +434,7 @@ public class AVMInterpreter
String storeName = command[1];
int ver =Integer.parseInt(command[2]);
String wpStoreId = getWebProject(storeName);
String wpStoreId = WCMUtil.getWebProject(fService, storeName);
if ((wpStoreId != null) && (ver <= 2))
{
return "WCM store - cannot delete versions 0-2";
@@ -447,7 +448,7 @@ public class AVMInterpreter
return "Syntax Error.";
}
String storeName = command[1];
String wpStoreId = getWebProject(storeName);
String wpStoreId = WCMUtil.getWebProject(fService, storeName);
Date fromDate = ISO8601DateFormat.parse(command[2]);
Date toDate = ISO8601DateFormat.parse(command[3]);
@@ -971,14 +972,4 @@ public class AVMInterpreter
}
return elements;
}
private String getWebProject(String name)
{
String wpStoreId = WCMUtil.getWebProjectStoreId(name);
if (WCMUtil.getWebProjectNodeFromWebProjectStore(fService, wpStoreId) != null)
{
return wpStoreId;
}
return null;
}
}