commit 0daf66b9cbf2f6d04d8ad6a35ac4af7bf0c9e043
author Thomas Vachuska <tom@onlab.us> Fri Dec 04 21:41:25 2015 -0800
committer Gerrit Code Review <gerrit@onlab.us> Mon Dec 07 17:19:55 2015 +0000
tree 5159c8968890dd1a095fd8a31bf2e40b15ddb4a7
parent a3e32340df6434679ff06081a1b8eaecc6f6dab1

Fixing VTN web.xml file.

Change-Id: I03c0e3fd7f47f1b4c0c84b1e30acd2e1a57ba4f2

apps/vtn/vtnweb/src/main/webapp/WEB-INF/web.xml

diff --git a/apps/vtn/vtnweb/src/main/webapp/WEB-INF/web.xml b/apps/vtn/vtnweb/src/main/webapp/WEB-INF/web.xml
index 13b377b..3b8d5d7 100644
--- a/apps/vtn/vtnweb/src/main/webapp/WEB-INF/web.xml
+++ b/apps/vtn/vtnweb/src/main/webapp/WEB-INF/web.xml
@@ -20,8 +20,29 @@
          id="ONOS" version="2.5">
     <display-name>VTNRSC REST API v1.0</display-name>
 
+    <!-- TODO: this should be uncommented
+    <security-constraint>
+        <web-resource-collection>
+            <web-resource-name>Secured</web-resource-name>
+            <url-pattern>/*</url-pattern>
+        </web-resource-collection>
+        <auth-constraint>
+            <role-name>admin</role-name>
+        </auth-constraint>
+    </security-constraint>
+
+    <security-role>
+        <role-name>admin</role-name>
+    </security-role>
+
+    <login-config>
+        <auth-method>BASIC</auth-method>
+        <realm-name>karaf</realm-name>
+    </login-config>
+    -->
+
     <servlet>
-        <servlet-name>JAX-RS Service</servlet-name>
+        <servlet-name>VTNRSC JAX-RS Service</servlet-name>
         <servlet-class>com.sun.jersey.spi.container.servlet.ServletContainer</servlet-class>
         <init-param>
             <param-name>com.sun.jersey.config.property.resourceConfigClass</param-name>
@@ -30,14 +51,24 @@
         <init-param>
             <param-name>com.sun.jersey.config.property.classnames</param-name>
             <param-value>
+                org.onosproject.rest.exceptions.EntityNotFoundMapper,
+                org.onosproject.rest.exceptions.ServiceNotFoundMapper,
+                org.onosproject.rest.exceptions.NotFoundMapper,
+                org.onosproject.rest.exceptions.ServerErrorMapper,
+                org.onosproject.rest.exceptions.BadRequestMapper,
+                org.onosproject.rest.exceptions.WebApplicationExceptionMapper,
+                org.onosproject.rest.exceptions.IllegalArgumentExceptionMapper,
+                org.onosproject.rest.exceptions.IllegalStateExceptionMapper,
+                org.onosproject.rest.resources.JsonBodyWriter,
+
                 org.onosproject.vtnweb.resources.TenantNetworkWebResource,
                 org.onosproject.vtnweb.resources.SubnetWebResource,
-                org.onosproject.vtnweb.resources.VirtualPortWebResource
-                org.onosproject.vtnweb.resources.FlowClassifierWebResource
-                org.onosproject.vtnweb.resources.PortChainWebResource
-                org.onosproject.vtnweb.resources.PortPairGroupWebResource
-                org.onosproject.vtnweb.resources.PortPairWebResource
-				org.onosproject.vtnweb.resources.FloatingIpWebResource
+                org.onosproject.vtnweb.resources.VirtualPortWebResource,
+                org.onosproject.vtnweb.resources.FlowClassifierWebResource,
+                org.onosproject.vtnweb.resources.PortChainWebResource,
+                org.onosproject.vtnweb.resources.PortPairGroupWebResource,
+                org.onosproject.vtnweb.resources.PortPairWebResource,
+                org.onosproject.vtnweb.resources.FloatingIpWebResource,
                 org.onosproject.vtnweb.resources.RouterWebResource
             </param-value>
         </init-param>
@@ -45,7 +76,7 @@
     </servlet>
 
     <servlet-mapping>
-        <servlet-name>JAX-RS Service</servlet-name>
+        <servlet-name>VTNRSC JAX-RS Service</servlet-name>
         <url-pattern>/*</url-pattern>
     </servlet-mapping>
 </web-app>