You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@velocity.apache.org by he...@apache.org on 2006/12/31 18:30:52 UTC

svn commit: r491451 - in /velocity/site/velocity-news-plugin: config/ src/main/java/org/apache/velocity/maven/plugin/news/ src/site/ src/site/apt/ src/site/resources/ src/site/resources/images/

Author: henning
Date: Sun Dec 31 09:30:39 2006
New Revision: 491451

URL: http://svn.apache.org/viewvc?view=rev&rev=491451
Log:
Add site building stuff.


Added:
    velocity/site/velocity-news-plugin/config/
    velocity/site/velocity-news-plugin/config/apache-header.txt   (with props)
    velocity/site/velocity-news-plugin/config/checkstyle.xml   (with props)
    velocity/site/velocity-news-plugin/src/site/
    velocity/site/velocity-news-plugin/src/site/apt/
    velocity/site/velocity-news-plugin/src/site/apt/index.apt
    velocity/site/velocity-news-plugin/src/site/resources/
    velocity/site/velocity-news-plugin/src/site/resources/images/
    velocity/site/velocity-news-plugin/src/site/resources/images/pbv90x30.png   (with props)
    velocity/site/velocity-news-plugin/src/site/resources/images/velocity_project_wide.png   (with props)
    velocity/site/velocity-news-plugin/src/site/site.xml   (with props)
Modified:
    velocity/site/velocity-news-plugin/src/main/java/org/apache/velocity/maven/plugin/news/VelocityNewsReport.java

Added: velocity/site/velocity-news-plugin/config/apache-header.txt
URL: http://svn.apache.org/viewvc/velocity/site/velocity-news-plugin/config/apache-header.txt?view=auto&rev=491451
==============================================================================
--- velocity/site/velocity-news-plugin/config/apache-header.txt (added)
+++ velocity/site/velocity-news-plugin/config/apache-header.txt Sun Dec 31 09:30:39 2006
@@ -0,0 +1,21 @@
+^package .*\;$
+^\s*$
+^/\*\s*$
+^ \* Licensed to the Apache Software Foundation \(ASF\) under one\s*$
+^ \* or more contributor license agreements.  See the NOTICE file\s*$
+^ \* distributed with this work for additional information\s*$
+^ \* regarding copyright ownership.  The ASF licenses this file\s*$
+^ \* to you under the Apache License, Version 2.0 \(the\s*$
+^ \* "License"\)\; you may not use this file except in compliance\s*$
+^ \* with the License.  You may obtain a copy of the License at\s*$
+^ \*\s*$
+^ \*   http://www\.apache\.org/licenses/LICENSE-2\.0\s*$
+^ \*\s*$
+^ \* Unless required by applicable law or agreed to in writing,\s*$
+^ \* software distributed under the License is distributed on an\s*$
+^ \* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY\s*$
+^ \* KIND, either express or implied.  See the License for the\s*$
+^ \* specific language governing permissions and limitations\s*$
+^ \* under the License.\s*$
+^ \*/\s*$
+^\s*$

Propchange: velocity/site/velocity-news-plugin/config/apache-header.txt
------------------------------------------------------------------------------
    svn:eol-style = native

Added: velocity/site/velocity-news-plugin/config/checkstyle.xml
URL: http://svn.apache.org/viewvc/velocity/site/velocity-news-plugin/config/checkstyle.xml?view=auto&rev=491451
==============================================================================
--- velocity/site/velocity-news-plugin/config/checkstyle.xml (added)
+++ velocity/site/velocity-news-plugin/config/checkstyle.xml Sun Dec 31 09:30:39 2006
@@ -0,0 +1,206 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ 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.
+-->
+
+<!DOCTYPE module PUBLIC
+    "-//Puppy Crawl//DTD Check Configuration 1.1//EN"
+    "http://www.puppycrawl.com/dtds/configuration_1_1.dtd">
+
+<!--
+
+  Checkstyle configuration that checks the sun coding conventions from:
+
+    - the Java Language Specification at
+      http://java.sun.com/docs/books/jls/second_edition/html/index.html
+
+    - the Sun Code Conventions at http://java.sun.com/docs/codeconv/
+
+    - the Javadoc guidelines at
+      http://java.sun.com/j2se/javadoc/writingdoccomments/index.html
+
+    - the JDK Api documentation http://java.sun.com/j2se/docs/api/index.html
+
+    - some best practices
+
+  Checkstyle is very configurable. Be sure to read the documentation at
+  http://checkstyle.sf.net (or in your downloaded distribution).
+
+  Most Checks are configurable, be sure to consult the documentation.
+
+  To completely disable a check, just comment it out or delete it from the file.
+
+  Finally, it is worth reading the documentation.
+
+-->
+
+<module name="Checker">
+
+    <!-- Checks that a package.html file exists for each package.     -->
+    <!-- See http://checkstyle.sf.net/config_javadoc.html#PackageHtml -->
+    <module name="PackageHtml"/>
+
+    <!-- Checks whether files end with a new line.                        -->
+    <!-- See http://checkstyle.sf.net/config_misc.html#NewlineAtEndOfFile -->
+    <module name="NewlineAtEndOfFile"/>
+
+    <!-- Checks that property files contain the same keys.         -->
+    <!-- See http://checkstyle.sf.net/config_misc.html#Translation -->
+    <module name="Translation"/>
+
+    <module name="TreeWalker">
+
+        <property name="cacheFile" value="${checkstyle.cache.file}"/>
+
+        <!-- ************************************************************** -->
+        <!-- Checks that are different from the sun coding conventions ones -->
+        <!-- ************************************************************** -->
+        <property name="tabWidth" value="4"/>
+        <module name="LeftCurly">
+          <property name="option" value="nl"/>
+        </module>
+        <module name="RightCurly">
+          <property name="option" value="alone"/>
+        </module>
+        <module name="LineLength">
+          <property name="ignorePattern" value="@version"/>
+          <property name="max" value="132"/>
+        </module>
+        <module name="MemberName">
+          <property name="format" value="^[a-z]+_*[a-zA-Z0-9]*$"/>
+        </module>
+        <module name="StaticVariableName">
+          <property name="format" value="^[a-z]+_*[a-zA-Z0-9]*$"/>
+        </module>
+        <module name="ConstantName">
+          <property name="format" value="^(([A-Z][A-Z0-9]*(_[A-Z0-9]+)*)|log)$"/>
+        </module>
+        <module name="ParameterName">
+          <property name="format" value="^[a-z]+_*[a-zA-Z0-9]*$"/>
+        </module>
+
+        <!-- ************************************************************** -->
+        <!-- Default Sun coding conventions checks                          -->
+        <!-- ************************************************************** -->
+
+        <!-- Checks for Javadoc comments.                     -->
+        <!-- See http://checkstyle.sf.net/config_javadoc.html -->
+        <module name="JavadocMethod">
+          <property name="excludeScope" value="private"/>
+        </module>
+        <module name="JavadocType"/>
+        <module name="JavadocVariable"/>
+
+
+        <!-- Checks for Naming Conventions.                  -->
+        <!-- See http://checkstyle.sf.net/config_naming.html -->
+        <module name="LocalFinalVariableName"/>
+        <module name="LocalVariableName"/>
+        <module name="MethodName"/>
+        <module name="PackageName"/>
+        <module name="TypeName"/>
+
+
+        <!-- Checks for Headers                              -->
+        <!-- See http://checkstyle.sf.net/config_header.html -->
+        <module name="RegexpHeader">
+            <!-- The follow property value demonstrates the ability     -->
+            <!-- to have access to ANT properties. In this case it uses -->
+            <!-- the ${basedir} property to allow Checkstyle to be run  -->
+            <!-- from any directory within a project.                   -->
+            <property name="headerFile" value="${checkstyle.header.file}"/>
+        </module>
+
+        <!-- Following interprets the header file as regular expressions. -->
+        <!-- <module name="RegexpHeader"/>                                -->
+
+
+        <!-- Checks for imports                              -->
+        <!-- See http://checkstyle.sf.net/config_import.html -->
+        <module name="AvoidStarImport"/>
+        <module name="IllegalImport"/> <!-- defaults to sun.* packages -->
+        <module name="RedundantImport"/>
+        <module name="UnusedImports"/>
+
+
+        <!-- Checks for Size Violations.                    -->
+        <!-- See http://checkstyle.sf.net/config_sizes.html -->
+        <module name="FileLength"/>
+        <module name="MethodLength"/>
+        <module name="ParameterNumber"/>
+
+
+        <!-- Checks for whitespace                               -->
+        <!-- See http://checkstyle.sf.net/config_whitespace.html -->
+        <module name="EmptyForIteratorPad"/>
+        <module name="NoWhitespaceAfter"/>
+        <module name="NoWhitespaceBefore"/>
+        <module name="OperatorWrap"/>
+        <module name="ParenPad"/>
+        <module name="TabCharacter"/>
+        <module name="WhitespaceAfter"/>
+        <module name="WhitespaceAround"/>
+
+
+        <!-- Modifier Checks                                    -->
+        <!-- See http://checkstyle.sf.net/config_modifiers.html -->
+        <module name="ModifierOrder"/>
+        <module name="RedundantModifier"/>
+
+        <module name="EmptyBlock"/>
+        <module name="NeedBraces"/>
+
+        <!-- Checks for common coding problems               -->
+        <!-- See http://checkstyle.sf.net/config_coding.html -->
+        <module name="DoubleCheckedLocking"/>    <!-- MY FAVOURITE -->
+        <module name="EmptyStatement"/>
+        <module name="EqualsHashCode"/>
+        <module name="FallThrough"/>
+        <module name="HiddenField">
+          <property name="ignoreConstructorParameter" value="true"/>
+          <property name="ignoreSetter" value="true"/>
+        </module>
+        <module name="IllegalInstantiation"/>
+        <module name="InnerAssignment"/>
+        <module name="MagicNumber"/>
+        <module name="MissingSwitchDefault"/>
+<!--        <module name="OneMethodPrivateField" /> -->
+        <module name="RedundantThrows"/>
+        <module name="SimplifyBooleanExpression"/>
+        <module name="SimplifyBooleanReturn"/>
+
+        <!-- Checks for class design                         -->
+        <!-- See http://checkstyle.sf.net/config_design.html -->
+        <module name="FinalClass"/>
+        <module name="HideUtilityClassConstructor"/>
+        <module name="VisibilityModifier">
+        <module name="MissingSwitchDefault"/>
+          <property name="protectedAllowed" value="true"/>
+        </module>
+
+
+        <!-- Miscellaneous other checks.                   -->
+        <!-- See http://checkstyle.sf.net/config_misc.html -->
+        <module name="ArrayTypeStyle"/>
+<!--         <module name="FinalParameters"/> -->
+        <module name="GenericIllegalRegexp">
+            <property name="format" value="\s+$"/>
+            <property name="message" value="Line has trailing spaces."/>
+        </module>
+        <module name="UpperEll"/>
+
+    </module>
+
+</module>

Propchange: velocity/site/velocity-news-plugin/config/checkstyle.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: velocity/site/velocity-news-plugin/config/checkstyle.xml
------------------------------------------------------------------------------
    svn:keywords = Id Author Date Revision

Modified: velocity/site/velocity-news-plugin/src/main/java/org/apache/velocity/maven/plugin/news/VelocityNewsReport.java
URL: http://svn.apache.org/viewvc/velocity/site/velocity-news-plugin/src/main/java/org/apache/velocity/maven/plugin/news/VelocityNewsReport.java?view=diff&rev=491451&r1=491450&r2=491451
==============================================================================
--- velocity/site/velocity-news-plugin/src/main/java/org/apache/velocity/maven/plugin/news/VelocityNewsReport.java (original)
+++ velocity/site/velocity-news-plugin/src/main/java/org/apache/velocity/maven/plugin/news/VelocityNewsReport.java Sun Dec 31 09:30:39 2006
@@ -7,6 +7,7 @@
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.Comparator;
+import java.util.Date;
 import java.util.Iterator;
 import java.util.List;
 import java.util.Locale;
@@ -79,8 +80,14 @@
                         return 1;
                     }
 
-                    Date d1 = i1.getDate();
-                    Date d2 = i2.getDate();
+                    Date d1 = null;
+                    Date d2 = null;
+                    try {
+                        d1 = NewsReportUtils.parseItemDate(i1.getDate());
+                        d2 = NewsReportUtils.parseItemDate(i2.getDate());
+                    } catch (MojoExecutionException mee) {
+                        throw new ClassCastException("While parsing date:" + mee.getMessage());
+                    }
 
                     if (d1 == null) {
                         return  (d2 == null) ? 0 : -1;

Added: velocity/site/velocity-news-plugin/src/site/apt/index.apt
URL: http://svn.apache.org/viewvc/velocity/site/velocity-news-plugin/src/site/apt/index.apt?view=auto&rev=491451
==============================================================================
--- velocity/site/velocity-news-plugin/src/site/apt/index.apt (added)
+++ velocity/site/velocity-news-plugin/src/site/apt/index.apt Sun Dec 31 09:30:39 2006
@@ -0,0 +1,6 @@
+ --------
+Velocity News Plugin
+ --------
+
+Velocity News Plugin
+

Added: velocity/site/velocity-news-plugin/src/site/resources/images/pbv90x30.png
URL: http://svn.apache.org/viewvc/velocity/site/velocity-news-plugin/src/site/resources/images/pbv90x30.png?view=auto&rev=491451
==============================================================================
Binary file - no diff available.

Propchange: velocity/site/velocity-news-plugin/src/site/resources/images/pbv90x30.png
------------------------------------------------------------------------------
    svn:mime-type = image/png

Added: velocity/site/velocity-news-plugin/src/site/resources/images/velocity_project_wide.png
URL: http://svn.apache.org/viewvc/velocity/site/velocity-news-plugin/src/site/resources/images/velocity_project_wide.png?view=auto&rev=491451
==============================================================================
Binary file - no diff available.

Propchange: velocity/site/velocity-news-plugin/src/site/resources/images/velocity_project_wide.png
------------------------------------------------------------------------------
    svn:mime-type = image/png

Added: velocity/site/velocity-news-plugin/src/site/site.xml
URL: http://svn.apache.org/viewvc/velocity/site/velocity-news-plugin/src/site/site.xml?view=auto&rev=491451
==============================================================================
--- velocity/site/velocity-news-plugin/src/site/site.xml (added)
+++ velocity/site/velocity-news-plugin/src/site/site.xml Sun Dec 31 09:30:39 2006
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project name="Velocity News Plugin">
+  <publishDate position="bottom" format="yyyy-MM-dd HH:mm:ss"/>
+  <bannerLeft>
+    <name>Velocity News Plugin</name>
+    <src>/images/velocity_project_wide.png</src>
+    <href>http:/velocity.apache.org/</href>
+  </bannerLeft>
+
+  <poweredBy>
+    <logo name="Apache Velocity" 
+          href="http://velocity.apache.org"
+          img="/images/pbv90x30.png" />
+  </poweredBy>
+
+  <body>
+    <breadcrumbs>
+      <item name="Apache" href="http://www.apache.org"/>
+      <item name="Velocity" href="http://velocity.apache.org/"/>
+    </breadcrumbs>
+
+    <menu name="General">
+      <item name="Overview" href="index.html"/>
+    </menu> 
+
+    ${reports}
+  </body>
+</project>
+ 
+

Propchange: velocity/site/velocity-news-plugin/src/site/site.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: velocity/site/velocity-news-plugin/src/site/site.xml
------------------------------------------------------------------------------
    svn:keywords = Id Author Date Revision