Index: maven-topia-plugin/plugin.jelly
diff -u maven-topia-plugin/plugin.jelly:1.29 maven-topia-plugin/plugin.jelly:1.30
--- maven-topia-plugin/plugin.jelly:1.29	Fri Sep 24 15:32:15 2004
+++ maven-topia-plugin/plugin.jelly	Fri Apr 22 17:10:59 2005
@@ -73,6 +73,21 @@
  |
  | maven.topia.jdo.fileset.dir [${maven.topia.jdo.fileset.dir}]
  |     Répertoire contenant les fichiers .jdo utitlisé par l'enhancer tjdo
+ |
+ | maven.topia.xmi.extractedPackages [${maven.topia.xmi.extractedPackages}]
+ |     Liste des packages à inclure lors de l'extraction depuis le XMI
+ |
+ | maven.topia.database.driver [${maven.topia.database.driver}]
+ |     Driver à utiliser pour la connection à la BD
+ |
+ | maven.topia.database.URL [${maven.topia.database.URL}]
+ |     URL de la BD
+ |
+ | maven.topia.database.user [${maven.topia.database.user}]
+ |     Nom d'utilisateur pour la connexion à la BD
+ |
+ | maven.topia.database.password [${maven.topia.database.password}]
+ |     Password pour la connexion à la BD
  +--
     </echo>
   </goal>
@@ -210,11 +225,11 @@
     <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"
+        <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"
+        <j:set var="maven.topia.jdo.PersistenceManagerFactoryClass"
                value="com.triactive.jdo.PersistenceManagerFactoryImpl"/>
       </j:if>
     </j:if>
@@ -262,6 +277,11 @@
       <j:set var="maven.topia.xmi.dir" value="xmi"/>
     </j:if>
 
+    <j:set var="valX" value="${maven.topia.xmi.extractedPackages}X"/>
+    <j:if test="${valX == 'X'}">
+      <j:set var="maven.topia.xmi.extractedPackages" value=""/>
+    </j:if>                                                                                                                                                                              
+
     <j:set var="valX" value="${maven.topia.UIModel.dir}X"/>
     <j:if test="${valX == 'X'}">
       <j:set var="maven.topia.UIModel.dir" value="uimodel"/>
@@ -289,6 +309,30 @@
 
     <j:set var="maven.tjdo.jdo.fileset.dir" value="${maven.topia.jdo.fileset.dir}"/>
 
+    <j:set var="valX" value="${maven.topia.database.driver}X"/>
+    <j:if test="${valX == 'X'}">
+      <j:set var="maven.topia.database.driver" value="org.postgresql.Driver"/>
+    </j:if>
+
+    <j:set var="valX" value="${maven.topia.database.URL}X"/>
+    <j:if test="${valX == 'X'}">
+      <j:set var="maven.topia.database.URL" value="jdbc:postgresql://localhost/database"/>
+    </j:if>
+
+    <j:set var="valX" value="${maven.topia.database.user}X"/>
+    <j:if test="${valX == 'X'}">
+      <j:set var="maven.topia.database.user" value="dbuser"/>
+    </j:if>
+
+    <j:set var="valX" value="${maven.topia.database.password}X"/>
+    <j:if test="${valX == 'X'}">
+      <j:set var="maven.topia.database.password" value="xxxxxxxx"/>
+    </j:if>
+
+
+
+
+
   </goal>
 
   <!-- ================================================================== -->
@@ -368,6 +412,7 @@
                style="${maven.topia.xmiToObjectModel.stylesheet}"
                includes="**/*.xmi">
                <param name="fullPackagePath" expression="${pom.package}"/>
+               <param name="extraPackages" expression="${maven.topia.xmi.extractedPackages}"/>
       </ant:xsl>
     </j:if>
   </goal>
@@ -440,7 +485,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}"
+                       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}"
                        includes="**/*.objectmodel" />
     </j:if>
     </j:if>
@@ -499,11 +544,14 @@
       <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"/>
     </j:if>
   </goal>

Index: maven-topia-plugin/project.xml
diff -u maven-topia-plugin/project.xml:1.32 maven-topia-plugin/project.xml:1.33
--- maven-topia-plugin/project.xml:1.32	Fri Nov  5 12:11:35 2004
+++ maven-topia-plugin/project.xml	Fri Apr 22 17:10:59 2005
@@ -6,7 +6,7 @@
   <id>maven-topia-plugin</id>
 
   <name>Maven plugin for ToPIA</name>
-  <currentVersion>0.27</currentVersion>
+  <currentVersion>0.29</currentVersion>
 
   <inceptionYear>2004</inceptionYear>
   <package>org.codelutin.topia</package>
@@ -57,7 +57,7 @@
     <dependency>
       <groupId>lutinlib</groupId>
       <artifactId>lutinutil</artifactId>
-      <version>0.12</version>
+      <version>0.15</version>
     </dependency>
     <dependency>
       <groupId>xalan</groupId>
@@ -68,18 +68,18 @@
     <dependency>
       <groupId>lutinlib</groupId>
       <artifactId>lutingenerator</artifactId>
-      <version>0.21</version>
+      <version>0.23</version>
     </dependency>
     <dependency>
       <groupId>lutinlib</groupId>
       <artifactId>lutinprocessor</artifactId>
-      <version>0.11</version>
+      <version>0.12</version>
     </dependency>
     <!-- Les generateurs de code pour ToPIA -->
     <dependency>
       <groupId>lutinlib</groupId>
       <artifactId>topia</artifactId>
-      <version>0.27</version>
+      <version>0.29</version>
     </dependency>
 
     <!-- Dependance des UI generators -->
@@ -92,7 +92,7 @@
     <dependency>
       <groupId>lutinlib</groupId>
       <artifactId>lutini18n</artifactId>
-      <version>0.12</version>
+      <version>0.17</version>
     </dependency>
     <dependency>
       <groupId>lutinlib</groupId>