16971: Merged V3.1 to V3.2
14282: (RECORD ONLY) Updated version to 3.1.1
14565: (RECORD ONLY) Updated version to include revision number (x.y.z)
14848: (RECORD ONLY) Updated version number
15029: (RECORD ONLY) ETHREEOH-441 and ETHREEOH-1862 Exceptions in server when certain PDFs are uploaded.
- Probably done already without merge info
- Renamed source zip to help tracking
15985: ETHREEOH-2292: Deployment failure in case of IPv6 on Win 2k8
16164: Fixed ETHREEOH-2690: JGroups TCP doesn't bind to specified address
16240: (RECORD ONLY) Fix typos in installer
16726: Fix ETHREEOH-2677 - user usages (when taking ownership)
16745: Fix ETHREEOH-2991 - Deployment exception, unable to deploy - when deploying a manual snapshot with a stale file
16771: (RECORD ONLY) Fix to ETHREEOH-441
- Probably merged without merge info
16822: Merged DEV/BELARUS/V3.1 to V3.1
16753: ETHREEOH-1951: when versionable aspect is active, using the Microsoft Word option ...
16825: Fixed ETHREEOH-803: Incorrect mimetype is displayed for .pps and .pot files
16862: Fix for ETHREEOH-801 Fail to extract some kind of PDF file metadata
- Resolved merge by prefering merged-in fix
16880: Merged V2.2 to V3.1
13966: (record only) Updated to use ALF-BINARIES version of installjammer
14340: (record only) Fix so deployment installers build
14719: (record only) Tweaks to AMP
15153: (record only) Fix ETWOTWO-1264 - PHP integration
15287: Fixed ETWOTWO-989: MS Sql server upgrade from 2.1.6 failed
15351: ETWOTWO-1345 (script not matching patch ID)
16928: Fixed shutdown: Task threads are now daemon threads
16986: Merged V3.1 to V3.2
16932: Moved Lucene ResultSet prefetch code to use NodeBulkLoader (backed by common code in Node DAO)
16945: (RECORD ONLY) Merged V3.2 to V3.1
16931: Fixed build unit test path for recent Chiba lib change
16957: Removed Hibernate event listener after 3.2.3 CGLib fixes
16959: Applied fix for ETHREEOH-2121: ContentUtils.getContentAsString does not pass JSESSIONID into the request
16961: (RECORD ONLY) Updated db settings in configs
16964: (RECORD ONLY) Merged V3.2 to V3.1
16308: ETHREEOH-2833: The Content rule with 'Items with specific text value in property' condition can't be created.
16968: Fixed ETHREEOH-2120: Recently Modified Documents Dashlet failed to load after a big upload
16983: Build fix: avoid queries for parent assocs if no nodes were found during child node in caching
16991: Merge V3.1 to V3.2
15136: (RECORD ONLY) : changes have already been merged.
MERGE 2.2 to 3.1
14985 - ETWOTWO-1174 - Preview of protected PDFs results in an error
14305 - ETWOTWO-951 - contribution
14601 - ETWOTWO-1236 - Make FSR deployment case sensitive.
17022: MT - fix fallout from r16924 - add inbound collection support to MT node service interceptor (caught by MultiTDemoTest.testCreateGroups)
17023: Fixed parentAssocCache bug when adding assocs against an empty cache
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@17025 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
16713: ETHREEOH-2379 deployment missing crypto libraries.
16722: ETHREEOH-2798 - java.lang.NullPointerException while deleting a folder node with emptyTranslation
16752: ETHREEOH-2946 - Release a test server from inside an Approve/Reject task
16796: ETHREEOH-1841 - MBean error when running in a WebSphere cluster
16920: ETHREEOH-2796 - Word 97 To Text transformation fails
16955: Merge V3.1 to V3.2
14275: Invitation change for ETHREEOH-1456, Missed change from check in 14222.
14222: ETHREEOH-1456 - accepting a rejected invitation.
16963: ETHREEOH-3029 - Strange defaltOnLoadListsner in hibernate-context.xml
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@16966 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
- Pulled old AuditDAO methods into new AuditDAO interface
- Combined AuditDAO implementations
- First cut of high-level AuditSession creation
- TODO: AuditSession data generation according to path
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@15864 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
14955: Merged V2.2 to V3.1
14352: Fixed ETWOTWO-1113: Creation date / modification date reset to current date during import
14956: Fix for ETHREEOH-2198 and ALFCOM-2972
- Thumbnail Service now allows creation of system managed thumbnails nodes by Consumer users or on Locked items
- Explicit permission check to ensure user must at least be able to Read the original doc
- Now correctly ensures that the 'modifier' properties are not updated on the original doc due to thumbnail generation
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@14957 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
- Set of overridable properties now centralized to new global-properties bean and referenced by repository-properties, hibernateConfigProperties and subsystems
- Installer defaults can now be specified in classpath:alfresco-global.properties
- A special BeanFactoryPostProcessor ensures backward compatibility with existing alfresco/extension/*-context.xml files overriding repository-properties or hibernateConfigProperties.
- Subsystems pick up initial property values from global-properties. Placeholders expanded.
- Messages now output when subsystems stopped and started
- Object names lists to allow better hierarchical organisation
- Composite properties now supported by child application contexts
- Materialized in context.xml as ListFactoryBeans - lists of beans
- Configured values injected before application context started
- Configurable via alfresco-global.properties or JMX
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@14351 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
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
13175: Basic implementation of timestamp propagation
13176: Fixed ETHREEOH-1172: NodeService.getProperties sometimes returning instance of "Collections.SingletonList"
13184: Merged V3.0 to V3.1
13179: Merged V2.2 to V3.0
13141: Fix for ETWOTWO-1109: WCM - content publisher cannot submit modified assets (2.2.3-dev regress)
13144: Fix for repopened ETWOTWO-1082: AVM has concurrency limitations via CIFS/NFS/FTP ...
13180: Merged V2.2 to V3.0
13144: Fix for repopened ETWOTWO-1082: AVM has concurrency limitations via CIFS/NFS/FTP ...
13185: Logging enhancements to FileFolderService to aid debugging of ETHREEOH-1247
13187: Changed NPE to IllegalArgumentException
13191: Fix for ETHREEOH-1267 malformed JSON.
13203: Fix ETHREEOH-1309 regress
13205: Fixed typo of UNKNOWN
13206: DM index check - allow index transaction tracker to be reset, etc
13213: Fixed ETHREEOH-1313: System Property Overrides not working when using the installer
13214: WCM services - add/update unit tests - CRUD using different roles
___________________________________________________________________
Modified: svn:mergeinfo
Merged /alfresco/BRANCHES/V3.0:r13179-13180
Merged /alfresco/BRANCHES/V2.2:r13141,13144
Merged /alfresco/BRANCHES/V3.1:r13172,13175-13176,13179-13181,13184-13189,13191,13203,13205-13206,13210-13215
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@13610 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
Merged DEV/LIVECYCLE-3.1 to V3.1
12665: Merged V2.1-A to DEV\LIVECYCLE-3.1
8615: Cluster startup and property setting enhancements
8657: Fixed shutdown procedure for JGroups
8676: Enable system property overriding of more JGroups TCP stack properties
- ${alfresco.tcp.start_port:7800}
- ${alfresco.tcp.port_range:3}
8678: More logging of cluster view changes and channel factory config during startup
12667: Merged V2.1-A to DEV/LIVECYCLE-3.1
9188: Index recovery job only calls through if property 'alfresco.cluster.name' has been set
9197: Fixed unit test after bean property name change
12793: Merged V2.1-A to DEV/LIVECYCLE-3.1
7765: Requested mimetypes
8526: Updated Mimetypes
8610: Mimetype changes
Many branding and other non-core changes were omitted
12848: Fixed JAWS-223: Adobe LC Hibernate Dialect Loading
- Hibernate dialect can be null or empty and will be autodetected from the database metadata
- Property 'hibernate.dialect' is set on the System
- iBatis loading (activities) checks for 'hibernate.dialect'
- SchemaBootstrap checks for 'hibernate.dialect'
12854: Merged V2.1-A to DEV/LIVECYCLE-3.1
8681: Fixed mimetype 'application/photoshop'
12856: Merged V2.1-A to DEV/LIVECYCLE-3.1
9008: Fixed ADB-64: NPE when applying aspect cm:mlDocument
12857: Merged V2.1-A to DEV/LIVECYCLE-3.1
9032: ACT-2303: "Namespace is displayed in the Node browser is www.alfresco.org ...
___________________________________________________________________
Modified: svn:mergeinfo
Merged /alfresco/BRANCHES/V2.1-A:r7765,8526,8610,8615,8657,8676,8678,9188,9197
Merged /alfresco/BRANCHES/V3.1:r12894
Merged /alfresco/BRANCHES/DEV/LIVECYCLE-3.1:r12665,12667,12793,12848,12854,12856-12857
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@13518 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
12083: Fix for ETHREEOH-790 - when using external auth such as NTLM the Change Password and Logout features are no longer available in the Share UI.
12085: ETHREEOH-565: Failure to generate flash preview for PPT file
12086: ETHREEOH-903 Sites drop-down Favorites UI improvements
ETHREEOH-904 My Sites dashlet Favorites UI improvements
ETHREEOH-547 User who is not a site manager can delete sites: my sites dashlet and sites page
12093: ETHREEOH-861, ETHREEOH-928
12094: Remove __MACOSX folder that has appeared in Share webapp
12096: Removed spurious files from YUI 2.6.0 distribution
12100: ETHREEOH-929 Tightening up transport adapters field (should never be shown for ASR)
12104: Fix for ETHREEOH-944. Admin now able to reset user home location again ((regression).
12105: Fixed: ETHREEOH-934 Multi-clicking Site favoriate icons can cause multiple requests before others finish and effectively cause a browser lock-up until page refresh
12106: Exception needs to be rethrown after releasing packet to the memory pool on a Winsock NetBIOS receive. ETHREEOH-628.
12110: An i18n message didn't work for failures. Related to ETHREEOH-934 Multi-clicking Site favoriate icons can cause multiple requests before others finish and effectively cause a browser lock-up until page refresh
12115: Added unit test to check for cm:folder-derived type support
12116: Removed unused, old patch-related query
12117: Merged V2.2 to V3.0
11454: Fixed ASH-7: QName fetching is inefficient when run without L2 cache
12118: Fixed compilation error after merge
12119: DM User Usages - 2nd pass (fix ETHREEOH-677)
12122: UserUsage does nothing if system is READ-ONLY.
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@12500 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
10963: Merged DEV/LARGE_COLLECTION_PROPERTIES_2.2.1 to V2.2
- PersonService: Lucene removal
- Lucene optimizations (in progress)
- Multi-valued and locale-specific properties persisted in alf_node_properties
- Removal of unused AVM tables
10987: Oracle dialects and enhanced SQL patch support
- Only support Alfresco's 9i and 10g dialects (with auto-switching)
- SQL script patches can now apply selectively to ranges
11007: Test to check cached retrieval of QNames
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@11206 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
10586: Merged V2.2 to V2.9
9883: Fix for https://issues.alfresco.com/jira/browse/ETWOTWO-561
9893: Gave some more time to wait for the threads to finish (QNameDAOTest)
9955: Added trace logging of calls that possibly cause failures during session flushing
9956: Part fix ETWOTWO570: RetryingTransactionAdvice needs to use RetryingTransactionHelper
9958: Fixed ETWOTWO-570: AVM transaction interceptors fail if methods are incorrectly declared
9973: More missing transaction declarations for AttributeService
9977: Fixed unit test to rollback properly after expected txn failure
9978: Fix for ETWOTWO-440: Error : 500: Failed to execute method NodeInfoBean.sendNodeInfo
9986: LinkValidationService missing txn declaration for onBootstrap
10588: Merged V2.2 to V2.9
9898: Fixed handling of cm:name on root nodes
9900: Empty property sets are allowed
10589: Merged V2.2 to V2.9
9965: Fixed unit test to inject 'nodeService' and not 'NodeService'.
10311: getWebProjectUserRole - change log level from info to debug
10329: Fix missing and mis-spelt transaction declarations
10343: Fix for ETWOTWO-32
10346: Build Fix
10358: Fix for ETWOTWO-621
10362: Fix for ETWOTWO-518
10371: QNameDAO cache doesn't blow up if cache entry is invalid
10538: Fix for minor XSS issue identified in ETWOTWO-657 item 3
10678: Merged V2.2 to V2.9
10205: Fix for ETWOTWO-48: Cancelled import of war into a Web project and Web Project became unusable
10206: Fix for ETWOTWO-181: Deletion of checked out document
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@10710 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
10561: Merged V2.2 to V2.9
9882: Node DAO separation
10580: Merged V2.2 to V2.9
10576: Missing onContentDelete firing
10577: More policies: beforeCreateNode and beforeDeleteNode when archiving nodes in hierarchy
- Updated UsageService and TenantService to conform to the new node DAO (more separation)
- TODO: Tenant node interceptor not present. This must be added if Multi-Tentant features are required.
- NodeMonitor event processing now checks that the nodes are still valid before processing.
- onMove firing was breaking NodeMonitor. Changed onMove to not fire when nodes are moved between stores.
- Raised ALFCOM-1912: ClassCastException when accessing property of type ver2:versionNumber
- Pull setFixedAcls fully into Node DAO for simpler and speedier execution
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@10709 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
10531: Merged V2.2 to V2.9
9928: Optimise & consolidate get web project user role (ETWOTWO-568)
9962: Reverted rev 9902 of RuleServiceImpl
9964: Fixed transaction read-only declaration
9979: ETWOTWO-572: Allow OpenOffice to be called remotely
9987: Second attempt at fixing ETWOTWO-438: versionable aspect and invite user
10096: Fix for ETWOTWO-507 FSR Service Port
10224: Fix for ETWOTWO-507 (inconsistent results with add and delete together)
10225: Adding logging and making FSR work with absolute directories (ETWOTWO-70 and ETWOONE-81)
10254: ALFCOM-242, ALFCOM-230, ETWOTWO-437
10283: Fixed deployment installer builder to use IJ v1.2.7
10359: Add Display Group for deployment servers to JSF client (ETWOTWO-474)
10536: MT - simple setup/system test
10553: Hid domain objects completely within the UsageDeltaDAO
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@10613 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
8372: Merged V2.1 to V2.2
8314: Merged V2.0 to V2.1
7750: Fix for ACT-475: ContentStoreCleaner causes OutOfMemoryError
8332: Made content URL column larger to accommodate the extra locale info present in 2.1
8334: Build fix: V2.1 tighter on authentication for getTempWriter
8376: Merged V2.1 to V2.2
8325: Fix for AWC-1089
8361: Workaround for WCM-882: All metadata extracters can now handle zero length files
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@8497 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
8083: Merged V2.1 to V2.2
8066: RM-31 and related issues (ACT-729)
8068: Fix for AR-1997
8084: Fixed script error on notify page of invite website user wizard
8086: Merged V2.1 to V2.2
8075: Clear()ing a hibernate session, is not always enough to guarantee that transactions not use unbounded amounts of memory
8076: Turn off test that needs to be fixed real soon now.
8092: Implementation for: http://issues.alfresco.com/browse/AR-1744
8093: Fixed upgrade scripts for V2.1.2 to V2.2 upgrades
8096: Fix for AWC-1578 and AWC-1814
8097: Added new indexes missing from scripts and made index names consistent.
8098: Fix for AWC-1548
8100: Removed use of QName from alf_permission table
8102: Fix for AWC-1690
8103: test was == on id that used to be long but is now a Long
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@8476 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
7575: Permission changes for AVM.
7577: Incorporated most of the feedback provided by Kevin C earlier today
7578: Removed directory not removed by patch
7579: EmailServer bug fixes
AR-1902: Double posts when emailing to a document
AR-1904: Attachments via email should be allowed on forum posts
AR-1903: (Partial Fix) Text attachments should be treated the same way as other attachments
7583: Fixed WCM-961 & WCM-962: Added confirm dialog for 'Delete All Deployment Reports' and 'Release Server' actions
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@8434 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
6349: Build fix after ReadPermissions was added to the permission model
6350: CIFS file rename fixes
6352: Management of avmsubmittedaspect, particularly as applies to newly created directories
6353: Added assemble to ignore property pattern
6354: Deployment project build stuff
6355: Fix for AR-1245 (Do not authenticate in a read only TX as it could create a person object)
6356: Office 2003 Add-Ins - Fixes to installers to support Vista
6357: Office Add-In web scripts - Updated to support the new Office 2007 extensions (.docx, .xlsx, .pptx)
6358: Fix for AR-1392 - Audit string lengths
6359: Remove unwanted rule model from repo
Fix issue with update rules on spaces causing documents to be deleted in CIFS
6360: Office 2003 Add-In Installers, Vista fixes
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@6723 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
- Issuers were using Spring init to load data. The Hibernate database auto-update was switch on and this bypassed the SchemaBootstrap.
- Added an AvmBootstrap bean for initializing AVM components that require DB interaction
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@5042 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
