jvanzyl 2002/11/11 18:38:34
Modified: src/java/org/apache/maven/ant MavenTask.java
src/java/org/apache/maven/app App.java Maven.java
Log:
o More cleanup, backing out property inheritance crap. It should be done
using Jelly contexts.
Revision Changes Path
1.3 +3 -2
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.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- MavenTask.java 4 Nov 2002 19:30:02 -0000 1.2
+++ MavenTask.java 12 Nov 2002 02:38:33 -0000 1.3
@@ -2,6 +2,7 @@
import com.werken.forehead.Forehead;
+import org.apache.maven.app.App;
import org.apache.maven.app.Maven;
import org.apache.tools.ant.BuildException;
import org.apache.tools.ant.Task;
@@ -27,7 +28,7 @@
*/
public class MavenTask extends Task
{
- private String projectFileName = Maven.PROJECT_DESCRIPTOR_FILE_NAME;
+ private String projectFileName = App.POM_FILE_NAME;
private String projectBuildFile = Maven.PROJECT_BUILD_FILE_NAME;
private String goalName = null;
private String mavenHome = null;
@@ -160,4 +161,4 @@
throw new BuildException(e);
}
}
-}
\ No newline at end of file
+}
1.28 +10 -4 jakarta-turbine-maven/src/java/org/apache/maven/app/App.java
Index: App.java
===================================================================
RCS file: /home/cvs/jakarta-turbine-maven/src/java/org/apache/maven/app/App.java,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- App.java 12 Nov 2002 00:41:05 -0000 1.27
+++ App.java 12 Nov 2002 02:38:34 -0000 1.28
@@ -109,6 +109,9 @@
// ------------------------------------------------------------
// C O N S T A N T S
// ------------------------------------------------------------
+
+ /** Default file name for an XML-based POM. */
+ public static final String POM_FILE_NAME = "project.xml";
/** Default console width - for formatting output - 78 */
private static final int CONSOLE_WIDTH = 80;
@@ -142,7 +145,11 @@
/** return code for a failure due to anything else */
private static final int RC_OTHER_FAILURE = 90;
-
+
+ // ------------------------------------------------------------
+ // C L A S S M E M B E R S
+ // ------------------------------------------------------------
+
/** Log. */
private static final Log log = LogFactory.getLog(App.class);
@@ -232,8 +239,7 @@
}
else if (!getCli().hasOption("f"))
{
- getMaven().setProjectFile( new File(getMaven().getDir(),
- Maven.PROJECT_DESCRIPTOR_FILE_NAME));
+ getMaven().setProjectFile( new File(getMaven().getDir(),
POM_FILE_NAME));
}
if (getCli().hasOption("D"))
1.126 +5 -57 jakarta-turbine-maven/src/java/org/apache/maven/app/Maven.java
Index: Maven.java
===================================================================
RCS file: /home/cvs/jakarta-turbine-maven/src/java/org/apache/maven/app/Maven.java,v
retrieving revision 1.125
retrieving revision 1.126
diff -u -r1.125 -r1.126
--- Maven.java 12 Nov 2002 00:41:05 -0000 1.125
+++ Maven.java 12 Nov 2002 02:38:34 -0000 1.126
@@ -109,14 +109,16 @@
*
* @author <a href="mailto:bob@;eng.werken.com">bob mcwhirter</a>
* @author <a href="mailto:jason@;zenplex.com">Jason van Zyl</a>
- * @author <a href="mailto:evenisse@;ifrance.com">Emmanuel Venisse</a>
*
* @version $Id$
*
- * @todo filter the Maven version number into a Java constant that will change
+ * @todo Filter the Maven version number into a Java constant that will change
* during compilation
* @todo Remove any notions of the filesystem. This should strictly be
* a logical entity for building projects.
+ * @todo Maven should be given an live instance of a Project object. Any
+ * logic like checking for the existance of a project.xml file and
+ * it's size should be moved to the CLI wrapper.
*/
public class Maven
{
@@ -127,9 +129,6 @@
/** Filename of project-specific maven buildfile. */
public static final String PROJECT_BUILD_FILE_NAME = "maven.xml";
- /** Filename of project descriptor. */
- public static final String PROJECT_DESCRIPTOR_FILE_NAME = "project.xml";
-
/** Tag for default goal */
public static final String DEFAULT_GOAL = "maven.default.goal";
@@ -572,8 +571,6 @@
InputStream is =
Maven.class.getClassLoader().getResourceAsStream(DRIVER_PROPERTIES);
loadProperties(is);
- // loadProjectProperties(getDir(), project);
-
props = new File( getDir(), "project.properties" );
loadProperties(props);
@@ -593,54 +590,6 @@
}
}
- /**
- * Load the project properties chain.
- *
- * <p>
- * This loads properties files with the following priority:
- * </p>
- *
- * <ol>
- * <li>$PARENT_PROJECTS/project.properties if project has
- * an extend property
- * </li>
- * <li>$PARENT_PROJECTS/build.properties if project has
- * an extend property
- * </li>
- * <li>$PROJECT/project.properties</li>
- * <li>$PROJECT/build.properties</li>
- * </ol>
- *
- * @param projectDir directory of project
- */
- private void loadProjectProperties(File projectDir, Project currentProject)
- throws Exception
- {
- File props = null;
-
- String parentProjectStr = currentProject.getExtend();
- if (parentProjectStr != null && !parentProjectStr.equals(""))
- {
- File parentProjectFile = new File(projectDir, parentProjectStr);
- File parentProjectDir = parentProjectFile.getParentFile();
-
- try
- {
- Project parentProject = MavenUtils.getProject(parentProjectFile);
- loadProjectProperties(parentProjectDir, parentProject);
- }
- catch (Exception e)
- {
- }
- }
-
- props = new File(projectDir, "project.properties");
- loadProperties(props);
-
- props = new File(projectDir, "build.properties");
- loadProperties(props);
- }
-
/** Produce a string representation, suitable for debugging.
*
* @return A debug string.
@@ -674,7 +623,6 @@
" file you specified has a length of zero.");
}
- //this.project = MavenUtils.getProject(getProjectFile(), getDir(),
getJellyContext());
this.project = MavenUtils.getProject(getProjectFile(), getDir());
}
--
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>
