You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@karaf.apache.org by gn...@apache.org on 2017/11/20 09:33:58 UTC
[karaf] branch master updated (46e8b90 -> 92b505c)
This is an automated email from the ASF dual-hosted git repository.
gnodet pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/karaf.git.
from 46e8b90 [KARAF-5446] Fragment bundles are not resolved properly when installing/restarting the container
add b186ba3 Fix performance issue generating service metadata, change logging
new 92b505c [KARAF-5494] Merge branch 'master' of https://github.com/mhus/karaf into mhus-master
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../tooling/tracker/GenerateServiceMetadata.java | 22 ++++++++++++++++------
1 file changed, 16 insertions(+), 6 deletions(-)
--
To stop receiving notification emails like this one, please contact
['"commits@karaf.apache.org" <co...@karaf.apache.org>'].
[karaf] 01/01: [KARAF-5494] Merge branch 'master' of
https://github.com/mhus/karaf into mhus-master
Posted by gn...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
gnodet pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/karaf.git
commit 92b505c70583b518e19693597d34cb449d9c1422
Merge: 46e8b90 b186ba3
Author: Guillaume Nodet <gn...@gmail.com>
AuthorDate: Mon Nov 20 10:30:08 2017 +0100
[KARAF-5494] Merge branch 'master' of https://github.com/mhus/karaf into mhus-master
.../tooling/tracker/GenerateServiceMetadata.java | 22 ++++++++++++++++------
1 file changed, 16 insertions(+), 6 deletions(-)
diff --cc tooling/karaf-services-maven-plugin/src/main/java/org/apache/karaf/tooling/tracker/GenerateServiceMetadata.java
index 7b0fd37,bd0aa50..d2fd670
--- 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
@@@ -96,7 -99,7 +99,7 @@@ public class GenerateServiceMetadata ex
URL classUrl = clazz.getClassLoader().getResource(clazz.getName().replace('.', '/') + ".class");
URL outputDirectoryUrl = new File(project.getBuild().getOutputDirectory()).toURI().toURL();
if (classUrl == null || !classUrl.getPath().startsWith(outputDirectoryUrl.getPath())) {
- System.out.println("Ignoring " + classUrl);
- getLog().info("Ignoring " + classUrl);
++ getLog().info("Ignoring " + classUrl);
continue;
}
@@@ -128,6 -131,7 +131,7 @@@
project.getProperties().setProperty(requirementsProperty, String.join(",", requirements));
project.getProperties().setProperty(capabilitiesProperty, String.join(",", capabilities));
if (activators.size() == 1) {
- getLog().info("Activator " + activators.get(0).getName());
++ getLog().info("Activator " + activators.get(0).getName());
project.getProperties().setProperty(activatorProperty, activators.get(0).getName());
}
project.getProperties().setProperty("BNDExtension-Private-Package", "org.apache.karaf.util.tracker");
@@@ -136,6 -140,7 +140,7 @@@
List<Class<?>> services = finder.findAnnotatedClasses(Service.class);
Set<String> packages = new TreeSet<>();
for (Class<?> clazz : services) {
- getLog().info("Service " + clazz.getPackage().getName());
++ getLog().info("Service " + clazz.getPackage().getName());
packages.add(clazz.getPackage().getName());
}
if (!packages.isEmpty()) {
@@@ -189,12 -194,17 +194,17 @@@
if ("project".equals(classloaderType)) {
List<URL> urls = new ArrayList<>();
-- urls.add( new File(project.getBuild().getOutputDirectory()).toURI().toURL() );
-- for ( Artifact artifact : project.getArtifacts() ) {
- File file = artifact.getFile();
- if ( file != null ) {
- urls.add( file.toURI().toURL() );
- if (artifactInclude != null && artifactInclude.length() > 0 && artifact.getArtifactId().matches(artifactInclude)) {
- File file = artifact.getFile();
- if ( file != null ) {
- getLog().debug("Use artifact " + artifact.getArtifactId() + ": " + file);
- urls.add( file.toURI().toURL() );
- }
- } else {
- getLog().debug("Ignore artifact " + artifact.getArtifactId() );
- }
++ urls.add(new File(project.getBuild().getOutputDirectory()).toURI().toURL());
++ for (Artifact artifact : project.getArtifacts()) {
++ if (artifactInclude != null && artifactInclude.length() > 0 && artifact.getArtifactId().matches(artifactInclude)) {
++ File file = artifact.getFile();
++ if (file != null) {
++ getLog().debug("Use artifact " + artifact.getArtifactId() + ": " + file);
++ urls.add(file.toURI().toURL());
++ }
++ } else {
++ getLog().debug("Ignore artifact " + artifact.getArtifactId());
+ }
}
ClassLoader loader = new URLClassLoader(urls.toArray(new URL[urls.size()]), getClass().getClassLoader());
finder = new ClassFinder(loader, urls);
--
To stop receiving notification emails like this one, please contact
"commits@karaf.apache.org" <co...@karaf.apache.org>.