You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@karaf.apache.org by jb...@apache.org on 2011/12/09 13:05:52 UTC
svn commit: r1212348 -
/karaf/branches/karaf-2.2.x/tooling/features-maven-plugin/src/main/java/org/apache/karaf/tooling/features/CreateKarMojo.java
Author: jbonofre
Date: Fri Dec 9 12:05:52 2011
New Revision: 1212348
URL: http://svn.apache.org/viewvc?rev=1212348&view=rev
Log:
[KARAF-959] Fix the features:create-kar goal (correct usage of the archiver)
Modified:
karaf/branches/karaf-2.2.x/tooling/features-maven-plugin/src/main/java/org/apache/karaf/tooling/features/CreateKarMojo.java
Modified: karaf/branches/karaf-2.2.x/tooling/features-maven-plugin/src/main/java/org/apache/karaf/tooling/features/CreateKarMojo.java
URL: http://svn.apache.org/viewvc/karaf/branches/karaf-2.2.x/tooling/features-maven-plugin/src/main/java/org/apache/karaf/tooling/features/CreateKarMojo.java?rev=1212348&r1=1212347&r2=1212348&view=diff
==============================================================================
--- karaf/branches/karaf-2.2.x/tooling/features-maven-plugin/src/main/java/org/apache/karaf/tooling/features/CreateKarMojo.java (original)
+++ karaf/branches/karaf-2.2.x/tooling/features-maven-plugin/src/main/java/org/apache/karaf/tooling/features/CreateKarMojo.java Fri Dec 9 12:05:52 2011
@@ -118,16 +118,16 @@ public class CreateKarMojo extends MojoS
private List<Artifact> readBundles() throws MojoExecutionException {
List<Artifact> bundles = new ArrayList<Artifact>();
try {
- RepositoryImpl featuresRepo = new RepositoryImpl(featuresFile.toURI());
- Feature[] features = featuresRepo.getFeatures();
- for (Feature feature : features) {
- for (BundleInfo bundle : feature.getBundles()) {
- if (!bundle.isDependency()) {
- bundles.add(bundleToArtifact(bundle.getLocation(), false));
- }
+ RepositoryImpl featuresRepo = new RepositoryImpl(featuresFile.toURI());
+ Feature[] features = featuresRepo.getFeatures();
+ for (Feature feature : features) {
+ for (BundleInfo bundle : feature.getBundles()) {
+ if (!bundle.isDependency()) {
+ bundles.add(bundleToArtifact(bundle.getLocation(), false));
}
}
- return bundles;
+ }
+ return bundles;
} catch (MojoExecutionException e) {
throw e;
} catch (Exception e) {
@@ -140,6 +140,7 @@ public class CreateKarMojo extends MojoS
File archiveFile = getArchiveFile(outputDirectory, finalName, null);
MavenArchiver archiver = new MavenArchiver();
+ MavenArchiveConfiguration configuration = new MavenArchiveConfiguration();
archiver.setArchiver(jarArchiver);
archiver.setOutputFile(archiveFile);
@@ -162,6 +163,8 @@ public class CreateKarMojo extends MojoS
archiver.getArchiver().addDirectory(resourcesDir);
}
+ archiver.createArchive(project, configuration);
+
return archiveFile;
} catch (Exception e) {
throw new MojoExecutionException("Failed to create kar archive", e);