You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by ch...@apache.org on 2017/10/31 04:48:33 UTC
[sling-org-apache-sling-commons-log] branch master updated:
SLING-7224 - Switch to standard OSGi annotations
This is an automated email from the ASF dual-hosted git repository.
chetanm pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-commons-log.git
The following commit(s) were added to refs/heads/master by this push:
new d8db32c SLING-7224 - Switch to standard OSGi annotations
d8db32c is described below
commit d8db32c4f36f61650ab16b2c5bdc2a873b76abdc
Author: Chetan Mehrotra <ch...@apache.org>
AuthorDate: Tue Oct 31 10:18:23 2017 +0530
SLING-7224 - Switch to standard OSGi annotations
---
pom.xml | 12 ++++++------
.../org/apache/sling/commons/log/logback/ConfigProvider.java | 2 +-
.../org/apache/sling/commons/log/logback/OsgiAction.java | 2 +-
.../sling/commons/log/logback/OsgiAppenderRefAction.java | 2 +-
.../sling/commons/log/logback/internal/LogbackManager.java | 9 +++++----
.../org/apache/sling/commons/log/logback/package-info.java | 6 ++----
.../sling/commons/log/logback/webconsole/LogPanel.java | 3 ++-
.../sling/commons/log/logback/webconsole/package-info.java | 6 ++----
.../commons/log/logback/integration/ITConfigFragments.java | 6 +++---
9 files changed, 23 insertions(+), 25 deletions(-)
diff --git a/pom.xml b/pom.xml
index 045817a..d9da7b1 100644
--- a/pom.xml
+++ b/pom.xml
@@ -234,12 +234,6 @@
<dependencies>
<dependency>
- <groupId>biz.aQute.bnd</groupId>
- <artifactId>bnd</artifactId>
- <version>2.1.0</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
<version>${slf4j.version}</version>
@@ -278,6 +272,12 @@
<version>6.0.0</version>
<scope>provided</scope>
</dependency>
+ <dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.annotation</artifactId>
+ <scope>provided</scope>
+ <version>6.0.0</version>
+ </dependency>
<!-- OSGi Command Line Shell support -->
<dependency>
diff --git a/src/main/java/org/apache/sling/commons/log/logback/ConfigProvider.java b/src/main/java/org/apache/sling/commons/log/logback/ConfigProvider.java
index 83ca844..e48439f 100644
--- a/src/main/java/org/apache/sling/commons/log/logback/ConfigProvider.java
+++ b/src/main/java/org/apache/sling/commons/log/logback/ConfigProvider.java
@@ -19,9 +19,9 @@
package org.apache.sling.commons.log.logback;
+import org.osgi.annotation.versioning.ConsumerType;
import org.xml.sax.InputSource;
-import aQute.bnd.annotation.ConsumerType;
/**
* Provides source for Logback configuration fragment.
diff --git a/src/main/java/org/apache/sling/commons/log/logback/OsgiAction.java b/src/main/java/org/apache/sling/commons/log/logback/OsgiAction.java
index 65f60fb..a963cea 100644
--- a/src/main/java/org/apache/sling/commons/log/logback/OsgiAction.java
+++ b/src/main/java/org/apache/sling/commons/log/logback/OsgiAction.java
@@ -20,8 +20,8 @@
package org.apache.sling.commons.log.logback;
import org.apache.sling.commons.log.logback.internal.OsgiInternalAction;
+import org.osgi.annotation.versioning.ProviderType;
-import aQute.bnd.annotation.ProviderType;
/**
* The action class needs to be referred in external files hence adding a marker
diff --git a/src/main/java/org/apache/sling/commons/log/logback/OsgiAppenderRefAction.java b/src/main/java/org/apache/sling/commons/log/logback/OsgiAppenderRefAction.java
index 03c86c8..c3efb67 100644
--- a/src/main/java/org/apache/sling/commons/log/logback/OsgiAppenderRefAction.java
+++ b/src/main/java/org/apache/sling/commons/log/logback/OsgiAppenderRefAction.java
@@ -19,8 +19,8 @@
package org.apache.sling.commons.log.logback;
-import aQute.bnd.annotation.ProviderType;
import org.apache.sling.commons.log.logback.internal.OsgiAppenderRefInternalAction;
+import org.osgi.annotation.versioning.ProviderType;
/**
* The action class needs to be referred in external files hence adding a marker
diff --git a/src/main/java/org/apache/sling/commons/log/logback/internal/LogbackManager.java b/src/main/java/org/apache/sling/commons/log/logback/internal/LogbackManager.java
index 80826f9..a0e7346 100644
--- a/src/main/java/org/apache/sling/commons/log/logback/internal/LogbackManager.java
+++ b/src/main/java/org/apache/sling/commons/log/logback/internal/LogbackManager.java
@@ -24,11 +24,12 @@ import java.net.URL;
import java.util.ArrayList;
import java.util.Collection;
import java.util.Collections;
+import java.util.Dictionary;
import java.util.HashMap;
+import java.util.Hashtable;
import java.util.Iterator;
import java.util.List;
import java.util.Map;
-import java.util.Properties;
import java.util.concurrent.Semaphore;
import java.util.concurrent.TimeUnit;
@@ -750,13 +751,13 @@ public class LogbackManager extends LoggerContextAwareBase {
}
private void registerWebConsoleSupport() {
- Properties panelProps = new Properties();
+ Dictionary<String,Object> panelProps = new Hashtable<>();
panelProps.put(Constants.SERVICE_VENDOR, "Apache Software Foundation");
panelProps.put(Constants.SERVICE_DESCRIPTION, "Sling Log Panel Support");
registrations.add(bundleContext.registerService(LogPanel.class.getName(),
new SlingLogPanel(this, bundleContext), panelProps));
- Properties printerProps = new Properties();
+ Dictionary<String,Object> printerProps = new Hashtable<>();
printerProps.put(Constants.SERVICE_VENDOR, "Apache Software Foundation");
printerProps.put(Constants.SERVICE_DESCRIPTION, "Sling Log Configuration Printer");
printerProps.put("felix.webconsole.label", PRINTER_URL);
@@ -769,7 +770,7 @@ public class LogbackManager extends LoggerContextAwareBase {
}
private void registerEventHandler() {
- Properties props = new Properties();
+ Dictionary<String,Object> props = new Hashtable<>();
props.put(Constants.SERVICE_VENDOR, "Apache Software Foundation");
props.put(Constants.SERVICE_DESCRIPTION, "Sling Log Reset Event Handler");
props.put("event.topics", new String[] {
diff --git a/src/main/java/org/apache/sling/commons/log/logback/package-info.java b/src/main/java/org/apache/sling/commons/log/logback/package-info.java
index 301d725..ceb9ff8 100644
--- a/src/main/java/org/apache/sling/commons/log/logback/package-info.java
+++ b/src/main/java/org/apache/sling/commons/log/logback/package-info.java
@@ -22,10 +22,8 @@
*
* @version 1.0
*/
-@Version("1.0")
-@Export(optional = "provide:=true")
+@Version("1.0.1")
package org.apache.sling.commons.log.logback;
-import aQute.bnd.annotation.Version;
-import aQute.bnd.annotation.Export;
+import org.osgi.annotation.versioning.Version;
\ No newline at end of file
diff --git a/src/main/java/org/apache/sling/commons/log/logback/webconsole/LogPanel.java b/src/main/java/org/apache/sling/commons/log/logback/webconsole/LogPanel.java
index 50b2be3..6887764 100644
--- a/src/main/java/org/apache/sling/commons/log/logback/webconsole/LogPanel.java
+++ b/src/main/java/org/apache/sling/commons/log/logback/webconsole/LogPanel.java
@@ -22,7 +22,8 @@ package org.apache.sling.commons.log.logback.webconsole;
import java.io.IOException;
import java.io.PrintWriter;
-import aQute.bnd.annotation.ProviderType;
+import org.osgi.annotation.versioning.ProviderType;
+
@ProviderType
public interface LogPanel {
diff --git a/src/main/java/org/apache/sling/commons/log/logback/webconsole/package-info.java b/src/main/java/org/apache/sling/commons/log/logback/webconsole/package-info.java
index a743024..349f054 100644
--- a/src/main/java/org/apache/sling/commons/log/logback/webconsole/package-info.java
+++ b/src/main/java/org/apache/sling/commons/log/logback/webconsole/package-info.java
@@ -22,10 +22,8 @@
*
* @version 1.0
*/
-@Version("1.0")
-@Export(optional = "provide:=true")
+@Version("1.0.1")
package org.apache.sling.commons.log.logback.webconsole;
-import aQute.bnd.annotation.Export;
-import aQute.bnd.annotation.Version;
+import org.osgi.annotation.versioning.Version;
\ No newline at end of file
diff --git a/src/test/java/org/apache/sling/commons/log/logback/integration/ITConfigFragments.java b/src/test/java/org/apache/sling/commons/log/logback/integration/ITConfigFragments.java
index 58ba484..fe0d57b 100644
--- a/src/test/java/org/apache/sling/commons/log/logback/integration/ITConfigFragments.java
+++ b/src/test/java/org/apache/sling/commons/log/logback/integration/ITConfigFragments.java
@@ -20,7 +20,7 @@
package org.apache.sling.commons.log.logback.integration;
import java.util.Dictionary;
-import java.util.Properties;
+import java.util.Hashtable;
import javax.inject.Inject;
@@ -66,8 +66,8 @@ public class ITConfigFragments extends LogTestBase {
@Test
public void testConfigFragment() throws Exception {
- Properties props = new Properties();
- props.setProperty("logbackConfig", "true");
+ Dictionary<String,Object> props = new Hashtable<>();
+ props.put("logbackConfig", "true");
String config = "<included>\n" + " <appender name=\"FOOFILE\" class=\"ch.qos.logback.core.FileAppender\">\n"
+ " <file>${sling.home}/logs/foo.log</file>\n" + " <encoder>\n"
--
To stop receiving notification emails like this one, please contact
['"commits@sling.apache.org" <co...@sling.apache.org>'].