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

Merged v3.0 to HEAD

Browse Source 
12725: *RECORD ONLY* remove errant comma
   12740: Merged V2.2 to V3.0
      12577: Fix ETWOTWO-973 - Enable Logging of Leaked Transactions By Default.
      12582: *RECORD-ONLY* Fix ETWOTWO-872 - openoffice bootstrap config in WAR bundle.
      12628: *RECORD-ONLY* Fix for ETWOTWO-937: Regression Multi-Valued properties - nullpointerexception if only one value is set initially
   12741: Merged V2.2 to V3.0
      12643: Fixed ETWOTWO-354: null properties created on copy-pasted nodes
      12694: Added NodeService.addProperties() method
      12695: Follow-up fix for  ETWOTWO-354: null properties created on copy-pasted nodes
      12715: Fix ETWOTWO-988: Gather Oracle schema stats before, during and after upgrade
      12730: IndexInfo.main processes multiple directory arguments
      12737: Fixed ETWOTWO-246, ETHREEOH-996 (by merge) and ALFCOM-2299: Cancel discussion orphans nodes
   12745: Merged V2.2 to V3.0
      12744: Fixed ETWOTWO-1011 and (by merge) ALFCOM-2372: Upgrade from 2.1C fails

   svn diff -N .
      Merged /alfresco/BRANCHES/V3.0:r12725,12740-12741,12745
      Merged /alfresco/BRANCHES/V2.2:r12577,12582,12628,12643,12694-12695,12715,12730,12737,12744


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@12748 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Derek Hulley
2009-01-14 17:32:34 +00:00
parent b7ef06d97c
commit fd15f44b54
12 changed files with 259 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
config/alfresco/dbscripts/upgrade/2.2/org.hibernate.dialect.MySQLInnoDBDialect/upgrade-from-2.1.sql
View File

@@ -1047,12 +1047,16 @@ ALTER TABLE alf_map_attribute_entries
;
ALTER TABLE alf_transaction DROP INDEX idx_commit_time_ms; -- (optional)
ALTER TABLE alf_transaction
ADD COLUMN commit_time_ms BIGINT NULL
; -- (optional)
ALTER TABLE alf_transaction
DROP INDEX FKB8761A3A9AE340B7, DROP FOREIGN KEY FKB8761A3A9AE340B7,
ADD INDEX fk_alf_txn_svr (server_id),
ADD CONSTRAINT fk_alf_txn_svr FOREIGN KEY (server_id) REFERENCES alf_server (id),
ADD INDEX idx_alf_txn_ctms (commit_time_ms)
;
UPDATE alf_transaction SET commit_time_ms = id WHERE commit_time_ms IS NULL;
ALTER TABLE avm_child_entries DROP INDEX fk_avm_ce_child, DROP FOREIGN KEY fk_avm_ce_child; -- (optional)
ALTER TABLE avm_child_entries DROP INDEX fk_avm_ce_parent, DROP FOREIGN KEY fk_avm_ce_parent; -- (optional)

1
config/alfresco/public-services-security-context.xml
View File

@@ -366,6 +366,7 @@
org.alfresco.service.cmr.repository.NodeService.getProperties=ACL_NODE.0.sys:base.ReadProperties
org.alfresco.service.cmr.repository.NodeService.getProperty=ACL_NODE.0.sys:base.ReadProperties
org.alfresco.service.cmr.repository.NodeService.setProperties=ACL_NODE.0.sys:base.WriteProperties
org.alfresco.service.cmr.repository.NodeService.addProperties=ACL_NODE.0.sys:base.WriteProperties
org.alfresco.service.cmr.repository.NodeService.setProperty=ACL_NODE.0.sys:base.WriteProperties
org.alfresco.service.cmr.repository.NodeService.removeProperty=ACL_NODE.0.sys:base.WriteProperties
org.alfresco.service.cmr.repository.NodeService.getParentAssocs=ACL_NODE.0.sys:base.ReadProperties

8
source/java/org/alfresco/repo/avm/AVMNodeService.java
View File

@@ -1343,6 +1343,14 @@ public class AVMNodeService extends AbstractNodeServiceImpl implements NodeServi
}
}
public void addProperties(NodeRef nodeRef, Map<QName, Serializable> properties)
{
// Overwrite the current properties
Map<QName, Serializable> currentProperties = getProperties(nodeRef);
currentProperties.putAll(properties);
setProperties(nodeRef, currentProperties);
}
static QName [] fgBuiltinProperties = new QName []
{
ContentModel.PROP_CREATED,

22
source/java/org/alfresco/repo/copy/CopyServiceImpl.java
View File

@@ -608,7 +608,8 @@ public class CopyServiceImpl implements CopyService
Collection<CopyServicePolicies.OnCopyNodePolicy> policies = this.onCopyNodeDelegate.getList(sourceClassRef);
if (policies.isEmpty() == true)
{
defaultOnCopy(sourceClassRef, sourceNodeRef, copyDetails);
Map<QName, Serializable> sourceNodeProperties = this.nodeService.getProperties(sourceNodeRef);
defaultOnCopy(sourceClassRef, sourceNodeRef, sourceNodeProperties, copyDetails);
}
else
{
@@ -626,7 +627,11 @@ public class CopyServiceImpl implements CopyService
* @param sourceNodeRef the source node reference
* @param copyDetails details of the state being copied
*/
private void defaultOnCopy(QName classRef, NodeRef sourceNodeRef, PolicyScope copyDetails)
private void defaultOnCopy(
QName classRef,
NodeRef sourceNodeRef,
Map<QName, Serializable> sourceNodeProperties,
PolicyScope copyDetails)
{
ClassDefinition classDefinition = this.dictionaryService.getClass(classRef);
if (classDefinition != null)
@@ -641,9 +646,12 @@ public class CopyServiceImpl implements CopyService
Map<QName,PropertyDefinition> propertyDefinitions = classDefinition.getProperties();
for (QName propertyName : propertyDefinitions.keySet())
{
Serializable propValue = this.nodeService.getProperty(sourceNodeRef, propertyName);
Serializable propValue = sourceNodeProperties.get(propertyName);
if (propValue != null)
{
copyDetails.addProperty(classDefinition.getName(), propertyName, propValue);
}
}
// Copy the associations (child and target)
Map<QName, AssociationDefinition> assocDefs = classDefinition.getAssociations();
@@ -684,11 +692,17 @@ public class CopyServiceImpl implements CopyService
Map<QName, Serializable> props = copyDetails.getProperties();
if (props != null)
{
Map<QName, Serializable> copyProps = new HashMap<QName, Serializable>(props);
for (QName propName : props.keySet())
{
this.nodeService.setProperty(destinationNodeRef, propName, props.get(propName));
Serializable value = props.get(propName);
if (value == null)
{
copyProps.remove(propName);
}
}
this.nodeService.addProperties(destinationNodeRef, copyProps);
}
}
/**

12
source/java/org/alfresco/repo/exporter/ExporterComponent.java
View File

@@ -579,7 +579,7 @@ public class ExporterComponent
catch(TypeConversionException e)
{
exporter.warning("Value of property " + property + " could not be converted to xml string");
exporter.value(nodeRef, property, value.toString(), index);
exporter.value(nodeRef, property, (value == null ? null : value.toString()), index);
}
}
else
@@ -590,7 +590,15 @@ public class ExporterComponent
{
// export an empty url for the content
ContentData contentData = (ContentData)value;
ContentData noContentURL = new ContentData("", contentData.getMimetype(), contentData.getSize(), contentData.getEncoding());
ContentData noContentURL = null;
if (contentData == null)
{
noContentURL = new ContentData("", null, 0L, "UTF-8");
}
else
{
noContentURL = new ContentData("", contentData.getMimetype(), contentData.getSize(), contentData.getEncoding());
}
exporter.content(nodeRef, property, null, noContentURL, index);
exporter.warning("Skipped content for property " + property + " on node " + nodeRef);
}

51
source/java/org/alfresco/repo/node/BaseNodeServiceTest.java
View File

@@ -110,6 +110,7 @@ public abstract class BaseNodeServiceTest extends BaseSpringTest
public static final QName ASPECT_QNAME_MANDATORY = QName.createQName(NAMESPACE, "mandatoryaspect");
public static final QName ASPECT_QNAME_WITH_DEFAULT_VALUE = QName.createQName(NAMESPACE, "withDefaultValue");
public static final QName PROP_QNAME_TEST_TITLE = QName.createQName(NAMESPACE, "title");
public static final QName PROP_QNAME_TEST_DESCRIPTION = QName.createQName(NAMESPACE, "description");
public static final QName PROP_QNAME_TEST_CONTENT = QName.createQName(NAMESPACE, "content");
public static final QName PROP_QNAME_BOOLEAN_VALUE = QName.createQName(NAMESPACE, "booleanValue");
public static final QName PROP_QNAME_INTEGER_VALUE = QName.createQName(NAMESPACE, "integerValue");
@@ -709,6 +710,36 @@ public abstract class BaseNodeServiceTest extends BaseSpringTest
0, nodeService.getTargetAssocs(sourceNodeRef, RegexQNamePattern.MATCH_ALL).size());
}
/**
* Test {@link https://issues.alfresco.com/jira/browse/ALFCOM-2299 ALFCOM-2299}
*/
public void testAspectRemovalCascadeDelete() throws Exception
{
// Create a node to add the aspect to
NodeRef sourceNodeRef = nodeService.createNode(
rootNodeRef,
ASSOC_TYPE_QNAME_TEST_CHILDREN,
QName.createQName(BaseNodeServiceTest.NAMESPACE, "testAspectRemovalCascadeDelete"),
ContentModel.TYPE_CONTAINER).getChildRef();
// Add the aspect to the source node and add a child using an association defined on the aspect
nodeService.addAspect(sourceNodeRef, ASPECT_WITH_ASSOCIATIONS, null);
NodeRef targetNodeRef = nodeService.createNode(
sourceNodeRef,
ASSOC_ASPECT_CHILD_ASSOC,
QName.createQName(BaseNodeServiceTest.NAMESPACE, "testAspectRemovalCascadeDelete"),
ContentModel.TYPE_CONTAINER).getChildRef();
assertTrue("Child node must exist", nodeService.exists(targetNodeRef));
// Now remove the aspect from the source node and check that the target node was cascade-deleted
nodeService.removeAspect(sourceNodeRef, ASPECT_WITH_ASSOCIATIONS);
assertFalse("Child node must have been cascade-deleted", nodeService.exists(targetNodeRef));
// Commit for good measure
setComplete();
endTransaction();
}
private static final QName ASPECT_QNAME_TEST_RENDERED = QName.createQName(NAMESPACE, "rendered");
private static final QName ASSOC_TYPE_QNAME_TEST_RENDITION = QName.createQName(NAMESPACE, "rendition-page");
private static final QName TYPE_QNAME_TEST_RENDITION_PAGE = QName.createQName(NAMESPACE, "rendition-page");
@@ -1205,6 +1236,26 @@ public abstract class BaseNodeServiceTest extends BaseSpringTest
}
}
public void setAddProperties() throws Exception
{
Map<QName, Serializable> properties = nodeService.getProperties(rootNodeRef);
// Add an aspect with a default value
nodeService.addAspect(rootNodeRef, ASPECT_QNAME_TEST_TITLED, null);
assertNull("Expected null property", nodeService.getProperty(rootNodeRef, PROP_QNAME_TEST_TITLE));
assertNull("Expected null property", nodeService.getProperty(rootNodeRef, PROP_QNAME_TEST_DESCRIPTION));
// Now add a map of two properties and check
Map<QName, Serializable> addProperties = new HashMap<QName, Serializable>(11);
addProperties.put(PROP_QNAME_TEST_TITLE, "Title");
addProperties.put(PROP_QNAME_TEST_DESCRIPTION, "Description");
nodeService.addProperties(rootNodeRef, addProperties);
// Check
Map<QName, Serializable> checkProperties = nodeService.getProperties(rootNodeRef);
assertEquals("Title", checkProperties.get(PROP_QNAME_TEST_TITLE));
assertEquals("Description", checkProperties.get(PROP_QNAME_TEST_DESCRIPTION));
}
public void testRemoveProperty() throws Exception
{
Map<QName, Serializable> properties = nodeService.getProperties(rootNodeRef);

31
source/java/org/alfresco/repo/node/FullNodeServiceTest.java
View File

@@ -204,6 +204,37 @@ public class FullNodeServiceTest extends BaseNodeServiceTest
nodeService.getProperty(nodeRef, BaseNodeServiceTest.PROP_QNAME_ML_TEXT_VALUE));
}
public void testMLValuesOnAddProperties() throws Exception
{
Map<QName, Serializable> properties = new HashMap<QName, Serializable>();
fillProperties(BaseNodeServiceTest.TYPE_QNAME_TEST_MANY_PROPERTIES, properties);
// Replace the MLText value with a plain string
properties.put(BaseNodeServiceTest.PROP_QNAME_ML_TEXT_VALUE, "Bonjour");
// Now switch to French
I18NUtil.setContentLocale(Locale.FRENCH);
// Add an aspect
NodeRef nodeRef = rootNodeRef;
nodeService.addProperties(nodeRef, properties);
// Now switch to English
I18NUtil.setContentLocale(Locale.ENGLISH);
// Set the english property
nodeService.setProperty(nodeRef, BaseNodeServiceTest.PROP_QNAME_ML_TEXT_VALUE, "Hello");
// Switch back to French and get the value
I18NUtil.setContentLocale(Locale.FRENCH);
assertEquals(
"Expected French value property",
"Bonjour",
nodeService.getProperty(nodeRef, BaseNodeServiceTest.PROP_QNAME_ML_TEXT_VALUE));
// Switch back to English and get the value
I18NUtil.setContentLocale(Locale.ENGLISH);
assertEquals(
"Expected English value property",
"Hello",
nodeService.getProperty(nodeRef, BaseNodeServiceTest.PROP_QNAME_ML_TEXT_VALUE));
}
/**
* {@inheritDoc}
*

21
source/java/org/alfresco/repo/node/MLPropertyInterceptor.java
View File

@@ -215,6 +215,27 @@ public class MLPropertyInterceptor implements MethodInterceptor
nodeService.setProperties(nodeRef, convertedProperties);
// Done
}
else if (methodName.equals("addProperties"))
{
NodeRef nodeRef = (NodeRef) args[0];
Map<QName, Serializable> newProperties =(Map<QName, Serializable>) args[1];
// Get the pivot translation, if appropriate
NodeRef pivotNodeRef = getPivotNodeRef(nodeRef);
// Get the current properties for the node
Map<QName, Serializable> currentProperties = nodeService.getProperties(nodeRef);
// Convert all properties
Map<QName, Serializable> convertedProperties = convertInboundProperties(
currentProperties,
newProperties,
contentLocale,
nodeRef,
pivotNodeRef);
// Now complete the call by passing the converted properties
nodeService.addProperties(nodeRef, convertedProperties);
// Done
}
else if (methodName.equals("setProperty"))
{
NodeRef nodeRef = (NodeRef) args[0];

80
source/java/org/alfresco/repo/node/db/DbNodeServiceImpl.java
View File

@@ -627,6 +627,7 @@ public class DbNodeServiceImpl extends AbstractNodeServiceImpl
// Remove child associations
// We have to iterate over the associations and remove all those between the parent and child
final List<Pair<Long, ChildAssociationRef>> assocsToDelete = new ArrayList<Pair<Long, ChildAssociationRef>>(5);
final List<Pair<Long, NodeRef>> nodesToDelete = new ArrayList<Pair<Long, NodeRef>>(5);
NodeDaoService.ChildAssocRefQueryCallback callback = new NodeDaoService.ChildAssocRefQueryCallback()
{
public boolean handle(
@@ -635,8 +636,16 @@ public class DbNodeServiceImpl extends AbstractNodeServiceImpl
Pair<Long, NodeRef> childNodePair
)
{
// Add it
// Double check that it's not a primary association. If so, we can't delete it and
// have to delete the child node directly and with full archival.
if (childAssocPair.getSecond().isPrimary())
{
nodesToDelete.add(childNodePair);
}
else
{
assocsToDelete.add(childAssocPair);
}
// No recurse
return false;
}
@@ -656,6 +665,13 @@ public class DbNodeServiceImpl extends AbstractNodeServiceImpl
invokeOnDeleteChildAssociation(assocRef);
}
// Cascade-delete any nodes that were attached to primary associations
for (Pair<Long, NodeRef> childNodePair : nodesToDelete)
{
NodeRef childNodeRef = childNodePair.getSecond();
this.deleteNode(childNodeRef);
}
// Remove regular associations
Map<QName, AssociationDefinition> nodeAssocDefs = aspectDef.getAssociations();
Collection<Pair<Long, AssociationRef>> nodeAssocPairs = nodeDaoService.getNodeAssocsToAndFrom(nodeId);
@@ -910,26 +926,44 @@ public class DbNodeServiceImpl extends AbstractNodeServiceImpl
Long childNodeId = getNodePairNotNull(childAssocRef.getChildRef()).getFirst();
QName assocTypeQName = childAssocRef.getTypeQName();
QName assocQName = childAssocRef.getQName();
Pair<Long, ChildAssociationRef> assocPair = nodeDaoService.getChildAssoc(
parentNodeId, childNodeId, assocTypeQName, assocQName);
if (assocPair == null)
{
// No association exists
return false;
}
Long assocId = assocPair.getFirst();
ChildAssociationRef assocRef = assocPair.getSecond();
if (assocRef.isPrimary())
{
NodeRef childNodeRef = assocRef.getChildRef();
// Delete the child node
this.deleteNode(childNodeRef);
// Done
return true;
}
else
{
// Delete the association
invokeBeforeDeleteChildAssociation(childAssocRef);
boolean deleted = nodeDaoService.deleteChildAssoc(parentNodeId, childNodeId, assocTypeQName, assocQName);
if (deleted)
{
nodeDaoService.deleteChildAssoc(assocId);
invokeOnDeleteChildAssociation(childAssocRef);
}
// Index
nodeIndexer.indexDeleteChildAssociation(childAssocRef);
// Done
return deleted;
return true;
}
}
public boolean removeSeconaryChildAssociation(ChildAssociationRef childAssocRef)
{
Long parentNodeId = getNodePairNotNull(childAssocRef.getParentRef()).getFirst();
Long childNodeId = getNodePairNotNull(childAssocRef.getChildRef()).getFirst();
QName typeQName = childAssocRef.getTypeQName();
QName qname = childAssocRef.getQName();
Pair<Long, ChildAssociationRef> assocPair = nodeDaoService.getChildAssoc(parentNodeId, childNodeId, typeQName, qname);
QName assocTypeQName = childAssocRef.getTypeQName();
QName assocQName = childAssocRef.getQName();
Pair<Long, ChildAssociationRef> assocPair = nodeDaoService.getChildAssoc(
parentNodeId, childNodeId, assocTypeQName, assocQName);
if (assocPair == null)
{
// No association exists
@@ -1150,6 +1184,34 @@ public class DbNodeServiceImpl extends AbstractNodeServiceImpl
nodeIndexer.indexUpdateNode(nodeRef);
}
public void addProperties(NodeRef nodeRef, Map<QName, Serializable> properties) throws InvalidNodeRefException
{
Pair<Long, NodeRef> nodePair = getNodePairNotNull(nodeRef);
Long nodeId = nodePair.getFirst();
extractIntrinsicProperties(properties);
// Invoke policy behaviours
Map<QName, Serializable> propertiesBefore = getPropertiesImpl(nodePair);
invokeBeforeUpdateNode(nodeRef);
// Change each property
for (Map.Entry<QName, Serializable> entry : properties.entrySet())
{
QName propertyQName = entry.getKey();
Serializable propertyValue = entry.getValue();
setPropertyImpl(nodeId, propertyQName, propertyValue);
}
// Invoke policy behaviours
Map<QName, Serializable> propertiesAfter = getPropertiesImpl(nodePair);
invokeOnUpdateNode(nodeRef);
invokeOnUpdateProperties(nodeRef, propertiesBefore, propertiesAfter);
// Index
nodeIndexer.indexUpdateNode(nodeRef);
}
private void setPropertiesImpl(Long nodeId, Map<QName, Serializable> properties)
{
// Get the cm:name and uuid for special handling

16
source/java/org/alfresco/repo/search/impl/lucene/index/IndexInfo.java
View File

@@ -2416,9 +2416,21 @@ public class IndexInfo implements IndexMonitor
*/
public static void main(String[] args) throws Throwable
{
for (int i = 0; i < args.length; i++)
{
File indexLocation = new File(args[i]);
if (!indexLocation.exists())
{
System.err.println("Index directory doesn't exist: " + indexLocation);
continue;
}
readIndexInfo(indexLocation);
}
}
String indexLocation = args[0];
IndexInfo ii = new IndexInfo(new File(indexLocation), null);
private static void readIndexInfo(File indexLocation) throws Throwable
{
IndexInfo ii = new IndexInfo(indexLocation, null);
ii.readWriteLock.writeLock().lock();
try

9
source/java/org/alfresco/repo/version/NodeServiceImpl.java
View File

@@ -402,6 +402,15 @@ public class NodeServiceImpl implements NodeService, VersionModel
throw new UnsupportedOperationException(MSG_UNSUPPORTED);
}
/**
* @throws UnsupportedOperationException always
*/
public void addProperties(NodeRef nodeRef, Map<QName, Serializable> properties) throws InvalidNodeRefException
{
// This operation is not supported for a version store
throw new UnsupportedOperationException(MSG_UNSUPPORTED);
}
/**
* @throws UnsupportedOperationException always
*/

14
source/java/org/alfresco/service/cmr/repository/NodeService.java
View File

@@ -382,13 +382,25 @@ public interface NodeService
* <p>
* <b>NOTE:</b> Null values <u>are</u> allowed.
*
* @param nodeRef
* @param nodeRef the node to chance
* @param properties all the properties of the node keyed by their qualified names
* @throws InvalidNodeRefException if the node could not be found
*/
@Auditable(key = Auditable.Key.ARG_0 ,parameters = {"nodeRef", "properties"})
public void setProperties(NodeRef nodeRef, Map<QName, Serializable> properties) throws InvalidNodeRefException;
/**
* Add all given properties to the node.
* <p>
* <b>NOTE:</b> Null values <u>are</u> allowed and will replace the existing value.
*
* @param nodeRef the node to change
* @param properties the properties to change, keyed by their qualified names
* @throws InvalidNodeRefException if the node could not be found
*/
@Auditable(key = Auditable.Key.ARG_0 ,parameters = {"nodeRef", "properties"})
public void addProperties(NodeRef nodeRef, Map<QName, Serializable> properties) throws InvalidNodeRefException;
/**
* Sets the value of a property to be any <code>Serializable</code> instance.
* <p>