Adjust Logging Dir settings for ONAP Users

Issue-ID: AAF-360
Change-Id: If19090ef482372d3a3a9aa2856762af91bc54017
Signed-off-by: Instrumental <jonathan.gathman@att.com>

2 files changed, 5 insertions, 2 deletions

diff --git a/auth/auth-core/src/main/java/org/onap/aaf/auth/server/Log4JLogIt.java b/auth/auth-core/src/main/java/org/onap/aaf/auth/server/Log4JLogIt.java
index e295c867..e6f2fc95 100644
--- a/auth/auth-core/src/main/java/org/onap/aaf/auth/server/Log4JLogIt.java
+++ b/auth/auth-core/src/main/java/org/onap/aaf/auth/server/Log4JLogIt.java
@@ -62,6 +62,9 @@ public class Log4JLogIt implements LogIt {
 			logs.mkdirs();
 		}
 
+		if(System.getProperty("log4j.configuration")==null) {
+			System.setProperty("log4j.configuration", etc_dir+'/'+propsFile);
+		}
 		LogFileNamer lfn = new LogFileNamer(log_dir,root);
 		try {
 			service=lfn.setAppender("service"); // when name is split, i.e. authz|service, the Appender is "authz", and "service"
diff --git a/auth/auth-deforg/src/main/java/org/onap/aaf/org/DefaultOrg.java b/auth/auth-deforg/src/main/java/org/onap/aaf/org/DefaultOrg.java
index 3d42b63c..eefb2732 100644
--- a/auth/auth-deforg/src/main/java/org/onap/aaf/org/DefaultOrg.java
+++ b/auth/auth-deforg/src/main/java/org/onap/aaf/org/DefaultOrg.java
@@ -21,7 +21,8 @@
  ******************************************************************************/
 package org.onap.aaf.org;
 
-import java.io.*;
+import java.io.File;
+import java.io.IOException;
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.GregorianCalendar;
@@ -160,7 +161,6 @@ public class DefaultOrg implements Organization {
 	@Override
 	public DefaultOrgIdentity getIdentity(AuthzTrans trans, String id) throws OrganizationException {
 		int at = id.indexOf('@');
-		String attt = at<0?id:id.substring(0, at);
 		return new DefaultOrgIdentity(trans,at<0?id:id.substring(0, at),this);
 	}