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>

3 files changed, 0 insertions, 185 deletions

diff --git a/authz-certman/src/main/config/certman.props b/authz-certman/src/main/config/certman.props
deleted file mode 100644
index 496d8c37..00000000
--- a/authz-certman/src/main/config/certman.props
+++ /dev/null
@@ -1,25 +0,0 @@
-##
-## AUTHZ Certman (authz-certman) Properties
-##
-
-hostname=_HOSTNAME_
-
-## DISCOVERY (DME2) Parameters on the Command Line
-AFT_LATITUDE=_AFT_LATITUDE_
-AFT_LONGITUDE=_AFT_LONGITUDE_
-AFT_ENVIRONMENT=_AFT_ENVIRONMENT_
-DEPLOYED_VERSION=_ARTIFACT_VERSION_
-
-## Pull in common/security properties
-
-cadi_prop_files=_COMMON_DIR_/com.att.aaf.common.props;_COMMON_DIR_/com.att.aaf.props
-
-##DME2 related parameters
-DMEServiceName=service=com.att.authz.certman/version=_MAJOR_VER_._MINOR_VER_._PATCH_VER_/envContext=_ENV_CONTEXT_/routeOffer=_ROUTE_OFFER_
-AFT_DME2_PORT_RANGE=_AUTHZ_CERTMAN_PORT_RANGE_
-
-# Turn on both AAF TAF & LUR 2.0                                                
-aaf_url=https://DME2RESOLVE/service=com.att.authz.AuthorizationService/version=_MAJOR_VER_._MINOR_VER_/envContext=_ENV_CONTEXT_/routeOffer=_ROUTE_OFFER_
-
-
-
diff --git a/authz-certman/src/main/config/log4j.properties b/authz-certman/src/main/config/log4j.properties
deleted file mode 100644
index ed7f1ca4..00000000
--- a/authz-certman/src/main/config/log4j.properties
+++ /dev/null
@@ -1,78 +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.

-# *

-#-------------------------------------------------------------------------------

-###############################################################################

-# Copyright (c) 2016 AT&T Intellectual Property. All rights reserved.

-###############################################################################

-#

-# Licensed to the Apache Software Foundation (ASF) under one

-# or more contributor license agreements.  See the NOTICE file

-# distributed with this work for additional information

-# regarding copyright ownership.  The ASF licenses this file

-# to you 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.

-#

-log4j.appender.INIT=org.apache.log4j.DailyRollingFileAppender 

-log4j.appender.INIT.File=_LOG_DIR_/${LOG4J_FILENAME_init}

-log4j.appender.INIT.DatePattern='.'yyyy-MM-dd

-#log4j.appender.INIT.MaxFileSize=_MAX_LOG_FILE_SIZE_

-#log4j.appender.INIT.MaxBackupIndex=_MAX_LOG_FILE_BACKUP_COUNT_

-log4j.appender.INIT.layout=org.apache.log4j.PatternLayout 

-log4j.appender.INIT.layout.ConversionPattern=%d{yyyy-MM-dd HH:mm:ss,SSSZ} %m %n

-

-

-log4j.appender.CM=org.apache.log4j.DailyRollingFileAppender 

-log4j.appender.CM.File=_LOG_DIR_/${LOG4J_FILENAME_cm}

-log4j.appender.CM.DatePattern='.'yyyy-MM-dd

-#log4j.appender.CM.MaxFileSize=_MAX_LOG_FILE_SIZE_

-#log4j.appender.CM.MaxBackupIndex=_MAX_LOG_FILE_BACKUP_COUNT_

-log4j.appender.CM.layout=org.apache.log4j.PatternLayout 

-log4j.appender.CM.layout.ConversionPattern=%d{yyyy-MM-dd HH:mm:ss,SSSZ} %p [%c] %m %n

-

-log4j.appender.AUDIT=org.apache.log4j.DailyRollingFileAppender

-log4j.appender.AUDIT.File=_LOG_DIR_/${LOG4J_FILENAME_audit}

-log4j.appender.AUDIT.DatePattern='.'yyyy-MM-dd

-#log4j.appender.AUDIT.MaxFileSize=_MAX_LOG_FILE_SIZE_

-#log4j.appender.AUDIT.MaxBackupIndex=_MAX_LOG_FILE_BACKUP_COUNT_

-log4j.appender.AUDIT.layout=org.apache.log4j.PatternLayout 

-log4j.appender.AUDIT.layout.ConversionPattern=%d{yyyy-MM-dd HH:mm:ss,SSSZ} %m %n

-

-

-# General Apache libraries

-log4j.rootLogger=INFO,CM

-log4j.logger.org.apache=WARN,INIT

-log4j.logger.dme2=WARN,INIT

-log4j.logger.init=INFO,INIT

-log4j.logger.authz=_LOG4J_LEVEL_,CM

-log4j.logger.audit=INFO,AUDIT

-log4j.category.org.jscep=INFO

-

diff --git a/authz-certman/src/main/config/lrm-authz-certman.xml b/authz-certman/src/main/config/lrm-authz-certman.xml
deleted file mode 100644
index 9fd99a3f..00000000
--- a/authz-certman/src/main/config/lrm-authz-certman.xml
+++ /dev/null
@@ -1,82 +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.cm.service.CertManAPI</ResourcePath>

-        <ResourceProps>

-            <Tag>process.workdir</Tag>

-            <Value>_ROOT_DIR_</Value>

-        </ResourceProps>    	       

-        <ResourceProps>

-            <Tag>jvm.version</Tag>

-            <Value>1.8</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>1024m</Value>

-        </ResourceProps>

-        <ResourceProps>

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

-            <Value>2048m</Value>

-        </ResourceProps>

-        <ResourceProps>

-            <Tag>start.class</Tag>

-            <Value>com.att.authz.cm.service.CertManAPI</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>        

-		<ResourceRegistration>_RESOURCE_REGISTRATION_</ResourceRegistration>

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

-        <ResourceSWMComponentVersion>_ARTIFACT_VERSION_</ResourceSWMComponentVersion>

-    </ns2:ManagedResource>

-</ns2:ManagedResourceList>