Update web.xml file to enable properties

Update web.xml to enable reacing properties from MSO-API-Prop.

Change-Id: I7dc1f48ff798c6f83e8976584edb5dfd9152f950
Issue-ID: SO-422
Signed-off-by: subhash kumar singh <subhash.kumar.singh@huawei.com>

diff --git a/bpmn/MSOCommonBPMN/src/main/java/org/openecomp/mso/bpmn/common/recipe/BpmnRestClient.java b/bpmn/MSOCommonBPMN/src/main/java/org/openecomp/mso/bpmn/common/recipe/BpmnRestClient.java
index e43af18..494ce69 100644 (file)
--- a/bpmn/MSOCommonBPMN/src/main/java/org/openecomp/mso/bpmn/common/recipe/BpmnRestClient.java
+++ b/bpmn/MSOCommonBPMN/src/main/java/org/openecomp/mso/bpmn/common/recipe/BpmnRestClient.java
@@ -189,6 +189,7 @@ public class BpmnRestClient {
             recipeRequest.setServiceInstanceId(serviceInstanceIdInput);\r
             recipeRequest.setServiceType(serviceTypeInput);\r
             recipeRequest.setRecipeParams(recipeParamsInput);\r
+            recipeRequest.setResourceInput(resourceInput);\r
             jsonReq = recipeRequest.toString();\r
             msoLogger.debug("request body is " + jsonReq);\r
         } catch(Exception e) {\r

diff --git a/bpmn/MSOInfrastructureBPMN/src/main/webapp/WEB-INF/web.xml b/bpmn/MSOInfrastructureBPMN/src/main/webapp/WEB-INF/web.xml
index 62a2748..cd68847 100644 (file)
--- a/bpmn/MSOInfrastructureBPMN/src/main/webapp/WEB-INF/web.xml
+++ b/bpmn/MSOInfrastructureBPMN/src/main/webapp/WEB-INF/web.xml
@@ -48,9 +48,19 @@
     <param-name>resteasy.resources</param-name>\r
     <param-value>org.openecomp.mso.logger.MsoLoggingServlet,org.openecomp.mso.bpmn.core.HealthCheckHandler</param-value>\r
   </context-param>\r
+  <context-param>\r
+    <param-name>mso.configuration</param-name>\r
+    <param-value>MSO_PROP_APIHANDLER_INFRA=mso.apihandler-infra.properties</param-value>\r
+  </context-param>\r
   <listener>\r
     <listener-class>org.springframework.web.context.ContextLoaderListener</listener-class>\r
+    <listener-class>org.jboss.resteasy.plugins.server.servlet.ResteasyBootstrap</listener-class>\r
   </listener>\r
+\r
+  <context-param>\r
+    <param-name>resteasy.jndi.resources</param-name>\r
+    <param-value>java:module/MsoPropertiesFactory</param-value>\r
+  </context-param>\r
   <filter>\r
     <filter-name>LogFilter</filter-name>\r
     <filter-class>org.openecomp.mso.logger.LogFilter</filter-class>\r