From 9775c521a4ce39e5dbf4078b2edd43ddcf95821c Mon Sep 17 00:00:00 2001 From: Willem Cazander Date: Sat, 31 Aug 2013 22:21:03 +0200 Subject: [PATCH] Moved plugin keyword to back for maven and made naming space for other type of tools. --- pom.xml | 4 ++-- {x4o-plugin => x4o-tool}/.project | 0 {x4o-plugin => x4o-tool}/pom.xml | 12 ++++++------ .../x4o-tool-ant-plugin}/.project | 0 .../x4o-tool-ant-plugin}/pom.xml | 10 +++++----- .../main/java/org/x4o/tool/ant/plugin}/X4OTask.java | 2 +- .../java/org/x4o/tool/ant/plugin}/package-info.java | 2 +- .../ant/plugin}/X4OWriteLanguageDocTaskTest.java | 2 +- .../ant/plugin}/X4OWriteLanguageSchemaTaskTest.java | 2 +- .../test/resources/junit/test-write-language-doc.xml | 2 +- .../resources/junit/test-write-language-schema.xml | 2 +- .../x4o-tool-maven-plugin}/.project | 0 .../x4o-tool-maven-plugin}/pom.xml | 10 +++++----- .../x4o/tool/maven/plugin}/X4OLanguageTaskMojo.java | 2 +- .../org/x4o/tool/maven/plugin}/package-info.java | 2 +- .../tool/maven/plugin}/X4OLanguageTaskMojoTest.java | 3 ++- .../test/resources/junit/test-plugin-conf-all.pom | 2 +- .../test/resources/junit/test-plugin-conf-lang.pom | 2 +- .../test/resources/junit/test-plugin-defaults.pom | 2 +- 19 files changed, 31 insertions(+), 30 deletions(-) rename {x4o-plugin => x4o-tool}/.project (100%) rename {x4o-plugin => x4o-tool}/pom.xml (76%) rename {x4o-plugin/x4o-plugin-ant => x4o-tool/x4o-tool-ant-plugin}/.project (100%) rename {x4o-plugin/x4o-plugin-ant => x4o-tool/x4o-tool-ant-plugin}/pom.xml (97%) rename {x4o-plugin/x4o-plugin-ant/src/main/java/org/x4o/plugin/ant => x4o-tool/x4o-tool-ant-plugin/src/main/java/org/x4o/tool/ant/plugin}/X4OTask.java (99%) rename {x4o-plugin/x4o-plugin-ant/src/main/java/org/x4o/plugin/ant => x4o-tool/x4o-tool-ant-plugin/src/main/java/org/x4o/tool/ant/plugin}/package-info.java (97%) rename {x4o-plugin/x4o-plugin-ant/src/test/java/org/x4o/plugin/ant => x4o-tool/x4o-tool-ant-plugin/src/test/java/org/x4o/tool/ant/plugin}/X4OWriteLanguageDocTaskTest.java (99%) rename {x4o-plugin/x4o-plugin-ant/src/test/java/org/x4o/plugin/ant => x4o-tool/x4o-tool-ant-plugin/src/test/java/org/x4o/tool/ant/plugin}/X4OWriteLanguageSchemaTaskTest.java (98%) rename {x4o-plugin/x4o-plugin-ant => x4o-tool/x4o-tool-ant-plugin}/src/test/resources/junit/test-write-language-doc.xml (97%) rename {x4o-plugin/x4o-plugin-ant => x4o-tool/x4o-tool-ant-plugin}/src/test/resources/junit/test-write-language-schema.xml (97%) rename {x4o-plugin/x4o-plugin-maven => x4o-tool/x4o-tool-maven-plugin}/.project (100%) rename {x4o-plugin/x4o-plugin-maven => x4o-tool/x4o-tool-maven-plugin}/pom.xml (95%) rename {x4o-plugin/x4o-plugin-maven/src/main/java/org/x4o/plugin/maven => x4o-tool/x4o-tool-maven-plugin/src/main/java/org/x4o/tool/maven/plugin}/X4OLanguageTaskMojo.java (99%) rename {x4o-plugin/x4o-plugin-maven/src/main/java/org/x4o/plugin/maven => x4o-tool/x4o-tool-maven-plugin/src/main/java/org/x4o/tool/maven/plugin}/package-info.java (97%) rename {x4o-plugin/x4o-plugin-maven/src/test/java/org/x4o/plugin/maven => x4o-tool/x4o-tool-maven-plugin/src/test/java/org/x4o/tool/maven/plugin}/X4OLanguageTaskMojoTest.java (98%) rename {x4o-plugin/x4o-plugin-maven => x4o-tool/x4o-tool-maven-plugin}/src/test/resources/junit/test-plugin-conf-all.pom (97%) rename {x4o-plugin/x4o-plugin-maven => x4o-tool/x4o-tool-maven-plugin}/src/test/resources/junit/test-plugin-conf-lang.pom (97%) rename {x4o-plugin/x4o-plugin-maven => x4o-tool/x4o-tool-maven-plugin}/src/test/resources/junit/test-plugin-defaults.pom (97%) diff --git a/pom.xml b/pom.xml index 378fc3e..61de594 100644 --- a/pom.xml +++ b/pom.xml @@ -48,9 +48,9 @@ x4o-driver x4o-eld-doc - x4o-meta - x4o-plugin x4o-html + x4o-meta + x4o-tool diff --git a/x4o-plugin/.project b/x4o-tool/.project similarity index 100% rename from x4o-plugin/.project rename to x4o-tool/.project diff --git a/x4o-plugin/pom.xml b/x4o-tool/pom.xml similarity index 76% rename from x4o-plugin/pom.xml rename to x4o-tool/pom.xml index 9419c94..6ae0bbb 100644 --- a/x4o-plugin/pom.xml +++ b/x4o-tool/pom.xml @@ -6,14 +6,14 @@ 0.8.7-SNAPSHOT .. - x4o-plugin - org.x4o.plugin + x4o-tool + org.x4o.tool pom - x4o-plugin - x4o plugins for other applications + x4o-tool + x4o tools to use and plugin for other applications - x4o-plugin-ant - x4o-plugin-maven + x4o-tool-ant-plugin + x4o-tool-maven-plugin diff --git a/x4o-plugin/x4o-plugin-ant/.project b/x4o-tool/x4o-tool-ant-plugin/.project similarity index 100% rename from x4o-plugin/x4o-plugin-ant/.project rename to x4o-tool/x4o-tool-ant-plugin/.project diff --git a/x4o-plugin/x4o-plugin-ant/pom.xml b/x4o-tool/x4o-tool-ant-plugin/pom.xml similarity index 97% rename from x4o-plugin/x4o-plugin-ant/pom.xml rename to x4o-tool/x4o-tool-ant-plugin/pom.xml index d6fc335..6da3024 100644 --- a/x4o-plugin/x4o-plugin-ant/pom.xml +++ b/x4o-tool/x4o-tool-ant-plugin/pom.xml @@ -1,13 +1,13 @@ 4.0.0 - org.x4o.plugin - x4o-plugin + org.x4o.tool + x4o-tool 0.8.7-SNAPSHOT - x4o-plugin-ant - x4o-plugin-ant - x4o-plugin-ant + x4o-tool-ant-plugin + x4o-tool-ant-plugin + x4o-tool-ant-plugin org.x4o diff --git a/x4o-plugin/x4o-plugin-ant/src/main/java/org/x4o/plugin/ant/X4OTask.java b/x4o-tool/x4o-tool-ant-plugin/src/main/java/org/x4o/tool/ant/plugin/X4OTask.java similarity index 99% rename from x4o-plugin/x4o-plugin-ant/src/main/java/org/x4o/plugin/ant/X4OTask.java rename to x4o-tool/x4o-tool-ant-plugin/src/main/java/org/x4o/tool/ant/plugin/X4OTask.java index c1b2405..38b0ae9 100644 --- a/x4o-plugin/x4o-plugin-ant/src/main/java/org/x4o/plugin/ant/X4OTask.java +++ b/x4o-tool/x4o-tool-ant-plugin/src/main/java/org/x4o/tool/ant/plugin/X4OTask.java @@ -20,7 +20,7 @@ * TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -package org.x4o.plugin.ant; +package org.x4o.tool.ant.plugin; import java.util.ArrayList; import java.util.List; diff --git a/x4o-plugin/x4o-plugin-ant/src/main/java/org/x4o/plugin/ant/package-info.java b/x4o-tool/x4o-tool-ant-plugin/src/main/java/org/x4o/tool/ant/plugin/package-info.java similarity index 97% rename from x4o-plugin/x4o-plugin-ant/src/main/java/org/x4o/plugin/ant/package-info.java rename to x4o-tool/x4o-tool-ant-plugin/src/main/java/org/x4o/tool/ant/plugin/package-info.java index ac7995c..fbbe71c 100644 --- a/x4o-plugin/x4o-plugin-ant/src/main/java/org/x4o/plugin/ant/package-info.java +++ b/x4o-tool/x4o-tool-ant-plugin/src/main/java/org/x4o/tool/ant/plugin/package-info.java @@ -26,4 +26,4 @@ * @since 1.0 */ -package org.x4o.plugin.ant; \ No newline at end of file +package org.x4o.tool.ant.plugin; \ No newline at end of file diff --git a/x4o-plugin/x4o-plugin-ant/src/test/java/org/x4o/plugin/ant/X4OWriteLanguageDocTaskTest.java b/x4o-tool/x4o-tool-ant-plugin/src/test/java/org/x4o/tool/ant/plugin/X4OWriteLanguageDocTaskTest.java similarity index 99% rename from x4o-plugin/x4o-plugin-ant/src/test/java/org/x4o/plugin/ant/X4OWriteLanguageDocTaskTest.java rename to x4o-tool/x4o-tool-ant-plugin/src/test/java/org/x4o/tool/ant/plugin/X4OWriteLanguageDocTaskTest.java index 2f91a27..5f29d25 100644 --- a/x4o-plugin/x4o-plugin-ant/src/test/java/org/x4o/plugin/ant/X4OWriteLanguageDocTaskTest.java +++ b/x4o-tool/x4o-tool-ant-plugin/src/test/java/org/x4o/tool/ant/plugin/X4OWriteLanguageDocTaskTest.java @@ -20,7 +20,7 @@ * TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -package org.x4o.plugin.ant; +package org.x4o.tool.ant.plugin; import java.io.File; diff --git a/x4o-plugin/x4o-plugin-ant/src/test/java/org/x4o/plugin/ant/X4OWriteLanguageSchemaTaskTest.java b/x4o-tool/x4o-tool-ant-plugin/src/test/java/org/x4o/tool/ant/plugin/X4OWriteLanguageSchemaTaskTest.java similarity index 98% rename from x4o-plugin/x4o-plugin-ant/src/test/java/org/x4o/plugin/ant/X4OWriteLanguageSchemaTaskTest.java rename to x4o-tool/x4o-tool-ant-plugin/src/test/java/org/x4o/tool/ant/plugin/X4OWriteLanguageSchemaTaskTest.java index 0340a4c..d8a7364 100644 --- a/x4o-plugin/x4o-plugin-ant/src/test/java/org/x4o/plugin/ant/X4OWriteLanguageSchemaTaskTest.java +++ b/x4o-tool/x4o-tool-ant-plugin/src/test/java/org/x4o/tool/ant/plugin/X4OWriteLanguageSchemaTaskTest.java @@ -20,7 +20,7 @@ * TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -package org.x4o.plugin.ant; +package org.x4o.tool.ant.plugin; import java.io.File; diff --git a/x4o-plugin/x4o-plugin-ant/src/test/resources/junit/test-write-language-doc.xml b/x4o-tool/x4o-tool-ant-plugin/src/test/resources/junit/test-write-language-doc.xml similarity index 97% rename from x4o-plugin/x4o-plugin-ant/src/test/resources/junit/test-write-language-doc.xml rename to x4o-tool/x4o-tool-ant-plugin/src/test/resources/junit/test-write-language-doc.xml index e023c30..b153eb8 100644 --- a/x4o-plugin/x4o-plugin-ant/src/test/resources/junit/test-write-language-doc.xml +++ b/x4o-tool/x4o-tool-ant-plugin/src/test/resources/junit/test-write-language-doc.xml @@ -28,7 +28,7 @@ - + diff --git a/x4o-plugin/x4o-plugin-ant/src/test/resources/junit/test-write-language-schema.xml b/x4o-tool/x4o-tool-ant-plugin/src/test/resources/junit/test-write-language-schema.xml similarity index 97% rename from x4o-plugin/x4o-plugin-ant/src/test/resources/junit/test-write-language-schema.xml rename to x4o-tool/x4o-tool-ant-plugin/src/test/resources/junit/test-write-language-schema.xml index b2793e7..3f58bdb 100644 --- a/x4o-plugin/x4o-plugin-ant/src/test/resources/junit/test-write-language-schema.xml +++ b/x4o-tool/x4o-tool-ant-plugin/src/test/resources/junit/test-write-language-schema.xml @@ -28,7 +28,7 @@ - + diff --git a/x4o-plugin/x4o-plugin-maven/.project b/x4o-tool/x4o-tool-maven-plugin/.project similarity index 100% rename from x4o-plugin/x4o-plugin-maven/.project rename to x4o-tool/x4o-tool-maven-plugin/.project diff --git a/x4o-plugin/x4o-plugin-maven/pom.xml b/x4o-tool/x4o-tool-maven-plugin/pom.xml similarity index 95% rename from x4o-plugin/x4o-plugin-maven/pom.xml rename to x4o-tool/x4o-tool-maven-plugin/pom.xml index dd7ce7b..333ba39 100644 --- a/x4o-plugin/x4o-plugin-maven/pom.xml +++ b/x4o-tool/x4o-tool-maven-plugin/pom.xml @@ -1,14 +1,14 @@ 4.0.0 - org.x4o.plugin - x4o-plugin + org.x4o.tool + x4o-tool 0.8.7-SNAPSHOT - x4o-plugin-maven + x4o-tool-maven-plugin maven-plugin - x4o-plugin-maven - x4o-plugin-maven + x4o-tool-maven-plugin + x4o-tool-maven-plugin org.x4o diff --git a/x4o-plugin/x4o-plugin-maven/src/main/java/org/x4o/plugin/maven/X4OLanguageTaskMojo.java b/x4o-tool/x4o-tool-maven-plugin/src/main/java/org/x4o/tool/maven/plugin/X4OLanguageTaskMojo.java similarity index 99% rename from x4o-plugin/x4o-plugin-maven/src/main/java/org/x4o/plugin/maven/X4OLanguageTaskMojo.java rename to x4o-tool/x4o-tool-maven-plugin/src/main/java/org/x4o/tool/maven/plugin/X4OLanguageTaskMojo.java index 7233d98..7e9f8f1 100644 --- a/x4o-plugin/x4o-plugin-maven/src/main/java/org/x4o/plugin/maven/X4OLanguageTaskMojo.java +++ b/x4o-tool/x4o-tool-maven-plugin/src/main/java/org/x4o/tool/maven/plugin/X4OLanguageTaskMojo.java @@ -20,7 +20,7 @@ * TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -package org.x4o.plugin.maven; +package org.x4o.tool.maven.plugin; import java.util.ArrayList; import java.util.List; diff --git a/x4o-plugin/x4o-plugin-maven/src/main/java/org/x4o/plugin/maven/package-info.java b/x4o-tool/x4o-tool-maven-plugin/src/main/java/org/x4o/tool/maven/plugin/package-info.java similarity index 97% rename from x4o-plugin/x4o-plugin-maven/src/main/java/org/x4o/plugin/maven/package-info.java rename to x4o-tool/x4o-tool-maven-plugin/src/main/java/org/x4o/tool/maven/plugin/package-info.java index ccd7d61..b470ef0 100644 --- a/x4o-plugin/x4o-plugin-maven/src/main/java/org/x4o/plugin/maven/package-info.java +++ b/x4o-tool/x4o-tool-maven-plugin/src/main/java/org/x4o/tool/maven/plugin/package-info.java @@ -26,4 +26,4 @@ * @since 1.0 */ -package org.x4o.plugin.maven; \ No newline at end of file +package org.x4o.tool.maven.plugin; \ No newline at end of file diff --git a/x4o-plugin/x4o-plugin-maven/src/test/java/org/x4o/plugin/maven/X4OLanguageTaskMojoTest.java b/x4o-tool/x4o-tool-maven-plugin/src/test/java/org/x4o/tool/maven/plugin/X4OLanguageTaskMojoTest.java similarity index 98% rename from x4o-plugin/x4o-plugin-maven/src/test/java/org/x4o/plugin/maven/X4OLanguageTaskMojoTest.java rename to x4o-tool/x4o-tool-maven-plugin/src/test/java/org/x4o/tool/maven/plugin/X4OLanguageTaskMojoTest.java index b36d6c2..f9c6124 100644 --- a/x4o-plugin/x4o-plugin-maven/src/test/java/org/x4o/plugin/maven/X4OLanguageTaskMojoTest.java +++ b/x4o-tool/x4o-tool-maven-plugin/src/test/java/org/x4o/tool/maven/plugin/X4OLanguageTaskMojoTest.java @@ -20,12 +20,13 @@ * TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -package org.x4o.plugin.maven; +package org.x4o.tool.maven.plugin; import java.io.File; import org.apache.maven.plugin.Mojo; import org.apache.maven.plugin.testing.AbstractMojoTestCase; +import org.x4o.tool.maven.plugin.X4OLanguageTaskMojo; /** * XX4OLanguageTaskMojoTest. diff --git a/x4o-plugin/x4o-plugin-maven/src/test/resources/junit/test-plugin-conf-all.pom b/x4o-tool/x4o-tool-maven-plugin/src/test/resources/junit/test-plugin-conf-all.pom similarity index 97% rename from x4o-plugin/x4o-plugin-maven/src/test/resources/junit/test-plugin-conf-all.pom rename to x4o-tool/x4o-tool-maven-plugin/src/test/resources/junit/test-plugin-conf-all.pom index 3d72e16..5787bb2 100644 --- a/x4o-plugin/x4o-plugin-maven/src/test/resources/junit/test-plugin-conf-all.pom +++ b/x4o-tool/x4o-tool-maven-plugin/src/test/resources/junit/test-plugin-conf-all.pom @@ -44,7 +44,7 @@ - x4o-plugin-maven + x4o-tool-maven-plugin cel eld-xsd diff --git a/x4o-plugin/x4o-plugin-maven/src/test/resources/junit/test-plugin-conf-lang.pom b/x4o-tool/x4o-tool-maven-plugin/src/test/resources/junit/test-plugin-conf-lang.pom similarity index 97% rename from x4o-plugin/x4o-plugin-maven/src/test/resources/junit/test-plugin-conf-lang.pom rename to x4o-tool/x4o-tool-maven-plugin/src/test/resources/junit/test-plugin-conf-lang.pom index 25990ec..ede7d3a 100644 --- a/x4o-plugin/x4o-plugin-maven/src/test/resources/junit/test-plugin-conf-lang.pom +++ b/x4o-tool/x4o-tool-maven-plugin/src/test/resources/junit/test-plugin-conf-lang.pom @@ -44,7 +44,7 @@ - x4o-plugin-maven + x4o-tool-maven-plugin cel eld-xsd diff --git a/x4o-plugin/x4o-plugin-maven/src/test/resources/junit/test-plugin-defaults.pom b/x4o-tool/x4o-tool-maven-plugin/src/test/resources/junit/test-plugin-defaults.pom similarity index 97% rename from x4o-plugin/x4o-plugin-maven/src/test/resources/junit/test-plugin-defaults.pom rename to x4o-tool/x4o-tool-maven-plugin/src/test/resources/junit/test-plugin-defaults.pom index 408d183..c3c3f47 100644 --- a/x4o-plugin/x4o-plugin-maven/src/test/resources/junit/test-plugin-defaults.pom +++ b/x4o-tool/x4o-tool-maven-plugin/src/test/resources/junit/test-plugin-defaults.pom @@ -44,7 +44,7 @@ - x4o-plugin-maven + x4o-tool-maven-plugin