Author: aheritier
Date: Sat Jan 6 17:46:26 2007
New Revision: 493630
URL: http://svn.apache.org/viewvc?view=rev&rev=493630
Log:
New site report (maven-modello-plugin) to generate the model documentation and
the XML schema.
New goal modello:xsd
New goals modello:jpox and modello:jpox-metadata-class
New goals modello:jdom, and modello:jdom-writer
New goals modello:dom4j, modello:dom4j-reader and modello:dom4j-writer
New goals modello:stax, modello:stax-reader and modello:stax-writer
Automatically verify required properties.
Add a test to validate generations from modello plugins.
New property maven.modello.plugins to select plugins to call for the goal
modello:modello
The property maven.modello.targetDirectory is replaced by
maven.modello.java.targetDirectory,maven.modello.xsd.targetDirectory, and
maven.modello.xdoc.targetDirectory
The plugin is now based on modello libraries 1.0-alpha-14.
Add plugin documentation and refactor web site.
Added:
maven/maven-1/plugins-sandbox/trunk/modello/project.properties (with
props)
maven/maven-1/plugins-sandbox/trunk/modello/src/plugin-test/ (with props)
maven/maven-1/plugins-sandbox/trunk/modello/src/plugin-test/maven.xml
(with props)
maven/maven-1/plugins-sandbox/trunk/modello/src/plugin-test/project.properties
(with props)
maven/maven-1/plugins-sandbox/trunk/modello/src/plugin-test/project.xml
(with props)
maven/maven-1/plugins-sandbox/trunk/modello/src/plugin-test/src/
maven/maven-1/plugins-sandbox/trunk/modello/src/plugin-test/src/main/
maven/maven-1/plugins-sandbox/trunk/modello/src/plugin-test/src/main/mdo/
maven/maven-1/plugins-sandbox/trunk/modello/src/plugin-test/src/main/mdo/model.mdo
maven/maven-1/plugins-sandbox/trunk/modello/xdocs/changes.xml (with props)
maven/maven-1/plugins-sandbox/trunk/modello/xdocs/goals.xml (with props)
maven/maven-1/plugins-sandbox/trunk/modello/xdocs/index.xml (with props)
maven/maven-1/plugins-sandbox/trunk/modello/xdocs/install.xml (with props)
maven/maven-1/plugins-sandbox/trunk/modello/xdocs/properties.xml (with
props)
maven/maven-1/plugins-sandbox/trunk/modello/xdocs/usage.xml (with props)
Modified:
maven/maven-1/plugins-sandbox/trunk/modello/plugin.jelly
maven/maven-1/plugins-sandbox/trunk/modello/plugin.properties
maven/maven-1/plugins-sandbox/trunk/modello/project.xml
maven/maven-1/plugins-sandbox/trunk/modello/xdocs/navigation.xml
Modified: maven/maven-1/plugins-sandbox/trunk/modello/plugin.jelly
URL:
http://svn.apache.org/viewvc/maven/maven-1/plugins-sandbox/trunk/modello/plugin.jelly?view=diff&rev=493630&r1=493629&r2=493630
==============================================================================
--- maven/maven-1/plugins-sandbox/trunk/modello/plugin.jelly (original)
+++ maven/maven-1/plugins-sandbox/trunk/modello/plugin.jelly Sat Jan 6
17:46:26 2007
@@ -19,7 +19,14 @@
-->
<project
+ xmlns:j="jelly:core"
xmlns:define="jelly:define"
+ xmlns:maven="jelly:maven"
+ xmlns:x="jelly:xml"
+ xmlns:util="jelly:util"
+ xmlns:assert="assert"
+ xmlns:ant="jelly:ant"
+ xmlns:doc="doc"
xmlns:modello="modello">
<define:taglib uri="modello">
@@ -28,68 +35,202 @@
<goal name="modello" prereqs="modello:modello" />
- <goal name="modello:modello" prereqs="modello:java,modello:xdoc" />
-
- <goal name="modello:java">
- ${systemScope.setProperty('package', 'org.apache.maven.project')}
+ <goal name="modello:modello" description="Code generation based on the
property maven.modello.plugins">
+ <maven:paramCheck value="${maven.modello.plugins}" fail="true">The
property "maven.modello.plugins" must be defined.</maven:paramCheck>
+ <j:set var="modelloPlugins" value="${maven.modello.plugins}"/>
+ <j:forEach var="modelloPlugin" items="${modelloPlugins}">
+ <attainGoal name="modello:${modelloPlugin}"/>
+ </j:forEach>
+ </goal>
+
+ <!-- INTERNAL - Checks that required settings are set -->
+ <goal name="modello:check-settings">
+ <maven:paramCheck value="${maven.modello.model}" fail="true">The property
"maven.modello.model" must be defined.</maven:paramCheck>
+ <assert:assertFileExists file="${maven.modello.model}"/>
+ <util:file var="modelFile" name="${maven.modello.model}"/>
+ <x:parse var="modelDoc" xml="${modelFile}"/>
+ <x:set var="modelId" select="string($modelDoc/model/id)"/>
+ <j:set var="maven_modello_model_id" value="${modelId}" scope="parent"/>
+ <maven:paramCheck value="${maven.modello.packageWithVersion}"
fail="true">The property "maven.modello.packageWithVersion" must be
defined.</maven:paramCheck>
+ <maven:paramCheck value="${maven.modello.version}" fail="true">The
property "maven.modello.version" must be defined.</maven:paramCheck>
+ </goal>
+
+ <!-- Java Model -->
+
+ <goal name="modello:java" prereqs="modello:check-settings"
description="Generates Java Pojos of the DataModel.">
+ <maven:paramCheck value="${maven.modello.java.targetDirectory}"
fail="true">The property "maven.modello.java.targetDirectory" must be
defined.</maven:paramCheck>
+ <ant:mkdir dir="${maven.modello.java.targetDirectory}"/>
+ <ant:path id="modello.sources"
location="${maven.modello.java.targetDirectory}" />
+ <maven:addPath id="maven.compile.src.set" refid="modello.sources" />
+ <j:set var="sourcesPresent" value="true" scope="parent"/>
<modello:generate
model="${maven.modello.model}"
type="java"
packageWithVersion="${maven.modello.packageWithVersion}"
version="${maven.modello.version}"
- targetDirectory="${maven.modello.targetDirectory}" />
+ targetDirectory="${maven.modello.java.targetDirectory}" />
</goal>
- <goal name="modello:xpp3" prereqs="modello:xpp3-reader,
modello:xpp3-writer"/>
+ <!-- XPP3 Reader/Writer -->
+
+ <goal name="modello:xpp3" prereqs="modello:xpp3-reader, modello:xpp3-writer"
description="Generates classes to read/write the model from/into a xml file
using Xpp3."/>
- <goal name="modello:xpp3-reader">
- ${systemScope.setProperty('package', 'org.apache.maven.project')}
+ <goal name="modello:xpp3-reader" prereqs="modello:java"
description="Generates the class to read the model from a xml file using Xpp3.">
<modello:generate
model="${maven.modello.model}"
type="xpp3-reader"
packageWithVersion="${maven.modello.packageWithVersion}"
version="${maven.modello.version}"
- targetDirectory="${maven.modello.targetDirectory}" />
+ targetDirectory="${maven.modello.java.targetDirectory}" />
</goal>
- <goal name="modello:xpp3-writer">
- ${systemScope.setProperty('package', 'org.apache.maven.project')}
+ <goal name="modello:xpp3-writer" prereqs="modello:java"
description="Generates the class to write the model into a xml file using
Xpp3.">
<modello:generate
model="${maven.modello.model}"
type="xpp3-writer"
packageWithVersion="${maven.modello.packageWithVersion}"
version="${maven.modello.version}"
- targetDirectory="${maven.modello.targetDirectory}" />
+ targetDirectory="${maven.modello.java.targetDirectory}" />
</goal>
+
+ <!-- STAX Reader/Writer -->
+
+ <goal name="modello:stax" prereqs="modello:stax-reader, modello:stax-writer"
description="Generates classes to read/write the model from/into a xml file
using Stax."/>
- <goal name="modello:xdoc">
- ${systemScope.setProperty('package', 'org.apache.maven.project')}
+ <goal name="modello:stax-reader" prereqs="modello:java"
description="Generates the class to read the model from a xml file using Stax.">
<modello:generate
model="${maven.modello.model}"
- type="xdoc"
+ type="stax-reader"
+ packageWithVersion="${maven.modello.packageWithVersion}"
+ version="${maven.modello.version}"
+ targetDirectory="${maven.modello.java.targetDirectory}" />
+ </goal>
+
+ <goal name="modello:stax-writer" prereqs="modello:java"
description="Generates the class to write the model into a xml file using
Stax.">
+ <modello:generate
+ model="${maven.modello.model}"
+ type="stax-writer"
+ packageWithVersion="${maven.modello.packageWithVersion}"
+ version="${maven.modello.version}"
+ targetDirectory="${maven.modello.java.targetDirectory}" />
+ </goal>
+
+ <!-- DOM4J Reader/Writer -->
+
+ <goal name="modello:dom4j" prereqs="modello:dom4j-reader,
modello:dom4j-writer" description="Generates classes to read/write the model
from/into a xml file using Dom4j."/>
+
+ <goal name="modello:dom4j-reader" prereqs="modello:java"
description="Generates the class to read the model from a xml file using
Dom4j.">
+ <modello:generate
+ model="${maven.modello.model}"
+ type="dom4j-reader"
+ packageWithVersion="${maven.modello.packageWithVersion}"
+ version="${maven.modello.version}"
+ targetDirectory="${maven.modello.java.targetDirectory}" />
+ </goal>
+
+ <goal name="modello:dom4j-writer" prereqs="modello:java"
description="Generates the class to write the model into a xml file using
Dom4j.">
+ <modello:generate
+ model="${maven.modello.model}"
+ type="dom4j-writer"
packageWithVersion="${maven.modello.packageWithVersion}"
version="${maven.modello.version}"
- targetDirectory="${maven.modello.targetDirectory}" />
+ targetDirectory="${maven.modello.java.targetDirectory}" />
</goal>
- <goal name="modello:jpox-store">
- ${systemScope.setProperty('package', 'org.apache.maven.project')}
+ <!-- JDOM Writer -->
+
+ <goal name="modello:jdom" prereqs="modello:jdom-writer"
description="Generates classes to write the model into a xml file using JDom."/>
+
+ <goal name="modello:jdom-writer" prereqs="modello:java"
description="Generates classes to write the model into a xml file using JDom.">
+ <modello:generate
+ model="${maven.modello.model}"
+ type="jdom-writer"
+ packageWithVersion="${maven.modello.packageWithVersion}"
+ version="${maven.modello.version}"
+ targetDirectory="${maven.modello.java.targetDirectory}" />
+ </goal>
+
+ <!-- JPOX Storage -->
+
+ <goal name="modello:jpox" prereqs="modello:jpox-store,
modello:jpox-jdo-mapping, modello:jpox-metadata-class" description="Generates
classes to read/store the model in a database using JPox."/>
+
+ <goal name="modello:jpox-store" description="Generates the persistence
mechanism using JPOX.">
<modello:generate
model="${maven.modello.model}"
type="jpox-store"
packageWithVersion="${maven.modello.packageWithVersion}"
version="${maven.modello.version}"
- targetDirectory="${maven.modello.targetDirectory}" />
+ targetDirectory="${maven.modello.java.targetDirectory}" />
</goal>
- <goal name="modello:jpox-jdo-mapping">
- ${systemScope.setProperty('package', 'org.apache.maven.project')}
+ <goal name="modello:jpox-jdo-mapping" description="Generates the JDO mapping
for JPOX.">
<modello:generate
model="${maven.modello.model}"
type="jpox-jdo-mapping"
packageWithVersion="${maven.modello.packageWithVersion}"
version="${maven.modello.version}"
- targetDirectory="${maven.modello.targetDirectory}" />
+ targetDirectory="${maven.modello.java.targetDirectory}" />
+ </goal>
+
+ <goal name="modello:jpox-metadata-class" description="Generates MetaData
class for jpox.">
+ <modello:generate
+ model="${maven.modello.model}"
+ type="jpox-metadata-class"
+ packageWithVersion="${maven.modello.packageWithVersion}"
+ version="${maven.modello.version}"
+ targetDirectory="${maven.modello.java.targetDirectory}" />
</goal>
+
+ <!-- XSD generation -->
+
+ <goal name="modello:xsd" prereqs="modello:check-settings"
description="Generates an XML Schema for the xml file used to store the model.">
+ <maven:paramCheck value="${maven.modello.xsd.targetDirectory}"
fail="true">The property "maven.modello.xsd.targetDirectory" must be
defined.</maven:paramCheck>
+ <ant:mkdir dir="${maven.modello.xsd.targetDirectory}"/>
+ <modello:generate
+ model="${maven.modello.model}"
+ type="xsd"
+ packageWithVersion="${maven.modello.packageWithVersion}"
+ version="${maven.modello.version}"
+ targetDirectory="${maven.modello.xsd.targetDirectory}" />
+ </goal>
+
+ <!-- XDOC generation -->
+
+ <goal name="modello:xdoc" prereqs="modello:check-settings"
description="Generates a xdoc file to document the model.">
+ <maven:paramCheck value="${maven.modello.xdoc.targetDirectory}"
fail="true">The property "maven.modello.xdoc.targetDirectory" must be
defined.</maven:paramCheck>
+ <ant:mkdir dir="${maven.modello.xdoc.targetDirectory}"/>
+ <modello:generate
+ model="${maven.modello.model}"
+ type="xdoc"
+ packageWithVersion="${maven.modello.packageWithVersion}"
+ version="${maven.modello.version}"
+ targetDirectory="${maven.modello.xdoc.targetDirectory}" />
+ </goal>
+
+ <!-- Site report (XDOC + XSD) -->
+
+ <goal name="maven-modello-plugin:register" description="Register the model
documentation." prereqs="modello:check-settings">
+ <doc:registerReport
+ name="Model documentation"
+ pluginName="maven-modello-plugin-xdoc"
+ link="${maven_modello_model_id}"
+ description="Documentation of the model."/>
+ <doc:registerReport
+ name="Model schema"
+ pluginName="maven-modello-plugin-xsd"
+ link="${maven_modello_model_id}-${maven.modello.version}"
+ target="_blank"
+ fileSuffix=".xsd"
+ description="Schema for the xml model."/>
+ </goal>
+
+ <goal name="maven-modello-plugin:deregister" description="Deregister the
model documentation.">
+ <doc:deregisterReport name="Model documentation"/>
+ <doc:deregisterReport name="Model schema"/>
+ </goal>
+
+ <goal name="maven-modello-plugin-xdoc:report" description="Called by site to
generate the model documentation." prereqs="modello:xdoc"/>
+
+ <goal name="maven-modello-plugin-xsd:report" description="Called by site to
generate the model schema." prereqs="modello:xsd"/>
</project>
Modified: maven/maven-1/plugins-sandbox/trunk/modello/plugin.properties
URL:
http://svn.apache.org/viewvc/maven/maven-1/plugins-sandbox/trunk/modello/plugin.properties?view=diff&rev=493630&r1=493629&r2=493630
==============================================================================
--- maven/maven-1/plugins-sandbox/trunk/modello/plugin.properties (original)
+++ maven/maven-1/plugins-sandbox/trunk/modello/plugin.properties Sat Jan 6
17:46:26 2007
@@ -1,2 +1,24 @@
+# -------------------------------------------------------------------
+# Copyright 2001-2006 The Apache Software Foundation.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+# -------------------------------------------------------------------
maven.modello.model=${basedir}/src/main/resources/model.mdo
-maven.modello.targetDirectory=${maven.build.dir}/generated-sources/modello
+maven.modello.packageWithVersion=
+maven.modello.version=
+
+maven.modello.java.targetDirectory=${maven.build.dir}/generated-src/main/modello
+maven.modello.xsd.targetDirectory=${maven.gen.docs}
+maven.modello.xdoc.targetDirectory=${maven.gen.docs}
+
+maven.modello.plugins=java,xdoc
\ No newline at end of file
Added: maven/maven-1/plugins-sandbox/trunk/modello/project.properties
URL:
http://svn.apache.org/viewvc/maven/maven-1/plugins-sandbox/trunk/modello/project.properties?view=auto&rev=493630
==============================================================================
--- maven/maven-1/plugins-sandbox/trunk/modello/project.properties (added)
+++ maven/maven-1/plugins-sandbox/trunk/modello/project.properties Sat Jan 6
17:46:26 2007
@@ -0,0 +1,22 @@
+# -------------------------------------------------------------------
+# Copyright 2001-2007 The Apache Software Foundation.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+# -------------------------------------------------------------------
+
+#=====
+# Repositories settings
+#=====
+
+# TODO: remove http://snapshots.dist.codehaus.org/modello/ and
http://people.apache.org/repo/m1-snapshot-repository/
+maven.repo.remote =
http://snapshots.dist.codehaus.org/modello/,http://people.apache.org/repo/m1-snapshot-repository/,http://repo1.maven.org/maven
\ No newline at end of file
Propchange: maven/maven-1/plugins-sandbox/trunk/modello/project.properties
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/maven-1/plugins-sandbox/trunk/modello/project.properties
------------------------------------------------------------------------------
svn:keywords = "Author Date Id Revision"
Modified: maven/maven-1/plugins-sandbox/trunk/modello/project.xml
URL:
http://svn.apache.org/viewvc/maven/maven-1/plugins-sandbox/trunk/modello/project.xml?view=diff&rev=493630&r1=493629&r2=493630
==============================================================================
--- maven/maven-1/plugins-sandbox/trunk/modello/project.xml (original)
+++ maven/maven-1/plugins-sandbox/trunk/modello/project.xml Sat Jan 6 17:46:26
2007
@@ -1,26 +1,29 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-/*
- * Copyright 2001-2006 The Apache Software Foundation.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
- -->
-<project>
+<?xml version="1.0" encoding="ISO-8859-1"?>
+
+<!--
+ /*
+ * Copyright 2001-2006 The Apache Software Foundation.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+-->
+<project xmlns="http://maven.apache.org/POM/3.0.0";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
+ xsi:schemaLocation="http://maven.apache.org/POM/3.0.0
http://maven.apache.org/maven-v3_0_0.xsd";>
<extend>../plugins-parent/project.xml</extend>
<artifactId>maven-modello-plugin</artifactId>
- <name>Maven Modello Plugin</name>
- <currentVersion>1.0-alpha-3-SNAPSHOT</currentVersion>
+ <name>Maven Modello Plugin</name>
+ <description><a href="http://modello.codehaus.org/";
target="_blank">Modello</a> is a Data Model toolkit. This plugin permits to
integrate modello services in your build to automatically (or manually)
generate the code and the documentation from the DataModel.</description>
+ <currentVersion>1.0-SNAPSHOT</currentVersion>
<inceptionYear>2004</inceptionYear>
<developers>
<developer>
@@ -45,68 +48,129 @@
</developer>
</developers>
<dependencies>
- <!-- Modello -->
+ <!-- Modello Core -->
<dependency>
<groupId>org.codehaus.modello</groupId>
<artifactId>modello-core</artifactId>
- <version>1.0-alpha-12-SNAPSHOT</version>
- </dependency>
- <dependency>
- <groupId>org.codehaus.modello</groupId>
- <artifactId>modello-plugin-xml</artifactId>
- <version>1.0-alpha-12-SNAPSHOT</version>
- </dependency>
- <dependency>
- <groupId>org.codehaus.modello</groupId>
- <artifactId>modello-plugin-xpp3</artifactId>
- <version>1.0-alpha-12-SNAPSHOT</version>
- </dependency>
+ <version>1.0-alpha-14-SNAPSHOT</version>
+ </dependency>
+
+ <!-- Modello XPP3 plugin -->
+ <dependency>
+ <groupId>org.codehaus.modello</groupId>
+ <artifactId>modello-plugin-xpp3</artifactId>
+ <version>1.0-alpha-14-SNAPSHOT</version>
+ </dependency>
+
+ <!-- Modello STAX plugin -->
+ <dependency>
+ <groupId>org.codehaus.modello</groupId>
+ <artifactId>modello-plugin-stax</artifactId>
+ <version>1.0-alpha-14-SNAPSHOT</version>
+ </dependency>
+
+ <!-- Modello DOM4J plugin -->
<dependency>
<groupId>org.codehaus.modello</groupId>
<artifactId>modello-plugin-dom4j</artifactId>
- <version>1.0-alpha-12-SNAPSHOT</version>
- </dependency>
+ <version>1.0-alpha-14-SNAPSHOT</version>
+ </dependency>
+
+ <!-- Modello XDOC plugin -->
<dependency>
<groupId>org.codehaus.modello</groupId>
<artifactId>modello-plugin-xdoc</artifactId>
- <version>1.0-alpha-12-SNAPSHOT</version>
- </dependency>
+ <version>1.0-alpha-14-SNAPSHOT</version>
+ </dependency>
+
+ <!-- Modello JPOX plugin -->
<dependency>
<groupId>org.codehaus.modello</groupId>
<artifactId>modello-plugin-jpox</artifactId>
- <version>1.0-alpha-12-SNAPSHOT</version>
- </dependency>
+ <version>1.0-alpha-14-SNAPSHOT</version>
+ </dependency>
+
+ <!-- Modello XSD plugin -->
+ <dependency>
+ <groupId>org.codehaus.modello</groupId>
+ <artifactId>modello-plugin-xsd</artifactId>
+ <version>1.0-alpha-14-SNAPSHOT</version>
+ </dependency>
+
+ <!-- Modello JDOM plugin -->
+ <dependency>
+ <groupId>org.codehaus.modello</groupId>
+ <artifactId>modello-plugin-jdom</artifactId>
+ <version>1.0-alpha-14-SNAPSHOT</version>
+ </dependency>
+
+ <!-- Modello plugin utilities-->
<dependency>
<groupId>org.codehaus.modello</groupId>
<artifactId>modello-plugin-store</artifactId>
- <version>1.0-alpha-12-SNAPSHOT</version>
- </dependency>
- <!-- Plexus -->
- <dependency>
- <groupId>plexus</groupId>
- <artifactId>plexus-container-default</artifactId>
- <version>1.0-alpha-6</version>
- </dependency>
- <dependency>
- <groupId>plexus</groupId>
- <artifactId>plexus-utils</artifactId>
- <version>1.0.3</version>
- </dependency>
- <dependency>
- <groupId>plexus</groupId>
- <artifactId>plexus-velocity</artifactId>
- <version>1.1.1</version>
- </dependency>
- <dependency>
- <groupId>classworlds</groupId>
- <artifactId>classworlds</artifactId>
- <version>1.1</version>
- </dependency>
- <dependency>
- <groupId>maven</groupId>
- <artifactId>velocity</artifactId>
- <version>1.5-20060721.044818</version>
- </dependency>
+ <version>1.0-alpha-14-SNAPSHOT</version>
+ <properties>
+ <comment>Required by modello-plugin-stax</comment>
+ </properties>
+ </dependency>
+ <dependency>
+ <groupId>org.codehaus.modello</groupId>
+ <artifactId>modello-plugin-xml</artifactId>
+ <version>1.0-alpha-14-SNAPSHOT</version>
+ <properties>
+ <comment>
+ Required by modello-plugin-xpp3, modello-plugin-stax,
modello-plugin-dom4j, modello-plugin-xdoc,
+ modello-plugin-xsd, modello-plugin-jdom
+ </comment>
+ </properties>
+ </dependency>
+
+ <!-- Other dependencies -->
+ <dependency>
+ <groupId>org.codehaus.plexus</groupId>
+ <artifactId>plexus-container-default</artifactId>
+ <version>1.0-alpha-15</version>
+ <properties>
+ <comment>Required by modello-core</comment>
+ </properties>
+ </dependency>
+ <dependency>
+ <groupId>org.codehaus.plexus</groupId>
+ <artifactId>plexus-component-api</artifactId>
+ <version>1.0-alpha-15</version>
+ <properties>
+ <comment>Required by plexus</comment>
+ </properties>
+ </dependency>
+ <dependency>
+ <groupId>org.codehaus.plexus</groupId>
+ <artifactId>plexus-utils</artifactId>
+ <version>1.0.5</version>
+ <properties>
+ <comment>Required by modello-plugin-xpp3, modello-plugin-jdom</comment>
+ </properties>
+ </dependency>
+ <dependency>
+ <groupId>org.codehaus.plexus</groupId>
+ <artifactId>plexus-velocity</artifactId>
+ <version>1.1.2</version>
+ <properties>
+ <comment>Required by modello-plugin-store</comment>
+ </properties>
+ </dependency>
+ <dependency>
+ <groupId>org.codehaus.plexus</groupId>
+ <artifactId>plexus-classworlds</artifactId>
+ <version>1.2-alpha-5</version>
+ <properties>
+ <comment>Required by plexus</comment>
+ </properties>
+ </dependency>
+
+ <!-- BE CAREFUL -->
+ <!-- You'll not find here the dependencies needed to use classes generated
by modello -->
+ <!-- BE CAREFUL -->
+
</dependencies>
<versions>
<version>
@@ -114,10 +178,10 @@
<name>1.0-alpha-1</name>
<tag>maven-modello-plugin-1.0-alpha-1</tag>
</version>
- <version>
- <id>1.0-alpha-2</id>
- <name>1.0-alpha-2</name>
- <tag>maven-modello-plugin-1.0-alpha-2</tag>
- </version>
+ <version>
+ <id>1.0-alpha-2</id>
+ <name>1.0-alpha-2</name>
+ <tag>maven-modello-plugin-1.0-alpha-2</tag>
+ </version>
</versions>
</project>
Propchange: maven/maven-1/plugins-sandbox/trunk/modello/src/plugin-test/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Sat Jan 6 17:46:26 2007
@@ -0,0 +1 @@
+target
Added: maven/maven-1/plugins-sandbox/trunk/modello/src/plugin-test/maven.xml
URL:
http://svn.apache.org/viewvc/maven/maven-1/plugins-sandbox/trunk/modello/src/plugin-test/maven.xml?view=auto&rev=493630
==============================================================================
--- maven/maven-1/plugins-sandbox/trunk/modello/src/plugin-test/maven.xml
(added)
+++ maven/maven-1/plugins-sandbox/trunk/modello/src/plugin-test/maven.xml Sat
Jan 6 17:46:26 2007
@@ -0,0 +1,54 @@
+<?xml version="1.0"?>
+<!--
+ /*
+ * Copyright 2001-2006 The Apache Software Foundation.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+-->
+<project xmlns:j="jelly:core" xmlns:maven="jelly:maven" xmlns:assert="assert">
+
+ <!-- Register Modello -->
+ <preGoal name="java:compile">
+ <attainGoal name="modello"/>
+ </preGoal>
+
+ <goal name="testPlugin" prereqs="clean,testJava,testSite"/>
+
+ <goal name="testJava" prereqs="jar">
+ <!-- Java Plugin -->
+ <assert:assertFileExists
file="${maven.build.dest}/org/apache/maven/model/Model.class"/>
+ <!-- XPP3 Plugin -->
+ <assert:assertFileExists
file="${maven.build.dest}/org/apache/maven/model/io/xpp3/MavenXpp3Reader.class"/>
+ <assert:assertFileExists
file="${maven.build.dest}/org/apache/maven/model/io/xpp3/MavenXpp3Writer.class"/>
+ <!-- Stax Plugin -->
+ <assert:assertFileExists
file="${maven.build.dest}/org/apache/maven/model/io/stax/MavenStaxReader.class"/>
+ <assert:assertFileExists
file="${maven.build.dest}/org/apache/maven/model/io/stax/MavenStaxWriter.class"/>
+ <!-- Dom4J Plugin -->
+ <assert:assertFileExists
file="${maven.build.dest}/org/apache/maven/model/io/dom4j/MavenDom4jReader.class"/>
+ <assert:assertFileExists
file="${maven.build.dest}/org/apache/maven/model/io/dom4j/MavenDom4jWriter.class"/>
+ <!-- JPox Plugin -->
+ <assert:assertFileExists
file="${maven.build.dest}/org/apache/maven/model/MavenJPoxStore.class"/>
+ <assert:assertFileExists
file="${maven.build.dest}/org/apache/maven/model/MavenModelloMetadata.class"/>
+ <!-- JDom Plugin -->
+ <assert:assertFileExists
file="${maven.build.dest}/org/apache/maven/model/io/jdom/MavenJDOMWriter.class"/>
+ </goal>
+
+ <goal name="testSite" prereqs="site">
+ <assert:assertFileExists
file="${maven.gen.docs}/${maven_modello_model_id}.xml"/>
+ <assert:assertFileExists
file="${maven.gen.docs}/${maven_modello_model_id}-${maven.modello.version}.xsd"/>
+ <assert:assertFileExists
file="${maven.docs.dest}/${maven_modello_model_id}.html"/>
+ <assert:assertFileExists
file="${maven.docs.dest}/${maven_modello_model_id}-${maven.modello.version}.xsd"/>
+ </goal>
+
+</project>
Propchange:
maven/maven-1/plugins-sandbox/trunk/modello/src/plugin-test/maven.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
maven/maven-1/plugins-sandbox/trunk/modello/src/plugin-test/maven.xml
------------------------------------------------------------------------------
svn:keywords = "Author Date Id Revision"
Added:
maven/maven-1/plugins-sandbox/trunk/modello/src/plugin-test/project.properties
URL:
http://svn.apache.org/viewvc/maven/maven-1/plugins-sandbox/trunk/modello/src/plugin-test/project.properties?view=auto&rev=493630
==============================================================================
---
maven/maven-1/plugins-sandbox/trunk/modello/src/plugin-test/project.properties
(added)
+++
maven/maven-1/plugins-sandbox/trunk/modello/src/plugin-test/project.properties
Sat Jan 6 17:46:26 2007
@@ -0,0 +1,19 @@
+# -------------------------------------------------------------------
+# Copyright 2001-2006 The Apache Software Foundation.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+# -------------------------------------------------------------------
+maven.modello.model=${basedir}/src/main/mdo/model.mdo
+maven.modello.packageWithVersion=false
+maven.modello.version=3.0.0
+maven.modello.plugins=xpp3,stax,dom4j,jpox,jdom
\ No newline at end of file
Propchange:
maven/maven-1/plugins-sandbox/trunk/modello/src/plugin-test/project.properties
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
maven/maven-1/plugins-sandbox/trunk/modello/src/plugin-test/project.properties
------------------------------------------------------------------------------
svn:keywords = "Author Date Id Revision"
Added: maven/maven-1/plugins-sandbox/trunk/modello/src/plugin-test/project.xml
URL:
http://svn.apache.org/viewvc/maven/maven-1/plugins-sandbox/trunk/modello/src/plugin-test/project.xml?view=auto&rev=493630
==============================================================================
--- maven/maven-1/plugins-sandbox/trunk/modello/src/plugin-test/project.xml
(added)
+++ maven/maven-1/plugins-sandbox/trunk/modello/src/plugin-test/project.xml Sat
Jan 6 17:46:26 2007
@@ -0,0 +1,86 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+
+<!--
+ /*
+ * Copyright 2001-2006 The Apache Software Foundation.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+-->
+<project xmlns="http://maven.apache.org/POM/3.0.0";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
+ xsi:schemaLocation="http://maven.apache.org/POM/3.0.0
http://maven.apache.org/maven-v3_0_0.xsd";>
+ <pomVersion>3</pomVersion>
+ <groupId>maven</groupId>
+ <artifactId>maven-modello-plugin-tests</artifactId>
+ <currentVersion>1.0</currentVersion>
+ <name>Test project for Modello</name>
+ <description>This project is used to test capabilities of the modello
plugin</description>
+ <package>org.apache.maven.model</package>
+ <dependencies>
+ <dependency>
+ <groupId>javax.jdo</groupId>
+ <artifactId>jdo2-api</artifactId>
+ <version>2.0</version>
+ <properties>
+ <comment>Required for modello JDO/JPOX storage</comment>
+ </properties>
+ </dependency>
+ <dependency>
+ <groupId>maven</groupId>
+ <artifactId>dom4j</artifactId>
+ <version>1.7-20060614</version>
+ <properties>
+ <comment>Required for modello DOM4J Reader/Writer</comment>
+ </properties>
+ </dependency>
+ <dependency>
+ <groupId>org.codehaus.plexus</groupId>
+ <artifactId>plexus-utils</artifactId>
+ <version>1.0.5</version>
+ <properties>
+ <comment>Required for modello DOM4J Reader/Writer</comment>
+ </properties>
+ </dependency>
+ <dependency>
+ <groupId>stax</groupId>
+ <artifactId>stax-api</artifactId>
+ <version>1.0.1</version>
+ <properties>
+ <comment>Required for modello STAX Reader/Writer</comment>
+ </properties>
+ </dependency>
+ <dependency>
+ <groupId>net.java.dev.stax-utils</groupId>
+ <artifactId>stax-utils</artifactId>
+ <version>20060502</version>
+ <properties>
+ <comment>Required for modello STAX Reader/Writer</comment>
+ </properties>
+ </dependency>
+ <dependency>
+ <groupId>jdom</groupId>
+ <artifactId>jdom</artifactId>
+ <version>1.0</version>
+ <properties>
+ <comment>Required for modello JDOM Writer</comment>
+ </properties>
+ </dependency>
+ </dependencies>
+ <build>
+
<sourceDirectory>${maven.build.dir}/generated-src/main/modello</sourceDirectory>
+ </build>
+ <reports>
+ <report>maven-javadoc-plugin</report>
+ <report>maven-modello-plugin</report>
+ </reports>
+</project>
Propchange:
maven/maven-1/plugins-sandbox/trunk/modello/src/plugin-test/project.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
maven/maven-1/plugins-sandbox/trunk/modello/src/plugin-test/project.xml
------------------------------------------------------------------------------
svn:keywords = "Author Date Id Revision"
