inteligr8/alfresco-community-repo
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-community-repo.git synced 2025-08-07 17:49:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (5.0/Cloud)

Browse Source 
78429: Merged EOL (5.0/Cloud) to HEAD-BUG-FIX (5.0/Cloud)
      75801: ACE-2149: EOL AVM / WCM
       - Thorough sweep of 'avm' and 'wcm' references
       - Picked up on many 'deployment' and related classes and configuration
       - Repo starts


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@82558 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Erik Winlof
2014-09-03 12:13:50 +00:00
parent 63678f2980
commit e94f8f8351
93 changed files with 62 additions and 4426 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
source/java/org/alfresco/util/RuntimeSystemPropertiesSetter.java
View File

@@ -107,13 +107,6 @@ public class RuntimeSystemPropertiesSetter implements BeanFactoryPostProcessor,
//
// $TOMCAT_HOME/webapps/alfresco/WEB-INF/classes/alfresco/alfresco-jmxrmi.password
// or: $TOMCAT_HOME/shared/classes/alfresco/alfresco-jmxrmi.password
//
// However, if WCM isn't installed there won't be a JMX password file.
// Therefore, while it's important to choke on bad paths, a missing
// password file must be acceptable -- it just means that WCM virtualization
// will be disabled later when org.alfresco.mbeans.VirtServerRegistry
// refuses to bring up the serverConnector bean.
path = this.resolver.getResource("classpath:alfresco/alfresco-jmxrmi.password").getFile().getCanonicalFile();
}
catch (Exception e )