You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@felix.apache.org by cz...@apache.org on 2012/08/31 10:15:22 UTC

svn commit: r1379350 - /felix/trunk/scrplugin/maven-scr-plugin/src/main/java/org/apache/felix/scrplugin/mojo/SCRDescriptorMojo.java

Author: cziegeler
Date: Fri Aug 31 08:15:22 2012
New Revision: 1379350

URL: http://svn.apache.org/viewvc?rev=1379350&view=rev
Log:
FELIX-3642 : Change default for generating descriptor files to generate single file for each component

Modified:
    felix/trunk/scrplugin/maven-scr-plugin/src/main/java/org/apache/felix/scrplugin/mojo/SCRDescriptorMojo.java

Modified: felix/trunk/scrplugin/maven-scr-plugin/src/main/java/org/apache/felix/scrplugin/mojo/SCRDescriptorMojo.java
URL: http://svn.apache.org/viewvc/felix/trunk/scrplugin/maven-scr-plugin/src/main/java/org/apache/felix/scrplugin/mojo/SCRDescriptorMojo.java?rev=1379350&r1=1379349&r2=1379350&view=diff
==============================================================================
--- felix/trunk/scrplugin/maven-scr-plugin/src/main/java/org/apache/felix/scrplugin/mojo/SCRDescriptorMojo.java (original)
+++ felix/trunk/scrplugin/maven-scr-plugin/src/main/java/org/apache/felix/scrplugin/mojo/SCRDescriptorMojo.java Fri Aug 31 08:15:22 2012
@@ -128,7 +128,14 @@ public class SCRDescriptorMojo extends A
      *
      * @parameter default-value="false"
      */
-    protected boolean strictMode;
+    private boolean strictMode;
+
+    /**
+     * If set to false, a single descriptor will be created.
+     *
+     * @parameter default-value="true"
+     */
+    private boolean generateSeparateDescriptors;
 
     /**
      * The comma separated list of tokens to include when processing sources.
@@ -201,6 +208,8 @@ public class SCRDescriptorMojo extends A
         options.setStrictMode(strictMode);
         options.setProperties(properties);
         options.setSpecVersion(SpecVersion.fromName(specVersion));
+        options.setGenerateSeparateDescriptors(this.generateSeparateDescriptors);
+
         if ( specVersion != null && options.getSpecVersion() == null ) {
             throw new MojoExecutionException("Unknown spec version specified: " + specVersion);
         }