From 9ebb5ddcb60345dea668049c73f5f2d9c3cdf731 Mon Sep 17 00:00:00 2001
From: Anand <ac204h@att.com>
Date: Thu, 4 Jan 2018 12:44:05 -0500
Subject: [PATCH] Code changes for platform hardening appc-oam

Issue-ID: APPC-371
Change-Id: I124ad01cd945beb7a9b63a90760b33ca25246bc7
Signed-off-by: Anand <ac204h@att.com>
---
 appc-oam/appc-oam-bundle/pom.xml                   | 24 ++++++++++++++++++
 .../java/org/onap/appc/oam/util/BundleFilter.java  |  8 +++---
 appc-oam/appc-oam-features/pom.xml                 | 29 +++++++++++++++++++---
 .../src/main/resources/features.xml                |  3 ++-
 appc-oam/appc-oam-installer/pom.xml                | 23 +++++++++++++++++
 appc-oam/appc-oam-model/pom.xml                    | 24 ++++++++++++++++++
 appc-oam/pom.xml                                   | 24 ++++++++++++++++++
 7 files changed, 127 insertions(+), 8 deletions(-)

diff --git a/appc-oam/appc-oam-bundle/pom.xml b/appc-oam/appc-oam-bundle/pom.xml
index 51deba758..c24aa4341 100644
--- a/appc-oam/appc-oam-bundle/pom.xml
+++ b/appc-oam/appc-oam-bundle/pom.xml
@@ -1,4 +1,27 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!--
+  ============LICENSE_START=======================================================
+  ONAP : APPC
+  ================================================================================
+  Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+  ================================================================================
+  Copyright (C) 2017 Amdocs
+  =============================================================================
+  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.
+
+  ECOMP is a trademark and service mark of AT&T Intellectual Property.
+  ============LICENSE_END=========================================================
+  -->
 <project
         xmlns="http://maven.apache.org/POM/4.0.0"
         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
@@ -10,6 +33,7 @@
         <version>1.3.0-SNAPSHOT</version>
     </parent>
     <artifactId>appc-oam-bundle</artifactId>
+    <name>APPC OAM - Bundle</name>
     <packaging>bundle</packaging>
     <build>
         <plugins>
diff --git a/appc-oam/appc-oam-bundle/src/main/java/org/onap/appc/oam/util/BundleFilter.java b/appc-oam/appc-oam-bundle/src/main/java/org/onap/appc/oam/util/BundleFilter.java
index 6dd98f165..c4dcb4fa7 100644
--- a/appc-oam/appc-oam-bundle/src/main/java/org/onap/appc/oam/util/BundleFilter.java
+++ b/appc-oam/appc-oam-bundle/src/main/java/org/onap/appc/oam/util/BundleFilter.java
@@ -45,7 +45,7 @@ import java.util.regex.Pattern;
  * the bundleToStopSet
  *
  */
-class BundleFilter {
+public class BundleFilter {
 
     private final Map<String, Bundle> bundleToStopSet;
     private final Map<String, Bundle> bundleToNotStopSet;
@@ -57,7 +57,7 @@ class BundleFilter {
      * @param exceptRegexes - An array of regular expression used to override which bundles are candidates for stopping
      * @param bundles - An array of the bundle to be split into {@link #getBundlesToStop()} {@link #getBundlesToNotStop()}
      */
-    BundleFilter(String[] stopRegexes, String[] exceptRegexes, Bundle[] bundles) {
+    public  BundleFilter(String[] stopRegexes, String[] exceptRegexes, Bundle[] bundles) {
 
         Pattern[] stopPatterns = toPattern(stopRegexes);
         Pattern[] exceptPatterns = toPattern(exceptRegexes);
@@ -114,7 +114,7 @@ class BundleFilter {
 
 
     /**@return Map of bundles that are to be stopped  */
-    Map<String, Bundle> getBundlesToStop(){
+    public Map<String, Bundle> getBundlesToStop(){
         return bundleToStopSet;
     }
 
@@ -122,7 +122,7 @@ class BundleFilter {
      *
      * @return Map of bundles that are not to be stopped
      */
-    Map<String, Bundle> getBundlesToNotStop() {
+    public Map<String, Bundle> getBundlesToNotStop() {
         return bundleToNotStopSet;
     }
 }
diff --git a/appc-oam/appc-oam-features/pom.xml b/appc-oam/appc-oam-features/pom.xml
index 6598cd68e..f5b7a938f 100644
--- a/appc-oam/appc-oam-features/pom.xml
+++ b/appc-oam/appc-oam-features/pom.xml
@@ -1,4 +1,27 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!--
+  ============LICENSE_START=======================================================
+  ONAP : APPC
+  ================================================================================
+  Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+  ================================================================================
+  Copyright (C) 2017 Amdocs
+  =============================================================================
+  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.
+
+  ECOMP is a trademark and service mark of AT&T Intellectual Property.
+  ============LICENSE_END=========================================================
+  -->
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
   <parent>
@@ -6,10 +29,10 @@
     <groupId>org.onap.appc</groupId>
     <version>1.3.0-SNAPSHOT</version>
   </parent>
-  <name>appc-oam-features</name>
-  <artifactId>appc-oam-features</artifactId>
 
-  <packaging>jar</packaging>
+   <name>APPC OAM - Features</name>
+    <artifactId>appc-oam-features</artifactId>
+    <packaging>jar</packaging>
 
   <dependencies>
     <dependency>
diff --git a/appc-oam/appc-oam-features/src/main/resources/features.xml b/appc-oam/appc-oam-features/src/main/resources/features.xml
index 69bb62a50..4a3a00cfe 100644
--- a/appc-oam/appc-oam-features/src/main/resources/features.xml
+++ b/appc-oam/appc-oam-features/src/main/resources/features.xml
@@ -31,7 +31,8 @@
     <repository>mvn:org.opendaylight.mdsal/features-mdsal/${odl.mdsal.features.version}/xml/features</repository>
 
     <feature name='appc-oam' description="appc oam module" version='${project.version}'>
-        <feature version="${odl.mdsal.version}">odl-mdsal-broker</feature>
+	<feature version="${odl.mdsal.version}">odl-mdsal-broker</feature>
+        <feature version='${project.version}'>appc-lifecycle-management</feature>
         <bundle>mvn:org.onap.appc/appc-oam-model/${project.version}</bundle>
         <bundle>mvn:org.onap.appc/appc-oam-bundle/${project.version}</bundle>
         <configfile finalname="etc/opendaylight/karaf/201-appc-oam.xml">mvn:org.onap.appc/appc-oam-bundle/${project.version}/xml/config</configfile>
diff --git a/appc-oam/appc-oam-installer/pom.xml b/appc-oam/appc-oam-installer/pom.xml
index f65879e80..98cbca996 100644
--- a/appc-oam/appc-oam-installer/pom.xml
+++ b/appc-oam/appc-oam-installer/pom.xml
@@ -1,4 +1,27 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!--
+  ============LICENSE_START=======================================================
+  ONAP : APPC
+  ================================================================================
+  Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+  ================================================================================
+  Copyright (C) 2017 Amdocs
+  =============================================================================
+  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.
+
+  ECOMP is a trademark and service mark of AT&T Intellectual Property.
+  ============LICENSE_END=========================================================
+  -->
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
   <parent>
diff --git a/appc-oam/appc-oam-model/pom.xml b/appc-oam/appc-oam-model/pom.xml
index 330be0a82..02b4e3730 100644
--- a/appc-oam/appc-oam-model/pom.xml
+++ b/appc-oam/appc-oam-model/pom.xml
@@ -1,4 +1,27 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!--
+  ============LICENSE_START=======================================================
+  ONAP : APPC
+  ================================================================================
+  Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+  ================================================================================
+  Copyright (C) 2017 Amdocs
+  =============================================================================
+  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.
+
+  ECOMP is a trademark and service mark of AT&T Intellectual Property.
+  ============LICENSE_END=========================================================
+  -->
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
@@ -8,6 +31,7 @@
         <version>1.3.0-SNAPSHOT</version>
     </parent>
     <artifactId>appc-oam-model</artifactId>
+    <name>APPC OAM - Model</name>
     <packaging>bundle</packaging>
 
     <build>
diff --git a/appc-oam/pom.xml b/appc-oam/pom.xml
index 7b3119d35..a62836c4d 100644
--- a/appc-oam/pom.xml
+++ b/appc-oam/pom.xml
@@ -1,3 +1,27 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  ============LICENSE_START=======================================================
+  ONAP : APPC
+  ================================================================================
+  Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+  ================================================================================
+  Copyright (C) 2017 Amdocs
+  =============================================================================
+  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.
+
+  ECOMP is a trademark and service mark of AT&T Intellectual Property.
+  ============LICENSE_END=========================================================
+  -->
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
   <parent>
-- 
2.16.6