15586: Merged V3.1 to V3.2
14863: Fixed ETHREEOH-2223: Oracle version-specific schema update failure in upgrading from 2.1A build to 3.1 build
15041: Further fix for ETHREEOH-2223: Oracle version-specific schema update failure in upgrading from 2.1A build to 3.1 build
15428: The ipAddress field of HibernateNodeDaoServiceImpl is 39 characters long (Transaction.hbm.xml modified)
15472: Incremented schema version number for SQL patch
15502: ETHREEOH-2292: Deployment failure in case of IPv6 on Win 2k8
*NOTE*: Removed Derby scripts as it's no longer supported
15588: (record only after Derby script removal) Fixed over-zelous move of Derby scripts
15589: Removed hard-coded GUEST reference
___________________________________________________________________
Modified: svn:mergeinfo
Merged /alfresco/BRANCHES/V3.1:r14863,15041,15428,15472,15502
Merged /alfresco/BRANCHES/V3.2:r15586,15588-15589
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@16863 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
12923: New Enterprise Examples project containing hyperic plugin and README.txt
12908: A few fixes to improve consistency in JMX object naming
12889: Fix failing unit tests. Include linkvalidation in unit test classpath.
12885: Merged DEV/DAVEW_POST3D to V3.1
12881: Changes to allow monitoring of authentication configuration
12862: Merged DEV/3.1_ENTERPRISE_ONLY to DEV/DAVEW_POST3D
12797: Changes to allow persistence of changes made by JMX.
12852: Review comment from Derek: remove dependencies of descriptor service (serverDescriptorDAO, currentRepoDescriptorDAO and installedRepoDescriptorDAO) out of bootstrap-context.xml
12849: Correction to JAWS-221: dbscripts directory must be directly under config/alfresco in enterprise project.
12847: JAWS-221: Move proprietary DB create/upgrade scripts into Enterprise Only project
12845: Avoid NullPointerExceptions in status templates when no codeName or description exists for the status code
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@13513 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
11557: ETHREEOH-666 - Consumers should not be able to create calendar entries. ETHREEOH-667 - Consumers should not be able to create/update wiki pages.
11559: Command line utility to help with schema comparisons and upgrades
11560: Fixed: ETHREEOH-518 Unfriendly error for "Create Site" when session has timed out. Fixed: IE7 prompt and messages now looks ok.
11563: Need to add connection strings and hibernate dialect examples. Fixes ETHREEOH-445
11565: Fixed ETHREEOH-538: Only support AlfrescoOracle9Dialect
11566: Discussions "Said" changed to "said" plus missing space inserted
11569: Fix for ETHREEOH-12 and ETHREEOH-592.
11572: Skip unit tests when usage monitoring is disabled
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@12476 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
