From be98878af7defcd737155be1ff8822bc7f6e2217 Mon Sep 17 00:00:00 2001 From: PsyKo Date: Sun, 5 Apr 2015 21:06:00 +0200 Subject: [PATCH] Small adjustement --- Goko/Goko.product | 3 --- Goko/META-INF/MANIFEST.MF | 16 +++++++++------- org.goko.core/OSGI-INF/component.xml | 4 ++-- .../goko/core/common/service/ServiceManager.java | 2 +- org.goko.core/src/org/goko/core/log/GkLog.java | 13 +------------ org.goko.log/.classpath | 2 +- org.goko.log/META-INF/MANIFEST.MF | 8 +++----- org.goko.log/build.properties | 3 ++- .../src/org/goko/log/GokoLogConsoleReader.java | 2 +- 9 files changed, 20 insertions(+), 33 deletions(-) diff --git a/Goko/Goko.product b/Goko/Goko.product index 17bb7758..53c9d7a8 100644 --- a/Goko/Goko.product +++ b/Goko/Goko.product @@ -3,7 +3,6 @@ - @@ -26,7 +25,6 @@ - org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6 @@ -845,7 +843,6 @@ Public License instead of this License. But first, please read - diff --git a/Goko/META-INF/MANIFEST.MF b/Goko/META-INF/MANIFEST.MF index 2b021bf9..cdf30e36 100644 --- a/Goko/META-INF/MANIFEST.MF +++ b/Goko/META-INF/MANIFEST.MF @@ -4,7 +4,11 @@ Bundle-Name: Goko Bundle-SymbolicName: Goko;singleton:=true Bundle-Version: 0.0.1.qualifier Bundle-Activator: goko.Activator -Require-Bundle: org.eclipse.core.runtime;bundle-version="3.8.0", +Require-Bundle: org.apache.batik.css;bundle-version="1.7.0", + org.apache.batik.util;bundle-version="1.7.0", + org.apache.batik.util.gui;bundle-version="1.7.0", + org.eclipse.ui;bundle-version="3.106.0", + org.eclipse.core.runtime;bundle-version="3.8.0", org.eclipse.swt;bundle-version="3.100.1", org.eclipse.e4.ui.services;bundle-version="0.10.2", org.eclipse.e4.ui.workbench;bundle-version="1.1.0", @@ -18,17 +22,15 @@ Require-Bundle: org.eclipse.core.runtime;bundle-version="3.8.0", org.eclipse.e4.ui.bindings;bundle-version="0.10.1", org.goko.core;bundle-version="0.0.1", org.eclipse.e4.ui.workbench.addons.swt;bundle-version="0.10.1", - org.eclipse.ui, org.eclipse.ui.forms;bundle-version="3.5.200", javax.inject;bundle-version="1.0.0", org.eclipse.ui.themes;bundle-version="1.0.0", org.eclipse.equinox.p2.reconciler.dropins;bundle-version="1.1.200", org.eclipse.e4.ui.model.workbench;bundle-version="1.1.0.v20140512-1820" Bundle-RequiredExecutionEnvironment: JavaSE-1.7 -Import-Package: org.eclipse.core.databinding.validation, - org.eclipse.e4.ui.model.application, - org.eclipse.e4.ui.model.application.ui, - org.eclipse.ui, - org.eclipse.ui.preferences, +Import-Package: org.eclipse.core.databinding.validation, + org.eclipse.e4.ui.model.application, + org.eclipse.e4.ui.model.application.ui, + org.eclipse.ui.preferences, org.osgi.framework;version="1.3.0" Bundle-ActivationPolicy: lazy diff --git a/org.goko.core/OSGI-INF/component.xml b/org.goko.core/OSGI-INF/component.xml index d665ae50..fcf7df16 100644 --- a/org.goko.core/OSGI-INF/component.xml +++ b/org.goko.core/OSGI-INF/component.xml @@ -1,7 +1,7 @@ - + - + diff --git a/org.goko.core/src/org/goko/core/common/service/ServiceManager.java b/org.goko.core/src/org/goko/core/common/service/ServiceManager.java index f398278e..736c2de5 100644 --- a/org.goko.core/src/org/goko/core/common/service/ServiceManager.java +++ b/org.goko.core/src/org/goko/core/common/service/ServiceManager.java @@ -35,7 +35,7 @@ public class ServiceManager { private static Map, Object> mapServices = new HashMap, Object>(); /** Log service */ - static LogService logService; + private static LogService logService; void startup(){ LOG.info("Starting service manager"); diff --git a/org.goko.core/src/org/goko/core/log/GkLog.java b/org.goko.core/src/org/goko/core/log/GkLog.java index db402197..0088f951 100644 --- a/org.goko.core/src/org/goko/core/log/GkLog.java +++ b/org.goko.core/src/org/goko/core/log/GkLog.java @@ -16,9 +16,6 @@ *******************************************************************************/ package org.goko.core.log; -import org.goko.core.common.exception.GkException; -import org.goko.core.common.service.ServiceManager; -import org.osgi.service.log.LogService; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -45,15 +42,7 @@ public void error(String msg) { * @param e the exception to log */ public void error(Exception e) { - try{ - if(ServiceManager.getLogService() != null){ - ServiceManager.getLogService().log(LogService.LOG_ERROR, "Error occured :", e); - }else{ - e.printStackTrace(); - } - }catch(GkException gke){ - gke.printStackTrace(); - } + logger.error("Error occured :", e); } public static GkLog getLogger(Class clazz) { diff --git a/org.goko.log/.classpath b/org.goko.log/.classpath index 48a8c050..423c2896 100644 --- a/org.goko.log/.classpath +++ b/org.goko.log/.classpath @@ -1,6 +1,6 @@ - + diff --git a/org.goko.log/META-INF/MANIFEST.MF b/org.goko.log/META-INF/MANIFEST.MF index 84ba3f69..8f5354f0 100644 --- a/org.goko.log/META-INF/MANIFEST.MF +++ b/org.goko.log/META-INF/MANIFEST.MF @@ -5,11 +5,9 @@ Bundle-SymbolicName: org.goko.log Bundle-Version: 1.0.0.qualifier Bundle-ActivationPolicy: lazy Bundle-RequiredExecutionEnvironment: JavaSE-1.7 -Import-Package: org.osgi.framework;version="1.3.0" -Require-Bundle: org.eclipse.osgi, - org.slf4j.api;bundle-version="1.6.4";resolution:=optional, - org.slf4j.jcl;bundle-version="1.6.4";resolution:=optional, - ch.qos.logback.core;bundle-version="1.0.0";resolution:=optional +Import-Package: javax.inject;version="1.0.0", + org.osgi.framework;version="1.3.0" +Require-Bundle: org.eclipse.osgi Service-Component: OSGI-INF/logComponent.xml Bundle-ClassPath: libs/logback-1.0.13/logback-access-1.0.13.jar, libs/logback-1.0.13/logback-classic-1.0.13.jar, diff --git a/org.goko.log/build.properties b/org.goko.log/build.properties index 26f42fa5..d38febb9 100644 --- a/org.goko.log/build.properties +++ b/org.goko.log/build.properties @@ -4,5 +4,6 @@ bin.includes = META-INF/,\ bin/,\ libs/,\ OSGI-INF/,\ - logback.xml + logback.xml,\ + libs/slf4j-1.7.5/slf4j-simple-1.7.5.jar source.. = src/ diff --git a/org.goko.log/src/org/goko/log/GokoLogConsoleReader.java b/org.goko.log/src/org/goko/log/GokoLogConsoleReader.java index 08b40717..5d644cb6 100644 --- a/org.goko.log/src/org/goko/log/GokoLogConsoleReader.java +++ b/org.goko.log/src/org/goko/log/GokoLogConsoleReader.java @@ -49,7 +49,7 @@ public void logged(LogEntry entry) { buffer.append("] "); buffer.append(getLevelAsString(entry.getLevel())); buffer.append( entry.getMessage()); - LOG.info(buffer.toString()); + LOG.info(buffer.toString()); } }