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

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

View file

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

View file

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

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

View file

@ -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;

View file

@ -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;

View file

@ -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;

View file

@ -28,7 +28,7 @@
<property name="test.dir" value="${basedir}/target/test-elddoc/"/>
<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}/test"/>
</target>

View file

@ -28,7 +28,7 @@
<property name="test.dir" value="${basedir}/target/test-schemas/"/>
<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}/test"/>
</target>

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

View file

@ -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;

View file

@ -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.

View file

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

View file

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

View file

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