Maven3対応

diff --git a/.hgeol b/.hgeol
index ca5f1c1..8458257 100644 (file)
--- a/.hgeol
+++ b/.hgeol
@@ -7,7 +7,13 @@
 
 **.xml = LF
 **.xsd = LF
 
 **.xml = 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 c94f6de..44c1d13 100644 (file)
--- a/.hgignore
+++ b/.hgignore
@@ -1,12 +1,36 @@
+#########################
+# for Mercurial hgignore
+#########################
+
+
+#####################

 syntax: regexp
 
 syntax: regexp
 

+^nb-configuration.xml$
+^nbactions.xml$
+^\.classpath$
+^\.project$
+

 \.orig$
 \.orig\..*$
 \.chg\..*$
 \.rej$
 \.conflict\~$
 \.orig$
 \.orig\..*$
 \.chg\..*$
 \.rej$
 \.conflict\~$

-^maven-build\.properties$
-^maven-build\.xml$
-^nb-configuration\.xml$
-^nbactions\.xml$
-^target$
+^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 22f8ecd..414db86 100644 (file)
--- a/CHANGELOG.txt
+++ b/CHANGELOG.txt
@@ -4,6 +4,9 @@
 Jovsonz 変更履歴
 
 
 Jovsonz 変更履歴
 
 

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

 1.101.2 (2011-05-13)
     ・初回リリース。
 
 1.101.2 (2011-05-13)
     ・初回リリース。
 

diff --git a/README.txt b/README.txt
index 5291797..f03a1f1 100644 (file)
--- a/README.txt
+++ b/README.txt
@@ -1,6 +1,6 @@
 [UTF-8 Japanese]
 
 [UTF-8 Japanese]
 

-                              J O V S O N Z
+                              J o v s o n z

                                   Readme
 
                                               Copyright(c) 2009 olyutorskii
                                   Readme
 
                                               Copyright(c) 2009 olyutorskii


@@ -21,9 +21,14 @@ JovsonzはJindolfプロジェクトから派生したオープンソースプロ
    原則として、JRE1.5に準拠した実行系であれば、プラットフォームを選びません。
 
 
    原則として、JRE1.5に準拠した実行系であれば、プラットフォームを選びません。
 
 

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

 === ディレクトリ内訳構成 ===
 
 === ディレクトリ内訳構成 ===
 

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

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


@@ -34,8 +39,11 @@ JovsonzはJindolfプロジェクトから派生したオープンソースプロ
 ./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..d55c674
--- /dev/null
+++ b/SCM.txt
@@ -0,0 +1,48 @@
+[UTF-8 Japanese]
+
+                              J o v s o n z
+                    バージョン管理システムに関する情報
+
+                                              Copyright(c) 2011 olyutorskii
+
+
+=== バージョン管理体制 ===
+
+  このアーカイブの原本は、Mercurial(hg)でバージョン管理されています。
+  このアーカイブの原本となる開発資産は、
+      http://hg.sourceforge.jp/view/jovsonz/Jovsonz
+  を上位に持つMercurialリポジトリで管理されています。
+  アーカイブの代わりにMercurialを通じての開発資産へのアクセスが可能です。
+  # hg clone http://hg.sourceforge.jp/view/jovsonz/Jovsonz
+
+
+=== 各種設定ファイル ===
+
+./.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 60%
rename from build.xml
rename to fixcrlf.xml
index 2216cdc..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="jovsonz" 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"
+            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"
             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"
+            eol="lf"

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

diff --git a/pom.xml b/pom.xml
index 97627c6..02d4a69 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -1,7 +1,7 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8" ?>

 
 <!--
 
 <!--

-    Maven2 POM definition file
+    Maven2(or3) POM definition file

 -->
 
 <project
 -->
 
 <project


@@ -89,13 +89,10 @@
         <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>

 
 

-        <!-- Walkaround for Maven3&PMD-plugin bug -->
-        <targetJdk>${maven.compiler.source}</targetJdk>
-
-        <!-- Walkaround for Maven3&checkstyle bug -->
-        <checkstyle.config.location>${project.myrepoconf}/checks.xml</checkstyle.config.location>
+        <checkstyle.config.location>${project.mainconf}/checks.xml</checkstyle.config.location>
+        <checkstyle.enable.rss>false</checkstyle.enable.rss>

 
     </properties>
 
 
     </properties>
 


@@ -106,7 +103,7 @@
         <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>
 
             <scope>test</scope>
         </dependency>
 


@@ -122,6 +119,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.5,)</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>


@@ -130,7 +143,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>


@@ -156,7 +173,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-jar-plugin</artifactId>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-jar-plugin</artifactId>

-                <version>2.3.1</version>
+                <version>2.3.2</version>

                 <configuration>
                     <archive>
                         <manifestEntries>
                 <configuration>
                     <archive>
                         <manifestEntries>


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

-                <artifactId>maven-enforcer-plugin</artifactId>
-                <version>1.0</version>
-                <configuration>
-                    <rules>
-                        <requireMavenVersion>
-                            <version>[2.2,3)</version>
-                        </requireMavenVersion>
-                        <requireJavaVersion>
-                            <version>[1.5,)</version>
-                        </requireJavaVersion>
-                    </rules>
-                </configuration>
-            </plugin>
-
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>

                 <artifactId>maven-source-plugin</artifactId>
                 <version>2.1.2</version>
                 <configuration>
                 <artifactId>maven-source-plugin</artifactId>
                 <version>2.1.2</version>
                 <configuration>


@@ -216,6 +217,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>


@@ -231,16 +289,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>**/*.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>
 


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

-                <artifactId>maven-site-plugin</artifactId>
-                <version>2.2</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>


@@ -270,28 +364,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>


@@ -309,30 +456,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.4</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 0b45e05..d5e3ff9 100644 (file)
--- a/src/main/config/checks.xml
+++ b/src/main/config/checks.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8" ?>

 
 <!DOCTYPE module PUBLIC
     "-//Puppy Crawl//DTD Check Configuration 1.3//EN"
 
 <!DOCTYPE module PUBLIC
     "-//Puppy Crawl//DTD Check Configuration 1.3//EN"


@@ -7,7 +7,7 @@
 <!--
     Checkstyle用チェック項目定義。
 
 <!--
     Checkstyle用チェック項目定義。
 

-    Checkstyle 5.0 以降向けに記述。
+    Checkstyle 5.3 以降向けに記述。

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


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

+        <module name="InnerTypeLast" />

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


@@ -143,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" />


@@ -171,6 +173,7 @@
         </module>
         <module name="MultipleVariableDeclarations" />
         <module name="UnnecessaryParentheses" />
         </module>
         <module name="MultipleVariableDeclarations" />
         <module name="UnnecessaryParentheses" />

+        <module name="OneStatementPerLine" />

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


@@ -238,6 +241,7 @@
             <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 -->


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

+        <module name="MethodCount" />

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


@@ -370,16 +375,6 @@
 <!-- バグ？
         <module name="RequireThis" />
 -->
 <!-- バグ？
         <module name="RequireThis" />
 -->

-<!-- 5.2 or later
-        <module name="InnerTypeLast" />
--->
-
-<!-- 5.3 or later
-        <module name="NestedForDepth" />
-        <module name="OneStatementPerLine" />
-        <module name="OuterTypeFilename" />
-        <module name="MethodCount" />
--->

 
 <!-- Obsolated
         <module name="TabCharacter" />
 
 <!-- Obsolated
         <module name="TabCharacter" />

diff --git a/src/main/config/pmdrules.xml b/src/main/config/pmdrules.xml
index ad3dba9..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用ルールセット定義


@@ -17,6 +17,10 @@
   name="Custom ruleset"
 >
 
   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>


@@ -42,6 +46,7 @@
         <exclude name="OnlyOneReturn" />
         <exclude name="DefaultPackage" />
         <exclude name="DataflowAnomalyAnalysis" />
         <exclude name="OnlyOneReturn" />
         <exclude name="DefaultPackage" />
         <exclude name="DataflowAnomalyAnalysis" />

+        <exclude name="AvoidUsingShortType" />

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

diff --git a/src/main/config/suppressions.xml b/src/main/config/suppressions.xml
index 1d736c1..728df15 100644 (file)
--- a/src/main/config/suppressions.xml
+++ b/src/main/config/suppressions.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8" ?>

 
 <!DOCTYPE suppressions PUBLIC
     "-//Puppy Crawl//DTD Suppressions 1.1//EN"
 
 <!DOCTYPE suppressions PUBLIC
     "-//Puppy Crawl//DTD Suppressions 1.1//EN"