perfsonar development work

Author: loukik
Date: 2006-10-19 08:09:43 -0400 (Thu, 19 Oct 2006)
New Revision: 1695

Modified:
   
branches/romradz-ant4rel-20061017/src/org/perfsonar/commons/auxiliary/AuxiliaryComponentManager.java
Log:
Applied changes required for "Multiple services in single tomcat" fix.

Modified: 
branches/romradz-ant4rel-20061017/src/org/perfsonar/commons/auxiliary/AuxiliaryComponentManager.java
===================================================================
--- 
branches/romradz-ant4rel-20061017/src/org/perfsonar/commons/auxiliary/AuxiliaryComponentManager.java
        2006-10-19 12:01:52 UTC (rev 1694)
+++ 
branches/romradz-ant4rel-20061017/src/org/perfsonar/commons/auxiliary/AuxiliaryComponentManager.java
        2006-10-19 12:09:43 UTC (rev 1695)
@@ -5,6 +5,7 @@
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.Map;
+import java.net.URL;
 import java.util.Iterator;
 
 import org.perfsonar.service.commons.exceptions.SystemException;
@@ -64,10 +65,18 @@
      */
     public void initManager() throws SystemException {
 
-        //read components from Configuration file and init them
+//read components from Configuration file and init them
         
         //String configFileName = 
"/projects/sonar/perfsonar/conf/components.properties";
-        String configFileName = System.getProperty("components.properties");
+        URL urlString = 
this.getClass().getClassLoader().getResource("perfsonar/conf/components.properties");
+        
+        if(urlString==null || urlString.toString()==null) {
+            
+            throw new 
SystemException("AuxiliaryComponentManager.initManager: " +
+                    "Missing or unable to locate components.properties file. 
Cannot continue");
+        }
+        String configFileName = urlString.toString();
+        
         System.out.println("AuxiliaryComponentManager.initManager: " +
                 "Read config file name as: "+configFileName);