diff --git a/bundles/org.openhab.core.init/.classpath b/bundles/org.openhab.core.init/.classpath deleted file mode 100644 index 1e446acfc..000000000 --- a/bundles/org.openhab.core.init/.classpath +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - - - diff --git a/bundles/org.openhab.core.init/.project b/bundles/org.openhab.core.init/.project deleted file mode 100644 index 86e3b002a..000000000 --- a/bundles/org.openhab.core.init/.project +++ /dev/null @@ -1,33 +0,0 @@ - - - org.openhab.core.init - This is the logging initializing component of the open Home Automation Bus (openHAB) - - - - - org.eclipse.jdt.core.javabuilder - - - - - org.eclipse.pde.ManifestBuilder - - - - - org.eclipse.pde.SchemaBuilder - - - - - org.eclipse.pde.ds.core.builder - - - - - - org.eclipse.jdt.core.javanature - org.eclipse.pde.PluginNature - - diff --git a/bundles/org.openhab.core.init/.settings/org.eclipse.jdt.core.prefs b/bundles/org.openhab.core.init/.settings/org.eclipse.jdt.core.prefs deleted file mode 100644 index 443e08599..000000000 --- a/bundles/org.openhab.core.init/.settings/org.eclipse.jdt.core.prefs +++ /dev/null @@ -1,8 +0,0 @@ -eclipse.preferences.version=1 -org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled -org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7 -org.eclipse.jdt.core.compiler.compliance=1.7 -org.eclipse.jdt.core.compiler.problem.assertIdentifier=error -org.eclipse.jdt.core.compiler.problem.enumIdentifier=error -org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning -org.eclipse.jdt.core.compiler.source=1.7 diff --git a/bundles/org.openhab.core.init/.settings/org.maven.ide.eclipse.prefs b/bundles/org.openhab.core.init/.settings/org.maven.ide.eclipse.prefs deleted file mode 100644 index 48cf5654b..000000000 --- a/bundles/org.openhab.core.init/.settings/org.maven.ide.eclipse.prefs +++ /dev/null @@ -1,9 +0,0 @@ -#Fri Feb 19 21:35:42 CET 2010 -activeProfiles= -eclipse.preferences.version=1 -fullBuildGoals=process-test-resources -includeModules=false -resolveWorkspaceProjects=true -resourceFilterGoals=process-resources resources\:testResources -skipCompilerPlugin=true -version=1 diff --git a/bundles/org.openhab.core.init/META-INF/MANIFEST.MF b/bundles/org.openhab.core.init/META-INF/MANIFEST.MF deleted file mode 100644 index 6f968c0c8..000000000 --- a/bundles/org.openhab.core.init/META-INF/MANIFEST.MF +++ /dev/null @@ -1,21 +0,0 @@ -Manifest-Version: 1.0 -Service-Component: OSGI-INF/logservice.xml -Bundle-Name: openHAB Initializer -Bundle-RequiredExecutionEnvironment: JavaSE-1.7 -Bundle-Vendor: openHAB.org -Bundle-Version: 2.0.0.qualifier -Bundle-Activator: org.openhab.core.init.internal.InitActivator -Bundle-ManifestVersion: 2 -Bundle-Description: This is the initializer component of the - open Home Automation Bus (openHAB) -Bundle-License: http://www.eclipse.org/legal/epl-v10.html -Import-Package: org.apache.commons.io, - org.apache.commons.lang, - org.eclipse.smarthome.config.core, - org.osgi.framework, - org.osgi.service.log, - org.slf4j, - org.slf4j.bridge -Bundle-SymbolicName: org.openhab.core.init -Bundle-DocURL: http://www.openhab.org - diff --git a/bundles/org.openhab.core.init/OSGI-INF/logservice.xml b/bundles/org.openhab.core.init/OSGI-INF/logservice.xml deleted file mode 100644 index c1d1cfd51..000000000 --- a/bundles/org.openhab.core.init/OSGI-INF/logservice.xml +++ /dev/null @@ -1,15 +0,0 @@ - - - - - - diff --git a/bundles/org.openhab.core.init/build.properties b/bundles/org.openhab.core.init/build.properties deleted file mode 100644 index 457d5a580..000000000 --- a/bundles/org.openhab.core.init/build.properties +++ /dev/null @@ -1,6 +0,0 @@ -output.. = target/classes/ -bin.includes = META-INF/,\ - .,\ - OSGI-INF/ -source.. = src/main/java/,\ - src/main/resources/ \ No newline at end of file diff --git a/bundles/org.openhab.core.init/pom.xml b/bundles/org.openhab.core.init/pom.xml deleted file mode 100644 index a54e2483e..000000000 --- a/bundles/org.openhab.core.init/pom.xml +++ /dev/null @@ -1,17 +0,0 @@ - - - - 4.0.0 - - - org.openhab.core - pom-bundles - 2.0.0-SNAPSHOT - - - org.openhab.core.init - - openHAB Initializer - eclipse-plugin - - diff --git a/bundles/org.openhab.core.init/src/main/java/org/openhab/core/init/internal/InitActivator.java b/bundles/org.openhab.core.init/src/main/java/org/openhab/core/init/internal/InitActivator.java deleted file mode 100644 index a0671ea20..000000000 --- a/bundles/org.openhab.core.init/src/main/java/org/openhab/core/init/internal/InitActivator.java +++ /dev/null @@ -1,31 +0,0 @@ -/** - * Copyright (c) 2015-2015 Kai Kreuzer and others. - * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - */ -package org.openhab.core.init.internal; - -import org.osgi.framework.BundleActivator; -import org.osgi.framework.BundleContext; -import org.slf4j.bridge.SLF4JBridgeHandler; - -/** - * This activator sets up slf4j with all bridges for the different logging frameworks. - * - * @author Kai Kreuzer - */ -public class InitActivator implements BundleActivator { - - @Override - public void start(BundleContext context) throws Exception { - SLF4JBridgeHandler.removeHandlersForRootLogger(); - SLF4JBridgeHandler.install(); - } - - @Override - public void stop(BundleContext context) throws Exception {} - -} diff --git a/bundles/org.openhab.core.init/src/main/java/org/openhab/core/init/internal/OSGILogListener.java b/bundles/org.openhab.core.init/src/main/java/org/openhab/core/init/internal/OSGILogListener.java deleted file mode 100644 index 46eff1c41..000000000 --- a/bundles/org.openhab.core.init/src/main/java/org/openhab/core/init/internal/OSGILogListener.java +++ /dev/null @@ -1,85 +0,0 @@ -/** - * Copyright (c) 2015-2015 Kai Kreuzer and others. - * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - */ -package org.openhab.core.init.internal; - -import java.util.HashMap; -import java.util.Map; - -import org.osgi.service.log.LogEntry; -import org.osgi.service.log.LogListener; -import org.osgi.service.log.LogReaderService; -import org.osgi.service.log.LogService; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; -import org.slf4j.Marker; -import org.slf4j.MarkerFactory; - -/** - * This is an adapter for forwarding OSGi Log Service entries to our logging backend (slf4j). - * - * @author Kai Kreuzer - * @since 0.1.0 - * - */ -public class OSGILogListener { - - /** a map for storing the different listeners (one for each log service) */ - static private Map logReaderMap = new HashMap(); - - public void activate() {} - - public void deactivate() { - logReaderMap.clear(); - } - - /** - * This method is called by the OSGi DS whenever there is a new log reader service available. - * Usually there is only one, but in general there could be multiple services available. - * - * @param aLogReaderService a new log reader service - */ - public void addLogReaderService(LogReaderService aLogReaderService) { - NLogListener listener = new NLogListener(); - logReaderMap.put(aLogReaderService, listener); - aLogReaderService.addLogListener(listener); - } - - /** - * This method is called by the OSGi DS whenever a service becomes unavailable. - * - * @param aLogReaderService the service that is no longer available - */ - public void removeLogReaderService(LogReaderService aLogReaderService) { - logReaderMap.remove(aLogReaderService); - } - - /** - * We use this private class as a listener for OSGi log entries. Whenever it is - * notified of a log entry, it forwards this entry to slf4j. - * - * @author Kai Kreuzer - * @author Jochen Hiller - Fix #068 NPE when getBundle() is null - * @since 0.1.0 - * - */ - private static class NLogListener implements LogListener { - public void logged(LogEntry entry) { - Logger logger = LoggerFactory.getLogger("OSGi"); - String markerName = entry.getBundle() == null ? "unknownBundle" : entry.getBundle().getSymbolicName(); - Marker marker = MarkerFactory.getMarker(markerName); - switch(entry.getLevel()) { - case LogService.LOG_DEBUG: logger.debug(marker, entry.getMessage(), entry.getException()); break; - case LogService.LOG_INFO: logger.info(marker, entry.getMessage(), entry.getException()); break; - case LogService.LOG_WARNING: logger.warn(marker, entry.getMessage(), entry.getException()); break; - case LogService.LOG_ERROR: logger.error(marker, entry.getMessage(), entry.getException()); break; - } - } - } - -} diff --git a/bundles/org.openhab.core.init/src/main/resources/readme.txt b/bundles/org.openhab.core.init/src/main/resources/readme.txt deleted file mode 100644 index 98698c670..000000000 --- a/bundles/org.openhab.core.init/src/main/resources/readme.txt +++ /dev/null @@ -1 +0,0 @@ -Bundle resources go in here! \ No newline at end of file diff --git a/bundles/pom.xml b/bundles/pom.xml index 3e410489a..9d54f1e0a 100644 --- a/bundles/pom.xml +++ b/bundles/pom.xml @@ -17,7 +17,6 @@ org.openhab.core - org.openhab.core.init org.openhab.core.compat1x org.openhab.core.compat1x.test org.openhab.core.karaf diff --git a/features/p2/feature.xml b/features/p2/feature.xml index a81636cf9..d4b1f7587 100644 --- a/features/p2/feature.xml +++ b/features/p2/feature.xml @@ -50,13 +50,6 @@ version="0.0.0" unpack="false"/> - -