diff --git a/nx01-popcorn/pom.xml b/nx01-popcorn/pom.xml index 1be5367..185d802 100644 --- a/nx01-popcorn/pom.xml +++ b/nx01-popcorn/pom.xml @@ -10,7 +10,7 @@ love.distributedrebirth.nx01 - nx01-x4o-eld-doc + nx01-x4o-driver org.commonmark diff --git a/nx01-x4o-eld-doc/src/main/java/org/x4o/xml/eld/doc/EldDocLanguageTask.java b/nx01-x4o-driver/src/main/java/org/x4o/xml/eld/doc/EldDocLanguageTask.java similarity index 100% rename from nx01-x4o-eld-doc/src/main/java/org/x4o/xml/eld/doc/EldDocLanguageTask.java rename to nx01-x4o-driver/src/main/java/org/x4o/xml/eld/doc/EldDocLanguageTask.java diff --git a/nx01-x4o-eld-doc/src/main/java/org/x4o/xml/eld/doc/EldDocWriter.java b/nx01-x4o-driver/src/main/java/org/x4o/xml/eld/doc/EldDocWriter.java similarity index 100% rename from nx01-x4o-eld-doc/src/main/java/org/x4o/xml/eld/doc/EldDocWriter.java rename to nx01-x4o-driver/src/main/java/org/x4o/xml/eld/doc/EldDocWriter.java diff --git a/nx01-x4o-eld-doc/src/main/java/org/x4o/xml/eld/doc/EldDocWriterElementClass.java b/nx01-x4o-driver/src/main/java/org/x4o/xml/eld/doc/EldDocWriterElementClass.java similarity index 100% rename from nx01-x4o-eld-doc/src/main/java/org/x4o/xml/eld/doc/EldDocWriterElementClass.java rename to nx01-x4o-driver/src/main/java/org/x4o/xml/eld/doc/EldDocWriterElementClass.java diff --git a/nx01-x4o-eld-doc/src/main/java/org/x4o/xml/eld/doc/EldDocWriterElementInterface.java b/nx01-x4o-driver/src/main/java/org/x4o/xml/eld/doc/EldDocWriterElementInterface.java similarity index 100% rename from nx01-x4o-eld-doc/src/main/java/org/x4o/xml/eld/doc/EldDocWriterElementInterface.java rename to nx01-x4o-driver/src/main/java/org/x4o/xml/eld/doc/EldDocWriterElementInterface.java diff --git a/nx01-x4o-eld-doc/src/main/java/org/x4o/xml/eld/doc/EldDocWriterElementNamespace.java b/nx01-x4o-driver/src/main/java/org/x4o/xml/eld/doc/EldDocWriterElementNamespace.java similarity index 100% rename from nx01-x4o-eld-doc/src/main/java/org/x4o/xml/eld/doc/EldDocWriterElementNamespace.java rename to nx01-x4o-driver/src/main/java/org/x4o/xml/eld/doc/EldDocWriterElementNamespace.java diff --git a/nx01-x4o-eld-doc/src/main/java/org/x4o/xml/eld/doc/EldDocWriterLanguage.java b/nx01-x4o-driver/src/main/java/org/x4o/xml/eld/doc/EldDocWriterLanguage.java similarity index 100% rename from nx01-x4o-eld-doc/src/main/java/org/x4o/xml/eld/doc/EldDocWriterLanguage.java rename to nx01-x4o-driver/src/main/java/org/x4o/xml/eld/doc/EldDocWriterLanguage.java diff --git a/nx01-x4o-eld-doc/src/main/java/org/x4o/xml/eld/doc/EldDocWriterLanguageModule.java b/nx01-x4o-driver/src/main/java/org/x4o/xml/eld/doc/EldDocWriterLanguageModule.java similarity index 100% rename from nx01-x4o-eld-doc/src/main/java/org/x4o/xml/eld/doc/EldDocWriterLanguageModule.java rename to nx01-x4o-driver/src/main/java/org/x4o/xml/eld/doc/EldDocWriterLanguageModule.java diff --git a/nx01-x4o-eld-doc/src/main/java/org/x4o/xml/eld/doc/EldDocXTreePageWriter.java b/nx01-x4o-driver/src/main/java/org/x4o/xml/eld/doc/EldDocXTreePageWriter.java similarity index 100% rename from nx01-x4o-eld-doc/src/main/java/org/x4o/xml/eld/doc/EldDocXTreePageWriter.java rename to nx01-x4o-driver/src/main/java/org/x4o/xml/eld/doc/EldDocXTreePageWriter.java diff --git a/nx01-x4o-eld-doc/src/main/java/org/x4o/xml/eld/doc/package-info.java b/nx01-x4o-driver/src/main/java/org/x4o/xml/eld/doc/package-info.java similarity index 100% rename from nx01-x4o-eld-doc/src/main/java/org/x4o/xml/eld/doc/package-info.java rename to nx01-x4o-driver/src/main/java/org/x4o/xml/eld/doc/package-info.java diff --git a/nx01-x4o-driver/src/main/resources/META-INF/x4o-drivers.xml b/nx01-x4o-driver/src/main/resources/META-INF/x4o-drivers.xml index 6b7aec8..4fffb7d 100644 --- a/nx01-x4o-driver/src/main/resources/META-INF/x4o-drivers.xml +++ b/nx01-x4o-driver/src/main/resources/META-INF/x4o-drivers.xml @@ -28,6 +28,7 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://language.x4o.org/xml/ns/drivers http://language.x4o.org/xml/ns/drivers-1.0.xsd" > + diff --git a/nx01-x4o-eld-doc/src/main/resources/org/x4o/xml/eld/doc/theme/base/api-color.css b/nx01-x4o-driver/src/main/resources/org/x4o/xml/eld/doc/theme/base/api-color.css similarity index 100% rename from nx01-x4o-eld-doc/src/main/resources/org/x4o/xml/eld/doc/theme/base/api-color.css rename to nx01-x4o-driver/src/main/resources/org/x4o/xml/eld/doc/theme/base/api-color.css diff --git a/nx01-x4o-eld-doc/src/main/resources/org/x4o/xml/eld/doc/theme/base/api-font.css b/nx01-x4o-driver/src/main/resources/org/x4o/xml/eld/doc/theme/base/api-font.css similarity index 100% rename from nx01-x4o-eld-doc/src/main/resources/org/x4o/xml/eld/doc/theme/base/api-font.css rename to nx01-x4o-driver/src/main/resources/org/x4o/xml/eld/doc/theme/base/api-font.css diff --git a/nx01-x4o-eld-doc/src/main/resources/org/x4o/xml/eld/doc/theme/base/api-html.css b/nx01-x4o-driver/src/main/resources/org/x4o/xml/eld/doc/theme/base/api-html.css similarity index 100% rename from nx01-x4o-eld-doc/src/main/resources/org/x4o/xml/eld/doc/theme/base/api-html.css rename to nx01-x4o-driver/src/main/resources/org/x4o/xml/eld/doc/theme/base/api-html.css diff --git a/nx01-x4o-eld-doc/src/main/resources/org/x4o/xml/eld/doc/theme/base/api-inset.css b/nx01-x4o-driver/src/main/resources/org/x4o/xml/eld/doc/theme/base/api-inset.css similarity index 100% rename from nx01-x4o-eld-doc/src/main/resources/org/x4o/xml/eld/doc/theme/base/api-inset.css rename to nx01-x4o-driver/src/main/resources/org/x4o/xml/eld/doc/theme/base/api-inset.css diff --git a/nx01-x4o-eld-doc/src/main/resources/org/x4o/xml/eld/doc/theme/base/api-layout.css b/nx01-x4o-driver/src/main/resources/org/x4o/xml/eld/doc/theme/base/api-layout.css similarity index 100% rename from nx01-x4o-eld-doc/src/main/resources/org/x4o/xml/eld/doc/theme/base/api-layout.css rename to nx01-x4o-driver/src/main/resources/org/x4o/xml/eld/doc/theme/base/api-layout.css diff --git a/nx01-x4o-eld-doc/src/main/resources/org/x4o/xml/eld/doc/theme/jdk6/stylesheet.css b/nx01-x4o-driver/src/main/resources/org/x4o/xml/eld/doc/theme/jdk6/stylesheet.css similarity index 100% rename from nx01-x4o-eld-doc/src/main/resources/org/x4o/xml/eld/doc/theme/jdk6/stylesheet.css rename to nx01-x4o-driver/src/main/resources/org/x4o/xml/eld/doc/theme/jdk6/stylesheet.css diff --git a/nx01-x4o-eld-doc/src/main/resources/org/x4o/xml/eld/doc/theme/jdk7/background.png b/nx01-x4o-driver/src/main/resources/org/x4o/xml/eld/doc/theme/jdk7/background.png similarity index 100% rename from nx01-x4o-eld-doc/src/main/resources/org/x4o/xml/eld/doc/theme/jdk7/background.png rename to nx01-x4o-driver/src/main/resources/org/x4o/xml/eld/doc/theme/jdk7/background.png diff --git a/nx01-x4o-eld-doc/src/main/resources/org/x4o/xml/eld/doc/theme/jdk7/stylesheet.css b/nx01-x4o-driver/src/main/resources/org/x4o/xml/eld/doc/theme/jdk7/stylesheet.css similarity index 100% rename from nx01-x4o-eld-doc/src/main/resources/org/x4o/xml/eld/doc/theme/jdk7/stylesheet.css rename to nx01-x4o-driver/src/main/resources/org/x4o/xml/eld/doc/theme/jdk7/stylesheet.css diff --git a/nx01-x4o-eld-doc/src/main/resources/org/x4o/xml/eld/doc/theme/jdk7/tab.png b/nx01-x4o-driver/src/main/resources/org/x4o/xml/eld/doc/theme/jdk7/tab.png similarity index 100% rename from nx01-x4o-eld-doc/src/main/resources/org/x4o/xml/eld/doc/theme/jdk7/tab.png rename to nx01-x4o-driver/src/main/resources/org/x4o/xml/eld/doc/theme/jdk7/tab.png diff --git a/nx01-x4o-eld-doc/src/main/resources/org/x4o/xml/eld/doc/theme/jdk7/titlebar.png b/nx01-x4o-driver/src/main/resources/org/x4o/xml/eld/doc/theme/jdk7/titlebar.png similarity index 100% rename from nx01-x4o-eld-doc/src/main/resources/org/x4o/xml/eld/doc/theme/jdk7/titlebar.png rename to nx01-x4o-driver/src/main/resources/org/x4o/xml/eld/doc/theme/jdk7/titlebar.png diff --git a/nx01-x4o-eld-doc/src/main/resources/org/x4o/xml/eld/doc/theme/jdk7/titlebar_end.png b/nx01-x4o-driver/src/main/resources/org/x4o/xml/eld/doc/theme/jdk7/titlebar_end.png similarity index 100% rename from nx01-x4o-eld-doc/src/main/resources/org/x4o/xml/eld/doc/theme/jdk7/titlebar_end.png rename to nx01-x4o-driver/src/main/resources/org/x4o/xml/eld/doc/theme/jdk7/titlebar_end.png diff --git a/nx01-x4o-eld-doc/src/test/java/org/x4o/xml/eld/doc/X4OWriteLanguageDocExecutorTest.java b/nx01-x4o-driver/src/test/java/org/x4o/xml/eld/doc/X4OWriteLanguageDocExecutorTest.java similarity index 100% rename from nx01-x4o-eld-doc/src/test/java/org/x4o/xml/eld/doc/X4OWriteLanguageDocExecutorTest.java rename to nx01-x4o-driver/src/test/java/org/x4o/xml/eld/doc/X4OWriteLanguageDocExecutorTest.java diff --git a/nx01-x4o-eld-doc/pom.xml b/nx01-x4o-eld-doc/pom.xml deleted file mode 100644 index da29634..0000000 --- a/nx01-x4o-eld-doc/pom.xml +++ /dev/null @@ -1,27 +0,0 @@ - - 4.0.0 - - love.distributedrebirth.nx01 - nx01 - 〇一。壬寅。一〄-SNAPSHOT - - nx01-x4o-eld-doc - - - love.distributedrebirth.nx01 - nx01-x4o-driver - - - love.distributedrebirth.nx01 - nx01-x4o-driver - test-jar - test - - - org.junit.jupiter - junit-jupiter - test - - - \ No newline at end of file diff --git a/nx01-x4o-eld-doc/src/main/resources/META-INF/x4o-drivers.xml b/nx01-x4o-eld-doc/src/main/resources/META-INF/x4o-drivers.xml deleted file mode 100644 index 81ad394..0000000 --- a/nx01-x4o-eld-doc/src/main/resources/META-INF/x4o-drivers.xml +++ /dev/null @@ -1,32 +0,0 @@ - - - - - diff --git a/nx01-x4o-tool-ant-plugin/pom.xml b/nx01-x4o-tool-ant-plugin/pom.xml index 6496681..f594faa 100644 --- a/nx01-x4o-tool-ant-plugin/pom.xml +++ b/nx01-x4o-tool-ant-plugin/pom.xml @@ -10,7 +10,7 @@ love.distributedrebirth.nx01 - nx01-x4o-eld-doc + nx01-x4o-driver love.distributedrebirth.nx01 diff --git a/nx01-x4o-tool-maven-plugin/pom.xml b/nx01-x4o-tool-maven-plugin/pom.xml index 109477b..44cef79 100644 --- a/nx01-x4o-tool-maven-plugin/pom.xml +++ b/nx01-x4o-tool-maven-plugin/pom.xml @@ -13,10 +13,6 @@ love.distributedrebirth.nx01 nx01-x4o-driver - - love.distributedrebirth.nx01 - nx01-x4o-eld-doc - love.distributedrebirth.nx01 nx01-x4o-driver diff --git a/pom.xml b/pom.xml index 8a97093..f8069af 100644 --- a/pom.xml +++ b/pom.xml @@ -48,13 +48,12 @@ nx01-warp-fault nx01-warp-manifestor nx01-x4o-driver - nx01-x4o-eld-doc + nx01-x4o-fc18 nx01-x4o-meta nx01-x4o-o2o nx01-x4o-tool-ant-plugin nx01-x4o-tool-maven-plugin nx01-zerofungus-server - nx01-x4o-fc18 @@ -385,11 +384,6 @@ ${project.version} test-jar - - love.distributedrebirth.nx01 - nx01-x4o-eld-doc - ${project.version} - love.distributedrebirth.nx01 nx01-x4o-fc18