From 7e8989cd2879ff0b93734995586ba7ed426a6f8a Mon Sep 17 00:00:00 2001
From: sg481n <sg481n@att.com>
Date: Sat, 30 Sep 2017 03:30:05 +0000
Subject: Improve code coverage for aaf cadi modules

Issue-ID: AAF-79
Change-Id: Ib01236cc4548a172d6455c59cd03a46b9743b09d
Signed-off-by: sg481n <sg481n@att.com>
---
 aaf/src/src/assemble/cadi-aaf-test.xml | 109 ---------------------------------
 aaf/src/src/assemble/cadi-aaf.xml      |  52 ----------------
 2 files changed, 161 deletions(-)
 delete mode 100644 aaf/src/src/assemble/cadi-aaf-test.xml
 delete mode 100644 aaf/src/src/assemble/cadi-aaf.xml

(limited to 'aaf/src/src/assemble')

diff --git a/aaf/src/src/assemble/cadi-aaf-test.xml b/aaf/src/src/assemble/cadi-aaf-test.xml
deleted file mode 100644
index 20626ad..0000000
--- a/aaf/src/src/assemble/cadi-aaf-test.xml
+++ /dev/null
@@ -1,109 +0,0 @@
-<!--
-  ============LICENSE_START====================================================
-  * org.onap.aaf
-  * ===========================================================================
-  * 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.
-  *
--->
-<assembly xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2 http://maven.apache.org/xsd/assembly-1.1.2.xsd">
-  
-  <id>test</id>
-  <formats>
-    <format>zip</format>
-  </formats>
-
-  <includeBaseDirectory>true</includeBaseDirectory>
-  <dependencySets>
-    <dependencySet>
-      <unpack>false</unpack>
-      <scope>test</scope>
-      <includes>
-      	<include>com.att.cadi:cadi-core</include>
-      </includes>
-    </dependencySet>
-    <dependencySet>
-      <unpack>false</unpack>
-      <scope>test</scope>
-      <includes>
-      	<include>com.att.cadi:cadi-aaf</include>
-      </includes>
-    </dependencySet>
-    <dependencySet>
-      <unpack>false</unpack>
-      <scope>test</scope>
-      <includes>
-      	<include>org.eclipse.jetty.aggregate:jetty-all</include>
-      </includes>
-    </dependencySet>
-
-    <dependencySet>
-      <unpack>false</unpack>
-      <scope>test</scope>
-      <includes>
-      	<include>org.eclipse.jetty.orbit:javax.servlet</include>
-      </includes>
-    </dependencySet>
-
-    <dependencySet>
-      <unpack>false</unpack>
-      <scope>test</scope>
-      <includes>
-      	<include>javax:servlet</include>
-      </includes>
-    </dependencySet>
-    
-    <dependencySet>
-      <unpack>false</unpack>
-      <scope>test</scope>
-      <includes>
-      	<include>com.att.aft:dme2</include>
-      </includes>
-    </dependencySet>
-    <dependencySet>
-      <unpack>false</unpack>
-      <scope>test</scope>
-      <includes>
-      	<include>com.att.aft.discovery:discovery-clt</include>
-      </includes>
-    </dependencySet>
-    <dependencySet>
-      <unpack>false</unpack>
-      <scope>compile</scope>
-      <includes>
-      	<include>com.att.cssa:rosetta</include>
-      </includes>
-    </dependencySet>
-  </dependencySets>
-  <fileSets>
-    <fileSet>
-      <directory>run</directory>
-      <includes>
-      	<include>cadi.properties</include>
-      	<include>keyfile</include>
-      	<include>start.sh</include>
-      </includes>
-    </fileSet>
-      <fileSet>
-      <includes>
-      	<include>../cadi/target/cadi-core*tests.jar</include>
-      </includes>
-    </fileSet>
-   </fileSets>
-  
-</assembly>
diff --git a/aaf/src/src/assemble/cadi-aaf.xml b/aaf/src/src/assemble/cadi-aaf.xml
deleted file mode 100644
index 3460028..0000000
--- a/aaf/src/src/assemble/cadi-aaf.xml
+++ /dev/null
@@ -1,52 +0,0 @@
-<!--
-  ============LICENSE_START====================================================
-  * org.onap.aaf
-  * ===========================================================================
-  * 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.
-  *
--->
-<assembly xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2 http://maven.apache.org/xsd/assembly-1.1.2.xsd">
-  
-  <id>full</id>
-  <formats>
-    <format>jar</format>
-  </formats>
-
-  <includeBaseDirectory>false</includeBaseDirectory>
-  <dependencySets>
-    <dependencySet>
-      <unpack>true</unpack>
-      <scope>compile</scope>
-      <includes>
-      	<include>com.att.authz:authz-client</include>
-      	<include>com.att.cadi:cadi-aaf</include>
-      	<include>com.att.cadi:cadi-core</include>
-      	<include>com.att.cadi:cadi-client</include>
-      	<include>com.att.inno:env</include>
-      	<include>com.att.inno:rosetta</include>
-      </includes>
-    </dependencySet>
-    
-  </dependencySets>
-  <fileSets>
-    <fileSet>
-      <directory>src/main/xsd</directory>
-    </fileSet>
-   </fileSets>
-</assembly>
-- 
cgit 1.2.3-korg