From 9bc9b6ca29d2bc787a935bcfa2bd23648e9f852f Mon Sep 17 00:00:00 2001
From: "kh5325.kim" <kh5325.kim@samsung.com>
Date: Wed, 17 Apr 2013 20:30:02 +0900
Subject: [PATCH] package version up (2.1.32), Changed logger for
 OnDemandInstall

---
 .../connection/debugtools/OnDemandInstall.java     | 24 +++++++++++++---------
 package/changelog                                  |  3 +++
 package/pkginfo.manifest                           |  2 +-
 3 files changed, 18 insertions(+), 11 deletions(-)

diff --git a/org.tizen.common.connection/src/org/tizen/common/connection/debugtools/OnDemandInstall.java b/org.tizen.common.connection/src/org/tizen/common/connection/debugtools/OnDemandInstall.java
index 4d8cc8c..52bcf08 100644
--- a/org.tizen.common.connection/src/org/tizen/common/connection/debugtools/OnDemandInstall.java
+++ b/org.tizen.common.connection/src/org/tizen/common/connection/debugtools/OnDemandInstall.java
@@ -41,11 +41,12 @@ import org.eclipse.core.runtime.IProgressMonitor;
 import org.eclipse.core.runtime.Path;
 import org.eclipse.core.runtime.RegistryFactory;
 import org.eclipse.osgi.util.NLS;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.tizen.common.TizenPlatformConstants;
 import org.tizen.common.core.application.InstallPathConfig;
 import org.tizen.common.util.FileUtil;
 import org.tizen.common.util.IOUtil;
-import org.tizen.common.util.log.Logger;
 import org.tizen.sdblib.IDevice;
 import org.tizen.sdblib.IDevice.Arch;
 import org.tizen.sdblib.MultiLineReceiver;
@@ -58,6 +59,8 @@ import org.tizen.sdblib.SyncService.SyncResult;
  * @author Gun Kim <gune.kim@samsung.com>
  */
 public class OnDemandInstall {
+    private Logger logger = LoggerFactory.getLogger(getClass());
+
     public static final String ID_DEBUGTOOLS_EXTENSION = "org.tizen.common.connection.tools"; //$NON-NLS-1$
     public static final String TOOLS_HOST_PATH = InstallPathConfig.getPlatformVersionPath();
     public static final String RPM_PACKAGE_TYPE = "rpm";
@@ -104,7 +107,7 @@ public class OnDemandInstall {
                 return true;
             }
         } catch (Exception e) {
-            Logger.error(OnDemandInstallMessages.CANNOT_CHECK_DIRECTORY);
+            logger.error(OnDemandInstallMessages.CANNOT_CHECK_DIRECTORY);
         }
 
         return false;
@@ -118,10 +121,10 @@ public class OnDemandInstall {
         try {
             result = getResult(cmd);
             if (CMD_RESULT_SUCCESS.equals(result) == false) {
-                Logger.error(OnDemandInstallMessages.CANNOT_CREATE_DIRECTORY);
+                logger.error(OnDemandInstallMessages.CANNOT_CREATE_DIRECTORY);
             }
         } catch (Exception e) {
-            Logger.error(OnDemandInstallMessages.CANNOT_CREATE_DIRECTORY);
+            logger.error(OnDemandInstallMessages.CANNOT_CREATE_DIRECTORY);
         }
     }
 
@@ -165,7 +168,7 @@ public class OnDemandInstall {
                 }
             }
         } catch (Exception e) {
-            Logger.error(NLS.bind(OnDemandInstallMessages.CANNOT_CHECK_INSTALLED, dt.getPackagename()), e);
+            logger.error(NLS.bind(OnDemandInstallMessages.CANNOT_CHECK_INSTALLED, dt.getPackagename()), e);
         }
         return false;
     }
@@ -228,6 +231,7 @@ public class OnDemandInstall {
 
         for (DebugTool dt : debugTools) {
             // get package list to install
+            verbose("Verifying: " + dt);
             if (verifyArchitecture(dt.getArchitecture()) == false) {
                 continue;
             }
@@ -254,7 +258,7 @@ public class OnDemandInstall {
                 throw new IOException();
             }
         } catch (IOException e) {
-            Logger.error(NLS.bind(OnDemandInstallMessages.CANNOT_COPY_FILE, tool.getBinaryname()), e);
+            logger.error(NLS.bind(OnDemandInstallMessages.CANNOT_COPY_FILE, tool.getBinaryname()), e);
             return;
         }
 
@@ -266,17 +270,17 @@ public class OnDemandInstall {
         try {
             result = getResult(cmd);
             if (CMD_RESULT_SUCCESS.equals(result) == false) {
-                Logger.error(NLS.bind(OnDemandInstallMessages.CANNOT_INSTALL_TOOL, tool.getPackagename(), result));
+                logger.error(NLS.bind(OnDemandInstallMessages.CANNOT_INSTALL_TOOL, tool.getPackagename(), result));
             } else {
                 verbose("Deployed: " + tool);
             }
         } catch (Exception e) {
-            Logger.error(NLS.bind(OnDemandInstallMessages.ERROR_EXECUTE_COMMAND, cmd), e);
+            logger.error(NLS.bind(OnDemandInstallMessages.ERROR_EXECUTE_COMMAND, cmd), e);
         }
     }
 
     private void verbose(String message) {
-        Logger.info("[OnDemandInstall][" + Thread.currentThread().getId() + "] " + message);
+        logger.debug("[OnDemandInstall][" + Thread.currentThread().getId() + "] " + message);
     }
 
     class OnDemandRunnable implements Runnable {
@@ -433,7 +437,7 @@ public class OnDemandInstall {
                 }
             }
         } catch (Throwable e) {
-            Logger.error("Failed making DebugTool list for on-demand install", e);
+            logger.error("Failed making DebugTool list for on-demand install", e);
         }
         return toolLists;
     }
diff --git a/package/changelog b/package/changelog
index 2ffb1c5..6f4db51 100644
--- a/package/changelog
+++ b/package/changelog
@@ -1,3 +1,6 @@
+* 2.1.32
+- Changed logger for OnDemandInstall
+== kh5325.kim <ho.namkoong@samsung.com> 2013-04-17
 * 2.1.31
 - Supports 'sdb launch' command
 - Added isRoot() method that check whether the user of device shell is root (sdblib)
diff --git a/package/pkginfo.manifest b/package/pkginfo.manifest
index 978985e..c39ad27 100644
--- a/package/pkginfo.manifest
+++ b/package/pkginfo.manifest
@@ -1,4 +1,4 @@
-Version:2.1.31
+Version:2.1.32
 Source:common-eplugin
 Maintainer:kangho kim <kh5325.kim@samsung.com>, yoonki park <yoonki.park@samsung.com>, hyunsik non <hyunsik.noh@samsung.com>, taeyoung son <taeyoung2.son@samsung.com>, gune Kim <gune.kim@samsung.com>, ho namkoong <ho.namkoong@samsung.com>, hyeongseok heo <hyeong-seok.heo@samsung.com>, gyeongseok seo <gyeongseok.seo@samsung.com>, jihoon song <jihoon80.song@samsung.com>, changhyun lee <changhyun1.lee@samsung.com>, bonyong lee <bonyong.lee@samsung.com>
 
-- 
2.7.4