From cb8baa2054a427becd39e4031798375efcc9027c Mon Sep 17 00:00:00 2001
From: Ittay Stern <ittay.stern@att.com>
Date: Mon, 11 Mar 2019 15:50:07 +0200
Subject: Merge simulator from ECOMP's repository

Reference commit in ECOMP: 8e92a8c6

Issue-ID: VID-378
Change-Id: Ifd87e07db55a760fc94c582758a7413103b5fdd8
Signed-off-by: Ittay Stern <ittay.stern@att.com>
---
 .../src/main/webapp/WEB-INF/rest-servlet.xml                | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

(limited to 'vid-ext-services-simulator/src/main/webapp')

diff --git a/vid-ext-services-simulator/src/main/webapp/WEB-INF/rest-servlet.xml b/vid-ext-services-simulator/src/main/webapp/WEB-INF/rest-servlet.xml
index 30c31285b..0d979aa9f 100644
--- a/vid-ext-services-simulator/src/main/webapp/WEB-INF/rest-servlet.xml
+++ b/vid-ext-services-simulator/src/main/webapp/WEB-INF/rest-servlet.xml
@@ -1,13 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<beans xmlns="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:context="http://www.springframework.org/schema/context"
-       xmlns:aop="http://www.springframework.org/schema/aop" xmlns:util="http://www.springframework.org/schema/util"
-       xsi:schemaLocation="
-        http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-4.0.xsd
+<beans xmlns="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xmlns:context="http://www.springframework.org/schema/context"
+  xmlns:mvc="http://www.springframework.org/schema/mvc"
+  xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-4.0.xsd
         http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-4.0.xsd
-        http://www.springframework.org/schema/aop http://www.springframework.org/schema/aop/spring-aop-4.0.xsd
-        http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util-4.0.xsd">
+
+          http://www.springframework.org/schema/mvc http://www.springframework.org/schema/mvc/spring-mvc.xsd">
 
 
     <context:component-scan
             base-package="org.onap.simulator" />
+    <mvc:annotation-driven/>
 </beans>
\ No newline at end of file
-- 
cgit 1.2.3-korg