diff --git a/modello/project.xml b/modello/project.xml
index 4e3734d6..68095d5a 100644
--- a/modello/project.xml
+++ b/modello/project.xml
@@ -1,194 +1,184 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-
-<!-- 
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You 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>
-  <description>Modello 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>
-  <shortDescription>Wrapper for Modello, a Data Model toolkit.</shortDescription>
-  <currentVersion>1.0-SNAPSHOT</currentVersion>
-  <inceptionYear>2004</inceptionYear>
-  <developers>
-    <developer>
-      <name>Brett Porter</name>
-      <id>brett</id>
-      <email>brett@apache.org</email>
-      <roles>
-        <role>Developer</role>
-      </roles>
-      <timezone>+10</timezone>
-    </developer>
-    <developer>
-      <name>Arnaud Heritier</name>
-      <id>aheritier</id>
-      <email>aheritier@apache.org</email>
-      <organization>Octo Technology</organization>
-      <roles>
-        <role>PMC Member</role>
-        <role>Java Developer</role>
-      </roles>
-      <timezone>+1</timezone>
-    </developer>
-  </developers>
-  <dependencies>
-    <!-- Modello Core -->
-    <dependency>
-      <groupId>org.codehaus.modello</groupId>
-      <artifactId>modello-core</artifactId>
-      <version>1.0-alpha-15</version>
-    </dependency>
-
-    <!-- Modello XPP3 plugin -->
-    <dependency>
-      <groupId>org.codehaus.modello</groupId>
-      <artifactId>modello-plugin-xpp3</artifactId>
-      <version>1.0-alpha-15</version>
-    </dependency>
-
-    <!-- Modello STAX plugin -->
-    <dependency>
-      <groupId>org.codehaus.modello</groupId>
-      <artifactId>modello-plugin-stax</artifactId>
-      <version>1.0-alpha-15</version>
-    </dependency>
-
-    <!-- Modello DOM4J plugin -->
-    <dependency>
-      <groupId>org.codehaus.modello</groupId>
-      <artifactId>modello-plugin-dom4j</artifactId>
-      <version>1.0-alpha-15</version>
-    </dependency>
-
-    <!-- Modello XDOC plugin -->
-    <dependency>
-      <groupId>org.codehaus.modello</groupId>
-      <artifactId>modello-plugin-xdoc</artifactId>
-      <version>1.0-alpha-15</version>
-    </dependency>
-
-    <!-- Modello JPOX plugin -->
-    <dependency>
-      <groupId>org.codehaus.modello</groupId>
-      <artifactId>modello-plugin-jpox</artifactId>
-      <version>1.0-alpha-15</version>
-    </dependency>
-      <dependency>
-        <groupId>org.codehaus.modello</groupId>
-        <artifactId>modello-db-keywords</artifactId>
-        <version>1.0-alpha-15</version>
-      </dependency>
-
-    <!-- Modello XSD plugin -->
-    <dependency>
-      <groupId>org.codehaus.modello</groupId>
-      <artifactId>modello-plugin-xsd</artifactId>
-      <version>1.0-alpha-15</version>
-    </dependency>
-
-    <!-- Modello JDOM plugin -->
-    <dependency>
-      <groupId>org.codehaus.modello</groupId>
-      <artifactId>modello-plugin-jdom</artifactId>
-      <version>1.0-alpha-15</version>
-    </dependency>
-
-    <!-- Modello plugin utilities-->
-    <dependency>
-      <groupId>org.codehaus.modello</groupId>
-      <artifactId>modello-plugin-store</artifactId>
-      <version>1.0-alpha-15</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-15</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>
-      <id>1.0-alpha-1</id>
-      <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>
-  </versions>
-</project>
+<?xml version="1.0" encoding="ISO-8859-1"?>
+
+<!-- 
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You 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>
+  <description>Modello 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>
+  <shortDescription>Wrapper for Modello, a Data Model toolkit.</shortDescription>
+  <currentVersion>1.0</currentVersion>
+  <inceptionYear>2004</inceptionYear>
+  <developers>
+    <developer>
+      <name>Brett Porter</name>
+      <id>brett</id>
+      <email>brett@apache.org</email>
+      <roles>
+        <role>Developer</role>
+      </roles>
+      <timezone>+10</timezone>
+    </developer>
+    <developer>
+      <name>Arnaud Heritier</name>
+      <id>aheritier</id>
+      <email>aheritier@apache.org</email>
+      <organization>Octo Technology</organization>
+      <roles>
+        <role>PMC Member</role>
+        <role>Java Developer</role>
+      </roles>
+      <timezone>+1</timezone>
+    </developer>
+  </developers>
+  <dependencies>
+    <!-- Modello Core --> 
+    <dependency>
+      <groupId>org.codehaus.modello</groupId>
+      <artifactId>modello-core</artifactId>
+      <version>1.0-alpha-15</version>
+    </dependency>
+    <!-- Modello XPP3 plugin --> 
+    <dependency>
+      <groupId>org.codehaus.modello</groupId>
+      <artifactId>modello-plugin-xpp3</artifactId>
+      <version>1.0-alpha-15</version>
+    </dependency>
+    <!-- Modello STAX plugin --> 
+    <dependency>
+      <groupId>org.codehaus.modello</groupId>
+      <artifactId>modello-plugin-stax</artifactId>
+      <version>1.0-alpha-15</version>
+    </dependency>
+    <!-- Modello DOM4J plugin --> 
+    <dependency>
+      <groupId>org.codehaus.modello</groupId>
+      <artifactId>modello-plugin-dom4j</artifactId>
+      <version>1.0-alpha-15</version>
+    </dependency>
+    <!-- Modello XDOC plugin --> 
+    <dependency>
+      <groupId>org.codehaus.modello</groupId>
+      <artifactId>modello-plugin-xdoc</artifactId>
+      <version>1.0-alpha-15</version>
+    </dependency>
+    <!-- Modello JPOX plugin --> 
+    <dependency>
+      <groupId>org.codehaus.modello</groupId>
+      <artifactId>modello-plugin-jpox</artifactId>
+      <version>1.0-alpha-15</version>
+    </dependency>
+    <dependency>
+      <groupId>org.codehaus.modello</groupId>
+      <artifactId>modello-db-keywords</artifactId>
+      <version>1.0-alpha-15</version>
+    </dependency>
+    <!-- Modello XSD plugin --> 
+    <dependency>
+      <groupId>org.codehaus.modello</groupId>
+      <artifactId>modello-plugin-xsd</artifactId>
+      <version>1.0-alpha-15</version>
+    </dependency>
+    <!-- Modello JDOM plugin --> 
+    <dependency>
+      <groupId>org.codehaus.modello</groupId>
+      <artifactId>modello-plugin-jdom</artifactId>
+      <version>1.0-alpha-15</version>
+    </dependency>
+    <!-- Modello plugin utilities--> 
+    <dependency>
+      <groupId>org.codehaus.modello</groupId>
+      <artifactId>modello-plugin-store</artifactId>
+      <version>1.0-alpha-15</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-15</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>
+      <id>1.0-alpha-1</id>
+      <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</id>
+      <name>1.0</name>
+      <tag>maven-modello-plugin-1.0</tag>
+    </version>
+  </versions>
+</project>
diff --git a/modello/xdocs/changes.xml b/modello/xdocs/changes.xml
index 824835b3..49a52537 100644
--- a/modello/xdocs/changes.xml
+++ b/modello/xdocs/changes.xml
@@ -18,42 +18,42 @@
  * limitations under the License.
  */
  -->
-<document>
-  <properties>
-    <title>Changes</title>
-    <author email="aheritier@apache.org">Arnaud Heritier</author>
-  </properties>
-  <body>
-    <release version="1.0-SNAPSHOT" date="In SVN">
-      <action dev="aheritier" type="add">New site report (maven-modello-plugin) to generate the model documentation and the XML schema.</action>
-      <action dev="aheritier" type="add">New goal modello:xsd</action>
-      <action dev="aheritier" type="add">New goals modello:jpox and modello:jpox-metadata-class</action>
-      <action dev="aheritier" type="add">New goals modello:jdom, and modello:jdom-writer</action>
-      <action dev="aheritier" type="add">New goals modello:dom4j, modello:dom4j-reader and modello:dom4j-writer</action>
-      <action dev="aheritier" type="add">New goals modello:stax, modello:stax-reader and modello:stax-writer</action>
-      <action dev="aheritier" type="add">Automatically verify required properties.</action>
-      <action dev="aheritier" type="add">Add a test to validate generations from modello plugins.</action>
-      <action dev="aheritier" type="add">New property maven.modello.plugins to select plugins to call for the goal modello:modello</action>
-      <action dev="aheritier" type="update">The property maven.modello.targetDirectory is replaced by maven.modello.java.targetDirectory,maven.modello.xsd.targetDirectory, and maven.modello.xdoc.targetDirectory</action>
-      <action dev="aheritier" type="update">The plugin is now based on modello libraries 1.0-alpha-15.</action>    
-      <action dev="aheritier" type="add">Add plugin documentation and refactor web site.</action>
-    </release>
-    <release version="1.0-alpha-2" date="2005-09-07">
-      <action dev="brett" type="fix">Fix web site address</action>
-    </release>
-    <release version="1.0-alpha-1" date="2005-06-02">
-      <action dev="trygvis" type="add">New goals modello:jpox-store and modello:jpox-jdo-mapping</action>
-      <action dev="trygvis" type="add">New goal modello:xdoc</action>
-      <action dev="trygvis" type="add">New goals modello:xpp3-reader and modello:xpp3-writer</action>
-      <action dev="trygvis" type="add">New property maven.modello.targetDirectory</action>
-      <action dev="trygvis" type="add">New property maven.modello.version</action>
-      <action dev="trygvis" type="add">New property maven.modello.packageWithVersion</action>
-      <action dev="trygvis" type="add">New property maven.modello.model</action>
-      <action dev="brett" type="add">New goal modello:xpp3</action>
-      <action dev="brett" type="add">New goal modello:java</action>
-      <action dev="brett" type="add">New goals modello and modello:modello</action>
-      <action dev="brett" type="add">New jelly tag modello:generate</action>
-      <action dev="brett" type="add">Initiate the plugin based on modello libraries 1.0-alpha-2</action>
-    </release>
-  </body>
+<document> 
+  <properties> 
+    <title>Changes</title>  
+    <author email="aheritier@apache.org">Arnaud Heritier</author> 
+  </properties>  
+  <body> 
+    <release version="1.0" date="2007-04-15"> 
+      <action dev="aheritier" type="add">New site report (maven-modello-plugin) to generate the model documentation and the XML schema.</action>  
+      <action dev="aheritier" type="add">New goal modello:xsd</action>  
+      <action dev="aheritier" type="add">New goals modello:jpox and modello:jpox-metadata-class</action>  
+      <action dev="aheritier" type="add">New goals modello:jdom, and modello:jdom-writer</action>  
+      <action dev="aheritier" type="add">New goals modello:dom4j, modello:dom4j-reader and modello:dom4j-writer</action>  
+      <action dev="aheritier" type="add">New goals modello:stax, modello:stax-reader and modello:stax-writer</action>  
+      <action dev="aheritier" type="add">Automatically verify required properties.</action>  
+      <action dev="aheritier" type="add">Add a test to validate generations from modello plugins.</action>  
+      <action dev="aheritier" type="add">New property maven.modello.plugins to select plugins to call for the goal modello:modello</action>  
+      <action dev="aheritier" type="update">The property maven.modello.targetDirectory is replaced by maven.modello.java.targetDirectory,maven.modello.xsd.targetDirectory, and maven.modello.xdoc.targetDirectory</action>  
+      <action dev="aheritier" type="update">The plugin is now based on modello libraries 1.0-alpha-15.</action>  
+      <action dev="aheritier" type="add">Add plugin documentation and refactor web site.</action> 
+    </release>  
+    <release version="1.0-alpha-2" date="2005-09-07"> 
+      <action dev="brett" type="fix">Fix web site address</action> 
+    </release>  
+    <release version="1.0-alpha-1" date="2005-06-02"> 
+      <action dev="trygvis" type="add">New goals modello:jpox-store and modello:jpox-jdo-mapping</action>  
+      <action dev="trygvis" type="add">New goal modello:xdoc</action>  
+      <action dev="trygvis" type="add">New goals modello:xpp3-reader and modello:xpp3-writer</action>  
+      <action dev="trygvis" type="add">New property maven.modello.targetDirectory</action>  
+      <action dev="trygvis" type="add">New property maven.modello.version</action>  
+      <action dev="trygvis" type="add">New property maven.modello.packageWithVersion</action>  
+      <action dev="trygvis" type="add">New property maven.modello.model</action>  
+      <action dev="brett" type="add">New goal modello:xpp3</action>  
+      <action dev="brett" type="add">New goal modello:java</action>  
+      <action dev="brett" type="add">New goals modello and modello:modello</action>  
+      <action dev="brett" type="add">New jelly tag modello:generate</action>  
+      <action dev="brett" type="add">Initiate the plugin based on modello libraries 1.0-alpha-2</action> 
+    </release> 
+  </body> 
 </document>