Index: maven-topia-plugin/lutinproject.xml
diff -u maven-topia-plugin/lutinproject.xml:1.7 maven-topia-plugin/lutinproject.xml:1.8
--- maven-topia-plugin/lutinproject.xml:1.7	Thu Dec 23 18:27:42 2004
+++ maven-topia-plugin/lutinproject.xml	Tue Jun 28 15:03:24 2005
@@ -14,7 +14,7 @@
   </organization>
 
   <!-- the project home page -->
-  <url>http://labs.libre-entreprise.org/${pom.artifactId}</url>
+  <url>http://labs.libre-entreprise.org/projects/${pom.artifactId}</url>
 
   <issueTrackingUrl>http://labs.libre-entreprise.org/tracker/</issueTrackingUrl>
 
@@ -94,7 +94,7 @@
   <reports>
     <report>maven-changelog-plugin</report>
     <report>maven-changes-plugin</report>
-    <report>maven-checkstyle-plugin</report>
+<!--    <report>maven-checkstyle-plugin</report> -->
     <report>maven-developer-activity-plugin</report>
     <report>maven-file-activity-plugin</report>
     <report>maven-javadoc-plugin</report>
@@ -102,9 +102,9 @@
     <report>maven-junit-report-plugin</report>
     <report>maven-jxr-plugin</report>
     <report>maven-license-plugin</report>
-    <report>maven-pmd-plugin</report>
+<!--    <report>maven-pmd-plugin</report> -->
     <report>maven-statcvs-plugin</report>
-    <report>maven-simian-plugin</report>
+<!--    <report>maven-simian-plugin</report> -->
     <report>maven-tasklist-plugin</report>
   </reports>
 
@@ -135,6 +135,8 @@
       <resource>
         <directory>${maven.src.dir}/resources</directory>
         <includes>
+          <include>**/*.png</include>
+          <include>**/*.gif</include>
           <include>**/*.jpg</include>
           <include>**/*.xml</include>
         </includes>

Index: maven-topia-plugin/plugin.jelly
diff -u maven-topia-plugin/plugin.jelly:1.33 maven-topia-plugin/plugin.jelly:1.34
--- maven-topia-plugin/plugin.jelly:1.33	Wed Jun 15 17:17:11 2005
+++ maven-topia-plugin/plugin.jelly	Tue Jun 28 15:03:24 2005
@@ -68,6 +68,12 @@
  | maven.topia.ObjectModel.dir [${maven.topia.ObjectModel.dir}]
  |     Répertoire contenant les fichiers ObjectModel
  |
+ | maven.topia.persistence [${maven.topia.persistence}]
+ |     Type de persistence à utiliser: Topia, Serializable, JDO
+ | 
+ | maven.topia.persistence.properties [${maven.topia.persistence.properties}]
+ |     Fichier de propriétés de la persistence choisie
+ |
  | maven.topia.jdo.implementation [${maven.topia.jdo.implementation}]
  |     l'implantation JDO utilisé.
  |
@@ -260,11 +266,6 @@
       <j:set var="maven.topia.processor.includes" value="**/*.java"/>
     </j:if>
 
-    <j:set var="valX" value="${maven.topia.generator.ObjectModel}X"/>
-    <j:if test="${valX == 'X'}">
-      <j:set var="maven.topia.generator.ObjectModel" value="org.codelutin.topia.generators.jdo.ObjectModelToJDOMetaGenerator,org.codelutin.topia.generators.ui.ObjectModelToUIMetaGenerator"/>
-    </j:if>
-
     <j:set var="valX" value="${maven.topia.generator.UIModel}X"/>
     <j:if test="${valX == 'X'}">
       <j:set var="maven.topia.generator.UIModel" value="org.codelutin.topia.generators.ui.swing.UIModelToSwingMetaGenerator"/>
@@ -300,6 +301,44 @@
       <j:set var="maven.topia.xmiToObjectModel.stylesheet" value="xmi1.2ToObjectModel.xsl"/>
     </j:if>
 
+    <j:set var="valX" value="${maven.topia.persistence}X"/>
+    <j:if test="${valX == 'X'}">
+      <j:set var="maven.topia.persistence" value="Serializable"/>
+    </j:if>
+
+    <j:set var="valX" value="${maven.topia.persistence.properties}X"/>
+    <j:if test="${valX == 'X'}">
+      <j:set var="maven.topia.persistence.properties" value="${pom.name}${maven.topia.persistence}PersistenceHelper.properties"/>
+    </j:if>
+
+    <j:set var="valX" value="${maven.topia.persistence.helper}X"/>
+    <j:if test="${valX == 'X'}">
+      <echo>Choix du helper pour ${maven.topia.persistence}</echo>
+      <j:if test="${context.getVariable('maven.topia.persistence') == 'Serializable'}">
+        <j:set var="maven.topia.persistence.helper" value="org.codelutin.topia.persistence.serialization.SerializablePersistenceHelper"/>
+      </j:if>
+      <j:if test="${context.getVariable('maven.topia.persistence') == 'Topia'}">
+        <j:set var="maven.topia.persistence.helper" value="org.codelutin.topia.persistence.topia.TopiaPersistenceHelper"/>
+      </j:if>
+      <j:if test="${context.getVariable('maven.topia.persistence') == 'JDO'}">
+        <j:set var="maven.topia.persistence.helper" value="org.codelutin.topia.persistence.jdo.JDOPersistenceHelper"/>
+      </j:if>
+    </j:if>
+
+    <j:set var="valX" value="${maven.topia.generator.ObjectModel}X"/>
+    <j:if test="${valX == 'X'}">
+      <echo>Choix des générateurs pour ${maven.topia.persistence}</echo>
+      <j:if test="${context.getVariable('maven.topia.persistence') == 'Serializable'}">
+        <j:set var="maven.topia.generator.ObjectModel" value="org.codelutin.topia.generators.serializable.ObjectModelToSerializableMetaGenerator"/>
+      </j:if>
+      <j:if test="${context.getVariable('maven.topia.persistence') == 'Topia'}">
+        <j:set var="maven.topia.generator.ObjectModel" value="org.codelutin.topia.generators.topia.ObjectModelToTopiaPersistenceMetaGenerator"/>
+      </j:if>
+      <j:if test="${context.getVariable('maven.topia.persistence') == 'JDO'}">
+        <j:set var="maven.topia.generator.ObjectModel" value="org.codelutin.topia.generators.jdo.ObjectModelToJDOMetaGenerator"/>
+      </j:if>
+    </j:if>
+
     <j:set var="valX" value="${maven.topia.jdo.implementation}X"/>
     <j:if test="${valX == 'X'}">
       <j:set var="maven.topia.jdo.implementation" value="jdo-ri"/>
@@ -461,8 +500,8 @@
       <fileset dir="${maven.topia.src.dir}"
                includes="**/META-INF/ejb-jar.xml"/>
       <filterset>
-			   <filter token="pom.name" value="${pom.name}"/>
-	  </filterset>
+               <filter token="pom.name" value="${pom.name}"/>
+      </filterset>
     </ant:copy>
     <attainGoal name="topia:setproperties"/>
   </goal>
@@ -492,7 +531,7 @@
                        templates="${maven.topia.generator.ObjectModel}"
                        srcdir="${maven.topia.compile.dir}/${maven.topia.ObjectModel.dir}"
                        destdir="${maven.topia.gen.dir}/${maven.topia.java.dir}"
-                       properties="defaultPackage=${pom.package},jdo.implementation=${maven.topia.jdo.implementation},javax.jdo.PersistenceManagerFactoryClass=${maven.topia.jdo.PersistenceManagerFactoryClass},database.driver=${maven.topia.database.driver},database.URL=${maven.topia.database.URL},database.user=${maven.topia.database.user},database.password=${maven.topia.database.password},security.skip=${maven.topia.security.skip}"
+                       properties="defaultPackage=${pom.package},persistenceHelper=${maven.topia.persistence.helper},persistenceHelperProperties=${maven.topia.persistence.properties},jdo.implementation=${maven.topia.jdo.implementation},javax.jdo.PersistenceManagerFactoryClass=${maven.topia.jdo.PersistenceManagerFactoryClass},database.driver=${maven.topia.database.driver},database.URL=${maven.topia.database.URL},database.user=${maven.topia.database.user},database.password=${maven.topia.database.password},security.skip=${maven.topia.security.skip}"
                        includes="**/*.objectmodel" />
     </j:if>
     </j:if>
@@ -550,16 +589,20 @@
               todir="${maven.build.dest}">
       <fileset dir="${maven.topia.gen.dir}/java" includes="**/*.jdo, **/*-widgets.xml"/>
     </ant:copy>
-    <!-- si on defini specifiquement jpox on utilise sont enhancer -->
-    <echo>maven.topia.jdo.implementation = ${maven.topia.jdo.implementation} (${context.getVariable('maven.topia.jdo.implementation')})</echo>
-    <j:if test="${context.getVariable('maven.topia.jdo.implementation') == 'jpox'}">
-      <echo>enhance with JPOX</echo>
-      <attainGoal name="jpox"/>
-    </j:if>
-    <!-- dans tous les autres cas ou utilise le jdo-ri pour enhancer -->
-    <j:if test="${context.getVariable('maven.topia.jdo.implementation') != 'jpox'}">
-      <echo>enhance with TJDO</echo>
-      <attainGoal name="tjdo:enhance"/>
+
+    <!-- si en JDO on enhance -->
+    <j:if test="${context.getVariable('maven.topia.persistence') == 'JDO'}">
+      <!-- si on defini specifiquement jpox on utilise sont enhancer -->
+      <echo>maven.topia.jdo.implementation = ${maven.topia.jdo.implementation} (${context.getVariable('maven.topia.jdo.implementation')})</echo>
+      <j:if test="${context.getVariable('maven.topia.jdo.implementation') == 'jpox'}">
+        <echo>enhance with JPOX</echo>
+        <attainGoal name="jpox"/>
+      </j:if>
+      <!-- dans tous les autres cas ou utilise le jdo-ri pour enhancer -->
+      <j:if test="${context.getVariable('maven.topia.jdo.implementation') != 'jpox'}">
+        <echo>enhance with TJDO</echo>
+        <attainGoal name="tjdo:enhance"/>
+      </j:if>
     </j:if>
   </goal>
 
@@ -567,11 +610,20 @@
   <!-- G E N E R A T E  X D O C S                                         -->
   <!-- ================================================================== -->
 
-  <goal name="topia:docs" prereqs="topia:setproperties"
+  <goal name="topia:docs-images" prereqs="topia:setproperties"
+        description="Copie les fichiers du répertoire doc vers le répertoire xdoc">
+    <ant:copy todir="${maven.gen.docs}" preservelastmodified="true"
+              overwrite="${maven.topia.overwrite}">
+      <ant:fileset dir="${maven.topia.doc.dir}"
+                   includes="**/*.png,**/*.jpeg,**/*.jpg,**/*.gif"/>
+    </ant:copy>
+  </goal>
+
+  <goal name="topia:docs" prereqs="topia:setproperties,topia:docs-images"
         description="Genère la documentation xdocs a partir des fichiers rst">
 
 
-        <!-- TODO: creation of rst-files for farEach function is to much complicated, i think, there are simple, but what ?-->
+        <!-- TODO: creation of rst-files for farEach function is to much complicated, i think, there is simple, but what ?-->
     <fileset dir="${maven.topia.doc.dir}" id="rst.files.tmp1">
       <include name="**/*.rst"/>
     </fileset>

Index: maven-topia-plugin/project.xml
diff -u maven-topia-plugin/project.xml:1.35 maven-topia-plugin/project.xml:1.36
--- maven-topia-plugin/project.xml:1.35	Wed Jun 15 17:12:37 2005
+++ maven-topia-plugin/project.xml	Tue Jun 28 15:03:24 2005
@@ -6,7 +6,7 @@
   <id>maven-topia-plugin</id>
 
   <name>Maven plugin for ToPIA</name>
-  <currentVersion>0.33</currentVersion>
+  <currentVersion>0.34</currentVersion>
 
   <inceptionYear>2004</inceptionYear>
   <package>org.codelutin.topia</package>