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>

2 files changed, 0 insertions, 97 deletions

diff --git a/authz-test/src/main/config/lrm-authz-service.xml b/authz-test/src/main/config/lrm-authz-service.xml
deleted file mode 100644
index 8cb7c9dc..00000000
--- a/authz-test/src/main/config/lrm-authz-service.xml
+++ /dev/null
@@ -1,81 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>

-<!--

-  ============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.

-  *

--->

-<ns2:ManagedResourceList xmlns:ns2="http://scld.att.com/lrm/util" xmlns="http://scld.att.com/lrm/commontypes" xmlns:ns3="http://scld.att.com/lrm/types">

-    <ns2:ManagedResource>

-        <ResourceDescriptor>

-            <ResourceName>com.att.authz._ARTIFACT_ID_</ResourceName>

-            <ResourceVersion>

-                <Major>_MAJOR_VER_</Major>

-                <Minor>_MINOR_VER_</Minor>

-                <Patch>_PATCH_VER_</Patch>                

-            </ResourceVersion>

-            <RouteOffer>_ROUTE_OFFER_</RouteOffer>

-        </ResourceDescriptor>

-        <ResourceType>Java</ResourceType>

-        <ResourcePath>com.att.authz.service.AuthzAPI</ResourcePath>

-        <ResourceProps>

-            <Tag>process.workdir</Tag>

-            <Value>_ROOT_DIR_</Value>

-        </ResourceProps>    	       

-        <ResourceProps>

-            <Tag>jvm.version</Tag>

-            <Value>1.6</Value>

-        </ResourceProps>

-        <ResourceProps>

-            <Tag>jvm.args</Tag>

-            <Value>-DAFT_LATITUDE=_AFT_LATITUDE_ -DAFT_LONGITUDE=_AFT_LONGITUDE_ -DAFT_ENVIRONMENT=_AFT_ENVIRONMENT_ -Dplatform=_SCLD_PLATFORM_ -Dcom.sun.jndi.ldap.connect.pool.maxsize=20  -Dcom.sun.jndi.ldap.connect.pool.prefsize=10 -Dcom.sun.jndi.ldap.connect.pool.timeout=3000 </Value>

-        </ResourceProps>

-        <ResourceProps>

-            <Tag>jvm.classpath</Tag>

-            <Value>_ROOT_DIR_/etc:_ROOT_DIR_/lib/*:</Value>

-        </ResourceProps>

-        <ResourceProps>

-            <Tag>jvm.heap.min</Tag>

-            <Value>512m</Value>

-        </ResourceProps>

-        <ResourceProps>

-            <Tag>jvm.heap.max</Tag>

-            <Value>1024m</Value>

-        </ResourceProps>

-        <ResourceProps>

-            <Tag>start.class</Tag>

-            <Value>com.att.authz.service.AuthAPI</Value>

-        </ResourceProps>

-        <ResourceProps>

-            <Tag>stdout.redirect</Tag>

-            <Value>_ROOT_DIR_/logs/SystemOut.log</Value>

-        </ResourceProps>

-        <ResourceProps>

-            <Tag>stderr.redirect</Tag>

-            <Value>_ROOT_DIR_/logs/SystemErr.log</Value>

-        </ResourceProps>

-        <ResourceOSID>aft</ResourceOSID>

-        <ResourceStartType>AUTO</ResourceStartType>

-        <ResourceStartPriority>2</ResourceStartPriority>

-		<ResourceMinCount>_RESOURCE_MIN_COUNT_</ResourceMinCount>

-		<ResourceMaxCount>_RESOURCE_MAX_COUNT_</ResourceMaxCount>        

-        <ResourceSWMComponent>com.att.authz:_ARTIFACT_ID_</ResourceSWMComponent>

-        <ResourceSWMComponentVersion>_ARTIFACT_VERSION_</ResourceSWMComponentVersion>

-    </ns2:ManagedResource>

-</ns2:ManagedResourceList>

diff --git a/authz-test/src/main/config/tc.devl b/authz-test/src/main/config/tc.devl
deleted file mode 100644
index 5d3dcb04..00000000
--- a/authz-test/src/main/config/tc.devl
+++ /dev/null
@@ -1,16 +0,0 @@
-# Load Passwords needed
-function aafcli {
-  java \
-  -Daaf_id=testid \
-  -Daaf_pass=<pass> \
-  -Daaf_url=DMEServiceName=service=com.att.authz.AuthorizationService/version=_MAJOR_VER_._MINOR_VER_/envContext=_AFT_ENVIRONMENT_/routeOffer=_ROUTE_OFFER_ \
-  -DAFT_LATITUDE=_AFT_LATITUDE_ \
-  -DAFT_LONGITUDE=_AFT_LONGITUDE_ \
-  -DAFT_ENVIRONMENT=_AFT_ENVIRONMENT_ \
-  -Dtestid=<pass> \
-  -Dbogus=xxx \
-  -Dm12345=<pass> \
-  -jar \
-   /Volumes/Data/src/authz/authz-cmd/target/authz-cmd-2.0.2-SNAPSHOT-jar-with-dependencies.jar \
-   $*
-}