kaz 02/04/28 10:35:00
Modified: src/dvsl/xdocs site.dvsl
src/java/org/apache/maven MavenTool.java
src/test/org/apache/maven MavenToolTest.java
Log:
Backing out the changes I made regarding the site.dvsl file directly
reading project.xml instead of using the Java POM object stuffed into
the DVSL toolbox. Ideally, it should use the Java POM object, but
MavenTool assumes that Ant was invoked in the project's base directory.
If this is not the case, then it bombs.
As a result, the patch I submitted regarding this should also be
disregarded as it contains the same problem. Having a single interface
to obtain a reference to the POM is a great idea, but only if that
interface can actually load the POM in a reliable manner.
Revision Changes Path
1.33 +19 -18 jakarta-turbine-maven/src/dvsl/xdocs/site.dvsl
Index: site.dvsl
===================================================================
RCS file: /home/cvs/jakarta-turbine-maven/src/dvsl/xdocs/site.dvsl,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- site.dvsl 27 Apr 2002 15:45:20 -0000 1.32
+++ site.dvsl 28 Apr 2002 17:35:00 -0000 1.33
@@ -16,6 +16,7 @@
<!DOCTYPE html PUBLIC "-//CollabNet//DTD XHTML 1.0 Transitional//EN"
"http://www.collabnet.com/dtds/collabnet_transitional_10.dtd";>
+ #set( $projectDescriptorFilename = "project.xml")
#set( $projectFilename = "$context.toolbox.docSrc/project.xml")
#set( $anakiaProjectFilename = "$context.toolbox.docSrc/stylesheets/project.xml")
@@ -24,10 +25,10 @@
#set( $filename = $context.getAppValue("infilename"))
#set( $relativePath = $context.toolbox.pathtool.getRelativePath($filename))
- ## Grab a reference to the POM so we can pull info from it such as the
- ## cvs web url, etc ...
+ ## Grab a reference to the project descriptor here so we can pull
+ ## info from it such as the cvs web url, etc ...
- #set( $pom = $context.toolbox.maven.project )
+ #set( $projectDescriptor =
$node.selectSingleNode("document('$projectDescriptorFilename')/project"))
## Check to see if an xdocs/projects.xml file exists, if so, use that
## as the navigation file; otherwise, check to see if someone is using
@@ -79,8 +80,8 @@
#set( $alt = $project.organizationLogo )
#set( $src = $project.organizationLogo.attribute("href") )
- #if ( $pom.organization.url )
- #set( $home = $pom.organization.url )
+ #if ( $projectDescriptor.organization.url )
+ #set( $home = $projectDescriptor.organization.url )
#else
## Fall back to the project url
#set( $home = $project.attribute( "href" ) )
@@ -111,7 +112,7 @@
#if( $project.attribute("href") )
#set( $home = $project.attribute("href") )
#else
- #set( $home = $pom.url )
+ #set( $home = $projectDescriptor.url )
#end
#set( $src = $project.logo.attribute( "href" ) )
@@ -161,11 +162,11 @@
#if
($context.toolbox.fileutil.file("$context.toolbox.docSrc/tasks.xml").exists())
<div><small><a
href="$relativePath/tasks.html">Tasks</a></small></div>
#end
- #if ($pom.cvsWebUrl)
- <div><small><a href="$pom.cvsWebUrl">CVS
Repository</a></small></div>
+ #if ($projectDescriptor.cvsWebUrl)
+ <div><small><a href="$projectDescriptor.cvsWebUrl">CVS
Repository</a></small></div>
#end
- #if ($pom.issueTrackingUrl)
- <div><small><a href="$pom.issueTrackingUrl">Issue
Tracking</a></small></div>
+ #if ($projectDescriptor.issueTrackingUrl)
+ <div><small><a href="$projectDescriptor.issueTrackingUrl">Issue
Tracking</a></small></div>
#end
<div><small><a href="$relativePath/changelog.html">Change
Log</a></small></div>
#if ($context.toolbox.testSrcPresent == "true")
@@ -199,15 +200,15 @@
<table border="0" cellspacing="0" cellpadding="4">
<tr>
<td>
- #if( $pom.organization.name )
- #if( $pom.inceptionYear )
- #if( $pom.inceptionYear == $context.toolbox.currentYear )
- © ${context.toolbox.currentYear}, $pom.organization.name
+ #if( $projectDescriptor.organization.name )
+ #if( $projectDescriptor.inceptionYear )
+ #if( $projectDescriptor.inceptionYear.toString() ==
$context.toolbox.currentYear )
+ © ${context.toolbox.currentYear},
$projectDescriptor.organization.name
#else
- © ${pom.inceptionYear}-${context.toolbox.currentYear},
$pom.organization.name
+ ©
${projectDescriptor.inceptionYear}-${context.toolbox.currentYear},
$projectDescriptor.organization.name
#end
#else
- © ${context.toolbox.currentYear}, $pom.organization.name
+ © ${context.toolbox.currentYear},
$projectDescriptor.organization.name
#end
#else
© 1999-2002, Apache Software Foundation
@@ -375,9 +376,9 @@
#end
#match("file")
- <a href="$pom.cvsWebUrl$node.name.value()">
+ <a href="$projectDescriptor.cvsWebUrl$node.name.value()">
$node.name.value()</a> -
- <a
href="$pom.cvsWebUrl$node.name.value()?rev=$node.revision.value()&content-type=text/vnd.viewcvs-markup">
+ <a
href="$projectDescriptor.cvsWebUrl$node.name.value()?rev=$node.revision.value()&content-type=text/vnd.viewcvs-markup">
v$node.revision.value()</a> <br/>
#end
1.5 +1 -4 jakarta-turbine-maven/src/java/org/apache/maven/MavenTool.java
Index: MavenTool.java
===================================================================
RCS file: /home/cvs/jakarta-turbine-maven/src/java/org/apache/maven/MavenTool.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- MavenTool.java 27 Apr 2002 15:45:20 -0000 1.4
+++ MavenTool.java 28 Apr 2002 17:35:00 -0000 1.5
@@ -71,14 +71,11 @@
/**
* Creates a new instance.
- *
- * @throws Exception If the Maven POM cannot be loaded.
*/
public MavenTool()
- throws Exception
{
// FIXME: Need a path to the project descriptor.
- project = MavenUtils.getProject("project.xml");
+ //project = MavenUtils.getProject("project.xml");
}
/**
1.5 +0 -3
jakarta-turbine-maven/src/test/org/apache/maven/MavenToolTest.java
Index: MavenToolTest.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine-maven/src/test/org/apache/maven/MavenToolTest.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- MavenToolTest.java 27 Apr 2002 15:45:20 -0000 1.4
+++ MavenToolTest.java 28 Apr 2002 17:35:00 -0000 1.5
@@ -66,7 +66,7 @@
* Unit test for <code>MavenTool</code>.
*
* @author <a href="mailto:[EMAIL PROTECTED]";>Daniel Rall</a>
- * @version $Id: MavenToolTest.java,v 1.4 2002/04/27 15:45:20 kaz Exp $
+ * @version $Id: MavenToolTest.java,v 1.5 2002/04/28 17:35:00 kaz Exp $
*/
public class MavenToolTest extends TestCase
{
@@ -92,11 +92,8 @@
/**
* Tests {@link MavenTool.resolvePathFragment(String, String, String[])}.
- *
- * @throws Exception If the POM can't be loaded.
*/
public void testResolvePathFragment()
- throws Exception
{
MavenTool tool = new MavenTool();
