Derek Hulley 1b2e8c53ec Fixed compilation error from 30162. Mixing fixes ...

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@30163 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261

2011-09-02 03:53:35 +00:00

..

activities

Merged DEV/SWIFT to HEAD

2011-05-24 06:19:00 +00:00

audit

Merged DEV/SWIFT to HEAD

2011-05-24 05:57:44 +00:00

avm

Merged V3.4-BUG-FIX to HEAD

2011-06-23 14:19:47 +00:00

contentdata

Merged DEV/SWIFT to HEAD

2011-05-24 05:57:44 +00:00

control

Merged DEV/SWIFT to HEAD

2011-05-24 05:57:44 +00:00

encoding

Merged DEV/SWIFT to HEAD

2011-05-24 05:57:44 +00:00

hibernate/dialect

…

locale

Merged DEV/SWIFT to HEAD

2011-05-24 05:57:44 +00:00

locks

Prevent testConcurrentLockAcquisition from running due to random and frequent failure.

2011-08-02 11:04:07 +00:00

mimetype

Merged DEV/SWIFT to HEAD

2011-05-24 05:57:44 +00:00

node

Fixed compilation error from 30162. Mixing fixes

2011-09-02 03:53:35 +00:00

patch

Merged DEV to HEAD

2011-07-19 03:22:11 +00:00

permissions

Merged DEV to HEAD:

2011-08-24 23:09:39 +00:00

propval

Merged DEV/SWIFT to HEAD

2011-05-24 05:57:44 +00:00

qname

Merged DEV/SWIFT to HEAD

2011-05-24 05:57:44 +00:00

query

Add debug logging on executeQuery to mirror that on executeCountQuery

2011-08-17 16:45:43 +00:00

schema

ALF-9258: Added isEngineEnabled check to the Activiti engine initialisation so the JobExecuterThread is not started when it doesn't need to be.

2011-08-18 19:41:52 +00:00

solr

Merged DEV/SWIFT to HEAD

2011-06-09 21:14:18 +00:00

subscriptions

ALF-9957: subscription service fix in MT environment

2011-08-19 12:05:53 +00:00

usage

Merged DEV/SWIFT to HEAD

2011-06-09 22:40:27 +00:00

AuditableProperties.java

…

CrcHelper.java

…

DomainTestSuite.java

Merged DEV/SWIFT to HEAD

2011-06-08 17:29:54 +00:00

PropertyValue.java

Changed metadata encryption to have a new dictionary type: d:encrypted

2011-06-20 11:50:37 +00:00

PropertyValueTest.java

…