From 246b9a78101197e9e62dc166ccd170b6621a0193 Mon Sep 17 00:00:00 2001
From: Olyutorskii <olyutorskii@users.osdn.me>
Date: Wed, 21 Mar 2018 15:44:36 +0900
Subject: [PATCH] rename package

---
 CHANGELOG.txt                                      |  5 ++
 README.txt                                         |  4 +-
 pom.xml                                            |  4 +-
 .../jindolf/parser/AbstractParser.java             |  3 +-
 .../jindolf/parser/BasicHandler.java               |  3 +-
 .../jindolf/parser/ChainedParser.java              |  3 +-
 .../jindolf/parser/EntityConverter.java            |  3 +-
 .../jindolf/parser/HtmlAdapter.java                |  3 +-
 .../jindolf/parser/HtmlHandler.java                |  2 +-
 .../jindolf/parser/HtmlParseException.java         |  6 +-
 .../jindolf/parser/HtmlParser.java                 |  3 +-
 .../jindolf/parser/PageType.java                   |  2 +-
 .../jindolf/parser/SeqRange.java                   |  2 +-
 .../jindolf/parser/SysEventHandler.java            |  3 +-
 .../jindolf/parser/SysEventParser.java             |  2 +-
 .../jindolf/parser/TalkHandler.java                |  3 +-
 .../jindolf/parser/TalkParser.java                 |  2 +-
 .../jindolf/parser/content}/ContentBuilder.java    |  2 +-
 .../jindolf/parser/content}/ContentBuilderSJ.java  |  2 +-
 .../jindolf/parser/content}/DecodeErrorInfo.java   |  2 +-
 .../jindolf/parser/content}/DecodedContent.java    |  2 +-
 .../jindolf/parser/content}/ShiftJis.java          |  2 +-
 .../jindolf/parser/content}/SjisNotifier.java      |  2 +-
 .../osdn/jindolf/parser/content/package-info.java  | 69 ++++++++++++++++++++++
 .../jindolf/parser/package-info.java               | 41 +++----------
 .../jindolf/parser/EntityConverterTest.java        |  4 +-
 .../jindolf/parser/HtmlParseExceptionTest.java     |  2 +-
 .../jindolf/parser/content}/Bseq.java              |  2 +-
 .../parser/content}/ContentBuilderSJTest.java      |  2 +-
 .../parser/content}/ContentBuilderTest.java        |  2 +-
 .../parser/content}/DecodeErrorInfoTest.java       |  2 +-
 .../parser/content}/DecodedContentTest.java        |  2 +-
 .../jindolf/parser/content}/ShiftJisTest.java      |  2 +-
 .../jindolf/parser/content}/SjisNotifierTest.java  |  2 +-
 .../jindolf/parser/content}/TestListener.java      |  2 +-
 .../jindolf/parser/content}/TestListenerRW.java    |  2 +-
 src/test/java/sample/SampleHandler.java            | 12 ++--
 src/test/java/sample/SampleParser.java             |  6 +-
 38 files changed, 140 insertions(+), 77 deletions(-)
 rename src/main/java/jp/{sourceforge => osdn}/jindolf/parser/AbstractParser.java (99%)
 rename src/main/java/jp/{sourceforge => osdn}/jindolf/parser/BasicHandler.java (98%)
 rename src/main/java/jp/{sourceforge => osdn}/jindolf/parser/ChainedParser.java (91%)
 rename src/main/java/jp/{sourceforge => osdn}/jindolf/parser/EntityConverter.java (99%)
 rename src/main/java/jp/{sourceforge => osdn}/jindolf/parser/HtmlAdapter.java (99%)
 rename src/main/java/jp/{sourceforge => osdn}/jindolf/parser/HtmlHandler.java (89%)
 rename src/main/java/jp/{sourceforge => osdn}/jindolf/parser/HtmlParseException.java (91%)
 rename src/main/java/jp/{sourceforge => osdn}/jindolf/parser/HtmlParser.java (99%)
 rename src/main/java/jp/{sourceforge => osdn}/jindolf/parser/PageType.java (90%)
 rename src/main/java/jp/{sourceforge => osdn}/jindolf/parser/SeqRange.java (99%)
 rename src/main/java/jp/{sourceforge => osdn}/jindolf/parser/SysEventHandler.java (99%)
 rename src/main/java/jp/{sourceforge => osdn}/jindolf/parser/SysEventParser.java (99%)
 rename src/main/java/jp/{sourceforge => osdn}/jindolf/parser/TalkHandler.java (97%)
 rename src/main/java/jp/{sourceforge => osdn}/jindolf/parser/TalkParser.java (99%)
 rename src/main/java/jp/{sourceforge/jindolf/parser => osdn/jindolf/parser/content}/ContentBuilder.java (98%)
 rename src/main/java/jp/{sourceforge/jindolf/parser => osdn/jindolf/parser/content}/ContentBuilderSJ.java (97%)
 rename src/main/java/jp/{sourceforge/jindolf/parser => osdn/jindolf/parser/content}/DecodeErrorInfo.java (99%)
 rename src/main/java/jp/{sourceforge/jindolf/parser => osdn/jindolf/parser/content}/DecodedContent.java (99%)
 rename src/main/java/jp/{sourceforge/jindolf/parser => osdn/jindolf/parser/content}/ShiftJis.java (98%)
 rename src/main/java/jp/{sourceforge/jindolf/parser => osdn/jindolf/parser/content}/SjisNotifier.java (99%)
 create mode 100644 src/main/java/jp/osdn/jindolf/parser/content/package-info.java
 rename src/main/java/jp/{sourceforge => osdn}/jindolf/parser/package-info.java (67%)
 rename src/test/java/jp/{sourceforge => osdn}/jindolf/parser/EntityConverterTest.java (97%)
 rename src/test/java/jp/{sourceforge => osdn}/jindolf/parser/HtmlParseExceptionTest.java (97%)
 rename src/test/java/jp/{sourceforge/jindolf/parser => osdn/jindolf/parser/content}/Bseq.java (97%)
 rename src/test/java/jp/{sourceforge/jindolf/parser => osdn/jindolf/parser/content}/ContentBuilderSJTest.java (99%)
 rename src/test/java/jp/{sourceforge/jindolf/parser => osdn/jindolf/parser/content}/ContentBuilderTest.java (99%)
 rename src/test/java/jp/{sourceforge/jindolf/parser => osdn/jindolf/parser/content}/DecodeErrorInfoTest.java (99%)
 rename src/test/java/jp/{sourceforge/jindolf/parser => osdn/jindolf/parser/content}/DecodedContentTest.java (99%)
 rename src/test/java/jp/{sourceforge/jindolf/parser => osdn/jindolf/parser/content}/ShiftJisTest.java (99%)
 rename src/test/java/jp/{sourceforge/jindolf/parser => osdn/jindolf/parser/content}/SjisNotifierTest.java (99%)
 rename src/test/java/jp/{sourceforge/jindolf/parser => osdn/jindolf/parser/content}/TestListener.java (98%)
 rename src/test/java/jp/{sourceforge/jindolf/parser => osdn/jindolf/parser/content}/TestListenerRW.java (92%)

diff --git a/CHANGELOG.txt b/CHANGELOG.txt
index 860d6be..8ca9c61 100644
--- a/CHANGELOG.txt
+++ b/CHANGELOG.txt
@@ -4,6 +4,11 @@
 JinParser 変更履歴
 
 
+2.101.X (20XX-XX-XX)
+    ・文字デコード処理をJioCemaに分離。
+    ・OSDN社の事情を鑑みパッケージ名とgroupIdを変更。
+    ・XHTMLに依存しない部分をパッケージ分離。
+
 1.409.4 (2017-04-09)
     ・F国URL修正に伴い JinCore 1.206.10 に対応。
 
diff --git a/README.txt b/README.txt
index d6dd11e..e2f621a 100644
--- a/README.txt
+++ b/README.txt
@@ -37,8 +37,8 @@ JindolfのXHTML文書パース機能を提供することを目的に発足し
 
 === 依存ライブラリ ===
 
- - JinParserはビルドに際してJinCoreライブラリを必要とします。
-   開発時はMaven等を用いてJinCoreライブラリを用意してください。
+ - JinParserはビルドに際してJinCore、JioCema両ライブラリを必要とします。
+   開発時はMaven等を用いてこれらのライブラリを用意してください。
 
 
 === 開発プロジェクト運営元 ===
diff --git a/pom.xml b/pom.xml
index 086cccd..e84406b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -13,10 +13,10 @@
     <modelVersion>4.0.0</modelVersion>
     <!--parent/-->
 
-    <groupId>jp.sourceforge.jindolf</groupId>
+    <groupId>jp.osdn.jindolf</groupId>
     <artifactId>jinparser</artifactId>
 
-    <version>1.409.5-SNAPSHOT</version>
+    <version>2.101.1-SNAPSHOT</version>
 
     <packaging>jar</packaging>
     <name>JinParser</name>
diff --git a/src/main/java/jp/sourceforge/jindolf/parser/AbstractParser.java b/src/main/java/jp/osdn/jindolf/parser/AbstractParser.java
similarity index 99%
rename from src/main/java/jp/sourceforge/jindolf/parser/AbstractParser.java
rename to src/main/java/jp/osdn/jindolf/parser/AbstractParser.java
index 85dfc7f..5281bcd 100644
--- a/src/main/java/jp/sourceforge/jindolf/parser/AbstractParser.java
+++ b/src/main/java/jp/osdn/jindolf/parser/AbstractParser.java
@@ -5,10 +5,11 @@
  * Copyright(c) 2009 olyutorskii
  */
 
-package jp.sourceforge.jindolf.parser;
+package jp.osdn.jindolf.parser;
 
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
+import jp.osdn.jindolf.parser.content.DecodedContent;
 import jp.sourceforge.jindolf.corelib.GameRole;
 
 /**
diff --git a/src/main/java/jp/sourceforge/jindolf/parser/BasicHandler.java b/src/main/java/jp/osdn/jindolf/parser/BasicHandler.java
similarity index 98%
rename from src/main/java/jp/sourceforge/jindolf/parser/BasicHandler.java
rename to src/main/java/jp/osdn/jindolf/parser/BasicHandler.java
index 6846725..f556cc6 100644
--- a/src/main/java/jp/sourceforge/jindolf/parser/BasicHandler.java
+++ b/src/main/java/jp/osdn/jindolf/parser/BasicHandler.java
@@ -5,8 +5,9 @@
  * Copyright(c) 2009 olyutorskii
  */
 
-package jp.sourceforge.jindolf.parser;
+package jp.osdn.jindolf.parser;
 
+import jp.osdn.jindolf.parser.content.DecodedContent;
 import jp.sourceforge.jindolf.corelib.PeriodType;
 import jp.sourceforge.jindolf.corelib.VillageState;
 
diff --git a/src/main/java/jp/sourceforge/jindolf/parser/ChainedParser.java b/src/main/java/jp/osdn/jindolf/parser/ChainedParser.java
similarity index 91%
rename from src/main/java/jp/sourceforge/jindolf/parser/ChainedParser.java
rename to src/main/java/jp/osdn/jindolf/parser/ChainedParser.java
index abbab64..7d83fe2 100644
--- a/src/main/java/jp/sourceforge/jindolf/parser/ChainedParser.java
+++ b/src/main/java/jp/osdn/jindolf/parser/ChainedParser.java
@@ -5,9 +5,10 @@
  * Copyright(c) 2009 olyutorskii
  */
 
-package jp.sourceforge.jindolf.parser;
+package jp.osdn.jindolf.parser;
 
 import java.util.regex.Matcher;
+import jp.osdn.jindolf.parser.content.DecodedContent;
 
 /**
  * 連結パーサの基本インタフェース。
diff --git a/src/main/java/jp/sourceforge/jindolf/parser/EntityConverter.java b/src/main/java/jp/osdn/jindolf/parser/EntityConverter.java
similarity index 99%
rename from src/main/java/jp/sourceforge/jindolf/parser/EntityConverter.java
rename to src/main/java/jp/osdn/jindolf/parser/EntityConverter.java
index becd08f..46f2efa 100644
--- a/src/main/java/jp/sourceforge/jindolf/parser/EntityConverter.java
+++ b/src/main/java/jp/osdn/jindolf/parser/EntityConverter.java
@@ -5,10 +5,11 @@
  * Copyright(c) 2009 olyutorskii
  */
 
-package jp.sourceforge.jindolf.parser;
+package jp.osdn.jindolf.parser;
 
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
+import jp.osdn.jindolf.parser.content.DecodedContent;
 
 /**
  * 人狼BBSで用いられる4種類のXHTML文字実体参照の
diff --git a/src/main/java/jp/sourceforge/jindolf/parser/HtmlAdapter.java b/src/main/java/jp/osdn/jindolf/parser/HtmlAdapter.java
similarity index 99%
rename from src/main/java/jp/sourceforge/jindolf/parser/HtmlAdapter.java
rename to src/main/java/jp/osdn/jindolf/parser/HtmlAdapter.java
index f874786..385b99a 100644
--- a/src/main/java/jp/sourceforge/jindolf/parser/HtmlAdapter.java
+++ b/src/main/java/jp/osdn/jindolf/parser/HtmlAdapter.java
@@ -5,8 +5,9 @@
  * Copyright(c) 2009 olyutorskii
  */
 
-package jp.sourceforge.jindolf.parser;
+package jp.osdn.jindolf.parser;
 
+import jp.osdn.jindolf.parser.content.DecodedContent;
 import jp.sourceforge.jindolf.corelib.EventFamily;
 import jp.sourceforge.jindolf.corelib.GameRole;
 import jp.sourceforge.jindolf.corelib.PeriodType;
diff --git a/src/main/java/jp/sourceforge/jindolf/parser/HtmlHandler.java b/src/main/java/jp/osdn/jindolf/parser/HtmlHandler.java
similarity index 89%
rename from src/main/java/jp/sourceforge/jindolf/parser/HtmlHandler.java
rename to src/main/java/jp/osdn/jindolf/parser/HtmlHandler.java
index 0552c60..4d53d52 100644
--- a/src/main/java/jp/sourceforge/jindolf/parser/HtmlHandler.java
+++ b/src/main/java/jp/osdn/jindolf/parser/HtmlHandler.java
@@ -5,7 +5,7 @@
  * Copyright(c) 2009 olyutorskii
  */
 
-package jp.sourceforge.jindolf.parser;
+package jp.osdn.jindolf.parser;
 
 /**
  * 各種XHTMLパース用ハンドラをまとめたインタフェース。
diff --git a/src/main/java/jp/sourceforge/jindolf/parser/HtmlParseException.java b/src/main/java/jp/osdn/jindolf/parser/HtmlParseException.java
similarity index 91%
rename from src/main/java/jp/sourceforge/jindolf/parser/HtmlParseException.java
rename to src/main/java/jp/osdn/jindolf/parser/HtmlParseException.java
index 241e45f..f569f3c 100644
--- a/src/main/java/jp/sourceforge/jindolf/parser/HtmlParseException.java
+++ b/src/main/java/jp/osdn/jindolf/parser/HtmlParseException.java
@@ -5,14 +5,14 @@
  * Copyright(c) 2009 olyutorskii
  */
 
-package jp.sourceforge.jindolf.parser;
+package jp.osdn.jindolf.parser;
 
 /**
  * XHTMLパースの異常系情報。
  * {@link HtmlParser}の各ハンドラは、この例外をスローすることで
  * パース処理の即時停止を{@link HtmlParser}に指示することができる。
- * パース対象({@link DecodedContent})内のパース中断位置を
- * 保持することができる。
+ * パース対象({@link jp.osdn.jindolf.parser.content.DecodedContent})
+ * 内のパース中断位置を保持することができる。
  * 中断位置が不明な場合は負の値が設定される。
  */
 @SuppressWarnings("serial")
diff --git a/src/main/java/jp/sourceforge/jindolf/parser/HtmlParser.java b/src/main/java/jp/osdn/jindolf/parser/HtmlParser.java
similarity index 99%
rename from src/main/java/jp/sourceforge/jindolf/parser/HtmlParser.java
rename to src/main/java/jp/osdn/jindolf/parser/HtmlParser.java
index fef14ce..1c5ac48 100644
--- a/src/main/java/jp/sourceforge/jindolf/parser/HtmlParser.java
+++ b/src/main/java/jp/osdn/jindolf/parser/HtmlParser.java
@@ -5,9 +5,10 @@
  * Copyright(c) 2009 olyutorskii
  */
 
-package jp.sourceforge.jindolf.parser;
+package jp.osdn.jindolf.parser;
 
 import java.util.regex.Pattern;
+import jp.osdn.jindolf.parser.content.DecodedContent;
 import jp.sourceforge.jindolf.corelib.PeriodType;
 import jp.sourceforge.jindolf.corelib.VillageState;
 
diff --git a/src/main/java/jp/sourceforge/jindolf/parser/PageType.java b/src/main/java/jp/osdn/jindolf/parser/PageType.java
similarity index 90%
rename from src/main/java/jp/sourceforge/jindolf/parser/PageType.java
rename to src/main/java/jp/osdn/jindolf/parser/PageType.java
index b4931cb..2f61a22 100644
--- a/src/main/java/jp/sourceforge/jindolf/parser/PageType.java
+++ b/src/main/java/jp/osdn/jindolf/parser/PageType.java
@@ -5,7 +5,7 @@
  * Copyright(c) 2009 olyutorskii
  */
 
-package jp.sourceforge.jindolf.parser;
+package jp.osdn.jindolf.parser;
 
 /**
  * 人狼BBSサーバが生成するXHTMLページの種別。
diff --git a/src/main/java/jp/sourceforge/jindolf/parser/SeqRange.java b/src/main/java/jp/osdn/jindolf/parser/SeqRange.java
similarity index 99%
rename from src/main/java/jp/sourceforge/jindolf/parser/SeqRange.java
rename to src/main/java/jp/osdn/jindolf/parser/SeqRange.java
index b2afd00..16342c6 100644
--- a/src/main/java/jp/sourceforge/jindolf/parser/SeqRange.java
+++ b/src/main/java/jp/osdn/jindolf/parser/SeqRange.java
@@ -5,7 +5,7 @@
  * Copyright(c) 2009 olyutorskii
  */
 
-package jp.sourceforge.jindolf.parser;
+package jp.osdn.jindolf.parser;
 
 import java.util.regex.MatchResult;
 
diff --git a/src/main/java/jp/sourceforge/jindolf/parser/SysEventHandler.java b/src/main/java/jp/osdn/jindolf/parser/SysEventHandler.java
similarity index 99%
rename from src/main/java/jp/sourceforge/jindolf/parser/SysEventHandler.java
rename to src/main/java/jp/osdn/jindolf/parser/SysEventHandler.java
index fdba3b6..b2dc713 100644
--- a/src/main/java/jp/sourceforge/jindolf/parser/SysEventHandler.java
+++ b/src/main/java/jp/osdn/jindolf/parser/SysEventHandler.java
@@ -5,8 +5,9 @@
  * Copyright(c) 2009 olyutorskii
  */
 
-package jp.sourceforge.jindolf.parser;
+package jp.osdn.jindolf.parser;
 
+import jp.osdn.jindolf.parser.content.DecodedContent;
 import jp.sourceforge.jindolf.corelib.EventFamily;
 import jp.sourceforge.jindolf.corelib.GameRole;
 import jp.sourceforge.jindolf.corelib.SysEventType;
diff --git a/src/main/java/jp/sourceforge/jindolf/parser/SysEventParser.java b/src/main/java/jp/osdn/jindolf/parser/SysEventParser.java
similarity index 99%
rename from src/main/java/jp/sourceforge/jindolf/parser/SysEventParser.java
rename to src/main/java/jp/osdn/jindolf/parser/SysEventParser.java
index 6b3c802..906212e 100644
--- a/src/main/java/jp/sourceforge/jindolf/parser/SysEventParser.java
+++ b/src/main/java/jp/osdn/jindolf/parser/SysEventParser.java
@@ -5,7 +5,7 @@
  * Copyright(c) 2009 olyutorskii
  */
 
-package jp.sourceforge.jindolf.parser;
+package jp.osdn.jindolf.parser;
 
 import java.util.regex.Pattern;
 import jp.sourceforge.jindolf.corelib.EventFamily;
diff --git a/src/main/java/jp/sourceforge/jindolf/parser/TalkHandler.java b/src/main/java/jp/osdn/jindolf/parser/TalkHandler.java
similarity index 97%
rename from src/main/java/jp/sourceforge/jindolf/parser/TalkHandler.java
rename to src/main/java/jp/osdn/jindolf/parser/TalkHandler.java
index 7ef1a78..d14c29a 100644
--- a/src/main/java/jp/sourceforge/jindolf/parser/TalkHandler.java
+++ b/src/main/java/jp/osdn/jindolf/parser/TalkHandler.java
@@ -5,8 +5,9 @@
  * Copyright(c) 2009 olyutorskii
  */
 
-package jp.sourceforge.jindolf.parser;
+package jp.osdn.jindolf.parser;
 
+import jp.osdn.jindolf.parser.content.DecodedContent;
 import jp.sourceforge.jindolf.corelib.TalkType;
 
 /**
diff --git a/src/main/java/jp/sourceforge/jindolf/parser/TalkParser.java b/src/main/java/jp/osdn/jindolf/parser/TalkParser.java
similarity index 99%
rename from src/main/java/jp/sourceforge/jindolf/parser/TalkParser.java
rename to src/main/java/jp/osdn/jindolf/parser/TalkParser.java
index 1e356e9..200267f 100644
--- a/src/main/java/jp/sourceforge/jindolf/parser/TalkParser.java
+++ b/src/main/java/jp/osdn/jindolf/parser/TalkParser.java
@@ -5,7 +5,7 @@
  * Copyright(c) 2009 olyutorskii
  */
 
-package jp.sourceforge.jindolf.parser;
+package jp.osdn.jindolf.parser;
 
 import java.util.regex.Pattern;
 import jp.sourceforge.jindolf.corelib.TalkType;
diff --git a/src/main/java/jp/sourceforge/jindolf/parser/ContentBuilder.java b/src/main/java/jp/osdn/jindolf/parser/content/ContentBuilder.java
similarity index 98%
rename from src/main/java/jp/sourceforge/jindolf/parser/ContentBuilder.java
rename to src/main/java/jp/osdn/jindolf/parser/content/ContentBuilder.java
index bcb42ee..c0f058d 100644
--- a/src/main/java/jp/sourceforge/jindolf/parser/ContentBuilder.java
+++ b/src/main/java/jp/osdn/jindolf/parser/content/ContentBuilder.java
@@ -5,7 +5,7 @@
  * Copyright(c) 2009 olyutorskii
  */
 
-package jp.sourceforge.jindolf.parser;
+package jp.osdn.jindolf.parser.content;
 
 import io.bitbucket.olyutorskii.jiocema.CharDecodeListener;
 import io.bitbucket.olyutorskii.jiocema.DecodeBreakException;
diff --git a/src/main/java/jp/sourceforge/jindolf/parser/ContentBuilderSJ.java b/src/main/java/jp/osdn/jindolf/parser/content/ContentBuilderSJ.java
similarity index 97%
rename from src/main/java/jp/sourceforge/jindolf/parser/ContentBuilderSJ.java
rename to src/main/java/jp/osdn/jindolf/parser/content/ContentBuilderSJ.java
index 393c825..777718d 100644
--- a/src/main/java/jp/sourceforge/jindolf/parser/ContentBuilderSJ.java
+++ b/src/main/java/jp/osdn/jindolf/parser/content/ContentBuilderSJ.java
@@ -5,7 +5,7 @@
  * Copyright(c) 2009 olyutorskii
  */
 
-package jp.sourceforge.jindolf.parser;
+package jp.osdn.jindolf.parser.content;
 
 import io.bitbucket.olyutorskii.jiocema.DecodeBreakException;
 
diff --git a/src/main/java/jp/sourceforge/jindolf/parser/DecodeErrorInfo.java b/src/main/java/jp/osdn/jindolf/parser/content/DecodeErrorInfo.java
similarity index 99%
rename from src/main/java/jp/sourceforge/jindolf/parser/DecodeErrorInfo.java
rename to src/main/java/jp/osdn/jindolf/parser/content/DecodeErrorInfo.java
index d9ea5c9..6142665 100644
--- a/src/main/java/jp/sourceforge/jindolf/parser/DecodeErrorInfo.java
+++ b/src/main/java/jp/osdn/jindolf/parser/content/DecodeErrorInfo.java
@@ -5,7 +5,7 @@
  * Copyright(c) 2009 olyutorskii
  */
 
-package jp.sourceforge.jindolf.parser;
+package jp.osdn.jindolf.parser.content;
 
 import java.util.Comparator;
 
diff --git a/src/main/java/jp/sourceforge/jindolf/parser/DecodedContent.java b/src/main/java/jp/osdn/jindolf/parser/content/DecodedContent.java
similarity index 99%
rename from src/main/java/jp/sourceforge/jindolf/parser/DecodedContent.java
rename to src/main/java/jp/osdn/jindolf/parser/content/DecodedContent.java
index ee5cd55..c5567c2 100644
--- a/src/main/java/jp/sourceforge/jindolf/parser/DecodedContent.java
+++ b/src/main/java/jp/osdn/jindolf/parser/content/DecodedContent.java
@@ -5,7 +5,7 @@
  * Copyright(c) 2009 olyutorskii
  */
 
-package jp.sourceforge.jindolf.parser;
+package jp.osdn.jindolf.parser.content;
 
 import java.util.ArrayList;
 import java.util.Collections;
diff --git a/src/main/java/jp/sourceforge/jindolf/parser/ShiftJis.java b/src/main/java/jp/osdn/jindolf/parser/content/ShiftJis.java
similarity index 98%
rename from src/main/java/jp/sourceforge/jindolf/parser/ShiftJis.java
rename to src/main/java/jp/osdn/jindolf/parser/content/ShiftJis.java
index 55008c8..8a0a456 100644
--- a/src/main/java/jp/sourceforge/jindolf/parser/ShiftJis.java
+++ b/src/main/java/jp/osdn/jindolf/parser/content/ShiftJis.java
@@ -5,7 +5,7 @@
  * Copyright(c) 2009 olyutorskii
  */
 
-package jp.sourceforge.jindolf.parser;
+package jp.osdn.jindolf.parser.content;
 
 import java.nio.charset.Charset;
 
diff --git a/src/main/java/jp/sourceforge/jindolf/parser/SjisNotifier.java b/src/main/java/jp/osdn/jindolf/parser/content/SjisNotifier.java
similarity index 99%
rename from src/main/java/jp/sourceforge/jindolf/parser/SjisNotifier.java
rename to src/main/java/jp/osdn/jindolf/parser/content/SjisNotifier.java
index 3081c8f..993a0f8 100644
--- a/src/main/java/jp/sourceforge/jindolf/parser/SjisNotifier.java
+++ b/src/main/java/jp/osdn/jindolf/parser/content/SjisNotifier.java
@@ -5,7 +5,7 @@
  * Copyright(c) 2018 olyutorskii
  */
 
-package jp.sourceforge.jindolf.parser;
+package jp.osdn.jindolf.parser.content;
 
 import io.bitbucket.olyutorskii.jiocema.DecodeNotifier;
 import java.io.IOException;
diff --git a/src/main/java/jp/osdn/jindolf/parser/content/package-info.java b/src/main/java/jp/osdn/jindolf/parser/content/package-info.java
new file mode 100644
index 0000000..b8cf576
--- /dev/null
+++ b/src/main/java/jp/osdn/jindolf/parser/content/package-info.java
@@ -0,0 +1,69 @@
+/*
+ * JinParser (content) パッケージコメント
+ *
+ * License : The MIT License
+ * Copyright(c) 2018 olyutorskii
+ */
+
+/**
+ * このパッケージは、人狼BBS用パーサライブラリ「JinParser」から
+ * XHTMLに依存しない部分のみを抽出したライブラリである。
+ *
+ * <p>
+ * 任意のバイトストリームから、
+ * デコードエラー情報付き文字列{@code DecodedContent}を得るには、
+ * 次のように行う。
+ * <pre>
+ * {@code
+ * InputStream is = .....
+ * DecodeNotifier decoder = new DecodeNotifier(...);
+ * ContentBuilder builder = new ContentBuilder();
+ * decoder.setCharDecodeListener(builder);
+ * try{
+ *     decoder.decode(is);
+ * }catch(IOException e){
+ *     // ERROR!
+ * }catch(DecodeBreakException e){
+ *     // ABORT!
+ * }
+ * DecodedContent content = builder.getContent();
+ * }
+ * </pre>
+ *
+ * <hr>
+ *
+ * <p>
+ * The MIT License
+ * <p>
+ * Copyright(c) 2018 olyutorskii
+ * <p>
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ * <p>
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ * <p>
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
+ * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+ * OTHER DEALINGS IN THE SOFTWARE.
+ * </p>
+ *
+ * <hr>
+ *
+ * @see <a href="http://jindolf.osdn.jp/">
+ * Jindolfポータルサイト</a>
+ * @see <a href="https://osdn.jp/projects/jindolf/devel/">
+ * Jindolf開発プロジェクト</a>
+ */
+
+package jp.osdn.jindolf.parser.content;
+
+/* EOF */
diff --git a/src/main/java/jp/sourceforge/jindolf/parser/package-info.java b/src/main/java/jp/osdn/jindolf/parser/package-info.java
similarity index 67%
rename from src/main/java/jp/sourceforge/jindolf/parser/package-info.java
rename to src/main/java/jp/osdn/jindolf/parser/package-info.java
index 8c25401..e50b358 100644
--- a/src/main/java/jp/sourceforge/jindolf/parser/package-info.java
+++ b/src/main/java/jp/osdn/jindolf/parser/package-info.java
@@ -1,54 +1,29 @@
 /*
  * JinParser パッケージコメント
  *
- * このファイルは、SunJDK5.0以降に含まれるJavadoc用に用意された、
- * 特別な名前を持つソースファイルです。
- * このファイルはソースコードを含まず、
- * パッケージコメントとパッケージ宣言のみが含まれます。
- *
  * License : The MIT License
  * Copyright(c) 2009 olyutorskii
  */
 
 /**
  * これは Jindolf プロジェクトにおける、
- * XHTML文書のパース部分を構成するパッケージです。
+ * XHTML文書のパース部分を構成するパッケージである。
  *
  * <p>
  * JinParserライブラリは、CGIゲーム「人狼BBS」のクライアント制作者向けに
- * 作られたJavaライブラリです。
+ * 作られたJavaライブラリである。
  * JinParserライブラリは、人狼BBSの専用クライアント開発プロジェクト
- * 「Jindolf」から派生しました。
+ * 「Jindolf」から派生した。
  *
  * <hr>
  *
  * <p>
- * 任意のバイトストリームから、
- * デコードエラー情報付き文字列{@code DecodedContent}を得るには、
- * 次のようにします。
- * <pre>
- * {@code
- * InputStream is = .....
- * DecodeNotifier decoder = new DecodeNotifier(...);
- * ContentBuilder builder = new ContentBuilder();
- * decoder.setCharDecodeListener(builder);
- * try{
- *     decoder.decode(is);
- * }catch(IOException e){
- *     // ERROR!
- * }catch(DecodeBreakException e){
- *     // ERROR!
- * }
- * DecodedContent content = builder.getContent();
- * }
- * </pre>
- *
- * <p>
- * このようにして得られた文字列をパースして、
+ * 文字列と文字デコードエラーが混在した{@code DecodedContent}をパースして、
  * あなたの実装したハンドラ{@code YourHandler}に通知するには、
- * 以下のようにします。
+ * 以下のように行う。
  * <pre>
  * {@code
+ * DecodedContent content = ...;
  * HtmlParser parser = new HtmlParser();
  * HtmlHandler handler = new YourHandler();
  * parser.setBasicHandler(handler);
@@ -64,7 +39,7 @@
  *
  * <p>
  * ハンドラ内部で、パース元となった文字列の一部を切り出したい場合は、
- * {@code EntityConverter}を使うのが便利です。
+ * {@code EntityConverter}を使うのが便利である。
  *
  * <hr>
  *
@@ -100,6 +75,6 @@
  * Jindolf開発プロジェクト</a>
  */
 
-package jp.sourceforge.jindolf.parser;
+package jp.osdn.jindolf.parser;
 
 /* EOF */
diff --git a/src/test/java/jp/sourceforge/jindolf/parser/EntityConverterTest.java b/src/test/java/jp/osdn/jindolf/parser/EntityConverterTest.java
similarity index 97%
rename from src/test/java/jp/sourceforge/jindolf/parser/EntityConverterTest.java
rename to src/test/java/jp/osdn/jindolf/parser/EntityConverterTest.java
index ed5e7e8..341aa6e 100644
--- a/src/test/java/jp/sourceforge/jindolf/parser/EntityConverterTest.java
+++ b/src/test/java/jp/osdn/jindolf/parser/EntityConverterTest.java
@@ -3,9 +3,11 @@
  * Copyright(c) 2009 olyutorskii
  */
 
-package jp.sourceforge.jindolf.parser;
+package jp.osdn.jindolf.parser;
 
 import java.util.List;
+import jp.osdn.jindolf.parser.content.DecodeErrorInfo;
+import jp.osdn.jindolf.parser.content.DecodedContent;
 import org.junit.After;
 import org.junit.AfterClass;
 import org.junit.Before;
diff --git a/src/test/java/jp/sourceforge/jindolf/parser/HtmlParseExceptionTest.java b/src/test/java/jp/osdn/jindolf/parser/HtmlParseExceptionTest.java
similarity index 97%
rename from src/test/java/jp/sourceforge/jindolf/parser/HtmlParseExceptionTest.java
rename to src/test/java/jp/osdn/jindolf/parser/HtmlParseExceptionTest.java
index e8c8d1d..4f73f31 100644
--- a/src/test/java/jp/sourceforge/jindolf/parser/HtmlParseExceptionTest.java
+++ b/src/test/java/jp/osdn/jindolf/parser/HtmlParseExceptionTest.java
@@ -3,7 +3,7 @@
  * Copyright(c) 2009 olyutorskii
  */
 
-package jp.sourceforge.jindolf.parser;
+package jp.osdn.jindolf.parser;
 
 import org.junit.After;
 import org.junit.AfterClass;
diff --git a/src/test/java/jp/sourceforge/jindolf/parser/Bseq.java b/src/test/java/jp/osdn/jindolf/parser/content/Bseq.java
similarity index 97%
rename from src/test/java/jp/sourceforge/jindolf/parser/Bseq.java
rename to src/test/java/jp/osdn/jindolf/parser/content/Bseq.java
index 04af3e3..d12482c 100644
--- a/src/test/java/jp/sourceforge/jindolf/parser/Bseq.java
+++ b/src/test/java/jp/osdn/jindolf/parser/content/Bseq.java
@@ -1,7 +1,7 @@
 /*
  */
 
-package jp.sourceforge.jindolf.parser;
+package jp.osdn.jindolf.parser.content;
 
 import java.io.ByteArrayInputStream;
 import java.util.ArrayList;
diff --git a/src/test/java/jp/sourceforge/jindolf/parser/ContentBuilderSJTest.java b/src/test/java/jp/osdn/jindolf/parser/content/ContentBuilderSJTest.java
similarity index 99%
rename from src/test/java/jp/sourceforge/jindolf/parser/ContentBuilderSJTest.java
rename to src/test/java/jp/osdn/jindolf/parser/content/ContentBuilderSJTest.java
index 4370744..c578fec 100644
--- a/src/test/java/jp/sourceforge/jindolf/parser/ContentBuilderSJTest.java
+++ b/src/test/java/jp/osdn/jindolf/parser/content/ContentBuilderSJTest.java
@@ -3,7 +3,7 @@
  * Copyright(c) 2009 olyutorskii
  */
 
-package jp.sourceforge.jindolf.parser;
+package jp.osdn.jindolf.parser.content;
 
 import io.bitbucket.olyutorskii.jiocema.DecodeBreakException;
 import io.bitbucket.olyutorskii.jiocema.DecodeNotifier;
diff --git a/src/test/java/jp/sourceforge/jindolf/parser/ContentBuilderTest.java b/src/test/java/jp/osdn/jindolf/parser/content/ContentBuilderTest.java
similarity index 99%
rename from src/test/java/jp/sourceforge/jindolf/parser/ContentBuilderTest.java
rename to src/test/java/jp/osdn/jindolf/parser/content/ContentBuilderTest.java
index ea82e4d..41404ba 100644
--- a/src/test/java/jp/sourceforge/jindolf/parser/ContentBuilderTest.java
+++ b/src/test/java/jp/osdn/jindolf/parser/content/ContentBuilderTest.java
@@ -3,7 +3,7 @@
  * Copyright(c) 2010 olyutorskii
  */
 
-package jp.sourceforge.jindolf.parser;
+package jp.osdn.jindolf.parser.content;
 
 import io.bitbucket.olyutorskii.jiocema.DecodeBreakException;
 import io.bitbucket.olyutorskii.jiocema.DecodeNotifier;
diff --git a/src/test/java/jp/sourceforge/jindolf/parser/DecodeErrorInfoTest.java b/src/test/java/jp/osdn/jindolf/parser/content/DecodeErrorInfoTest.java
similarity index 99%
rename from src/test/java/jp/sourceforge/jindolf/parser/DecodeErrorInfoTest.java
rename to src/test/java/jp/osdn/jindolf/parser/content/DecodeErrorInfoTest.java
index 06ac25b..ab2db1b 100644
--- a/src/test/java/jp/sourceforge/jindolf/parser/DecodeErrorInfoTest.java
+++ b/src/test/java/jp/osdn/jindolf/parser/content/DecodeErrorInfoTest.java
@@ -3,7 +3,7 @@
  * Copyright(c) 2009 olyutorskii
  */
 
-package jp.sourceforge.jindolf.parser;
+package jp.osdn.jindolf.parser.content;
 
 import org.junit.After;
 import org.junit.AfterClass;
diff --git a/src/test/java/jp/sourceforge/jindolf/parser/DecodedContentTest.java b/src/test/java/jp/osdn/jindolf/parser/content/DecodedContentTest.java
similarity index 99%
rename from src/test/java/jp/sourceforge/jindolf/parser/DecodedContentTest.java
rename to src/test/java/jp/osdn/jindolf/parser/content/DecodedContentTest.java
index d218b69..48a85dd 100644
--- a/src/test/java/jp/sourceforge/jindolf/parser/DecodedContentTest.java
+++ b/src/test/java/jp/osdn/jindolf/parser/content/DecodedContentTest.java
@@ -3,7 +3,7 @@
  * Copyright(c) 2009 olyutorskii
  */
 
-package jp.sourceforge.jindolf.parser;
+package jp.osdn.jindolf.parser.content;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/src/test/java/jp/sourceforge/jindolf/parser/ShiftJisTest.java b/src/test/java/jp/osdn/jindolf/parser/content/ShiftJisTest.java
similarity index 99%
rename from src/test/java/jp/sourceforge/jindolf/parser/ShiftJisTest.java
rename to src/test/java/jp/osdn/jindolf/parser/content/ShiftJisTest.java
index 8097786..62d0b1c 100644
--- a/src/test/java/jp/sourceforge/jindolf/parser/ShiftJisTest.java
+++ b/src/test/java/jp/osdn/jindolf/parser/content/ShiftJisTest.java
@@ -3,7 +3,7 @@
  * Copyright(c) 2009 olyutorskii
  */
 
-package jp.sourceforge.jindolf.parser;
+package jp.osdn.jindolf.parser.content;
 
 import java.io.UnsupportedEncodingException;
 import org.junit.After;
diff --git a/src/test/java/jp/sourceforge/jindolf/parser/SjisNotifierTest.java b/src/test/java/jp/osdn/jindolf/parser/content/SjisNotifierTest.java
similarity index 99%
rename from src/test/java/jp/sourceforge/jindolf/parser/SjisNotifierTest.java
rename to src/test/java/jp/osdn/jindolf/parser/content/SjisNotifierTest.java
index d5dcdb0..c34fc29 100644
--- a/src/test/java/jp/sourceforge/jindolf/parser/SjisNotifierTest.java
+++ b/src/test/java/jp/osdn/jindolf/parser/content/SjisNotifierTest.java
@@ -1,7 +1,7 @@
 /*
  */
 
-package jp.sourceforge.jindolf.parser;
+package jp.osdn.jindolf.parser.content;
 
 import io.bitbucket.olyutorskii.jiocema.DecodeNotifier;
 import java.io.InputStream;
diff --git a/src/test/java/jp/sourceforge/jindolf/parser/TestListener.java b/src/test/java/jp/osdn/jindolf/parser/content/TestListener.java
similarity index 98%
rename from src/test/java/jp/sourceforge/jindolf/parser/TestListener.java
rename to src/test/java/jp/osdn/jindolf/parser/content/TestListener.java
index 0614273..8a03d7e 100644
--- a/src/test/java/jp/sourceforge/jindolf/parser/TestListener.java
+++ b/src/test/java/jp/osdn/jindolf/parser/content/TestListener.java
@@ -3,7 +3,7 @@
  * Copyright(c) 2018 olyutorskii
  */
 
-package jp.sourceforge.jindolf.parser;
+package jp.osdn.jindolf.parser.content;
 
 import io.bitbucket.olyutorskii.jiocema.CharDecodeListener;
 import io.bitbucket.olyutorskii.jiocema.DecodeBreakException;
diff --git a/src/test/java/jp/sourceforge/jindolf/parser/TestListenerRW.java b/src/test/java/jp/osdn/jindolf/parser/content/TestListenerRW.java
similarity index 92%
rename from src/test/java/jp/sourceforge/jindolf/parser/TestListenerRW.java
rename to src/test/java/jp/osdn/jindolf/parser/content/TestListenerRW.java
index 021908b..e2bce55 100644
--- a/src/test/java/jp/sourceforge/jindolf/parser/TestListenerRW.java
+++ b/src/test/java/jp/osdn/jindolf/parser/content/TestListenerRW.java
@@ -3,7 +3,7 @@
  * Copyright(c) 2018 olyutorskii
  */
 
-package jp.sourceforge.jindolf.parser;
+package jp.osdn.jindolf.parser.content;
 
 import io.bitbucket.olyutorskii.jiocema.DecodeBreakException;
 
diff --git a/src/test/java/sample/SampleHandler.java b/src/test/java/sample/SampleHandler.java
index 82ac5d4..a8fad89 100644
--- a/src/test/java/sample/SampleHandler.java
+++ b/src/test/java/sample/SampleHandler.java
@@ -1,17 +1,17 @@
 /*
  * sample handler
- * 
+ *
  * License : The MIT License
  * Copyright(c) 2009 olyutorskii
  */
 
 package sample;
 
-import jp.sourceforge.jindolf.parser.DecodedContent;
-import jp.sourceforge.jindolf.parser.EntityConverter;
-import jp.sourceforge.jindolf.parser.HtmlAdapter;
-import jp.sourceforge.jindolf.parser.HtmlParseException;
-import jp.sourceforge.jindolf.parser.SeqRange;
+import jp.osdn.jindolf.parser.EntityConverter;
+import jp.osdn.jindolf.parser.HtmlAdapter;
+import jp.osdn.jindolf.parser.HtmlParseException;
+import jp.osdn.jindolf.parser.SeqRange;
+import jp.osdn.jindolf.parser.content.DecodedContent;
 
 /**
  * サンプルのハンドラ
diff --git a/src/test/java/sample/SampleParser.java b/src/test/java/sample/SampleParser.java
index 60390ab..92a247c 100644
--- a/src/test/java/sample/SampleParser.java
+++ b/src/test/java/sample/SampleParser.java
@@ -20,7 +20,11 @@ import java.util.SortedMap;
 import java.util.TreeMap;
 import java.util.zip.ZipEntry;
 import java.util.zip.ZipFile;
-import jp.sourceforge.jindolf.parser.*;
+import jp.osdn.jindolf.parser.HtmlHandler;
+import jp.osdn.jindolf.parser.HtmlParseException;
+import jp.osdn.jindolf.parser.HtmlParser;
+import jp.osdn.jindolf.parser.content.ContentBuilder;
+import jp.osdn.jindolf.parser.content.DecodedContent;
 
 /**
  * サンプルのパーサ
-- 
2.11.0