From 8abc672e7368792cf8705e8f2ad48b28a9d4864d Mon Sep 17 00:00:00 2001 From: Guangrong Fu Date: Wed, 6 Sep 2017 17:53:51 +0800 Subject: [PATCH] Change the API Path Change the API path from onapapi to api Change-Id: I62ee0a3d4e4b24de5aa40d4ca8bb92e6e78d9d1d Issue-ID: HOLMES-39 Signed-off-by: Guangrong Fu --- engine-d-standalone/src/main/assembly/conf/engine-d.yml | 6 +++--- engine-d/src/main/java/org/onap/holmes/engine/EngineDActiveApp.java | 2 +- .../src/main/java/org/onap/holmes/engine/manager/DroolsEngine.java | 1 + 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/engine-d-standalone/src/main/assembly/conf/engine-d.yml b/engine-d-standalone/src/main/assembly/conf/engine-d.yml index 06f1913..ff3201b 100644 --- a/engine-d-standalone/src/main/assembly/conf/engine-d.yml +++ b/engine-d-standalone/src/main/assembly/conf/engine-d.yml @@ -15,7 +15,7 @@ # server: type: simple - rootPath: '/onapapi/holmes-engine-mgmt/v1/*' + rootPath: '/api/holmes-engine-mgmt/v1/*' applicationContextPath: / adminContextPath: /admin connector: @@ -52,7 +52,7 @@ database: driverClass: org.postgresql.Driver user: holmes password: holmespwd - url: jdbc:postgresql://169.254.59.196:5432/holmes + url: jdbc:postgresql://10.74.156.206:5432/holmes properties: charSet: UTF-8 maxWaitForConnection: 1s @@ -64,7 +64,7 @@ database: minIdleTime: 1s mqConfig: - brokerIp: 127.0.0.1 + brokerIp: 10.74.156.206 brokerPort: 61616 brokerUsername: activemq brokerPassword: v1 diff --git a/engine-d/src/main/java/org/onap/holmes/engine/EngineDActiveApp.java b/engine-d/src/main/java/org/onap/holmes/engine/EngineDActiveApp.java index f8c2660..5f2f3be 100644 --- a/engine-d/src/main/java/org/onap/holmes/engine/EngineDActiveApp.java +++ b/engine-d/src/main/java/org/onap/holmes/engine/EngineDActiveApp.java @@ -51,7 +51,7 @@ public class EngineDActiveApp extends IOCApplication { MicroServiceInfo msinfo = new MicroServiceInfo(); msinfo.setServiceName("holmes-engine-mgmt"); msinfo.setVersion("v1"); - msinfo.setUrl("/onapapi/holmes-engine-mgmt/v1"); + msinfo.setUrl("/api/holmes-engine-mgmt/v1"); msinfo.setProtocol("REST"); msinfo.setVisualRange("0|1"); Set nodes = new HashSet<>(); diff --git a/engine-d/src/main/java/org/onap/holmes/engine/manager/DroolsEngine.java b/engine-d/src/main/java/org/onap/holmes/engine/manager/DroolsEngine.java index c8835cc..5d1f442 100644 --- a/engine-d/src/main/java/org/onap/holmes/engine/manager/DroolsEngine.java +++ b/engine-d/src/main/java/org/onap/holmes/engine/manager/DroolsEngine.java @@ -189,6 +189,7 @@ public class DroolsEngine { } catch (Exception e) { throw new CorrelationException("Failed to delete the rule: " + packageName, e); } + packageNames.remove(pkg.getName()); } public void compileRule(String content, Locale locale) -- 2.16.6