diff --git a/config/alfresco/application-context.xml b/config/alfresco/application-context.xml index 58739f596a..3271bfe2a1 100644 --- a/config/alfresco/application-context.xml +++ b/config/alfresco/application-context.xml @@ -41,7 +41,6 @@ - diff --git a/config/alfresco/blog-context.xml b/config/alfresco/blog-context.xml deleted file mode 100644 index dca512fa97..0000000000 --- a/config/alfresco/blog-context.xml +++ /dev/null @@ -1,73 +0,0 @@ - - - - - - - - - - org.alfresco.repo.blogIntegration.BlogIntegrationService - - - - - - - - - - - - - - - - - - - - - ${server.transaction.mode.default} - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/config/alfresco/dbscripts/upgrade/2.2/org.hibernate.dialect.MySQLInnoDBDialect/upgrade-from-2.1.sql b/config/alfresco/dbscripts/upgrade/2.2/org.hibernate.dialect.MySQLInnoDBDialect/upgrade-from-2.1.sql index 90fa528b13..f255056fda 100644 --- a/config/alfresco/dbscripts/upgrade/2.2/org.hibernate.dialect.MySQLInnoDBDialect/upgrade-from-2.1.sql +++ b/config/alfresco/dbscripts/upgrade/2.2/org.hibernate.dialect.MySQLInnoDBDialect/upgrade-from-2.1.sql @@ -263,6 +263,10 @@ INSERT INTO t_alf_store (version, protocol, identifier, root_node_id) SELECT 1, protocol, identifier, root_node_id FROM alf_store ; +-- Add type_qname index for nodes +CREATE INDEX tidx_node_tqn ON alf_node (type_qname); + +-- Copy data over INSERT INTO t_alf_node ( id, version, store_id, uuid, transaction_id, node_deleted, type_qname_id, acl_id, @@ -270,10 +274,10 @@ INSERT INTO t_alf_node ) SELECT n.id, 1, s.id, n.uuid, nstat.transaction_id, false, q.qname_id, n.acl_id, - 'unknown', '2008-09-17T02:23:37.212+01:00', 'unkown', '2008-09-17T02:23:37.212+01:00' + null, null, null, null FROM - t_qnames q - JOIN alf_node n ON (q.qname = n.type_qname) + alf_node n + JOIN t_qnames q ON (q.qname = n.type_qname) JOIN alf_node_status nstat ON (nstat.node_id = n.id) JOIN t_alf_store s ON (s.protocol = nstat.protocol AND s.identifier = nstat.identifier) ; @@ -438,10 +442,10 @@ INSERT INTO t_alf_usage_delta ud.delta_size FROM alf_usage_delta ud -; +; -- (optional) -- Clean up -DROP TABLE alf_usage_delta; +DROP TABLE alf_usage_delta; -- (optional) ALTER TABLE t_alf_usage_delta RENAME TO alf_usage_delta; -- ----------------------------- diff --git a/config/alfresco/dbscripts/upgrade/2.2/org.hibernate.dialect.MySQLInnoDBDialect/upgrade-from-2.2SP1.sql b/config/alfresco/dbscripts/upgrade/2.2/org.hibernate.dialect.MySQLInnoDBDialect/upgrade-from-2.2SP1.sql index 9073484487..a2870a876b 100644 --- a/config/alfresco/dbscripts/upgrade/2.2/org.hibernate.dialect.MySQLInnoDBDialect/upgrade-from-2.2SP1.sql +++ b/config/alfresco/dbscripts/upgrade/2.2/org.hibernate.dialect.MySQLInnoDBDialect/upgrade-from-2.2SP1.sql @@ -63,6 +63,7 @@ INSERT INTO t_alf_store (version, protocol, identifier, root_node_id) SELECT 1, protocol, identifier, root_node_id FROM alf_store ; +-- Copy data over INSERT INTO t_alf_node ( id, version, store_id, uuid, transaction_id, node_deleted, type_qname_id, acl_id, @@ -70,7 +71,7 @@ INSERT INTO t_alf_node ) SELECT n.id, 1, s.id, n.uuid, nstat.transaction_id, false, n.type_qname_id, n.acl_id, - 'unknown', '2008-09-17T02:23:37.212+01:00', 'unkown', '2008-09-17T02:23:37.212+01:00' + null, null, null, null FROM alf_node n JOIN alf_node_status nstat ON (nstat.node_id = n.id) @@ -232,10 +233,10 @@ INSERT INTO t_alf_usage_delta ud.delta_size FROM alf_usage_delta ud -; +; -- (optional) -- Clean up -DROP TABLE alf_usage_delta; +DROP TABLE alf_usage_delta; -- (optional) ALTER TABLE t_alf_usage_delta RENAME TO alf_usage_delta; -- ----------------------------- diff --git a/config/alfresco/dbscripts/upgrade/2.2/org.hibernate.dialect.Oracle9Dialect/upgrade-0-create-missing-tables.sql b/config/alfresco/dbscripts/upgrade/2.2/org.hibernate.dialect.Oracle9Dialect/upgrade-0-create-missing-tables.sql index ed46264cce..dcd48b015e 100644 --- a/config/alfresco/dbscripts/upgrade/2.2/org.hibernate.dialect.Oracle9Dialect/upgrade-0-create-missing-tables.sql +++ b/config/alfresco/dbscripts/upgrade/2.2/org.hibernate.dialect.Oracle9Dialect/upgrade-0-create-missing-tables.sql @@ -27,7 +27,7 @@ ALTER TABLE alf_audit_date RENAME COLUMN year TO full_year; create table avm_aspects_new ( id number(19,0) not null, name varchar2(200 char) not null, - primary key (id, qname_id) + primary key (id, name) ); -- (optional) create table avm_node_properties ( @@ -58,7 +58,7 @@ ALTER TABLE alf_audit_date RENAME COLUMN year TO full_year; string_value varchar2(1024 char), serializable_value long raw, qname varchar2(200 char) not null, - primary key (node_id, qname_id) + primary key (node_id, qname) ); -- (optional) create table avm_store_properties ( diff --git a/source/java/org/alfresco/repo/avm/AVMExpiredContentProcessor.java b/source/java/org/alfresco/repo/avm/AVMExpiredContentProcessor.java index ae2b609d60..7b989fd175 100644 --- a/source/java/org/alfresco/repo/avm/AVMExpiredContentProcessor.java +++ b/source/java/org/alfresco/repo/avm/AVMExpiredContentProcessor.java @@ -488,10 +488,6 @@ public class AVMExpiredContentProcessor NodeRef packageNodeRef = workflowService.createPackage( AVMNodeConverter.ToNodeRef(-1, packageDesc.getPath())); this.nodeService.setProperty(packageNodeRef, WorkflowModel.PROP_IS_SYSTEM_PACKAGE, true); - - // apply global permission to workflow package - this.permissionService.setPermission(packageNodeRef, PermissionService.ALL_AUTHORITIES, - PermissionService.ALL_PERMISSIONS, true); return packageNodeRef; } diff --git a/source/java/org/alfresco/repo/node/BaseNodeServiceTest.java b/source/java/org/alfresco/repo/node/BaseNodeServiceTest.java index 8e256cdc0b..7dcab8d3d1 100644 --- a/source/java/org/alfresco/repo/node/BaseNodeServiceTest.java +++ b/source/java/org/alfresco/repo/node/BaseNodeServiceTest.java @@ -1575,6 +1575,15 @@ public abstract class BaseNodeServiceTest extends BaseSpringTest assertTrue("Node DB ID property not present in map", properties.containsKey(ContentModel.PROP_NODE_DBID)); } + public void testReferencePropertySet() throws Exception + { + Serializable nodeDbId = nodeService.getProperty(rootNodeRef, ContentModel.PROP_NODE_DBID); + // Now set it + nodeService.setProperty(rootNodeRef, ContentModel.PROP_NODE_DBID, new Long(-1)); + Serializable nodeDbIdCheck = nodeService.getProperty(rootNodeRef, ContentModel.PROP_NODE_DBID); + assertEquals("Cannot set Node DB ID", nodeDbId, nodeDbIdCheck); + } + public void testGetParentAssocs() throws Exception { Map assocRefs = buildNodeGraph(); diff --git a/source/java/org/alfresco/repo/node/db/DbNodeServiceImpl.java b/source/java/org/alfresco/repo/node/db/DbNodeServiceImpl.java index f4f7d4599f..e5ca22f87e 100644 --- a/source/java/org/alfresco/repo/node/db/DbNodeServiceImpl.java +++ b/source/java/org/alfresco/repo/node/db/DbNodeServiceImpl.java @@ -1039,8 +1039,15 @@ public class DbNodeServiceImpl extends AbstractNodeServiceImpl Long nodeId = nodePair.getFirst(); // Ensure that we are not setting intrinsic properties - Map properties = Collections.singletonMap(qname, value); + Map properties = new HashMap(1, 1.0F); + properties.put(qname, value); extractIntrinsicProperties(properties); + + // Shortcut if nothing is left + if (properties.size() == 0) + { + return; + } // Get the properties from before Map propertiesBefore = getPropertiesImpl(nodePair);