You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by kh...@apache.org on 2014/07/09 22:18:44 UTC
svn commit: r1609286 - in
/maven/plugins/trunk/maven-ear-plugin/src/main/java/org/apache/maven/plugin/ear:
AbstractEarMojo.java EarMojo.java
Author: khmarbaise
Date: Wed Jul 9 20:18:44 2014
New Revision: 1609286
URL: http://svn.apache.org/r1609286
Log:
[MEAR-183]
- Creation of temp folder now in target folder.
Modified:
maven/plugins/trunk/maven-ear-plugin/src/main/java/org/apache/maven/plugin/ear/AbstractEarMojo.java
maven/plugins/trunk/maven-ear-plugin/src/main/java/org/apache/maven/plugin/ear/EarMojo.java
Modified: maven/plugins/trunk/maven-ear-plugin/src/main/java/org/apache/maven/plugin/ear/AbstractEarMojo.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-ear-plugin/src/main/java/org/apache/maven/plugin/ear/AbstractEarMojo.java?rev=1609286&r1=1609285&r2=1609286&view=diff
==============================================================================
--- maven/plugins/trunk/maven-ear-plugin/src/main/java/org/apache/maven/plugin/ear/AbstractEarMojo.java (original)
+++ maven/plugins/trunk/maven-ear-plugin/src/main/java/org/apache/maven/plugin/ear/AbstractEarMojo.java Wed Jul 9 20:18:44 2014
@@ -143,6 +143,12 @@ public abstract class AbstractEarMojo
@Parameter
private String mainArtifactId = "none";
+ /**
+ * temp folder location.
+ */
+ @Parameter( defaultValue = "${project.build.directory}", required = true )
+ private File tempFolder;
+
private List<EarModule> earModules;
private List<EarModule> allModules;
@@ -279,6 +285,11 @@ public abstract class AbstractEarMojo
return jbossConfiguration;
}
+ public File getTempFolder()
+ {
+ return tempFolder;
+ }
+
private static boolean isArtifactRegistered( Artifact a, List<EarModule> currentList )
{
for ( EarModule em : currentList )
Modified: maven/plugins/trunk/maven-ear-plugin/src/main/java/org/apache/maven/plugin/ear/EarMojo.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-ear-plugin/src/main/java/org/apache/maven/plugin/ear/EarMojo.java?rev=1609286&r1=1609285&r2=1609286&view=diff
==============================================================================
--- maven/plugins/trunk/maven-ear-plugin/src/main/java/org/apache/maven/plugin/ear/EarMojo.java (original)
+++ maven/plugins/trunk/maven-ear-plugin/src/main/java/org/apache/maven/plugin/ear/EarMojo.java Wed Jul 9 20:18:44 2014
@@ -658,7 +658,7 @@ public class EarMojo
{
// Create a temporary work directory
// MEAR-167 use uri as directory to prevent merging of artifacts with the same artifactId
- workDirectory = new File( new File( generatedDescriptorLocation, "temp" ), module.getUri() );
+ workDirectory = new File( new File( getTempFolder(), "temp" ), module.getUri() );
workDirectory.mkdirs();
getLog().debug( "Created a temporary work directory: " + workDirectory.getAbsolutePath() );