You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cactus-dev@jakarta.apache.org by pt...@apache.org on 2008/09/24 14:48:57 UTC
svn commit: r698546 - in
/jakarta/cactus/trunk/integration/maven2/src/main/java/org/apache/cactus/maven2/mojos:
CactifyEarMojo.java CactifyWarMojo.java
Author: ptahchiev
Date: Wed Sep 24 05:48:56 2008
New Revision: 698546
URL: http://svn.apache.org/viewvc?rev=698546&view=rev
Log:
Changes on the maven mojo to be able to specify the classes directory
Modified:
jakarta/cactus/trunk/integration/maven2/src/main/java/org/apache/cactus/maven2/mojos/CactifyEarMojo.java
jakarta/cactus/trunk/integration/maven2/src/main/java/org/apache/cactus/maven2/mojos/CactifyWarMojo.java
Modified: jakarta/cactus/trunk/integration/maven2/src/main/java/org/apache/cactus/maven2/mojos/CactifyEarMojo.java
URL: http://svn.apache.org/viewvc/jakarta/cactus/trunk/integration/maven2/src/main/java/org/apache/cactus/maven2/mojos/CactifyEarMojo.java?rev=698546&r1=698545&r2=698546&view=diff
==============================================================================
--- jakarta/cactus/trunk/integration/maven2/src/main/java/org/apache/cactus/maven2/mojos/CactifyEarMojo.java (original)
+++ jakarta/cactus/trunk/integration/maven2/src/main/java/org/apache/cactus/maven2/mojos/CactifyEarMojo.java Wed Sep 24 05:48:56 2008
@@ -64,6 +64,7 @@
{
/**
* Cactus war configuration holder.
+ * @parameter
*/
private CactifyWarMojo cactusWar;
@@ -198,7 +199,7 @@
archiver.setOutputFile(getDestFile());
// create the cactus war
- File cactusWarFile = createCactusWar();
+ File cactusWarFile = createCactusWarFile();
addFileToEar(cactusWarFile, cactusWar.getFileName());
archiver.createArchive(getProject(), getArchive());
@@ -246,12 +247,14 @@
* @throws MojoExecutionException in case a runtime error occurs.
* @throws MojoFailureException in case a mojo failure occurs.
*/
- private File createCactusWar() throws MojoExecutionException, MojoFailureException
+ private File createCactusWarFile() throws MojoExecutionException, MojoFailureException
{
File tmpCactusWar = FileUtils.createTempFile("cactus", "cactus.war",
getProject().getBasedir());
tmpCactusWar.deleteOnExit();
cactusWar.setDestFile(tmpCactusWar);
+ cactusWar.setWarArchiver(this.warArchiver);
+ cactusWar.setProject(this.project);
if (addEjbReferences)
{
Modified: jakarta/cactus/trunk/integration/maven2/src/main/java/org/apache/cactus/maven2/mojos/CactifyWarMojo.java
URL: http://svn.apache.org/viewvc/jakarta/cactus/trunk/integration/maven2/src/main/java/org/apache/cactus/maven2/mojos/CactifyWarMojo.java?rev=698546&r1=698545&r2=698546&view=diff
==============================================================================
--- jakarta/cactus/trunk/integration/maven2/src/main/java/org/apache/cactus/maven2/mojos/CactifyWarMojo.java (original)
+++ jakarta/cactus/trunk/integration/maven2/src/main/java/org/apache/cactus/maven2/mojos/CactifyWarMojo.java Wed Sep 24 05:48:56 2008
@@ -43,6 +43,7 @@
import org.apache.maven.plugin.assembly.archive.ArchiveExpansionException;
import org.apache.maven.plugin.assembly.utils.AssemblyFileUtils;
import org.apache.maven.project.MavenProject;
+import org.apache.maven.shared.model.fileset.FileSet;
import org.apache.tools.ant.types.XMLCatalog;
import org.codehaus.cargo.container.internal.util.ResourceUtils;
import org.codehaus.cargo.maven2.log.MavenLogger;
@@ -108,6 +109,12 @@
private File srcFile;
/**
+ * Test classes.
+ * @parameter
+ */
+ private FileSet classes;
+
+ /**
* The War archiver.
*
* @parameter expression="${component.org.codehaus.plexus.archiver.Archiver#war}"
@@ -331,14 +338,16 @@
addJarWithClass("junit.framework."
+ "TestCase", "JUnit");
-
tempLocation = createTempFile("cactus", "explode.tmp.dir",
getProject().getBasedir(), true);
tempLocation.mkdirs();
tempLocation.deleteOnExit();
-
+
+ //Add the classes.
+ warArchiver.addClasses(new File(classes.getDirectory()),
+ classes.getIncludesArray(), classes.getExcludesArray());
+
//Now add all of the additional lib files.
-
for (Iterator iter = libDependencies.iterator(); iter.hasNext();)
{
org.apache.cactus.maven2.mojos.Dependency dependency =
@@ -704,6 +713,16 @@
public String getContext() {
return context;
}
+
+ /**
+ * Returns the source file for cactification.
+ *
+ * @return <code>java.io.File</code>
+ */
+ public File getSrcFile() {
+ return this.srcFile;
+ }
+
/**
* Sets the context.
@@ -725,6 +744,16 @@
}
/**
+ * Sets the source file for cactification.
+ *
+ * @param theSrcFile The source file
+ */
+ public final void setSrcFile(File theSrcFile)
+ {
+ this.srcFile = theSrcFile;
+ }
+
+ /**
* Gets the file name.
*
* @return the name of the web app file
@@ -759,7 +788,8 @@
*
* @param warArchiver
*/
- public void setWarArchiver(WarArchiver warArchiver) {
+ public void setWarArchiver(WarArchiver warArchiver)
+ {
this.warArchiver = warArchiver;
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: cactus-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: cactus-dev-help@jakarta.apache.org