metatype support. fixed logging
git-svn-id: https://svn.apache.org/repos/asf/felix/trunk@907339 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/dependencymanager/annotation/src/main/java/org/apache/felix/dm/annotation/plugin/mvn/AnnotationMojo.java b/dependencymanager/annotation/src/main/java/org/apache/felix/dm/annotation/plugin/mvn/AnnotationMojo.java
index 05c009b..274bdbf 100644
--- a/dependencymanager/annotation/src/main/java/org/apache/felix/dm/annotation/plugin/mvn/AnnotationMojo.java
+++ b/dependencymanager/annotation/src/main/java/org/apache/felix/dm/annotation/plugin/mvn/AnnotationMojo.java
@@ -98,6 +98,11 @@
{
jar.putResource(entry.getKey(), entry.getValue());
}
+
+ Resource metaType = generator.getMetaTypeResource();
+ if (metaType != null) {
+ jar.putResource("OSGI-INF/metatype/metatype.xml", metaType);
+ }
copy(jar, target);
}
@@ -128,7 +133,7 @@
catch (Throwable t)
{
- getLog().warn("Exception while scanning annotation", t);
+ getLog().error("Exception while scanning annotation", t);
throw new MojoExecutionException(t.getMessage(), t.getCause());
}