Update CM to us Local Intermediate Certs

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

23 files changed, 269 insertions, 167 deletions

diff --git a/cadi/aaf/src/main/java/org/onap/aaf/cadi/aaf/v2_0/AAFConHttp.java b/cadi/aaf/src/main/java/org/onap/aaf/cadi/aaf/v2_0/AAFConHttp.java
index 7237cb5f..9fc38d9f 100644
--- a/cadi/aaf/src/main/java/org/onap/aaf/cadi/aaf/v2_0/AAFConHttp.java
+++ b/cadi/aaf/src/main/java/org/onap/aaf/cadi/aaf/v2_0/AAFConHttp.java
@@ -70,8 +70,9 @@ public class AAFConHttp extends AAFCon<HttpURLConnection> {
 			} catch (IOException /*| GeneralSecurityException*/ e) {
 				throw new CadiException(e);
 			}
+		} else {
+			throw new CadiException("No IDs (" + Config.CADI_ALIAS + " or " + Config.AAF_APPID + ") have been identified.");
 		}
-		return null;
 	}
 
 	public AAFConHttp(Access access, String tag) throws APIException, CadiException, LocatorException {
diff --git a/cadi/aaf/src/main/java/org/onap/aaf/cadi/cm/CmAgent.java b/cadi/aaf/src/main/java/org/onap/aaf/cadi/configure/Agent.java
index a899662b..3c8719b4 100644
--- a/cadi/aaf/src/main/java/org/onap/aaf/cadi/cm/CmAgent.java
+++ b/cadi/aaf/src/main/java/org/onap/aaf/cadi/configure/Agent.java
@@ -19,13 +19,14 @@
  *
  */
 
-package org.onap.aaf.cadi.cm;
+package org.onap.aaf.cadi.configure;
 
 import java.io.File;
 import java.io.FileInputStream;
 import java.io.FileOutputStream;
 import java.io.PrintStream;
 import java.net.ConnectException;
+import java.net.HttpURLConnection;
 import java.net.InetAddress;
 import java.net.UnknownHostException;
 import java.nio.file.Files;
@@ -53,6 +54,7 @@ import org.onap.aaf.cadi.client.Future;
 import org.onap.aaf.cadi.client.Rcli;
 import org.onap.aaf.cadi.client.Retryable;
 import org.onap.aaf.cadi.config.Config;
+import org.onap.aaf.cadi.config.SecurityInfoC;
 import org.onap.aaf.cadi.http.HBasicAuthSS;
 import org.onap.aaf.cadi.locator.SingleEndpointLocator;
 import org.onap.aaf.cadi.sso.AAFSSO;
@@ -76,8 +78,8 @@ import certman.v1_0.CertificateRequest;
 import locate.v1_1.Configuration;
 import locate.v1_1.Configuration.Props;
 
-public class CmAgent {
-	private static final String HASHES = "######################";
+public class Agent {
+	private static final String HASHES = "################################################################";
 	private static final String PRINT = "print";
 	private static final String FILE = "file";
 	private static final String PKCS12 = "pkcs12";
@@ -103,25 +105,36 @@ public class CmAgent {
 		int exitCode = 0;
 		doExit = true;
 		try {
-			AAFSSO aafsso = new AAFSSO(args, new AAFSSO.ProcessArgs() {
-				@Override
-				public Properties process(String[] args, Properties props) {
-					if(args.length>1) {
-						if(args[0].equals("validate")) {
-							props.put(Config.CADI_PROP_FILES, args[1]);
-						} else if (!args[0].equals("genkeypair")) {
-							props.put("aaf_id", args[1]);
-						}	
+			AAFSSO aafsso;
+			PropAccess access;
+			
+			if(args.length>0 && args[0].equals("validate")) {
+				int idx = args[1].indexOf('=');
+				aafsso = null;
+				access = new PropAccess(
+							(idx<0?Config.CADI_PROP_FILES:args[1].substring(0, idx))+
+							'='+
+						    (idx<0?args[1]:args[1].substring(idx+1)));
+			} else {
+				aafsso= new AAFSSO(args, new AAFSSO.ProcessArgs() {
+					@Override
+					public Properties process(String[] args, Properties props) {
+						if(args.length>1) {
+							if (!args[0].equals("genkeypair")) {
+								props.put("aaf_id", args[1]);
+							}	
+						}
+						return props;
 					}
-					return props;
-				}
-			});
-			if(aafsso.loginOnly()) {
+				});
+				access = aafsso.access();
+			}
+				
+			if(aafsso!=null && aafsso.loginOnly()) {
 				aafsso.setLogDefault();
 				aafsso.writeFiles();
 				System.out.println("AAF SSO information created in ~/.aaf");
 			} else {
-				PropAccess access = aafsso.access();
 				env = new RosettaEnv(access.getProperties());
 				Deque<String> cmds = new ArrayDeque<String>();
 				for(String p : args) {
@@ -145,7 +158,7 @@ public class CmAgent {
 					System.out.println("   showpass <FQI> [<machine>]");
 					System.out.println("   check    <FQI> [<machine>]");
 					System.out.println("   config   <FQI>");
-					System.out.println("   validate <cadi.props>");
+					System.out.println("   validate <FQI>.props>");
 					System.out.println("   genkeypair");
 					if (doExit) {
 						System.exit(1);
@@ -174,16 +187,18 @@ public class CmAgent {
 					trans.setProperty("oauth_token", token);
 				}
 				try {
+					if(aafsso!=null) {
 					// show Std out again
-					aafsso.setLogDefault();
-					aafsso.setStdErrDefault();
-					
-					// if CM_URL can be obtained, add to sso.props, if written
-					String cm_url = getProperty(access,env,false, Config.CM_URL,Config.CM_URL+": ");
-					if(cm_url!=null) {
-						aafsso.addProp(Config.CM_URL, cm_url);
+						aafsso.setLogDefault();
+						aafsso.setStdErrDefault();
+						
+						// if CM_URL can be obtained, add to sso.props, if written
+						String cm_url = getProperty(access,env,false, Config.CM_URL,Config.CM_URL+": ");
+						if(cm_url!=null) {
+							aafsso.addProp(Config.CM_URL, cm_url);
+						}
+						aafsso.writeFiles();
 					}
-					aafsso.writeFiles();
 
 					AAFCon<?> aafcon = new AAFConHttp(access,Config.CM_URL);
 
@@ -214,7 +229,7 @@ public class CmAgent {
 							initConfig(trans,access,aafcon,cmds);
 							break;
 						case "validate":
-							validate(aafsso,aafcon);
+							validate(access);
 							break;
 						case "check":
 							try {
@@ -234,7 +249,9 @@ public class CmAgent {
 	                	trans.info().log("Trans Info\n",sb);
 	                }
 				}
-				aafsso.close();
+				if(aafsso!=null) {
+					aafsso.close();
+				}
 			}
 		} catch (Exception e) {
 			e.printStackTrace();
@@ -610,7 +627,7 @@ public class CmAgent {
 						if(allowed) {
 							File dir = new File(a.getDir());
 							Properties props = new Properties();
-							FileInputStream fis = new FileInputStream(new File(dir,a.getNs()+".props"));
+							FileInputStream fis = new FileInputStream(new File(dir,a.getNs()+".cred.props"));
 							try {
 								props.load(fis);
 								fis.close();
@@ -664,88 +681,135 @@ public class CmAgent {
 		TimeTaken tt = trans.start("Get Configuration", Env.REMOTE);
 		try {
 			boolean ok=false;
-			File fprops = File.createTempFile(rootFile, ".tmp",dir);
-			PrintStream out = new PrintStream(new FileOutputStream(fprops));
-			out.println(HASHES);
-			out.print("# Configuration File generated on ");
-			out.println(new Date().toString());
-			out.println(HASHES);
-			
-			File fkf = new File(dir,rootFile+".keyfile");
-			if(!fkf.exists()) {
-				CmdLine.main(new String[] {"keygen",fkf.toString()});
-			}
-			out.print("cadi_keyfile=");
-			out.println(fkf.getCanonicalPath());
-			
-			out.print(Config.AAF_APPID);
-			out.print('=');
-			out.println(fqi);
-			
-			Symm filesymm = Symm.obtain(fkf);
-			out.print(Config.AAF_APPPASS);
-			out.print("=enc:");
-			String ps = pa.decrypt(pa.getProperty(Config.AAF_APPPASS), false);
-			ps = filesymm.enpass(ps);
-			out.println(ps);
-			
-			out.print(Config.CADI_TRUSTSTORE);
-			out.print("=");
-			File origTruststore = new File(pa.getProperty(Config.CADI_TRUSTSTORE));
-			File newTruststore = new File(dir,origTruststore.getName());
-			if(!newTruststore.exists()) {
-				Files.copy(origTruststore.toPath(), newTruststore.toPath());
+			File fProps = File.createTempFile(rootFile, ".tmp",dir);
+			File fSecureTempProps = File.createTempFile(rootFile, ".cred.tmp",dir);
+			File fSecureProps = new File(dir,rootFile+".cred.props");
+			PrintStream psProps;
+
+			File fLocProps = new File(dir,rootFile + ".location.props");
+			if(!fLocProps.exists()) {
+				psProps = new PrintStream(new FileOutputStream(fLocProps));
+				try {
+					psProps.println(HASHES);
+					psProps.print("# Configuration File generated on ");
+					psProps.println(new Date().toString());
+					psProps.println(HASHES);
+					for(String tag : new String[] {Config.CADI_LATITUDE,Config.CADI_LONGITUDE}) {
+						psProps.print(tag);
+						psProps.print('=');
+						psProps.println(getProperty(pa, trans, false, tag, "%s: ",tag));
+					}
+				} finally {
+					psProps.close();
+				}
 			}
-			out.println(newTruststore.getCanonicalPath());
-
-			out.print(Config.CADI_TRUSTSTORE_PASSWORD);
-			out.print("=enc:");
-			ps = pa.decrypt(pa.getProperty(Config.CADI_TRUSTSTORE_PASSWORD), false);
-			ps = filesymm.enpass(ps);
-			out.println(ps);
 
-			
+			psProps = new PrintStream(new FileOutputStream(fProps));
 			try {
-				Future<Configuration> acf = aafcon.client(new SingleEndpointLocator(locator))
-						.read("/configure/"+fqi+"/aaf", configDF);
-				if(acf.get(TIMEOUT)) {
-//					out.println(acf.value.getName());
-					for(Props props : acf.value.getProps()) {
-						out.println(props.getTag() + '=' + props.getValue());					
+				PrintStream psCredProps = new PrintStream(new FileOutputStream(fSecureTempProps));
+				try {
+					psCredProps.println(HASHES);
+					psCredProps.print("# Configuration File generated on ");
+					psCredProps.println(new Date().toString());
+					psCredProps.println(HASHES);
+
+					psProps.println(HASHES);
+					psProps.print("# Configuration File generated on ");
+					psProps.println(new Date().toString());
+					psProps.println(HASHES);
+					
+					psProps.print(Config.CADI_PROP_FILES);
+					psProps.print('=');
+					psProps.print(fSecureProps.getCanonicalPath());
+					psProps.print(File.pathSeparatorChar);
+					psProps.println(fLocProps.getCanonicalPath());
+					
+					File fkf = new File(dir,rootFile+".keyfile");
+					if(!fkf.exists()) {
+						CmdLine.main(new String[] {"keygen",fkf.toString()});
 					}
-					ok = true;
-				} else if(acf.code()==401){
-					trans.error().log("Bad Password sent to AAF");
-				} else {
-					trans.error().log(errMsg.toMsg(acf));
+					psCredProps.print("cadi_keyfile=");
+					psCredProps.println(fkf.getCanonicalPath());
+					
+					psCredProps.print(Config.AAF_APPID);
+					psCredProps.print('=');
+					psCredProps.println(fqi);
+					
+					Symm filesymm = Symm.obtain(fkf);
+					psCredProps.print(Config.AAF_APPPASS);
+					psCredProps.print("=enc:");
+					String ps = pa.decrypt(pa.getProperty(Config.AAF_APPPASS), false);
+					ps = filesymm.enpass(ps);
+					psCredProps.println(ps);
+					
+					psCredProps.print(Config.CADI_TRUSTSTORE);
+					psCredProps.print("=");
+					File origTruststore = new File(pa.getProperty(Config.CADI_TRUSTSTORE));
+					File newTruststore = new File(dir,origTruststore.getName());
+					if(!newTruststore.exists()) {
+						Files.copy(origTruststore.toPath(), newTruststore.toPath());
+					}
+					psCredProps.println(newTruststore.getCanonicalPath());
+		
+					psCredProps.print(Config.CADI_TRUSTSTORE_PASSWORD);
+					psCredProps.print("=enc:");
+					ps = pa.decrypt(pa.getProperty(Config.CADI_TRUSTSTORE_PASSWORD), false);
+					ps = filesymm.enpass(ps);
+					psCredProps.println(ps);
+					
+					try {
+						Future<Configuration> acf = aafcon.client(new SingleEndpointLocator(locator))
+								.read("/configure/"+fqi+"/aaf", configDF);
+						if(acf.get(TIMEOUT)) {
+		//					out.println(acf.value.getName());
+							for(Props props : acf.value.getProps()) {
+								psProps.println(props.getTag() + '=' + props.getValue());					
+							}
+							ok = true;
+						} else if(acf.code()==401){
+							trans.error().log("Bad Password sent to AAF");
+						} else {
+							trans.error().log(errMsg.toMsg(acf));
+						}
+					} finally {
+						psProps.close();
+					}
+					if(ok) {
+						File newFile = new File(dir,rootFile+".props");
+						fProps.renameTo(newFile);
+						System.out.println("Created " + newFile.getCanonicalPath());
+						fProps = newFile;
+						
+						fSecureTempProps.renameTo(fSecureProps);
+						System.out.println("Created " + fSecureProps.getCanonicalPath());
+						fProps = newFile;
+					} else {
+						fProps.delete();
+						fSecureTempProps.delete();
+					}
+				} finally {
+					psCredProps.close();
 				}
 			} finally {
-				out.close();
-			}
-			if(ok) {
-				File newFile = new File(dir,rootFile+".common.props");
-				fprops.renameTo(newFile);
-				System.out.println("Created " + newFile.getCanonicalPath());
-				fprops = newFile;
-			} else {
-				fprops.delete();
+				psProps.close();
 			}
 		} finally {
 			tt.done();
 		}
 	}
 	
-	private static void validate(final AAFSSO aafsso, final AAFCon<?> aafcon) throws LocatorException, CadiException, APIException {
+	private static void validate(final PropAccess pa) throws LocatorException, CadiException, APIException {
 		System.out.println("Validating Configuration...");
-		aafcon.clone(aafsso.access().getProperty(Config.AAF_URL)).best(new Retryable<Void>() {
+		final AAFCon<?> aafcon = new AAFConHttp(pa,Config.AAF_URL,new SecurityInfoC<HttpURLConnection>(pa));
+		aafcon.best(new Retryable<Void>() {
 			@Override
 			public Void code(Rcli<?> client) throws CadiException, ConnectException, APIException {
-				Future<Perms> fc = client.read("/authz/perms/user/"+aafsso.user(),permDF);
+				Future<Perms> fc = client.read("/authz/perms/user/"+aafcon.defID(),permDF);
 				if(fc.get(aafcon.timeout)) {
 					System.out.print("Success connecting to ");
 					System.out.println(client.getURI());
 					System.out.print("   Permissions for ");
-					System.out.println(aafsso.user());
+					System.out.println(aafcon.defID());
 					for(Perm p : fc.value.getPerm()) {
 						System.out.print('\t');
 						System.out.print(p.getType());
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
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);
 				}
diff --git a/cadi/aaf/src/main/java/org/onap/aaf/cadi/cm/CertException.java b/cadi/aaf/src/main/java/org/onap/aaf/cadi/configure/CertException.java
index 5c525ff2..4ea5e335 100644
--- a/cadi/aaf/src/main/java/org/onap/aaf/cadi/cm/CertException.java
+++ b/cadi/aaf/src/main/java/org/onap/aaf/cadi/configure/CertException.java
@@ -19,7 +19,7 @@
  *
  */
 
-package org.onap.aaf.cadi.cm;
+package org.onap.aaf.cadi.configure;
 
 public class CertException extends Exception {
 
diff --git a/cadi/aaf/src/main/java/org/onap/aaf/cadi/cm/Factory.java b/cadi/aaf/src/main/java/org/onap/aaf/cadi/configure/Factory.java
index e969fab3..5bb99131 100644
--- a/cadi/aaf/src/main/java/org/onap/aaf/cadi/cm/Factory.java
+++ b/cadi/aaf/src/main/java/org/onap/aaf/cadi/configure/Factory.java
@@ -19,7 +19,7 @@
  *
  */
 
-package org.onap.aaf.cadi.cm;
+package org.onap.aaf.cadi.configure;
 
 import java.io.BufferedReader;
 import java.io.ByteArrayInputStream;
@@ -64,6 +64,7 @@ import javax.crypto.Cipher;
 import javax.crypto.NoSuchPaddingException;
 
 import org.onap.aaf.cadi.Symm;
+import org.onap.aaf.cadi.client.Holder;
 import org.onap.aaf.misc.env.Env;
 import org.onap.aaf.misc.env.TimeTaken;
 import org.onap.aaf.misc.env.Trans;
@@ -155,10 +156,10 @@ public class Factory {
 	}
 	
 	public static PrivateKey toPrivateKey(Trans trans, String pk) throws IOException, CertException {
-		byte[] bytes = decode(new StringReader(pk));
+		byte[] bytes = decode(new StringReader(pk), null);
 		return toPrivateKey(trans, bytes);
 	}
-	
+
 	public static PrivateKey toPrivateKey(Trans trans, byte[] bytes) throws IOException, CertException {
 		TimeTaken tt=trans.start("Reconstitute Private Key", Env.SUB);
 		try {
@@ -169,11 +170,12 @@ public class Factory {
 			tt.done();
 		}
 	}
-	
+
 	public static PrivateKey toPrivateKey(Trans trans, File file) throws IOException, CertException {
 		TimeTaken tt = trans.start("Decode Private Key File", Env.SUB);
 		try {
-			return toPrivateKey(trans,decode(file));
+			Holder<String> firstLine = new Holder<String>(null);
+			return toPrivateKey(trans,decode(file,firstLine));
 		}finally {
 			tt.done();
 		}
@@ -190,7 +192,7 @@ public class Factory {
 		try {
 			ByteArrayInputStream bais = new ByteArrayInputStream(pk.getBytes());
 			ByteArrayOutputStream baos = new ByteArrayOutputStream();
-			Symm.base64noSplit.decode(bais, baos);
+			Symm.base64noSplit.decode(new StripperInputStream(bais), baos);
 
 			return keyFactory.generatePublic(new X509EncodedKeySpec(baos.toByteArray()));
 		} catch (InvalidKeySpecException e) {
@@ -273,10 +275,25 @@ public class Factory {
 	}
 
 	public static byte[] strip(Reader rdr) throws IOException {
+		return strip(rdr,null);
+	}
+	
+	public static byte[] strip(Reader rdr, Holder<String> hs) throws IOException {
 		BufferedReader br = new BufferedReader(rdr);
 		ByteArrayOutputStream baos = new ByteArrayOutputStream();
 		String line;
+		boolean notStarted = true;
 		while((line=br.readLine())!=null) {
+			if(notStarted) {
+				if(line.startsWith("-----")) {
+					notStarted = false;
+					if(hs!=null) {
+						hs.set(line);
+					}
+				} else {
+					continue;
+				}
+			}
 			if(line.length()>0 &&
 			   !line.startsWith("-----") &&
 			   line.indexOf(':')<0) {  // Header elements
@@ -285,7 +302,7 @@ public class Factory {
 		}
 		return baos.toByteArray();
 	}
-	
+
 	public static class StripperInputStream extends InputStream {
 		private Reader created;
 		private BufferedReader br;
@@ -395,17 +412,18 @@ public class Factory {
 		return baos.toByteArray();
 	}
 	
-	public static byte[] decode(File f) throws IOException {
+	public static byte[] decode(File f, Holder<String> hs) throws IOException {
 		FileReader fr = new FileReader(f);
 		try {
-			return Factory.decode(fr);
+			return Factory.decode(fr,hs);
 		} finally {
 			fr.close();
 		}
-
 	}
-	public static byte[] decode(Reader rdr) throws IOException {
-		return decode(strip(rdr));
+
+
+	public static byte[] decode(Reader rdr,Holder<String> hs) throws IOException {
+		return decode(strip(rdr,hs));
 	}
 
 
diff --git a/cadi/aaf/src/main/java/org/onap/aaf/cadi/cm/PlaceArtifact.java b/cadi/aaf/src/main/java/org/onap/aaf/cadi/configure/PlaceArtifact.java
index 369f48d0..4b200c04 100644
--- a/cadi/aaf/src/main/java/org/onap/aaf/cadi/cm/PlaceArtifact.java
+++ b/cadi/aaf/src/main/java/org/onap/aaf/cadi/configure/PlaceArtifact.java
@@ -19,7 +19,7 @@
  *
  */
 
-package org.onap.aaf.cadi.cm;
+package org.onap.aaf.cadi.configure;
 
 import certman.v1_0.Artifacts.Artifact;
 import certman.v1_0.CertInfo;
diff --git a/cadi/aaf/src/main/java/org/onap/aaf/cadi/cm/PlaceArtifactInFiles.java b/cadi/aaf/src/main/java/org/onap/aaf/cadi/configure/PlaceArtifactInFiles.java
index f419577b..25fe776c 100644
--- a/cadi/aaf/src/main/java/org/onap/aaf/cadi/cm/PlaceArtifactInFiles.java
+++ b/cadi/aaf/src/main/java/org/onap/aaf/cadi/configure/PlaceArtifactInFiles.java
@@ -19,7 +19,7 @@
  *
  */
 
-package org.onap.aaf.cadi.cm;
+package org.onap.aaf.cadi.configure;
 
 import java.io.File;
 
@@ -36,6 +36,7 @@ public class PlaceArtifactInFiles extends ArtifactDir {
 		try {
 			// Setup Public Cert
 			File f = new File(dir,arti.getNs()+".crt");
+			// In Version 1.0, App Cert is first
 			write(f,Chmod.to644,certInfo.getCerts().get(0),C_R);
 			
 			// Setup Private Key
diff --git a/cadi/aaf/src/main/java/org/onap/aaf/cadi/cm/PlaceArtifactInKeystore.java b/cadi/aaf/src/main/java/org/onap/aaf/cadi/configure/PlaceArtifactInKeystore.java
index 2b498d4f..2a522bc1 100644
--- a/cadi/aaf/src/main/java/org/onap/aaf/cadi/cm/PlaceArtifactInKeystore.java
+++ b/cadi/aaf/src/main/java/org/onap/aaf/cadi/configure/PlaceArtifactInKeystore.java
@@ -19,7 +19,7 @@
  *
  */
 
-package org.onap.aaf.cadi.cm;
+package org.onap.aaf.cadi.configure;
 
 import java.io.File;
 import java.security.KeyStore;
@@ -28,7 +28,10 @@ import java.security.cert.Certificate;
 import java.security.cert.X509Certificate;
 import java.util.ArrayList;
 import java.util.Collection;
+import java.util.Collections;
+import java.util.HashSet;
 import java.util.List;
+import java.util.Set;
 
 import org.onap.aaf.cadi.CadiException;
 import org.onap.aaf.cadi.Symm;
@@ -52,7 +55,8 @@ public class PlaceArtifactInKeystore extends ArtifactDir {
 		try {
 			KeyStore jks = KeyStore.getInstance(kst);
 			if(fks.exists()) {
-				fks.delete();
+				File backup = File.createTempFile(fks.getName()+'.', ".backup",dir);
+				fks.renameTo(backup);
 			}	
 
 			// Get the Cert(s)... Might include Trust store
@@ -60,29 +64,26 @@ public class PlaceArtifactInKeystore extends ArtifactDir {
 			// find where the trusts end in 1.0 API
 		
 			X509Certificate x509;
-			List<X509Certificate> certList = new ArrayList<X509Certificate>();
-			Certificate[] trustChain = null;
-			Certificate[] trustCAs;
+			List<X509Certificate> chainList = new ArrayList<X509Certificate>();
+			Set<X509Certificate> caSet = new HashSet<X509Certificate>();
 			for(Certificate c : certColl) {
 				x509 = (X509Certificate)c;
-				if(trustChain==null && x509.getSubjectDN().equals(x509.getIssuerDN())) {
-					trustChain = new Certificate[certList.size()];
-					certList.toArray(trustChain);
-					certList.clear(); // reuse
+				// Is a Root (self-signed, anyway)
+				if(x509.getSubjectDN().equals(x509.getIssuerDN())) {
+					caSet.add(x509);
+				} else {
+					chainList.add(x509);
 				}
-				certList.add(x509);
 			}
-			
-			// remainder should be Trust CAs
-			trustCAs = new Certificate[certList.size()];
-			certList.toArray(trustCAs);
+//			chainList.addAll(caSet);
+			//Collections.reverse(chainList);
 
 			// Properties, etc
 			// Add CADI Keyfile Entry to Properties
 			addProperty(Config.CADI_KEYFILE,arti.getDir()+'/'+arti.getNs() + ".keyfile");
 			// Set Keystore Password
 			addProperty(Config.CADI_KEYSTORE,fks.getAbsolutePath());
-			String keystorePass = Symm.randomGen(CmAgent.PASS_SIZE);
+			String keystorePass = Symm.randomGen(Agent.PASS_SIZE);
 			addEncProperty(Config.CADI_KEYSTORE_PASSWORD,keystorePass);
 			char[] keystorePassArray = keystorePass.toCharArray();
 			jks.load(null,keystorePassArray); // load in
@@ -106,6 +107,8 @@ public class PlaceArtifactInKeystore extends ArtifactDir {
 			KeyStore.ProtectionParameter protParam = 
 					new KeyStore.PasswordProtection(keyPass.toCharArray());
 			
+			Certificate[] trustChain = new Certificate[chainList.size()];
+			chainList.toArray(trustChain);
 			KeyStore.PrivateKeyEntry pkEntry = 
 				new KeyStore.PrivateKeyEntry(pk, trustChain);
 			jks.setEntry(arti.getMechid(), 
@@ -116,16 +119,23 @@ public class PlaceArtifactInKeystore extends ArtifactDir {
 			
 			// Change out to TrustStore
 			fks = new File(dir,arti.getNs()+".trust."+kst);
+			if(fks.exists()) {
+				File backup = File.createTempFile(fks.getName()+'.', ".backup",dir);
+				fks.renameTo(backup);
+			}	
+
 			jks = KeyStore.getInstance(kst);
 			
 			// Set Truststore Password
 			addProperty(Config.CADI_TRUSTSTORE,fks.getAbsolutePath());
-			String trustStorePass = Symm.randomGen(CmAgent.PASS_SIZE);
+			String trustStorePass = Symm.randomGen(Agent.PASS_SIZE);
 			addEncProperty(Config.CADI_TRUSTSTORE_PASSWORD,trustStorePass);
 			char[] truststorePassArray = trustStorePass.toCharArray();
 			jks.load(null,truststorePassArray); // load in
 			
 			// Add Trusted Certificates, but PKCS12 doesn't support
+			Certificate[] trustCAs = new Certificate[caSet.size()];
+			caSet.toArray(trustCAs);
 			for(int i=0; i<trustCAs.length;++i) {
 				jks.setCertificateEntry("ca_" + arti.getCa() + '_' + i, trustCAs[i]);
 			}
diff --git a/cadi/aaf/src/main/java/org/onap/aaf/cadi/cm/PlaceArtifactOnStream.java b/cadi/aaf/src/main/java/org/onap/aaf/cadi/configure/PlaceArtifactOnStream.java
index 1ae5be94..b6aeafe6 100644
--- a/cadi/aaf/src/main/java/org/onap/aaf/cadi/cm/PlaceArtifactOnStream.java
+++ b/cadi/aaf/src/main/java/org/onap/aaf/cadi/configure/PlaceArtifactOnStream.java
@@ -19,7 +19,7 @@
  *
  */
 
-package org.onap.aaf.cadi.cm;
+package org.onap.aaf.cadi.configure;
 
 import java.io.PrintStream;
 
diff --git a/cadi/aaf/src/main/java/org/onap/aaf/cadi/cm/PlaceArtifactScripts.java b/cadi/aaf/src/main/java/org/onap/aaf/cadi/configure/PlaceArtifactScripts.java
index 9347f70e..84161b50 100644
--- a/cadi/aaf/src/main/java/org/onap/aaf/cadi/cm/PlaceArtifactScripts.java
+++ b/cadi/aaf/src/main/java/org/onap/aaf/cadi/configure/PlaceArtifactScripts.java
@@ -19,7 +19,7 @@
  *
  */
 
-package org.onap.aaf.cadi.cm;
+package org.onap.aaf.cadi.configure;
 
 import java.io.File;
 
@@ -116,7 +116,7 @@ public class PlaceArtifactScripts extends ArtifactDir {
 			" fi\n" +
 			"}\n\n" +
 			javaHome() + "/bin/" +"java -cp $CP " +
-				CmAgent.class.getName() + 
+				Agent.class.getName() + 
 				" cadi_prop_files=$DIR/$APP.props check 2>  $DIR/$APP.STDERR > $DIR/$APP.STDOUT\n" +
 			"case \"$?\" in\n" +
 			"  0)\n" +
diff --git a/cadi/aaf/src/test/java/org/onap/aaf/cadi/cm/test/JU_ArtifactDir.java b/cadi/aaf/src/test/java/org/onap/aaf/cadi/cm/test/JU_ArtifactDir.java
index d0d67e23..ed23179a 100644
--- a/cadi/aaf/src/test/java/org/onap/aaf/cadi/cm/test/JU_ArtifactDir.java
+++ b/cadi/aaf/src/test/java/org/onap/aaf/cadi/cm/test/JU_ArtifactDir.java
@@ -42,7 +42,7 @@ import org.junit.Test;
 import org.mockito.Mock;
 import org.mockito.MockitoAnnotations;
 import org.onap.aaf.cadi.CadiException;
-import org.onap.aaf.cadi.cm.ArtifactDir;
+import org.onap.aaf.cadi.configure.ArtifactDir;
 import org.onap.aaf.cadi.util.Chmod;
 import org.onap.aaf.misc.env.Trans;
 
diff --git a/cadi/aaf/src/test/java/org/onap/aaf/cadi/cm/test/JU_CertException.java b/cadi/aaf/src/test/java/org/onap/aaf/cadi/cm/test/JU_CertException.java
index aa12d7c6..a973bc22 100644
--- a/cadi/aaf/src/test/java/org/onap/aaf/cadi/cm/test/JU_CertException.java
+++ b/cadi/aaf/src/test/java/org/onap/aaf/cadi/cm/test/JU_CertException.java
@@ -24,8 +24,7 @@ package org.onap.aaf.cadi.cm.test;
 import static org.junit.Assert.*;
 import static org.hamcrest.CoreMatchers.*;
 import org.junit.*;
-
-import org.onap.aaf.cadi.cm.CertException;
+import org.onap.aaf.cadi.configure.CertException;
 
 public class JU_CertException {
 
diff --git a/cadi/aaf/src/test/java/org/onap/aaf/cadi/cm/test/JU_CmAgent.java b/cadi/aaf/src/test/java/org/onap/aaf/cadi/cm/test/JU_CmAgent.java
index fbeb360f..b50c5a5e 100644
--- a/cadi/aaf/src/test/java/org/onap/aaf/cadi/cm/test/JU_CmAgent.java
+++ b/cadi/aaf/src/test/java/org/onap/aaf/cadi/cm/test/JU_CmAgent.java
@@ -28,7 +28,7 @@ import java.io.File;
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
-import org.onap.aaf.cadi.cm.CmAgent;
+import org.onap.aaf.cadi.configure.Agent;
 
 public class JU_CmAgent {
 
@@ -58,62 +58,62 @@ public class JU_CmAgent {
 				"-login",
 				"-noExit",
 		};
-		CmAgent.main(args);
+		Agent.main(args);
 
 		inStream.reset();
 		args = new String[] {
 				"-noExit",
 		};
-		CmAgent.main(args);
+		Agent.main(args);
 
 		inStream.reset();
 		args = new String[] {
 				"place",
 				"-noExit",
 		};
-		CmAgent.main(args);
+		Agent.main(args);
 
 		inStream.reset();
 		args = new String[] {
 				"-noExit",
 				"create"
 		};
-		CmAgent.main(args);
+		Agent.main(args);
 
 		inStream.reset();
 		args = new String[] {
 				"-noExit",
 				"read"
 		};
-		CmAgent.main(args);
+		Agent.main(args);
 
 		inStream.reset();
 		args = new String[] {
 				"-noExit",
 				"copy"
 		};
-		CmAgent.main(args);
+		Agent.main(args);
 
 		inStream.reset();
 		args = new String[] {
 				"-noExit",
 				"update"
 		};
-		CmAgent.main(args);
+		Agent.main(args);
 
 		inStream.reset();
 		args = new String[] {
 				"-noExit",
 				"delete"
 		};
-		CmAgent.main(args);
+		Agent.main(args);
 
 		inStream.reset();
 		args = new String[] {
 				"-noExit",
 				"showpass"
 		};
-		CmAgent.main(args);
+		Agent.main(args);
 
 	}
 
diff --git a/cadi/aaf/src/test/java/org/onap/aaf/cadi/cm/test/JU_Factory.java b/cadi/aaf/src/test/java/org/onap/aaf/cadi/cm/test/JU_Factory.java
index fb186b89..b47abe2c 100644
--- a/cadi/aaf/src/test/java/org/onap/aaf/cadi/cm/test/JU_Factory.java
+++ b/cadi/aaf/src/test/java/org/onap/aaf/cadi/cm/test/JU_Factory.java
@@ -57,11 +57,10 @@ import java.util.List;
 
 import javax.crypto.Cipher;
 
-import org.onap.aaf.cadi.cm.CertException;
-import org.onap.aaf.cadi.cm.Factory;
-import org.onap.aaf.cadi.cm.Factory.Base64InputStream;
-import org.onap.aaf.cadi.cm.Factory.StripperInputStream;
-
+import org.onap.aaf.cadi.configure.CertException;
+import org.onap.aaf.cadi.configure.Factory;
+import org.onap.aaf.cadi.configure.Factory.Base64InputStream;
+import org.onap.aaf.cadi.configure.Factory.StripperInputStream;
 import org.onap.aaf.misc.env.Env;
 import org.onap.aaf.misc.env.LogTarget;
 import org.onap.aaf.misc.env.TimeTaken;
@@ -162,8 +161,8 @@ public class JU_Factory {
 		assertThat(privateKeyString.startsWith("-----BEGIN PRIVATE KEY-----"), is(true));
 		assertThat(privateKeyString.endsWith("-----END PRIVATE KEY-----\n"), is(true));
 
-		PublicKey publicKey = Factory.toPublicKey(transMock, cleanupString(publicKeyString));
-		PrivateKey privateKey = Factory.toPrivateKey(transMock, cleanupString(privateKeyString));
+		PublicKey publicKey = Factory.toPublicKey(transMock, publicKeyString);
+		PrivateKey privateKey = Factory.toPrivateKey(transMock, privateKeyString);
 
 		Cipher encryptor = Factory.pkCipher(publicKey, true);
 		Cipher decryptor = Factory.pkCipher(privateKey, false);
diff --git a/cadi/aaf/src/test/java/org/onap/aaf/cadi/cm/test/JU_PlaceArtifactInFiles.java b/cadi/aaf/src/test/java/org/onap/aaf/cadi/cm/test/JU_PlaceArtifactInFiles.java
index 3c83112c..7afb4cf4 100644
--- a/cadi/aaf/src/test/java/org/onap/aaf/cadi/cm/test/JU_PlaceArtifactInFiles.java
+++ b/cadi/aaf/src/test/java/org/onap/aaf/cadi/cm/test/JU_PlaceArtifactInFiles.java
@@ -32,7 +32,7 @@ import java.util.List;
 import org.junit.*;
 import org.mockito.*;
 import org.onap.aaf.cadi.CadiException;
-import org.onap.aaf.cadi.cm.PlaceArtifactInFiles;
+import org.onap.aaf.cadi.configure.PlaceArtifactInFiles;
 import org.onap.aaf.misc.env.Trans;
 
 import certman.v1_0.Artifacts.Artifact;
diff --git a/cadi/aaf/src/test/java/org/onap/aaf/cadi/cm/test/JU_PlaceArtifactInKeystore.java b/cadi/aaf/src/test/java/org/onap/aaf/cadi/cm/test/JU_PlaceArtifactInKeystore.java
index d146f631..0b086f11 100644
--- a/cadi/aaf/src/test/java/org/onap/aaf/cadi/cm/test/JU_PlaceArtifactInKeystore.java
+++ b/cadi/aaf/src/test/java/org/onap/aaf/cadi/cm/test/JU_PlaceArtifactInKeystore.java
@@ -39,7 +39,7 @@ import java.security.cert.CertificateException;
 import org.junit.*;
 import org.mockito.*;
 import org.onap.aaf.cadi.CadiException;
-import org.onap.aaf.cadi.cm.PlaceArtifactInKeystore;
+import org.onap.aaf.cadi.configure.PlaceArtifactInKeystore;
 import org.onap.aaf.misc.env.Env;
 import org.onap.aaf.misc.env.TimeTaken;
 import org.onap.aaf.misc.env.Trans;
@@ -102,8 +102,9 @@ public class JU_PlaceArtifactInKeystore {
 		certs.add(x509String);
 		certs.add(x509Chain);
 		assertThat(placer.place(transMock, certInfoMock, artiMock, "machine"), is(true));
-		for (String ext : new String[] {"chal", "keyfile", "jks", "props", "trust.jks"}) {
-			assertThat(new File(dirName + '/' + nsName + '.' + ext).exists(), is(true));
+		for (String ext : new String[] {"chal", "keyfile", "jks", "trust.jks", "cred.props"}) {
+			File f = new File(dirName + '/' + nsName + '.' + ext);
+			assertThat(f.exists(), is(true));
 		}
 
 		// coverage
diff --git a/cadi/aaf/src/test/java/org/onap/aaf/cadi/cm/test/JU_PlaceArtifactOnStream.java b/cadi/aaf/src/test/java/org/onap/aaf/cadi/cm/test/JU_PlaceArtifactOnStream.java
index 6e390bed..3d8f41c6 100644
--- a/cadi/aaf/src/test/java/org/onap/aaf/cadi/cm/test/JU_PlaceArtifactOnStream.java
+++ b/cadi/aaf/src/test/java/org/onap/aaf/cadi/cm/test/JU_PlaceArtifactOnStream.java
@@ -32,8 +32,7 @@ import java.util.List;
 
 import org.junit.*;
 import org.mockito.*;
-
-import org.onap.aaf.cadi.cm.PlaceArtifactOnStream;
+import org.onap.aaf.cadi.configure.PlaceArtifactOnStream;
 import org.onap.aaf.misc.env.LogTarget;
 import org.onap.aaf.misc.env.Trans;
 
diff --git a/cadi/aaf/src/test/java/org/onap/aaf/cadi/cm/test/JU_PlaceArtifactScripts.java b/cadi/aaf/src/test/java/org/onap/aaf/cadi/cm/test/JU_PlaceArtifactScripts.java
index 0ed29e10..682606c0 100644
--- a/cadi/aaf/src/test/java/org/onap/aaf/cadi/cm/test/JU_PlaceArtifactScripts.java
+++ b/cadi/aaf/src/test/java/org/onap/aaf/cadi/cm/test/JU_PlaceArtifactScripts.java
@@ -30,7 +30,7 @@ import java.io.File;
 import org.junit.*;
 import org.mockito.*;
 import org.onap.aaf.cadi.CadiException;
-import org.onap.aaf.cadi.cm.PlaceArtifactScripts;
+import org.onap.aaf.cadi.configure.PlaceArtifactScripts;
 import org.onap.aaf.misc.env.Trans;
 
 import certman.v1_0.Artifacts.Artifact;
diff --git a/cadi/core/src/main/java/org/onap/aaf/cadi/Symm.java b/cadi/core/src/main/java/org/onap/aaf/cadi/Symm.java
index ea3891f9..5a3fe825 100644
--- a/cadi/core/src/main/java/org/onap/aaf/cadi/Symm.java
+++ b/cadi/core/src/main/java/org/onap/aaf/cadi/Symm.java
@@ -450,9 +450,11 @@ public class Symm {
 		   this.range = range;
 	   }
 	   public int convert(int read) throws IOException {
+		   // System.out.print((char)read);
 		   switch(read) {
 			   case -1: 
 			   case '=':
+			   case ' ':
 			   case '\n':
 			   case '\r':
 				   return -1;
diff --git a/cadi/core/src/main/java/org/onap/aaf/cadi/config/Config.java b/cadi/core/src/main/java/org/onap/aaf/cadi/config/Config.java
index c79c5cce..9a0a53cf 100644
--- a/cadi/core/src/main/java/org/onap/aaf/cadi/config/Config.java
+++ b/cadi/core/src/main/java/org/onap/aaf/cadi/config/Config.java
@@ -43,6 +43,7 @@ import org.onap.aaf.cadi.CadiException;
 import org.onap.aaf.cadi.Connector;
 import org.onap.aaf.cadi.CredVal;
 import org.onap.aaf.cadi.Locator;
+import org.onap.aaf.cadi.LocatorException;
 import org.onap.aaf.cadi.Lur;
 import org.onap.aaf.cadi.PropAccess;
 import org.onap.aaf.cadi.Symm;
@@ -225,7 +226,7 @@ public class Config {
 		}
 	}
 
-	public static HttpTaf configHttpTaf(Connector con, SecurityInfoC<HttpURLConnection> si, TrustChecker tc, CredVal up, Lur lur, Object ... additionalTafLurs) throws CadiException {
+	public static HttpTaf configHttpTaf(Connector con, SecurityInfoC<HttpURLConnection> si, TrustChecker tc, CredVal up, Lur lur, Object ... additionalTafLurs) throws CadiException, LocatorException {
 		Access access = si.access;
 		/////////////////////////////////////////////////////
 		// Setup AAFCon for any following
@@ -712,7 +713,7 @@ public class Config {
 
 
 	@SuppressWarnings("unchecked")
-	public static Locator<URI> loadLocator(SecurityInfoC<HttpURLConnection> si, final String _url) {
+	public static Locator<URI> loadLocator(SecurityInfoC<HttpURLConnection> si, final String _url) throws LocatorException {
 		Access access = si.access;
 		Locator<URI> locator = null;
 		if(_url==null) {
@@ -753,6 +754,9 @@ public class Config {
 					access.log(Level.INFO, "AAFLocator enabled using preloaded " + locator.getClass().getSimpleName());
 				}
 			} catch (InvocationTargetException e) {
+				if(e.getTargetException() instanceof LocatorException) {
+					throw (LocatorException)e.getTargetException();
+				}
 				access.log(Level.INIT,e.getTargetException().getMessage(),"AAFLocator for",url,"could not be created.",e);
 			} catch (Exception e) {
 				access.log(Level.INIT,"AAFLocator for",url,"could not be created.",e);
diff --git a/cadi/core/src/main/java/org/onap/aaf/cadi/config/SecurityInfoC.java b/cadi/core/src/main/java/org/onap/aaf/cadi/config/SecurityInfoC.java
index 33aef6c9..cc366c27 100644
--- a/cadi/core/src/main/java/org/onap/aaf/cadi/config/SecurityInfoC.java
+++ b/cadi/core/src/main/java/org/onap/aaf/cadi/config/SecurityInfoC.java
@@ -34,7 +34,7 @@ public class SecurityInfoC<CLIENT> extends SecurityInfo {
 	private static Map<Class<?>,SecurityInfoC<?>> sicMap = new HashMap<Class<?>,SecurityInfoC<?>>();
 	public SecuritySetter<CLIENT> defSS;
 
-	private SecurityInfoC(Access access) throws CadiException {
+	public SecurityInfoC(Access access) throws CadiException {
 		super(access);
 		defSS = new SecuritySetter<CLIENT>() {
 				@Override
@@ -54,14 +54,14 @@ public class SecurityInfoC<CLIENT> extends SecurityInfo {
 			};
 	}
 	
-	@SuppressWarnings("unchecked")
 	public static synchronized <CLIENT> SecurityInfoC<CLIENT> instance(Access access, Class<CLIENT> cls) throws CadiException {
-		SecurityInfoC<?> sic = sicMap.get(cls);
+		@SuppressWarnings("unchecked")
+		SecurityInfoC<CLIENT> sic = (SecurityInfoC<CLIENT>) sicMap.get(cls);
 		if(sic==null) {
 			sic = new SecurityInfoC<CLIENT>(access); 
 			sicMap.put(cls, sic);
 		}
-		return (SecurityInfoC<CLIENT>)sic;
+		return sic;
 	}
 
 	public SecurityInfoC<CLIENT> set(SecuritySetter<CLIENT> defSS) {
diff --git a/cadi/core/src/main/java/org/onap/aaf/cadi/filter/CadiFilter.java b/cadi/core/src/main/java/org/onap/aaf/cadi/filter/CadiFilter.java
index 8577d55c..1f302c64 100644
--- a/cadi/core/src/main/java/org/onap/aaf/cadi/filter/CadiFilter.java
+++ b/cadi/core/src/main/java/org/onap/aaf/cadi/filter/CadiFilter.java
@@ -38,6 +38,7 @@ import javax.servlet.http.HttpServletResponse;
 import org.onap.aaf.cadi.Access;
 import org.onap.aaf.cadi.CadiException;
 import org.onap.aaf.cadi.CadiWrap;
+import org.onap.aaf.cadi.LocatorException;
 import org.onap.aaf.cadi.Lur;
 import org.onap.aaf.cadi.PropAccess;
 import org.onap.aaf.cadi.ServletContextAccess;
@@ -188,7 +189,7 @@ public class CadiFilter implements Filter {
 				}
 				try {
 					httpChecker = new CadiHTTPManip(access,null /*reuseable Con*/,tc, additionalTafLurs);
-				} catch (CadiException e1) {
+				} catch (CadiException | LocatorException e1) {
 					throw new ServletException(e1);
 				}
 			} else if(access==null) {
diff --git a/cadi/core/src/main/java/org/onap/aaf/cadi/filter/CadiHTTPManip.java b/cadi/core/src/main/java/org/onap/aaf/cadi/filter/CadiHTTPManip.java
index 006d6b4e..0cc52203 100644
--- a/cadi/core/src/main/java/org/onap/aaf/cadi/filter/CadiHTTPManip.java
+++ b/cadi/core/src/main/java/org/onap/aaf/cadi/filter/CadiHTTPManip.java
@@ -32,6 +32,7 @@ import org.onap.aaf.cadi.CadiException;
 import org.onap.aaf.cadi.CadiWrap;
 import org.onap.aaf.cadi.Connector;
 import org.onap.aaf.cadi.CredVal;
+import org.onap.aaf.cadi.LocatorException;
 import org.onap.aaf.cadi.Lur;
 import org.onap.aaf.cadi.Taf;
 import org.onap.aaf.cadi.TrustChecker;
@@ -70,7 +71,7 @@ public class CadiHTTPManip {
 	public static final Object[] noAdditional = new Object[0]; // CadiFilter can be created each call in some systems
 
 
-	public CadiHTTPManip(Access access, Connector con, TrustChecker tc, Object ... additionalTafLurs) throws CadiException {
+	public CadiHTTPManip(Access access, Connector con, TrustChecker tc, Object ... additionalTafLurs) throws CadiException, LocatorException {
 		synchronized(LOCK) {
 			this.access = access;
 //			Get getter = new AccessGetter(access);