dion 2002/11/04 11:30:02 Modified: src/java/org/apache/maven/ant MavenTask.java Log: Formatting Revision Changes Path 1.2 +30 -88 jakarta-turbine-maven/src/java/org/apache/maven/ant/MavenTask.java Index: MavenTask.java =================================================================== RCS file: /home/cvs/jakarta-turbine-maven/src/java/org/apache/maven/ant/MavenTask.java,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- MavenTask.java 27 Aug 2002 17:55:37 -0000 1.1 +++ MavenTask.java 4 Nov 2002 19:30:02 -0000 1.2 @@ -1,69 +1,11 @@ package org.apache.maven.ant; -/* ==================================================================== - * The Apache Software License, Version 1.1 - * - * Copyright (c) 2002 The Apache Software Foundation. All rights - * reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in - * the documentation and/or other materials provided with the - * distribution. - * - * 3. The end-user documentation included with the redistribution, - * if any, must include the following acknowledgment: - * "This product includes software developed by the - * Apache Software Foundation (http://www.apache.org/)." - * Alternately, this acknowledgment may appear in the software itself, - * if and wherever such third-party acknowledgments normally appear. - * - * 4. The names "Apache" and "Apache Software Foundation" and - * "Apache Maven" must not be used to endorse or promote products - * derived from this software without prior written permission. For - * written permission, please contact [EMAIL PROTECTED] - * - * 5. Products derived from this software may not be called "Apache", - * "Apache Maven", nor may "Apache" appear in their name, without - * prior written permission of the Apache Software Foundation. - * - * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED - * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES - * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE - * DISCLAIMED. IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR - * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, - * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT - * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF - * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND - * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, - * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT - * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. - * ==================================================================== - * - * This software consists of voluntary contributions made by many - * individuals on behalf of the Apache Software Foundation. For more - * information on the Apache Software Foundation, please see - * <http://www.apache.org/>. - * - * ==================================================================== - */ -import java.io.File; +import com.werken.forehead.Forehead; import org.apache.maven.app.Maven; - import org.apache.tools.ant.BuildException; import org.apache.tools.ant.Task; -import com.werken.forehead.Forehead; - /** * Allows Ant to "wrap" Maven. * @@ -83,21 +25,21 @@ * @author <a href="mailto:jjohnson@;imperitek.com">James CE Johnson</a> * @version 1.0 */ -public class MavenTask - extends Task +public class MavenTask extends Task { private String projectFileName = Maven.PROJECT_DESCRIPTOR_FILE_NAME; private String projectBuildFile = Maven.PROJECT_BUILD_FILE_NAME; private String goalName = null; private String mavenHome = null; private String toolsJar = null; - + /** * Gets the value of projectFileName * * @return the value of projectFileName */ - public String getProjectFileName() { + public String getProjectFileName() + { return this.projectFileName; } @@ -106,7 +48,8 @@ * * @param argProjectFileName Value to assign to this.projectFileName */ - public void setProjectFileName(String argProjectFileName) { + public void setProjectFileName(String argProjectFileName) + { this.projectFileName = argProjectFileName; } @@ -115,7 +58,8 @@ * * @return the value of projectBuildFile */ - public String getProjectBuildFile() { + public String getProjectBuildFile() + { return this.projectBuildFile; } @@ -124,7 +68,8 @@ * * @param argProjectBuildFile Value to assign to this.projectBuildFile */ - public void setProjectBuildFile(String argProjectBuildFile) { + public void setProjectBuildFile(String argProjectBuildFile) + { this.projectBuildFile = argProjectBuildFile; } @@ -133,7 +78,8 @@ * * @return the value of goalName */ - public String getGoalName() { + public String getGoalName() + { return this.goalName; } @@ -142,7 +88,8 @@ * * @param argGoalName Value to assign to this.goalName */ - public void setGoalName(String argGoalName) { + public void setGoalName(String argGoalName) + { this.goalName = argGoalName; } @@ -151,7 +98,8 @@ * * @return the value of mavenHome */ - public String getMavenHome() { + public String getMavenHome() + { return this.mavenHome; } @@ -160,7 +108,8 @@ * * @param argMavenHome Value to assign to this.mavenHome */ - public void setMavenHome(String argMavenHome) { + public void setMavenHome(String argMavenHome) + { this.mavenHome = argMavenHome; } @@ -169,7 +118,8 @@ * * @return the value of toolsJar */ - public String getToolsJar() { + public String getToolsJar() + { return this.toolsJar; } @@ -178,7 +128,8 @@ * * @param argToolsJar Value to assign to this.toolsJar */ - public void setToolsJar(String argToolsJar) { + public void setToolsJar(String argToolsJar) + { this.toolsJar = argToolsJar; } @@ -187,26 +138,17 @@ * * @exception BuildException Thrown in unrecoverable error. */ - public void execute() - throws BuildException + public void execute() throws BuildException { // I'm pretty sure this isn't the *best* way to get the job // done but at the same time I'm pretty sure it *is* the // quickest means to my desired end... - - System.setProperty("maven.home", - this.getMavenHome()); - System.setProperty("forehead.conf.file", + System.setProperty("maven.home", this.getMavenHome()); + System.setProperty("forehead.conf.file", this.getMavenHome() + "/bin/forehead.conf"); - System.setProperty("tools.jar", - this.getToolsJar() - ); - - String [] args = - { - "-p" + this.getProjectFileName(), - this.getGoalName() - }; + System.setProperty("tools.jar", this.getToolsJar()); + + String[] args = { "-p" + this.getProjectFileName(), this.getGoalName() }; try { @@ -218,4 +160,4 @@ throw new BuildException(e); } } -} +} \ No newline at end of file
-- To unsubscribe, e-mail: <mailto:turbine-maven-dev-unsubscribe@;jakarta.apache.org> For additional commands, e-mail: <mailto:turbine-maven-dev-help@;jakarta.apache.org>
