Package webpack's `dist` folder into /app/ui

Issue-ID: VID-515

Change-Id: I33d4b5f0dbd4125a5b79253c4dc8e736df9116ee
Signed-off-by: Ittay Stern <ittay.stern@att.com>

diff --git a/epsdk-app-onap/pom.xml b/epsdk-app-onap/pom.xml
index 6bb4ffd..d706df6 100755 (executable)
--- a/epsdk-app-onap/pom.xml
+++ b/epsdk-app-onap/pom.xml
@@ -149,7 +149,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-war-plugin</artifactId>
-                <version>2.0.2</version>
+                <version>3.2.0</version>
                 <configuration>
                     <archive>
                         <manifest>
@@ -169,6 +169,10 @@
                             <groupId>org.onap.portal.sdk</groupId>
                             <artifactId>epsdk-app-overlay</artifactId>
                         </overlay>
+                        <overlay>
+                            <groupId>org.onap.vid</groupId>
+                            <artifactId>vid-webpack-master</artifactId>
+                        </overlay>
                     </overlays>
                 </configuration>
             </plugin>
@@ -280,6 +284,12 @@
             <type>jar</type>
             <classifier>classes</classifier>
         </dependency>
+        <dependency>
+            <groupId>org.onap.vid</groupId>
+            <artifactId>vid-webpack-master</artifactId>
+            <version>${project.version}</version>
+            <type>war</type>
+        </dependency>
         <!-- SDK components -->
         <dependency>
             <groupId>org.onap.portal.sdk</groupId>

diff --git a/epsdk-app-onap/src/main/webapp/WEB-INF/web.xml b/epsdk-app-onap/src/main/webapp/WEB-INF/web.xml
index 0355fb2..6007fdc 100755 (executable)
--- a/epsdk-app-onap/src/main/webapp/WEB-INF/web.xml
+++ b/epsdk-app-onap/src/main/webapp/WEB-INF/web.xml
@@ -1,9 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>\r
-<web-app xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"\r
-         xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/javaee" \r
-         xmlns:web="http://xmlns.jcp.org/xml/ns/javaee/web-app_3_1.xsd"\r
-         version="3.1" xmlns="http://xmlns.jcp.org/xml/ns/javaee">\r
-\r
+<web-app xmlns="http://xmlns.jcp.org/xml/ns/javaee"\r
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"\r
+         xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/javaee http://xmlns.jcp.org/xml/ns/javaee/web-app_3_1.xsd"\r
+         version="3.1">\r
        <display-name>ecomp-sdk-app-os</display-name>\r
 \r
        <!-- The app can function on a HA cluster -->\r
@@ -13,6 +12,7 @@
                <session-timeout>30</session-timeout>\r
                <tracking-mode>COOKIE</tracking-mode>\r
        </session-config>\r
+\r
        <filter>\r
     <filter-name>SecurityXssFilter</filter-name>\r
     <filter-class>org.onap.portalapp.filter.SecurityXssFilter</filter-class>\r
@@ -22,4 +22,53 @@
     <url-pattern>/*</url-pattern>\r
   </filter-mapping>\r
 \r
+  <!--\r
+  `vid-webpack-master` servlet and it's servlet mapping below, serves\r
+  Angular's index.html for any requests like the following, letting\r
+  the JavaScript router do its magic:\r
+  * /vid/app/ui/\r
+  * /vid/app/ui/servicePlanning\r
+  * /vid/app/ui/browseSdc\r
+  -->\r
+  <servlet>\r
+    <servlet-name>vid-webpack-master</servlet-name>\r
+    <jsp-file>/app/ui/index.html</jsp-file>\r
+  </servlet>\r
+\r
+  <servlet-mapping>\r
+    <servlet-name>vid-webpack-master</servlet-name>\r
+    <url-pattern>/app/ui/</url-pattern>\r
+  </servlet-mapping>\r
+\r
+  <!--\r
+  All the files under the paths below are served as static files, using\r
+  tomcat's `default` servlet. This overrides the `vid-webpack-master`\r
+  url-pattern.\r
+  The filter `charset-to-utf8-filter` adds "charset=UTF-8" to these files\r
+  content type, as the default content-type is platform-dependant (which\r
+  is not ok for Windows stations).\r
+  -->\r
+  <servlet-mapping>\r
+    <servlet-name>default</servlet-name>\r
+    <url-pattern>/app/ui/*</url-pattern>\r
+  </servlet-mapping>\r
+\r
+  <filter>\r
+    <filter-name>charset-to-utf8-filter</filter-name>\r
+    <filter-class>org.springframework.web.filter.CharacterEncodingFilter</filter-class>\r
+    <init-param>\r
+      <param-name>encoding</param-name>\r
+      <param-value>UTF-8</param-value>\r
+    </init-param>\r
+    <init-param>\r
+      <param-name>forceEncoding</param-name>\r
+      <param-value>true</param-value>\r
+    </init-param>\r
+  </filter>\r
+\r
+  <filter-mapping>\r
+    <filter-name>charset-to-utf8-filter</filter-name>\r
+    <url-pattern>/app/ui/*</url-pattern>\r
+  </filter-mapping>\r
+\r
 </web-app>
\ No newline at end of file

diff --git a/vid-webpack-master/src/WEB-INF/web.xml b/vid-webpack-master/src/WEB-INF/web.xml
index a4152da..c449b34 100644 (file)
--- a/vid-webpack-master/src/WEB-INF/web.xml
+++ b/vid-webpack-master/src/WEB-INF/web.xml
@@ -20,10 +20,9 @@
 
   <servlet-mapping>
     <servlet-name>vid-webpack-master</servlet-name>
-    <url-pattern>/app/ui/*</url-pattern>
+    <url-pattern>/app/ui/</url-pattern>
   </servlet-mapping>
 
-
   <!--
   All the files under the paths below are served as static files, using
   tomcat's `default` servlet. This overrides the `vid-webpack-master`
@@ -34,10 +33,7 @@
   -->
   <servlet-mapping>
     <servlet-name>default</servlet-name>
-    <url-pattern>/app/ui/css/*</url-pattern>
-    <url-pattern>/app/ui/fonts/*</url-pattern>
-    <url-pattern>/app/ui/img/*</url-pattern>
-    <url-pattern>/app/ui/js/*</url-pattern>
+    <url-pattern>/app/ui/*</url-pattern>
   </servlet-mapping>
 
   <filter>