Derek Hulley
cfb373ae36
Merge 1.4 to HEAD
...
svn merge svn://svn.alfresco.com:3691/alfresco/BRANCHES/V1.4@4340 svn://svn.alfresco.com:3691/alfresco/BRANCHES/V1.4@4350 .
svn resolved root\projects\3rd-party\.classpath
svn resolved root\projects\repository\source\java\org\alfresco\repo\workflow\WorkflowInterpreter.java
svn merge svn://svn.alfresco.com:3691/alfresco/BRANCHES/V1.4@4379 svn://svn.alfresco.com:3691/alfresco/BRANCHES/V1.4@4380 .
svn merge svn://svn.alfresco.com:3691/alfresco/BRANCHES/V1.4@4420 svn://svn.alfresco.com:3691/alfresco/BRANCHES/V1.4@4421 .
svn resolved root\projects\3rd-party\.classpath
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@4655 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2006-12-19 14:24:45 +00:00
Britt Park
e76fc329b6
Refinements to RetryingTransactionHelper to make it equivalent to
...
executeInUserTransaction().
Changed the on close callback for write listeners to use a RetryingTransaction.
The point of this exercise is to make it possible for clients of the core server
to ignore transient resource contention failures. CIFS, for example, will be able
to take advantage of this, since a transient error condition currently results in a dead
share.
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@4597 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2006-12-13 17:03:44 +00:00
Britt Park
b2f9df29d1
Humongous merge. It is incomplete, however; faces-config-navigation.xml and ClientConfigElement
...
were both beyond me, and are just the raw conflict merge data. If Kev can't figure out how they should
go together by tomorrow AM (for me) I'll dig back in.
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/WCM-DEV2/root@4306 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2006-11-08 05:17:40 +00:00
Britt Park
39a18df7f2
Yet another merge from head to WCM-DEV2.
...
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/WCM-DEV2/root@3774 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2006-09-12 18:55:07 +00:00
Britt Park
07bfd7c60c
More configuration errors fixed. I'm guessing I haven't seen the end of them.
...
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/WCM-DEV2/root@3737 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2006-09-08 21:30:12 +00:00
Britt Park
8031cc6574
Big honkin' merge from head. Sheesh!
...
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/WCM-DEV2/root@3617 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2006-08-27 01:01:30 +00:00
Britt Park
e2c66899cc
Make sure that ContentStoreCleaner doesn't clean up in-use
...
AVM content. Doh!
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/WCM-DEV2/root@3612 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2006-08-25 14:00:32 +00:00
Britt Park
06df2021c8
This changes the AVM service to use ContentService for storage. This gives us,
...
in theory, AVM working underneath (more or less) NodeService and ContentService.
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/WCM-DEV2/root@3481 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2006-08-10 21:50:34 +00:00
Britt Park
f7d9d83036
Merge from HEAD into WCM-DEV2. Also fixes build breakage in
...
jndi-client and catalina-virtual that I introduced earlier.
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/WCM-DEV2/root@3393 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2006-07-24 18:27:41 +00:00
Derek Hulley
75fe6196f4
Made URLs explicit to be classpath: and not file:
...
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@2484 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2006-02-23 16:35:25 +00:00
Derek Hulley
349183a535
Beefed up unit tests for content metadata extracters
...
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@2469 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2006-02-22 13:16:56 +00:00
Derek Hulley
31d9ef768b
Inverted configuration of Metadata Extracters
...
- Adding an extracter no longer requires modification to the MetadataExtracterRegistry
Fixed lack of stream closures
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@2465 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2006-02-22 11:11:53 +00:00
Derek Hulley
3cc84ed467
Changed windows search command pattern
...
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@2463 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2006-02-21 23:54:03 +00:00
Derek Hulley
58d6778173
Fixed AR-435: Added system bootstrap and shutdown hooks for native executables
...
- See the RuntimeExecBeansTest-context.xml for examples of how to put these together
- Shutdown hooks are executed on ApplicationContext shutdown or VM shutdown, whichever is first
Moved native executable error code detection into RuntimeExec class
- This affects any existing RuntimeExecContentTransformers (e.g. TidyTransformer)
Made OS search use regular expressions
- Command search order is: Exact name, First matching REGEX, *
- Note that * is a special case for 'default'. The REGEX equivalent is .*
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@2448 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2006-02-20 01:22:32 +00:00
Derek Hulley
440fa299b4
Content URLs are now generated with an extra HOUR folder to handle high volume input in one day better
...
Added cleanup job for content stores
- content is moved into (alf_data)/contentstore.deleted and mirrors the live content store
- We'll make a call about disabling the trigger for the job, but currently it will fire at 4am
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@2422 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2006-02-16 20:01:57 +00:00
Derek Hulley
57ed31d277
Removed unnecessary import after config extension changes
...
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@2311 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2006-02-07 12:26:51 +00:00
Derek Hulley
d252748bbe
More fine-grained access to mimetype config XML. Added more mimetypes to OpenOffice handlers
...
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@2225 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2006-01-27 14:34:45 +00:00
Derek Hulley
a4a4830b04
Reversed registration order of ContentTransfomers. Self-registration means that config extensions are much simpler
...
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@2221 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2006-01-26 16:54:16 +00:00
Derek Hulley
e1e6508fec
Moving to root below branch label
...
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@2005 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2005-12-08 07:13:07 +00:00