Index: maven-topia-plugin/plugin.jelly
diff -u maven-topia-plugin/plugin.jelly:1.26 maven-topia-plugin/plugin.jelly:1.27
--- maven-topia-plugin/plugin.jelly:1.26	Wed Aug  4 08:56:37 2004
+++ maven-topia-plugin/plugin.jelly	Fri Aug  6 17:52:12 2004
@@ -27,6 +27,14 @@
  | maven.topia.doc.dir [${maven.topia.doc.dir}]
  |     Répertoire contenant les sources de la documentation Rst
  |
+ | maven.topia.overwrite [${maven.topia.overwrite}]
+ |     Si faux alors seul les fichiers destinations qui sont plus vieux que les
+ |     sources seront refait. Si vrai tout est toujours refait
+ |
+ | maven.topia.jdo.PersistenceManagerFactoryClass [${maven.topia.jdo.PersistenceManagerFactoryClass}]
+ |     Le PersistenceManagerFactory à utiliser, il varie suivant l'implantation
+ |     jdo que vous souhaitez utiliser
+ |
  | maven.topia.compile.dir [${maven.topia.compile.dir}]
  | maven.src.dir [${maven.src.dir}]
  |     Répertoire contenant les sources à compiler du projet, ce
@@ -60,7 +68,10 @@
  | maven.topia.ObjectModel.dir [${maven.topia.ObjectModel.dir}]
  |     Répertoire contenant les fichiers ObjectModel
  |
- | maven.tjdo.jdo.fileset.dir [${maven.tjdo.jdo.fileset.dir}]
+ | maven.topia.jdo.implementation [${maven.topia.jdo.implementation}]
+ |     l'implantation JDO utilisé.
+ |
+ | maven.topia.jdo.fileset.dir [${maven.topia.jdo.fileset.dir}]
  |     Répertoire contenant les fichiers .jdo utitlisé par l'enhancer tjdo
  +--
     </echo>
@@ -191,6 +202,23 @@
       <j:set var="maven.topia.doc.dir" value="${basedir}/doc"/>
     </j:if>
 
+    <j:set var="valX" value="${maven.topia.overwrite}X"/>
+    <j:if test="${valX == 'X'}">
+      <j:set var="maven.topia.overwrite" value="false"/>
+    </j:if>
+
+    <j:set var="valX" value="${maven.topia.jdo.PersistenceManagerFactoryClass}X"/>
+    <j:if test="${valX == 'X'}">
+      <j:if test="${context.getVariable('maven.topia.jdo.implementation') == 'jpox'}">
+    <j:set var="maven.topia.jdo.PersistenceManagerFactoryClass"
+               value="org.jpox.PersistenceManagerFactoryImpl"/>
+      </j:if>
+      <j:if test="${context.getVariable('maven.topia.jdo.implementation') != 'jpox'}">
+         <j:set var="maven.topia.jdo.PersistenceManagerFactoryClass"
+               value="com.triactive.jdo.PersistenceManagerFactoryImpl"/>
+      </j:if>
+    </j:if>
+
     <j:set var="valX" value="${maven.topia.compile.dir}X"/>
     <j:if test="${valX == 'X'}">
       <j:set var="maven.topia.compile.dir" value="${basedir}/target/src-build"/>
@@ -249,11 +277,17 @@
       <j:set var="maven.topia.xmiToObjectModel.stylesheet" value="xmi1.2ToObjectModel.xsl"/>
     </j:if>
 
-    <j:set var="valX" value="${maven.tjdo.jdo.fileset.dir}X"/>
+    <j:set var="valX" value="${maven.topia.jdo.implementation}X"/>
     <j:if test="${valX == 'X'}">
-      <j:set var="maven.tjdo.jdo.fileset.dir" value="${basedir}/src-build/java"/>
+      <j:set var="maven.topia.jdo.implementation" value="jdo-ri"/>
     </j:if>
 
+    <j:set var="valX" value="${maven.topia.jdo.fileset.dir}X"/>
+    <j:if test="${valX == 'X'}">
+      <j:set var="maven.topia.jdo.fileset.dir" value="${basedir}/src-build/java"/>
+    </j:if>
+
+    <j:set var="maven.tjdo.jdo.fileset.dir" value="${maven.topia.jdo.fileset.dir}"/>
 
   </goal>
 
@@ -284,7 +318,7 @@
       <ant:available property="xmiPresent"
                      file="${maven.topia.src.dir}/${maven.topia.xmi.dir}"/>
     <j:if test="${xmiPresent == 'true'}">
-      <ant:unzip overwrite="false"
+      <ant:unzip overwrite="${maven.topia.overwrite}"
                  dest="${maven.topia.compile.dir}/${maven.topia.xmi.dir}">
         <ant:fileset dir="${maven.topia.src.dir}/${maven.topia.xmi.dir}">
           <include name="**/*.zargo"/>
@@ -327,7 +361,7 @@
            classname="org.codelutin.xml.XSLAntTask"
            classpath="${plugin.getDependencyClasspath()}"
            onerror="report"/>
-      <ant:xsl overwrite="false"
+      <ant:xsl overwrite="${maven.topia.overwrite}"
                srcdir="${maven.topia.compile.dir}/${maven.topia.xmi.dir}"
                destdir="${maven.topia.compile.dir}/${maven.topia.ObjectModel.dir}"
                extSubstitution="objectmodel"
@@ -349,7 +383,7 @@
          classpath="${plugin.getDependencyClasspath()}"
          onerror="report"/>
     <ant:echo>Process file from ${maven.topia.src.dir} to ${maven.topia.compile.dir}</ant:echo>
-    <ant:processor overwrite="false"
+    <ant:processor overwrite="${maven.topia.overwrite}"
                    filters="${maven.topia.processor.filters}"
                    srcdir="${maven.topia.src.dir}"
                    destdir="${maven.topia.compile.dir}"
@@ -364,7 +398,7 @@
   <goal name="topia:copy" prereqs="topia:setproperties,topia:prepare-filesystem"
         description="Copie les fichiers qui n'ont pas été traité par lutinprocessor dans le répertoire de compilation">
     <ant:copy preservelastmodified="true"
-              overwrite="false"
+              overwrite="${maven.topia.overwrite}"
               todir="${maven.topia.compile.dir}">
       <fileset dir="${maven.topia.src.dir}"
                excludes="${maven.topia.processor.includes}"/>
@@ -393,24 +427,19 @@
              classname="org.codelutin.generator.GeneratorTask"
              classpath="${pom.getDependencyClasspath()}:${plugin.getDependencyClasspath()}"
              onerror="report"/>
-        <ant:generator overwrite="false"
+        <ant:generator overwrite="${maven.topia.overwrite}"
                        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}"
+                       properties="defaultPackage=${pom.package},jdo.implementation=${maven.topia.jdo.implementation},javax.jdo.PersistenceManagerFactoryClass=${maven.topia.jdo.PersistenceManagerFactoryClass}"
                        includes="**/*.objectmodel" />
     </j:if>
     </j:if>
     <ant:copy preservelastmodified="true"
-              overwrite="false"
+              overwrite="${maven.topia.overwrite}"
               todir="${maven.topia.compile.dir}">
       <fileset dir="${maven.topia.gen.dir}"/>
     </ant:copy>
-    <ant:copy preservelastmodified="true"
-              overwrite="false"
-              todir="${maven.build.dest}">
-      <fileset dir="${maven.topia.gen.dir}/java" includes="**/*.jdo"/>
-    </ant:copy>
   </goal>
 
   <goal name="topia:generateUIModel" prereqs="topia:setproperties,topia:prepare-filesystem,topia:copy"
@@ -426,7 +455,7 @@
              classname="org.codelutin.generator.GeneratorTask"
              classpath="${plugin.getDependencyClasspath()}"
              onerror="report"/>
-        <ant:generator overwrite="false"
+        <ant:generator overwrite="${maven.topia.overwrite}"
                        templates="${maven.topia.generator.UIModel}"
                        srcdir="${maven.topia.compile.dir}/${maven.topia.UIModel.dir}"
                        destdir="${maven.topia.gen.dir}/${maven.topia.java.dir}"
@@ -435,7 +464,7 @@
 <!--      </j:if> -->
     </j:if>
     <ant:copy preservelastmodified="true"
-              overwrite="false"
+              overwrite="${maven.topia.overwrite}"
               todir="${maven.topia.compile.dir}">
       <fileset dir="${maven.topia.gen.dir}"/>
     </ant:copy>
@@ -450,6 +479,27 @@
   </goal>
 
   <!-- ================================================================== -->
+  <!-- P O S T  B U I L D  A N D  E N H A N C E                           -->
+  <!-- ================================================================== -->
+
+  <goal name="topia:postbuild" prereqs="topia:setproperties"
+        description="applique l'enhancement du jdo">
+    <ant:copy preservelastmodified="true"
+              overwrite="${maven.topia.overwrite}"
+              todir="${maven.build.dest}">
+      <fileset dir="${maven.topia.gen.dir}/java" includes="**/*.jdo"/>
+    </ant:copy>
+    <!-- si on defini specifiquement jpox on utilise sont enhancer -->
+    <j:if test="${context.getVariable('maven.topia.jdo.implementation') == 'jpox'}">
+      <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'}">
+      <attainGoal name="tjdo:enhance"/>
+    </j:if>
+  </goal>
+
+  <!-- ================================================================== -->
   <!-- G E N E R A T E  X D O C S                                         -->
   <!-- ================================================================== -->
 
@@ -474,7 +524,7 @@
 
       <ant:java classname="org.codelutin.jrst.Parser" failonerror="true"
               classpath="${plugin.getDependencyClasspath()}" fork="true">
-        <arg line='--xdoc --nooverwrite -o ${destFile.replaceAll(".rst$", ".xml")} ${sourceFile}'/>
+        <arg line='--xdoc --overwrite ${maven.topia.overwrite} -o ${destFile.replaceAll(".rst$", ".xml")} ${sourceFile}'/>
       </ant:java>
     </j:forEach>
   </goal>

Index: maven-topia-plugin/project.xml
diff -u maven-topia-plugin/project.xml:1.23 maven-topia-plugin/project.xml:1.24
--- maven-topia-plugin/project.xml:1.23	Wed Aug  4 08:56:37 2004
+++ maven-topia-plugin/project.xml	Fri Aug  6 17:52:12 2004
@@ -45,7 +45,7 @@
     <dependency>
       <groupId>lutinlib</groupId>
       <artifactId>jrst</artifactId>
-      <version>0.3</version>
+      <version>0.4</version>
     </dependency>
     <dependency>
       <groupId>externallib</groupId>
@@ -61,17 +61,17 @@
     <dependency>
       <groupId>lutinlib</groupId>
       <artifactId>lutinutil</artifactId>
-      <version>0.8</version>
+      <version>0.10</version>
     </dependency>
     <dependency>
       <groupId>lutinlib</groupId>
       <artifactId>lutinxml</artifactId>
-      <version>0.5</version>
+      <version>0.6</version>
     </dependency>
     <dependency>
       <groupId>lutinlib</groupId>
       <artifactId>lutingenerator</artifactId>
-      <version>0.17</version>
+      <version>0.18</version>
     </dependency>
     <dependency>
       <groupId>lutinlib</groupId>
@@ -81,7 +81,7 @@
     <dependency>
       <groupId>lutinlib</groupId>
       <artifactId>topia</artifactId>
-      <version>0.20</version>
+      <version>0.21</version>
     </dependency>
     <dependency>
       <groupId>dom4j</groupId>