Author: cziegeler
Date: Wed Oct 1 09:11:48 2014
New Revision: 1628655
URL: http://svn.apache.org/r1628655
Log:
Move io methods to helper class
Modified:
sling/trunk/tooling/maven/slingstart-maven-plugin/src/main/java/org/apache/sling/maven/slingstart/AbstractSlingStartMojo.java
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/AbstractSlingStartMojo.java
URL:
http://svn.apache.org/viewvc/sling/trunk/tooling/maven/slingstart-maven-plugin/src/main/java/org/apache/sling/maven/slingstart/AbstractSlingStartMojo.java?rev=1628655&r1=1628654&r2=1628655&view=diff
==============================================================================
---
sling/trunk/tooling/maven/slingstart-maven-plugin/src/main/java/org/apache/sling/maven/slingstart/AbstractSlingStartMojo.java
(original)
+++
sling/trunk/tooling/maven/slingstart-maven-plugin/src/main/java/org/apache/sling/maven/slingstart/AbstractSlingStartMojo.java
Wed Oct 1 09:11:48 2014
@@ -17,16 +17,13 @@
package org.apache.sling.maven.slingstart;
import java.io.File;
-import java.io.IOException;
import org.apache.maven.execution.MavenSession;
import org.apache.maven.plugin.AbstractMojo;
-import org.apache.maven.plugin.MojoExecutionException;
import org.apache.maven.plugins.annotations.Component;
import org.apache.maven.plugins.annotations.Parameter;
import org.apache.maven.project.MavenProject;
import org.apache.maven.project.MavenProjectHelper;
-import org.apache.sling.provisioning.model.Model;
public abstract class AbstractSlingStartMojo extends AbstractMojo {
@@ -45,45 +42,6 @@ public abstract class AbstractSlingStart
@Parameter(defaultValue="false")
protected boolean createWebapp;
- private static final String CTX_RAW = Model.class.getName() + "/r";
- private static final String CTX_EFFECTIVE = Model.class.getName() + "/e";
-
- /**
- * Read the model prepared by the lifecycle plugin
- */
- protected Model readRawModel()
- throws MojoExecutionException {
- Model result = (Model)this.project.getContextValue(CTX_RAW);
- if ( result == null ) {
- try {
- result = ModelUtils.getRawModel(this.project);
-
- this.project.setContextValue(CTX_RAW, result);
- } catch ( final IOException ioe) {
- throw new MojoExecutionException("Unable to cache model", ioe);
- }
- }
- return result;
- }
-
- /**
- * Read the model prepared by the lifecycle plugin
- */
- protected Model readEffectiveModel()
- throws MojoExecutionException {
- Model result = (Model)this.project.getContextValue(CTX_EFFECTIVE);
- if ( result == null ) {
- try {
- result = ModelUtils.getEffectiveModel(this.project);
-
- this.project.setContextValue(CTX_EFFECTIVE, result);
- } catch ( final IOException ioe) {
- throw new MojoExecutionException("Unable to cache model", ioe);
- }
- }
- return result;
- }
-
protected File getTmpDir() {
return new File(this.project.getBuild().getDirectory(),
"slingstart-tmp");
}
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=1628655&r1=1628654&r2=1628655&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:11:48 2014
@@ -44,12 +44,13 @@ public class AttachSlingStartModel exten
@Override
public void execute() throws MojoExecutionException, MojoFailureException {
- final Model model = this.readRawModel();
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);
} catch (IOException e) {
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=1628655&r1=1628654&r2=1628655&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:11:48 2014
@@ -188,6 +188,9 @@ public abstract class ModelUtils {
return null;
}
+ private static final String RAW_MODEL_TXT = Model.class.getName() + "/raw";
+ private static final String EFFECTIVE_MODEL_TXT = Model.class.getName() +
"/effective";
+
private static final String RAW_MODEL = Model.class.getName() + "/raw";
private static final String EFFECTIVE_MODEL = Model.class.getName() +
"/effective";
@@ -201,7 +204,7 @@ public abstract class ModelUtils {
throws IOException {
final StringWriter w = new StringWriter();
ModelWriter.write(w, model);
- project.setContextValue(RAW_MODEL, w.toString());
+ project.setContextValue(RAW_MODEL_TXT, w.toString());
}
/**
@@ -211,8 +214,13 @@ public abstract class ModelUtils {
* @throws IOException If reading fails
*/
public static Model getRawModel(final MavenProject project) throws
IOException {
- final String contents = (String)project.getContextValue(RAW_MODEL);
- return ModelReader.read(new StringReader(contents), null);
+ 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);
+ }
+ return result;
}
/**
@@ -225,7 +233,7 @@ public abstract class ModelUtils {
throws IOException {
final StringWriter w = new StringWriter();
ModelWriter.write(w, model);
- project.setContextValue(EFFECTIVE_MODEL, w.toString());
+ project.setContextValue(EFFECTIVE_MODEL_TXT, w.toString());
}
/**
@@ -235,7 +243,12 @@ public abstract class ModelUtils {
* @throws IOException If reading fails
*/
public static Model getEffectiveModel(final MavenProject project) throws
IOException {
- final String contents =
(String)project.getContextValue(EFFECTIVE_MODEL);
- return ModelReader.read(new StringReader(contents), null);
+ 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);
+ }
+ 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=1628655&r1=1628654&r2=1628655&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:11:48 2014
@@ -78,11 +78,15 @@ public class PreparePackageMojo extends
@Override
public void execute() throws MojoExecutionException, MojoFailureException {
- final Model model = this.readEffectiveModel();
+ try {
+ final Model model = ModelUtils.getEffectiveModel(this.project);
- this.prepareGlobal(model);
- this.prepareStandaloneApp(model);
- this.prepareWebapp(model);
+ this.prepareGlobal(model);
+ this.prepareStandaloneApp(model);
+ this.prepareWebapp(model);
+ } catch ( final IOException io) {
+ throw new MojoExecutionException("Unable to read cached model.",
io);
+ }
}
/**
