64 Commits

Author SHA1 Message Date
Jan Vonka
7f8a4f0d5b User content usages & quotas - initial check-in
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@7453 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2007-11-27 18:44:24 +00:00
Glen Johnson
bc43fb2c9c Overview:
---------

Overhaul of some areas of Workflow JavaScript API implementation after 2nd review - see details.

Details:
--------

- Fleshed out some of the JavaDocs that needed more detail
- Package changed from org.alfresco.repo.workflow.jsapi to org.alfresco.repo.workflow.jscript
- Prefixed class names of Bean classes with Jscript to keep them distinct from the names of similar classes in org.alfresco.service.cmr.workflow (no longer have to namespace these latter classes everywhere in the code)
- Added JscriptWorkflowTransition and JscriptWorkflowNode classes
- fixing code in various backing beans where instance variables exposed as public by mistake and not as they should using getters
- fixing up problems with some collections/objects being passed back not being scriptable
- Converting backing beans to all be Serializable and having UID set to appropriate values given by using serialver utility
- Changing code so that all Java List to JavaScript array conversions use ValueConvertor.convertValueForScript(...) helper method (much cleaner code)
- Fixing code so that root scripting scope reference available in all backing beans and retro-fitting all their contructors to receive the scope as a parameter so that it is available if needed
- Change constructors of backing beans to be consistent with each other i.e. all of them receiving Service Registry as parameter, and not a mixture of Service Registry for some and Workflow Service for others
- Fixed places where Map was being passed back instead of ScriptableQNameMap
- Some of the member variables in JscriptWorkflowNode and JscriptWorkflowTransition were not exposed as properties - this was fixed up
- Changed WorkflowManager so that WorkflowService is no longer injected. It does not need to be injected as it can be derived from the RegistryService which is already being injected

Files:
------

M – Repository/config/alfresco/script-services-context.xml
M – Repository/source/java/org/alfresco/repo/workflow/jscript/WorkflowManager.java

D – Repository/source/java/org/alfresco/repo/workflow/jsapi/
D – Repository/source/java/org/alfresco/repo/workflow/jsapi/WorkflowDefinition.java
D – Repository/source/java/org/alfresco/repo/workflow/jsapi/WorkflowInstance.java
D – Repository/source/java/org/alfresco/repo/workflow/jsapi/WorkflowManager.java
D – Repository/source/java/org/alfresco/repo/workflow/jsapi/WorkflowPath.java
D – Repository/source/java/org/alfresco/repo/workflow/jsapi/WorkflowTask.java

A – Repository/source/java/org/alfreco/repo/workflow/jscript/
A – Repository/source/java/org/alfreco/repo/workflow/jscript/JscriptWorkflowDefinition.java
A – Repository/source/java/org/alfresco/repo/workflow/jscript/JscriptWorkflowInstance.java
A – Repository/source/java/org/alfresco/repo/workflow/jscript/JscriptWorkflowNode.java
A – Repository/source/java/org/alfresco/repo/workflow/jscript/JscriptWorkflowPath.java
A – Repository/source/java/org/alfresco/repo/workflow/jscript/JscriptWorkflowTask.java
A – Repository/source/java/org/alfresco/repo/workflow/jscript/JscriptWorkflowTransition.java

D – Repository/source/java/org/alfresco/repo/workflow/jscript/WorkflowDefinition.java
D – Repository/source/java/org/alfresco/repo/workflow/jscript/WorkflowInstance.java
D – Repository/source/java/org/alfresco/repo/workflow/jscript/WorkflowPath.java
D – Repository/source/java/org/alfresco/repo/workflow/jscript/WorkflowTask.java

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@6904 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2007-10-02 22:29:34 +00:00
Jan Vonka
0d7da3e6e6 Fix main entry point for the interpreters
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@6816 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2007-09-18 16:01:50 +00:00
David Caruana
1747086061 Fix issue where javascript returns array of nodes, but those nodes are not converted to the appropriate type for jbpm persistence.
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@6815 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2007-09-18 15:50:44 +00:00
Jan Vonka
d9590d3677 MT extension
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@6785 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2007-09-14 11:20:02 +00:00
Jan Vonka
c872cb5bc5 Fix to WorkflowDefinitionType - ignore working copy
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@6778 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2007-09-13 16:05:55 +00:00
Jan Vonka
f161572b1e Workflow updates to support deployment of a workflow definition sourced from the repository (ie. node of type bpm:workflowDefinition)
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@6770 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2007-09-12 21:26:12 +00:00
Jan Vonka
8fcf3da049 MT fix to check domain when switching user in the Workflow console
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@6765 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2007-09-12 14:47:55 +00:00
Derek Hulley
f4f0f51a7d Merged V2.1 to HEAD
6609: Portlet UI (doclist, myspaces, mytasks) updates following design review
   6610: AR-1270
   6611: debugging WCM-778.
   6612: Improved API documentation.
   6613: Added store lookup cache to EHCache config for default and extended cluster sample
   6614: AWC-1531 and AWC-1146. Link objects that have targets which the user does not have access to are now filtered from the view.
   6615: AR-1664: Bootstraping from full export fails if file names differs only with a space: my file, my file
   6616: Fixed AR-1519: Possible duplicate entries when moving nodes between stores
   6617: Removed deprecated aspects; Added emailed aspect to messages; Added OOo command line options
   6618: Fix for AWC-1350
   6619: Fix for AWC-1509
   6620: AWC-1179: Searching for users in Invite User Wizard is slow with large number of users
   6621: Changed shutdown logic to avoid classloader cleanup race.
   6622: Fix for AWC-1533 (can't save office docs to Company Home)
   6623: Fix for AR-1705
   6624: Better fix for AWC-1256 (links generated by tinyMCE editor)
   6625: Fixed AR-1713: Transformers that do nothing don't break full text indexing
   6626: Fixed AWC-1438: Added explcit TXT to PDF converter that wraps the PDFBox TextToPDF class
   6627: Portlet templates now handle missing description property on web form
   6628: Fix WCM-788
   6635: Make workflow available for users who cannot see company home
         Resolved conflicted state of 'root\projects\repository\source\java\org\alfresco\repo\workflow\jbpm\JBPMEngine.java'


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@6748 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2007-09-11 03:39:41 +00:00
Derek Hulley
1050a3cb98 Merged V2.1 to HEAD
6368: Change home folder provider to use User Homes and not company home
   6370: Fixed BDE-50: Empty line in the clean_tomcat.sh script file
   6373: Working copy nodes don't get sys:temporary aspect applied.
            Node archival ignores working copy nodes.
   6375: Fixed AR-1154: Benchmark override sample
   6377: Documentation updates.
   6379: Moved old installer files.
   6381: Fixed AR-782: Early detection of property conversion issues
   6382: Fixed AR-1414: Serializable property values are immediately disconnected from the client's instance.
   6384: Fix AR-1642 : Pooled task is not auto-assigned when task is completed by user, but user has not first 'taken ownership'
   6385: AR-1621 Workflow bootstrap is not sensitive to system read-only mode
            Resolved conflicted state of 'root\projects\repository\source\java\org\alfresco\repo\workflow\WorkflowInterpreter.java'


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@6726 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2007-09-10 15:21:52 +00:00
Jan Vonka
ab85be5821 Added getTaskDefinitions to WorkflowService - required for delete model validation
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@6693 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2007-09-06 17:10:39 +00:00
Jan Vonka
40b3a8b154 Updated Workflow Interpreter to extend from BaseInterpreter, in preparation for other console interpreters such as WebClientConfig admin console.
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@6662 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2007-08-31 14:55:24 +00:00
Glen Johnson
4c2aba1bd9 Workflow JavaScript API
-----------------------

Overview
--------
The WorkflowManager bean is available in the root scripting scope.
It provides a simplified object oriented API giving JavaScript scripts access to Workflow Service operations. Through the WorkflowManager object, scripts can do things like
- get latest versions of all deployed workflow definitions
- get assigned tasks, pooled tasks etc.
- get workflow paths
- get workflow instances
- start a new workflow instance
- delete a workflow instance, cancel a workflow instance
- get all tasks belonging to a workflow path
- end a task
- etc. etc.

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@6479 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2007-08-10 07:34:12 +00:00
Jan Vonka
5279ab5a22 - add new Message Service + hook into Workflow Service
- add Tenant Service hooks to Workflow Service
- MT bootstrap ordering fix


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@6476 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2007-08-09 17:13:22 +00:00
Derek Hulley
0d1bd57217 More for AR-460: System concurrency
There might be a few SDK projects that still use TransactionUtil, but this checkin gets rid of
its use otherwise.
I took a glance over the areas of the code that use UserTransaction directly and didn't see any
transactionally wrapped code that desperately needed to be put into a retry loop (i.e. write
transactions in a concurrent scenario).  If you spot any that you think might qualify, let me know.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@6220 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2007-07-12 04:15:28 +00:00
David Caruana
01098ee76e AR-1551 Oracle Constraint violation error submitting workflow in WCM
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@6156 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2007-07-04 11:25:02 +00:00
David Caruana
6f02a81027 Workflow: Fix issue where re-use of swimlane in a pooled task failed as the pooled task was immediately assigned an owner (the owner set previously in the swimlane).
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@6142 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2007-07-03 11:45:40 +00:00
David Caruana
12e8663942 Workflow: fix issue where explicit collection of people (not a group) could not be assigned to a pooled task
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@6057 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2007-06-21 16:44:38 +00:00
Derek Hulley
646d634f76 Fix for use with case-sensitive DB
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@5971 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2007-06-15 08:06:38 +00:00
David Caruana
bfaedb95ca Fix fallout from javascript/freemarker node conversion refactoring.
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@5963 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2007-06-14 18:11:23 +00:00
Jan Vonka
7d160bc4d9 - updated comment with correct eg workflow definition name
- fixed typo

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@5959 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2007-06-14 15:50:56 +00:00
Kevin Roast
f074450627 Script specific Node class renamed to ScriptNode.
SVN rename command used to ensure file history is kept.

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@5920 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2007-06-12 15:10:48 +00:00
David Caruana
8e38ff8253 Web Scripts:
- improved generated documentation (indexed by web script url & package)
- addition of ticket management web scripts
- addition of put, post & delete support to Web Script test server

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@5820 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2007-05-31 18:03:17 +00:00
David Caruana
ee7b890b2c Fix premature db access in initialisation of workflow interpreter.
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@5773 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2007-05-24 12:34:36 +00:00
David Caruana
504b174852 Workflow Console: automatically create workflow package and assignee variables on start of console (always required for testing, so saves some typing to create them manually.
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@5765 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2007-05-23 17:12:06 +00:00
David Caruana
1c46628575 Workflow Service: add support for task comment.
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@5763 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2007-05-23 16:15:07 +00:00
David Caruana
3682ff9474 - Workflow Service
-- addition of get process definition history
-- addition of get active timers (for a process definition)
-- addition of fire custom workflow events
-- addition of get process variables

- Workflow Console
-- addition of undeploy all versions of a process definition
-- addition of list all versions of a process definition
-- addition of list workflows for previous version of a process definition
-- addition of query tasks
-- addition of firing custom workflow event
-- addition of list timers
-- addition of show process variables

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@5754 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2007-05-22 17:48:11 +00:00
David Caruana
7649017ac0 Workflow Task Query - add order by task due date.
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@5721 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2007-05-18 12:53:42 +00:00
David Caruana
801ec46791 Workflow Service - addition of task query
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@5720 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2007-05-18 12:35:22 +00:00
David Caruana
a71b9e4191 WCM Content Launch:
- submit process now allows for delayed submissions (launch date may be entered during submit)
- in case of delayed submission, initiator is sent "submission pending" task with actions for cancelling submission and submitting now.  On launch date, submission is made, removing "pending" task from initiator.
- approved task is now submitted task

Fixes to jBPM Timers:
- fix to ensure task is ended when associated timer is fired
- fix to ensure Alfresco transaction is active when triggered node action is executed

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@5687 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2007-05-15 17:43:50 +00:00
David Caruana
7567867be1 - jBPM 3.1.2 to 3.2 upgrade
- Implementation of Workflow Timers (primarily for WCM content launch, but also useful in other scenarios)

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@5578 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2007-04-30 17:21:52 +00:00
David Caruana
d1283ac26a Fix AR-1323: NPE whilst returning ownership to pool
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@5400 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2007-03-19 14:40:22 +00:00
Derek Hulley
78d5d43e86 Merged V2.0 to HEAD
5178: WCM-336, checkin performance
   5182: Missing OpenSearch strings
   5183: AR-1126
   5185: OpenSearch externalized strings
   5190: Schema and xforms
   5191: WCM-343
   5205: NTML using incorrect auth component
   5210: No virtual server start
   5211: WCM-352, WCM-353
   5212: Manage Task Dialog issues


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@5332 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2007-03-07 15:04:21 +00:00
Derek Hulley
563ca10bea Merged V2.0 to HEAD
5091:  AWC-1118
   5092:  pooledactor assignment
   5100:  AWC-1133
   5103:  CML copy and cm:name
   5106:  Bubble view discussion topics
   5107:  AWC-1030, AWC-1137, Console buttons


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@5312 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2007-03-06 13:20:00 +00:00
Paul Holmes-Higgin
4e2300f095 Updated copyright
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@5186 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2007-02-19 17:17:36 +00:00
Derek Hulley
0c10d61a48 Merged V2.0 to HEAD
svn merge svn://svn.alfresco.com:3691/alfresco/BRANCHES/V2.0@5141 svn://svn.alfresco.com:3691/alfresco/BRANCHES/V2.0@51352 .
      - FLOSS
      - Some files will need a follow-up
         -root/projects/repository/source/java/org/alfresco/repo/avm/wf/AVMRemoveWFStoreHandler.java (not yet on HEAD: 5094)
         -root/projects/repository/source/java/org/alfresco/filesys/server/state/FileStateLockManager.java (not yet on HEAD: 5093)
         -onContentUpdateRecord (not on HEAD)


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@5167 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2007-02-16 06:44:46 +00:00
Paul Holmes-Higgin
31c250682b Changed licence headers
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@5081 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2007-02-08 18:59:58 +00:00
David Caruana
eab5595836 Workflow:
- Ensure group support is available to all users (i.e. fix up all permission errors)

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@4927 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2007-01-25 15:44:08 +00:00
David Caruana
bb5b7365f3 Workflow
- full "group" / "pooled task" sample workflow definitions (with UI dialogs)

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@4922 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2007-01-24 18:12:10 +00:00
David Caruana
211da07059 Workflow
- fix for XOR type joins where forked path were not ended properly and tasks on those paths were not removed

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@4919 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2007-01-24 15:36:53 +00:00
David Caruana
592bd8fbd6 - Example group / pooled workflow definitions
- Fix to workflow javascript when writing multiple variables back to process

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@4893 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2007-01-22 13:40:58 +00:00
David Caruana
d771c444a5 Workflow group / pooled tasks support
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@4892 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2007-01-22 10:34:18 +00:00
David Caruana
7dccfe18fb Workflow (server-side) groups support
- assignment of groups to pooled tasks
- retrieve group members added to javascript

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@4805 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2007-01-12 12:20:00 +00:00
David Caruana
eb3dd411ce - Fix WCM-205
- Add help for 'show my pooled' to Workflow Interpreter
- Remove unnecessary code added earlier for pooled task support

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@4786 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2007-01-10 18:55:56 +00:00
David Caruana
ff9d1f598f Workflow:
- Pooled task support

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@4782 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2007-01-10 15:40:59 +00:00
Derek Hulley
a67dce2f5e Merged 1.4 to HEAD (Repository support for Records Management)
svn merge svn://svn.alfresco.com:3691/alfresco/BRANCHES/V1.4/root/projects/repository@4306 svn://svn.alfresco.com:3691/alfresco/BRANCHES/V1.4/root/projects/repository@4307 .
   svn merge svn://svn.alfresco.com:3691/alfresco/BRANCHES/V1.4/root/projects/repository@4485 svn://svn.alfresco.com:3691/alfresco/BRANCHES/V1.4/root/projects/repository@4486 .
   svn merge svn://svn.alfresco.com:3691/alfresco/BRANCHES/V1.4/root/projects/repository@4532 svn://svn.alfresco.com:3691/alfresco/BRANCHES/V1.4/root/projects/repository@4533 .
   svn resolved source\java\org\alfresco\repo\jscript\Node.java
   svn resolved config\alfresco\action-services-context.xml


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@4664 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2006-12-19 17:12:47 +00:00
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
Derek Hulley
00e6c989fc Merged 1.4 to HEAD
svn merge svn://svn.alfresco.com:3691/alfresco/BRANCHES/V1.4@4316 svn://svn.alfresco.com:3691/alfresco/BRANCHES/V1.4@4317 .
   svn merge svn://svn.alfresco.com:3691/alfresco/BRANCHES/V1.4@4319 svn://svn.alfresco.com:3691/alfresco/BRANCHES/V1.4@4328 .


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@4652 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2006-12-19 12:18:46 +00:00
Derek Hulley
72bb79696d Merged 1.4 to HEAD
svn merge svn://svn.alfresco.com:3691/alfresco/BRANCHES/V1.4@4252 svn://svn.alfresco.com:3691/alfresco/BRANCHES/V1.4@4294 .
   svn revert root\common\common.xml
   svn resolved root\projects\repository\config\alfresco\script-services-context.xml


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@4634 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2006-12-18 13:45:11 +00:00
Derek Hulley
df4fd38e52 Merged 1.4 to HEAD
svn merge svn://svn.alfresco.com:3691/alfresco/BRANCHES/V1.4@4145 svn://svn.alfresco.com:3691/alfresco/BRANCHES/V1.4@4146 .
   svn merge svn://svn.alfresco.com:3691/alfresco/BRANCHES/V1.4@4159 svn://svn.alfresco.com:3691/alfresco/BRANCHES/V1.4@4160 .
   svn merge svn://svn.alfresco.com:3691/alfresco/BRANCHES/V1.4@4164 svn://svn.alfresco.com:3691/alfresco/BRANCHES/V1.4@4165 .
   svn merge svn://svn.alfresco.com:3691/alfresco/BRANCHES/V1.4@4165 svn://svn.alfresco.com:3691/alfresco/BRANCHES/V1.4@4166 .
   svn merge svn://svn.alfresco.com:3691/alfresco/BRANCHES/V1.4@4176 svn://svn.alfresco.com:3691/alfresco/BRANCHES/V1.4@4178 .
   svn merge svn://svn.alfresco.com:3691/alfresco/BRANCHES/V1.4@4179 svn://svn.alfresco.com:3691/alfresco/BRANCHES/V1.4@4181 .
   svn merge svn://svn.alfresco.com:3691/alfresco/BRANCHES/V1.4@4145 svn://svn.alfresco.com:3691/alfresco/BRANCHES/V1.4@4146 .


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@4630 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2006-12-18 11:21:44 +00:00