werken 2002/06/05 21:45:59
Modified: src/bin maven-bootstrap.jelly
src/java/org/apache/maven/jelly MavenInitTag.java
Log:
A step closer to success.
Revision Changes Path
1.3 +3 -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.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- maven-bootstrap.jelly 6 Jun 2002 04:02:49 -0000 1.2
+++ maven-bootstrap.jelly 6 Jun 2002 04:45:59 -0000 1.3
@@ -12,18 +12,15 @@
-->
<maven:init dir="./">
- <jelly:set var="file"><jelly:expr
value="${mavenHome}"/>/maven-properties.jelly</jelly:set>
+ <jelly:set var="file">file://<jelly:expr
value="${mavenHome}"/>/bin/maven-properties.jelly</jelly:set>
<jelly:import uri="${file}"/>
- <!--
- <jelly:set var="file"><jelly:expr
value="${mavenHome}"/>/maven-scripts.jelly</jelly:set>
+ <jelly:set var="file">file://<jelly:expr
value="${mavenHome}"/>/bin/maven-scripts.jelly</jelly:set>
<jelly:import uri="${file}"/>
- <jelly:set var="file"><jelly:expr value="${mavenHome}"/>/maven.jelly</jelly:set>
+ <jelly:set var="file">file://<jelly:expr
value="${mavenHome}"/>/bin/maven.jelly</jelly:set>
<jelly:import uri="${file}"/>
-
- -->
</maven:init>
1.4 +16 -3
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.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- MavenInitTag.java 6 Jun 2002 03:57:56 -0000 1.3
+++ MavenInitTag.java 6 Jun 2002 04:45:59 -0000 1.4
@@ -95,6 +95,11 @@
private Properties props;
+ public MavenInitTag()
+ {
+ System.err.println( "######## MavenInitTag.ctor()" );
+ }
+
/**
* Set Maven project descriptor.
*/
@@ -119,6 +124,8 @@
public void doTag(XMLOutput output)
throws Exception
{
+
+ System.err.println( "##############3 DO TAG" );
Properties props = new Properties();
Project project = new Project();
@@ -150,19 +157,25 @@
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 );
}
}
+
+ 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.out.println(">>>>>>>> " + mavenHome);
+ System.err.println(">>>>>>>> " + mavenHome);
context.setVariable( "mavenHome", mavenHome);
+ */
+
+ context.setVariable( "mavenHome", System.getProperty( "maven.home") );
+
getBody().run(context, output);
}
}
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
