Update aaf client module

Remove aaf submodules and update aaf client
module.

Issue-id: AAF-21
Change-Id: I750ec9e26596652a142b014db94aabd082880130
Signed-off-by: sg481n <sg481n@att.com>

6 files changed, 0 insertions, 113 deletions

diff --git a/opt/app/aaf/common/.gitignore b/opt/app/aaf/common/.gitignore
deleted file mode 100644
index 4e8dea10..00000000
--- a/opt/app/aaf/common/.gitignore
+++ /dev/null
@@ -1,4 +0,0 @@
-/com.osaaf.common.props
-/com.osaaf.keyfile
-/com.osaaf.props
-/mylocal.common.props
diff --git a/opt/app/aaf/common/README.txt b/opt/app/aaf/common/README.txt
deleted file mode 100644
index 4de4f15e..00000000
--- a/opt/app/aaf/common/README.txt
+++ /dev/null
@@ -1,15 +0,0 @@
-# Initial instructions for Common Directory
-
-1) Generate a Keyfile
-	a) From the "Cadi" Lib directory
-		java -jar <CADI DIRECTORY>/lib/cadi_core*.jar keygen com.osaaf.keyfile
-2) "cp" com.osaaf.common.props.sample to a locally named file
-	a) It is best to replace relative paths with canonical paths
-	a) Add your Cassandra Connection info.
-	b) For your Password, do (from "Cadi Lib" again):
-		java -jar <CADI DIRECTORY>/lib/cadi_core*.jar digest com.osaaf.keyfile
-		Prepend "enc:" to the encrypted password
-3) "ln -s" the locally named file to com.osaaf.common.props
-4) "cp" com.osaaf.props.sample to com.osaaf.props
-	Note: This file will be replaced by Certificate Manager if used
-	a) Update with appropriate "Certificate Manger" URL, if used
diff --git a/opt/app/aaf/common/com.osaaf.common.props.sample b/opt/app/aaf/common/com.osaaf.common.props.sample
deleted file mode 100644
index 0081413c..00000000
--- a/opt/app/aaf/common/com.osaaf.common.props.sample
+++ /dev/null
@@ -1,78 +0,0 @@
-############################################################
-# Properties Written by Jonathan Gathman
-#   on 2016-08-12T04:17:59.628-0500
-# These properties encapsulate the Verisign Public Certificates
-############################################################
-# DEVELOPER ONLY SETTING!!!!!  DO NOT USE on ANY BOX other than your Developer box, and it
-# would be better if you got a Cert for that, and remove this!  There is nothing stupider than
-# an unsecured Security Service.
-cadi_trust_all_x509=true
-
-# Public (i.e. Verisign) Key stores.
-# AFT_DME2_KEYSTORE=
-# AFT_DME2_KEYSTORE_PASSWORD=
-# AFT_DME2_KEY_PASSWORD=
-# cadi_truststore=
-# cadi_truststore_password=
-
-# Standard for this App/Machine
-aaf_env=DEV
-aaf_data_dir=../data
-cadi_loglevel=WARN
-aaf_id=<osaaf's Application Identity>
-aaf_password=enc:<Encrypted Password, use java -jar cadi-core*.jar>
-
-aaf_conn_timeout=6000
-aaf_timeout=10000
-aaf_user_expires=600000
-aaf_clean_interval=45000
-aaf_refresh_trigger_count=3
-aaf_high_count=30000
-
-# Basic Auth
-aaf_default_realm=osaaf.com
-basic_realm=osaaf.com
-basic_warn=false
-localhost_deny=false
-
-# Cassandra
-# IP:Cass DataCenter:Latitude:Longitude,IP....
-# cassandra.clusters=127.0.0.1:dc1:32.780140:-96.800451,127.0.0.2:dc1:32.780140:-96.800451
-# cassandra.clusters.port=9042
-# cassandra.clusters.user=
-# cassandra.clusters.password=enc:<encrypted>
-## Exceptions from Cassandra which require resetting the Cassandra Connections
-cassandra.reset.exceptions=com.datastax.driver.core.exceptions.NoHostAvailableException:"no host was tried":"Connection has been closed"
-
-# Consistency Settings
-cassandra.writeConsistency.ns=LOCAL_QUORUM
-cassandra.writeConsistency.perm=LOCAL_QUORUM
-cassandra.writeConsistency.role=LOCAL_QUORUM
-cassandra.writeConsistency.user_role=LOCAL_QUORUM
-cassandra.writeConsistency.cred=LOCAL_QUORUM
-cassandra.writeConsistency.ns_attrib=LOCAL_QUORUM
-
-## Supported Plugin Organizational Units
-Organization.com.osaaf=com.osaaf.defOrg.DefaultOrg
-
-## Email Server settings for Def Organization.
-#Sender's email ID needs to be mentioned
-com.osaaf.mailFromUserId=mailid@bogus.com
-com.osaaf.supportEmail=support@bogus.com
-com.osaaf.mailHost=smtp.bogus.com
-
-# Standard AAF DME2 Props
-AFT_DME2_REMOVE_PERSISTENT_CACHE_ON_STARTUP=TRUE
-AFT_DME2_DISABLE_PERSISTENT_CACHE=TRUE
-AFT_DME2_DISABLE_PERSISTENT_CACHE_LOAD=TRUE
-
-## SSL OPTIONAL ONLY IN DEVELOPMENT PC/Local... WHATEVER YOU DO, don't use this on any box than your local PC
-AFT_DME2_SSL_ENABLE=false
-# for when you turn on SSL... Only TLSv1.1+ is secure as of 2016
-AFT_DME2_SSL_WANT_CLIENT_AUTH=TRUE
-AFT_DME2_SSL_INCLUDE_PROTOCOLS=TLSv1.1,TLSv1.2
-AFT_DME2_SSL_VALIDATE_CERTS=FALSE
-AFT_DME2_CLIENT_IGNORE_SSL_CONFIG=false
-
-## Extra CA Trusts, for Certifiate Manager to build truststore with external CAs
-cm_trust_cas=VerisignG3_CA.cer;VerisignG4_CA.cer;VerisignG5_CA.cer
diff --git a/opt/app/aaf/common/com.osaaf.props.sample b/opt/app/aaf/common/com.osaaf.props.sample
deleted file mode 100644
index 59948ef7..00000000
--- a/opt/app/aaf/common/com.osaaf.props.sample
+++ /dev/null
@@ -1,9 +0,0 @@
-############################################################
-# Initial File for Generating
-#   on 2016-10-26T06:56:19.905-0500
-# @copyright 2016, AT&T
-############################################################
-cm_url=https://<certificate manager host>:8150
-hostname=<your host>
-cadi_x509_issuers=CN=ATT CADI Issuing CA - Test 01, OU=CSO, O=ATT, C=US
-cadi_keyfile=../common/com.osaaf.keyfile
diff --git a/opt/app/aaf/data/identities.dat b/opt/app/aaf/data/identities.dat
deleted file mode 100644
index 98bf99a3..00000000
--- a/opt/app/aaf/data/identities.dat
+++ /dev/null
@@ -1,7 +0,0 @@
-iowna|Ima D. Owner|Ima|Owner|314-123-2000|ima.d.owner@osaaf.com|e|
-mmanager|Mark D. Manager|Mark|Manager|314-123-1234|mark.d.manager@osaaf.com|e|iowna
-bdevl|Robert D. Developer|Bob|Developer|314-123-1235|bob.d.develper@osaaf.com|e|mmanager
-mmarket|Mary D. Marketer|Mary|Marketer|314-123-1236|mary.d.marketer@osaaf.com|e|mmanager
-ccontra|Clarice D. Contractor|Clarice|Contractor|314-123-1237|clarice.d.contractor@osaaf.com|c|mmanager
-iretired|Ira Lee M. Retired|Ira|Retired|314-123-1238|clarice.d.contractor@osaaf.com|n|mmanager
-osaaf|ID of AAF|||||a|bdevl
diff --git a/opt/app/aaf/data/identities.idx b/opt/app/aaf/data/identities.idx
deleted file mode 100644
index 78fc0a56..00000000
--- a/opt/app/aaf/data/identities.idx
+++ /dev/null