Repository: incubator-taverna-engine Updated Branches: refs/heads/master ee15a80eb -> 81179b82a
reflect file -> path in taverna-osgi Project: http://git-wip-us.apache.org/repos/asf/incubator-taverna-engine/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-taverna-engine/commit/81179b82 Tree: http://git-wip-us.apache.org/repos/asf/incubator-taverna-engine/tree/81179b82 Diff: http://git-wip-us.apache.org/repos/asf/incubator-taverna-engine/diff/81179b82 Branch: refs/heads/master Commit: 81179b82afe53a4a4a31c585f63eefcf51d0a6e7 Parents: ee15a80 Author: Stian Soiland-Reyes <[email protected]> Authored: Sun Feb 14 22:49:22 2016 +0000 Committer: Stian Soiland-Reyes <[email protected]> Committed: Sun Feb 14 22:49:22 2016 +0000 ---------------------------------------------------------------------- .../credentialmanager/impl/DistinguishedNameParserImpl.java | 2 +- .../configuration/database/impl/DatabaseManagerImpl.java | 7 ++++--- 2 files changed, 5 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-taverna-engine/blob/81179b82/taverna-credential-manager-impl/src/main/java/org/apache/taverna/security/credentialmanager/impl/DistinguishedNameParserImpl.java ---------------------------------------------------------------------- diff --git a/taverna-credential-manager-impl/src/main/java/org/apache/taverna/security/credentialmanager/impl/DistinguishedNameParserImpl.java b/taverna-credential-manager-impl/src/main/java/org/apache/taverna/security/credentialmanager/impl/DistinguishedNameParserImpl.java index 3ce0538..8f37169 100644 --- a/taverna-credential-manager-impl/src/main/java/org/apache/taverna/security/credentialmanager/impl/DistinguishedNameParserImpl.java +++ b/taverna-credential-manager-impl/src/main/java/org/apache/taverna/security/credentialmanager/impl/DistinguishedNameParserImpl.java @@ -77,7 +77,7 @@ public class DistinguishedNameParserImpl implements DistinguishedNameParser{ */ public static File getTheCredentialManagerDefaultDirectory( ApplicationConfiguration applicationConfiguration) { - File home = applicationConfiguration.getApplicationHomeDir(); + File home = applicationConfiguration.getApplicationHomeDir().toFile(); File secConfigDirectory = new File(home, "security"); if (!secConfigDirectory.exists()) secConfigDirectory.mkdir(); http://git-wip-us.apache.org/repos/asf/incubator-taverna-engine/blob/81179b82/taverna-database-configuration-impl/src/main/java/org/apache/taverna/configuration/database/impl/DatabaseManagerImpl.java ---------------------------------------------------------------------- diff --git a/taverna-database-configuration-impl/src/main/java/org/apache/taverna/configuration/database/impl/DatabaseManagerImpl.java b/taverna-database-configuration-impl/src/main/java/org/apache/taverna/configuration/database/impl/DatabaseManagerImpl.java index be7f12e..3a0ffc8 100644 --- a/taverna-database-configuration-impl/src/main/java/org/apache/taverna/configuration/database/impl/DatabaseManagerImpl.java +++ b/taverna-database-configuration-impl/src/main/java/org/apache/taverna/configuration/database/impl/DatabaseManagerImpl.java @@ -20,6 +20,7 @@ package org.apache.taverna.configuration.database.impl; import java.io.File; +import java.nio.file.Path; import java.sql.Connection; import java.sql.SQLException; @@ -145,10 +146,10 @@ public class DatabaseManagerImpl implements DatabaseManager { private void setDerbyPaths() { if (databaseConfiguration.getConnectorType() == DatabaseConfiguration.CONNECTOR_DERBY) { - String homeDir = applicationConfiguration.getApplicationHomeDir().getAbsolutePath(); + String homeDir = applicationConfiguration.getApplicationHomeDir().toAbsolutePath().toString(); System.setProperty("derby.system.home",homeDir); - File logFile = new File(applicationConfiguration.getLogDir(), "derby.log"); - System.setProperty("derby.stream.error.file", logFile.getAbsolutePath()); + Path logFile = applicationConfiguration.getLogDir().resolve("derby.log"); + System.setProperty("derby.stream.error.file", logFile.toAbsolutePath().toString()); } }
