X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=cadi%2Faaf%2Fsrc%2Fmain%2Fjava%2Forg%2Fonap%2Faaf%2Fcadi%2Fconfigure%2FArtifactDir.java;fp=cadi%2Faaf%2Fsrc%2Fmain%2Fjava%2Forg%2Fonap%2Faaf%2Fcadi%2Fcm%2FArtifactDir.java;h=74cf4e4b839cf4ee31bf200801367acb5e643584;hb=c060284812fbbc18fcf22eb628c47c251505fe50;hp=7259d68e2cb4dda791e7b4bb1232cc6e04c1b98f;hpb=2c0dd5c5136e249f63f1d3296063795cde30c399;p=aaf%2Fauthz.git

diff --git a/cadi/aaf/src/main/java/org/onap/aaf/cadi/cm/ArtifactDir.java b/cadi/aaf/src/main/java/org/onap/aaf/cadi/configure/ArtifactDir.java
similarity index 95%
rename from cadi/aaf/src/main/java/org/onap/aaf/cadi/cm/ArtifactDir.java
rename to cadi/aaf/src/main/java/org/onap/aaf/cadi/configure/ArtifactDir.java
index 7259d68e..74cf4e4b 100644
--- a/cadi/aaf/src/main/java/org/onap/aaf/cadi/cm/ArtifactDir.java
+++ b/cadi/aaf/src/main/java/org/onap/aaf/cadi/configure/ArtifactDir.java
@@ -19,7 +19,7 @@
  *
  */
 
-package org.onap.aaf.cadi.cm;
+package org.onap.aaf.cadi.configure;
 
 import java.io.File;
 import java.io.FileOutputStream;
@@ -29,6 +29,7 @@ import java.io.PrintStream;
 import java.io.PrintWriter;
 import java.security.KeyStore;
 import java.util.ArrayList;
+import java.util.Date;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -75,8 +76,8 @@ public abstract class ArtifactDir implements PlaceArtifact {
 				
 				// Also place cm_url and Host Name
 				addProperty(Config.CM_URL,trans.getProperty(Config.CM_URL));
-				addProperty(Config.HOSTNAME,machine);
-				addProperty(Config.AAF_ENV,certInfo.getEnv());
+//				addProperty(Config.HOSTNAME,machine);
+//				addProperty(Config.AAF_ENV,certInfo.getEnv());
 				// Obtain Issuers
 				boolean first = true;
 				StringBuilder issuers = new StringBuilder();
@@ -208,10 +209,11 @@ public abstract class ArtifactDir implements PlaceArtifact {
 		}
 		boolean first=processed.get("dir")==null;
 		try {
-			File f = new File(dir,arti.getNs()+".props");
+			File f = new File(dir,arti.getNs()+".cred.props");
 			if(f.exists()) {
 				if(first) {
-					f.delete();
+					File backup = File.createTempFile(f.getName()+'.', ".backup",dir);
+					f.renameTo(backup);
 				} else {
 					f.setWritable(true);
 				}