(childNodeTypeQNameIds));
ChildAssocResultHandler resultHandler = new ChildAssocResultHandler(resultsCallback);
+ // TODO MyBatis workaround - see also http://code.google.com/p/mybatis/issues/detail?id=58 (and #139, #234, ...)
+ template.clearCache();
+
template.select(SELECT_CHILD_ASSOCS_OF_PARENT, assoc, resultHandler);
resultsCallback.done();
}
@@ -1144,6 +1147,10 @@ public class NodeDAOImpl extends AbstractNodeDAOImpl
}
ChildAssocResultHandler resultHandler = new ChildAssocResultHandler(resultsCallback);
+
+ // TODO MyBatis workaround - see also http://code.google.com/p/mybatis/issues/detail?id=58 (and #139, #234, ...)
+ template.clearCache();
+
template.select(SELECT_CHILD_ASSOCS_OF_PARENT_WITHOUT_PARENT_ASSOCS_OF_TYPE, assoc, resultHandler);
resultsCallback.done();
}
diff --git a/source/java/org/alfresco/repo/domain/patch/AbstractPatchDAOImpl.java b/source/java/org/alfresco/repo/domain/patch/AbstractPatchDAOImpl.java
index db0324691d..31be0e3cbd 100644
--- a/source/java/org/alfresco/repo/domain/patch/AbstractPatchDAOImpl.java
+++ b/source/java/org/alfresco/repo/domain/patch/AbstractPatchDAOImpl.java
@@ -27,7 +27,6 @@ import org.alfresco.repo.domain.contentdata.ContentDataDAO;
import org.alfresco.service.cmr.repository.ContentData;
import org.apache.ibatis.session.ResultHandler;
-
/**
* Abstract implementation for Patch DAO.
*
@@ -217,6 +216,7 @@ public abstract class AbstractPatchDAOImpl implements PatchDAO, BatchingDAO
protected abstract int deleteAclMemberEntitiesForAcls(List aclIds);
// note: caller's row handler is expected to migrate the attrs
+ @Override
public void migrateOldAttrTenants(ResultHandler resultHandler)
{
getOldAttrTenantsImpl(resultHandler);
@@ -225,6 +225,7 @@ public abstract class AbstractPatchDAOImpl implements PatchDAO, BatchingDAO
protected abstract void getOldAttrTenantsImpl(ResultHandler resultHandler);
// note: caller's row handler is expected to migrate the attrs
+ @Override
public void migrateOldAttrAVMLocks(ResultHandler resultHandler)
{
getOldAttrAVMLocksImpl(resultHandler);
@@ -233,6 +234,7 @@ public abstract class AbstractPatchDAOImpl implements PatchDAO, BatchingDAO
protected abstract void getOldAttrAVMLocksImpl(ResultHandler resultHandler);
// note: caller's row handler is expected to migrate the attrs
+ @Override
public void migrateOldAttrPropertyBackedBeans(ResultHandler resultHandler)
{
getOldAttrPropertyBackedBeansImpl(resultHandler);
@@ -241,6 +243,7 @@ public abstract class AbstractPatchDAOImpl implements PatchDAO, BatchingDAO
protected abstract void getOldAttrPropertyBackedBeansImpl(ResultHandler resultHandler);
// note: caller's row handler is expected to migrate the attrs
+ @Override
public void migrateOldAttrChainingURS(ResultHandler resultHandler)
{
getOldAttrChainingURSImpl(resultHandler);
@@ -248,18 +251,11 @@ public abstract class AbstractPatchDAOImpl implements PatchDAO, BatchingDAO
protected abstract void getOldAttrChainingURSImpl(ResultHandler resultHandler);
+ @Override
public List getOldAttrCustomNames()
{
return getOldAttrCustomNamesImpl();
}
protected abstract List getOldAttrCustomNamesImpl();
-
- public void deleteAllOldAttrs()
- {
- deleteAllOldAttrsImpl();
- }
-
- protected abstract void deleteAllOldAttrsImpl();
-
}
diff --git a/source/java/org/alfresco/repo/domain/patch/PatchDAO.java b/source/java/org/alfresco/repo/domain/patch/PatchDAO.java
index ac4860630c..bd0a7c973c 100644
--- a/source/java/org/alfresco/repo/domain/patch/PatchDAO.java
+++ b/source/java/org/alfresco/repo/domain/patch/PatchDAO.java
@@ -203,16 +203,16 @@ public interface PatchDAO
*/
public void migrateOldAttrChainingURS(ResultHandler resultHandler);
+ /**
+ * Drop old attribute alf_*attribute* tables
+ */
+ public void migrateOldAttrDropTables();
+
/**
* Get custom global attribute names (if any)
*/
public List getOldAttrCustomNames();
- /**
- * Delete all old attributes (from alf_*attribute* tables)
- */
- public void deleteAllOldAttrs();
-
/**
* Get shared acls with inheritance issues
* @return
diff --git a/source/java/org/alfresco/repo/domain/patch/ibatis/AppliedPatchDAOImpl.java b/source/java/org/alfresco/repo/domain/patch/ibatis/AppliedPatchDAOImpl.java
index 82857927dd..ca7462fef1 100644
--- a/source/java/org/alfresco/repo/domain/patch/ibatis/AppliedPatchDAOImpl.java
+++ b/source/java/org/alfresco/repo/domain/patch/ibatis/AppliedPatchDAOImpl.java
@@ -73,37 +73,4 @@ public class AppliedPatchDAOImpl extends AbstractAppliedPatchDAOImpl
{
return (List) template.selectList(SELECT_ALL_APPLIED_PATCH);
}
-
-//
-// @Override
-// protected EncodingEntity getEncodingEntity(Long id)
-// {
-// EncodingEntity encodingEntity = new EncodingEntity();
-// encodingEntity.setId(id);
-// encodingEntity = (EncodingEntity) template.queryForObject(SELECT_ENCODING_BY_ID, encodingEntity);
-// // Done
-// return encodingEntity;
-// }
-//
-// @Override
-// protected EncodingEntity getEncodingEntity(String encoding)
-// {
-// EncodingEntity encodingEntity = new EncodingEntity();
-// encodingEntity.setEncoding(encoding == null ? null : encoding.toLowerCase());
-// encodingEntity = (EncodingEntity) template.queryForObject(SELECT_ENCODING_BY_KEY, encodingEntity);
-// // Could be null
-// return encodingEntity;
-// }
-//
-// @Override
-// protected EncodingEntity createEncodingEntity(String encoding)
-// {
-// EncodingEntity encodingEntity = new EncodingEntity();
-// encodingEntity.setVersion(MimetypeEntity.CONST_LONG_ZERO);
-// encodingEntity.setEncoding(encoding == null ? null : encoding.toLowerCase());
-// Long id = (Long) template.insert(INSERT_ENCODING, encodingEntity);
-// encodingEntity.setId(id);
-// // Done
-// return encodingEntity;
-// }
}
diff --git a/source/java/org/alfresco/repo/domain/patch/ibatis/PatchDAOImpl.java b/source/java/org/alfresco/repo/domain/patch/ibatis/PatchDAOImpl.java
index 1203420323..e113085e6b 100644
--- a/source/java/org/alfresco/repo/domain/patch/ibatis/PatchDAOImpl.java
+++ b/source/java/org/alfresco/repo/domain/patch/ibatis/PatchDAOImpl.java
@@ -89,11 +89,12 @@ public class PatchDAOImpl extends AbstractPatchDAOImpl
private static final String SELECT_OLD_ATTR_CHAINING_URS = "alfresco.patch.select_oldAttrChainingURS";
private static final String SELECT_OLD_ATTR_CUSTOM_NAMES = "alfresco.patch.select_oldAttrCustomNames";
- private static final String DELETE_OLD_ATTR_LIST = "alfresco.patch.delete_oldAttrAlfListAttributeEntries";
- private static final String DELETE_OLD_ATTR_MAP = "alfresco.patch.delete_oldAttrAlfMapAttributeEntries";
- private static final String DELETE_OLD_ATTR_GLOBAL = "alfresco.patch.delete_oldAttrAlfGlobalAttributes";
- private static final String DELETE_OLD_ATTR = "alfresco.patch.delete_oldAttrAlfAttributes";
-
+ private static final String DROP_OLD_ATTR_LIST = "alfresco.patch.drop_oldAttrAlfListAttributeEntries";
+ private static final String DROP_OLD_ATTR_MAP = "alfresco.patch.drop_oldAttrAlfMapAttributeEntries";
+ private static final String DROP_OLD_ATTR_GLOBAL = "alfresco.patch.drop_oldAttrAlfGlobalAttributes";
+ private static final String DROP_OLD_ATTR = "alfresco.patch.drop_oldAttrAlfAttributes";
+ private static final String DROP_OLD_ATTR_SEQ = "alfresco.patch.drop_oldAttrAlfAttributes_seq";
+
private static final String SELECT_ACLS_THAT_INHERIT_FROM_NON_PRIMARY_PARENT = "alfresco.patch.select_aclsThatInheritFromNonPrimaryParent";
private static final String SELECT_ACLS_THAT_INHERIT_WITH_INHERITANCE_UNSET = "alfresco.patch.select_aclsThatInheritWithInheritanceUnset";
private static final String SELECT_DEFINING_ACLS_THAT_DO_NOT_INHERIT_CORRECTLY_FROM_THE_PRIMARY_PARENT = "alfresco.patch.select_definingAclsThatDoNotInheritCorrectlyFromThePrimaryParent";
@@ -102,7 +103,7 @@ public class PatchDAOImpl extends AbstractPatchDAOImpl
private LocaleDAO localeDAO;
- private SqlSessionTemplate template;
+ protected SqlSessionTemplate template;
public final void setSqlSessionTemplate(SqlSessionTemplate sqlSessionTemplate)
{
@@ -538,23 +539,46 @@ public class PatchDAOImpl extends AbstractPatchDAOImpl
}
@Override
- protected void deleteAllOldAttrsImpl()
+ public void migrateOldAttrDropTables()
{
- int deleted = 0;
-
- deleted = template.delete(DELETE_OLD_ATTR_LIST);
- logger.info("Deleted "+deleted+" rows from alf_list_attribute_entries");
-
- deleted = template.delete(DELETE_OLD_ATTR_MAP);
- logger.info("Deleted "+deleted+" rows from alf_map_attribute_entries");
-
- deleted = template.delete(DELETE_OLD_ATTR_GLOBAL);
- logger.info("Deleted "+deleted+" rows from alf_global_attributes");
-
- deleted = template.delete(DELETE_OLD_ATTR);
- logger.info("Deleted "+deleted+" rows from alf_attributes");
+ template.update(DROP_OLD_ATTR_LIST);
+ template.update(DROP_OLD_ATTR_MAP);
+ template.update(DROP_OLD_ATTR_GLOBAL);
+ template.update(DROP_OLD_ATTR);
}
+ /**
+ * PostgreSQL-specific DAO
+ *
+ * @author Derek Hulley
+ * @since 4.0
+ */
+ public static class PostgreSQL extends PatchDAOImpl
+ {
+ @Override
+ public void migrateOldAttrDropTables()
+ {
+ super.migrateOldAttrDropTables();
+ template.update(DROP_OLD_ATTR_SEQ);
+ }
+ }
+
+ /**
+ * Oracle-specific DAO
+ *
+ * @author Derek Hulley
+ * @since 4.0
+ */
+ public static class Oracle extends PatchDAOImpl
+ {
+ @Override
+ public void migrateOldAttrDropTables()
+ {
+ super.migrateOldAttrDropTables();
+ template.update(DROP_OLD_ATTR_SEQ);
+ }
+ }
+
@SuppressWarnings("unchecked")
@Override
public List> getAclsThatInheritFromNonPrimaryParent()
diff --git a/source/java/org/alfresco/repo/node/AbstractNodeServiceImpl.java b/source/java/org/alfresco/repo/node/AbstractNodeServiceImpl.java
index 7136a99c8a..8e2277e4ea 100644
--- a/source/java/org/alfresco/repo/node/AbstractNodeServiceImpl.java
+++ b/source/java/org/alfresco/repo/node/AbstractNodeServiceImpl.java
@@ -795,4 +795,10 @@ public abstract class AbstractNodeServiceImpl implements NodeService
{
throw new UnsupportedOperationException();
}
+
+ @Override
+ public final boolean removeSeconaryChildAssociation(ChildAssociationRef childAssocRef)
+ {
+ return removeSecondaryChildAssociation(childAssocRef);
+ }
}
diff --git a/source/java/org/alfresco/repo/node/db/DbNodeServiceImpl.java b/source/java/org/alfresco/repo/node/db/DbNodeServiceImpl.java
index 8f1e25832e..74fd3695be 100644
--- a/source/java/org/alfresco/repo/node/db/DbNodeServiceImpl.java
+++ b/source/java/org/alfresco/repo/node/db/DbNodeServiceImpl.java
@@ -1254,7 +1254,8 @@ public class DbNodeServiceImpl extends AbstractNodeServiceImpl
}
}
- public boolean removeSeconaryChildAssociation(ChildAssociationRef childAssocRef)
+ @Override
+ public boolean removeSecondaryChildAssociation(ChildAssociationRef childAssocRef)
{
Long parentNodeId = getNodePairNotNull(childAssocRef.getParentRef()).getFirst();
Long childNodeId = getNodePairNotNull(childAssocRef.getChildRef()).getFirst();
diff --git a/source/java/org/alfresco/repo/node/locator/AbstractNodeLocator.java b/source/java/org/alfresco/repo/node/locator/AbstractNodeLocator.java
new file mode 100644
index 0000000000..db3775dae9
--- /dev/null
+++ b/source/java/org/alfresco/repo/node/locator/AbstractNodeLocator.java
@@ -0,0 +1,51 @@
+/*
+ * Copyright (C) 2005-2011 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.repo.node.locator;
+
+import java.util.Collections;
+import java.util.List;
+
+import org.alfresco.service.cmr.action.ParameterDefinition;
+import org.alfresco.service.cmr.repository.NodeLocator;
+import org.alfresco.service.cmr.repository.NodeLocatorService;
+
+/**
+ * @author Nick Smith
+ * @since 4.0
+ *
+ */
+public abstract class AbstractNodeLocator implements NodeLocator
+{
+
+ public void setNodeLocatorService(NodeLocatorService nodeLocatorService)
+ {
+ nodeLocatorService.register(getName(), this);
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public List getParameterDefinitions()
+ {
+ return Collections.emptyList();
+ }
+
+ public abstract String getName();
+}
diff --git a/source/java/org/alfresco/repo/node/locator/AncestorNodeLocator.java b/source/java/org/alfresco/repo/node/locator/AncestorNodeLocator.java
new file mode 100644
index 0000000000..680e8a3cc7
--- /dev/null
+++ b/source/java/org/alfresco/repo/node/locator/AncestorNodeLocator.java
@@ -0,0 +1,137 @@
+/*
+ * Copyright (C) 2005-2011 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.repo.node.locator;
+
+import java.io.Serializable;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+
+import org.alfresco.repo.action.ParameterDefinitionImpl;
+import org.alfresco.service.cmr.action.ParameterDefinition;
+import org.alfresco.service.cmr.dictionary.DataTypeDefinition;
+import org.alfresco.service.cmr.repository.ChildAssociationRef;
+import org.alfresco.service.cmr.repository.NodeRef;
+import org.alfresco.service.cmr.repository.NodeService;
+import org.alfresco.service.namespace.NamespaceService;
+import org.alfresco.service.namespace.QName;
+
+/**
+ * @author Nick Smith
+ * @since 4.0
+ *
+ */
+public class AncestorNodeLocator extends AbstractNodeLocator
+{
+ public static final String NAME = "AncestorNodeLocator";
+ public static final String TYPE_KEY = "type";
+ public static final String ASPECT_KEY = "aspect";
+
+ private NamespaceService namespaceService;
+ private NodeService nodeService;
+
+ /**
+ * {@inheritDoc}
+ */
+ @Override
+ public NodeRef getNode(NodeRef source, Map params)
+ {
+ QName type = getQNameParam(TYPE_KEY, params);
+ QName aspect = getQNameParam(ASPECT_KEY, params);
+ NodeRef child = source;
+ while(true)
+ {
+ ChildAssociationRef parentAssoc = nodeService.getPrimaryParent(child);
+ if(parentAssoc == null)
+ {
+ break; // No matching ancestor found.
+ }
+ NodeRef parent = parentAssoc.getParentRef();
+ if(parent == null)
+ {
+ break; // No matching ancestor found.
+ }
+ if(typeMatches(type, parent) && aspectMatches(aspect, parent))
+ {
+ return parent; // Matching ancestor was found.
+ }
+ child = parent;
+ }
+ return null;
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ @Override
+ public List getParameterDefinitions()
+ {
+ List paramDefs = new ArrayList(2);
+ paramDefs.add(new ParameterDefinitionImpl(TYPE_KEY, DataTypeDefinition.QNAME, false, "Type"));
+ paramDefs.add(new ParameterDefinitionImpl(ASPECT_KEY, DataTypeDefinition.QNAME, false, "Aspect"));
+ return paramDefs;
+ }
+
+ private boolean typeMatches(QName type, NodeRef parent)
+ {
+ return type==null || type.equals(nodeService.getType(parent));
+ }
+
+ private boolean aspectMatches(QName aspect, NodeRef parent)
+ {
+ return aspect==null || nodeService.getAspects(parent).contains(aspect);
+ }
+
+ private QName getQNameParam(String key, Map params)
+ {
+ String value = (String) params.get(key);
+ if(value!=null)
+ {
+ return QName.createQName(value, namespaceService);
+ }
+ return null;
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ @Override
+ public String getName()
+ {
+ return NAME;
+ }
+
+ /**
+ * @param nodeService the nodeService to set
+ */
+ public void setNodeService(NodeService nodeService)
+ {
+ this.nodeService = nodeService;
+ }
+
+ /**
+ * @param namespaceService the namespaceService to set
+ */
+ public void setNamespaceService(NamespaceService namespaceService)
+ {
+ this.namespaceService = namespaceService;
+ }
+
+}
diff --git a/source/java/org/alfresco/repo/node/locator/CompanyHomeNodeLocator.java b/source/java/org/alfresco/repo/node/locator/CompanyHomeNodeLocator.java
new file mode 100644
index 0000000000..9833a68095
--- /dev/null
+++ b/source/java/org/alfresco/repo/node/locator/CompanyHomeNodeLocator.java
@@ -0,0 +1,67 @@
+/*
+ * Copyright (C) 2005-2011 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.repo.node.locator;
+
+
+import java.io.Serializable;
+import java.util.Map;
+
+import org.alfresco.repo.model.Repository;
+import org.alfresco.service.cmr.repository.NodeRef;
+
+/**
+ * Locates the Company Home {@link NodeRef}.
+ *
+ * @author Nick Smith
+ * @since 4.0
+ *
+ */
+public class CompanyHomeNodeLocator extends AbstractNodeLocator
+{
+ public static final String NAME = "CompanyHomeNodeLocator";
+
+ private Repository repoHelper;
+
+ /**
+ * {@inheritDoc}
+ */
+ public NodeRef getNode(NodeRef source, Map params)
+ {
+ return repoHelper.getCompanyHome();
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ @Override
+ public String getName()
+ {
+ return NAME;
+ }
+
+ /**
+ * @param repoHelper the repoHelper to set
+ */
+ public void setRepositoryHelper(Repository repoHelper)
+ {
+ this.repoHelper = repoHelper;
+ }
+
+}
diff --git a/source/java/org/alfresco/repo/node/locator/DocLibNodeLocator.java b/source/java/org/alfresco/repo/node/locator/DocLibNodeLocator.java
new file mode 100644
index 0000000000..312774b9be
--- /dev/null
+++ b/source/java/org/alfresco/repo/node/locator/DocLibNodeLocator.java
@@ -0,0 +1,98 @@
+/*
+ * Copyright (C) 2005-2011 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.repo.node.locator;
+
+import java.io.Serializable;
+import java.util.Map;
+
+import org.alfresco.repo.model.Repository;
+import org.alfresco.service.cmr.repository.NodeLocator;
+import org.alfresco.service.cmr.repository.NodeRef;
+import org.alfresco.service.cmr.site.SiteInfo;
+import org.alfresco.service.cmr.site.SiteService;
+
+/**
+ * This {@link NodeLocator} identifies the site in which the source node resides and returns the Document Library container for that site.
+ * If no site can be found or the site does not have a Document Library then the Company Home is returned.
+ * @author Nick Smith
+ * @since 4.0
+ *
+ */
+public class DocLibNodeLocator extends AbstractNodeLocator
+{
+ public static final String NAME = "DocumentLibraryNodeLocator";
+
+ private SiteService siteService;
+ private Repository repositoryHelper;
+
+ /**
+ * Finds the site in which the source {@link NodeRef} resides and returns the Document Library container for that site.
+ * If no site can be found or the site does not have a Document Library then the Company Home is returned.
+ *
+ * @param sourceNode the starting point for locating the site Document Library.
+ * @param params Not used.
+ * @return the Document Library or the Company Home.
+ */
+ @Override
+ public NodeRef getNode(NodeRef source, Map params)
+ {
+ NodeRef docLib = null;
+ if(source != null)
+ {
+ SiteInfo siteInfo = siteService.getSite(source);
+ if(siteInfo != null)
+ {
+ String siteName = siteInfo.getShortName();
+ String containerId = SiteService.DOCUMENT_LIBRARY;
+ docLib = siteService.getContainer(siteName, containerId);
+ }
+ }
+ if(docLib == null)
+ {
+ docLib = repositoryHelper.getCompanyHome();
+ }
+ return docLib;
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ @Override
+ public String getName()
+ {
+ return NAME;
+ }
+
+ /**
+ * @param siteService the siteService to set
+ */
+ public void setSiteService(SiteService siteService)
+ {
+ this.siteService = siteService;
+ }
+
+ /**
+ * @param repositoryHelper the repositoryHelper to set
+ */
+ public void setRepositoryHelper(Repository repositoryHelper)
+ {
+ this.repositoryHelper = repositoryHelper;
+ }
+}
diff --git a/source/java/org/alfresco/repo/node/locator/NodeLocatorServiceImpl.java b/source/java/org/alfresco/repo/node/locator/NodeLocatorServiceImpl.java
new file mode 100644
index 0000000000..157682e778
--- /dev/null
+++ b/source/java/org/alfresco/repo/node/locator/NodeLocatorServiceImpl.java
@@ -0,0 +1,71 @@
+/*
+ * Copyright (C) 2005-2011 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.repo.node.locator;
+
+import java.io.Serializable;
+import java.util.HashMap;
+import java.util.Map;
+
+import org.alfresco.service.cmr.repository.NodeLocator;
+import org.alfresco.service.cmr.repository.NodeLocatorService;
+import org.alfresco.service.cmr.repository.NodeRef;
+import org.alfresco.util.ParameterCheck;
+
+/**
+ * @author Nick Smith
+ * @since 4.0
+ *
+ */
+public class NodeLocatorServiceImpl implements NodeLocatorService
+{
+ private final Map locators = new HashMap();
+
+ /**
+ * {@inheritDoc}
+ */
+ @Override
+ public NodeRef getNode(String locatorName, NodeRef source, Map params)
+ {
+ NodeLocator locator = locators.get(locatorName);
+ if(locator == null)
+ {
+ String msg = "No NodeLocator is registered with name " +locatorName;
+ throw new IllegalArgumentException(msg);
+ }
+ return locator.getNode(source, params);
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ @Override
+ public void register(String locatorName, NodeLocator locator)
+ {
+ ParameterCheck.mandatory("locatorName", locatorName);
+ ParameterCheck.mandatory("locator", locator);
+ if(locators.containsKey(locatorName))
+ {
+ String msg = "Locator with name: " +locatorName + " is already registered!";
+ throw new IllegalArgumentException(msg);
+ }
+ locators.put(locatorName, locator);
+ }
+
+}
diff --git a/source/java/org/alfresco/repo/node/locator/NodeLocatorServiceImplTest.java b/source/java/org/alfresco/repo/node/locator/NodeLocatorServiceImplTest.java
new file mode 100644
index 0000000000..efa3ff4241
--- /dev/null
+++ b/source/java/org/alfresco/repo/node/locator/NodeLocatorServiceImplTest.java
@@ -0,0 +1,102 @@
+/*
+ * Copyright (C) 2005-2011 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.repo.node.locator;
+
+import static junit.framework.Assert.*;
+import static org.mockito.Mockito.when;
+
+import javax.annotation.Resource;
+
+import org.alfresco.repo.model.Repository;
+import org.alfresco.repo.site.SiteServiceInternal;
+import org.alfresco.service.cmr.repository.NodeLocatorService;
+import org.alfresco.service.cmr.repository.NodeRef;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.test.context.ContextConfiguration;
+import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
+
+/**
+ * @author Nick Smith
+ * @since 4.0
+ *
+ */
+@RunWith(SpringJUnit4ClassRunner.class)
+@ContextConfiguration(locations={"classpath:alfresco/node-locator-context.xml", "classpath:test-nodeLocatorServiceImpl-context.xml"})
+public class NodeLocatorServiceImplTest
+{
+ private static final NodeRef companyHome = new NodeRef("alfresco://company/home");
+ private static final NodeRef sitesHome = new NodeRef("alfresco://sites/home");
+
+ @Resource
+ private NodeLocatorService nodeLocatorService;
+
+ @Autowired
+ private Repository repositoryHelper;
+
+ @Autowired
+ private SiteServiceInternal siteService;
+
+ @Test
+ public void testUnknownNodeLocator() throws Exception
+ {
+ try
+ {
+ nodeLocatorService.getNode(null, null, null);
+ fail("An exception should have been thrown!");
+ }
+ catch(IllegalArgumentException e)
+ {
+ //NOOP
+ }
+ try
+ {
+ nodeLocatorService.getNode("some unknown name", null, null);
+ fail("An exception should have been thrown!");
+ }
+ catch(IllegalArgumentException e)
+ {
+ //NOOP
+ }
+ }
+
+ @Test
+ public void testCompanyHomeNodeLocator() throws Exception
+ {
+ NodeRef result = nodeLocatorService.getNode(CompanyHomeNodeLocator.NAME, null, null);
+ assertEquals(companyHome, result);
+ }
+
+ @Test
+ public void testSitesHomeNodeLocator() throws Exception
+ {
+ NodeRef result = nodeLocatorService.getNode(SitesHomeNodeLocator.NAME, null, null);
+ assertEquals(sitesHome, result);
+ }
+
+ @Before
+ public void setUpClass()
+ {
+ when(repositoryHelper.getCompanyHome()).thenReturn(companyHome);
+ when(siteService.getSiteRoot()).thenReturn(sitesHome);
+ }
+}
diff --git a/source/java/org/alfresco/service/cmr/rendition/NodeLocator.java b/source/java/org/alfresco/repo/node/locator/SelfNodeLocator.java
similarity index 58%
rename from source/java/org/alfresco/service/cmr/rendition/NodeLocator.java
rename to source/java/org/alfresco/repo/node/locator/SelfNodeLocator.java
index 90d59ab981..116d9647ef 100644
--- a/source/java/org/alfresco/service/cmr/rendition/NodeLocator.java
+++ b/source/java/org/alfresco/repo/node/locator/SelfNodeLocator.java
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2005-2010 Alfresco Software Limited.
+ * Copyright (C) 2005-2011 Alfresco Software Limited.
*
* This file is part of Alfresco
*
@@ -17,7 +17,7 @@
* along with Alfresco. If not, see .
*/
-package org.alfresco.service.cmr.rendition;
+package org.alfresco.repo.node.locator;
import java.io.Serializable;
import java.util.Map;
@@ -25,19 +25,29 @@ import java.util.Map;
import org.alfresco.service.cmr.repository.NodeRef;
/**
- * This interface defines a strategy object used for finding a {@link NodeRef}.
- *
* @author Nick Smith
+ * @since 4.0
+ *
*/
-public interface NodeLocator
+public class SelfNodeLocator extends AbstractNodeLocator
{
+ public static final String NAME = "SelfNodeLocator";
/**
- * Finds a {@link NodeRef} given a starting {@link NodeRef} and a
- * {@link Map} of parameters.
- *
- * @param sourceNode the starting point for locating a new node.
- * @param params a {@link Map} of parameters.
- * @return the {@link NodeRef}.
- */
- NodeRef getNode(NodeRef sourceNode, Map params);
+ * {@inheritDoc}
+ */
+ @Override
+ public NodeRef getNode(NodeRef source, Map params)
+ {
+ return source;
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ @Override
+ public String getName()
+ {
+ return NAME;
+ }
+
}
diff --git a/source/java/org/alfresco/repo/node/locator/SitesHomeNodeLocator.java b/source/java/org/alfresco/repo/node/locator/SitesHomeNodeLocator.java
new file mode 100644
index 0000000000..af2b563b2d
--- /dev/null
+++ b/source/java/org/alfresco/repo/node/locator/SitesHomeNodeLocator.java
@@ -0,0 +1,66 @@
+/*
+ * Copyright (C) 2005-2011 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.repo.node.locator;
+
+
+import java.io.Serializable;
+import java.util.Map;
+
+import org.alfresco.repo.site.SiteServiceInternal;
+import org.alfresco.service.cmr.repository.NodeRef;
+
+/**
+ * @author Nick Smith
+ * @since 4.0
+ *
+ */
+public class SitesHomeNodeLocator extends AbstractNodeLocator
+{
+ public static final String NAME = "SitesHomeNodeLocator";
+
+ SiteServiceInternal siteService;
+
+ /**
+ * {@inheritDoc}
+ */
+ @Override
+ public NodeRef getNode(NodeRef source, Map params)
+ {
+ return siteService.getSiteRoot();
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ @Override
+ public String getName()
+ {
+ return NAME;
+ }
+
+ /**
+ * @param siteService the siteService to set
+ */
+ public void setSiteService(SiteServiceInternal siteService)
+ {
+ this.siteService = siteService;
+ }
+
+}
diff --git a/source/java/org/alfresco/repo/node/locator/UserHomeNodeLocator.java b/source/java/org/alfresco/repo/node/locator/UserHomeNodeLocator.java
new file mode 100644
index 0000000000..75c7612898
--- /dev/null
+++ b/source/java/org/alfresco/repo/node/locator/UserHomeNodeLocator.java
@@ -0,0 +1,68 @@
+/*
+ * Copyright (C) 2005-2011 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.repo.node.locator;
+
+import java.io.Serializable;
+import java.util.Map;
+
+import org.alfresco.repo.model.Repository;
+import org.alfresco.service.cmr.repository.NodeRef;
+
+/**
+ * @author Nick Smith
+ * @since 4.0
+ *
+ */
+public class UserHomeNodeLocator extends AbstractNodeLocator
+{
+ public static final String NAME = "UserHomeNodeLocator";
+ private Repository repositoryHelper;
+
+ /**
+ * {@inheritDoc}
+ */
+ @Override
+ public NodeRef getNode(NodeRef source, Map params)
+ {
+ NodeRef person = repositoryHelper.getPerson();
+ if(person != null)
+ {
+ return repositoryHelper.getUserHome(person);
+ }
+ return null;
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ @Override
+ public String getName()
+ {
+ return NAME;
+ }
+
+ /**
+ * @param repositoryHelper the repositoryHelper to set
+ */
+ public void setRepositoryHelper(Repository repositoryHelper)
+ {
+ this.repositoryHelper = repositoryHelper;
+ }
+}
diff --git a/source/java/org/alfresco/repo/node/locator/XPathNodeLocator.java b/source/java/org/alfresco/repo/node/locator/XPathNodeLocator.java
new file mode 100644
index 0000000000..f8c7aa8d82
--- /dev/null
+++ b/source/java/org/alfresco/repo/node/locator/XPathNodeLocator.java
@@ -0,0 +1,129 @@
+/*
+ * Copyright (C) 2005-2011 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.repo.node.locator;
+
+import java.io.Serializable;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+
+import org.alfresco.error.AlfrescoRuntimeException;
+import org.alfresco.repo.action.ParameterDefinitionImpl;
+import org.alfresco.service.cmr.action.ParameterDefinition;
+import org.alfresco.service.cmr.dictionary.DataTypeDefinition;
+import org.alfresco.service.cmr.repository.NodeRef;
+import org.alfresco.service.cmr.repository.StoreRef;
+import org.alfresco.service.cmr.search.ResultSet;
+import org.alfresco.service.cmr.search.SearchService;
+import org.alfresco.util.ParameterCheck;
+
+/**
+ * @author Nick Smith
+ * @since 4.0
+ *
+ */
+public class XPathNodeLocator extends AbstractNodeLocator
+{
+ public static final String NAME = "XPathNodeLocator";
+ public static final String QUERY_KEY = "query";
+ public static final String STORE_TYPE_KEY = "store_type";
+ public static final String STORE_ID_KEY = "store_id";
+
+ private SearchService searchService;
+ private StoreRef defaultStore;
+
+ /**
+ * {@inheritDoc}
+ */
+ @Override
+ public NodeRef getNode(NodeRef source, Map params)
+ {
+ String query = (String) params.get(QUERY_KEY);
+ ParameterCheck.mandatoryString("query", query);
+ StoreRef store = null;
+ if(source!=null)
+ {
+ store = source.getStoreRef();
+ }
+ else
+ {
+ String storeType = (String) params.get(STORE_TYPE_KEY);
+ String storeId = (String) params.get(STORE_ID_KEY);
+ if(storeType !=null && storeId != null)
+ {
+ store = new StoreRef(storeType, storeId);
+ }
+ else store = defaultStore;
+ }
+ try
+ {
+ ResultSet results = searchService.query(store, SearchService.LANGUAGE_XPATH, query);
+ List nodes = results.getNodeRefs();
+ if (nodes.size() > 0)
+ {
+ return nodes.get(0);
+ }
+ }
+ catch(Exception e)
+ {
+ String msg = "Error while searching XPath. StoreRef: " + store + " Query: " + query;
+ throw new AlfrescoRuntimeException(msg, e);
+ }
+ return null;
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ @Override
+ public List getParameterDefinitions()
+ {
+ List paramDefs = new ArrayList(2);
+ paramDefs.add(new ParameterDefinitionImpl(QUERY_KEY, DataTypeDefinition.TEXT, true, "Query"));
+ paramDefs.add(new ParameterDefinitionImpl(STORE_TYPE_KEY, DataTypeDefinition.TEXT, false, "Store Type"));
+ paramDefs.add(new ParameterDefinitionImpl(STORE_ID_KEY, DataTypeDefinition.TEXT, false, "Store Id"));
+ return paramDefs;
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ @Override
+ public String getName()
+ {
+ return NAME;
+ }
+
+ /**
+ * @param searchService the searchService to set
+ */
+ public void setSearchService(SearchService searchService)
+ {
+ this.searchService = searchService;
+ }
+
+ /**
+ * @param defaultStore the defaultStore to set
+ */
+ public void setDefaultStore(String defaultStoreStr)
+ {
+ this.defaultStore = new StoreRef(defaultStoreStr);
+ }
+}
\ No newline at end of file
diff --git a/source/java/org/alfresco/repo/rendition/executer/AbstractRenderingEngine.java b/source/java/org/alfresco/repo/rendition/executer/AbstractRenderingEngine.java
index 99672429e9..0ac1fbdea7 100644
--- a/source/java/org/alfresco/repo/rendition/executer/AbstractRenderingEngine.java
+++ b/source/java/org/alfresco/repo/rendition/executer/AbstractRenderingEngine.java
@@ -36,6 +36,7 @@ import org.alfresco.model.RenditionModel;
import org.alfresco.repo.action.ParameterDefinitionImpl;
import org.alfresco.repo.action.executer.ActionExecuterAbstractBase;
import org.alfresco.repo.content.MimetypeMap;
+import org.alfresco.repo.node.locator.SelfNodeLocator;
import org.alfresco.repo.policy.BehaviourFilter;
import org.alfresco.repo.rendition.RenderingEngineDefinitionImpl;
import org.alfresco.repo.rendition.RenditionDefinitionImpl;
@@ -47,7 +48,6 @@ import org.alfresco.service.cmr.action.Action;
import org.alfresco.service.cmr.action.ActionDefinition;
import org.alfresco.service.cmr.action.ParameterDefinition;
import org.alfresco.service.cmr.dictionary.DataTypeDefinition;
-import org.alfresco.service.cmr.rendition.NodeLocator;
import org.alfresco.service.cmr.rendition.RenderCallback;
import org.alfresco.service.cmr.rendition.RenditionDefinition;
import org.alfresco.service.cmr.rendition.RenditionService;
@@ -56,6 +56,7 @@ import org.alfresco.service.cmr.repository.ChildAssociationRef;
import org.alfresco.service.cmr.repository.ContentReader;
import org.alfresco.service.cmr.repository.ContentService;
import org.alfresco.service.cmr.repository.ContentWriter;
+import org.alfresco.service.cmr.repository.NodeLocator;
import org.alfresco.service.cmr.repository.NodeRef;
import org.alfresco.service.cmr.repository.NodeService;
import org.alfresco.service.namespace.NamespaceException;
@@ -189,14 +190,7 @@ public abstract class AbstractRenderingEngine extends ActionExecuterAbstractBase
/**
* Default {@link NodeLocator} simply returns the source node.
*/
- private final static NodeLocator defaultNodeLocator = new NodeLocator()
- {
- @Override
- public NodeRef getNode(NodeRef sourceNode, Map params)
- {
- return sourceNode;
- }
- };
+ private final static NodeLocator defaultNodeLocator = new SelfNodeLocator();
/*
* Injected beans
diff --git a/source/java/org/alfresco/repo/security/person/PersonServiceImpl.java b/source/java/org/alfresco/repo/security/person/PersonServiceImpl.java
index 320d637757..0ebeb525f8 100644
--- a/source/java/org/alfresco/repo/security/person/PersonServiceImpl.java
+++ b/source/java/org/alfresco/repo/security/person/PersonServiceImpl.java
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2005-2010 Alfresco Software Limited.
+ * Copyright (C) 2005-2011 Alfresco Software Limited.
*
* This file is part of Alfresco
*
@@ -88,7 +88,6 @@ import org.alfresco.util.EqualsHelper;
import org.alfresco.util.GUID;
import org.alfresco.util.ModelUtil;
import org.alfresco.util.PropertyCheck;
-import org.alfresco.util.UrlUtil;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.springframework.extensions.surf.util.I18NUtil;
@@ -130,7 +129,7 @@ public class PersonServiceImpl extends TransactionListenerAdapter implements Per
private PermissionsManager permissionsManager;
private RepoAdminService repoAdminService;
private ServiceRegistry serviceRegistry;
-
+
private boolean createMissingPeople;
private static Set mutableProperties;
private String defaultHomeFolderProvider;
@@ -182,7 +181,6 @@ public class PersonServiceImpl extends TransactionListenerAdapter implements Per
PropertyCheck.mandatory(this, "storeUrl", storeRef);
PropertyCheck.mandatory(this, "transactionService", transactionService);
PropertyCheck.mandatory(this, "nodeService", nodeService);
- PropertyCheck.mandatory(this, "searchService", searchService);
PropertyCheck.mandatory(this, "permissionServiceSPI", permissionServiceSPI);
PropertyCheck.mandatory(this, "authorityService", authorityService);
PropertyCheck.mandatory(this, "authenticationService", authenticationService);
diff --git a/source/java/org/alfresco/repo/site/SiteServiceImpl.java b/source/java/org/alfresco/repo/site/SiteServiceImpl.java
index 01827e5e6b..6f01f89afc 100644
--- a/source/java/org/alfresco/repo/site/SiteServiceImpl.java
+++ b/source/java/org/alfresco/repo/site/SiteServiceImpl.java
@@ -1,4 +1,4 @@
-/*
+/*
* Copyright (C) 2005-2011 Alfresco Software Limited.
*
* This file is part of Alfresco
@@ -14,1095 +14,1092 @@
* 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.repo.site;
-
-import java.io.Serializable;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.Comparator;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-import java.util.SortedSet;
-import java.util.StringTokenizer;
-import java.util.TreeSet;
-import java.util.concurrent.ConcurrentHashMap;
-
-import org.alfresco.model.ContentModel;
-import org.alfresco.repo.activities.ActivityType;
-import org.alfresco.repo.admin.SysAdminParams;
+ * along with Alfresco. If not, see .
+ */
+package org.alfresco.repo.site;
+
+import java.io.Serializable;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Comparator;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.SortedSet;
+import java.util.StringTokenizer;
+import java.util.TreeSet;
+import java.util.concurrent.ConcurrentHashMap;
+
+import org.alfresco.model.ContentModel;
+import org.alfresco.repo.activities.ActivityType;
+import org.alfresco.repo.admin.SysAdminParams;
import org.alfresco.repo.policy.BehaviourFilter;
-import org.alfresco.repo.search.impl.lucene.LuceneQueryParser;
-import org.alfresco.repo.security.authentication.AuthenticationContext;
-import org.alfresco.repo.security.authentication.AuthenticationUtil;
-import org.alfresco.repo.security.authentication.AuthenticationUtil.RunAsWork;
-import org.alfresco.repo.tenant.TenantAdminService;
-import org.alfresco.repo.tenant.TenantService;
-import org.alfresco.repo.transaction.RetryingTransactionHelper;
-import org.alfresco.repo.transaction.RetryingTransactionHelper.RetryingTransactionCallback;
-import org.alfresco.service.cmr.activities.ActivityService;
-import org.alfresco.service.cmr.dictionary.DictionaryService;
-import org.alfresco.service.cmr.model.FileFolderService;
-import org.alfresco.service.cmr.model.FileInfo;
-import org.alfresco.service.cmr.model.FileNotFoundException;
-import org.alfresco.service.cmr.repository.ChildAssociationRef;
-import org.alfresco.service.cmr.repository.NodeRef;
-import org.alfresco.service.cmr.repository.NodeService;
-import org.alfresco.service.cmr.repository.StoreRef;
-import org.alfresco.service.cmr.search.ResultSet;
-import org.alfresco.service.cmr.search.ResultSetRow;
-import org.alfresco.service.cmr.search.SearchParameters;
-import org.alfresco.service.cmr.search.SearchService;
-import org.alfresco.service.cmr.security.AccessPermission;
-import org.alfresco.service.cmr.security.AccessStatus;
-import org.alfresco.service.cmr.security.AuthorityService;
-import org.alfresco.service.cmr.security.AuthorityType;
-import org.alfresco.service.cmr.security.PermissionService;
-import org.alfresco.service.cmr.security.PersonService;
-import org.alfresco.service.cmr.site.SiteInfo;
-import org.alfresco.service.cmr.site.SiteService;
-import org.alfresco.service.cmr.site.SiteVisibility;
-import org.alfresco.service.cmr.tagging.TaggingService;
-import org.alfresco.service.namespace.NamespaceService;
-import org.alfresco.service.namespace.QName;
-import org.alfresco.service.namespace.RegexQNamePattern;
-import org.alfresco.util.PropertyCheck;
-import org.alfresco.util.PropertyMap;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-import org.json.JSONException;
-import org.json.JSONObject;
-import org.springframework.extensions.surf.util.ParameterCheck;
-
-/**
- * Site Service Implementation. Also bootstraps the site AVM and DM stores.
- *
- * @author Roy Wetherall
- */
-public class SiteServiceImpl implements SiteService, SiteModel
-{
- /** Logger */
- private static Log logger = LogFactory.getLog(SiteServiceImpl.class);
-
- /** The DM store where site's are kept */
- public static final StoreRef SITE_STORE = new StoreRef("workspace://SpacesStore");
-
- /** Activity tool */
- private static final String ACTIVITY_TOOL = "siteService";
-
- private static final String SITE_PREFIX = "site_";
- private static final String GROUP_SITE_PREFIX = PermissionService.GROUP_PREFIX + SITE_PREFIX;
- private static final int GROUP_PREFIX_LENGTH = PermissionService.GROUP_PREFIX.length();
- private static final int GROUP_SITE_PREFIX_LENGTH = GROUP_SITE_PREFIX.length();
-
- /** Site home ref cache (Tennant aware) */
- private Map siteHomeRefs = new ConcurrentHashMap(4);
-
- /** Site node ref cache (Tennant aware) */
- private Map siteNodeRefs = new ConcurrentHashMap(256);
-
- private String sitesXPath;
-
- /** Messages */
- private static final String MSG_UNABLE_TO_CREATE = "site_service.unable_to_create";
- private static final String MSG_VISIBILITY_GROUP_MISSING = "site_service.visibility_group_missing";
- private static final String MSG_CAN_NOT_UPDATE = "site_service.can_not_update";
- private static final String MSG_CAN_NOT_DELETE = "site_service.can_not_delete";
- private static final String MSG_SITE_NO_EXIST = "site_service.site_no_exist";
+import org.alfresco.repo.search.impl.lucene.LuceneQueryParser;
+import org.alfresco.repo.security.authentication.AuthenticationContext;
+import org.alfresco.repo.security.authentication.AuthenticationUtil;
+import org.alfresco.repo.security.authentication.AuthenticationUtil.RunAsWork;
+import org.alfresco.repo.tenant.TenantAdminService;
+import org.alfresco.repo.tenant.TenantService;
+import org.alfresco.repo.transaction.RetryingTransactionHelper;
+import org.alfresco.repo.transaction.RetryingTransactionHelper.RetryingTransactionCallback;
+import org.alfresco.service.cmr.activities.ActivityService;
+import org.alfresco.service.cmr.dictionary.DictionaryService;
+import org.alfresco.service.cmr.model.FileFolderService;
+import org.alfresco.service.cmr.model.FileInfo;
+import org.alfresco.service.cmr.model.FileNotFoundException;
+import org.alfresco.service.cmr.repository.ChildAssociationRef;
+import org.alfresco.service.cmr.repository.NodeRef;
+import org.alfresco.service.cmr.repository.NodeService;
+import org.alfresco.service.cmr.repository.StoreRef;
+import org.alfresco.service.cmr.search.ResultSet;
+import org.alfresco.service.cmr.search.ResultSetRow;
+import org.alfresco.service.cmr.search.SearchParameters;
+import org.alfresco.service.cmr.search.SearchService;
+import org.alfresco.service.cmr.security.AccessPermission;
+import org.alfresco.service.cmr.security.AccessStatus;
+import org.alfresco.service.cmr.security.AuthorityService;
+import org.alfresco.service.cmr.security.AuthorityType;
+import org.alfresco.service.cmr.security.PermissionService;
+import org.alfresco.service.cmr.security.PersonService;
+import org.alfresco.service.cmr.site.SiteInfo;
+import org.alfresco.service.cmr.site.SiteVisibility;
+import org.alfresco.service.cmr.tagging.TaggingService;
+import org.alfresco.service.namespace.NamespaceService;
+import org.alfresco.service.namespace.QName;
+import org.alfresco.service.namespace.RegexQNamePattern;
+import org.alfresco.util.PropertyCheck;
+import org.alfresco.util.PropertyMap;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.json.JSONException;
+import org.json.JSONObject;
+import org.springframework.extensions.surf.util.ParameterCheck;
+
+/**
+ * Site Service Implementation. Also bootstraps the site AVM and DM stores.
+ *
+ * @author Roy Wetherall
+ */
+public class SiteServiceImpl implements SiteServiceInternal, SiteModel
+{
+ /** Logger */
+ private static Log logger = LogFactory.getLog(SiteServiceImpl.class);
+
+ /** The DM store where site's are kept */
+ public static final StoreRef SITE_STORE = new StoreRef("workspace://SpacesStore");
+
+ /** Activity tool */
+ private static final String ACTIVITY_TOOL = "siteService";
+
+ private static final String SITE_PREFIX = "site_";
+ private static final String GROUP_SITE_PREFIX = PermissionService.GROUP_PREFIX + SITE_PREFIX;
+ private static final int GROUP_PREFIX_LENGTH = PermissionService.GROUP_PREFIX.length();
+ private static final int GROUP_SITE_PREFIX_LENGTH = GROUP_SITE_PREFIX.length();
+
+ /** Site home ref cache (Tennant aware) */
+ private Map siteHomeRefs = new ConcurrentHashMap(4);
+
+ /** Site node ref cache (Tennant aware) */
+ private Map siteNodeRefs = new ConcurrentHashMap(256);
+
+ private String sitesXPath;
+
+ /** Messages */
+ private static final String MSG_UNABLE_TO_CREATE = "site_service.unable_to_create";
+ private static final String MSG_VISIBILITY_GROUP_MISSING = "site_service.visibility_group_missing";
+ private static final String MSG_CAN_NOT_UPDATE = "site_service.can_not_update";
+ private static final String MSG_CAN_NOT_DELETE = "site_service.can_not_delete";
+ private static final String MSG_SITE_NO_EXIST = "site_service.site_no_exist";
private static final String MSG_CAN_NOT_REMOVE_MSHIP = "site_service.can_not_remove_membership";
- private static final String MSG_DO_NOT_CHANGE_MGR = "site_service.do_not_change_manager";
+ private static final String MSG_DO_NOT_CHANGE_MGR = "site_service.do_not_change_manager";
private static final String MSG_CAN_NOT_CHANGE_MSHIP="site_service.can_not_change_membership";
- private static final String MSG_SITE_CONTAINER_NOT_FOLDER = "site_service.site_container_not_folder";
-
- /* Services */
- private NodeService nodeService;
- private FileFolderService fileFolderService;
- private SearchService searchService;
- private NamespaceService namespaceService;
- private PermissionService permissionService;
- private ActivityService activityService;
- private PersonService personService;
- private AuthenticationContext authenticationContext;
- private TaggingService taggingService;
- private AuthorityService authorityService;
- private DictionaryService dictionaryService;
- private TenantService tenantService;
- private TenantAdminService tenantAdminService;
- private RetryingTransactionHelper retryingTransactionHelper;
- private Comparator roleComparator;
- private SysAdminParams sysAdminParams;
+ private static final String MSG_SITE_CONTAINER_NOT_FOLDER = "site_service.site_container_not_folder";
+
+ /* Services */
+ private NodeService nodeService;
+ private FileFolderService fileFolderService;
+ private SearchService searchService;
+ private NamespaceService namespaceService;
+ private PermissionService permissionService;
+ private ActivityService activityService;
+ private PersonService personService;
+ private AuthenticationContext authenticationContext;
+ private TaggingService taggingService;
+ private AuthorityService authorityService;
+ private DictionaryService dictionaryService;
+ private TenantService tenantService;
+ private TenantAdminService tenantAdminService;
+ private RetryingTransactionHelper retryingTransactionHelper;
+ private Comparator roleComparator;
+ private SysAdminParams sysAdminParams;
private BehaviourFilter behaviourFilter;
private SitesPermissionCleaner sitesPermissionsCleaner;
-
-
- /**
- * Set the path to the location of the sites root folder. For example:
- *
- * ./app:company_home/st:sites
- *
- * @param sitesXPath a valid XPath
- */
- public void setSitesXPath(String sitesXPath)
- {
- this.sitesXPath = sitesXPath;
- }
-
- /**
- * Set node service
- */
- public void setNodeService(NodeService nodeService)
- {
- this.nodeService = nodeService;
- }
-
- /**
- * Set file folder service
- */
- public void setFileFolderService(FileFolderService fileFolderService)
- {
- this.fileFolderService = fileFolderService;
- }
-
- /**
- * Set search service
- */
- public void setSearchService(SearchService searchService)
- {
- this.searchService = searchService;
- }
-
- /**
- * Set Namespace service
- */
- public void setNamespaceService(NamespaceService namespaceService)
- {
- this.namespaceService = namespaceService;
- }
-
- /**
- * Set permission service
- */
- public void setPermissionService(PermissionService permissionService)
- {
- this.permissionService = permissionService;
- }
-
- /**
- * Set activity service
- */
- public void setActivityService(ActivityService activityService)
- {
- this.activityService = activityService;
- }
-
- /**
- * Set person service
- */
- public void setPersonService(PersonService personService)
- {
- this.personService = personService;
- }
-
- /**
- * Set authentication component
- */
- public void setAuthenticationContext(
- AuthenticationContext authenticationContext)
- {
- this.authenticationContext = authenticationContext;
- }
-
- /**
- * Set the tagging service
- */
- public void setTaggingService(TaggingService taggingService)
- {
- this.taggingService = taggingService;
- }
-
- /**
- * Set the authority service
- */
- public void setAuthorityService(AuthorityService authorityService)
- {
- this.authorityService = authorityService;
- }
-
- /**
- * Set the dictionary service
- *
- * @param dictionaryService dictionary service
- */
- public void setDictionaryService(DictionaryService dictionaryService)
- {
- this.dictionaryService = dictionaryService;
- }
-
- /**
- * Set the tenant service
- *
- * @param tenantService tenant service
- */
- public void setTenantService(TenantService tenantService)
- {
- this.tenantService = tenantService;
- }
-
- /**
- * Sets the tenant admin service
- */
- public void setTenantAdminService(TenantAdminService tenantAdminService)
- {
- this.tenantAdminService = tenantAdminService;
- }
-
- /**
- * Sets helper that provides transaction callbacks
- */
- public void setTransactionHelper(RetryingTransactionHelper retryingTransactionHelper)
- {
- this.retryingTransactionHelper = retryingTransactionHelper;
- }
-
- public void setRoleComparator(Comparator roleComparator)
- {
- this.roleComparator = roleComparator;
- }
-
- public void setSysAdminParams(SysAdminParams sysAdminParams)
- {
- this.sysAdminParams = sysAdminParams;
- }
+
+
+ /**
+ * Set the path to the location of the sites root folder. For example:
+ *
+ * ./app:company_home/st:sites
+ *
+ * @param sitesXPath a valid XPath
+ */
+ public void setSitesXPath(String sitesXPath)
+ {
+ this.sitesXPath = sitesXPath;
+ }
+
+ /**
+ * Set node service
+ */
+ public void setNodeService(NodeService nodeService)
+ {
+ this.nodeService = nodeService;
+ }
+
+ /**
+ * Set file folder service
+ */
+ public void setFileFolderService(FileFolderService fileFolderService)
+ {
+ this.fileFolderService = fileFolderService;
+ }
+
+ /**
+ * Set search service
+ */
+ public void setSearchService(SearchService searchService)
+ {
+ this.searchService = searchService;
+ }
+
+ /**
+ * Set Namespace service
+ */
+ public void setNamespaceService(NamespaceService namespaceService)
+ {
+ this.namespaceService = namespaceService;
+ }
+
+ /**
+ * Set permission service
+ */
+ public void setPermissionService(PermissionService permissionService)
+ {
+ this.permissionService = permissionService;
+ }
+
+ /**
+ * Set activity service
+ */
+ public void setActivityService(ActivityService activityService)
+ {
+ this.activityService = activityService;
+ }
+
+ /**
+ * Set person service
+ */
+ public void setPersonService(PersonService personService)
+ {
+ this.personService = personService;
+ }
+
+ /**
+ * Set authentication component
+ */
+ public void setAuthenticationContext(
+ AuthenticationContext authenticationContext)
+ {
+ this.authenticationContext = authenticationContext;
+ }
+
+ /**
+ * Set the tagging service
+ */
+ public void setTaggingService(TaggingService taggingService)
+ {
+ this.taggingService = taggingService;
+ }
+
+ /**
+ * Set the authority service
+ */
+ public void setAuthorityService(AuthorityService authorityService)
+ {
+ this.authorityService = authorityService;
+ }
+
+ /**
+ * Set the dictionary service
+ *
+ * @param dictionaryService dictionary service
+ */
+ public void setDictionaryService(DictionaryService dictionaryService)
+ {
+ this.dictionaryService = dictionaryService;
+ }
+
+ /**
+ * Set the tenant service
+ *
+ * @param tenantService tenant service
+ */
+ public void setTenantService(TenantService tenantService)
+ {
+ this.tenantService = tenantService;
+ }
+
+ /**
+ * Sets the tenant admin service
+ */
+ public void setTenantAdminService(TenantAdminService tenantAdminService)
+ {
+ this.tenantAdminService = tenantAdminService;
+ }
+
+ /**
+ * Sets helper that provides transaction callbacks
+ */
+ public void setTransactionHelper(RetryingTransactionHelper retryingTransactionHelper)
+ {
+ this.retryingTransactionHelper = retryingTransactionHelper;
+ }
+
+ public void setRoleComparator(Comparator roleComparator)
+ {
+ this.roleComparator = roleComparator;
+ }
+
+ public void setSysAdminParams(SysAdminParams sysAdminParams)
+ {
+ this.sysAdminParams = sysAdminParams;
+ }
public void setBehaviourFilter(BehaviourFilter behaviourFilter)
{
this.behaviourFilter = behaviourFilter;
}
-
+
public void setSitesPermissionsCleaner(SitesPermissionCleaner sitesPermissionsCleaner)
{
this.sitesPermissionsCleaner = sitesPermissionsCleaner;
}
- public Comparator getRoleComparator()
- {
- return roleComparator;
- }
-
- /**
- * Checks that all necessary properties and services have been provided.
- */
- public void init()
- {
- PropertyCheck.mandatory(this, "nodeService", nodeService);
- PropertyCheck.mandatory(this, "fileFolderService", fileFolderService);
- PropertyCheck.mandatory(this, "searchService", searchService);
- PropertyCheck.mandatory(this, "namespaceService", namespaceService);
- PropertyCheck.mandatory(this, "permissionService", permissionService);
- PropertyCheck.mandatory(this, "authenticationContext", authenticationContext);
- PropertyCheck.mandatory(this, "personService", personService);
- PropertyCheck.mandatory(this, "activityService", activityService);
- PropertyCheck.mandatory(this, "taggingService", taggingService);
- PropertyCheck.mandatory(this, "authorityService", authorityService);
- PropertyCheck.mandatory(this, "sitesXPath", sitesXPath);
- }
-
- /*
- * (non-Javadoc)
- * @see org.alfresco.service.cmr.site.SiteService#hasCreateSitePermissions()
- */
- public boolean hasCreateSitePermissions()
- {
- final NodeRef siteRoot = getSiteRoot();
- if (siteRoot == null)
- {
- throw new SiteServiceException("No root sites folder exists");
- }
- boolean result = permissionService.hasPermission(siteRoot, PermissionService.CONTRIBUTOR).equals(AccessStatus.ALLOWED);
- return result;
- }
-
- /**
- * @see org.alfresco.service.cmr.site.SiteService#createSite(java.lang.String, java.lang.String, java.lang.String, java.lang.String, boolean)
- */
- public SiteInfo createSite(final String sitePreset,
- String passedShortName,
- final String title,
- final String description,
- final boolean isPublic)
- {
- // Determine the site visibility
- SiteVisibility visibility = SiteVisibility.PRIVATE;
- if (isPublic == true)
- {
- visibility = SiteVisibility.PUBLIC;
- }
-
- // Create the site
- return createSite(sitePreset, passedShortName, title, description, visibility);
- }
-
- /**
- * @see org.alfresco.service.cmr.site.SiteService#createSite(java.lang.String, java.lang.String, java.lang.String, java.lang.String, boolean)
- */
- public SiteInfo createSite(final String sitePreset,
- String passedShortName,
- final String title,
- final String description,
- final SiteVisibility visibility)
- {
- // Remove spaces from shortName
- final String shortName = passedShortName.replaceAll(" ", "");
-
- /**
- * Check that the site does not already exist
- */
- // Check to see if we already have a site of this name
- NodeRef existingSite = getSiteNodeRef(shortName);
- if (existingSite != null)
- {
- // Throw an exception since we have a duplicate site name
- throw new SiteServiceException(MSG_UNABLE_TO_CREATE, new Object[]{shortName});
- }
-
- // Get the site parent node reference
- NodeRef siteParent = getSiteParent(shortName);
- if (siteParent == null)
- {
- throw new SiteServiceException("No root sites folder exists");
- }
-
- // Create the site node
- PropertyMap properties = new PropertyMap(4);
- properties.put(ContentModel.PROP_NAME, shortName);
- properties.put(SiteModel.PROP_SITE_PRESET, sitePreset);
- properties.put(SiteModel.PROP_SITE_VISIBILITY, visibility.toString());
- properties.put(ContentModel.PROP_TITLE, title);
- properties.put(ContentModel.PROP_DESCRIPTION, description);
-
- final NodeRef siteNodeRef = this.nodeService.createNode(
- siteParent,
- ContentModel.ASSOC_CONTAINS,
- QName.createQName(NamespaceService.CONTENT_MODEL_1_0_URI,
- shortName), SiteModel.TYPE_SITE, properties)
- .getChildRef();
-
- // Make the new site a tag scope
- this.taggingService.addTagScope(siteNodeRef);
-
- // Clear the sites inherited permissions
- this.permissionService.setInheritParentPermissions(siteNodeRef, false);
-
- // Get the current user
- final String currentUser = authenticationContext.getCurrentUserName();
-
- // Create the relevant groups and assign permissions
- AuthenticationUtil.runAs(new AuthenticationUtil.RunAsWork