Removing references to a prior branded controller 07/107/1
authorColin Dixon <ckd@us.ibm.com>
Thu, 4 Apr 2013 22:27:28 +0000 (17:27 -0500)
committerColin Dixon <ckd@us.ibm.com>
Thu, 4 Apr 2013 22:27:28 +0000 (17:27 -0500)
Change-Id: Ie5518714964fd1713ae64274228bf7269e32d728
Signed-off-by: Colin Dixon <ckd@us.ibm.com>
opendaylight/protocol_plugins/openflow/src/main/java/org/opendaylight/controller/protocol_plugin/openflow/vendorextension/v6extension/V6StatsReply.java
opendaylight/routing/dijkstra_implementation/src/main/java/org/opendaylight/controller/routing/dijkstra_implementation/internal/DijkstraImplementation.java
opendaylight/routing/dijkstra_implementation/src/main/resources/OSGI-INF/component.xml
opendaylight/switchmanager/src/main/java/org/opendaylight/controller/switchmanager/Switch.java
opendaylight/web/root/src/main/resources/WEB-INF/web.xml
opendaylight/web/root/src/main/resources/js/one.js

index 1b14ab0..8b5662c 100644 (file)
@@ -23,7 +23,7 @@ import org.openflow.util.U16;
  * This Class processes the OpenFlow Vendor Extension Reply message of a Stats
  * Request. It parses the reply message and initializes fields of  V6StatsReply
  * object. Multiple instances of this class objects are created and used by 
- * ONE Controller's Troubleshooting Application.
+ * OpenDaylight's Troubleshooting Application.
  * 
  */
 
index 1fed3e1..6f1dc3f 100644 (file)
@@ -61,7 +61,7 @@ public class DijkstraImplementation implements IRouting, ITopologyManagerAware {
     private IReadService readService;
     private static final long DEFAULT_LINK_SPEED = Bandwidth.BW1Gbps;
 
-    public void setLIstenRoutingUpdates(IListenRoutingUpdates i) {
+    public void setListenRoutingUpdates(IListenRoutingUpdates i) {
         if (this.routingAware == null) {
             this.routingAware = new HashSet<IListenRoutingUpdates>();
         }
index f530768..4f9cdc8 100644 (file)
@@ -6,13 +6,13 @@
   <implementation class="org.opendaylight.controller.routing.dijkstra_implementation.internal.DijkstraImplementation"/>
 
   <service>
-    <provide interface="org.opendaylight.controller.sal.routing.IONERouting"/>
-    <provide interface="org.opendaylight.controller.sal.topology.IONETopologyBwAware"/>
+    <provide interface="org.opendaylight.controller.sal.routing.IRouting"/>
+    <provide interface="org.opendaylight.controller.topologymanager.ITopologyManagerAware"/>
   </service>
-  <reference name="ONERoutingAware"
-             bind="setONERoutingAware"
-             unbind="unsetONERoutingAware"
+  <reference name="IListenRoutingUpdates"
+             bind="setListenRoutingUpdates"
+             unbind="unsetRoutingUpdates"
              cardinality="0..n"
              policy="dynamic"
-             interface="org.opendaylight.controller.sal.routing.IONERoutingAware"/>
+             interface="org.opendaylight.controller.sal.routing.IListenRoutingUpdates"/>
 </scr:component>
index d13c042..afca30c 100755 (executable)
@@ -36,7 +36,7 @@ public class Switch implements Serializable {
      * As we are adding switches on per event basis in a map, we do not need a default constructor
      * This way we can keep the validations internal, in the proper constructor
     public Switch() {
-        this.swPorts = new HashSet<ONESwitchPortTuple>();
+        this.swPorts = new HashSet<SwitchPortTuple>();
         this.spanPorts = new ArrayList<Short>(2);
     }
      */
index 6c8a560..c763531 100644 (file)
@@ -34,8 +34,8 @@ http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd"
                <url-pattern>/*</url-pattern>
        </filter-mapping>
 
-       <display-name>Cisco ONE Controller</display-name>
-       <description>Cisco ONE Controller</description>
+       <display-name>OpenDaylight Controller</display-name>
+       <description>OpenDaylight Controller</description>
 
        <listener>
                <listener-class>org.opendaylight.controller.web.ControllerUISessionManager</listener-class>
index b996e73..4cb633e 100644 (file)
@@ -284,7 +284,7 @@ one.lib.alert = function(alert) {
        INITIALIZATION
        executable JS code starts here
 */
-//ONE root page
+//OpenDaylight root page
 one.main = {};
 
 one.main.constants = {