Index: ofbiz-neogia-generators/src/java/org/nereide/ofbiz/neogia/generators/GeneratorServicesXml.java
diff -u ofbiz-neogia-generators/src/java/org/nereide/ofbiz/neogia/generators/GeneratorServicesXml.java:1.4 ofbiz-neogia-generators/src/java/org/nereide/ofbiz/neogia/generators/GeneratorServicesXml.java:1.5
--- ofbiz-neogia-generators/src/java/org/nereide/ofbiz/neogia/generators/GeneratorServicesXml.java:1.4	Fri Jun 25 19:55:10 2004
+++ ofbiz-neogia-generators/src/java/org/nereide/ofbiz/neogia/generators/GeneratorServicesXml.java	Sat Jun 26 17:18:33 2004
@@ -49,7 +49,7 @@
 * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
  *
  *@author     Olivier.Heintz@nereide.biz
- *@version    $Revision: 1.4 $
+ *@version    $Revision: 1.5 $
  *@since      3.1
  * 
  * This file has been generated, and will be re-generated,
@@ -75,13 +75,13 @@
                 if (Util.hasGuiEdit(clazz) || Util.isEditViaAssoc(model, clazz) ){
 /*{
     <service name="edit<%=entityName%>" default-entity-name="<%=entityName%>" engine="java"
-            location="org.ofbiz.<%=packageName%>.<%=subpackageName%>.developped.<%=entityName%>Services" invoke="edit<%=entityName%>" auth="true">
+            location="org.ofbiz.<%=packageName%>.<%=subpackageName%>.generated.<%=entityName%>Services" invoke="edit<%=entityName%>" auth="true">
         <description>Create or Update a <%=entityName%></description>
         <auto-attributes include="all" mode="INOUT" optional="true"/>
         <attribute name="actionForm" type="String" mode="IN" optional="false"/>
     </service>
     <service name="remove<%=entityName%>" default-entity-name="<%=entityName%>" engine="java"
-            location="org.ofbiz.<%=packageName%>.<%=subpackageName%>.developped.<%=entityName%>Services" invoke="remove<%=entityName%>" auth="true">
+            location="org.ofbiz.<%=packageName%>.<%=subpackageName%>.generated.<%=entityName%>Services" invoke="remove<%=entityName%>" auth="true">
         <description>Remove a <%=entityName%></description>
         <auto-attributes include="pk" mode="IN" optional="false"/>
     </service>

Index: ofbiz-neogia-generators/src/java/org/nereide/ofbiz/neogia/generators/Util.java
diff -u ofbiz-neogia-generators/src/java/org/nereide/ofbiz/neogia/generators/Util.java:1.21 ofbiz-neogia-generators/src/java/org/nereide/ofbiz/neogia/generators/Util.java:1.22
--- ofbiz-neogia-generators/src/java/org/nereide/ofbiz/neogia/generators/Util.java:1.21	Wed Jun 23 12:31:02 2004
+++ ofbiz-neogia-generators/src/java/org/nereide/ofbiz/neogia/generators/Util.java	Sat Jun 26 17:18:33 2004
@@ -28,9 +28,9 @@
 * Copyright Code Lutin
 * Copyright Nereide
 * Copyright Neogia
-* @version $Revision: 1.21 $
+* @version $Revision: 1.22 $
 *
-* Last update : $Date: 2004/06/23 12:31:02 $
+* Last update : $Date: 2004/06/26 17:18:33 $
 * by : $Author: holivier $
 */
 package org.nereide.ofbiz.neogia.generators;
@@ -55,7 +55,7 @@
 /**
  * 
  */
-public class Util extends org.codelutin.topia.Util {
+public class Util extends org.codelutin.topia.generators.Util {
 
     static private final String tagSeparator = ", ";
 
@@ -217,7 +217,7 @@
                 primaryKeys.addAll(Util.getPrimaryKeyAttributes(superClass));
             }
         }
-        primaryKeys.addAll(org.codelutin.topia.Util.getPrimaryKeyAttributes(clazz));
+        primaryKeys.addAll(org.codelutin.topia.generators.Util.getPrimaryKeyAttributes(clazz));
         return primaryKeys;
     }
     
@@ -302,7 +302,7 @@
             }    
             //System.out.println("XXXXXXX-getMapPrimaryKeyAttr3-Debug associationClass class="+clazz.getName()+" listPrimaryKeys="+listPrimaryKeyName);
         }
-        for (Iterator iter=org.codelutin.topia.Util.getPrimaryKeyAttributes(clazz).iterator(); iter.hasNext(); ){
+        for (Iterator iter=org.codelutin.topia.generators.Util.getPrimaryKeyAttributes(clazz).iterator(); iter.hasNext(); ){
             ObjectModelAttribute attribute = (ObjectModelAttribute) iter.next();
             listPrimaryKeyName.add(attribute.getName());
             if (entity) listPrimaryKeyType.add(Util.getOfbizType(attribute) );

Index: ofbiz-neogia-generators/src/java/org/nereide/ofbiz/neogia/generators/GeneratorLookupJava.java
diff -u ofbiz-neogia-generators/src/java/org/nereide/ofbiz/neogia/generators/GeneratorLookupJava.java:1.7 ofbiz-neogia-generators/src/java/org/nereide/ofbiz/neogia/generators/GeneratorLookupJava.java:1.8
--- ofbiz-neogia-generators/src/java/org/nereide/ofbiz/neogia/generators/GeneratorLookupJava.java:1.7	Fri Jun 25 19:55:10 2004
+++ ofbiz-neogia-generators/src/java/org/nereide/ofbiz/neogia/generators/GeneratorLookupJava.java	Sat Jun 26 17:18:33 2004
@@ -11,12 +11,20 @@
 
 public class GeneratorLookupJava extends ObjectModelGenerator {
 
-    final private String packageParam = "org.neogia.manufacturing";
-    final private String packageName = "manufacturing";
-    // il faudrait le lancer par subpackage, et alors changer la methode getFilenameForxxxx
+    private String packageParam = null;
+    private String packageName = null;
     
     public String getFilenameForModel(ObjectModel model){
-        return "src/org/ofbiz/"+packageName+"/generated/lookupParams.java";
+        // il faudrait le lancer par subpackage, et alors changer la methode getFilenameForxxxx
+        if (packageName == null) {
+            String[] packageParams = new String[2];
+            if (! Util.initPackageParam(packageParams)) packageName="error";
+            else{
+                packageParam = packageParams[0];
+                packageName = packageParams[1];
+            }
+        }
+        return packageName + "/src/org/ofbiz/"+packageName+"/generated/lookupParams.java";
 	}
 
     public void generateFromModel(Writer output, ObjectModel model) throws IOException {
@@ -42,7 +50,7 @@
 //  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 // 
 // @author     malin.nicolas@nereide.biz
-// @version    $Revision: 1.7 $
+// @version    $Revision: 1.8 $
 // @since      3.1
 //  
 //  This file has been generated, and will be re-generated,
@@ -54,6 +62,14 @@
     public static final String module = lookupParams.class.getName();
 
 }*/
+        if (packageParam == null){
+            String[] packageParams = new String[2];
+            if (! Util.initPackageParam(packageParams)) return;
+            else{
+                packageParam = packageParams[0];
+                packageName = packageParams[1];
+            }
+        }
         ObjectModelClass clazz;
         String entityName, packageName, subpackageName;
         for( Iterator iterClazz = model.getClasses().iterator(); iterClazz.hasNext(); ){
@@ -84,7 +100,7 @@
 			} else paramLookup.clear();
 			paramLookup.put("lookupName","Lookup<%=entityName%>");
 			paramLookup.put("titleProperty","PageTitleLookup<%=entityName%>");
-			paramLookup.put("formDefFile","/<%=packageName%>/<%=subpackageName%>/<%=entityName%>Forms.xml");    
+			paramLookup.put("formDefFile","/<%=packageName%>/<%=subpackageName%>/generated/<%=entityName%>Forms.xml");    
 			paramLookup.put("singleFormName","lookup<%=entityName%>");    
 			paramLookup.put("listFormName","listLookup<%=entityName%>");    
 			paramLookup.put("entityName","<%=entityName%>");

Index: ofbiz-neogia-generators/src/java/org/nereide/ofbiz/neogia/generators/ListPkAttribute.java
diff -u ofbiz-neogia-generators/src/java/org/nereide/ofbiz/neogia/generators/ListPkAttribute.java:1.3 ofbiz-neogia-generators/src/java/org/nereide/ofbiz/neogia/generators/ListPkAttribute.java:1.4
--- ofbiz-neogia-generators/src/java/org/nereide/ofbiz/neogia/generators/ListPkAttribute.java:1.3	Wed Jun 23 12:31:02 2004
+++ ofbiz-neogia-generators/src/java/org/nereide/ofbiz/neogia/generators/ListPkAttribute.java	Sat Jun 26 17:18:33 2004
@@ -39,9 +39,9 @@
  * @param clazz
  * @param boolean to say if the ofbizType is an entity OfbizType (true) or java OfbizType (false)
  * @param _classAssoc to be able to test for not retreiving  primaryKey when they coming from _classAssoc.
- * @version $Revision: 1.3 $
+ * @version $Revision: 1.4 $
  *
- * Last update : $Date: 2004/06/23 12:31:02 $
+ * Last update : $Date: 2004/06/26 17:18:33 $
  * by : $Author: holivier $
  */
 public class ListPkAttribute {
@@ -122,7 +122,7 @@
             }    
             //System.out.println("XXXXXXX-getMapPrimaryKeyAttr3-Debug associationClass class="+clazz.getName()+" listPrimaryKeys="+this.name);
         }
-        for (Iterator iter=org.codelutin.topia.Util.getPrimaryKeyAttributes(clazz).iterator(); iter.hasNext(); ){
+        for (Iterator iter=org.codelutin.topia.generators.Util.getPrimaryKeyAttributes(clazz).iterator(); iter.hasNext(); ){
             ObjectModelAttribute attribute = (ObjectModelAttribute) iter.next();
             this.name.add(attribute.getName());
             if (entity) this.type.add(Util.getOfbizType(attribute) );

Index: ofbiz-neogia-generators/src/java/org/nereide/ofbiz/neogia/generators/GeneratorEntitygroupXml.java
diff -u ofbiz-neogia-generators/src/java/org/nereide/ofbiz/neogia/generators/GeneratorEntitygroupXml.java:1.4 ofbiz-neogia-generators/src/java/org/nereide/ofbiz/neogia/generators/GeneratorEntitygroupXml.java:1.5
--- ofbiz-neogia-generators/src/java/org/nereide/ofbiz/neogia/generators/GeneratorEntitygroupXml.java:1.4	Thu Jun 10 08:47:55 2004
+++ ofbiz-neogia-generators/src/java/org/nereide/ofbiz/neogia/generators/GeneratorEntitygroupXml.java	Sat Jun 26 17:18:33 2004
@@ -29,8 +29,7 @@
 
     public void generateFromModel(Writer output, ObjectModel model) throws IOException {
       
-                 /*{
-<?xml version="1.0" encoding="UTF-8"?>
+/*{<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE entitygroup PUBLIC "-//OFBiz//DTD Entity Group//EN" "http://www.ofbiz.org/dtds/entitygroup.dtd">
 <!--  Title: Entity Generator Group Definitions for the General Data Model
  *
@@ -53,7 +52,7 @@
  *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
  *
  *@author     Olivier.Heintz@nereide.biz
- *@version    $Revision: 1.4 $
+ *@version    $Revision: 1.5 $
  *@since      3.1
  * 
  * This file has been generated, and will be re-generated,
@@ -77,8 +76,7 @@
             clazz = (ObjectModelClass) iterClazz.next();
             if(Util.isEntity(clazz) && clazz.getPackageName().startsWith(packageParam)){
                 entityName = clazz.getName();
-/*{
-    <entity-group group="org.ofbiz" entity="<%=entityName%>"/>
+/*{    <entity-group group="org.ofbiz" entity="<%=entityName%>"/>
 }*/                
             }
         }

Index: ofbiz-neogia-generators/src/java/org/nereide/ofbiz/neogia/generators/GeneratorEntityObjectJava.java
diff -u ofbiz-neogia-generators/src/java/org/nereide/ofbiz/neogia/generators/GeneratorEntityObjectJava.java:1.5 ofbiz-neogia-generators/src/java/org/nereide/ofbiz/neogia/generators/GeneratorEntityObjectJava.java:1.6
--- ofbiz-neogia-generators/src/java/org/nereide/ofbiz/neogia/generators/GeneratorEntityObjectJava.java:1.5	Fri Jun 25 19:55:10 2004
+++ ofbiz-neogia-generators/src/java/org/nereide/ofbiz/neogia/generators/GeneratorEntityObjectJava.java	Sat Jun 26 17:18:33 2004
@@ -7,7 +7,7 @@
 import java.util.Map;
 
 import org.codelutin.generator.ObjectModelGenerator;
-import org.codelutin.generator.models.object.ObjectModelAttribute;
+import org.codelutin.generator.models.object.ObjectModelAttribute; 
 import org.codelutin.generator.models.object.ObjectModelClass;
 
 public class GeneratorEntityObjectJava extends ObjectModelGenerator {
@@ -48,7 +48,7 @@
 //  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 // 
 //  @author     Olivier.Heintz@nereide.biz
-// @version    $Revision: 1.5 $
+// @version    $Revision: 1.6 $
 // @since      3.1
 //  
 //  This file has been generated, and will be re-generated,
@@ -56,7 +56,7 @@
 // 
  
  
-package org.ofbiz.<%=packageName%>.<%=subpackageName%>;
+package org.ofbiz.<%=packageName%>.<%=subpackageName%>.generated;
 
 import java.sql.Timestamp;
 import java.util.Date;

Index: ofbiz-neogia-generators/src/java/org/nereide/ofbiz/neogia/generators/GeneratorEntityServicesJava.java
diff -u ofbiz-neogia-generators/src/java/org/nereide/ofbiz/neogia/generators/GeneratorEntityServicesJava.java:1.3 ofbiz-neogia-generators/src/java/org/nereide/ofbiz/neogia/generators/GeneratorEntityServicesJava.java:1.4
--- ofbiz-neogia-generators/src/java/org/nereide/ofbiz/neogia/generators/GeneratorEntityServicesJava.java:1.3	Fri Jun 25 19:55:10 2004
+++ ofbiz-neogia-generators/src/java/org/nereide/ofbiz/neogia/generators/GeneratorEntityServicesJava.java	Sat Jun 26 17:18:33 2004
@@ -113,7 +113,7 @@
 //  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 // 
 // @author     Olivier.Heintz@nereide.biz
-// @version    $Revision: 1.3 $
+// @version    $Revision: 1.4 $
 // @since      3.1
 //  
 //  This file has been generated, and will be re-generated,
@@ -121,7 +121,7 @@
 // 
  
  
-package org.ofbiz.<%=packageName%>.<%=subpackageName%>;
+package org.ofbiz.<%=packageName%>.<%=subpackageName%>.generated;
 
 import java.sql.Timestamp;
 import java.util.ArrayList;

Index: ofbiz-neogia-generators/src/java/org/nereide/ofbiz/neogia/generators/GeneratorFormsXml.java
diff -u ofbiz-neogia-generators/src/java/org/nereide/ofbiz/neogia/generators/GeneratorFormsXml.java:1.24 ofbiz-neogia-generators/src/java/org/nereide/ofbiz/neogia/generators/GeneratorFormsXml.java:1.25
--- ofbiz-neogia-generators/src/java/org/nereide/ofbiz/neogia/generators/GeneratorFormsXml.java:1.24	Fri Jun 25 19:55:10 2004
+++ ofbiz-neogia-generators/src/java/org/nereide/ofbiz/neogia/generators/GeneratorFormsXml.java	Sat Jun 26 17:18:33 2004
@@ -141,14 +141,12 @@
     private void generateList(Writer output, ObjectModelClass clazz, ObjectModelAttribute attrEditAssoc, String entityRemoveName) throws IOException {
         String entityName = clazz.getName();
 
-/*{
-                title="listSelect<%=entityName%>" 
+/*{                title="listSelect<%=entityName%>" 
                 default-title-style="tableheadtext" default-widget-style="tabletext" default-tooltip-style="tabletext">
              <field name="actionForm"><hidden value="edit"/></field>
 }*/
         if (attrEditAssoc != null){
-/*{
-             <field name="association"><hidden value="${association}"/></field>
+/*{             <field name="association"><hidden value="${association}"/></field>
 }*/
         }
         // add field for link with getMaxMultiplicity = 1 and not navigable for this class
@@ -164,12 +162,10 @@
                 for(int i=0; i<listPrimaryKey.getName().size(); i++ ){
                     String attrAssocPkName = (String) listPrimaryKey.getName().get(i);
                     if (attrAssociated.equals(attrEditAssoc) ){
-/*{
-             <field name="<%=relationName%><%=Util.toUpperCaseFirstLetter(attrAssocPkName)%>"><hidden/></field>
+/*{             <field name="<%=relationName%><%=Util.toUpperCaseFirstLetter(attrAssocPkName)%>"><hidden/></field>
 }*/
                     } else {
-/*{
-             <field name="<%=relationName%><%=Util.toUpperCaseFirstLetter(attrAssocPkName)%>" title="<%=uiLabel( relationName+Util.toUpperCaseFirstLetter(attrAssocPkName) )%>"><display/></field>
+/*{             <field name="<%=relationName%><%=Util.toUpperCaseFirstLetter(attrAssocPkName)%>" title="<%=uiLabel( relationName+Util.toUpperCaseFirstLetter(attrAssocPkName) )%>"><display/></field>
 }*/
                     }
                 }
@@ -184,14 +180,12 @@
                 ListPkAttribute listParticipantPrimaryKey = new ListPkAttribute(model, participantClass, true);        
                 for (int j=0; j<listParticipantPrimaryKey.getName().size(); j++ ){
                     String fieldName = participantName + Util.toUpperCaseFirstLetter((String) listParticipantPrimaryKey.getName().get(j) );
-/*{
-             <field name="<%=fieldName%>"><hidden/></field>
+/*{             <field name="<%=fieldName%>"><hidden/></field>
 }*/
                }
                if (! participantClass.equals((ObjectModelClass) attrEditAssoc.getDeclaringElement() ) ){
                    String call = getCallForAssociationClass( participantClass );
-/*{
-             <field name="<%=participantName%>" title="<%=uiLabel( participantName )%>">
+/*{             <field name="<%=participantName%>" title="<%=uiLabel( participantName )%>">
                     <hyperlink target="Show<%=call%>}"
                                description="[${<%=participantName%>Name}] ${<%=participantName%>Description}"/>
              </field>
@@ -204,15 +198,13 @@
             if (attribute.referenceClassifier() ){
                     String call = getCallForAssociation( attribute );
                     String classAssociatedName = Util.toLowerCaseFirstLetter(attribute.getClassifier().getName());
-/*{
-             <field name="<%=attribute.getName()%>" title="<%=uiLabel( attribute )%>">
+/*{             <field name="<%=attribute.getName()%>" title="<%=uiLabel( attribute )%>">
                     <hyperlink target="Show<%=call%>}"
                                description="[${<%=classAssociatedName%>Name}] ${<%=classAssociatedName%>Description}"/>
              </field>
 }*/
             }else {
-/*{
-             <field name="<%=attribute.getName()%>" title="<%=uiLabel( attribute )%>"><display/></field>
+/*{             <field name="<%=attribute.getName()%>" title="<%=uiLabel( attribute )%>"><display/></field>
 }*/
             }
         }
@@ -222,8 +214,7 @@
             String participantAttrKeyName = (String) listPrimaryKey.getName().get(j);
             listValAtt = listValAtt + participantAttrKeyName + "=${" + participantAttrKeyName + "}&amp;";
         }    
-/*{
-              <field name="deleteLink" title="&amp;nbsp;" widget-style="smallSubmit">
+/*{              <field name="deleteLink" title="&amp;nbsp;" widget-style="smallSubmit">
                   <hyperlink target="Remove<%=entityRemoveName%>?<%=listValAtt%>" description="[${uiLabelMap.CommonDelete}]" also-hidden="false"/>
               </field>
               <field name="submitButton" title="${uiLabelMap.CommonSelected}" widget-style="smallSubmit" ><submit button-type="button"/></field>
@@ -239,13 +230,11 @@
      */
     private void generateEdit(Writer output, ObjectModelClass clazz, ObjectModelAttribute attrEditAssoc) throws IOException {
         String entityName = clazz.getName();
-/*{                                
-                default-title-style="tableheadtext" default-widget-style="tabletext" default-tooltip-style="tabletext">
+/*{                default-title-style="tableheadtext" default-widget-style="tabletext" default-tooltip-style="tabletext">
             <field name="actionForm"><hidden value="commit${actionForm}"/></field>
 }*/
         if (attrEditAssoc != null){
-/*{
-            <field name="association"><hidden value="${association}"/></field>
+/*{            <field name="association"><hidden value="${association}"/></field>
 }*/
         }
         // add field for link with getMaxMultiplicity = 1 and not navigable for this class
@@ -261,12 +250,10 @@
                 for(int i=0; i<listPrimaryKey.getName().size(); i++ ){
                     String fieldName = relationName + Util.toUpperCaseFirstLetter((String) listPrimaryKey.getName().get(i) );
                     if (attrAssociated.equals(attrEditAssoc) ){
-/*{
-            <field name="<%=fieldName%>"><hidden/></field>
+/*{            <field name="<%=fieldName%>"><hidden/></field>
 }*/
                     } else {
-/*{
-            <field name="<%=fieldName%>" title="<%=uiLabel( fieldName )%>" 
+/*{            <field name="<%=fieldName%>" title="<%=uiLabel( fieldName )%>" 
                 use-when="${isAdd}!=null">}*/
                         if ("date-time".equals(listPrimaryKey.getType().get(i) ) ) { /*{<date-time/>}*/ }
                         else { /*{<text/>}*/ }
@@ -289,12 +276,10 @@
                 for (int j=0; j<listParticipantPrimaryKey.getName().size(); j++ ){
                     String fieldName = participantName + Util.toUpperCaseFirstLetter((String) listParticipantPrimaryKey.getName().get(j) );
                     if (hiddenField ) {
-/*{
-            <field name="<%=fieldName%>"><hidden/></field>
+/*{            <field name="<%=fieldName%>"><hidden/></field>
 }*/
                     } else {
-/*{
-            <field name="<%=fieldName%>" title="<%=uiLabel( fieldName )%>" 
+/*{            <field name="<%=fieldName%>" title="<%=uiLabel( fieldName )%>" 
                 use-when="${isAdd}!=null">}*/
                         if ("date-time".equals(listParticipantPrimaryKey.getType().get(j) ) ) { /*{<date-time/>}*/ }
                         else { /*{<text/>}*/ }
@@ -310,8 +295,7 @@
             ObjectModelAttribute attribute = (ObjectModelAttribute) iter.next();       
             if (! Util.hasGuiHidden(attribute) ){
                 if (Util.hasGuiCalculated(attribute) ){
-/*{
-            <field name="<%=attribute.getName()%>" title="<%=uiLabel( attribute )%>"><display/></field>
+/*{            <field name="<%=attribute.getName()%>" title="<%=uiLabel( attribute )%>"><display/></field>
 }*/
                 } else if (attribute.referenceClassifier() ){
                     if (attribute.getMaxMultiplicity() == 1 ){
@@ -325,12 +309,10 @@
                             Map fieldNameMap = (Map) iterList.next();
                             String attributeKeyName = (String) fieldNameMap.get("fieldName");
                             String relAttributeKeyName = (String) fieldNameMap.get("relFieldName");
-/*{
-            <field name="<%=attributeKeyName%>" title="<%=uiLabel( attributeKeyName )%>"> 
+/*{            <field name="<%=attributeKeyName%>" title="<%=uiLabel( attributeKeyName )%>"> 
 }*/                                
                             if (Util.hasGuiDropDown(clazzAssociated) ){
-/*{                                        
-                   <drop-down>
+/*{                   <drop-down>
                         <entity-options entity-name="<%=relationName%>" key-field-name="<%=relAttributeKeyName%>" description="[${<%=iDFieldName%>}] ${<%=descriptionFieldName %>}">
                                 <entity-order-by field-name="<%=descriptionFieldName%>"/>
                         </entity-options>
@@ -339,24 +321,20 @@
 }*/
                             } else { 
                                 if (Util.hasGuiLookup(clazzAssociated) ){
-/*{
-                    <lookup target-form-name="Lookup<%=relationName%>"/>
+/*{                    <lookup target-form-name="Lookup<%=relationName%>"/>
 }*/
                                 } else {
-/*{
-                    <text/>
+/*{                    <text/>
 }*/
                                 }
-/*{
-            </field>
+/*{            </field>
             <field name="<%=Util.toLowerCaseFirstLetter(relationName )%><%=Util.toUpperCaseFirstLetter(descriptionFieldName )%>"><display/></field>    
 }*/
                             }
                         }
                     }
                 } else if (Util.isPrimaryKey(attribute) ){  
-/*{
-            <field name="<%=attribute.getName()%>" title="<%=uiLabel( attribute )%>" use-when="${isAdd}!=null">}*/
+/*{            <field name="<%=attribute.getName()%>" title="<%=uiLabel( attribute )%>" use-when="${isAdd}!=null">}*/
                     if (Util.isDate(attribute.getType() ) ) { /*{<date-time/>}*/ }
                     else { /*{<text/>}*/ }
                             /*{</field>
@@ -364,8 +342,7 @@
                 <display/></field>
 }*/
                 } else { // a standard edit attribute
-/*{
-            <field name="<%=attribute.getName()%>" title="<%=uiLabel( attribute )%>">}*/
+/*{            <field name="<%=attribute.getName()%>" title="<%=uiLabel( attribute )%>">}*/
                     if (Util.isDate(attribute.getType() ) ) { /*{<date-time/>}*/ }
                     else { /*{<text/>}*/ }
                             /*{</field>
@@ -373,8 +350,7 @@
                 }
             }
         }                                               
-/*{
-             <field name="submitButton" title="${uiLabelButton}" widget-style="smallSubmit" ><submit button-type="button"/></field>
+/*{             <field name="submitButton" title="${uiLabelButton}" widget-style="smallSubmit" ><submit button-type="button"/></field>
         </form>
 
 }*/
@@ -398,8 +374,7 @@
             String entityName = clazz.getName();
             ObjectModelAttribute att;
 
-            /*{
-<?xml version="1.0" encoding="UTF-8" ?>
+/*{<?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE forms PUBLIC "-//OFBiz//DTD OFBiz Form Widget//EN" "http://www.ofbiz.org/dtds/widget-form.dtd">
 <!--
 * Copyright (c) 2004 Malin Nicolas - malin.nicolas@librenberry.net
@@ -424,7 +399,7 @@
 *
 *@author           Olivier.Heintz@nereide.biz
 *@author           malin.nicolas@nereide.biz
-*@version          $Revision: 1.24 $
+*@version          $Revision: 1.25 $
 *@since            3.1
 *
 * This file has been generated, and will be re-generated,
@@ -441,7 +416,6 @@
                 //System.out.println( "Lookup-Find " + clazz.getName() );
 /*{
 
-
     <!-- Lookup - Find - Selection -->
 
         <form name="find<%=entityName%>" type="single"
@@ -452,8 +426,7 @@
 
                 for ( iter = listAttLookup.iterator(); iter.hasNext(); ){
                     att = (ObjectModelAttribute) iter.next();
-/*{
-            <field name="<%=att.getName()%>" title="<%=uiLabel( att )%>">}*/
+/*{            <field name="<%=att.getName()%>" title="<%=uiLabel( att )%>">}*/
                     if( att.getType().equals( "java.util.Date" ) ){
                         /*{<date-find/>}*/
                     }
@@ -461,8 +434,7 @@
                         /*{</field>
 }*/
                 }
-/*{
-            <field name="submitButton" title="${uiLabelMap.CommonLookup}" widget-style="smallSubmit">
+/*{            <field name="submitButton" title="${uiLabelMap.CommonLookup}" widget-style="smallSubmit">
                 <submit button-type="button"/>
             </field>
         </form>
@@ -476,7 +448,6 @@
                   =================================
                 */
 /*{
-
     <!-- ListLookup -->
 
         <form name="list<%=entityName%>" type="list"
@@ -487,13 +458,11 @@
                 for ( iter = listAttListLookup.iterator(); iter.hasNext(); ){
                     att = (ObjectModelAttribute) iter.next();
                     // TODO : completed by the test if classifier
-/*{
-             <field name="<%=att.getName()%>" title="<%=uiLabel( att )%>"><display/></field>
+/*{             <field name="<%=att.getName()%>" title="<%=uiLabel( att )%>"><display/></field>
 
 }*/
                 }
-/*{
-         </form>
+/*{         </form>
 
 }*/
             }
@@ -505,7 +474,6 @@
 
             if( Util.hasGuiShowList( clazz ) ){      
 /*{
-
     <!-- List without link-->
 
         <form name="listAll<%=entityName%>" type="list"
@@ -516,20 +484,17 @@
                 for ( iter = listAttList.iterator(); iter.hasNext(); ){
                     att = (ObjectModelAttribute) iter.next();
                     if (att.referenceClassifier() ){
-/*{
-             <field name="<%=att.getName()%>" title="<%=uiLabel( att )%>">
+/*{             <field name="<%=att.getName()%>" title="<%=uiLabel( att )%>">
                     <display description="[${<%=Util.toLowerCaseFirstLetter(clazz.getName())%>Name}] ${<%=Util.toLowerCaseFirstLetter(clazz.getName())%>Description}"/>
              </field>
 }*/
                     }else {
-/*{
-             <field name="<%=att.getName()%>" title="<%=uiLabel( att )%>"><display/></field>
+/*{             <field name="<%=att.getName()%>" title="<%=uiLabel( att )%>"><display/></field>
 
 }*/
                     }
                 }
-/*{
-        </form>
+/*{        </form>
 
 }*/
             }
@@ -541,7 +506,6 @@
             if (Util.hasGuiList( clazz ) || Util.hasGuiListAll( clazz ) ){
                 //System.out.println( "Beginning ListEdit "  );
 /*{
-
     <!-- List with link to Edit -->
 
         <form name="list<%=entityName%>" type="list" list-name="entityList"
@@ -562,7 +526,6 @@
                         Util.toUpperCaseFirstLetter(attributeAssociated.getName() );
                     String entityUriName =  entityName +fromEntityName;
 /*{
-
     <!-- SubList with link to Edit -->
 
         <form name="subList<%=entityUriName%>" type="list" list-name="entityList"
@@ -578,7 +541,6 @@
             //=================================
             if( Util.hasGuiEdit( clazz ) ){    
 /*{
-
     <!-- Edit/Ajout -->
 
         <form name="edit<%=entityName%>" type="single"
@@ -599,7 +561,6 @@
                         Util.toUpperCaseFirstLetter(attributeAssociated.getDeclaringElement().getName() ):
                         Util.toUpperCaseFirstLetter(attributeAssociated.getName() );
 /*{
-
     <!-- Edit/Ajout -->
 
         <form name="subEdit<%=entityName%><%=fromEntityName%>" type="single"
@@ -615,7 +576,6 @@
             //=============================
             if( Util.hasGuiShow( clazz ) || Util.hasGuiEditAssoc( clazz )){    //  TODO : add test if there is, at least, one reverse association with Maxmultiplicity == 1
 /*{
-
     <!-- Show -->
 
         <form name="show<%=entityName%>" type="single"
@@ -628,8 +588,7 @@
                     ObjectModelAttribute attribute = (ObjectModelAttribute) iter.next();       
                     if (! Util.hasGuiHidden(attribute) ){
                         if (Util.hasGuiCalculated(attribute) ){
-/*{
-            <field name="<%=attribute.getName()%>" title="<%=uiLabel( attribute )%>"><display/></field>
+/*{            <field name="<%=attribute.getName()%>" title="<%=uiLabel( attribute )%>"><display/></field>
 }*/
                         } else if (attribute.referenceClassifier() ){
                             if (attribute.getMaxMultiplicity() == 1 ){
@@ -638,21 +597,18 @@
                                 String relationName = clazzAssociated.getName();
                                 String descriptionFieldName = Util.getAttributeDescription(clazzAssociated);
                                 String iDFieldName = Util.getAttributeName(clazzAssociated);
-/*{
-             <field name="<%=attribute.getName()%>" title="<%=uiLabel( attribute )%>">
+/*{             <field name="<%=attribute.getName()%>" title="<%=uiLabel( attribute )%>">
                                <display description="[${<%=relationName%>Name}] ${<%=relationName%>Description}"/>
              </field>
 }*/
                             }
                         } else { // a standard edit attribute
-/*{
-            <field name="<%=attribute.getName()%>" title="<%=uiLabel( attribute )%>"><display/></field>
+/*{            <field name="<%=attribute.getName()%>" title="<%=uiLabel( attribute )%>"><display/></field>
 }*/
                         }
                     }
                 }                                               
-/*{
-        </form>
+/*{        </form>
 
 }*/
             }

Index: ofbiz-neogia-generators/src/java/org/nereide/ofbiz/neogia/generators/GeneratorEditAssocBsh.java
diff -u ofbiz-neogia-generators/src/java/org/nereide/ofbiz/neogia/generators/GeneratorEditAssocBsh.java:1.3 ofbiz-neogia-generators/src/java/org/nereide/ofbiz/neogia/generators/GeneratorEditAssocBsh.java:1.4
--- ofbiz-neogia-generators/src/java/org/nereide/ofbiz/neogia/generators/GeneratorEditAssocBsh.java:1.3	Fri Jun 25 19:55:10 2004
+++ ofbiz-neogia-generators/src/java/org/nereide/ofbiz/neogia/generators/GeneratorEditAssocBsh.java	Sat Jun 26 17:18:33 2004
@@ -62,7 +62,7 @@
 
 
 /*{
-//  $Id: GeneratorEditAssocBsh.java,v 1.3 2004/06/25 19:55:10 holivier Exp $
+//  $Id: GeneratorEditAssocBsh.java,v 1.4 2004/06/26 17:18:33 holivier Exp $
 //  Copyright (c) 2004 Olivier Heintz - olivier.heintz@nereide.biz
 //  Copyright (c) 2004 Nereide - www.nereide.biz
 //  Copyright (c) 2004 Neogia - www.neogia.org
@@ -82,7 +82,7 @@
 //  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 //
 //  @author     Olivier.Heintz@nereide.biz
-//  @version    $Revision: 1.3 $
+//  @version    $Revision: 1.4 $
 //  @since      3.1
 //  
 //  Calls Find on a dynamiqueView  to return an EntityListIterator of the
@@ -121,15 +121,13 @@
         if (associationList.size() > 1){ 
             for (Iterator iter=associationList.iterator(); iter.hasNext(); ){
                 ObjectModelAttribute association = (ObjectModelAttribute) iter.next();
-/*{
-if (association.equals("<%=association.getName()%>") ) {
+/*{if (association.equals("<%=association.getName()%>") ) {
     page.setProperty("tabButtonItem", page.getProperty("tabButtonItem<%=Util.toUpperCaseFirstLetter(association.getName())%>") );
 }    
 }*/
             }
         }
-/*{
-context.put("association",association);
+/*{context.put("association",association);
 
 }*/
         ListPkAttribute listPrimaryKey = new ListPkAttribute(model, clazz, false);        
@@ -143,34 +141,28 @@
                 primaryKeysEmpty +=  ") || UtilValidate.isEmpty(";
                 primaryKeysMap    +=  ",\"";
             }
-/*{
-String <%=attributeKeyName%> = request.getParameter("<%=attributeKeyName%>");
+/*{String <%=attributeKeyName%> = request.getParameter("<%=attributeKeyName%>");
 }*/            
         }
         primaryKeysEmpty +=  ")";
-/*{
-if (<%=primaryKeysEmpty%>) {
+/*{if (<%=primaryKeysEmpty%>) {
 }*/
         for (Iterator iter=associationList.iterator(); iter.hasNext(); ){
             ObjectModelAttribute association = (ObjectModelAttribute) iter.next();
-/*{
-    if (association.equals("<%=association.getName()%>") ){
+/*{    if (association.equals("<%=association.getName()%>") ){
 }*/    
             String reverseAttributeName = ( association.getReverseAttribute() != null ) ? 
                     Util.getAttributeShortName(association.getReverseAttribute())  :
                     Util.getClassShortName(clazz);
             for(int i=0; i<listPrimaryKey.getName().size(); i++ ){
                 String attributeKeyName = (String)listPrimaryKey.getName().get(i);
-/*{    
-        <%=attributeKeyName%> = request.getParameter("<%=reverseAttributeName%><%=Util.toUpperCaseFirstLetter(attributeKeyName)%>");
+/*{        <%=attributeKeyName%> = request.getParameter("<%=reverseAttributeName%><%=Util.toUpperCaseFirstLetter(attributeKeyName)%>");
 }*/
             }
-/*{
-    }
+/*{    }
 }*/            
         }    
-/*{
-}
+/*{}
 }*/
         for (Iterator iter=associationList.iterator(); iter.hasNext(); ){
             ObjectModelAttribute association = (ObjectModelAttribute) iter.next();
@@ -185,12 +177,10 @@
                     assocPkParameters += "&amp;";
                 }
             }
-/*{
-context.put("<%=association.getName()%>PkParameters",<%=assocPkParameters%>);    
+/*{context.put("<%=association.getName()%>PkParameters",<%=assocPkParameters%>);    
 }*/    
         }    
 /*{
-
 if ( ! ( <%=primaryKeysEmpty%> ) ) {
     // TODO : use the <%=entityName%> object and its methods to access the attributes
     GenericValue <%=Util.toLowerCaseFirstLetter(entityName)%> =  delegator.findByPrimaryKey("<%=entityName%>", UtilMisc.toMap(<%=primaryKeysMap%>));
@@ -205,40 +195,34 @@
 }*/
         for (int i=0; i<listAttributeName.size(); i++){
             String attributeName = (String) listAttributeName.get(i);
-/*{
-    <%=attributeName%> = request.getParameter("<%=attributeName%>");
+/*{    <%=attributeName%> = request.getParameter("<%=attributeName%>");
 }*/
         }
 /*{
-
     if (<%=Util.toLowerCaseFirstLetter(entityName)%> != null){
 }*/    
         for(int j=0; j<listPrimaryKey.getName().size(); j++ ){
             String attributeKeyName = (String)listPrimaryKey.getName().get(j);
-/*{
-        context.put("<%=attributeKeyName%>", <%=attributeKeyName%>);
+/*{        context.put("<%=attributeKeyName%>", <%=attributeKeyName%>);
         formsData.put("<%=attributeKeyName%>",<%=attributeKeyName%>);
 
 }*/
         }    
-/*{    
-            // FOR attribue with calculated
+/*{            // FOR attribue with calculated
             // formsData.put("%attribue%",<%=Util.toLowerCaseFirstLetter(entityName)%>.get("%attribue%"));
             //
 
 }*/        
         for (int i=0; i<listAttributeName.size(); i++){
             String attributeName = (String) listAttributeName.get(i);
-/*{
-        if (<%=attributeName%> != null)  formsData.put("<%=attributeName%>",<%=attributeName%>); 
+/*{        if (<%=attributeName%> != null)  formsData.put("<%=attributeName%>",<%=attributeName%>); 
         else formsData.put("<%=attributeName%>",<%=Util.toLowerCaseFirstLetter(entityName)%>.get("<%=attributeName%>" ));
 
 }*/
         }
         for (int i=0; i<listAttCalculated.size(); i++){
             String attributeName = (String) listAttributeName.get(i);
-/*{
-        formsData.put("<%=attributeName%>",<%=Util.toLowerCaseFirstLetter(entityName)%>.get("<%=attributeName%>" ));
+/*{        formsData.put("<%=attributeName%>",<%=Util.toLowerCaseFirstLetter(entityName)%>.get("<%=attributeName%>" ));
 }*/
         }
         for (int i=0; i<listAttAssoc.size(); i++ ){
@@ -246,8 +230,7 @@
             String relationName = classAssociated.getName();
             String idNameFieldName = Util.getAttributeName(classAssociated);
             String descriptionFieldName = Util.getAttributeDescription(classAssociated);
-/*{            
-        GenericValue <%=Util.toLowerCaseFirstLetter(relationName )%> = <%=Util.toLowerCaseFirstLetter(entityName)%>.getRelatedOne("<%=relationName%>");
+/*{        GenericValue <%=Util.toLowerCaseFirstLetter(relationName )%> = <%=Util.toLowerCaseFirstLetter(entityName)%>.getRelatedOne("<%=relationName%>");
         if (<%=Util.toLowerCaseFirstLetter(relationName )%> != null){
             formsData.put("<%=Util.toLowerCaseFirstLetter(relationName )%>Description",  <%=Util.toLowerCaseFirstLetter(relationName )%>.get("<%=descriptionFieldName%>") );
             formsData.put("<%=Util.toLowerCaseFirstLetter(relationName )%>Name",  <%=Util.toLowerCaseFirstLetter(relationName )%>.get("<%=idNameFieldName%>") );
@@ -255,10 +238,8 @@
         
 }*/            
         }
-/*{       
-        HtmlFormWrapper singleWrapper = new NsingleHtmlFormWrapper("/<%=subPackageName%>/Forms<%=entityName%>.xml", "show<%=entityName%>", request, response, formsData);
+/*{        HtmlFormWrapper singleWrapper = new NsingleHtmlFormWrapper("/<%=subPackageName%>/generated/Forms<%=entityName%>.xml", "show<%=entityName%>", request, response, formsData);
         context.put("singleWrapper", singleWrapper);
-
 }*/
         for (Iterator iterAssoc=associationList.iterator(); iterAssoc.hasNext(); ){
             ObjectModelAttribute association = (ObjectModelAttribute) iterAssoc.next();
@@ -278,7 +259,7 @@
             //  ==============
             //     List Preparation
             //  ==============
-            page.setProperty("formDefFile","/<%=subPackageAssoc%>/Forms<%=classAssociated.getName()%>.xml");
+            page.setProperty("formDefFile","/<%=subPackageAssoc%>/generated/Forms<%=classAssociated.getName()%>.xml");
             page.setProperty("listFormName","subList<%=classAssociated.getName()%><%=fromEntityName%>");
             page.setProperty("entityName","<%=classAssociated.getName()%>");
             request.setAttribute("association",association);
@@ -288,12 +269,10 @@
 }*/            
             for(int j=0; j<listPrimaryKey.getName().size(); j++ ){
                 String attributeKeyName = (String)listPrimaryKey.getName().get(j);
-/*{
-            inputFields.put("<%=reverseAttributeName%><%=Util.toUpperCaseFirstLetter(attributeKeyName)%>", <%=attributeKeyName%>);
+/*{            inputFields.put("<%=reverseAttributeName%><%=Util.toUpperCaseFirstLetter(attributeKeyName)%>", <%=attributeKeyName%>);
 }*/
             }
 /*{
-             
              // create the dynamic view entity
             DynamicViewEntity dynamicView = new DynamicViewEntity();
         
@@ -303,8 +282,7 @@
 }*/                
             for(int j=0; j<listPrimaryKey.getName().size(); j++ ){             // PrimaryKeys field from the main entity
                 String attributeKeyName = (String)listPrimaryKey.getName().get(j);
-/*{
-                dynamicView.addAlias("EE", "<%=reverseAttributeName%><%=Util.toUpperCaseFirstLetter(attributeKeyName)%>");
+/*{                dynamicView.addAlias("EE", "<%=reverseAttributeName%><%=Util.toUpperCaseFirstLetter(attributeKeyName)%>");
 }*/
             }
             List listAssoc = new ArrayList();
@@ -325,8 +303,7 @@
                     if ( attribute.getMaxMultiplicity() == 1 ) listAssoc.add(attribute);
                 } else{
                     listAttNameAssoc.add(attribute.getName());
-/*{
-                dynamicView.addAlias("EE", "<%=attribute.getName()%>");
+/*{                dynamicView.addAlias("EE", "<%=attribute.getName()%>");
 }*/                
                 }
             }
@@ -339,7 +316,6 @@
                 ObjectModelClass clazzAssoc = (ObjectModelClass) relationKeyName.get("clazzAssociated");
                 String relationName = clazzAssoc.getName();
 /*{
-        
             // Associated entities
             dynamicView.addMemberEntity("E<%=String.valueOf(nbAssoc)%>", "<%=relationName%>");
                  dynamicView.addAlias("E<%=String.valueOf(nbAssoc)%>", "<%=Util.toLowerCaseFirstLetter(relationName)%>Name","<%=Util.getAttributeName(clazzAssoc)%>",null,null,null,null);
@@ -358,8 +334,7 @@
                     String fieldName = (String) relationItem.get("fieldName");
                     if (listAttributeName.indexOf(fieldName) == -1){ // adding the field in the dynamicView
                         listAttributeName.add(fieldName);
-/*{
-                dynamicView.addAlias("EE", "<%=fieldName%>");
+/*{                dynamicView.addAlias("EE", "<%=fieldName%>");
 }*/                
                     }
                 }
@@ -367,13 +342,11 @@
                 for (Iterator iterAssocB=clazzAssoc.getAttributes().iterator(); iterAssocB.hasNext(); ){
                     ObjectModelAttribute attributeAssoc = (ObjectModelAttribute) iterAssocB.next();
                     if ( Util.hasGuiListInAssoc(attributeAssoc) ){
-/*{
-                 dynamicView.addAlias("E<%=String.valueOf(nbAssoc)%>", "<%=Util.toLowerCaseFirstLetter(relationName)%><%=Util.toUpperCaseFirstLetter(attributeAssoc.getName())%>","<%=attributeAssoc.getName()%>",null,null,null,null);
+/*{                 dynamicView.addAlias("E<%=String.valueOf(nbAssoc)%>", "<%=Util.toLowerCaseFirstLetter(relationName)%><%=Util.toUpperCaseFirstLetter(attributeAssoc.getName())%>","<%=attributeAssoc.getName()%>",null,null,null,null);
 }*/                    
                     }
                 }
-/*{         
-                dynamicView.addViewLink("EE", "E<%=String.valueOf(nbAssoc)%>", Boolean.TRUE, ModelKeyMap.makeKeyMapList( }*/            
+/*{                dynamicView.addViewLink("EE", "E<%=String.valueOf(nbAssoc)%>", Boolean.TRUE, ModelKeyMap.makeKeyMapList( }*/            
                 boolean first = true;
                 for(Iterator iterList=listName.iterator(); iterList.hasNext(); ){
                     Map relationItem = (Map) iterList.next();
@@ -388,7 +361,6 @@
                 nbAssoc += 1;   
             }
 /*{
-     
             // read and analyse the inputFields
             Map queryStringMap = new HashMap();
             Map origValueMap = new HashMap();
@@ -399,19 +371,16 @@
 }*/
             for (Iterator iter=attributesIndexed.iterator(); iter.hasNext(); ){
                 String attributeName = (String) iter.next();
-/*{
-            keys.add("<%=attributeName%>");
+/*{            keys.add("<%=attributeName%>");
 }*/
             }
             for(int j=0; j<listPrimaryKey.getName().size(); j++ ){             // PrimaryKeys field from the main entity
                 String attributeKeyName = (String)listPrimaryKey.getName().get(j);
-/*{
-            keys.add("<%=reverseAttributeName%><%=Util.toUpperCaseFirstLetter(attributeKeyName)%>");
+/*{            keys.add("<%=reverseAttributeName%><%=Util.toUpperCaseFirstLetter(attributeKeyName)%>");
 }*/
             }
             //
-/*{
-            ArrayList tmpList = FindServices.createCondition(keys, normalizedFields, queryStringMap, origValueMap);
+/*{            ArrayList tmpList = FindServices.createCondition(keys, normalizedFields, queryStringMap, origValueMap);
             
             //create the entity condition
             EntityOperator entOp = EntityOperator.AND;
@@ -473,8 +442,7 @@
             String primaryKeysMapB = "\"";
             for(int j=0; j<listPrimaryKeyB.getName().size(); j++ ){
                 String attributeKeyName = (String)listPrimaryKeyB.getName().get(j);
-/*{
-                String <%=attributeKeyName%> = request.getParameter("<%=attributeKeyName%>");
+/*{                String <%=attributeKeyName%> = request.getParameter("<%=attributeKeyName%>");
                 context.put("<%=attributeKeyName%>", <%=attributeKeyName%>);
                 <%=association.getName()%>FD.put("<%=attributeKeyName%>",<%=attributeKeyName%>);
 
@@ -487,8 +455,7 @@
                 }
             }
             primaryKeysEmptyB +=  ")";
-/*{
-                if (<%=primaryKeysEmptyB%>) {
+/*{                if (<%=primaryKeysEmptyB%>) {
                     GenericValue <%=Util.toLowerCaseFirstLetter(classAssociated.getName())%> =  delegator.findByPrimaryKey("<%=classAssociated.getName()%>", UtilMisc.toMap(<%=primaryKeysMapB%>));
                 
                     String }*/
@@ -501,12 +468,10 @@
 }*/
             for (int i=0; i<listAttributeNameB.size(); i++){
                 String attributeName = (String) listAttributeNameB.get(i);
-/*{
-                    <%=attributeName%> = request.getParameter("<%=attributeName%>");
+/*{                    <%=attributeName%> = request.getParameter("<%=attributeName%>");
 }*/
             }
 /*{
-
                     if (<%=Util.toLowerCaseFirstLetter(classAssociated.getName())%> != null){
                         if (actionForm.equals("add") ) actionForm = "edit";
                         // FOR attribue with calculated
@@ -516,16 +481,14 @@
 }*/        
             for (int i=0; i<listAttributeNameB.size(); i++){
                 String attributeName = (String) listAttributeNameB.get(i);
-/*{
-                        if (<%=attributeName%> != null)  <%=association.getName()%>FD.put("<%=attributeName%>",<%=attributeName%>); 
+/*{                        if (<%=attributeName%> != null)  <%=association.getName()%>FD.put("<%=attributeName%>",<%=attributeName%>); 
                         else <%=association.getName()%>FD.put("<%=attributeName%>",<%=Util.toLowerCaseFirstLetter(classAssociated.getName())%>.get("<%=attributeName%>" ));
 
 }*/
             }
             for (int i=0; i<listAttCalculatedB.size(); i++){
                 String attributeName = (String) listAttributeNameB.get(i);
-/*{
-                        <%=association.getName()%>FD.put("<%=attributeName%>",<%=Util.toLowerCaseFirstLetter(classAssociated.getName())%>.get("<%=attributeName%>" ));
+/*{                        <%=association.getName()%>FD.put("<%=attributeName%>",<%=Util.toLowerCaseFirstLetter(classAssociated.getName())%>.get("<%=attributeName%>" ));
 }*/
             }
             for (int i=0; i<listAttAssocB.size(); i++ ){
@@ -533,8 +496,7 @@
                 String relationName = classAssociatedB.getName();
                 String idNameFieldName = Util.getAttributeName(classAssociatedB);
                 String descriptionFieldName = Util.getAttributeDescription(classAssociatedB);
-/*{            
-                        GenericValue <%=Util.toLowerCaseFirstLetter(relationName )%> = <%=Util.toLowerCaseFirstLetter(classAssociated.getName())%>.getRelatedOne("<%=relationName%>");
+/*{                        GenericValue <%=Util.toLowerCaseFirstLetter(relationName )%> = <%=Util.toLowerCaseFirstLetter(classAssociated.getName())%>.getRelatedOne("<%=relationName%>");
                         if (<%=Util.toLowerCaseFirstLetter(relationName )%> != null){
                             <%=association.getName()%>FD.put("<%=Util.toLowerCaseFirstLetter(relationName )%>Description",  <%=Util.toLowerCaseFirstLetter(relationName )%>.get("<%=descriptionFieldName%>") );
                             <%=association.getName()%>FD.put("<%=Util.toLowerCaseFirstLetter(relationName )%>Name",  <%=Util.toLowerCaseFirstLetter(relationName )%>.get("<%=idNameFieldName%>") );
@@ -542,11 +504,10 @@
         
 }*/            
             }
-/*{       
-                    }
+/*{                    }
                 }    
                 request.setAttribute("actionForm",actionForm);
-                HtmlFormWrapper <%=association.getName()%>Wrapper = new NsingleHtmlFormWrapper("/<%=subPackageAssoc%>/Forms<%=classAssociated.getName()%>.xml", "subEdit<%=classAssociated.getName()%><%=fromEntityName%>", request, response, <%=association.getName()%>FD);
+                HtmlFormWrapper <%=association.getName()%>Wrapper = new NsingleHtmlFormWrapper("/<%=subPackageAssoc%>/generated/Forms<%=classAssociated.getName()%>.xml", "subEdit<%=classAssociated.getName()%><%=fromEntityName%>", request, response, <%=association.getName()%>FD);
                 <%=association.getName()%>Wrapper.putInContext("association",association);
                 context.put("<%=association.getName()%>Wrapper", <%=association.getName()%>Wrapper);
             }

Index: ofbiz-neogia-generators/src/java/org/nereide/ofbiz/neogia/generators/GeneratorControlerXml.java
diff -u ofbiz-neogia-generators/src/java/org/nereide/ofbiz/neogia/generators/GeneratorControlerXml.java:1.12 ofbiz-neogia-generators/src/java/org/nereide/ofbiz/neogia/generators/GeneratorControlerXml.java:1.13
--- ofbiz-neogia-generators/src/java/org/nereide/ofbiz/neogia/generators/GeneratorControlerXml.java:1.12	Fri Jun 25 19:55:10 2004
+++ ofbiz-neogia-generators/src/java/org/nereide/ofbiz/neogia/generators/GeneratorControlerXml.java	Sat Jun 26 17:18:33 2004
@@ -51,7 +51,7 @@
 * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
  *
  *@author     Olivier.Heintz@nereide.biz
- *@version    $Revision: 1.12 $
+ *@version    $Revision: 1.13 $
  *@since      3.1
  * 
  * This file has been generated, and will be re-generated,
@@ -165,28 +165,24 @@
 }*/        
         for( Iterator iterClazz = model.getClasses().iterator(); iterClazz.hasNext(); ){
            clazz = (ObjectModelClass) iterClazz.next();
-           if(Util.isEntity(clazz)){
+           if(Util.isEntity(clazz) && clazz.getPackageName().startsWith(packageParam) ){
                 entityName = clazz.getName();
                 subpackageName = Util.getLastWord(Util.getParentPackageName(clazz.getPackageName()));
                 if (Util.hasGuiList(clazz) || Util.hasGuiListAll(clazz)){
-/*{       
-
+/*{
         <view-map name="List<%=clazz.getName()%>" type="jpublish" page="/<%=subpackageName%>/generated/List<%=clazz.getName()%>.ftl"/>
 }*/
                 }
                if (Util.hasGuiEdit(clazz)){
-/*{                
-        <view-map name="Edit<%=clazz.getName()%>" type="jpublish" page="/<%=subpackageName%>/generated/Edit<%=clazz.getName()%>.ftl"/>
+/*{        <view-map name="Edit<%=clazz.getName()%>" type="jpublish" page="/<%=subpackageName%>/generated/Edit<%=clazz.getName()%>.ftl"/>
 }*/
                }
                if (Util.hasGuiEditAssoc(clazz)){
-/*{                
-        <view-map name="EditAssoc<%=clazz.getName()%>" type="jpublish" page="/<%=subpackageName%>/generated/EditAssoc<%=clazz.getName()%>.ftl"/>
+/*{        <view-map name="EditAssoc<%=clazz.getName()%>" type="jpublish" page="/<%=subpackageName%>/generated/EditAssoc<%=clazz.getName()%>.ftl"/>
 }*/
                }
                if (Util.hasGuiShow(clazz)){
-/*{                
-        <view-map name="Show<%=clazz.getName()%>" type="jpublish" page="/<%=subpackageName%>/generated/Show<%=clazz.getName()%>.ftl"/>
+/*{        <view-map name="Show<%=clazz.getName()%>" type="jpublish" page="/<%=subpackageName%>/generated/Show<%=clazz.getName()%>.ftl"/>
 }*/
                }
             }

Index: ofbiz-neogia-generators/src/java/org/nereide/ofbiz/neogia/generators/GeneratorEntitymodelXml.java
diff -u ofbiz-neogia-generators/src/java/org/nereide/ofbiz/neogia/generators/GeneratorEntitymodelXml.java:1.8 ofbiz-neogia-generators/src/java/org/nereide/ofbiz/neogia/generators/GeneratorEntitymodelXml.java:1.9
--- ofbiz-neogia-generators/src/java/org/nereide/ofbiz/neogia/generators/GeneratorEntitymodelXml.java:1.8	Thu Jun 10 08:47:55 2004
+++ ofbiz-neogia-generators/src/java/org/nereide/ofbiz/neogia/generators/GeneratorEntitymodelXml.java	Sat Jun 26 17:18:33 2004
@@ -32,8 +32,7 @@
 
     public void generateFromModel(Writer output, ObjectModel model) throws IOException {
         ObjectModelClass clazz;
-                 /*{
-<?xml version="1.0" encoding="UTF-8"?>
+/*{<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE entitymodel PUBLIC "-//OFBiz//DTD Entity Model//EN" "http://www.ofbiz.org/dtds/entitymodel.dtd">
 <!--  Title: Entity Generator Definitions for the General Data Model
  *
@@ -56,7 +55,7 @@
  *   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
  *
  *@author     Olivier.Heintz@nereide.biz
- *@version    $Revision: 1.8 $
+ *@version    $Revision: 1.9 $
  *@since      3.1
  * 
  * This file has been generated, and will be re-generated,
@@ -117,8 +116,7 @@
                         for(int j=0; j<listPrimaryKeyName.size(); j++ ){
                             attributeType = (String) listPrimaryKeyType.get(j);
                             String attributeName = (String) listPrimaryKeyName.get(j);
-/*{
-        <field name="<%=participantName%><%=Util.toUpperCaseFirstLetter(attributeName)%>" type="<%=attributeType%>"></field>
+/*{        <field name="<%=participantName%><%=Util.toUpperCaseFirstLetter(attributeName)%>" type="<%=attributeType%>"></field>
 }*/                        
                         }
                     }    
@@ -131,8 +129,7 @@
                         for(int i=0; i<listPrimaryKeyName.size(); i++ ){
                             attributeType = (String) listPrimaryKeyType.get(i);
                             String attributeName = (String) listPrimaryKeyName.get(i);
-/*{
-        <field name="<%=attributeName%>" type="<%=attributeType%>"></field>
+/*{        <field name="<%=attributeName%>" type="<%=attributeType%>"></field>
 }*/                            
                         }
                     }
@@ -144,8 +141,7 @@
                     isAssoc = attribute.referenceClassifier();
                     if (! isAssoc){
                         attributeType = Util.getOfbizType(attribute);
-/*{
-        <field name="<%=attribute.getName()%>" type="<%=attributeType%>"></field>
+/*{        <field name="<%=attribute.getName()%>" type="<%=attributeType%>"></field>
 }*/                        
                     } else{
                         if (attribute.getMaxMultiplicity() == 1){
@@ -158,8 +154,7 @@
                                 //System.out.println("XXXXXXXX4Debug attrAssoc="+attrAssoc.getName());
                                 attributeType = (String) listPrimaryKeyType.get(i);
                                 String attrAssocName = (String) listPrimaryKeyName.get(i);
-/*{
-        <field name="<%=Util.getAttributeShortName(attribute)%><%=Util.toUpperCaseFirstLetter(attrAssocName)%>" type="<%=attributeType%>"></field>
+/*{        <field name="<%=Util.getAttributeShortName(attribute)%><%=Util.toUpperCaseFirstLetter(attrAssocName)%>" type="<%=attributeType%>"></field>
 }*/                            
                             }
                             if (listPrimaryKeyName.size()<1) System.out.println("UML MODEL ERROR  class without a primaryKey,  class ="+clazzAssociated.getName());
@@ -181,8 +176,7 @@
                         for(int i=0; i<listPrimaryKeyName.size(); i++ ){
                             attributeType = (String) listPrimaryKeyType.get(i);
                             String attrAssocPkName = (String) listPrimaryKeyName.get(i);
-/*{
-        <field name="<%=relationName%><%=Util.toUpperCaseFirstLetter(attrAssocPkName)%>" type="<%=attributeType%>"></field>
+/*{        <field name="<%=relationName%><%=Util.toUpperCaseFirstLetter(attrAssocPkName)%>" type="<%=attributeType%>"></field>
 }*/                            
                         }
                     }
@@ -192,8 +186,7 @@
                 Util.getListPrimaryKeyAttr(model, clazz, listPrimaryKeyName, listPrimaryKeyType);
                 for(int i=0; i<listPrimaryKeyName.size(); i++ ){
                     String primaryKeyName = (String) listPrimaryKeyName.get(i);
-/*{
-        <prim-key field="<%=primaryKeyName%>"/>
+/*{        <prim-key field="<%=primaryKeyName%>"/>
 }*/                        
                 }
                 System.out.println("YYYYYYYYY-Y2-Debug  primaryKey creation clazz=" + clazz.getName());
@@ -202,8 +195,7 @@
                     System.out.println("XXXXXXX-X4-Debug associationClass primaryKey");
                     for (int i=0; i<2; i++){
                         ObjectModelClass participantClass = (ObjectModelClass) ((List) participantsWithName.get("classParticipants")).get(i);
-/*{
-        <relation type="one-nofk" rel-entity-name="<%=participantClass.getName()%>">
+/*{        <relation type="one-nofk" rel-entity-name="<%=participantClass.getName()%>">
 }*/                        
                         String participantName = (String) ((List) participantsWithName.get("attributeParticipants")).get(i);
                         if (Util.toUpperCaseFirstLetter(participantName).equals(participantClass.getName())) participantName = Util.getClassShortName(participantClass);
@@ -211,12 +203,10 @@
                         Util.getListPrimaryKeyAttr(model, participantClass, listPrimaryKeyName, listPrimaryKeyType);
                         for(int j=0; j<listPrimaryKeyName.size(); j++ ){
                             String participantAttrKeyName = (String)listPrimaryKeyName.get(j);
-/*{
-            <key-map field-name="<%=participantName%><%=Util.toUpperCaseFirstLetter(participantAttrKeyName)%>" rel-field-name="<%=participantAttrKeyName%>"/>
+/*{            <key-map field-name="<%=participantName%><%=Util.toUpperCaseFirstLetter(participantAttrKeyName)%>" rel-field-name="<%=participantAttrKeyName%>"/>
 }*/                        
                         }
-/*{
-        </relation>
+/*{        </relation>
 }*/                        
                     }    
                 }
@@ -228,19 +218,16 @@
                         String relationName = ((ObjectModelClass) relationKeyName.get("clazzAssociated")).getName();
 
                         if (attribute.getMaxMultiplicity() == 1){
-/*{
-        <relation type="one-nofk" rel-entity-name="<%=relationName%>">
+/*{        <relation type="one-nofk" rel-entity-name="<%=relationName%>">
 }*/
                             List listName = (List) relationKeyName.get("listName"); 
                             for(Iterator iterList=listName.iterator(); iterList.hasNext(); ){
                                 Map fieldName = (Map) iterList.next();
-/*{
-            <key-map field-name="<%=(String) fieldName.get("fieldName")%>" rel-field-name="<%=(String) fieldName.get("relFieldName")%>"/>
+/*{            <key-map field-name="<%=(String) fieldName.get("fieldName")%>" rel-field-name="<%=(String) fieldName.get("relFieldName")%>"/>
 }*/                                
                             }   
                         } else {
-/*{
-        <relation type="many" rel-entity-name="<%=relationName%>">
+/*{        <relation type="many" rel-entity-name="<%=relationName%>">
 }*/
                             String reverseAttributeName = ( attribute.getReverseAttribute() != null ) ? 
                                     Util.getAttributeShortName(attribute.getReverseAttribute())  :
@@ -250,20 +237,16 @@
                             for(int i=0; i<listPrimaryKeyName.size(); i++ ){
                                 String attrPkName = (String)listPrimaryKeyName.get(i);
                                 //System.out.println("XXXXXXXX6Debug attrPk="+attrPk.getName());
-/*{
-            <key-map field-name="<%=attrPkName%>" rel-field-name="<%=reverseAttributeName%><%=Util.toUpperCaseFirstLetter(attrPkName)%>"/>
+/*{            <key-map field-name="<%=attrPkName%>" rel-field-name="<%=reverseAttributeName%><%=Util.toUpperCaseFirstLetter(attrPkName)%>"/>
 }*/ 
                             }
                         }    
-/*{
-        </relation>
+/*{        </relation>
 }*/                        
                     }
                     
                 }                
-/*{
-    </entity>
-
+/*{    </entity>
 }*/
             }
         }

Index: ofbiz-neogia-generators/src/java/org/nereide/ofbiz/neogia/generators/GeneratorShowFtl.java
diff -u ofbiz-neogia-generators/src/java/org/nereide/ofbiz/neogia/generators/GeneratorShowFtl.java:1.2 ofbiz-neogia-generators/src/java/org/nereide/ofbiz/neogia/generators/GeneratorShowFtl.java:1.3
--- ofbiz-neogia-generators/src/java/org/nereide/ofbiz/neogia/generators/GeneratorShowFtl.java:1.2	Thu Jun 10 08:47:55 2004
+++ ofbiz-neogia-generators/src/java/org/nereide/ofbiz/neogia/generators/GeneratorShowFtl.java	Sat Jun 26 17:18:33 2004
@@ -14,7 +14,7 @@
     
     public String getFilenameForClass(ObjectModelClass clazz){
             Map nameMap = Util.initPackageName(clazz);
-            return ((String)nameMap.get("packageName"))+"/webapp/"+((String)nameMap.get("packageName"))+"/"+((String)nameMap.get("subpackageName"))+"/Show"+clazz.getName()+".ftl";
+            return ((String)nameMap.get("packageName"))+"/webapp/"+((String)nameMap.get("packageName"))+"/"+((String)nameMap.get("subpackageName"))+"/generated/Show"+clazz.getName()+".ftl";
     }
 
     public void generateFromClass(Writer output, ObjectModelClass clazz) throws IOException {
@@ -52,7 +52,7 @@
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
  * @author     Olivier.Heintz@nereide.biz
- *@version    $Revision: 1.2 $
+ *@version    $Revision: 1.3 $
  *@since      3.1
  * 
  * This file has been generated, and will be re-generated,

Index: ofbiz-neogia-generators/src/java/org/nereide/ofbiz/neogia/generators/TestModelValidity.java
diff -u /dev/null ofbiz-neogia-generators/src/java/org/nereide/ofbiz/neogia/generators/TestModelValidity.java:1.1
--- /dev/null	Sat Jun 26 17:18:39 2004
+++ ofbiz-neogia-generators/src/java/org/nereide/ofbiz/neogia/generators/TestModelValidity.java	Sat Jun 26 17:18:33 2004
@@ -0,0 +1,99 @@
+package org.nereide.ofbiz.neogia.generators;
+
+import java.io.IOException;
+import java.io.Writer;
+import java.util.Iterator;
+
+import org.codelutin.generator.ObjectModelGenerator;
+import org.codelutin.generator.models.object.ObjectModel;
+import org.codelutin.generator.models.object.ObjectModelAttribute;
+import org.codelutin.generator.models.object.ObjectModelClass;
+
+public class TestModelValidity extends ObjectModelGenerator {
+
+    private String packageParam = null;
+    private String packageName = null;
+    
+    
+    public String getFilenameForModel(ObjectModel model){
+        if (packageName == null) {
+            String[] packageParams = new String[2];
+            if (! Util.initPackageParam(packageParams)) packageName="error";
+            else{
+                packageParam = packageParams[0];
+                packageName = packageParams[1];
+            }
+        }
+        return packageName+"TestValidityModel.xml";
+    }
+
+    public void generateFromModel(Writer output, ObjectModel model) throws IOException {
+      
+/*{
+<!--
+ * Copyright (c) 2004 Olivier Heintz - olivier.heintz@nereide.biz 
+ * Copyright (c) 2004 Nereide - www.nereide.biz
+ * Copyright (c) 2004 Neogia - www.neogia.org
+ *  
+ *   This program is free software; you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation; either version 2 of the License, or
+ *   (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program; if not, write to the Free Software
+* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+ *
+ *@author     Olivier.Heintz@nereide.biz
+ *@version    $Revision: 1.1 $
+ *@since      3.1
+ * 
+ * This file has been generated, and will be re-generated,
+ *      this file must be use only only to easly add some lines in the services.xml file.
+ -->
+
+}*/
+        if (packageParam == null){
+             String[] packageParams = new String[2];
+             if (! Util.initPackageParam(packageParams)) return;
+             else{
+                 packageParam = packageParams[0];
+                 packageName = packageParams[1];
+             }
+        }
+        System.out.println("Package Name Param is =" + packageName);
+        ObjectModelClass clazz;
+        String entityName, subpackageName;
+        for( Iterator iterClazz = model.getClasses().iterator(); iterClazz.hasNext(); ){
+            clazz = (ObjectModelClass) iterClazz.next();
+            System.out.println("Class Name  is =" + clazz.getName() );
+            if(Util.isEntity(clazz) ){
+                entityName = clazz.getName();
+                subpackageName = Util.getLastWord(Util.getParentPackageName(clazz.getPackageName()));
+                if (clazz.getPackageName().startsWith(packageParam) )
+                    System.out.println("    Class is in the package subpackageName =" + subpackageName );
+                else
+                    System.out.println("    subpackageName =" + subpackageName );
+                for (Iterator iterAtt=clazz.getAttributes().iterator(); iterAtt.hasNext(); ) {
+                    ObjectModelAttribute attribute = (ObjectModelAttribute) iterAtt.next();
+                    System.out.println("        Attribute Name =" + attribute.getName() );
+                    if (attribute.referenceClassifier() ){
+                        if (attribute.hasAssociationClass() ){
+                            System.out.println("            Attribute.getClassifier =" + attribute.getClassifier().getName() + " and an association Class =" + attribute.getAssociationClass().getName() );
+                        } else
+                            System.out.println("            Attribute.getClassifier =" + attribute.getClassifier().getName()  );
+                    } else {
+                        String testSt = Util.getOfbizType(attribute);
+                    }
+                }
+            }        
+        }
+    }
+} 
+
+