You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@felix.apache.org by pd...@apache.org on 2010/02/06 23:41:07 UTC
svn commit: r907339 -
/felix/trunk/dependencymanager/annotation/src/main/java/org/apache/felix/dm/annotation/plugin/mvn/AnnotationMojo.java
Author: pderop
Date: Sat Feb 6 22:41:07 2010
New Revision: 907339
URL: http://svn.apache.org/viewvc?rev=907339&view=rev
Log:
metatype support. fixed logging
Modified:
felix/trunk/dependencymanager/annotation/src/main/java/org/apache/felix/dm/annotation/plugin/mvn/AnnotationMojo.java
Modified: felix/trunk/dependencymanager/annotation/src/main/java/org/apache/felix/dm/annotation/plugin/mvn/AnnotationMojo.java
URL: http://svn.apache.org/viewvc/felix/trunk/dependencymanager/annotation/src/main/java/org/apache/felix/dm/annotation/plugin/mvn/AnnotationMojo.java?rev=907339&r1=907338&r2=907339&view=diff
==============================================================================
--- felix/trunk/dependencymanager/annotation/src/main/java/org/apache/felix/dm/annotation/plugin/mvn/AnnotationMojo.java (original)
+++ felix/trunk/dependencymanager/annotation/src/main/java/org/apache/felix/dm/annotation/plugin/mvn/AnnotationMojo.java Sat Feb 6 22:41:07 2010
@@ -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());
}