You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by ro...@apache.org on 2017/11/07 10:27:20 UTC
[sling-slingstart-maven-plugin] 03/13: SLING-5170 : Make dependency
handling code more reusable
This is an automated email from the ASF dual-hosted git repository.
rombert pushed a commit to annotated tag slingstart-maven-plugin-1.4.0
in repository https://gitbox.apache.org/repos/asf/sling-slingstart-maven-plugin.git
commit c3b709abf82653de04730f1329f3caf4bfceddbf
Author: Carsten Ziegeler <cz...@apache.org>
AuthorDate: Mon Oct 19 10:29:12 2015 +0000
SLING-5170 : Make dependency handling code more reusable
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk/tooling/maven/slingstart-maven-plugin@1709384 13f79535-47bb-0310-9956-ffa450edef68
---
.../slingstart/DependencyLifecycleParticipant.java | 424 +--------------------
...ycleParticipant.java => ModelPreprocessor.java} | 98 ++---
.../sling/maven/slingstart/ProjectHelper.java | 2 +-
3 files changed, 36 insertions(+), 488 deletions(-)
diff --git a/src/main/java/org/apache/sling/maven/slingstart/DependencyLifecycleParticipant.java b/src/main/java/org/apache/sling/maven/slingstart/DependencyLifecycleParticipant.java
index 8a51986..f6993b3 100644
--- a/src/main/java/org/apache/sling/maven/slingstart/DependencyLifecycleParticipant.java
+++ b/src/main/java/org/apache/sling/maven/slingstart/DependencyLifecycleParticipant.java
@@ -16,44 +16,18 @@
*/
package org.apache.sling.maven.slingstart;
-import java.io.File;
-import java.io.FileReader;
-import java.io.IOException;
-import java.io.Reader;
-import java.io.StringReader;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import org.apache.commons.io.IOUtils;
import org.apache.maven.AbstractMavenLifecycleParticipant;
import org.apache.maven.MavenExecutionException;
-import org.apache.maven.artifact.Artifact;
-import org.apache.maven.artifact.DefaultArtifact;
import org.apache.maven.artifact.handler.manager.ArtifactHandlerManager;
-import org.apache.maven.artifact.resolver.ArtifactNotFoundException;
-import org.apache.maven.artifact.resolver.ArtifactResolutionException;
import org.apache.maven.artifact.resolver.ArtifactResolver;
-import org.apache.maven.artifact.versioning.VersionRange;
import org.apache.maven.execution.MavenSession;
-import org.apache.maven.model.Dependency;
import org.apache.maven.model.Plugin;
import org.apache.maven.project.MavenProject;
-import org.apache.sling.provisioning.model.ArtifactGroup;
-import org.apache.sling.provisioning.model.Feature;
-import org.apache.sling.provisioning.model.Model;
-import org.apache.sling.provisioning.model.ModelConstants;
-import org.apache.sling.provisioning.model.ModelUtility;
-import org.apache.sling.provisioning.model.ModelUtility.ResolverOptions;
-import org.apache.sling.provisioning.model.RunMode;
-import org.apache.sling.provisioning.model.Traceable;
-import org.apache.sling.provisioning.model.io.ModelReader;
+import org.apache.sling.maven.slingstart.ModelPreprocessor.Environment;
+import org.apache.sling.maven.slingstart.ModelPreprocessor.ProjectInfo;
import org.codehaus.plexus.component.annotations.Component;
import org.codehaus.plexus.component.annotations.Requirement;
import org.codehaus.plexus.logging.Logger;
-import org.codehaus.plexus.util.xml.Xpp3Dom;
/**
* Maven lifecycle participant which adds the artifacts of the model to the dependencies.
@@ -76,25 +50,6 @@ public class DependencyLifecycleParticipant extends AbstractMavenLifecyclePartic
@Requirement
private ArtifactResolver resolver;
- public static final class ProjectInfo {
-
- public MavenProject project;
- public Plugin plugin;
- public Model localModel;
- public boolean done = false;
- public Model model;
- public final Map<org.apache.sling.provisioning.model.Artifact, Model> includedModels = new HashMap<org.apache.sling.provisioning.model.Artifact, Model>();
-
- }
-
- public static final class Environment {
- public ArtifactHandlerManager artifactHandlerManager;
- public ArtifactResolver resolver;
- public MavenSession session;
- public Logger logger;
- public final Map<String, ProjectInfo> modelProjects = new HashMap<String, ProjectInfo>();
- }
-
@Override
public void afterProjectsRead(final MavenSession session) throws MavenExecutionException {
final Environment env = new Environment();
@@ -122,379 +77,6 @@ public class DependencyLifecycleParticipant extends AbstractMavenLifecyclePartic
}
}
- addDependencies(env);
- }
-
- public static void addDependencies(final Environment env) throws MavenExecutionException {
- for(final ProjectInfo info : env.modelProjects.values()) {
- addDependencies(env, info);
- }
- }
-
- private static Model addDependencies(final Environment env, final ProjectInfo info)
- throws MavenExecutionException {
- if ( info.done == true ) {
- env.logger.debug("Return prepared model for " + info.project);
- return info.model;
- }
- // prevent recursion and multiple processing
- info.done = true;
- env.logger.debug("Processing project " + info.project);
-
- // read local model
- final String directory = nodeValue(info.plugin,
- "modelDirectory",
- new File(info.project.getBasedir(), "src/main/provisioning").getAbsolutePath());
- final String inlinedModel = nodeValue(info.plugin,
- "model", null);
- try {
- info.localModel = readLocalModel(info.project, inlinedModel, new File(directory), env.logger);
- } catch ( final IOException ioe) {
- throw new MavenExecutionException(ioe.getMessage(), ioe);
- }
-
- // prepare resolver options
- ResolverOptions resolverOptions = new ResolverOptions();
- if (nodeBooleanValue(info.plugin, "usePomVariables", false)) {
- resolverOptions.variableResolver(new PomVariableResolver(info.project));
- }
- if (nodeBooleanValue(info.plugin, "usePomDependencies", false)) {
- resolverOptions.artifactVersionResolver(new PomArtifactVersionResolver(info.project,
- nodeBooleanValue(info.plugin, "allowUnresolvedPomDependencies", false)));
- }
-
- // we have to create an effective model to add the dependencies
- final Model effectiveModel = ModelUtility.getEffectiveModel(info.localModel, resolverOptions);
-
- final List<Model> dependencies = searchSlingstartDependencies(env, info, info.localModel, effectiveModel);
- info.model = new Model();
- for(final Model d : dependencies) {
- ModelUtility.merge(info.model, d);
- }
- ModelUtility.merge(info.model, info.localModel);
- info.localModel = info.model;
- info.model = ModelUtility.getEffectiveModel(info.model, resolverOptions);
-
- final Map<Traceable, String> errors = ModelUtility.validate(info.model);
- if ( errors != null ) {
- throw new MavenExecutionException("Unable to create model file for " + info.project + " : " + errors, (File)null);
- }
-
- addDependenciesFromModel(env, info);
-
- try {
- ProjectHelper.storeProjectInfo(info);
- } catch ( final IOException ioe) {
- throw new MavenExecutionException(ioe.getMessage(), ioe);
- }
- return info.model;
- }
-
- /**
- * Add all dependencies from the model
- * @param project The project
- * @param model The model
- * @param log The logger
- * @throws MavenExecutionException
- */
- private static void addDependenciesFromModel(
- final Environment env,
- final ProjectInfo info)
- throws MavenExecutionException {
- if ( info.project.getPackaging().equals(BuildConstants.PACKAGING_SLINGSTART ) ) {
- // add base artifact if defined in current model
- final org.apache.sling.provisioning.model.Artifact baseArtifact = ModelUtils.findBaseArtifact(info.model);
-
- final String[] classifiers = new String[] {null, BuildConstants.CLASSIFIER_APP, BuildConstants.CLASSIFIER_WEBAPP};
- for(final String c : classifiers) {
- final Dependency dep = new Dependency();
- dep.setGroupId(baseArtifact.getGroupId());
- dep.setArtifactId(baseArtifact.getArtifactId());
- dep.setVersion(baseArtifact.getVersion());
- dep.setType(baseArtifact.getType());
- dep.setClassifier(c);
- if ( BuildConstants.CLASSIFIER_WEBAPP.equals(c) ) {
- dep.setType(BuildConstants.TYPE_WAR);
- }
- dep.setScope(Artifact.SCOPE_PROVIDED);
-
- info.project.getDependencies().add(dep);
- env.logger.debug("- adding base dependency " + ModelUtils.toString(dep));
- }
- }
-
- for(final Feature feature : info.model.getFeatures()) {
- // skip launchpad feature
- if ( feature.getName().equals(ModelConstants.FEATURE_LAUNCHPAD) ) {
- continue;
- }
- for(final RunMode runMode : feature.getRunModes()) {
- for(final ArtifactGroup group : runMode.getArtifactGroups()) {
- for(final org.apache.sling.provisioning.model.Artifact a : group) {
- final Dependency dep = new Dependency();
- dep.setGroupId(a.getGroupId());
- dep.setArtifactId(a.getArtifactId());
- dep.setVersion(a.getVersion());
- dep.setType(a.getType());
- dep.setClassifier(a.getClassifier());
-
- dep.setScope(Artifact.SCOPE_PROVIDED);
-
- env.logger.debug("- adding dependency " + ModelUtils.toString(dep));
- info.project.getDependencies().add(dep);
- }
- }
- }
- }
- }
-
- /**
- * Search for dependent slingstart/slingfeature artifacts and remove them from the effective model.
- * @throws MavenExecutionException
- */
- private static List<Model> searchSlingstartDependencies(
- final Environment env,
- final ProjectInfo info,
- final Model rawModel,
- final Model effectiveModel)
- throws MavenExecutionException {
- // slingstart or slingfeature
- final List<Model> dependencies = new ArrayList<Model>();
-
- for(final Feature feature : effectiveModel.getFeatures()) {
- for(final RunMode runMode : feature.getRunModes()) {
- for(final ArtifactGroup group : runMode.getArtifactGroups()) {
- final List<org.apache.sling.provisioning.model.Artifact> removeList = new ArrayList<org.apache.sling.provisioning.model.Artifact>();
- for(final org.apache.sling.provisioning.model.Artifact a : group) {
- if ( a.getType().equals(BuildConstants.PACKAGING_SLINGSTART)
- || a.getType().equals(BuildConstants.PACKAGING_PARTIAL_SYSTEM)) {
-
- final Dependency dep = new Dependency();
- dep.setGroupId(a.getGroupId());
- dep.setArtifactId(a.getArtifactId());
- dep.setVersion(a.getVersion());
- dep.setType(BuildConstants.PACKAGING_PARTIAL_SYSTEM);
- if ( a.getType().equals(BuildConstants.PACKAGING_SLINGSTART) ) {
- dep.setClassifier(BuildConstants.PACKAGING_PARTIAL_SYSTEM);
- } else {
- dep.setClassifier(a.getClassifier());
- }
- dep.setScope(Artifact.SCOPE_PROVIDED);
-
- env.logger.debug("- adding dependency " + ModelUtils.toString(dep));
- info.project.getDependencies().add(dep);
-
- // if it's a project from the current reactor build, we can't resolve it right now
- final String key = a.getGroupId() + ":" + a.getArtifactId();
- final ProjectInfo depInfo = env.modelProjects.get(key);
- if ( depInfo != null ) {
- env.logger.debug("Found reactor " + a.getType() + " dependency : " + a);
- final Model model = addDependencies(env, depInfo);
- if ( model == null ) {
- throw new MavenExecutionException("Recursive model dependency list including project " + info.project, (File)null);
- }
- dependencies.add(model);
- info.includedModels.put(a, depInfo.localModel);
-
- } else {
- env.logger.debug("Found external " + a.getType() + " dependency: " + a);
-
- // "external" dependency, we can already resolve it
- final File modelFile = resolveSlingstartArtifact(env, info.project, dep);
- FileReader r = null;
- try {
- r = new FileReader(modelFile);
- final Model model = ModelReader.read(r, modelFile.getAbsolutePath());
-
- info.includedModels.put(a, model);
-
- final Map<Traceable, String> errors = ModelUtility.validate(model);
- if ( errors != null ) {
- throw new MavenExecutionException("Unable to read model file from " + modelFile + " : " + errors, modelFile);
- }
- final Model fullModel = processSlingstartDependencies(env, info, dep, model);
-
- dependencies.add(fullModel);
- } catch ( final IOException ioe) {
- throw new MavenExecutionException("Unable to read model file from " + modelFile, ioe);
- } finally {
- try {
- if ( r != null ) {
- r.close();
- }
- } catch ( final IOException io) {
- // ignore
- }
- }
- }
-
- removeList.add(a);
- }
- }
- for(final org.apache.sling.provisioning.model.Artifact r : removeList) {
- group.remove(r);
- final Feature localModelFeature = rawModel.getFeature(feature.getName());
- if ( localModelFeature != null ) {
- final RunMode localRunMode = localModelFeature.getRunMode(runMode.getNames());
- if ( localRunMode != null ) {
- final ArtifactGroup localAG = localRunMode.getArtifactGroup(group.getStartLevel());
- if ( localAG != null ) {
- localAG.remove(r);
- }
- }
- }
- }
- }
- }
- }
-
- return dependencies;
- }
-
- private static Model processSlingstartDependencies(final Environment env, final ProjectInfo info, final Dependency dep, final Model rawModel)
- throws MavenExecutionException {
- env.logger.debug("Processing dependency " + dep);
-
- // we have to create an effective model to add the dependencies
- final Model effectiveModel = ModelUtility.getEffectiveModel(rawModel, new ResolverOptions());
-
- final List<Model> dependencies = searchSlingstartDependencies(env, info, rawModel, effectiveModel);
- Model mergingModel = new Model();
- for(final Model d : dependencies) {
- ModelUtility.merge(mergingModel, d);
- }
- ModelUtility.merge(mergingModel, rawModel);
-
- final Map<Traceable, String> errors = ModelUtility.validate(ModelUtility.getEffectiveModel(mergingModel, new ResolverOptions()));
- if ( errors != null ) {
- throw new MavenExecutionException("Unable to create model file for " + dep + " : " + errors, (File)null);
- }
-
- return mergingModel;
- }
-
- /**
- * Gets plugins configuration from POM (string parameter).
- * @param plugin Plugin
- * @param name Configuration parameter.
- * @param defaultValue Default value that is returned if parameter is not set
- * @return Parameter value or default value.
- */
- private static String nodeValue(final Plugin plugin, final String name, final String defaultValue) {
- final Xpp3Dom config = plugin == null ? null : (Xpp3Dom)plugin.getConfiguration();
- final Xpp3Dom node = (config == null ? null : config.getChild(name));
- if (node != null) {
- return node.getValue();
- } else {
- return defaultValue;
- }
- }
-
- /**
- * Gets plugins configuration from POM (boolean parameter).
- * @param plugin Plugin
- * @param name Configuration parameter.
- * @param defaultValue Default value that is returned if parameter is not set
- * @return Parameter value or default value.
- */
- private static boolean nodeBooleanValue(final Plugin plugin, final String name, final boolean defaultValue) {
- String booleanValue = nodeValue(plugin, name, Boolean.toString(defaultValue));
- return "true".equals(booleanValue.toLowerCase());
- }
-
- private static File resolveSlingstartArtifact(final Environment env,
- final MavenProject project,
- final Dependency d)
- throws MavenExecutionException {
- final Artifact prjArtifact = new DefaultArtifact(d.getGroupId(),
- d.getArtifactId(),
- VersionRange.createFromVersion(d.getVersion()),
- Artifact.SCOPE_PROVIDED,
- d.getType(),
- d.getClassifier(),
- env.artifactHandlerManager.getArtifactHandler(d.getType()));
- try {
- env.resolver.resolve(prjArtifact, project.getRemoteArtifactRepositories(), env.session.getLocalRepository());
- } catch (final ArtifactResolutionException e) {
- throw new MavenExecutionException("Unable to get artifact for " + d, e);
- } catch (final ArtifactNotFoundException e) {
- throw new MavenExecutionException("Unable to get artifact for " + d, e);
- }
- return prjArtifact.getFile();
- }
-
- /**
- * Read all model files from the directory in alphabetical order.
- * Only files ending with .txt or .model are read.
- *
- * @param project The current maven project
- * @param modelDirectory The directory to scan for models
- * @param logger The logger
- */
- private static Model readLocalModel(
- final MavenProject project,
- final String inlinedModel,
- final File modelDirectory,
- final Logger logger)
- throws MavenExecutionException, IOException {
- final List<String> candidates = new ArrayList<String>();
- if ( modelDirectory != null && modelDirectory.exists() ) {
- for(final File f : modelDirectory.listFiles() ) {
- if ( f.isFile() && !f.getName().startsWith(".") ) {
- if ( f.getName().endsWith(".txt") || f.getName().endsWith(".model") ) {
- candidates.add(f.getName());
- }
- }
- }
- Collections.sort(candidates);
- }
- if ( candidates.size() == 0 && (inlinedModel == null || inlinedModel.trim().length() == 0) ) {
- throw new MavenExecutionException("No model files found in " + modelDirectory + ", and no model inlined in POM.", (File)null);
- }
- final Model result = new Model();
- if ( inlinedModel != null ) {
- logger.debug("Reading inlined model from project " + project.getId());
- try {
- final Reader reader = new StringReader(inlinedModel);
- try {
- final Model current = ModelReader.read(reader, "pom");
- final Map<Traceable, String> errors = ModelUtility.validate(current);
- if (errors != null ) {
- throw new MavenExecutionException("Invalid inlined model : " + errors, (File)null);
- }
- ModelUtility.merge(result, current, false);
- } finally {
- IOUtils.closeQuietly(reader);
- }
- } catch ( final IOException io) {
- throw new MavenExecutionException("Unable to read inlined model", io);
- }
- }
- for(final String name : candidates) {
- logger.debug("Reading model " + name + " in project " + project.getId());
- try {
- final File f = new File(modelDirectory, name);
- final FileReader reader = new FileReader(f);
- try {
- final Model current = ModelReader.read(reader, f.getAbsolutePath());
- final Map<Traceable, String> errors = ModelUtility.validate(current);
- if (errors != null ) {
- throw new MavenExecutionException("Invalid model at " + name + " : " + errors, (File)null);
- }
- ModelUtility.merge(result, current, false);
- } finally {
- IOUtils.closeQuietly(reader);
- }
- } catch ( final IOException io) {
- throw new MavenExecutionException("Unable to read model at " + name, io);
- }
- }
-
- final Map<Traceable, String> errors = ModelUtility.validate(result);
- if (errors != null ) {
- throw new MavenExecutionException("Invalid assembled model : " + errors, (File)null);
- }
-
- return result;
+ new ModelPreprocessor().addDependencies(env);
}
}
diff --git a/src/main/java/org/apache/sling/maven/slingstart/DependencyLifecycleParticipant.java b/src/main/java/org/apache/sling/maven/slingstart/ModelPreprocessor.java
similarity index 86%
copy from src/main/java/org/apache/sling/maven/slingstart/DependencyLifecycleParticipant.java
copy to src/main/java/org/apache/sling/maven/slingstart/ModelPreprocessor.java
index 8a51986..26c8b0f 100644
--- a/src/main/java/org/apache/sling/maven/slingstart/DependencyLifecycleParticipant.java
+++ b/src/main/java/org/apache/sling/maven/slingstart/ModelPreprocessor.java
@@ -28,7 +28,6 @@ import java.util.List;
import java.util.Map;
import org.apache.commons.io.IOUtils;
-import org.apache.maven.AbstractMavenLifecycleParticipant;
import org.apache.maven.MavenExecutionException;
import org.apache.maven.artifact.Artifact;
import org.apache.maven.artifact.DefaultArtifact;
@@ -50,31 +49,10 @@ import org.apache.sling.provisioning.model.ModelUtility.ResolverOptions;
import org.apache.sling.provisioning.model.RunMode;
import org.apache.sling.provisioning.model.Traceable;
import org.apache.sling.provisioning.model.io.ModelReader;
-import org.codehaus.plexus.component.annotations.Component;
-import org.codehaus.plexus.component.annotations.Requirement;
import org.codehaus.plexus.logging.Logger;
import org.codehaus.plexus.util.xml.Xpp3Dom;
-/**
- * Maven lifecycle participant which adds the artifacts of the model to the dependencies.
- */
-@Component(role = AbstractMavenLifecycleParticipant.class)
-public class DependencyLifecycleParticipant extends AbstractMavenLifecycleParticipant {
-
- private static final String PLUGIN_ID = "slingstart-maven-plugin";
-
- @Requirement
- private Logger logger;
-
- @Requirement
- private ArtifactHandlerManager artifactHandlerManager;
-
- /**
- * Used to look up Artifacts in the remote repository.
- *
- */
- @Requirement
- private ArtifactResolver resolver;
+public class ModelPreprocessor {
public static final class ProjectInfo {
@@ -95,43 +73,13 @@ public class DependencyLifecycleParticipant extends AbstractMavenLifecyclePartic
public final Map<String, ProjectInfo> modelProjects = new HashMap<String, ProjectInfo>();
}
- @Override
- public void afterProjectsRead(final MavenSession session) throws MavenExecutionException {
- final Environment env = new Environment();
- env.artifactHandlerManager = artifactHandlerManager;
- env.resolver = resolver;
- env.logger = logger;
- env.session = session;
-
- logger.debug("Searching for " + BuildConstants.PACKAGING_SLINGSTART + "/" + BuildConstants.PACKAGING_PARTIAL_SYSTEM + " projects...");
-
- for (final MavenProject project : session.getProjects()) {
- if ( project.getPackaging().equals(BuildConstants.PACKAGING_SLINGSTART)
- || project.getPackaging().equals(BuildConstants.PACKAGING_PARTIAL_SYSTEM)) {
- logger.debug("Found " + project.getPackaging() + " project: " + project);
- // search plugin configuration (optional)
- final ProjectInfo info = new ProjectInfo();
- for (Plugin plugin : project.getBuild().getPlugins()) {
- if (plugin.getArtifactId().equals(PLUGIN_ID)) {
- info.plugin = plugin;
- break;
- }
- }
- info.project = project;
- env.modelProjects.put(project.getGroupId() + ":" + project.getArtifactId(), info);
- }
- }
-
- addDependencies(env);
- }
-
- public static void addDependencies(final Environment env) throws MavenExecutionException {
+ public void addDependencies(final Environment env) throws MavenExecutionException {
for(final ProjectInfo info : env.modelProjects.values()) {
addDependencies(env, info);
}
}
- private static Model addDependencies(final Environment env, final ProjectInfo info)
+ private Model addDependencies(final Environment env, final ProjectInfo info)
throws MavenExecutionException {
if ( info.done == true ) {
env.logger.debug("Return prepared model for " + info.project);
@@ -169,9 +117,9 @@ public class DependencyLifecycleParticipant extends AbstractMavenLifecyclePartic
final List<Model> dependencies = searchSlingstartDependencies(env, info, info.localModel, effectiveModel);
info.model = new Model();
for(final Model d : dependencies) {
- ModelUtility.merge(info.model, d);
+ this.mergeModels(info.model, d);
}
- ModelUtility.merge(info.model, info.localModel);
+ this.mergeModels(info.model, info.localModel);
info.localModel = info.model;
info.model = ModelUtility.getEffectiveModel(info.model, resolverOptions);
@@ -197,7 +145,7 @@ public class DependencyLifecycleParticipant extends AbstractMavenLifecyclePartic
* @param log The logger
* @throws MavenExecutionException
*/
- private static void addDependenciesFromModel(
+ private void addDependenciesFromModel(
final Environment env,
final ProjectInfo info)
throws MavenExecutionException {
@@ -252,7 +200,7 @@ public class DependencyLifecycleParticipant extends AbstractMavenLifecyclePartic
* Search for dependent slingstart/slingfeature artifacts and remove them from the effective model.
* @throws MavenExecutionException
*/
- private static List<Model> searchSlingstartDependencies(
+ private List<Model> searchSlingstartDependencies(
final Environment env,
final ProjectInfo info,
final Model rawModel,
@@ -351,7 +299,7 @@ public class DependencyLifecycleParticipant extends AbstractMavenLifecyclePartic
return dependencies;
}
- private static Model processSlingstartDependencies(final Environment env, final ProjectInfo info, final Dependency dep, final Model rawModel)
+ private Model processSlingstartDependencies(final Environment env, final ProjectInfo info, final Dependency dep, final Model rawModel)
throws MavenExecutionException {
env.logger.debug("Processing dependency " + dep);
@@ -361,9 +309,9 @@ public class DependencyLifecycleParticipant extends AbstractMavenLifecyclePartic
final List<Model> dependencies = searchSlingstartDependencies(env, info, rawModel, effectiveModel);
Model mergingModel = new Model();
for(final Model d : dependencies) {
- ModelUtility.merge(mergingModel, d);
+ this.mergeModels(mergingModel, d);
}
- ModelUtility.merge(mergingModel, rawModel);
+ this.mergeModels(mergingModel, rawModel);
final Map<Traceable, String> errors = ModelUtility.validate(ModelUtility.getEffectiveModel(mergingModel, new ResolverOptions()));
if ( errors != null ) {
@@ -380,7 +328,7 @@ public class DependencyLifecycleParticipant extends AbstractMavenLifecyclePartic
* @param defaultValue Default value that is returned if parameter is not set
* @return Parameter value or default value.
*/
- private static String nodeValue(final Plugin plugin, final String name, final String defaultValue) {
+ private String nodeValue(final Plugin plugin, final String name, final String defaultValue) {
final Xpp3Dom config = plugin == null ? null : (Xpp3Dom)plugin.getConfiguration();
final Xpp3Dom node = (config == null ? null : config.getChild(name));
if (node != null) {
@@ -397,12 +345,12 @@ public class DependencyLifecycleParticipant extends AbstractMavenLifecyclePartic
* @param defaultValue Default value that is returned if parameter is not set
* @return Parameter value or default value.
*/
- private static boolean nodeBooleanValue(final Plugin plugin, final String name, final boolean defaultValue) {
+ private boolean nodeBooleanValue(final Plugin plugin, final String name, final boolean defaultValue) {
String booleanValue = nodeValue(plugin, name, Boolean.toString(defaultValue));
return "true".equals(booleanValue.toLowerCase());
}
- private static File resolveSlingstartArtifact(final Environment env,
+ private File resolveSlingstartArtifact(final Environment env,
final MavenProject project,
final Dependency d)
throws MavenExecutionException {
@@ -431,7 +379,7 @@ public class DependencyLifecycleParticipant extends AbstractMavenLifecyclePartic
* @param modelDirectory The directory to scan for models
* @param logger The logger
*/
- private static Model readLocalModel(
+ protected Model readLocalModel(
final MavenProject project,
final String inlinedModel,
final File modelDirectory,
@@ -495,6 +443,24 @@ public class DependencyLifecycleParticipant extends AbstractMavenLifecyclePartic
throw new MavenExecutionException("Invalid assembled model : " + errors, (File)null);
}
+ return postProcessReadModel(result);
+ }
+
+ /**
+ * Hook to post process the local model
+ * @param result The read model
+ * @return The post processed model
+ */
+ protected Model postProcessReadModel(final Model result) throws MavenExecutionException {
return result;
}
+
+ /**
+ * Hook to change the merge behavior
+ * @param base The base model
+ * @param additional The additional model
+ */
+ protected void mergeModels(final Model base, final Model additional) throws MavenExecutionException {
+ ModelUtility.merge(base, additional);
+ }
}
diff --git a/src/main/java/org/apache/sling/maven/slingstart/ProjectHelper.java b/src/main/java/org/apache/sling/maven/slingstart/ProjectHelper.java
index 35ec739..a454bd0 100644
--- a/src/main/java/org/apache/sling/maven/slingstart/ProjectHelper.java
+++ b/src/main/java/org/apache/sling/maven/slingstart/ProjectHelper.java
@@ -48,7 +48,7 @@ public abstract class ProjectHelper {
* @param info The project info
* @throws IOException If writing fails
*/
- public static void storeProjectInfo(final DependencyLifecycleParticipant.ProjectInfo info)
+ public static void storeProjectInfo(final ModelPreprocessor.ProjectInfo info)
throws IOException {
// we have to serialize as the dependency lifecycle participant uses a different class loader (!)
final StringWriter w1 = new StringWriter();
--
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.