kaz 02/03/27 20:11:26
Modified: . project.xml
src/dvsl/xdocs dependencies.dvsl site.dvsl
src/java/org/apache/maven/project Dependency.java
Project.java
src/test/org/apache/maven/project ProjectMapperTest.java
xdocs project-descriptor.xml
Log:
- Added the <issueTrackingUrl> to the project descriptor. This is used
to provide a link in the navigation bar to a project's issue tracking
system (such as Scarab).
- Also changed <homepage> element to <url> per Dan's suggestion.
Thanks Dan!
Revision Changes Path
1.46 +14 -13 jakarta-turbine-maven/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/jakarta-turbine-maven/project.xml,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -r1.45 -r1.46
--- project.xml 27 Mar 2002 20:04:52 -0000 1.45
+++ project.xml 28 Mar 2002 04:11:26 -0000 1.46
@@ -24,6 +24,7 @@
<url>http://jakarta.apache.org/turbine/maven/</url>
<cvsWebUrl>http://cvs.apache.org/viewcvs/jakarta-turbine-maven/</cvsWebUrl>
+
<issueTrackingUrl>http://nagoya.apache.org:8080/scarab/servlet/scarab/</issueTrackingUrl>
<siteAddress>jakarta.apache.org</siteAddress>
<siteDirectory>/www/jakarta.apache.org/turbine/maven/</siteDirectory>
<distributionDirectory>/www/jakarta.apache.org/builds/jakarta-turbine-maven/</distributionDirectory>
@@ -164,7 +165,7 @@
<type>required</type>
<version>1.0-b2-dev</version>
<jar>stratum-1.0-b2-dev.jar</jar>
- <homepage>http://jakarta.apache.org/turbine/stratum/</homepage>
+ <url>http://jakarta.apache.org/turbine/stratum/</url>
</dependency>
<dependency>
@@ -172,7 +173,7 @@
<type>required</type>
<version>5.0</version>
<jar>bcel.jar</jar>
- <homepage>http://jakarta.apache.org/bcel/</homepage>
+ <url>http://jakarta.apache.org/bcel/</url>
</dependency>
<dependency>
@@ -180,7 +181,7 @@
<type>required</type>
<version>1.3-dev</version>
<jar>velocity-1.3-dev.jar</jar>
- <homepage>http://jakarta.apache.org/velocity/</homepage>
+ <url>http://jakarta.apache.org/velocity/</url>
</dependency>
<dependency>
@@ -188,7 +189,7 @@
<type>required</type>
<version>1.3</version>
<jar>oro.jar</jar>
- <homepage>http://jakarta.apache.org/oro/</homepage>
+ <url>http://jakarta.apache.org/oro/</url>
</dependency>
<!-- Runtime dependencies -->
@@ -198,7 +199,7 @@
<type>required</type>
<version>1.1.3</version>
<jar>log4j-1.1.3.jar</jar>
- <homepage>http://jakarta.apache.org/log4j/</homepage>
+ <url>http://jakarta.apache.org/log4j/</url>
</dependency>
<dependency>
@@ -206,7 +207,7 @@
<type>required</type>
<version>1.3</version>
<jar>dom4j-1.3.jar</jar>
- <homepage>http://www.dom4j.org/</homepage>
+ <url>http://www.dom4j.org/</url>
</dependency>
<dependency>
@@ -214,7 +215,7 @@
<type>required</type>
<version>0.1</version>
<jar>commons-lang-0.1-dev.jar</jar>
- <homepage>http://jakarta.apache.org/commons/</homepage>
+ <url>http://jakarta.apache.org/commons/</url>
</dependency>
<dependency>
@@ -222,7 +223,7 @@
<type>required</type>
<version>0.1</version>
<jar>commons-io.jar</jar>
- <homepage>http://jakarta.apache.org/commons/</homepage>
+ <url>http://jakarta.apache.org/commons/</url>
</dependency>
<dependency>
@@ -230,7 +231,7 @@
<type>required</type>
<version>0.1</version>
<jar>commons-util-1.0-rc2-dev.jar</jar>
- <homepage>http://jakarta.apache.org/commons/</homepage>
+ <url>http://jakarta.apache.org/commons/</url>
</dependency>
<dependency>
@@ -238,7 +239,7 @@
<type>required</type>
<version>1.0</version>
<jar>commons-beanutils.jar</jar>
- <homepage>http://jakarta.apache.org/commons/</homepage>
+ <url>http://jakarta.apache.org/commons/</url>
</dependency>
<dependency>
@@ -246,7 +247,7 @@
<type>required</type>
<version>1.0</version>
<jar>commons-collections.jar</jar>
- <homepage>http://jakarta.apache.org/commons/</homepage>
+ <url>http://jakarta.apache.org/commons/</url>
</dependency>
<!-- Documentation dependencies -->
@@ -256,7 +257,7 @@
<type>documentation</type>
<version>0.43</version>
<jar>velocity-dvsl-0.43.jar</jar>
- <homepage>http://jakarta.apache.org/velocity/dvsl/</homepage>
+ <url>http://jakarta.apache.org/velocity/dvsl/</url>
</dependency>
<dependency>
@@ -264,7 +265,7 @@
<type>required</type>
<version>2.2</version>
<jar>jdepend.jar</jar>
- <homepage>http://jakarta.apache.org/turbine/maven/</homepage>
+ <url>http://jakarta.apache.org/turbine/maven/</url>
</dependency>
</dependencies>
1.4 +3 -3 jakarta-turbine-maven/src/dvsl/xdocs/dependencies.dvsl
Index: dependencies.dvsl
===================================================================
RCS file: /home/cvs/jakarta-turbine-maven/src/dvsl/xdocs/dependencies.dvsl,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- dependencies.dvsl 27 Mar 2002 20:04:52 -0000 1.3
+++ dependencies.dvsl 28 Mar 2002 04:11:26 -0000 1.4
@@ -2,7 +2,7 @@
dependency page generator
- version : $Id: dependencies.dvsl,v 1.3 2002/03/27 20:04:52 kaz Exp $
+ version : $Id: dependencies.dvsl,v 1.4 2002/03/28 04:11:26 kaz Exp $
-->
#match ("/")
@@ -49,8 +49,8 @@
#match ("dependency")
<tr>
<td>
- #if ($node.homepage)
- <a href="$node.homepage.value()">$node.name.value()</a>
+ #if ($node.url)
+ <a href="$node.url.value()">$node.name.value()</a>
#else
$node.name.value()
#end
1.15 +5 -0 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.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- site.dvsl 28 Mar 2002 00:38:24 -0000 1.14
+++ site.dvsl 28 Mar 2002 04:11:26 -0000 1.15
@@ -103,7 +103,12 @@
<div><small><a href="$relativePath/mail-lists.html">Mailing
Lists</a></small></div>
<div><small><a
href="$relativePath/developer-list.html">Developers</a></small></div>
<div><small><a
href="$relativePath/dependencies.html">Dependencies</a></small></div>
+ #if ($projectDescriptor.cvsWebUrl)
<div><small><a href="$projectDescriptor.cvsWebUrl">CVS
Repository</a></small></div>
+ #end
+ #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>
<div><small><a href="$relativePath/jdepend-report.html">Metric
Results</a></small></div>
<div><small><a href="$relativePath/junit-report.html">Unit
Tests</a></small></div>
1.5 +6 -6
jakarta-turbine-maven/src/java/org/apache/maven/project/Dependency.java
Index: Dependency.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine-maven/src/java/org/apache/maven/project/Dependency.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- Dependency.java 27 Mar 2002 20:04:52 -0000 1.4
+++ Dependency.java 28 Mar 2002 04:11:26 -0000 1.5
@@ -55,7 +55,7 @@
/**
* @author <a href="mailto:[EMAIL PROTECTED]";>Jason van Zyl</a>
- * @version $Id: Dependency.java,v 1.4 2002/03/27 20:04:52 kaz Exp $
+ * @version $Id: Dependency.java,v 1.5 2002/03/28 04:11:26 kaz Exp $
*/
public class Dependency
extends Project
@@ -78,7 +78,7 @@
/**
* The URL to the dependency's homepage.
*/
- private String homepage;
+ private String url;
/**
* Default constructor
@@ -117,13 +117,13 @@
return jar;
}
- public void setHomepage(String homepage)
+ public void setUrl(String url)
{
- this.homepage = homepage;
+ this.url = url;
}
- public String getHomepage()
+ public String getUrl()
{
- return homepage;
+ return url;
}
}
1.9 +22 -1
jakarta-turbine-maven/src/java/org/apache/maven/project/Project.java
Index: Project.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine-maven/src/java/org/apache/maven/project/Project.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- Project.java 24 Mar 2002 15:57:27 -0000 1.8
+++ Project.java 28 Mar 2002 04:11:26 -0000 1.9
@@ -59,7 +59,7 @@
/**
* @author <a href="mailto:[EMAIL PROTECTED]";>Jason van Zyl</a>
- * @version $Id: Project.java,v 1.8 2002/03/24 15:57:27 jvanzyl Exp $
+ * @version $Id: Project.java,v 1.9 2002/03/28 04:11:26 kaz Exp $
*/
public class Project
extends BaseObject
@@ -94,6 +94,11 @@
*/
private String cvsWebUrl;
+ /**
+ * Project's issue tracking Url
+ */
+ private String issueTrackingUrl;
+
/**
* Project's mailing lists.
*/
@@ -327,6 +332,22 @@
public String getCvsWebUrl()
{
return cvsWebUrl;
+ }
+
+ /**
+ * Sets the issueTrackingUrl attribute of the Project object
+ */
+ public void setIssueTrackingUrl(String issueTrackingUrl)
+ {
+ this.issueTrackingUrl = issueTrackingUrl;
+ }
+
+ /**
+ * Gets the issueTrackingUrl attribute of the Project object
+ */
+ public String getIssueTrackingUrl()
+ {
+ return issueTrackingUrl;
}
/**
1.5 +2 -1
jakarta-turbine-maven/src/test/org/apache/maven/project/ProjectMapperTest.java
Index: ProjectMapperTest.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine-maven/src/test/org/apache/maven/project/ProjectMapperTest.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- ProjectMapperTest.java 27 Mar 2002 20:04:53 -0000 1.4
+++ ProjectMapperTest.java 28 Mar 2002 04:11:26 -0000 1.5
@@ -46,6 +46,7 @@
assertEquals("Apache Software Foundation", p.getOrganization());
assertEquals("http://jakarta.apache.org/turbine/maven/",p.getUrl());
assertEquals("http://cvs.apache.org/viewcvs/jakarta-turbine-maven/",p.getCvsWebUrl());
+
assertEquals("http://nagoya.apache.org:8080/scarab/servlet/scarab/",p.getIssueTrackingUrl());
assertEquals("1.0-b2-dev", p.getCurrentVersion());
// Test Mailing List info
@@ -72,7 +73,7 @@
assertEquals("stratum-1.0-b2-dev.jar",
((Dependency)p.getDependencies().get(0)).getJar());
assertEquals("http://jakarta.apache.org/turbine/stratum/";,
- ((Dependency)p.getDependencies().get(0)).getHomepage());
+ ((Dependency)p.getDependencies().get(0)).getUrl());
// Test Source Directories
assertEquals("src/java",(String)p.getBuild().getSourceDirectories().get(0));
1.13 +15 -5 jakarta-turbine-maven/xdocs/project-descriptor.xml
Index: project-descriptor.xml
===================================================================
RCS file: /home/cvs/jakarta-turbine-maven/xdocs/project-descriptor.xml,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- project-descriptor.xml 28 Mar 2002 00:47:11 -0000 1.12
+++ project-descriptor.xml 28 Mar 2002 04:11:26 -0000 1.13
@@ -62,6 +62,10 @@
<cvsWebUrl>
http://cvs.apache.org/viewcvs/jakarta-turbine-maven/
</cvsWebUrl>
+ <issueTrackingUrl>
+ http://nagoya.apache.org:8080/scarab/servlet/scarab/
+ </issueTrackingUrl>
+
<siteAddress>jakarta.apache.org</siteAddress>
<siteDirectory>
/www/jakarta.apache.org/turbine/maven/
@@ -124,7 +128,7 @@
<type>required</type>
<version>0.1</version>
<jar>stratum-0.1-dev.jar</jar>
- <homepage>http://jakarta.apache.org/turbine/stratum/</homepage>
+ <url>http://jakarta.apache.org/turbine/stratum/</url>
</dependency>
<dependency>
@@ -132,7 +136,7 @@
<type>documentation</type>
<version>0.40</version>
<jar>velocity-dvsl-0.40.jar</jar>
- <homepage>http://jakarta.apache.org/velocity/</homepage>
+ <url>http://jakarta.apache.org/velocity/</url>
</dependency>
.
@@ -144,7 +148,7 @@
<type>required</type>
<version>2.2</version>
<jar>jdepend.jar</jar>
- <homepage>http://jakarta.apache.org/turbine/maven/</homepage>
+ <url>http://jakarta.apache.org/turbine/maven/</url>
</dependency>
</dependencies>
@@ -275,6 +279,12 @@
</td>
</tr>
<tr>
+ <td>issueTrackingUrl</td>
+ <td>
+ The URL to the project's issue tracking system.
+ </td>
+ </tr>
+ <tr>
<td>siteAddress</td>
<td>
The hostname of the web server that hosts the project's web
@@ -421,8 +431,8 @@
<td>The dependency's jar filename.</td>
</tr>
<tr>
- <td>homepage</td>
- <td>The homepage of the dependency.</td>
+ <td>url</td>
+ <td>The url of the dependency's homepage.</td>
</tr>
</table>
</subsection>
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
