Commit Graph

61 Commits

Author SHA1 Message Date
Alan Davis
4fef0c0ef4 Merged 5.2.N (5.2.1) to HEAD (5.2)
125788 rmunteanu: Merged 5.1.N (5.1.2) to 5.2.N (5.2.1)
      125606 rmunteanu: Merged 5.1.1 (5.1.1) to 5.1.N (5.1.2)
         125515 slanglois: MNT-16155 Update source headers - add new Copyrights for Java and JSP source files + automatic check in the build


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@127810 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-06-03 17:08:06 +00:00
Alan Davis
22512d8c9e Merged 5.2.N (5.2.1) to HEAD (5.2)
125783 rmunteanu: Merged 5.1.N (5.1.2) to 5.2.N (5.2.1)
      125605 rmunteanu: Merged 5.1.1 (5.1.1) to 5.1.N (5.1.2)
         125498 slanglois: MNT-16155 Update source headers - remove svn:eol-style property on Java and JSP source files


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@127809 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-06-03 16:45:04 +00:00
Alan Davis
4818f7ccf5 Merged 5.2.N (5.2.1) to HEAD (5.2)
125781 rmunteanu: Merged 5.1.N (5.1.2) to 5.2.N (5.2.1)
      125603 rmunteanu: Merged 5.1.1 (5.1.1) to 5.1.N (5.1.2)
         125484 slanglois: MNT-16155 Update source headers - remove old Copyrights from Java and JSP dource files


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@127808 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-06-03 16:40:56 +00:00
Alan Davis
64b99bc21d Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)
57568: Merged V4.2-BUG-FIX (4.2.1) to HEAD-BUG-FIX (Cloud/4.3)
      57531: Merged V4.1-BUG-FIX (4.1.8) to V4.2-BUG-FIX (4.2.1)
         57425: Merged V4.1.7 (4.1.7) to V4.1-BUG-FIX (4.1.8)
            57422: MNT-9767: Merged DEV to PATCHES/V4.1.7
            57268: MNT-9767 : Navigation arrows of the document details view do not work when a search result is displayed
            Was added the check for currentSortColumn when it is null in SpaceDetailsDialog.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@61844 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-02-11 21:05:04 +00:00
Samuel Langlois
e60d57ea42 Merged HEAD-QA to HEAD (4.2) (including moving test classes into separate folders)
51903 to 54309 


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@54310 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2013-08-20 17:17:31 +00:00
Dave Ward
ac683161de Merged V4.1-BUG-FIX to HEAD
43944: Fixes: ALF-16090: fixes view mode for control param showTime.
   43964: Fixes: ALF-14758. Adds distinct styling for menus nested 4 levels or deeper to prevent confusion if there's an overlap.
   44029: MNT-180 - Clone for Hotfix: Word document on Windows via CIFS becomes locked (Read Only) when network drops temporarily
   44040: Merged V3.4-BUF-GIX (3.4.12) to V4.1-BUG-FIX (4.1.3)
      44039: Minor changes to TransformerDebug to make output more readable when there are exceptions.
         - NPE when there is no exception message
   44046: MERGE DEV to V4.1-BUG-FIX
     ALF-16562 : CIFS: Excel document version history lost after saving content in Excel:mac 2011 on Mac Mountain Lion
   44115: Changes to standalone file state cache access mode checks to bring them into line with the clustered file state cache.
   44160: Fix for ALF-13129, checks to see if the child association already exists on the versioned node.  If it exists it doesn't add it again.
   44239: ALF-16977: InstallerBuilder 8.5.1 2012-11-29 with layout fix from Bitrock
   44319: Latest installer translations from Gloria
   44343: Merged V4.1 (4.1.2) to V4.1-BUG-FIX (4.1.3)
      44339: ALF-17070: Merged to V4.1 (4.1.2) from V4.1-BUG-FIX (3.4.12)
         << Regression introduced into 4.0.2 on 12/4/12 r35201 >>
         44337: Merged DEV to V3.4-BUG-FIX (3.4.12)
            44297: ALF-16935: wcm/avm file picker fails to render selection from folders navigation only works with 127.0.0.1 url
            - Fix for regression from ALF-11956, connected with setting titles for file picker controls
      44316: Merged DEV to V4.1
         44094: ALF-16794: CLONE - Webdav: Version history lost after editing content with Mac Word 2011 in Finder
            Add WebDAV MOVE handling for case when backup is enabled in Mac 2011 Word
         44285: ALF-16794: CLONE - Webdav: Version history lost after editing content with Mac Word 2011 in Finder
            Handle Mac 2011 Word backup in scope of RenameShuffle
      44312: Part 3 for ALF-16895 SOLR: Cannot find files after restart and reindex solr 
      - fix incremental cache state to cope with duplicate leaf/aux doc entries.
      44283: Encoding fix by David Webster
      44275: Part 2 for ALF-16895 SOLR: Cannot find files after restart and reindex solr 
      - fix initial cache state to cope with duplicate leaf/aux doc entries.
      44252: Russian fix from Gloria
      44200: Probable fix for     ALF-16895 SOLR: Cannot find files after restart and reindex solr 
      - still difficult to reproduce
      44149: Merged HEAD to V4.1
         44037: ALF-16947: prevent dependency to web-framework-commons war to be transitive: this artifact is not generated in Ant build
         44039: Version in parent-pom was not changed properly when deploying to Maven repo
      44142: ITALIAN: Translation update based on EN r43623, fixes ALF-16609
      44107: ALF-16016, ALF-15991, ALF-16180: Russian fixes by Gloria
      44078: ALF-16620: Out of memory Error applying CopiedFromAspectPatch
      - CopiedFromAspectPatch.WorkProvider.getNextWork() was fetching discrete managable chunks
      - and then blowing up as it continually fetched into the same in-memory HashSet!
   44404: Merged DEV to V4.1-BUG-FIX
      44378: ALF-16791 : resource bundle deployement for localization does not work with the dynamic approach
      1. Split out MessageService message lookup methods into new interface MessageLookup that lives in DataModel
      2. Added a simple implementation for SOLR to use
      3. Made M2Label look up model labels via a supplied MessageLookup argument
      4. Make DictionaryService extend MessageLookup so that it's easy to find a MessageLookup if you've got a DictionaryService
      5. Accounted for interface changes throughout. 
   44421: ALF-17114: Merged V3.4-BUG-FIX (3.4.12) to V4.1-BUG-FIX (4.1.3)
      44419: ALF-17045 If GhostScript is not installed, deletion of content is not working
         - Not just Ghostscript but any thumbnail failure
   44422: ALF-16123: "CheckOutCheckInService.checkout fails with DuplicateChildNodeNameException if no working copy label message found in current locale"
   44424: Merged V4.1 (4.1.2) to V4.1-BUG-FIX (4.1.3) RECORD ONLY
      44423: ALF-17114: Merged V4.1-BUG-FIX (4.1.3) to V4.1 (4.1.2)
         - got the wrong branch
         44421: ALF-17114: Merged V3.4-BUG-FIX (3.4.12) to V4.1-BUG-FIX (4.1.3)
            44419: ALF-17045 If GhostScript is not installed, deletion of content is not working
               - Not just Ghostscript but any thumbnail failure
   44447: Merged V4.0.2 (4.0.0.22) to V4.1-BUG-FIX (4.1.3) RECORD ONLY
      << Recording this as RECORD ONLY as it turns out the DEV code came form V4.1-BUG-FIX r42431 >>
      44435: Merged DEV to V4.0.2 (4.0.2.22)
         44429: MNT-232: Upgrade from 3.4.9 to 4.0.2 - FAILED
         - Initialize rootRefs in the property definition to prevent NPE.
   44468: Merged V3.4-PATCHES to V4.1-BUG-FIX
     MNT-211 (Still needs implementing on 4.1)
   44470: Fixes: ALF-16878 - don't use IE8's native JSON stringify method.
   44511: ALF-16791: Added missing class.
   44519: ALF-16791: Fixed broken unit tests
   44541: Fix for     ALF-17151   SOLR - add support to disable permission checks
   44542: MNT-211  Re-implement on 4.1
   44548: ALF-16791: Fixed broken SOLR
   44559: ALF-17075: "Exporting and importing null MLText values does not work."
   44577: Final part for     ALF-16558 SOLR tracking does not do incremental updates but one single chunk 
   - fixed code so SolrSearchers are held for as little time as possible
   44590: ALF-14523 (Share - Metadata constraint on workflow creation)
   44594: ALF-16310: "Calling CancelCheckout() on the original document deletes the document."
   44596: ALF-17075: "Exporting and importing null MLText values does not work." - change test name to something more meaningful
   44599: ALF-16310: "Calling CancelCheckout() on the original document deletes the document."
   44600: ALF-16791: Another omission not covered by unit tests
   44603: ALF-14201: upgrade activiti to 5.7-20121211
   44605: Added missing vti.server.url.path.prefix property required by commit 43471
   Missing due to cherry picked commit, this is implemented as part of 39309 on HEAD.
   44606: ALF-14201: upgrade activiti to 5.7-20121211 in Maven poms
   44613: ALF-13690 (Share - It's possible to delete site groups via the UI)
   44618: ALF-16939: "Error "importStatus.batchWeight is undefined" is thrown when Bulk Importer status webscript is run for XML format"
   44621: Merged PATCHES/V4.1.1 to V4.1-BUG-FIX
      44620: MNT-247: Merged DEV to PATCHES/V4.1.1 with corrections
         44526: ALF-16964: Share alfrescoCookie connector fails when alfresco.authentication.allowGuestLogin=false, use case proxy between share and alfresco
            Check if external authentication is active in BaseServlet
   44628: Solution for ALF-3780 - Dashboard settings not deleted for deleted user.
   Initial implementation by Dmitry Velichkevich.
   Surf user config folder and user Surf dynamic component references are removed when user node is deleted via a Delete Node policy.
   44632: addition of validation of NetworkFile isClosed property.
   44648: Merge V3.4-BUG-FIX to V4.1-BUG-FIX (4.1.3)
      44566: ALF-17164: Add SVN revision in version.properties when building in continuous mode
      44602: ALF-17164: adding the SCM revision in version.build so that it is displayed
         also, sneak in the SVN path, so that tracability is complete
   44650: BDE-111: Stop creating installers in parallel, it fails on pbld02. Also, revert to zip compression to gain build time
   44651: ALF-14348 (Unable to update external blog configuration details)
   44654: Merged DEV to V4.1-BUG-FIX
      44614: ALF-17119: Possible UI bug - "$$" chars added to permissions for IMAP Attachments folder
      Added a message bundles for FullControll access role.
   44655: Merged DEV to V4.1-BUG-FIX
      44593: ALF-14154: Encoding problem when open a file via webdav on Windows XP
      Ignore user credentials for the OPTIONS request.
      44612: ALF-14154 : Encoding problem when open a file via webdav on Windows XP
      Ignore user credentials for the OPTIONS request.
   44666: ALF-12001: Privacy: blog activities - activity is seen for draft blogs
   - Wrong node was being used for access checks
   - Fix by Andrey Chernov
   44671: Merged V3.4-BUG-FIX to V4.1-BUG-FIX
      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
      44296: ALF-17203 / ALF-17201 / MNT-216 : error saving versionable word documents


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@44675 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2012-12-13 14:16:40 +00:00
Kevin Roast
ad8f82ce31 Fix for ALF-10560 - Alfresco Explorer and nulling properties in CreateSpaceWizard
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@31562 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2011-10-31 11:34:52 +00:00
Gavin Cornwell
057ed36a0c Fixed ALF-10113: Can't delete Web Form: Node does not exist: missing://missing/missing
Added a check for node existence before actually deleting the node.

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@30795 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2011-09-27 11:23:40 +00:00
Dave Ward
5e6d266b3e Merged V3.4-BUG-FIX to HEAD
27967: Fixes: ALF-8696. L10N updates
   27969: Fixes: ALF-8698 - FR L10N string updates
   28011: Fixes: ALF-8776 - IT L10N updates
   28035: Fix for ALF-2711 - Spring Surf contrib: Unable to upload files over 2GB
   28052: Fixes: ALF-8724
   28054: Merged PATCHES/V3.4.1 to V3.4-BUG-FIX
      27765: ALF-8607: Detect and invalidate stale cached nodes during transaction tracking
         - Also increased debug logging around IndexTransactionTracker
      27953: ALF-8607: Store FTSSTATUS on a supplementary document in the index for each transaction, so that we don't forget to FTS reindex the document if it has already been updated by a later transaction.
      27965: ALF-8607: Complete query parsers' handling of new FTSREF field
      28033: ALF-8811: Removed invalid caching of permissions from Invite wizards. Finish off ALF-4597
      28053: ALF-8815: Make it possible to copy a node with the cm:storeSelector aspect
         - The copied node's content will already be in the target store when its properties (including storeName) are first applied
   28055: Merged PATCHES/V3.3.4 to V3.4-BUG-FIX (RECORD ONLY)
      27830: ALF-8476: Possible fix to StackOverflowError when searching a transaction with a huge number of deletions
      27854: Merged V3.3 to PATCHES/V3.3.4
         27851: Fix for ALF-8476: CLONE - Query consuming all heap and receiving an OOM exception
            - actually fixes stack overflow with skipTo when there are lots of deleted docs in an index in a row (<10000 on the default settings)
   28060: ALF-8779: I18N Fix from Bitrock.
   28065: ALF-8105: Correction to ETWOTWO-1384 fix: do not embed schema in XForm definition if it references externals to avoid performance issues
   - Previous fix embedded a partial, invalid schema that caused XML parser warnings
   28070: Suggested fix for ALF-8852. Upgrading pdfbox,fontbox,jempbox from 1.3.1 to 1.5.0.
   28071: Fix for symptom raised in ALF-8780: Forms system does not show control for associations of cm:person type
   
   This hides the rn:rendition association from default forms as it should never be edited by a user. The proper fix for the bug is to supply form config for the custom type.
   28072: Fixed ALF-8050: Inconsistency in validation of webforms with maxOccurs="*"
   28077: ALF-6293: Fix from Bitrock
   - Installing the tomcat service logs more stuff on Linux and Windows
   28084: ALF-8877: Upgraded freemarker to 2.3.18
   28090: Fix failing forms related tests
   28118: ALF-8557 Added NullScope object used by JbpmNode. 
   28123: Fix for ALF-8207
   28124: ALF-7708 The JavaScript expressions in workflows should no longer be re-formatted.
   28134: Incremented version revision for 3.4.3
   28135: Merged V3.4 to V3.4-BUG-FIX
      27962: Update to Bitrock 7.1.1 + use absolute path to Bitrock license under protected build-classpath directory
      27971: Fix for ALF-8704 - RM search doesn't work
      27984: ALF-8771: Installer now uses cmd /C start /MIN /WAIT to run minimized commands synchronously rather than asynchronously!
      - Also uses -w flag when registering postgres service to make its startup synchronous
      - Should mean that the install waits for postgres to start before issuing commands to it!
      27987: ALF-8666: Bitrock service run and install scripts now execute commands sequentially
      - start /MIN /WAIT cmd /C used instead of start /MIN
      27993: ALF-8761: getWindowsACL fix from Bitrock
      27996: ALF-8710: Run servicerun.bat as admin user
      27998: ALF-7164: NFS: User with editor role cannot edit content
      28021: ALF-8823: PostgreSQL Windows service is registered under SYSTEM user. Therefore initial initdb must be done as this user for service to start.
      28022: ALF-8823: Additional fix from Bitrock
      28041: Another try at fixing ALF-8704 - RM search doesn't work
      28119: ALF-8853: I18N fallout from ALF-6469. TransferService default group must be looked up by QName rather than cm:name


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@28137 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2011-06-01 09:22:18 +00:00
Kevin Roast
52212fc5cd Merged V3.3 to HEAD
20225: Merged V3.2.1 to V3.3 
      20224: Fix for ALF-2787 - items deleted by non-admin users now correctly archived.

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@20502 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2010-06-03 09:35:41 +00:00
Derek Hulley
d3bd0ff2f0 Removed svn:executable tag
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@19134 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2010-03-09 00:43:42 +00:00
Paul Holmes-Higgin
60c08702d5 Updated files to LGPL
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@18963 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2010-03-02 21:36:59 +00:00
Kevin Roast
2cd5047075 Merged V3.2E to HEAD
17533: Fix for unreported issue for events with multiple days (secondary elements) aren't filtered correctly when view is filtered by tags
   17535: ETHREEOH-3411 - Alert appears when loading My Dashboard when Documents I'm editing dashlet is aded and site name was edited with XSS text
   17536: Fixes for various forms issues (ETHREEOH-3398, ETHREEOH-3273, ETHREEOH-3339 & ALFCOM-3587) and reverted accidentally checked in log4j.properties file
            - Folders can now have tags applied in edit form
            - Working copy nodes have their cm:name property set to protected
            - Removed mandatory marker from checkbox control (if you have a boolean there is always a value so no need to mark as mandatory)
            - Potential security issue
   17537: ETHREEOH-1908 - .docx word documents are not displayed in 'Word Documents' category in 'Document List' component. Also fixed some i18n strings.
   17538: Fix for ETHREEOH-3085 and ETHREEOH-3341.
          - NTLM/Kerberos, Tomcat/JBoss5 and JSF client now play nicely on session timeout and display the correct configured page on first login.
          - Tested Share NTLM works correctly with above changes.
   17539: Fix for ETHREEOH-3368: UI does not show multi-valued MLText propertis as localisable
   17543: Merged DEV_TEMPORARY to V3.2
      17529: Fix for ETHREEOH-3186 & ETHREEOH-3187
   17544: Fix for ETHREEOH-1509 - Manage action is not applied for task resources part from My Tasks tab in Office Addins if user already opens another task.
   17547: Fix for ETHREEOH-1709 - AccessDeniedException - Download Servlet not re-directing user to login page.
          - WebDav path now resolved to a noderef as system user - then the permission test for READ_CONTENT is performed directly on the resulting noderef.
   17548: Fix for ETHREEOH-3137 - Tags created for All day event are not displayed in Tags pane.
   17551: Final part of fix for ETHREEOH-2161 includes solution for ETHREEOH-3270.
          - An admin user can now optionally disable the execute of Rules and the Archive of nodes during a folder delete operation.

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@18128 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2010-01-19 12:01:16 +00:00
Kevin Roast
0c88b471ee Merged DEV/TEMPORARY to HEAD
17667: Branch for SpringSurf integration - from HEAD r17665
   17668: Fix to ensure included scripts files are not loaded from a cached classpath loader.
   17670: Part 1 of SpringSurf integration - changes relating to spring-surf-core-1.0.0.CI-SNAPSHOT.jar
   17674: Part 2 of SpringSurf integration - changes relating to spring-surf-core-configservice-1.0.0.CI-SNAPSHOT.jar

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@17788 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2009-12-14 13:41:05 +00:00
Derek Hulley
f03cabea25 Merged V3.2 to HEAD
15908: Merged V3.1 to V3.2 (record only)
      15907: Merged V3.2 to V3.1
         15683: Fixed potential concurrency issues in HeartBeat and LicenseComponent
   15972: Merged V3.1 to V3.2
      15429: **Record only** I18N message IDs for JSF dashlets
      15947: ETHREEOH-2565: The content size shown in the preview popup is incorrect
      15952: Part of fix for ETHREEOH-2493 - missing html encoding on webscript 404 html status page.
      15953: Fix for ETHREEOH-2364 - LDAP sync missing last name displayed as null.
      15956: Fix for ETHREEOH-2714 - html encoding in Create New User summary page.
      15957: Merged DEV-TEMPORARY to V3.1
         15865: Fix for ETHREEOH-2673
      15958: Merged DEV-TEMPORARY to V3.1
         15885: ETHREEOH-2615: Localization Issue - Japanese UI
      15959: Merged DEV-TEMPORARY to V3.1
         15882: ETHREEOH-2644: Sending Email using Template throws exception
      15962: Fix for ETHREEOH-2390
      15963: Fix ETHREEOH-1962: Hibernate flush ordering incorrect for alf_qname
      15965: Merged DEV/BELARUS/V3.1
         15949: ETHREEOH-2689: When upgrading from 2.1.7e to 3.1.0e/3.1.1e user roles are mapped incorrectly
      15966: Merged V2.2 to V3.1
         15948: (RECORD ONLY) Backport of the fix provided for ETHREEOH-1719.
      15969: Prep for ETHREEOH-2295 fixes and associated merges.
      15970: Merged DEV-TEMPORARY to V3.1
         14360: ETHREEOH-1571, ETHREEOH-1656, ETHREEOH-1404, ETHREEOH-953, ALFCOM-2650, ETHREEOH-1572, ETHREEOH-1574
         15331: ETHREEOH-2295 - LayeredFile: Layer file/folder is present when original file/folder is removed
         15824: ETHREEOH-2295 - higlight stale object
___________________________________________________________________
Modified: svn:mergeinfo
   Merged /alfresco/BRANCHES/DEV/BELARUS/V3.1:r15865,15882,15885,15949
   Merged /alfresco/BRANCHES/DEV/3.1SP2:r14360,15331,15824
   Merged /alfresco/BRANCHES/V2.2:r15948
   Merged /alfresco/BRANCHES/V3.1:r15907,15947-15962,15964-15970
   Merged /alfresco/BRANCHES/V3.2:r15908,15972


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@16887 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2009-10-13 20:33:02 +00:00
Dave Ward
f73c72d424 Merged V3.2 to HEAD
15642: Merged V3.1 to V3.2
      15376: ETHREEOH-255: missing email template dependencies that were stopping a cold bootstrap from working


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@15801 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2009-08-18 18:02:23 +00:00
Kevin Roast
7bc8553167 Fixes for ALFCOM-2313, ETHREEOH-1006, ALFCOM-2302, ETHREEOH-1023, ETWOTWO-1069
- correct enable/disable of OK button for applying Templates and RSS feeds to spaces and documents
 - clean up of related bean and JSP pages - conversion to JSF components from horrid verbatim tag based dialogs

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@14783 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2009-06-18 11:18:59 +00:00
Derek Hulley
a20914fa8e DM NodeService automatically adds aspects when properties or associations are added to a node
- AVM NodeService not covered.

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@14328 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2009-05-15 04:15:40 +00:00
Derek Hulley
a966e847f0 Merged V3.1 to HEAD
13424: ETHREEOH-1242: Sample LDAP authentication config breaks site invites in Share
   13427: Fixes for ETHREEOH-1157: Propagate exceptions using ReportedException
   13428: Fix ETHREEOH-1493: Upgrade from 2.1-A to 3.1 uses incorrect patch id and fixes_to_schema
   13429: Specific fix for ETHREEOH-1157: duplicate/triplicate users not properly prohibited
   13436: Merged V2.2 to V3.1
      13435: Merged V2.1 to V2.2  
         12307: Merged DEV/V2.1SP7 to 2.1 
            11927: ETWOONE-396 
            12112: ETWOONE-396
   13437: Fixed ETHREEOH-1498: Mismatched closing XML tag in ehcache-custom.xml.sample.cluster
   13439: Fix for ETHREEOH-1157: JSF Dialogs Absorbing Exceptions
   13456: Fixed ETHREEOH-1472: Changes to systemBootstrap cause bootstrapping ACP's not to work
   13469: Upgrade patch to update internal version2Store counter (follow-on fix for ETHREEOH-1540)
   13491: Chaining example for DOC-84
   13492: Fixed paths in zip file
   13494: Fixed GenericBootstrapPatch when overriding bootstrap views
   13495: Added @version javadoc
   13496: Minor logging updates
   13497: Fixed ETHREEOH-1431: Authentication case sensitivity switch doesn't work
   13500: Temporary fix for Sharepoint issue raised last week
   13502: ETHREEOH-1575: It's impossible to create Change Request task
   13511: Fix for ETHREEOH-1549: Impossible to create HTML web content
   13529: Fix for ETHREEOH-1595
   13531: Fix for ETHREEOH-1607: Error on chaining example xml - malformed comment
   13537: Build fix ... exclude the system user from auto creation
   13538: Build Fix - further contraints to aviod auto-creation of guest
   ___________________________________________________________________
   Modified: svn:mergeinfo
      Merged /alfresco/BRANCHES/V2.1:r12307
      Merged /alfresco/BRANCHES/V2.2:r13435
      Merged /alfresco/BRANCHES/V3.1:r
                   13424,13427-13429,13436-13437,13439,13442-13450,13452,13454-13456,
                   13469-13473,13475-13476,13479-13480,13491-13500,13502,13511,13529-13538


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@13619 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2009-03-13 01:52:39 +00:00
Jan Vonka
d5f42006f8 Merged V3.0 to HEAD
12310: Merged V2.2 to V3.0
    12306: Merged V2.1 to V2.2
      12212: Final set of XSS and HTML encoding fixes for ETWOONE-90
  12312: Merged V2.2 to V3.0
    12311: Merged V2.1 to V2.2
      11667: Fix for ETWOONE-389 - Current page number not always visible on the browse screen.
  12316: Fix for merge issue
  12317: Merged 2.1 to 3.0
    12313: Fix for regression introduced when fixing ETWOONE-91. Also fixes ETHREEOH-1043
  12319: Final set of XSS fixes specific to 3.0 codeline see ETWOONE-90
  12321: Missing file from previous checkin
  12324: Merged 2.2 to 3.0
    12320: Merged 2.1 to 2.2
      11682: Fix for ETWOONE-87: Behavior of delete cascade
  12326: Merge 2.1 to 3.0
    11615: Fix for ETWOONE-188: After session has timed out, expanding a space in the Navigator results in unfriendly error


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@12531 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2008-12-22 13:20:37 +00:00
Gavin Cornwell
14043b0071 Merged V2.2 to HEAD
8110: Fix for AWC-1664
  8112: Fix for AWC-1697

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@8501 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2008-03-11 10:37:36 +00:00
Derek Hulley
5f6cc8d453 Merged V2.2 to HEAD
8146: Interim checkin for Oracle upgrade scripts.
   8150: AR-1905
   8151: AR-1956
   8152: Correct I18N when reporting patch description
   8153: QName script for Oracle along with fixes for unique constraints on assoc tables
   8155: Upgrade scripts for Oracle V2.2 - almost there
   8164: AWC-1633: Unable to edit rule added via web service
   8166: V2.2 upgrade scripts for MySQL and Oracle
   8170: AWC-1515: E-mail doesn't reach user's mail box, if it was created with the help of templates
   8174: Fix for AWC-798
   8180: Fix for AWC-1843
   8183: Fixes for different unique index names on alf_child_assoc
   8189: AWC-1719: Need to alllow Rules to account for a space being deleted
   8249: Fixed handling of empty namespaces on Oracle
   8259: Fixes for null namespaces in QName
   8360: Modified alf_audit_date columns and added patch
   8404: Fix AR-2133: Fix handling of empty namespaces during upgrade


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@8481 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2008-03-10 15:32:55 +00:00
Gavin Cornwell
1d96040edf Merged DEV/UI-CLUSTERING2 to HEAD
8348: UI cluster support

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@8358 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2008-02-22 09:53:50 +00:00
Roy Wetherall
2a5f0a3cb8 Added permission model bootstrap bean, added mediaWiki cusomt permission model, updated UI wizards to use custom permission models for derived types, added PHP mimetype
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@8303 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2008-02-18 11:58:54 +00:00
Gavin Cornwell
a450598ecb Merge of all UI clustering changes originally applied to 2.2
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@8292 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2008-02-15 14:59:11 +00:00
Kevin Roast
eae981f72e Final set of UI dialog conversion changes from usethelink. A few associated minor fixes. Improvements and optimisations to automagic file upload JSF trickery
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@7976 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2008-01-10 14:31:58 +00:00
Kevin Roast
99544b86fa Fix so that Project Space policy code is moved to emailserver:aliasable onAddAspect - fixes 2 bugs and allows creation of project from any Project template
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@7876 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2008-01-08 19:16:24 +00:00
Kevin Roast
ace8095e21 Fix to not show spaces derived from app:projectfolder in the Advanced Space Wizard
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@7745 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2008-01-02 15:39:14 +00:00
Kevin Roast
f261c168b7 Merged V2.1 to HEAD
6933:  Various fixes for cross-site javascript and associated trickery to web-client UI screens
Plus fixes to several dialogs broken in use-the-link dialog conversion changes.

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@7362 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2007-11-12 16:07:55 +00:00
Derek Hulley
b8c846e081 Merged V2.1 to HEAD
6455: OpenOffice transformer and extractor register regardless of the initial connection state.
   6456: Fix for WCM-636 (Clicking OK twice while deleting web project results in exception)
   6457: Updated installers and associated config
   6458: AR-1669 Add getQnamePath to Javascript
   6459: Fix for AWC-1456 - Word and Excel documents were being stored as octet streams rather than their correct mimetype
   6460: Reverse order of reject & approve transitions, so that approve appears first in list of ui actions.
   6461: Removed Process.exe (often detected as a virus) and updated config wizard.
   6462: Switch to synchronous indexing for AVM by default
   6463: Better support to query the state of AVM indexes
   6464: Added Office 2007 document mimetypes and icons
   6465: Added Office 2007 icons without the typo this time


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@6736 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2007-09-10 22:41:44 +00:00
Jan Vonka
ffc06927b4 First-cut dynamic WebClient.
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@6663 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2007-08-31 15:14:36 +00:00
Paul Holmes-Higgin
e1ac246363 removed rest of ML space pieces
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@6123 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2007-06-27 21:32:12 +00:00
Paul Holmes-Higgin
f67b0f07c0 surface removal of multilingual space dialogs plus removal of native tomcat connector config
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@6122 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2007-06-27 20:17:24 +00:00
Kevin Roast
e9e3fecbb9 UI related code/jsp fixes and cleanup to new ML space/dialog components.
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@5764 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2007-05-23 16:45:42 +00:00
Derek Hulley
a266aab21c Phase one of merge of EC multilingual work
These files are their changes plus adjustments for formatting and immediate clashes
I anticipate that this will break the build, but there are too many changes coming to risk it.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@5740 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2007-05-22 04:47:14 +00:00
Gavin Cornwell
6dc020da0d Updated JavaDocs for web client project
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@5337 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2007-03-08 08:30:03 +00:00
Derek Hulley
87b184032f Merged V2.0 to HEAD
5116: AWC-1067, AWC-1126
   5121: AR-1233 (from 1.4 via 2.0)
   5129: AR-966
   5131: Overlay copy and duplicate name


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@5323 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2007-03-07 09:50:10 +00:00
Paul Holmes-Higgin
7fd19e7e88 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
71b50172ef Merged V2.0 to HEAD
svn merge svn://svn.alfresco.com:3691/alfresco/BRANCHES/V2.0@5142 svn://svn.alfresco.com:3691/alfresco/BRANCHES/V2.0@5143 .
      - DeletedSpaceDialog
   svn merge svn://svn.alfresco.com:3691/alfresco/BRANCHES/V2.0@5179 svn://svn.alfresco.com:3691/alfresco/BRANCHES/V2.0@5180 .
      - SDK Eclipse project classpath


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@5184 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2007-02-19 14:19:15 +00:00
Derek Hulley
93cd8e8f4e Merge V2.0 to HEAD
svn merge svn://svn.alfresco.com:3691/alfresco/BRANCHES/V2.0@5160 svn://svn.alfresco.com:3691/alfresco/BRANCHES/V2.0@5161 .
      -Skipped missing target: 'root\projects\web-client\source\java\org\alfresco\web\bean\LicenseBean.java' (File not required on HEAD)


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@5173 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2007-02-16 16:38:51 +00:00
Derek Hulley
3627699e04 Merged 1.4 to HEAD
svn merge svn://svn.alfresco.com:3691/alfresco/BRANCHES/V1.4@4229 svn://svn.alfresco.com:3691/alfresco/BRANCHES/V1.4@4230 .
   svn merge svn://svn.alfresco.com:3691/alfresco/BRANCHES/V1.4@4232 svn://svn.alfresco.com:3691/alfresco/BRANCHES/V1.4@4233 .
   svn merge svn://svn.alfresco.com:3691/alfresco/BRANCHES/V1.4@4234 svn://svn.alfresco.com:3691/alfresco/BRANCHES/V1.4@4235 .
   svn merge svn://svn.alfresco.com:3691/alfresco/BRANCHES/V1.4@4239 svn://svn.alfresco.com:3691/alfresco/BRANCHES/V1.4@4240 .
   svn resolved root\projects\web-client\source\java\org\alfresco\web\app\AlfrescoNavigationHandler.java
   svn resolved root\projects\web-client\source\web\WEB-INF\faces-config-beans.xml
   svn merge svn://svn.alfresco.com:3691/alfresco/BRANCHES/V1.4@4241 svn://svn.alfresco.com:3691/alfresco/BRANCHES/V1.4@4242 .
   svn merge svn://svn.alfresco.com:3691/alfresco/BRANCHES/V1.4@4243 svn://svn.alfresco.com:3691/alfresco/BRANCHES/V1.4@4244 .
   svn merge svn://svn.alfresco.com:3691/alfresco/BRANCHES/V1.4@4244 svn://svn.alfresco.com:3691/alfresco/BRANCHES/V1.4@4245 .
   svn merge svn://svn.alfresco.com:3691/alfresco/BRANCHES/V1.4@4245 svn://svn.alfresco.com:3691/alfresco/BRANCHES/V1.4@4246 .
   svn merge svn://svn.alfresco.com:3691/alfresco/BRANCHES/V1.4@4247 svn://svn.alfresco.com:3691/alfresco/BRANCHES/V1.4@4248 .
   svn merge svn://svn.alfresco.com:3691/alfresco/BRANCHES/V1.4@4248 svn://svn.alfresco.com:3691/alfresco/BRANCHES/V1.4@4249 .
   svn merge svn://svn.alfresco.com:3691/alfresco/BRANCHES/V1.4@4250 svn://svn.alfresco.com:3691/alfresco/BRANCHES/V1.4@4251 .
   svn merge svn://svn.alfresco.com:3691/alfresco/BRANCHES/V1.4@4251 svn://svn.alfresco.com:3691/alfresco/BRANCHES/V1.4@4252 .


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@4633 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2006-12-18 13:18:44 +00:00
Kevin Roast
6027f1c17d . 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
Kevin Roast
249ddd00c8 . Fix up for several merge issues in UI classes
. Framework for new SelectList component

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/WCM-DEV2/root@4221 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2006-10-25 16:12:27 +00:00
Britt Park
a2f161b731 Heinous merge from HEAD. Seems to basically work. Be on guard however.
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/WCM-DEV2/root@4137 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2006-10-18 02:24:36 +00:00
Kevin Roast
82e76ede01 Bug fixes to rename action for non-AVM objects
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/WCM-DEV2/root@4016 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2006-10-04 10:20:43 +00:00
Kevin Roast
2d261f31f7 . Implemented 'rename' for AVM files/folders
- this has highlighted some interesting future issues with AVM NodeRef objects - as unlike the usual noderefs, they can change due to a rename or move!
. Fixed issue with navigating back to details and browse screens after a delete file/folder operation

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/WCM-DEV2/root@4004 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2006-10-03 11:49:37 +00:00
Kevin Roast
0dc8a68d44 . Edit Folder Properties dialog
. Edit file/folder properties now shows name+title+description as expected
. Addition of TITLED and UIFACETS aspects to files and folders during import/create

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/WCM-DEV2/root@3987 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2006-10-02 10:14:45 +00:00
Britt Park
b0d02fa6be 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
f6355ea108 Merge from HEAD into WCM-DEV2. Also fixes build breakage in
jndi-client and catalina-virtual that I introduced earlier. 


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/WCM-DEV2/root@3393 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2006-07-24 18:27:41 +00:00
Britt Park
77df6eb45d Morning merge.
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/WCM-DEV2/root@2959 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2006-05-23 16:39:21 +00:00