[Red5commits] [617] jbauch

[luke@codegent.com]

load red5.properties from configuation root


Timestamp: 04/03/06 03:19:44 (1 hour ago) 
Change: 617 
Author: jbauch

Files (see diff or trac for details): 
java/server/trunk/src/org/red5/server/Standalone.java


Trac: http://mirror1.cvsdude.com/trac/osflash/red5/changeset/617

Index: /java/server/trunk/src/org/red5/server/Standalone.java
===================================================================
--- /java/server/trunk/src/org/red5/server/Standalone.java (revision 616)
+++ /java/server/trunk/src/org/red5/server/Standalone.java (revision 617)
@@ -49,5 +49,4 @@
 	
 	protected static String red5ConfigPath = "./conf/red5.xml";
-	protected static String red5PropertiesPath = "./conf/red5.properties";
 	
 	/**
@@ -68,13 +67,4 @@
 		}
 		
-		// Setup system properties so they can be evaluated by Jetty
-		Properties props = new Properties();
-		props.load(new FileInputStream(red5PropertiesPath));
-		Iterator it = props.keySet().iterator();
-		while (it.hasNext()) {
-			String key = (String) it.next();
-			System.setProperty(key, props.getProperty(key));
-		}
-		
 		// Detect root of Red5 configuration and set as system property
 		File fp = new File(red5ConfigPath);
@@ -86,4 +76,14 @@
 		System.setProperty("red5.config_root", root);
 
+		// Setup system properties so they can be evaluated by Jetty
+		Properties props = new Properties();
+		props.load(new FileInputStream(root + "/red5.properties"));
+		Iterator it = props.keySet().iterator();
+		while (it.hasNext()) {
+			String key = (String) it.next();
+			System.setProperty(key, props.getProperty(key));
+		}
+		
+		// Store root directory of Red5
 		idx = root.lastIndexOf('/');
 		root = root.substring(0, idx);