summaryrefslogtreecommitdiffstats
path: root/packages/base/src/files/install/servers
diff options
context:
space:
mode:
authorPamela Dragosh <pdragosh@research.att.com>2017-03-14 18:15:32 -0400
committerPamela Dragosh <pdragosh@research.att.com>2017-03-14 18:25:19 -0400
commit49898dee144de74a943bf620ffd8d250e6f5f00f (patch)
tree8046bfd7fed7cfede9eea656c04a998e05f4e63d /packages/base/src/files/install/servers
parent3234eb071e48263e4be760115f9aaf5ba2e49d33 (diff)
cherry-pick release-1.0.0 changes
Change-Id: Ibaac4da670cc8c800582aaffbb8a42c60d00e6f9 Signed-off-by: Pamela Dragosh <pdragosh@research.att.com>
Diffstat (limited to 'packages/base/src/files/install/servers')
-rw-r--r--packages/base/src/files/install/servers/brmsgw/config.properties2
-rwxr-xr-x[-rw-r--r--]packages/base/src/files/install/servers/console/bin/workspace/admin/repository/com/Config_BRMS_Param_BRMSParamvFWDemoPolicy.1.xml6
-rwxr-xr-x[-rw-r--r--]packages/base/src/files/install/servers/console/bin/workspace/admin/repository/com/Config_BRMS_Param_BRMSParamvLBDemoPolicy.1.xml6
-rwxr-xr-x[-rw-r--r--]packages/base/src/files/install/servers/pap/webapps/Config/com.Config_BRMS_Param_BRMSParamvFWDemoPolicy.1.txt2
-rwxr-xr-x[-rw-r--r--]packages/base/src/files/install/servers/pap/webapps/Config/com.Config_BRMS_Param_BRMSParamvLBDemoPolicy.1.txt2
5 files changed, 9 insertions, 9 deletions
diff --git a/packages/base/src/files/install/servers/brmsgw/config.properties b/packages/base/src/files/install/servers/brmsgw/config.properties
index f46a27840..96bfa682e 100644
--- a/packages/base/src/files/install/servers/brmsgw/config.properties
+++ b/packages/base/src/files/install/servers/brmsgw/config.properties
@@ -82,6 +82,6 @@ test_via_jmx=${{test_via_jmx}}
ping_interval=30000
-brms.dependency.version=1.0.0-SNAPSHOT
+brms.dependency.version=1.1.0-SNAPSHOT
CLIENT_FILE=client.properties
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 a21ed006f..1e8b6cf48 100644..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
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<Policy xmlns="urn:oasis:names:tc:xacml:3.0:core:schema:wd-17" PolicyId="urn:com:xacml:policy:id:f8ba1b97-fea0-431b-9c5b-8f0fa572b337" Version="1" RuleCombiningAlgId="urn:oasis:names:tc:xacml:3.0:rule-combining-algorithm:permit-overrides">
- <Description>BRMSParamvFWDemoPolicy@CreatedBy:demo@CreatedBy:@ModifiedBy:demo@ModifiedBy:</Description>
+<Policy xmlns="urn:oasis:names:tc:xacml:3.0:core:schema:wd-17" PolicyId="urn:com:xacml:policy:id:256f4712-a965-4817-a851-a71bdeb9fb49" Version="1" RuleCombiningAlgId="urn:oasis:names:tc:xacml:3.0:rule-combining-algorithm:permit-overrides">
+ <Description>BRMSParam vFW Demo Policy@CreatedBy:@CreatedBy:@ModifiedBy:@ModifiedBy:</Description>
<Target>
<AnyOf>
<AllOf>
@@ -37,7 +37,7 @@
</AllOf>
</AnyOf>
</Target>
- <Rule RuleId="urn:com:xacml:rule:id:9a371467-7775-47de-afa7-e1dbcdaf6594" Effect="Permit">
+ <Rule RuleId="urn:com:xacml:rule:id:8cdb88aa-448b-4ed1-bce5-6a037651e73c" Effect="Permit">
<Target>
<AnyOf>
<AllOf>
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 46b968298..86defdf44 100644..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
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<Policy xmlns="urn:oasis:names:tc:xacml:3.0:core:schema:wd-17" PolicyId="urn:com:xacml:policy:id:8b7dd2ad-00d0-4e85-97ce-f915322c9023" Version="1" RuleCombiningAlgId="urn:oasis:names:tc:xacml:3.0:rule-combining-algorithm:permit-overrides">
- <Description>vLB Demo Policy@CreatedBy:demo@CreatedBy:@ModifiedBy:demo@ModifiedBy:</Description>
+<Policy xmlns="urn:oasis:names:tc:xacml:3.0:core:schema:wd-17" PolicyId="urn:com:xacml:policy:id:ace93d23-7a21-450a-87b4-5ff11e01d4b1" Version="1" RuleCombiningAlgId="urn:oasis:names:tc:xacml:3.0:rule-combining-algorithm:permit-overrides">
+ <Description>BRMSParam vLB Demo Policy@CreatedBy:@CreatedBy:@ModifiedBy:@ModifiedBy:</Description>
<Target>
<AnyOf>
<AllOf>
@@ -37,7 +37,7 @@
</AllOf>
</AnyOf>
</Target>
- <Rule RuleId="urn:com:xacml:rule:id:d35c6a55-3fc2-420e-b426-080a680bce62" Effect="Permit">
+ <Rule RuleId="urn:com:xacml:rule:id:9d472f3a-bab1-4bee-8bfc-0ee1b4e11ad6" Effect="Permit">
<Target>
<AnyOf>
<AllOf>
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 102c293e9..25b53d0ca 100644..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
@@ -1051,7 +1051,7 @@ rule "BRMSParamvFWDemoPolicy.MSO.RESPONSE"
//
// The operation can either be succeeded or failed
//
- if($response.request.requestStatus.requestState.equals("Completed")) {
+ if($response.request.requestStatus.requestState.equals("COMPLETE")) {
$operationWrapper.operation.outcome = "SUCCESS";
$manager.setControlLoopResult("SUCCESS");
notification.history.add($operationWrapper.operation);
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 25de49320..e640d007d 100644..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
@@ -1051,7 +1051,7 @@ rule "BRMSParamvLBDemoPolicy.MSO.RESPONSE"
//
// The operation can either be succeeded or failed
//
- if($response.request.requestStatus.requestState.equals("Completed")) {
+ if($response.request.requestStatus.requestState.equals("COMPLETE")) {
$operationWrapper.operation.outcome = "SUCCESS";
$manager.setControlLoopResult("SUCCESS");
notification.history.add($operationWrapper.operation);