You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@karaf.apache.org by cs...@apache.org on 2017/08/15 17:03:18 UTC
[1/5] karaf git commit: Suppress logging of
WriteToClosedSessionException
Repository: karaf
Updated Branches:
refs/heads/master ecf6a8dc7 -> 767012d25
Suppress logging of WriteToClosedSessionException
Project: http://git-wip-us.apache.org/repos/asf/karaf/repo
Commit: http://git-wip-us.apache.org/repos/asf/karaf/commit/b4969149
Tree: http://git-wip-us.apache.org/repos/asf/karaf/tree/b4969149
Diff: http://git-wip-us.apache.org/repos/asf/karaf/diff/b4969149
Branch: refs/heads/master
Commit: b4969149f8888f1dc52890f0a4c204258e904e84
Parents: ecf6a8d
Author: Christian Schneider <ch...@die-schneider.net>
Authored: Tue Aug 15 17:13:07 2017 +0200
Committer: Christian Schneider <ch...@die-schneider.net>
Committed: Tue Aug 15 17:13:07 2017 +0200
----------------------------------------------------------------------
jaas/modules/src/test/resources/log4j.properties | 3 +++
1 file changed, 3 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/karaf/blob/b4969149/jaas/modules/src/test/resources/log4j.properties
----------------------------------------------------------------------
diff --git a/jaas/modules/src/test/resources/log4j.properties b/jaas/modules/src/test/resources/log4j.properties
index a75bae2..485e43b 100644
--- a/jaas/modules/src/test/resources/log4j.properties
+++ b/jaas/modules/src/test/resources/log4j.properties
@@ -20,6 +20,9 @@
#
log4j.rootLogger=INFO, console, file
+# Suppress logging of WriteToClosedSessionException
+log4j.logger.org.apache.directory.server.ldap.LdapProtocolHandler=OFF
+
# Console will only display warnings
log4j.appender.console=org.apache.log4j.ConsoleAppender
log4j.appender.console.layout=org.apache.log4j.PatternLayout
[2/5] karaf git commit: Avoid excessive logging
Posted by cs...@apache.org.
Avoid excessive logging
Project: http://git-wip-us.apache.org/repos/asf/karaf/repo
Commit: http://git-wip-us.apache.org/repos/asf/karaf/commit/fcf9b7c1
Tree: http://git-wip-us.apache.org/repos/asf/karaf/tree/fcf9b7c1
Diff: http://git-wip-us.apache.org/repos/asf/karaf/diff/fcf9b7c1
Branch: refs/heads/master
Commit: fcf9b7c19b9c9edf56aa75ab29675a30c237e741
Parents: b496914
Author: Christian Schneider <ch...@die-schneider.net>
Authored: Tue Aug 15 17:47:03 2017 +0200
Committer: Christian Schneider <ch...@die-schneider.net>
Committed: Tue Aug 15 17:47:03 2017 +0200
----------------------------------------------------------------------
jaas/jasypt/src/test/resources/log4j.properties | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/karaf/blob/fcf9b7c1/jaas/jasypt/src/test/resources/log4j.properties
----------------------------------------------------------------------
diff --git a/jaas/jasypt/src/test/resources/log4j.properties b/jaas/jasypt/src/test/resources/log4j.properties
index e1cbdd1..3822bad 100644
--- a/jaas/jasypt/src/test/resources/log4j.properties
+++ b/jaas/jasypt/src/test/resources/log4j.properties
@@ -18,7 +18,7 @@
#
# The logging properties used during tests..
#
-log4j.rootLogger=DEBUG, console, file
+log4j.rootLogger=INFO, console, file
# Console will only display warnnings
log4j.appender.console=org.apache.log4j.ConsoleAppender
[3/5] karaf git commit: Refactor GenerateServiceMetadata
Posted by cs...@apache.org.
Refactor GenerateServiceMetadata
Project: http://git-wip-us.apache.org/repos/asf/karaf/repo
Commit: http://git-wip-us.apache.org/repos/asf/karaf/commit/011c9b04
Tree: http://git-wip-us.apache.org/repos/asf/karaf/tree/011c9b04
Diff: http://git-wip-us.apache.org/repos/asf/karaf/diff/011c9b04
Branch: refs/heads/master
Commit: 011c9b048f6ae16271be6154e6d547ad288e70fc
Parents: fcf9b7c
Author: Christian Schneider <ch...@die-schneider.net>
Authored: Tue Aug 15 17:47:32 2017 +0200
Committer: Christian Schneider <ch...@die-schneider.net>
Committed: Tue Aug 15 17:47:32 2017 +0200
----------------------------------------------------------------------
.../tracker/GenerateServiceMetadata.java | 74 +++++++++-----------
1 file changed, 33 insertions(+), 41 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/karaf/blob/011c9b04/tooling/karaf-services-maven-plugin/src/main/java/org/apache/karaf/tooling/tracker/GenerateServiceMetadata.java
----------------------------------------------------------------------
diff --git a/tooling/karaf-services-maven-plugin/src/main/java/org/apache/karaf/tooling/tracker/GenerateServiceMetadata.java b/tooling/karaf-services-maven-plugin/src/main/java/org/apache/karaf/tooling/tracker/GenerateServiceMetadata.java
index ba4fac1..2d44bfd 100644
--- a/tooling/karaf-services-maven-plugin/src/main/java/org/apache/karaf/tooling/tracker/GenerateServiceMetadata.java
+++ b/tooling/karaf-services-maven-plugin/src/main/java/org/apache/karaf/tooling/tracker/GenerateServiceMetadata.java
@@ -17,6 +17,7 @@
package org.apache.karaf.tooling.tracker;
import java.io.File;
+import java.io.IOException;
import java.io.OutputStream;
import java.net.URL;
import java.net.URLClassLoader;
@@ -84,8 +85,8 @@ public class GenerateServiceMetadata extends AbstractMojo {
try {
boolean addSourceDirectory = false;
- StringBuilder requirements = new StringBuilder();
- StringBuilder capabilities = new StringBuilder();
+ List<String> requirements = new ArrayList<>();
+ List<String> capabilities = new ArrayList<>();
ClassFinder finder = createFinder(classLoader);
List<Class<?>> classes = finder.findAnnotatedClasses(Services.class);
@@ -103,28 +104,18 @@ public class GenerateServiceMetadata extends AbstractMojo {
activators.add(clazz);
}
- Properties props = new Properties();
+ writeServiceProperties(clazz);
+
Services services = clazz.getAnnotation(Services.class);
if (services != null) {
for (RequireService req : services.requires()) {
- String fltWithClass = combine(req.filter(), "(objectClass=" + req.value().getName() + ")");
- addServiceReq(requirements, fltWithClass);
- props.setProperty(req.value().getName(), req.filter());
+ requirements.add(getRequirement(req));
}
for (ProvideService cap : services.provides()) {
- addServiceCap(capabilities, cap);
+ capabilities.add(getCapability(cap));
}
}
- Managed managed = clazz.getAnnotation(Managed.class);
- if (managed != null) {
- props.setProperty("pid", managed.value());
- }
-
- File file = new File(outputDirectory, "OSGI-INF/karaf-tracker/" + clazz.getName());
- file.getParentFile().mkdirs();
- try (OutputStream os = buildContext.newFileOutputStream(file)) {
- props.store(os, null);
- }
+
addSourceDirectory = true;
}
@@ -134,8 +125,8 @@ public class GenerateServiceMetadata extends AbstractMojo {
project.addResource(resource);
}
- project.getProperties().setProperty(requirementsProperty, requirements.toString());
- project.getProperties().setProperty(capabilitiesProperty, capabilities.toString());
+ project.getProperties().setProperty(requirementsProperty, String.join(",", requirements));
+ project.getProperties().setProperty(capabilitiesProperty, String.join(",", capabilities));
if (activators.size() == 1) {
project.getProperties().setProperty(activatorProperty, activators.get(0).getName());
}
@@ -148,7 +139,7 @@ public class GenerateServiceMetadata extends AbstractMojo {
packages.add(clazz.getPackage().getName());
}
if (!packages.isEmpty()) {
- project.getProperties().setProperty("BNDExtension-Karaf-Commands", join(packages, ","));
+ project.getProperties().setProperty("BNDExtension-Karaf-Commands", String.join(",", packages));
}
} catch (Exception e) {
@@ -156,32 +147,33 @@ public class GenerateServiceMetadata extends AbstractMojo {
}
}
- private String join(Set<String> packages, String separator) {
- StringBuilder sb = new StringBuilder();
- for (String pkg : packages) {
- if (sb.length() > 0) {
- sb.append(separator);
- }
- sb.append(pkg);
- }
- return sb.toString();
+ private String getRequirement(RequireService req) {
+ String fltWithClass = combine(req.filter(), "(objectClass=" + req.value().getName() + ")");
+ return "osgi.service;effective:=active;filter:=\"" + fltWithClass + "\"";
+ }
+
+ private String getCapability(ProvideService cap) {
+ return "osgi.service;effective:=active;objectClass=" + cap.value().getName();
}
- private void addServiceCap(StringBuilder capabilities, ProvideService cap) {
- if (capabilities.length() > 0) {
- capabilities.append(",");
+ private void writeServiceProperties(Class<?> serviceClazz) throws IOException {
+ Properties props = new Properties();
+ Services services = serviceClazz.getAnnotation(Services.class);
+ if (services != null) {
+ for (RequireService req : services.requires()) {
+ props.setProperty(req.value().getName(), req.filter());
+ }
+ }
+ Managed managed = serviceClazz.getAnnotation(Managed.class);
+ if (managed != null) {
+ props.setProperty("pid", managed.value());
}
- capabilities.append("osgi.service;effective:=active;objectClass=")
- .append(cap.value().getName());
- }
- private void addServiceReq(StringBuilder requirements, String fltWithClass) {
- if (requirements.length() > 0) {
- requirements.append(",");
+ File file = new File(outputDirectory, "OSGI-INF/karaf-tracker/" + serviceClazz.getName());
+ file.getParentFile().mkdirs();
+ try (OutputStream os = buildContext.newFileOutputStream(file)) {
+ props.store(os, null);
}
- requirements.append("osgi.service;effective:=active;filter:=\"")
- .append(fltWithClass)
- .append("\"");
}
private String combine(String filter1, String filter2) {
[4/5] karaf git commit: Do not print each classpath Element
Posted by cs...@apache.org.
Do not print each classpath Element
Project: http://git-wip-us.apache.org/repos/asf/karaf/repo
Commit: http://git-wip-us.apache.org/repos/asf/karaf/commit/1bf544b9
Tree: http://git-wip-us.apache.org/repos/asf/karaf/tree/1bf544b9
Diff: http://git-wip-us.apache.org/repos/asf/karaf/diff/1bf544b9
Branch: refs/heads/master
Commit: 1bf544b95aa03ad6f4c4ec6a9060b047430615a5
Parents: 011c9b0
Author: Christian Schneider <ch...@die-schneider.net>
Authored: Tue Aug 15 17:48:10 2017 +0200
Committer: Christian Schneider <ch...@die-schneider.net>
Committed: Tue Aug 15 17:48:10 2017 +0200
----------------------------------------------------------------------
.../org/apache/karaf/tooling/tracker/GenerateServiceMetadata.java | 1 -
1 file changed, 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/karaf/blob/1bf544b9/tooling/karaf-services-maven-plugin/src/main/java/org/apache/karaf/tooling/tracker/GenerateServiceMetadata.java
----------------------------------------------------------------------
diff --git a/tooling/karaf-services-maven-plugin/src/main/java/org/apache/karaf/tooling/tracker/GenerateServiceMetadata.java b/tooling/karaf-services-maven-plugin/src/main/java/org/apache/karaf/tooling/tracker/GenerateServiceMetadata.java
index 2d44bfd..7b0fd37 100644
--- a/tooling/karaf-services-maven-plugin/src/main/java/org/apache/karaf/tooling/tracker/GenerateServiceMetadata.java
+++ b/tooling/karaf-services-maven-plugin/src/main/java/org/apache/karaf/tooling/tracker/GenerateServiceMetadata.java
@@ -194,7 +194,6 @@ public class GenerateServiceMetadata extends AbstractMojo {
File file = artifact.getFile();
if ( file != null ) {
urls.add( file.toURI().toURL() );
- System.out.println("classpath: " + file);
}
}
ClassLoader loader = new URLClassLoader(urls.toArray(new URL[urls.size()]), getClass().getClassLoader());
[5/5] karaf git commit: Avoid excessive logging
Posted by cs...@apache.org.
Avoid excessive logging
Project: http://git-wip-us.apache.org/repos/asf/karaf/repo
Commit: http://git-wip-us.apache.org/repos/asf/karaf/commit/767012d2
Tree: http://git-wip-us.apache.org/repos/asf/karaf/tree/767012d2
Diff: http://git-wip-us.apache.org/repos/asf/karaf/diff/767012d2
Branch: refs/heads/master
Commit: 767012d2544be03ab5818f3288912f1578d0e0c2
Parents: 1bf544b
Author: Christian Schneider <ch...@die-schneider.net>
Authored: Tue Aug 15 17:57:24 2017 +0200
Committer: Christian Schneider <ch...@die-schneider.net>
Committed: Tue Aug 15 17:57:24 2017 +0200
----------------------------------------------------------------------
jaas/blueprint/jasypt/src/test/resources/log4j.properties | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/karaf/blob/767012d2/jaas/blueprint/jasypt/src/test/resources/log4j.properties
----------------------------------------------------------------------
diff --git a/jaas/blueprint/jasypt/src/test/resources/log4j.properties b/jaas/blueprint/jasypt/src/test/resources/log4j.properties
index e1cbdd1..3822bad 100644
--- a/jaas/blueprint/jasypt/src/test/resources/log4j.properties
+++ b/jaas/blueprint/jasypt/src/test/resources/log4j.properties
@@ -18,7 +18,7 @@
#
# The logging properties used during tests..
#
-log4j.rootLogger=DEBUG, console, file
+log4j.rootLogger=INFO, console, file
# Console will only display warnnings
log4j.appender.console=org.apache.log4j.ConsoleAppender