Index: ofbiz-neogia-generators/src/java/org/nereide/ofbiz/neogia/generators/GeneratorEditFtl.java
diff -u ofbiz-neogia-generators/src/java/org/nereide/ofbiz/neogia/generators/GeneratorEditFtl.java:1.2 ofbiz-neogia-generators/src/java/org/nereide/ofbiz/neogia/generators/GeneratorEditFtl.java:1.3
--- ofbiz-neogia-generators/src/java/org/nereide/ofbiz/neogia/generators/GeneratorEditFtl.java:1.2	Sun Jun  6 22:25:40 2004
+++ ofbiz-neogia-generators/src/java/org/nereide/ofbiz/neogia/generators/GeneratorEditFtl.java	Thu Jun 10 08:47:55 2004
@@ -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,
@@ -91,7 +91,7 @@
     <h3>${uiLabelMap.CommonPermissionError}</h3>
 </#if>
 
- }*/
+}*/
     }
 } 
 

Index: ofbiz-neogia-generators/src/java/org/nereide/ofbiz/neogia/generators/GeneratorListFtl.java
diff -u ofbiz-neogia-generators/src/java/org/nereide/ofbiz/neogia/generators/GeneratorListFtl.java:1.2 ofbiz-neogia-generators/src/java/org/nereide/ofbiz/neogia/generators/GeneratorListFtl.java:1.3
--- ofbiz-neogia-generators/src/java/org/nereide/ofbiz/neogia/generators/GeneratorListFtl.java:1.2	Fri May 28 20:45:25 2004
+++ ofbiz-neogia-generators/src/java/org/nereide/ofbiz/neogia/generators/GeneratorListFtl.java	Thu Jun 10 08:47:55 2004
@@ -43,7 +43,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,
@@ -93,7 +93,7 @@
     
 <hr/>
 
- }*/
+}*/
     }
 } 
 

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.1 ofbiz-neogia-generators/src/java/org/nereide/ofbiz/neogia/generators/GeneratorServicesXml.java:1.2
--- ofbiz-neogia-generators/src/java/org/nereide/ofbiz/neogia/generators/GeneratorServicesXml.java:1.1	Sun Jun  6 22:25:40 2004
+++ ofbiz-neogia-generators/src/java/org/nereide/ofbiz/neogia/generators/GeneratorServicesXml.java	Thu Jun 10 08:47:55 2004
@@ -49,14 +49,14 @@
 * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
  *
  *@author     Olivier.Heintz@nereide.biz
- *@version    $Revision: 1.1 $
+ *@version    $Revision: 1.2 $
  *@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;

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.19 ofbiz-neogia-generators/src/java/org/nereide/ofbiz/neogia/generators/GeneratorFormsXml.java:1.20
--- ofbiz-neogia-generators/src/java/org/nereide/ofbiz/neogia/generators/GeneratorFormsXml.java:1.19	Sun Jun  6 22:25:40 2004
+++ ofbiz-neogia-generators/src/java/org/nereide/ofbiz/neogia/generators/GeneratorFormsXml.java	Thu Jun 10 08:47:55 2004
@@ -154,7 +154,7 @@
 *
 *@author           Olivier.Heintz@nereide.biz
 *@author           malin.nicolas@nereide.biz
-*@version          $Revision: 1.19 $
+*@version          $Revision: 1.20 $
 *@since            3.1
 *
 * This file has been generated, and will be re-generated,
@@ -470,6 +470,7 @@
         <form name="show<%=entityName%>" type="single"
                 target="Show<%=entityName%>" title="" default-map-name="formsData"
                 default-title-style="tableheadtext" default-widget-style="tabletext" default-tooltip-style="tabletext">
+            <field name="actionForm"><hidden value="commit${actionForm}"/></field>
 
 }*/
                 for ( iter = clazz.getAttributes().iterator(); iter.hasNext(); ){
@@ -540,14 +541,14 @@
                 target="Edit<%=associatClazz.getName()%>" title="" default-map-name=""
                 default-title-style="tableheadtext" default-widget-style="tabletext" default-tooltip-style="tabletext">
 
-                }*/
+}*/
                     for ( iter2 = listAttPrimaryKey.iterator(); iter.hasNext(); ){
                         att = (ObjectModelAttribute) iter.next();
 
                     /*{
              <field name="<%=att.getName()%>" title="<%=uiLabel( attAssoc )%><hidden value="<%=att.getName()%>"/></field>
 
-                      }*/
+}*/
                     }     
                     
                     for ( iter2 = listAttAssociatList.iterator(); iter.hasNext(); ){
@@ -556,14 +557,14 @@
                     /*{
              <field name="<%=attAssoc.getName()%>" title="<%=uiLabel( attAssoc )%><display/></field>
 
-                      }*/
+}*/
                     }
                     /*{
               </field>
               <field name="submitButton" title="${uiLabelMap.CommonSelected}" widget-style="smallSubmit" ><submit button-type="button"/></field>
          </form>
 
-                      }*/
+}*/
                 }
             }
 /*{

Index: ofbiz-neogia-generators/src/java/org/nereide/ofbiz/neogia/generators/GeneratorPagedefsListXml.java
diff -u ofbiz-neogia-generators/src/java/org/nereide/ofbiz/neogia/generators/GeneratorPagedefsListXml.java:1.4 ofbiz-neogia-generators/src/java/org/nereide/ofbiz/neogia/generators/GeneratorPagedefsListXml.java:1.5
--- ofbiz-neogia-generators/src/java/org/nereide/ofbiz/neogia/generators/GeneratorPagedefsListXml.java:1.4	Fri May 28 20:45:25 2004
+++ ofbiz-neogia-generators/src/java/org/nereide/ofbiz/neogia/generators/GeneratorPagedefsListXml.java	Thu Jun 10 08:47:55 2004
@@ -60,7 +60,7 @@
     <content-action name="/includes/pagelistprep.bsh"/>
 </page>
 
- }*/
+}*/
     }
 } 
 

Index: ofbiz-neogia-generators/src/java/org/nereide/ofbiz/neogia/generators/GeneratorUiLabelProperties.java
diff -u ofbiz-neogia-generators/src/java/org/nereide/ofbiz/neogia/generators/GeneratorUiLabelProperties.java:1.3 ofbiz-neogia-generators/src/java/org/nereide/ofbiz/neogia/generators/GeneratorUiLabelProperties.java:1.4
--- ofbiz-neogia-generators/src/java/org/nereide/ofbiz/neogia/generators/GeneratorUiLabelProperties.java:1.3	Sun Jun  6 22:25:40 2004
+++ ofbiz-neogia-generators/src/java/org/nereide/ofbiz/neogia/generators/GeneratorUiLabelProperties.java	Thu Jun 10 08:47:55 2004
@@ -76,13 +76,13 @@
 #* 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,
 # *      this file must be use only to easly add some lines in the <%=packageName%>UiLabel.properties  file.
 
- }*/
+}*/
         if (packageParam == null){
             String[] packageParams = new String[2];
             if (! Util.initPackageParam(packageParams)) return;

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.7 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.7	Fri May 28 20:45:25 2004
+++ ofbiz-neogia-generators/src/java/org/nereide/ofbiz/neogia/generators/GeneratorEntitymodelXml.java	Thu Jun 10 08:47:55 2004
@@ -56,7 +56,7 @@
  *   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
  *
  *@author     Olivier.Heintz@nereide.biz
- *@version    $Revision: 1.7 $
+ *@version    $Revision: 1.8 $
  *@since      3.1
  * 
  * This file has been generated, and will be re-generated,
@@ -78,7 +78,7 @@
   <!-- ========================================================= -->
   <!-- ======================== Data Model ===================== -->
 
- }*/
+}*/
          if (packageParam == null){
              String[] packageParams = new String[2];
              if (! Util.initPackageParam(packageParams)) return;

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.1 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.1	Sun Jun  6 22:25:40 2004
+++ ofbiz-neogia-generators/src/java/org/nereide/ofbiz/neogia/generators/GeneratorShowFtl.java	Thu Jun 10 08:47:55 2004
@@ -52,7 +52,7 @@
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
  * @author     Olivier.Heintz@nereide.biz
- *@version    $Revision: 1.1 $
+ *@version    $Revision: 1.2 $
  *@since      3.1
  * 
  * This file has been generated, and will be re-generated,
@@ -81,7 +81,7 @@
     <h3>${uiLabelMap.CommonPermissionError}</h3>
 </#if>
 
- }*/
+}*/
     }
 } 
 

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.3 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.3	Thu May 27 06:33:22 2004
+++ ofbiz-neogia-generators/src/java/org/nereide/ofbiz/neogia/generators/GeneratorEntitygroupXml.java	Thu Jun 10 08:47:55 2004
@@ -1,5 +1,6 @@
 package org.nereide.ofbiz.neogia.generators;
 
+import java.io.File;
 import java.io.IOException;
 import java.io.Writer;
 import java.util.Iterator;
@@ -10,12 +11,20 @@
 
 public class GeneratorEntitygroupXml extends ObjectModelGenerator {
 
-    final private String packageParam = "org.neogia.manufacturing";
-    final private String packageName = "manufacturing";
+    private String packageParam = null;
+    private String packageName = null;
     
     
     public String getFilenameForModel(ObjectModel model){
-        return "entitydef/entitygroup.xml";
+        if (packageName == null) {
+            String[] packageParams = new String[2];
+            if (! Util.initPackageParam(packageParams)) packageName="error";
+            else{
+                packageParam = packageParams[0];
+                packageName = packageParams[1];
+            }
+        }
+        return packageName +File.separatorChar +"entitydef" + File.separatorChar +"entitygroup.xml";
     }
 
     public void generateFromModel(Writer output, ObjectModel model) throws IOException {
@@ -44,7 +53,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,
@@ -53,7 +62,15 @@
 
 <entitygroup>
 
-  }*/
+}*/
+          if (packageParam == null){
+              String[] packageParams = new String[2];
+              if (! Util.initPackageParam(packageParams)) return;
+              else{
+                  packageParam = packageParams[0];
+                  packageName = packageParams[1];
+              }
+          }
          ObjectModelClass clazz;
          String entityName;
          for( Iterator iterClazz = model.getClasses().iterator(); iterClazz.hasNext(); ){