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 c348dc3e0a772d291f3818548bb9acd9e3db90b5 Author: Carsten Ziegeler <[email protected]> AuthorDate: Fri Sep 26 16:23:12 2014 +0000 Implement txt format for reading and writing git-svn-id: https://svn.apache.org/repos/asf/sling/trunk/tooling/maven/slingstart-maven-plugin@1627821 13f79535-47bb-0310-9956-ffa450edef68 --- .../org/apache/sling/maven/slingstart/AbstractSlingStartMojo.java | 4 ++-- .../apache/sling/maven/slingstart/DependencyLifecycleParticipant.java | 4 ++-- src/main/java/org/apache/sling/maven/slingstart/ModelUtils.java | 3 +-- 3 files changed, 5 insertions(+), 6 deletions(-) diff --git a/src/main/java/org/apache/sling/maven/slingstart/AbstractSlingStartMojo.java b/src/main/java/org/apache/sling/maven/slingstart/AbstractSlingStartMojo.java index 140d3a9..c7b541d 100644 --- a/src/main/java/org/apache/sling/maven/slingstart/AbstractSlingStartMojo.java +++ b/src/main/java/org/apache/sling/maven/slingstart/AbstractSlingStartMojo.java @@ -28,7 +28,7 @@ import org.apache.maven.plugins.annotations.Parameter; import org.apache.maven.project.MavenProject; import org.apache.maven.project.MavenProjectHelper; import org.apache.sling.slingstart.model.SSMDeliverable; -import org.apache.sling.slingstart.model.xml.XMLSSMModelReader; +import org.apache.sling.slingstart.model.txt.TXTSSMModelReader; public abstract class AbstractSlingStartMojo extends AbstractMojo { @@ -56,7 +56,7 @@ public abstract class AbstractSlingStartMojo extends AbstractMojo { if ( result == null ) { try { final String contents = (String)this.project.getContextValue(SSMDeliverable.class.getName() + "/text"); - result = XMLSSMModelReader.read(new StringReader(contents)); + result = TXTSSMModelReader.read(new StringReader(contents), null); this.project.setContextValue(SSMDeliverable.class.getName(), result); } catch ( final IOException ioe) { 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 cca358c..5857fac 100644 --- a/src/main/java/org/apache/sling/maven/slingstart/DependencyLifecycleParticipant.java +++ b/src/main/java/org/apache/sling/maven/slingstart/DependencyLifecycleParticipant.java @@ -41,7 +41,7 @@ import org.apache.sling.slingstart.model.SSMConstants; import org.apache.sling.slingstart.model.SSMDeliverable; import org.apache.sling.slingstart.model.SSMFeature; import org.apache.sling.slingstart.model.SSMStartLevel; -import org.apache.sling.slingstart.model.xml.XMLSSMModelWriter; +import org.apache.sling.slingstart.model.txt.TXTSSMModelWriter; import org.codehaus.plexus.component.annotations.Component; import org.codehaus.plexus.component.annotations.Requirement; import org.codehaus.plexus.logging.Logger; @@ -113,7 +113,7 @@ public class DependencyLifecycleParticipant extends AbstractMavenLifecyclePartic final SSMDeliverable model = ModelUtils.readFullModel(new File(directory), dependencies, project, session, log); final StringWriter w = new StringWriter(); - XMLSSMModelWriter.write(w, model); + TXTSSMModelWriter.write(w, model); project.setContextValue(SSMDeliverable.class.getName() + "/text", w.toString()); // start with base artifact diff --git a/src/main/java/org/apache/sling/maven/slingstart/ModelUtils.java b/src/main/java/org/apache/sling/maven/slingstart/ModelUtils.java index ab3c0f0..9ed721d 100644 --- a/src/main/java/org/apache/sling/maven/slingstart/ModelUtils.java +++ b/src/main/java/org/apache/sling/maven/slingstart/ModelUtils.java @@ -37,7 +37,6 @@ import org.apache.sling.slingstart.model.SSMFeature; import org.apache.sling.slingstart.model.SSMTraceable; import org.apache.sling.slingstart.model.SSMValidator; import org.apache.sling.slingstart.model.txt.TXTSSMModelReader; -import org.apache.sling.slingstart.model.xml.XMLSSMModelReader; import org.codehaus.plexus.logging.Logger; public abstract class ModelUtils { @@ -110,7 +109,7 @@ public abstract class ModelUtils { if ( depModel == null ) { depModel = new SSMDeliverable(); } - final SSMDeliverable readModel = XMLSSMModelReader.read(r); + final SSMDeliverable readModel = TXTSSMModelReader.read(r, file.getAbsolutePath()); final Map<SSMTraceable, String> errors = new SSMValidator().validate(readModel); if (errors != null ) { throw new MojoExecutionException("Invalid model at " + file + " : " + errors); -- To stop receiving notification emails like this one, please contact "[email protected]" <[email protected]>.
