commit 3c8e558b04f2c20e7576551088dbd3c4f575ff88
author Sean Condon <sean.condon@microsemi.com> Tue Aug 28 23:22:43 2018 +0100
committer Ray Milkey <ray@opennetworking.org> Wed Aug 29 14:22:40 2018 -0700
tree 364364227149ef3a01570dd2d7df8dcc7f5db81f
parent dc579c580a90815b03ed09d558e76942491988bd

Minor fixes for the Bazel build of GUI2

Change-Id: I9f9f59390f929696e264abeffe897bdc59658eaf

web/gui2/src/main/webapp/WEB-INF/web.xml

diff --git a/web/gui2/src/main/webapp/WEB-INF/web.xml b/web/gui2/src/main/webapp/WEB-INF/web.xml
index ae8c650..60c222b 100644
--- a/web/gui2/src/main/webapp/WEB-INF/web.xml
+++ b/web/gui2/src/main/webapp/WEB-INF/web.xml
@@ -135,25 +135,25 @@
         <!--<url-pattern>/raw/*</url-pattern>-->
     <!--</servlet-mapping>-->
 
-    <!--<servlet>-->
-        <!--<servlet-name>JAX-RS Service</servlet-name>-->
-        <!--<servlet-class>org.glassfish.jersey.servlet.ServletContainer</servlet-class>-->
-        <!--<init-param>-->
-            <!--<param-name>jersey.config.server.provider.classnames</param-name>-->
-            <!--<param-value>-->
-                <!--org.glassfish.jersey.media.multipart.MultiPartFeature,-->
-                <!--org.onosproject.ui.impl.LogoutResource,-->
+    <servlet>
+        <servlet-name>JAX-RS Service</servlet-name>
+        <servlet-class>org.glassfish.jersey.servlet.ServletContainer</servlet-class>
+        <init-param>
+            <param-name>jersey.config.server.provider.classnames</param-name>
+            <param-value>
+                org.glassfish.jersey.media.multipart.MultiPartFeature,
+                org.onosproject.ui.impl.gui2.LogoutResource,
                 <!--org.onosproject.ui.impl.TopologyResource,-->
-                <!--org.onosproject.ui.impl.ApplicationResource-->
-            <!--</param-value>-->
-        <!--</init-param>-->
-        <!--<load-on-startup>1</load-on-startup>-->
-    <!--</servlet>-->
+                org.onosproject.ui.impl.ApplicationResource
+            </param-value>
+        </init-param>
+        <load-on-startup>1</load-on-startup>
+    </servlet>
 
-    <!--<servlet-mapping>-->
-        <!--<servlet-name>JAX-RS Service</servlet-name>-->
-        <!--<url-pattern>/rs/*</url-pattern>-->
-    <!--</servlet-mapping>-->
+    <servlet-mapping>
+        <servlet-name>JAX-RS Service</servlet-name>
+        <url-pattern>/rs/*</url-pattern>
+    </servlet-mapping>
 
     <!--<servlet>-->
         <!--<servlet-name>Web Socket Service</servlet-name>-->