Index: topia/src/java/org/codelutin/topia/generators/jdo/ObjectModelToJDOEntityGenerator.java
diff -u topia/src/java/org/codelutin/topia/generators/jdo/ObjectModelToJDOEntityGenerator.java:1.8 topia/src/java/org/codelutin/topia/generators/jdo/ObjectModelToJDOEntityGenerator.java:1.9
--- topia/src/java/org/codelutin/topia/generators/jdo/ObjectModelToJDOEntityGenerator.java:1.8	Mon Dec  6 18:49:23 2004
+++ topia/src/java/org/codelutin/topia/generators/jdo/ObjectModelToJDOEntityGenerator.java	Fri Dec 17 16:13:51 2004
@@ -23,9 +23,9 @@
  *
  * @author Benjamin Poussin <poussin@codelutin.com>
  * Copyright Code Lutin
- * @version $Revision: 1.8 $
+ * @version $Revision: 1.9 $
  *
- * Mise a jour: $Date: 2004/12/06 18:49:23 $
+ * Mise a jour: $Date: 2004/12/17 16:13:51 $
  * par : $Author: pineau $
  */
 
@@ -163,10 +163,10 @@
 /*{
 
     protected String _topiaId_ = null;
-    protected String _version_;
-    protected Date _creationDate_;
-    protected Date _lastUpdateDate_;
-    protected TopiaUser _lastUpdateUser_;
+    protected String _topiaVersion_;
+    protected Date _topiaCreationDate_;
+    protected Date _topiaLastUpdateDate_;
+    protected TopiaUser _topiaLastUpdateUser_;
 
     public String get_topiaId_(){
         return _topiaId_;
@@ -178,32 +178,32 @@
         }
         this._topiaId_ = topiaId;
     }
-    public String get_version_(){
-        return _version_;
+    public String get_topiaVersion_(){
+        return _topiaVersion_;
     }
-    public void set_version_(String version){
-        this._version_ = version;
+    public void set_topiaVersion_(String version){
+        this._topiaVersion_ = version;
     }
 
-    public Date get_creationDate_(){
-        return _creationDate_;
+    public Date get_topiaCreationDate_(){
+        return _topiaCreationDate_;
     }
-    public void set_creationDate_(Date creationDate){
-        this._creationDate_ = creationDate;
+    public void set_topiaCreationDate_(Date creationDate){
+        this._topiaCreationDate_ = creationDate;
     }
 
-    public Date get_lastUpdateDate_(){
-        return _lastUpdateDate_;
+    public Date get_topiaLastUpdateDate_(){
+        return _topiaLastUpdateDate_;
     }
-    public void set_lastUpdateDate_(Date lastUpdateDate){
-        this._lastUpdateDate_ = lastUpdateDate;
+    public void set_topiaLastUpdateDate_(Date lastUpdateDate){
+        this._topiaLastUpdateDate_ = lastUpdateDate;
     }
 
-    public TopiaUser get_lastUpdateUser_(){
-        return _lastUpdateUser_;
+    public TopiaUser get_topiaLastUpdateUser_(){
+        return _topiaLastUpdateUser_;
     }
-    public void set_lastUpdateUser_(TopiaUser lastUpdateUser){
-        this._lastUpdateUser_ = lastUpdateUser;
+    public void set_topiaLastUpdateUser_(TopiaUser lastUpdateUser){
+        this._topiaLastUpdateUser_ = lastUpdateUser;
     }
 
     public JDOPersistenceHelper getPersistenceHelper(){
@@ -270,10 +270,10 @@
         <%=clazz.getQualifiedName()%>Impl entity = (<%=clazz.getQualifiedName()%>Impl)topiaEntity;
 
         this._topiaId_ = entity.get_topiaId_();
-        this._version_ = entity.get_version_();
-        this._creationDate_ = (Date) entity.get_creationDate_().clone();
-        this._lastUpdateDate_ = (Date) entity.get_lastUpdateDate_().clone();
-        this._lastUpdateUser_ = entity.get_lastUpdateUser_();
+        this._topiaVersion_ = entity.get_topiaVersion_();
+        this._topiaCreationDate_ = (Date) entity.get_topiaCreationDate_().clone();
+        this._topiaLastUpdateDate_ = (Date) entity.get_topiaLastUpdateDate_().clone();
+        this._topiaLastUpdateUser_ = entity.get_topiaLastUpdateUser_();
 
     }*/
 
@@ -349,10 +349,10 @@
 
         result.setContext(getContext());
         result.set_topiaId_(_topiaId_);
-        result.set_version_(_version_);
-        result.set_creationDate_(_creationDate_);
-        result.set_lastUpdateDate_(_lastUpdateDate_);
-        result.set_lastUpdateUser_(_lastUpdateUser_);
+        result.set_topiaVersion_(_topiaVersion_);
+        result.set_topiaCreationDate_(_topiaCreationDate_);
+        result.set_topiaLastUpdateDate_(_topiaLastUpdateDate_);
+        result.set_topiaLastUpdateUser_(_topiaLastUpdateUser_);
 }*/
         // Iterate on each attribute
         for (Iterator i = clazz.getAttributes().iterator(); i.hasNext();) {
@@ -400,7 +400,7 @@
     }
 
     public TopiaEntity getLazy(TopiaContext context) throws TopiaException {
-        return new <%=clazzifier.getName()%>Lazy(context, get_topiaId_(), get_version_());
+        return new <%=clazzifier.getName()%>Lazy(context, get_topiaId_(), get_topiaVersion_());
     }
 }*/
 

Index: topia/src/java/org/codelutin/topia/generators/jdo/ObjectModelToJDOEntityMetaDataGenerator.java
diff -u topia/src/java/org/codelutin/topia/generators/jdo/ObjectModelToJDOEntityMetaDataGenerator.java:1.3 topia/src/java/org/codelutin/topia/generators/jdo/ObjectModelToJDOEntityMetaDataGenerator.java:1.4
--- topia/src/java/org/codelutin/topia/generators/jdo/ObjectModelToJDOEntityMetaDataGenerator.java:1.3	Mon Dec  6 18:49:23 2004
+++ topia/src/java/org/codelutin/topia/generators/jdo/ObjectModelToJDOEntityMetaDataGenerator.java	Fri Dec 17 16:13:51 2004
@@ -23,9 +23,9 @@
  *
  * @author Benjamin Poussin <poussin@codelutin.com>
  * Copyright Code Lutin
- * @version $Revision: 1.3 $
+ * @version $Revision: 1.4 $
  *
- * Mise a jour: $Date: 2004/12/06 18:49:23 $
+ * Mise a jour: $Date: 2004/12/17 16:13:51 $
  * par : $Author: pineau $
  */
 
@@ -103,15 +103,15 @@
         <extension vendor-name="triactive" key="length" value="255"/>
         <extension vendor-name="jpox" key="length" value="255" />
       </field>
-      <field name="_version_">
+      <field name="_topiaVersion_">
         <extension vendor-name="triactive" key="length" value="255"/>
         <extension vendor-name="jpox" key="length" value="255" />
       </field>
-      <field name="_creationDate_"/>
-      <field name="_lastUpdateDate_"/>
+      <field name="_topiaCreationDate_"/>
+      <field name="_topiaLastUpdateDate_"/>
       <!--
        | FIXME ajouter ici l'entre pour le dernier utilisateur ayant modifié l'objet
-       | <field name="_lastUpdateUser_"/>
+       | <field name="_topiaLastUpdateUser_"/>
        +-->
 }*/
 }