X-Git-Url: https://git.argeo.org/?a=blobdiff_plain;f=org.argeo.cms%2Fsrc%2Forg%2Fargeo%2Fcms%2Finternal%2Fruntime%2FCmsStateImpl.java;h=d335b48b191b111ce428ac2bab5dc19beff228e8;hb=2752f591462f846423020ef1c1989766b20cd554;hp=47a4b1ff6c3c61301fdf7839d8072eb780dcf5f6;hpb=36c0ba6709ae9a3974c1d1dce01ebe47c5aec24e;p=lgpl%2Fargeo-commons.git

diff --git a/org.argeo.cms/src/org/argeo/cms/internal/runtime/CmsStateImpl.java b/org.argeo.cms/src/org/argeo/cms/internal/runtime/CmsStateImpl.java
index 47a4b1ff6..d335b48b1 100644
--- a/org.argeo.cms/src/org/argeo/cms/internal/runtime/CmsStateImpl.java
+++ b/org.argeo.cms/src/org/argeo/cms/internal/runtime/CmsStateImpl.java
@@ -4,9 +4,7 @@ import java.io.File;
 import java.io.FileFilter;
 import java.io.IOException;
 import java.io.Reader;
-import java.net.InetAddress;
 import java.net.URL;
-import java.net.UnknownHostException;
 import java.nio.charset.StandardCharsets;
 import java.nio.file.Files;
 import java.nio.file.Path;
@@ -44,7 +42,7 @@ public class CmsStateImpl implements CmsState {
 
 	private UUID uuid;
 //	private final boolean cleanState;
-	private String hostname;
+//	private String hostname;
 
 	private UuidFactory uuidFactory;
 
@@ -83,11 +81,11 @@ public class CmsStateImpl implements CmsState {
 //			this.uuid = UUID.fromString(stateUuidStr);
 			this.uuid = uuidFactory.timeUUID();
 //		this.cleanState = stateUuid.equals(frameworkUuid);
-			try {
-				this.hostname = InetAddress.getLocalHost().getHostName();
-			} catch (UnknownHostException e) {
-				log.error("Cannot set hostname: " + e);
-			}
+//			try {
+//				this.hostname = InetAddress.getLocalHost().getHostName();
+//			} catch (UnknownHostException e) {
+//				log.error("Cannot set hostname: " + e);
+//			}
 
 			availableSince = System.currentTimeMillis();
 			if (log.isDebugEnabled()) {
@@ -119,7 +117,7 @@ public class CmsStateImpl implements CmsState {
 			}
 
 		} catch (RuntimeException | IOException e) {
-			log.error("## FATAL: CMS activator failed", e);
+			log.error("## FATAL: CMS state failed", e);
 		}
 	}
 
@@ -156,6 +154,7 @@ public class CmsStateImpl implements CmsState {
 			try (Reader key = Files.newBufferedReader(pemKeyPath, StandardCharsets.US_ASCII);
 					Reader cert = Files.newBufferedReader(pemCertPath, StandardCharsets.US_ASCII);) {
 				PkiUtils.loadPem(keyStore, key, keyStorePassword, cert);
+				Files.createDirectories(keyStorePath.getParent());
 				PkiUtils.saveKeyStore(keyStorePath, keyStorePassword, keyStore);
 				if (log.isDebugEnabled())
 					log.debug("PEM certificate stored in " + keyStorePath);
@@ -175,6 +174,7 @@ public class CmsStateImpl implements CmsState {
 					getDeployProperty(CmsDeployProperty.SSL_TRUSTSTORETYPE));
 			try (Reader cert = Files.newBufferedReader(ipaCaCertPath, StandardCharsets.US_ASCII);) {
 				PkiUtils.loadPem(trustStore, null, trustStorePassword, cert);
+				Files.createDirectories(keyStorePath.getParent());
 				PkiUtils.saveKeyStore(trustStorePath, trustStorePassword, trustStore);
 				if (log.isDebugEnabled())
 					log.debug("IPA CA certificate stored in " + trustStorePath);
@@ -335,10 +335,6 @@ public class CmsStateImpl implements CmsState {
 	/*
 	 * ACCESSORS
 	 */
-	public String getHostname() {
-		return hostname;
-	}
-
 	@Override
 	public UUID getUuid() {
 		return uuid;