Minor fixes for the Bazel build of GUI2
Change-Id: I9f9f59390f929696e264abeffe897bdc59658eaf
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>-->
diff --git a/web/gui2/src/main/webapp/app/view/apps/apps/apps.component.html b/web/gui2/src/main/webapp/app/view/apps/apps/apps.component.html
index 9aa9584..230263d 100644
--- a/web/gui2/src/main/webapp/app/view/apps/apps/apps.component.html
+++ b/web/gui2/src/main/webapp/app/view/apps/apps/apps.component.html
@@ -118,7 +118,7 @@
</td>
<td class="table-icon">
<!-- The path below gets the app icon from the old GUI path -->
- <img src="../../ui/rs/applications/{{app.icon}}/icon"
+ <img src="rs/applications/{{app.icon}}/icon"
height="24px" width="24px" />
</td>
<td>{{ app.title }}</td>
diff --git a/web/gui2/src/main/webapp/app/view/apps/apps/apps.component.ts b/web/gui2/src/main/webapp/app/view/apps/apps/apps.component.ts
index b2f6231..3a8e2a8 100644
--- a/web/gui2/src/main/webapp/app/view/apps/apps/apps.component.ts
+++ b/web/gui2/src/main/webapp/app/view/apps/apps/apps.component.ts
@@ -39,7 +39,7 @@
const DRAGDROPMSGEXT = 'Only files ending in .oar can be dropped';
/** Prefix to access the REST service for applications */
-export const APPURLPREFIX = '../../ui/rs/applications/'; // TODO: This is a hack to work off GUIv1 URL
+export const APPURLPREFIX = 'rs/applications/';
/** Suffix to access the icon of the application - gives back an image */
export const ICONURLSUFFIX = '/icon';