geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From djen...@apache.org
Subject svn commit: r1099356 - /geronimo/server/branches/3.0-osgi/framework/buildsupport/car-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/car/PackageMojo.java
Date Wed, 04 May 2011 07:48:33 GMT
Author: djencks
Date: Wed May  4 07:48:33 2011
New Revision: 1099356

URL: http://svn.apache.org/viewvc?rev=1099356&view=rev
Log:
non-working fix to use features options to make failure investigation easier

Modified:
    geronimo/server/branches/3.0-osgi/framework/buildsupport/car-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/car/PackageMojo.java

Modified: geronimo/server/branches/3.0-osgi/framework/buildsupport/car-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/car/PackageMojo.java
URL: http://svn.apache.org/viewvc/geronimo/server/branches/3.0-osgi/framework/buildsupport/car-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/car/PackageMojo.java?rev=1099356&r1=1099355&r2=1099356&view=diff
==============================================================================
--- geronimo/server/branches/3.0-osgi/framework/buildsupport/car-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/car/PackageMojo.java
(original)
+++ geronimo/server/branches/3.0-osgi/framework/buildsupport/car-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/car/PackageMojo.java
Wed May  4 07:48:33 2011
@@ -23,6 +23,7 @@ import java.io.File;
 import java.lang.reflect.Method;
 import java.net.URI;
 import java.util.ArrayList;
+import java.util.EnumSet;
 import java.util.List;
 import java.util.Map;
 
@@ -165,7 +166,7 @@ public class PackageMojo extends Abstrac
                 try {
                     karInstallMethod = karService.getClass().getMethod("install", new Class[]{File.class});
                     featuresAddRepoMethod = featuresService.getClass().getMethod("addRepository",
new Class[]{URI.class});
-                    featuresInstallFeatureMethod = featuresService.getClass().getMethod("installFeature",
new Class[]{String.class});
+                    featuresInstallFeatureMethod = featuresService.getClass().getMethod("installFeature",
new Class[]{String.class, String.class, EnumSet.class});
                 } catch (NoSuchMethodException e) {
                     throw new MojoFailureException("What class??", e);
                 }
@@ -199,7 +200,7 @@ public class PackageMojo extends Abstrac
                 }
                 if (features != null) {
                     for (String featureName: features) {
-                        featuresInstallFeatureMethod.invoke(featuresService, featureName);
+                        featuresInstallFeatureMethod.invoke(featuresService, featureName,
org.apache.karaf.features.internal.model.Feature.DEFAULT_VERSION, EnumSet.of(FeaturesService.Option.NoCleanIfFailure,
FeaturesService.Option.ContinueBatchOnFailure));
                     }
                 }
                 for (Long id : ids) {



Mime
View raw message