From e0d4977f17c8de4bcae7bdb87448ef161d9300eb Mon Sep 17 00:00:00 2001 From: Emil Ivov Date: Sun, 14 Jan 2007 17:05:32 +0000 Subject: [PATCH] Configurable home name and location, properly store international characters in the metacontactlist, history, and configuration files. make the debian installer store bndles un ${user.home}/.sip-communicator instead of ${user.home}/.felix/sip-communicator.bin. related issues: 286, 266, 271, 230, 274 make sure that log directory parent is retrieved from the configuration service so that we have a truly configurable sip-communicator.home --- .../sip/ProtocolProviderServiceSipImpl.java | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/src/net/java/sip/communicator/impl/protocol/sip/ProtocolProviderServiceSipImpl.java b/src/net/java/sip/communicator/impl/protocol/sip/ProtocolProviderServiceSipImpl.java index 9305d5051..391db4723 100644 --- a/src/net/java/sip/communicator/impl/protocol/sip/ProtocolProviderServiceSipImpl.java +++ b/src/net/java/sip/communicator/impl/protocol/sip/ProtocolProviderServiceSipImpl.java @@ -147,9 +147,7 @@ public class ProtocolProviderServiceSipImpl /** * The default name of a debug log file for the jain-sip RI. */ - private static final String NSPVALUE_DEBUG_LOG = - System.getProperty("user.home") - + "/.sip-communicator/log/sc-jainsipdebug.log"; + private static String NSPVALUE_DEBUG_LOG = "log/sc-jainsipdebug.log"; /** * The name of the property under which the jain-sip-ri would expect to find @@ -162,9 +160,7 @@ public class ProtocolProviderServiceSipImpl /** * The default name of a server log file for the jain-sip RI. */ - private static final String NSPVALUE_SERVER_LOG = - System.getProperty("user.home") - + "/.sip-communicator/log/sc-jainsipserver.log"; + private static String NSPVALUE_SERVER_LOG = "log/sc-jainsipserver.log"; /** * A random generator we use to generate tags. @@ -510,6 +506,15 @@ protected void initialize(String sipAddress, { synchronized (initializationLock) { + String logDir + = SipActivator.getConfigurationService().getScHomeDirLocation() + + System.getProperty("file.separator") + + SipActivator.getConfigurationService().getScHomeDirName() + + System.getProperty("file.separator"); + + NSPVALUE_DEBUG_LOG = logDir + NSPNAME_DEBUG_LOG; + NSPVALUE_SERVER_LOG = logDir + NSPNAME_SERVER_LOG; + this.accountID = accountID; sipFactory = SipFactory.getInstance();