From daee922e51e60c3cad6a3cc691214a34aad9ac7f Mon Sep 17 00:00:00 2001 From: Jim Hahn Date: Thu, 19 Apr 2018 11:28:41 -0400 Subject: [PATCH] Add license to policy-engine files Added license to various files. Updated XACMLPolicyScanner to work even when license comment is added to the Policy.xml file. Moved DOCTYPE before license in html files. Removed license from css files, as many are generated or come from third-party software. Removed license from other generated files. Change-Id: I9d98ca9f552a6eae17e80ef27fc7045cc4f27b8e Issue-ID: POLICY-741 Signed-off-by: Jim Hahn --- BRMSGateway/src/test/resources/META-INF/drop.ddl | 20 ++++++ ONAP-PAP-REST/pip.properties | 20 ++++++ .../resources/Decision_GuardBLPolicyTemplate.xml | 19 ++++++ .../resources/Decision_GuardPolicyTemplate.xml | 19 ++++++ ONAP-PAP-REST/src/main/resources/META-INF/drop.ddl | 20 ++++++ .../src/test/resources/Config_SampleTest1206.1.xml | 19 ++++++ .../testgroup2/com.Config_SampleBasePolicy.1.xml | 19 ++++++ .../resources/pdps/testgroup2/xacml.pip.properties | 20 ++++++ .../pdps/testgroup2/xacml.policy.properties | 20 ++++++ .../src/test/resources/pdps/xacml.properties | 20 ++++++ ONAP-PDP-REST/client.properties | 20 ++++++ ONAP-PDP-REST/config/xacml.pip.properties | 20 ++++++ ONAP-PDP-REST/config/xacml.policy.properties | 20 ++++++ ONAP-PDP-REST/src/test/resources/META-INF/drop.ddl | 20 ++++++ ONAP-PDP-REST/src/test/resources/client.properties | 20 ++++++ .../src/test/resources/policy_tosca_tca-v1707.yml | 20 ++++++ ONAP-SDK-APP/distribution.xml | 19 ++++++ .../src/main/webapp/WEB-INF/defs/definitions.xml | 19 ++++++ ONAP-SDK-APP/src/main/webapp/WEB-INF/web.xml | 19 ++++++ .../onap/policy/xacml/util/XACMLPolicyScanner.java | 78 +++++++++------------- .../test/resources/Action_TestActionPolicy.1.xml | 19 ++++++ .../src/test/resources/Config_SampleTest1206.1.xml | 19 ++++++ .../emptyPapGroupsDefault/xacml.properties | 20 ++++++ ....Config_BRMS_Param_BRMSParamvFWDemoPolicy.1.xml | 19 ++++++ .../resources/pdps/default/xacml.pip.properties | 20 ++++++ .../resources/pdps/default/xacml.policy.properties | 20 ++++++ .../src/test/resources/pdps/xacml.properties | 20 ++++++ .../xacml3.0-ct-v.0.4/IIA001Response.xml | 19 ++++++ POLICY-SDK-APP/config/policyLogger.properties | 20 ++++++ POLICY-SDK-APP/policyLogger.properties | 20 ++++++ .../src/main/webapp/WEB-INF/conf/system.properties | 20 ++++++ .../src/main/webapp/WEB-INF/defs/definitions.xml | 19 ++++++ POLICY-SDK-APP/src/main/webapp/WEB-INF/web.xml | 19 ++++++ .../main/webapp/app/policyApp/CSS/lockdownIcon.css | 20 ++++++ .../src/main/webapp/app/policyApp/CSS/w3.css | 20 ++++++ .../Dictionary/FWServiceGroupDictionary.html | 19 ++++++ .../PolicyTemplates/ActionPolicyTemplate.html | 19 ++++++ .../PolicyTemplates/BRMSParamPolicyTemplate.html | 19 ++++++ .../PolicyTemplates/BRMSRawPolicyTemplate.html | 19 ++++++ .../Editor/PolicyTemplates/BasePolicyTemplate.html | 19 ++++++ .../ClosedLoopFaultPolicyTemplate.html | 19 ++++++ .../ClosedLoopPMPolicyTemplate.html | 19 ++++++ .../DCAEMicroServicePolicyTemplate.html | 19 ++++++ .../PolicyTemplates/DecisionPolicyTemplate.html | 19 ++++++ .../PolicyTemplates/DescribePolicyTemplate.html | 19 ++++++ .../PolicyTemplates/ExportPolicyTemplate.html | 19 ++++++ .../PolicyTemplates/FirewallPolicyTemplate.html | 19 ++++++ .../OptimizationPolicyTemplate.html | 19 ++++++ .../templates/current-folder-breadcrumb.html | 19 ++++++ .../Editor/templates/item-context-menu.html | 19 ++++++ .../Editor/templates/item-toolbar.html | 19 ++++++ .../policy-models/Editor/templates/main-icons.html | 19 ++++++ .../Editor/templates/main-table-modal.html | 19 ++++++ .../policy-models/Editor/templates/main-table.html | 19 ++++++ .../policy-models/Editor/templates/modals.html | 19 ++++++ .../policy-models/Editor/templates/navbar.html | 19 ++++++ .../Editor/templates/policyEditor.html | 19 ++++++ .../Editor/templates/search-main-table.html | 19 ++++++ .../Editor/templates/searchNavbar.html | 19 ++++++ .../policy-models/Editor/templates/spinner.html | 19 ++++++ .../test/resources/Action_TestActionPolicy.1.xml | 19 ++++++ .../Config_BRMS_Param_BRMSParamvFWDemoPolicy.1.xml | 19 ++++++ .../Config_BRMS_Raw_TestBRMSRawPolicy.1.xml | 19 ++++++ .../resources/Config_FW_TestFireWallPolicy.1.xml | 19 ++++++ .../Config_Fault_TestClosedLoopPolicy.1.xml | 19 ++++++ .../src/test/resources/Config_MS_vFirewall.1.xml | 19 ++++++ .../Config_PM_TestClosedLoopPMPolicy.1.xml | 19 ++++++ .../src/test/resources/Config_SampleTest1206.1.xml | 19 ++++++ ...sion_TestDecisionPolicyWithRuleAlgorithms.1.xml | 19 ++++++ .../resources/pdps/default/xacml.pip.properties | 20 ++++++ .../resources/pdps/default/xacml.policy.properties | 20 ++++++ .../src/test/resources/pdps/xacml.properties | 20 ++++++ .../src/test/resources/policy_tosca_tca-v1707.yml | 20 ++++++ .../src/test/resources/META-INF/drop.ddl | 20 ++++++ docker_build.sh | 20 ++++++ docker_merge.sh | 20 ++++++ docker_verify.sh | 20 ++++++ packages/base/src/files/etc/logrotate.d/elk.conf | 20 ++++++ .../base/src/files/etc/logrotate.d/monitor.conf | 20 ++++++ packages/base/src/files/etc/monitor/monitor.cfg | 20 ++++++ packages/base/src/files/etc/profile.d/su.cfg | 20 ++++++ packages/base/src/files/install/elk/bin/elk.sh | 20 ++++++ .../src/files/install/elk/config/elasticsearch.yml | 20 ++++++ .../install/servers/pap/bin/pdps/xacml.properties | 20 ++++++ .../files/install/servers/pap/bin/pip.properties | 20 ++++++ packages/docker/src/main/docker/do-start.sh | 20 ++++++ packages/docker/src/main/docker/docker-install.sh | 20 ++++++ packages/docker/src/main/docker/wait-for-port.sh | 20 ++++++ packages/install/src/files/base.conf | 20 ++++++ packages/install/src/files/brmsgw.conf | 20 ++++++ packages/install/src/files/console.conf | 20 ++++++ packages/install/src/files/elk.conf | 20 ++++++ packages/install/src/files/mysql.conf | 20 ++++++ packages/install/src/files/pap.conf | 20 ++++++ packages/install/src/files/paplp.conf | 20 ++++++ packages/install/src/files/pdp.conf | 20 ++++++ packages/install/src/files/pdplp.conf | 20 ++++++ version.properties | 20 ++++++ 98 files changed, 1925 insertions(+), 46 deletions(-) diff --git a/BRMSGateway/src/test/resources/META-INF/drop.ddl b/BRMSGateway/src/test/resources/META-INF/drop.ddl index a46848df2..8bb53e6f0 100644 --- a/BRMSGateway/src/test/resources/META-INF/drop.ddl +++ b/BRMSGateway/src/test/resources/META-INF/drop.ddl @@ -1,2 +1,22 @@ +/* + * ============LICENSE_START================================================== + * ONAP Policy Engine + * =========================================================================== + * Copyright (C) 2017-2018 AT&T Intellectual Property. All rights reserved. + * =========================================================================== + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * ============LICENSE_END==================================================== + */ + DROP TABLE IF EXISTS brmsgroup_info DROP TABLE IF EXISTS brmsgroup_policy \ No newline at end of file diff --git a/ONAP-PAP-REST/pip.properties b/ONAP-PAP-REST/pip.properties index b5d46af57..4fd544a03 100644 --- a/ONAP-PAP-REST/pip.properties +++ b/ONAP-PAP-REST/pip.properties @@ -1,3 +1,23 @@ +# +#============LICENSE_START================================================== +# ONAP Policy Engine +#=========================================================================== +# Copyright (C) 2017-2018 AT&T Intellectual Property. All rights reserved. +#=========================================================================== +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +#============LICENSE_END================================================== +# + # # Default PIP Configuration from Policy. # diff --git a/ONAP-PAP-REST/src/main/resources/Decision_GuardBLPolicyTemplate.xml b/ONAP-PAP-REST/src/main/resources/Decision_GuardBLPolicyTemplate.xml index a8e1b9480..1ac292c3f 100644 --- a/ONAP-PAP-REST/src/main/resources/Decision_GuardBLPolicyTemplate.xml +++ b/ONAP-PAP-REST/src/main/resources/Decision_GuardBLPolicyTemplate.xml @@ -1,4 +1,23 @@ + ${description} diff --git a/ONAP-PAP-REST/src/main/resources/Decision_GuardPolicyTemplate.xml b/ONAP-PAP-REST/src/main/resources/Decision_GuardPolicyTemplate.xml index 6dee0cb97..15465f3c0 100644 --- a/ONAP-PAP-REST/src/main/resources/Decision_GuardPolicyTemplate.xml +++ b/ONAP-PAP-REST/src/main/resources/Decision_GuardPolicyTemplate.xml @@ -1,4 +1,23 @@ + ${description} diff --git a/ONAP-PAP-REST/src/main/resources/META-INF/drop.ddl b/ONAP-PAP-REST/src/main/resources/META-INF/drop.ddl index f7138ad52..2949aef88 100644 --- a/ONAP-PAP-REST/src/main/resources/META-INF/drop.ddl +++ b/ONAP-PAP-REST/src/main/resources/META-INF/drop.ddl @@ -1,3 +1,23 @@ +/* + * ============LICENSE_START================================================== + * ONAP Policy Engine + * =========================================================================== + * Copyright (C) 2017-2018 AT&T Intellectual Property. All rights reserved. + * =========================================================================== + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * ============LICENSE_END==================================================== + */ + DROP TABLE IF EXISTS ConfigurationDataEntity DROP TABLE IF EXISTS PolicyEntity DROP TABLE IF EXISTS PolicyDBDaoEntity diff --git a/ONAP-PAP-REST/src/test/resources/Config_SampleTest1206.1.xml b/ONAP-PAP-REST/src/test/resources/Config_SampleTest1206.1.xml index dcfd0c5eb..551616744 100644 --- a/ONAP-PAP-REST/src/test/resources/Config_SampleTest1206.1.xml +++ b/ONAP-PAP-REST/src/test/resources/Config_SampleTest1206.1.xml @@ -1,4 +1,23 @@ + SampleTest1206@CreatedBy:test@CreatedBy:@ModifiedBy:test@ModifiedBy: diff --git a/ONAP-PAP-REST/src/test/resources/pdps/testgroup2/com.Config_SampleBasePolicy.1.xml b/ONAP-PAP-REST/src/test/resources/pdps/testgroup2/com.Config_SampleBasePolicy.1.xml index 168cb5525..5ce959af2 100644 --- a/ONAP-PAP-REST/src/test/resources/pdps/testgroup2/com.Config_SampleBasePolicy.1.xml +++ b/ONAP-PAP-REST/src/test/resources/pdps/testgroup2/com.Config_SampleBasePolicy.1.xml @@ -1,4 +1,23 @@ + SampleBasePolicy@CreatedBy:demo@CreatedBy:@ModifiedBy:demo@ModifiedBy: diff --git a/ONAP-PAP-REST/src/test/resources/pdps/testgroup2/xacml.pip.properties b/ONAP-PAP-REST/src/test/resources/pdps/testgroup2/xacml.pip.properties index bc4027a5f..b191fc259 100644 --- a/ONAP-PAP-REST/src/test/resources/pdps/testgroup2/xacml.pip.properties +++ b/ONAP-PAP-REST/src/test/resources/pdps/testgroup2/xacml.pip.properties @@ -1,3 +1,23 @@ +# +#============LICENSE_START================================================== +# ONAP Policy Engine +#=========================================================================== +# Copyright (C) 2017-2018 AT&T Intellectual Property. All rights reserved. +#=========================================================================== +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +#============LICENSE_END================================================== +# + # #Wed Feb 14 16:26:32 EST 2018 historydb.name=operationHistoryDB diff --git a/ONAP-PAP-REST/src/test/resources/pdps/testgroup2/xacml.policy.properties b/ONAP-PAP-REST/src/test/resources/pdps/testgroup2/xacml.policy.properties index d2218a8b5..ab1b59fda 100644 --- a/ONAP-PAP-REST/src/test/resources/pdps/testgroup2/xacml.policy.properties +++ b/ONAP-PAP-REST/src/test/resources/pdps/testgroup2/xacml.policy.properties @@ -1,3 +1,23 @@ +# +#============LICENSE_START================================================== +# ONAP Policy Engine +#=========================================================================== +# Copyright (C) 2017-2018 AT&T Intellectual Property. All rights reserved. +#=========================================================================== +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +#============LICENSE_END================================================== +# + # #Wed Feb 14 16:26:32 EST 2018 com.Config_SampleBasePolicy.1.xml.name=com.Config_SampleBasePolicy diff --git a/ONAP-PAP-REST/src/test/resources/pdps/xacml.properties b/ONAP-PAP-REST/src/test/resources/pdps/xacml.properties index a6b85a04f..9e4b83db4 100644 --- a/ONAP-PAP-REST/src/test/resources/pdps/xacml.properties +++ b/ONAP-PAP-REST/src/test/resources/pdps/xacml.properties @@ -1,3 +1,23 @@ +# +#============LICENSE_START================================================== +# ONAP Policy Engine +#=========================================================================== +# Copyright (C) 2017-2018 AT&T Intellectual Property. All rights reserved. +#=========================================================================== +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +#============LICENSE_END================================================== +# + # #Wed Feb 14 16:29:58 EST 2018 default.description=this is my new description. diff --git a/ONAP-PDP-REST/client.properties b/ONAP-PDP-REST/client.properties index 15319dd41..e97bbedb6 100644 --- a/ONAP-PDP-REST/client.properties +++ b/ONAP-PDP-REST/client.properties @@ -1 +1,21 @@ +# +#============LICENSE_START================================================== +# ONAP Policy Engine +#=========================================================================== +# Copyright (C) 2017-2018 AT&T Intellectual Property. All rights reserved. +#=========================================================================== +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +#============LICENSE_END================================================== +# + python=test,MASTER \ No newline at end of file diff --git a/ONAP-PDP-REST/config/xacml.pip.properties b/ONAP-PDP-REST/config/xacml.pip.properties index 0ded40999..3d5de8657 100644 --- a/ONAP-PDP-REST/config/xacml.pip.properties +++ b/ONAP-PDP-REST/config/xacml.pip.properties @@ -1,3 +1,23 @@ +# +#============LICENSE_START================================================== +# ONAP Policy Engine +#=========================================================================== +# Copyright (C) 2017-2018 AT&T Intellectual Property. All rights reserved. +#=========================================================================== +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +#============LICENSE_END================================================== +# + # #Mon Mar 19 19:20:17 UTC 2018 historydb.name=operationHistoryDB diff --git a/ONAP-PDP-REST/config/xacml.policy.properties b/ONAP-PDP-REST/config/xacml.policy.properties index 1090a5e5c..d72b3dba1 100644 --- a/ONAP-PDP-REST/config/xacml.policy.properties +++ b/ONAP-PDP-REST/config/xacml.policy.properties @@ -1,3 +1,23 @@ +# +#============LICENSE_START================================================== +# ONAP Policy Engine +#=========================================================================== +# Copyright (C) 2017-2018 AT&T Intellectual Property. All rights reserved. +#=========================================================================== +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +#============LICENSE_END================================================== +# + # #Mon Mar 19 19:20:17 UTC 2018 xacml.referencedPolicies= diff --git a/ONAP-PDP-REST/src/test/resources/META-INF/drop.ddl b/ONAP-PDP-REST/src/test/resources/META-INF/drop.ddl index f7138ad52..2949aef88 100644 --- a/ONAP-PDP-REST/src/test/resources/META-INF/drop.ddl +++ b/ONAP-PDP-REST/src/test/resources/META-INF/drop.ddl @@ -1,3 +1,23 @@ +/* + * ============LICENSE_START================================================== + * ONAP Policy Engine + * =========================================================================== + * Copyright (C) 2017-2018 AT&T Intellectual Property. All rights reserved. + * =========================================================================== + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * ============LICENSE_END==================================================== + */ + DROP TABLE IF EXISTS ConfigurationDataEntity DROP TABLE IF EXISTS PolicyEntity DROP TABLE IF EXISTS PolicyDBDaoEntity diff --git a/ONAP-PDP-REST/src/test/resources/client.properties b/ONAP-PDP-REST/src/test/resources/client.properties index 13aa106cd..167d89468 100644 --- a/ONAP-PDP-REST/src/test/resources/client.properties +++ b/ONAP-PDP-REST/src/test/resources/client.properties @@ -1,2 +1,22 @@ +# +#============LICENSE_START================================================== +# ONAP Policy Engine +#=========================================================================== +# Copyright (C) 2017-2018 AT&T Intellectual Property. All rights reserved. +#=========================================================================== +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +#============LICENSE_END================================================== +# + #Don't Change this python=test,MASTER \ No newline at end of file diff --git a/ONAP-REST/src/test/resources/policy_tosca_tca-v1707.yml b/ONAP-REST/src/test/resources/policy_tosca_tca-v1707.yml index 0c30ceea0..b29ebcfa9 100644 --- a/ONAP-REST/src/test/resources/policy_tosca_tca-v1707.yml +++ b/ONAP-REST/src/test/resources/policy_tosca_tca-v1707.yml @@ -1,3 +1,23 @@ +# +#============LICENSE_START================================================== +# ONAP Policy Engine +#=========================================================================== +# Copyright (C) 2017-2018 AT&T Intellectual Property. All rights reserved. +#=========================================================================== +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +#============LICENSE_END================================================== +# + tosca_definitions_version: tosca_simple_yaml_1_0_0 node_types: diff --git a/ONAP-SDK-APP/distribution.xml b/ONAP-SDK-APP/distribution.xml index 3a9d6e799..79a2d6c24 100644 --- a/ONAP-SDK-APP/distribution.xml +++ b/ONAP-SDK-APP/distribution.xml @@ -1,3 +1,22 @@ + + diff --git a/ONAP-SDK-APP/src/main/webapp/WEB-INF/web.xml b/ONAP-SDK-APP/src/main/webapp/WEB-INF/web.xml index a576f61f5..f2f259aeb 100644 --- a/ONAP-SDK-APP/src/main/webapp/WEB-INF/web.xml +++ b/ONAP-SDK-APP/src/main/webapp/WEB-INF/web.xml @@ -1,4 +1,23 @@ + root = um.unmarshal(e, PolicyType.class); - // - // Here is our policy set class - // - return root.getValue(); - } else if (e.getNodeName().endsWith("PolicySet")) { - // - // Now we can create the context for the policy set - // and unmarshall the policy into a class. - // - JAXBContext context = JAXBContext.newInstance(PolicySetType.class); - Unmarshaller um = context.createUnmarshaller(); - JAXBElement root = um.unmarshal(e, PolicySetType.class); - // - // Here is our policy set class - // - return root.getValue(); - } else { - if (logger.isDebugEnabled()) { - logger.debug("Not supported yet: " + e.getNodeName()); - } - } + JAXBContext context = JAXBContext.newInstance(PolicyType.class); + Unmarshaller um = context.createUnmarshaller(); + JAXBElement root = um.unmarshal(e, PolicyType.class); + // + // Here is our policy set class + // + return root.getValue(); + } else if (e.getNodeName().endsWith("PolicySet")) { + // + // Now we can create the context for the policy set + // and unmarshall the policy into a class. + // + JAXBContext context = JAXBContext.newInstance(PolicySetType.class); + Unmarshaller um = context.createUnmarshaller(); + JAXBElement root = um.unmarshal(e, PolicySetType.class); + // + // Here is our policy set class + // + return root.getValue(); } else { - logger.warn("unsupported namespace: " + e.getNamespaceURI()); + if (logger.isDebugEnabled()) { + logger.debug("Not supported yet: " + e.getNodeName()); + } } } else { - if (logger.isDebugEnabled()) { - logger.debug("No root element contained in policy " + - " Name: " + node.getNodeName() + " type: " + node.getNodeType() + - " Value: " + node.getNodeValue()); - } + logger.warn("unsupported namespace: " + e.getNamespaceURI()); } } catch (Exception e) { PolicyLogger.error(MessageCodes.ERROR_SCHEMA_INVALID, e, "XACMLPolicyScanner", "Exception in readPolicy"); diff --git a/ONAP-XACML/src/test/resources/Action_TestActionPolicy.1.xml b/ONAP-XACML/src/test/resources/Action_TestActionPolicy.1.xml index a3b483f74..7f5d45cec 100644 --- a/ONAP-XACML/src/test/resources/Action_TestActionPolicy.1.xml +++ b/ONAP-XACML/src/test/resources/Action_TestActionPolicy.1.xml @@ -1,4 +1,23 @@ + TestActionPolicy@CreatedBy:test@CreatedBy:@ModifiedBy:test@ModifiedBy: diff --git a/ONAP-XACML/src/test/resources/Config_SampleTest1206.1.xml b/ONAP-XACML/src/test/resources/Config_SampleTest1206.1.xml index dcfd0c5eb..551616744 100644 --- a/ONAP-XACML/src/test/resources/Config_SampleTest1206.1.xml +++ b/ONAP-XACML/src/test/resources/Config_SampleTest1206.1.xml @@ -1,4 +1,23 @@ + SampleTest1206@CreatedBy:test@CreatedBy:@ModifiedBy:test@ModifiedBy: diff --git a/ONAP-XACML/src/test/resources/emptyPapGroupsDefault/xacml.properties b/ONAP-XACML/src/test/resources/emptyPapGroupsDefault/xacml.properties index be5102f2d..291324a3b 100644 --- a/ONAP-XACML/src/test/resources/emptyPapGroupsDefault/xacml.properties +++ b/ONAP-XACML/src/test/resources/emptyPapGroupsDefault/xacml.properties @@ -1,3 +1,23 @@ +# +#============LICENSE_START================================================== +# ONAP Policy Engine +#=========================================================================== +# Copyright (C) 2017-2018 AT&T Intellectual Property. All rights reserved. +#=========================================================================== +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +#============LICENSE_END================================================== +# + # #Fri Feb 16 11:15:29 GMT 2018 xacml.pap.groups.default= diff --git a/ONAP-XACML/src/test/resources/pdps/default/com.Config_BRMS_Param_BRMSParamvFWDemoPolicy.1.xml b/ONAP-XACML/src/test/resources/pdps/default/com.Config_BRMS_Param_BRMSParamvFWDemoPolicy.1.xml index e27f163b6..4fffaf3aa 100644 --- a/ONAP-XACML/src/test/resources/pdps/default/com.Config_BRMS_Param_BRMSParamvFWDemoPolicy.1.xml +++ b/ONAP-XACML/src/test/resources/pdps/default/com.Config_BRMS_Param_BRMSParamvFWDemoPolicy.1.xml @@ -1,4 +1,23 @@ + vFW Demo Policy@CreatedBy:@CreatedBy:@ModifiedBy:@ModifiedBy: diff --git a/ONAP-XACML/src/test/resources/pdps/default/xacml.pip.properties b/ONAP-XACML/src/test/resources/pdps/default/xacml.pip.properties index 846848f28..d55f7176b 100644 --- a/ONAP-XACML/src/test/resources/pdps/default/xacml.pip.properties +++ b/ONAP-XACML/src/test/resources/pdps/default/xacml.pip.properties @@ -1,3 +1,23 @@ +# +#============LICENSE_START================================================== +# ONAP Policy Engine +#=========================================================================== +# Copyright (C) 2017-2018 AT&T Intellectual Property. All rights reserved. +#=========================================================================== +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +#============LICENSE_END================================================== +# + # #Tue Feb 07 10:35:08 EST 2017 AAF.description=AAFEngine to communicate with AAF to take decisions diff --git a/ONAP-XACML/src/test/resources/pdps/default/xacml.policy.properties b/ONAP-XACML/src/test/resources/pdps/default/xacml.policy.properties index 1dc2aabf4..9b74b3eb9 100644 --- a/ONAP-XACML/src/test/resources/pdps/default/xacml.policy.properties +++ b/ONAP-XACML/src/test/resources/pdps/default/xacml.policy.properties @@ -1,3 +1,23 @@ +# +#============LICENSE_START================================================== +# ONAP Policy Engine +#=========================================================================== +# Copyright (C) 2017-2018 AT&T Intellectual Property. All rights reserved. +#=========================================================================== +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +#============LICENSE_END================================================== +# + # #Tue Feb 07 10:35:08 EST 2017 com.Config_BRMS_Param_BRMSParamvFWDemoPolicy.1.xml.name=Config_BRMS_Param_BRMSParamvFWDemoPolicy diff --git a/ONAP-XACML/src/test/resources/pdps/xacml.properties b/ONAP-XACML/src/test/resources/pdps/xacml.properties index aa1ece0a3..f0bed55ea 100644 --- a/ONAP-XACML/src/test/resources/pdps/xacml.properties +++ b/ONAP-XACML/src/test/resources/pdps/xacml.properties @@ -1,3 +1,23 @@ +# +#============LICENSE_START================================================== +# ONAP Policy Engine +#=========================================================================== +# Copyright (C) 2017-2018 AT&T Intellectual Property. All rights reserved. +#=========================================================================== +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +#============LICENSE_END================================================== +# + # #Tue Feb 07 10:37:51 EST 2017 default.description=The default group where new PDP's are put. diff --git a/ONAP-XACML/testsets/conformance/xacml3.0-ct-v.0.4/IIA001Response.xml b/ONAP-XACML/testsets/conformance/xacml3.0-ct-v.0.4/IIA001Response.xml index 8c484e0a9..680d27d1d 100644 --- a/ONAP-XACML/testsets/conformance/xacml3.0-ct-v.0.4/IIA001Response.xml +++ b/ONAP-XACML/testsets/conformance/xacml3.0-ct-v.0.4/IIA001Response.xml @@ -1,4 +1,23 @@ + + diff --git a/POLICY-SDK-APP/src/main/webapp/WEB-INF/web.xml b/POLICY-SDK-APP/src/main/webapp/WEB-INF/web.xml index 31b096049..c93a4189f 100644 --- a/POLICY-SDK-APP/src/main/webapp/WEB-INF/web.xml +++ b/POLICY-SDK-APP/src/main/webapp/WEB-INF/web.xml @@ -1,4 +1,23 @@ +