Maven3対応。

diff --git a/.hgeol b/.hgeol
index c2e4f82..8458257 100644 (file)
--- a/.hgeol
+++ b/.hgeol
@@ -9,6 +9,11 @@
 **.xsd = LF
 **.dtd = LF
 
 **.xsd = LF
 **.dtd = LF
 

-**.css = LF

 **.html = LF
 **.html = LF

+**.htm = LF
+**.css = LF
+

 **.png = BIN
 **.png = BIN

+**.gif = BIN
+**.jpeg = BIN
+**.jpg = BIN

diff --git a/.hgignore b/.hgignore
index 7454a09..3ce27c0 100644 (file)
--- a/.hgignore
+++ b/.hgignore
@@ -1,12 +1,36 @@
-syntax: regexp\r
-\r
-\.orig$\r
-\.orig\..*$\r
-\.chg\..*$\r
-\.rej$\r
-\.conflict\~$\r
-^maven-build\.properties$\r
-^maven-build\.xml$\r
-^nb-configuration\.xml$\r
-^nbactions\.xml$\r
-^target$\r
+#########################
+# for Mercurial hgignore
+#########################
+
+
+#####################
+syntax: regexp
+
+^nb-configuration\.xml$
+^nbactions\.xml$
+^\.classpath$
+^\.project$
+
+\.orig$
+\.orig\..*$
+\.chg\..*$
+\.rej$
+\.conflict\~$
+^target/
+^build/
+^bin/
+^nbproject/
+^\.settings/
+
+
+#####################
+syntax: glob
+
+.DS_Store
+_MACOSX
+[Tt]humbs.db
+[Dd]esktop.ini
+core
+
+
+### EOF ###

diff --git a/CHANGELOG.txt b/CHANGELOG.txt
index bf60f49..8c4d115 100644 (file)
--- a/CHANGELOG.txt
+++ b/CHANGELOG.txt
@@ -4,6 +4,9 @@
 Pmd2XML 変更履歴
 
 
 Pmd2XML 変更履歴
 
 

+X.XXX.X (20XX-XX-XX)
+    ・Maven3対応。
+

 1.102.4 (2010-10-09)
     ・TogaGem1.105.2のバグ修正(接続ボーンを持たない剛体の件)に対処。
 
 1.102.4 (2010-10-09)
     ・TogaGem1.105.2のバグ修正(接続ボーンを持たない剛体の件)に対処。
 

diff --git a/README.txt b/README.txt
index 3eff83c..405b557 100644 (file)
--- a/README.txt
+++ b/README.txt
@@ -30,16 +30,6 @@ Pmd2XMLは、同じMikuTogaプロジェクト内のTogaGemライブラリを用
    原則として、JRE1.6に準拠した実行系であれば、プラットフォームを選びません。
 
 
    原則として、JRE1.6に準拠した実行系であれば、プラットフォームを選びません。
 
 

-=== アーカイブ管理体制 ===
-
-  このアーカイブは、UTF-8による開発環境を前提として構成されています。
-  このアーカイブの原本となる開発資産は、
-      http://hg.sourceforge.jp/view/mikutoga/Pmd2XML
-  を上位に持つMercurialリポジトリで管理されています。
-  アーカイブの代わりにMercurialを通じての開発資産へのアクセスが可能です。
-  # hg clone http://hg.sourceforge.jp/view/mikutoga/Pmd2XML
-
-

 === 開発プロジェクト運営元 ===
 
   http://sourceforge.jp/projects/mikutoga/ まで。
 === 開発プロジェクト運営元 ===
 
   http://sourceforge.jp/projects/mikutoga/ まで。


@@ -47,7 +37,7 @@ Pmd2XMLは、同じMikuTogaプロジェクト内のTogaGemライブラリを用
 
 === ディレクトリ内訳構成 ===
 
 
 === ディレクトリ内訳構成 ===
 

-基本的にはMaven2のmaven-archetype-quickstart構成に準じます。
+基本的にはMaven3のmaven-archetype-quickstart構成に準じます。

 
 ./README.txt
     あなたが今見てるこれ。
 
 ./README.txt
     あなたが今見てるこれ。


@@ -58,8 +48,11 @@ Pmd2XMLは、同じMikuTogaプロジェクト内のTogaGemライブラリを用
 ./LICENSE.txt
     ライセンスに関して。
 
 ./LICENSE.txt
     ライセンスに関して。
 

+./SCM.txt
+    ソースコード管理に関して。
+

 ./pom.xml
 ./pom.xml

-    Maven2用プロジェクト構成定義ファイル。
+    Maven3用プロジェクト構成定義ファイル。

 
 ./src/main/java/
     Javaのソースコード。
 
 ./src/main/java/
     Javaのソースコード。

diff --git a/SCM.txt b/SCM.txt
new file mode 100644 (file)
index 0000000..7cde56b
--- /dev/null
+++ b/SCM.txt
@@ -0,0 +1,48 @@
+[UTF-8 Japanese]
+
+                               P m d 2 X M L
+                    バージョン管理システムに関する情報
+
+                                              Copyright(c) 2011 olyutorskii
+
+
+=== バージョン管理体制 ===
+
+  このアーカイブの原本は、Mercurial(hg)でバージョン管理されています。
+  このアーカイブの原本となる開発資産は、
+      http://hg.sourceforge.jp/view/mikutoga/Pmd2XML
+  を上位に持つMercurialリポジトリで管理されています。
+  アーカイブの代わりにMercurialを通じての開発資産へのアクセスが可能です。
+  # hg clone http://hg.sourceforge.jp/view/mikutoga/Pmd2XML
+
+
+=== 各種設定ファイル ===
+
+./.hgignore
+
+Mercurial 管理の対象外にさせたいファイル群の設定です。
+IDE独自の設定ファイルは基本的に管理対象外とするつもりです。
+
+
+./.hgeol
+
+Mercurial の EOL Extension 用の設定です。
+非バイナリなテキストファイルの改行コードに関する設定です。
+・拡張子が *.txt なローカルファイルの改行文字はローカルの環境に合わせる。
+・拡張子が *.java なローカルファイルの改行文字はローカルの環境に合わせる。
+・それ以外の非バイナリなローカルファイルの改行文字は基本LFで統一。
+・リポジトリ上の全ての非バイナリファイルの改行文字は基本LFで統一。
+というポリシーで運用しています。
+EOL Extensionを有効にしないと設定が反映されません。
+
+
+=== リンク ===
+
+・http://mercurial.selenic.com/
+・http://mercurial.selenic.com/wiki/.hgignore
+・http://www.selenic.com/mercurial/hgignore.5.html
+・http://mercurial.selenic.com/wiki/EolExtension
+・http://tortoisehg.bitbucket.org/
+
+
+--- EOF ---

diff --git a/build.xml b/fixcrlf.xml
similarity index 62%
rename from build.xml
rename to fixcrlf.xml
index 321ecbd..90a7b46 100644 (file)
--- a/build.xml
+++ b/fixcrlf.xml
@@ -1,25 +1,14 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8" ?>

 
 <!-- ====================================================================== -->
 
 <!-- ====================================================================== -->

-<!-- Ant build file (http://ant.apache.org/) for Ant 1.6.2 or above.        -->
+<!-- Ant build file (http://ant.apache.org/) for Ant 1.8.0 or later.        -->

 <!-- ====================================================================== -->
 
 <!-- ====================================================================== -->
 

-<project name="pmd2xml" default="package" basedir=".">
-
-<!-- ====================================================================== -->
-<!-- Import maven-build.xml into the current project                        -->
-<!-- Maven2 command "mvn ant:ant" will put maven-build.xml                  -->
-<!-- ====================================================================== -->
-
-    <import optional="true" file="maven-build.xml"/>
-
-<!-- ====================================================================== -->
-<!-- Help target                                                            -->
-<!-- ====================================================================== -->
-
-    <target name="help">
-        <echo message="Please run: $ant -projecthelp"/>
-    </target>
+<project basedir=".">
+<description>
+CAUTION : This is not build-file for project-building.
+It's just adapting project-files for native environment.
+</description>

 
 <!-- ====================================================================== -->
 <!-- sanitize files for native environment                                  -->
 
 <!-- ====================================================================== -->
 <!-- sanitize files for native environment                                  -->


@@ -29,17 +18,16 @@
         <echo message="sanitize files..." />
 
         <fixcrlf
         <echo message="sanitize files..." />
 
         <fixcrlf

-            srcDir="./src/" includes="**/*.java"
+            srcDir="." includes="*.txt"

             encoding="UTF-8" outputencoding="UTF-8"
             encoding="UTF-8" outputencoding="UTF-8"

-            tablength="4" tab="remove" javafiles="true"
+            tablength="8" tab="remove"

             eof="remove"
         />
 
         <fixcrlf
             eof="remove"
         />
 
         <fixcrlf

-            srcDir="./src/" includes="**/*.xml,**/*.xsd,**/*.dtd"
+            srcDir="./src/" includes="**/*.java"

             encoding="UTF-8" outputencoding="UTF-8"
             encoding="UTF-8" outputencoding="UTF-8"

-            tablength="8" tab="remove"
-            eol="lf"
+            tablength="4" tab="remove" javafiles="true"

             eof="remove"
         />
 
             eof="remove"
         />
 


@@ -51,9 +39,18 @@
         />
 
         <fixcrlf
         />
 
         <fixcrlf

-            srcDir="." includes="*.txt"
+            srcDir="./src/" includes="**/*.xml,**/*.xsd,**/*.dtd"
+            encoding="UTF-8" outputencoding="UTF-8"
+            tablength="8" tab="remove"
+            eol="lf"
+            eof="remove"
+        />
+
+        <fixcrlf
+            srcDir="./src/" includes="**/*.html,**/*.htm,**/*.css"

             encoding="UTF-8" outputencoding="UTF-8"
             tablength="8" tab="remove"
             encoding="UTF-8" outputencoding="UTF-8"
             tablength="8" tab="remove"

+            eol="lf"

             eof="remove"
         />
 
             eof="remove"
         />
 

diff --git a/pom.xml b/pom.xml
index 47fcbc5..98ec3fc 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -1,8 +1,7 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8" ?>

 
 <!--
 
 <!--

-    Pmd2XML
-    Maven2用プロジェクト構成定義ファイル
+    Maven2(or3) POM definition file

 -->
 
 <project
 -->
 
 <project


@@ -24,8 +23,7 @@
 
     <description><!--
 -->Pmd2XML is a PMD-XML converter for MikuMikuDance.<!--
 
     <description><!--
 -->Pmd2XML is a PMD-XML converter for MikuMikuDance.<!--

- -->
-    </description>
+ --></description>

 
     <url>http://sourceforge.jp/projects/mikutoga/</url>
     <inceptionYear>2010</inceptionYear>
 
     <url>http://sourceforge.jp/projects/mikutoga/</url>
     <inceptionYear>2010</inceptionYear>


@@ -60,7 +58,7 @@
     <mailingLists/>
 
     <prerequisites>
     <mailingLists/>
 
     <prerequisites>

-        <maven>2.2.1</maven>
+        <maven>2.2</maven>

     </prerequisites>
 
     <modules/>
     </prerequisites>
 
     <modules/>


@@ -91,18 +89,12 @@
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
 
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
 

-        <project.myrepoconf>${project.basedir}/src/main/config</project.myrepoconf>
+        <project.mainconf>${project.basedir}/src/main/config</project.mainconf>

 
 

-        <project.transformer>
-            org.apache.maven.plugins.shade.resource.ManifestResourceTransformer
-        </project.transformer>
-        <project.mainentry>jp.sourceforge.mikutoga.pmd2xml.Pmd2Xml</project.mainentry>
-
-        <!-- Walkaround for Maven3&PMD-plugin bug -->
-        <targetJdk>${maven.compiler.source}</targetJdk>
+        <checkstyle.config.location>${project.mainconf}/checks.xml</checkstyle.config.location>
+        <checkstyle.enable.rss>false</checkstyle.enable.rss>

 
 

-        <!-- Walkaround for Maven3&checkstyle bug -->
-        <checkstyle.config.location>${project.myrepoconf}/checks.xml</checkstyle.config.location>
+        <project.mainentry>jp.sourceforge.mikutoga.pmd2xml.Pmd2Xml</project.mainentry>

 
     </properties>
 
 
     </properties>
 


@@ -113,14 +105,14 @@
         <dependency>
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>
         <dependency>
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>

-            <version>[4.8.2,)</version>
+            <version>4.10</version>

             <scope>test</scope>
         </dependency>
 
         <dependency>
             <groupId>jp.sourceforge.mikutoga</groupId>
             <artifactId>togagem</artifactId>
             <scope>test</scope>
         </dependency>
 
         <dependency>
             <groupId>jp.sourceforge.mikutoga</groupId>
             <artifactId>togagem</artifactId>

-            <version>2.101.2</version>
+            <version>2.101.3-SNAPSHOT</version>

             <scope>compile</scope>
         </dependency>
 
             <scope>compile</scope>
         </dependency>
 


@@ -136,6 +128,22 @@
 
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
 
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>

+                <artifactId>maven-enforcer-plugin</artifactId>
+                <version>1.0.1</version>
+                <configuration>
+                    <rules>
+                        <requireMavenVersion>
+                            <version>[2.2,)</version>
+                        </requireMavenVersion>
+                        <requireJavaVersion>
+                            <version>[1.6,)</version>
+                        </requireJavaVersion>
+                    </rules>
+                </configuration>
+            </plugin>
+
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>

                 <artifactId>maven-clean-plugin</artifactId>
                 <version>2.4.1</version>
                 <configuration>
                 <artifactId>maven-clean-plugin</artifactId>
                 <version>2.4.1</version>
                 <configuration>


@@ -144,7 +152,11 @@
                             <directory>${project.basedir}</directory>
                             <includes>
                                 <include>**/.DS_Store</include>
                             <directory>${project.basedir}</directory>
                             <includes>
                                 <include>**/.DS_Store</include>

+                                <include>**/_MACOSX</include>

                                 <include>**/Thumbs.db</include>
                                 <include>**/Thumbs.db</include>

+                                <include>**/thumbs.db</include>
+                                <include>**/Desktop.ini</include>
+                                <include>**/desktop.ini</include>

                                 <include>**/core</include>
                             </includes>
                         </fileset>
                                 <include>**/core</include>
                             </includes>
                         </fileset>


@@ -173,8 +185,10 @@
                 <version>2.3.2</version>
                 <configuration>
                     <archive>
                 <version>2.3.2</version>
                 <configuration>
                     <archive>

+                        <manifest>
+                            <mainClass>${project.mainentry}</mainClass>
+                        </manifest>

                         <manifestEntries>
                         <manifestEntries>

-                            <Main-Class>${project.mainentry}</Main-Class>

                             <Built-By>${project.organization.name}</Built-By>
                         </manifestEntries>
                     </archive>
                             <Built-By>${project.organization.name}</Built-By>
                         </manifestEntries>
                     </archive>


@@ -183,19 +197,8 @@
 
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
 
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>

-                <artifactId>maven-assembly-plugin</artifactId>
-                <version>2.2.1</version>
-                <configuration>
-                    <descriptors>
-                        <descriptor>src/main/assembly/descriptor.xml</descriptor>
-                    </descriptors>
-                </configuration>
-            </plugin>
-
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>

                 <artifactId>maven-shade-plugin</artifactId>
                 <artifactId>maven-shade-plugin</artifactId>

-                <version>1.4</version>
+                <version>1.5</version>

                 <executions>
                     <execution>
                         <phase>package</phase>
                 <executions>
                     <execution>
                         <phase>package</phase>


@@ -218,17 +221,12 @@
 
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
 
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>

-                <artifactId>maven-enforcer-plugin</artifactId>
-                <version>1.0.1</version>
+                <artifactId>maven-assembly-plugin</artifactId>
+                <version>2.2.1</version>

                 <configuration>
                 <configuration>

-                    <rules>
-                        <requireMavenVersion>
-                            <version>[2.2,3)</version>
-                        </requireMavenVersion>
-                        <requireJavaVersion>
-                            <version>[1.6,)</version>
-                        </requireJavaVersion>
-                    </rules>
+                    <descriptors>
+                        <descriptor>src/main/assembly/descriptor.xml</descriptor>
+                    </descriptors>

                 </configuration>
             </plugin>
 
                 </configuration>
             </plugin>
 


@@ -255,6 +253,63 @@
                 </executions>
             </plugin>
 
                 </executions>
             </plugin>
 

+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-resources-plugin</artifactId>
+                <version>2.5</version>
+            </plugin>
+
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-surefire-plugin</artifactId>
+                <version>2.10</version>
+                <configuration>
+                    <skipTests>false</skipTests>
+                    <enableAssertions>true</enableAssertions>
+                </configuration>
+            </plugin>
+
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-site-plugin</artifactId>
+                <version>3.0</version>
+                <configuration>
+                    <generateReports>true</generateReports>
+                    <locales>ja</locales>
+                    <inputEncoding>${project.build.sourceEncoding}</inputEncoding>
+                    <outputEncoding>${project.reporting.outputEncoding}</outputEncoding>
+                </configuration>
+            </plugin>
+
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-checkstyle-plugin</artifactId>
+                <version>2.8</version>
+                <!-- config from property value -->
+            </plugin>
+
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-pmd-plugin</artifactId>
+                <version>2.6</version>
+                <configuration>
+                    <targetJdk>${maven.compiler.target}</targetJdk>
+                    <rulesets>
+                        <ruleset>${project.mainconf}/pmdrules.xml</ruleset>
+                    </rulesets>
+                </configuration>
+            </plugin>
+
+            <plugin>
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>findbugs-maven-plugin</artifactId>
+                <version>2.3.2</version>
+                <configuration>
+                    <effort>Max</effort>
+                    <threshold>Low</threshold>
+                </configuration>
+            </plugin>
+

         </plugins>
 
         <resources>
         </plugins>
 
         <resources>


@@ -270,17 +325,33 @@
             <resource>
                 <directory>src/main/resources</directory>
                 <includes>
             <resource>
                 <directory>src/main/resources</directory>
                 <includes>

-                    <include>**/*.css</include>
-                    <include>**/*.html</include>
-                    <include>**/*.png</include>
-                    <include>**/*.properties</include>

                     <include>**/*.txt</include>
                     <include>**/*.txt</include>

+
+                    <include>**/*.properties</include>
+

                     <include>**/*.xml</include>
                     <include>**/*.xsd</include>
                     <include>**/*.dtd</include>
                     <include>**/*.xml</include>
                     <include>**/*.xsd</include>
                     <include>**/*.dtd</include>

+
+                    <include>**/*.html</include>
+                    <include>**/*.htm</include>
+                    <include>**/*.css</include>
+
+                    <include>**/*.png</include>
+                    <include>**/*.gif</include>
+                    <include>**/*.jpeg</include>
+                    <include>**/*.jpg</include>

                 </includes>
                 <excludes>
                     <exclude>**/version.properties</exclude>
                 </includes>
                 <excludes>
                     <exclude>**/version.properties</exclude>

+
+                    <exclude>**/.DS_Store</exclude>
+                    <exclude>**/_MACOSX</exclude>
+                    <exclude>**/Thumbs.db</exclude>
+                    <exclude>**/thumbs.db</exclude>
+                    <exclude>**/Desktop.ini</exclude>
+                    <exclude>**/desktop.ini</exclude>
+                    <exclude>**/core</exclude>

                 </excludes>
             </resource>
 
                 </excludes>
             </resource>
 


@@ -294,15 +365,34 @@
 
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
 
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>

-                <artifactId>maven-site-plugin</artifactId>
-                <version>3.0</version>
+                <artifactId>maven-project-info-reports-plugin</artifactId>
+                <version>2.4</version>

                 <configuration>
                 <configuration>

-                    <locales>ja</locales>
-                    <generateReports>true</generateReports>
-                    <generateSitemap>true</generateSitemap>
-                    <inputEncoding>${project.build.sourceEncoding}</inputEncoding>
-                    <outputEncoding>${project.reporting.outputEncoding}</outputEncoding>
+                    <linkOnly>true</linkOnly>
+                    <offline>true</offline>

                 </configuration>
                 </configuration>

+                <reportSets>
+                    <reportSet>
+                        <reports>
+                            <report>index</report>
+                            <report>summary</report>
+                            <report>license</report>
+                            <report>dependencies</report>
+                            <report>plugins</report>
+                            <report>scm</report>
+                            <report>project-team</report>
+<!--
+                            <report>dependency-convergence</report>
+                            <report>dependency-management</report>
+                            <report>distribution-management</report>
+                            <report>issue-tracking</report>
+                            <report>mailing-list</report>
+                            <report>modules</report>
+                            <report>plugin-management</report>
+-->
+                        </reports>
+                    </reportSet>
+                </reportSets>

             </plugin>
 
             <plugin>
             </plugin>
 
             <plugin>


@@ -310,28 +400,81 @@
                 <artifactId>maven-javadoc-plugin</artifactId>
                 <version>2.8</version>
                 <configuration>
                 <artifactId>maven-javadoc-plugin</artifactId>
                 <version>2.8</version>
                 <configuration>

+                    <skip>false</skip>
+                    <notimestamp>true</notimestamp>
+                    <quiet>true</quiet>

                     <show>protected</show>
                     <show>protected</show>

+                    <stylesheet>maven</stylesheet>
+                </configuration>
+                <reportSets>
+                    <reportSet>
+                        <reports>
+                            <report>javadoc</report>
+                        </reports>
+                    </reportSet>
+                </reportSets>
+            </plugin>
+
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-jxr-plugin</artifactId>
+                <version>2.3</version>
+                <configuration>
+                    <skip>false</skip>
+                </configuration>
+            </plugin>
+
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-surefire-report-plugin</artifactId>
+                <version>2.10</version>
+                <configuration>
+                    <showSuccess>false</showSuccess>
+                </configuration>
+                <reportSets>
+                    <reportSet>
+                        <reports>
+                            <report>report-only</report>
+                        </reports>
+                    </reportSet>
+                </reportSets>
+            </plugin>
+
+            <plugin>
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>cobertura-maven-plugin</artifactId>
+                <version>2.5.1</version>
+                <configuration>
+                    <encoding>${project.build.sourceEncoding}</encoding>

                 </configuration>
             </plugin>
 
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-checkstyle-plugin</artifactId>
                 </configuration>
             </plugin>
 
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-checkstyle-plugin</artifactId>

-                <version>2.6</version>
+                <version>2.8</version>

                 <configuration>
                 <configuration>

-                    <configLocation>${checkstyle.config.location}</configLocation>
-                    <encoding>UTF-8</encoding>
+                    <skip>false</skip>
+                    <!-- config from property value -->

                 </configuration>
                 </configuration>

+                <reportSets>
+                    <reportSet>
+                        <reports>
+                            <report>checkstyle</report>
+                        </reports>
+                    </reportSet>
+                </reportSets>

             </plugin>
 
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-pmd-plugin</artifactId>
             </plugin>
 
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-pmd-plugin</artifactId>

-                <version>2.5</version>
+                <version>2.6</version>

                 <configuration>
                 <configuration>

+                    <skip>false</skip>

                     <targetJdk>${maven.compiler.target}</targetJdk>
                     <rulesets>
                     <targetJdk>${maven.compiler.target}</targetJdk>
                     <rulesets>

-                        <ruleset>${project.myrepoconf}/pmdrules.xml</ruleset>
+                        <ruleset>${project.mainconf}/pmdrules.xml</ruleset>

                     </rulesets>
                 </configuration>
                 <reportSets>
                     </rulesets>
                 </configuration>
                 <reportSets>


@@ -349,30 +492,23 @@
                 <artifactId>findbugs-maven-plugin</artifactId>
                 <version>2.3.2</version>
                 <configuration>
                 <artifactId>findbugs-maven-plugin</artifactId>
                 <version>2.3.2</version>
                 <configuration>

+                    <skip>false</skip>

                     <effort>Max</effort>
                     <threshold>Low</threshold>
                     <effort>Max</effort>
                     <threshold>Low</threshold>

-                    <inputEncoding>${project.build.sourceEncoding}</inputEncoding>
-                    <outputEncoding>${project.reporting.outputEncoding}</outputEncoding>
-                    <!--excludeFilterFile/-->
+                    <!-- excludeFilterFile/ -->

                 </configuration>
             </plugin>
 
             <plugin>
                 <groupId>org.codehaus.mojo</groupId>
                 </configuration>
             </plugin>
 
             <plugin>
                 <groupId>org.codehaus.mojo</groupId>

-                <artifactId>cobertura-maven-plugin</artifactId>
-                <version>2.5.1</version>
-            </plugin>
-
-            <plugin>
-                <groupId>org.codehaus.mojo</groupId>

                 <artifactId>javancss-maven-plugin</artifactId>
                 <version>2.0</version>
             </plugin>
 
             <plugin>
                 <artifactId>javancss-maven-plugin</artifactId>
                 <version>2.0</version>
             </plugin>
 
             <plugin>

-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-jxr-plugin</artifactId>
-                <version>2.2</version>
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>jdepend-maven-plugin</artifactId>
+                <version>2.0-beta-2</version>

             </plugin>
 
         </plugins>
             </plugin>
 
         </plugins>

diff --git a/src/main/assembly/descriptor.xml b/src/main/assembly/descriptor.xml
index b744cbd..5712cd3 100644 (file)
--- a/src/main/assembly/descriptor.xml
+++ b/src/main/assembly/descriptor.xml
@@ -1,15 +1,15 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8" ?>

 
 <assembly
 
 <assembly

-  xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0"
+  xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2"

   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"

-  xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0
-  http://maven.apache.org/xsd/assembly-1.1.0.xsd"
+  xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2
+  http://maven.apache.org/xsd/assembly-1.1.2.xsd"

 >
 
 <!--
     SourceForge.JP用リリースファイル構成定義ファイル
 >
 
 <!--
     SourceForge.JP用リリースファイル構成定義ファイル

-    Maven2 assembly用
+    Maven2(or3) assembly用

 -->
 
     <id>src</id>
 -->
 
     <id>src</id>


@@ -21,10 +21,14 @@
     <fileSets>
         <fileSet>
             <includes>
     <fileSets>
         <fileSet>
             <includes>

-                <include>*.txt</include>

                 <include>pom.xml</include>
                 <include>pom.xml</include>

-                <include>build.xml</include>
+                <include>fixcrlf.xml</include>
+                <include>*.txt</include>

             </includes>
             </includes>

+            <excludes>
+                <exclude>nb-configuration.xml</exclude>
+                <exclude>nbactions.xml</exclude>
+            </excludes>

             <useDefaultExcludes>true</useDefaultExcludes>
         </fileSet>
         <fileSet>
             <useDefaultExcludes>true</useDefaultExcludes>
         </fileSet>
         <fileSet>

diff --git a/src/main/config/checks.xml b/src/main/config/checks.xml
index 67da074..c21c580 100644 (file)
--- a/src/main/config/checks.xml
+++ b/src/main/config/checks.xml
@@ -1,13 +1,13 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8" ?>

 
 <!DOCTYPE module PUBLIC
 
 <!DOCTYPE module PUBLIC

-    "-//Puppy Crawl//DTD Check Configuration 1.2//EN"
-    "http://www.puppycrawl.com/dtds/configuration_1_2.dtd">
+    "-//Puppy Crawl//DTD Check Configuration 1.3//EN"
+    "http://www.puppycrawl.com/dtds/configuration_1_3.dtd">

 
 <!--
     Checkstyle用チェック項目定義。
 
 
 <!--
     Checkstyle用チェック項目定義。
 

-    Checkstyle5.1以降向けに記述。
+    Checkstyle 5.3 以降向けに記述。

 
     [ http://checkstyle.sourceforge.net/ ]
 
 
     [ http://checkstyle.sourceforge.net/ ]
 


@@ -18,9 +18,20 @@
 <module name="Checker">
 
     <property name="charset" value="UTF-8" />
 <module name="Checker">
 
     <property name="charset" value="UTF-8" />

+    <property name="localeCountry" value="JP" />
+    <property name="localeLanguage" value="ja" />

     <property name="severity" value="error" />
 
 
     <property name="severity" value="error" />
 
 

+    <!-- Filters -->
+    <module name="SeverityMatchFilter" />
+    <module name="SuppressionFilter">
+        <property name="file" value="src/main/config/suppressions.xml" />
+    </module>
+    <module name="SuppressionCommentFilter" />
+    <module name="SuppressWithNearbyCommentFilter" />
+
+

     <!-- Duplicate Code -->
     <module name="StrictDuplicateCode">
         <property name="min" value="20" />
     <!-- Duplicate Code -->
     <module name="StrictDuplicateCode">
         <property name="min" value="20" />


@@ -59,17 +70,9 @@
     <module name="FileTabCharacter" />
 
 
     <module name="FileTabCharacter" />
 
 

-<!-- Filters
-    <module name="SeverityMatchFilter" />
-    <module name="SuppressionFilter" />
-    <module name="SuppressionCommentFilter" />
-    <module name="SuppressWithNearbyCommentFilter" />
--->
-
-

     <module name="TreeWalker">
 
     <module name="TreeWalker">
 

-        <property name="tabWidth" value="4" />
+        <module name="FileContentsHolder" />

 
 
     <!-- Annotations -->
 
 
     <!-- Annotations -->


@@ -103,6 +106,7 @@
         <module name="ThrowsCount">
             <property name="max" value="4" />
         </module>
         <module name="ThrowsCount">
             <property name="max" value="4" />
         </module>

+        <module name="InnerTypeLast" />

 
 
     <!-- Coding -->
 
 
     <!-- Coding -->


@@ -120,11 +124,7 @@
             <property name="ignoreSetter" value="true" />
             <property name="ignoreAbstractMethods" value="true" />
         </module>
             <property name="ignoreSetter" value="true" />
             <property name="ignoreAbstractMethods" value="true" />
         </module>

-        <module name="IllegalInstantiation">
-            <property
-                name="classes"
-                value="java.lang.Boolean, java.lang.Integer" />
-        </module>
+        <module name="IllegalInstantiation" />

         <module name="IllegalToken">
             <property name="tokens" value="LITERAL_NATIVE, STATIC_IMPORT" />
         </module>
         <module name="IllegalToken">
             <property name="tokens" value="LITERAL_NATIVE, STATIC_IMPORT" />
         </module>


@@ -144,6 +144,7 @@
         <module name="SimplifyBooleanExpression" />
         <module name="SimplifyBooleanReturn" />
         <module name="StringLiteralEquality" />
         <module name="SimplifyBooleanExpression" />
         <module name="SimplifyBooleanReturn" />
         <module name="StringLiteralEquality" />

+        <module name="NestedForDepth" />

         <module name="NestedIfDepth" />
         <module name="NestedTryDepth" />
         <module name="NoClone" />
         <module name="NestedIfDepth" />
         <module name="NestedTryDepth" />
         <module name="NoClone" />


@@ -155,7 +156,7 @@
         <module name="PackageDeclaration" />
         <module name="JUnitTestCase" />
         <module name="ReturnCount">
         <module name="PackageDeclaration" />
         <module name="JUnitTestCase" />
         <module name="ReturnCount">

-            <property name="max" value="3" />
+            <property name="max" value="5" />

         </module>
         <module name="IllegalType" />
         <module name="DeclarationOrder" />
         </module>
         <module name="IllegalType" />
         <module name="DeclarationOrder" />


@@ -167,6 +168,7 @@
         <module name="MultipleStringLiterals" />
         <module name="MultipleVariableDeclarations" />
         <module name="UnnecessaryParentheses" />
         <module name="MultipleStringLiterals" />
         <module name="MultipleVariableDeclarations" />
         <module name="UnnecessaryParentheses" />

+        <module name="OneStatementPerLine" />

 
 
     <!-- Imports -->
 
 
     <!-- Imports -->


@@ -216,10 +218,9 @@
         <module name="UpperEll" />
         <module name="ArrayTypeStyle" />
 <!--    <module name="FinalParameters" />  -->
         <module name="UpperEll" />
         <module name="ArrayTypeStyle" />
 <!--    <module name="FinalParameters" />  -->

-        <module name="DescendantToken" />
+<!--    <module name="DescendantToken" />  -->

 <!--
         <module name="Indentation">
 <!--
         <module name="Indentation">

-            <property name="basicOffset" value="4" />

             <property name="caseIndent" value="0" />
         </module>
 -->
             <property name="caseIndent" value="0" />
         </module>
 -->


@@ -235,6 +236,8 @@
             <property name="format" value="^ \* License : The MIT License" />
             <property name="duplicateLimit" value="1" />
         </module>
             <property name="format" value="^ \* License : The MIT License" />
             <property name="duplicateLimit" value="1" />
         </module>

+        <module name="OuterTypeFilename" />
+

 
     <!-- Modifiers -->
 
 
     <!-- Modifiers -->
 


@@ -244,7 +247,12 @@
 
     <!-- Naming Conventions -->
 
 
     <!-- Naming Conventions -->
 

-        <module name="AbstractClassName" />
+        <module name="AbstractClassName">
+            <property
+                name="format"
+                value="^Abstract.*$|^.*Factory$|^.*Builder$|^.*Adapter$"
+            />
+        </module>

         <module name="ClassTypeParameterName" />
         <module name="ConstantName" />
         <module name="LocalFinalVariableName">
         <module name="ClassTypeParameterName" />
         <module name="ConstantName" />
         <module name="LocalFinalVariableName">


@@ -278,6 +286,7 @@
         <module name="AnonInnerLength" />
         <module name="ParameterNumber" />
         <module name="OuterTypeNumber" />
         <module name="AnonInnerLength" />
         <module name="ParameterNumber" />
         <module name="OuterTypeNumber" />

+        <module name="MethodCount" />

 
 
     <!-- Whitespace -->
 
 
     <!-- Whitespace -->


@@ -286,7 +295,10 @@
         <module name="EmptyForInitializerPad" />
         <module name="EmptyForIteratorPad" />
         <module name="MethodParamPad">
         <module name="EmptyForInitializerPad" />
         <module name="EmptyForIteratorPad" />
         <module name="MethodParamPad">

-            <property name="tokens" value="CTOR_DEF, LITERAL_NEW, METHOD_DEF, SUPER_CTOR_CALL" />
+            <property
+                name="tokens"
+                value="CTOR_DEF, LITERAL_NEW, METHOD_DEF, SUPER_CTOR_CALL"
+            />

         </module>
         <module name="NoWhitespaceAfter">
             <property name="allowLineBreaks" value="false" />
         </module>
         <module name="NoWhitespaceAfter">
             <property name="allowLineBreaks" value="false" />


@@ -323,7 +335,10 @@
         </module>
         <module name="ParenPad">
             <property name="option" value="nospace" />
         </module>
         <module name="ParenPad">
             <property name="option" value="nospace" />

-            <property name="tokens" value="CTOR_CALL, METHOD_CALL, SUPER_CTOR_CALL" />
+            <property
+                name="tokens"
+                value="CTOR_CALL, METHOD_CALL, SUPER_CTOR_CALL"
+            />

         </module>
         <module name="TypecastParenPad" />
         <module name="WhitespaceAfter">
         </module>
         <module name="TypecastParenPad" />
         <module name="WhitespaceAfter">


@@ -339,7 +354,8 @@
                        SL, SR,
                        SL_ASSIGN, SR_ASSIGN,
                        MINUS, STAR, DIV, MOD,
                        SL, SR,
                        SL_ASSIGN, SR_ASSIGN,
                        MINUS, STAR, DIV, MOD,

-                       PLUS_ASSIGN, MINUS_ASSIGN, STAR_ASSIGN, DIV_ASSIGN, MOD_ASSIGN,
+                       PLUS_ASSIGN, MINUS_ASSIGN,
+                       STAR_ASSIGN, DIV_ASSIGN, MOD_ASSIGN,

                        EQUAL, NOT_EQUAL, GT, GE, LT, LE,
                        "
             />
                        EQUAL, NOT_EQUAL, GT, GE, LT, LE,
                        "
             />


@@ -362,6 +378,7 @@
 -->
 
     </module>
 -->
 
     </module>

+

 </module>
 
 <!-- EOF -->
 </module>
 
 <!-- EOF -->

diff --git a/src/main/config/pmdrules.xml b/src/main/config/pmdrules.xml
index 1b5fcf2..65d196b 100644 (file)
--- a/src/main/config/pmdrules.xml
+++ b/src/main/config/pmdrules.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8" ?>

 
 <!--
     PMD用ルールセット定義
 
 <!--
     PMD用ルールセット定義


@@ -9,14 +9,18 @@
 -->
 
 <ruleset
 -->
 
 <ruleset

-  name="Custom ruleset"

   xmlns="http://pmd.sf.net/ruleset/1.0.0"
   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
   xsi:schemaLocation="http://pmd.sf.net/ruleset/1.0.0
   http://pmd.sf.net/ruleset_xml_schema.xsd"
   xsi:noNamespaceSchemaLocation="http://pmd.sf.net/ruleset_xml_schema.xsd"
   xmlns="http://pmd.sf.net/ruleset/1.0.0"
   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
   xsi:schemaLocation="http://pmd.sf.net/ruleset/1.0.0
   http://pmd.sf.net/ruleset_xml_schema.xsd"
   xsi:noNamespaceSchemaLocation="http://pmd.sf.net/ruleset_xml_schema.xsd"

+  name="Custom ruleset"

 >
 
 >
 

+    <description>
+        custom rulesets for project
+    </description>
+

     <rule ref="rulesets/basic.xml">
         <exclude name="UnnecessaryReturn" />
     </rule>
     <rule ref="rulesets/basic.xml">
         <exclude name="UnnecessaryReturn" />
     </rule>


@@ -29,18 +33,26 @@
     <rule ref="rulesets/codesize.xml">
         <exclude name="TooManyMethods" />
     </rule>
     <rule ref="rulesets/codesize.xml">
         <exclude name="TooManyMethods" />
     </rule>

+    <rule ref="rulesets/codesize.xml/TooManyMethods">
+        <properties>
+            <property name="maxmethods" value="25"/>
+        </properties>
+    </rule>

 
     <rule ref="rulesets/clone.xml" />
 
     <rule ref="rulesets/controversial.xml">
 
     <rule ref="rulesets/clone.xml" />
 
     <rule ref="rulesets/controversial.xml">

-        <exclude name="DataflowAnomalyAnalysis" />
+        <exclude name="NullAssignment" />

         <exclude name="OnlyOneReturn" />
         <exclude name="DefaultPackage" />
         <exclude name="OnlyOneReturn" />
         <exclude name="DefaultPackage" />

+        <exclude name="DataflowAnomalyAnalysis" />
+        <exclude name="AvoidUsingShortType" />

     </rule>
 
     <rule ref="rulesets/coupling.xml" />
 
     <rule ref="rulesets/design.xml">
     </rule>
 
     <rule ref="rulesets/coupling.xml" />
 
     <rule ref="rulesets/design.xml">

+        <exclude name="ConfusingTernary" />

         <exclude name="UnnecessaryLocalBeforeReturn" />
     </rule>
 
         <exclude name="UnnecessaryLocalBeforeReturn" />
     </rule>
 


@@ -54,8 +66,14 @@
     <rule ref="rulesets/migrating_to_15.xml" />
 
     <rule ref="rulesets/naming.xml">
     <rule ref="rulesets/migrating_to_15.xml" />
 
     <rule ref="rulesets/naming.xml">

-        <exclude name="LongVariable" />

         <exclude name="ShortVariable" />
         <exclude name="ShortVariable" />

+        <exclude name="LongVariable" />
+        <exclude name="AvoidFieldNameMatchingMethodName" />
+    </rule>
+    <rule ref="rulesets/naming.xml/LongVariable">
+        <properties>
+            <property name="minimum" value="25"/>
+        </properties>

     </rule>
 
     <rule ref="rulesets/optimizations.xml">
     </rule>
 
     <rule ref="rulesets/optimizations.xml">

diff --git a/src/main/config/suppressions.xml b/src/main/config/suppressions.xml
new file mode 100644 (file)
index 0000000..728df15
--- /dev/null
+++ b/src/main/config/suppressions.xml
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+
+<!DOCTYPE suppressions PUBLIC
+    "-//Puppy Crawl//DTD Suppressions 1.1//EN"
+    "http://www.puppycrawl.com/dtds/suppressions_1_1.dtd">
+
+<!--
+    Checkstyle用警告抑止設定
+    ※ SuppressionFilter モジュール用
+
+    [ http://checkstyle.sourceforge.net/ ]
+
+    Copyright(c) 2010 olyutorskii
+-->
+
+
+<suppressions>
+
+<!--
+    <suppress files="" checks="ExecutableStatementCount" />
+
+    <suppress files="" checks="ClassDataAbstractionCoupling" />
+    <suppress files="" checks="ClassFanOutComplexity" />
+    <suppress files="" checks="CyclomaticComplexity" />
+    <suppress files="" checks="NPathComplexity" />
+    <suppress files="" checks="JavaNCSS" />
+-->
+
+<!--
+    <suppress files="" checks="MagicNumber" />
+    <suppress files="" checks="MultipleStringLiterals" />
+-->
+
+</suppressions>
+
+
+<!-- EOF -->