From f0c46adb22b1ca165ea26e6a3f9a5620ad77bb2f Mon Sep 17 00:00:00 2001 From: Damian Minkov Date: Thu, 21 Aug 2008 14:17:10 +0000 Subject: [PATCH] Move custom FileHandler to util package and add util classes to system classloader under windows. --- lib/logging.properties | 15 +++++++-------- resources/install/logging.properties | 12 +++++------- resources/install/windows/run.exe | Bin 615424 -> 615424 bytes resources/install/windows/run.exe.jsmooth | 1 + .../logging => util}/FileHandler.java | 2 +- 5 files changed, 14 insertions(+), 16 deletions(-) rename src/net/java/sip/communicator/{launcher/logging => util}/FileHandler.java (99%) diff --git a/lib/logging.properties b/lib/logging.properties index cc4046a94..7162d2ebe 100644 --- a/lib/logging.properties +++ b/lib/logging.properties @@ -1,5 +1,5 @@ ############################################################ -# Default Logging Configuration File +# Default Logging Configuration File # # You can use a different file by specifying a filename # with the java.util.logging.config.file system property. @@ -7,7 +7,7 @@ ############################################################ ############################################################ -# Global properties +# Global properties ############################################################ # "handlers" specifies a comma separated list of log Handler @@ -15,7 +15,7 @@ # Note that these classes must be on the system classpath. # By default we only configure a ConsoleHandler, which will only # show messages at the INFO and above levels. -handlers= net.java.sip.communicator.launcher.logging.FileHandler, java.util.logging.ConsoleHandler +handlers= net.java.sip.communicator.util.FileHandler, java.util.logging.ConsoleHandler # To also add the FileHandler, use the following line instead. @@ -35,11 +35,10 @@ handlers= net.java.sip.communicator.launcher.logging.FileHandler, java.util.logg ############################################################ # default file output is in user's home directory. -net.java.sip.communicator.launcher.logging.FileHandler.limit = 5000000 -net.java.sip.communicator.launcher.logging.FileHandler.count = 1 -net.java.sip.communicator.launcher.logging.FileHandler.formatter = net.java.sip.communicator.util.ScLogFormatter -net.java.sip.communicator.launcher.logging.FileHandler.level = INFO - +net.java.sip.communicator.util.FileHandler.limit = 5000000 +net.java.sip.communicator.util.FileHandler.count = 1 +net.java.sip.communicator.util.FileHandler.formatter = net.java.sip.communicator.util.ScLogFormatter +net.java.sip.communicator.util.FileHandler.level = FINEST diff --git a/resources/install/logging.properties b/resources/install/logging.properties index bc0661bf9..4b4e80629 100644 --- a/resources/install/logging.properties +++ b/resources/install/logging.properties @@ -15,7 +15,7 @@ # Note that these classes must be on the system classpath. # By default we only configure a ConsoleHandler, which will only # show messages at the INFO and above levels. -handlers= net.java.sip.communicator.launcher.logging.FileHandler, java.util.logging.ConsoleHandler +handlers= net.java.sip.communicator.util.FileHandler, java.util.logging.ConsoleHandler # To also add the FileHandler, use the following line instead. @@ -35,12 +35,10 @@ handlers= net.java.sip.communicator.launcher.logging.FileHandler, java.util.logg ############################################################ # default file output is in user's home directory. -net.java.sip.communicator.launcher.logging.FileHandler.limit = 5000000 -net.java.sip.communicator.launcher.logging.FileHandler.count = 3 -net.java.sip.communicator.launcher.logging.FileHandler.formatter = net.java.sip.communicator.util.ScLogFormatter -net.java.sip.communicator.launcher.logging.FileHandler.level = FINEST - - +net.java.sip.communicator.util.FileHandler.limit = 5000000 +net.java.sip.communicator.util.FileHandler.count = 3 +net.java.sip.communicator.util.FileHandler.formatter = net.java.sip.communicator.util.ScLogFormatter +net.java.sip.communicator.util.FileHandler.level = FINEST # Limit the message that are printed on the console to FINEST and above (all). diff --git a/resources/install/windows/run.exe b/resources/install/windows/run.exe index 5d360261e574c90d2fb75090277a37324f2ee9a1..b6c095f6defd5b894a43c3a47a0669f9b88e8c62 100644 GIT binary patch delta 199 zcmZoTq1pgMEsQNpEzB(}EvzkUE$mx3WbSaPm@zc)F)%QsOjo_bVa&2ci=kn9fdr?> z_JTVcN7NV#x0^C^MllLn7boi`mFA`7q!!1-l$K=XZ0}~_6lI#e6{wU&i-FrmAndzAl noYJfdY#10eOg}5ZsW^R=1g9M96CnS~b|7DdaXX_F=YLNCg*rHV delta 185 zcmZoTq1pgMEsQNpEzB(}EvzkUE$mx3WbSbCm@zc)F)%RrOjo_bVazyZd*mIC+iHw4 z+fA7{qZqd@Vc`^H5`DHKzzwJd2pAbSSr{0$XfZGx*?yLdGn<=J2WS8jP{wAuqY$S! ztBV-}L&)}6Ax>^))(}euhLr8OqMYo^yg4=u4Fy2F28g#zZ+HV3;v|p#-Nr b>lq;P4v48ZolTPS_hbh~iS3M1oc}!mrnfKo diff --git a/resources/install/windows/run.exe.jsmooth b/resources/install/windows/run.exe.jsmooth index 5fb510c5a..cec5f53c7 100644 --- a/resources/install/windows/run.exe.jsmooth +++ b/resources/install/windows/run.exe.jsmooth @@ -11,6 +11,7 @@ lib\jdic-all.jar lib\jdic_stub.jar sc-bundles\sc-launcher.jar +sc-bundles\util.jar ${EXECUTABLEPATH} false run.exe diff --git a/src/net/java/sip/communicator/launcher/logging/FileHandler.java b/src/net/java/sip/communicator/util/FileHandler.java similarity index 99% rename from src/net/java/sip/communicator/launcher/logging/FileHandler.java rename to src/net/java/sip/communicator/util/FileHandler.java index a71983903..d26a7149c 100644 --- a/src/net/java/sip/communicator/launcher/logging/FileHandler.java +++ b/src/net/java/sip/communicator/util/FileHandler.java @@ -5,7 +5,7 @@ * See terms of license at gnu.org. */ -package net.java.sip.communicator.launcher.logging; +package net.java.sip.communicator.util; import java.io.*; import java.util.logging.*;