From a69e3a9565186ae06c96215f9c73198d0651b529 Mon Sep 17 00:00:00 2001
From: Jim Hahn <jrh3@att.com>
Date: Thu, 5 Apr 2018 13:27:38 -0400
Subject: Sonar fixes to pooling

Made various changes to the pooling feature to address some of the
sonar issues.
Remove duplicate classes, Pair & Triple.
Fix sonar issue about duplicate process(xxx) methods.
Remove extra items from pom.xml and add assembly builder.
Fix license text in pom.xml, inadvertently reformatted.
Fix a few typos in comments and change LinkedList to Queue.
Move assembly.xml to correct source directory.
Replace ScheduledFuture<?> with CancellableScheduledTask, to satisfy
sonar.
Eliminate "TODO" items: add logging, delay after sending Offline
message.
Add more logging in process(Message) methods.
Begin creating end-to-end junit test, fixed bugs found as a result.
Restore logback-test.xml to WARN.
Fix merge conflict - restored test properties file.

Change-Id: Ic70a8cee49678ea0fc3da309699aec1f6088fe70
Issue-ID: POLICY-728
Signed-off-by: Jim Hahn <jrh3@att.com>
---
 feature-pooling-dmaap/assembly/assemble_zip.xml | 76 -------------------------
 1 file changed, 76 deletions(-)
 delete mode 100644 feature-pooling-dmaap/assembly/assemble_zip.xml

(limited to 'feature-pooling-dmaap/assembly/assemble_zip.xml')

diff --git a/feature-pooling-dmaap/assembly/assemble_zip.xml b/feature-pooling-dmaap/assembly/assemble_zip.xml
deleted file mode 100644
index 9908a2b9..00000000
--- a/feature-pooling-dmaap/assembly/assemble_zip.xml
+++ /dev/null
@@ -1,76 +0,0 @@
-<!--
-  ============LICENSE_START=======================================================
-  feature-pooling-dmaap
-  ================================================================================
-  Copyright (C) 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=========================================================
-  -->
-
-<!-- Defines how we build the .zip file which is our distribution. -->
-
-<assembly
-	xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0"
-	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0 http://maven.apache.org/xsd/assembly-1.1.0.xsd">
-	<id>feature-pooling-dmaap</id>
-	<formats>
-		<format>zip</format>
-	</formats>
-
-	<!-- we want "system" and related files right at the root level as this 
-		file is suppose to be unzip on top of a karaf distro. -->
-	<includeBaseDirectory>false</includeBaseDirectory>
-
-	<fileSets>
-		<fileSet>
-			<directory>target</directory>
-			<outputDirectory>lib/feature</outputDirectory>
-			<includes>
-				<include>feature-pooling-dmaap-${project.version}.jar</include>
-			</includes>
-		</fileSet>
-		<fileSet>
-			<directory>target/assembly/lib</directory>
-			<outputDirectory>lib/dependencies</outputDirectory>
-			<includes>
-				<include>*.jar</include>
-			</includes>
-		</fileSet>
-		<fileSet>
-			<directory>src/main/feature/config</directory>
-			<outputDirectory>config</outputDirectory>
-			<fileMode>0644</fileMode>
-			<excludes/>
-		</fileSet>
-		<fileSet>
-			<directory>src/main/feature/bin</directory>
-			<outputDirectory>bin</outputDirectory>
-			<fileMode>0744</fileMode>
-			<excludes/>
-		</fileSet>
-		<fileSet>
-			<directory>src/main/feature/db</directory>
-			<outputDirectory>db</outputDirectory>
-			<fileMode>0744</fileMode>
-			<excludes/>
-		</fileSet>
-		<fileSet>
-			<directory>src/main/feature/install</directory>
-			<outputDirectory>install</outputDirectory>
-			<fileMode>0744</fileMode>
-			<excludes/>
-		</fileSet>
-	</fileSets>
-</assembly>
-- 
cgit 1.2.3-korg