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

Merged V2.2 to HEAD

Browse Source 
8049: Fix for WCM-1033: Only admin users can create web projects
   8051: Merged V2.1 to V2.2
      8006: Merged V2.1-A to V2.1 (Virtual Server fixes)
         7723: The JMX server connector is now lazily instantiated in the server context.
         7734: Fix for WCM-934.
         7735: The linkvalidation service now provides a public API
         7742: Possible fix for ACT #361
      8012: Merged V2.1-A to V2.1
         7749: Fix stack overflow
         7955: Fix for issue ADB-18 Forward slash '/' in username causes Advanced Search failure
         7975: AR-1832: Allow setting of timeout value in the Java webservices client
         7995: Include the alf_child_assoc.type_qname in the check for duplicate children.
   8052: Build fix
   8054: Merged V2.1 to V2.2
      8045: Patch fix to solve WCM-1051 - also reruns fixed patch on previously patched repos (see CHK-2143)
   8058: Fixed compilation issues following merge


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@8466 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Derek Hulley
2008-03-07 13:39:01 +00:00
parent d096386b6b
commit a55663b452
10 changed files with 84 additions and 80 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -49,6 +49,10 @@ import org.springframework.core.Ordered;
public class RuntimeSystemPropertiesSetter
implements BeanFactoryPostProcessor, Ordered
{
private static org.apache.commons.logging.Log log=
org.apache.commons.logging.LogFactory.getLog(
RuntimeSystemPropertiesSetter.class );
// default: just before PropertyPlaceholderConfigurer
private int order = Integer.MAX_VALUE - 1;
@@ -61,14 +65,38 @@ public class RuntimeSystemPropertiesSetter
String path=null;
try
{
// Typically, the value of 'path' will be something like:
//
// $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 = loader.getResource("alfresco/alfresco-jmxrmi.password").toURI().getPath();
}
catch (java.net.URISyntaxException e ) { e.printStackTrace(); }
catch (Exception e )
{
if ( log.isWarnEnabled() )
log.warn(
"Could not find alfresco-jmxrmi.password on classpath");
}
String alfresco_jmx_dir =
path.substring(0,path.lastIndexOf("/alfresco-jmxrmi.password"));
if ( path == null ) { System.setProperty("alfresco.jmx.dir", ""); }
else
{
String alfresco_jmx_dir =
path.substring(0,path.lastIndexOf("/alfresco-jmxrmi.password"));
System.setProperty("alfresco.jmx.dir", alfresco_jmx_dir);
// The value of 'alfresco.jmx.dir' will be something like:
// $TOMCAT_HOME/webapps/alfresco/WEB-INF/classes/alfresco
System.setProperty("alfresco.jmx.dir", alfresco_jmx_dir);
}
}
public void setOrder(int order) { this.order = order; }
public int getOrder() { return order; }