You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openaz.apache.org by pd...@apache.org on 2016/03/17 01:56:21 UTC

[02/12] incubator-openaz git commit: Fix configuration and policy files This Closes #2

http://git-wip-us.apache.org/repos/asf/incubator-openaz/blob/a6e96a6f/openaz-xacml-test/src/test/resources/testsets/conformance/xacml3.0-ct-v.0.4/xacml3.0-deprecated/IIC231dPolicy.xml
----------------------------------------------------------------------
diff --git a/openaz-xacml-test/src/test/resources/testsets/conformance/xacml3.0-ct-v.0.4/xacml3.0-deprecated/IIC231dPolicy.xml b/openaz-xacml-test/src/test/resources/testsets/conformance/xacml3.0-ct-v.0.4/xacml3.0-deprecated/IIC231dPolicy.xml
old mode 100755
new mode 100644
index e63d3af..569f328
--- a/openaz-xacml-test/src/test/resources/testsets/conformance/xacml3.0-ct-v.0.4/xacml3.0-deprecated/IIC231dPolicy.xml
+++ b/openaz-xacml-test/src/test/resources/testsets/conformance/xacml3.0-ct-v.0.4/xacml3.0-deprecated/IIC231dPolicy.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!--
   Licensed to the Apache Software Foundation (ASF) under one or more
   contributor license agreements.  See the NOTICE file distributed with
@@ -16,7 +16,6 @@
   limitations under the License.
 -->
 
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <Policy xmlns="urn:oasis:names:tc:xacml:3.0:core:schema:wd-17" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" PolicyId="urn:oasis:names:tc:xacml:2.0:conformance-test:IIC231d:policy" RuleCombiningAlgId="urn:oasis:names:tc:xacml:1.0:rule-combining-algorithm:deny-overrides" Version="1.0" xsi:schemaLocation="urn:oasis:names:tc:xacml:3.0:policy:schema:os access_control-xacml-2.0-policy-schema-os.xsd">
     <Description>
         Policy for Conformance Test IIC231d. Deprecated dayTimeDuration id.

http://git-wip-us.apache.org/repos/asf/incubator-openaz/blob/a6e96a6f/openaz-xacml-test/src/test/resources/testsets/conformance/xacml3.0-ct-v.0.4/xacml3.0-deprecated/IIC232dPolicy.xml
----------------------------------------------------------------------
diff --git a/openaz-xacml-test/src/test/resources/testsets/conformance/xacml3.0-ct-v.0.4/xacml3.0-deprecated/IIC232dPolicy.xml b/openaz-xacml-test/src/test/resources/testsets/conformance/xacml3.0-ct-v.0.4/xacml3.0-deprecated/IIC232dPolicy.xml
old mode 100755
new mode 100644
index 9f44a9d..82acabd
--- a/openaz-xacml-test/src/test/resources/testsets/conformance/xacml3.0-ct-v.0.4/xacml3.0-deprecated/IIC232dPolicy.xml
+++ b/openaz-xacml-test/src/test/resources/testsets/conformance/xacml3.0-ct-v.0.4/xacml3.0-deprecated/IIC232dPolicy.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!--
   Licensed to the Apache Software Foundation (ASF) under one or more
   contributor license agreements.  See the NOTICE file distributed with
@@ -16,7 +16,6 @@
   limitations under the License.
 -->
 
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <Policy xmlns="urn:oasis:names:tc:xacml:3.0:core:schema:wd-17" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" PolicyId="urn:oasis:names:tc:xacml:2.0:conformance-test:IIC232d:policy" RuleCombiningAlgId="urn:oasis:names:tc:xacml:1.0:rule-combining-algorithm:deny-overrides" Version="1.0" xsi:schemaLocation="urn:oasis:names:tc:xacml:3.0:policy:schema:os access_control-xacml-2.0-policy-schema-os.xsd">
     <Description>
         Policy for Conformance Test IIC232d. Deprecated yearMonthDuration id.

http://git-wip-us.apache.org/repos/asf/incubator-openaz/blob/a6e96a6f/openaz-xacml-test/src/test/resources/testsets/conformance/xacml3.0-ct-v.0.4/xacml3.0-deprecated/IIC340dPolicy.xml
----------------------------------------------------------------------
diff --git a/openaz-xacml-test/src/test/resources/testsets/conformance/xacml3.0-ct-v.0.4/xacml3.0-deprecated/IIC340dPolicy.xml b/openaz-xacml-test/src/test/resources/testsets/conformance/xacml3.0-ct-v.0.4/xacml3.0-deprecated/IIC340dPolicy.xml
old mode 100755
new mode 100644
index e481f64..9a67ca0
--- a/openaz-xacml-test/src/test/resources/testsets/conformance/xacml3.0-ct-v.0.4/xacml3.0-deprecated/IIC340dPolicy.xml
+++ b/openaz-xacml-test/src/test/resources/testsets/conformance/xacml3.0-ct-v.0.4/xacml3.0-deprecated/IIC340dPolicy.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!--
   Licensed to the Apache Software Foundation (ASF) under one or more
   contributor license agreements.  See the NOTICE file distributed with
@@ -16,7 +16,6 @@
   limitations under the License.
 -->
 
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <Policy xmlns="urn:oasis:names:tc:xacml:3.0:core:schema:wd-17" 
 		xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
 		PolicyId="urn:oasis:names:tc:xacml:2.0:conformance-test:IIC340d:policy" 

http://git-wip-us.apache.org/repos/asf/incubator-openaz/blob/a6e96a6f/openaz-xacml-test/src/test/resources/testsets/conformance/xacml3.0-ct-v.0.4/xacml3.0-deprecated/IIC341dPolicy.xml
----------------------------------------------------------------------
diff --git a/openaz-xacml-test/src/test/resources/testsets/conformance/xacml3.0-ct-v.0.4/xacml3.0-deprecated/IIC341dPolicy.xml b/openaz-xacml-test/src/test/resources/testsets/conformance/xacml3.0-ct-v.0.4/xacml3.0-deprecated/IIC341dPolicy.xml
old mode 100755
new mode 100644
index 18642c2..9817b6a
--- a/openaz-xacml-test/src/test/resources/testsets/conformance/xacml3.0-ct-v.0.4/xacml3.0-deprecated/IIC341dPolicy.xml
+++ b/openaz-xacml-test/src/test/resources/testsets/conformance/xacml3.0-ct-v.0.4/xacml3.0-deprecated/IIC341dPolicy.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!--
   Licensed to the Apache Software Foundation (ASF) under one or more
   contributor license agreements.  See the NOTICE file distributed with
@@ -16,7 +16,6 @@
   limitations under the License.
 -->
 
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <Policy xmlns="urn:oasis:names:tc:xacml:3.0:core:schema:wd-17" 
 		xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
 		PolicyId="urn:oasis:names:tc:xacml:2.0:conformance-test:IIC341d:policy" 

http://git-wip-us.apache.org/repos/asf/incubator-openaz/blob/a6e96a6f/openaz-xacml-test/src/test/resources/testsets/conformance/xacml3.0-ct-v.0.4/xacml3.0-deprecated/IIC342dPolicy.xml
----------------------------------------------------------------------
diff --git a/openaz-xacml-test/src/test/resources/testsets/conformance/xacml3.0-ct-v.0.4/xacml3.0-deprecated/IIC342dPolicy.xml b/openaz-xacml-test/src/test/resources/testsets/conformance/xacml3.0-ct-v.0.4/xacml3.0-deprecated/IIC342dPolicy.xml
old mode 100755
new mode 100644
index 84209b0..5928d10
--- a/openaz-xacml-test/src/test/resources/testsets/conformance/xacml3.0-ct-v.0.4/xacml3.0-deprecated/IIC342dPolicy.xml
+++ b/openaz-xacml-test/src/test/resources/testsets/conformance/xacml3.0-ct-v.0.4/xacml3.0-deprecated/IIC342dPolicy.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!--
   Licensed to the Apache Software Foundation (ASF) under one or more
   contributor license agreements.  See the NOTICE file distributed with
@@ -16,7 +16,6 @@
   limitations under the License.
 -->
 
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <Policy xmlns="urn:oasis:names:tc:xacml:3.0:core:schema:wd-17" 
 		xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
 		PolicyId="urn:oasis:names:tc:xacml:2.0:conformance-test:IIC342d:policy" 

http://git-wip-us.apache.org/repos/asf/incubator-openaz/blob/a6e96a6f/openaz-xacml-test/src/test/resources/testsets/conformance/xacml3.0-ct-v.0.4/xacml3.0-deprecated/IIC343dPolicy.xml
----------------------------------------------------------------------
diff --git a/openaz-xacml-test/src/test/resources/testsets/conformance/xacml3.0-ct-v.0.4/xacml3.0-deprecated/IIC343dPolicy.xml b/openaz-xacml-test/src/test/resources/testsets/conformance/xacml3.0-ct-v.0.4/xacml3.0-deprecated/IIC343dPolicy.xml
old mode 100755
new mode 100644
index 9991884..db56ae0
--- a/openaz-xacml-test/src/test/resources/testsets/conformance/xacml3.0-ct-v.0.4/xacml3.0-deprecated/IIC343dPolicy.xml
+++ b/openaz-xacml-test/src/test/resources/testsets/conformance/xacml3.0-ct-v.0.4/xacml3.0-deprecated/IIC343dPolicy.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!--
   Licensed to the Apache Software Foundation (ASF) under one or more
   contributor license agreements.  See the NOTICE file distributed with
@@ -16,7 +16,6 @@
   limitations under the License.
 -->
 
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <Policy xmlns="urn:oasis:names:tc:xacml:3.0:core:schema:wd-17" 
 		xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
 		PolicyId="urn:oasis:names:tc:xacml:2.0:conformance-test:IIC343d:policy" 

http://git-wip-us.apache.org/repos/asf/incubator-openaz/blob/a6e96a6f/openaz-xacml-test/src/test/resources/testsets/conformance/xacml3.0-ct-v.0.4/xacml3.0-deprecated/IIC344dPolicy.xml
----------------------------------------------------------------------
diff --git a/openaz-xacml-test/src/test/resources/testsets/conformance/xacml3.0-ct-v.0.4/xacml3.0-deprecated/IIC344dPolicy.xml b/openaz-xacml-test/src/test/resources/testsets/conformance/xacml3.0-ct-v.0.4/xacml3.0-deprecated/IIC344dPolicy.xml
old mode 100755
new mode 100644
index 007185b..0361e0c
--- a/openaz-xacml-test/src/test/resources/testsets/conformance/xacml3.0-ct-v.0.4/xacml3.0-deprecated/IIC344dPolicy.xml
+++ b/openaz-xacml-test/src/test/resources/testsets/conformance/xacml3.0-ct-v.0.4/xacml3.0-deprecated/IIC344dPolicy.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!--
   Licensed to the Apache Software Foundation (ASF) under one or more
   contributor license agreements.  See the NOTICE file distributed with
@@ -16,7 +16,6 @@
   limitations under the License.
 -->
 
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <Policy xmlns="urn:oasis:names:tc:xacml:3.0:core:schema:wd-17" 
 		xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
 		PolicyId="urn:oasis:names:tc:xacml:2.0:conformance-test:IIC344d:policy" 

http://git-wip-us.apache.org/repos/asf/incubator-openaz/blob/a6e96a6f/openaz-xacml-test/src/test/resources/testsets/conformance/xacml3.0-ct-v.0.4/xacml3.0-deprecated/IIC345dPolicy.xml
----------------------------------------------------------------------
diff --git a/openaz-xacml-test/src/test/resources/testsets/conformance/xacml3.0-ct-v.0.4/xacml3.0-deprecated/IIC345dPolicy.xml b/openaz-xacml-test/src/test/resources/testsets/conformance/xacml3.0-ct-v.0.4/xacml3.0-deprecated/IIC345dPolicy.xml
old mode 100755
new mode 100644
index b69da89..da7a8a7
--- a/openaz-xacml-test/src/test/resources/testsets/conformance/xacml3.0-ct-v.0.4/xacml3.0-deprecated/IIC345dPolicy.xml
+++ b/openaz-xacml-test/src/test/resources/testsets/conformance/xacml3.0-ct-v.0.4/xacml3.0-deprecated/IIC345dPolicy.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!--
   Licensed to the Apache Software Foundation (ASF) under one or more
   contributor license agreements.  See the NOTICE file distributed with
@@ -16,7 +16,6 @@
   limitations under the License.
 -->
 
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <Policy xmlns="urn:oasis:names:tc:xacml:3.0:core:schema:wd-17" 
 		xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
 		PolicyId="urn:oasis:names:tc:xacml:2.0:conformance-test:IIC345d:policy" 

http://git-wip-us.apache.org/repos/asf/incubator-openaz/blob/a6e96a6f/openaz-xacml-test/src/test/resources/testsets/conformance/xacml3.0-ct-v.0.4/xacml3.0-deprecated/IIC346dPolicy.xml
----------------------------------------------------------------------
diff --git a/openaz-xacml-test/src/test/resources/testsets/conformance/xacml3.0-ct-v.0.4/xacml3.0-deprecated/IIC346dPolicy.xml b/openaz-xacml-test/src/test/resources/testsets/conformance/xacml3.0-ct-v.0.4/xacml3.0-deprecated/IIC346dPolicy.xml
old mode 100755
new mode 100644
index c694bc7..fbea129
--- a/openaz-xacml-test/src/test/resources/testsets/conformance/xacml3.0-ct-v.0.4/xacml3.0-deprecated/IIC346dPolicy.xml
+++ b/openaz-xacml-test/src/test/resources/testsets/conformance/xacml3.0-ct-v.0.4/xacml3.0-deprecated/IIC346dPolicy.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!--
   Licensed to the Apache Software Foundation (ASF) under one or more
   contributor license agreements.  See the NOTICE file distributed with
@@ -16,7 +16,6 @@
   limitations under the License.
 -->
 
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <Policy xmlns="urn:oasis:names:tc:xacml:3.0:core:schema:wd-17" 
 		xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
 		PolicyId="urn:oasis:names:tc:xacml:2.0:conformance-test:IIC346d:policy" 

http://git-wip-us.apache.org/repos/asf/incubator-openaz/blob/a6e96a6f/openaz-xacml-test/src/test/resources/testsets/conformance/xacml3.0-ct-v.0.4/xacml3.0-deprecated/IIC347dPolicy.xml
----------------------------------------------------------------------
diff --git a/openaz-xacml-test/src/test/resources/testsets/conformance/xacml3.0-ct-v.0.4/xacml3.0-deprecated/IIC347dPolicy.xml b/openaz-xacml-test/src/test/resources/testsets/conformance/xacml3.0-ct-v.0.4/xacml3.0-deprecated/IIC347dPolicy.xml
old mode 100755
new mode 100644
index 16fda76..3735003
--- a/openaz-xacml-test/src/test/resources/testsets/conformance/xacml3.0-ct-v.0.4/xacml3.0-deprecated/IIC347dPolicy.xml
+++ b/openaz-xacml-test/src/test/resources/testsets/conformance/xacml3.0-ct-v.0.4/xacml3.0-deprecated/IIC347dPolicy.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!--
   Licensed to the Apache Software Foundation (ASF) under one or more
   contributor license agreements.  See the NOTICE file distributed with
@@ -16,7 +16,6 @@
   limitations under the License.
 -->
 
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <Policy xmlns="urn:oasis:names:tc:xacml:3.0:core:schema:wd-17" 
 		xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
 		PolicyId="urn:oasis:names:tc:xacml:2.0:conformance-test:IIC347d:policy" 

http://git-wip-us.apache.org/repos/asf/incubator-openaz/blob/a6e96a6f/openaz-xacml-test/src/test/resources/testsets/conformance/xacml3.0-ct-v.0.4/xacml3.0-deprecated/IIC348dPolicy.xml
----------------------------------------------------------------------
diff --git a/openaz-xacml-test/src/test/resources/testsets/conformance/xacml3.0-ct-v.0.4/xacml3.0-deprecated/IIC348dPolicy.xml b/openaz-xacml-test/src/test/resources/testsets/conformance/xacml3.0-ct-v.0.4/xacml3.0-deprecated/IIC348dPolicy.xml
old mode 100755
new mode 100644
index ab03eb8..b481a3b
--- a/openaz-xacml-test/src/test/resources/testsets/conformance/xacml3.0-ct-v.0.4/xacml3.0-deprecated/IIC348dPolicy.xml
+++ b/openaz-xacml-test/src/test/resources/testsets/conformance/xacml3.0-ct-v.0.4/xacml3.0-deprecated/IIC348dPolicy.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!--
   Licensed to the Apache Software Foundation (ASF) under one or more
   contributor license agreements.  See the NOTICE file distributed with
@@ -16,7 +16,6 @@
   limitations under the License.
 -->
 
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <Policy xmlns="urn:oasis:names:tc:xacml:3.0:core:schema:wd-17" 
 		xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
 		PolicyId="urn:oasis:names:tc:xacml:2.0:conformance-test:IIC348d:policy" 

http://git-wip-us.apache.org/repos/asf/incubator-openaz/blob/a6e96a6f/openaz-xacml-test/src/test/resources/testsets/conformance/xacml3.0-ct-v.0.4/xacml3.0-deprecated/IIC349dPolicy.xml
----------------------------------------------------------------------
diff --git a/openaz-xacml-test/src/test/resources/testsets/conformance/xacml3.0-ct-v.0.4/xacml3.0-deprecated/IIC349dPolicy.xml b/openaz-xacml-test/src/test/resources/testsets/conformance/xacml3.0-ct-v.0.4/xacml3.0-deprecated/IIC349dPolicy.xml
old mode 100755
new mode 100644
index fcc92a4..33fbdb0
--- a/openaz-xacml-test/src/test/resources/testsets/conformance/xacml3.0-ct-v.0.4/xacml3.0-deprecated/IIC349dPolicy.xml
+++ b/openaz-xacml-test/src/test/resources/testsets/conformance/xacml3.0-ct-v.0.4/xacml3.0-deprecated/IIC349dPolicy.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!--
   Licensed to the Apache Software Foundation (ASF) under one or more
   contributor license agreements.  See the NOTICE file distributed with
@@ -16,7 +16,6 @@
   limitations under the License.
 -->
 
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <Policy xmlns="urn:oasis:names:tc:xacml:3.0:core:schema:wd-17" 
 		xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
 		PolicyId="urn:oasis:names:tc:xacml:2.0:conformance-test:IIC349d:policy" 

http://git-wip-us.apache.org/repos/asf/incubator-openaz/blob/a6e96a6f/openaz-xacml-test/src/test/resources/testsets/conformance/xacml3.0-ct-v.0.4/xacml3.0-deprecated/IIC500dPolicy.xml
----------------------------------------------------------------------
diff --git a/openaz-xacml-test/src/test/resources/testsets/conformance/xacml3.0-ct-v.0.4/xacml3.0-deprecated/IIC500dPolicy.xml b/openaz-xacml-test/src/test/resources/testsets/conformance/xacml3.0-ct-v.0.4/xacml3.0-deprecated/IIC500dPolicy.xml
old mode 100755
new mode 100644
index f1b1da7..984d9e2
--- a/openaz-xacml-test/src/test/resources/testsets/conformance/xacml3.0-ct-v.0.4/xacml3.0-deprecated/IIC500dPolicy.xml
+++ b/openaz-xacml-test/src/test/resources/testsets/conformance/xacml3.0-ct-v.0.4/xacml3.0-deprecated/IIC500dPolicy.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!--
   Licensed to the Apache Software Foundation (ASF) under one or more
   contributor license agreements.  See the NOTICE file distributed with
@@ -16,7 +16,6 @@
   limitations under the License.
 -->
 
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <Policy xmlns="urn:oasis:names:tc:xacml:3.0:core:schema:wd-17" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" PolicyId="urn:oasis:names:tc:xacml:2.0:conformance-test:IIC006:policy" RuleCombiningAlgId="urn:oasis:names:tc:xacml:1.0:rule-combining-algorithm:deny-overrides" Version="1.0" xsi:schemaLocation="urn:oasis:names:tc:xacml:3.0:policy:schema:os         access_control-xacml-2.0-policy-schema-os.xsd">
     <Description>
         Policy for Conformance Test IIC500d. test deprecated uri-string-concatenate.

http://git-wip-us.apache.org/repos/asf/incubator-openaz/blob/a6e96a6f/openaz-xacml-test/src/test/resources/testsets/conformance/xacml3.0-ct-v.0.4/xacml3.0-deprecated/IID001dPolicy.xml
----------------------------------------------------------------------
diff --git a/openaz-xacml-test/src/test/resources/testsets/conformance/xacml3.0-ct-v.0.4/xacml3.0-deprecated/IID001dPolicy.xml b/openaz-xacml-test/src/test/resources/testsets/conformance/xacml3.0-ct-v.0.4/xacml3.0-deprecated/IID001dPolicy.xml
old mode 100755
new mode 100644
index 6246e5f..a0dec07
--- a/openaz-xacml-test/src/test/resources/testsets/conformance/xacml3.0-ct-v.0.4/xacml3.0-deprecated/IID001dPolicy.xml
+++ b/openaz-xacml-test/src/test/resources/testsets/conformance/xacml3.0-ct-v.0.4/xacml3.0-deprecated/IID001dPolicy.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!--
   Licensed to the Apache Software Foundation (ASF) under one or more
   contributor license agreements.  See the NOTICE file distributed with
@@ -16,7 +16,6 @@
   limitations under the License.
 -->
 
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <Policy xmlns="urn:oasis:names:tc:xacml:3.0:core:schema:wd-17" 
 		xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
 		PolicyId="urn:oasis:names:tc:xacml:2.0:conformance-test:IID001d:policy" 

http://git-wip-us.apache.org/repos/asf/incubator-openaz/blob/a6e96a6f/openaz-xacml-test/src/test/resources/testsets/conformance/xacml3.0-ct-v.0.4/xacml3.0-deprecated/IID002dPolicy.xml
----------------------------------------------------------------------
diff --git a/openaz-xacml-test/src/test/resources/testsets/conformance/xacml3.0-ct-v.0.4/xacml3.0-deprecated/IID002dPolicy.xml b/openaz-xacml-test/src/test/resources/testsets/conformance/xacml3.0-ct-v.0.4/xacml3.0-deprecated/IID002dPolicy.xml
old mode 100755
new mode 100644
index 489dded..d1723a7
--- a/openaz-xacml-test/src/test/resources/testsets/conformance/xacml3.0-ct-v.0.4/xacml3.0-deprecated/IID002dPolicy.xml
+++ b/openaz-xacml-test/src/test/resources/testsets/conformance/xacml3.0-ct-v.0.4/xacml3.0-deprecated/IID002dPolicy.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!--
   Licensed to the Apache Software Foundation (ASF) under one or more
   contributor license agreements.  See the NOTICE file distributed with
@@ -16,7 +16,6 @@
   limitations under the License.
 -->
 
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <Policy xmlns="urn:oasis:names:tc:xacml:3.0:core:schema:wd-17" 
 		xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
 		PolicyId="urn:oasis:names:tc:xacml:2.0:conformance-test:IID002d:policy" 

http://git-wip-us.apache.org/repos/asf/incubator-openaz/blob/a6e96a6f/openaz-xacml-test/src/test/resources/testsets/conformance/xacml3.0-ct-v.0.4/xacml3.0-deprecated/IID003dPolicy.xml
----------------------------------------------------------------------
diff --git a/openaz-xacml-test/src/test/resources/testsets/conformance/xacml3.0-ct-v.0.4/xacml3.0-deprecated/IID003dPolicy.xml b/openaz-xacml-test/src/test/resources/testsets/conformance/xacml3.0-ct-v.0.4/xacml3.0-deprecated/IID003dPolicy.xml
old mode 100755
new mode 100644
index 47dabd3..8f0e6f0
--- a/openaz-xacml-test/src/test/resources/testsets/conformance/xacml3.0-ct-v.0.4/xacml3.0-deprecated/IID003dPolicy.xml
+++ b/openaz-xacml-test/src/test/resources/testsets/conformance/xacml3.0-ct-v.0.4/xacml3.0-deprecated/IID003dPolicy.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!--
   Licensed to the Apache Software Foundation (ASF) under one or more
   contributor license agreements.  See the NOTICE file distributed with
@@ -16,7 +16,6 @@
   limitations under the License.
 -->
 
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <Policy xmlns="urn:oasis:names:tc:xacml:3.0:core:schema:wd-17" 
 		xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
 		PolicyId="urn:oasis:names:tc:xacml:2.0:conformance-test:IID003d:policy" 

http://git-wip-us.apache.org/repos/asf/incubator-openaz/blob/a6e96a6f/openaz-xacml-test/src/test/resources/testsets/conformance/xacml3.0-ct-v.0.4/xacml3.0-deprecated/IID004dPolicy.xml
----------------------------------------------------------------------
diff --git a/openaz-xacml-test/src/test/resources/testsets/conformance/xacml3.0-ct-v.0.4/xacml3.0-deprecated/IID004dPolicy.xml b/openaz-xacml-test/src/test/resources/testsets/conformance/xacml3.0-ct-v.0.4/xacml3.0-deprecated/IID004dPolicy.xml
old mode 100755
new mode 100644
index 2e9cd5c..ed16df7
--- a/openaz-xacml-test/src/test/resources/testsets/conformance/xacml3.0-ct-v.0.4/xacml3.0-deprecated/IID004dPolicy.xml
+++ b/openaz-xacml-test/src/test/resources/testsets/conformance/xacml3.0-ct-v.0.4/xacml3.0-deprecated/IID004dPolicy.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!--
   Licensed to the Apache Software Foundation (ASF) under one or more
   contributor license agreements.  See the NOTICE file distributed with
@@ -16,7 +16,6 @@
   limitations under the License.
 -->
 
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <Policy xmlns="urn:oasis:names:tc:xacml:3.0:core:schema:wd-17" 
 		xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
 		PolicyId="urn:oasis:names:tc:xacml:2.0:conformance-test:IID004d:policy" 

http://git-wip-us.apache.org/repos/asf/incubator-openaz/blob/a6e96a6f/openaz-xacml-test/src/test/resources/testsets/conformance/xacml3.0-ct-v.0.4/xacml3.0-deprecated/IID005dPolicy.xml
----------------------------------------------------------------------
diff --git a/openaz-xacml-test/src/test/resources/testsets/conformance/xacml3.0-ct-v.0.4/xacml3.0-deprecated/IID005dPolicy.xml b/openaz-xacml-test/src/test/resources/testsets/conformance/xacml3.0-ct-v.0.4/xacml3.0-deprecated/IID005dPolicy.xml
old mode 100755
new mode 100644
index b6f8f22..e9c1ce1
--- a/openaz-xacml-test/src/test/resources/testsets/conformance/xacml3.0-ct-v.0.4/xacml3.0-deprecated/IID005dPolicy.xml
+++ b/openaz-xacml-test/src/test/resources/testsets/conformance/xacml3.0-ct-v.0.4/xacml3.0-deprecated/IID005dPolicy.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!--
   Licensed to the Apache Software Foundation (ASF) under one or more
   contributor license agreements.  See the NOTICE file distributed with
@@ -16,7 +16,6 @@
   limitations under the License.
 -->
 
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <PolicySet xmlns="urn:oasis:names:tc:xacml:3.0:core:schema:wd-17" 
 		xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
 		PolicyCombiningAlgId="urn:oasis:names:tc:xacml:1.0:policy-combining-algorithm:deny-overrides" 

http://git-wip-us.apache.org/repos/asf/incubator-openaz/blob/a6e96a6f/openaz-xacml-test/src/test/resources/testsets/conformance/xacml3.0-ct-v.0.4/xacml3.0-deprecated/IID006dPolicy.xml
----------------------------------------------------------------------
diff --git a/openaz-xacml-test/src/test/resources/testsets/conformance/xacml3.0-ct-v.0.4/xacml3.0-deprecated/IID006dPolicy.xml b/openaz-xacml-test/src/test/resources/testsets/conformance/xacml3.0-ct-v.0.4/xacml3.0-deprecated/IID006dPolicy.xml
old mode 100755
new mode 100644
index 9afb7cf..d940888
--- a/openaz-xacml-test/src/test/resources/testsets/conformance/xacml3.0-ct-v.0.4/xacml3.0-deprecated/IID006dPolicy.xml
+++ b/openaz-xacml-test/src/test/resources/testsets/conformance/xacml3.0-ct-v.0.4/xacml3.0-deprecated/IID006dPolicy.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!--
   Licensed to the Apache Software Foundation (ASF) under one or more
   contributor license agreements.  See the NOTICE file distributed with
@@ -16,7 +16,6 @@
   limitations under the License.
 -->
 
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <PolicySet xmlns="urn:oasis:names:tc:xacml:3.0:core:schema:wd-17"
 		xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
 		PolicyCombiningAlgId="urn:oasis:names:tc:xacml:1.0:policy-combining-algorithm:deny-overrides" 

http://git-wip-us.apache.org/repos/asf/incubator-openaz/blob/a6e96a6f/openaz-xacml-test/src/test/resources/testsets/conformance/xacml3.0-ct-v.0.4/xacml3.0-deprecated/IID007dPolicy.xml
----------------------------------------------------------------------
diff --git a/openaz-xacml-test/src/test/resources/testsets/conformance/xacml3.0-ct-v.0.4/xacml3.0-deprecated/IID007dPolicy.xml b/openaz-xacml-test/src/test/resources/testsets/conformance/xacml3.0-ct-v.0.4/xacml3.0-deprecated/IID007dPolicy.xml
old mode 100755
new mode 100644
index e874596..7b3559a
--- a/openaz-xacml-test/src/test/resources/testsets/conformance/xacml3.0-ct-v.0.4/xacml3.0-deprecated/IID007dPolicy.xml
+++ b/openaz-xacml-test/src/test/resources/testsets/conformance/xacml3.0-ct-v.0.4/xacml3.0-deprecated/IID007dPolicy.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!--
   Licensed to the Apache Software Foundation (ASF) under one or more
   contributor license agreements.  See the NOTICE file distributed with
@@ -16,7 +16,6 @@
   limitations under the License.
 -->
 
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <PolicySet xmlns="urn:oasis:names:tc:xacml:3.0:core:schema:wd-17" 
 		xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
 		PolicyCombiningAlgId="urn:oasis:names:tc:xacml:1.0:policy-combining-algorithm:deny-overrides" 

http://git-wip-us.apache.org/repos/asf/incubator-openaz/blob/a6e96a6f/openaz-xacml-test/src/test/resources/testsets/conformance/xacml3.0-ct-v.0.4/xacml3.0-deprecated/IID008dPolicy.xml
----------------------------------------------------------------------
diff --git a/openaz-xacml-test/src/test/resources/testsets/conformance/xacml3.0-ct-v.0.4/xacml3.0-deprecated/IID008dPolicy.xml b/openaz-xacml-test/src/test/resources/testsets/conformance/xacml3.0-ct-v.0.4/xacml3.0-deprecated/IID008dPolicy.xml
old mode 100755
new mode 100644
index 2f43f72..58c3947
--- a/openaz-xacml-test/src/test/resources/testsets/conformance/xacml3.0-ct-v.0.4/xacml3.0-deprecated/IID008dPolicy.xml
+++ b/openaz-xacml-test/src/test/resources/testsets/conformance/xacml3.0-ct-v.0.4/xacml3.0-deprecated/IID008dPolicy.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!--
   Licensed to the Apache Software Foundation (ASF) under one or more
   contributor license agreements.  See the NOTICE file distributed with
@@ -16,7 +16,6 @@
   limitations under the License.
 -->
 
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <PolicySet xmlns="urn:oasis:names:tc:xacml:3.0:core:schema:wd-17" 
 		xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
 		PolicyCombiningAlgId="urn:oasis:names:tc:xacml:1.0:policy-combining-algorithm:deny-overrides" 

http://git-wip-us.apache.org/repos/asf/incubator-openaz/blob/a6e96a6f/openaz-xacml-test/src/test/resources/testsets/conformance/xacml3.0-ct-v.0.4/xacml3.0-deprecated/IID009dPolicy.xml
----------------------------------------------------------------------
diff --git a/openaz-xacml-test/src/test/resources/testsets/conformance/xacml3.0-ct-v.0.4/xacml3.0-deprecated/IID009dPolicy.xml b/openaz-xacml-test/src/test/resources/testsets/conformance/xacml3.0-ct-v.0.4/xacml3.0-deprecated/IID009dPolicy.xml
old mode 100755
new mode 100644
index f860177..0391a37
--- a/openaz-xacml-test/src/test/resources/testsets/conformance/xacml3.0-ct-v.0.4/xacml3.0-deprecated/IID009dPolicy.xml
+++ b/openaz-xacml-test/src/test/resources/testsets/conformance/xacml3.0-ct-v.0.4/xacml3.0-deprecated/IID009dPolicy.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!--
   Licensed to the Apache Software Foundation (ASF) under one or more
   contributor license agreements.  See the NOTICE file distributed with
@@ -16,7 +16,6 @@
   limitations under the License.
 -->
 
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <Policy xmlns="urn:oasis:names:tc:xacml:3.0:core:schema:wd-17" 
 		xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
 		PolicyId="urn:oasis:names:tc:xacml:2.0:conformance-test:IID009d:policy" 

http://git-wip-us.apache.org/repos/asf/incubator-openaz/blob/a6e96a6f/openaz-xacml-test/src/test/resources/testsets/conformance/xacml3.0-ct-v.0.4/xacml3.0-deprecated/IID010dPolicy.xml
----------------------------------------------------------------------
diff --git a/openaz-xacml-test/src/test/resources/testsets/conformance/xacml3.0-ct-v.0.4/xacml3.0-deprecated/IID010dPolicy.xml b/openaz-xacml-test/src/test/resources/testsets/conformance/xacml3.0-ct-v.0.4/xacml3.0-deprecated/IID010dPolicy.xml
old mode 100755
new mode 100644
index f81a428..5a5af31
--- a/openaz-xacml-test/src/test/resources/testsets/conformance/xacml3.0-ct-v.0.4/xacml3.0-deprecated/IID010dPolicy.xml
+++ b/openaz-xacml-test/src/test/resources/testsets/conformance/xacml3.0-ct-v.0.4/xacml3.0-deprecated/IID010dPolicy.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!--
   Licensed to the Apache Software Foundation (ASF) under one or more
   contributor license agreements.  See the NOTICE file distributed with
@@ -16,7 +16,6 @@
   limitations under the License.
 -->
 
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <Policy xmlns="urn:oasis:names:tc:xacml:3.0:core:schema:wd-17" 
 		xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
 		PolicyId="urn:oasis:names:tc:xacml:2.0:conformance-test:IID010d:policy" 

http://git-wip-us.apache.org/repos/asf/incubator-openaz/blob/a6e96a6f/openaz-xacml-test/src/test/resources/testsets/conformance/xacml3.0-ct-v.0.4/xacml3.0-deprecated/IID011dPolicy.xml
----------------------------------------------------------------------
diff --git a/openaz-xacml-test/src/test/resources/testsets/conformance/xacml3.0-ct-v.0.4/xacml3.0-deprecated/IID011dPolicy.xml b/openaz-xacml-test/src/test/resources/testsets/conformance/xacml3.0-ct-v.0.4/xacml3.0-deprecated/IID011dPolicy.xml
old mode 100755
new mode 100644
index 029393f..d595b4c
--- a/openaz-xacml-test/src/test/resources/testsets/conformance/xacml3.0-ct-v.0.4/xacml3.0-deprecated/IID011dPolicy.xml
+++ b/openaz-xacml-test/src/test/resources/testsets/conformance/xacml3.0-ct-v.0.4/xacml3.0-deprecated/IID011dPolicy.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!--
   Licensed to the Apache Software Foundation (ASF) under one or more
   contributor license agreements.  See the NOTICE file distributed with
@@ -16,7 +16,6 @@
   limitations under the License.
 -->
 
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <Policy xmlns="urn:oasis:names:tc:xacml:3.0:core:schema:wd-17" 
 		xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
 		PolicyId="urn:oasis:names:tc:xacml:2.0:conformance-test:IID011d:policy" 

http://git-wip-us.apache.org/repos/asf/incubator-openaz/blob/a6e96a6f/openaz-xacml-test/src/test/resources/testsets/conformance/xacml3.0-ct-v.0.4/xacml3.0-deprecated/IID012dPolicy.xml
----------------------------------------------------------------------
diff --git a/openaz-xacml-test/src/test/resources/testsets/conformance/xacml3.0-ct-v.0.4/xacml3.0-deprecated/IID012dPolicy.xml b/openaz-xacml-test/src/test/resources/testsets/conformance/xacml3.0-ct-v.0.4/xacml3.0-deprecated/IID012dPolicy.xml
old mode 100755
new mode 100644
index ec938f0..81a7c40
--- a/openaz-xacml-test/src/test/resources/testsets/conformance/xacml3.0-ct-v.0.4/xacml3.0-deprecated/IID012dPolicy.xml
+++ b/openaz-xacml-test/src/test/resources/testsets/conformance/xacml3.0-ct-v.0.4/xacml3.0-deprecated/IID012dPolicy.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!--
   Licensed to the Apache Software Foundation (ASF) under one or more
   contributor license agreements.  See the NOTICE file distributed with
@@ -16,7 +16,6 @@
   limitations under the License.
 -->
 
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <Policy xmlns="urn:oasis:names:tc:xacml:3.0:core:schema:wd-17" 
 		xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
 		PolicyId="urn:oasis:names:tc:xacml:2.0:conformance-test:IID012d:policy" 

http://git-wip-us.apache.org/repos/asf/incubator-openaz/blob/a6e96a6f/openaz-xacml-test/src/test/resources/testsets/conformance/xacml3.0-ct-v.0.4/xacml3.0-deprecated/IID013dPolicy.xml
----------------------------------------------------------------------
diff --git a/openaz-xacml-test/src/test/resources/testsets/conformance/xacml3.0-ct-v.0.4/xacml3.0-deprecated/IID013dPolicy.xml b/openaz-xacml-test/src/test/resources/testsets/conformance/xacml3.0-ct-v.0.4/xacml3.0-deprecated/IID013dPolicy.xml
old mode 100755
new mode 100644
index 3633fdd..e26a68b
--- a/openaz-xacml-test/src/test/resources/testsets/conformance/xacml3.0-ct-v.0.4/xacml3.0-deprecated/IID013dPolicy.xml
+++ b/openaz-xacml-test/src/test/resources/testsets/conformance/xacml3.0-ct-v.0.4/xacml3.0-deprecated/IID013dPolicy.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!--
   Licensed to the Apache Software Foundation (ASF) under one or more
   contributor license agreements.  See the NOTICE file distributed with
@@ -16,7 +16,6 @@
   limitations under the License.
 -->
 
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <PolicySet xmlns="urn:oasis:names:tc:xacml:3.0:core:schema:wd-17" 
 		xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
 		PolicyCombiningAlgId="urn:oasis:names:tc:xacml:1.0:policy-combining-algorithm:permit-overrides" 

http://git-wip-us.apache.org/repos/asf/incubator-openaz/blob/a6e96a6f/openaz-xacml-test/src/test/resources/testsets/conformance/xacml3.0-ct-v.0.4/xacml3.0-deprecated/IID014dPolicy.xml
----------------------------------------------------------------------
diff --git a/openaz-xacml-test/src/test/resources/testsets/conformance/xacml3.0-ct-v.0.4/xacml3.0-deprecated/IID014dPolicy.xml b/openaz-xacml-test/src/test/resources/testsets/conformance/xacml3.0-ct-v.0.4/xacml3.0-deprecated/IID014dPolicy.xml
old mode 100755
new mode 100644
index 7b43293..dd8c39b
--- a/openaz-xacml-test/src/test/resources/testsets/conformance/xacml3.0-ct-v.0.4/xacml3.0-deprecated/IID014dPolicy.xml
+++ b/openaz-xacml-test/src/test/resources/testsets/conformance/xacml3.0-ct-v.0.4/xacml3.0-deprecated/IID014dPolicy.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!--
   Licensed to the Apache Software Foundation (ASF) under one or more
   contributor license agreements.  See the NOTICE file distributed with
@@ -16,7 +16,6 @@
   limitations under the License.
 -->
 
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <PolicySet xmlns="urn:oasis:names:tc:xacml:3.0:core:schema:wd-17" 
 		xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
 		PolicyCombiningAlgId="urn:oasis:names:tc:xacml:1.0:policy-combining-algorithm:permit-overrides" 

http://git-wip-us.apache.org/repos/asf/incubator-openaz/blob/a6e96a6f/openaz-xacml-test/src/test/resources/testsets/conformance/xacml3.0-ct-v.0.4/xacml3.0-deprecated/IID015dPolicy.xml
----------------------------------------------------------------------
diff --git a/openaz-xacml-test/src/test/resources/testsets/conformance/xacml3.0-ct-v.0.4/xacml3.0-deprecated/IID015dPolicy.xml b/openaz-xacml-test/src/test/resources/testsets/conformance/xacml3.0-ct-v.0.4/xacml3.0-deprecated/IID015dPolicy.xml
old mode 100755
new mode 100644
index 40356e9..b72a2f5
--- a/openaz-xacml-test/src/test/resources/testsets/conformance/xacml3.0-ct-v.0.4/xacml3.0-deprecated/IID015dPolicy.xml
+++ b/openaz-xacml-test/src/test/resources/testsets/conformance/xacml3.0-ct-v.0.4/xacml3.0-deprecated/IID015dPolicy.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!--
   Licensed to the Apache Software Foundation (ASF) under one or more
   contributor license agreements.  See the NOTICE file distributed with
@@ -16,7 +16,6 @@
   limitations under the License.
 -->
 
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <PolicySet xmlns="urn:oasis:names:tc:xacml:3.0:core:schema:wd-17" 
 		xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
 		PolicyCombiningAlgId="urn:oasis:names:tc:xacml:1.0:policy-combining-algorithm:permit-overrides" 

http://git-wip-us.apache.org/repos/asf/incubator-openaz/blob/a6e96a6f/openaz-xacml-test/src/test/resources/testsets/conformance/xacml3.0-ct-v.0.4/xacml3.0-deprecated/IID016dPolicy.xml
----------------------------------------------------------------------
diff --git a/openaz-xacml-test/src/test/resources/testsets/conformance/xacml3.0-ct-v.0.4/xacml3.0-deprecated/IID016dPolicy.xml b/openaz-xacml-test/src/test/resources/testsets/conformance/xacml3.0-ct-v.0.4/xacml3.0-deprecated/IID016dPolicy.xml
old mode 100755
new mode 100644
index e9e5b87..0bf8d95
--- a/openaz-xacml-test/src/test/resources/testsets/conformance/xacml3.0-ct-v.0.4/xacml3.0-deprecated/IID016dPolicy.xml
+++ b/openaz-xacml-test/src/test/resources/testsets/conformance/xacml3.0-ct-v.0.4/xacml3.0-deprecated/IID016dPolicy.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!--
   Licensed to the Apache Software Foundation (ASF) under one or more
   contributor license agreements.  See the NOTICE file distributed with
@@ -16,7 +16,6 @@
   limitations under the License.
 -->
 
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <PolicySet xmlns="urn:oasis:names:tc:xacml:3.0:core:schema:wd-17" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" PolicyCombiningAlgId="urn:oasis:names:tc:xacml:1.0:policy-combining-algorithm:permit-overrides" PolicySetId="urn:oasis:names:tc:xacml:2.0:conformance-test:IID016:policyset" Version="1.0" xsi:schemaLocation="urn:oasis:names:tc:xacml:3.0:policy:schema:os access_control-xacml-2.0-policy-schema-os.xsd">
     <Description>
         PolicySet for Conformance Test IID016d.  Deprecated Overrides test.

http://git-wip-us.apache.org/repos/asf/incubator-openaz/blob/a6e96a6f/openaz-xacml-test/src/test/resources/testsets/conformance/xacml3.0-ct-v.0.4/xacml3.0-deprecated/IID300dPolicy.xml
----------------------------------------------------------------------
diff --git a/openaz-xacml-test/src/test/resources/testsets/conformance/xacml3.0-ct-v.0.4/xacml3.0-deprecated/IID300dPolicy.xml b/openaz-xacml-test/src/test/resources/testsets/conformance/xacml3.0-ct-v.0.4/xacml3.0-deprecated/IID300dPolicy.xml
old mode 100755
new mode 100644
index 8e9a737..425c83e
--- a/openaz-xacml-test/src/test/resources/testsets/conformance/xacml3.0-ct-v.0.4/xacml3.0-deprecated/IID300dPolicy.xml
+++ b/openaz-xacml-test/src/test/resources/testsets/conformance/xacml3.0-ct-v.0.4/xacml3.0-deprecated/IID300dPolicy.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!--
   Licensed to the Apache Software Foundation (ASF) under one or more
   contributor license agreements.  See the NOTICE file distributed with
@@ -16,7 +16,6 @@
   limitations under the License.
 -->
 
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <PolicySet xmlns="urn:oasis:names:tc:xacml:3.0:core:schema:wd-17" 
 		xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
 		PolicyCombiningAlgId="urn:oasis:names:tc:xacml:1.0:policy-combining-algorithm:permit-overrides" 

http://git-wip-us.apache.org/repos/asf/incubator-openaz/blob/a6e96a6f/openaz-xacml-test/src/test/resources/testsets/conformance/xacml3.0-ct-v.0.4/xacml3.0-deprecated/IID301dPolicy.xml
----------------------------------------------------------------------
diff --git a/openaz-xacml-test/src/test/resources/testsets/conformance/xacml3.0-ct-v.0.4/xacml3.0-deprecated/IID301dPolicy.xml b/openaz-xacml-test/src/test/resources/testsets/conformance/xacml3.0-ct-v.0.4/xacml3.0-deprecated/IID301dPolicy.xml
old mode 100755
new mode 100644
index ed9bb3b..43dae34
--- a/openaz-xacml-test/src/test/resources/testsets/conformance/xacml3.0-ct-v.0.4/xacml3.0-deprecated/IID301dPolicy.xml
+++ b/openaz-xacml-test/src/test/resources/testsets/conformance/xacml3.0-ct-v.0.4/xacml3.0-deprecated/IID301dPolicy.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!--
   Licensed to the Apache Software Foundation (ASF) under one or more
   contributor license agreements.  See the NOTICE file distributed with
@@ -16,7 +16,6 @@
   limitations under the License.
 -->
 
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <Policy xmlns="urn:oasis:names:tc:xacml:3.0:core:schema:wd-17" 
 		xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
 		PolicyId="urn:oasis:names:tc:xacml:2.0:conformance-test:IID301orderedd:policy" 

http://git-wip-us.apache.org/repos/asf/incubator-openaz/blob/a6e96a6f/openaz-xacml-test/src/test/resources/testsets/conformance/xacml3.0-ct-v.0.4/xacml3.0-deprecated/IID302dPolicy.xml
----------------------------------------------------------------------
diff --git a/openaz-xacml-test/src/test/resources/testsets/conformance/xacml3.0-ct-v.0.4/xacml3.0-deprecated/IID302dPolicy.xml b/openaz-xacml-test/src/test/resources/testsets/conformance/xacml3.0-ct-v.0.4/xacml3.0-deprecated/IID302dPolicy.xml
old mode 100755
new mode 100644
index 7942e5c..c77ffe5
--- a/openaz-xacml-test/src/test/resources/testsets/conformance/xacml3.0-ct-v.0.4/xacml3.0-deprecated/IID302dPolicy.xml
+++ b/openaz-xacml-test/src/test/resources/testsets/conformance/xacml3.0-ct-v.0.4/xacml3.0-deprecated/IID302dPolicy.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!--
   Licensed to the Apache Software Foundation (ASF) under one or more
   contributor license agreements.  See the NOTICE file distributed with
@@ -16,7 +16,6 @@
   limitations under the License.
 -->
 
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <Policy xmlns="urn:oasis:names:tc:xacml:3.0:core:schema:wd-17" 
 		xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
 		PolicyId="urn:oasis:names:tc:xacml:2.0:conformance-test:IID302d:policy" 

http://git-wip-us.apache.org/repos/asf/incubator-openaz/blob/a6e96a6f/openaz-xacml-test/src/test/resources/testsets/conformance/xacml3.0-ct-v.0.4/xacml3.0-deprecated/IID304dPolicy.xml
----------------------------------------------------------------------
diff --git a/openaz-xacml-test/src/test/resources/testsets/conformance/xacml3.0-ct-v.0.4/xacml3.0-deprecated/IID304dPolicy.xml b/openaz-xacml-test/src/test/resources/testsets/conformance/xacml3.0-ct-v.0.4/xacml3.0-deprecated/IID304dPolicy.xml
old mode 100755
new mode 100644
index e8f7147..aecb496
--- a/openaz-xacml-test/src/test/resources/testsets/conformance/xacml3.0-ct-v.0.4/xacml3.0-deprecated/IID304dPolicy.xml
+++ b/openaz-xacml-test/src/test/resources/testsets/conformance/xacml3.0-ct-v.0.4/xacml3.0-deprecated/IID304dPolicy.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!--
   Licensed to the Apache Software Foundation (ASF) under one or more
   contributor license agreements.  See the NOTICE file distributed with
@@ -16,7 +16,6 @@
   limitations under the License.
 -->
 
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <Policy xmlns="urn:oasis:names:tc:xacml:3.0:core:schema:wd-17" 
 		xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
 		PolicyId="urn:oasis:names:tc:xacml:2.0:conformance-test:IID304d:policy" 

http://git-wip-us.apache.org/repos/asf/incubator-openaz/blob/a6e96a6f/openaz-xacml-test/src/test/resources/testsets/conformance/xacml3.0-ct-v.0.4/xacml3.0-deprecated/IID305dPolicy.xml
----------------------------------------------------------------------
diff --git a/openaz-xacml-test/src/test/resources/testsets/conformance/xacml3.0-ct-v.0.4/xacml3.0-deprecated/IID305dPolicy.xml b/openaz-xacml-test/src/test/resources/testsets/conformance/xacml3.0-ct-v.0.4/xacml3.0-deprecated/IID305dPolicy.xml
old mode 100755
new mode 100644
index 9d9d015..315e1ef
--- a/openaz-xacml-test/src/test/resources/testsets/conformance/xacml3.0-ct-v.0.4/xacml3.0-deprecated/IID305dPolicy.xml
+++ b/openaz-xacml-test/src/test/resources/testsets/conformance/xacml3.0-ct-v.0.4/xacml3.0-deprecated/IID305dPolicy.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!--
   Licensed to the Apache Software Foundation (ASF) under one or more
   contributor license agreements.  See the NOTICE file distributed with
@@ -16,7 +16,6 @@
   limitations under the License.
 -->
 
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <Policy xmlns="urn:oasis:names:tc:xacml:3.0:core:schema:wd-17" 
 		xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
 		PolicyId="urn:oasis:names:tc:xacml:2.0:conformance-test:IID305d:policy" 

http://git-wip-us.apache.org/repos/asf/incubator-openaz/blob/a6e96a6f/openaz-xacml-test/src/test/resources/testsets/conformance/xacml3.0-ct-v.0.4/xacml3.0-deprecated/IID306dPolicy.xml
----------------------------------------------------------------------
diff --git a/openaz-xacml-test/src/test/resources/testsets/conformance/xacml3.0-ct-v.0.4/xacml3.0-deprecated/IID306dPolicy.xml b/openaz-xacml-test/src/test/resources/testsets/conformance/xacml3.0-ct-v.0.4/xacml3.0-deprecated/IID306dPolicy.xml
old mode 100755
new mode 100644
index 8cb6298..81531ec
--- a/openaz-xacml-test/src/test/resources/testsets/conformance/xacml3.0-ct-v.0.4/xacml3.0-deprecated/IID306dPolicy.xml
+++ b/openaz-xacml-test/src/test/resources/testsets/conformance/xacml3.0-ct-v.0.4/xacml3.0-deprecated/IID306dPolicy.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!--
   Licensed to the Apache Software Foundation (ASF) under one or more
   contributor license agreements.  See the NOTICE file distributed with
@@ -16,7 +16,6 @@
   limitations under the License.
 -->
 
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <PolicySet xmlns="urn:oasis:names:tc:xacml:3.0:core:schema:wd-17" 
 		xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
 		PolicyCombiningAlgId="urn:oasis:names:tc:xacml:1.1:policy-combining-algorithm:ordered-deny-overrides" 

http://git-wip-us.apache.org/repos/asf/incubator-openaz/blob/a6e96a6f/openaz-xacml-test/src/test/resources/testsets/conformance/xacml3.0-ct-v.0.4/xacml3.0-deprecated/IID307dPolicy.xml
----------------------------------------------------------------------
diff --git a/openaz-xacml-test/src/test/resources/testsets/conformance/xacml3.0-ct-v.0.4/xacml3.0-deprecated/IID307dPolicy.xml b/openaz-xacml-test/src/test/resources/testsets/conformance/xacml3.0-ct-v.0.4/xacml3.0-deprecated/IID307dPolicy.xml
old mode 100755
new mode 100644
index 3bec837..c47d49c
--- a/openaz-xacml-test/src/test/resources/testsets/conformance/xacml3.0-ct-v.0.4/xacml3.0-deprecated/IID307dPolicy.xml
+++ b/openaz-xacml-test/src/test/resources/testsets/conformance/xacml3.0-ct-v.0.4/xacml3.0-deprecated/IID307dPolicy.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!--
   Licensed to the Apache Software Foundation (ASF) under one or more
   contributor license agreements.  See the NOTICE file distributed with
@@ -16,7 +16,6 @@
   limitations under the License.
 -->
 
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <PolicySet xmlns="urn:oasis:names:tc:xacml:3.0:core:schema:wd-17" 
 		xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
 		PolicyCombiningAlgId="urn:oasis:names:tc:xacml:3.0:policy-combining-algorithm:ordered-deny-overrides" 

http://git-wip-us.apache.org/repos/asf/incubator-openaz/blob/a6e96a6f/openaz-xacml-test/src/test/resources/testsets/conformance/xacml3.0-ct-v.0.4/xacml3.0-deprecated/IID308dPolicy.xml
----------------------------------------------------------------------
diff --git a/openaz-xacml-test/src/test/resources/testsets/conformance/xacml3.0-ct-v.0.4/xacml3.0-deprecated/IID308dPolicy.xml b/openaz-xacml-test/src/test/resources/testsets/conformance/xacml3.0-ct-v.0.4/xacml3.0-deprecated/IID308dPolicy.xml
old mode 100755
new mode 100644
index 7e06610..66bfef7
--- a/openaz-xacml-test/src/test/resources/testsets/conformance/xacml3.0-ct-v.0.4/xacml3.0-deprecated/IID308dPolicy.xml
+++ b/openaz-xacml-test/src/test/resources/testsets/conformance/xacml3.0-ct-v.0.4/xacml3.0-deprecated/IID308dPolicy.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!--
   Licensed to the Apache Software Foundation (ASF) under one or more
   contributor license agreements.  See the NOTICE file distributed with
@@ -16,7 +16,6 @@
   limitations under the License.
 -->
 
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <PolicySet xmlns="urn:oasis:names:tc:xacml:3.0:core:schema:wd-17" 
 		xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
 		PolicyCombiningAlgId="urn:oasis:names:tc:xacml:1.1:policy-combining-algorithm:ordered-deny-overrides" 

http://git-wip-us.apache.org/repos/asf/incubator-openaz/blob/a6e96a6f/openaz-xacml-test/src/test/resources/testsets/conformance/xacml3.0-ct-v.0.4/xacml3.0-deprecated/IID309dPolicy.xml
----------------------------------------------------------------------
diff --git a/openaz-xacml-test/src/test/resources/testsets/conformance/xacml3.0-ct-v.0.4/xacml3.0-deprecated/IID309dPolicy.xml b/openaz-xacml-test/src/test/resources/testsets/conformance/xacml3.0-ct-v.0.4/xacml3.0-deprecated/IID309dPolicy.xml
old mode 100755
new mode 100644
index f46caa3..15ea4fe
--- a/openaz-xacml-test/src/test/resources/testsets/conformance/xacml3.0-ct-v.0.4/xacml3.0-deprecated/IID309dPolicy.xml
+++ b/openaz-xacml-test/src/test/resources/testsets/conformance/xacml3.0-ct-v.0.4/xacml3.0-deprecated/IID309dPolicy.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!--
   Licensed to the Apache Software Foundation (ASF) under one or more
   contributor license agreements.  See the NOTICE file distributed with
@@ -16,7 +16,6 @@
   limitations under the License.
 -->
 
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <PolicySet xmlns="urn:oasis:names:tc:xacml:3.0:core:schema:wd-17" 
 		xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
 		PolicyCombiningAlgId="urn:oasis:names:tc:xacml:1.1:policy-combining-algorithm:ordered-deny-overrides" 

http://git-wip-us.apache.org/repos/asf/incubator-openaz/blob/a6e96a6f/openaz-xacml-test/src/test/resources/testsets/conformance/xacml3.0-ct-v.0.4/xacml3.0-deprecated/IID310dPolicy.xml
----------------------------------------------------------------------
diff --git a/openaz-xacml-test/src/test/resources/testsets/conformance/xacml3.0-ct-v.0.4/xacml3.0-deprecated/IID310dPolicy.xml b/openaz-xacml-test/src/test/resources/testsets/conformance/xacml3.0-ct-v.0.4/xacml3.0-deprecated/IID310dPolicy.xml
old mode 100755
new mode 100644
index f0307b4..5283c90
--- a/openaz-xacml-test/src/test/resources/testsets/conformance/xacml3.0-ct-v.0.4/xacml3.0-deprecated/IID310dPolicy.xml
+++ b/openaz-xacml-test/src/test/resources/testsets/conformance/xacml3.0-ct-v.0.4/xacml3.0-deprecated/IID310dPolicy.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!--
   Licensed to the Apache Software Foundation (ASF) under one or more
   contributor license agreements.  See the NOTICE file distributed with
@@ -16,7 +16,6 @@
   limitations under the License.
 -->
 
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <PolicySet xmlns="urn:oasis:names:tc:xacml:3.0:core:schema:wd-17" 
 		xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
 		PolicyCombiningAlgId="urn:oasis:names:tc:xacml:1.1:policy-combining-algorithm:ordered-deny-overrides" 

http://git-wip-us.apache.org/repos/asf/incubator-openaz/blob/a6e96a6f/openaz-xacml-test/src/test/resources/testsets/conformance/xacml3.0-ct-v.0.4/xacml3.0-deprecated/IID311dPolicy.xml
----------------------------------------------------------------------
diff --git a/openaz-xacml-test/src/test/resources/testsets/conformance/xacml3.0-ct-v.0.4/xacml3.0-deprecated/IID311dPolicy.xml b/openaz-xacml-test/src/test/resources/testsets/conformance/xacml3.0-ct-v.0.4/xacml3.0-deprecated/IID311dPolicy.xml
old mode 100755
new mode 100644
index 30f5d54..ba0a9c7
--- a/openaz-xacml-test/src/test/resources/testsets/conformance/xacml3.0-ct-v.0.4/xacml3.0-deprecated/IID311dPolicy.xml
+++ b/openaz-xacml-test/src/test/resources/testsets/conformance/xacml3.0-ct-v.0.4/xacml3.0-deprecated/IID311dPolicy.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!--
   Licensed to the Apache Software Foundation (ASF) under one or more
   contributor license agreements.  See the NOTICE file distributed with
@@ -16,7 +16,6 @@
   limitations under the License.
 -->
 
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <Policy xmlns="urn:oasis:names:tc:xacml:3.0:core:schema:wd-17" 
 		xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
 		PolicyId="urn:oasis:names:tc:xacml:2.0:conformance-test:IID311d:policy" 

http://git-wip-us.apache.org/repos/asf/incubator-openaz/blob/a6e96a6f/openaz-xacml-test/src/test/resources/testsets/conformance/xacml3.0-ct-v.0.4/xacml3.0-deprecated/IID313dPolicy.xml
----------------------------------------------------------------------
diff --git a/openaz-xacml-test/src/test/resources/testsets/conformance/xacml3.0-ct-v.0.4/xacml3.0-deprecated/IID313dPolicy.xml b/openaz-xacml-test/src/test/resources/testsets/conformance/xacml3.0-ct-v.0.4/xacml3.0-deprecated/IID313dPolicy.xml
old mode 100755
new mode 100644
index 392ca49..7f473d9
--- a/openaz-xacml-test/src/test/resources/testsets/conformance/xacml3.0-ct-v.0.4/xacml3.0-deprecated/IID313dPolicy.xml
+++ b/openaz-xacml-test/src/test/resources/testsets/conformance/xacml3.0-ct-v.0.4/xacml3.0-deprecated/IID313dPolicy.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!--
   Licensed to the Apache Software Foundation (ASF) under one or more
   contributor license agreements.  See the NOTICE file distributed with
@@ -16,7 +16,6 @@
   limitations under the License.
 -->
 
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <Policy xmlns="urn:oasis:names:tc:xacml:3.0:core:schema:wd-17" 
 		xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
 		PolicyId="urn:oasis:names:tc:xacml:2.0:conformance-test:IID313d:policy" 

http://git-wip-us.apache.org/repos/asf/incubator-openaz/blob/a6e96a6f/openaz-xacml-test/src/test/resources/testsets/conformance/xacml3.0-ct-v.0.4/xacml3.0-deprecated/IID314dPolicy.xml
----------------------------------------------------------------------
diff --git a/openaz-xacml-test/src/test/resources/testsets/conformance/xacml3.0-ct-v.0.4/xacml3.0-deprecated/IID314dPolicy.xml b/openaz-xacml-test/src/test/resources/testsets/conformance/xacml3.0-ct-v.0.4/xacml3.0-deprecated/IID314dPolicy.xml
old mode 100755
new mode 100644
index 89b1e06..ee73dd8
--- a/openaz-xacml-test/src/test/resources/testsets/conformance/xacml3.0-ct-v.0.4/xacml3.0-deprecated/IID314dPolicy.xml
+++ b/openaz-xacml-test/src/test/resources/testsets/conformance/xacml3.0-ct-v.0.4/xacml3.0-deprecated/IID314dPolicy.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!--
   Licensed to the Apache Software Foundation (ASF) under one or more
   contributor license agreements.  See the NOTICE file distributed with
@@ -16,7 +16,6 @@
   limitations under the License.
 -->
 
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <Policy xmlns="urn:oasis:names:tc:xacml:3.0:core:schema:wd-17" 
 		xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
 		PolicyId="urn:oasis:names:tc:xacml:2.0:conformance-test:IID314d:policy" 

http://git-wip-us.apache.org/repos/asf/incubator-openaz/blob/a6e96a6f/openaz-xacml-test/src/test/resources/testsets/conformance/xacml3.0-ct-v.0.4/xacml3.0-deprecated/IID315dPolicy.xml
----------------------------------------------------------------------
diff --git a/openaz-xacml-test/src/test/resources/testsets/conformance/xacml3.0-ct-v.0.4/xacml3.0-deprecated/IID315dPolicy.xml b/openaz-xacml-test/src/test/resources/testsets/conformance/xacml3.0-ct-v.0.4/xacml3.0-deprecated/IID315dPolicy.xml
old mode 100755
new mode 100644
index 954772b..cc08647
--- a/openaz-xacml-test/src/test/resources/testsets/conformance/xacml3.0-ct-v.0.4/xacml3.0-deprecated/IID315dPolicy.xml
+++ b/openaz-xacml-test/src/test/resources/testsets/conformance/xacml3.0-ct-v.0.4/xacml3.0-deprecated/IID315dPolicy.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!--
   Licensed to the Apache Software Foundation (ASF) under one or more
   contributor license agreements.  See the NOTICE file distributed with
@@ -16,7 +16,6 @@
   limitations under the License.
 -->
 
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <Policy xmlns="urn:oasis:names:tc:xacml:3.0:core:schema:wd-17" 
 		xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
 		PolicyId="urn:oasis:names:tc:xacml:2.0:conformance-test:II315d:policy" 

http://git-wip-us.apache.org/repos/asf/incubator-openaz/blob/a6e96a6f/openaz-xacml-test/src/test/resources/testsets/conformance/xacml3.0-ct-v.0.4/xacml3.0-deprecated/IID316dPolicy.xml
----------------------------------------------------------------------
diff --git a/openaz-xacml-test/src/test/resources/testsets/conformance/xacml3.0-ct-v.0.4/xacml3.0-deprecated/IID316dPolicy.xml b/openaz-xacml-test/src/test/resources/testsets/conformance/xacml3.0-ct-v.0.4/xacml3.0-deprecated/IID316dPolicy.xml
old mode 100755
new mode 100644
index 3e29c47..57b8f70
--- a/openaz-xacml-test/src/test/resources/testsets/conformance/xacml3.0-ct-v.0.4/xacml3.0-deprecated/IID316dPolicy.xml
+++ b/openaz-xacml-test/src/test/resources/testsets/conformance/xacml3.0-ct-v.0.4/xacml3.0-deprecated/IID316dPolicy.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!--
   Licensed to the Apache Software Foundation (ASF) under one or more
   contributor license agreements.  See the NOTICE file distributed with
@@ -16,7 +16,6 @@
   limitations under the License.
 -->
 
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <PolicySet xmlns="urn:oasis:names:tc:xacml:3.0:core:schema:wd-17" 
 		xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
 		PolicyCombiningAlgId="urn:oasis:names:tc:xacml:1.1:policy-combining-algorithm:ordered-permit-overrides" 

http://git-wip-us.apache.org/repos/asf/incubator-openaz/blob/a6e96a6f/openaz-xacml-test/src/test/resources/testsets/conformance/xacml3.0-ct-v.0.4/xacml3.0-deprecated/IID317dPolicy.xml
----------------------------------------------------------------------
diff --git a/openaz-xacml-test/src/test/resources/testsets/conformance/xacml3.0-ct-v.0.4/xacml3.0-deprecated/IID317dPolicy.xml b/openaz-xacml-test/src/test/resources/testsets/conformance/xacml3.0-ct-v.0.4/xacml3.0-deprecated/IID317dPolicy.xml
old mode 100755
new mode 100644
index e45c7ca..b12b1e8
--- a/openaz-xacml-test/src/test/resources/testsets/conformance/xacml3.0-ct-v.0.4/xacml3.0-deprecated/IID317dPolicy.xml
+++ b/openaz-xacml-test/src/test/resources/testsets/conformance/xacml3.0-ct-v.0.4/xacml3.0-deprecated/IID317dPolicy.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!--
   Licensed to the Apache Software Foundation (ASF) under one or more
   contributor license agreements.  See the NOTICE file distributed with
@@ -16,7 +16,6 @@
   limitations under the License.
 -->
 
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <PolicySet xmlns="urn:oasis:names:tc:xacml:3.0:core:schema:wd-17" 
 		xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
 		PolicyCombiningAlgId="urn:oasis:names:tc:xacml:1.1:policy-combining-algorithm:ordered-permit-overrides" 

http://git-wip-us.apache.org/repos/asf/incubator-openaz/blob/a6e96a6f/openaz-xacml-test/src/test/resources/testsets/conformance/xacml3.0-ct-v.0.4/xacml3.0-deprecated/IID318dPolicy.xml
----------------------------------------------------------------------
diff --git a/openaz-xacml-test/src/test/resources/testsets/conformance/xacml3.0-ct-v.0.4/xacml3.0-deprecated/IID318dPolicy.xml b/openaz-xacml-test/src/test/resources/testsets/conformance/xacml3.0-ct-v.0.4/xacml3.0-deprecated/IID318dPolicy.xml
old mode 100755
new mode 100644
index 5499d61..e4bdb04
--- a/openaz-xacml-test/src/test/resources/testsets/conformance/xacml3.0-ct-v.0.4/xacml3.0-deprecated/IID318dPolicy.xml
+++ b/openaz-xacml-test/src/test/resources/testsets/conformance/xacml3.0-ct-v.0.4/xacml3.0-deprecated/IID318dPolicy.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!--
   Licensed to the Apache Software Foundation (ASF) under one or more
   contributor license agreements.  See the NOTICE file distributed with
@@ -16,7 +16,6 @@
   limitations under the License.
 -->
 
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <PolicySet xmlns="urn:oasis:names:tc:xacml:3.0:core:schema:wd-17" 
 		xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
 		PolicyCombiningAlgId="urn:oasis:names:tc:xacml:1.1:policy-combining-algorithm:ordered-permit-overrides" 

http://git-wip-us.apache.org/repos/asf/incubator-openaz/blob/a6e96a6f/openaz-xacml-test/src/test/resources/testsets/conformance/xacml3.0-ct-v.0.4/xacml3.0-deprecated/IID319dPolicy.xml
----------------------------------------------------------------------
diff --git a/openaz-xacml-test/src/test/resources/testsets/conformance/xacml3.0-ct-v.0.4/xacml3.0-deprecated/IID319dPolicy.xml b/openaz-xacml-test/src/test/resources/testsets/conformance/xacml3.0-ct-v.0.4/xacml3.0-deprecated/IID319dPolicy.xml
old mode 100755
new mode 100644
index 93e9b32..f196948
--- a/openaz-xacml-test/src/test/resources/testsets/conformance/xacml3.0-ct-v.0.4/xacml3.0-deprecated/IID319dPolicy.xml
+++ b/openaz-xacml-test/src/test/resources/testsets/conformance/xacml3.0-ct-v.0.4/xacml3.0-deprecated/IID319dPolicy.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!--
   Licensed to the Apache Software Foundation (ASF) under one or more
   contributor license agreements.  See the NOTICE file distributed with
@@ -16,7 +16,6 @@
   limitations under the License.
 -->
 
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <PolicySet xmlns="urn:oasis:names:tc:xacml:3.0:core:schema:wd-17" 
 		xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
 		PolicyCombiningAlgId="urn:oasis:names:tc:xacml:1.1:policy-combining-algorithm:ordered-permit-overrides" 

http://git-wip-us.apache.org/repos/asf/incubator-openaz/blob/a6e96a6f/openaz-xacml-test/src/test/resources/testsets/conformance/xacml3.0-ct-v.0.4/xacml3.0-deprecated/IID320dPolicy.xml
----------------------------------------------------------------------
diff --git a/openaz-xacml-test/src/test/resources/testsets/conformance/xacml3.0-ct-v.0.4/xacml3.0-deprecated/IID320dPolicy.xml b/openaz-xacml-test/src/test/resources/testsets/conformance/xacml3.0-ct-v.0.4/xacml3.0-deprecated/IID320dPolicy.xml
old mode 100755
new mode 100644
index c6783a6..579b7bd
--- a/openaz-xacml-test/src/test/resources/testsets/conformance/xacml3.0-ct-v.0.4/xacml3.0-deprecated/IID320dPolicy.xml
+++ b/openaz-xacml-test/src/test/resources/testsets/conformance/xacml3.0-ct-v.0.4/xacml3.0-deprecated/IID320dPolicy.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!--
   Licensed to the Apache Software Foundation (ASF) under one or more
   contributor license agreements.  See the NOTICE file distributed with
@@ -16,7 +16,6 @@
   limitations under the License.
 -->
 
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <PolicySet xmlns="urn:oasis:names:tc:xacml:3.0:core:schema:wd-17" 
 		xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
 		PolicyCombiningAlgId="urn:oasis:names:tc:xacml:1.1:policy-combining-algorithm:ordered-permit-overrides" 

http://git-wip-us.apache.org/repos/asf/incubator-openaz/blob/a6e96a6f/openaz-xacml-test/src/test/resources/testsets/conformance/xacml3.0-ct-v.0.4/xacml3.0-deprecated/IIIG001dPolicy.xml
----------------------------------------------------------------------
diff --git a/openaz-xacml-test/src/test/resources/testsets/conformance/xacml3.0-ct-v.0.4/xacml3.0-deprecated/IIIG001dPolicy.xml b/openaz-xacml-test/src/test/resources/testsets/conformance/xacml3.0-ct-v.0.4/xacml3.0-deprecated/IIIG001dPolicy.xml
old mode 100755
new mode 100644
index 2d615be..125322d
--- a/openaz-xacml-test/src/test/resources/testsets/conformance/xacml3.0-ct-v.0.4/xacml3.0-deprecated/IIIG001dPolicy.xml
+++ b/openaz-xacml-test/src/test/resources/testsets/conformance/xacml3.0-ct-v.0.4/xacml3.0-deprecated/IIIG001dPolicy.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!--
   Licensed to the Apache Software Foundation (ASF) under one or more
   contributor license agreements.  See the NOTICE file distributed with
@@ -16,7 +16,6 @@
   limitations under the License.
 -->
 
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <Policy xmlns="urn:oasis:names:tc:xacml:3.0:core:schema:wd-17" 
 		xmlns:md="http://www.medico.com/schemas/record" 
 		xmlns:xacml-context="urn:oasis:names:tc:xacml:3.0:context:schema:os" 

http://git-wip-us.apache.org/repos/asf/incubator-openaz/blob/a6e96a6f/openaz-xacml-test/src/test/resources/testsets/conformance/xacml3.0-ct-v.0.4/xacml3.0-deprecated/IIIG002dPolicy.xml
----------------------------------------------------------------------
diff --git a/openaz-xacml-test/src/test/resources/testsets/conformance/xacml3.0-ct-v.0.4/xacml3.0-deprecated/IIIG002dPolicy.xml b/openaz-xacml-test/src/test/resources/testsets/conformance/xacml3.0-ct-v.0.4/xacml3.0-deprecated/IIIG002dPolicy.xml
old mode 100755
new mode 100644
index 0a1960b..0afdb7d
--- a/openaz-xacml-test/src/test/resources/testsets/conformance/xacml3.0-ct-v.0.4/xacml3.0-deprecated/IIIG002dPolicy.xml
+++ b/openaz-xacml-test/src/test/resources/testsets/conformance/xacml3.0-ct-v.0.4/xacml3.0-deprecated/IIIG002dPolicy.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!--
   Licensed to the Apache Software Foundation (ASF) under one or more
   contributor license agreements.  See the NOTICE file distributed with
@@ -16,7 +16,6 @@
   limitations under the License.
 -->
 
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <Policy xmlns="urn:oasis:names:tc:xacml:3.0:core:schema:wd-17" 
 		xmlns:md="http://www.medico.com/schemas/record" 
 		xmlns:xacml-context="urn:oasis:names:tc:xacml:3.0:context:schema:os" 

http://git-wip-us.apache.org/repos/asf/incubator-openaz/blob/a6e96a6f/openaz-xacml-test/src/test/resources/testsets/conformance/xacml3.0-ct-v.0.4/xacml3.0-deprecated/IIIG003dPolicy.xml
----------------------------------------------------------------------
diff --git a/openaz-xacml-test/src/test/resources/testsets/conformance/xacml3.0-ct-v.0.4/xacml3.0-deprecated/IIIG003dPolicy.xml b/openaz-xacml-test/src/test/resources/testsets/conformance/xacml3.0-ct-v.0.4/xacml3.0-deprecated/IIIG003dPolicy.xml
old mode 100755
new mode 100644
index fcd2de3..24ac846
--- a/openaz-xacml-test/src/test/resources/testsets/conformance/xacml3.0-ct-v.0.4/xacml3.0-deprecated/IIIG003dPolicy.xml
+++ b/openaz-xacml-test/src/test/resources/testsets/conformance/xacml3.0-ct-v.0.4/xacml3.0-deprecated/IIIG003dPolicy.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!--
   Licensed to the Apache Software Foundation (ASF) under one or more
   contributor license agreements.  See the NOTICE file distributed with
@@ -16,7 +16,6 @@
   limitations under the License.
 -->
 
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <Policy xmlns="urn:oasis:names:tc:xacml:3.0:core:schema:wd-17" 
 		xmlns:md="http://www.medico.com/schemas/record" 
 		xmlns:xacml-context="urn:oasis:names:tc:xacml:3.0:context:schema:os" 

http://git-wip-us.apache.org/repos/asf/incubator-openaz/blob/a6e96a6f/openaz-xacml-test/src/test/resources/testsets/conformance/xacml3.0-ct-v.0.4/xacml3.0-deprecated/IIIG004dPolicy.xml
----------------------------------------------------------------------
diff --git a/openaz-xacml-test/src/test/resources/testsets/conformance/xacml3.0-ct-v.0.4/xacml3.0-deprecated/IIIG004dPolicy.xml b/openaz-xacml-test/src/test/resources/testsets/conformance/xacml3.0-ct-v.0.4/xacml3.0-deprecated/IIIG004dPolicy.xml
old mode 100755
new mode 100644
index 62839ac..fffbfe9
--- a/openaz-xacml-test/src/test/resources/testsets/conformance/xacml3.0-ct-v.0.4/xacml3.0-deprecated/IIIG004dPolicy.xml
+++ b/openaz-xacml-test/src/test/resources/testsets/conformance/xacml3.0-ct-v.0.4/xacml3.0-deprecated/IIIG004dPolicy.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!--
   Licensed to the Apache Software Foundation (ASF) under one or more
   contributor license agreements.  See the NOTICE file distributed with
@@ -16,7 +16,6 @@
   limitations under the License.
 -->
 
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <Policy xmlns="urn:oasis:names:tc:xacml:3.0:core:schema:wd-17" 
 		xmlns:md="http://www.medico.com/schemas/record" 
 		xmlns:xacml-context="urn:oasis:names:tc:xacml:3.0:context:schema:os" 

http://git-wip-us.apache.org/repos/asf/incubator-openaz/blob/a6e96a6f/openaz-xacml-test/src/test/resources/testsets/conformance/xacml3.0-ct-v.0.4/xacml3.0-deprecated/IIIG005dPolicy.xml
----------------------------------------------------------------------
diff --git a/openaz-xacml-test/src/test/resources/testsets/conformance/xacml3.0-ct-v.0.4/xacml3.0-deprecated/IIIG005dPolicy.xml b/openaz-xacml-test/src/test/resources/testsets/conformance/xacml3.0-ct-v.0.4/xacml3.0-deprecated/IIIG005dPolicy.xml
old mode 100755
new mode 100644
index c37bfa6..80b30fd
--- a/openaz-xacml-test/src/test/resources/testsets/conformance/xacml3.0-ct-v.0.4/xacml3.0-deprecated/IIIG005dPolicy.xml
+++ b/openaz-xacml-test/src/test/resources/testsets/conformance/xacml3.0-ct-v.0.4/xacml3.0-deprecated/IIIG005dPolicy.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!--
   Licensed to the Apache Software Foundation (ASF) under one or more
   contributor license agreements.  See the NOTICE file distributed with
@@ -16,7 +16,6 @@
   limitations under the License.
 -->
 
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <Policy xmlns="urn:oasis:names:tc:xacml:3.0:core:schema:wd-17" 
 		xmlns:md="http://www.medico.com/schemas/record" 
 		xmlns:xacml-context="urn:oasis:names:tc:xacml:3.0:context:schema:os" 

http://git-wip-us.apache.org/repos/asf/incubator-openaz/blob/a6e96a6f/openaz-xacml-test/src/test/resources/testsets/conformance/xacml3.0-ct-v.0.4/xacml3.0-deprecated/IIIG006dPolicy.xml
----------------------------------------------------------------------
diff --git a/openaz-xacml-test/src/test/resources/testsets/conformance/xacml3.0-ct-v.0.4/xacml3.0-deprecated/IIIG006dPolicy.xml b/openaz-xacml-test/src/test/resources/testsets/conformance/xacml3.0-ct-v.0.4/xacml3.0-deprecated/IIIG006dPolicy.xml
index 120de43..85da06f 100755
--- a/openaz-xacml-test/src/test/resources/testsets/conformance/xacml3.0-ct-v.0.4/xacml3.0-deprecated/IIIG006dPolicy.xml
+++ b/openaz-xacml-test/src/test/resources/testsets/conformance/xacml3.0-ct-v.0.4/xacml3.0-deprecated/IIIG006dPolicy.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!--
   Licensed to the Apache Software Foundation (ASF) under one or more
   contributor license agreements.  See the NOTICE file distributed with
@@ -16,8 +16,7 @@
   limitations under the License.
 -->
 
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<Policy xmlns="urn:oasis:names:tc:xacml:3.0:core:schema:wd-17" 
+<Policy xmlns="urn:oasis:names:tc:xacml:3.0:core:schema:wd-17"
 		xmlns:md="http://www.medico.com/schemas/record" 
 		xmlns:xacml-context="urn:oasis:names:tc:xacml:3.0:context:schema:os" 
 		xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 

http://git-wip-us.apache.org/repos/asf/incubator-openaz/blob/a6e96a6f/openaz-xacml-test/src/test/resources/testsets/custom/category/Custom-Category-v1.xml
----------------------------------------------------------------------
diff --git a/openaz-xacml-test/src/test/resources/testsets/custom/category/Custom-Category-v1.xml b/openaz-xacml-test/src/test/resources/testsets/custom/category/Custom-Category-v1.xml
index c9995db..166b348 100755
--- a/openaz-xacml-test/src/test/resources/testsets/custom/category/Custom-Category-v1.xml
+++ b/openaz-xacml-test/src/test/resources/testsets/custom/category/Custom-Category-v1.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
 <!--
   Licensed to the Apache Software Foundation (ASF) under one or more
   contributor license agreements.  See the NOTICE file distributed with
@@ -16,7 +16,6 @@
   limitations under the License.
 -->
 
-<?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:att:xacml:policy:id:4ec39305-37d5-40c4-a614-8a258683b114" Version="1" RuleCombiningAlgId="urn:oasis:names:tc:xacml:1.0:rule-combining-algorithm:first-applicable">
     <Description>Test policy for using a custom category.</Description>
     <Target>

http://git-wip-us.apache.org/repos/asf/incubator-openaz/blob/a6e96a6f/openaz-xacml-test/src/test/resources/testsets/custom/category/xacml.properties
----------------------------------------------------------------------
diff --git a/openaz-xacml-test/src/test/resources/testsets/custom/category/xacml.properties b/openaz-xacml-test/src/test/resources/testsets/custom/category/xacml.properties
index eb8d2b6..0936f73 100755
--- a/openaz-xacml-test/src/test/resources/testsets/custom/category/xacml.properties
+++ b/openaz-xacml-test/src/test/resources/testsets/custom/category/xacml.properties
@@ -4,7 +4,7 @@
 # Standard API Factories
 #
 xacml.dataTypeFactory=org.apache.openaz.xacml.std.StdDataTypeFactory
-xacml.pdpEngineFactory=org.apache.openaz.xacmlatt.pdp.ATTPDPEngineFactory
+xacml.pdpEngineFactory=org.apache.openaz.xacml.pdp.OpenAZPDPEngineFactory
 xacml.pepEngineFactory=org.apache.openaz.xacml.std.pep.StdEngineFactory
 xacml.pipFinderFactory=org.apache.openaz.xacml.std.pip.StdPIPFinderFactory
 #

http://git-wip-us.apache.org/repos/asf/incubator-openaz/blob/a6e96a6f/openaz-xacml-test/src/test/resources/testsets/custom/datatype-function/Custom-Datatype-Function-v1.xml
----------------------------------------------------------------------
diff --git a/openaz-xacml-test/src/test/resources/testsets/custom/datatype-function/Custom-Datatype-Function-v1.xml b/openaz-xacml-test/src/test/resources/testsets/custom/datatype-function/Custom-Datatype-Function-v1.xml
index ca4eae1..7c4f18b 100755
--- a/openaz-xacml-test/src/test/resources/testsets/custom/datatype-function/Custom-Datatype-Function-v1.xml
+++ b/openaz-xacml-test/src/test/resources/testsets/custom/datatype-function/Custom-Datatype-Function-v1.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
 <!--
   Licensed to the Apache Software Foundation (ASF) under one or more
   contributor license agreements.  See the NOTICE file distributed with
@@ -16,7 +16,6 @@
   limitations under the License.
 -->
 
-<?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:att:xacml:policy:id:eca9620b-0f58-4ede-8198-1168862a6133" Version="1" RuleCombiningAlgId="urn:oasis:names:tc:xacml:1.0:rule-combining-algorithm:first-applicable">
     <Description>This policy demonstrates the use of a custom datatype and function for that datatype.</Description>
     <Target/>

http://git-wip-us.apache.org/repos/asf/incubator-openaz/blob/a6e96a6f/openaz-xacml-test/src/test/resources/testsets/custom/datatype-function/results/Response.01.Permit.json
----------------------------------------------------------------------
diff --git a/openaz-xacml-test/src/test/resources/testsets/custom/datatype-function/results/Response.01.Permit.json b/openaz-xacml-test/src/test/resources/testsets/custom/datatype-function/results/Response.01.Permit.json
new file mode 100644
index 0000000..643b74d
--- /dev/null
+++ b/openaz-xacml-test/src/test/resources/testsets/custom/datatype-function/results/Response.01.Permit.json
@@ -0,0 +1,10 @@
+{
+  "Response" : [ {
+    "Status" : {
+      "StatusCode" : {
+        "Value" : "urn:oasis:names:tc:xacml:1.0:status:ok"
+      }
+    },
+    "Decision" : "Permit"
+  } ]
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-openaz/blob/a6e96a6f/openaz-xacml-test/src/test/resources/testsets/custom/datatype-function/results/Response.02.Deny.json
----------------------------------------------------------------------
diff --git a/openaz-xacml-test/src/test/resources/testsets/custom/datatype-function/results/Response.02.Deny.json b/openaz-xacml-test/src/test/resources/testsets/custom/datatype-function/results/Response.02.Deny.json
new file mode 100644
index 0000000..c31f415
--- /dev/null
+++ b/openaz-xacml-test/src/test/resources/testsets/custom/datatype-function/results/Response.02.Deny.json
@@ -0,0 +1,10 @@
+{
+  "Response" : [ {
+    "Status" : {
+      "StatusCode" : {
+        "Value" : "urn:oasis:names:tc:xacml:1.0:status:ok"
+      }
+    },
+    "Decision" : "Deny"
+  } ]
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-openaz/blob/a6e96a6f/openaz-xacml-test/src/test/resources/testsets/custom/datatype-function/xacml.properties
----------------------------------------------------------------------
diff --git a/openaz-xacml-test/src/test/resources/testsets/custom/datatype-function/xacml.properties b/openaz-xacml-test/src/test/resources/testsets/custom/datatype-function/xacml.properties
index 2ee09e8..21680c9 100755
--- a/openaz-xacml-test/src/test/resources/testsets/custom/datatype-function/xacml.properties
+++ b/openaz-xacml-test/src/test/resources/testsets/custom/datatype-function/xacml.properties
@@ -4,13 +4,13 @@
 #
 # Our Customized Factories
 #
-xacml.dataTypeFactory=org.apache.openaz.xacmlatt.pdp.test.custom.CustomDataTypeFactory
-xacml.openaz.functionDefinitionFactory=org.apache.openaz.xacmlatt.pdp.test.custom.CustomFunctionDefinitionFactory
+xacml.dataTypeFactory=org.apache.openaz.xacml.pdp.test.custom.CustomDataTypeFactory
+xacml.openaz.functionDefinitionFactory=org.apache.openaz.xacml.pdp.test.custom.CustomFunctionDefinitionFactory
 
 #
 # Standard API Factories
 #
-xacml.pdpEngineFactory=org.apache.openaz.xacmlatt.pdp.ATTPDPEngineFactory
+xacml.pdpEngineFactory=org.apache.openaz.xacml.pdp.OpenAZPDPEngineFactory
 xacml.pepEngineFactory=org.apache.openaz.xacml.std.pep.StdEngineFactory
 xacml.pipFinderFactory=org.apache.openaz.xacml.std.pip.StdPIPFinderFactory
 #