Update pki-server ca-cert-import

The pki-server ca-cert-import has been updated to support
an absolute profile path.

base/ca/src/main/java/org/dogtagpki/server/ca/cli/CACertImportCLI.java

@@ -7,6 +7,7 @@
 
 import java.io.File;
 import java.nio.file.Files;
+import java.nio.file.Path;
 import java.nio.file.Paths;
 import java.security.SecureRandom;
 
@@ -105,8 +106,6 @@ public void execute(CommandLine cmd) throws Exception {
             throw new Exception("Missing profile ID");
         }
 
-        String profileID = cmd.getOptionValue("profile");
-
         // initialize JSS in pki-server CLI
         TomcatJSS tomcatjss = TomcatJSS.getInstance();
         tomcatjss.loadConfig();
@@ -147,10 +146,14 @@ public void execute(CommandLine cmd) throws Exception {
         CAEngineConfig cs = new CAEngineConfig(storage);
         cs.load();
 
-        String profilePath = confDir + File.separator + profileID;
+        // If the profile path is relative (e.g. caCert.profile),
+        // convert it to /var/lib/pki/pki-tomcat/ca/conf/<profile>
+        // If the profile path is absolute, use it as is.
+        String profile = cmd.getOptionValue("profile");
+        Path profilePath = Paths.get(confDir).resolve(profile);
 
         logger.info("Loading " + profilePath);
-        ConfigStorage profileStorage = new FileConfigStorage(profilePath);
+        ConfigStorage profileStorage = new FileConfigStorage(profilePath.toString());
         ConfigStore profileConfig = new ConfigStore(profileStorage);
         profileConfig.load();