glennm 2002/06/03 20:20:52
Modified: . project.xml
src/dvsl/xdocs site.dvsl
src/java/org/apache/maven/project Organization.java
Project.java
xdocs navigation.xml
xdocs/plugins navigation.xml
xdocs/plugins/j2ee navigation.xml
xdocs/plugins/struts navigation.xml
xdocs/ref navigation.xml project-descriptor.xml
xdocs/start navigation.xml
Log:
Glenn McAllister - 2002/06/03
- Removed the navigation.xml <logo> and <organizationLogo> elements.
They've been replaced by the <project><logo/> and <organization><logo/>
elements respectively. The alt text for the logos are taken from
<project><name> and <organization><name> respectively.
Revision Changes Path
1.96 +2 -0 jakarta-turbine-maven/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/jakarta-turbine-maven/project.xml,v
retrieving revision 1.95
retrieving revision 1.96
diff -u -r1.95 -r1.96
--- project.xml 4 Jun 2002 00:51:54 -0000 1.95
+++ project.xml 4 Jun 2002 03:20:51 -0000 1.96
@@ -8,9 +8,11 @@
<organization>
<name>Apache Software Foundation</name>
<url>http://jakarta.apache.org/</url>
+ <logo>/images/jakarta-logo-blue.gif</logo>
</organization>
<inceptionYear>2001</inceptionYear>
<package>org.apache.maven</package>
+ <logo>/images/maven.jpg</logo>
<shortDescription>Java Project Management Tools</shortDescription>
1.49 +9 -13 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.48
retrieving revision 1.49
diff -u -r1.48 -r1.49
--- site.dvsl 4 Jun 2002 02:35:01 -0000 1.48
+++ site.dvsl 4 Jun 2002 03:20:51 -0000 1.49
@@ -91,16 +91,16 @@
<table border="0" cellspacing="0" cellpadding="8" width="100%">
<tr>
<td>
- #if( $nav.organizationLogo )
+ #if( $pom.organization.logo )
- #set( $alt = $nav.organizationLogo )
- #set( $src = $nav.organizationLogo.attribute("href") )
+ #set( $alt = $pom.organization.name )
+ #set( $src = $pom.organization.logo )
#if ( $pom.organization.url )
#set( $home = $pom.organization.url )
#else
## Fall back to the project url
- #set( $home = $nav.attribute( "href" ) )
+ #set( $home = $pom.url )
#end
<a href="$home">
@@ -112,7 +112,7 @@
</a>
#else
-
+
## Default to the Jakarta logo if one has not been defined.
<a href="http://jakarta.apache.org/";>
<img src="$relativePath/images/jakarta-logo-blue.gif"
align="left" alt="The Jakarta Project" border="0"/>
@@ -122,15 +122,11 @@
</td>
<td>
<div align="right" id="login">
- #if( $nav.logo )
+ #if( $pom.logo )
- #set( $alt = $nav.logo )
- #if( $nav.attribute("href") )
- #set( $home = $nav.attribute("href") )
- #else
- #set( $home = $pom.url )
- #end
- #set( $src = $nav.logo.attribute( "href" ) )
+ #set( $alt = $pom.name )
+ #set( $home = $pom.url )
+ #set( $src = $pom.logo )
<a href="$home">
#if ( $src.startsWith("http") )
1.3 +5 -3
jakarta-turbine-maven/src/java/org/apache/maven/project/Organization.java
Index: Organization.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine-maven/src/java/org/apache/maven/project/Organization.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- Organization.java 3 Jun 2002 12:40:48 -0000 1.2
+++ Organization.java 4 Jun 2002 03:20:51 -0000 1.3
@@ -56,7 +56,7 @@
/**
* @author <a href="mailto:[EMAIL PROTECTED]";>Jason van Zyl</a>
- * @version $Id: Organization.java,v 1.2 2002/06/03 12:40:48 jvanzyl Exp $
+ * @version $Id: Organization.java,v 1.3 2002/06/04 03:20:51 glennm Exp $
*/
public class Organization
extends BaseObject
@@ -90,7 +90,9 @@
}
/**
- * Sets the logo attribute of the Organization object
+ * Sets the logo text attribute of the Organization object.
+ *
+ * @param logo the logo text
*/
public void setLogo(String logo)
{
@@ -98,7 +100,7 @@
}
/**
- * Gets the organization logo.
+ * Gets the organization logo text.
*
* @returns the organization logo.
*/
1.24 +25 -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.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- Project.java 3 Jun 2002 17:13:16 -0000 1.23
+++ Project.java 4 Jun 2002 03:20:51 -0000 1.24
@@ -65,7 +65,7 @@
/**
* @author <a href="mailto:[EMAIL PROTECTED]";>Jason van Zyl</a>
* @author <a href="[EMAIL PROTECTED]">Vincent Massol</a>
- * @version $Id: Project.java,v 1.23 2002/06/03 17:13:16 werken Exp $
+ * @version $Id: Project.java,v 1.24 2002/06/04 03:20:51 glennm Exp $
*/
public class Project
extends BaseObject
@@ -91,6 +91,11 @@
private String url;
/**
+ * Project logo url
+ */
+ private String logo;
+
+ /**
* Project description
*/
private String description;
@@ -571,4 +576,23 @@
return (Version) versionMap.get(versionId);
}
+ /**
+ * Set the project logo image URL.
+ *
+ * @param logo the url for the project logo image.
+ */
+ public void setLogo(String logo)
+ {
+ this.logo = logo;
+ }
+
+ /**
+ * Return the project logo image URL.
+ *
+ * @return the logo image URL
+ */
+ public String getLogo()
+ {
+ return logo;
+ }
}
1.3 +0 -2 jakarta-turbine-maven/xdocs/navigation.xml
Index: navigation.xml
===================================================================
RCS file: /home/cvs/jakarta-turbine-maven/xdocs/navigation.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- navigation.xml 30 May 2002 12:55:22 -0000 1.2
+++ navigation.xml 4 Jun 2002 03:20:52 -0000 1.3
@@ -2,8 +2,6 @@
<project name="Maven">
<title>Maven</title>
- <logo href="/images/maven.jpg">Maven</logo>
- <organizationLogo href="/images/jakarta-logo-blue.gif">Jakarta</organizationLogo>
<body>
<links>
1.2 +0 -2 jakarta-turbine-maven/xdocs/plugins/navigation.xml
Index: navigation.xml
===================================================================
RCS file: /home/cvs/jakarta-turbine-maven/xdocs/plugins/navigation.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- navigation.xml 30 May 2002 12:55:22 -0000 1.1
+++ navigation.xml 4 Jun 2002 03:20:52 -0000 1.2
@@ -2,8 +2,6 @@
<project name="Maven">
<title>Maven</title>
- <logo href="/images/maven.jpg">Maven</logo>
- <organizationLogo href="/images/jakarta-logo-blue.gif">Jakarta</organizationLogo>
<body>
<links>
1.3 +0 -2 jakarta-turbine-maven/xdocs/plugins/j2ee/navigation.xml
Index: navigation.xml
===================================================================
RCS file: /home/cvs/jakarta-turbine-maven/xdocs/plugins/j2ee/navigation.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- navigation.xml 31 May 2002 16:51:19 -0000 1.2
+++ navigation.xml 4 Jun 2002 03:20:52 -0000 1.3
@@ -2,8 +2,6 @@
<project name="Maven">
<title>Maven</title>
- <logo href="/images/maven.jpg">Maven</logo>
- <organizationLogo href="/images/jakarta-logo-blue.gif">Jakarta</organizationLogo>
<body>
<links>
1.3 +0 -2 jakarta-turbine-maven/xdocs/plugins/struts/navigation.xml
Index: navigation.xml
===================================================================
RCS file: /home/cvs/jakarta-turbine-maven/xdocs/plugins/struts/navigation.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- navigation.xml 31 May 2002 16:46:21 -0000 1.2
+++ navigation.xml 4 Jun 2002 03:20:52 -0000 1.3
@@ -2,8 +2,6 @@
<project name="Maven">
<title>Maven</title>
- <logo href="/images/maven.jpg">Maven</logo>
- <organizationLogo href="/images/jakarta-logo-blue.gif">Jakarta</organizationLogo>
<body>
<links>
1.5 +0 -2 jakarta-turbine-maven/xdocs/ref/navigation.xml
Index: navigation.xml
===================================================================
RCS file: /home/cvs/jakarta-turbine-maven/xdocs/ref/navigation.xml,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- navigation.xml 30 May 2002 12:55:22 -0000 1.4
+++ navigation.xml 4 Jun 2002 03:20:52 -0000 1.5
@@ -2,8 +2,6 @@
<project name="Maven">
<title>Maven</title>
- <logo href="/images/maven.jpg">Maven</logo>
- <organizationLogo href="/images/jakarta-logo-blue.gif">Jakarta</organizationLogo>
<body>
<links>
1.12 +20 -0 jakarta-turbine-maven/xdocs/ref/project-descriptor.xml
Index: project-descriptor.xml
===================================================================
RCS file: /home/cvs/jakarta-turbine-maven/xdocs/ref/project-descriptor.xml,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- project-descriptor.xml 3 Jun 2002 22:04:34 -0000 1.11
+++ project-descriptor.xml 4 Jun 2002 03:20:52 -0000 1.12
@@ -132,6 +132,16 @@
</td>
</tr>
<tr>
+ <td>logo</td>
+ <td>
+ The URL to the project's logo image. This can be an URL relative
+ to the base directory of the generated web site,
+ (e.g., <code>/images/project-logo.png</code>) or an absolute URL
+ (e.g., <code>http://my.corp/project-logo.png</code>). This is used
+ when generating the project documentation.
+ </td>
+ </tr>
+ <tr>
<td>issueTrackingUrl</td>
<td>
Optional. The URL to the project's issue tracking system.
@@ -236,6 +246,16 @@
<td>url</td>
<td>
The URL to the organization's home page.
+ </td>
+ </tr>
+ <tr>
+ <td>logo</td>
+ <td>
+ The URL to the organization's logo image. This can be an URL relative
+ to the base directory of the generated web site,
+ (e.g., <code>/images/org-logo.png</code>) or an absolute URL
+ (e.g., <code>http://my.corp/logo.png</code>). This value is used
+ when generating the project documentation.
</td>
</tr>
</table>
1.3 +0 -2 jakarta-turbine-maven/xdocs/start/navigation.xml
Index: navigation.xml
===================================================================
RCS file: /home/cvs/jakarta-turbine-maven/xdocs/start/navigation.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- navigation.xml 30 May 2002 12:55:23 -0000 1.2
+++ navigation.xml 4 Jun 2002 03:20:52 -0000 1.3
@@ -2,8 +2,6 @@
<project name="Maven">
<title>Maven</title>
- <logo href="/images/maven.jpg">Maven</logo>
- <organizationLogo href="/images/jakarta-logo-blue.gif">Jakarta</organizationLogo>
<body>
<links>
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
