Merged V3.0 to HEAD

11375: MT - complete fix for ETHREEOH-189
   11378: Supporting changes for license component in 3.0 (but not the license component itself ...)
   11380: Fix for transaction error. ETHREEOH-451.
   11383: Oracle upgrade and create SQL fixes (Can Entperprise-only later)
   11384: Fix truelicense classpath in sdk-projects


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@12424 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Derek Hulley
2008-12-17 05:36:39 +00:00
parent 23af538c1a
commit 37d6a30bd2
28 changed files with 1160 additions and 615 deletions

View File

@@ -106,9 +106,7 @@ public class RepoServerMgmt implements RepoServerMgmtMBean, ApplicationContextAw
try
{
licenseService = (LicenseService) ctx.getBean("org.alfresco.license.LicenseComponent");
// verify license, but only if license component is installed
licenseService.verifyLicense();
readOnly = !licenseService.isLicenseValid();
}
catch (NoSuchBeanDefinitionException e)
{