You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by cz...@apache.org on 2015/07/16 16:45:13 UTC
svn commit: r1691412 - in
/sling/trunk/tooling/maven/slingstart-maven-plugin/src/main/java/org/apache/sling/maven/slingstart:
AbstractSlingStartMojo.java PreparePackageMojo.java
Author: cziegeler
Date: Thu Jul 16 14:45:13 2015
New Revision: 1691412
URL: http://svn.apache.org/r1691412
Log:
SLING-4889 : Provide a mojo to create a maven like structure of the referenced artifacts
Modified:
sling/trunk/tooling/maven/slingstart-maven-plugin/src/main/java/org/apache/sling/maven/slingstart/AbstractSlingStartMojo.java
sling/trunk/tooling/maven/slingstart-maven-plugin/src/main/java/org/apache/sling/maven/slingstart/PreparePackageMojo.java
Modified: sling/trunk/tooling/maven/slingstart-maven-plugin/src/main/java/org/apache/sling/maven/slingstart/AbstractSlingStartMojo.java
URL: http://svn.apache.org/viewvc/sling/trunk/tooling/maven/slingstart-maven-plugin/src/main/java/org/apache/sling/maven/slingstart/AbstractSlingStartMojo.java?rev=1691412&r1=1691411&r2=1691412&view=diff
==============================================================================
--- sling/trunk/tooling/maven/slingstart-maven-plugin/src/main/java/org/apache/sling/maven/slingstart/AbstractSlingStartMojo.java (original)
+++ sling/trunk/tooling/maven/slingstart-maven-plugin/src/main/java/org/apache/sling/maven/slingstart/AbstractSlingStartMojo.java Thu Jul 16 14:45:13 2015
@@ -24,6 +24,7 @@ import org.apache.maven.plugins.annotati
import org.apache.maven.plugins.annotations.Parameter;
import org.apache.maven.project.MavenProject;
import org.apache.maven.project.MavenProjectHelper;
+import org.apache.sling.provisioning.model.ModelUtility.ResolverOptions;
/**
* Base class for all slingstart mojos.
@@ -52,23 +53,36 @@ public abstract class AbstractSlingStart
*/
@Parameter(defaultValue="false")
protected boolean usePomVariables;
-
+
/**
- * If set to true, Artifact dependencies from provisioning file without explicit version are tried
+ * If set to true, Artifact dependencies from provisioning file without explicit version are tried
* to be resolved against the dependency versions from the Maven POM.
*/
@Parameter(defaultValue="false")
protected boolean usePomDependencies;
-
+
/**
* If set to true, an exception is throws when "usePomDependencies" is set to true and some
* dependency version could not be resolved in the Maven POM.
*/
@Parameter(defaultValue="false")
protected boolean allowUnresolvedPomDependencies;
-
+
protected File getTmpDir() {
return new File(this.project.getBuild().getDirectory(), "slingstart-tmp");
}
-
+
+ /**
+ * @return Resolving options to be used when building an effective provisioning model.
+ */
+ protected ResolverOptions getResolverOptions() {
+ ResolverOptions options = new ResolverOptions();
+ if (usePomVariables) {
+ options.variableResolver(new PomVariableResolver(project));
+ }
+ if (usePomDependencies) {
+ options.artifactVersionResolver(new PomArtifactVersionResolver(project, allowUnresolvedPomDependencies));
+ }
+ return options;
+ }
}
Modified: sling/trunk/tooling/maven/slingstart-maven-plugin/src/main/java/org/apache/sling/maven/slingstart/PreparePackageMojo.java
URL: http://svn.apache.org/viewvc/sling/trunk/tooling/maven/slingstart-maven-plugin/src/main/java/org/apache/sling/maven/slingstart/PreparePackageMojo.java?rev=1691412&r1=1691411&r2=1691412&view=diff
==============================================================================
--- sling/trunk/tooling/maven/slingstart-maven-plugin/src/main/java/org/apache/sling/maven/slingstart/PreparePackageMojo.java (original)
+++ sling/trunk/tooling/maven/slingstart-maven-plugin/src/main/java/org/apache/sling/maven/slingstart/PreparePackageMojo.java Thu Jul 16 14:45:13 2015
@@ -43,7 +43,6 @@ import org.apache.sling.provisioning.mod
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.ResolverOptions;
import org.apache.sling.provisioning.model.RunMode;
import org.codehaus.plexus.archiver.ArchiverException;
import org.codehaus.plexus.archiver.UnArchiver;
@@ -99,20 +98,6 @@ public class PreparePackageMojo extends
this.prepareWebapp(model);
}
- /**
- * @return Resolving options to be used when building an effective provisioning model.
- */
- protected ResolverOptions getResolverOptions() {
- ResolverOptions options = new ResolverOptions();
- if (usePomVariables) {
- options.variableResolver(new PomVariableResolver(project));
- }
- if (usePomDependencies) {
- options.artifactVersionResolver(new PomArtifactVersionResolver(project, allowUnresolvedPomDependencies));
- }
- return options;
- }
-
protected File getStandaloneOutputDirectory() {
return new File(this.project.getBuild().getOutputDirectory());
}
@@ -215,7 +200,7 @@ public class PreparePackageMojo extends
throws MojoExecutionException{
for(final ArtifactGroup group : runMode.getArtifactGroups()) {
for(final org.apache.sling.provisioning.model.Artifact a : group) {
- final Artifact artifact = ModelUtils.getArtifact(this.project, this.mavenSession, this.artifactHandlerManager, this.resolver,
+ final Artifact artifact = ModelUtils.getArtifact(this.project, this.mavenSession, this.artifactHandlerManager, this.resolver,
a.getGroupId(), a.getArtifactId(), a.getVersion(), a.getType(), a.getClassifier());
final File artifactFile = artifact.getFile();
contentsMap.put(getPathForArtifact(group.getStartLevel(), artifactFile.getName(), runMode, isBoot), artifactFile);
@@ -467,7 +452,7 @@ public class PreparePackageMojo extends
mainName,
alias);
}
-
+
/**
* Replace \${var} with ${var}
* @param text String with escaped variables
@@ -479,5 +464,5 @@ public class PreparePackageMojo extends
}
return text.replaceAll("\\\\\\$", "\\$");
}
-
+
}