commit 04aba91f813200f6615ab115e156ecf3a3cebaa0
author Jonathan Hart <jono@onlab.us> Thu Mar 27 15:05:48 2014 -0700
committer Gerrit Code Review <gerrit2@onos-services> Fri Mar 28 11:49:36 2014 -0700
tree 73919268433979930f8878bf324774d00793043c
parent 7c9a2fb618324b9dbb79a310d8cb07e1bcbf6f73

Removed a few old floodlight files

Change-Id: Icd4a70d76c1985673cad1b510d8f0f8e47e9e9ac

src/main/java/net/floodlightcontroller/core/module/FloodlightModuleLoader.java

diff --git a/src/main/java/net/floodlightcontroller/core/module/FloodlightModuleLoader.java b/src/main/java/net/floodlightcontroller/core/module/FloodlightModuleLoader.java
index 7507fd5..5ae7914 100644
--- a/src/main/java/net/floodlightcontroller/core/module/FloodlightModuleLoader.java
+++ b/src/main/java/net/floodlightcontroller/core/module/FloodlightModuleLoader.java
@@ -2,8 +2,6 @@
 
 import java.io.File;
 import java.io.FileInputStream;
-import java.io.IOException;
-import java.io.InputStream;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collection;
@@ -44,9 +42,7 @@
     protected static Object lock = new Object();
     
     protected FloodlightModuleContext floodlightModuleContext;
-	
-    public static final String COMPILED_CONF_FILE = 
-            "floodlightdefault.properties";
+
     public static final String FLOODLIGHT_MODULES_KEY =
             "floodlight.modules";
     
@@ -175,15 +171,8 @@
                 System.exit(1);
             }
         } else {
-            logger.info("Loading default modules");
-            InputStream is = this.getClass().getClassLoader().
-                                    getResourceAsStream(COMPILED_CONF_FILE);
-            try {
-                prop.load(is);
-            } catch (IOException e) {
-                logger.error("Could not load default modules", e);
-                System.exit(1);
-            }
+            logger.error("No configuration file specified");
+            System.exit(1);
         }
         
         String moduleList = prop.getProperty(FLOODLIGHT_MODULES_KEY)