This is an automated email from the ASF dual-hosted git repository. rombert pushed a commit to annotated tag slingstart-maven-plugin-1.0.0 in repository https://gitbox.apache.org/repos/asf/sling-slingstart-maven-plugin.git
commit 869228d26767cc50fa38cb4b6d65616863f481e3 Author: Carsten Ziegeler <[email protected]> AuthorDate: Mon Sep 22 12:01:59 2014 +0000 Rename classes git-svn-id: https://svn.apache.org/repos/asf/sling/trunk/tooling/maven/slingstart-maven-plugin@1626746 13f79535-47bb-0310-9956-ffa450edef68 --- .../{AbstractSubsystemMojo.java => AbstractSlingStartMojo.java} | 2 +- .../{AttachSlingSubsystem.java => AttachSlingStartModel.java} | 2 +- .../sling/maven/slingstart/DependencyLifecycleParticipant.java | 4 ++-- .../maven/slingstart/{SubsystemUtils.java => ModelUtils.java} | 2 +- src/main/java/org/apache/sling/maven/slingstart/PackageMojo.java | 2 +- .../org/apache/sling/maven/slingstart/PreparePackageMojo.java | 8 ++++---- 6 files changed, 10 insertions(+), 10 deletions(-) diff --git a/src/main/java/org/apache/sling/maven/slingstart/AbstractSubsystemMojo.java b/src/main/java/org/apache/sling/maven/slingstart/AbstractSlingStartMojo.java similarity index 97% rename from src/main/java/org/apache/sling/maven/slingstart/AbstractSubsystemMojo.java rename to src/main/java/org/apache/sling/maven/slingstart/AbstractSlingStartMojo.java index 1bdd46b..140d3a9 100644 --- a/src/main/java/org/apache/sling/maven/slingstart/AbstractSubsystemMojo.java +++ b/src/main/java/org/apache/sling/maven/slingstart/AbstractSlingStartMojo.java @@ -30,7 +30,7 @@ import org.apache.maven.project.MavenProjectHelper; import org.apache.sling.slingstart.model.SSMDeliverable; import org.apache.sling.slingstart.model.xml.XMLSSMModelReader; -public abstract class AbstractSubsystemMojo extends AbstractMojo { +public abstract class AbstractSlingStartMojo extends AbstractMojo { @Parameter(defaultValue="${basedir}/src/main/systems") protected File systemsDirectory; diff --git a/src/main/java/org/apache/sling/maven/slingstart/AttachSlingSubsystem.java b/src/main/java/org/apache/sling/maven/slingstart/AttachSlingStartModel.java similarity index 97% rename from src/main/java/org/apache/sling/maven/slingstart/AttachSlingSubsystem.java rename to src/main/java/org/apache/sling/maven/slingstart/AttachSlingStartModel.java index fec0fc4..f634942 100644 --- a/src/main/java/org/apache/sling/maven/slingstart/AttachSlingSubsystem.java +++ b/src/main/java/org/apache/sling/maven/slingstart/AttachSlingStartModel.java @@ -40,7 +40,7 @@ import org.apache.sling.slingstart.model.xml.XMLSSMModelWriter; requiresDependencyResolution = ResolutionScope.TEST, threadSafe = true ) -public class AttachSlingSubsystem extends AbstractSubsystemMojo { +public class AttachSlingStartModel extends AbstractSlingStartMojo { @Override public void execute() throws MojoExecutionException, MojoFailureException { 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 bbb8478..c3616c6 100644 --- a/src/main/java/org/apache/sling/maven/slingstart/DependencyLifecycleParticipant.java +++ b/src/main/java/org/apache/sling/maven/slingstart/DependencyLifecycleParticipant.java @@ -109,14 +109,14 @@ public class DependencyLifecycleParticipant extends AbstractMavenLifecyclePartic final String directory = nodeValue((Xpp3Dom) plugin.getConfiguration(), "systemsDirectory", new File(project.getBasedir(), "src/main/systems").getAbsolutePath()); - final SSMDeliverable model = SubsystemUtils.readFullModel(new File(directory), dependencies, project, session, log); + final SSMDeliverable model = ModelUtils.readFullModel(new File(directory), dependencies, project, session, log); final StringWriter w = new StringWriter(); XMLSSMModelWriter.write(w, model); project.setContextValue(SSMDeliverable.class.getName() + "/text", w.toString()); // start with base artifact - final SSMArtifact base = SubsystemUtils.getBaseArtifact(model); + final SSMArtifact base = ModelUtils.getBaseArtifact(model); final String[] classifiers = new String[] {null, BuildConstants.CLASSIFIER_APP, BuildConstants.CLASSIFIER_WEBAPP}; for(final String c : classifiers) { final Dependency dep = new Dependency(); diff --git a/src/main/java/org/apache/sling/maven/slingstart/SubsystemUtils.java b/src/main/java/org/apache/sling/maven/slingstart/ModelUtils.java similarity index 99% rename from src/main/java/org/apache/sling/maven/slingstart/SubsystemUtils.java rename to src/main/java/org/apache/sling/maven/slingstart/ModelUtils.java index 5ff6b8a..b213c4e 100644 --- a/src/main/java/org/apache/sling/maven/slingstart/SubsystemUtils.java +++ b/src/main/java/org/apache/sling/maven/slingstart/ModelUtils.java @@ -35,7 +35,7 @@ import org.apache.sling.slingstart.model.SSMDeliverable; import org.apache.sling.slingstart.model.xml.XMLSSMModelReader; import org.codehaus.plexus.logging.Logger; -public abstract class SubsystemUtils { +public abstract class ModelUtils { /** * Read all model files from the directory in alphabetical order diff --git a/src/main/java/org/apache/sling/maven/slingstart/PackageMojo.java b/src/main/java/org/apache/sling/maven/slingstart/PackageMojo.java index 0914d2a..0699561 100644 --- a/src/main/java/org/apache/sling/maven/slingstart/PackageMojo.java +++ b/src/main/java/org/apache/sling/maven/slingstart/PackageMojo.java @@ -41,7 +41,7 @@ import org.codehaus.plexus.archiver.jar.JarArchiver; requiresDependencyResolution = ResolutionScope.TEST, threadSafe = true ) -public class PackageMojo extends AbstractSubsystemMojo { +public class PackageMojo extends AbstractSlingStartMojo { private static final String[] EXCLUDES_MANIFEST = new String[] {"META-INF/MANIFEST.MF"}; diff --git a/src/main/java/org/apache/sling/maven/slingstart/PreparePackageMojo.java b/src/main/java/org/apache/sling/maven/slingstart/PreparePackageMojo.java index 10ccab8..ffc643b 100644 --- a/src/main/java/org/apache/sling/maven/slingstart/PreparePackageMojo.java +++ b/src/main/java/org/apache/sling/maven/slingstart/PreparePackageMojo.java @@ -51,7 +51,7 @@ import org.codehaus.plexus.util.FileUtils; requiresDependencyResolution = ResolutionScope.TEST, threadSafe = true ) -public class PreparePackageMojo extends AbstractSubsystemMojo { +public class PreparePackageMojo extends AbstractSlingStartMojo { private static final String BASE_DESTINATION = "resources"; @@ -171,7 +171,7 @@ public class PreparePackageMojo extends AbstractSubsystemMojo { throws MojoExecutionException{ for(final SSMStartLevel sl : runMode.startLevels) { for(final SSMArtifact a : sl.artifacts) { - final Artifact artifact = SubsystemUtils.getArtifact(this.project, a.groupId, a.artifactId, model.getValue(a.version), a.type, a.classifier); + final Artifact artifact = ModelUtils.getArtifact(this.project, a.groupId, a.artifactId, model.getValue(a.version), a.type, a.classifier); final File artifactFile = artifact.getFile(); contentsMap.put(getPathForArtifact(sl.level, artifactFile.getName(), runMode), artifactFile); } @@ -275,9 +275,9 @@ public class PreparePackageMojo extends AbstractSubsystemMojo { * Return the base artifact */ private Artifact getBaseArtifact(final SSMDeliverable model, final String classifier, final String type) throws MojoExecutionException { - final SSMArtifact baseArtifact = SubsystemUtils.getBaseArtifact(model); + final SSMArtifact baseArtifact = ModelUtils.getBaseArtifact(model); - final Artifact a = SubsystemUtils.getArtifact(this.project, baseArtifact.groupId, + final Artifact a = ModelUtils.getArtifact(this.project, baseArtifact.groupId, baseArtifact.artifactId, model.getValue(baseArtifact.version), type, -- To stop receiving notification emails like this one, please contact "[email protected]" <[email protected]>.
