summaryrefslogtreecommitdiffstats
path: root/packages/base/src/files/install/servers
diff options
context:
space:
mode:
Diffstat (limited to 'packages/base/src/files/install/servers')
-rw-r--r--packages/base/src/files/install/servers/brmsgw/client.properties2
-rw-r--r--packages/base/src/files/install/servers/brmsgw/config.properties2
-rw-r--r--packages/base/src/files/install/servers/brmsgw/config/policyLogger.properties2
-rw-r--r--packages/base/src/files/install/servers/common/tomcat/bin/setenv.sh2
-rw-r--r--packages/base/src/files/install/servers/common/tomcat/conf/server.xml2
-rw-r--r--packages/base/src/files/install/servers/configs/conf/server.xml2
-rw-r--r--packages/base/src/files/install/servers/console/bin/Policy-Admin.xml2
-rw-r--r--packages/base/src/files/install/servers/console/bin/config/policyLogger.properties2
-rw-r--r--packages/base/src/files/install/servers/console/bin/model.properties2
-rwxr-xr-xpackages/base/src/files/install/servers/console/bin/workspace/admin/repository/com/Config_BRMS_Param_BRMSParamvFWDemoPolicy.1.xml18
-rwxr-xr-xpackages/base/src/files/install/servers/console/bin/workspace/admin/repository/com/Config_BRMS_Param_BRMSParamvLBDemoPolicy.1.xml18
-rw-r--r--packages/base/src/files/install/servers/console/bin/workspace/admin/repository/com/Config_MS_vFirewall.1.xml24
-rw-r--r--packages/base/src/files/install/servers/console/bin/workspace/admin/repository/com/Config_MS_vLoadBalancer.1.xml24
-rw-r--r--packages/base/src/files/install/servers/console/bin/xacml.admin.properties30
-rw-r--r--packages/base/src/files/install/servers/console/conf/server.xml4
-rw-r--r--packages/base/src/files/install/servers/onap/WEB-INF/classes/portal.properties (renamed from packages/base/src/files/install/servers/ecomp/WEB-INF/classes/portal.properties)28
-rw-r--r--packages/base/src/files/install/servers/onap/WEB-INF/conf/system.properties (renamed from packages/base/src/files/install/servers/ecomp/WEB-INF/conf/system.properties)10
-rw-r--r--packages/base/src/files/install/servers/pap/bin/autopush.properties2
-rw-r--r--packages/base/src/files/install/servers/pap/bin/config/policyLogger.properties2
-rw-r--r--packages/base/src/files/install/servers/pap/bin/pdps/default/com.Config_BRMS_Param_BRMSParamvFWDemoPolicy.1.xml18
-rw-r--r--packages/base/src/files/install/servers/pap/bin/pdps/default/com.Config_BRMS_Param_BRMSParamvLBDemoPolicy.1.xml18
-rw-r--r--packages/base/src/files/install/servers/pap/bin/pdps/default/com.Config_MS_vFirewall.1.xml24
-rw-r--r--packages/base/src/files/install/servers/pap/bin/pdps/default/com.Config_MS_vLoadBalancer.1.xml24
-rw-r--r--packages/base/src/files/install/servers/pap/bin/pdps/default/xacml.pip.properties2
-rw-r--r--packages/base/src/files/install/servers/pap/bin/pip.properties4
-rw-r--r--packages/base/src/files/install/servers/pap/bin/policyelk.properties2
-rw-r--r--packages/base/src/files/install/servers/pap/bin/test.properties2
-rw-r--r--packages/base/src/files/install/servers/pap/bin/xacml.pap.properties14
-rwxr-xr-xpackages/base/src/files/install/servers/pap/webapps/Config/com.Config_BRMS_Param_BRMSParamvFWDemoPolicy.1.txt4
-rwxr-xr-xpackages/base/src/files/install/servers/pap/webapps/Config/com.Config_BRMS_Param_BRMSParamvLBDemoPolicy.1.txt8
-rw-r--r--packages/base/src/files/install/servers/paplp/bin/config/policyLogger.properties2
-rw-r--r--packages/base/src/files/install/servers/paplp/bin/parserlog.properties2
-rw-r--r--packages/base/src/files/install/servers/pdp/bin/client.properties2
-rw-r--r--packages/base/src/files/install/servers/pdp/bin/config/policyLogger.properties2
-rw-r--r--packages/base/src/files/install/servers/pdp/bin/xacml.pdp.properties12
-rw-r--r--packages/base/src/files/install/servers/pdplp/bin/config/policyLogger.properties2
-rwxr-xr-xpackages/base/src/files/install/servers/pdplp/bin/parserlog.properties2
37 files changed, 161 insertions, 161 deletions
diff --git a/packages/base/src/files/install/servers/brmsgw/client.properties b/packages/base/src/files/install/servers/brmsgw/client.properties
index 97156b66e..4a39cf1c0 100644
--- a/packages/base/src/files/install/servers/brmsgw/client.properties
+++ b/packages/base/src/files/install/servers/brmsgw/client.properties
@@ -1,6 +1,6 @@
###
# ============LICENSE_START=======================================================
-# ECOMP Policy Engine
+# ONAP Policy Engine
# ================================================================================
# Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
# ================================================================================
diff --git a/packages/base/src/files/install/servers/brmsgw/config.properties b/packages/base/src/files/install/servers/brmsgw/config.properties
index 30b14b1e2..9e95ed719 100644
--- a/packages/base/src/files/install/servers/brmsgw/config.properties
+++ b/packages/base/src/files/install/servers/brmsgw/config.properties
@@ -1,6 +1,6 @@
###
# ============LICENSE_START=======================================================
-# ECOMP Policy Engine
+# ONAP Policy Engine
# ================================================================================
# Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
# ================================================================================
diff --git a/packages/base/src/files/install/servers/brmsgw/config/policyLogger.properties b/packages/base/src/files/install/servers/brmsgw/config/policyLogger.properties
index 0deb1b3d6..bbb0ecf4e 100644
--- a/packages/base/src/files/install/servers/brmsgw/config/policyLogger.properties
+++ b/packages/base/src/files/install/servers/brmsgw/config/policyLogger.properties
@@ -1,6 +1,6 @@
###
# ============LICENSE_START=======================================================
-# ECOMP Policy Engine
+# ONAP Policy Engine
# ================================================================================
# Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
# ================================================================================
diff --git a/packages/base/src/files/install/servers/common/tomcat/bin/setenv.sh b/packages/base/src/files/install/servers/common/tomcat/bin/setenv.sh
index 154b2a544..0ba7ab8e4 100644
--- a/packages/base/src/files/install/servers/common/tomcat/bin/setenv.sh
+++ b/packages/base/src/files/install/servers/common/tomcat/bin/setenv.sh
@@ -1,6 +1,6 @@
###
# ============LICENSE_START=======================================================
-# ECOMP Policy Engine
+# ONAP Policy Engine
# ================================================================================
# Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
# ================================================================================
diff --git a/packages/base/src/files/install/servers/common/tomcat/conf/server.xml b/packages/base/src/files/install/servers/common/tomcat/conf/server.xml
index e45450024..787347283 100644
--- a/packages/base/src/files/install/servers/common/tomcat/conf/server.xml
+++ b/packages/base/src/files/install/servers/common/tomcat/conf/server.xml
@@ -1,7 +1,7 @@
<?xml version='1.0' encoding='utf-8'?>
<!--
============LICENSE_START=======================================================
- ECOMP Policy Engine
+ ONAP Policy Engine
================================================================================
Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
================================================================================
diff --git a/packages/base/src/files/install/servers/configs/conf/server.xml b/packages/base/src/files/install/servers/configs/conf/server.xml
index acda634ef..2a6191e99 100644
--- a/packages/base/src/files/install/servers/configs/conf/server.xml
+++ b/packages/base/src/files/install/servers/configs/conf/server.xml
@@ -1,7 +1,7 @@
<?xml version='1.0' encoding='utf-8'?>
<!--
============LICENSE_START=======================================================
- ECOMP Policy Engine
+ ONAP Policy Engine
================================================================================
Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
================================================================================
diff --git a/packages/base/src/files/install/servers/console/bin/Policy-Admin.xml b/packages/base/src/files/install/servers/console/bin/Policy-Admin.xml
index b2d70de9b..1f304b99a 100644
--- a/packages/base/src/files/install/servers/console/bin/Policy-Admin.xml
+++ b/packages/base/src/files/install/servers/console/bin/Policy-Admin.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<!--
============LICENSE_START=======================================================
- ECOMP Policy Engine
+ ONAP Policy Engine
================================================================================
Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
================================================================================
diff --git a/packages/base/src/files/install/servers/console/bin/config/policyLogger.properties b/packages/base/src/files/install/servers/console/bin/config/policyLogger.properties
index 0deb1b3d6..bbb0ecf4e 100644
--- a/packages/base/src/files/install/servers/console/bin/config/policyLogger.properties
+++ b/packages/base/src/files/install/servers/console/bin/config/policyLogger.properties
@@ -1,6 +1,6 @@
###
# ============LICENSE_START=======================================================
-# ECOMP Policy Engine
+# ONAP Policy Engine
# ================================================================================
# Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
# ================================================================================
diff --git a/packages/base/src/files/install/servers/console/bin/model.properties b/packages/base/src/files/install/servers/console/bin/model.properties
index ce448b9ed..450654f60 100644
--- a/packages/base/src/files/install/servers/console/bin/model.properties
+++ b/packages/base/src/files/install/servers/console/bin/model.properties
@@ -1,6 +1,6 @@
###
# ============LICENSE_START=======================================================
-# ECOMP Policy Engine
+# ONAP Policy Engine
# ================================================================================
# Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
# ================================================================================
diff --git a/packages/base/src/files/install/servers/console/bin/workspace/admin/repository/com/Config_BRMS_Param_BRMSParamvFWDemoPolicy.1.xml b/packages/base/src/files/install/servers/console/bin/workspace/admin/repository/com/Config_BRMS_Param_BRMSParamvFWDemoPolicy.1.xml
index 38405d625..e57f8fa4c 100755
--- a/packages/base/src/files/install/servers/console/bin/workspace/admin/repository/com/Config_BRMS_Param_BRMSParamvFWDemoPolicy.1.xml
+++ b/packages/base/src/files/install/servers/console/bin/workspace/admin/repository/com/Config_BRMS_Param_BRMSParamvFWDemoPolicy.1.xml
@@ -4,33 +4,33 @@
<Target>
<AnyOf>
<AllOf>
- <Match MatchId="org.openecomp.function.regex-match">
+ <Match MatchId="org.onap.function.regex-match">
<AttributeValue DataType="http://www.w3.org/2001/XMLSchema#string">com.Config_BRMS_Param_BRMSParamvFWDemoPolicy.1.xml</AttributeValue>
<AttributeDesignator Category="urn:oasis:names:tc:xacml:1.0:subject-category:access-subject" AttributeId="PolicyName" DataType="http://www.w3.org/2001/XMLSchema#string" MustBePresent="false"/>
</Match>
</AllOf>
<AllOf>
- <Match MatchId="org.openecomp.function.regex-match">
+ <Match MatchId="org.onap.function.regex-match">
<AttributeValue DataType="http://www.w3.org/2001/XMLSchema#string">DROOLS</AttributeValue>
- <AttributeDesignator Category="urn:oasis:names:tc:xacml:1.0:subject-category:access-subject" AttributeId="ECOMPName" DataType="http://www.w3.org/2001/XMLSchema#string" MustBePresent="false"/>
+ <AttributeDesignator Category="urn:oasis:names:tc:xacml:1.0:subject-category:access-subject" AttributeId="ONAPName" DataType="http://www.w3.org/2001/XMLSchema#string" MustBePresent="false"/>
</Match>
- <Match MatchId="org.openecomp.function.regex-match">
+ <Match MatchId="org.onap.function.regex-match">
<AttributeValue DataType="http://www.w3.org/2001/XMLSchema#string">BRMS_PARAM_RULE</AttributeValue>
<AttributeDesignator Category="urn:oasis:names:tc:xacml:1.0:subject-category:access-subject" AttributeId="ConfigName" DataType="http://www.w3.org/2001/XMLSchema#string" MustBePresent="false"/>
</Match>
- <Match MatchId="org.openecomp.function.regex-match">
+ <Match MatchId="org.onap.function.regex-match">
<AttributeValue DataType="http://www.w3.org/2001/XMLSchema#string">SampleRiskType</AttributeValue>
<AttributeDesignator Category="urn:oasis:names:tc:xacml:3.0:attribute-category:resource" AttributeId="RiskType" DataType="http://www.w3.org/2001/XMLSchema#string" MustBePresent="false"/>
</Match>
- <Match MatchId="org.openecomp.function.regex-match">
+ <Match MatchId="org.onap.function.regex-match">
<AttributeValue DataType="http://www.w3.org/2001/XMLSchema#string">1</AttributeValue>
<AttributeDesignator Category="urn:oasis:names:tc:xacml:3.0:attribute-category:resource" AttributeId="RiskLevel" DataType="http://www.w3.org/2001/XMLSchema#string" MustBePresent="false"/>
</Match>
- <Match MatchId="org.openecomp.function.regex-match">
+ <Match MatchId="org.onap.function.regex-match">
<AttributeValue DataType="http://www.w3.org/2001/XMLSchema#string">False</AttributeValue>
<AttributeDesignator Category="urn:oasis:names:tc:xacml:3.0:attribute-category:resource" AttributeId="guard" DataType="http://www.w3.org/2001/XMLSchema#string" MustBePresent="false"/>
</Match>
- <Match MatchId="org.openecomp.function.regex-match">
+ <Match MatchId="org.onap.function.regex-match">
<AttributeValue DataType="http://www.w3.org/2001/XMLSchema#string">NA</AttributeValue>
<AttributeDesignator Category="urn:oasis:names:tc:xacml:3.0:attribute-category:resource" AttributeId="TTLDate" DataType="http://www.w3.org/2001/XMLSchema#string" MustBePresent="false"/>
</Match>
@@ -66,7 +66,7 @@
<AttributeAssignmentExpression AttributeId="VersionNumber" Category="urn:oasis:names:tc:xacml:3.0:attribute-category:resource" Issuer="">
<AttributeValue DataType="http://www.w3.org/2001/XMLSchema#string">1</AttributeValue>
</AttributeAssignmentExpression>
- <AttributeAssignmentExpression AttributeId="matching:ECOMPName" Category="urn:oasis:names:tc:xacml:3.0:attribute-category:resource" Issuer="">
+ <AttributeAssignmentExpression AttributeId="matching:ONAPName" Category="urn:oasis:names:tc:xacml:3.0:attribute-category:resource" Issuer="">
<AttributeValue DataType="http://www.w3.org/2001/XMLSchema#string">DROOLS</AttributeValue>
</AttributeAssignmentExpression>
<AttributeAssignmentExpression AttributeId="matching:ConfigName" Category="urn:oasis:names:tc:xacml:3.0:attribute-category:resource" Issuer="">
diff --git a/packages/base/src/files/install/servers/console/bin/workspace/admin/repository/com/Config_BRMS_Param_BRMSParamvLBDemoPolicy.1.xml b/packages/base/src/files/install/servers/console/bin/workspace/admin/repository/com/Config_BRMS_Param_BRMSParamvLBDemoPolicy.1.xml
index 25af35a78..7b60d8e86 100755
--- a/packages/base/src/files/install/servers/console/bin/workspace/admin/repository/com/Config_BRMS_Param_BRMSParamvLBDemoPolicy.1.xml
+++ b/packages/base/src/files/install/servers/console/bin/workspace/admin/repository/com/Config_BRMS_Param_BRMSParamvLBDemoPolicy.1.xml
@@ -4,33 +4,33 @@
<Target>
<AnyOf>
<AllOf>
- <Match MatchId="org.openecomp.function.regex-match">
+ <Match MatchId="org.onap.function.regex-match">
<AttributeValue DataType="http://www.w3.org/2001/XMLSchema#string">com.Config_BRMS_Param_BRMSParamvLBDemoPolicy.1.xml</AttributeValue>
<AttributeDesignator Category="urn:oasis:names:tc:xacml:1.0:subject-category:access-subject" AttributeId="PolicyName" DataType="http://www.w3.org/2001/XMLSchema#string" MustBePresent="false"/>
</Match>
</AllOf>
<AllOf>
- <Match MatchId="org.openecomp.function.regex-match">
+ <Match MatchId="org.onap.function.regex-match">
<AttributeValue DataType="http://www.w3.org/2001/XMLSchema#string">DROOLS</AttributeValue>
- <AttributeDesignator Category="urn:oasis:names:tc:xacml:1.0:subject-category:access-subject" AttributeId="ECOMPName" DataType="http://www.w3.org/2001/XMLSchema#string" MustBePresent="false"/>
+ <AttributeDesignator Category="urn:oasis:names:tc:xacml:1.0:subject-category:access-subject" AttributeId="ONAPName" DataType="http://www.w3.org/2001/XMLSchema#string" MustBePresent="false"/>
</Match>
- <Match MatchId="org.openecomp.function.regex-match">
+ <Match MatchId="org.onap.function.regex-match">
<AttributeValue DataType="http://www.w3.org/2001/XMLSchema#string">BRMS_PARAM_RULE</AttributeValue>
<AttributeDesignator Category="urn:oasis:names:tc:xacml:1.0:subject-category:access-subject" AttributeId="ConfigName" DataType="http://www.w3.org/2001/XMLSchema#string" MustBePresent="false"/>
</Match>
- <Match MatchId="org.openecomp.function.regex-match">
+ <Match MatchId="org.onap.function.regex-match">
<AttributeValue DataType="http://www.w3.org/2001/XMLSchema#string">SampleRiskType</AttributeValue>
<AttributeDesignator Category="urn:oasis:names:tc:xacml:3.0:attribute-category:resource" AttributeId="RiskType" DataType="http://www.w3.org/2001/XMLSchema#string" MustBePresent="false"/>
</Match>
- <Match MatchId="org.openecomp.function.regex-match">
+ <Match MatchId="org.onap.function.regex-match">
<AttributeValue DataType="http://www.w3.org/2001/XMLSchema#string">1</AttributeValue>
<AttributeDesignator Category="urn:oasis:names:tc:xacml:3.0:attribute-category:resource" AttributeId="RiskLevel" DataType="http://www.w3.org/2001/XMLSchema#string" MustBePresent="false"/>
</Match>
- <Match MatchId="org.openecomp.function.regex-match">
+ <Match MatchId="org.onap.function.regex-match">
<AttributeValue DataType="http://www.w3.org/2001/XMLSchema#string">False</AttributeValue>
<AttributeDesignator Category="urn:oasis:names:tc:xacml:3.0:attribute-category:resource" AttributeId="guard" DataType="http://www.w3.org/2001/XMLSchema#string" MustBePresent="false"/>
</Match>
- <Match MatchId="org.openecomp.function.regex-match">
+ <Match MatchId="org.onap.function.regex-match">
<AttributeValue DataType="http://www.w3.org/2001/XMLSchema#string">NA</AttributeValue>
<AttributeDesignator Category="urn:oasis:names:tc:xacml:3.0:attribute-category:resource" AttributeId="TTLDate" DataType="http://www.w3.org/2001/XMLSchema#string" MustBePresent="false"/>
</Match>
@@ -66,7 +66,7 @@
<AttributeAssignmentExpression AttributeId="VersionNumber" Category="urn:oasis:names:tc:xacml:3.0:attribute-category:resource" Issuer="">
<AttributeValue DataType="http://www.w3.org/2001/XMLSchema#string">1</AttributeValue>
</AttributeAssignmentExpression>
- <AttributeAssignmentExpression AttributeId="matching:ECOMPName" Category="urn:oasis:names:tc:xacml:3.0:attribute-category:resource" Issuer="">
+ <AttributeAssignmentExpression AttributeId="matching:ONAPName" Category="urn:oasis:names:tc:xacml:3.0:attribute-category:resource" Issuer="">
<AttributeValue DataType="http://www.w3.org/2001/XMLSchema#string">DROOLS</AttributeValue>
</AttributeAssignmentExpression>
<AttributeAssignmentExpression AttributeId="matching:ConfigName" Category="urn:oasis:names:tc:xacml:3.0:attribute-category:resource" Issuer="">
diff --git a/packages/base/src/files/install/servers/console/bin/workspace/admin/repository/com/Config_MS_vFirewall.1.xml b/packages/base/src/files/install/servers/console/bin/workspace/admin/repository/com/Config_MS_vFirewall.1.xml
index 336504c71..3b81613bc 100644
--- a/packages/base/src/files/install/servers/console/bin/workspace/admin/repository/com/Config_MS_vFirewall.1.xml
+++ b/packages/base/src/files/install/servers/console/bin/workspace/admin/repository/com/Config_MS_vFirewall.1.xml
@@ -4,45 +4,45 @@
<Target>
<AnyOf>
<AllOf>
- <Match MatchId="org.openecomp.function.regex-match">
+ <Match MatchId="org.onap.function.regex-match">
<AttributeValue DataType="http://www.w3.org/2001/XMLSchema#string">com.Config_MS_vFirewall.1.xml</AttributeValue>
<AttributeDesignator Category="urn:oasis:names:tc:xacml:1.0:subject-category:access-subject" AttributeId="PolicyName" DataType="http://www.w3.org/2001/XMLSchema#string" MustBePresent="false"/>
</Match>
</AllOf>
<AllOf>
- <Match MatchId="org.openecomp.function.regex-match">
+ <Match MatchId="org.onap.function.regex-match">
<AttributeValue DataType="http://www.w3.org/2001/XMLSchema#string">DCAE</AttributeValue>
- <AttributeDesignator Category="urn:oasis:names:tc:xacml:1.0:subject-category:access-subject" AttributeId="ECOMPName" DataType="http://www.w3.org/2001/XMLSchema#string" MustBePresent="false"/>
+ <AttributeDesignator Category="urn:oasis:names:tc:xacml:1.0:subject-category:access-subject" AttributeId="ONAPName" DataType="http://www.w3.org/2001/XMLSchema#string" MustBePresent="false"/>
</Match>
- <Match MatchId="org.openecomp.function.regex-match">
+ <Match MatchId="org.onap.function.regex-match">
<AttributeValue DataType="http://www.w3.org/2001/XMLSchema#string">SampleConfigName</AttributeValue>
<AttributeDesignator Category="urn:oasis:names:tc:xacml:1.0:subject-category:access-subject" AttributeId="ConfigName" DataType="http://www.w3.org/2001/XMLSchema#string" MustBePresent="false"/>
</Match>
- <Match MatchId="org.openecomp.function.regex-match">
+ <Match MatchId="org.onap.function.regex-match">
<AttributeValue DataType="http://www.w3.org/2001/XMLSchema#string">TcaMetrics-v1.0.0.5</AttributeValue>
<AttributeDesignator Category="urn:oasis:names:tc:xacml:3.0:attribute-category:resource" AttributeId="service" DataType="http://www.w3.org/2001/XMLSchema#string" MustBePresent="false"/>
</Match>
- <Match MatchId="org.openecomp.function.regex-match">
+ <Match MatchId="org.onap.function.regex-match">
<AttributeValue DataType="http://www.w3.org/2001/XMLSchema#string">/services/cdap-tca-hi-lo/instances/demo/configuration/metricsPerFunctionalRole/vFirewall</AttributeValue>
<AttributeDesignator Category="urn:oasis:names:tc:xacml:3.0:attribute-category:resource" AttributeId="uuid" DataType="http://www.w3.org/2001/XMLSchema#string" MustBePresent="false"/>
</Match>
- <Match MatchId="org.openecomp.function.regex-match">
+ <Match MatchId="org.onap.function.regex-match">
<AttributeValue DataType="http://www.w3.org/2001/XMLSchema#string">SampleServiceLocation</AttributeValue>
<AttributeDesignator Category="urn:oasis:names:tc:xacml:3.0:attribute-category:resource" AttributeId="location" DataType="http://www.w3.org/2001/XMLSchema#string" MustBePresent="false"/>
</Match>
- <Match MatchId="org.openecomp.function.regex-match">
+ <Match MatchId="org.onap.function.regex-match">
<AttributeValue DataType="http://www.w3.org/2001/XMLSchema#string">SampleRiskType</AttributeValue>
<AttributeDesignator Category="urn:oasis:names:tc:xacml:3.0:attribute-category:resource" AttributeId="RiskType" DataType="http://www.w3.org/2001/XMLSchema#string" MustBePresent="false"/>
</Match>
- <Match MatchId="org.openecomp.function.regex-match">
+ <Match MatchId="org.onap.function.regex-match">
<AttributeValue DataType="http://www.w3.org/2001/XMLSchema#string">1</AttributeValue>
<AttributeDesignator Category="urn:oasis:names:tc:xacml:3.0:attribute-category:resource" AttributeId="RiskLevel" DataType="http://www.w3.org/2001/XMLSchema#string" MustBePresent="false"/>
</Match>
- <Match MatchId="org.openecomp.function.regex-match">
+ <Match MatchId="org.onap.function.regex-match">
<AttributeValue DataType="http://www.w3.org/2001/XMLSchema#string">False</AttributeValue>
<AttributeDesignator Category="urn:oasis:names:tc:xacml:3.0:attribute-category:resource" AttributeId="guard" DataType="http://www.w3.org/2001/XMLSchema#string" MustBePresent="false"/>
</Match>
- <Match MatchId="org.openecomp.function.regex-match">
+ <Match MatchId="org.onap.function.regex-match">
<AttributeValue DataType="http://www.w3.org/2001/XMLSchema#string">NA</AttributeValue>
<AttributeDesignator Category="urn:oasis:names:tc:xacml:3.0:attribute-category:resource" AttributeId="TTLDate" DataType="http://www.w3.org/2001/XMLSchema#string" MustBePresent="false"/>
</Match>
@@ -78,7 +78,7 @@
<AttributeAssignmentExpression AttributeId="VersionNumber" Category="urn:oasis:names:tc:xacml:3.0:attribute-category:resource" Issuer="">
<AttributeValue DataType="http://www.w3.org/2001/XMLSchema#string">1</AttributeValue>
</AttributeAssignmentExpression>
- <AttributeAssignmentExpression AttributeId="matching:ECOMPName" Category="urn:oasis:names:tc:xacml:3.0:attribute-category:resource" Issuer="">
+ <AttributeAssignmentExpression AttributeId="matching:ONAPName" Category="urn:oasis:names:tc:xacml:3.0:attribute-category:resource" Issuer="">
<AttributeValue DataType="http://www.w3.org/2001/XMLSchema#string">DCAE</AttributeValue>
</AttributeAssignmentExpression>
<AttributeAssignmentExpression AttributeId="matching:ConfigName" Category="urn:oasis:names:tc:xacml:3.0:attribute-category:resource" Issuer="">
diff --git a/packages/base/src/files/install/servers/console/bin/workspace/admin/repository/com/Config_MS_vLoadBalancer.1.xml b/packages/base/src/files/install/servers/console/bin/workspace/admin/repository/com/Config_MS_vLoadBalancer.1.xml
index bb183c5a0..d48bf9e22 100644
--- a/packages/base/src/files/install/servers/console/bin/workspace/admin/repository/com/Config_MS_vLoadBalancer.1.xml
+++ b/packages/base/src/files/install/servers/console/bin/workspace/admin/repository/com/Config_MS_vLoadBalancer.1.xml
@@ -4,45 +4,45 @@
<Target>
<AnyOf>
<AllOf>
- <Match MatchId="org.openecomp.function.regex-match">
+ <Match MatchId="org.onap.function.regex-match">
<AttributeValue DataType="http://www.w3.org/2001/XMLSchema#string">com.Config_MS_vLoadBalancer.1.xml</AttributeValue>
<AttributeDesignator Category="urn:oasis:names:tc:xacml:1.0:subject-category:access-subject" AttributeId="PolicyName" DataType="http://www.w3.org/2001/XMLSchema#string" MustBePresent="false"/>
</Match>
</AllOf>
<AllOf>
- <Match MatchId="org.openecomp.function.regex-match">
+ <Match MatchId="org.onap.function.regex-match">
<AttributeValue DataType="http://www.w3.org/2001/XMLSchema#string">DCAE</AttributeValue>
- <AttributeDesignator Category="urn:oasis:names:tc:xacml:1.0:subject-category:access-subject" AttributeId="ECOMPName" DataType="http://www.w3.org/2001/XMLSchema#string" MustBePresent="false"/>
+ <AttributeDesignator Category="urn:oasis:names:tc:xacml:1.0:subject-category:access-subject" AttributeId="ONAPName" DataType="http://www.w3.org/2001/XMLSchema#string" MustBePresent="false"/>
</Match>
- <Match MatchId="org.openecomp.function.regex-match">
+ <Match MatchId="org.onap.function.regex-match">
<AttributeValue DataType="http://www.w3.org/2001/XMLSchema#string">SampleConfigName</AttributeValue>
<AttributeDesignator Category="urn:oasis:names:tc:xacml:1.0:subject-category:access-subject" AttributeId="ConfigName" DataType="http://www.w3.org/2001/XMLSchema#string" MustBePresent="false"/>
</Match>
- <Match MatchId="org.openecomp.function.regex-match">
+ <Match MatchId="org.onap.function.regex-match">
<AttributeValue DataType="http://www.w3.org/2001/XMLSchema#string">TcaMetrics-v1.0.0.5</AttributeValue>
<AttributeDesignator Category="urn:oasis:names:tc:xacml:3.0:attribute-category:resource" AttributeId="service" DataType="http://www.w3.org/2001/XMLSchema#string" MustBePresent="false"/>
</Match>
- <Match MatchId="org.openecomp.function.regex-match">
+ <Match MatchId="org.onap.function.regex-match">
<AttributeValue DataType="http://www.w3.org/2001/XMLSchema#string">/services/cdap-tca-hi-lo/instances/demo/configuration/metricsPerFunctionalRole/vLoadBalancer</AttributeValue>
<AttributeDesignator Category="urn:oasis:names:tc:xacml:3.0:attribute-category:resource" AttributeId="uuid" DataType="http://www.w3.org/2001/XMLSchema#string" MustBePresent="false"/>
</Match>
- <Match MatchId="org.openecomp.function.regex-match">
+ <Match MatchId="org.onap.function.regex-match">
<AttributeValue DataType="http://www.w3.org/2001/XMLSchema#string">SampleServiceLocation</AttributeValue>
<AttributeDesignator Category="urn:oasis:names:tc:xacml:3.0:attribute-category:resource" AttributeId="location" DataType="http://www.w3.org/2001/XMLSchema#string" MustBePresent="false"/>
</Match>
- <Match MatchId="org.openecomp.function.regex-match">
+ <Match MatchId="org.onap.function.regex-match">
<AttributeValue DataType="http://www.w3.org/2001/XMLSchema#string">SampleRiskType</AttributeValue>
<AttributeDesignator Category="urn:oasis:names:tc:xacml:3.0:attribute-category:resource" AttributeId="RiskType" DataType="http://www.w3.org/2001/XMLSchema#string" MustBePresent="false"/>
</Match>
- <Match MatchId="org.openecomp.function.regex-match">
+ <Match MatchId="org.onap.function.regex-match">
<AttributeValue DataType="http://www.w3.org/2001/XMLSchema#string">1</AttributeValue>
<AttributeDesignator Category="urn:oasis:names:tc:xacml:3.0:attribute-category:resource" AttributeId="RiskLevel" DataType="http://www.w3.org/2001/XMLSchema#string" MustBePresent="false"/>
</Match>
- <Match MatchId="org.openecomp.function.regex-match">
+ <Match MatchId="org.onap.function.regex-match">
<AttributeValue DataType="http://www.w3.org/2001/XMLSchema#string">False</AttributeValue>
<AttributeDesignator Category="urn:oasis:names:tc:xacml:3.0:attribute-category:resource" AttributeId="guard" DataType="http://www.w3.org/2001/XMLSchema#string" MustBePresent="false"/>
</Match>
- <Match MatchId="org.openecomp.function.regex-match">
+ <Match MatchId="org.onap.function.regex-match">
<AttributeValue DataType="http://www.w3.org/2001/XMLSchema#string">NA</AttributeValue>
<AttributeDesignator Category="urn:oasis:names:tc:xacml:3.0:attribute-category:resource" AttributeId="TTLDate" DataType="http://www.w3.org/2001/XMLSchema#string" MustBePresent="false"/>
</Match>
@@ -78,7 +78,7 @@
<AttributeAssignmentExpression AttributeId="VersionNumber" Category="urn:oasis:names:tc:xacml:3.0:attribute-category:resource" Issuer="">
<AttributeValue DataType="http://www.w3.org/2001/XMLSchema#string">1</AttributeValue>
</AttributeAssignmentExpression>
- <AttributeAssignmentExpression AttributeId="matching:ECOMPName" Category="urn:oasis:names:tc:xacml:3.0:attribute-category:resource" Issuer="">
+ <AttributeAssignmentExpression AttributeId="matching:ONAPName" Category="urn:oasis:names:tc:xacml:3.0:attribute-category:resource" Issuer="">
<AttributeValue DataType="http://www.w3.org/2001/XMLSchema#string">DCAE</AttributeValue>
</AttributeAssignmentExpression>
<AttributeAssignmentExpression AttributeId="matching:ConfigName" Category="urn:oasis:names:tc:xacml:3.0:attribute-category:resource" Issuer="">
diff --git a/packages/base/src/files/install/servers/console/bin/xacml.admin.properties b/packages/base/src/files/install/servers/console/bin/xacml.admin.properties
index 7c2d1d270..755d0f28b 100644
--- a/packages/base/src/files/install/servers/console/bin/xacml.admin.properties
+++ b/packages/base/src/files/install/servers/console/bin/xacml.admin.properties
@@ -1,6 +1,6 @@
###
# ============LICENSE_START=======================================================
-# ECOMP Policy Engine
+# ONAP Policy Engine
# ================================================================================
# Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
# ================================================================================
@@ -39,12 +39,12 @@ xacml.pipFinderFactory=com.att.research.xacml.std.pip.StdPIPFinderFactory
#
xacml.att.evaluationContextFactory=com.att.research.xacmlatt.pdp.std.StdEvaluationContextFactory
xacml.att.combiningAlgorithmFactory=com.att.research.xacmlatt.pdp.std.StdCombiningAlgorithmFactory
-xacml.att.functionDefinitionFactory=org.openecomp.policy.xacml.custom.EcompFunctionDefinitionFactory
+xacml.att.functionDefinitionFactory=org.onap.policy.xacml.custom.OnapFunctionDefinitionFactory
xacml.att.policyFinderFactory=com.att.research.xacmlatt.pdp.std.StdPolicyFinderFactory
#
# Policy Adapter Implementation class
#
-policyAdapter.impl.className = org.openecomp.policy.admin.PolicyAdapter
+policyAdapter.impl.className = org.onap.policy.admin.PolicyAdapter
#
# This is an extremely simple policy to demonstrate authorization
@@ -56,12 +56,12 @@ admin.file=${{ADMIN_FILE}}
#
# PAP Servlet properties
#
-xacml.PAP.papEngineFactory=org.openecomp.policy.xacml.std.pap.StdEngineFactory
+xacml.PAP.papEngineFactory=org.onap.policy.xacml.std.pap.StdEngineFactory
#
# Admin Console properties
#
-xacml.AC.papEngineFactory=org.openecomp.policy.xacml.admin.util.RESTfulPAPFactory
+xacml.AC.papEngineFactory=org.onap.policy.xacml.admin.util.RESTfulPAPFactory
# Set your domain here:
@@ -185,8 +185,8 @@ xacml.att.automatic.push = ${{automatic_push}}
#Dashboard Tab Limit
-xacml.ecomp.dashboard.logTableLimit = 5000
-xacml.ecomp.dashboard.systemAlertTableLimit = 2000
+xacml.onap.dashboard.logTableLimit = 5000
+xacml.onap.dashboard.systemAlertTableLimit = 2000
#Diff of policies for Firewall feature
FW_GETURL=${{FW_GETURL}}
@@ -195,16 +195,16 @@ FW_PROXY=${{FW_PROXY}}
FW_PORT=${{FW_PORT}}
#SMTP Server Details for Java Mail
-ecomp.smtp.host = ${{ecomp_smtp_host}}
-ecomp.smtp.port = ${{ecomp_smtp_port}}
-ecomp.smtp.userName = ${{ecomp_smtp_userName}}
-ecomp.smtp.password = ${{ecomp_smtp_password}}
-ecomp.smtp.emailExtension=${{ecomp_smtp_emailExtension}}
-ecomp.application.name = ${{ecomp_application_name}}
+onap.smtp.host = ${{onap_smtp_host}}
+onap.smtp.port = ${{onap_smtp_port}}
+onap.smtp.userName = ${{onap_smtp_userName}}
+onap.smtp.password = ${{onap_smtp_password}}
+onap.smtp.emailExtension=${{onap_smtp_emailExtension}}
+onap.application.name = ${{onap_application_name}}
#Dialect for Database
-ecomp.dialect = org.hibernate.dialect.MySQLDialect
+onap.dialect = org.hibernate.dialect.MySQLDialect
#Micro Service Model Properties
-xacml.policy.msEcompName=${{policy_msEcompName}}
+xacml.policy.msOnapName=${{policy_msOnapName}}
xacml.policy.msPolicyName=${{policy_msPolicyName}} \ No newline at end of file
diff --git a/packages/base/src/files/install/servers/console/conf/server.xml b/packages/base/src/files/install/servers/console/conf/server.xml
index f45c5646c..53d563bba 100644
--- a/packages/base/src/files/install/servers/console/conf/server.xml
+++ b/packages/base/src/files/install/servers/console/conf/server.xml
@@ -1,7 +1,7 @@
<?xml version='1.0' encoding='utf-8'?>
<!--
============LICENSE_START=======================================================
- ECOMP Policy Engine
+ ONAP Policy Engine
================================================================================
Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
================================================================================
@@ -106,7 +106,7 @@
documentation
-->
- <!-- ECOMP portal currently using http instead of https
+ <!-- ONAP portal currently using http instead of https
<Connector port="${{SSL_HTTP_CONNECTOR_PORT}}" protocol="org.apache.coyote.http11.Http11NioProtocol"
maxThreads="150" SSLEnabled="true" scheme="https" secure="true"
clientAuth="false" sslEnabledProtocols="TLSv1, TLSv1.1, TLSv1.2"
diff --git a/packages/base/src/files/install/servers/ecomp/WEB-INF/classes/portal.properties b/packages/base/src/files/install/servers/onap/WEB-INF/classes/portal.properties
index 7b12df4c1..e7332be87 100644
--- a/packages/base/src/files/install/servers/ecomp/WEB-INF/classes/portal.properties
+++ b/packages/base/src/files/install/servers/onap/WEB-INF/classes/portal.properties
@@ -1,6 +1,6 @@
###
# ============LICENSE_START=======================================================
-# ECOMP Policy Engine
+# ONAP Policy Engine
# ================================================================================
# Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
# ================================================================================
@@ -18,7 +18,7 @@
# ============LICENSE_END=========================================================
###
-# Properties read by ECOMP Framework library, ecompFW.jar
+# Properties read by ONAP Framework library, onapFW.jar
##########################################################################
# The following properties should NOT be changed by partner applications.
@@ -41,14 +41,14 @@ use_rest_for_functional_menu=true
##########################################################################
# Name of java class that implements the OnBoardingApiService interface.
-portal.api.impl.class = org.openecomp.portalapp.service.OnBoardingApiServiceImpl
+portal.api.impl.class = org.onap.portalapp.service.OnBoardingApiServiceImpl
# CSP Global Log On for single sign on
-ecomp_redirect_url = ${{ECOMP_REDIRECT_URL}}
+onap_redirect_url = ${{ONAP_REDIRECT_URL}}
-# URL of the ECOMP Portal REST API
-# ecomp.homer.com is a development machine
-ecomp_rest_url = ${{ECOMP_REST_URL}}
+# URL of the ONAP Portal REST API
+# onap.homer.com is a development machine
+onap_rest_url = ${{ONAP_REST_URL}}
# Applications do not need to run a UEB listener in 1610.
ueb_listeners_enable = false
@@ -58,14 +58,14 @@ ueb_listeners_enable = false
# In release 1610, if key ueb_listeners_enable is set to false,
# then only the ueb_app_key is required.
# UEB servers
-ueb_url_list = ${{ECOMP_UEB_URL_LIST}}
-# ECOMP Portal listens on this UEB topic
-ecomp_portal_inbox_name = ${{ECOMP_PORTAL_INBOX_NAME}}
+ueb_url_list = ${{ONAP_UEB_URL_LIST}}
+# ONAP Portal listens on this UEB topic
+onap_portal_inbox_name = ${{ONAP_PORTAL_INBOX_NAME}}
# Replace these 3 default values with the ones for your specific App,
-# as shown on the on-boarding page on the ECOMP Portal web application.
-ueb_app_key = ${{ECOMP_UEB_APP_KEY}}
-ueb_app_secret = ${{ECOMP_UEB_APP_SECRET}}
-ueb_app_mailbox_name = ${{ECOMP_UEB_APP_MAILBOX_NAME}}
+# as shown on the on-boarding page on the ONAP Portal web application.
+ueb_app_key = ${{ONAP_UEB_APP_KEY}}
+ueb_app_secret = ${{ONAP_UEB_APP_SECRET}}
+ueb_app_mailbox_name = ${{ONAP_UEB_APP_MAILBOX_NAME}}
# Consumer group name for UEB topic.
# Use the special tag '{UUID}' to generate a unique one for each sdk-app server.
ueb_app_consumer_group_name = {UUID}
diff --git a/packages/base/src/files/install/servers/ecomp/WEB-INF/conf/system.properties b/packages/base/src/files/install/servers/onap/WEB-INF/conf/system.properties
index 4ae54c1d2..484a61768 100644
--- a/packages/base/src/files/install/servers/ecomp/WEB-INF/conf/system.properties
+++ b/packages/base/src/files/install/servers/onap/WEB-INF/conf/system.properties
@@ -1,6 +1,6 @@
###
# ============LICENSE_START=======================================================
-# ECOMP Policy Engine
+# ONAP Policy Engine
# ================================================================================
# Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
# ================================================================================
@@ -18,7 +18,7 @@
# ============LICENSE_END=========================================================
###
-# Properties read by ECOMP Core library, ecompSDK-core.jar
+# Properties read by ONAP Core library, onapSDK-core.jar
##########################################################################
# The following properties should NOT be changed by partner applications.
@@ -64,8 +64,8 @@ mylogins_feed_cron = 0 0/60 * * * ?;
#sessiontimeout_feed_cron = 0 * * * * ? *
my_login_feed_output_dir = /tmp/MyLogins
-# ECOMP Portal Shared Context REST API URL
-ecomp_shared_context_rest_url= ${{ECOMP_SHARED_CONTEXT_REST_URL}}
+# ONAP Portal Shared Context REST API URL
+onap_shared_context_rest_url= ${{ONAP_SHARED_CONTEXT_REST_URL}}
# Link shown in Help menu
contact_us_link =
@@ -73,7 +73,7 @@ contact_us_link =
# An Unique 128-bit value defined to identify a specific version
# of an application deployed on a specific virtual machine.
# This value must be generated and updated by the application
-# which is using the ECOMP SDK at the time of its deployment.
+# which is using the ONAP SDK at the time of its deployment.
# Online Unique UUID generator - https://www.uuidgenerator.net/
instance_uuid=8da691c9-987d-43ed-a358-00ac2f35685d
diff --git a/packages/base/src/files/install/servers/pap/bin/autopush.properties b/packages/base/src/files/install/servers/pap/bin/autopush.properties
index 8d780842f..134ff5dab 100644
--- a/packages/base/src/files/install/servers/pap/bin/autopush.properties
+++ b/packages/base/src/files/install/servers/pap/bin/autopush.properties
@@ -1,6 +1,6 @@
###
# ============LICENSE_START=======================================================
-# ECOMP Policy Engine
+# ONAP Policy Engine
# ================================================================================
# Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
# ================================================================================
diff --git a/packages/base/src/files/install/servers/pap/bin/config/policyLogger.properties b/packages/base/src/files/install/servers/pap/bin/config/policyLogger.properties
index 0deb1b3d6..bbb0ecf4e 100644
--- a/packages/base/src/files/install/servers/pap/bin/config/policyLogger.properties
+++ b/packages/base/src/files/install/servers/pap/bin/config/policyLogger.properties
@@ -1,6 +1,6 @@
###
# ============LICENSE_START=======================================================
-# ECOMP Policy Engine
+# ONAP Policy Engine
# ================================================================================
# Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
# ================================================================================
diff --git a/packages/base/src/files/install/servers/pap/bin/pdps/default/com.Config_BRMS_Param_BRMSParamvFWDemoPolicy.1.xml b/packages/base/src/files/install/servers/pap/bin/pdps/default/com.Config_BRMS_Param_BRMSParamvFWDemoPolicy.1.xml
index 33c0c4a8d..e27f163b6 100644
--- a/packages/base/src/files/install/servers/pap/bin/pdps/default/com.Config_BRMS_Param_BRMSParamvFWDemoPolicy.1.xml
+++ b/packages/base/src/files/install/servers/pap/bin/pdps/default/com.Config_BRMS_Param_BRMSParamvFWDemoPolicy.1.xml
@@ -4,33 +4,33 @@
<Target>
<AnyOf>
<AllOf>
- <Match MatchId="org.openecomp.function.regex-match">
+ <Match MatchId="org.onap.function.regex-match">
<AttributeValue DataType="http://www.w3.org/2001/XMLSchema#string">com.Config_BRMS_Param_BRMSParamvFWDemoPolicy.1.xml</AttributeValue>
<AttributeDesignator Category="urn:oasis:names:tc:xacml:1.0:subject-category:access-subject" AttributeId="PolicyName" DataType="http://www.w3.org/2001/XMLSchema#string" MustBePresent="false"/>
</Match>
</AllOf>
<AllOf>
- <Match MatchId="org.openecomp.function.regex-match">
+ <Match MatchId="org.onap.function.regex-match">
<AttributeValue DataType="http://www.w3.org/2001/XMLSchema#string">DROOLS</AttributeValue>
- <AttributeDesignator Category="urn:oasis:names:tc:xacml:1.0:subject-category:access-subject" AttributeId="ECOMPName" DataType="http://www.w3.org/2001/XMLSchema#string" MustBePresent="false"/>
+ <AttributeDesignator Category="urn:oasis:names:tc:xacml:1.0:subject-category:access-subject" AttributeId="ONAPName" DataType="http://www.w3.org/2001/XMLSchema#string" MustBePresent="false"/>
</Match>
- <Match MatchId="org.openecomp.function.regex-match">
+ <Match MatchId="org.onap.function.regex-match">
<AttributeValue DataType="http://www.w3.org/2001/XMLSchema#string">BRMS_PARAM_RULE</AttributeValue>
<AttributeDesignator Category="urn:oasis:names:tc:xacml:1.0:subject-category:access-subject" AttributeId="ConfigName" DataType="http://www.w3.org/2001/XMLSchema#string" MustBePresent="false"/>
</Match>
- <Match MatchId="org.openecomp.function.regex-match">
+ <Match MatchId="org.onap.function.regex-match">
<AttributeValue DataType="http://www.w3.org/2001/XMLSchema#string">SampleRiskType</AttributeValue>
<AttributeDesignator Category="urn:oasis:names:tc:xacml:3.0:attribute-category:resource" AttributeId="RiskType" DataType="http://www.w3.org/2001/XMLSchema#string" MustBePresent="false"/>
</Match>
- <Match MatchId="org.openecomp.function.regex-match">
+ <Match MatchId="org.onap.function.regex-match">
<AttributeValue DataType="http://www.w3.org/2001/XMLSchema#string">1</AttributeValue>
<AttributeDesignator Category="urn:oasis:names:tc:xacml:3.0:attribute-category:resource" AttributeId="RiskLevel" DataType="http://www.w3.org/2001/XMLSchema#string" MustBePresent="false"/>
</Match>
- <Match MatchId="org.openecomp.function.regex-match">
+ <Match MatchId="org.onap.function.regex-match">
<AttributeValue DataType="http://www.w3.org/2001/XMLSchema#string">False</AttributeValue>
<AttributeDesignator Category="urn:oasis:names:tc:xacml:3.0:attribute-category:resource" AttributeId="guard" DataType="http://www.w3.org/2001/XMLSchema#string" MustBePresent="false"/>
</Match>
- <Match MatchId="org.openecomp.function.regex-match">
+ <Match MatchId="org.onap.function.regex-match">
<AttributeValue DataType="http://www.w3.org/2001/XMLSchema#string">NA</AttributeValue>
<AttributeDesignator Category="urn:oasis:names:tc:xacml:3.0:attribute-category:resource" AttributeId="TTLDate" DataType="http://www.w3.org/2001/XMLSchema#string" MustBePresent="false"/>
</Match>
@@ -66,7 +66,7 @@
<AttributeAssignmentExpression AttributeId="VersionNumber" Category="urn:oasis:names:tc:xacml:3.0:attribute-category:resource" Issuer="">
<AttributeValue DataType="http://www.w3.org/2001/XMLSchema#string">1</AttributeValue>
</AttributeAssignmentExpression>
- <AttributeAssignmentExpression AttributeId="matching:ECOMPName" Category="urn:oasis:names:tc:xacml:3.0:attribute-category:resource" Issuer="">
+ <AttributeAssignmentExpression AttributeId="matching:ONAPName" Category="urn:oasis:names:tc:xacml:3.0:attribute-category:resource" Issuer="">
<AttributeValue DataType="http://www.w3.org/2001/XMLSchema#string">DROOLS</AttributeValue>
</AttributeAssignmentExpression>
<AttributeAssignmentExpression AttributeId="matching:ConfigName" Category="urn:oasis:names:tc:xacml:3.0:attribute-category:resource" Issuer="">
diff --git a/packages/base/src/files/install/servers/pap/bin/pdps/default/com.Config_BRMS_Param_BRMSParamvLBDemoPolicy.1.xml b/packages/base/src/files/install/servers/pap/bin/pdps/default/com.Config_BRMS_Param_BRMSParamvLBDemoPolicy.1.xml
index 290146240..54bcbaaf0 100644
--- a/packages/base/src/files/install/servers/pap/bin/pdps/default/com.Config_BRMS_Param_BRMSParamvLBDemoPolicy.1.xml
+++ b/packages/base/src/files/install/servers/pap/bin/pdps/default/com.Config_BRMS_Param_BRMSParamvLBDemoPolicy.1.xml
@@ -4,33 +4,33 @@
<Target>
<AnyOf>
<AllOf>
- <Match MatchId="org.openecomp.function.regex-match">
+ <Match MatchId="org.onap.function.regex-match">
<AttributeValue DataType="http://www.w3.org/2001/XMLSchema#string">com.Config_BRMS_Param_BRMSParamvLBDemoPolicy.1.xml</AttributeValue>
<AttributeDesignator Category="urn:oasis:names:tc:xacml:1.0:subject-category:access-subject" AttributeId="PolicyName" DataType="http://www.w3.org/2001/XMLSchema#string" MustBePresent="false"/>
</Match>
</AllOf>
<AllOf>
- <Match MatchId="org.openecomp.function.regex-match">
+ <Match MatchId="org.onap.function.regex-match">
<AttributeValue DataType="http://www.w3.org/2001/XMLSchema#string">DROOLS</AttributeValue>
- <AttributeDesignator Category="urn:oasis:names:tc:xacml:1.0:subject-category:access-subject" AttributeId="ECOMPName" DataType="http://www.w3.org/2001/XMLSchema#string" MustBePresent="false"/>
+ <AttributeDesignator Category="urn:oasis:names:tc:xacml:1.0:subject-category:access-subject" AttributeId="ONAPName" DataType="http://www.w3.org/2001/XMLSchema#string" MustBePresent="false"/>
</Match>
- <Match MatchId="org.openecomp.function.regex-match">
+ <Match MatchId="org.onap.function.regex-match">
<AttributeValue DataType="http://www.w3.org/2001/XMLSchema#string">BRMS_PARAM_RULE</AttributeValue>
<AttributeDesignator Category="urn:oasis:names:tc:xacml:1.0:subject-category:access-subject" AttributeId="ConfigName" DataType="http://www.w3.org/2001/XMLSchema#string" MustBePresent="false"/>
</Match>
- <Match MatchId="org.openecomp.function.regex-match">
+ <Match MatchId="org.onap.function.regex-match">
<AttributeValue DataType="http://www.w3.org/2001/XMLSchema#string">SampleRiskType</AttributeValue>
<AttributeDesignator Category="urn:oasis:names:tc:xacml:3.0:attribute-category:resource" AttributeId="RiskType" DataType="http://www.w3.org/2001/XMLSchema#string" MustBePresent="false"/>
</Match>
- <Match MatchId="org.openecomp.function.regex-match">
+ <Match MatchId="org.onap.function.regex-match">
<AttributeValue DataType="http://www.w3.org/2001/XMLSchema#string">1</AttributeValue>
<AttributeDesignator Category="urn:oasis:names:tc:xacml:3.0:attribute-category:resource" AttributeId="RiskLevel" DataType="http://www.w3.org/2001/XMLSchema#string" MustBePresent="false"/>
</Match>
- <Match MatchId="org.openecomp.function.regex-match">
+ <Match MatchId="org.onap.function.regex-match">
<AttributeValue DataType="http://www.w3.org/2001/XMLSchema#string">False</AttributeValue>
<AttributeDesignator Category="urn:oasis:names:tc:xacml:3.0:attribute-category:resource" AttributeId="guard" DataType="http://www.w3.org/2001/XMLSchema#string" MustBePresent="false"/>
</Match>
- <Match MatchId="org.openecomp.function.regex-match">
+ <Match MatchId="org.onap.function.regex-match">
<AttributeValue DataType="http://www.w3.org/2001/XMLSchema#string">NA</AttributeValue>
<AttributeDesignator Category="urn:oasis:names:tc:xacml:3.0:attribute-category:resource" AttributeId="TTLDate" DataType="http://www.w3.org/2001/XMLSchema#string" MustBePresent="false"/>
</Match>
@@ -66,7 +66,7 @@
<AttributeAssignmentExpression AttributeId="VersionNumber" Category="urn:oasis:names:tc:xacml:3.0:attribute-category:resource" Issuer="">
<AttributeValue DataType="http://www.w3.org/2001/XMLSchema#string">1</AttributeValue>
</AttributeAssignmentExpression>
- <AttributeAssignmentExpression AttributeId="matching:ECOMPName" Category="urn:oasis:names:tc:xacml:3.0:attribute-category:resource" Issuer="">
+ <AttributeAssignmentExpression AttributeId="matching:ONAPName" Category="urn:oasis:names:tc:xacml:3.0:attribute-category:resource" Issuer="">
<AttributeValue DataType="http://www.w3.org/2001/XMLSchema#string">DROOLS</AttributeValue>
</AttributeAssignmentExpression>
<AttributeAssignmentExpression AttributeId="matching:ConfigName" Category="urn:oasis:names:tc:xacml:3.0:attribute-category:resource" Issuer="">
diff --git a/packages/base/src/files/install/servers/pap/bin/pdps/default/com.Config_MS_vFirewall.1.xml b/packages/base/src/files/install/servers/pap/bin/pdps/default/com.Config_MS_vFirewall.1.xml
index a18b59f41..ca01be5a7 100644
--- a/packages/base/src/files/install/servers/pap/bin/pdps/default/com.Config_MS_vFirewall.1.xml
+++ b/packages/base/src/files/install/servers/pap/bin/pdps/default/com.Config_MS_vFirewall.1.xml
@@ -4,45 +4,45 @@
<Target>
<AnyOf>
<AllOf>
- <Match MatchId="org.openecomp.function.regex-match">
+ <Match MatchId="org.onap.function.regex-match">
<AttributeValue DataType="http://www.w3.org/2001/XMLSchema#string">com.Config_MS_vFirewall.1.xml</AttributeValue>
<AttributeDesignator Category="urn:oasis:names:tc:xacml:1.0:subject-category:access-subject" AttributeId="PolicyName" DataType="http://www.w3.org/2001/XMLSchema#string" MustBePresent="false"/>
</Match>
</AllOf>
<AllOf>
- <Match MatchId="org.openecomp.function.regex-match">
+ <Match MatchId="org.onap.function.regex-match">
<AttributeValue DataType="http://www.w3.org/2001/XMLSchema#string">DCAE</AttributeValue>
- <AttributeDesignator Category="urn:oasis:names:tc:xacml:1.0:subject-category:access-subject" AttributeId="ECOMPName" DataType="http://www.w3.org/2001/XMLSchema#string" MustBePresent="false"/>
+ <AttributeDesignator Category="urn:oasis:names:tc:xacml:1.0:subject-category:access-subject" AttributeId="ONAPName" DataType="http://www.w3.org/2001/XMLSchema#string" MustBePresent="false"/>
</Match>
- <Match MatchId="org.openecomp.function.regex-match">
+ <Match MatchId="org.onap.function.regex-match">
<AttributeValue DataType="http://www.w3.org/2001/XMLSchema#string">SampleConfigName</AttributeValue>
<AttributeDesignator Category="urn:oasis:names:tc:xacml:1.0:subject-category:access-subject" AttributeId="ConfigName" DataType="http://www.w3.org/2001/XMLSchema#string" MustBePresent="false"/>
</Match>
- <Match MatchId="org.openecomp.function.regex-match">
+ <Match MatchId="org.onap.function.regex-match">
<AttributeValue DataType="http://www.w3.org/2001/XMLSchema#string">TcaMetrics-v1.0.0.5</AttributeValue>
<AttributeDesignator Category="urn:oasis:names:tc:xacml:3.0:attribute-category:resource" AttributeId="service" DataType="http://www.w3.org/2001/XMLSchema#string" MustBePresent="false"/>
</Match>
- <Match MatchId="org.openecomp.function.regex-match">
+ <Match MatchId="org.onap.function.regex-match">
<AttributeValue DataType="http://www.w3.org/2001/XMLSchema#string">/services/cdap-tca-hi-lo/instances/demo/configuration/metricsPerFunctionalRole/vFirewall</AttributeValue>
<AttributeDesignator Category="urn:oasis:names:tc:xacml:3.0:attribute-category:resource" AttributeId="uuid" DataType="http://www.w3.org/2001/XMLSchema#string" MustBePresent="false"/>
</Match>
- <Match MatchId="org.openecomp.function.regex-match">
+ <Match MatchId="org.onap.function.regex-match">
<AttributeValue DataType="http://www.w3.org/2001/XMLSchema#string">SampleServiceLocation</AttributeValue>
<AttributeDesignator Category="urn:oasis:names:tc:xacml:3.0:attribute-category:resource" AttributeId="location" DataType="http://www.w3.org/2001/XMLSchema#string" MustBePresent="false"/>
</Match>
- <Match MatchId="org.openecomp.function.regex-match">
+ <Match MatchId="org.onap.function.regex-match">
<AttributeValue DataType="http://www.w3.org/2001/XMLSchema#string">SampleRiskType</AttributeValue>
<AttributeDesignator Category="urn:oasis:names:tc:xacml:3.0:attribute-category:resource" AttributeId="RiskType" DataType="http://www.w3.org/2001/XMLSchema#string" MustBePresent="false"/>
</Match>
- <Match MatchId="org.openecomp.function.regex-match">
+ <Match MatchId="org.onap.function.regex-match">
<AttributeValue DataType="http://www.w3.org/2001/XMLSchema#string">1</AttributeValue>
<AttributeDesignator Category="urn:oasis:names:tc:xacml:3.0:attribute-category:resource" AttributeId="RiskLevel" DataType="http://www.w3.org/2001/XMLSchema#string" MustBePresent="false"/>
</Match>
- <Match MatchId="org.openecomp.function.regex-match">
+ <Match MatchId="org.onap.function.regex-match">
<AttributeValue DataType="http://www.w3.org/2001/XMLSchema#string">False</AttributeValue>
<AttributeDesignator Category="urn:oasis:names:tc:xacml:3.0:attribute-category:resource" AttributeId="guard" DataType="http://www.w3.org/2001/XMLSchema#string" MustBePresent="false"/>
</Match>
- <Match MatchId="org.openecomp.function.regex-match">
+ <Match MatchId="org.onap.function.regex-match">
<AttributeValue DataType="http://www.w3.org/2001/XMLSchema#string">NA</AttributeValue>
<AttributeDesignator Category="urn:oasis:names:tc:xacml:3.0:attribute-category:resource" AttributeId="TTLDate" DataType="http://www.w3.org/2001/XMLSchema#string" MustBePresent="false"/>
</Match>
@@ -78,7 +78,7 @@
<AttributeAssignmentExpression AttributeId="VersionNumber" Category="urn:oasis:names:tc:xacml:3.0:attribute-category:resource" Issuer="">
<AttributeValue DataType="http://www.w3.org/2001/XMLSchema#string">1</AttributeValue>
</AttributeAssignmentExpression>
- <AttributeAssignmentExpression AttributeId="matching:ECOMPName" Category="urn:oasis:names:tc:xacml:3.0:attribute-category:resource" Issuer="">
+ <AttributeAssignmentExpression AttributeId="matching:ONAPName" Category="urn:oasis:names:tc:xacml:3.0:attribute-category:resource" Issuer="">
<AttributeValue DataType="http://www.w3.org/2001/XMLSchema#string">DCAE</AttributeValue>
</AttributeAssignmentExpression>
<AttributeAssignmentExpression AttributeId="matching:ConfigName" Category="urn:oasis:names:tc:xacml:3.0:attribute-category:resource" Issuer="">
diff --git a/packages/base/src/files/install/servers/pap/bin/pdps/default/com.Config_MS_vLoadBalancer.1.xml b/packages/base/src/files/install/servers/pap/bin/pdps/default/com.Config_MS_vLoadBalancer.1.xml
index 03ae3e806..663f4f3c5 100644
--- a/packages/base/src/files/install/servers/pap/bin/pdps/default/com.Config_MS_vLoadBalancer.1.xml
+++ b/packages/base/src/files/install/servers/pap/bin/pdps/default/com.Config_MS_vLoadBalancer.1.xml
@@ -4,45 +4,45 @@
<Target>
<AnyOf>
<AllOf>
- <Match MatchId="org.openecomp.function.regex-match">
+ <Match MatchId="org.onap.function.regex-match">
<AttributeValue DataType="http://www.w3.org/2001/XMLSchema#string">com.Config_MS_vLoadBalancer.1.xml</AttributeValue>
<AttributeDesignator Category="urn:oasis:names:tc:xacml:1.0:subject-category:access-subject" AttributeId="PolicyName" DataType="http://www.w3.org/2001/XMLSchema#string" MustBePresent="false"/>
</Match>
</AllOf>
<AllOf>
- <Match MatchId="org.openecomp.function.regex-match">
+ <Match MatchId="org.onap.function.regex-match">
<AttributeValue DataType="http://www.w3.org/2001/XMLSchema#string">DCAE</AttributeValue>
- <AttributeDesignator Category="urn:oasis:names:tc:xacml:1.0:subject-category:access-subject" AttributeId="ECOMPName" DataType="http://www.w3.org/2001/XMLSchema#string" MustBePresent="false"/>
+ <AttributeDesignator Category="urn:oasis:names:tc:xacml:1.0:subject-category:access-subject" AttributeId="ONAPName" DataType="http://www.w3.org/2001/XMLSchema#string" MustBePresent="false"/>
</Match>
- <Match MatchId="org.openecomp.function.regex-match">
+ <Match MatchId="org.onap.function.regex-match">
<AttributeValue DataType="http://www.w3.org/2001/XMLSchema#string">SampleConfigName</AttributeValue>
<AttributeDesignator Category="urn:oasis:names:tc:xacml:1.0:subject-category:access-subject" AttributeId="ConfigName" DataType="http://www.w3.org/2001/XMLSchema#string" MustBePresent="false"/>
</Match>
- <Match MatchId="org.openecomp.function.regex-match">
+ <Match MatchId="org.onap.function.regex-match">
<AttributeValue DataType="http://www.w3.org/2001/XMLSchema#string">TcaMetrics-v1.0.0.5</AttributeValue>
<AttributeDesignator Category="urn:oasis:names:tc:xacml:3.0:attribute-category:resource" AttributeId="service" DataType="http://www.w3.org/2001/XMLSchema#string" MustBePresent="false"/>
</Match>
- <Match MatchId="org.openecomp.function.regex-match">
+ <Match MatchId="org.onap.function.regex-match">
<AttributeValue DataType="http://www.w3.org/2001/XMLSchema#string">/services/cdap-tca-hi-lo/instances/demo/configuration/metricsPerFunctionalRole/vLoadBalancer</AttributeValue>
<AttributeDesignator Category="urn:oasis:names:tc:xacml:3.0:attribute-category:resource" AttributeId="uuid" DataType="http://www.w3.org/2001/XMLSchema#string" MustBePresent="false"/>
</Match>
- <Match MatchId="org.openecomp.function.regex-match">
+ <Match MatchId="org.onap.function.regex-match">
<AttributeValue DataType="http://www.w3.org/2001/XMLSchema#string">SampleServiceLocation</AttributeValue>
<AttributeDesignator Category="urn:oasis:names:tc:xacml:3.0:attribute-category:resource" AttributeId="location" DataType="http://www.w3.org/2001/XMLSchema#string" MustBePresent="false"/>
</Match>
- <Match MatchId="org.openecomp.function.regex-match">
+ <Match MatchId="org.onap.function.regex-match">
<AttributeValue DataType="http://www.w3.org/2001/XMLSchema#string">SampleRiskType</AttributeValue>
<AttributeDesignator Category="urn:oasis:names:tc:xacml:3.0:attribute-category:resource" AttributeId="RiskType" DataType="http://www.w3.org/2001/XMLSchema#string" MustBePresent="false"/>
</Match>
- <Match MatchId="org.openecomp.function.regex-match">
+ <Match MatchId="org.onap.function.regex-match">
<AttributeValue DataType="http://www.w3.org/2001/XMLSchema#string">1</AttributeValue>
<AttributeDesignator Category="urn:oasis:names:tc:xacml:3.0:attribute-category:resource" AttributeId="RiskLevel" DataType="http://www.w3.org/2001/XMLSchema#string" MustBePresent="false"/>
</Match>
- <Match MatchId="org.openecomp.function.regex-match">
+ <Match MatchId="org.onap.function.regex-match">
<AttributeValue DataType="http://www.w3.org/2001/XMLSchema#string">False</AttributeValue>
<AttributeDesignator Category="urn:oasis:names:tc:xacml:3.0:attribute-category:resource" AttributeId="guard" DataType="http://www.w3.org/2001/XMLSchema#string" MustBePresent="false"/>
</Match>
- <Match MatchId="org.openecomp.function.regex-match">
+ <Match MatchId="org.onap.function.regex-match">
<AttributeValue DataType="http://www.w3.org/2001/XMLSchema#string">NA</AttributeValue>
<AttributeDesignator Category="urn:oasis:names:tc:xacml:3.0:attribute-category:resource" AttributeId="TTLDate" DataType="http://www.w3.org/2001/XMLSchema#string" MustBePresent="false"/>
</Match>
@@ -78,7 +78,7 @@
<AttributeAssignmentExpression AttributeId="VersionNumber" Category="urn:oasis:names:tc:xacml:3.0:attribute-category:resource" Issuer="">
<AttributeValue DataType="http://www.w3.org/2001/XMLSchema#string">1</AttributeValue>
</AttributeAssignmentExpression>
- <AttributeAssignmentExpression AttributeId="matching:ECOMPName" Category="urn:oasis:names:tc:xacml:3.0:attribute-category:resource" Issuer="">
+ <AttributeAssignmentExpression AttributeId="matching:ONAPName" Category="urn:oasis:names:tc:xacml:3.0:attribute-category:resource" Issuer="">
<AttributeValue DataType="http://www.w3.org/2001/XMLSchema#string">DCAE</AttributeValue>
</AttributeAssignmentExpression>
<AttributeAssignmentExpression AttributeId="matching:ConfigName" Category="urn:oasis:names:tc:xacml:3.0:attribute-category:resource" Issuer="">
diff --git a/packages/base/src/files/install/servers/pap/bin/pdps/default/xacml.pip.properties b/packages/base/src/files/install/servers/pap/bin/pdps/default/xacml.pip.properties
index 4dba1f554..846848f28 100644
--- a/packages/base/src/files/install/servers/pap/bin/pdps/default/xacml.pip.properties
+++ b/packages/base/src/files/install/servers/pap/bin/pdps/default/xacml.pip.properties
@@ -1,6 +1,6 @@
#
#Tue Feb 07 10:35:08 EST 2017
AAF.description=AAFEngine to communicate with AAF to take decisions
-AAF.classname=org.openecomp.policy.xacml.std.pip.engines.aaf.AAFEngine
+AAF.classname=org.onap.policy.xacml.std.pip.engines.aaf.AAFEngine
AAF.name=AAFEngine
xacml.pip.engines=AAF \ No newline at end of file
diff --git a/packages/base/src/files/install/servers/pap/bin/pip.properties b/packages/base/src/files/install/servers/pap/bin/pip.properties
index d9df903e4..b5d46af57 100644
--- a/packages/base/src/files/install/servers/pap/bin/pip.properties
+++ b/packages/base/src/files/install/servers/pap/bin/pip.properties
@@ -5,11 +5,11 @@ xacml.pip.engines=AAF,historydb
### AAF PIP Configuration.
AAF.description=AAFEngine to communicate with AAF to take decisions
-AAF.classname=org.openecomp.policy.xacml.std.pip.engines.aaf.AAFEngine
+AAF.classname=org.onap.policy.xacml.std.pip.engines.aaf.AAFEngine
AAF.name=AAFEngine
# PIP Engine Definition
#
-historydb.classname=org.openecomp.policy.xacml.std.pip.engines.OperationHistoryEngine
+historydb.classname=org.onap.policy.xacml.std.pip.engines.OperationHistoryEngine
historydb.issuer=org:onap:xacml:guard:historydb
historydb.name=operationHistoryDB \ No newline at end of file
diff --git a/packages/base/src/files/install/servers/pap/bin/policyelk.properties b/packages/base/src/files/install/servers/pap/bin/policyelk.properties
index 88fa7d7d0..4071e99dd 100644
--- a/packages/base/src/files/install/servers/pap/bin/policyelk.properties
+++ b/packages/base/src/files/install/servers/pap/bin/policyelk.properties
@@ -1,6 +1,6 @@
###
# ============LICENSE_START=======================================================
-# ECOMP Policy Engine
+# ONAP Policy Engine
# ================================================================================
# Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
# ================================================================================
diff --git a/packages/base/src/files/install/servers/pap/bin/test.properties b/packages/base/src/files/install/servers/pap/bin/test.properties
index e983c3b7c..993c7e8ec 100644
--- a/packages/base/src/files/install/servers/pap/bin/test.properties
+++ b/packages/base/src/files/install/servers/pap/bin/test.properties
@@ -1,6 +1,6 @@
###
# ============LICENSE_START=======================================================
-# ECOMP Policy Engine
+# ONAP Policy Engine
# ================================================================================
# Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
# ================================================================================
diff --git a/packages/base/src/files/install/servers/pap/bin/xacml.pap.properties b/packages/base/src/files/install/servers/pap/bin/xacml.pap.properties
index 3e30bde80..5646cf4b0 100644
--- a/packages/base/src/files/install/servers/pap/bin/xacml.pap.properties
+++ b/packages/base/src/files/install/servers/pap/bin/xacml.pap.properties
@@ -1,6 +1,6 @@
###
# ============LICENSE_START=======================================================
-# ECOMP Policy Engine
+# ONAP Policy Engine
# ================================================================================
# Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
# ================================================================================
@@ -21,11 +21,11 @@
#
# This is our factory that will create our engine
#
-xacml.PAP.papEngineFactory=org.openecomp.policy.xacml.std.pap.StdEngineFactory
-dictionary.impl.className=org.openecomp.policy.pap.xacml.rest.handler.DictionaryHandlerImpl
-savePolicy.impl.className=org.openecomp.policy.pap.xacml.rest.handler.SavePolicyHandler
-pushPolicy.impl.className=org.openecomp.policy.pap.xacml.rest.handler.PushPolicyHandler
-deletePolicy.impl.className=org.openecomp.policy.pap.xacml.rest.handler.DeleteHandler
+xacml.PAP.papEngineFactory=org.onap.policy.xacml.std.pap.StdEngineFactory
+dictionary.impl.className=org.onap.policy.pap.xacml.rest.handler.DictionaryHandlerImpl
+savePolicy.impl.className=org.onap.policy.pap.xacml.rest.handler.SavePolicyHandler
+pushPolicy.impl.className=org.onap.policy.pap.xacml.rest.handler.PushPolicyHandler
+deletePolicy.impl.className=org.onap.policy.pap.xacml.rest.handler.DeleteHandler
#
# Where we store our PAP PDP Group/Node information
#
@@ -137,5 +137,5 @@ integrity_audit_period_seconds=${{integrity_audit_period_seconds}}
ENVIRONMENT=${{ENVIRONMENT}}
#Micro Service Model Properties
-xacml.policy.msEcompName=${{policy_msEcompName}}
+xacml.policy.msOnapName=${{policy_msOnapName}}
xacml.policy.msPolicyName=${{policy_msPolicyName}} \ No newline at end of file
diff --git a/packages/base/src/files/install/servers/pap/webapps/Config/com.Config_BRMS_Param_BRMSParamvFWDemoPolicy.1.txt b/packages/base/src/files/install/servers/pap/webapps/Config/com.Config_BRMS_Param_BRMSParamvFWDemoPolicy.1.txt
index c731b3f77..6ff244ea4 100755
--- a/packages/base/src/files/install/servers/pap/webapps/Config/com.Config_BRMS_Param_BRMSParamvFWDemoPolicy.1.txt
+++ b/packages/base/src/files/install/servers/pap/webapps/Config/com.Config_BRMS_Param_BRMSParamvFWDemoPolicy.1.txt
@@ -83,7 +83,7 @@ import org.onap.policy.mso.MSORelatedInstanceListElement;
import org.onap.policy.mso.MSORelatedInstance;
import org.onap.policy.mso.MSOResponse;
-import org.openecomp.policy.drools.system.PolicyEngine;
+import org.onap.policy.drools.system.PolicyEngine;
//
// These parameters are required to build the runtime policy
@@ -106,7 +106,7 @@ end
/*
*
* Called once and only once to insert the parameters into working memory for this Closed Loop policy.
-* (Comment SETUP rule out for the first ECOMP opensource release since policy BRMS_GW already puts a Params fact in there)
+* (Comment SETUP rule out for the first ONAP opensource release since policy BRMS_GW already puts a Params fact in there)
*
*
*rule "BRMSParamvFWDemoPolicy.SETUP"
diff --git a/packages/base/src/files/install/servers/pap/webapps/Config/com.Config_BRMS_Param_BRMSParamvLBDemoPolicy.1.txt b/packages/base/src/files/install/servers/pap/webapps/Config/com.Config_BRMS_Param_BRMSParamvLBDemoPolicy.1.txt
index 77408a227..f9accdd96 100755
--- a/packages/base/src/files/install/servers/pap/webapps/Config/com.Config_BRMS_Param_BRMSParamvLBDemoPolicy.1.txt
+++ b/packages/base/src/files/install/servers/pap/webapps/Config/com.Config_BRMS_Param_BRMSParamvLBDemoPolicy.1.txt
@@ -83,7 +83,7 @@ import org.onap.policy.mso.MSORelatedInstanceListElement;
import org.onap.policy.mso.MSORelatedInstance;
import org.onap.policy.mso.MSOResponse;
-import org.openecomp.policy.drools.system.PolicyEngine;
+import org.onap.policy.drools.system.PolicyEngine;
//
// These parameters are required to build the runtime policy
@@ -106,7 +106,7 @@ end
/*
*
* Called once and only once to insert the parameters into working memory for this Closed Loop policy.
-* (Comment SETUP rule out for the first ECOMP opensource release since policy BRMS_GW already puts a Params fact in there)
+* (Comment SETUP rule out for the first ONAP opensource release since policy BRMS_GW already puts a Params fact in there)
*
*
*rule "BRMSParamvLBDemoPolicy.SETUP"
@@ -119,7 +119,7 @@ end
* params.setAaiURL("https://aai.api.simpledemo.openecomp.org:8443");
* params.setAaiUsername("POLICY");
* params.setAaiPassword("POLICY");
-* params.setMsoURL("http://vm1.mso.simpledemo.openecomp.org:8080/ecomp/mso/infra");
+* params.setMsoURL("http://vm1.mso.simpledemo.openecomp.org:8080/onap/mso/infra");
* params.setMsoUsername("InfraPortalClient");
* params.setMsoPassword("password1$");
* params.setAaiNamedQueryUUID("f199cb88-5e69-4b1f-93e0-6f257877d066");
@@ -1135,7 +1135,7 @@ rule "com.Config_BRMS_Param_BRMSParamvLBDemoPolicy.Params"
params.setMsoPassword("password1$");
params.setClosedLoopControlName("CL-DNS-LOW-TRAFFIC-SIG-d925ed73-8231-4d02-9545-db4e101f88f8");
params.setAaiUsername("POLICY");
- params.setMsoURL("http://vm1.mso.simpledemo.openecomp.org:8080/ecomp/mso/infra");
+ params.setMsoURL("http://vm1.mso.simpledemo.openecomp.org:8080/onap/mso/infra");
params.setActor("MSO");
params.setMsoUsername("InfraPortalClient");
params.setAaiNamedQueryUUID("f199cb88-5e69-4b1f-93e0-6f257877d066");
diff --git a/packages/base/src/files/install/servers/paplp/bin/config/policyLogger.properties b/packages/base/src/files/install/servers/paplp/bin/config/policyLogger.properties
index 0deb1b3d6..bbb0ecf4e 100644
--- a/packages/base/src/files/install/servers/paplp/bin/config/policyLogger.properties
+++ b/packages/base/src/files/install/servers/paplp/bin/config/policyLogger.properties
@@ -1,6 +1,6 @@
###
# ============LICENSE_START=======================================================
-# ECOMP Policy Engine
+# ONAP Policy Engine
# ================================================================================
# Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
# ================================================================================
diff --git a/packages/base/src/files/install/servers/paplp/bin/parserlog.properties b/packages/base/src/files/install/servers/paplp/bin/parserlog.properties
index 8dbd70e9b..e9189f9c7 100644
--- a/packages/base/src/files/install/servers/paplp/bin/parserlog.properties
+++ b/packages/base/src/files/install/servers/paplp/bin/parserlog.properties
@@ -1,6 +1,6 @@
###
# ============LICENSE_START=======================================================
-# ECOMP Policy Engine
+# ONAP Policy Engine
# ================================================================================
# Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
# ================================================================================
diff --git a/packages/base/src/files/install/servers/pdp/bin/client.properties b/packages/base/src/files/install/servers/pdp/bin/client.properties
index 97156b66e..4a39cf1c0 100644
--- a/packages/base/src/files/install/servers/pdp/bin/client.properties
+++ b/packages/base/src/files/install/servers/pdp/bin/client.properties
@@ -1,6 +1,6 @@
###
# ============LICENSE_START=======================================================
-# ECOMP Policy Engine
+# ONAP Policy Engine
# ================================================================================
# Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
# ================================================================================
diff --git a/packages/base/src/files/install/servers/pdp/bin/config/policyLogger.properties b/packages/base/src/files/install/servers/pdp/bin/config/policyLogger.properties
index 0deb1b3d6..bbb0ecf4e 100644
--- a/packages/base/src/files/install/servers/pdp/bin/config/policyLogger.properties
+++ b/packages/base/src/files/install/servers/pdp/bin/config/policyLogger.properties
@@ -1,6 +1,6 @@
###
# ============LICENSE_START=======================================================
-# ECOMP Policy Engine
+# ONAP Policy Engine
# ================================================================================
# Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
# ================================================================================
diff --git a/packages/base/src/files/install/servers/pdp/bin/xacml.pdp.properties b/packages/base/src/files/install/servers/pdp/bin/xacml.pdp.properties
index 765396339..ac7a5bb7e 100644
--- a/packages/base/src/files/install/servers/pdp/bin/xacml.pdp.properties
+++ b/packages/base/src/files/install/servers/pdp/bin/xacml.pdp.properties
@@ -1,6 +1,6 @@
###
# ============LICENSE_START=======================================================
-# ECOMP Policy Engine
+# ONAP Policy Engine
# ================================================================================
# Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
# ================================================================================
@@ -32,17 +32,17 @@ xacml.traceEngineFactory=com.att.research.xacml.std.trace.LoggingTraceEngineFact
#
xacml.att.evaluationContextFactory=com.att.research.xacmlatt.pdp.std.StdEvaluationContextFactory
xacml.att.combiningAlgorithmFactory=com.att.research.xacmlatt.pdp.std.StdCombiningAlgorithmFactory
-xacml.att.functionDefinitionFactory=org.openecomp.policy.xacml.custom.EcompFunctionDefinitionFactory
+xacml.att.functionDefinitionFactory=org.onap.policy.xacml.custom.OnapFunctionDefinitionFactory
# NOT USED SEE BELOW xacml.att.policyFinderFactory=com.att.research.xacmlatt.pdp.std.StdPolicyFinderFactory
# creteUpdate Policy Implementation Class details.
-createUpdatePolicy.impl.className=org.openecomp.policy.pdp.rest.api.services.CreateUpdatePolicyServiceImpl
+createUpdatePolicy.impl.className=org.onap.policy.pdp.rest.api.services.CreateUpdatePolicyServiceImpl
# AAF Implementation class details
-aafClient.impl.className=org.openecomp.policy.utils.AAFPolicyClientImpl
+aafClient.impl.className=org.onap.policy.utils.AAFPolicyClientImpl
#
# AT&T RESTful PDP Implementation Factories
#
-xacml.pipFinderFactory=org.openecomp.policy.pdp.rest.impl.XACMLPdpPIPFinderFactory
-xacml.att.policyFinderFactory=org.openecomp.policy.pdp.rest.XACMLPdpPolicyFinderFactory
+xacml.pipFinderFactory=org.onap.policy.pdp.rest.impl.XACMLPdpPIPFinderFactory
+xacml.att.policyFinderFactory=org.onap.policy.pdp.rest.XACMLPdpPolicyFinderFactory
#
# When set to true, this flag tells the StdPolicyFinderFactory to combined all the root policy files into
# into one PolicySet and use the given Policy Algorithm.
diff --git a/packages/base/src/files/install/servers/pdplp/bin/config/policyLogger.properties b/packages/base/src/files/install/servers/pdplp/bin/config/policyLogger.properties
index 0deb1b3d6..bbb0ecf4e 100644
--- a/packages/base/src/files/install/servers/pdplp/bin/config/policyLogger.properties
+++ b/packages/base/src/files/install/servers/pdplp/bin/config/policyLogger.properties
@@ -1,6 +1,6 @@
###
# ============LICENSE_START=======================================================
-# ECOMP Policy Engine
+# ONAP Policy Engine
# ================================================================================
# Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
# ================================================================================
diff --git a/packages/base/src/files/install/servers/pdplp/bin/parserlog.properties b/packages/base/src/files/install/servers/pdplp/bin/parserlog.properties
index 42c3ade32..245af07b6 100755
--- a/packages/base/src/files/install/servers/pdplp/bin/parserlog.properties
+++ b/packages/base/src/files/install/servers/pdplp/bin/parserlog.properties
@@ -1,6 +1,6 @@
###
# ============LICENSE_START=======================================================
-# ECOMP Policy Engine
+# ONAP Policy Engine
# ================================================================================
# Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
# ================================================================================