Index: topia/src/java/org/codelutin/topia/generators/jdo/tjdo/ObjectModelToEntityMetadataFileGenerator.java
diff -u topia/src/java/org/codelutin/topia/generators/jdo/tjdo/ObjectModelToEntityMetadataFileGenerator.java:1.7 topia/src/java/org/codelutin/topia/generators/jdo/tjdo/ObjectModelToEntityMetadataFileGenerator.java:1.8
--- topia/src/java/org/codelutin/topia/generators/jdo/tjdo/ObjectModelToEntityMetadataFileGenerator.java:1.7	Wed Jun 16 09:41:26 2004
+++ topia/src/java/org/codelutin/topia/generators/jdo/tjdo/ObjectModelToEntityMetadataFileGenerator.java	Fri Jun 18 18:29:20 2004
@@ -38,8 +38,7 @@
         if (! Util.isEntity(clazz)) return;
 
 //				------------- XML header
- /*{
-<?xml version="1.0"?>
+ /*{<?xml version="1.0"?>
 <!DOCTYPE jdo PUBLIC "-//Sun Microsystems, Inc.//DTD Java Data Objects Metadata 1.0//EN" "http://java.sun.com/dtd/jdo_1_0.dtd">
 }*/
 
@@ -58,13 +57,13 @@
 }*/
         if (! hasSuperClass) {
 /*{
-      <field name="_version">
+      <field name="_version_">
         <extension vendor-name="triactive" key="length" value="unlimited"/>
       </field>
-      <field name="_creationDate"/>
-      <field name="_lastUpdateDate"/>
+      <field name="_creationDate_"/>
+      <field name="_lastUpdateDate_"/>
 }*/
-// TODO     <field name="_lastUpdateUser"/>
+// TODO     <field name="_lastUpdateUser_"/>
 
             }
 
@@ -73,15 +72,9 @@
         for (Iterator i = clazz.getAttributes().iterator(); i.hasNext();) {
             ObjectModelAttribute attribute = (ObjectModelAttribute) i.next();
             ObjectModelClassifier classifier = attribute.getClassifier();
-            if (classifier == null) {
 /*{
-      <field name="<%=attribute.getName()%>">
+      <field name="_<%=attribute.getName()%>">
 }*/
-            } else {
-/*{
-      <field name="<%=attribute.getName()%>DO">
-}*/
-            }
             if (Util.isNMultiplicity(attribute)) {
 /*{
         <collection element-type="<%=classifier.getPackageName()+".persistence."+classifier.getName()%>JDODO">