itr = path.iterator();
- while (itr.hasNext())
- {
- Path.Element element = (Path.Element)itr.next();
- String pathElement = element.getPrefixedString(services.getNamespaceService());
- if (Application.getWebContentFormsFolderName(fc).equals(pathElement))
- {
- isWebFormsPath = true;
- break;
- }
- }
-
- return (node.hasAspect(WCMAppModel.ASPECT_RENDERING_ENGINE_TEMPLATE) || isWebFormsPath) && isUserAllowed;
- */
- }
-}
diff --git a/source/java/org/alfresco/web/action/evaluator/ViewPermissionEvaluator.java b/source/java/org/alfresco/web/action/evaluator/ViewPermissionEvaluator.java
deleted file mode 100644
index 4ffdcd9f59..0000000000
--- a/source/java/org/alfresco/web/action/evaluator/ViewPermissionEvaluator.java
+++ /dev/null
@@ -1,68 +0,0 @@
-/*
- * 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 .
- */
-package org.alfresco.web.action.evaluator;
-
-import org.alfresco.web.bean.repository.Node;
-
-/**
- * UI Action Evaluator - Evaluates whether the view permissions action should be visible.
- *
- * @author Sergey Gavrusev
- */
-public class ViewPermissionEvaluator extends BaseActionEvaluator
-{
-
- private static final long serialVersionUID = 1340473144312214960L;
-
- /*
- * (non-Javadoc)
- *
- * @see org.alfresco.web.action.evaluator.BaseActionEvaluator#evaluate(org.alfresco.web.bean.repository.Node)
- */
- @Override
- public boolean evaluate(final Node node)
- {
- boolean result = true;
-// // WCM
-// final String path = AVMNodeConverter.ToAVMVersionPath(node.getNodeRef()).getSecond();
-// if (!AVMUtil.isMainStore(AVMUtil.getStoreName(path)))
-// {
-// result = false;
-// }
- return result;
-
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.alfresco.web.action.evaluator.BaseActionEvaluator#evaluate(java.lang.Object)
- */
- @Override
- public boolean evaluate(Object obj)
- {
-// // WCM
-// if (obj instanceof ManagePermissionsDialog)
-// {
-// return !((ManagePermissionsDialog) obj).isRendered();
-// }
- return false;
- }
-
-}
diff --git a/source/java/org/alfresco/web/app/Application.java b/source/java/org/alfresco/web/app/Application.java
index aa6129d3f7..6bdda2eecf 100644
--- a/source/java/org/alfresco/web/app/Application.java
+++ b/source/java/org/alfresco/web/app/Application.java
@@ -28,7 +28,6 @@ import java.util.ResourceBundle;
import javax.faces.context.FacesContext;
import javax.servlet.ServletContext;
import javax.servlet.ServletException;
-import javax.servlet.http.Cookie;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import javax.servlet.http.HttpSession;
@@ -641,70 +640,6 @@ public class Application
return getGuestHomeFolderName(FacesContextUtils.getRequiredWebApplicationContext(context));
}
- /**
- * @return the Websites folder name
- */
- public static String getWebsitesFolderName(ServletContext context)
- {
- return getWebsitesFolderName(WebApplicationContextUtils.getRequiredWebApplicationContext(context));
- }
-
- /**
- * @return the Websites folder name
- */
- public static String getWebsitesFolderName(FacesContext context)
- {
- return getWebsitesFolderName(FacesContextUtils.getRequiredWebApplicationContext(context));
- }
-
- /**
- * @return the WCM Content Forms folder name
- */
- public static String getWebContentFormsFolderName(ServletContext context)
- {
- return getWebContentFormsFolderName(WebApplicationContextUtils.getRequiredWebApplicationContext(context));
- }
-
- /**
- * @return the WCM Content Forms folder name
- */
- public static String getWebContentFormsFolderName(FacesContext context)
- {
- return getWebContentFormsFolderName(FacesContextUtils.getRequiredWebApplicationContext(context));
- }
-
- /**
- * @return the Content Forms folder name
- */
- public static String getContentFormsFolderName(ServletContext context)
- {
- return getContentFormsFolderName(WebApplicationContextUtils.getRequiredWebApplicationContext(context));
- }
-
- /**
- * @return the Content Forms folder name
- */
- public static String getContentFormsFolderName(FacesContext context)
- {
- return getContentFormsFolderName(FacesContextUtils.getRequiredWebApplicationContext(context));
- }
-
- /**
-<<<<<<< .working
- * @return the Projects folder name
- */
- public static String getProjectsFolderName(ServletContext context)
- {
- return getProjectsFolderName(WebApplicationContextUtils.getRequiredWebApplicationContext(context));
- }
-
- /**
- * @return the Projects folder name
- */
- public static String getProjectsFolderName(FacesContext context)
- {
- return getProjectsFolderName(FacesContextUtils.getRequiredWebApplicationContext(context));
- }
/**
* Set the language locale for the current user context
@@ -1259,78 +1194,6 @@ public class Application
return guestHomeFolderName;
}
- /**
- * Returns the Websites folder name
- *
- * @param context The Spring context
- * @return The Websites folder name
- */
- private static String getWebsitesFolderName(WebApplicationContext context)
- {
- if (websitesFolderName == null)
- {
- ImporterBootstrap bootstrap = (ImporterBootstrap)context.getBean(BEAN_IMPORTER_BOOTSTRAP);
- Properties configuration = bootstrap.getConfiguration();
- websitesFolderName = configuration.getProperty("spaces.wcm.childname");
- }
-
- return websitesFolderName;
- }
-
- /**
- * Returns the Projects folder name
- *
- * @param context The Spring context
- * @return The Projects folder name
- */
- private static String getProjectsFolderName(WebApplicationContext context)
- {
- if (projectsFolderName == null)
- {
- ImporterBootstrap bootstrap = (ImporterBootstrap)context.getBean(BEAN_IMPORTER_BOOTSTRAP);
- Properties configuration = bootstrap.getConfiguration();
- projectsFolderName = configuration.getProperty("spaces.projects.childname");
- }
-
- return projectsFolderName;
- }
-
- /**
- * Returns the WCM Content Forms folder name
- *
- * @param context The Spring context
- * @return The WCM Content Forms folder name
- */
- private static String getWebContentFormsFolderName(WebApplicationContext context)
- {
- if (webContentFormsFolderName == null)
- {
- ImporterBootstrap bootstrap = (ImporterBootstrap)context.getBean(BEAN_IMPORTER_BOOTSTRAP);
- Properties configuration = bootstrap.getConfiguration();
- webContentFormsFolderName = configuration.getProperty("spaces.wcm_content_forms.childname");
- }
-
- return webContentFormsFolderName;
- }
-
- /**
- * Returns the Content Forms folder name
- *
- * @param context The Spring context
- * @return The WCM Content Forms folder name
- */
- private static String getContentFormsFolderName(WebApplicationContext context)
- {
- if (contentFormsFolderName == null)
- {
- ImporterBootstrap bootstrap = (ImporterBootstrap)context.getBean(BEAN_IMPORTER_BOOTSTRAP);
- Properties configuration = bootstrap.getConfiguration();
- contentFormsFolderName = configuration.getProperty("spaces.content_forms.childname");
- }
-
- return contentFormsFolderName;
- }
-
/**
* Retrieves the configured error page for the application
*
diff --git a/source/java/org/alfresco/web/app/servlet/command/EditWebContentCommand.java b/source/java/org/alfresco/web/app/servlet/command/EditWebContentCommand.java
deleted file mode 100644
index 344cf8bbb8..0000000000
--- a/source/java/org/alfresco/web/app/servlet/command/EditWebContentCommand.java
+++ /dev/null
@@ -1,98 +0,0 @@
-/*
- * 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 .
- */
-package org.alfresco.web.app.servlet.command;
-
-import java.util.Map;
-
-import javax.faces.context.FacesContext;
-import javax.servlet.ServletContext;
-import javax.servlet.ServletRequest;
-import javax.servlet.ServletResponse;
-
-import org.alfresco.error.AlfrescoRuntimeException;
-import org.alfresco.service.ServiceRegistry;
-import org.alfresco.web.app.servlet.BaseServlet;
-import org.alfresco.web.app.servlet.FacesHelper;
-import org.alfresco.web.bean.NavigationBean;
-import org.springframework.extensions.surf.util.ParameterCheck;
-
-/**
- * Command to execute the Edit Web Content (xforms) wizard via url.
- *
- * Arguments: webproject = the GUID of the webproject to create the content in
- * sandbox = the sandbox to create the content in
- * path = path to the form instance data for edit
- *
- * @author Kevin Roast
- */
-public class EditWebContentCommand extends BaseUIActionCommand
-{
- public static final String PROP_WEBPROJECTID = "webproject";
- public static final String PROP_SANDBOX = "sandbox";
- public static final String PROP_PATH = "path";
-
- private static final String[] PROPERTIES = new String[] {
- PROP_SERVLETCONTEXT, PROP_REQUEST, PROP_RESPONSE, PROP_WEBPROJECTID, PROP_SANDBOX, PROP_PATH};
-
- /**
- * @see org.alfresco.web.app.servlet.command.Command#execute(org.alfresco.service.ServiceRegistry, java.util.Map)
- */
- public Object execute(ServiceRegistry serviceRegistry, Map properties)
- {
- ServletContext sc = (ServletContext)properties.get(PROP_SERVLETCONTEXT);
- ServletRequest req = (ServletRequest)properties.get(PROP_REQUEST);
- ServletResponse res = (ServletResponse)properties.get(PROP_RESPONSE);
- FacesContext fc = FacesHelper.getFacesContext(req, res, sc);
-// AVMBrowseBean avmBrowseBean = (AVMBrowseBean)FacesHelper.getManagedBean(fc, AVMBrowseBean.BEAN_NAME); // WCM
- NavigationBean navigator = (NavigationBean)FacesHelper.getManagedBean(fc, NavigationBean.BEAN_NAME);
-
- // setup context from url args in properties map
- String webProjectId = (String)properties.get(PROP_WEBPROJECTID);
- ParameterCheck.mandatoryString(PROP_WEBPROJECTID, webProjectId);
- String sandbox = (String)properties.get(PROP_SANDBOX);
- ParameterCheck.mandatoryString(PROP_SANDBOX, sandbox);
- String path = (String)properties.get(PROP_PATH);
- ParameterCheck.mandatoryString(PROP_PATH, path);
- navigator.setCurrentNodeId(webProjectId);
-// // WCM
-// avmBrowseBean.setSandbox(sandbox);
-// // navigation handler is called directly in this method
-// avmBrowseBean.setupEditAction(path);
-
- String viewId = fc.getViewRoot().getViewId();
- try
- {
- sc.getRequestDispatcher(BaseServlet.FACES_SERVLET + viewId).forward(req, res);
- }
- catch (Exception e)
- {
- throw new AlfrescoRuntimeException("Unable to forward to viewId: " + viewId, e);
- }
-
- return null;
- }
-
- /**
- * @see org.alfresco.web.app.servlet.command.Command#getPropertyNames()
- */
- public String[] getPropertyNames()
- {
- return PROPERTIES;
- }
-}
diff --git a/source/java/org/alfresco/web/app/servlet/command/UIActionCommandProcessor.java b/source/java/org/alfresco/web/app/servlet/command/UIActionCommandProcessor.java
index b25aaa57ce..b639e9bbc3 100644
--- a/source/java/org/alfresco/web/app/servlet/command/UIActionCommandProcessor.java
+++ b/source/java/org/alfresco/web/app/servlet/command/UIActionCommandProcessor.java
@@ -47,12 +47,9 @@ import org.alfresco.web.ui.common.Utils;
*/
public class UIActionCommandProcessor implements ExtCommandProcessor
{
- /**
- *
- */
- private static final String MANAGE_TASK = "managetask";
+ private static final String MANAGE_TASK = "managetask";
-public static final String PARAM_CONTAINER = "container";
+ public static final String PARAM_CONTAINER = "container";
private ServletContext sc = null;
private String command = null;
@@ -61,9 +58,6 @@ public static final String PARAM_CONTAINER = "container";
static
{
// add our commands to the command registry
-// // WCM
-// CommandFactory.getInstance().registerCommand("createwebcontent", CreateWebContentCommand.class);
- CommandFactory.getInstance().registerCommand("editwebcontent", EditWebContentCommand.class);
CommandFactory.getInstance().registerCommand(MANAGE_TASK, ManageTaskDialogCommand.class);
CommandFactory.getInstance().registerCommand("editcontentprops", EditContentPropertiesCommand.class);
CommandFactory.getInstance().registerCommand("userprofile", UserProfileDialogCommand.class);
@@ -81,7 +75,7 @@ public static final String PARAM_CONTAINER = "container";
{
this.args = new HashMap(args);
}
- if(MANAGE_TASK.equals(command))
+ if (MANAGE_TASK.equals(command))
{
String taskId = args.get(ManageTaskDialogCommand.PROP_TASKID);
return WorkflowUtil.isTaskEditable(taskId, sc);
diff --git a/source/java/org/alfresco/web/bean/admin/AdminNodeBrowseBean.java b/source/java/org/alfresco/web/bean/admin/AdminNodeBrowseBean.java
index 86b977cc6c..b5d284974c 100644
--- a/source/java/org/alfresco/web/bean/admin/AdminNodeBrowseBean.java
+++ b/source/java/org/alfresco/web/bean/admin/AdminNodeBrowseBean.java
@@ -102,7 +102,6 @@ public class AdminNodeBrowseBean implements Serializable
transient private DataModel assocs = null;
transient private DataModel permissions = null;
transient private DataModel permissionMasks = null;
- transient private DataModel avmStoreProps = null;
// supporting repository services
transient private TransactionService transactionService;
@@ -111,8 +110,6 @@ public class AdminNodeBrowseBean implements Serializable
transient private SearchService searchService;
transient private NamespaceService namespaceService;
transient private PermissionService permissionService;
-// // WCM
-// transient private AVMService avmService;
/**
* @param transactionService transaction service
@@ -216,24 +213,6 @@ public class AdminNodeBrowseBean implements Serializable
return permissionService;
}
-// // WCM
-// /**
-// * @param avmService AVM service
-// */
-// public void setAVMService(AVMService avmService)
-// {
-// this.avmService = avmService;
-// }
-//
-// private AVMService getAVMService()
-// {
-// if (avmService == null)
-// {
-// avmService = Repository.getServiceRegistry(FacesContext.getCurrentInstance()).getAVMService();
-// }
-// return avmService;
-// }
-//
/**
* Gets the list of repository stores
*
@@ -424,18 +403,9 @@ public class AdminNodeBrowseBean implements Serializable
{
if (permissionMasks == null)
{
-// // WCM
-// if (nodeRef.getStoreRef().getProtocol().equals(StoreRef.PROTOCOL_AVM))
-// {
-// List nodePermissions = new ArrayList(getPermissionService().getAllSetPermissions(nodeRef.getStoreRef()));
-// permissionMasks = new ListDataModel(nodePermissions);
-// }
-// else
-// {
- List noReadPermissions = new ArrayList(1);
- noReadPermissions.add(new NoStoreMask());
- permissionMasks = new ListDataModel(noReadPermissions);
-// }
+ List noReadPermissions = new ArrayList(1);
+ noReadPermissions.add(new NoStoreMask());
+ permissionMasks = new ListDataModel(noReadPermissions);
}
return permissionMasks;
}
@@ -476,43 +446,6 @@ public class AdminNodeBrowseBean implements Serializable
}
return assocs;
}
-//
-// // WCM
-// public boolean getInAVMStore()
-// {
-// return nodeRef.getStoreRef().getProtocol().equals(StoreRef.PROTOCOL_AVM);
-// }
-//
-// // WCM
-// public DataModel getAVMStoreProperties()
-// {
-// if (avmStoreProps == null)
-// {
-// // work out the store name from current nodeRef
-// String store = nodeRef.getStoreRef().getIdentifier();
-// Map props = getAVMService().getStoreProperties(store);
-// List> storeProperties = new ArrayList>();
-//
-// for (Map.Entry property : props.entrySet())
-// {
-// Map map = new HashMap(2);
-// map.put("name", property.getKey().toString());
-// map.put("type", property.getValue().getActualTypeString());
-// String val = property.getValue().getStringValue();
-// if (val == null)
-// {
-// val = "null";
-// }
-// map.put("value", val);
-//
-// storeProperties.add(map);
-// }
-//
-// avmStoreProps = new ListDataModel(storeProperties);
-// }
-//
-// return avmStoreProps;
-// }
/**
* Gets the current query language
@@ -585,8 +518,6 @@ public class AdminNodeBrowseBean implements Serializable
NodeRef rootNode = getNodeService().getRootNode(storeRef);
setNodeRef(rootNode);
- this.avmStoreProps = null;
-
return "success";
}
diff --git a/source/java/org/alfresco/web/bean/clipboard/AbstractClipboardItem.java b/source/java/org/alfresco/web/bean/clipboard/AbstractClipboardItem.java
index 48813a9f52..0b1d2028de 100644
--- a/source/java/org/alfresco/web/bean/clipboard/AbstractClipboardItem.java
+++ b/source/java/org/alfresco/web/bean/clipboard/AbstractClipboardItem.java
@@ -59,9 +59,6 @@ abstract class AbstractClipboardItem implements ClipboardItem
private QName type;
private String icon;
-// // WCM
-// transient protected AVMService avmService;
-//
private List customPasteViewIds;
@@ -93,21 +90,6 @@ abstract class AbstractClipboardItem implements ClipboardItem
this.customPasteViewIds = customPasteViewIds;
}
-// // WCM
-// public void setAvmService(AVMService avmService)
-// {
-// this.avmService = avmService;
-// }
-//
-// protected AVMService getAvmService()
-// {
-// if (avmService == null)
-// {
-// avmService = getServiceRegistry().getAVMLockingAwareService();
-// }
-// return avmService;
-// }
-//
public ClipboardStatus getMode()
{
return this.mode;
@@ -226,29 +208,4 @@ abstract class AbstractClipboardItem implements ClipboardItem
return (nodeRefs.size() != 0);
}
-//
-// // WCM
-// protected void recursiveFormCheck(AVMNodeDescriptor desc)
-// {
-// if (desc.isFile())
-// {
-// String filePath = desc.getPath();
-// if (avmService.hasAspect(-1, filePath, WCMAppModel.ASPECT_FORM_INSTANCE_DATA))
-// {
-// avmService.removeAspect(filePath, WCMAppModel.ASPECT_FORM_INSTANCE_DATA);
-// }
-// if (avmService.hasAspect(-1, filePath, WCMAppModel.ASPECT_RENDITION))
-// {
-// avmService.removeAspect(filePath, WCMAppModel.ASPECT_RENDITION);
-// }
-// }
-// else
-// {
-// Map listing = getAvmService().getDirectoryListing(desc);
-// for (Map.Entry entry : listing.entrySet())
-// {
-// recursiveFormCheck(entry.getValue());
-// }
-// }
-// }
}
diff --git a/source/java/org/alfresco/web/bean/clipboard/ClipboardBean.java b/source/java/org/alfresco/web/bean/clipboard/ClipboardBean.java
index f581a153bd..7aa759bed6 100644
--- a/source/java/org/alfresco/web/bean/clipboard/ClipboardBean.java
+++ b/source/java/org/alfresco/web/bean/clipboard/ClipboardBean.java
@@ -330,16 +330,6 @@ public class ClipboardBean implements Serializable
{
item = new WorkspaceClipboardItem(ref, parent, mode, customPasteViewIds);
}
-// // WCM
-// else if (StoreRef.PROTOCOL_AVM.equals(ref.getStoreRef().getProtocol()))
-// {
-// item = new AVMClipboardItem(ref, mode, customPasteViewIds);
-// }
-// else
-// {
-// logger.warn("Unable to add item to clipboard - unknown store protocol: " + ref.getStoreRef().getProtocol());
-// }
-//
if (item != null)
{
// check for duplicates first
@@ -364,8 +354,6 @@ public class ClipboardBean implements Serializable
FacesContext context = FacesContext.getCurrentInstance();
if (Application.getClientConfig(context).isClipboardStatusVisible())
{
-// // WCM
-// String pattern = Application.getMessage(context, StoreRef.PROTOCOL_AVM.equals(ref.getStoreRef().getProtocol()) ? "node_added_clipboard_avm" : "node_added_clipboard");
String pattern = Application.getMessage(context, "node_added_clipboard");
String msg = MessageFormat.format(pattern, items.size());
FacesMessage facesMsg = new FacesMessage(FacesMessage.SEVERITY_INFO, msg, msg);
diff --git a/source/java/org/alfresco/web/bean/clipboard/WorkspaceClipboardItem.java b/source/java/org/alfresco/web/bean/clipboard/WorkspaceClipboardItem.java
index f616684324..152cfdef91 100644
--- a/source/java/org/alfresco/web/bean/clipboard/WorkspaceClipboardItem.java
+++ b/source/java/org/alfresco/web/bean/clipboard/WorkspaceClipboardItem.java
@@ -55,7 +55,6 @@ public class WorkspaceClipboardItem extends AbstractClipboardItem
private static final long serialVersionUID = -1686557602737846009L;
private static final String WORKSPACE_PASTE_VIEW_ID = "/jsp/browse/browse.jsp";
-// private static final String AVM_PASTE_VIEW_ID = "/jsp/wcm/browse-sandbox.jsp"; // WCM
private static final String FORUMS_PASTE_VIEW_ID = "/jsp/forums/forums.jsp";
private static final String FORUM_PASTE_VIEW_ID = "/jsp/forums/forum.jsp";
@@ -96,24 +95,8 @@ public class WorkspaceClipboardItem extends AbstractClipboardItem
*/
public boolean canCopyToViewId(String viewId)
{
-// // WCM
-// if (AVM_PASTE_VIEW_ID.equals(viewId))
-// {
-// AVMBrowseBean avmBrowseBean = (AVMBrowseBean)FacesHelper.getManagedBean(FacesContext.getCurrentInstance(), AVMBrowseBean.BEAN_NAME);
-// String destPath = avmBrowseBean.getCurrentPath();
-//
-// if (WCMUtil.isStagingStore(WCMUtil.getStoreName(destPath)))
-// {
-// return false;
-// }
-//
-// return true;
-// }
-// else
- {
- return super.canCopyToViewId(viewId) || (WORKSPACE_PASTE_VIEW_ID.equals(viewId) || /*AVM_PASTE_VIEW_ID.equals(viewId) || WCM */
- FORUMS_PASTE_VIEW_ID.equals(viewId) || FORUM_PASTE_VIEW_ID.equals(viewId));
- }
+ return super.canCopyToViewId(viewId) || (WORKSPACE_PASTE_VIEW_ID.equals(viewId) ||
+ FORUMS_PASTE_VIEW_ID.equals(viewId) || FORUM_PASTE_VIEW_ID.equals(viewId));
}
/**
@@ -121,8 +104,8 @@ public class WorkspaceClipboardItem extends AbstractClipboardItem
*/
public boolean canMoveToViewId(String viewId)
{
- return super.canMoveToViewId(viewId) || (WORKSPACE_PASTE_VIEW_ID.equals(viewId) || FORUMS_PASTE_VIEW_ID.equals(viewId) ||
- FORUM_PASTE_VIEW_ID.equals(viewId));
+ return super.canMoveToViewId(viewId) || (WORKSPACE_PASTE_VIEW_ID.equals(viewId) || FORUMS_PASTE_VIEW_ID.equals(viewId) ||
+ FORUM_PASTE_VIEW_ID.equals(viewId));
}
/**
@@ -346,75 +329,6 @@ public class WorkspaceClipboardItem extends AbstractClipboardItem
}
return true;
}
-// // WCM
-// else if (AVM_PASTE_VIEW_ID.equals(viewId))
-// {
-// AVMBrowseBean avmBrowseBean = (AVMBrowseBean)FacesHelper.getManagedBean(fc, AVMBrowseBean.BEAN_NAME);
-//
-// final String destPath = avmBrowseBean.getCurrentPath();
-// final NodeRef destRef = AVMNodeConverter.ToNodeRef(-1, destPath);
-//
-// final CrossRepositoryCopyService crossRepoCopyService = getServiceRegistry().getCrossRepositoryCopyService();
-//
-// // initial name to attempt the copy of the item with
-// String name = getName();
-//
-// for(;;)
-// {
-// try
-// {
-// final String currentName = name;
-//
-// // attempt each copy/paste in its own transaction
-// retryingTransactionHelper.doInTransaction(new RetryingTransactionCallback()
-// {
-// public Void execute() throws Throwable
-// {
-// if (getMode() == ClipboardStatus.COPY)
-// {
-// // COPY operation
-// if (logger.isDebugEnabled())
-// logger.debug("Attempting to copy node: " + getNodeRef() + " into node ID: " + destRef.toString());
-//
-// // inter-store copy operation
-// crossRepoCopyService.copy(getNodeRef(), destRef, currentName);
-//
-// if (destRef.getStoreRef().getProtocol().equals(StoreRef.PROTOCOL_AVM))
-// {
-// // ETHREEOH-2110
-// AVMNodeDescriptor desc = getAvmService().lookup(-1, destPath + "/" + currentName);
-// recursiveFormCheck(desc);
-// }
-// }
-// else
-// {
-// // this should not occur as the canMoveToViewId() will return false
-// throw new Exception("Move operation not supported between stores.");
-// }
-// return null;
-// }
-// });
-//
-// // We got here without error, so no need to loop with a new name
-// break;
-// }
-// catch (FileExistsException fileExistsErr)
-// {
-// // If mode is COPY, have another go around the loop with a new name
-// if (getMode() == ClipboardStatus.COPY)
-// {
-// String copyOf = Application.getMessage(fc, MSG_COPY_OF);
-// name = copyOf + ' ' + name;
-// }
-// else
-// {
-// // we should not rename an item when it is being moved - so exit
-// throw fileExistsErr;
-// }
-// }
-// }
-// return true;
-// }
else
{
return false;
diff --git a/source/java/org/alfresco/web/bean/coci/CheckinCheckoutDialog.java b/source/java/org/alfresco/web/bean/coci/CheckinCheckoutDialog.java
index dba4dfb101..226bf5437c 100644
--- a/source/java/org/alfresco/web/bean/coci/CheckinCheckoutDialog.java
+++ b/source/java/org/alfresco/web/bean/coci/CheckinCheckoutDialog.java
@@ -317,24 +317,7 @@ public class CheckinCheckoutDialog extends BaseDialogBean
{
boolean editingInline = false;
Node node = setupContentDocument(id);
-
-// // WCM
-// if (node.hasAspect(WCMAppModel.ASPECT_FORM_INSTANCE_DATA))
-// {
-// editingInline = true;
-//
-// // editable form document
-// FacesContext fc = FacesContext.getCurrentInstance();
-// this.navigator.setupDispatchContext(node);
-//
-// // TODO - rename editContent Wizard since it only deals with editing form content
-// fc.getApplication().getNavigationHandler().handleNavigation(fc, null, "wizard:editContent");
-// }
-//
-// // detect the inline editing aspect to see which edit mode to use
-// else if (node.hasAspect(ApplicationModel.ASPECT_INLINEEDITABLE) &&
-// node.getProperties().get(ApplicationModel.PROP_EDITINLINE) != null &&
-// ((Boolean)node.getProperties().get(ApplicationModel.PROP_EDITINLINE)).booleanValue() == true)
+
if (node.hasAspect(ApplicationModel.ASPECT_INLINEEDITABLE) &&
node.getProperties().get(ApplicationModel.PROP_EDITINLINE) != null &&
((Boolean)node.getProperties().get(ApplicationModel.PROP_EDITINLINE)).booleanValue() == true)
diff --git a/source/java/org/alfresco/web/bean/content/CreateContentWizard.java b/source/java/org/alfresco/web/bean/content/CreateContentWizard.java
index d0a0bde930..0af555771d 100644
--- a/source/java/org/alfresco/web/bean/content/CreateContentWizard.java
+++ b/source/java/org/alfresco/web/bean/content/CreateContentWizard.java
@@ -18,11 +18,8 @@
*/
package org.alfresco.web.bean.content;
-import java.io.Serializable;
import java.text.MessageFormat;
import java.util.ArrayList;
-import java.util.Collection;
-import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.ResourceBundle;
@@ -31,30 +28,21 @@ import javax.faces.context.FacesContext;
import javax.faces.event.ValueChangeEvent;
import javax.faces.model.SelectItem;
-import org.springframework.extensions.config.Config;
-import org.springframework.extensions.config.ConfigElement;
-import org.springframework.extensions.config.ConfigService;
import org.alfresco.model.ContentModel;
import org.alfresco.repo.content.MimetypeMap;
import org.alfresco.service.cmr.model.FileExistsException;
-import org.alfresco.service.namespace.QName;
import org.alfresco.web.app.AlfrescoNavigationHandler;
import org.alfresco.web.app.Application;
-import org.alfresco.web.app.servlet.FacesHelper;
import org.alfresco.web.bean.repository.Node;
import org.alfresco.web.bean.repository.Repository;
import org.alfresco.web.data.IDataContainer;
import org.alfresco.web.data.QuickSort;
-import org.alfresco.web.forms.Form;
-import org.alfresco.web.forms.FormNotFoundException;
-import org.alfresco.web.forms.FormProcessor;
-import org.alfresco.web.forms.FormsService;
-import org.alfresco.util.XMLUtil;
import org.alfresco.web.ui.common.Utils;
-import org.apache.commons.io.FilenameUtils;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.w3c.dom.Document;
+import org.springframework.extensions.config.Config;
+import org.springframework.extensions.config.ConfigElement;
+import org.springframework.extensions.config.ConfigService;
/**
* Bean implementation for the "Create Content Wizard" dialog
@@ -68,35 +56,9 @@ public class CreateContentWizard extends BaseContentWizard
protected String content = null;
protected List createMimeTypes;
- transient protected FormsService formsService;
- protected String formName;
- protected FormProcessor.Session formProcessorSession = null;
- transient protected Document instanceDataDocument = null;
-
private static Log logger = LogFactory.getLog(CreateContentWizard.class);
- /**
- * @param formsService The FormsService to set.
- */
- public void setFormsService(final FormsService formsService)
- {
- this.formsService = formsService;
- }
-
- /**
- * @return the formsService
- */
- private FormsService getFormsService()
- {
- //check for null for cluster environment
- if (formsService == null)
- {
- formsService = (FormsService) FacesHelper.getManagedBean(FacesContext.getCurrentInstance(), "FormsService");
- }
- return formsService;
- }
-
// ------------------------------------------------------------------------------
// Wizard implementation
@@ -104,25 +66,8 @@ public class CreateContentWizard extends BaseContentWizard
@Override
public String finish()
{
- // if a form is entered, then save the form instance data as XML ...
- if (this.instanceDataDocument != null)
- {
- this.content = XMLUtil.toString(this.instanceDataDocument, true);
-
- this.mimeType = MimetypeMap.MIMETYPE_XML; // belts & braces - override mimetype (in case is not set to XML)
- }
-
String result = super.finish();
-// // WCM
-// if ((super.createdNode != null) && (this.instanceDataDocument != null))
-// {
-// final Map props = new HashMap(1, 1.0f);
-// props.put(WCMAppModel.PROP_PARENT_FORM_NAME, getFormName());
-// props.put(WCMAppModel.PROP_ORIGINAL_PARENT_PATH, "");
-// getNodeService().addAspect(super.createdNode, WCMAppModel.ASPECT_FORM_INSTANCE_DATA, props);
-// }
-//
return result;
}
@@ -144,14 +89,6 @@ public class CreateContentWizard extends BaseContentWizard
this.content = null;
this.inlineEdit = true;
this.mimeType = MimetypeMap.MIMETYPE_HTML;
- this.formName = "";
-
- this.instanceDataDocument = null;
- if (this.formProcessorSession != null)
- {
- this.formProcessorSession.destroy();
- }
- this.formProcessorSession = null;
}
@Override
@@ -299,11 +236,6 @@ public class CreateContentWizard extends BaseContentWizard
{
ResourceBundle bundle = Application.getBundle(FacesContext.getCurrentInstance());
- if (this.instanceDataDocument != null)
- {
- this.mimeType = MimetypeMap.MIMETYPE_XML; // belts & braces - override mimetype (in case is not set to XML)
- }
-
// TODO: show first few lines of content here?
return buildSummary(
new String[] {bundle.getString("file_name"),
@@ -313,81 +245,6 @@ public class CreateContentWizard extends BaseContentWizard
getSummaryMimeType(this.mimeType)});
}
- /**
- * @return List of UI items to represent the full list of available ECM Forms
- */
- public List getFormsList()
- {
- Collection