werken 2002/06/05 22:03:55
Modified: src/bin maven-bootstrap.jelly maven.jelly
src/java/org/apache/maven/jelly MavenInitTag.java
Log:
jellystyle is now finding maven.home jellyscripts and invoking
either user-defined project-specific targets or hitting the
internal maven target hook.
Revision Changes Path
1.4 +6 -6 jakarta-turbine-maven/src/bin/maven-bootstrap.jelly
Index: maven-bootstrap.jelly
===================================================================
RCS file: /home/cvs/jakarta-turbine-maven/src/bin/maven-bootstrap.jelly,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- maven-bootstrap.jelly 6 Jun 2002 04:45:59 -0000 1.3
+++ maven-bootstrap.jelly 6 Jun 2002 05:03:55 -0000 1.4
@@ -10,17 +10,17 @@
<!--
|| Read the project's build-maven.xml, project.xml, etc
-->
- <maven:init dir="./">
+
+ <maven:init>
<jelly:set var="file">file://<jelly:expr
value="${mavenHome}"/>/bin/maven-properties.jelly</jelly:set>
<jelly:import uri="${file}"/>
-
-
+
<jelly:set var="file">file://<jelly:expr
value="${mavenHome}"/>/bin/maven-scripts.jelly</jelly:set>
- <jelly:import uri="${file}"/>
-
+ <jelly:import uri="${file}" inherit="true"/>
+
<jelly:set var="file">file://<jelly:expr
value="${mavenHome}"/>/bin/maven.jelly</jelly:set>
- <jelly:import uri="${file}"/>
+ <jelly:import uri="${file}" inherit="true"/>
</maven:init>
1.2 +1 -0 jakarta-turbine-maven/src/bin/maven.jelly
Index: maven.jelly
===================================================================
RCS file: /home/cvs/jakarta-turbine-maven/src/bin/maven.jelly,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- maven.jelly 5 Jun 2002 22:08:22 -0000 1.1
+++ maven.jelly 6 Jun 2002 05:03:55 -0000 1.2
@@ -15,6 +15,7 @@
var="target"
items="${args}"
begin="1">
+ target: <jelly:expr value="${target}"/>
<maven:maven target="${target}"/>
</jelly:forEach>
1.5 +14 -25
jakarta-turbine-maven/src/java/org/apache/maven/jelly/MavenInitTag.java
Index: MavenInitTag.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine-maven/src/java/org/apache/maven/jelly/MavenInitTag.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- MavenInitTag.java 6 Jun 2002 04:45:59 -0000 1.4
+++ MavenInitTag.java 6 Jun 2002 05:03:55 -0000 1.5
@@ -95,9 +95,7 @@
private Properties props;
- public MavenInitTag()
- {
- System.err.println( "######## MavenInitTag.ctor()" );
+ public MavenInitTag() {
}
/**
@@ -125,7 +123,6 @@
throws Exception
{
- System.err.println( "##############3 DO TAG" );
Properties props = new Properties();
Project project = new Project();
@@ -142,39 +139,31 @@
Class.forName( "javax.xml.parsers.SAXParserFactory" );
- File mavenBuildFile = new File( getDir(),"build.xml" );
+ String dir = System.getProperty( "user.dir" );
+
+ File mavenBuildFile = new File( dir, "build.xml" );
if (mavenBuildFile.exists() == false)
{
- mavenBuildFile = new File ( getDir(), "build-maven.xml" );
-
+ mavenBuildFile = new File ( dir, "build-maven.xml" );
+
if (mavenBuildFile.exists() == false)
{
context.setVariable( "buildfile-present", Boolean.FALSE);
}
- else
- {
- context.setVariable( "buildfile-present", Boolean.TRUE);
- ProjectHelper.configureProject( project, mavenBuildFile );
- project.setUserProperty("ant.file" ,
mavenBuildFile.getAbsolutePath() );
- }
+ }
+
+ if ( mavenBuildFile.exists() )
+ {
+ context.setVariable( "buildfile-present", Boolean.TRUE);
+ ProjectHelper.configureProject( project, mavenBuildFile );
+ project.setUserProperty("ant.file" , mavenBuildFile.getAbsolutePath() );
}
context.registerTagLibrary( "jelly:ant", new AntTagLibrary(project) );
context.setVariable( "ant-project", project );
-
- /*
- Properties buildProperties = new Properties();
- buildProperties.load( new FileInputStream(
- new File(System.getProperty("user.home"),
- "build.properties")));
-
- String mavenHome = buildProperties.getProperty("maven.home");
- System.err.println(">>>>>>>> " + mavenHome);
- context.setVariable( "mavenHome", mavenHome);
- */
-
context.setVariable( "mavenHome", System.getProperty( "maven.home") );
+ project.setUserProperty( "maven.home", System.getProperty( "maven.home" ) );
getBody().run(context, output);
}
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
