Author: vsiveton
Date: Tue Jul 26 20:12:55 2005
New Revision: 225446
URL: http://svn.apache.org/viewcvs?rev=225446&view=rev
Log:
MNG-599: Using the organization name and the inception year in the Velocity
template
Added:
maven/components/trunk/maven-plugins/maven-site-plugin/src/test/projects/site-plugin-test7/
maven/components/trunk/maven-plugins/maven-site-plugin/src/test/projects/site-plugin-test7/pom.xml
(with props)
maven/components/trunk/maven-plugins/maven-site-plugin/src/test/projects/site-plugin-test7/src/
maven/components/trunk/maven-plugins/maven-site-plugin/src/test/projects/site-plugin-test7/src/main/
maven/components/trunk/maven-plugins/maven-site-plugin/src/test/projects/site-plugin-test7/src/main/java/
maven/components/trunk/maven-plugins/maven-site-plugin/src/test/projects/site-plugin-test7/src/main/java/org/
maven/components/trunk/maven-plugins/maven-site-plugin/src/test/projects/site-plugin-test7/src/main/java/org/apache/
maven/components/trunk/maven-plugins/maven-site-plugin/src/test/projects/site-plugin-test7/src/main/java/org/apache/maven/
maven/components/trunk/maven-plugins/maven-site-plugin/src/test/projects/site-plugin-test7/src/main/java/org/apache/maven/plugin/
maven/components/trunk/maven-plugins/maven-site-plugin/src/test/projects/site-plugin-test7/src/main/java/org/apache/maven/plugin/site/
maven/components/trunk/maven-plugins/maven-site-plugin/src/test/projects/site-plugin-test7/src/main/java/org/apache/maven/plugin/site/test7/
maven/components/trunk/maven-plugins/maven-site-plugin/src/test/projects/site-plugin-test7/src/main/java/org/apache/maven/plugin/site/test7/App.java
(with props)
maven/components/trunk/maven-plugins/maven-site-plugin/src/test/projects/site-plugin-test7/src/test/
maven/components/trunk/maven-plugins/maven-site-plugin/src/test/projects/site-plugin-test7/src/test/java/
maven/components/trunk/maven-plugins/maven-site-plugin/src/test/projects/site-plugin-test7/src/test/java/org/
maven/components/trunk/maven-plugins/maven-site-plugin/src/test/projects/site-plugin-test7/src/test/java/org/apache/
maven/components/trunk/maven-plugins/maven-site-plugin/src/test/projects/site-plugin-test7/src/test/java/org/apache/maven/
maven/components/trunk/maven-plugins/maven-site-plugin/src/test/projects/site-plugin-test7/src/test/java/org/apache/maven/plugin/
maven/components/trunk/maven-plugins/maven-site-plugin/src/test/projects/site-plugin-test7/src/test/java/org/apache/maven/plugin/site/
maven/components/trunk/maven-plugins/maven-site-plugin/src/test/projects/site-plugin-test7/src/test/java/org/apache/maven/plugin/site/test7/
maven/components/trunk/maven-plugins/maven-site-plugin/src/test/projects/site-plugin-test7/src/test/java/org/apache/maven/plugin/site/test7/AppTest.java
(with props)
Modified:
maven/components/trunk/maven-plugins/maven-site-plugin/src/main/java/org/apache/maven/doxia/DoxiaMojo.java
maven/components/trunk/maven-plugins/maven-site-plugin/src/main/resources/org/apache/maven/doxia/maven-site.vm
Modified:
maven/components/trunk/maven-plugins/maven-site-plugin/src/main/java/org/apache/maven/doxia/DoxiaMojo.java
URL:
http://svn.apache.org/viewcvs/maven/components/trunk/maven-plugins/maven-site-plugin/src/main/java/org/apache/maven/doxia/DoxiaMojo.java?rev=225446&r1=225445&r2=225446&view=diff
==============================================================================
---
maven/components/trunk/maven-plugins/maven-site-plugin/src/main/java/org/apache/maven/doxia/DoxiaMojo.java
(original)
+++
maven/components/trunk/maven-plugins/maven-site-plugin/src/main/java/org/apache/maven/doxia/DoxiaMojo.java
Tue Jul 26 20:12:55 2005
@@ -212,6 +212,16 @@
List reports = getReports();
+ if ( attributes == null )
+ {
+ attributes = new HashMap();
+ }
+
+ if ( attributes.get( "project" ) == null )
+ {
+ attributes.put( "project", project );
+ }
+
try
{
categorizeReports( reports );
Modified:
maven/components/trunk/maven-plugins/maven-site-plugin/src/main/resources/org/apache/maven/doxia/maven-site.vm
URL:
http://svn.apache.org/viewcvs/maven/components/trunk/maven-plugins/maven-site-plugin/src/main/resources/org/apache/maven/doxia/maven-site.vm?rev=225446&r1=225445&r2=225446&view=diff
==============================================================================
---
maven/components/trunk/maven-plugins/maven-site-plugin/src/main/resources/org/apache/maven/doxia/maven-site.vm
(original)
+++
maven/components/trunk/maven-plugins/maven-site-plugin/src/main/resources/org/apache/maven/doxia/maven-site.vm
Tue Jul 26 20:12:55 2005
@@ -151,7 +151,25 @@
<hr/>
</div>
<div id="footer">
- <div class="xright">© 2002-2005, Apache Software Foundation</div>
+ <div class="xright">©
+#if ( $project )
+ #set ( $currentYear = ${currentDate.year} + 1900 )
+
+ #if ( ${project.inceptionYear} && ( ${project.inceptionYear} !=
${currentYear.toString()} ) )
+ ${project.inceptionYear}-${currentYear}
+ #else
+ ${currentYear}
+ #end
+
+ #if ( ${project.organization} && ${project.organization.name} )
+ ${project.organization.name}
+ #else
+ Apache Software Foundation
+ #end
+#else
+ 2002-2005, Apache Software Foundation
+#end
+ </div>
<div class="clear">
<hr/>
</div>
Added:
maven/components/trunk/maven-plugins/maven-site-plugin/src/test/projects/site-plugin-test7/pom.xml
URL:
http://svn.apache.org/viewcvs/maven/components/trunk/maven-plugins/maven-site-plugin/src/test/projects/site-plugin-test7/pom.xml?rev=225446&view=auto
==============================================================================
---
maven/components/trunk/maven-plugins/maven-site-plugin/src/test/projects/site-plugin-test7/pom.xml
(added)
+++
maven/components/trunk/maven-plugins/maven-site-plugin/src/test/projects/site-plugin-test7/pom.xml
Tue Jul 26 20:12:55 2005
@@ -0,0 +1,56 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+
+<!--
+/*
+ * Copyright 2001-2005 The Apache Software Foundation.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+ -->
+
+<project xmlns="http://maven.apache.org/POM/4.0.0";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/maven-v4_0_0.xsd";>
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>org.apache.maven.plugin.site.test7</groupId>
+ <artifactId>site-plugin-test7</artifactId>
+ <packaging>jar</packaging>
+ <version>1.0-SNAPSHOT</version>
+ <inceptionYear>2003</inceptionYear>
+ <name>Maven Site Plugin Test7 MNG-599 issue</name>
+ <description>Test the MNG-599 issue</description>
+ <url>http://maven.apache.org</url>
+ <organization>
+ <name>Your Organization</name>
+ <url>http://www.someorganization.biz/</url>
+ </organization>
+ <dependencies>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>3.8.1</version>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+ <developers>
+ <developer>
+ <id>vsiveton</id>
+ <name>Vincent Siveton</name>
+ <email>[EMAIL PROTECTED]</email>
+ <organization>Apache Software Foundation</organization>
+ <roles>
+ <role>Java Developer</role>
+ </roles>
+ <timezone>-5</timezone>
+ </developer>
+ </developers>
+</project>
Propchange:
maven/components/trunk/maven-plugins/maven-site-plugin/src/test/projects/site-plugin-test7/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Added:
maven/components/trunk/maven-plugins/maven-site-plugin/src/test/projects/site-plugin-test7/src/main/java/org/apache/maven/plugin/site/test7/App.java
URL:
http://svn.apache.org/viewcvs/maven/components/trunk/maven-plugins/maven-site-plugin/src/test/projects/site-plugin-test7/src/main/java/org/apache/maven/plugin/site/test7/App.java?rev=225446&view=auto
==============================================================================
---
maven/components/trunk/maven-plugins/maven-site-plugin/src/test/projects/site-plugin-test7/src/main/java/org/apache/maven/plugin/site/test7/App.java
(added)
+++
maven/components/trunk/maven-plugins/maven-site-plugin/src/test/projects/site-plugin-test7/src/main/java/org/apache/maven/plugin/site/test7/App.java
Tue Jul 26 20:12:55 2005
@@ -0,0 +1,13 @@
+package org.apache.maven.plugin.site.test7;
+
+/**
+ * Hello world!
+ *
+ */
+public class App
+{
+ public static void main( String[] args )
+ {
+ System.out.println( "Hello World!" );
+ }
+}
Propchange:
maven/components/trunk/maven-plugins/maven-site-plugin/src/test/projects/site-plugin-test7/src/main/java/org/apache/maven/plugin/site/test7/App.java
------------------------------------------------------------------------------
svn:eol-style = native
Added:
maven/components/trunk/maven-plugins/maven-site-plugin/src/test/projects/site-plugin-test7/src/test/java/org/apache/maven/plugin/site/test7/AppTest.java
URL:
http://svn.apache.org/viewcvs/maven/components/trunk/maven-plugins/maven-site-plugin/src/test/projects/site-plugin-test7/src/test/java/org/apache/maven/plugin/site/test7/AppTest.java?rev=225446&view=auto
==============================================================================
---
maven/components/trunk/maven-plugins/maven-site-plugin/src/test/projects/site-plugin-test7/src/test/java/org/apache/maven/plugin/site/test7/AppTest.java
(added)
+++
maven/components/trunk/maven-plugins/maven-site-plugin/src/test/projects/site-plugin-test7/src/test/java/org/apache/maven/plugin/site/test7/AppTest.java
Tue Jul 26 20:12:55 2005
@@ -0,0 +1,38 @@
+package org.apache.maven.plugin.site.test7;
+
+import junit.framework.Test;
+import junit.framework.TestCase;
+import junit.framework.TestSuite;
+
+/**
+ * Unit test for simple App.
+ */
+public class AppTest
+ extends TestCase
+{
+ /**
+ * Create the test case
+ *
+ * @param testName name of the test case
+ */
+ public AppTest( String testName )
+ {
+ super( testName );
+ }
+
+ /**
+ * @return the suite of tests being tested
+ */
+ public static Test suite()
+ {
+ return new TestSuite( AppTest.class );
+ }
+
+ /**
+ * Rigourous Test :-)
+ */
+ public void testApp()
+ {
+ assertTrue( true );
+ }
+}
Propchange:
maven/components/trunk/maven-plugins/maven-site-plugin/src/test/projects/site-plugin-test7/src/test/java/org/apache/maven/plugin/site/test7/AppTest.java
------------------------------------------------------------------------------
svn:eol-style = native
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
