17 Commits

Author SHA1 Message Date
Mark Rogers
6bba4fe0e8 Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (5.0/Cloud)
84969: Merged PLATFORM1 (5.0/Cloud) to HEAD-BUG-FIX (5.0/Cloud)
      83756: ACE-2269	 - Allow AMPs to include literals in version number (e.g. -SNAPSHOT)


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@85284 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-09-20 09:56:48 +00:00
Greg Melahn
8ff70d0542 Added Annotation for Alfresco Public API per ALF-19471
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@55805 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2013-09-22 21:05:30 +00:00
Jan Vonka
da8bdafbcc Merged BRANCHES/DEV/CONV_HEAD to HEAD:
47880: Create branch for Cloud Convergence from the latest state of HEAD (Revision 47874)
   47886: Merged BRANCHES/DEV/CONV_V413 to BRANCHES/DEV/CONV_HEAD:
        33052: (RECORD ONLY) Branch for Enterprise 4.0 service pack development
        38002: (RECORD ONLY) Create branch for 4.1 Enterprise releases, based on 4.0.2
        38003: (RECORD ONLY) Update version to 4.1.0
        38079: (RECORD ONLY) Updated schema version to 5100
        38536: (RECORD ONLY) Merged V4.1-BUG-FIX to V4.1
             38219: ALF-14674: DOS voodoo to make start_deployment.bat work, as installed by Bitrock
             38344: ALF-14674: Deployment installer still doesn't work
             - Use ${installdir.escape_backslashes} instead of ${installdir}
             38471: ALF-14674: Deployment installer still doesn't work
             - Correction to use of ${installdir.escape_backslashes}
        39519: (RECORD ONLY) Merged PATCHES/V4.0.2 to V4.1
             38899: ALF-15005: Merged V4.0-BUG-FIX to PATCHES/V4.0.2
                37920: ALF-13816: Permission Denied on web-client browsing if parent does not inherit permissions
                   - FileFolderService getNamePath() now performs toFileInfo() as SystemUser.
             38900: ALF-15005: Merged V4.1-BUG-FIX to PATCHES/V4.0.2
                38549: ALF-11861: Maintain the same defuault root of WebDav for Alfresco 4.0 as was in pre-4.0
                   Removed overriding protocols.rootPath property from installer and enterprise overlay versions of alfresco-global.properties so that correct setting in repository.properties is used.
             39494: ALF-15213 / ALF-15170: Can't change folder permissions in Private or Public-moderated sites
                - Fix by Dmitry V
        44843: (RECORD ONLY) Created hotfix branch off V4.1 build 372 revision 44743 (candidate 4.1.2 release)
        45708: (RECORD ONLY) Merged PATCHES/V4.1.2 to PATCHES/V4.1.3
             45570: Merged V3.4-BUG-FIX to PATCHES/V4.1.2
                43939: ALF-17197 / ALF-16917: Merged PATCHES/V3.4.11 to V3.4-BUG-FIX
                   43896: MNT-198: Activity feeds get not generated in private sites for added files if username in LDAP-AD contains uppercase letters
                   - Now we can cope with a runAs where the username is in the wrong case
        45714: (RECORD ONLY) Merged BRANCHES/DEV/V4.1-BUG-FIX to PATCHES/DEV/V4.1.3
              45513: MNT-279: Use binary search in cached authority search to cut down search time when a group contains an astronomical number of authorities
              - Experimental fix to cut down on severe profiling hit
        45715: (RECORD ONLY) Merged BRANCHES/DEV/V4.1-BUG-FIX to PATCHES/V4.1.3
              44848: Fix for     ALF-17178 SolrLuceneAnalyser.findAnalyser generating InavlidQNameExceptions wher they are easily protected.
        46188: (RECORD ONLY) Merged BRANCHES/DEV/V4.1-BUG-FIX to PATCHES/V4.1.3
             46014: Fix for ALF-17732 - SWF files are considered insecure content and should not be displayed directly in the browser.
             46160: Fix for ALF-17759 - HTML files are stripped from metadata and style information after they are uploaded.
             46165: Fix for ALF-17787 - Site Members 'All Members' link should not run query immediately
             46169: Fix for ALF-17787 - Site Members 'All Members' link should not run query immediately - missing file
             46186: Fix for ALF-17786 - Site dashboard page issues too many requests (Site Members dashlet issues avatar requests when it doesn't need too)
        46242: (RECORD ONLY) Merged BRANCHES/DEV/V4.1-BUG-FIX to PATCHES/V4.1.3:
             46184: Refactoring a test class to use JUnit Rules - as part of attempt to reproduce ALF-17797.
             46192: Enhancement to JUnit Rule TemporaryNodes.java as required by fix for ALF-17797.
             46194: Fix for ALF-17797. AddFailedThumbnailActionExecuter is failing.
        46710: (RECORD ONLY) Create branch for Cloud Convergence from the latest state of 4.1.3 (RC5, Build 85, Revision 46648)
   47908: Merged from DEV/CONV_V143 to DEV/CONV_HEAD
        46788: Merged from BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413
           Merged BRANCHES/DEV/THOR1 to BRANCHES/DEV/CLOUD1:
              30323: (RECORD ONLY) Merged HEAD to BRANCHES/DEV/THOR1:
                 30171: ALF-9613: caching content store. Various improvements and bug fixes. Including:
              30325: THOR-114: S3 content store
              30326: THOR-128: S3 content store
              30333: THOR-139 F101: Get account for user e-mail id
              30335: Merge from THOR0 to THOR1
                 r30274: THOR-135 is email address accepted by Alfresco? Part One.  
              30340: THOR-99: Thor module - enable tests
              30341: Removing duplicate account-service-context.xml file.
              30343: Merge THOR0 to THOR1
                 30339: Test email singup in Share complete
                    30338: New form runtime features:
                       - Yellow background is displayed for mandatory fields without value
                       - Red background dis displayed for fields with validation errors
                       - Error message is displayed in a balloon when fields with error has focus
                       - Using balloons is now the default method of displaying errors
                       - Removed balloon code form create site menu since its now handled automatically
                       - An alternative to balloons are "error containers" (div with clickable red text labels focusing the field): setErrorContainer(divEl)
                       - Its possible to setMultipleErrors(true) to display all the forms/fields errors in the "error container"/ballon.
                       - Its possible to turn of the balloons and error containers complete by setting setErrorContainer(null)
                       - js validation handlers no longer needs to handle the messages OR the css classes for mandatory & invalid
              30344: Missing value check caused js undefined error
              30346: Minor css form fixes
              30347: THOR-126: S3 content store - do not swallow exceptions
              30348: THOR-66: disable unused services/features
              30349: THOR-137 F88: Add existing external user (from another network) checkpoint
              30350: THOR-135 Is email address accepted by Alfresco.
        46789: Merged from BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413
           35594: Fix merge issue
   47930: Merged BRANCHES/DEV/CONV_V413 to BRANCHES/DEV/CONV_HEAD:
        46762: (RECORD ONLY) Merged BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413:
        46768: (RECORD ONLY) Merged BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413:
        46769: (RECORD ONLY) Merged BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413:
        46778: (RECORD ONLY) Merged BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413:
        46780: (RECORD ONLY) Merged BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413:
        46786: (RECORD ONLY) Merged BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413:
        46791: (RECORD ONLY) Merged BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413:
        46792: (RECORD ONLY) Merged BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413:
        46808: (RECORD ONLY) Merged BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413:
        46809: (RECORD ONLY) Merged BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413:
        46819: (RECORD ONLY) Merged BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413:
        46829: (RECORD ONLY) Merged BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413:
        46839: (RECORD ONLY) Merged BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413:
        46842: (RECORD ONLY) Merged BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413:
        46844: (RECORD ONLY) Merged BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413:
        46846: (RECORD ONLY) Merged BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413:
        46847: (RECORD ONLY) Merged BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413:
        46876: (RECORD ONLY) Merged BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413:
        46877: (RECORD ONLY) Merged BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413:
        46878: (RECORD ONLY) Merged BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413:
        46879: (RECORD ONLY) Merged BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413:
        46880: (RECORD ONLY) Merged BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413:
        46881: (RECORD ONLY) Merged BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413:
   47947: Merged BRANCHES/DEV/CONV_V413 to BRANCHES/DEV/CONV_HEAD:
        46737: Merged BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413:
             35288: Alfresco Cloud (from BRANCHES/V4.0)
             35389: Merged BRANCHES/DEV/THOR1 to BRANCHES/DEV/CLOUD1:
                  30170: Thor branch based on Swift feature complete
                  30185: Merged BRANCHES/DEV/THOR0 to BRANCHES/DEV/THOR1:
                       28973: THOR-1: verify ability to create DB schema programatically on AWS RDS (for MySQL & Oracle)
                       28999: THOR-3: Tenant Routing Data Source (dynamic tenant-aware DB connection pools)
                       29022: THOR-1: verify ability to create DB schema programatically on AWS RDS (for MySQL & Oracle)
                       29031: THOR-1: verify ability to create DB schema programatically on AWS RDS (for MySQL & Oracle)
                  30186: Merged BRANCHES/DEV/THOR0 to BRANCHES/DEV/THOR1: (3 conflicts resolved)
                       29116: THOR-3: Tenant Routing Data Source (dynamic tenant-aware DB connection pools)
                       29174: THOR-24 Set up new Alfresco AMP module project.
                       29186: THOR-25 Copy and refactor Account Service from SambaJAM
                       29193: ImporterComponent - prep for THOR-7
                       29198: THOR-7:  Tenant Service API - Create Tenant (using separate DB schema)
                       29204: THOR-29 Account Type Registry
                       29234: THOR-7:  Tenant Service API - Create Tenant (using separate DB schema)
                       29246: THOR-7:  Tenant Service API - Create Tenant (using separate DB schema)
                       29251: THOR-30 Added AccountDAO interface along with two implementations:
                           AccountDAOImpl (not implemented) which will manage Account data in an RDB via iBatis.
                           AccountDAO_InMemory which manages AccountInfo in simple HashMaps for testing purposes only.
                       29258: THOR-28
                       29259: Addendum to THOR-25. Moved account-service spring config into a subfolder. (trivial)
             35393: (RECORD ONLY) Merged BRANCHES/DEV/THOR1 to BRANCHES/DEV/CLOUD1:
                   - fix up classpath (remove mybatis 1.0.0 -> 1.0.1 and chemistry 0.4.0 -> 0.6.0)
             35411: (RECORD ONLY) Merged BRANCHES/DEV/V4.0-BUG-FIX to BRANCHES/DEV/CLOUD1:
                  35409: Merged HEAD to BRANCHES/DEV/V4.0-BUG-FIX:
                       35399: ALF-12874: Schema reference files are out of date.
             35452: (RECORD ONLY) Merged BRANCHES/DEV/V4.0-BUG-FIX to BRANCHES/DEV/CLOUD1:
                   34219: Merged BRANCHES/DEV/THOR1 to BRANCHES/DEV/V4.0-BUG-FIX:
                       32096: THOR-429: Fix "MT: Thumbnail + Preview are not updated (after uploading new version)"
                       32125: THOR-429: Fix "MT: Thumbnail + Preview are not updated (after uploading new version)"
                   34220: Minor: follow-on to r34219 (ALF-11563)
                   34747: ALF-13262: adding missing indexes for new schema's (activiti-schema create) + schema patch for existing schema
                   35417: Merged BRANCHES/DEV/THOR0 to BRANCHES/DEV/V4.0-BUG-FIX: (THOR-6 / ALF-13755)
                       29356: THOR-6: MT is configured (but not enabled) by default - will be auto-enabled when first tenant is created
                       29455: THOR-6: build test/fix
                       29471: THOR-6: build test/fix
                   35423: Merged BRANCHES/DEV/THOR0 to BRANCHES/DEV/V4.0-BUG-FIX: (THOR-4 / ALF-13756)
                       29500: THOR-4: Replace Tenant attributes with Tenant table (alf_tenant)
                       29501: THOR-4: Replace Tenant attributes with Tenant table (alf_tenant)
                       29503: THOR-4: Replace Tenant attributes with Tenant table (alf_tenant)
   47949: Merged HEAD to BRANCHES/DEV/CONV_HEAD:
        47914: Merge fix for org.alfresco.repo.cache.AbstractAsynchronouslyRefreshedCache<T> R 46078, 46079, 46121
   47958: Merged BRANCHES/DEV/CONV_V413 to BRANCHES/DEV/CONV_HEAD:
        46746: Merged BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413:
             35455: Merged BRANCHES/DEV/THOR1 to BRANCHES/DEV/CLOUD1:
                  30187: Merged BRANCHES/DEV/THOR0 to BRANCHES/DEV/THOR1:
                       29260: THOR: Initial Tenant Admin Service REST API - create, delete, get (list) web scripts
                       29356: THOR-6: MT is configured by default
                       29366: THOR-59: selectively disable certain test suites (for THOR dev build plan)
                       29377: THOR-59: selectively disable certain test suites (for THOR dev build plan)
                       29398: Refactoring of code to remove deprecation warnings. Replaced lots of object.field accesses with object.getField() calls.Trivial changes, but with so many warnings I can't see the wood for the trees.
                       29400: THOR-59: selectively disable certain test suites (for THOR dev build plan)
             35456: Merged BRANCHES/DEV/THOR1 to BRANCHES/DEV/CLOUD1:
                  30188: Merged BRANCHES/DEV/THOR0 to BRANCHES/DEV/THOR1: 
                       29442: THOR-59: selectively disable certain test suites (for THOR dev build plan)
                       29453: THOR-59: selectively disable certain test suites (for THOR dev build plan)
                       29455: THOR-76: track THOR build test failures and fix-up
                       29471: THOR-76: track THOR build test failures and fix-up
             35459: Merged BRANCHES/DEV/THOR1 to BRANCHES/DEV/CLOUD1:
                  30189: Merged BRANCHES/DEV/THOR0 to BRANCHES/DEV/THOR1:
                       29473: Preliminary checkin for THOR-44. Created placeholder interface/impl/spring config for a new UserService.
                       29497: THOR-76: track THOR build test failures and fix-up ( LicenseComponentTest)
                       29500: THOR-4: Replace Tenant attributes with Tenant table (alf_tenant)
                       29501: THOR-4: Replace Tenant attributes with Tenant table (alf_tenant)
                       29503: THOR-4: Replace Tenant attributes with Tenant table (alf_tenant)
                       29511: THOR-59: selectively disable certain test suites (for THOR dev build plan)
                       29512: Adding a new JUnit4 test class with an @Ignore'd test in it - to see how Bamboo reports these.
                       29514: THOR: Initial Tenant Admin Service REST API - create, delete, list web scripts
                       29515: THOR-59: selectively disable certain test suites (for THOR dev build plan)
                       29521: THOR-79 - mark AVM sitestore as unindexed
             35461: Merged BRANCHES/DEV/THOR1 to BRANCHES/DEV/CLOUD1:
                  30190: Merged BRANCHES/DEV/THOR0 to BRANCHES/DEV/THOR1:
                       29533: THOR-59: exclude certain N/A tests
                       29555: THOR-76: track THOR build test failures
                       29630: Added ant build targets for Cloud Module and a new executable for the Alfresco devenv.
                       29664: THOR-76: exclude system test suites
                       29667: THOR-64: add initial support for tenant routing data source
                       29676: THOR-76: exclude intermittent ActionTrackingServiceImplTest (pending ALF-9773 & ALF-9774)
                       29677: THOR-80: MT-aware S3 content store
                       29678: THOR-80: MT-aware S3 content store
                       29680: THOR-80: MT-aware S3 content store
                       29693: THOR-80: MT-aware S3 content store
                       29694: THOR-80: MT-aware S3 content store
   47959: CONV_HEAD: CLOUD-1348 - comment back in MultiTDemoTest.testDeleteAllTenants
   47967: Merged BRANCHES/DEV/CONV_V413 to BRANCHES/DEV/CONV_HEAD:
        46748: Merged BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413:
             35464: Merged BRANCHES/DEV/THOR1 to BRANCHES/DEV/CLOUD1:
                  30195: Merged BRANCHES/DEV/THOR0 to BRANCHES/DEV/THOR1:
                       29774: Refactor Account DAO and Service. Boost Tests. Add appropriate headers.
                       29776: THOR-76: exclude intermittent ActionTrackingServiceImplTest (pending ALF-9773 & ALF-9774)
                       29795: Implemented MyBatis-backed Account DAO:
                       29817: Move (and rename) user service from repository to thor
                  30196: Merged BRANCHES/DEV/THOR0 to BRANCHES/DEV/THOR1:
                       29827: THOR-69: TenantAdminDAO
                       29832: THOR-78: fix tenantEntityCache (shared)
                       29834: THOR-111: experimental config option for S3 content store to support flat root (ie. all tenant files in single folder)
                       29856: THOR updates
                       29857: THOR-76: exclude build components/projects
        46761: Merged BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413:
             35478: Merged BRANCHES/DEV/THOR1 to BRANCHES/DEV/CLOUD1:
                  30198: Merged BRANCHES/DEV/THOR0 to BRANCHES/DEV/THOR1:
                       29869: THOR-92. BPMN2.0 workflow definition for account self-signup.
                       29871: THOR-93. REST API for self signup (and miscellaneous related items).
                       29882: THOR-102: Faster CreateTenant
                       29888: THOR-95. Placeholder email template for self-signup.
                       29889: Completion of THOR-95. Placeholder emails for self-signup.
                            Added a 'you've already registered' template.
                       29896: THOR-89F100: Create User Foundation API…
                       29912: Fix issue where module believed it was still executed after delete tenant
                       29940: THOR-96. First cut of a signup email sender delegate. This will be refined later - probably both in this sprint and the next.
                       29966: Fixing InvitationServiceImplTest failing tests, which are failing because the email templates are not there.
                       29978: THOR-89: Switch tenant for person creation
                       29982: THOR-89: Fix multi-domain account creation test after review with Jan
                       29983: THOR-102: Faster CreateTenant
                       29985: THOR-90: F99 Is email address already registred foundation API
                       29991: THOR-99: Thor module build/packaging
                       29994: Changes for THOR-92, THOR-93 and THOR-96.
                  30199: Merged BRANCHES/DEV/THOR0 to BRANCHES/DEV/THOR1:
                       29995: THOR-93. Use the proper sspring config in the test case.
                       29996: THOR-99: Thor module build/packaging
                       29997: Consolidated DaveC's EmailAddressService and my EMailUtil into a single feature.
                       29998: Follow-on to previous check-in (29997). Deletion of now-unused folder.
                       30000: Blatant attempt to get svn r=30k. Removing some dead config.
                       30001: THOR-96. Ensure that we get a meaningful exception when attempting to activate an account with no pending workflow for that email.
                       30036: Resolve issues with tenant-independent user store - can now login via Share
                       30041: Package and auto deploy of license with Thor module
                       30048: Ensure that when a duplicate email prevents a workflow from creating an account, that the workflow still ends gracefully.
                       30049: Removing a dead class that I'd used to see how our Bamboo handles @Ignore(message=msg) @Test annotations.
                       30054: THOR-84 F82: List Accounts Foundation API
                       30067: THOR-87 List Accounts REST API.
                       30069: THOR-87. Completion of listAccounts REST API.
                           Fixed the problems in the JUnit test case and tweaked the FTL slightly.
                       30071: Cosmetic changes as part of THOR-93.
                       30072: Oops. Broke a test case. Follow-on to previous (30071) check-in which cosmetically changed JSON as part of THOR-93.
                       30073: As part of THOR-93 (REST API signup) I have made the 2 webscripts usable without any authentication.
                       30074: Trivial fix to an error string.
                       30076: THOR-93. The account-activation.post webscript now includes the provided workflowInstanceId when identifying the ongoing workflow. 
                       30077: Fix Email validator to allow for example domains
                   30202: Merged BRANCHES/DEV/THOR0 to BRANCHES/DEV/THOR1:
                       30140: Refactor of account signup workflow
                       30142: No longer require email address for activation step of sign-up
                       30143: Remove use of task query in account signup workflow
                       30146: thor-share project structure
                       30147: Buildfix (removed modules not used by THOR)
                       30151: Incorporate already registered use case into account signup workflow
                       30152: Finally resolve license loading in Eclipse based tests
                   30203: Merged BRANCHES/DEV/THOR0 to BRANCHES/DEV/THOR1:
                       30184: Build box fix as a result of not including certian components
                   30206: Fix blatant merge issues
   47972: Merged BRANCHES/DEV/CONV_V413 to BRANCHES/DEV/CONV_HEAD:
        46766: Merged BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413:
             35497: Merged BRANCHES/DEV/THOR0 to BRANCHES/DEV/CLOUD1:
                  29723: THOR-31: MT-aware shared caches
                  29749: THOR-5: MT-aware immutable singletons
                  29762: THOR-31: MT-aware shared cache
        46767: Merged BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413:
             35507: Merged BRANCHES/DEV/THOR1 to BRANCHES/DEV/CLOUD1:
                  30237: Merged BRANCHES/DEV/THOR0 to BRANCHES/DEV/THOR1:
                       29532: THOR-79 - add ability to disable Lucene indexes (so that IndexInfo / IndexInfoBackup files are not created per store per tenant)
                       29723: THOR-31: MT-aware shared caches
                       29749: THOR-5: MT-aware immutable singletons
                       29762: THOR-31: MT-aware shared cache
   47973: CONV_HEAD: CLOUD-1348 - comment back in MultiTDemoTest tests (testNonSharedGroupDeletion & testSharedGroupDeletion)
   47975: CONV_HEAD: CLOUD-1348 - comment back in FeedNotifierTest.testFailedNotifications
   47988: Merged BRANCHES/DEV/CONV_V413 to BRANCHES/DEV/CONV_HEAD:
        46775: Merged BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413:
             35531: Merged BRANCHES/DEV/THOR1 to BRANCHES/DEV/CLOUD1:
                   30449: F66: add option to configure a common "contentRootContainerPath"
                   30564: THOR-156: prep - consolidate runAsSystemTenant/runAsPrimaryTenant
             35532: Merged BRANCHES/DEV/THOR1 to BRANCHES/DEV/CLOUD1:
                  30777: THOR-201: temporarily comment-out MultiTDemoTest.testDeleteArchiveAndRestoreContent (pending fix for THOR-201)
   48008: Merged BRANCHES/DEV/CONV_V413 to BRANCHES/DEV/CONV_HEAD:
        46844: (RECORD ONLY) Merged BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413:
        46895: (RECORD ONLY) Merged BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413:
        46903: (RECORD ONLY) Merged BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413:
        46907: (RECORD ONLY) Merged BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413:
        46922: (RECORD ONLY) Merged BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413:
        46974: (RECORD ONLY) Merged BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413:
        46991: (RECORD ONLY) Merged BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413:
        46992: (RECORD ONLY) Merged BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413:
        46994: (RECORD ONLY) Merged BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413:
        47107: (RECORD ONLY) Merged BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413:
        47265: (RECORD ONLY) Merged BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413:
        47267: (RECORD ONLY) Merged BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413:
        47272: (RECORD ONLY) Merged BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413:
        47277: (RECORD ONLY) Merged BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413:
        47284: (RECORD ONLY) Merged BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413:
        47286: (RECORD ONLY) Merged BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413:
        47289: (RECORD ONLY) Merged BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413:
        47292: (RECORD ONLY) Merged BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413:
   48009: Merged DEV/CONV_V413 to DEV/CONV_HEAD
        46801: Merged from BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413
           35602: Merged BRANCHES/DEV/THOR1 to BRANCHES/DEV/CLOUD1:
              30513: Cloud Share module
              30515: Fix issue with person replication between tenants.
              30516: Slight mod to email validation web script response.
              30518: Quick fix for workflow id generation in sign email
              30534: THOR-163: Unable to get license file
              30535: Fix Thor build process.
              30536: Refine user's home site name and description
              30539: THOR-96. When sending the signup email, execute the mail action asynchronously.
              30542: Replace placeholder text in sign-up email
              30543: Account Activation
        46802: Merged from BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413
           35643: Merged BRANCHES/DEV/THOR1 to BRANCHES/DEV/CLOUD1:
              30544: Account activation
              30545: Account activation
              30550: AMP build targets
              30554: THOR-94. Cloud site invitation workflow.
              30555: AMP build targets - added client side resources
   48011: Merged BRANCHES/DEV/CONV_V413 to BRANCHES/DEV/CONV_HEAD:
        47056: (RECORD ONLY) Merged BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413:
        47087: (RECORD ONLY) Merged BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413:
        47228: (RECORD ONLY) Merged BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413:
        47271: (RECORD ONLY) Merged BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413:
        47297: (RECORD ONLY) Merged BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413:
        47299: (RECORD ONLY) Merged BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413:
        47300: (RECORD ONLY) Merged BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413:
        47301: (RECORD ONLY) Merged BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413:
        47304: (RECORD ONLY) Merged BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413:
        47328: (RECORD ONLY) Merged BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413:
        47330: (RECORD ONLY) Merged BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413:
        47339: (RECORD ONLY) Merged BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413:
   48013: Merged DEV/CONV_V413 to DEV/CONV_HEAD (commiting the missing merge info for r48009)
        46801: Merged from BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413
           35602: Merged BRANCHES/DEV/THOR1 to BRANCHES/DEV/CLOUD1:
              30513: Cloud Share module
              30515: Fix issue with person replication between tenants.
              30516: Slight mod to email validation web script response.
              30518: Quick fix for workflow id generation in sign email
              30534: THOR-163: Unable to get license file
              30535: Fix Thor build process.
              30536: Refine user's home site name and description
              30539: THOR-96. When sending the signup email, execute the mail action asynchronously.
              30542: Replace placeholder text in sign-up email
              30543: Account Activation
        46802: Merged from BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413
           35643: Merged BRANCHES/DEV/THOR1 to BRANCHES/DEV/CLOUD1:
              30544: Account activation
              30545: Account activation
              30550: AMP build targets
              30554: THOR-94. Cloud site invitation workflow.
              30555: AMP build targets - added client side resources
   48015: Merged DEV/CONV_V413 to DEV/CONV_HEAD
        46841: Merged from BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413
           35684: Merged BRANCHES/DEV/THOR1 to BRANCHES/DEV/CLOUD1:
              30904: (RECORD ONLY) Merged HEAD to BRANCHES/DEV/THOR1:
                 30270  ALF-9492 Can now update task properties through the Workflow JavaScript API. ALF-10087 Fixed failing Multi-tenancy tests.
                 30288  ALF-9492 Can now update task properties through the Workflow JavaScript API.
                 30309  Fixed failing MultiTDemoTest and re-enabled.
                 30356  ALF-10117: JBPM workflows should be hidden.
                 30358  Build fix, fallout from ALF-10117 (JBPM workflows should be hidden)
                 30415  Added parseRootElement() method to Activiti's BPMNParseListener.
                 30452  ALF-10276: Reject flow didn't set bpm_assignee property properly
                 30563  Added tests to ensure multi-tenancy works and fixed several multi-tenancy issues in workflow.
                 30698  ALF-9541: Fixed HistoricTaskEntity update when TaskEntity is loaded from DB
                 30699  ALF-10084, ALF-10242. Fixed issues and added WorkflowService methods to get workflow instances without filtering by definition id.
                 30750  ALF-10197, Added the ability to auto-complete Start Tasks in Activiti. If a start task extends the bpm:activitiStartTask type or implements the bpm:endAutomatically aspect then the task will be ended as soon as the workflow instance is started.
                 30796  ALF-10374 Fixed failing MultiTDemoTest
              30908: Add logging for failed email domain lookups:
              30922: Rolling back .classpath changes to Data Model.
              30930: Basic version of site invite working
              30931: THOR-172: Switch Tenant via public API
              30936: Allow for repo web scripts to switch to user's default tenant via -default- tenant id:
              30937: Implementation of THOR-214. There is now a new repo webscript to retrieve signup status for a given {id, key} pair.
              30938: Allow dev email address to be specified in properties file:
              30945: THOR-221: Add (EntityLookup) cache to AccountDAO
              30946: Build fix. Renaming a test infrastructure class so that it doesn't get picked up by the ant test targets.
              30955: THOR-222. Added inviter first and last name to invitation-status.get webscript.
        46843: Merged from BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413
           35694: Merged BRANCHES/DEV/THOR1 to BRANCHES/DEV/CLOUD1:
              30997: Firefox scrollbars removed on "invitation" and "signup" pages (now using new helper method Alfresco.util.createYUIOverlay)
              31001: Impl of THOR-223. Webscripts for getting pending invitations.
              31002: Invite - redirect bug fixed, removed old code matching previous webscript api, email picker style fixes
              31003: Addendum for THOR-223. I've added an explicit test to record the fact that pending-invitations.get to a non-existent site returns 200 and an empty collection rather than a 404.
              31004: Adding REST-client .rcq files as part of THOR-223
        46848: Merged from BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413
           35700: Merged BRANCHES/DEV/THOR1 to BRANCHES/DEV/CLOUD1:
              31014: (RECORD ONLY) Merged HEAD to BRANCHES/DEV/THOR1:
                   30999: ALF-9957 - MT: test and fix subscriptions (followers)
              31020: Update invite email template to bring in line with wireframe and text
              31021: Apply latest sanitized email blacklist:
              31030: Fixed THOR-226 "DocLib "Detailed View" (default) does not list items - note: "Simple View" seems to be OK"
              31033: THOR-228: Update aws sample file with quota config for cachingcontentstore
              31036: Fixed THOR-236 "Webscript URL clash in signup"
              31037: THOR-175: set and enforce per-tenant quota
              31043: Fixed THOR-174 "F27: User can switch between networks they belong to"   
        46854: Merged from BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413
           35725: Merged BRANCHES/DEV/THOR1 to BRANCHES/DEV/CLOUD1:
              31124: Fix for THOR-145. This check-in makes the Cloud Signup and Invitation workflows hidden within Share - users can't initiate them via "Start workflow..."
   48016: Merged BRANCHES/DEV/CONV_V413 to BRANCHES/DEV/CONV_HEAD:
        46793: Merged BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413:
        46795: Merged BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413:
        46796: Merged BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413:
   48030: Merged BRANCHES/DEV/CONV_V413 to BRANCHES/DEV/CONV_HEAD:
        46820: Merged BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413:
             35657: Merged BRANCHES/DEV/THOR1 to BRANCHES/DEV/CLOUD1:
                  30556: THOR-135F103: Is e-mail address accepted by Alfresco?
                  30562: Fixing a typo in the email-validation FTL. It was returning invalid JSON - no opening " on a string.
                  30569: THOR-156: switch to secondary tenant (initially via @@login)
                  30571: THOR-99: Thor build
   48037: Merged BRANCHES/DEV/CONV_V413 to BRANCHES/DEV/CONV_HEAD:
        46821: Merged BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413:
             35659: Merged BRANCHES/DEV/THOR1 to BRANCHES/DEV/CLOUD1:
                  30586: THOR-166. I've added an additional check at the start of the signup workflow that checks if the email is blocked.
                  30587: THOR-163: S3ContentReader fails to getObjectDetails
                  30592: THOR-156: switch to secondary tenant (initially via @@login)
             35660: Merged BRANCHES/DEV/THOR1 to BRANCHES/DEV/CLOUD1:
                  30607: (RECORD ONLY) Merged HEAD to BRANCHES/DEV/THOR1:
                       30208: Remaining commits for ALF-9510
                       30218: Fix build - add missing files
                       30254: Encryption related documentation, source code comments
                       30392: Fix for ALF-10205
                       30405: Fix for ALF-10189
                       30406: Fix for ALF-10189: part 2 - minor update
                  30613: THOR-148. The cloud test target was accidentally excluding *RestTest.java.
                  30613: THOR-148. The cloud test target was accidentally excluding *RestTest.java.
                  30614: Revert some of the additional email checks in registration process
                  30615: Set ignore patterns for build dir in thor module
                  30619: Merged HEAD to BRANCHES/DEV/THOR1:
                       30618: Additional test classes that allow for easier testing of Notifications (emails mostly).
                  30622: Ensure use of System user, not system user
                  30624: Removed deep merge info
                  30625: Switch off creation of missing people, use Admin instead of System
        46824: Merged BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413:
        46828: Merged BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413:
   48038: Merged DEV/CONV_V413 to DEV/CONV_HEAD (ui-only)
        46830: Merged BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413:
           Merged BRANCHES/DEV/THOR1 to BRANCHES/DEV/CLOUD1:
           30737: (RECORD ONLY) Merged HEAD to BRANCHES/DEV/THOR1:
                30736: ALF-6706 - MT: activities not generated (for tenants)
           30738: Site invite (rough version, not finished)
           30741: THOR-175: Set and enforce file space quota for tenant
           30752: Site invite - added som padding to user suggestion list
           30753: Disabling 2 tests while I fix them.
           30758: THOR-172 F63: Switch Tenant via public REST API:
           30764: Tweak to Activiti integration code to prevent it from trying to create person nodes for the System user.
           30766: Implementation of THOR-196. Inviting multiple email addresses in a single call.
           30769: Re-enable MultiTDemoTest 
           30775: Site invite 
           30776: THOR-172: Switch Tenant via public API
           30785: Add tenant id to account info returned in Thor responses
   48043: Merged DEV/CONV_V413 to DEV/CONV_HEAD
        46831: Merged BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413:
           Merged BRANCHES/DEV/THOR1 to BRANCHES/DEV/CLOUD1:
              30813: Add Eclipse project for Thor-Share module:
              30815: THOR-175: Set and enforce file space quota for tenant
              30817: Switch network skeleton code and minor fixes
              30818: Update Share Node Browser (at least for THOR) to allow option to retrieve "storeroot" via DB query
              30826: Add distribute-solr to Thor builds
   48045: Merged BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413:
       Merged BRANCHES/DEV/THOR1 to BRANCHES/DEV/CLOUD1: 
           30737: (RECORD ONLY) Merged HEAD to BRANCHES/DEV/THOR1: 
           30736: ALF-6706 - MT: activities not generated (for tenants) 
           30738: Site invite (rough version, not finished) 
           30741: THOR-175: Set and enforce file space quota for tenant 
           30752: Site invite - added som padding to user suggestion list 
           30753: Disabling 2 tests while I fix them. 
           30758: THOR-172 F63: Switch Tenant via public REST API: 
           30764: Tweak to Activiti integration code to prevent it from trying to create person nodes for the System user. 
           30766: Implementation of THOR-196. Inviting multiple email addresses in a single call. 
           30769: Re-enable MultiTDemoTest 
           30775: Site invite 
           30776: THOR-172: Switch Tenant via public API 
           30785: Add tenant id to account info returned in Thor responses 


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@48251 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2013-03-18 09:23:29 +00:00
Kevin Roast
a625d87120 Merge of BRANCHES/DEV/4.2_ENT_DEV/ADMIN_CONSOLE - Admin Console 46247-46672
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@46677 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2013-02-15 11:44:53 +00:00
Gethin James
fdc9bdfe84 FIXED ALF-12541: AMP files need to be able to be pinned to specific "edition(s)" of Alfresco
It is now possible to specify a module.editions property (eg. community) which is checked by the MMT.
Also, the version is checked on install.
Also, started refactoring some of the code for better reuse.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@33668 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2012-02-06 11:11:42 +00:00
Paul Holmes-Higgin
cefda8c965 Updated header to LGPL
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@18931 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2010-03-01 22:48:39 +00:00
Paul Holmes-Higgin
43e93f3c14 Updated header to LGPL
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@18926 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2010-03-01 22:09:17 +00:00
Derek Hulley
8307ba5ba9 AMP dependency checking on the tool side.
This is work in progress and the repo is not currently double checking the runtime dependencies.

To declare a dependency, add the following to your module.properties:
   module.depends.ABC=ABCfromVersion - ABCtoVersion
Wildcard * can be used in place of fromVersion or toVersion, as well as just a single version.
The most common usage will be:
   module.depends.ABC=1.0-*
i.e. this module depends on ABC version 1.0 or later being present.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@5601 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2007-05-02 20:28:20 +00:00
Derek Hulley
31efa6d4f3 Support for renaming of modules
- When a module ID changes, the old ID gets put in a list against property 'module.aliases'.
 - The tool and the repo startup detect the existing installation against the alias and perform a rename.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@5559 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2007-04-26 08:42:19 +00:00
Derek Hulley
c1a69f0f3f Added support to limit module execution to a specific range of repository versions.
e.g. the PHP SDK module has the following:
   module.repo.version.min=2.0
   module.repo.version.max=2.1
This limits it to being installed on 2.0 or 2.1 versions of Alfresco.
Roy can change this, if required.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@5532 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2007-04-24 01:14:42 +00:00
Derek Hulley
03c56f4c90 Tighter control of file-mapping.properties values.
Fixed bug with file-mapping.properties 'include.default' option.
Refactor of ModuleDetails properties serialization.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@5518 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2007-04-20 16:10:48 +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
Roy Wetherall
2ad8f02979 Added module status to module.properties file saved in WAR for later use. Added contribution to return node path in Reference object. Fixed issues with web service caused by outdated Jars and incorrect AuthenticationService
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@4980 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2007-01-31 11:56:02 +00:00
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
Derek Hulley
05d2cd1b28 Merged DEV\EXTENSIONS to HEAD
svn merge svn://svn.alfresco.com:3691/alfresco/BRANCHES/DEV/EXTENSIONS@4832 svn://svn.alfresco.com:3691/alfresco/BRANCHES/DEV/EXTENSIONS@4833 .
   svn merge svn://svn.alfresco.com:3691/alfresco/BRANCHES/DEV/EXTENSIONS@4862 svn://svn.alfresco.com:3691/alfresco/BRANCHES/DEV/EXTENSIONS@4863 .
   svn merge svn://svn.alfresco.com:3691/alfresco/BRANCHES/DEV/EXTENSIONS@4866 svn://svn.alfresco.com:3691/alfresco/BRANCHES/DEV/EXTENSIONS@4867 .
   svn rm --force root\projects\repository\source\java\org\alfresco\repo\extension
   svn rm --force root\projects\repository\source\java\org\alfresco\service\cmr\extension


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@4954 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2007-01-29 14:02:14 +00:00