[Red5devs] [red5 commit] r3089 - java/server/trunk/src/org/red5/server/tomcat

[codesite-noreply at google.com]

Author: daccattato
Date: Mon Sep 22 08:26:37 2008
New Revision: 3089

Modified:
    java/server/trunk/src/org/red5/server/tomcat/TomcatLoader.java

Log:
fixed path problem where "dist/./dist" was showing up.  Instead, made it  
absolute

Modified: java/server/trunk/src/org/red5/server/tomcat/TomcatLoader.java
==============================================================================
--- java/server/trunk/src/org/red5/server/tomcat/TomcatLoader.java	 
(original)
+++ java/server/trunk/src/org/red5/server/tomcat/TomcatLoader.java	Mon Sep  
22 08:26:37 2008
@@ -492,10 +492,22 @@

  		Container cont = null;
  		
+		if (webappFolder == null) {
+			// Use default webapps directory
+			webappFolder = System.getProperty("red5.root") + "/webapps";
+		}
+		System.setProperty("red5.webapp.root", webappFolder);
+		log.info("Application root: {}", webappFolder);
+
+		// scan for additional webapp contexts
+
+		// Root applications directory
+		File appDirBase = new File(webappFolder);
+		
  		//check if the context already exists for the host
  		if ((cont = host.findChild(contextName)) == null) {
  			log.debug("Context did not exist in host");
-			String webappContextDir = FileUtil.formatPath(webappFolder,  
applicationName);
+			String webappContextDir =  
FileUtil.formatPath(appDirBase.getAbsolutePath(), applicationName);
  			log.debug("Webapp context directory (full path): {}", webappContextDir);
      		//set the newly created context as the current container
      		cont = addContext(contextName, webappContextDir);