arch-jedi/x4o
2
0
Fork 0
Code Issues 2 Pull requests Activity

Moved plugin keyword to back for maven and made naming space for other

Browse source 
type of tools.
This commit is contained in:
Willem Cazander 2013-08-31 22:21:03 +02:00
parent c5e03779e2
commit 9775c521a4
19 changed files with 31 additions and 30 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
pom.xml
View file

@ -48,9 +48,9 @@
<modules> <modules>
<module>x4o-driver</module> <module>x4o-driver</module>
<module>x4o-eld-doc</module> <module>x4o-eld-doc</module>
<module>x4o-meta</module>
<module>x4o-plugin</module>
<module>x4o-html</module> <module>x4o-html</module>
<module>x4o-meta</module>
<module>x4o-tool</module>
</modules> </modules>
<distributionManagement> <distributionManagement>
<site> <site>

0
x4o-plugin/.project → x4o-tool/.project
View file

12
x4o-plugin/pom.xml → x4o-tool/pom.xml
View file

@ -6,14 +6,14 @@
<version>0.8.7-SNAPSHOT</version> <version>0.8.7-SNAPSHOT</version>
<relativePath>..</relativePath> <relativePath>..</relativePath>
</parent> </parent>
<artifactId>x4o-plugin</artifactId> <artifactId>x4o-tool</artifactId>
<groupId>org.x4o.plugin</groupId> <groupId>org.x4o.tool</groupId>
<packaging>pom</packaging> <packaging>pom</packaging>
<name>x4o-plugin</name> <name>x4o-tool</name>
<description>x4o plugins for other applications</description> <description>x4o tools to use and plugin for other applications</description>
<modules> <modules>
<module>x4o-plugin-ant</module> <module>x4o-tool-ant-plugin</module>
<module>x4o-plugin-maven</module> <module>x4o-tool-maven-plugin</module>
</modules> </modules>
<build> <build>
<pluginManagement> <pluginManagement>

0
x4o-plugin/x4o-plugin-ant/.project → x4o-tool/x4o-tool-ant-plugin/.project
View file

10
x4o-plugin/x4o-plugin-ant/pom.xml → x4o-tool/x4o-tool-ant-plugin/pom.xml
View file

@ -1,13 +1,13 @@
<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/xsd/maven-4.0.0.xsd"> <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/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<parent> <parent>
<groupId>org.x4o.plugin</groupId> <groupId>org.x4o.tool</groupId>
<artifactId>x4o-plugin</artifactId> <artifactId>x4o-tool</artifactId>
<version>0.8.7-SNAPSHOT</version> <version>0.8.7-SNAPSHOT</version>
</parent> </parent>
<artifactId>x4o-plugin-ant</artifactId> <artifactId>x4o-tool-ant-plugin</artifactId>
<name>x4o-plugin-ant</name> <name>x4o-tool-ant-plugin</name>
<description>x4o-plugin-ant</description> <description>x4o-tool-ant-plugin</description>
<dependencies> <dependencies>
<dependency> <dependency>
<groupId>org.x4o</groupId> <groupId>org.x4o</groupId>

2
x4o-plugin/x4o-plugin-ant/src/main/java/org/x4o/plugin/ant/X4OTask.java → x4o-tool/x4o-tool-ant-plugin/src/main/java/org/x4o/tool/ant/plugin/X4OTask.java
View file

@ -20,7 +20,7 @@
* TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS * 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. * 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.ArrayList;
import java.util.List; import java.util.List;

2
x4o-plugin/x4o-plugin-ant/src/main/java/org/x4o/plugin/ant/package-info.java → x4o-tool/x4o-tool-ant-plugin/src/main/java/org/x4o/tool/ant/plugin/package-info.java
View file

@ -26,4 +26,4 @@
* @since 1.0 * @since 1.0
*/ */
package org.x4o.plugin.ant; package org.x4o.tool.ant.plugin;

2
x4o-plugin/x4o-plugin-ant/src/test/java/org/x4o/plugin/ant/X4OWriteLanguageDocTaskTest.java → x4o-tool/x4o-tool-ant-plugin/src/test/java/org/x4o/tool/ant/plugin/X4OWriteLanguageDocTaskTest.java
View file

@ -20,7 +20,7 @@
* TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS * 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. * 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; import java.io.File;

2
x4o-plugin/x4o-plugin-ant/src/test/java/org/x4o/plugin/ant/X4OWriteLanguageSchemaTaskTest.java → x4o-tool/x4o-tool-ant-plugin/src/test/java/org/x4o/tool/ant/plugin/X4OWriteLanguageSchemaTaskTest.java
View file

@ -20,7 +20,7 @@
* TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS * 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. * 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; import java.io.File;

2
x4o-plugin/x4o-plugin-ant/src/test/resources/junit/test-write-language-doc.xml → x4o-tool/x4o-tool-ant-plugin/src/test/resources/junit/test-write-language-doc.xml
View file

@ -28,7 +28,7 @@
<property name="test.dir" value="${basedir}/target/test-elddoc/"/> <property name="test.dir" value="${basedir}/target/test-elddoc/"/>
<target name="init"> <target name="init">
<taskdef name="x4oTask" classname="org.x4o.plugin.ant.X4OTask"/> <taskdef name="x4oTask" classname="org.x4o.tool.ant.plugin.X4OTask"/>
<mkdir dir="${test.dir}"/> <mkdir dir="${test.dir}"/>
<mkdir dir="${test.dir}/test"/> <mkdir dir="${test.dir}/test"/>
</target> </target>

2
x4o-plugin/x4o-plugin-ant/src/test/resources/junit/test-write-language-schema.xml → x4o-tool/x4o-tool-ant-plugin/src/test/resources/junit/test-write-language-schema.xml
View file

@ -28,7 +28,7 @@
<property name="test.dir" value="${basedir}/target/test-schemas/"/> <property name="test.dir" value="${basedir}/target/test-schemas/"/>
<target name="init"> <target name="init">
<taskdef name="x4oTask" classname="org.x4o.plugin.ant.X4OTask"/> <taskdef name="x4oTask" classname="org.x4o.tool.ant.plugin.X4OTask"/>
<mkdir dir="${test.dir}"/> <mkdir dir="${test.dir}"/>
<mkdir dir="${test.dir}/test"/> <mkdir dir="${test.dir}/test"/>
</target> </target>

0
x4o-plugin/x4o-plugin-maven/.project → x4o-tool/x4o-tool-maven-plugin/.project
View file

10
x4o-plugin/x4o-plugin-maven/pom.xml → x4o-tool/x4o-tool-maven-plugin/pom.xml
View file

@ -1,14 +1,14 @@
<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/xsd/maven-4.0.0.xsd"> <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/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<parent> <parent>
<groupId>org.x4o.plugin</groupId> <groupId>org.x4o.tool</groupId>
<artifactId>x4o-plugin</artifactId> <artifactId>x4o-tool</artifactId>
<version>0.8.7-SNAPSHOT</version> <version>0.8.7-SNAPSHOT</version>
</parent> </parent>
<artifactId>x4o-plugin-maven</artifactId> <artifactId>x4o-tool-maven-plugin</artifactId>
<packaging>maven-plugin</packaging> <packaging>maven-plugin</packaging>
<name>x4o-plugin-maven</name> <name>x4o-tool-maven-plugin</name>
<description>x4o-plugin-maven</description> <description>x4o-tool-maven-plugin</description>
<dependencies> <dependencies>
<dependency> <dependency>
<groupId>org.x4o</groupId> <groupId>org.x4o</groupId>

2
x4o-plugin/x4o-plugin-maven/src/main/java/org/x4o/plugin/maven/X4OLanguageTaskMojo.java → x4o-tool/x4o-tool-maven-plugin/src/main/java/org/x4o/tool/maven/plugin/X4OLanguageTaskMojo.java
View file

@ -20,7 +20,7 @@
* TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS * 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. * 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.ArrayList;
import java.util.List; import java.util.List;

2
x4o-plugin/x4o-plugin-maven/src/main/java/org/x4o/plugin/maven/package-info.java → x4o-tool/x4o-tool-maven-plugin/src/main/java/org/x4o/tool/maven/plugin/package-info.java
View file

@ -26,4 +26,4 @@
* @since 1.0 * @since 1.0
*/ */
package org.x4o.plugin.maven; package org.x4o.tool.maven.plugin;

3
x4o-plugin/x4o-plugin-maven/src/test/java/org/x4o/plugin/maven/X4OLanguageTaskMojoTest.java → x4o-tool/x4o-tool-maven-plugin/src/test/java/org/x4o/tool/maven/plugin/X4OLanguageTaskMojoTest.java
View file

@ -20,12 +20,13 @@
* TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS * 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. * 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 java.io.File;
import org.apache.maven.plugin.Mojo; import org.apache.maven.plugin.Mojo;
import org.apache.maven.plugin.testing.AbstractMojoTestCase; import org.apache.maven.plugin.testing.AbstractMojoTestCase;
import org.x4o.tool.maven.plugin.X4OLanguageTaskMojo;
/** /**
* XX4OLanguageTaskMojoTest. * XX4OLanguageTaskMojoTest.

2
x4o-plugin/x4o-plugin-maven/src/test/resources/junit/test-plugin-conf-all.pom → x4o-tool/x4o-tool-maven-plugin/src/test/resources/junit/test-plugin-conf-all.pom
View file

@ -44,7 +44,7 @@
<build> <build>
<plugins> <plugins>
<plugin> <plugin>
<artifactId>x4o-plugin-maven</artifactId> <artifactId>x4o-tool-maven-plugin</artifactId>
<configuration> <configuration>
<languageName>cel</languageName> <languageName>cel</languageName>
<taskId>eld-xsd</taskId> <taskId>eld-xsd</taskId>

2
x4o-plugin/x4o-plugin-maven/src/test/resources/junit/test-plugin-conf-lang.pom → x4o-tool/x4o-tool-maven-plugin/src/test/resources/junit/test-plugin-conf-lang.pom
View file

@ -44,7 +44,7 @@
<build> <build>
<plugins> <plugins>
<plugin> <plugin>
<artifactId>x4o-plugin-maven</artifactId> <artifactId>x4o-tool-maven-plugin</artifactId>
<configuration> <configuration>
<languageName>cel</languageName> <languageName>cel</languageName>
<taskId>eld-xsd</taskId> <taskId>eld-xsd</taskId>

2
x4o-plugin/x4o-plugin-maven/src/test/resources/junit/test-plugin-defaults.pom → x4o-tool/x4o-tool-maven-plugin/src/test/resources/junit/test-plugin-defaults.pom
View file

@ -44,7 +44,7 @@
<build> <build>
<plugins> <plugins>
<plugin> <plugin>
<artifactId>x4o-plugin-maven</artifactId> <artifactId>x4o-tool-maven-plugin</artifactId>
<configuration> <configuration>
</configuration> </configuration>
</plugin> </plugin>