Author: cziegeler
Date: Wed Oct 1 09:17:43 2014
New Revision: 1628657
URL: http://svn.apache.org/r1628657
Log:
Move io methods to helper class
Modified:
sling/trunk/tooling/maven/slingstart-maven-plugin/src/main/java/org/apache/sling/maven/slingstart/AttachSlingStartModel.java
sling/trunk/tooling/maven/slingstart-maven-plugin/src/main/java/org/apache/sling/maven/slingstart/ModelUtils.java
sling/trunk/tooling/maven/slingstart-maven-plugin/src/main/java/org/apache/sling/maven/slingstart/PreparePackageMojo.java
Modified:
sling/trunk/tooling/maven/slingstart-maven-plugin/src/main/java/org/apache/sling/maven/slingstart/AttachSlingStartModel.java
URL:
http://svn.apache.org/viewvc/sling/trunk/tooling/maven/slingstart-maven-plugin/src/main/java/org/apache/sling/maven/slingstart/AttachSlingStartModel.java?rev=1628657&r1=1628656&r2=1628657&view=diff
==============================================================================
---
sling/trunk/tooling/maven/slingstart-maven-plugin/src/main/java/org/apache/sling/maven/slingstart/AttachSlingStartModel.java
(original)
+++
sling/trunk/tooling/maven/slingstart-maven-plugin/src/main/java/org/apache/sling/maven/slingstart/AttachSlingStartModel.java
Wed Oct 1 09:17:43 2014
@@ -44,12 +44,12 @@ public class AttachSlingStartModel exten
@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);
Modified:
sling/trunk/tooling/maven/slingstart-maven-plugin/src/main/java/org/apache/sling/maven/slingstart/ModelUtils.java
URL:
http://svn.apache.org/viewvc/sling/trunk/tooling/maven/slingstart-maven-plugin/src/main/java/org/apache/sling/maven/slingstart/ModelUtils.java?rev=1628657&r1=1628656&r2=1628657&view=diff
==============================================================================
---
sling/trunk/tooling/maven/slingstart-maven-plugin/src/main/java/org/apache/sling/maven/slingstart/ModelUtils.java
(original)
+++
sling/trunk/tooling/maven/slingstart-maven-plugin/src/main/java/org/apache/sling/maven/slingstart/ModelUtils.java
Wed Oct 1 09:17:43 2014
@@ -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;
}
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=1628657&r1=1628656&r2=1628657&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
Wed Oct 1 09:17:43 2014
@@ -78,15 +78,11 @@ public class PreparePackageMojo extends
@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);
}
/**
