Skip to content
This repository has been archived by the owner on Jul 16, 2023. It is now read-only.

Commit

Permalink
Small adjustement
Browse files Browse the repository at this point in the history
  • Loading branch information
PsyKo committed Apr 5, 2015
1 parent be7a29d commit be98878
Show file tree
Hide file tree
Showing 9 changed files with 20 additions and 33 deletions.
3 changes: 0 additions & 3 deletions Goko/Goko.product
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@

<product name="Goko" uid="org.goko" id="Goko.product" application="org.eclipse.e4.ui.workbench.swt.E4Application" version="0.0.1.qualifier" useFeatures="false" includeLaunchers="true">


<configIni use="default">
</configIni>

Expand All @@ -26,7 +25,6 @@
</win>
</launcher>


<vm>
<windows include="false">org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6</windows>
</vm>
Expand Down Expand Up @@ -845,7 +843,6 @@ Public License instead of this License. But first, please read
<plugin id="org.eclipse.ui.win32" fragment="true"/>
<plugin id="org.eclipse.ui.workbench"/>
<plugin id="org.eclipse.ui.workbench.texteditor"/>
<plugin id="org.goko.autoleveller"/>
<plugin id="org.goko.base.commandpanel"/>
<plugin id="org.goko.base.dro"/>
<plugin id="org.goko.base.execution.time"/>
Expand Down
16 changes: 9 additions & 7 deletions Goko/META-INF/MANIFEST.MF
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand All @@ -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
4 changes: 2 additions & 2 deletions org.goko.core/OSGI-INF/component.xml
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<scr:component xmlns:scr="http://www.osgi.org/xmlns/scr/v1.1.0" activate="startup" configuration-policy="optional" enabled="true" name="org.goko.core">
<scr:component xmlns:scr="http://www.osgi.org/xmlns/scr/v1.1.0" configuration-policy="optional" enabled="true" factory="org.goko.core.serviceManager" immediate="true" name="org.goko.core">
<implementation class="org.goko.core.common.service.ServiceManager"/>
<reference bind="setLogService" cardinality="1..1" interface="org.osgi.service.log.LogService" name="LogService" policy="static" unbind="removeLogService"/>
<reference bind="setLogService" cardinality="1..1" interface="org.osgi.service.log.LogService" name="LogService" policy="dynamic" unbind="removeLogService"/>
<reference cardinality="1..1" interface="org.goko.core.connection.IConnectionService" name="IConnectionService" policy="static"/>
<reference cardinality="1..1" interface="org.goko.core.controller.IControllerService" name="IControllerService" policy="static"/>
<reference cardinality="1..1" interface="org.goko.core.gcode.service.IGCodeService" name="IGCodeService" policy="static"/>
Expand Down
2 changes: 1 addition & 1 deletion org.goko.core/src/org/goko/core/common/service/ServiceManager.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ public class ServiceManager {
private static Map<Class<?>, Object> mapServices = new HashMap<Class<?>, Object>();

/** Log service */
static LogService logService;
private static LogService logService;

void startup(){
LOG.info("Starting service manager");
Expand Down
13 changes: 1 addition & 12 deletions org.goko.core/src/org/goko/core/log/GkLog.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand All @@ -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) {
Expand Down
2 changes: 1 addition & 1 deletion org.goko.log/.classpath
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
<classpathentry exported="true" kind="lib" path="libs/slf4j-1.7.5/slf4j-jdk14-1.7.5.jar"/>
<classpathentry exported="true" kind="lib" path="libs/slf4j-1.7.5/slf4j-simple-1.7.5.jar"/>
<classpathentry exported="true" kind="lib" path="libs/slf4j-1.7.5/slf4j-api-1.7.5.jar"/>
<classpathentry exported="true" kind="lib" path="libs/logback-1.0.13/logback-access-1.0.13.jar"/>
<classpathentry exported="true" kind="lib" path="libs/logback-1.0.13/logback-classic-1.0.13.jar"/>
Expand Down
8 changes: 3 additions & 5 deletions org.goko.log/META-INF/MANIFEST.MF
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
3 changes: 2 additions & 1 deletion org.goko.log/build.properties
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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/
2 changes: 1 addition & 1 deletion org.goko.log/src/org/goko/log/GokoLogConsoleReader.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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());
}
}

Expand Down

0 comments on commit be98878

Please sign in to comment.