Catalog alignment

Issue-ID: SDC-2724
Signed-off-by: ys9693 <ys9693@att.com>
Change-Id: I52b4aacb58cbd432ca0e1ff7ff1f7dd52099c6fe

2 files changed, 293 insertions, 173 deletions

diff --git a/catalog-be/src/main/webapp/WEB-INF/web.xml b/catalog-be/src/main/webapp/WEB-INF/web.xml
index 027601b952..3acf64ca6f 100644
--- a/catalog-be/src/main/webapp/WEB-INF/web.xml
+++ b/catalog-be/src/main/webapp/WEB-INF/web.xml
@@ -1,164 +1,301 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <web-app xmlns="http://java.sun.com/xml/ns/javaee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	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>jersey</servlet-name>
-		<servlet-class>org.glassfish.jersey.servlet.ServletContainer</servlet-class>
-		<init-param>
-			<param-name>jersey.config.server.provider.packages</param-name>
-			<param-value>io.swagger.jaxrs.json, org.openecomp.sdc.be.servlets</param-value>
-		</init-param>
-		<init-param>
-			<param-name>jersey.config.server.provider.classnames</param-name>
-			<param-value>io.swagger.jersey.listing.ApiListingResourceJSON,
+         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>jersey</servlet-name>
+        <servlet-class>org.glassfish.jersey.servlet.ServletContainer</servlet-class>
+        <init-param>
+            <param-name>jersey.config.server.provider.packages</param-name>
+            <param-value>io.swagger.jaxrs.json, org.openecomp.sdc.be.servlets</param-value>
+        </init-param>
+        <init-param>
+            <param-name>jersey.config.server.provider.classnames</param-name>
+            <param-value>io.swagger.jersey.listing.ApiListingResourceJSON,
                 org.glassfish.jersey.media.multipart.MultiPartFeature,
                 org.openecomp.sdc.be.filters.BeServletFilter,
                 org.openecomp.sdc.be.filters.ComponentsAvailabilityFilter,
+                org.glassfish.jersey.server.filter.RolesAllowedDynamicFeature,
 				org.openecomp.sdc.be.servlets.exception.DefaultExceptionMapper,
                 org.openecomp.sdc.be.servlets.exception.ComponentExceptionMapper,
+                org.openecomp.sdc.be.servlets.exception.ConstraintViolationExceptionMapper,
 				org.openecomp.sdc.be.servlets.exception.StorageExceptionMapper,
-                org.openecomp.sdc.be.view.MixinModelWriter
+                org.openecomp.sdc.be.view.MixinModelWriter,
+                org.openecomp.sdc.config.ObjectMapperProvider
             </param-value>
 
-		</init-param>
-		<init-param>
-			<param-name>swagger.scanner.id</param-name>
-			<param-value>test.1</param-value>
-		</init-param>
-		<init-param>
-			<param-name>swagger.config.id</param-name>
-			<param-value>test.1</param-value>
-		</init-param>
-		<load-on-startup>1</load-on-startup>
-	</servlet>
-	
-	<servlet-mapping>
-		<servlet-name>jersey</servlet-name>
-		<url-pattern>/sdc2/rest/*</url-pattern>
-	</servlet-mapping>
-	
-	<servlet>
-		<servlet-name>EsGateway</servlet-name>
-		<servlet-class>org.openecomp.sdc.be.monitoring.EsGateway</servlet-class>
-		<load-on-startup>1</load-on-startup>
-		<async-supported>true</async-supported>
-	</servlet>
-
-	<servlet-mapping>
-		<servlet-name>EsGateway</servlet-name>
-		<url-pattern>/sdc2/esGateway/*</url-pattern>
-	</servlet-mapping>
-	
-	<servlet>
-		<servlet-name>jerseyDistribution</servlet-name>
-		<servlet-class>org.glassfish.jersey.servlet.ServletContainer</servlet-class>
-		<init-param>
-			<param-name>jersey.config.server.provider.packages</param-name>
-			<param-value>io.swagger.jaxrs.json, org.openecomp.sdc.be.distribution.servlet, org.openecomp.sdc.be.externalapi.servlet</param-value>
-		</init-param>
-		<init-param>
-			<param-name>jersey.config.server.provider.classnames</param-name>
-			<param-value>io.swagger.jersey.listing.ApiListingResourceJSON, 
-			org.glassfish.jersey.media.multipart.MultiPartFeature, 
-			org.openecomp.sdc.be.filters.BeServletFilter,
-			org.openecomp.sdc.be.servlets.exception.DefaultExceptionMapper,
-			org.openecomp.sdc.be.servlets.exception.ComponentExceptionMapper,
-			org.openecomp.sdc.be.servlets.exception.StorageExceptionMapper,
-			org.openecomp.sdc.be.filters.BasicAuthenticationFilter</param-value>
-		</init-param>
-		
-		<init-param>
-			<param-name>swagger.scanner.id</param-name>
-			<param-value>test.2</param-value>
-		</init-param>
-		
-		<init-param>
-			<param-name>swagger.config.id</param-name>
-			<param-value>test.2</param-value>
-		</init-param>
-		
-		<load-on-startup>1</load-on-startup>
-		<async-supported>true</async-supported>
-	</servlet>
-	
-	<servlet-mapping>
-		<servlet-name>jerseyDistribution</servlet-name>
-		<url-pattern>/sdc/*</url-pattern>
-	</servlet-mapping>
-
-	<servlet>
-		<servlet-name>Internal-APIs-Configurations</servlet-name>
-		<servlet-class>io.swagger.jaxrs.config.DefaultJaxrsConfig</servlet-class>
-		
-		<init-param>
-			<param-name>api.version</param-name>
-			<param-value>1.2.0</param-value>
-		</init-param>
-		
-		<init-param>
-			<param-name>swagger.api.title</param-name>
-			<param-value>Internal API's</param-value>
-		</init-param>
-		
-		<init-param>
-			<param-name>swagger.api.basepath</param-name>
-			<param-value>/sdc2/rest</param-value>
-		</init-param>
-		
-		<init-param>
-			<param-name>swagger.scanner.id</param-name>
-			<param-value>test.1</param-value>
-		</init-param>
-
-		<init-param>
-			<param-name>swagger.config.id</param-name>
-			<param-value>test.1</param-value>
-		</init-param>
-		
-		<load-on-startup>2</load-on-startup>
-		<async-supported>true</async-supported>
-	</servlet>
-	
-	<servlet>
-		<servlet-name>External and Distribution API's</servlet-name>
-		<servlet-class>io.swagger.jaxrs.config.DefaultJaxrsConfig</servlet-class>
-		
-		<init-param>
-			<param-name>api.version</param-name>
-			<param-value>1.2.0</param-value>
-		</init-param>
-	
-		<init-param>
-			<param-name>swagger.api.title</param-name>
-			<param-value>DistributionAndExternalAPIs</param-value>
-		</init-param>
-    
-    	<init-param>
-			<param-name>swagger.api.basepath</param-name>
-			<!-- Check if second param can be added -->
-			<param-value>/sdc</param-value>
-		</init-param>
-		
-		<init-param>
-			<param-name>swagger.context.id</param-name>
-			<param-value>test.2</param-value>
-		</init-param>
-		<load-on-startup>2</load-on-startup>
-	</servlet>
-	
-	<servlet>
-		<servlet-name>ViewStatusMessages</servlet-name>
-		<servlet-class>ch.qos.logback.classic.ViewStatusMessagesServlet</servlet-class>
-		<async-supported>true</async-supported>
-	</servlet>
-
-	<servlet-mapping>
-		<servlet-name>ViewStatusMessages</servlet-name>
-		<url-pattern>/lbClassicStatus</url-pattern>
-	</servlet-mapping>
+        </init-param>
+        <init-param>
+            <param-name>swagger.scanner.id</param-name>
+            <param-value>test.1</param-value>
+        </init-param>
+        <init-param>
+            <param-name>swagger.config.id</param-name>
+            <param-value>test.1</param-value>
+        </init-param>
+        <init-param>
+            <param-name>exclude_url_endpoints</param-name>
+            <param-value>/api/v3/analytics,/api/v3/storeAnalytics</param-value>
+        </init-param>
+        <load-on-startup>1</load-on-startup>
+
+    </servlet>
+
+    <servlet-mapping>
+        <servlet-name>jersey</servlet-name>
+        <url-pattern>/sdc2/rest/*</url-pattern>
+    </servlet-mapping>
+
+    <servlet>
+        <servlet-name>jerseyDistribution</servlet-name>
+        <servlet-class>org.glassfish.jersey.servlet.ServletContainer</servlet-class>
+        <init-param>
+            <param-name>jersey.config.server.provider.packages</param-name>
+            <param-value>io.swagger.jaxrs.json, org.openecomp.sdc.be.distribution.servlet, org.openecomp.sdc.be.externalapi.servlet </param-value>
+        </init-param>
+        <init-param>
+            <param-name>jersey.config.server.provider.classnames</param-name>
+            <param-value>io.swagger.jersey.listing.ApiListingResourceJSON,
+                org.glassfish.jersey.media.multipart.MultiPartFeature,
+                org.openecomp.sdc.be.filters.BeServletFilter,
+                org.openecomp.sdc.be.servlets.exception.DefaultExceptionMapper,
+                org.openecomp.sdc.be.servlets.exception.ComponentExceptionMapper,
+                org.openecomp.sdc.be.servlets.exception.StorageExceptionMapper,
+                org.openecomp.sdc.be.filters.BasicAuthenticationFilter
+                </param-value>
+        </init-param>
+
+        <init-param>
+            <param-name>swagger.scanner.id</param-name>
+            <param-value>test.2</param-value>
+        </init-param>
+
+        <init-param>
+            <param-name>swagger.config.id</param-name>
+            <param-value>test.2</param-value>
+        </init-param>
+
+        <load-on-startup>1</load-on-startup>
+        <async-supported>true</async-supported>
+    </servlet>
+
+    <servlet-mapping>
+        <servlet-name>jerseyDistribution</servlet-name>
+        <url-pattern>/sdc/*</url-pattern>
+    </servlet-mapping>
+
+    <servlet>
+        <servlet-name>Internal-APIs-Configurations</servlet-name>
+        <servlet-class>io.swagger.jaxrs.config.DefaultJaxrsConfig</servlet-class>
+
+        <init-param>
+            <param-name>api.version</param-name>
+            <param-value>1.2.0</param-value>
+        </init-param>
+
+        <init-param>
+            <param-name>swagger.api.title</param-name>
+            <param-value>Internal API's</param-value>
+        </init-param>
+
+        <init-param>
+            <param-name>swagger.api.basepath</param-name>
+            <param-value>/sdc2/rest</param-value>
+        </init-param>
+
+        <init-param>
+            <param-name>swagger.scanner.id</param-name>
+            <param-value>test.1</param-value>
+        </init-param>
+
+        <init-param>
+            <param-name>swagger.config.id</param-name>
+            <param-value>test.1</param-value>
+        </init-param>
+
+        <load-on-startup>2</load-on-startup>
+        <async-supported>true</async-supported>
+    </servlet>
+
+    <servlet>
+        <servlet-name>External and Distribution API's</servlet-name>
+        <servlet-class>io.swagger.jaxrs.config.DefaultJaxrsConfig</servlet-class>
+
+        <init-param>
+            <param-name>api.version</param-name>
+            <param-value>1.2.0</param-value>
+        </init-param>
+
+        <init-param>
+            <param-name>swagger.api.title</param-name>
+            <param-value>DistributionAndExternalAPIs</param-value>
+        </init-param>
 
+        <init-param>
+            <param-name>swagger.api.basepath</param-name>
+            <!-- Check if second param can be added -->
+            <param-value>/sdc</param-value>
+        </init-param>
+
+        <init-param>
+            <param-name>swagger.context.id</param-name>
+            <param-value>test.2</param-value>
+        </init-param>
+        <load-on-startup>2</load-on-startup>
+    </servlet>
+
+    <!-- ECOMP Portal -->
+    <servlet>
+        <servlet-name>ECOMPServlet</servlet-name>
+        <servlet-class>org.onap.portalsdk.core.onboarding.crossapi.PortalRestAPIProxy</servlet-class>
+        <load-on-startup>3</load-on-startup>
+        <async-supported>true</async-supported>
+    </servlet>
+
+<!--    <filter>-->
+<!--        <filter-name>CadiAuthFilter</filter-name>-->
+<!--        <filter-class>org.onap.portalsdk.core.onboarding.crossapi.CadiAuthFilter</filter-class>-->
+<!--        <init-param>-->
+<!--            <param-name>cadi_prop_files</param-name>-->
+<!--            &lt;!&ndash; Add Absolute path of cadi.properties &ndash;&gt;-->
+<!--            <param-value>etc/cadi.properties</param-value>-->
+<!--        </init-param>-->
+<!--        &lt;!&ndash;Add param values with comma delimited values &ndash;&gt;-->
+<!--        &lt;!&ndash; for example /api/v3/*,/auxapi/*&ndash;&gt;-->
+<!--        <init-param>-->
+<!--            <param-name>include_url_endpoints</param-name>-->
+<!--            <param-value>/api/v3/roles,/api/v3/user/*,/api/v3/user/*/roles,/api/v3/users,/api/v3/sessionTimeOuts,/api/v3/updateSessionTimeOuts</param-value>-->
+<!--        </init-param>-->
+<!--        <init-param>-->
+<!--            <param-name>exclude_url_endpoints</param-name>-->
+<!--            <param-value>/api/v3/analytics,/api/v3/storeAnalytics</param-value>-->
+<!--        </init-param>-->
+<!--    </filter>-->
+<!--    <filter-mapping>-->
+<!--        <filter-name>CadiAuthFilter</filter-name>-->
+<!--        <url-pattern>/api/v3/*</url-pattern>-->
+<!--    </filter-mapping>-->
+
+    <servlet>
+        <servlet-name>ViewStatusMessages</servlet-name>
+        <servlet-class>ch.qos.logback.classic.ViewStatusMessagesServlet</servlet-class>
+        <async-supported>true</async-supported>
+    </servlet>
+
+    <servlet>
+        <servlet-name>TogglzConsoleServlet</servlet-name>
+        <servlet-class>org.togglz.console.TogglzConsoleServlet</servlet-class>
+    </servlet>
+
+    <servlet-mapping>
+        <servlet-name>TogglzConsoleServlet</servlet-name>
+        <url-pattern>/catalog/togglz/*</url-pattern>
+    </servlet-mapping>
+
+    <servlet-mapping>
+        <servlet-name>ViewStatusMessages</servlet-name>
+        <url-pattern>/lbClassicStatus</url-pattern>
+    </servlet-mapping>
+
+    <!--  	<filter>
+           <filter-name>GzipFilter</filter-name>
+           <filter-class>org.eclipse.jetty.servlets.GzipFilter</filter-class>
+           <async-supported>true</async-supported>
+           <init-param>
+            <param-name>methods</param-name>
+            <param-value>GET,POST,PUT,DELETE</param-value>
+           </init-param>
+           <init-param>
+              <param-name>mimeTypes</param-name>
+              <param-value>text/html,text/plain,text/css,application/javascript,application/json</param-value>
+           </init-param>
+        </filter>
+        <filter-mapping>
+           <filter-name>GzipFilter</filter-name>
+            <url-pattern>/sdc2/rest/*</url-pattern>
+        </filter-mapping>
+
+    -->
+    <!--<filter>-->
+    <!--<filter-name>RestrictionAccessFilter</filter-name>-->
+    <!--<filter-class>org.openecomp.sdc.be.filters.RestrictionAccessFilter</filter-class>-->
+    <!--<async-supported>true</async-supported>-->
+    <!--</filter>-->
+
+<!--    <filter>-->
+<!--    <filter-name>gatewayFilter</filter-name>-->
+<!--    <filter-class>org.openecomp.sdc.be.filters.GatewayFilter</filter-class>-->
+<!--    </filter>-->
+
+    <filter>
+        <filter-name>gatewayFilter</filter-name>
+        <filter-class>
+            org.springframework.web.filter.DelegatingFilterProxy
+        </filter-class>
+        <init-param>
+            <param-name>targetFilterLifecycle</param-name>
+            <param-value>true</param-value>
+        </init-param>
+    </filter>
+
+    <filter-mapping>
+        <filter-name>gatewayFilter</filter-name>
+        <url-pattern>/sdc2/rest/*</url-pattern>
+        <url-pattern>/sdc/*</url-pattern>
+    </filter-mapping>
+
+<!--    <filter>-->
+<!--        <filter-name>beRestrictionAccessFilter</filter-name>-->
+<!--        <filter-class>-->
+<!--            org.springframework.web.filter.DelegatingFilterProxy-->
+<!--        </filter-class>-->
+<!--        <init-param>-->
+<!--            <param-name>targetFilterLifecycle</param-name>-->
+<!--            <param-value>true</param-value>-->
+<!--        </init-param>-->
+<!--    </filter>-->
+<!--    <filter-mapping>-->
+<!--        <filter-name>beRestrictionAccessFilter</filter-name>-->
+<!--        <url-pattern>/sdc2/rest/*</url-pattern>-->
+<!--    </filter-mapping>-->
+
+<!--    <filter>-->
+<!--        <filter-name>CADI</filter-name>-->
+<!--        <filter-class>org.openecomp.sdc.be.filters.BeCadiServletFilter</filter-class>-->
+<!--        <init-param>-->
+<!--            <param-name>cadi_prop_files</param-name>-->
+<!--            <param-value>etc/cadi.properties</param-value>-->
+<!--        </init-param>-->
+<!--    </filter>-->
+
+<!--    <filter-mapping>-->
+<!--        <filter-name>CADI</filter-name>-->
+<!--        <url-pattern>/sdc/*</url-pattern>-->
+<!--        <url-pattern>/sdc2/rest/*</url-pattern>-->
+<!--    </filter-mapping>-->
+
+    <filter>
+        <filter-name>reqValidationFilter</filter-name>
+        <filter-class>
+            org.springframework.web.filter.DelegatingFilterProxy
+        </filter-class>
+        <init-param>
+            <param-name>targetFilterLifecycle</param-name>
+            <param-value>true</param-value>
+        </init-param>
+    </filter>
+
+    <filter-mapping>
+        <filter-name>reqValidationFilter</filter-name>
+        <url-pattern>/sdc2/rest/*</url-pattern>
+        <url-pattern>/sdc/*</url-pattern>
+    </filter-mapping>
+
+    <error-page>
+        <exception-type>java.lang.RuntimeException</exception-type>
+        <location>/sdc2/rest/v1/catalog/handleException/</location>
+    </error-page>
 	<context-param>
 		<param-name>contextConfigLocation</param-name>
 		<param-value>classpath:application-context.xml</param-value>
@@ -168,11 +305,11 @@
 		<listener-class>org.openecomp.sdc.be.listen.BEAppContextListener</listener-class>
 	</listener>
 
-	<listener>
-		<listener-class>org.springframework.web.context.ContextLoaderListener</listener-class>
-	</listener>
+    <listener>
+        <listener-class>org.springframework.web.context.ContextLoaderListener</listener-class>
+    </listener>
 
-	<welcome-file-list>
-		<welcome-file>index.html</welcome-file>
-	</welcome-file-list>
+    <welcome-file-list>
+        <welcome-file>index.html</welcome-file>
+    </welcome-file-list>
 </web-app>
diff --git a/catalog-be/src/main/webapp/index.html b/catalog-be/src/main/webapp/index.html
index b2231d6ffc..4b26987758 100644
--- a/catalog-be/src/main/webapp/index.html
+++ b/catalog-be/src/main/webapp/index.html
@@ -1,20 +1,3 @@
-<!--
-  ~ Copyright (C) 2018 AT&T Intellectual Property. All rights reserved.
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License.
-  -->
- 
- 
 <html>
 
 <body>