David Webster bee6b4fe4c Fixes: ALF-9344 and ALF-9345 - minor properties file merge issues from Team. ...

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

2011-09-21 15:25:20 +00:00

..

activities

Merged V3.4-TEAM to HEAD

2011-04-11 19:26:26 +00:00

audit

Merged BRANCHES/DEV/V3.4-BUG-FIX to HEAD

2011-06-20 12:42:10 +00:00

bootstrap

ALF-1017 Remove EVERYONE Contributor permissions from /Company Home/Sites/, to avoid misc nodes being created in there by mistake by users, and update the SiteService to runAsSystem when creating the Site node

2011-09-21 14:55:31 +00:00

dao

Merged V3.4-BUG-FIX

2011-09-19 11:30:56 +00:00

dbscripts

ALF-9990: Schema auto-update fails on MS SQL Server

2011-08-22 17:40:23 +00:00

deployment

Merge V3.4 to HEAD

2010-12-09 13:31:25 +00:00

desktop

…

domain

Merged V3.4-TEAM to HEAD

2011-04-11 19:26:26 +00:00

extension

ALF-9981 Due to Spring 3.0 SPEL running on FTL entries like ${foo} before they are passed as properties to beans, support an escaped form of \$\{foo\} which is un-escaped before being passed to the FreeMarker engine. Updates the template code for scheduled actions to un-escape, and the example action definitions to be escaped

2011-09-15 16:02:25 +00:00

ibatis

Merged V3.4-BUG-FIX to HEAD

2011-09-06 16:14:53 +00:00

imap/scripts

…

jgroups

Merged V3.4-BUG-FIX to HEAD

2011-05-21 10:41:57 +00:00

keystore

Encryption related documentation, source code comments

2011-09-06 09:45:26 +00:00

messages

Fixes: ALF-9344 and ALF-9345 - minor properties file merge issues from Team.

2011-09-21 15:25:20 +00:00

mimetype

Better support for .csv in explorer and share - register the mime type better, and include thumbnailing

2010-10-12 14:45:42 +00:00

ml

…

model

Fix ALF-10402: PUB: Access tokens are not being stored in encrypted properties

2011-09-20 13:49:36 +00:00

module

…

mt

…

patch

ALF-1017 Remove EVERYONE Contributor permissions from /Company Home/Sites/, to avoid misc nodes being created in there by mistake by users, and update the SiteService to runAsSystem when creating the Site node

2011-09-21 14:55:31 +00:00

subsystems

Fix for ALF-10170 Implement "Do Nothing" search subsystem to aid QA testing

2011-09-09 20:15:50 +00:00

templates

Added "following email"

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

thumbnail

Merged V3.4-TEAM to HEAD

2011-05-20 13:30:26 +00:00

workflow

L10N Updates from Gloria (based on r30252), fixes: ALF-8211, ALF-9018, ALF-10120, ALF-10172 and adds translations for new strings.

2011-09-16 08:16:35 +00:00

action-services-context.xml

Fixed issues found as a result of ALF-9636: SVC 67: Lucene removal: Sanity test Share UI with Lucene turned off

2011-08-09 11:35:51 +00:00

activiti-context.xml

Added tests to ensure multi-tenancy works and fixed several multi-tenancy issues in workflow.

2011-09-16 09:34:02 +00:00

alfresco-jmxrmi.access

…

alfresco-jmxrmi.password

…

alfresco-shared.properties

Merged V3.4 to HEAD

2011-04-11 14:24:38 +00:00

application-context-core.xml

Refactoring to support ALF-9510, ALF-8702

2011-08-23 18:34:15 +00:00

application-context-highlevel.xml

Renamed "web-publishing-context.xml" to "content-publishing-context.xml"

2011-08-25 13:38:04 +00:00

application-context.xml

Publishing:

2011-06-24 14:40:10 +00:00

attributes-service-context.xml

Merged BRANCHES/DEV/V3.3-DAO-REFACTOR-5 to HEAD:

2010-06-17 19:35:49 +00:00

audit-services-context.xml

Merged BRANCHES/DEV/V3.4-BUG-FIX to HEAD

2011-06-20 12:42:10 +00:00

authentication-services-context.xml

Merged V3.4-BUG-FIX to HEAD

2011-07-25 19:32:17 +00:00

authority-services-context.xml

Consolidating usage patterns around CannedQuery

2011-06-29 02:25:37 +00:00

avm-console-context.xml

…

avm-console.properties

…

avm-services-context.xml

Merged BRANCHES/DEV/V3.4-BUG-FIX to HEAD

2011-06-20 12:42:10 +00:00

avm-test-context.xml

…

blog-context.xml

ALF-9385. Refactoring of the findTaggedBlogPosts method.

2011-07-13 15:33:32 +00:00

bootstrap-context.xml

Fix for ALF-10189:

2011-09-11 12:09:24 +00:00

cache-context.xml

Merged V3.4-TEAM to HEAD

2011-04-11 19:26:26 +00:00

calendar-services-context.xml

On advice from Derek, pre-load node details when wrapping CQ results as higher level objects, for Calendar, Wiki, Links and Discussions

2011-08-16 14:59:58 +00:00

clt-context.xml

…

cmis-api-context.xml

ALF-9079: RSOLR 019: Lucene to SOLR switchover administration

2011-07-15 12:14:43 +00:00

comment-services-context.xml

Move the comment/forum behaviour beans from the core context file to the comment specific one, to fix various build failures when running on the minimal context set

2011-06-30 10:49:19 +00:00

content-publishing-context.xml

Fix ALF-10402: PUB: Access tokens are not being stored in encrypted properties

2011-09-20 13:49:36 +00:00

content-services-context.xml

Merged DEV/SWIFT to HEAD

2011-06-10 00:21:55 +00:00

copy-services-context.xml

Merged DEV to HEAD

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

core-services-context.xml

Fix for ALF-10170 Implement "Do Nothing" search subsystem to aid QA testing

2011-09-09 20:15:50 +00:00

deployment-service-context.xml

ALF-4898 - rework to deployment locks to implement Job Lock Service timeout callback.

2010-10-07 13:56:35 +00:00

deprecated-context.xml

…

discussions-services-context.xml

ALF-9153 Discussions service CQ support for finding "hot" topics (those with recent replies)

2011-08-24 13:45:59 +00:00

ehcache-default.xml

Merged V3.4-BUG-FIX to HEAD

2011-09-06 16:14:53 +00:00

encryption-context.xml

Fix for ALF-10189:

2011-09-11 12:09:24 +00:00

facebook-publishing-context.xml

Fix ALF-10402: PUB: Access tokens are not being stored in encrypted properties

2011-09-20 13:49:36 +00:00

flickr-publishing-context.xml

Fix ALF-10402: PUB: Access tokens are not being stored in encrypted properties

2011-09-20 13:49:36 +00:00

form-services-context.xml

Merged DEV/SWIFT to HEAD

2011-06-10 00:21:55 +00:00

hibernate-context.xml

Merged V3.4-BUG-FIX to HEAD

2011-05-21 10:41:57 +00:00

import-export-context.xml

Missing file from rev 29828 - required to bootstrap clean DB.

2011-08-17 13:58:06 +00:00

invitation-service-context.xml

Started efactoring InviatationServiceImpl so that it uses Activit workflow engine.

2011-08-23 13:24:42 +00:00

jbpm-context.xml

Added tests to ensure multi-tenancy works and fixed several multi-tenancy issues in workflow.

2011-09-16 09:34:02 +00:00

jcr-api-context.xml

…

jcr-context.xml

…

linkedin-publishing-context.xml

Publishing: final config adjustments for each of the publishing channel types

2011-08-26 14:55:36 +00:00

links-services-context.xml

LinksService wrapped with retryingReadTxnAdvice, retryingWriteTxnAdvice and checkTxnAdvisor

2011-09-15 03:05:41 +00:00

logging-context.xml

Merged V3.4 to HEAD

2011-04-11 14:24:38 +00:00

minimal-context.xml

RSOLR 019: Lucene to SOLR switchover administration

2011-07-18 19:30:21 +00:00

model-specific-services-context.xml

Consolidating usage patterns around CannedQuery

2011-06-29 02:25:37 +00:00

module-context.xml

…

network-authentication-context.xml

…

node-locator-context.xml

Merged DEV/SWIFT to HEAD

2011-06-09 12:08:12 +00:00

node-services-context.xml

Merged V3.4-BUG-FIX

2011-09-19 11:30:56 +00:00

notification-services-context.xml

Merged BRANCHES/DEV/WF-NOTIFICATION to HEAD:

2011-08-12 04:26:24 +00:00

opencmis-context.xml

Added CMIS getCheckedOutDocs implementation

2011-08-22 11:20:29 +00:00

ownable-services-context.xml

…

period-type-context.xml

…

policy-context.xml

Merged V3.3 to HEAD

2010-06-09 12:47:50 +00:00

preference-service-context.xml

…

public-services-context.xml

Merged V3.4-BUG-FIX to HEAD

2011-08-11 18:54:03 +00:00

public-services-security-context.xml

Merged V3.4-BUG-FIX to HEAD

2011-09-06 16:14:53 +00:00

rating-services-context.xml

Merged V3.4-TEAM to HEAD

2011-04-11 19:26:26 +00:00

remote-avm-test-context.xml

…

remote-email-service-test-context.xml

…

remote-services-context.xml

Have all the RMI exports retry if the server port is in-use (previously only one export was retrying)

2011-08-28 20:48:05 +00:00

rendition-services-context.xml

Merged V3.4-BUG-FIX to HEAD

2011-06-30 11:36:51 +00:00

replication-services-context.xml

Merged V3.4-BUG-FIX to HEAD

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

repo-admin-context.xml

Merged V3.4-TEAM to HEAD

2011-04-11 19:26:26 +00:00

repository.properties

Added tests to ensure multi-tenancy works and fixed several multi-tenancy issues in workflow.

2011-09-16 09:34:02 +00:00

rule-services-context.xml

Merged V3.4-BUG-FIX to HEAD

2011-09-06 16:14:53 +00:00

scheduled-jobs-context.xml

ALF-9079: RSOLR 019: Lucene to SOLR switchover administration

2011-07-15 12:14:43 +00:00

scheduler-core-context.xml

Allow Context Aware quartz jobs, and start to implement scheduled persisted actions using this (ALF-4346)

2010-08-17 15:13:56 +00:00

script-services-context.xml

Document Library: some refactoring & clean-up of evaluator code. Adds support for Repository custom response injection; the vti server details have now moved to this model instead of a separate webscript call. Added browser evaluator via userAgent regexp test and access to doclib webscript metadata response in evaluators.

2011-08-17 20:43:39 +00:00

site-services-context.xml

Merged V3.4-BUG-FIX to HEAD

2011-09-06 16:14:53 +00:00

slideshare-publishing-context.xml

Fix ALF-10402: PUB: Access tokens are not being stored in encrypted properties

2011-09-20 13:49:36 +00:00

slingshot-context.xml

Class name typo fix for r29845

2011-08-18 07:23:49 +00:00

social-publishing-context.xml

Updated Spring Social JARs and made channels.get webscript a bit more robust.

2011-06-29 10:42:32 +00:00

st-context.xml

…

swf-transform-context.xml

Merged DEV/SWIFT to HEAD

2011-06-10 00:21:55 +00:00

tagging-services-context.xml

Merged V3.4-BUG-FIX to HEAD

2011-04-11 15:57:26 +00:00

template-services-context.xml

Merged V3.4-TEAM to HEAD

2011-04-11 19:26:26 +00:00

thumbnail-service-context.xml

Merged DEV/SWIFT to HEAD

2011-06-10 00:21:55 +00:00

transfer-service-context.xml

TransferService:

2011-08-10 17:54:58 +00:00

twitter-publishing-context.xml

Publishing: final config adjustments for each of the publishing channel types

2011-08-26 14:55:36 +00:00

usage-services-context.xml

Merged V3.4-TEAM to HEAD

2011-04-11 19:26:26 +00:00

version.properties

ALF-1017 Remove EVERYONE Contributor permissions from /Company Home/Sites/, to avoid misc nodes being created in there by mistake by users, and update the SiteService to runAsSystem when creating the Site node

2011-09-21 14:55:31 +00:00

wcm-services-context.xml

Merged V3.4-BUG-FIX to HEAD

2011-05-21 10:41:57 +00:00

wiki-services-context.xml

On advice from Derek, pre-load node details when wrapping CQ results as higher level objects, for Calendar, Wiki, Links and Discussions

2011-08-16 14:59:58 +00:00

workflow-context.xml

Added tests to ensure multi-tenancy works and fixed several multi-tenancy issues in workflow.

2011-09-16 09:34:02 +00:00

youtube-publishing-context.xml

Fix ALF-10402: PUB: Access tokens are not being stored in encrypted properties

2011-09-20 13:49:36 +00:00