Rename maven modules in drools-applications

[policy/engine.git] / BRMSGateway / src / main / java / org / onap / policy / brmsInterface / BRMSPush.java

diff --git a/BRMSGateway/src/main/java/org/onap/policy/brmsInterface/BRMSPush.java b/BRMSGateway/src/main/java/org/onap/policy/brmsInterface/BRMSPush.java
index 4818fb3..ac1d0ac 100644 (file)
--- a/BRMSGateway/src/main/java/org/onap/policy/brmsInterface/BRMSPush.java
+++ b/BRMSGateway/src/main/java/org/onap/policy/brmsInterface/BRMSPush.java
@@ -73,7 +73,6 @@ import org.onap.policy.api.PolicyException;
 import org.onap.policy.brmsInterface.jpa.BRMSGroupInfo;
 import org.onap.policy.brmsInterface.jpa.BRMSPolicyInfo;
 import org.onap.policy.brmsInterface.jpa.DependencyInfo;
-import org.onap.policy.common.im.AdministrativeStateException;
 import org.onap.policy.common.im.IntegrityMonitor;
 import org.onap.policy.common.logging.eelf.MessageCodes;
 import org.onap.policy.common.logging.eelf.PolicyLogger;
@@ -105,7 +104,8 @@ import com.fasterxml.jackson.core.JsonProcessingException;
 @SuppressWarnings("deprecation")
 public class BRMSPush {
     private static final String GROUP_NAMES = "groupNames";
-       private static final String DROOLS_APPS_PACKAGE = "org.onap.policy.drools-applications";
+       private static final String DROOLS_APPS_TEMPLATE_GROUP = "org.onap.policy.drools-applications.controlloop.templates";
+       private static final String DROOLS_APPS_MODEL_GROUP    = "org.onap.policy.drools-applications.controlloop.common.model-impl";
        private static final String META_INF = "META-INF";
        private static final String KMODULE_XML_FILE = "kmodule.xml";
        private static final String POM_XML_FILE = "pom.xml";
@@ -415,18 +415,16 @@ public class BRMSPush {
                         LOGGER.error(XACMLErrorConstants.ERROR_PROCESS_FLOW + "Error while resolving Controller: " + e);
                     }
 
-                } else if ("$dependency$".equals(key)) {
-                    if (value.startsWith("[") && value.endsWith("]")) {
-                        value = value.substring(1, value.length() - 1).trim();
-                        List<String> dependencyStrings = Arrays.asList(value.split("},{"));
-                        for (String dependencyString : dependencyStrings) {
-                            try {
-                                userDependencies
-                                        .add(PolicyUtils.jsonStringToObject(dependencyString, PEDependency.class));
-                            } catch (Exception e) {
-                                LOGGER.error(XACMLErrorConstants.ERROR_PROCESS_FLOW
-                                        + "Error while resolving Dependencies: " + e);
-                            }
+                } else if ("$dependency$".equals(key) && value.startsWith("[") && value.endsWith("]")) {
+                    value = value.substring(1, value.length() - 1).trim();
+                    List<String> dependencyStrings = Arrays.asList(value.split("},{"));
+                    for (String dependencyString : dependencyStrings) {
+                        try {
+                            userDependencies
+                                    .add(PolicyUtils.jsonStringToObject(dependencyString, PEDependency.class));
+                        } catch (Exception e) {
+                            LOGGER.error(XACMLErrorConstants.ERROR_PROCESS_FLOW
+                                    + "Error while resolving Dependencies: " + e);
                         }
                     }
                 }
@@ -961,44 +959,44 @@ public class BRMSPush {
         String version = StringEscapeUtils.escapeJava(brmsdependencyversion);
 
         Dependency demoDependency = new Dependency();
-        demoDependency.setGroupId(DROOLS_APPS_PACKAGE);
-        demoDependency.setArtifactId("demo");
+        demoDependency.setGroupId(DROOLS_APPS_TEMPLATE_GROUP);
+        demoDependency.setArtifactId("template.demo");
         demoDependency.setVersion(version);
         dependencyList.add(demoDependency);
 
         Dependency controlloopDependency = new Dependency();
-        controlloopDependency.setGroupId(DROOLS_APPS_PACKAGE);
+        controlloopDependency.setGroupId(DROOLS_APPS_MODEL_GROUP);
         controlloopDependency.setArtifactId("events");
         controlloopDependency.setVersion(version);
         dependencyList.add(controlloopDependency);
 
         Dependency restDependency = new Dependency();
-        restDependency.setGroupId(DROOLS_APPS_PACKAGE);
-        restDependency.setArtifactId("rest");
+        restDependency.setGroupId(DROOLS_APPS_MODEL_GROUP);
+        restDependency.setArtifactId("controlloop.common.model-impl.rest");
         restDependency.setVersion(version);
         dependencyList.add(restDependency);
 
         Dependency appcDependency = new Dependency();
-        appcDependency.setGroupId(DROOLS_APPS_PACKAGE);
-        appcDependency.setArtifactId("appc");
+        appcDependency.setGroupId(DROOLS_APPS_MODEL_GROUP);
+        appcDependency.setArtifactId("controlloop.common.model-impl.appc");
         appcDependency.setVersion(version);
         dependencyList.add(appcDependency);
 
         Dependency aaiDependency = new Dependency();
-        aaiDependency.setGroupId(DROOLS_APPS_PACKAGE);
-        aaiDependency.setArtifactId("aai");
+        aaiDependency.setGroupId(DROOLS_APPS_MODEL_GROUP);
+        aaiDependency.setArtifactId("controlloop.common.model-impl.aai");
         aaiDependency.setVersion(version);
         dependencyList.add(aaiDependency);
 
         Dependency msoDependency = new Dependency();
-        msoDependency.setGroupId(DROOLS_APPS_PACKAGE);
-        msoDependency.setArtifactId("mso");
+        msoDependency.setGroupId(DROOLS_APPS_MODEL_GROUP);
+        msoDependency.setArtifactId("controlloop.common.model-impl.so");
         msoDependency.setVersion(version);
         dependencyList.add(msoDependency);
 
         Dependency trafficgeneratorDependency = new Dependency();
-        trafficgeneratorDependency.setGroupId(DROOLS_APPS_PACKAGE);
-        trafficgeneratorDependency.setArtifactId("trafficgenerator");
+        trafficgeneratorDependency.setGroupId(DROOLS_APPS_MODEL_GROUP);
+        trafficgeneratorDependency.setArtifactId("controlloop.common.model-impl.trafficgenerator");
         trafficgeneratorDependency.setVersion(version);
         dependencyList.add(trafficgeneratorDependency);
         return dependencyList;