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 2014/10/02 10:04:28 UTC
svn commit: r1628906 - in
/sling/trunk/tooling/maven/slingstart-maven-plugin/src/main/java/org/apache/sling/maven/slingstart:
BuildConstants.java DependencyLifecycleParticipant.java
Author: cziegeler
Date: Thu Oct 2 08:04:28 2014
New Revision: 1628906
URL: http://svn.apache.org/r1628906
Log:
Rename constants
Modified:
sling/trunk/tooling/maven/slingstart-maven-plugin/src/main/java/org/apache/sling/maven/slingstart/BuildConstants.java
sling/trunk/tooling/maven/slingstart-maven-plugin/src/main/java/org/apache/sling/maven/slingstart/DependencyLifecycleParticipant.java
Modified: sling/trunk/tooling/maven/slingstart-maven-plugin/src/main/java/org/apache/sling/maven/slingstart/BuildConstants.java
URL: http://svn.apache.org/viewvc/sling/trunk/tooling/maven/slingstart-maven-plugin/src/main/java/org/apache/sling/maven/slingstart/BuildConstants.java?rev=1628906&r1=1628905&r2=1628906&view=diff
==============================================================================
--- sling/trunk/tooling/maven/slingstart-maven-plugin/src/main/java/org/apache/sling/maven/slingstart/BuildConstants.java (original)
+++ sling/trunk/tooling/maven/slingstart-maven-plugin/src/main/java/org/apache/sling/maven/slingstart/BuildConstants.java Thu Oct 2 08:04:28 2014
@@ -39,13 +39,13 @@ public abstract class BuildConstants {
public static final String TYPE_TXT = "txt";
- public static final String PACKAGING_PARTIAL_SYSTEM = "slingsubsystem";
+ public static final String PACKAGING_PARTIAL_SYSTEM = "slingfeature";
public static final String PACKAGING_SLINGSTART = "slingstart";
// Classifiers
- public static final String CLASSIFIER_PARTIAL_SYSTEM = "slingsubsystem";
+ public static final String CLASSIFIER_PARTIAL_SYSTEM = "slingfeature";
public static final String CLASSIFIER_BASE = "base";
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=1628906&r1=1628905&r2=1628906&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 Thu Oct 2 08:04:28 2014
@@ -102,8 +102,8 @@ public class DependencyLifecycleParticip
for(final Dependency d : project.getDependencies() ) {
if ( d.getType().equals(BuildConstants.PACKAGING_SLINGSTART)
|| d.getType().equals(BuildConstants.PACKAGING_PARTIAL_SYSTEM)) {
- final File modelXML = getSlingstartArtifact(artifactHandlerManager, resolver, project, session, d);
- dependencies.add(modelXML);
+ final File modelFile = getSlingstartArtifact(artifactHandlerManager, resolver, project, session, d);
+ dependencies.add(modelFile);
}
}