Clean up left over commented out code from the Karaf 4.X port
Change-Id: Iaa7231c2acb33c229e698776f10476fefd0f0732
diff --git a/core/net/src/main/java/org/onosproject/net/driver/impl/DriverRegistryManager.java b/core/net/src/main/java/org/onosproject/net/driver/impl/DriverRegistryManager.java
index 02df30e..bc2bc8d 100644
--- a/core/net/src/main/java/org/onosproject/net/driver/impl/DriverRegistryManager.java
+++ b/core/net/src/main/java/org/onosproject/net/driver/impl/DriverRegistryManager.java
@@ -38,7 +38,6 @@
import org.onosproject.net.driver.DriverListener;
import org.onosproject.net.driver.DriverProvider;
import org.osgi.service.component.ComponentContext;
-//import org.osgi.service.metatype.annotations.AttributeDefinition;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -60,7 +59,13 @@
/**
* Manages inventory of device drivers.
*/
-@Component(immediate = true, enabled = true, service = {DriverAdminService.class, DriverRegistry.class})
+@Component(
+ immediate = true,
+ service = {
+ DriverAdminService.class,
+ DriverRegistry.class
+ }
+)
public class DriverRegistryManager extends DefaultDriverProvider implements DriverAdminService {
private static final String DRIVER_COMPONENT = "org.onosproject.net.driver.impl.DriverManager";
@@ -86,12 +91,6 @@
private static final String DEFAULT_REQUIRED_DRIVERS = "default";
private static String requiredDrivers = DEFAULT_REQUIRED_DRIVERS;
- //@AttributeDefinition(name = "requiredDrivers",
- // defaultValue = DEFAULT_REQUIRED_DRIVERS + "AAA",
- // description = "Comma-separated list of drivers that must be registered before starting driver subsystem")
- private String requiredDrivers() {
- return requiredDrivers;
- }
private Set<String> requiredDriverSet;
private Set<DriverProvider> providers = Sets.newConcurrentHashSet();