Derek Hulley 4fdb297884 Merged V3.1 to HEAD ...

Merged DEV/LIVECYCLE-3.1 to V3.1
      12581: Merged V2.1-A to DEV/LIVECYCLE-3.1
         8675: Set FileServers configuration properties using system properties
      12603: Merged V2.1-A to DEV/LIVECYCLE-3.1
         8702: Added bindto as a property-enabled value
         8703: Added bindto as a property-enabled value
         8705: Filter out a bind to address of '0.0.0.0'
      12631: Merged V2.1-A to DEV/LIVECYCLE-3.1
         8551: JGroups Channel factory
      12633: Merged V2.1-A to DEV\LIVECYCLE-3.1
         8552: Wired in JGroups heartbeats
         8554: Re-delete file
         8573: Failed hearbeat still must still wait before trying again
         8582: JGroups EHCache heartbeat fixes for TCP stack
   ___________________________________________________________________
   Modified: svn:mergeinfo
      Merged /alfresco/BRANCHES/V2.1-A:r8551-8552,8554,8573,8582,8675,8702-8705
      Merged /alfresco/BRANCHES/V3.1:r12893
      Merged /alfresco/BRANCHES/DEV/LIVECYCLE-3.1:r12581,12603,12631,12633


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

2009-03-10 13:23:30 +00:00

..

bootstrap

Merged V2.0 to HEAD

2007-07-04 16:03:31 +00:00

mt

MT Share - initial checkpoint

2009-03-03 22:25:50 +00:00

asynchronous-avm-indexing-context.xml.sample

Merged V2.1 to HEAD

2007-09-10 22:41:44 +00:00

benchmark-override-context.xml.sample

Merged V3.0 to HEAD

2008-12-18 12:06:12 +00:00

bm-remote-loader-context.xml.sample

Merge LOGNEON-HEAD-3D-BENCHMARK to HEAD

2009-02-16 12:21:41 +00:00

chaining-authentication-context.xml.sample

Fix ALFCOM-1824

2008-07-14 11:11:36 +00:00

content-expiration-debug-context.xml.sample

Sample config file to make content expiration check every 2 minutes

2007-09-06 16:19:18 +00:00

custom-activities-feed-context.xml.sample

Activity Service:

2008-06-25 15:51:16 +00:00

custom-activities-SqlMapConfig.xml.sample

Activity Service:

2008-06-25 15:51:16 +00:00

custom-connection-pool-context.xml.sample

Merged 1.4 to HEAD

2006-12-19 12:35:52 +00:00

custom-email-server.sample.zip

Remove duplicate context file and set allow to all address patterns by default.

2007-11-16 12:53:13 +00:00

custom-hibernate-dialect.properties.sample

Merged V3.0 to HEAD

2008-12-18 10:01:11 +00:00

custom-metadata-extrators-context.xml.sample

Sample extracter override to add an additional mapping from user-defined field 'user1' on the OpenDocument extracter.

2007-05-16 13:57:56 +00:00

custom-model-context.xml.sample

Build script changes

2006-02-10 14:33:27 +00:00

custom-repository-context.xml.sample

Merged 1.4 to HEAD

2006-12-18 14:33:46 +00:00

custom-repository.properties.sample

Merged V3.0 to HEAD

2008-12-19 17:44:01 +00:00

customModel.xml.sample

Build script changes

2006-02-10 14:33:27 +00:00

deployment-attempt-cleaner-context.xml.sample

Merged V2.2 to HEAD

2008-02-26 15:13:48 +00:00

disabled-avm-indexing-context.xml.sample

Context to disable avm indexing

2007-05-18 08:22:03 +00:00

ehcache-custom.xml.sample.cluster

Merged V3.1 to HEAD

2009-03-10 13:23:30 +00:00

example-model-context.xml.sample

Build script changes

2006-02-10 14:33:27 +00:00

exampleModel.xml.sample

- Added support for groups to the association editor components

2007-01-24 10:07:28 +00:00

file-servers-custom.xml

Merged V3.1 to HEAD

2009-03-10 13:23:30 +00:00

file-servers-custom.xml.sample

Big honkin' merge from head. Sheesh!

2006-08-27 01:01:30 +00:00

index-recovery-context.xml.sample

Merged V2.2 to HEAD

2008-03-10 15:22:43 +00:00

index-tracking-context.xml.sample

Merged V2.1 to HEAD

2007-11-12 23:52:46 +00:00

jaas-authentication-context.xml.sample

Merged V2.2 to HEAD

2008-03-10 13:11:50 +00:00

language-specific-index-and-search-context.xml.sample

Add WCM search with atomic indexing around snapshots

2007-05-17 15:52:46 +00:00

ldap-authentication-context.xml.sample

Merged V2.9 to HEAD

2008-05-23 21:41:53 +00:00

ldap-authentication.properties

Merged V2.9 to HEAD

2008-05-23 21:41:53 +00:00

ldap-synchronisation-context.xml.sample

Merged V3.0 to HEAD

2008-12-19 12:15:59 +00:00

ldap-synchronisation.properties

Merged V2.1 to HEAD

2007-09-10 22:57:18 +00:00

lifecycle_processdefinition.xml

Workflow:

2007-01-10 15:40:59 +00:00

lifecycle-messages.properties

Merged 1.4 to HEAD

2006-12-18 13:45:11 +00:00

lifecycle-workflow-context.xml.sample

Merged 1.4 to HEAD

2006-12-18 13:45:11 +00:00

lifecycleModel.xml

Merged 1.4 to HEAD

2006-12-18 13:45:11 +00:00

mimetype-map-extension.xml.sample

Morning merge.

2006-05-14 16:21:55 +00:00

mimetypes-extension.xml.sample

Morning merge.

2006-05-14 16:21:55 +00:00

network-protocol-context.xml.sample

custom file-server config sample

2006-02-16 09:51:56 +00:00

ntlm-authentication-context.xml.sample

Merged V3.0 to HEAD

2008-12-18 10:22:08 +00:00

remote-openoffice-context.xml.sample

Merged V2.9 to HEAD

2008-09-01 13:56:46 +00:00

replicating-content-services-context.xml.sample

Merged V2.1 to HEAD

2007-10-02 16:10:58 +00:00

restore-context.xml.sample

Dynamic Models - fix AR-1953

2008-01-18 12:25:24 +00:00

scheduled-action-services-context.xml.sample

rename to sample

2006-04-20 14:05:55 +00:00

unsecured-public-services-security-context.xml.sample

Merged V3.0 to HEAD

2008-12-19 12:15:59 +00:00

wcm-xml-metadata-extracter-context.xml.sample

Merged V2.9 to HEAD

2008-09-01 10:29:50 +00:00

workflow-context.xml.sample

- Example group / pooled workflow definitions

2007-01-22 13:42:55 +00:00