werken 2002/06/05 23:54:37
Modified: . build.xml
src/bin maven-scripts.jelly maven.jelly
src/java/org/apache/maven ProjectProperties.java
src/java/org/apache/maven/jelly MavenInitTag.java
Log:
Now invoke targets through jelly in project's build.xml
Revision Changes Path
1.39 +6 -0 jakarta-turbine-maven/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/jakarta-turbine-maven/build.xml,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -r1.38 -r1.39
--- build.xml 28 May 2002 16:44:16 -0000 1.38
+++ build.xml 6 Jun 2002 06:54:36 -0000 1.39
@@ -12,6 +12,12 @@
<!-- Set default values for the build -->
<property file="project.properties" />
+ <target
+ name="jelly-jar">
+ <antcall target="maven:jar"/>
+ </target>
+
+
<!-- ================================================================== -->
<!-- J A V A C C -->
<!-- ================================================================== -->
1.2 +0 -7 jakarta-turbine-maven/src/bin/maven-scripts.jelly
Index: maven-scripts.jelly
===================================================================
RCS file: /home/cvs/jakarta-turbine-maven/src/bin/maven-scripts.jelly,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- maven-scripts.jelly 5 Jun 2002 22:08:22 -0000 1.1
+++ maven-scripts.jelly 6 Jun 2002 06:54:36 -0000 1.2
@@ -1,15 +1,12 @@
-
<!--
|| This file lives in ${maven.home}
-->
-
<jelly:jelly
trim="true"
xmlns:ant="jelly:ant"
xmlns:jelly="jelly:core"
xmlns:def="jelly:define"
xmlns:maven="jelly:org.apache.maven.jelly.MavenTagLibrary">
-
<!--
|| maven:target
-->
@@ -18,7 +15,6 @@
maven.home = <jelly:expr value="${maven.home}"/>
lib.repo = <jelly:expr value="${lib.repo}"/>
</def:script>
-
<!--
|| bogus maven:target
-->
@@ -29,7 +25,6 @@
== The target "<jelly:expr value="${target}"/>" is not valid for this project.
======================================================================
</def:script>
-
<!--
|| user-defined target
-->
@@ -44,7 +39,6 @@
</jelly:when>
</jelly:choose>
</def:script>
-
<!--
|| general ant target failure
-->
@@ -55,5 +49,4 @@
== The target "<jelly:expr value="${target}"/>" failed.
======================================================================
</def:script>
-
</jelly:jelly>
1.3 +0 -3 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.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- maven.jelly 6 Jun 2002 05:03:55 -0000 1.2
+++ maven.jelly 6 Jun 2002 06:54:36 -0000 1.3
@@ -7,7 +7,6 @@
xmlns:jelly="jelly:core"
xmlns:util="maven:util"
xmlns:maven="jelly:org.apache.maven.jelly.MavenTagLibrary">
-
<!--
|| Dispatch each argument as a maven build target.
-->
@@ -15,8 +14,6 @@
var="target"
items="${args}"
begin="1">
- target: <jelly:expr value="${target}"/>
<maven:maven target="${target}"/>
</jelly:forEach>
-
</jelly:jelly>
1.45 +6 -1
jakarta-turbine-maven/src/java/org/apache/maven/ProjectProperties.java
Index: ProjectProperties.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine-maven/src/java/org/apache/maven/ProjectProperties.java,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -r1.44 -r1.45
--- ProjectProperties.java 5 Jun 2002 04:15:56 -0000 1.44
+++ ProjectProperties.java 6 Jun 2002 06:54:37 -0000 1.45
@@ -86,7 +86,7 @@
*
* @author <a href="[EMAIL PROTECTED]">Jason van Zyl</a>
* @author <a href="[EMAIL PROTECTED]">Vincent Massol</a>
- * @version $Id: ProjectProperties.java,v 1.44 2002/06/05 04:15:56 dion Exp $
+ * @version $Id: ProjectProperties.java,v 1.45 2002/06/06 06:54:37 werken Exp $
*/
public class ProjectProperties
extends ProjectExecutor
@@ -376,5 +376,10 @@
getProject().setProperty("maven.tag", version.getTag());
}
+ }
+
+ public org.apache.maven.project.Project getMavenProject()
+ {
+ return super.getMavenProject();
}
}
1.6 +30 -37
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.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- MavenInitTag.java 6 Jun 2002 05:03:55 -0000 1.5
+++ MavenInitTag.java 6 Jun 2002 06:54:37 -0000 1.6
@@ -65,10 +65,9 @@
import org.apache.commons.jelly.tags.ant.AntTagLibrary;
-// import org.apache.maven.MavenUtils;
-// import org.apache.maven.project.Project;
+import org.apache.maven.MavenUtils;
+import org.apache.maven.ProjectProperties;
-import org.apache.tools.ant.Project;
import org.apache.tools.ant.ProjectHelper;
import org.apache.tools.ant.BuildLogger;
import org.apache.tools.ant.NoBannerLogger;
@@ -81,55 +80,49 @@
public class MavenInitTag
extends TagSupport
{
- /**
- * Maven project descriptor.
- */
- private String projectDescriptor;
-
- private String dir;
-
- /**
- * Maven POM
- */
- private Project project;
-
- private Properties props;
public MavenInitTag() {
}
/**
- * Set Maven project descriptor.
+ * Description of the Method
*/
- public void setProjectDescriptor(String projectDescriptor)
+ public void doTag(XMLOutput output)
+ throws Exception
{
- this.projectDescriptor = projectDescriptor;
- }
+ org.apache.tools.ant.Project antProject = initAntProject();
- public void setDir(String dir)
- {
- this.dir = dir;
- }
+ initMavenProject( antProject );
- public String getDir()
- {
- return this.dir;
+ getBody().run(context, output);
}
- /**
- * Description of the Method
- */
- public void doTag(XMLOutput output)
- throws Exception
+ private void initMavenProject(org.apache.tools.ant.Project antProject) throws
Exception
{
+ String dir = System.getProperty( "user.dir" );
- Properties props = new Properties();
+ File projDesc = new File( dir,
+ "project.xml" );
+
+ ProjectProperties projProps = new ProjectProperties();
+ projProps.setProjectDescriptor( projDesc );
+ projProps.setProject( antProject );
+
+ // org.apache.maven.project.Project project = MavenUtils.getProject(
projDesc.getPath() );
- Project project = new Project();
+ projProps.execute();
+
+ context.setVariable( "maven-project",
+ projProps.getMavenProject() );
+ }
+
+ private org.apache.tools.ant.Project initAntProject() throws Exception
+ {
+ org.apache.tools.ant.Project project = new org.apache.tools.ant.Project();
BuildLogger logger = new NoBannerLogger();
- logger.setMessageOutputLevel( Project.MSG_VERBOSE );
+ logger.setMessageOutputLevel( org.apache.tools.ant.Project.MSG_VERBOSE );
logger.setOutputPrintStream( System.out );
logger.setErrorPrintStream( System.err);
@@ -159,12 +152,12 @@
ProjectHelper.configureProject( project, mavenBuildFile );
project.setUserProperty("ant.file" , mavenBuildFile.getAbsolutePath() );
}
-
+
context.registerTagLibrary( "jelly:ant", new AntTagLibrary(project) );
context.setVariable( "ant-project", project );
context.setVariable( "mavenHome", System.getProperty( "maven.home") );
project.setUserProperty( "maven.home", System.getProperty( "maven.home" ) );
- getBody().run(context, output);
+ return project;
}
}
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
