105 Commits

Author SHA1 Message Date
Derek Hulley
751fcbb1fa Merged V2.2 to HEAD
7307: Re-enabled ability to perform deployments against new model
   7278: Added friendly server name property to model and refactored view deployment report dialog
   7272: Patch for new deployment features


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@8245 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2008-02-11 13:19:19 +00:00
Jan Vonka
14ef325e93 MT - simpify tenant deployer service (subsume tenant service)
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@8244 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2008-02-11 11:53:56 +00:00
Derek Hulley
1f36c62b18 Merged V2.2 to HEAD
7266: Updates to JMX-based admin
   7270: Add JMX-managed attribute 'maxUsers' and related startup property (server.maxusers)


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@8243 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2008-02-11 11:21:42 +00:00
Derek Hulley
17b806c6c0 Merged V2.2 to HEAD
7260: Basic JMX sys admin - to manage session/tickets and server modes such as read-only and single-user


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@8242 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2008-02-11 11:07:46 +00:00
Derek Hulley
9fe73fc97c Merged V2.2 to HEAD
7051: Add ability to change log levels at runtime via JMX console - using Log4j's HierarchyDynamicMBean.
   7055: AR-1821. Also related to CHK-1583.
         Manual merge and fix of line endings


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@8225 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2008-02-08 12:03:57 +00:00
Jan Vonka
e1abbcc7a4 MT - fix AR-2036
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@8124 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2008-01-30 14:16:50 +00:00
Jan Vonka
92919aa931 Dynamic Models - minor, validate message resource bundle exists in repo
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@8055 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2008-01-22 12:49:50 +00:00
Jan Vonka
cf5d4c650c Dynamic models - validate message resource bundle exists (when reloading)
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@7680 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2007-12-17 11:02:39 +00:00
Jan Vonka
b33696652a DM forms - fix for fresh bootstrap
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@7402 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2007-11-16 20:19:06 +00:00
Derek Hulley
306e626cec Merged V2.2 to HEAD (V2.1 sourced)
7127: Merged V2.1 to V2.2
      7118: Fixed overly-eager applicability of patches brought forward from previous releases
      7119: Fixed SQL script patch schema numbering
   7245: Merged V2.1 to V2.2:
      7238: Serializes alfresco->alfresco deployments to the same target.
      7241: Added AVM index tracking into the built-in, cron-controlled config.
      7242: More DEBUG messages for index tracking, where required.
      7243: Fix for url encoding issue as found by by Ishii Akinori
   7372: Merged V2.1 to V2.2
      7289: Fix for AWC-1542 where utf-8 characters not displaying correctly in RSS feed output
      7300: Bumped up session size management values to reduce potential issues with mix-style, shorter transactions.
      7303: Portlet updates for MSIE problems in Liferay.
      7304: Added the <cifs-url-suffix>. AWC-1671.
      7317: Fix OO shutdown
      7319: Catch for raising rule executions using null NodeRefs.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@7374 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2007-11-13 03:19:12 +00:00
Derek Hulley
dd06e3166b Merged V2.2 to HEAD (V2.1 sourced fixes)
7121: Merged V2.1 to V2.2
      7049: Fix for unreported duplicate component ID error (very rarely seen) in browse WCM sandbox JSP
      7058: Fixes failure to rollback correctly on failed alfresco->alfresco deployment.
      7074: Added filtering/access control checks to the AVM virtualization view.
      7083: Added transaction handling to calls involving preview store
      7084: xmlsec library update to 1.4.1
      7092: Missing config update from the AVM filtering checkin.
   7124: Merged V2.1 to V2.2
      7091: Fix to several issues found with Regenerate Renditions wizard and FormsService
   7125: Merged V2.1 to V2.2
      7093: Fixes to workaround some deployment issues being experienced by a customer.
      7094: Fix for previous build failure


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@7373 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2007-11-13 02:41:28 +00:00
Derek Hulley
0ddb624acf Merged V2.1 to HEAD
6958: Fix for WCM-823
   6959: Merged V1.4 to V2.1
      6943: Upgrade scripts for transaction commit time and indexes for QName columns on alf_child_assoc
   6960: Fixed script patch "applied on" date updates.
   6961: Retry transactions on ConstraintViolationException.
   6964: Added svn revision number to be substituted into build string if build number is not passed.
   6965: Daylight savings for FTP. Fix for AR-1776.
   6966: Added catch blocks for the AVMLockingException. WCM-877.
   6967: Interim fix for WCM-866 (large link validation report causes SQL exception)
   6968: Fixes for AWC-1309 "Broken preview image for Web Projects in MySpaces" and similar AWC-1635 "Broken/Missing images in MySpaces Web Script".
   6970: Force DB write ordering of the NodeStatus vs Node object.
   6971: More transaction demarcation fixes for special cases of non-executed script patches.
   6972: Switch off session size management for the mass archive and restore test.
   6973: Fixed AR-1801: Boolean isMultiValued() no longer returns null


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@7370 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2007-11-13 00:24:19 +00:00
Derek Hulley
bfcb186478 Merged V2.1 to HEAD
6938: Fix for WCM-864 (bulk import of ZIP containing only directories and no files)
   6939: Fix for AWC-1602. Workaround for MSIE7 DOM access methods in Javascript.
   6942: Fixed bug in transaction demarcation around the patch service.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@7349 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2007-11-12 14:40:12 +00:00
Derek Hulley
dc98a19382 Merged V2.1 to HEAD
6910: Fix for WCM-858, actions for files with an apostrophe in the name emit JavaScript errors
   6916: Fix to layout when My Spaces portlet follows on same page
   6919: Fix for AWC-1367 and AWC-1627
   6923: Added suport for datetime tokens in the lucene inedx
   6925: Fix for WCM-810
   6930: Fix for WCM-854
   Moved schema version to 110 and adjusted patch accordingly.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@7343 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2007-11-12 14:08:11 +00:00
Derek Hulley
d145180099 Benchmark client zip and reporting fixes.
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@6845 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2007-09-20 18:55:54 +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
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
Derek Hulley
e3e2711e29 Merged V2.1 to HEAD
6327: Drops alfresco-deployment.zip in build/dist instead of build.
   6328:Set AVM file name requirements as lenient as possible.
   6329: Fixed DNS name restriction to allow 1-char host labels.
   6330: Setting read-only flag for start up components (AR-1621 and AR-193)
   6331: Minor formatting
   6332: Implementation of a read-only, HTTP-based ContentStore.
   6333: AR-1619: A debug message needed changing as the FileFolderService now supports adding children onto system nodes.
   6334: Build fix
   6335: Fix for AWC-1447 (Office Add-In - Create Collaboration Space)
   6337: Fixed AR-1622: WebService requests must be wrapped in retries


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@6721 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2007-09-10 13:09:30 +00:00
Jan Vonka
3b58addf08 Dynamic model activation / deactivation - via WebClient UI or RepoAdmin console - also verified in MT env
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@6712 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2007-09-10 11:37:01 +00:00
Jan Vonka
a03df08f5e First-cut validation of dynamic model changes
- in case of re-deploy (dynamic update) check for incremental updates only
- in case of undeploy (dynamic delete) check for type/aspect usages (in content and workflows)

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@6698 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2007-09-07 11:32:51 +00:00
Jan Vonka
4ba6200dd3 Couple of RepoAdmin fixes
- reload models syntax error
- get models not being listed with correct details

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@6687 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2007-09-06 11:35:06 +00:00
Jan Vonka
9f539ce6e7 First-cut RepoAdmin Service for managing models & messages in the repo (not yet enabled)
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@6682 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2007-09-05 17:18:23 +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
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
Derek Hulley
25411a888b Merged V2.0 to HEAD
5910: Web Services getUsers
   5913: Web Services admin user password change
   5956: LDAP anon simple bind test
   6133: WCM-486
   6158: Merged V1.4 to V2.0
      5600: Split person bootstrap
      5642: AR-439 NetBIOS adaptor status request
   6160: VersionHistoryPerformance patch with no versionedNodeId


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@6166 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2007-07-04 16:03:31 +00:00
Britt Park
8aa69caee3 Performance tweaks for AVM Indexing.
Removed calls to getXXXPaths().
Changed mappings of properties and aspects on AVM Nodes to
favor get all calls. 
Added getAspects() and getNodeProperties() which take
AVMNodeDescriptors.
Used these in AVM Indexing to reduce the number of redundant full lookups.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@6121 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2007-06-27 18:24:05 +00:00
Britt Park
cf0685b7ef Change to mapping of AVM aspects.
This seems to make indexing a bit quicker, and at least doesn't make other things
slower. Bulk import now just sucks; it used to be an order of magnitude suckier.
98% of that is due to Andy's recent changes.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@6103 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2007-06-26 01:15:39 +00:00
Derek Hulley
ecd81e37a2 Fixed AR-1525: Version root doesn't have the required aspect.
The patch execution evaluation is done again if the patch was not executed - even if it was considered for execution before.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@6038 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2007-06-20 18:50:25 +00:00
Britt Park
b4dfe11644 Patch for AVMLockingService. I think I even did it right.
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@6025 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2007-06-19 23:51:04 +00:00
David Caruana
06e84d5690 - Addition of generic workflow deploy patch
- Patch for re-deploying new WCM submit process

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@6015 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2007-06-19 13:23:19 +00:00
Derek Hulley
e670eabfad Javadoc: Fixed @inheritDoc to be {@inheritDoc}
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@5965 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2007-06-14 18:18:53 +00:00
Derek Hulley
fb069d1680 Merged DEV/DEREK_2.1 to HEAD
- Removed Node.parentAssocs mapping
 - Added parentAssocs transactional cache to NodeDAO
 - Added concurrency detection to TransactionalCache
 - Fixed cluster sample config


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@5948 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2007-06-13 23:50:14 +00:00
Derek Hulley
7956a08df8 Fix for AR-1430: Table name too long for Oracle
- Shortened table name
 - A new table will be created, so reintroduced the patch under a new ID and target version 56


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@5942 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2007-06-13 19:55:22 +00:00
Andrew Hind
4bd5b0266c Index rebuld and vlidation support for AVM.
Added AVM indexes to the configuration checker

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@5818 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2007-05-31 14:15:12 +00:00
Derek Hulley
652bed012c Fixed AR-1425: Patches that weren't successfully executed are now re-examined for applicability.
Changed the applicability version numbers of several patches that were merged over from V2.0.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@5672 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2007-05-14 16:03:34 +00:00
Britt Park
656f297ebb Patch for recent Layered lookup changes.
Miscellaneous cleanups noticed on the way.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@5586 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2007-05-01 17:23:17 +00:00
Derek Hulley
6d39078356 Added copy and delete of registry keys
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@5557 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2007-04-26 08:27:23 +00:00
Derek Hulley
766c19b128 Merged V2.0 to HEAD
5491: AWC-1154 WCM Workflows
   5507, 5511: AVMGuidPatch


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@5542 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2007-04-25 02:02:30 +00:00
Derek Hulley
d6e56b62a4 Merged V2.0 to HEAD
5466, 5471-5475: ModuleManagementTool enhancements


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@5487 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2007-04-12 02:52:48 +00:00
Derek Hulley
0570c77f46 Merged V2.0 to HEAD
5457: Merge error on copy web project action
   5459: AR-1278
   5461:
   5462: A few deployment fixes
   5469: Dictionary messages
   5470: L2 cache checks
   5478: WCM-374


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@5485 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2007-04-12 02:02:42 +00:00
Derek Hulley
4ea83f7f2b Merged V2.0 to HEAD
5448: (From V1.4)
      5281 (V1.4): Patches not executed in read-only mode
      5284 (V1.4): Integrity messages
      5308 (V1.4): Category selector performance
      5331 (V1.4): Category performance
      5402 (V1.4): AR-1315
      5410 (V1.4): 
      5417 (V1.4): Upgrade script performance
      5435 (V1.4): Lucene test text encoding


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@5482 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2007-04-11 23:24:00 +00:00
Derek Hulley
f43d8864cb Merged V2.0 to HEAD
5425: AR-1309
   5426: AR-1342
   5427: AWC-1157


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@5480 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2007-04-11 21:46:19 +00:00
Derek Hulley
f17fd30824 Merge V2.0 to HEAD
5234: LicenseService shutdown
   5256: AR-1273 workaround
   5289: AWC-1142
   5294: WCM-360
   5296: Potential NPE in patches dao


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@5333 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2007-03-07 15:14:46 +00:00
Derek Hulley
2e252ee520 Merged V2.0 to HEAD
svn merge svn://svn.alfresco.com:3691/alfresco/BRANCHES/V2.0@5212 svn://svn.alfresco.com:3691/alfresco/BRANCHES/V2.0@5220 .
      - Installer updates (minor)
      - VersionService implementation


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@5221 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2007-02-27 01:01:03 +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
b2037c66e2 Merged V2.0 to HEAD
svn merge svn://svn.alfresco.com:3691/alfresco/BRANCHES/V2.0@5158 svn://svn.alfresco.com:3691/alfresco/BRANCHES/V2.0@5160 .
      - Fix WCM-190
      - License header


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@5172 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2007-02-16 16:15:55 +00:00
Derek Hulley
b4e48157f5 Merged V2.0 to HEAD
svn merge svn://svn.alfresco.com:3691/alfresco/BRANCHES/V2.0@5154 svn://svn.alfresco.com:3691/alfresco/BRANCHES/V2.0@5155 .
      - Installer script cleanup
   svn merge svn://svn.alfresco.com:3691/alfresco/BRANCHES/V2.0@5156 svn://svn.alfresco.com:3691/alfresco/BRANCHES/V2.0@5157 .
   svn merge svn://svn.alfresco.com:3691/alfresco/BRANCHES/V2.0@5162 svn://svn.alfresco.com:3691/alfresco/BRANCHES/V2.0@5163 .
   svn rm --force root\projects\repository\config\alfresco\dbscripts\create\1.4\org.hibernate.dialect.Dialect\post-create-indexes.sql
   svn rm --force root\projects\repository\config\alfresco\dbscripts\create\1.4\org.hibernate.dialect.MySQLInnoDBDialect\post-create-indexes.sql
      - Fix AR-1225: Upgrade and install indexes


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@5171 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2007-02-16 16:10:44 +00:00
Derek Hulley
f484e98638 Merged V2.0 to HEAD
svn merge svn://svn.alfresco.com:3691/alfresco/BRANCHES/V2.0@5146 svn://svn.alfresco.com:3691/alfresco/BRANCHES/V2.0@5147 .
      - WCM-225
   svn merge svn://svn.alfresco.com:3691/alfresco/BRANCHES/V2.0@5149 svn://svn.alfresco.com:3691/alfresco/BRANCHES/V2.0@5151 .
      - WCM-339
      - 2 revisions


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@5170 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2007-02-16 15:56:51 +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
Derek Hulley
22f523d12b Merged V2.0 to HEAD
svn merge svn://svn.alfresco.com:3691/alfresco/BRANCHES/V2.0@5114 svn://svn.alfresco.com:3691/alfresco/BRANCHES/V2.0@5115 .
      - AR-942
   svn merge svn://svn.alfresco.com:3691/alfresco/BRANCHES/V2.0@5131 svn://svn.alfresco.com:3691/alfresco/BRANCHES/V2.0@5132 .
      - AR-1244
   svn merge svn://svn.alfresco.com:3691/alfresco/BRANCHES/V2.0@5127 svn://svn.alfresco.com:3691/alfresco/BRANCHES/V2.0@5128 .
      - AWC-1138


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@5165 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2007-02-16 05:30:09 +00:00