From faac33b7cd3806e2641000ae64216b571b754426 Mon Sep 17 00:00:00 2001 From: DmitriyMX Date: Wed, 8 Mar 2017 15:23:03 +0300 Subject: [PATCH] =?UTF-8?q?fix:Core:=20=D1=8D=D0=BA=D1=81=D0=BF=D0=BE?= =?UTF-8?q?=D1=80=D1=82=20=D1=81=D0=B8=D1=81=D1=82=D0=B5=D0=BC=D0=BD=D1=8B?= =?UTF-8?q?=D1=85(=D0=B2=D1=81=D1=82=D1=80=D0=BE=D0=B5=D0=BD=D0=BD=D1=8B?= =?UTF-8?q?=D1=85)=20=D0=BF=D0=B0=D0=BA=D0=B5=D1=82=D0=BE=D0=B2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- core/build.gradle | 2 +- core/src/main/java/asys/core/Core.java | 12 +++++++++++- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/core/build.gradle b/core/build.gradle index a18c4f7..4ca180b 100644 --- a/core/build.gradle +++ b/core/build.gradle @@ -1,5 +1,5 @@ group = 'asys' -version = '0.0-SNAPSHOT' +version = '0.1-SNAPSHOT' apply plugin: 'application' diff --git a/core/src/main/java/asys/core/Core.java b/core/src/main/java/asys/core/Core.java index 2f3d065..87b5cbd 100644 --- a/core/src/main/java/asys/core/Core.java +++ b/core/src/main/java/asys/core/Core.java @@ -55,11 +55,21 @@ public class Core { config.put("felix.fileinstall.poll", 250); config.put("felix.fileinstall.log.level", 2); config.put("felix.fileinstall.noInitialDelay", true); - config.put("org.osgi.framework.system.packages.extra", "com.sun.net.httpserver;asys.api"); + config.put("org.osgi.framework.system.packages.extra", extraPackages()); return ImmutableMap.newInstance(config); } + private String extraPackages() { + StringJoiner sj = new StringJoiner(","); + sj.add("com.sun.net.httpserver"); + sj.add("asys.api"); + sj.add("asys.api.*"); + sj.add("org.slf4j; version=1.7.21"); + sj.add("org.slf4j.*; version=1.7.21"); + return sj.toString(); + } + @PreDestroy public void stop() { startFelix();