From a7a144ba512654bd93b0856b1e9eb5c886060c21 Mon Sep 17 00:00:00 2001
From: Joshua Reich <jreich@research.att.com>
Date: Wed, 10 Apr 2019 13:38:59 -0700
Subject: Cleanup PIP/Database-related code.

Ensure database schema/naming consistent across repos.
Ensure PIP implementation consistent across repos.
Cleanup unused imports and made sure licenses are ok.

Issue-ID: POLICY-1471
Change-Id: I20a325fe3e66e6ae400e603ec366315aea716993
Signed-off-by: Joshua Reich <jreich@research.att.com>
Signed-off-by: Pamela Dragosh <pdragosh@research.att.com>
---
 .../template.demo/src/main/resources/blacklist_template.xml    | 10 +++++-----
 .../src/main/resources/frequency_limiter_template.xml          | 10 +++++-----
 .../src/main/resources/frequency_limiter_template_old.xml      |  6 +++---
 3 files changed, 13 insertions(+), 13 deletions(-)

(limited to 'controlloop/templates/template.demo/src/main/resources')

diff --git a/controlloop/templates/template.demo/src/main/resources/blacklist_template.xml b/controlloop/templates/template.demo/src/main/resources/blacklist_template.xml
index 590b19d25..1563e4a7d 100644
--- a/controlloop/templates/template.demo/src/main/resources/blacklist_template.xml
+++ b/controlloop/templates/template.demo/src/main/resources/blacklist_template.xml
@@ -3,7 +3,7 @@
   ============LICENSE_START=======================================================
   drools-applications
   ================================================================================
-  Copyright (C) 2018 AT&T Intellectual Property. All rights reserved.
+  Copyright (C) 2018-2019 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.
@@ -33,7 +33,7 @@
                         DataType="http://www.w3.org/2001/XMLSchema#string">${clname}</AttributeValue>
                     <AttributeDesignator
                         Category="urn:oasis:names:tc:xacml:1.0:subject-category:access-subject"
-                        AttributeId="urn:oasis:names:tc:xacml:1.0:clname:clname-id"
+                        AttributeId="urn:org:onap:guard:clname:clname-id"
                         DataType="http://www.w3.org/2001/XMLSchema#string"
                         MustBePresent="false" />
                 </Match>
@@ -45,7 +45,7 @@
                         DataType="http://www.w3.org/2001/XMLSchema#string">${actor}</AttributeValue>
                     <AttributeDesignator
                         Category="urn:oasis:names:tc:xacml:1.0:subject-category:access-subject"
-                        AttributeId="urn:oasis:names:tc:xacml:1.0:actor:actor-id"
+                        AttributeId="urn:org:onap:guard:actor:actor-id"
                         DataType="http://www.w3.org/2001/XMLSchema#string"
                         MustBePresent="false" />
                 </Match>
@@ -55,7 +55,7 @@
                         DataType="http://www.w3.org/2001/XMLSchema#string">${recipe}</AttributeValue>
                     <AttributeDesignator
                         Category="urn:oasis:names:tc:xacml:3.0:attribute-category:action"
-                        AttributeId="urn:oasis:names:tc:xacml:1.0:operation:operation-id"
+                        AttributeId="urn:org:onap:guard:operation:operation-id"
                         DataType="http://www.w3.org/2001/XMLSchema#string"
                         MustBePresent="false" />
                 </Match>
@@ -86,7 +86,7 @@
                 FunctionId="urn:oasis:names:tc:xacml:1.0:function:string-one-and-only">
                 <AttributeDesignator
                     Category="urn:oasis:names:tc:xacml:3.0:attribute-category:resource"
-                    AttributeId="urn:oasis:names:tc:xacml:1.0:target:target-id"
+                    AttributeId="urn:org:onap:guard:target:target-id"
                     DataType="http://www.w3.org/2001/XMLSchema#string"
                     MustBePresent="false" />
             </Apply>
diff --git a/controlloop/templates/template.demo/src/main/resources/frequency_limiter_template.xml b/controlloop/templates/template.demo/src/main/resources/frequency_limiter_template.xml
index 34aa1af69..d26432f86 100644
--- a/controlloop/templates/template.demo/src/main/resources/frequency_limiter_template.xml
+++ b/controlloop/templates/template.demo/src/main/resources/frequency_limiter_template.xml
@@ -3,7 +3,7 @@
   ============LICENSE_START=======================================================
   drools-applications
   ================================================================================
-  Copyright (C) 2018 AT&T Intellectual Property. All rights reserved.
+  Copyright (C) 2018-2019 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.
@@ -34,7 +34,7 @@
                         DataType="http://www.w3.org/2001/XMLSchema#string">${clname}</AttributeValue>
                     <AttributeDesignator
                         Category="urn:oasis:names:tc:xacml:1.0:subject-category:access-subject"
-                        AttributeId="urn:oasis:names:tc:xacml:1.0:clname:clname-id"
+                        AttributeId="urn:org:onap:guard:clname:clname-id"
                         DataType="http://www.w3.org/2001/XMLSchema#string"
                         MustBePresent="false" />
                 </Match>
@@ -46,7 +46,7 @@
                         DataType="http://www.w3.org/2001/XMLSchema#string">${actor}</AttributeValue>
                     <AttributeDesignator
                         Category="urn:oasis:names:tc:xacml:1.0:subject-category:access-subject"
-                        AttributeId="urn:oasis:names:tc:xacml:1.0:actor:actor-id"
+                        AttributeId="urn:org:onap:guard:actor:actor-id"
                         DataType="http://www.w3.org/2001/XMLSchema#string"
                         MustBePresent="false" />
                 </Match>
@@ -56,7 +56,7 @@
                         DataType="http://www.w3.org/2001/XMLSchema#string">${recipe}</AttributeValue>
                     <AttributeDesignator
                         Category="urn:oasis:names:tc:xacml:3.0:attribute-category:action"
-                        AttributeId="urn:oasis:names:tc:xacml:1.0:operation:operation-id"
+                        AttributeId="urn:org:onap:guard:operation:operation-id"
                         DataType="http://www.w3.org/2001/XMLSchema#string"
                         MustBePresent="false" />
                 </Match>
@@ -67,7 +67,7 @@
                         DataType="http://www.w3.org/2001/XMLSchema#string">${targets}</AttributeValue>
                     <AttributeDesignator
                         Category="urn:oasis:names:tc:xacml:3.0:attribute-category:resource"
-                        AttributeId="urn:oasis:names:tc:xacml:1.0:target:target-id"
+                        AttributeId="urn:org:onap:guard:target:target-id"
                         DataType="http://www.w3.org/2001/XMLSchema#string"
                         MustBePresent="false" />
                 </Match>
diff --git a/controlloop/templates/template.demo/src/main/resources/frequency_limiter_template_old.xml b/controlloop/templates/template.demo/src/main/resources/frequency_limiter_template_old.xml
index b41fdb3f2..e1e3451f3 100644
--- a/controlloop/templates/template.demo/src/main/resources/frequency_limiter_template_old.xml
+++ b/controlloop/templates/template.demo/src/main/resources/frequency_limiter_template_old.xml
@@ -3,7 +3,7 @@
   ============LICENSE_START=======================================================
   drools-applications
   ================================================================================
-  Copyright (C) 2018 AT&T Intellectual Property. All rights reserved.
+  Copyright (C) 2018-2019 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.
@@ -32,7 +32,7 @@
                         DataType="http://www.w3.org/2001/XMLSchema#string">${actor}</AttributeValue>
                     <AttributeDesignator
                         Category="urn:oasis:names:tc:xacml:1.0:subject-category:access-subject"
-                        AttributeId="urn:oasis:names:tc:xacml:1.0:actor:actor-id"
+                        AttributeId="urn:org:onap:guard:actor:actor-id"
                         DataType="http://www.w3.org/2001/XMLSchema#string"
                         MustBePresent="false" />
                 </Match>
@@ -42,7 +42,7 @@
                         DataType="http://www.w3.org/2001/XMLSchema#string">${recipe}</AttributeValue>
                     <AttributeDesignator
                         Category="urn:oasis:names:tc:xacml:3.0:attribute-category:action"
-                        AttributeId="urn:oasis:names:tc:xacml:1.0:operation:operation-id"
+                        AttributeId="urn:org:onap:guard:operation:operation-id"
                         DataType="http://www.w3.org/2001/XMLSchema#string"
                         MustBePresent="false" />
                 </Match>
-- 
cgit 1.2.3-korg