48 Commits

Author SHA1 Message Date
Derek Hulley
f047c6baaf Merged DEV\EXTENSIONS to HEAD
svn merge svn://svn.alfresco.com:3691/alfresco/BRANCHES/DEV/EXTENSIONS@4868 svn://svn.alfresco.com:3691/alfresco/BRANCHES/DEV/EXTENSIONS@4869 .
   svn merge svn://svn.alfresco.com:3691/alfresco/BRANCHES/DEV/EXTENSIONS@4904 svn://svn.alfresco.com:3691/alfresco/BRANCHES/DEV/EXTENSIONS@4938 .
   Module management support
   Modularization of Records Management


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@4956 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2007-01-29 14:43:37 +00:00
David Caruana
f011e13683 Fall back to selectNodes if a path contains a predicate.
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@4809 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2007-01-12 14:23:38 +00:00
Derek Hulley
db240fef48 More robust handling of transaction and authentication exceptions
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@4711 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2007-01-03 14:46:21 +00:00
Kevin Roast
4003f0e36f . Big and juicy application/WCM model refactoring
- WARNING: this change requires a new DB as the WCM model has changed significantly, yes I have probably broken a few WCM things :)

Previously the following statements were true:
 - Most of the model constants were defined in the ContentModel class - including web-client Application specific model items
 - WCMModel class was a mix of WCM repository and WCM application model constants
 - The applicationModel.xml definition file contained both web-client Application and WCM application model definitions
 - The wcmModel.xml definition file contained both WCM repository and WCM application model definitions

The following statements are now true:
 - All web-client application specific model constants have been moved from ContentModel to a new model constants class ApplicationModel
 - A new WCM application model has been defined with the prefix "wca" and URI: http://www.alfresco.org/model/wcmappmodel/1.0
 - All WCM application specific model constants have been renamed/moved from ContentModel/WCMModel to a new model constants class WCMAppModel
 - The mix of WCM application specific model definitions in contentModel.xml and applicationModel.xml has been moved to a new definition file wcmAppModel.xml
 - A patch is not required for standard Alfresco as only WCM definitions have actually changed

. Fix to issue created during workflow id/name refactor
. Fix to allow forms in the Available Content Forms panel to have correct sandbox/username context for action dialog

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/WCM-DEV2/root@4448 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2006-11-27 15:03:12 +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
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
7d940d08e1 Big hunk of merge.
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/WCM-DEV2/root@3265 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2006-06-28 17:31:18 +00:00
Britt Park
7f79a2a498 Merged up to HEAD.
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/WCM-DEV2/root@3129 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2006-06-16 19:18:30 +00:00
Britt Park
bfd0d2a337 Afternoon merge.
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/WCM-DEV2/root@2915 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2006-05-17 22:42:03 +00:00
Britt Park
1d601e1be7 Morning merge.
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/WCM-DEV2/root@2889 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2006-05-14 16:21:55 +00:00
Britt Park
4b881e72ad Daily merge.
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/WCM-DEV2/root@2882 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2006-05-12 20:22:46 +00:00
Britt Park
a22ddfb666 Morning merge.
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/WCM-DEV2/root@2851 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2006-05-11 17:01:57 +00:00
David Caruana
76740ffe1c Addition of Developer SDK bundle to continuous build.
- creation of SDK project
- Allow ACP files to be imported from .jar

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@2799 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2006-05-09 17:48:30 +00:00
Derek Hulley
dcc4be56cb Added optional user authentication to FileImporterTest
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@2796 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2006-05-09 10:25:39 +00:00
Derek Hulley
1119bdd44e Fix up comments to keep in line with recent changes to the main() method arguments
Some javadoc fixes where necessary


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@2794 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2006-05-09 07:58:04 +00:00
David Caruana
166de93b48 Fixes for supporting full repository export/import.
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@2625 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2006-04-05 19:14:20 +00:00
David Caruana
701657f2f1 Full Repository Export / Import Support - first checkpoint
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@2591 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2006-03-30 18:38:03 +00:00
Derek Hulley
d4d33c1e34 Merge V1.2.0 BRANCH to HEAD
svn merge -r 2566:2569 svn://www.alfresco.org/alfresco/BRANCHES/V1.2.0/root HEAD/root


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@2570 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2006-03-22 16:21:14 +00:00
Derek Hulley
506e408ca7 Merge V1.2.0 BRANCH to HEAD
svn merge -r 2519:2565 svn://www.alfresco.org/alfresco/BRANCHES/V1.2.0/root HEAD/root


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@2566 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2006-03-22 12:23:43 +00:00
David Caruana
4e46906b91 - Fix AR-442 Error performing background import of several .acp files - ConcurrentModificationException
- Support Import of ACP files that have Guest permission reference (re-map to Consumer)

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@2460 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2006-02-21 19:29:42 +00:00
David Caruana
cab7aa3b4e AW-542 Guest user can not see any Categories
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@2456 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2006-02-21 16:12:12 +00:00
David Caruana
f63e898993 Fix build issue - ImporterComponentTest failure.
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@2423 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2006-02-17 10:10:38 +00:00
David Caruana
6cb16abef4 Fix AR-431, AR-432.
Modified the Repository bootstrap mechanism so it's performed after all other initialisation and the order of bootstrap is explicit.

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@2414 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2006-02-16 15:11:53 +00:00
David Caruana
c25759542b Fix for sample user bootstrap extension (6000 user example for Novell) which failed in enterprise build. Change order of bootstrap so that user store is created first. Also added log flag to importerBootstrap allow debug output for bootstrap without first unpacking war file to adjust log4j properties.
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@2371 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2006-02-14 14:59:19 +00:00
David Caruana
286e173539 - Example demonstrating how to extend bootstrap data set (Users).
- Modified bootstrap Spring bean definitions allowing easier extension
- Modified importer bootstrap to allow import from .acp files (currently only supports .acp file in filesystem, not .jar)

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@2344 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2006-02-10 18:49:45 +00:00
David Caruana
70e55cebd5 AR-380 - Export/Import of Forums/Discussions failed.
AR-395 - Provide abstract bean definition for DictionaryBootstrap
Fix build issue; JCR Import failed due to recent extension config changes
Fix issue in ISO9075 encoder; failed to encode colon properly meaning that Discussion Posts (with have colon seperated dates in their name) were not importing/exporting.

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@2299 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2006-02-05 16:25:30 +00:00
Derek Hulley
21eab8566f Tool to run the repository standalone (useful for CIFS and FTP server testing)
Importer no longer flushes integrity events
Improvement to one-jar ant script
Changed bean local references to normal references in scheduler


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@2286 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2006-02-02 14:50:18 +00:00
David Caruana
ac583e0765 Fix AR-379 - checked-out items lose their copiedFrom aspect
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@2278 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2006-02-01 16:37:11 +00:00
David Caruana
3129923af7 Fix AR-378 - Items with multiple categories export successfully but when imported, only one category is set.
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@2269 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2006-01-31 18:52:25 +00:00
David Caruana
89abae6099 Fix AR-377 - able to export everything regardless of permissions (run in background = false).
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@2260 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2006-01-31 13:06:04 +00:00
David Caruana
a0bab2238c Fix issue where importer failed to find correct xml meta-data file when an .acp file contained exported xml files. The importer would start parsing the last xml file found in the .acp file and generally barf with an exception that was bemusing.l
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@2249 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2006-01-30 12:31:14 +00:00
David Caruana
c131dd7dec Fix issue where imported content does not have associated binary content stream (i.e. fixes "ContentData does not have a content url" error).
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@2232 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2006-01-27 16:46:07 +00:00
David Caruana
b7aec4a280 Importer - allow imported node references/paths to be searched for within committed repository only or committed repository and current import transaction.
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@2202 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2006-01-25 15:41:19 +00:00
Andrew Hind
68ae6ef330 Ldap progress and user/person search
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@2201 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2006-01-25 14:17:41 +00:00
David Caruana
e4ca1dfb9f Fix missing checkin
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@2197 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2006-01-25 11:05:58 +00:00
Derek Hulley
27c3652b85 Temporary build fix
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@2191 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2006-01-25 08:35:42 +00:00
David Caruana
91b4de1563 Provision of simple import statistics - e.g. duration of import, count of nodes/props/etc imported.
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@2188 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2006-01-24 18:47:24 +00:00
David Caruana
2a897f877d Fix to handle .acp files which have been updated with via a zip tool.
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@2180 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2006-01-23 18:51:32 +00:00
David Caruana
c0524bd3cc Addition of Import references; allows...
- secondary child links (or multiple parents)
- update of existing items

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@2171 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2006-01-21 19:14:16 +00:00
Derek Hulley
1a7f5244ea Removed rollback calls within bootstrap as it was rolling back the entire transaction state and therefore not allowing any tests to get started
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@2145 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2006-01-19 12:22:54 +00:00
Derek Hulley
572f151402 Fallout from Spring upgrade
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@2138 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2006-01-18 16:30:33 +00:00
Andrew Hind
4408850b7a Guest and LDAP progress
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@2127 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2006-01-17 14:17:39 +00:00
David Caruana
985138446c Addition of Update Node import strategy
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@2110 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2006-01-13 16:01:38 +00:00
David Caruana
4fd84a9595 Import permissions and permission inheritance.
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@2108 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2006-01-13 15:22:15 +00:00
David Caruana
dbb20b17ab Support for different import strategies:
- replace existing
- remove existing
- throw error on conflict

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@2027 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2005-12-12 17:05:30 +00:00
David Caruana
f89817cf12 1) Do not import copied from references
2) ACP zip file now contains content files with appropriate extension for easy viewing of content

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@2018 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2005-12-09 13:44:37 +00:00
David Caruana
7be4e3ef83 System View Import
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@2013 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2005-12-08 18:57:52 +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