You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by da...@apache.org on 2018/04/30 09:36:44 UTC
[sling-slingstart-maven-plugin] 04/07: Feature model conversion
enabled for generate-resources phase
This is an automated email from the ASF dual-hosted git repository.
davidb pushed a commit to branch featureModel
in repository https://gitbox.apache.org/repos/asf/sling-slingstart-maven-plugin.git
commit 00c219c797aa6d3287619c7e3e0892748b3c4d9c
Author: David Bosschaert <da...@gmail.com>
AuthorDate: Wed Mar 7 14:29:19 2018 +0000
Feature model conversion enabled for generate-resources phase
---
.../apache/sling/maven/slingstart/FeatureModelConverter.java | 1 -
.../apache/sling/maven/slingstart/GenerateResourcesMojo.java | 12 +++++++-----
src/main/resources/META-INF/plexus/components.xml | 1 +
3 files changed, 8 insertions(+), 6 deletions(-)
diff --git a/src/main/java/org/apache/sling/maven/slingstart/FeatureModelConverter.java b/src/main/java/org/apache/sling/maven/slingstart/FeatureModelConverter.java
index d2b16f0..2dadcc5 100644
--- a/src/main/java/org/apache/sling/maven/slingstart/FeatureModelConverter.java
+++ b/src/main/java/org/apache/sling/maven/slingstart/FeatureModelConverter.java
@@ -68,7 +68,6 @@ public class FeatureModelConverter {
String fn = targetDir.getAbsolutePath() + "/" + f.getName() + ".txt";
FeatureToProvisioning.convert(f, fn, am);
System.out.println("~~~ Converted at: " + fn);
-
}
} catch (Exception e) {
throw new MavenExecutionException("Cannot convert feature files to provisioning model", e);
diff --git a/src/main/java/org/apache/sling/maven/slingstart/GenerateResourcesMojo.java b/src/main/java/org/apache/sling/maven/slingstart/GenerateResourcesMojo.java
index e92d384..fed1432 100644
--- a/src/main/java/org/apache/sling/maven/slingstart/GenerateResourcesMojo.java
+++ b/src/main/java/org/apache/sling/maven/slingstart/GenerateResourcesMojo.java
@@ -74,14 +74,16 @@ public class GenerateResourcesMojo extends AbstractSlingStartMojo {
System.out.println("### Found: " + f);
}
- String targetDir = project.getBuild().getDirectory();
- File provModelDir = new File(targetDir + "/" + FeatureModelConverter.BUILD_DIR);
- provModelDir.mkdirs();
+ File targetDir = new File(project.getBuild().getDirectory(), FeatureModelConverter.BUILD_DIR);
+ targetDir.mkdirs();
try {
ArtifactManager am = getArtifactManager();
- FeatureToProvisioning.convert(files, provModelDir.getAbsolutePath() + "/model.txt", false, am);
- System.out.println("~~~ Converted files at: " + provModelDir);
+ for (File f : files) {
+ String fn = targetDir.getAbsolutePath() + "/" + f.getName() + ".txt";
+ FeatureToProvisioning.convert(f, fn, am);
+ System.out.println("### Converted: " + fn);
+ }
} catch (Exception e) {
throw new MojoExecutionException("Cannot convert feature files to provisioning model", e);
}
diff --git a/src/main/resources/META-INF/plexus/components.xml b/src/main/resources/META-INF/plexus/components.xml
index d694e2d..c05d45e 100644
--- a/src/main/resources/META-INF/plexus/components.xml
+++ b/src/main/resources/META-INF/plexus/components.xml
@@ -45,6 +45,7 @@
<lifecycle>
<id>default</id>
<phases>
+ <generate-resources>org.apache.sling:slingstart-maven-plugin:generate-resources</generate-resources>
<process-resources>org.apache.maven.plugins:maven-resources-plugin:resources</process-resources>
<compile>org.apache.maven.plugins:maven-compiler-plugin:compile</compile>
<process-test-resources>
--
To stop receiving notification emails like this one, please contact
davidb@apache.org.