Move SwitchClustersResource and TopologyWebRoutable to topology package.

src/main/java/net/floodlightcontroller/linkdiscovery/internal/LinkDiscoveryManager.java

@@ -55,7 +55,6 @@ import net.floodlightcontroller.linkdiscovery.ILinkDiscoveryService;
 import net.floodlightcontroller.linkdiscovery.LinkInfo;
 import net.floodlightcontroller.linkdiscovery.LinkTuple;
 import net.floodlightcontroller.linkdiscovery.SwitchPortTuple;
-import net.floodlightcontroller.linkdiscovery.web.TopologyWebRoutable;
 import net.floodlightcontroller.packet.BPDU;
 import net.floodlightcontroller.packet.Ethernet;
 import net.floodlightcontroller.packet.IPv4;
@@ -69,6 +68,7 @@ import net.floodlightcontroller.storage.IStorageSourceListener;
 import net.floodlightcontroller.storage.OperatorPredicate;
 import net.floodlightcontroller.storage.StorageException;
 import net.floodlightcontroller.topology.ITopologyListener;
+import net.floodlightcontroller.topology.web.TopologyWebRoutable;
 import net.floodlightcontroller.util.EventHistory;
 import net.floodlightcontroller.util.EventHistory.EvAction;
 

src/main/java/net/floodlightcontroller/core/web/SwitchClustersResource.java → src/main/java/net/floodlightcontroller/topology/web/SwitchClustersResource.java

@@ -15,7 +15,7 @@
 *    under the License.
 **/
 
-package net.floodlightcontroller.core.web;
+package net.floodlightcontroller.topology.web;
 
 import java.util.ArrayList;
 import java.util.HashMap;

src/main/java/net/floodlightcontroller/linkdiscovery/web/TopologyWebRoutable.java → src/main/java/net/floodlightcontroller/topology/web/TopologyWebRoutable.java

-package net.floodlightcontroller.linkdiscovery.web;
+package net.floodlightcontroller.topology.web;
 
 import org.restlet.Context;
 import org.restlet.Restlet;
 import org.restlet.routing.Router;
 
-import net.floodlightcontroller.core.web.SwitchClustersResource;
+import net.floodlightcontroller.linkdiscovery.web.LinksResource;
 import net.floodlightcontroller.restserver.RestletRoutable;
 
 public class TopologyWebRoutable implements RestletRoutable {