- ソースコードをすべてUTF-8に変更

- maven対応 (java web startを除く)

<以下，maven関係のメモ>
- mvn eclipse:eclipseでeclipse用のクラスパスの設定
- mvn packageでtargetフォルダ以下に配布用zipファイルを生成
- マニフェストファイル，batファイルはクラスパスやVMオプション等を含めて自動生成するようにした
- 各種jarファイルはコンパイル時にダウンロード
 - mr3, jwnl, gosen, idwについては，標準のmavenリポジトリで提供されていないため，mr3.sourceforge.net/m2repositoryとdoddle-owl.sourceforge.net/m2repositoryにjarファイルを配置
- pom.xml(全般)とsrc/main/assembly/descriptor-bin.xml(zip配布用)の二つのファイルでmavenの設定を行っている

<TODO>
- java web startのためのjarファイルへの署名とjnlpファイルの自動生成
- 動作検証（特にEDR，日本語WordNetのDODDLE用辞書への変換について）
- mainメソッド内で行っている簡易テストをJUnitで書き直す
- DB接続をactiveobjectsを利用して行う
- DODDLEプロジェクトをsqlite形式で保存・復元できるようにする

.classpath

@@ -1,31 +1,34 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry excluding="**/.svn/*" kind="src" path="src"/>
+	<classpathentry including="**/*.java" kind="src" output="target/test-classes" path="src/test/java"/>
+	<classpathentry including="**/*.html|**/*.java|**/*.owl|**/*.png|**/*.rq" kind="src" path="src/main/java"/>
+	<classpathentry excluding="**/*.java" kind="src" path="src/main/resources"/>
+	<classpathentry kind="var" path="M2_REPO/com/hp/hpl/jena/arq/2.8.2/arq-2.8.2.jar"/>
+	<classpathentry kind="var" path="M2_REPO/bouncycastle/bcmail-jdk14/136/bcmail-jdk14-136.jar"/>
+	<classpathentry kind="var" path="M2_REPO/bouncycastle/bcprov-jdk14/136/bcprov-jdk14-136.jar"/>
+	<classpathentry kind="var" path="M2_REPO/commons-logging/commons-logging/1.1.1/commons-logging-1.1.1.jar"/>
+	<classpathentry kind="var" path="M2_REPO/org/fontbox/fontbox/0.1.0/fontbox-0.1.0.jar"/>
+	<classpathentry kind="var" path="M2_REPO/net/sourceforge/itadaki/gosen/1.0_beta/gosen-1.0_beta.jar"/>
+	<classpathentry kind="var" path="M2_REPO/com/ibm/icu/icu4j/3.4.4/icu4j-3.4.4.jar"/>
+	<classpathentry kind="var" path="M2_REPO/net/infonode/idw/1.6.1_gpl/idw-1.6.1_gpl.jar"/>
+	<classpathentry kind="var" path="M2_REPO/com/hp/hpl/jena/iri/0.8/iri-0.8.jar"/>
+	<classpathentry kind="var" path="M2_REPO/gnu/getopt/java-getopt/1.0.13/java-getopt-1.0.13.jar"/>
+	<classpathentry kind="var" path="M2_REPO/org/jempbox/jempbox/0.2.0/jempbox-0.2.0.jar"/>
+	<classpathentry kind="var" path="M2_REPO/com/hp/hpl/jena/jena/2.6.2/jena-2.6.2.jar"/>
+	<classpathentry kind="var" path="M2_REPO/junit/junit/4.5/junit-4.5.jar" sourcepath="M2_REPO/junit/junit/4.5/junit-4.5-sources.jar"/>
+	<classpathentry kind="var" path="M2_REPO/net/didion/jwnl/1.4_rc2/jwnl-1.4_rc2.jar"/>
+	<classpathentry kind="var" path="M2_REPO/log4j/log4j/1.2.13/log4j-1.2.13.jar"/>
+	<classpathentry kind="var" path="M2_REPO/org/apache/lucene/lucene-core/2.3.1/lucene-core-2.3.1.jar"/>
+	<classpathentry kind="var" path="M2_REPO/jp/ac/keio/ae/comp/yamaguti/mmm/mr3/1.0_rc5/mr3-1.0_rc5.jar"/>
+	<classpathentry kind="var" path="M2_REPO/mysql/mysql-connector-java/5.1.10/mysql-connector-java-5.1.10.jar"/>
+	<classpathentry kind="var" path="M2_REPO/org/xerial/thirdparty/nestedvm/1.0/nestedvm-1.0.jar"/>
+	<classpathentry kind="var" path="M2_REPO/pdfbox/pdfbox/0.7.3/pdfbox-0.7.3.jar"/>
+	<classpathentry kind="var" path="M2_REPO/org/slf4j/slf4j-api/1.5.6/slf4j-api-1.5.6.jar"/>
+	<classpathentry kind="var" path="M2_REPO/org/slf4j/slf4j-log4j12/1.5.6/slf4j-log4j12-1.5.6.jar"/>
+	<classpathentry kind="var" path="M2_REPO/org/xerial/sqlite-jdbc/3.6.14.2/sqlite-jdbc-3.6.14.2.jar"/>
+	<classpathentry kind="var" path="M2_REPO/stax/stax-api/1.0.1/stax-api-1.0.1.jar"/>
+	<classpathentry kind="var" path="M2_REPO/org/codehaus/woodstox/wstx-asl/3.2.9/wstx-asl-3.2.9.jar"/>
+	<classpathentry kind="var" path="M2_REPO/xerces/xercesImpl/2.7.1/xercesImpl-2.7.1.jar"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
-	<classpathentry kind="lib" path="build/lib/antlr-2.7.5.jar"/>
-	<classpathentry kind="lib" path="build/lib/arq.jar"/>
-	<classpathentry kind="lib" path="build/lib/concurrent.jar"/>
-	<classpathentry kind="lib" path="build/lib/icu4j_3_4.jar"/>
-	<classpathentry kind="lib" path="build/lib/iri.jar"/>
-	<classpathentry kind="lib" path="build/lib/jena.jar"/>
-	<classpathentry kind="lib" path="build/lib/jenatest.jar"/>
-	<classpathentry kind="lib" path="build/lib/json.jar"/>
-	<classpathentry kind="lib" path="build/lib/junit.jar"/>
-	<classpathentry kind="lib" path="build/lib/jwnl.jar"/>
-	<classpathentry kind="lib" path="build/lib/log4j-1.2.12.jar"/>
-	<classpathentry kind="lib" path="build/lib/mr3.jar"/>
-	<classpathentry kind="lib" path="build/lib/stax-api-1.0.jar"/>
-	<classpathentry kind="lib" path="build/lib/xercesImpl.jar"/>
-	<classpathentry kind="lib" path="build/lib/xml-apis.jar"/>
-	<classpathentry kind="lib" path="build/lib/arq-extra.jar"/>
-	<classpathentry kind="lib" path="build/lib/wstx-asl-3.0.0.jar"/>
-	<classpathentry kind="lib" path="build/lib/idw-gpl.jar"/>
-	<classpathentry kind="lib" path="build/lib/gosen-1.0beta.jar"/>
-	<classpathentry kind="lib" path="build/lib/commons-logging-1.1.1.jar"/>
-	<classpathentry kind="lib" path="build/lib/sqlite-jdbc-3.6.11.jar"/>
-	<classpathentry kind="lib" path="build/lib/java-getopt-1.0.13.jar"/>
-	<classpathentry kind="lib" path="build/lib/mysql-connector-java-5.1.7-bin.jar"/>
-	<classpathentry kind="lib" path="build/lib/PDFBox-0.7.3.jar"/>
-	<classpathentry kind="lib" path="build/lib/lucene-core-2.3.1.jar"/>
-	<classpathentry kind="output" path="build/classes"/>
+	<classpathentry kind="output" path="target/classes"/>
 </classpath>

.project

@@ -1,29 +1,13 @@
-<?xml version="1.0" encoding="UTF-8"?>
 <projectDescription>
-	<name>DODDLE</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.jdt.core.javabuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>de.tobject.findbugs.findbugsBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>net.sourceforge.metrics.builder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-		<nature>de.tobject.findbugs.findbugsNature</nature>
-		<nature>net.sourceforge.metrics.nature</nature>
-	</natures>
-</projectDescription>
+  <name>doddle</name>
+  <comment/>
+  <projects/>
+  <buildSpec>
+    <buildCommand>
+      <name>org.eclipse.jdt.core.javabuilder</name>
+    </buildCommand>
+  </buildSpec>
+  <natures>
+    <nature>org.eclipse.jdt.core.javanature</nature>
+  </natures>
+</projectDescription>

pom.xml

@@ -0,0 +1,239 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+	<modelVersion>4.0.0</modelVersion>
+	<groupId>jp.ac.keio.ae.comp.yamaguti</groupId>
+	<artifactId>doddle</artifactId>
+	<packaging>jar</packaging>
+	<version>beta8</version>
+	<name>DODDLE-OWL</name>
+	<url>http://maven.apache.org</url>
+	<properties>
+		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+	</properties>
+	<dependencies>
+		<dependency>
+			<groupId>net.infonode</groupId>
+			<artifactId>idw</artifactId>
+			<version>1.6.1_gpl</version>
+		</dependency>
+		<dependency>
+			<groupId>mysql</groupId>
+			<artifactId>mysql-connector-java</artifactId>
+			<version>5.1.10</version>
+		</dependency>
+		<dependency>
+			<groupId>org.xerial</groupId>
+			<artifactId>sqlite-jdbc</artifactId>
+			<version>3.6.14.2</version>
+		</dependency>
+		<dependency>
+			<groupId>pdfbox</groupId>
+			<artifactId>pdfbox</artifactId>
+			<version>0.7.3</version>
+		</dependency>
+		<dependency>
+			<groupId>gnu.getopt</groupId>
+			<artifactId>java-getopt</artifactId>
+			<version>1.0.13</version>
+		</dependency>
+		<dependency>
+			<groupId>jp.ac.keio.ae.comp.yamaguti.mmm</groupId>
+			<artifactId>mr3</artifactId>
+			<version>1.0_rc5</version>
+		</dependency>
+		<dependency>
+			<groupId>com.hp.hpl.jena</groupId>
+			<artifactId>arq</artifactId>
+			<version>2.8.2</version>
+		</dependency>
+		<dependency>
+			<groupId>com.hp.hpl.jena</groupId>
+			<artifactId>jena</artifactId>
+			<version>2.6.2</version>
+		</dependency>
+		<dependency>
+			<groupId>junit</groupId>
+			<artifactId>junit</artifactId>
+			<version>4.5</version>
+		</dependency>
+		<dependency>
+			<groupId>net.didion</groupId>
+			<artifactId>jwnl</artifactId>
+			<version>1.4_rc2</version>
+		</dependency>
+		<dependency>
+			<groupId>net.sourceforge.itadaki</groupId>
+			<artifactId>gosen</artifactId>
+			<version>1.0_beta</version>
+		</dependency>
+	</dependencies>
+	<build>
+		<resources>
+			<!--
+				<resource> <filtering>false</filtering>
+				<directory>src/main/resources</directory> </resource>
+			-->
+			<resource>
+				<filtering>false</filtering>
+				<directory>src/main/java</directory>
+				<includes>
+					<include>**</include>
+				</includes>
+				<excludes>
+					<exclude>**/*.java</exclude>
+				</excludes>
+			</resource>
+		</resources>
+		<testResources>
+			<testResource>
+				<filtering>false</filtering>
+				<directory>src/test/java</directory>
+				<includes>
+					<include>**</include>
+				</includes>
+				<excludes>
+					<exclude>**/*.java</exclude>
+				</excludes>
+			</testResource>
+		</testResources>
+		<plugins>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-compiler-plugin</artifactId>
+				<configuration>
+					<encoding>UTF-8</encoding>
+					<source>1.6</source>
+					<target>1.6</target>
+				</configuration>
+			</plugin>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-javadoc-plugin</artifactId>
+				<configuration>
+					<author>true</author>
+					<source>1.5</source>
+					<showPackage>false</showPackage>
+					<showPrivate>true</showPrivate>
+					<encoding>UTF-8</encoding>
+					<charset>UTF-8</charset>
+					<docencoding>UTF-8</docencoding>
+					<bottom>Copyright (C) 2004-2009 DODDLE Project All rights reserved.</bottom>
+				</configuration>
+				<executions>
+					<execution>
+						<phase>package</phase>
+						<goals>
+							<goal>javadoc</goal>
+						</goals>
+					</execution>
+				</executions>
+			</plugin>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-jar-plugin</artifactId>
+				<version>2.3</version>
+				<configuration>
+					<archive>
+						<manifest>
+							<addClasspath>true</addClasspath>
+							<mainClass>jp.ac.keio.ae.comp.yamaguti.doddle.DODDLE</mainClass>
+						</manifest>
+						<manifestSections>
+							<manifestSection>
+								<name>jp.ac.keio.ae.comp.yamaguti.doddle.DODDLEPlugin</name>
+								<manifestEntries>
+									<menu-name>DODDLEPlugin</menu-name>
+									<creator>Takeshi Morita</creator>
+									<Date>2008-11-04</Date>
+								</manifestEntries>
+							</manifestSection>
+						</manifestSections>
+					</archive>
+				</configuration>
+			</plugin>
+			<plugin>
+				<groupId>org.codehaus.mojo</groupId>
+				<artifactId>appassembler-maven-plugin</artifactId>
+				<version>1.0</version>
+				<configuration>
+					<repositoryLayout>flat</repositoryLayout>
+					<repositoryName>lib</repositoryName>
+					<configurationDirectory>config</configurationDirectory>
+					<generateRepository>true</generateRepository>
+					<installArtifacts>false</installArtifacts>
+					<extraJvmArguments>-Xmx1024m</extraJvmArguments>
+					<programs>
+						<program>
+							<mainClass>jp.ac.keio.ae.comp.yamaguti.doddle.DODDLE</mainClass>
+							<name>DODDLE</name>
+						</program>
+						<program>
+							<mainClass>jp.ac.keio.ae.comp.yamaguti.doddle.ui.DODDLEDicConverterUI</mainClass>
+							<name>DODDLE_DIC_Converter</name>
+						</program>
+					</programs>
+
+				</configuration>
+				<executions>
+					<execution>
+						<phase>package</phase>
+						<goals>
+							<goal>assemble</goal>
+						</goals>
+					</execution>
+				</executions>
+			</plugin>
+			<plugin>
+				<artifactId>maven-assembly-plugin</artifactId>
+				<configuration>
+					<descriptors>
+						<descriptor>src/main/assembly/descriptor-bin.xml</descriptor>
+					</descriptors>
+					<archive>
+						<manifest>
+							<mainClass>jp.ac.keio.ae.comp.yamaguti.doddle.DODDLE</mainClass>
+						</manifest>
+						<manifestEntries>
+							<Class-Path>config/</Class-Path>
+						</manifestEntries>
+					</archive>
+				</configuration>
+				<executions>
+					<execution>
+						<id>make-assembly</id>
+						<phase>package</phase>
+						<goals>
+							<goal>single</goal>
+						</goals>
+					</execution>
+				</executions>
+			</plugin>
+		</plugins>
+	</build>
+	<repositories>
+		<repository>
+			<id>maven2-repository.dev.java.net</id>
+			<name>Java.net Repository for Maven</name>
+			<url>http://download.java.net/maven/2</url>
+		</repository>
+		<repository>
+			<id>net.sourceforge.mr3</id>
+			<url>http://mr3.sourceforge.net/m2repository</url>
+		</repository>
+		<repository>
+			<id>net.sourceforge.doddle-owl</id>
+			<url>http://doddle-owl.sourceforge.net/m2repository</url>
+		</repository>
+		<repository>
+			<id>openjena.org</id>
+			<name>Jena Repository</name>
+			<url>http://openjena.org/repo</url>
+		</repository>
+	</repositories>
+	<pluginRepositories>
+		<pluginRepository>
+			<id>Codehaus repository</id>
+			<url>http://repository.codehaus.org/</url>
+		</pluginRepository>
+	</pluginRepositories>
+</project>