Index: src/web/src/org/opennms/web/graph/PrefabGraph.java
===================================================================
RCS file: /cvsroot/opennms/opennms/src/web/src/org/opennms/web/graph/PrefabGraph.java,v
retrieving revision 1.8
diff -U3 -r1.8 PrefabGraph.java
--- src/web/src/org/opennms/web/graph/PrefabGraph.java	22 Mar 2005 05:49:26 -0000	1.8
+++ src/web/src/org/opennms/web/graph/PrefabGraph.java	27 Jan 2006 23:37:27 -0000
@@ -32,15 +32,90 @@
 
 package org.opennms.web.graph;
 
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FilenameFilter;
+import java.io.IOException;
+import java.util.Enumeration;
 import java.util.HashMap;
 import java.util.Map;
 import java.util.Properties;
 
+import org.opennms.core.resource.Vault;
 import org.opennms.core.utils.BundleLists;
 
 public class PrefabGraph extends Object implements Comparable {
     public static final String DEFAULT_GRAPH_LIST_KEY = "reports";
 
+    static public class Config extends Object {
+    	public Map prefabGraphs;
+    	public Properties rawProps;
+    }
+    /* *
+     * Return a PrefabGraph.Config,
+     * 
+     * Parses the specified file (baseConfigName is relative to ONMS home dir), and
+     * merges in any properties files in the baseConfigName".d" directory.
+     * 
+     * rawProps will contain the raw merged Properties object (so caller can pull
+     *  out any non-report parameters
+     *  
+     *  prefabGraphs is a Map of PrefabGraph objects keyed on the name as specified
+     *   in the config file.
+     */
+    
+    public static PrefabGraph.Config getPrefabGraphConfiguration(String baseConfigName) throws IOException {
+    	PrefabGraph.Config result = new PrefabGraph.Config();
+        String homeDir = Vault.getHomeDir();
+        Properties props = new java.util.Properties();
+        String baseFilename=homeDir+baseConfigName;
+
+        props.load(new FileInputStream(baseFilename));
+        File propsDir=new File(baseFilename+".d");
+
+        if(propsDir.exists()) {
+        	//FInd all *.properties files in propsDir
+        	File[] subPropFiles=propsDir.listFiles(new FilenameFilter() {
+        		public boolean accept(File dir, String name) {
+        			return name.endsWith(".properties");
+        		}
+        	});
+        	
+        	for(int i=0; i<subPropFiles.length; i++) {
+        		Properties subProps=new java.util.Properties();
+        		subProps.load(new FileInputStream(subPropFiles[i]));
+        		//If the sub reports properties file defines "reports" then
+        		//we assume it has multiple reports, so we want to merge the "reports" value and
+        		// just add all the other properties as is. 
+        		
+        		//If there is no "reports" property, then assume it's just one report.  Prefix the 
+        		// file basename (the report name) to all properties from this sub file, and
+        		// add these renamed properties to the global properties
+        		String subReportProp=subProps.getProperty("reports");
+        		if(subReportProp!=null) {
+        			//Multiple reports - merge "reports" and import all other values
+        			props.setProperty("reports", props.getProperty("reports")+","+subReportProp);
+        			subProps.remove("reports");
+        			props.putAll(subProps);
+        		} else {
+        			//One report per file - get basename, use to add to "reports", and import all other 
+        			// values, renamed.
+        			String fileName=subPropFiles[i].getName();
+        			String reportName=fileName.substring(0,fileName.length()-".properties".length());
+        			props.setProperty("reports", props.getProperty("reports")+", "+reportName);
+        			Enumeration propNameEnum=subProps.propertyNames();
+        			while(propNameEnum.hasMoreElements()) {
+        				String propName=(String)propNameEnum.nextElement();
+        				props.setProperty("report."+reportName+"."+propName, subProps.getProperty(propName));
+        			}
+        		}
+        	}
+        }
+        result.prefabGraphs=PrefabGraph.getPrefabGraphDefinitions(props);
+        result.rawProps=props;
+        return result;
+    }
+
     public static Map getPrefabGraphDefinitions(Properties props) {
         return getPrefabGraphDefinitions(props, DEFAULT_GRAPH_LIST_KEY);
     }
@@ -58,7 +133,6 @@
         }
 
         String[] list = BundleLists.parseBundleList(listString);
-
         for (int i = 0; i < list.length; i++) {
             String key = list[i];
             PrefabGraph graph = new PrefabGraph(key, props, i);
Index: src/web/src/org/opennms/web/graph/RRDGraphServlet.java
===================================================================
RCS file: /cvsroot/opennms/opennms/src/web/src/org/opennms/web/graph/RRDGraphServlet.java,v
retrieving revision 1.17
diff -U3 -r1.17 RRDGraphServlet.java
--- src/web/src/org/opennms/web/graph/RRDGraphServlet.java	20 Jan 2006 17:51:45 -0000	1.17
+++ src/web/src/org/opennms/web/graph/RRDGraphServlet.java	27 Jan 2006 23:37:27 -0000
@@ -37,7 +37,6 @@
 import java.io.FileNotFoundException;
 import java.io.IOException;
 import java.io.InputStream;
-import java.io.Reader;
 import java.text.MessageFormat;
 import java.util.HashMap;
 import java.util.Iterator;
@@ -46,7 +45,6 @@
 import java.util.regex.PatternSyntaxException;
 
 import javax.servlet.ServletException;
-import javax.servlet.ServletOutputStream;
 import javax.servlet.http.HttpServlet;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
@@ -101,7 +99,6 @@
      * Initializes this servlet by reading the rrdtool-graph properties file.
      */
     public void init() throws ServletException {
-        String homeDir = Vault.getHomeDir();
         String configs = getServletConfig().getInitParameter(s_initParam);
 
         try {
@@ -117,9 +114,8 @@
 		}
 		String type = entry[0];
 		String configFile = entry[1];
-
 		GraphTypeConfig config =
-		    loadGraphTypeConfig(type, homeDir + configFile);
+		    loadGraphTypeConfig(type, configFile);
 		m_graphTypeMap.put(type, config);
             }
         } catch (PatternSyntaxException e) {
@@ -133,12 +129,26 @@
     public GraphTypeConfig loadGraphTypeConfig(String type,
 					       String propertiesFilename)
 		throws ServletException {
-        Properties properties = new Properties();
-
+        Properties properties;
+        GraphTypeConfig config = new GraphTypeConfig();
         try {
-            properties.load(new FileInputStream(propertiesFilename));
+        	RrdUtils.graphicsInitialize();
 
-            RrdUtils.graphicsInitialize();
+        	Map map;
+        	if (isTypeAdHoc(type)) {
+        		map = new HashMap();
+        		properties=new Properties();
+                String homeDir = Vault.getHomeDir();
+
+                properties.load(new FileInputStream(homeDir+propertiesFilename));
+        		map.put("adhoc", properties);
+        	} else {
+                PrefabGraph.Config pconfig;
+        		pconfig=PrefabGraph.getPrefabGraphConfiguration(propertiesFilename);
+                properties=pconfig.rawProps;
+        		map = pconfig.prefabGraphs;
+                config.setReportMap(map);
+        	}
         } catch (FileNotFoundException e) {
             log("Could not find configuration file", e);
             throw new ServletException("Could not find configuration file", e);
@@ -153,21 +163,10 @@
             throw new ServletException("Unexpected exception or error occured: " + e.getMessage(), e);
         }
 
-        GraphTypeConfig config = new GraphTypeConfig();
-
         config.setWorkDir(new File(properties.getProperty("command.input.dir")));
         config.setCommandPrefix(properties.getProperty("command.prefix"));
         config.setMimeType(properties.getProperty("output.mime"));
-
-	Map map;
-	if (isTypeAdHoc(type)) {
-	    map = new HashMap();
-	    map.put("adhoc", properties);
-	} else {
-	    map = PrefabGraph.getPrefabGraphDefinitions(properties);
-	}
-        config.setReportMap(map);
-
+        
         return config;
     }
 
Index: src/web/src/org/opennms/web/performance/PerformanceModel.java
===================================================================
RCS file: /cvsroot/opennms/opennms/src/web/src/org/opennms/web/performance/PerformanceModel.java,v
retrieving revision 1.14
diff -U3 -r1.14 PerformanceModel.java
--- src/web/src/org/opennms/web/performance/PerformanceModel.java	19 Jan 2006 18:07:34 -0000	1.14
+++ src/web/src/org/opennms/web/performance/PerformanceModel.java	27 Jan 2006 23:37:27 -0000
@@ -38,7 +38,6 @@
 package org.opennms.web.performance;
 
 import java.io.File;
-import java.io.FileInputStream;
 import java.io.IOException;
 import java.sql.Connection;
 import java.sql.ResultSet;
@@ -71,7 +70,7 @@
 public class PerformanceModel extends Object implements GraphModel {
     public static final String RRDTOOL_GRAPH_PROPERTIES_FILENAME =
 		File.separator + "etc" + File.separator + "snmp-graph.properties";
-
+    
     public static final String INTERFACE_GRAPH_TYPE = "interface";
 
     public static final String NODE_GRAPH_TYPE = "node";
@@ -97,10 +96,9 @@
         if (homeDir == null) {
             throw new IllegalArgumentException("Cannot take null parameters.");
         }
-
-        this.props = new java.util.Properties();
-        this.props.load(new FileInputStream(homeDir + RRDTOOL_GRAPH_PROPERTIES_FILENAME));
-
+        PrefabGraph.Config prefabConfig=PrefabGraph.getPrefabGraphConfiguration(RRDTOOL_GRAPH_PROPERTIES_FILENAME);
+        this.reportMap=prefabConfig.prefabGraphs;
+        this.props=prefabConfig.rawProps;
         this.rrdDirectory = new File(this.props.getProperty("command.input.dir"));
         this.infoCommand = this.props.getProperty("info.command");