svn commit: r1517282 - in /karaf/trunk/tooling/karaf-maven-plugin/src: main/java/org/apache/karaf/tooling/features/ main/java/org/apache/karaf/tooling/features/model/ test/java/org/apache/karaf/tooling/features/

[cs...@apache.org]

Author: cschneider
Date: Sun Aug 25 13:03:20 2013
New Revision: 1517282

URL: http://svn.apache.org/r1517282
Log:
KARAF-2426 Add defaultStartlevel

Modified:
    karaf/trunk/tooling/karaf-maven-plugin/src/main/java/org/apache/karaf/tooling/features/AddToRepositoryMojo.java
    karaf/trunk/tooling/karaf-maven-plugin/src/main/java/org/apache/karaf/tooling/features/model/Repository.java
    karaf/trunk/tooling/karaf-maven-plugin/src/test/java/org/apache/karaf/tooling/features/AddToRepositoryMojoTest.java

Modified: karaf/trunk/tooling/karaf-maven-plugin/src/main/java/org/apache/karaf/tooling/features/AddToRepositoryMojo.java
URL: http://svn.apache.org/viewvc/karaf/trunk/tooling/karaf-maven-plugin/src/main/java/org/apache/karaf/tooling/features/AddToRepositoryMojo.java?rev=1517282&r1=1517281&r2=1517282&view=diff
==============================================================================
--- karaf/trunk/tooling/karaf-maven-plugin/src/main/java/org/apache/karaf/tooling/features/AddToRepositoryMojo.java (original)
+++ karaf/trunk/tooling/karaf-maven-plugin/src/main/java/org/apache/karaf/tooling/features/AddToRepositoryMojo.java Sun Aug 25 13:03:20 2013
@@ -129,6 +129,12 @@ public class AddToRepositoryMojo extends
     private File metaDataFile;
     
     /**
+     * The start level exported when no explicit start level is set for a bundle
+     * @parameter 
+     */
+    private int defaultStartLevel = 80;
+    
+    /**
      * Internal counter for garbage collection
      */
     private int resolveCount = 0;
@@ -215,7 +221,8 @@ public class AddToRepositoryMojo extends
         if (includeMvnBasedDescriptors) {
             bundles.add(uri);
         }
-        Repository repo = new Repository(URI.create(translateFromMaven(uri.replaceAll(" ", "%20"))));
+        URI repoURI = URI.create(translateFromMaven(uri.replaceAll(" ", "%20")));
+        Repository repo = new Repository(repoURI, defaultStartLevel);
         for (Feature f : repo.getFeatures()) {
             featuresMap.put(f.getName() + "/" + f.getVersion(), f);
         }

Modified: karaf/trunk/tooling/karaf-maven-plugin/src/main/java/org/apache/karaf/tooling/features/model/Repository.java
URL: http://svn.apache.org/viewvc/karaf/trunk/tooling/karaf-maven-plugin/src/main/java/org/apache/karaf/tooling/features/model/Repository.java?rev=1517282&r1=1517281&r2=1517282&view=diff
==============================================================================
--- karaf/trunk/tooling/karaf-maven-plugin/src/main/java/org/apache/karaf/tooling/features/model/Repository.java (original)
+++ karaf/trunk/tooling/karaf-maven-plugin/src/main/java/org/apache/karaf/tooling/features/model/Repository.java Sun Aug 25 13:03:20 2013
@@ -36,9 +36,11 @@ public class Repository {
     private URI uri;
     private List<Feature> features;
     private List<String> repositories;
+    private Integer defaultStartLevel;
 
-    public Repository(URI uri) {
+    public Repository(URI uri, Integer defaultStartLevel) {
         this.uri = uri;
+        this.defaultStartLevel = defaultStartLevel;
     }
 
     public URI getURI() {
@@ -127,6 +129,9 @@ public class Repository {
                     } catch (Exception e1) {
                         startLevel = null;
                     }
+                    if (startLevel == null || startLevel == 0) {
+                        startLevel = defaultStartLevel;
+                    }
                     f.addBundle(new BundleRef(b.getTextContent(), startLevel));
                 }
                 features.add(f);

Modified: karaf/trunk/tooling/karaf-maven-plugin/src/test/java/org/apache/karaf/tooling/features/AddToRepositoryMojoTest.java
URL: http://svn.apache.org/viewvc/karaf/trunk/tooling/karaf-maven-plugin/src/test/java/org/apache/karaf/tooling/features/AddToRepositoryMojoTest.java?rev=1517282&r1=1517281&r2=1517282&view=diff
==============================================================================
--- karaf/trunk/tooling/karaf-maven-plugin/src/test/java/org/apache/karaf/tooling/features/AddToRepositoryMojoTest.java (original)
+++ karaf/trunk/tooling/karaf-maven-plugin/src/test/java/org/apache/karaf/tooling/features/AddToRepositoryMojoTest.java Sun Aug 25 13:03:20 2013
@@ -41,7 +41,7 @@ public class AddToRepositoryMojoTest ext
     @Test
     public void testSimpleURL() throws Exception {
         URL in = getClass().getClassLoader().getResource("input-repository.xml");
-        Repository repo = new Repository(in.toURI());
+        Repository repo = new Repository(in.toURI(), 80);
 
         String[] repos = repo.getDefinedRepositories();