Merge into master from pull request #16:

Move the SwitchCluster REST API from core into topology. (https://github.com/floodlight/floodlight/pull/16)

src/main/java/net/floodlightcontroller/core/web/CoreWebRoutable.java

@@ -37,7 +37,6 @@ public class CoreWebRoutable implements RestletRoutable {
         router.attach("/switch/all/{statType}/json", AllSwitchStatisticsResource.class);
         router.attach("/switch/{switchId}/{statType}/json", SwitchStatisticsResource.class);
         router.attach("/controller/switches/json", ControllerSwitchesResource.class);
-        router.attach("/controller/switchclusters/json", SwitchClustersResource.class);
         router.attach("/counter/{counterTitle}/json", CounterResource.class);
         router.attach("/counter/{switchId}/{counterName}/json", SwitchCounterResource.class);
         router.attach("/counter/categories/{switchId}/{counterName}/{layer}/json", SwitchCounterCategoriesResource.class);

src/main/java/net/floodlightcontroller/topology/web/TopologyWebRouteable.java

@@ -5,19 +5,25 @@ import org.restlet.Restlet;
 import org.restlet.routing.Router;
 
 import net.floodlightcontroller.core.web.RestletRoutable;
+import net.floodlightcontroller.core.web.SwitchClustersResource;
 
 public class TopologyWebRouteable implements RestletRoutable {
-
+    /**
+     * Create the Restlet router and bind to the proper resources.
+     */
     @Override
     public Restlet getRestlet(Context context) {
         Router router = new Router(context);
-        router.attach("/links", LinksResource.class);
+        router.attach("/links/json", LinksResource.class);
+        router.attach("/switchclusters/json", SwitchClustersResource.class);
         return router;
     }
 
+    /**
+     * Set the base path for the Topology
+     */
     @Override
     public String basePath() {
         return "/wm/topology";
     }
-
 }