Index: topia/src/java/org/codelutin/topia/generators/ObjectModelToContextPropertiesGenerator.java
diff -u topia/src/java/org/codelutin/topia/generators/ObjectModelToContextPropertiesGenerator.java:1.15 topia/src/java/org/codelutin/topia/generators/ObjectModelToContextPropertiesGenerator.java:1.16
--- topia/src/java/org/codelutin/topia/generators/ObjectModelToContextPropertiesGenerator.java:1.15	Wed Aug  3 16:11:44 2005
+++ topia/src/java/org/codelutin/topia/generators/ObjectModelToContextPropertiesGenerator.java	Wed Aug  3 16:50:05 2005
@@ -23,9 +23,9 @@
  *
  * @author Benjamin Poussin <poussin@codelutin.com>
  * Copyright Code Lutin
- * @version $Revision: 1.15 $
+ * @version $Revision: 1.16 $
  *
- * Mise a jour: $Date: 2005/08/03 16:11:44 $
+ * Mise a jour: $Date: 2005/08/03 16:50:05 $
  * par : $Author: thimel $
  */
 
@@ -40,6 +40,7 @@
 import org.codelutin.generator.models.object.ObjectModel;
 import org.codelutin.generator.models.object.ObjectModelClass;
 import org.codelutin.generator.models.object.ObjectModelClassifier;
+import org.codelutin.topia.TopiaConst; 
 import org.codelutin.topia.generators.Util;
 
 public class ObjectModelToContextPropertiesGenerator extends ObjectModelGenerator { // ObjectModelToContextPropertiesGenerator
@@ -58,31 +59,33 @@
 
     public void generateFromModel(Writer output, ObjectModel model) throws IOException {
 /*{
-context.class=<%=getProperty("defaultPackage")%>.<%=model.getName()%>Context
-context.helper.persistence=<%=getProperty("persistenceHelper")%>
-context.helper.persistence.properties.file=<%=getProperty("persistenceHelperProperties")%>
+<%=TopiaConst.CONTEXT_CLASS%>=<%=getProperty("defaultPackage")%>.<%=model.getName()%>Context
+<%=TopiaConst.HELPER_PERSISTENCE%>=<%=getProperty("persistenceHelper")%>
+<%=TopiaConst.HELPER_PERSISTENCE%>.properties.file=<%=getProperty("persistenceHelperProperties")%>
+<%=TopiaConst.HELPER_TRANSACTION%>=org.codelutin.topia.persistence.TopiaTransactionHelper
+<%=TopiaConst.HELPER_HOOK%>=org.codelutin.topia.hook.DefaultHookHelper
+<%=TopiaConst.HELPER_SECURITY%>=org.codelutin.topia.security.TopiaSecurityHelper
+<%=TopiaConst.HELPER_ENTIIES%>=org.codelutin.topia.DefaultEntitiesHelper
+
+#obsoletes
 #context.helper.persistence=org.codelutin.topia.persistence.serialization.SerializablePersistenceHelper
 #context.helper.persistence.properties.file=<%=model.getName()%>SerializablePersistenceHelper.properties
 #context.helper.persistence=org.codelutin.topia.persistence.jdo.JDOPersistenceHelper
 #context.helper.persistence.properties.file=<%=model.getName()%>JDOPersistenceHelper.properties
-context.helper.transaction=org.codelutin.topia.persistence.TopiaTransactionHelper
 #context.helper.distribution=org.codelutin.topia.distribution.LocalDistributionHelper
-context.helper.hook=org.codelutin.topia.hook.DefaultHookHelper
-context.helper.security=org.codelutin.topia.security.TopiaSecurityHelper
-context.helper.entities=org.codelutin.topia.DefaultEntitiesHelper
 
 }*/
         for(Iterator i=model.getClassifiers().iterator(); i.hasNext();){
             ObjectModelClassifier clazz = (ObjectModelClassifier)i.next();
             if(Util.isEntity(clazz)){
-/*{mapping.implementation.<%=clazz.getQualifiedName()%>Operation=<%=clazz.getQualifiedName()%>OperationImpl
-mapping.distribution.<%=clazz.getQualifiedName()%>Operation=<%=clazz.getQualifiedName()%>OperationRouter
-mapping.implementation.<%=clazz.getQualifiedName()%>PersistenceService=<%=clazz.getQualifiedName()%>PersistenceServiceImpl
+/*{<%=TopiaConst.MAPPING_IMPLEMENTATION%>.<%=clazz.getQualifiedName()%>Operation=<%=clazz.getQualifiedName()%>OperationImpl
+<%=TopiaConst.MAPPING_DISTRIBUTION%>.<%=clazz.getQualifiedName()%>Operation=<%=clazz.getQualifiedName()%>OperationRouter
+<%=TopiaConst.MAPPING_IMPLEMENTATION%>.<%=clazz.getQualifiedName()%>PersistenceService=<%=clazz.getQualifiedName()%>PersistenceServiceImpl
 }*/
             }
             if(Util.isService(clazz)){
-/*{mapping.implementation.<%=clazz.getQualifiedName()%>=<%=clazz.getQualifiedName()%>Impl
-mapping.distribution.<%=clazz.getQualifiedName()%>=<%=clazz.getQualifiedName()%>Router
+/*{<%=TopiaConst.MAPPING_IMPLEMENTATION%>.<%=clazz.getQualifiedName()%>=<%=clazz.getQualifiedName()%>Impl
+<%=TopiaConst.MAPPING_DISTRIBUTION%>.<%=clazz.getQualifiedName()%>=<%=clazz.getQualifiedName()%>Router
 }*/
             }
         }