Use new xacml actor in drools-apps

Modified drools-apps to use actor.xacml instead of actor.guard.
This included updating property files.

Issue-ID: POLICY-3503
Change-Id: I25c5586c59a2adaae9f4f0f5ca66e14b12b0c18a
Signed-off-by: Jim Hahn <jrh3@att.com>

7 files changed, 39 insertions, 39 deletions

diff --git a/controlloop/common/eventmanager/src/main/java/org/onap/policy/controlloop/eventmanager/ControlLoopEventManager.java b/controlloop/common/eventmanager/src/main/java/org/onap/policy/controlloop/eventmanager/ControlLoopEventManager.java
index 3a7531c03..354567cd8 100644
--- a/controlloop/common/eventmanager/src/main/java/org/onap/policy/controlloop/eventmanager/ControlLoopEventManager.java
+++ b/controlloop/common/eventmanager/src/main/java/org/onap/policy/controlloop/eventmanager/ControlLoopEventManager.java
@@ -68,7 +68,7 @@ public class ControlLoopEventManager implements StepContext, Serializable {
      */
     private static final OperationHistoryDataManager STUB_DATA_MANAGER = new OperationHistoryDataManagerStub();
 
-    private static final String GUARD_DISABLED_PROPERTY = "guard.disabled";
+    public static final String GUARD_DISABLED_PROPERTY = "guard.disabled";
 
     /**
      * Counts the number of these objects that have been created. This is used by junit
diff --git a/controlloop/common/eventmanager/src/main/java/org/onap/policy/controlloop/eventmanager/EventManagerServices.java b/controlloop/common/eventmanager/src/main/java/org/onap/policy/controlloop/eventmanager/EventManagerServices.java
index 4fef9f9d4..3271267e7 100644
--- a/controlloop/common/eventmanager/src/main/java/org/onap/policy/controlloop/eventmanager/EventManagerServices.java
+++ b/controlloop/common/eventmanager/src/main/java/org/onap/policy/controlloop/eventmanager/EventManagerServices.java
@@ -25,10 +25,10 @@ import java.util.Properties;
 import lombok.Getter;
 import org.onap.policy.common.parameters.ValidationResult;
 import org.onap.policy.common.utils.properties.PropertyObjectUtils;
-import org.onap.policy.controlloop.actor.guard.DecisionOperation;
-import org.onap.policy.controlloop.actor.guard.DecisionOperator;
-import org.onap.policy.controlloop.actor.guard.GuardActor;
-import org.onap.policy.controlloop.actor.guard.GuardConfig;
+import org.onap.policy.controlloop.actor.xacml.DecisionConfig;
+import org.onap.policy.controlloop.actor.xacml.DecisionOperator;
+import org.onap.policy.controlloop.actor.xacml.GuardOperation;
+import org.onap.policy.controlloop.actor.xacml.XacmlActor;
 import org.onap.policy.controlloop.actorserviceprovider.ActorService;
 import org.onap.policy.controlloop.actorserviceprovider.Util;
 import org.onap.policy.controlloop.ophistory.OperationHistoryDataManager;
@@ -103,14 +103,14 @@ public class EventManagerServices {
      */
     public boolean isGuardEnabled() {
         try {
-            DecisionOperator guard = (DecisionOperator) getActorService().getActor(GuardActor.NAME)
-                            .getOperator(DecisionOperation.NAME);
+            DecisionOperator guard = (DecisionOperator) getActorService().getActor(XacmlActor.NAME)
+                            .getOperator(GuardOperation.NAME);
             if (!guard.isConfigured()) {
                 logger.warn("cannot check 'disabled' property in GUARD actor - assuming disabled");
                 return false;
             }
 
-            GuardConfig config = (GuardConfig) guard.getCurrentConfig();
+            DecisionConfig config = (DecisionConfig) guard.getCurrentConfig();
             if (config.isDisabled()) {
                 logger.warn("guard disabled");
                 return false;
diff --git a/controlloop/common/eventmanager/src/test/resources/eventService/event-svc-guard-disabled.properties b/controlloop/common/eventmanager/src/test/resources/eventService/event-svc-guard-disabled.properties
index 289de44eb..8f8c71f37 100644
--- a/controlloop/common/eventmanager/src/test/resources/eventService/event-svc-guard-disabled.properties
+++ b/controlloop/common/eventmanager/src/test/resources/eventService/event-svc-guard-disabled.properties
@@ -2,7 +2,7 @@
 # ============LICENSE_START======================================================
 # ONAP
 # ===============================================================================
-# Copyright (C) 2020 AT&T Intellectual Property. All rights reserved.
+# Copyright (C) 2020-2021 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.
@@ -18,9 +18,9 @@
 # ============LICENSE_END========================================================
 #
 
-actor.service.GUARD.disabled=true
-actor.service.GUARD.clientName=guard-client
-actor.service.GUARD.onapName=my-onap-name
-actor.service.GUARD.onapComponent=my-onap-component
-actor.service.GUARD.onapInstance=my-onap-instance
-actor.service.GUARD.operations.Decision.path=decide
+actor.service.XACML.disabled=true
+actor.service.XACML.clientName=xacml-client
+actor.service.XACML.onapName=my-onap-name
+actor.service.XACML.onapComponent=my-onap-component
+actor.service.XACML.onapInstance=my-onap-instance
+actor.service.XACML.operations.Guard.path=decide
diff --git a/controlloop/common/eventmanager/src/test/resources/eventService/event-svc-http-client.properties b/controlloop/common/eventmanager/src/test/resources/eventService/event-svc-http-client.properties
index a563afdc3..8a1819b61 100644
--- a/controlloop/common/eventmanager/src/test/resources/eventService/event-svc-http-client.properties
+++ b/controlloop/common/eventmanager/src/test/resources/eventService/event-svc-http-client.properties
@@ -2,7 +2,7 @@
 # ============LICENSE_START======================================================
 # ONAP
 # ===============================================================================
-# Copyright (C) 2020 AT&T Intellectual Property. All rights reserved.
+# Copyright (C) 2020-2021 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.
@@ -18,7 +18,7 @@
 # ============LICENSE_END========================================================
 #
 
-http.client.services=guard-client
-http.client.services.guard-client.host=localhost
-http.client.services.guard-client.port=80
-http.client.services.guard-client.managed=true
+http.client.services=xacml-client
+http.client.services.xacml-client.host=localhost
+http.client.services.xacml-client.port=80
+http.client.services.xacml-client.managed=true
diff --git a/controlloop/common/eventmanager/src/test/resources/eventService/event-svc-invalid-db.properties b/controlloop/common/eventmanager/src/test/resources/eventService/event-svc-invalid-db.properties
index 09a6fbb31..3648567c2 100644
--- a/controlloop/common/eventmanager/src/test/resources/eventService/event-svc-invalid-db.properties
+++ b/controlloop/common/eventmanager/src/test/resources/eventService/event-svc-invalid-db.properties
@@ -2,7 +2,7 @@
 # ============LICENSE_START======================================================
 # ONAP
 # ===============================================================================
-# Copyright (C) 2020 AT&T Intellectual Property. All rights reserved.
+# Copyright (C) 2020-2021 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.
@@ -18,12 +18,12 @@
 # ============LICENSE_END========================================================
 #
 
-#actor.service.GUARD.disabled=true
-actor.service.GUARD.clientName=guard-client
-actor.service.GUARD.onapName=my-onap-name
-actor.service.GUARD.onapComponent=my-onap-component
-actor.service.GUARD.onapInstance=my-onap-instance
-actor.service.GUARD.operations.Decision.path=decide
+#actor.service.XACML.disabled=true
+actor.service.XACML.clientName=xacml-client
+actor.service.XACML.onapName=my-onap-name
+actor.service.XACML.onapComponent=my-onap-component
+actor.service.XACML.onapInstance=my-onap-instance
+actor.service.XACML.operations.Guard.path=decide
 
 # purposely missing the URL
 #operation.history.url=jdbc:h2:mem:EventManagerServicesTest
diff --git a/controlloop/common/eventmanager/src/test/resources/eventService/event-svc-no-guard-actor.properties b/controlloop/common/eventmanager/src/test/resources/eventService/event-svc-no-guard-actor.properties
index 027f824e8..f72378881 100644
--- a/controlloop/common/eventmanager/src/test/resources/eventService/event-svc-no-guard-actor.properties
+++ b/controlloop/common/eventmanager/src/test/resources/eventService/event-svc-no-guard-actor.properties
@@ -2,7 +2,7 @@
 # ============LICENSE_START======================================================
 # ONAP
 # ===============================================================================
-# Copyright (C) 2020 AT&T Intellectual Property. All rights reserved.
+# Copyright (C) 2020-2021 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.
@@ -18,8 +18,8 @@
 # ============LICENSE_END========================================================
 #
 
-# all GUARD properties are commented out on purpose
+# all XACML properties are commented out on purpose
 
-#actor.service.GUARD.disabled=true
-#actor.service.GUARD.clientName=guard-client
-#actor.service.GUARD.operations.Decision.path=decide
+#actor.service.XACML.disabled=true
+#actor.service.XACML.clientName=xacml-client
+#actor.service.XACML.operations.Guard.path=decide
diff --git a/controlloop/common/eventmanager/src/test/resources/eventService/event-svc-with-db.properties b/controlloop/common/eventmanager/src/test/resources/eventService/event-svc-with-db.properties
index 0fd886b46..c20f82b22 100644
--- a/controlloop/common/eventmanager/src/test/resources/eventService/event-svc-with-db.properties
+++ b/controlloop/common/eventmanager/src/test/resources/eventService/event-svc-with-db.properties
@@ -2,7 +2,7 @@
 # ============LICENSE_START======================================================
 # ONAP
 # ===============================================================================
-# Copyright (C) 2020 AT&T Intellectual Property. All rights reserved.
+# Copyright (C) 2020-2021 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.
@@ -18,12 +18,12 @@
 # ============LICENSE_END========================================================
 #
 
-#actor.service.GUARD.disabled=true
-actor.service.GUARD.clientName=guard-client
-actor.service.GUARD.onapName=my-onap-name
-actor.service.GUARD.onapComponent=my-onap-component
-actor.service.GUARD.onapInstance=my-onap-instance
-actor.service.GUARD.operations.Decision.path=decide
+#actor.service.XACML.disabled=true
+actor.service.XACML.clientName=xacml-client
+actor.service.XACML.onapName=my-onap-name
+actor.service.XACML.onapComponent=my-onap-component
+actor.service.XACML.onapInstance=my-onap-instance
+actor.service.XACML.operations.Guard.path=decide
 
 operation.history.url=jdbc:h2:mem:EventManagerServicesTest
 operation.history.userName=sa