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 6fa67eb0d141ad85e4db5c6d164cde5f1edb8c2b Author: Carsten Ziegeler <[email protected]> AuthorDate: Wed Oct 1 09:17:43 2014 +0000 Move io methods to helper class git-svn-id: https://svn.apache.org/repos/asf/sling/trunk/tooling/maven/slingstart-maven-plugin@1628657 13f79535-47bb-0310-9956-ffa450edef68 --- .../maven/slingstart/AttachSlingStartModel.java | 2 +- .../apache/sling/maven/slingstart/ModelUtils.java | 24 ++++++++++++++-------- .../sling/maven/slingstart/PreparePackageMojo.java | 12 ++++------- 3 files changed, 21 insertions(+), 17 deletions(-) diff --git a/src/main/java/org/apache/sling/maven/slingstart/AttachSlingStartModel.java b/src/main/java/org/apache/sling/maven/slingstart/AttachSlingStartModel.java index be284ea..9c45604 100644 --- a/src/main/java/org/apache/sling/maven/slingstart/AttachSlingStartModel.java +++ b/src/main/java/org/apache/sling/maven/slingstart/AttachSlingStartModel.java @@ -44,12 +44,12 @@ public class AttachSlingStartModel extends AbstractSlingStartMojo { @Override public void execute() throws MojoExecutionException, MojoFailureException { + final Model model = ModelUtils.getRawModel(this.project); final File outputFile = new File(this.project.getBuild().getDirectory() + File.separatorChar + "slingstart.txt"); outputFile.getParentFile().mkdirs(); Writer writer = null; try { - final Model model = ModelUtils.getRawModel(this.project); writer = new FileWriter(outputFile); ModelWriter.write(writer, model); 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 7fe7be9..bfc51e7 100644 --- a/src/main/java/org/apache/sling/maven/slingstart/ModelUtils.java +++ b/src/main/java/org/apache/sling/maven/slingstart/ModelUtils.java @@ -211,14 +211,18 @@ public abstract class ModelUtils { * Get the raw model from the project * @param project The maven projet * @return The raw model - * @throws IOException If reading fails + * @throws MojoExecutionException If reading fails */ - public static Model getRawModel(final MavenProject project) throws IOException { + public static Model getRawModel(final MavenProject project) throws MojoExecutionException { Model result = (Model)project.getContextValue(RAW_MODEL); if ( result == null ) { final String contents = (String)project.getContextValue(RAW_MODEL_TXT); - result = ModelReader.read(new StringReader(contents), null); - project.setContextValue(RAW_MODEL, result); + try { + result = ModelReader.read(new StringReader(contents), null); + project.setContextValue(RAW_MODEL, result); + } catch ( final IOException ioe) { + throw new MojoExecutionException("Unable to read cached model.", ioe); + } } return result; } @@ -240,14 +244,18 @@ public abstract class ModelUtils { * Get the effective model from the project * @param project The maven projet * @return The raw model - * @throws IOException If reading fails + * @throws MojoExecutionException If reading fails */ - public static Model getEffectiveModel(final MavenProject project) throws IOException { + public static Model getEffectiveModel(final MavenProject project) throws MojoExecutionException { Model result = (Model)project.getContextValue(EFFECTIVE_MODEL); if ( result == null ) { final String contents = (String)project.getContextValue(EFFECTIVE_MODEL_TXT); - result = ModelReader.read(new StringReader(contents), null); - project.setContextValue(EFFECTIVE_MODEL, result); + try { + result = ModelReader.read(new StringReader(contents), null); + project.setContextValue(EFFECTIVE_MODEL, result); + } catch ( final IOException ioe) { + throw new MojoExecutionException("Unable to read cached model.", ioe); + } } return result; } 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 b2f627b..6145b8d 100644 --- a/src/main/java/org/apache/sling/maven/slingstart/PreparePackageMojo.java +++ b/src/main/java/org/apache/sling/maven/slingstart/PreparePackageMojo.java @@ -78,15 +78,11 @@ public class PreparePackageMojo extends AbstractSlingStartMojo { @Override public void execute() throws MojoExecutionException, MojoFailureException { - try { - final Model model = ModelUtils.getEffectiveModel(this.project); + final Model model = ModelUtils.getEffectiveModel(this.project); - this.prepareGlobal(model); - this.prepareStandaloneApp(model); - this.prepareWebapp(model); - } catch ( final IOException io) { - throw new MojoExecutionException("Unable to read cached model.", io); - } + this.prepareGlobal(model); + this.prepareStandaloneApp(model); + this.prepareWebapp(model); } /** -- To stop receiving notification emails like this one, please contact "[email protected]" <[email protected]>.
