Commit Graph

63 Commits

Author SHA1 Message Date
Andrew Hind
7038f07076 Fix for MOB-1029: Read operations for zones should not create zones
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@14859 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2009-06-23 13:39:55 +00:00
Andrew Hind
de477c27df Add pattern based search for authorities constrained to zones
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@14829 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2009-06-22 12:45:00 +00:00
Andrew Hind
e3df62325d Extended zone support for multiple zones and added Authorities (including people) to zones. (MOB-762: Part 1)
WCM and Share groups are not in the default zones so they can be hidden in the UI.

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@14762 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2009-06-17 11:57:21 +00:00
Dave Ward
b76f5fe5e1 Fix failing unit test. Account for EMAIL_CONTRIBUTORS group in SimpleAuthorityServiceTest
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@14647 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2009-06-11 07:56:37 +00:00
Dave Ward
e5c375d103 Fix failing unit test. Cascade delete site groups on site deletion.
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@14641 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2009-06-10 15:20:05 +00:00
Dave Ward
5688516416 Added extra diagnostics to testAdminUser to find out why it fails in the build
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@14612 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2009-06-09 19:18:43 +00:00
Dave Ward
067bcc25a6 Fix authority-related bugs
- migration patch uses non-public authority service
- root authority query ignores deleted nodes
- avoid exception for getContainingAuthorities("System")
- update unit test to cope with corrected EMAIL_CONTRIBUTORS group and slight difference in behaviour with root authorities

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@14609 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2009-06-09 17:17:23 +00:00
Dave Ward
d5e0432589 Merged BRANCHES/DEV/DAVEW/LDAP to HEAD
14587: Added new node service method getNodesWithoutParentAssocsOfType to public-services-security-context.xml (or at least my best guess at it!)
   14586: Use US spelling of synchronization in filenames for consistency
   14585: Lower the default user registry sync frequency to daily instead of hourly. Now users and groups are pulled over incrementally on login of missing users.
   14583: Unit test for ChainingUserRegistrySynchronizer
   14571: Migration patch for existing authorities previously held in users store
      - Uses AuthorityService to recreate authorities in spaces store with new structure
   14555: Authority service changes for LDAP sync improvements
      - Moved sys:authorities container to spaces store
      - All authorities now stored directly under sys:authorities
      - Authorities can now be looked up directly by node service
      - Secondary child associations used to model group relationships
      - 'Root' groups for UI navigation determined dynamically by node service query
      - cm:member association used to relate both authority containers and persons to other authorities
      - New cm:inZone association relates persons and authority containers to synchronization 'zones' stored under sys:zones
      - Look up of authority zone and all authorities in a zone to enable multi-zone LDAP sync
   14524: Dev branch for finishing LDAP zones and upgrade impact

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@14588 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2009-06-08 16:16:32 +00:00
Kevin Roast
8343b2a642 Fix for ALFCOM-2912 - group search now correctly handles double quotes in search terms
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@14522 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2009-06-03 14:13:40 +00:00
Mark Rogers
6e09838e9c Implementing Web Site Group Membership.
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@14342 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2009-05-18 12:44:04 +00:00
Andrew Hind
da0ea36dea Enable the cache - oops
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@14291 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2009-05-13 09:35:09 +00:00
Andrew Hind
6a43e8de20 Fix for ETHREEOH-1331: Caching of results from AuthorityService.getContainingAuthorities() needs improving to cache groups for non-immediate queries etc.
- caches all look ups

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@14237 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2009-05-07 16:18:40 +00:00
Mark Rogers
91a43578c8 Implementation of addition of trailing * in search groups pattern
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@13994 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2009-04-17 12:25:38 +00:00
Mark Rogers
82dd391580 Implementation of Group REST API - update methods.
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@13946 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2009-04-14 17:13:47 +00:00
Mark Rogers
14413ff7ee First cut REST group api - read methods working.
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@13891 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2009-04-07 15:36:16 +00:00
Mark Rogers
8b86152153 Build fix for breaking test case.
Bug fix invitation service was approving too many invitations! 
Implemented security rules for who is allowed to cancel a moderated invitation.
Continuing implementation of group authority scripts.

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@13815 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2009-04-02 16:35:31 +00:00
Dave Ward
facbdaf5b7 MOB-412: Decouple thread local authentication methods from AuthenticationComponent into new AuthenticationContext super-interface. The AuthenticationContext is a delegate of AbstractAuthenticationComponent and can be accessed directly by low-level classes (e.g. schema bootstrap) before the authentication subsystem is available.
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@13721 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2009-03-23 14:01:29 +00:00
Dave Ward
3179e8fdf2 Fix unit test failure. As per 13687 "administrator" is no longer an admin user name by default (admin user names are configurable per AuthenticationComponent)
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@13689 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2009-03-19 14:58:12 +00:00
Dave Ward
b6bb73fd22 Fix unit test failure. "administrator" is no longer an admin user name by default (admin user names are configurable per AuthenticationComponent)
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@13687 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2009-03-19 13:10:54 +00:00
Dave Ward
115b40d462 Merged DAVEW_V3.2 to HEAD
13659: Fix NTLMAuthenticationFilter to call super.afterPropertiesSet()
   13658: MOB-424: Utility to Dump JMX Data
      - new enterprise distributable jmx-dumper.jar
      - command line invocation via "java -jar jmx-dumper.jar"
      - admin web access via http://localhost:8080/alfresco/faces/jsp/admin/jmx-dumper.jsp
   13575: Preconfigured authentication stacks for alfresco, LDAP, Kerberos and NTLM. TODO: file server config.
   13493: Initial work to enable selection, configuration, testing and hot-swapping of different authentication subsystems via JMX or admin UI.
   13309: Changes to allow datasource and property configuration via JNDI
      - Move AVM catalina .jars into 3rd-party/lib/virtual-tomcat so that they don't get automatically included in the .war file and hence stop JNDI lookups from working
      - Allow JNDI lookup of datasource – use standard app server mechanisms for managing it but still fall back to 'normal' one
      - Allow properties to be overridden by JNDI env-entries as well as system properties. Including hibernate dialect ones. Web.xml can then declare required env-entries and these can be defined on deployment.
      - Rewire iBatis so that no config file edits are necessary when dialect is changed
      - Use proxy around datasource so that auto-commit is always activated for iBatis


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@13668 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2009-03-18 12:49:12 +00:00
Andrew Hind
2510f14ced Build Fix: MOB-587: New Query parser requires \ encoding
- temporary fix needs escpaing correctly

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@13643 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2009-03-17 10:06:35 +00:00
Andrew Hind
b3b960b03b Lucene upgrade to 2.4.1: MOB-587: First round of fixes for the query parser
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@13633 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2009-03-16 12:08:04 +00:00
Derek Hulley
198ebe371e Merged V3.1 to HEAD
13256: Fix ETHREEOH-1221   Hard-coded use of "admin" username
   ___________________________________________________________________
   Modified: svn:mergeinfo
      Merged /alfresco/BRANCHES/V3.1:r13256


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@13613 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2009-03-12 21:48:15 +00:00
Kevin Roast
ab97851b3a Merged V3.1 to HEAD
13249: Fix for ETHREEOH-1064 and ETHREEOH-1286 and fix for issue where New Page action not activated in Share Wiki page list.
   13251: Final part of fix for ETHREEOH-1270 - Group pickers in JSF client now use new findAuthorities() API to find groups for user searches - over 10x quicker for installations with many groups.

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@13580 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2009-03-11 19:51:09 +00:00
Kevin Roast
199672a511 Merged V3.1 to HEAD
13207: Rhino JAR update (System.out warning removal patch applied)
   13240: Part of fix for ETHREEOH-1270
          - Authority service has an API to search for groups by name patterns (not other authority types)
          - it uses lucene so relies on the index
   13242: Fix for ETHREEOH-1303 - Calendar events now only retrieved for the current site when rendering a site specific calendar component.
          Some code tidy up and related fixes.

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@13573 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2009-03-11 15:06:17 +00:00
Derek Hulley
e3503a6a88 Merged V3.1 to HEAD
12983: Merged V2.1-A to V3.1
      8668: Added authorityDisplayName
   12985: Merged V2.1-A to V3.1
      8706: (record-only) Build fixes after removing the guest user - DO NOT MERGE
   12990: Merged V3.0 to V3.1
      12922: Merged V2.2 to V3.0
         12555: Fix ETWOTWO-972 (Remove Lookup Cache)
         12558: Fix ETWOTWO-978 (L2 Cache removal for No Row Issues)
      12928: Merged V2.2 to V3.0
         11319: Fix for ETWOTWO-73 (missed merge ?)
   ___________________________________________________________________
   Modified: svn:mergeinfo
      Merged /alfresco/BRANCHES/V2.1-A:r8668,8706
      Merged /alfresco/BRANCHES/V3.0:r12922,12928
      Merged /alfresco/BRANCHES/V2.2:r12555,12558
      Merged /alfresco/BRANCHES/V3.1:r12983,12985,12990


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@13546 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2009-03-11 01:48:45 +00:00
Dave Ward
38d1d18085 Merged DEV/3.1_ENTERPRISE_ONLY to HEAD
12575: Fix broken SimpleAuthorityServiceTest. Extra admin group has increased the number of initial groups to 2.

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@12576 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2009-01-06 14:12:14 +00:00
Dave Ward
d6aca11a87 Merged DEV/3.1_ENTERPRISE_ONLY to HEAD
12562: JAWS-42: Allow mapping of the admin role to user groups

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@12564 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2009-01-06 11:41:48 +00:00
Jan Vonka
cd09266213 Merged V3.0 to HEAD
12145: Merged V2.2 to V3.0 (AuthenticationUtil)
    12109: AuthenticationUtil and AuthenticationComponent refactor
  12152: Removed Lucene usage from lookup of 'sites' root folder
  12153: Fix InviteServiceTest by cleaning up leaking authentications
  12159: Fix for broken usage pattern of the Threadlocal values in recent AuthenticationUtil refactor.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@12508 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2008-12-19 12:15:59 +00:00
Kevin Roast
16861e9117 Merged V3.0 to HEAD
12123: Merged V2.2 to V3.0
      11466: Fixed sql-query DELETE syntax
      11614: Flush after putChild, fix for ETWOTWO-777
      11641: Merged V2.1 to V2.2
         11632: Improvements for AVM index FULL and AUTO rebuild. 
      11646: Upgrade scripts tweaks:
      11650: Added unit test to confirm fix of ETWOTWO-740
      11674: Added missing EHCache definitions for QName, Namespace and Locale caches
      11825: Fixed Eclipse classpath addition of path for Oracle JDBC driver
   12125: ETHREEOH-899: Image transformations do not follow Options
   12127: Merged V2.2 to V3.0
      11675: Node DAO optimizations
      11680: Full Fix for ETWOTWO-777 + more protection for nested write transactions beneath read transactions.
      11729: AVM creates and deletes no longer update the directory mod time - ETWOTWO-801
      11738: Fix for ETWOTWO - fixed check for TX propagation mode
      11748: Fixed ETWOTWO-578: RepositoryWebService fetchMore() does not fetch last node
      11749: Incorporate feedback from ACT-5440: MySQL-specific tweaks to the upgrade scripts
      11750: Moved t_qnames_dyn section to after t_qnames
      11752: Fixed ETWOTWO-734: ImporterComponent uses Lucene queries
      11785: Build Fix:Remove auto created person TX commit fro DB
      11853: Fix for ETWOTWO-687 - missed a case when generating lists of actions for modified files list
      11940: Stress test main method for ETWOTWO-744
      11950: Fixed ETWOTWO-909 and ETWOTWO-911
      11987: Dirty checking for attribute related  DAOs
      12008: Fixed test for transaction-requiring AttributeService
   12128: Merged V2.2 to V3.0
      11530: Merged V2.1 to V2.2
         11499: Defensive clear of the security context to avoid any ticket sharing for a given user - ETWOTWO-326

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@12501 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2008-12-18 17:23:44 +00:00
Jan Vonka
d2748b308f Merged V2.2 to HEAD (re-merge of r11057)
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@11236 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2008-10-07 13:18:54 +00:00
Derek Hulley
c5f08a8f06 Merged V2.2 to HEAD
11053: Reinstate transaction count for FULL index recover
   11055: Build fix
   11056: Fix bug/Build - finding deleted people
   11057: Clean any people that should not be there at the start of the tests ..
   11063: Throw detailed failure message when Authority list size is incorrect
   11075: Build fix
   11145: Fixed FK index name


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@11222 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2008-10-06 23:32:49 +00:00
Derek Hulley
bccc560c44 Merged V2.2 to HEAD
7700: Added store level ACLs.
   7705: Merged V2.1 to V2.2
      7701: Fixes a number of problems with FS deployment. Should work on windows now.
   7712: AWC-1473: Fixed rendering of sidebar in Safari
   7718: Merged V2.1 to V2.2
      7704: Fix for HSQL column name clash - NEXT is reserved, so now NEXT_ID
   7719: Build fix after Qname changes
   7730: Build fix for email group.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@8446 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2008-03-07 00:57:50 +00:00
Jan Vonka
0a7fef92aa MT fixes to provide initial support for tenant-specific guests
- explicit guest access is required, such as "guest@tenant1" (note: implicit/anonymous guest access can only login to the default domain)
- also fixes issue with "Show All" users, when logged in as a tenant admin

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@7748 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2008-01-03 15:06:07 +00:00
Andrew Hind
245c9fda77 Test ifx for email group changes
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@7383 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2007-11-14 09:55:18 +00:00
Andrew Hind
5713632748 Test fix after adding email group to bootstrap
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@7377 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2007-11-13 12:21:56 +00:00
Gavin Cornwell
d744170713 Temporary disablement of test so the build can go through for demos
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@7288 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2007-11-03 22:25:23 +00:00
Britt Park
19d195c423 Backing out stuff that should have gone on its own branch.
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@6890 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2007-10-01 15:47:06 +00:00
Britt Park
fb81fb4470 Checkpoint of light weight ACLs.
This is a fairly brute force strategy that allows permissions evalutations
with essentially no db access. It does a number of 'bad' things and I may
rip it out completely.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@6788 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2007-09-14 12:39:07 +00:00
Derek Hulley
bcfd0ae519 Merged V2.1 to HEAD
6466: Xml metadata.  Support for pulling collections of values from XML
   6470: Fix for AWC-1321 - Using zero as items per page gives error for Alfresco repos in OpenSearch
   6471: Fix for AWC-1496 - OpenSearch dashlet can get in a state where search queries are not executed
   6472: Fix for AWC-1495. Searching additional attributes now working correctly for folders.
   6473: Fix for AR-1251 (Version error when saving new content via CIFS)
   6474: Updated bundles and installers - added missing files back into Linux bundle
   6475: LDAP and chainging authentication
          Resolved conflicted state of 'root\projects\repository\source\java\org\alfresco\repo\security\authentication\AuthenticationUtil.java'
   6477: XForms WCM-696.
   6478: Fix for WCM-567 (IndexOutOfBoundsException when stepping through wizard rapidly)
   6480: Fix to issue when removing locks on directories.
   6481: Updated installer and config wizard to fix download option and config behaviour when called from installer.
   6482: Fix for WCM-1229 (properties sheet does not refresh)
   6483: Fix for AR-1511
   6484: Fix for AR-1351
   6485: Missed a unit test update


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@6737 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2007-09-10 22:57:18 +00:00
Jan Vonka
9ed7b186f0 Tenant Service hooks for LockService, FileFolderService and other MT fixes (DbNodeService & AuthorityService)
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@6437 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2007-08-07 08:40:25 +00:00
Jan Vonka
65f660c26c - add TenantService hooks to org.alfresco.repo.security services
- Authentication, Person, Permission, Authority
- add user/tenant-based logging via log4j NDC (nested diagnostic context)

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@6399 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2007-08-02 10:56:30 +00:00
Andrew Hind
ca5cca799c Updated unit tests for name tokenisation
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@6109 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2007-06-26 14:27:27 +00:00
Andrew Hind
d8050806af Updates to the permission service to find nodes by permission assignment
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@6020 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2007-06-19 15:08:15 +00:00
Andrew Hind
2c2b000f3e Fixs for AR 1411, 1510, 1517
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@5982 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2007-06-15 15:41:45 +00:00
Britt Park
32d169b99b AVMLockingService is better tested now. Added isAdminAuthority() to
AuthorityService.  Can be removed if this is objectionable.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@5887 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2007-06-07 20:20:34 +00:00
Derek Hulley
4a44e4d3a2 Merged V2.0 to HEAD
5135: AR-1240 (AuthenticationComponent bean naming)


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@5324 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2007-03-07 09:59:47 +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