2 files changed, 5 insertions, 29 deletions
diff --git a/authz-service/src/main/resources/etc/authAPI.props b/authz-service/src/main/resources/etc/authAPI.props
index f0dbc8be..d1acfb07 100644
--- a/authz-service/src/main/resources/etc/authAPI.props
+++ b/authz-service/src/main/resources/etc/authAPI.props
@@ -15,42 +15,18 @@ DEPLOYED_VERSION=2.0.SAMPLE
 DMEServiceName=service=org.onap.aaf.authz.AuthorizationService/version=2.0/envContext=DEV/routeOffer=BAU_SE
 
 #DME2 can limit Port Ranges with the following:
-#AFT_DME2_PORT_RANGE=8101-8029,8100
+AFT_DME2_PORT_RANGE=8101-8101,8100
 #DME2 picks any unused port in +1024 range
 #AFT_DME2_PORT=0
 AFT_DME2_ALLOW_PORT_CACHING=false
-aaf_root_ns=org.openecomp
-
-# Point to "Common" files, used between all the AAF Services. ... 
-
-
 
 
-# Cassandra
-# IP:Cass DataCenter:Latitude:Longitude,IP....
-cassandra.clusters=127.0.0.1
-cassandra.clusters.port=9042
-cassandra.clusters.user=authz
-cassandra.clusters.password=authz
-## 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=org.onap.aaf.osaaf.defOrg.DefaultOrg
-
+# Point to "Common" files, used between all the AAF Services. ... 
 
 
 
 #cadi_prop_files=com.osaaf.common.props;com.osaaf.props
-cadi_prop_files=opt/app/aaf/authz-service/1.0.0-SNAPSHOT/etc/com.osaaf.common.props;opt/app/aaf/authz-service/1.0.0-SNAPSHOT/etc/com.osaaf.props
+cadi_prop_files=opt/app/aaf/authz-service/etc/com.osaaf.common.props:opt/app/aaf/authz-service/etc/com.osaaf.props
 CACHE_HIGH_COUNT=40000
 CACHE_CLEAN_INTERVAL=60000
 
diff --git a/authz-service/src/main/resources/etc/com.osaaf.common.props b/authz-service/src/main/resources/etc/com.osaaf.common.props
index 5bf127ce..e27b594d 100644
--- a/authz-service/src/main/resources/etc/com.osaaf.common.props
+++ b/authz-service/src/main/resources/etc/com.osaaf.common.props
@@ -17,7 +17,7 @@ cadi_trust_all_x509=true
 
 # Standard for this App/Machine
 aaf_env=DEV
-aaf_data_dir=../data
+aaf_data_dir=opt/app/aaf/authz-service/etc/data
 cadi_loglevel=WARN
 aaf_id=<osaaf's Application Identity>
 aaf_password=enc:31-LFPNtP9Yl1DZKAz1rx8N8YfYVY8VKnnDr
@@ -56,7 +56,7 @@ cassandra.writeConsistency.cred=LOCAL_QUORUM
 cassandra.writeConsistency.ns_attrib=LOCAL_QUORUM
 
 ## Supported Plugin Organizational Units
-Organization.com.osaaf=org.onap.aaf.osaaf.defOrg.DefaultOrg
+Organization.org=org.onap.aaf.osaaf.defOrg.DefaultOrg
 
 ## Email Server settings for Def Organization.
 #Sender's email ID needs to be mentioned