Removed a few old floodlight files
Change-Id: Icd4a70d76c1985673cad1b510d8f0f8e47e9e9ac
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)