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.4 ofbiz-neogia-generators/src/java/org/nereide/ofbiz/neogia/generators/GeneratorEditFtl.java:1.5
--- ofbiz-neogia-generators/src/java/org/nereide/ofbiz/neogia/generators/GeneratorEditFtl.java:1.4	Mon Jun 14 22:14:09 2004
+++ ofbiz-neogia-generators/src/java/org/nereide/ofbiz/neogia/generators/GeneratorEditFtl.java	Fri Jun 25 19:55:10 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"))+"/Edit"+clazz.getName()+".ftl";
+            return ((String)nameMap.get("packageName"))+"/webapp/"+((String)nameMap.get("packageName"))+"/"+((String)nameMap.get("subpackageName"))+"/generated/Edit"+clazz.getName()+".ftl";
     }
 
     public void generateFromClass(Writer output, ObjectModelClass clazz) throws IOException {
@@ -51,7 +51,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,

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.3 ofbiz-neogia-generators/src/java/org/nereide/ofbiz/neogia/generators/GeneratorListFtl.java:1.4
--- ofbiz-neogia-generators/src/java/org/nereide/ofbiz/neogia/generators/GeneratorListFtl.java:1.3	Thu Jun 10 08:47:55 2004
+++ ofbiz-neogia-generators/src/java/org/nereide/ofbiz/neogia/generators/GeneratorListFtl.java	Fri Jun 25 19:55:10 2004
@@ -12,7 +12,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"))+"/List"+clazz.getName()+".ftl";
+            return ((String)nameMap.get("packageName"))+"/webapp/"+((String)nameMap.get("packageName"))+"/"+((String)nameMap.get("subpackageName"))+"/generated/List"+clazz.getName()+".ftl";
     }
 
     public void generateFromClass(Writer output, ObjectModelClass clazz) throws IOException {
@@ -43,7 +43,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,

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.3 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.3	Sun Jun 13 22:56:56 2004
+++ ofbiz-neogia-generators/src/java/org/nereide/ofbiz/neogia/generators/GeneratorServicesXml.java	Fri Jun 25 19:55:10 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.3 $
+ *@version    $Revision: 1.4 $
  *@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%>.<%=entityName%>Services" invoke="edit<%=entityName%>" auth="true">
+            location="org.ofbiz.<%=packageName%>.<%=subpackageName%>.developped.<%=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%>.<%=entityName%>Services" invoke="remove<%=entityName%>" auth="true">
+            location="org.ofbiz.<%=packageName%>.<%=subpackageName%>.developped.<%=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/GeneratorPagedefsListXml.java
diff -u 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.6
--- ofbiz-neogia-generators/src/java/org/nereide/ofbiz/neogia/generators/GeneratorPagedefsListXml.java:1.5	Thu Jun 10 08:47:55 2004
+++ ofbiz-neogia-generators/src/java/org/nereide/ofbiz/neogia/generators/GeneratorPagedefsListXml.java	Fri Jun 25 19:55:10 2004
@@ -11,7 +11,7 @@
 
     public String getFilenameForClass(ObjectModelClass clazz){
         Map nameMap = Util.initPackageName(clazz);
-        return ((String)nameMap.get("packageName"))+"/webapp/"+((String)nameMap.get("packageName"))+"/WEB-INF/pagedefs/"+((String)nameMap.get("subpackageName"))+"/List"+clazz.getName()+"G.xml";
+        return ((String)nameMap.get("packageName"))+"/webapp/"+((String)nameMap.get("packageName"))+"/WEB-INF/pagedefs/"+((String)nameMap.get("subpackageName"))+"/generated/List"+clazz.getName()+"G.xml";
     }
 
     public void generateFromClass(Writer output, ObjectModelClass clazz) throws IOException {
@@ -28,12 +28,12 @@
 <page>
     <template>main</template> 
     <property name="titleProperty"><%=packageName%>List<%=clazz.getName()%></property>
-    <property name="formDefFile">/<%=subpackageName%>/Forms<%=clazz.getName()%>.xml</property>
+    <property name="formDefFile">/<%=subpackageName%>/generated/Forms<%=clazz.getName()%>.xml</property>
     <property name="singleFormName">find<%=clazz.getName()%></property>    
     <property name="listFormName">list<%=clazz.getName()%></property>    
     <property name="viewSize">20</property>    
     <property name="headerItem"><%=subpackageName%></property>    
-    <property name="subMenu">/<%=subpackageName%>/TabBarSubMenu.ftl</property>    
+    <property name="subMenu">/<%=subpackageName%>/developped/TabBarSubMenu.ftl</property>    
     <property name="tabButtonItem">find</property>
     <property name="entityName"><%=clazz.getName()%></property>
 }*/
@@ -56,7 +56,7 @@
     <property name="permissionType">simple</property>    
     <content-action name="/includes/checkPermission.bsh"/>
     <content-action name="/includes/formprep.bsh"/>
-    <content-action name="/<%=subpackageName%>/Find<%=clazz.getName()%>.bsh"/>
+    <content-action name="/<%=subpackageName%>/generated/Find<%=clazz.getName()%>.bsh"/>
     <content-action name="/includes/pagelistprep.bsh"/>
 </page>
 

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.6 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.6	Wed May 19 06:43:19 2004
+++ ofbiz-neogia-generators/src/java/org/nereide/ofbiz/neogia/generators/GeneratorLookupJava.java	Fri Jun 25 19:55:10 2004
@@ -16,7 +16,7 @@
     // il faudrait le lancer par subpackage, et alors changer la methode getFilenameForxxxx
     
     public String getFilenameForModel(ObjectModel model){
-        return "src/org/ofbiz/"+packageName+"/lookupParams.java";
+        return "src/org/ofbiz/"+packageName+"/generated/lookupParams.java";
 	}
 
     public void generateFromModel(Writer output, ObjectModel model) throws IOException {
@@ -42,7 +42,7 @@
 //  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 // 
 // @author     malin.nicolas@nereide.biz
-// @version    $Revision: 1.6 $
+// @version    $Revision: 1.7 $
 // @since      3.1
 //  
 //  This file has been generated, and will be re-generated,
@@ -66,11 +66,11 @@
                 subpackageName = (String) nameMap.get("subpackageName");
 	            entityName = clazz.getName();
 /*{  
-  /** Set up parameters to be able to start the generic lockup to have Lookup<%=entityName%>
-	 *@param request The HTTPRequest object for the current request
-	 *@param response The HTTPResponse object for the current request
-	 *@return String specifying the exit status of this event
-     */
+     // Set up parameters to be able to start the generic lockup to have Lookup<%=entityName%>
+	 //*@param request The HTTPRequest object for the current request
+	 //*@param response The HTTPResponse object for the current request
+	 //*@return String specifying the exit status of this event
+     //
 }*/
 /*{  
 	public static String lookup<%=entityName%>(HttpServletRequest request, HttpServletResponse response) {

Index: ofbiz-neogia-generators/src/java/org/nereide/ofbiz/neogia/generators/GeneratorEditBsh.java
diff -u ofbiz-neogia-generators/src/java/org/nereide/ofbiz/neogia/generators/GeneratorEditBsh.java:1.5 ofbiz-neogia-generators/src/java/org/nereide/ofbiz/neogia/generators/GeneratorEditBsh.java:1.6
--- ofbiz-neogia-generators/src/java/org/nereide/ofbiz/neogia/generators/GeneratorEditBsh.java:1.5	Wed Jun 16 11:51:39 2004
+++ ofbiz-neogia-generators/src/java/org/nereide/ofbiz/neogia/generators/GeneratorEditBsh.java	Fri Jun 25 19:55:10 2004
@@ -16,7 +16,7 @@
     
     public String getFilenameForClass(ObjectModelClass clazz){
          Map nameMap = Util.initPackageName(clazz);
-        return ((String)nameMap.get("packageName"))+"/webapp/"+((String)nameMap.get("packageName"))+"/WEB-INF/actions/"+((String)nameMap.get("subpackageName"))+"/Edit"+clazz.getName()+".bsh";
+        return ((String)nameMap.get("packageName"))+"/webapp/"+((String)nameMap.get("packageName"))+"/WEB-INF/actions/"+((String)nameMap.get("subpackageName"))+"/generated/Edit"+clazz.getName()+".bsh";
     }
 
     public void generateFromClass(Writer output, ObjectModelClass clazz) throws IOException {
@@ -28,7 +28,7 @@
         System.out.println("XXXXXXXX1Debug clazz.getName="+clazz.getName());
 
 /*{
-//  $Id: GeneratorEditBsh.java,v 1.5 2004/06/16 11:51:39 holivier Exp $
+//  $Id: GeneratorEditBsh.java,v 1.6 2004/06/25 19:55:10 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
@@ -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
 //  
 //

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.4 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.4	Sun Jun 20 21:58:10 2004
+++ ofbiz-neogia-generators/src/java/org/nereide/ofbiz/neogia/generators/GeneratorEntityObjectJava.java	Fri Jun 25 19:55:10 2004
@@ -16,7 +16,7 @@
     public String getFilenameForClass(ObjectModelClass clazz){
         Map nameMap = Util.initPackageName(clazz);
         String packageName = (String) nameMap.get("packageName");
-        return packageName+"/src/org/ofbiz/"+packageName+"/"+((String)nameMap.get("subpackageName"))+"/"+clazz.getName()+".java";
+        return packageName+"/src/org/ofbiz/"+packageName+"/"+((String)nameMap.get("subpackageName"))+"/generated/"+clazz.getName()+".java";
 	}
 
     public void generateFromClass(Writer output, ObjectModelClass clazz) throws IOException {
@@ -48,7 +48,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,

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.2 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.2	Sun Jun 20 21:58:10 2004
+++ ofbiz-neogia-generators/src/java/org/nereide/ofbiz/neogia/generators/GeneratorEntityServicesJava.java	Fri Jun 25 19:55:10 2004
@@ -78,7 +78,7 @@
     public String getFilenameForClass(ObjectModelClass clazz){
         Map nameMap = Util.initPackageName(clazz);
         String packageName = (String) nameMap.get("packageName");
-        return packageName+"/src/org/ofbiz/"+packageName+"/"+((String)nameMap.get("subpackageName"))+"/"+clazz.getName()+"Services.java";
+        return packageName+"/src/org/ofbiz/"+packageName+"/"+((String)nameMap.get("subpackageName"))+"/generated/"+clazz.getName()+"Services.java";
 	}
 
     // ---------------------------------------------
@@ -113,7 +113,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/GeneratorPagedefsEditAssocXml.java
diff -u ofbiz-neogia-generators/src/java/org/nereide/ofbiz/neogia/generators/GeneratorPagedefsEditAssocXml.java:1.2 ofbiz-neogia-generators/src/java/org/nereide/ofbiz/neogia/generators/GeneratorPagedefsEditAssocXml.java:1.3
--- ofbiz-neogia-generators/src/java/org/nereide/ofbiz/neogia/generators/GeneratorPagedefsEditAssocXml.java:1.2	Mon Jun 14 22:14:09 2004
+++ ofbiz-neogia-generators/src/java/org/nereide/ofbiz/neogia/generators/GeneratorPagedefsEditAssocXml.java	Fri Jun 25 19:55:10 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"))+"/WEB-INF/pagedefs/"+((String)nameMap.get("subpackageName"))+"/EditAssoc"+clazz.getName()+"G.xml";
+        return ((String)nameMap.get("packageName"))+"/webapp/"+((String)nameMap.get("packageName"))+"/WEB-INF/pagedefs/"+((String)nameMap.get("subpackageName"))+"/generated/EditAssoc"+clazz.getName()+"G.xml";
     }
 
     public void generateFromClass(Writer output, ObjectModelClass clazz) throws IOException {
@@ -34,7 +34,7 @@
     <template>main</template> 
     <property name="titleProperty"><%=packageName%>EditAssoc<%=clazz.getName()%></property>
     <property name="headerItem"><%=subpackageName%></property>    
-    <property name="subMenu">/<%=subpackageName%>/TabBarSubMenu.ftl</property>
+    <property name="subMenu">/<%=subpackageName%>/developped/TabBarSubMenu.ftl</property>
 }*/
         if (associationList.size() == 1){
                 String associationName = ((ObjectModelAttribute) associationList.get(0) ).getName();
@@ -55,7 +55,7 @@
     <property name="entityOperation">_UPDATE</property>    
     <property name="permissionType">simple</property>    
     <content-action name="/includes/checkPermission.bsh"/>
-    <content-action name="/<%=subpackageName%>/EditAssoc<%=clazz.getName()%>.bsh"/>
+    <content-action name="/<%=subpackageName%>/generated/EditAssoc<%=clazz.getName()%>.bsh"/>
     <content-action name="/includes/pagelistprep.bsh"/>
 </page>
 }*/

Index: ofbiz-neogia-generators/src/java/org/nereide/ofbiz/neogia/generators/GeneratorPagedefsShowXml.java
diff -u ofbiz-neogia-generators/src/java/org/nereide/ofbiz/neogia/generators/GeneratorPagedefsShowXml.java:1.1 ofbiz-neogia-generators/src/java/org/nereide/ofbiz/neogia/generators/GeneratorPagedefsShowXml.java:1.2
--- ofbiz-neogia-generators/src/java/org/nereide/ofbiz/neogia/generators/GeneratorPagedefsShowXml.java:1.1	Sun Jun  6 22:25:40 2004
+++ ofbiz-neogia-generators/src/java/org/nereide/ofbiz/neogia/generators/GeneratorPagedefsShowXml.java	Fri Jun 25 19:55:10 2004
@@ -3,7 +3,6 @@
 import java.io.IOException;
 import java.io.Writer;
 import java.util.Map;
-import java.util.StringTokenizer;
 
 import org.codelutin.generator.ObjectModelGenerator;
 import org.codelutin.generator.models.object.ObjectModelClass;
@@ -12,7 +11,7 @@
 
     public String getFilenameForClass(ObjectModelClass clazz){
         Map nameMap = Util.initPackageName(clazz);
-        return ((String)nameMap.get("packageName"))+"/webapp/"+((String)nameMap.get("packageName"))+"/WEB-INF/pagedefs/"+((String)nameMap.get("subpackageName"))+"/Show"+clazz.getName()+"G.xml";
+        return ((String)nameMap.get("packageName"))+"/webapp/"+((String)nameMap.get("packageName"))+"/WEB-INF/pagedefs/"+((String)nameMap.get("subpackageName"))+"/generated/Show"+clazz.getName()+"G.xml";
     }
 
     public void generateFromClass(Writer output, ObjectModelClass clazz) throws IOException {
@@ -29,17 +28,17 @@
 <page>
     <template>main</template> 
     <property name="titleProperty"><%=packageName%>Show<%=clazz.getName()%></property>
-    <property name="formDefFile">/<%=subpackageName%>/Forms<%=clazz.getName()%>.xml</property>
+    <property name="formDefFile">/<%=subpackageName%>/generated/Forms<%=clazz.getName()%>.xml</property>
     <property name="singleFormName">show<%=clazz.getName()%></property>    
     <property name="headerItem"><%=subpackageName%></property>    
-    <property name="subMenu">/<%=subpackageName%>/TabBarSubMenu.ftl</property>    
+    <property name="subMenu">/<%=subpackageName%>/developped/TabBarSubMenu.ftl</property>    
     <property name="tabButtonItem">show</property>
     <property name="entityName"><%=clazz.getName()%></property>
     <property name="permission"><%=packageName.toUpperCase()%></property>    
     <property name="entityOperation">_VIEW</property>    
     <property name="permissionType">simple</property>    
     <content-action name="/includes/checkPermission.bsh"/>
-    <content-action name="/<%=subpackageName%>/Edit<%=clazz.getName()%>.bsh"/>
+    <content-action name="/<%=subpackageName%>/generated/Edit<%=clazz.getName()%>.bsh"/>
     <content-action name="/includes/formprep.bsh"/>
 </page>
 }*/

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.23 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.23	Wed Jun 23 12:31:02 2004
+++ ofbiz-neogia-generators/src/java/org/nereide/ofbiz/neogia/generators/GeneratorFormsXml.java	Fri Jun 25 19:55:10 2004
@@ -74,7 +74,7 @@
 
     public String getFilenameForClass(ObjectModelClass clazz){
         initPackageName(clazz);
-        return packageName+"/webapp/" + packageName + "/" + subpackageName + "/"
+        return packageName+"/webapp/" + packageName + "/" + subpackageName + "/generated/"
             + "Forms" + clazz.getName()+".xml";
     }
 
@@ -424,7 +424,7 @@
 *
 *@author           Olivier.Heintz@nereide.biz
 *@author           malin.nicolas@nereide.biz
-*@version          $Revision: 1.23 $
+*@version          $Revision: 1.24 $
 *@since            3.1
 *
 * This file has been generated, and will be re-generated,

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.2 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.2	Wed Jun 23 12:31:02 2004
+++ ofbiz-neogia-generators/src/java/org/nereide/ofbiz/neogia/generators/GeneratorEditAssocBsh.java	Fri Jun 25 19:55:10 2004
@@ -17,7 +17,7 @@
     
     public String getFilenameForClass(ObjectModelClass clazz){
          Map nameMap = Util.initPackageName(clazz);
-        return ((String)nameMap.get("packageName"))+"/webapp/"+((String)nameMap.get("packageName"))+"/WEB-INF/actions/"+((String)nameMap.get("subpackageName"))+"/EditAssoc"+clazz.getName()+".bsh";
+        return ((String)nameMap.get("packageName"))+"/webapp/"+((String)nameMap.get("packageName"))+"/WEB-INF/actions/"+((String)nameMap.get("subpackageName"))+"/generated/EditAssoc"+clazz.getName()+".bsh";
     }
 
     public void generateFromClass(Writer output, ObjectModelClass clazz) throws IOException {
@@ -62,7 +62,7 @@
 
 
 /*{
-//  $Id: GeneratorEditAssocBsh.java,v 1.2 2004/06/23 12:31:02 holivier Exp $
+//  $Id: GeneratorEditAssocBsh.java,v 1.3 2004/06/25 19:55:10 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.2 $
+//  @version    $Revision: 1.3 $
 //  @since      3.1
 //  
 //  Calls Find on a dynamiqueView  to return an EntityListIterator of the

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.11 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.11	Wed Jun 23 12:31:02 2004
+++ ofbiz-neogia-generators/src/java/org/nereide/ofbiz/neogia/generators/GeneratorControlerXml.java	Fri Jun 25 19:55:10 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.11 $
+ *@version    $Revision: 1.12 $
  *@since      3.1
  * 
  * This file has been generated, and will be re-generated,
@@ -171,22 +171,22 @@
                 if (Util.hasGuiList(clazz) || Util.hasGuiListAll(clazz)){
 /*{       
 
-        <view-map name="List<%=clazz.getName()%>" type="jpublish" page="/<%=subpackageName%>/List<%=clazz.getName()%>.ftl"/>
+        <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%>/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%>/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%>/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/GeneratorPagedefsEditXml.java
diff -u ofbiz-neogia-generators/src/java/org/nereide/ofbiz/neogia/generators/GeneratorPagedefsEditXml.java:1.1 ofbiz-neogia-generators/src/java/org/nereide/ofbiz/neogia/generators/GeneratorPagedefsEditXml.java:1.2
--- ofbiz-neogia-generators/src/java/org/nereide/ofbiz/neogia/generators/GeneratorPagedefsEditXml.java:1.1	Wed Jun  2 00:09:26 2004
+++ ofbiz-neogia-generators/src/java/org/nereide/ofbiz/neogia/generators/GeneratorPagedefsEditXml.java	Fri Jun 25 19:55:10 2004
@@ -11,7 +11,7 @@
 
     public String getFilenameForClass(ObjectModelClass clazz){
         Map nameMap = Util.initPackageName(clazz);
-        return ((String)nameMap.get("packageName"))+"/webapp/"+((String)nameMap.get("packageName"))+"/WEB-INF/pagedefs/"+((String)nameMap.get("subpackageName"))+"/Edit"+clazz.getName()+"G.xml";
+        return ((String)nameMap.get("packageName"))+"/webapp/"+((String)nameMap.get("packageName"))+"/WEB-INF/pagedefs/"+((String)nameMap.get("subpackageName"))+"/generated/Edit"+clazz.getName()+"G.xml";
     }
 
     public void generateFromClass(Writer output, ObjectModelClass clazz) throws IOException {
@@ -27,17 +27,17 @@
 <page>
     <template>main</template> 
     <property name="titleProperty"><%=packageName%>Edit<%=clazz.getName()%></property>
-    <property name="formDefFile">/<%=subpackageName%>/Forms<%=clazz.getName()%>.xml</property>
+    <property name="formDefFile">/<%=subpackageName%>/generated/Forms<%=clazz.getName()%>.xml</property>
     <property name="singleFormName">edit<%=clazz.getName()%></property>    
     <property name="headerItem"><%=subpackageName%></property>    
-    <property name="subMenu">/<%=subpackageName%>/TabBarSubMenu.ftl</property>    
+    <property name="subMenu">/<%=subpackageName%>/developped/TabBarSubMenu.ftl</property>    
     <property name="tabButtonItem">edit</property>
     <property name="entityName"><%=clazz.getName()%></property>
     <property name="permission"><%=packageName.toUpperCase()%></property>    
     <property name="entityOperation">_UPDATE</property>    
     <property name="permissionType">simple</property>    
     <content-action name="/includes/checkPermission.bsh"/>
-    <content-action name="/<%=subpackageName%>/Edit<%=clazz.getName()%>.bsh"/>
+    <content-action name="/<%=subpackageName%>/generated/Edit<%=clazz.getName()%>.bsh"/>
     <content-action name="/includes/formprep.bsh"/>
 </page>
 }*/

Index: ofbiz-neogia-generators/src/java/org/nereide/ofbiz/neogia/generators/GeneratorEditAssocFtl.java
diff -u ofbiz-neogia-generators/src/java/org/nereide/ofbiz/neogia/generators/GeneratorEditAssocFtl.java:1.2 ofbiz-neogia-generators/src/java/org/nereide/ofbiz/neogia/generators/GeneratorEditAssocFtl.java:1.3
--- ofbiz-neogia-generators/src/java/org/nereide/ofbiz/neogia/generators/GeneratorEditAssocFtl.java:1.2	Wed Jun 23 12:31:02 2004
+++ ofbiz-neogia-generators/src/java/org/nereide/ofbiz/neogia/generators/GeneratorEditAssocFtl.java	Fri Jun 25 19:55:10 2004
@@ -15,7 +15,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"))+"/EditAssoc"+clazz.getName()+".ftl";
+            return ((String)nameMap.get("packageName"))+"/webapp/"+((String)nameMap.get("packageName"))+"/"+((String)nameMap.get("subpackageName"))+"/generated/EditAssoc"+clazz.getName()+".ftl";
     }
 
     public void generateFromClass(Writer output, ObjectModelClass clazz) throws IOException {
@@ -59,7 +59,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/GeneratorFindBsh.java
diff -u ofbiz-neogia-generators/src/java/org/nereide/ofbiz/neogia/generators/GeneratorFindBsh.java:1.4 ofbiz-neogia-generators/src/java/org/nereide/ofbiz/neogia/generators/GeneratorFindBsh.java:1.5
--- ofbiz-neogia-generators/src/java/org/nereide/ofbiz/neogia/generators/GeneratorFindBsh.java:1.4	Wed Jun 23 12:31:02 2004
+++ ofbiz-neogia-generators/src/java/org/nereide/ofbiz/neogia/generators/GeneratorFindBsh.java	Fri Jun 25 19:55:10 2004
@@ -16,7 +16,7 @@
     
     public String getFilenameForClass(ObjectModelClass clazz){
          Map nameMap = Util.initPackageName(clazz);
-        return ((String)nameMap.get("packageName"))+"/webapp/"+((String)nameMap.get("packageName"))+"/WEB-INF/actions/"+((String)nameMap.get("subpackageName"))+"/Find"+clazz.getName()+".bsh";
+        return ((String)nameMap.get("packageName"))+"/webapp/"+((String)nameMap.get("packageName"))+"/WEB-INF/actions/"+((String)nameMap.get("subpackageName"))+"/generated/Find"+clazz.getName()+".bsh";
     }
 
     public void generateFromClass(Writer output, ObjectModelClass clazz) throws IOException {
@@ -27,7 +27,7 @@
         System.out.println("XXXXXXXX1Debug clazz.getName="+clazz.getName());
 
 /*{
-//  $Id: GeneratorFindBsh.java,v 1.4 2004/06/23 12:31:02 holivier Exp $
+//  $Id: GeneratorFindBsh.java,v 1.5 2004/06/25 19:55:10 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
@@ -47,7 +47,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
 //  
 //  Calls Find on a dynamiqueView  to return an EntityListIterator of the