Add all of the command line tools

for the get put update and releationship tools

Issue-ID: AAI-488
Issue-ID: AAI-489
Issue-ID: AAI-490
Issue-ID: AAI-491
Issue-ID: AAI-492
Change-Id: Ie38f93e56b062d3d6966b191af5a9bc1817cf40e
Signed-off-by: Venkata Harish K Kajur <vk250x@att.com>

6 files changed, 0 insertions, 738 deletions

diff --git a/aai-resources/bundleconfig-local/etc/appprops/deltool-logback.xml b/aai-resources/bundleconfig-local/etc/appprops/deltool-logback.xml
deleted file mode 100644
index 5e8a820..0000000
--- a/aai-resources/bundleconfig-local/etc/appprops/deltool-logback.xml
+++ /dev/null
@@ -1,123 +0,0 @@
-<!--
-
-    ============LICENSE_START=======================================================
-    org.onap.aai
-    ================================================================================
-    Copyright © 2017 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=========================================================
-
-    ECOMP is a trademark and service mark of AT&T Intellectual Property.
-
--->
-<configuration>
-	<property name="logDirectory" value="${AJSC_HOME}/logs" />
-	<property name="eelfLogPattern" value="%ecompStartTime|%date{yyyy-MM-dd'T'HH:mm:ss.SSSZ, UTC}|%X{requestId}|%X{serviceInstanceId}|%-10t|%X{serverName}|%X{serviceName}|%X{partnerName}|%X{statusCode}|%X{responseCode}|%replace(%replace(%X{responseDescription}){'\\|', '!'}){'\r|\n', '^'}|%X{instanceUUID}|%level|%X{severity}|%X{serverIpAddress}|%ecompElapsedTime|%X{server}|%X{clientIpAddress}|%eelfClassOfCaller|%X{unused}|%X{processKey}|%X{customField1}|%X{customField2}|%X{customField3}|%X{customField4}|co=%X{component}:%replace(%replace(%m){'\\|', '!'}){'\r|\n', '^'}%n"/>
-	<property name="eelfMetricLogPattern" value="%ecompStartTime|%date{yyyy-MM-dd'T'HH:mm:ss.SSSZ, UTC}|%X{requestId}|%X{serviceInstanceId}|%-10t|%X{serverName}|%X{serviceName}|%X{partnerName}|%X{targetEntity}|%X{targetServiceName}|%X{statusCode}|%X{responseCode}|%replace(%replace(%X{responseDescription}){'\\|', '!'}){'\r|\n', '^'}|%X{instanceUUID}|%level|%X{severity}|%X{serverIpAddress}|%ecompElapsedTime|%X{server}|%X{clientIpAddress}|%eelfClassOfCaller|%X{unused}|%X{processKey}|%X{targetVirtualEntity}|%X{customField1}|%X{customField2}|%X{customField3}|%X{customField4}|co=%X{component}:%replace(%replace(%m){'\\|', '!'}){'\r|\n', '^'}%n"/>
-
-	<appender name="delTool" class="ch.qos.logback.core.rolling.RollingFileAppender">
-		<filter class="ch.qos.logback.classic.filter.ThresholdFilter">
-			<level>WARN</level>
-		</filter>
-		<File>${logDirectory}/delTool/error.log</File>
-		<rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
-			<fileNamePattern>${logDirectory}/delTool/error.log.%d{yyyy-MM-dd}</fileNamePattern>
-		</rollingPolicy>
-		<encoder class="org.onap.aai.logging.EcompEncoder">
-			<pattern>${eelfLogPattern}</pattern>
-		</encoder>
-	</appender>
-
-	<appender name="delTooldebug" class="ch.qos.logback.core.rolling.RollingFileAppender">
-		<filter class="ch.qos.logback.classic.filter.LevelFilter">
-			<level>DEBUG</level>
-			<onMatch>ACCEPT</onMatch>
-			<onMismatch>DENY</onMismatch>
-		</filter>
-		<File>${logDirectory}/delTool/debug.log</File>
-		<rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
-			<fileNamePattern>${logDirectory}/delTool/debug.log.%d{yyyy-MM-dd}</fileNamePattern>
-		</rollingPolicy>
-		<encoder class="org.onap.aai.logging.EcompEncoder">
-			<pattern>${eelfLogPattern}</pattern>
-		</encoder>
-	</appender>
-	
-	<appender name="delToolmetric" class="ch.qos.logback.core.rolling.RollingFileAppender">
-		<filter class="ch.qos.logback.classic.filter.LevelFilter">
-			<level>INFO</level>
-			<onMatch>ACCEPT</onMatch>
-			<onMismatch>DENY</onMismatch>
-		</filter>
-		<File>${logDirectory}/delTool/metrics.log</File>
-		<rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
-			<fileNamePattern>${logDirectory}/delTool/metrics.log.%d{yyyy-MM-dd}</fileNamePattern>
-		</rollingPolicy>
-		<encoder class="org.onap.aai.logging.EcompEncoder">
-			<pattern>${eelfMetricLogPattern}</pattern>
-		</encoder>
-	</appender>
-
-	<appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
-		<encoder>%-4relative [%thread] %-5level %logger{35} - %msg %n</encoder>
-	</appender>
-
-	<logger name="org.reflections" level="WARN" additivity="false">
-		<appender-ref ref="delTool"/>
-		<appender-ref ref="delTooldebug"/>
-		<appender-ref ref="delToolmetric"/>
-	</logger>
-	<logger name="org.apache.zookeeper" level="WARN" additivity="false">
-		<appender-ref ref="delTool"/>
-		<appender-ref ref="delTooldebug"/>
-		<appender-ref ref="delToolmetric"/>
-	</logger>
-	<logger name="org.apache.hadoop" level="WARN" additivity="false">
-		<appender-ref ref="delTool"/>
-		<appender-ref ref="delTooldebug"/>
-		<appender-ref ref="delToolmetric"/>
-	</logger>
-	<logger name="com.thinkaurelius" level="WARN" additivity="false">
-		<appender-ref ref="delTool"/>
-		<appender-ref ref="delTooldebug"/>
-		<appender-ref ref="delToolmetric"/>
-	</logger>
-	<logger name="ch.qos.logback.classic" level="WARN" additivity="false">
-		<appender-ref ref="delTool"/>
-		<appender-ref ref="delTooldebug"/>
-		<appender-ref ref="delToolmetric"/>
-	</logger>
-	<logger name="ch.qos.logback.core" level="WARN" additivity="false">
-		<appender-ref ref="delTool"/>
-		<appender-ref ref="delTooldebug"/>
-		<appender-ref ref="delToolmetric"/>
-	</logger>
-	<logger name="com.att.eelf" level="WARN" additivity="false">
-		<appender-ref ref="delTool"/>
-		<appender-ref ref="delTooldebug"/>
-		<appender-ref ref="delToolmetric"/>
-	</logger>
-	<logger name="org.onap.aai" level="INFO" additivity="false">
-		<appender-ref ref="delTool"/>
-		<appender-ref ref="delTooldebug"/>
-		<appender-ref ref="delToolmetric"/>
-	</logger>
-
-	<root level="INFO">
-		<appender-ref ref="delTool"/>
-		<appender-ref ref="delTooldebug"/>
-		<appender-ref ref="delToolmetric"/>
-		<appender-ref ref="STDOUT"/>
-	</root>
-</configuration>
diff --git a/aai-resources/bundleconfig-local/etc/appprops/posttool-logback.xml b/aai-resources/bundleconfig-local/etc/appprops/posttool-logback.xml
deleted file mode 100644
index 01b3d84..0000000
--- a/aai-resources/bundleconfig-local/etc/appprops/posttool-logback.xml
+++ /dev/null
@@ -1,123 +0,0 @@
-<!--
-
-    ============LICENSE_START=======================================================
-    org.onap.aai
-    ================================================================================
-    Copyright © 2017 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=========================================================
-
-    ECOMP is a trademark and service mark of AT&T Intellectual Property.
-
--->
-<configuration>
-	<property name="logDirectory" value="${AJSC_HOME}/logs" />
-	<property name="eelfLogPattern" value="%ecompStartTime|%date{yyyy-MM-dd'T'HH:mm:ss.SSSZ, UTC}|%X{requestId}|%X{serviceInstanceId}|%-10t|%X{serverName}|%X{serviceName}|%X{partnerName}|%X{statusCode}|%X{responseCode}|%replace(%replace(%X{responseDescription}){'\\|', '!'}){'\r|\n', '^'}|%X{instanceUUID}|%level|%X{severity}|%X{serverIpAddress}|%ecompElapsedTime|%X{server}|%X{clientIpAddress}|%eelfClassOfCaller|%X{unused}|%X{processKey}|%X{customField1}|%X{customField2}|%X{customField3}|%X{customField4}|co=%X{component}:%replace(%replace(%m){'\\|', '!'}){'\r|\n', '^'}%n"/>
-	<property name="eelfMetricLogPattern" value="%ecompStartTime|%date{yyyy-MM-dd'T'HH:mm:ss.SSSZ, UTC}|%X{requestId}|%X{serviceInstanceId}|%-10t|%X{serverName}|%X{serviceName}|%X{partnerName}|%X{targetEntity}|%X{targetServiceName}|%X{statusCode}|%X{responseCode}|%replace(%replace(%X{responseDescription}){'\\|', '!'}){'\r|\n', '^'}|%X{instanceUUID}|%level|%X{severity}|%X{serverIpAddress}|%ecompElapsedTime|%X{server}|%X{clientIpAddress}|%eelfClassOfCaller|%X{unused}|%X{processKey}|%X{targetVirtualEntity}|%X{customField1}|%X{customField2}|%X{customField3}|%X{customField4}|co=%X{component}:%replace(%replace(%m){'\\|', '!'}){'\r|\n', '^'}%n"/>
-
-	<appender name="postTool" class="ch.qos.logback.core.rolling.RollingFileAppender">
-		<filter class="ch.qos.logback.classic.filter.ThresholdFilter">
-			<level>WARN</level>
-		</filter>
-		<File>${logDirectory}/postTool/error.log</File>
-		<rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
-			<fileNamePattern>${logDirectory}/postTool/error.log.%d{yyyy-MM-dd}</fileNamePattern>
-		</rollingPolicy>
-		<encoder class="org.onap.aai.logging.EcompEncoder">
-			<pattern>${eelfLogPattern}</pattern>
-		</encoder>
-	</appender>
-
-	<appender name="postTooldebug" class="ch.qos.logback.core.rolling.RollingFileAppender">
-		<filter class="ch.qos.logback.classic.filter.LevelFilter">
-			<level>DEBUG</level>
-			<onMatch>ACCEPT</onMatch>
-			<onMismatch>DENY</onMismatch>
-		</filter>
-		<File>${logDirectory}/postTool/debug.log</File>
-		<rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
-			<fileNamePattern>${logDirectory}/postTool/debug.log.%d{yyyy-MM-dd}</fileNamePattern>
-		</rollingPolicy>
-		<encoder class="org.onap.aai.logging.EcompEncoder">
-			<pattern>${eelfLogPattern}</pattern>
-		</encoder>
-	</appender>
-	
-	<appender name="postToolmetric" class="ch.qos.logback.core.rolling.RollingFileAppender">
-		<filter class="ch.qos.logback.classic.filter.LevelFilter">
-			<level>INFO</level>
-			<onMatch>ACCEPT</onMatch>
-			<onMismatch>DENY</onMismatch>
-		</filter>
-		<File>${logDirectory}/postTool/metrics.log</File>
-		<rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
-			<fileNamePattern>${logDirectory}/postTool/metrics.log.%d{yyyy-MM-dd}</fileNamePattern>
-		</rollingPolicy>
-		<encoder class="org.onap.aai.logging.EcompEncoder">
-			<pattern>${eelfMetricLogPattern}</pattern>
-		</encoder>
-	</appender>
-
-	<appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
-		<encoder>%-4relative [%thread] %-5level %logger{35} - %msg %n</encoder>
-	</appender>
-
-	<logger name="org.reflections" level="WARN" additivity="false">
-		<appender-ref ref="postTool"/>
-		<appender-ref ref="postTooldebug"/>
-		<appender-ref ref="postToolmetric"/>
-	</logger>
-	<logger name="org.apache.zookeeper" level="WARN" additivity="false">
-		<appender-ref ref="postTool"/>
-		<appender-ref ref="postTooldebug"/>
-		<appender-ref ref="postToolmetric"/>
-	</logger>
-	<logger name="org.apache.hadoop" level="WARN" additivity="false">
-		<appender-ref ref="postTool"/>
-		<appender-ref ref="postTooldebug"/>
-		<appender-ref ref="postToolmetric"/>
-	</logger>
-	<logger name="com.thinkaurelius" level="WARN" additivity="false">
-		<appender-ref ref="postTool"/>
-		<appender-ref ref="postTooldebug"/>
-		<appender-ref ref="postToolmetric"/>
-	</logger>
-	<logger name="ch.qos.logback.classic" level="WARN" additivity="false">
-		<appender-ref ref="postTool"/>
-		<appender-ref ref="postTooldebug"/>
-		<appender-ref ref="postToolmetric"/>
-	</logger>
-	<logger name="ch.qos.logback.core" level="WARN" additivity="false">
-		<appender-ref ref="postTool"/>
-		<appender-ref ref="postTooldebug"/>
-		<appender-ref ref="postToolmetric"/>
-	</logger>
-	<logger name="com.att.eelf" level="WARN" additivity="false">
-		<appender-ref ref="postTool"/>
-		<appender-ref ref="postTooldebug"/>
-		<appender-ref ref="postToolmetric"/>
-	</logger>
-	<logger name="org.onap.aai" level="INFO" additivity="false">
-		<appender-ref ref="postTool"/>
-		<appender-ref ref="postTooldebug"/>
-		<appender-ref ref="postToolmetric"/>
-	</logger>
-
-	<root level="INFO">
-		<appender-ref ref="postTool"/>
-		<appender-ref ref="postTooldebug"/>
-		<appender-ref ref="postToolmetric"/>
-		<appender-ref ref="STDOUT"/>
-	</root>
-</configuration>
diff --git a/aai-resources/bundleconfig-local/etc/appprops/prov-logback.xml b/aai-resources/bundleconfig-local/etc/appprops/prov-logback.xml
deleted file mode 100644
index 552ff0c..0000000
--- a/aai-resources/bundleconfig-local/etc/appprops/prov-logback.xml
+++ /dev/null
@@ -1,123 +0,0 @@
-<!--
-
-    ============LICENSE_START=======================================================
-    org.onap.aai
-    ================================================================================
-    Copyright © 2017 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=========================================================
-
-    ECOMP is a trademark and service mark of AT&T Intellectual Property.
-
--->
-<configuration>
-	<property name="logDirectory" value="${AJSC_HOME}/logs" />
-	<property name="eelfLogPattern" value="%ecompStartTime|%date{yyyy-MM-dd'T'HH:mm:ss.SSSZ, UTC}|%X{requestId}|%X{serviceInstanceId}|%-10t|%X{serverName}|%X{serviceName}|%X{partnerName}|%X{statusCode}|%X{responseCode}|%replace(%replace(%X{responseDescription}){'\\|', '!'}){'\r|\n', '^'}|%X{instanceUUID}|%level|%X{severity}|%X{serverIpAddress}|%ecompElapsedTime|%X{server}|%X{clientIpAddress}|%eelfClassOfCaller|%X{unused}|%X{processKey}|%X{customField1}|%X{customField2}|%X{customField3}|%X{customField4}|co=%X{component}:%replace(%replace(%m){'\\|', '!'}){'\r|\n', '^'}%n"/>
-	<property name="eelfMetricLogPattern" value="%ecompStartTime|%date{yyyy-MM-dd'T'HH:mm:ss.SSSZ, UTC}|%X{requestId}|%X{serviceInstanceId}|%-10t|%X{serverName}|%X{serviceName}|%X{partnerName}|%X{targetEntity}|%X{targetServiceName}|%X{statusCode}|%X{responseCode}|%replace(%replace(%X{responseDescription}){'\\|', '!'}){'\r|\n', '^'}|%X{instanceUUID}|%level|%X{severity}|%X{serverIpAddress}|%ecompElapsedTime|%X{server}|%X{clientIpAddress}|%eelfClassOfCaller|%X{unused}|%X{processKey}|%X{targetVirtualEntity}|%X{customField1}|%X{customField2}|%X{customField3}|%X{customField4}|co=%X{component}:%replace(%replace(%m){'\\|', '!'}){'\r|\n', '^'}%n"/>
-
-	<appender name="provTool" class="ch.qos.logback.core.rolling.RollingFileAppender">
-		<filter class="ch.qos.logback.classic.filter.ThresholdFilter">
-			<level>WARN</level>
-		</filter>
-		<File>${logDirectory}/provTool/error.log</File>
-		<rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
-			<fileNamePattern>${logDirectory}/provTool/error.log.%d{yyyy-MM-dd}</fileNamePattern>
-		</rollingPolicy>
-		<encoder class="org.onap.aai.logging.EcompEncoder">
-			<pattern>${eelfLogPattern}</pattern>
-		</encoder>
-	</appender>
-
-	<appender name="provTooldebug" class="ch.qos.logback.core.rolling.RollingFileAppender">
-		<filter class="ch.qos.logback.classic.filter.LevelFilter">
-			<level>DEBUG</level>
-			<onMatch>ACCEPT</onMatch>
-			<onMismatch>DENY</onMismatch>
-		</filter>
-		<File>${logDirectory}/provTool/debug.log</File>
-		<rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
-			<fileNamePattern>${logDirectory}/provTool/debug.log.%d{yyyy-MM-dd}</fileNamePattern>
-		</rollingPolicy>
-		<encoder class="org.onap.aai.logging.EcompEncoder">
-			<pattern>${eelfLogPattern}</pattern>
-		</encoder>
-	</appender>
-	
-	<appender name="provToolmetric" class="ch.qos.logback.core.rolling.RollingFileAppender">
-		<filter class="ch.qos.logback.classic.filter.LevelFilter">
-			<level>INFO</level>
-			<onMatch>ACCEPT</onMatch>
-			<onMismatch>DENY</onMismatch>
-		</filter>
-		<File>${logDirectory}/provTool/metrics.log</File>
-		<rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
-			<fileNamePattern>${logDirectory}/provTool/metrics.log.%d{yyyy-MM-dd}</fileNamePattern>
-		</rollingPolicy>
-		<encoder class="org.onap.aai.logging.EcompEncoder">
-			<pattern>${eelfMetricLogPattern}</pattern>
-		</encoder>
-	</appender>
-
-	<appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
-		<encoder>%-4relative [%thread] %-5level %logger{35} - %msg %n</encoder>
-	</appender>
-
-	<logger name="org.reflections" level="WARN" additivity="false">
-		<appender-ref ref="provTool"/>
-		<appender-ref ref="provTooldebug"/>
-		<appender-ref ref="provToolmetric"/>
-	</logger>
-	<logger name="org.apache.zookeeper" level="WARN" additivity="false">
-		<appender-ref ref="provTool"/>
-		<appender-ref ref="provTooldebug"/>
-		<appender-ref ref="provToolmetric"/>
-	</logger>
-	<logger name="org.apache.hadoop" level="WARN" additivity="false">
-		<appender-ref ref="provTool"/>
-		<appender-ref ref="provTooldebug"/>
-		<appender-ref ref="provToolmetric"/>
-	</logger>
-	<logger name="com.thinkaurelius" level="WARN" additivity="false">
-		<appender-ref ref="provTool"/>
-		<appender-ref ref="provTooldebug"/>
-		<appender-ref ref="provToolmetric"/>
-	</logger>
-	<logger name="ch.qos.logback.classic" level="WARN" additivity="false">
-		<appender-ref ref="provTool"/>
-		<appender-ref ref="provTooldebug"/>
-		<appender-ref ref="provToolmetric"/>
-	</logger>
-	<logger name="ch.qos.logback.core" level="WARN" additivity="false">
-		<appender-ref ref="provTool"/>
-		<appender-ref ref="provTooldebug"/>
-		<appender-ref ref="provToolmetric"/>
-	</logger>
-	<logger name="com.att.eelf" level="WARN" additivity="false">
-		<appender-ref ref="provTool"/>
-		<appender-ref ref="provTooldebug"/>
-		<appender-ref ref="provToolmetric"/>
-	</logger>
-	<logger name="org.onap.aai" level="INFO" additivity="false">
-		<appender-ref ref="provTool"/>
-		<appender-ref ref="provTooldebug"/>
-		<appender-ref ref="provToolmetric"/>
-	</logger>
-
-	<root level="INFO">
-		<appender-ref ref="provTool"/>
-		<appender-ref ref="provTooldebug"/>
-		<appender-ref ref="provToolmetric"/>
-		<appender-ref ref="STDOUT"/>
-	</root>
-</configuration>
diff --git a/aai-resources/bundleconfig-local/etc/appprops/puttool-logback.xml b/aai-resources/bundleconfig-local/etc/appprops/puttool-logback.xml
deleted file mode 100644
index c3accfb..0000000
--- a/aai-resources/bundleconfig-local/etc/appprops/puttool-logback.xml
+++ /dev/null
@@ -1,123 +0,0 @@
-<!--
-
-    ============LICENSE_START=======================================================
-    org.onap.aai
-    ================================================================================
-    Copyright © 2017 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=========================================================
-
-    ECOMP is a trademark and service mark of AT&T Intellectual Property.
-
--->
-<configuration>
-	<property name="logDirectory" value="${AJSC_HOME}/logs" />
-	<property name="eelfLogPattern" value="%ecompStartTime|%date{yyyy-MM-dd'T'HH:mm:ss.SSSZ, UTC}|%X{requestId}|%X{serviceInstanceId}|%-10t|%X{serverName}|%X{serviceName}|%X{partnerName}|%X{statusCode}|%X{responseCode}|%replace(%replace(%X{responseDescription}){'\\|', '!'}){'\r|\n', '^'}|%X{instanceUUID}|%level|%X{severity}|%X{serverIpAddress}|%ecompElapsedTime|%X{server}|%X{clientIpAddress}|%eelfClassOfCaller|%X{unused}|%X{processKey}|%X{customField1}|%X{customField2}|%X{customField3}|%X{customField4}|co=%X{component}:%replace(%replace(%m){'\\|', '!'}){'\r|\n', '^'}%n"/>
-	<property name="eelfMetricLogPattern" value="%ecompStartTime|%date{yyyy-MM-dd'T'HH:mm:ss.SSSZ, UTC}|%X{requestId}|%X{serviceInstanceId}|%-10t|%X{serverName}|%X{serviceName}|%X{partnerName}|%X{targetEntity}|%X{targetServiceName}|%X{statusCode}|%X{responseCode}|%replace(%replace(%X{responseDescription}){'\\|', '!'}){'\r|\n', '^'}|%X{instanceUUID}|%level|%X{severity}|%X{serverIpAddress}|%ecompElapsedTime|%X{server}|%X{clientIpAddress}|%eelfClassOfCaller|%X{unused}|%X{processKey}|%X{targetVirtualEntity}|%X{customField1}|%X{customField2}|%X{customField3}|%X{customField4}|co=%X{component}:%replace(%replace(%m){'\\|', '!'}){'\r|\n', '^'}%n"/>
-
-	<appender name="putTool" class="ch.qos.logback.core.rolling.RollingFileAppender">
-		<filter class="ch.qos.logback.classic.filter.ThresholdFilter">
-			<level>WARN</level>
-		</filter>
-		<File>${logDirectory}/putTool/error.log</File>
-		<rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
-			<fileNamePattern>${logDirectory}/putTool/error.log.%d{yyyy-MM-dd}</fileNamePattern>
-		</rollingPolicy>
-		<encoder class="org.onap.aai.logging.EcompEncoder">
-			<pattern>${eelfLogPattern}</pattern>
-		</encoder>
-	</appender>
-
-	<appender name="putTooldebug" class="ch.qos.logback.core.rolling.RollingFileAppender">
-		<filter class="ch.qos.logback.classic.filter.LevelFilter">
-			<level>DEBUG</level>
-			<onMatch>ACCEPT</onMatch>
-			<onMismatch>DENY</onMismatch>
-		</filter>
-		<File>${logDirectory}/putTool/debug.log</File>
-		<rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
-			<fileNamePattern>${logDirectory}/putTool/debug.log.%d{yyyy-MM-dd}</fileNamePattern>
-		</rollingPolicy>
-		<encoder class="org.onap.aai.logging.EcompEncoder">
-			<pattern>${eelfLogPattern}</pattern>
-		</encoder>
-	</appender>
-	
-	<appender name="putToolmetric" class="ch.qos.logback.core.rolling.RollingFileAppender">
-		<filter class="ch.qos.logback.classic.filter.LevelFilter">
-			<level>INFO</level>
-			<onMatch>ACCEPT</onMatch>
-			<onMismatch>DENY</onMismatch>
-		</filter>
-		<File>${logDirectory}/putTool/metrics.log</File>
-		<rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
-			<fileNamePattern>${logDirectory}/putTool/metrics.log.%d{yyyy-MM-dd}</fileNamePattern>
-		</rollingPolicy>
-		<encoder class="org.onap.aai.logging.EcompEncoder">
-			<pattern>${eelfMetricLogPattern}</pattern>
-		</encoder>
-	</appender>
-
-	<appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
-		<encoder>%-4relative [%thread] %-5level %logger{35} - %msg %n</encoder>
-	</appender>
-
-	<logger name="org.reflections" level="WARN" additivity="false">
-		<appender-ref ref="putTool"/>
-		<appender-ref ref="putTooldebug"/>
-		<appender-ref ref="putToolmetric"/>
-	</logger>
-	<logger name="org.apache.zookeeper" level="WARN" additivity="false">
-		<appender-ref ref="putTool"/>
-		<appender-ref ref="putTooldebug"/>
-		<appender-ref ref="putToolmetric"/>
-	</logger>
-	<logger name="org.apache.hadoop" level="WARN" additivity="false">
-		<appender-ref ref="putTool"/>
-		<appender-ref ref="putTooldebug"/>
-		<appender-ref ref="putToolmetric"/>
-	</logger>
-	<logger name="com.thinkaurelius" level="WARN" additivity="false">
-		<appender-ref ref="putTool"/>
-		<appender-ref ref="putTooldebug"/>
-		<appender-ref ref="putToolmetric"/>
-	</logger>
-	<logger name="ch.qos.logback.classic" level="WARN" additivity="false">
-		<appender-ref ref="putTool"/>
-		<appender-ref ref="putTooldebug"/>
-		<appender-ref ref="putToolmetric"/>
-	</logger>
-	<logger name="ch.qos.logback.core" level="WARN" additivity="false">
-		<appender-ref ref="putTool"/>
-		<appender-ref ref="putTooldebug"/>
-		<appender-ref ref="putToolmetric"/>
-	</logger>
-	<logger name="com.att.eelf" level="WARN" additivity="false">
-		<appender-ref ref="putTool"/>
-		<appender-ref ref="putTooldebug"/>
-		<appender-ref ref="putToolmetric"/>
-	</logger>
-	<logger name="org.onap.aai" level="INFO" additivity="false">
-		<appender-ref ref="putTool"/>
-		<appender-ref ref="putTooldebug"/>
-		<appender-ref ref="putToolmetric"/>
-	</logger>
-
-	<root level="INFO">
-		<appender-ref ref="putTool"/>
-		<appender-ref ref="putTooldebug"/>
-		<appender-ref ref="putToolmetric"/>
-		<appender-ref ref="STDOUT"/>
-	</root>
-</configuration>
diff --git a/aai-resources/bundleconfig-local/etc/appprops/rshiptool-logback.xml b/aai-resources/bundleconfig-local/etc/appprops/rshiptool-logback.xml
deleted file mode 100644
index 1a86039..0000000
--- a/aai-resources/bundleconfig-local/etc/appprops/rshiptool-logback.xml
+++ /dev/null
@@ -1,123 +0,0 @@
-<!--
-
-    ============LICENSE_START=======================================================
-    org.onap.aai
-    ================================================================================
-    Copyright © 2017 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=========================================================
-
-    ECOMP is a trademark and service mark of AT&T Intellectual Property.
-
--->
-<configuration>
-	<property name="logDirectory" value="${AJSC_HOME}/logs" />
-	<property name="eelfLogPattern" value="%ecompStartTime|%date{yyyy-MM-dd'T'HH:mm:ss.SSSZ, UTC}|%X{requestId}|%X{serviceInstanceId}|%-10t|%X{serverName}|%X{serviceName}|%X{partnerName}|%X{statusCode}|%X{responseCode}|%replace(%replace(%X{responseDescription}){'\\|', '!'}){'\r|\n', '^'}|%X{instanceUUID}|%level|%X{severity}|%X{serverIpAddress}|%ecompElapsedTime|%X{server}|%X{clientIpAddress}|%eelfClassOfCaller|%X{unused}|%X{processKey}|%X{customField1}|%X{customField2}|%X{customField3}|%X{customField4}|co=%X{component}:%replace(%replace(%m){'\\|', '!'}){'\r|\n', '^'}%n"/>
-	<property name="eelfMetricLogPattern" value="%ecompStartTime|%date{yyyy-MM-dd'T'HH:mm:ss.SSSZ, UTC}|%X{requestId}|%X{serviceInstanceId}|%-10t|%X{serverName}|%X{serviceName}|%X{partnerName}|%X{targetEntity}|%X{targetServiceName}|%X{statusCode}|%X{responseCode}|%replace(%replace(%X{responseDescription}){'\\|', '!'}){'\r|\n', '^'}|%X{instanceUUID}|%level|%X{severity}|%X{serverIpAddress}|%ecompElapsedTime|%X{server}|%X{clientIpAddress}|%eelfClassOfCaller|%X{unused}|%X{processKey}|%X{targetVirtualEntity}|%X{customField1}|%X{customField2}|%X{customField3}|%X{customField4}|co=%X{component}:%replace(%replace(%m){'\\|', '!'}){'\r|\n', '^'}%n"/>
-
-	<appender name="rshipTool" class="ch.qos.logback.core.rolling.RollingFileAppender">
-		<filter class="ch.qos.logback.classic.filter.ThresholdFilter">
-			<level>WARN</level>
-		</filter>
-		<File>${logDirectory}/rshipTool/error.log</File>
-		<rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
-			<fileNamePattern>${logDirectory}/rshipTool/error.log.%d{yyyy-MM-dd}</fileNamePattern>
-		</rollingPolicy>
-		<encoder class="org.onap.aai.logging.EcompEncoder">
-			<pattern>${eelfLogPattern}</pattern>
-		</encoder>
-	</appender>
-
-	<appender name="rshipTooldebug" class="ch.qos.logback.core.rolling.RollingFileAppender">
-		<filter class="ch.qos.logback.classic.filter.LevelFilter">
-			<level>DEBUG</level>
-			<onMatch>ACCEPT</onMatch>
-			<onMismatch>DENY</onMismatch>
-		</filter>
-		<File>${logDirectory}/rshipTool/debug.log</File>
-		<rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
-			<fileNamePattern>${logDirectory}/rshipTool/debug.log.%d{yyyy-MM-dd}</fileNamePattern>
-		</rollingPolicy>
-		<encoder class="org.onap.aai.logging.EcompEncoder">
-			<pattern>${eelfLogPattern}</pattern>
-		</encoder>
-	</appender>
-	
-	<appender name="rshipToolmetric" class="ch.qos.logback.core.rolling.RollingFileAppender">
-		<filter class="ch.qos.logback.classic.filter.LevelFilter">
-			<level>INFO</level>
-			<onMatch>ACCEPT</onMatch>
-			<onMismatch>DENY</onMismatch>
-		</filter>
-		<File>${logDirectory}/rshipTool/metrics.log</File>
-		<rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
-			<fileNamePattern>${logDirectory}/rshipTool/metrics.log.%d{yyyy-MM-dd}</fileNamePattern>
-		</rollingPolicy>
-		<encoder class="org.onap.aai.logging.EcompEncoder">
-			<pattern>${eelfMetricLogPattern}</pattern>
-		</encoder>
-	</appender>
-
-	<appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
-		<encoder>%-4relative [%thread] %-5level %logger{35} - %msg %n</encoder>
-	</appender>
-
-	<logger name="org.reflections" level="WARN" additivity="false">
-		<appender-ref ref="rshipTool"/>
-		<appender-ref ref="rshipTooldebug"/>
-		<appender-ref ref="rshipToolmetric"/>
-	</logger>
-	<logger name="org.apache.zookeeper" level="WARN" additivity="false">
-		<appender-ref ref="rshipTool"/>
-		<appender-ref ref="rshipTooldebug"/>
-		<appender-ref ref="rshipToolmetric"/>
-	</logger>
-	<logger name="org.apache.hadoop" level="WARN" additivity="false">
-		<appender-ref ref="rshipTool"/>
-		<appender-ref ref="rshipTooldebug"/>
-		<appender-ref ref="rshipToolmetric"/>
-	</logger>
-	<logger name="com.thinkaurelius" level="WARN" additivity="false">
-		<appender-ref ref="rshipTool"/>
-		<appender-ref ref="rshipTooldebug"/>
-		<appender-ref ref="rshipToolmetric"/>
-	</logger>
-	<logger name="ch.qos.logback.classic" level="WARN" additivity="false">
-		<appender-ref ref="rshipTool"/>
-		<appender-ref ref="rshipTooldebug"/>
-		<appender-ref ref="rshipToolmetric"/>
-	</logger>
-	<logger name="ch.qos.logback.core" level="WARN" additivity="false">
-		<appender-ref ref="rshipTool"/>
-		<appender-ref ref="rshipTooldebug"/>
-		<appender-ref ref="rshipToolmetric"/>
-	</logger>
-	<logger name="com.att.eelf" level="WARN" additivity="false">
-		<appender-ref ref="rshipTool"/>
-		<appender-ref ref="rshipTooldebug"/>
-		<appender-ref ref="rshipToolmetric"/>
-	</logger>
-	<logger name="org.onap.aai" level="INFO" additivity="false">
-		<appender-ref ref="rshipTool"/>
-		<appender-ref ref="rshipTooldebug"/>
-		<appender-ref ref="rshipToolmetric"/>
-	</logger>
-
-	<root level="INFO">
-		<appender-ref ref="rshipTool"/>
-		<appender-ref ref="rshipTooldebug"/>
-		<appender-ref ref="rshipToolmetric"/>
-		<appender-ref ref="STDOUT"/>
-	</root>
-</configuration>
diff --git a/aai-resources/bundleconfig-local/etc/appprops/updtool-logback.xml b/aai-resources/bundleconfig-local/etc/appprops/updtool-logback.xml
deleted file mode 100644
index 6bc0a27..0000000
--- a/aai-resources/bundleconfig-local/etc/appprops/updtool-logback.xml
+++ /dev/null
@@ -1,123 +0,0 @@
-<!--
-
-    ============LICENSE_START=======================================================
-    org.onap.aai
-    ================================================================================
-    Copyright © 2017 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=========================================================
-
-    ECOMP is a trademark and service mark of AT&T Intellectual Property.
-
--->
-<configuration>
-	<property name="logDirectory" value="${AJSC_HOME}/logs" />
-	<property name="eelfLogPattern" value="%ecompStartTime|%date{yyyy-MM-dd'T'HH:mm:ss.SSSZ, UTC}|%X{requestId}|%X{serviceInstanceId}|%-10t|%X{serverName}|%X{serviceName}|%X{partnerName}|%X{statusCode}|%X{responseCode}|%replace(%replace(%X{responseDescription}){'\\|', '!'}){'\r|\n', '^'}|%X{instanceUUID}|%level|%X{severity}|%X{serverIpAddress}|%ecompElapsedTime|%X{server}|%X{clientIpAddress}|%eelfClassOfCaller|%X{unused}|%X{processKey}|%X{customField1}|%X{customField2}|%X{customField3}|%X{customField4}|co=%X{component}:%replace(%replace(%m){'\\|', '!'}){'\r|\n', '^'}%n"/>
-	<property name="eelfMetricLogPattern" value="%ecompStartTime|%date{yyyy-MM-dd'T'HH:mm:ss.SSSZ, UTC}|%X{requestId}|%X{serviceInstanceId}|%-10t|%X{serverName}|%X{serviceName}|%X{partnerName}|%X{targetEntity}|%X{targetServiceName}|%X{statusCode}|%X{responseCode}|%replace(%replace(%X{responseDescription}){'\\|', '!'}){'\r|\n', '^'}|%X{instanceUUID}|%level|%X{severity}|%X{serverIpAddress}|%ecompElapsedTime|%X{server}|%X{clientIpAddress}|%eelfClassOfCaller|%X{unused}|%X{processKey}|%X{targetVirtualEntity}|%X{customField1}|%X{customField2}|%X{customField3}|%X{customField4}|co=%X{component}:%replace(%replace(%m){'\\|', '!'}){'\r|\n', '^'}%n"/>
-
-	<appender name="updTool" class="ch.qos.logback.core.rolling.RollingFileAppender">
-		<filter class="ch.qos.logback.classic.filter.ThresholdFilter">
-			<level>WARN</level>
-		</filter>
-		<File>${logDirectory}/updTool/error.log</File>
-		<rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
-			<fileNamePattern>${logDirectory}/updTool/error.log.%d{yyyy-MM-dd}</fileNamePattern>
-		</rollingPolicy>
-		<encoder class="org.onap.aai.logging.EcompEncoder">
-			<pattern>${eelfLogPattern}</pattern>
-		</encoder>
-	</appender>
-
-	<appender name="updTooldebug" class="ch.qos.logback.core.rolling.RollingFileAppender">
-		<filter class="ch.qos.logback.classic.filter.LevelFilter">
-			<level>DEBUG</level>
-			<onMatch>ACCEPT</onMatch>
-			<onMismatch>DENY</onMismatch>
-		</filter>
-		<File>${logDirectory}/updTool/debug.log</File>
-		<rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
-			<fileNamePattern>${logDirectory}/updTool/debug.log.%d{yyyy-MM-dd}</fileNamePattern>
-		</rollingPolicy>
-		<encoder class="org.onap.aai.logging.EcompEncoder">
-			<pattern>${eelfLogPattern}</pattern>
-		</encoder>
-	</appender>
-	
-	<appender name="updToolmetric" class="ch.qos.logback.core.rolling.RollingFileAppender">
-		<filter class="ch.qos.logback.classic.filter.LevelFilter">
-			<level>INFO</level>
-			<onMatch>ACCEPT</onMatch>
-			<onMismatch>DENY</onMismatch>
-		</filter>
-		<File>${logDirectory}/updTool/metrics.log</File>
-		<rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
-			<fileNamePattern>${logDirectory}/updTool/metrics.log.%d{yyyy-MM-dd}</fileNamePattern>
-		</rollingPolicy>
-		<encoder class="org.onap.aai.logging.EcompEncoder">
-			<pattern>${eelfMetricLogPattern}</pattern>
-		</encoder>
-	</appender>
-
-	<appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
-		<encoder>%-4relative [%thread] %-5level %logger{35} - %msg %n</encoder>
-	</appender>
-
-	<logger name="org.reflections" level="WARN" additivity="false">
-		<appender-ref ref="updTool"/>
-		<appender-ref ref="updTooldebug"/>
-		<appender-ref ref="updToolmetric"/>
-	</logger>
-	<logger name="org.apache.zookeeper" level="WARN" additivity="false">
-		<appender-ref ref="updTool"/>
-		<appender-ref ref="updTooldebug"/>
-		<appender-ref ref="updToolmetric"/>
-	</logger>
-	<logger name="org.apache.hadoop" level="WARN" additivity="false">
-		<appender-ref ref="updTool"/>
-		<appender-ref ref="updTooldebug"/>
-		<appender-ref ref="updToolmetric"/>
-	</logger>
-	<logger name="com.thinkaurelius" level="WARN" additivity="false">
-		<appender-ref ref="updTool"/>
-		<appender-ref ref="updTooldebug"/>
-		<appender-ref ref="updToolmetric"/>
-	</logger>
-	<logger name="ch.qos.logback.classic" level="WARN" additivity="false">
-		<appender-ref ref="updTool"/>
-		<appender-ref ref="updTooldebug"/>
-		<appender-ref ref="updToolmetric"/>
-	</logger>
-	<logger name="ch.qos.logback.core" level="WARN" additivity="false">
-		<appender-ref ref="updTool"/>
-		<appender-ref ref="updTooldebug"/>
-		<appender-ref ref="updToolmetric"/>
-	</logger>
-	<logger name="com.att.eelf" level="WARN" additivity="false">
-		<appender-ref ref="updTool"/>
-		<appender-ref ref="updTooldebug"/>
-		<appender-ref ref="updToolmetric"/>
-	</logger>
-	<logger name="org.onap.aai" level="INFO" additivity="false">
-		<appender-ref ref="updTool"/>
-		<appender-ref ref="updTooldebug"/>
-		<appender-ref ref="updToolmetric"/>
-	</logger>
-
-	<root level="INFO">
-		<appender-ref ref="updTool"/>
-		<appender-ref ref="updTooldebug"/>
-		<appender-ref ref="updToolmetric"/>
-		<appender-ref ref="STDOUT"/>
-	</root>
-</configuration>