sling-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cziege...@apache.org
Subject svn commit: r1626746 - /sling/trunk/tooling/maven/slingstart-maven-plugin/src/main/java/org/apache/sling/maven/slingstart/
Date Mon, 22 Sep 2014 12:02:00 GMT
Author: cziegeler
Date: Mon Sep 22 12:01:59 2014
New Revision: 1626746

URL: http://svn.apache.org/r1626746
Log:
Rename classes

Added:
    sling/trunk/tooling/maven/slingstart-maven-plugin/src/main/java/org/apache/sling/maven/slingstart/AbstractSlingStartMojo.java
      - copied, changed from r1626745, sling/trunk/tooling/maven/slingstart-maven-plugin/src/main/java/org/apache/sling/maven/slingstart/AbstractSubsystemMojo.java
    sling/trunk/tooling/maven/slingstart-maven-plugin/src/main/java/org/apache/sling/maven/slingstart/AttachSlingStartModel.java
      - copied, changed from r1626745, sling/trunk/tooling/maven/slingstart-maven-plugin/src/main/java/org/apache/sling/maven/slingstart/AttachSlingSubsystem.java
    sling/trunk/tooling/maven/slingstart-maven-plugin/src/main/java/org/apache/sling/maven/slingstart/ModelUtils.java
      - copied, changed from r1626745, sling/trunk/tooling/maven/slingstart-maven-plugin/src/main/java/org/apache/sling/maven/slingstart/SubsystemUtils.java
Removed:
    sling/trunk/tooling/maven/slingstart-maven-plugin/src/main/java/org/apache/sling/maven/slingstart/AbstractSubsystemMojo.java
    sling/trunk/tooling/maven/slingstart-maven-plugin/src/main/java/org/apache/sling/maven/slingstart/AttachSlingSubsystem.java
    sling/trunk/tooling/maven/slingstart-maven-plugin/src/main/java/org/apache/sling/maven/slingstart/SubsystemUtils.java
Modified:
    sling/trunk/tooling/maven/slingstart-maven-plugin/src/main/java/org/apache/sling/maven/slingstart/DependencyLifecycleParticipant.java
    sling/trunk/tooling/maven/slingstart-maven-plugin/src/main/java/org/apache/sling/maven/slingstart/PackageMojo.java
    sling/trunk/tooling/maven/slingstart-maven-plugin/src/main/java/org/apache/sling/maven/slingstart/PreparePackageMojo.java

Copied: sling/trunk/tooling/maven/slingstart-maven-plugin/src/main/java/org/apache/sling/maven/slingstart/AbstractSlingStartMojo.java
(from r1626745, sling/trunk/tooling/maven/slingstart-maven-plugin/src/main/java/org/apache/sling/maven/slingstart/AbstractSubsystemMojo.java)
URL: http://svn.apache.org/viewvc/sling/trunk/tooling/maven/slingstart-maven-plugin/src/main/java/org/apache/sling/maven/slingstart/AbstractSlingStartMojo.java?p2=sling/trunk/tooling/maven/slingstart-maven-plugin/src/main/java/org/apache/sling/maven/slingstart/AbstractSlingStartMojo.java&p1=sling/trunk/tooling/maven/slingstart-maven-plugin/src/main/java/org/apache/sling/maven/slingstart/AbstractSubsystemMojo.java&r1=1626745&r2=1626746&rev=1626746&view=diff
==============================================================================
--- sling/trunk/tooling/maven/slingstart-maven-plugin/src/main/java/org/apache/sling/maven/slingstart/AbstractSubsystemMojo.java
(original)
+++ sling/trunk/tooling/maven/slingstart-maven-plugin/src/main/java/org/apache/sling/maven/slingstart/AbstractSlingStartMojo.java
Mon Sep 22 12:01:59 2014
@@ -30,7 +30,7 @@ import org.apache.maven.project.MavenPro
 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;

Copied: sling/trunk/tooling/maven/slingstart-maven-plugin/src/main/java/org/apache/sling/maven/slingstart/AttachSlingStartModel.java
(from r1626745, sling/trunk/tooling/maven/slingstart-maven-plugin/src/main/java/org/apache/sling/maven/slingstart/AttachSlingSubsystem.java)
URL: http://svn.apache.org/viewvc/sling/trunk/tooling/maven/slingstart-maven-plugin/src/main/java/org/apache/sling/maven/slingstart/AttachSlingStartModel.java?p2=sling/trunk/tooling/maven/slingstart-maven-plugin/src/main/java/org/apache/sling/maven/slingstart/AttachSlingStartModel.java&p1=sling/trunk/tooling/maven/slingstart-maven-plugin/src/main/java/org/apache/sling/maven/slingstart/AttachSlingSubsystem.java&r1=1626745&r2=1626746&rev=1626746&view=diff
==============================================================================
--- sling/trunk/tooling/maven/slingstart-maven-plugin/src/main/java/org/apache/sling/maven/slingstart/AttachSlingSubsystem.java
(original)
+++ sling/trunk/tooling/maven/slingstart-maven-plugin/src/main/java/org/apache/sling/maven/slingstart/AttachSlingStartModel.java
Mon Sep 22 12:01:59 2014
@@ -40,7 +40,7 @@ import org.apache.sling.slingstart.model
         requiresDependencyResolution = ResolutionScope.TEST,
         threadSafe = true
     )
-public class AttachSlingSubsystem extends AbstractSubsystemMojo {
+public class AttachSlingStartModel extends AbstractSlingStartMojo {
 
     @Override
     public void execute() throws MojoExecutionException, MojoFailureException {

Modified: sling/trunk/tooling/maven/slingstart-maven-plugin/src/main/java/org/apache/sling/maven/slingstart/DependencyLifecycleParticipant.java
URL: http://svn.apache.org/viewvc/sling/trunk/tooling/maven/slingstart-maven-plugin/src/main/java/org/apache/sling/maven/slingstart/DependencyLifecycleParticipant.java?rev=1626746&r1=1626745&r2=1626746&view=diff
==============================================================================
--- sling/trunk/tooling/maven/slingstart-maven-plugin/src/main/java/org/apache/sling/maven/slingstart/DependencyLifecycleParticipant.java
(original)
+++ sling/trunk/tooling/maven/slingstart-maven-plugin/src/main/java/org/apache/sling/maven/slingstart/DependencyLifecycleParticipant.java
Mon Sep 22 12:01:59 2014
@@ -109,14 +109,14 @@ public class DependencyLifecycleParticip
 
         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();

Copied: sling/trunk/tooling/maven/slingstart-maven-plugin/src/main/java/org/apache/sling/maven/slingstart/ModelUtils.java
(from r1626745, sling/trunk/tooling/maven/slingstart-maven-plugin/src/main/java/org/apache/sling/maven/slingstart/SubsystemUtils.java)
URL: http://svn.apache.org/viewvc/sling/trunk/tooling/maven/slingstart-maven-plugin/src/main/java/org/apache/sling/maven/slingstart/ModelUtils.java?p2=sling/trunk/tooling/maven/slingstart-maven-plugin/src/main/java/org/apache/sling/maven/slingstart/ModelUtils.java&p1=sling/trunk/tooling/maven/slingstart-maven-plugin/src/main/java/org/apache/sling/maven/slingstart/SubsystemUtils.java&r1=1626745&r2=1626746&rev=1626746&view=diff
==============================================================================
--- sling/trunk/tooling/maven/slingstart-maven-plugin/src/main/java/org/apache/sling/maven/slingstart/SubsystemUtils.java
(original)
+++ sling/trunk/tooling/maven/slingstart-maven-plugin/src/main/java/org/apache/sling/maven/slingstart/ModelUtils.java
Mon Sep 22 12:01:59 2014
@@ -35,7 +35,7 @@ import org.apache.sling.slingstart.model
 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

Modified: sling/trunk/tooling/maven/slingstart-maven-plugin/src/main/java/org/apache/sling/maven/slingstart/PackageMojo.java
URL: http://svn.apache.org/viewvc/sling/trunk/tooling/maven/slingstart-maven-plugin/src/main/java/org/apache/sling/maven/slingstart/PackageMojo.java?rev=1626746&r1=1626745&r2=1626746&view=diff
==============================================================================
--- sling/trunk/tooling/maven/slingstart-maven-plugin/src/main/java/org/apache/sling/maven/slingstart/PackageMojo.java
(original)
+++ sling/trunk/tooling/maven/slingstart-maven-plugin/src/main/java/org/apache/sling/maven/slingstart/PackageMojo.java
Mon Sep 22 12:01:59 2014
@@ -41,7 +41,7 @@ import org.codehaus.plexus.archiver.jar.
         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"};
 

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=1626746&r1=1626745&r2=1626746&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
Mon Sep 22 12:01:59 2014
@@ -51,7 +51,7 @@ import org.codehaus.plexus.util.FileUtil
         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 
     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 
      * 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,



Mime
View raw message