Changed servlet name in web.xml so that the affinity northbound API

would launch.  Added default constructor to AffinityGroup to stop HTTP
500 error in northbound API.

Signed-off-by: Katrina LaCurts <katrina.lacurts@plexxi.com>

diff --git a/affinity/api/src/main/java/org/opendaylight/controller/affinity/AffinityGroup.java b/affinity/api/src/main/java/org/opendaylight/controller/affinity/AffinityGroup.java
index ffbdbbf5eeb1167cedb35e5e85595268ab450fbf..50b52c6d7de39b657bd5ef184611d078bd14147c 100644 (file)
--- a/affinity/api/src/main/java/org/opendaylight/controller/affinity/AffinityGroup.java
+++ b/affinity/api/src/main/java/org/opendaylight/controller/affinity/AffinityGroup.java
@@ -45,6 +45,10 @@ public class AffinityGroup implements Cloneable, Serializable {
     @XmlElement
     private final Map<String, AffinityIdentifier> elements;
 
+    public AffinityGroup() {
+        this("");
+    }
+
     public AffinityGroup(String name) {
        this.name = name;
        elements = new HashMap<String, AffinityIdentifier>();

diff --git a/affinity/northbound/src/main/resources/WEB-INF/web.xml b/affinity/northbound/src/main/resources/WEB-INF/web.xml
index 188b21b24d000014c1f498f6f4e101ed8dd25c21..1c47c11366552b426f6f432c8cfdff527b424707 100644 (file)
--- a/affinity/northbound/src/main/resources/WEB-INF/web.xml
+++ b/affinity/northbound/src/main/resources/WEB-INF/web.xml
@@ -3,17 +3,17 @@
         xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_3_0.xsd"
         version="3.0">
   <servlet>
-    <servlet-name>JAXRSSwitchManager</servlet-name>
+    <servlet-name>JAXRSAffinity</servlet-name>
     <servlet-class>com.sun.jersey.spi.container.servlet.ServletContainer</servlet-class>
     <init-param>
       <param-name>javax.ws.rs.Application</param-name>
-      <param-value>org.opendaylight.controller.switchmanager.northbound.SwitchNorthboundRSApplication</param-value>
+      <param-value>org.opendaylight.controller.affinity.northbound.AffinityNorthboundRSApplication</param-value>
     </init-param>
     <load-on-startup>1</load-on-startup>
   </servlet>
 
   <servlet-mapping>
-    <servlet-name>JAXRSSwitchManager</servlet-name>
+    <servlet-name>JAXRSAffinity</servlet-name>
     <url-pattern>/*</url-pattern>
   </servlet-mapping>
 
@@ -47,4 +47,4 @@
                 <auth-method>BASIC</auth-method>
                 <realm-name>opendaylight</realm-name>
         </login-config>
-</web-app>
\ No newline at end of file
+</web-app>