cvs commit: maven/src/plugins-build/checkstyle/src/plugin-resources avalon_checks.xml sun_checks.xml turbine_checks.xml avalon-checkstyle.properties sun-checkstyle.properties turbine-checkstyle.properties
vmassol 2003/05/30 06:13:26
Modified:src/plugins-build/checkstyle .cvsignore plugin.jelly
plugin.properties project.xml
src/plugins-build/checkstyle/xdocs changes.xml goals.xml
index.xml properties.xml
Added: src/plugins-build/checkstyle/src/plugin-resources
avalon_checks.xml sun_checks.xml turbine_checks.xml
Removed: src/plugins-build/checkstyle/xdocs .cvsignore
src/plugins-build/checkstyle/src/plugin-resources
avalon-checkstyle.properties
sun-checkstyle.properties
turbine-checkstyle.properties
Log:
- Upgraded to support Checkstyle 3.1 and bumped version to 2.0-SNAPSHOT
- Cleaned the plugin goals and logic
- Cleaned and updated the documentation
Revision ChangesPath
1.3 +1 -0 maven/src/plugins-build/checkstyle/.cvsignore
Index: .cvsignore
===
RCS file: /home/cvs/maven/src/plugins-build/checkstyle/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore28 May 2003 09:07:15 - 1.2
+++ .cvsignore30 May 2003 13:13:25 - 1.3
@@ -3,3 +3,4 @@
maven.log
.classpath
.project
+build.properties
1.6 +138 -94 maven/src/plugins-build/checkstyle/plugin.jelly
Index: plugin.jelly
===
RCS file: /home/cvs/maven/src/plugins-build/checkstyle/plugin.jelly,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- plugin.jelly 26 Mar 2003 23:27:44 - 1.5
+++ plugin.jelly 30 May 2003 13:13:25 - 1.6
@@ -1,45 +1,118 @@
?xml version=1.0?
+!--
+ =
+Checkstyle plugin for Maven.
+ =
+--
project
xmlns:j=jelly:core
xmlns:ant=jelly:ant
xmlns:util=jelly:util
xmlns:doc=doc
- goal name=maven-checkstyle-plugin:register
-doc:registerReport
- name=Checkstyle
- pluginName=maven-checkstyle-plugin
- link=checkstyle-report
- description=Report on coding style conventions./
- /goal
-
- goal name=maven-checkstyle-plugin:deregister
-doc:deregisterReport name=Checkstyle/
- /goal
-
- !-- == --
- !-- C H E C K S T Y L E--
- !-- == --
-
- goal
-name=maven-checkstyle-plugin:report
-description=Generate code convention conformance reports
-prereqs=checkstyle:check-license-file/
-
- goal
-name=checkstyle:report
+ !--
+
+ Default goal.
+
+ --
+ goal name=checkstyle description=Perform checkstyle checks
+ prereqs=checkstyle:report/
+
+ !--
+
+ Initializations.
+
+ --
+ goal name=checkstyle:init
j:if test=${sourcesPresent == 'true'}
- ant:taskdef
-name=checkstyle
+ !-- If an explicit config file is set then use that. If one isn't
+then we will look for the maven.checkstyle.format property and
+load the predefined config set. --
+ j:set var=checkstylePropertiesX value=${maven.checkstyle.properties}X/
+ j:choose
+j:when test=${checkstylePropertiesX != 'X'}
+ j:set
+var=checkstyleProperties
+value=${maven.checkstyle.properties}/
+/j:when
+j:otherwise
+ j:set
+var=checkstyleProperties
+value=${plugin.resources}/${maven.checkstyle.format}_checks.xml/
+/j:otherwise
+ /j:choose
+
+ ant:taskdef name=checkstyle
classname=com.puppycrawl.tools.checkstyle.CheckStyleTask
+classpath
+ pathelement
location=${plugin.getDependencyPath('checkstyle:checkstyle')}/
+ pathelement location=${plugin.getDependencyPath('antlr:antlr')}/
+ pathelement location=${plugin.getDependencyPath('regexp:regexp')}/
+ pathelement
location=${plugin.getDependencyPath('commons-beanutils:commons-beanutils')}/
+ pathelement
location=${plugin.getDependencyPath('commons-collections:commons-collections')}/
+ pathelement
cvs commit: maven-new/core/src/test/org/apache/maven/artifact/handlers JarHandlerTest.java
michal 2003/05/30 08:13:43 Modified:core/src/test/org/apache/maven/artifact/handlers JarHandlerTest.java Log: Small typo fixed Revision ChangesPath 1.3 +2 -2 maven-new/core/src/test/org/apache/maven/artifact/handlers/JarHandlerTest.java Index: JarHandlerTest.java === RCS file: /home/cvs/maven-new/core/src/test/org/apache/maven/artifact/handlers/JarHandlerTest.java,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- JarHandlerTest.java 30 May 2003 15:12:34 - 1.2 +++ JarHandlerTest.java 30 May 2003 15:13:43 - 1.3 @@ -159,7 +159,7 @@ Classpath does not contain entry for: + testA, hasEntryForA); assertTrue( -Classpath does not contain entry for: + testA, +Classpath does not contain entry for: + testB, hasEntryForB); } - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: maven checkstyle.xml project.properties
vmassol 2003/05/30 08:14:13
Modified:.project.properties
Added: .checkstyle.xml
Log:
Converted old checkstyle format to new one (now needs an XML file). Note: I have
dropped the exclusion of the whitespace check as I was not sure how to translate that
into the new syntax.
Revision ChangesPath
1.37 +1 -17 maven/project.properties
Index: project.properties
===
RCS file: /home/cvs/maven/project.properties,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- project.properties8 Feb 2003 14:25:02 - 1.36
+++ project.properties30 May 2003 15:14:13 - 1.37
@@ -9,23 +9,7 @@
# C H E C K S T Y L E P R O P E R T I E S
# ---
-maven.checkstyle.properties = ${basedir}/project.properties
-
-checkstyle.lcurly.type = nl
-checkstyle.lcurly.method = nl
-checkstyle.lcurly.other = nl
-checkstyle.rcurly = alone
-
-checkstyle.paren.pad = ignore
-checkstyle.maxlinelen = 132
-
-checkstyle.maxmethodlen = 175
-
-checkstyle.ignore.whitespace = yes
-
-checkstyle.header.file = LICENSE.txt
-checkstyle.header.ignoreline = 1,2,3,4,5,6
-checkstyle.pattern.const = log|^[a-zA-Z][a-zA-Z0-9_]*$
+maven.checkstyle.properties = ${basedir}/checkstyle.xml
# ---
# J A V A D O C P R O P E R T I E S
1.1 maven/checkstyle.xml
Index: checkstyle.xml
===
?xml version=1.0?
!DOCTYPE module PUBLIC
-//Puppy Crawl//DTD Check Configuration 1.1//EN
http://www.puppycrawl.com/dtds/configuration_1_1.dtd;
!--
Checkstyle checks configured for Maven.
--
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 --
!-- ** --
module name=Header
property name=headerFile value=${basedir}/LICENSE.txt/
property name=ignoreLines value=1,2,3,4,5,6/
/module
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=max value=132/
/module
module name=MethodLength
property name=max value=175/
/module
!-- No Paren pad check
module name=ParenPad/
--
module name=ConstantName
property name=format value=log|^[a-zA-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/
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=ParameterName/
module name=StaticVariableName/
module name=TypeName/
module name=MemberName/
!-- 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
basic forrest plugin for maven
Hi gang, I've written a very basic forrest plugin: http://cvs.apache.org/~leosimons/maven-forrest-plugin.zip (12 megs!) I've copied over a forrest snapshot build from feb 19 into the plugin-resources directory, tweaked the forrest.build.xml file (see the forrest.build.xml.patch.txt), added a plugin.properties, project.properties, then added a minimal plugin.jelly script which just calls the ant buildfile. --- You can see it in use in the avalon-excalibur cvs: 1 - install maven beta 9 (or later, probably) 2 - unzip the plugin into your maven plugins/ dir 3 - checkout the avalon and avalon-excalibur cvses 4 - cd avalon-excalibur/compatibility 5 - maven xdoc Current usage: postGoal name=xdoc attainGoal name=forrest:generate/ /postGoal or call maven forrest:generate directly. --- I am sure there is a better way to do this, but given the lack of plugin writing docs this was the easiest thing I could figure out that would make things work. Is there interest in improving this? Anyone want to help out here? I think most of the things that need doing are just an hour of two of work for those among you who know maven well :D --- Partial todo - add plugin to forrest cvs or maven cvs (which one?) - figure out a full POM for forrest and list all of its dependencies (the gump descriptor should be a good start) - patch the most recent forrest install buildfile as I did (really minimal changes only, in fact) - patch the buildfile to customize the classpath to reference dependencies in the repository, rather than include a whole bunch of jars in the plugin; remove all the jars - properly structure the plugin so that it adheres to maven plugin conventions and things like a manifest are auto-generated - remove unused stuff like the webapp and forrestbot functionality from the plugin - figure out how to neatly replace the xdoc generation (right now the forrest:generate target just overwrites any maven-generated files which are in the way) - customize forrest skins to include a reference to the maven-generated project reports if they exist - write a project.xml (maven POM) - status.xml (Forrest status file) converter - perhaps write an all-new doc generation plugin where it is easier to customize whether JSL or forrest or something else is used? --- cheers, - Leo - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
