svn commit: r995688 [2/3] - in /ofbiz/branches/jquery: ./ applications/content/config/ applications/content/script/org/ofbiz/content/data/ applications/content/servicedef/ applications/content/webapp/content/WEB-INF/ applications/content/widget/content...

Modified: ofbiz/branches/jquery/framework/images/webapp/images/selectall.js
URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/framework/images/webapp/images/selectall.js?rev=995688&r1=995687&r2=995688&view=diff
==============================================================================
--- ofbiz/branches/jquery/framework/images/webapp/images/selectall.js (original)
+++ ofbiz/branches/jquery/framework/images/webapp/images/selectall.js Fri Sep 10 07:26:12 2010
@@ -232,6 +232,7 @@ function confirmActionFormLink(msg, form
   * @param target The URL to call to update the HTML container
   * @param targetParams The URL parameters
 */
+
 function ajaxUpdateArea(areaId, target, targetParams) {
     waitSpinnerShow();
     jQuery.ajax({
@@ -423,7 +424,23 @@ function setLookDescription(textFieldId,
     if (description) {
         var start = description.lastIndexOf(' [');
         if (start != -1) {
+            // To allow to set a dependent Id field when using a Name field as a lookup (the fields must have the same prefix, eg: partyName, partyId)
+            // It uses the description (Id) shown with the Name. Hence the Lookup screen must be set in order to show a description in the autocomplete part.
+            // It seems this is not always easy notably when you need to show at least 2 parts for the Name (eg Person).
+            // At least it easy to set and it works well for simples case for now (eg PartyGroup)            
+            var dependentId = textFieldId.replace(/Name/, "Id"); // Raw but ok for now, needs safe navigation...
+            // I did not find another way since Ajax.Autocompleter can't update another field
+            // The alternative would be navigation to the next hidden field, at least it would avoid the mandatory Id/Name pair
+            // But it's more difficult to demonstrate in Example component
+            // dependentId = (textFieldId.next('div').down('input[type=hidden]');
+            $(dependentId).clear();
+            var dependentIdValue = (description.substring(start + 1, description.length).replace(/\[/g, "")).replace(/\]/g, "");
+            if ($(dependentId)) {            
+                $(dependentId).value = dependentIdValue;
+            }
+            
             description = description.substring(0, start);
+            $(dependentId).value = description;
         }
     }
     var lookupWrapperEl = jQuery("#" + textFieldId).closest(jQuery('.field-lookup'));

Modified: ofbiz/branches/jquery/framework/webapp/dtd/site-conf.xsd
URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/framework/webapp/dtd/site-conf.xsd?rev=995688&r1=995687&r2=995688&view=diff
==============================================================================
--- ofbiz/branches/jquery/framework/webapp/dtd/site-conf.xsd (original)
+++ ofbiz/branches/jquery/framework/webapp/dtd/site-conf.xsd Fri Sep 10 07:26:12 2010
@@ -323,6 +323,7 @@ under the License.
                     a request attribute or parameter.</xs:documentation>
             </xs:annotation>
         </xs:attribute>
+        <xs:attribute type="xs:string" name="value" use="optional"/>
     </xs:attributeGroup>
     <xs:element name="view-map">
         <xs:complexType>

Modified: ofbiz/branches/jquery/framework/webapp/src/org/ofbiz/webapp/control/ConfigXMLReader.java
URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/framework/webapp/src/org/ofbiz/webapp/control/ConfigXMLReader.java?rev=995688&r1=995687&r2=995688&view=diff
==============================================================================
--- ofbiz/branches/jquery/framework/webapp/src/org/ofbiz/webapp/control/ConfigXMLReader.java (original)
+++ ofbiz/branches/jquery/framework/webapp/src/org/ofbiz/webapp/control/ConfigXMLReader.java Fri Sep 10 07:26:12 2010
@@ -596,6 +596,7 @@ public class ConfigXMLReader {
         public boolean saveCurrentView = false;
         public boolean saveHomeView = false;
         public Map<String, String> redirectParameterMap = FastMap.newInstance();
+        public Map<String, String> redirectParameterValueMap = FastMap.newInstance();
 
         public RequestResponse(Element responseElement) {
             this.name = responseElement.getAttribute("name");
@@ -605,9 +606,13 @@ public class ConfigXMLReader {
             this.saveCurrentView = "true".equals(responseElement.getAttribute("save-current-view"));
             this.saveHomeView = "true".equals(responseElement.getAttribute("save-home-view"));
             for (Element redirectParameterElement: UtilXml.childElementList(responseElement, "redirect-parameter")) {
-                String from = redirectParameterElement.getAttribute("from");
-                if (UtilValidate.isEmpty(from)) from = redirectParameterElement.getAttribute("name");
-                this.redirectParameterMap.put(redirectParameterElement.getAttribute("name"), from);
+                if (UtilValidate.isNotEmpty(redirectParameterElement.getAttribute("value"))) {
+                    this.redirectParameterValueMap.put(redirectParameterElement.getAttribute("name"), redirectParameterElement.getAttribute("value"));
+                } else {
+                    String from = redirectParameterElement.getAttribute("from");
+                    if (UtilValidate.isEmpty(from)) from = redirectParameterElement.getAttribute("name");
+                    this.redirectParameterMap.put(redirectParameterElement.getAttribute("name"), from);
+                }
             }
         }
 

Modified: ofbiz/branches/jquery/framework/webapp/src/org/ofbiz/webapp/control/RequestHandler.java
URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/framework/webapp/src/org/ofbiz/webapp/control/RequestHandler.java?rev=995688&r1=995687&r2=995688&view=diff
==============================================================================
--- ofbiz/branches/jquery/framework/webapp/src/org/ofbiz/webapp/control/RequestHandler.java (original)
+++ ofbiz/branches/jquery/framework/webapp/src/org/ofbiz/webapp/control/RequestHandler.java Fri Sep 10 07:26:12 2010
@@ -928,6 +928,19 @@ public class RequestHandler {
                     queryString.append(value);
                 }
             }
+            for (Map.Entry<String, String> entry: requestResponse.redirectParameterValueMap.entrySet()) {
+                String name = entry.getKey();
+                String value = entry.getValue();
+
+                if (UtilValidate.isNotEmpty(value)) {
+                    if (queryString.length() > 1) {
+                        queryString.append("&");
+                    }
+                    queryString.append(name);
+                    queryString.append("=");
+                    queryString.append(value);
+                }
+            }
             return queryString.toString();
         }
     }

Modified: ofbiz/branches/jquery/framework/webtools/config/WebtoolsUiLabels.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/framework/webtools/config/WebtoolsUiLabels.xml?rev=995688&r1=995687&r2=995688&view=diff
==============================================================================
--- ofbiz/branches/jquery/framework/webtools/config/WebtoolsUiLabels.xml (original)
+++ ofbiz/branches/jquery/framework/webtools/config/WebtoolsUiLabels.xml Fri Sep 10 07:26:12 2010
@@ -1254,7 +1254,7 @@
         <value xml:lang="de">Im Level "Fehler" werden Fehlerereignisse geschrieben, wobei die Anwendung noch weiter laufen kann.</value>
         <value xml:lang="en">The Error level designates error events that might still allow the application to continue running.</value>
         <value xml:lang="fr">Le niveau "Error" désigne des événements d'erreur qui pourraient encore permettre à l'application de continuer de fonctionner.</value>
-        <value xml:lang="it">Il livello "Errore" designa eventi di errori che potrebbero ancora permettere all'applicazione di continuare l'esecuzione.</value>
+        <value xml:lang="it">Il livello "Errore" designa eventi di errore che potrebbero ancora permettere all'applicazione di continuare l'esecuzione.</value>
         <value xml:lang="ro">Niveul Eroare prezinta erori care ar putea  sa  permita aplictiei sa continuie executia.</value>
         <value xml:lang="th">เกิดข้อผิดพลาดในการระบุข้อมูลกรุณากดยอมรับเพื่อดำเนินการต่อไป</value>
         <value xml:lang="zh">错误级别会指出那些仍然允许应用程序继续执行的错误事件。</value>
@@ -1333,7 +1333,7 @@
         <value xml:lang="de">Der Level "Fatal" bezeichnet sehr ernste Fehlerereignisse, die zum Absturz der Anwendung führen.</value>
         <value xml:lang="en">The Fatal level designates very severe error events that will presumably lead the application to abort.</value>
         <value xml:lang="fr">Le niveau "Fatal" désigne des événements d'erreur très graves qui forceront vraisemblablement l'application à s'arrêter.</value>
-        <value xml:lang="it">Il livello "Fatale" designa molti eventi di errori che presubibilmente l'applicazione terminerà.</value>
+        <value xml:lang="it">Il livello "Fatale" designa gli eventi di errore molto gravi che presumibilmente termineranno l'applicazione.</value>
         <value xml:lang="ro">Nivelul Fatal prezinta multe erori din care cauza   aplicatia va fi terminata.</value>
         <value xml:lang="th">ข้อผิดพลาดระดับร้ายแรงโดยผลที่เกิดขึ้นนั้นจะเป็นไปได้ที่จะก่อให้เกิดความล้มเหลว</value>
         <value xml:lang="zh">严重错误级别会指出那些可能导致应用程序异常中断的严重错误事件。</value>
@@ -1581,7 +1581,7 @@
         <value xml:lang="de">Der Loglevel "Wichtig" bezeichnet Log-Einträge, die den Fortgang der Anwendung mit geringer Detailtiefe beschreiben.</value>
         <value xml:lang="en">The Important level designates informational messages that highlight the progress of the application at coarse-grained level.</value>
         <value xml:lang="fr">Le niveau "Important" désigne les messages d'information qui reflètent grosso-modo la progression de l'application.</value>
-        <value xml:lang="it">Il livello "Importante" designa messaggi informativi che evidenziano lo stato di esecuzione dell'applicazione a basso livello.</value>
+        <value xml:lang="it">Il livello "Importante" designa messaggi informativi che mostrano lo stato di esecuzione dell'applicazione ad alto livello.</value>
         <value xml:lang="ro">Nivelul Important desemneaza mesaje informative ce evidentiaza statul de executie a aplicatiei de jos nivel.</value>
         <value xml:lang="th">กำหนดระดับความสำคัญของข้อความเทคโนโลยรีสารสนเทศที่เน้นความก้าวหน้าของโปรแกรมที่ระดับหยาบ</value>
         <value xml:lang="zh">重要级别会粗粒地指出那些突出应用程序进行情况的信息。 </value>
@@ -1633,7 +1633,7 @@
         <value xml:lang="de">Der Loglevel "Info" bezeichnet Log-Mitteilungen, die den Fortgang der Anwendung mit einiger Detailtiefe beschreiben.</value>
         <value xml:lang="en">The Info level designates informational messages that highlight the progress of the application at coarse-grained level.</value>
         <value xml:lang="fr">Le niveau "Info" désigne les messages qui montrentla progression de l'application à un niveau de détail assez grossier.</value>
-        <value xml:lang="it">Il livello "Informativo" designa messggi che evidenziano lo stato di esecuzione dell'applicazione a basso livello.</value>
+        <value xml:lang="it">Il livello "Informativo" designa messaggi che mostrano lo stato di esecuzione dell'applicazione a basso livello.</value>
         <value xml:lang="ro">Nivelul Informativ desemneaza mesaje ce evidentiaza statul de executie al aplicatiei de jos nivel.</value>
         <value xml:lang="th">กำหนดระดับความสำคัญของข้อความเทคโนโลยรีสารสนเทศที่เน้นความก้าวหน้าของโปรแกรมที่ระดับหยาบ</value>
         <value xml:lang="zh">信息级别会粗粒地指出那些突出应用程序进行情况的信息。</value>

Modified: ofbiz/branches/jquery/framework/webtools/data/helpdata/HELP_WEBTOOLS_main.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/framework/webtools/data/helpdata/HELP_WEBTOOLS_main.xml?rev=995688&r1=995687&r2=995688&view=diff
==============================================================================
--- ofbiz/branches/jquery/framework/webtools/data/helpdata/HELP_WEBTOOLS_main.xml (original)
+++ ofbiz/branches/jquery/framework/webtools/data/helpdata/HELP_WEBTOOLS_main.xml Fri Sep 10 07:26:12 2010
@@ -19,6 +19,36 @@ License.
     xmlns="http://docbook.org/ns/docbook">
     <title>The Webtools Main page.</title>
     <para>
-        The default screen is for the Webtools tab is 'Main'. It list all options are listed.
+        This is the default screen for the Webtools application. Several links are present on this page to access specific tool screens directly. Using the application menu you can select the tool you need.      
     </para>
+    <itemizedlist>
+      <listitem>
+        <para>The <link xl:href="">Logging</link> section is used to view and configure the OFBiz system logs.</para>
+      </listitem>
+      <listitem>
+        <para>The <link xl:href="">Cache &amp; Debug</link> section is used to monitor the OFBiz cache system status. You can even set or clear some cache content or force Garbage collection with this tool.</para>
+      </listitem>
+      <listitem>
+        <para>The <link xl:href="">Artifact Info</link> section is used to navigate through all OFBiz artifact files. When accessing this section the complete OFBiz code base is scanned and a list of all artifacts is offered to the user to be navigated.
+        Please note that the initial scan can take a while to be completed.</para>
+      </listitem>
+      <listitem>
+        <para>The <link xl:href="">Entity Engine</link> section is used to interact with the entities defined in the system. You can view the entity structures, search for entity content, navigate though related entities, etc.</para>
+      </listitem>
+      <listitem>
+        <para>The <link xl:href="">Service Engine</link> section is used to interact with the services defined in the system. You can view all services details, monitor the jobs that are running, the active threads. You can even manually run a service or schedule a periodic/delaied job execution.</para>
+      </listitem>
+      <listitem>
+        <para>The <link xl:href="">Import/Export</link> section is used to transfer entity content from the OFBiz system to external systems and viceversa. Various import/export systems and formats are available.</para>
+      </listitem>
+      <listitem>
+        <para>The <link xl:href="">Configuration</link> section is used to set parameters for the OFBiz system.</para>
+      </listitem>
+      <listitem>
+        <para>The <link xl:href="">Portal Page Admin.</link> section is used to browse and edit all Portal Pages defined in the system.</para>
+      </listitem>
+      <listitem>
+        <para>The <link xl:href="showHelp?helpTopic=WEBTOOLS_selenium">Tests</link> section is used to run system tests.</para>
+      </listitem>
+    </itemizedlist>
 </section>

Modified: ofbiz/branches/jquery/framework/webtools/webapp/webtools/WEB-INF/actions/cache/FindUtilCache.groovy
URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/framework/webtools/webapp/webtools/WEB-INF/actions/cache/FindUtilCache.groovy?rev=995688&r1=995687&r2=995688&view=diff
==============================================================================
--- ofbiz/branches/jquery/framework/webtools/webapp/webtools/WEB-INF/actions/cache/FindUtilCache.groovy (original)
+++ ofbiz/branches/jquery/framework/webtools/webapp/webtools/WEB-INF/actions/cache/FindUtilCache.groovy Fri Sep 10 07:26:12 2010
@@ -18,6 +18,7 @@
  */
 import org.ofbiz.base.util.cache.UtilCache;
 import org.ofbiz.base.util.UtilFormatOut;
+import org.ofbiz.base.util.UtilMisc;
 import org.ofbiz.security.Security;
 
 context.hasUtilCacheEdit = security.hasEntityPermission("UTIL_CACHE", "_EDIT", session);
@@ -50,4 +51,9 @@ names.each { cacheName ->
 
         cacheList.add(cache);
 }
-context.cacheList = cacheList;
+sortField = parameters.sortField;
+if (sortField) {
+    context.cacheList = UtilMisc.sortMaps(cacheList, UtilMisc.toList(sortField));
+} else {
+    context.cacheList = cacheList;
+}

Modified: ofbiz/branches/jquery/framework/webtools/webapp/webtools/WEB-INF/actions/cache/FindUtilCacheElements.groovy
URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/framework/webtools/webapp/webtools/WEB-INF/actions/cache/FindUtilCacheElements.groovy?rev=995688&r1=995687&r2=995688&view=diff
==============================================================================
--- ofbiz/branches/jquery/framework/webtools/webapp/webtools/WEB-INF/actions/cache/FindUtilCacheElements.groovy (original)
+++ ofbiz/branches/jquery/framework/webtools/webapp/webtools/WEB-INF/actions/cache/FindUtilCacheElements.groovy Fri Sep 10 07:26:12 2010
@@ -19,6 +19,7 @@
 import org.ofbiz.base.util.cache.UtilCache;
 import org.ofbiz.base.util.cache.CacheLine;
 import org.ofbiz.base.util.UtilFormatOut;
+import org.ofbiz.base.util.UtilMisc;
 import org.ofbiz.security.Security;
 
 context.hasUtilCacheEdit = security.hasEntityPermission("UTIL_CACHE", "_EDIT", session);
@@ -44,4 +45,9 @@ if (cacheName) {
     }
 }
 context.totalSize = UtilFormatOut.formatQuantity(totalSize);
-context.cacheElementsList = cacheElementsList;
+sortField = parameters.sortField;
+if (sortField) {
+    context.cacheElementsList = UtilMisc.sortMaps(cacheElementsList, UtilMisc.toList(sortField));
+} else {
+    context.cacheElementsList = cacheElementsList;
+}

Modified: ofbiz/branches/jquery/framework/webtools/webapp/webtools/WEB-INF/actions/entity/CheckDb.groovy
URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/framework/webtools/webapp/webtools/WEB-INF/actions/entity/CheckDb.groovy?rev=995688&r1=995687&r2=995688&view=diff
==============================================================================
--- ofbiz/branches/jquery/framework/webtools/webapp/webtools/WEB-INF/actions/entity/CheckDb.groovy (original)
+++ ofbiz/branches/jquery/framework/webtools/webapp/webtools/WEB-INF/actions/entity/CheckDb.groovy Fri Sep 10 07:26:12 2010
@@ -34,11 +34,11 @@ if (security.hasPermission("ENTITY_MAINT
     entityName = parameters.entityName;
 
     if (groupName) {
-        helperName = delegator.getGroupHelperName(groupName);
+        helperInfo = delegator.getGroupHelperInfo(groupName);
 
         messages = [];
         //helper = GenericHelperFactory.getHelper(helperName);
-        dbUtil = new DatabaseUtil(helperName);
+        dbUtil = new DatabaseUtil(helperInfo);
         modelEntities = delegator.getModelEntityMapByGroup(groupName);
         modelEntityNames = new TreeSet(modelEntities.keySet());
 

Modified: ofbiz/branches/jquery/framework/webtools/webapp/webtools/WEB-INF/actions/service/Services.groovy
URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/framework/webtools/webapp/webtools/WEB-INF/actions/service/Services.groovy?rev=995688&r1=995687&r2=995688&view=diff
==============================================================================
--- ofbiz/branches/jquery/framework/webtools/webapp/webtools/WEB-INF/actions/service/Services.groovy (original)
+++ ofbiz/branches/jquery/framework/webtools/webapp/webtools/WEB-INF/actions/service/Services.groovy Fri Sep 10 07:26:12 2010
@@ -45,4 +45,9 @@ log.each { rs, value ->
 
     serviceList.add(service);
 }
-context.services = serviceList;
+sortField = parameters.sortField;
+if (sortField) {
+    context.services = UtilMisc.sortMaps(serviceList, UtilMisc.toList(sortField));
+} else {
+    context.services = serviceList;
+}

Modified: ofbiz/branches/jquery/framework/webtools/webapp/webtools/service/threads.ftl
URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/framework/webtools/webapp/webtools/service/threads.ftl?rev=995688&r1=995687&r2=995688&view=diff
==============================================================================
--- ofbiz/branches/jquery/framework/webtools/webapp/webtools/service/threads.ftl (original)
+++ ofbiz/branches/jquery/framework/webtools/webapp/webtools/service/threads.ftl Fri Sep 10 07:26:12 2010
@@ -20,44 +20,6 @@ under the License.
 <#assign isJava5 = javaVer.startsWith("1.5")/>
 <#if parameters.maxElements?has_content><#assign maxElements = parameters.maxElements?number/><#else><#assign maxElements = 10/></#if>
 
-<div class="screenlet">
-  <div class="screenlet-title-bar">
-    <h3>${uiLabelMap.WebtoolsServiceEngineThreads}</h3>
-  </div>
-  <div class="screenlet-body">
-    <table class="basic-table hover-bar" cellspacing="0">
-      <tr class="header-row">
-        <td>${uiLabelMap.WebtoolsThread}</td>
-        <td>${uiLabelMap.CommonStatus}</td>
-        <td>${uiLabelMap.WebtoolsJob}</td>
-        <td>${uiLabelMap.WebtoolsService}</td>
-        <td>${uiLabelMap.WebtoolsUsage}</td>
-        <td>${uiLabelMap.WebtoolsTTL} (ms)</td>
-        <td>${uiLabelMap.CommonTime} (ms)</td>
-      </tr>
-      <#assign alt_row = false>
-      <#list threads as thread>
-      <tr valign="middle"<#if alt_row> class="alternate-row"</#if>>
-        <td>${thread.threadId?if_exists} ${thread.threadName?if_exists}</td>
-        <td>${thread.status?if_exists}</td>
-        <td>${thread.jobName?default("${uiLabelMap.CommonNone}")}</td>
-        <td>${thread.serviceName?default("${uiLabelMap.CommonNone}")}</td>
-        <td>${thread.usage?if_exists}</td>
-        <td>${thread.ttl?if_exists}</td>
-        <td>${thread.runTime?if_exists}</td>
-      </tr>
-      <#-- toggle the row color -->
-      <#assign alt_row = !alt_row>
-      </#list>
-    </table>
-  </div>
-</div>
-<div class="screenlet">
-  <div class="screenlet-title-bar">
-    <h3>${uiLabelMap.WebtoolsGeneralJavaThreads}</h3>
-  </div>
-  <div class="screenlet-body">
-    <br />
     <p>${uiLabelMap.WebtoolsThisThread}<b> ${Static["java.lang.Thread"].currentThread().getName()} (${Static["java.lang.Thread"].currentThread().getId()})</b></p>
     <p>${uiLabelMap.WebtoolsJavaVersionIs5} <#if isJava5> ${uiLabelMap.CommonYes}<#else>${uiLabelMap.CommonNo}</#if></p>
     <br />
@@ -95,5 +57,3 @@ under the License.
       <#assign alt_row = !alt_row>
       </#list>
     </table>
-  </div>
-</div>
\ No newline at end of file

Modified: ofbiz/branches/jquery/framework/webtools/widget/CacheScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/framework/webtools/widget/CacheScreens.xml?rev=995688&r1=995687&r2=995688&view=diff
==============================================================================
--- ofbiz/branches/jquery/framework/webtools/widget/CacheScreens.xml (original)
+++ ofbiz/branches/jquery/framework/webtools/widget/CacheScreens.xml Fri Sep 10 07:26:12 2010
@@ -20,96 +20,101 @@ under the License.
 
 <screens xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
         xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/widget-screen.xsd">
-  <screen name="FindUtilCache">
-    <section>
-      <actions>
-        <set field="headerItem" value="cache"/>
-        <set field="titleProperty" value="PageTitleFindUtilCache"/>
-        <script location="component://webtools/webapp/webtools/WEB-INF/actions/cache/FindUtilCache.groovy"/>
-      </actions>
-      <widgets>
-        <decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}">
-          <decorator-section name="body">
-            <section>
-              <!-- do check for UTIL_CACHE, _VIEW permission -->
-              <condition>
-                <if-has-permission permission="UTIL_CACHE" action="_VIEW"/>
-              </condition>
-              <widgets>
-                <platform-specific>
-                  <html><html-template location="component://webtools/webapp/webtools/cache/findUtilCache.ftl"/></html>
-                </platform-specific>
-                <decorator-section-include name="body"/>
-              </widgets>
-              <fail-widgets>
-                <label style="h3">${uiLabelMap.WebtoolsPermissionError}</label>
-              </fail-widgets>
-            </section>
-          </decorator-section>
-        </decorator-screen>
-      </widgets>
-    </section>
-  </screen>
+    <screen name="FindUtilCache">
+        <section>
+            <actions>
+                <set field="headerItem" value="cache"/>
+                <set field="titleProperty" value="PageTitleFindUtilCache"/>
+                <script location="component://webtools/webapp/webtools/WEB-INF/actions/cache/FindUtilCache.groovy"/>
+            </actions>
+            <widgets>
+                <decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}">
+                    <decorator-section name="body">
+                        <section>
+                            <!-- do check for UTIL_CACHE, _VIEW permission -->
+                            <condition>
+                                <if-has-permission permission="UTIL_CACHE" action="_VIEW"/>
+                            </condition>
+                            <widgets>
+                                <screenlet title="${uiLabelMap.PageTitleFindUtilCache}">
+                                    <label>${uiLabelMap.WebtoolsMemory} ${uiLabelMap.WebtoolsTotalMemory} ${memory} ${uiLabelMap.WebtoolsFreeMemory} ${freeMemory} ${uiLabelMap.WebtoolsUsedMemory} ${usedMemory}
+                                        ${uiLabelMap.WebtoolsMaxMemory} ${maxMemory}</label>
+                                    <include-menu name="FindCache" location="component://webtools/widget/Menus.xml"/>
+                                    <include-form name="ListCache" location="component://webtools/widget/CacheForms.xml"/>
+                                    <include-menu name="FindCache" location="component://webtools/widget/Menus.xml"/>
+                                </screenlet>
+                            </widgets>
+                            <fail-widgets>
+                                <label style="h3">${uiLabelMap.WebtoolsPermissionError}</label>
+                            </fail-widgets>
+                        </section>
+                    </decorator-section>
+                </decorator-screen>
+            </widgets>
+        </section>
+    </screen>
 
-  <screen name="FindUtilCacheElements">
-    <section>
-      <actions>
-        <set field="headerItem" value="cache"/>
-        <set field="titleProperty" value="PageTitleFindUtilCacheElements"/>
-        <script location="component://webtools/webapp/webtools/WEB-INF/actions/cache/FindUtilCacheElements.groovy"/>
-      </actions>
-      <widgets>
-        <decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}">
-          <decorator-section name="body">
-            <section>
-              <!-- do check for UTIL_CACHE, _VIEW permission -->
-              <condition>
-                <if-has-permission permission="UTIL_CACHE" action="_VIEW"/>
-              </condition>
-              <widgets>
-                <platform-specific>
-                  <html><html-template location="component://webtools/webapp/webtools/cache/findUtilCacheElements.ftl"/></html>
-                </platform-specific>
-                <decorator-section-include name="body"/>
-              </widgets>
-              <fail-widgets>
-                <label style="h3">${uiLabelMap.WebtoolsPermissionError}</label>
-              </fail-widgets>
-            </section>
-          </decorator-section>
-        </decorator-screen>
-      </widgets>
-    </section>
-  </screen>
+    <screen name="FindUtilCacheElements">
+        <section>
+            <actions>
+                <set field="headerItem" value="cache"/>
+                <set field="titleProperty" value="PageTitleFindUtilCacheElements"/>
+                <script location="component://webtools/webapp/webtools/WEB-INF/actions/cache/FindUtilCacheElements.groovy"/>
+            </actions>
+            <widgets>
+                <decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}">
+                    <decorator-section name="body">
+                        <section>
+                            <!-- do check for UTIL_CACHE, _VIEW permission -->
+                            <condition>
+                                <if-has-permission permission="UTIL_CACHE" action="_VIEW"/>
+                            </condition>
+                            <widgets>
+                                <screenlet title="${uiLabelMap.PageTitleFindUtilCacheElements}">
+                                    <label>${uiLabelMap.WebtoolsCacheName} ${cacheName} (${now}) ${uiLabelMap.WebtoolsSizeTotal} ${totalSize} ${uiLabelMap.WebtoolsBytes}</label>
+                                    <include-menu name="CacheElements" location="component://webtools/widget/Menus.xml"/>
+                                    <include-form name="ListCacheElements" location="component://webtools/widget/CacheForms.xml"/>
+                                    <include-menu name="CacheElements" location="component://webtools/widget/Menus.xml"/>
+                                </screenlet>
+                            </widgets>
+                            <fail-widgets>
+                                <label style="h3">${uiLabelMap.WebtoolsPermissionError}</label>
+                            </fail-widgets>
+                        </section>
+                    </decorator-section>
+                </decorator-screen>
+            </widgets>
+        </section>
+    </screen>
 
-  <screen name="EditUtilCache">
-    <section>
-      <actions>
-        <set field="headerItem" value="cache"/>
-        <set field="titleProperty" value="PageTitleEditUtilCache"/>
-        <script location="component://webtools/webapp/webtools/WEB-INF/actions/cache/EditUtilCache.groovy"/>
-      </actions>
-      <widgets>
-        <decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}">
-          <decorator-section name="body">
-            <section>
-              <!-- do check for UTIL_CACHE, _EDIT permission -->
-              <condition>
-                <if-has-permission permission="UTIL_CACHE" action="_EDIT"/>
-              </condition>
-              <widgets>
-                <platform-specific>
-                  <html><html-template location="component://webtools/webapp/webtools/cache/editUtilCache.ftl"/></html>
-                </platform-specific>
-                <decorator-section-include name="body"/>
-              </widgets>
-              <fail-widgets>
-                <label style="h3">${uiLabelMap.WebtoolsPermissionError}</label>
-              </fail-widgets>
-            </section>
-          </decorator-section>
-        </decorator-screen>
-      </widgets>
-    </section>
-  </screen>
+    <screen name="EditUtilCache">
+        <section>
+            <actions>
+                <set field="headerItem" value="cache"/>
+                <set field="titleProperty" value="PageTitleEditUtilCache"/>
+                <script location="component://webtools/webapp/webtools/WEB-INF/actions/cache/EditUtilCache.groovy"/>
+            </actions>
+            <widgets>
+                <decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}">
+                    <decorator-section name="body">
+                        <section>
+                            <!-- do check for UTIL_CACHE, _EDIT permission -->
+                            <condition>
+                                <if-has-permission permission="UTIL_CACHE" action="_EDIT"/>
+                            </condition>
+                            <widgets>
+                                <screenlet title="${uiLabelMap.PageTitleEditUtilCache}">
+                                    <include-menu name="EditCache" location="component://webtools/widget/Menus.xml"/>
+                                    <include-form name="EditCache" location="component://webtools/widget/CacheForms.xml"/>
+                                </screenlet>
+                            </widgets>
+                            <fail-widgets>
+                                <label style="h3">${uiLabelMap.WebtoolsPermissionError}</label>
+                            </fail-widgets>
+                        </section>
+                    </decorator-section>
+                </decorator-screen>
+            </widgets>
+        </section>
+    </screen>
 </screens>

Modified: ofbiz/branches/jquery/framework/webtools/widget/EntityForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/framework/webtools/widget/EntityForms.xml?rev=995688&r1=995687&r2=995688&view=diff
==============================================================================
--- ofbiz/branches/jquery/framework/webtools/widget/EntityForms.xml (original)
+++ ofbiz/branches/jquery/framework/webtools/widget/EntityForms.xml Fri Sep 10 07:26:12 2010
@@ -33,4 +33,13 @@ under the License.
         </field>
         <field name="submitButton" title="${uiLabelMap.CommonSubmit}"><submit button-type="button"/></field>
     </form>
+
+    <form name="ListPerformanceResults" type="list" list-name="performanceList" paginate-target="EntityPerformanceTest" separate-columns="true" odd-row-style="alternate-row" default-table-style="basic-table hover-bar">
+        <field name="operation" title="${uiLabelMap.WebtoolsPerformanceOperation}"><display/></field>
+        <field name="entity" title="${uiLabelMap.WebtoolsEntity}"><display/></field>
+        <field name="calls" title="${uiLabelMap.WebtoolsPerformanceCalls}"><display/></field>
+        <field name="seconds" title="${uiLabelMap.WebtoolsPerformanceSeconds}"><display/></field>
+        <field name="secsPerCall" title="${uiLabelMap.WebtoolsPerformanceSecondsCall}"><display/></field>
+        <field name="callsPerSecond" title="${uiLabelMap.WebtoolsPerformanceCallsSecond}"><display/></field>
+    </form>
 </forms>

Modified: ofbiz/branches/jquery/framework/webtools/widget/EntityScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/framework/webtools/widget/EntityScreens.xml?rev=995688&r1=995687&r2=995688&view=diff
==============================================================================
--- ofbiz/branches/jquery/framework/webtools/widget/EntityScreens.xml (original)
+++ ofbiz/branches/jquery/framework/webtools/widget/EntityScreens.xml Fri Sep 10 07:26:12 2010
@@ -384,6 +384,9 @@ under the License.
     </screen>
     <screen name="EntityPerformanceTest">
         <section>
+            <condition>
+                <if-has-permission permission="ENTITY_MAINT"/>
+            </condition>
             <actions>
                 <set field="headerItem" value="main"/>
                 <set field="titleProperty" value="WebtoolsPerformanceTests"/>
@@ -392,12 +395,16 @@ under the License.
             <widgets>
                 <decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}">
                     <decorator-section name="body">
-                        <platform-specific>
-                            <html><html-template location="component://webtools/webapp/webtools/performance/EntityPerformanceTest.ftl"/></html>
-                        </platform-specific>
+                        <screenlet title="${uiLabelMap.WebtoolsEntityEnginePerformanceTests}">
+                            <label>${uiLabelMap.WebtoolsNotePerformanceResultsMayVary}</label>
+                            <include-form name="ListPerformanceResults" location="component://webtools/widget/EntityForms.xml"/>
+                        </screenlet>
                     </decorator-section>
                 </decorator-screen>
             </widgets>
+            <fail-widgets>
+                <label style="h3">${uiLabelMap.WebtoolsPermissionMaint}</label>
+            </fail-widgets>
         </section>
     </screen>
     <screen name="xmldsdump">
@@ -440,5 +447,3 @@ under the License.
         </section>
     </screen>
 </screens>
-
-

Modified: ofbiz/branches/jquery/framework/webtools/widget/LogScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/framework/webtools/widget/LogScreens.xml?rev=995688&r1=995687&r2=995688&view=diff
==============================================================================
--- ofbiz/branches/jquery/framework/webtools/widget/LogScreens.xml (original)
+++ ofbiz/branches/jquery/framework/webtools/widget/LogScreens.xml Fri Sep 10 07:26:12 2010
@@ -65,9 +65,9 @@ under the License.
             <widgets>
                 <decorator-screen name="log-decorator">
                     <decorator-section name="body">
-                        <platform-specific>
-                            <html><html-template location="component://webtools/webapp/webtools/service/services.ftl"/></html>
-                        </platform-specific>
+                        <screenlet title="${uiLabelMap.PageTitleServiceList}">
+                            <include-form name="ListServices" location="component://webtools/widget/ServiceForms.xml"/>
+                        </screenlet>
                     </decorator-section>
                 </decorator-screen>
             </widgets>

Modified: ofbiz/branches/jquery/framework/webtools/widget/Menus.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/framework/webtools/widget/Menus.xml?rev=995688&r1=995687&r2=995688&view=diff
==============================================================================
--- ofbiz/branches/jquery/framework/webtools/widget/Menus.xml (original)
+++ ofbiz/branches/jquery/framework/webtools/widget/Menus.xml Fri Sep 10 07:26:12 2010
@@ -203,4 +203,57 @@ under the License.
             </link>
         </menu-item>
     </menu>
+
+    <menu name="StatsSinceStart" extends="CommonButtonBarMenu" extends-resource="component://common/widget/CommonMenus.xml">
+        <menu-item name="clearStats" title="${uiLabelMap.WebtoolsStatsClearSince}">
+            <link target="StatsSinceStart">
+               <parameter param-name="clear" value="true"/>
+            </link>
+        </menu-item>
+        <menu-item name="refresh" title="${uiLabelMap.CommonRefresh}" widget-style="buttontext refresh">
+            <link target="StatsSinceStart"/>
+        </menu-item>
+    </menu>
+
+    <menu name="StatsBinHistory" extends="CommonButtonBarMenu" extends-resource="component://common/widget/CommonMenus.xml">
+        <menu-item name="statsSinceStart" title="${uiLabelMap.WebtoolsStatsMainPageTitle}">
+            <link target="StatsSinceStart"/>
+        </menu-item>
+        <menu-item name="refresh" title="${uiLabelMap.CommonRefresh}" widget-style="buttontext refresh">
+            <link target="StatBinsHistory">
+               <parameter param-name="statsId" from-field="parameters.statsId"/>
+               <parameter param-name="type" from-field="parameters.type"/>
+            </link>
+        </menu-item>
+    </menu>
+
+    <menu name="FindCache" extends="CommonButtonBarMenu" extends-resource="component://common/widget/CommonMenus.xml">
+        <menu-item name="refresh" title="${uiLabelMap.CommonRefresh}" widget-style="buttontext refresh">
+            <link target="FindUtilCache"/>
+        </menu-item>
+        <menu-item name="clearAll" title="${uiLabelMap.WebtoolsClearAllCaches}">
+            <link target="FindUtilCacheClearAll"/>
+        </menu-item>
+        <menu-item name="forceGarbageCollection" title="${uiLabelMap.WebtoolsRunGC}">
+            <link target="ForceGarbageCollection"/>
+        </menu-item>
+    </menu>
+
+    <menu name="CacheElements" extends="CommonButtonBarMenu" extends-resource="component://common/widget/CommonMenus.xml">
+        <menu-item name="back" title="${uiLabelMap.WebtoolsBackToCacheMaintenance}">
+            <link target="FindUtilCache"/>
+        </menu-item>
+    </menu>
+
+    <menu name="EditCache" extends="CommonButtonBarMenu" extends-resource="component://common/widget/CommonMenus.xml">
+        <menu-item name="clear" title="${uiLabelMap.WebtoolsClearThisCache}">
+            <link target="EditUtilCacheClear">
+               <parameter param-name="UTIL_CACHE_NAME" from-field="cacheName"/>
+               <parameter param-name="type" from-field="parameters.type"/>
+            </link>
+        </menu-item>
+        <menu-item name="back" title="${uiLabelMap.WebtoolsBackToCacheMaintenance}">
+            <link target="FindUtilCache"/>
+        </menu-item>
+    </menu>
 </menus>

Modified: ofbiz/branches/jquery/framework/webtools/widget/ServiceForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/framework/webtools/widget/ServiceForms.xml?rev=995688&r1=995687&r2=995688&view=diff
==============================================================================
--- ofbiz/branches/jquery/framework/webtools/widget/ServiceForms.xml (original)
+++ ofbiz/branches/jquery/framework/webtools/widget/ServiceForms.xml Fri Sep 10 07:26:12 2010
@@ -99,4 +99,22 @@ under the License.
             </hyperlink>
         </field>
     </form>
+    <form name="ListJavaThread" type="list" list-name="threads" paginate-target="threadList" separate-columns="true"
+        odd-row-style="alternate-row" default-table-style="basic-table hover-bar">
+        <field name="threadId" title="${uiLabelMap.WebtoolsThread}"><display description="${threadId} ${threadName}"/></field>
+        <field name="status" title="${uiLabelMap.CommonStatus}"><display/></field>
+        <field name="jobName" title="${uiLabelMap.WebtoolsJob}"><display default-value="${uiLabelMap.CommonNone}"/></field>
+        <field name="serviceName" title="${uiLabelMap.WebtoolsService}"><display default-value="${uiLabelMap.CommonNone}"/></field>
+        <field name="usage" title="${uiLabelMap.WebtoolsUsage}"><display/></field>
+        <field name="ttl" title="${uiLabelMap.WebtoolsTTL} (ms)"><display/></field>
+        <field name="runTime" title="${uiLabelMap.CommonTime} (ms)"><display/></field>
+    </form>
+    <form name="ListServices" type="list" list-name="services" paginate-target="ServiceLog" separate-columns="true"
+        odd-row-style="alternate-row" default-table-style="basic-table hover-bar" header-row-style="header-row-2">
+        <field name="serviceName" title="${uiLabelMap.WebtoolsServiceName}" sort-field="true"><display/></field>
+        <field name="localName" title="${uiLabelMap.WebtoolsDispatcherName}" sort-field="true"><display/></field>
+        <field name="modeStr" title="${uiLabelMap.WebtoolsMode}" sort-field="true"><display default-value="${uiLabelMap.CommonNone}"/></field>
+        <field name="startTime" title="${uiLabelMap.CommonStartDateTime}" sort-field="true"><display/></field>
+        <field name="endTime" title="${uiLabelMap.CommonEndDateTime}" sort-field="true"><display default-value="${uiLabelMap.WebtoolsStatusRunning}"/></field>
+    </form>
 </forms>

Modified: ofbiz/branches/jquery/framework/webtools/widget/ServiceScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/framework/webtools/widget/ServiceScreens.xml?rev=995688&r1=995687&r2=995688&view=diff
==============================================================================
--- ofbiz/branches/jquery/framework/webtools/widget/ServiceScreens.xml (original)
+++ ofbiz/branches/jquery/framework/webtools/widget/ServiceScreens.xml Fri Sep 10 07:26:12 2010
@@ -84,9 +84,14 @@ under the License.
             <widgets>
                 <decorator-screen name="CommonServiceDecorator" location="${parameters.mainDecoratorLocation}">
                     <decorator-section name="body">
-                        <platform-specific>
-                            <html><html-template location="component://webtools/webapp/webtools/service/threads.ftl"/></html>
-                        </platform-specific>
+                        <screenlet title="${uiLabelMap.WebtoolsServiceEngineThreads}">
+                            <include-form name="ListJavaThread" location="component://webtools/widget/ServiceForms.xml"/>
+                        </screenlet>
+                        <screenlet title="${uiLabelMap.WebtoolsGeneralJavaThreads}">
+                            <platform-specific>
+                                <html><html-template location="component://webtools/webapp/webtools/service/threads.ftl"/></html>
+                            </platform-specific>
+                        </screenlet>
                     </decorator-section>
                 </decorator-screen>
             </widgets>

Modified: ofbiz/branches/jquery/framework/webtools/widget/StatsScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/framework/webtools/widget/StatsScreens.xml?rev=995688&r1=995687&r2=995688&view=diff
==============================================================================
--- ofbiz/branches/jquery/framework/webtools/widget/StatsScreens.xml (original)
+++ ofbiz/branches/jquery/framework/webtools/widget/StatsScreens.xml Fri Sep 10 07:26:12 2010
@@ -32,13 +32,27 @@ under the License.
                 <decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}">
                     <decorator-section name="body">
                         <section>
+                            <condition>
+                                <if-has-permission permission="SERVER_STATS" action="_VIEW"/>
+                            </condition>
                             <widgets>
-                                <platform-specific>
-                                    <html>
-                                        <html-template location="component://webtools/webapp/webtools/stats/StatsSinceStart.ftl"/>
-                                    </html>
-                                </platform-specific>
+                                <screenlet title="${uiLabelMap.WebtoolsStatsMainPageTitle}">
+                                    <include-menu name="StatsSinceStart" location="component://webtools/widget/Menus.xml"/>
+                                    <label>${uiLabelMap.WebtoolsStatsCurrentTime} ${nowTimestamp}</label>
+                                    <screenlet title="${uiLabelMap.WebtoolsStatsRequestStats}">
+                                        <include-form name="ListRequestStats" location="component://webtools/widget/StatsForms.xml"/>
+                                    </screenlet>
+                                    <screenlet title="${uiLabelMap.WebtoolsStatsEventStats}">
+                                        <include-form name="ListEventStats" location="component://webtools/widget/StatsForms.xml"/>
+                                    </screenlet>
+                                    <screenlet title="${uiLabelMap.WebtoolsStatsViewStats}">
+                                        <include-form name="ListViewStats" location="component://webtools/widget/StatsForms.xml"/>
+                                    </screenlet>
+                                </screenlet>
                             </widgets>
+                            <fail-widgets>
+                                <label style="h3">${uiLabelMap.WebtoolsStatsPermissionMsg}</label>
+                            </fail-widgets>
                         </section>
                     </decorator-section>
                 </decorator-screen>
@@ -49,7 +63,7 @@ under the License.
     <screen name="StatBinsHistory">
         <section>
             <actions>
-                <set field="titleProperty" value="WebtoolsStatsMainPageTitle"/>
+                <set field="titleProperty" value="WebtoolsStatsBinsPageTitle"/>
                 <set field="headerItem" value="stats"/>
                 <script location="component://webtools/webapp/webtools/WEB-INF/actions/stats/StatBinsHistory.groovy"/>
             </actions>
@@ -57,12 +71,17 @@ under the License.
                 <decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}">
                     <decorator-section name="body">
                         <section>
+                            <condition>
+                                <if-has-permission permission="SERVER_STATS" action="_VIEW"/>
+                            </condition>
                             <widgets>
-                                <platform-specific>
-                                    <html>
-                                        <html-template location="component://webtools/webapp/webtools/stats/StatBinsHistory.ftl"/>
-                                    </html>
-                                </platform-specific>
+                                <screenlet title="${uiLabelMap.WebtoolsStatsBinsPageTitle}">
+                                    <include-menu name="StatsBinHistory" location="component://webtools/widget/Menus.xml"/>
+                                    <label>${uiLabelMap.WebtoolsStatsCurrentTime} ${nowTimestamp}</label>
+                                    <screenlet title="${uiLabelMap.WebtoolsStatsRequestStats}">
+                                        <include-form name="ListRequestBins" location="component://webtools/widget/StatsForms.xml"/>
+                                    </screenlet>
+                                </screenlet>
                             </widgets>
                         </section>
                     </decorator-section>

Modified: ofbiz/branches/jquery/framework/widget/dtd/widget-form.xsd
URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/framework/widget/dtd/widget-form.xsd?rev=995688&r1=995687&r2=995688&view=diff
==============================================================================
--- ofbiz/branches/jquery/framework/widget/dtd/widget-form.xsd (original)
+++ ofbiz/branches/jquery/framework/widget/dtd/widget-form.xsd Fri Sep 10 07:26:12 2010
@@ -688,6 +688,9 @@ under the License.
         <xs:attribute type="xs:string" name="image-location">
             <xs:annotation><xs:documentation>Specifies the image to display.</xs:documentation></xs:annotation>
         </xs:attribute>
+        <xs:attribute type="xs:string" name="default-value">        
+            <xs:annotation><xs:documentation>Specifies a string to be displayed if the field is empty.</xs:documentation></xs:annotation>
+        </xs:attribute>
     </xs:attributeGroup>
     <xs:element name="display-entity" substitutionGroup="AllFields">
         <xs:annotation><xs:documentation>This is just like display but looks up a description using the Entity Engine; note that if also-hidden is true then it uses the key as the value, not the shown description.</xs:documentation></xs:annotation>

Modified: ofbiz/branches/jquery/framework/widget/src/org/ofbiz/widget/ModelWidget.java
URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/framework/widget/src/org/ofbiz/widget/ModelWidget.java?rev=995688&r1=995687&r2=995688&view=diff
==============================================================================
--- ofbiz/branches/jquery/framework/widget/src/org/ofbiz/widget/ModelWidget.java (original)
+++ ofbiz/branches/jquery/framework/widget/src/org/ofbiz/widget/ModelWidget.java Fri Sep 10 07:26:12 2010
@@ -53,6 +53,9 @@ public class ModelWidget implements Seri
     public static final String enableBoundaryCommentsParam = "widgetVerbose";
     protected String name;
     protected boolean enableWidgetBoundaryComments = false;
+    private String systemId;
+    private int startColumn;
+    private int startLine;
 
     protected ModelWidget() {}
 
@@ -62,6 +65,9 @@ public class ModelWidget implements Seri
      */
     public ModelWidget(Element widgetElement) {
         this.name = widgetElement.getAttribute("name");
+        this.systemId = (String) widgetElement.getUserData("systemId");
+        this.startColumn = ((Integer) widgetElement.getUserData("startColumn")).intValue();
+        this.startLine = ((Integer) widgetElement.getUserData("startLine")).intValue();
     }
 
     /**
@@ -73,6 +79,35 @@ public class ModelWidget implements Seri
     }
 
     /**
+     * Returns the url as a string, from where this widget was defined.
+     * @return url
+     */
+    public String getSystemId() {
+        return systemId;
+    }
+
+    /**
+     * Returns the column where this widget was defined, in it's containing xml file.
+     * @return start column
+     */
+    public int getStartColumn() {
+        return startColumn;
+    }
+
+    /**
+     * Returns the line where this widget was defined, in it's containing xml file.
+     * @return start line
+     */
+    public int getStartLine() {
+        return startLine;
+    }
+
+    @Override
+    public String toString() {
+        return getClass().getSimpleName() + "[" + getSystemId() + "#" + getName() + "@" + getStartColumn() + "," + getStartLine() + "]";
+    }
+
+    /**
      * Returns the widget's name to be used in boundary comments. The default action
      * is to return the widget's name. Derived classes can override this method to
      * return a customized name.

Modified: ofbiz/branches/jquery/framework/widget/src/org/ofbiz/widget/form/FormFactory.java
URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/framework/widget/src/org/ofbiz/widget/form/FormFactory.java?rev=995688&r1=995687&r2=995688&view=diff
==============================================================================
--- ofbiz/branches/jquery/framework/widget/src/org/ofbiz/widget/form/FormFactory.java (original)
+++ ofbiz/branches/jquery/framework/widget/src/org/ofbiz/widget/form/FormFactory.java Fri Sep 10 07:26:12 2010
@@ -59,7 +59,7 @@ public class FormFactory {
         }
         */
         URL formFileUrl = FlexibleLocation.resolveLocation(resourceName); //, loader);
-        Document formFileDoc = UtilXml.readXmlDocument(formFileUrl, true);
+        Document formFileDoc = UtilXml.readXmlDocument(formFileUrl, true, true);
         return readFormDocument(formFileDoc, entityModelReader, dispatchContext, resourceName);
     }
 
@@ -78,7 +78,7 @@ public class FormFactory {
                     }
                     */
                     URL formFileUrl = FlexibleLocation.resolveLocation(resourceName); //, loader);
-                    Document formFileDoc = UtilXml.readXmlDocument(formFileUrl, true);
+                    Document formFileDoc = UtilXml.readXmlDocument(formFileUrl, true, true);
                     if (formFileDoc == null) {
                         throw new IllegalArgumentException("Could not find resource [" + resourceName + "]");
                     }
@@ -106,7 +106,7 @@ public class FormFactory {
                     Delegator delegator = (Delegator) request.getAttribute("delegator");
                     LocalDispatcher dispatcher = (LocalDispatcher) request.getAttribute("dispatcher");
                     URL formFileUrl = servletContext.getResource(resourceName);
-                    Document formFileDoc = UtilXml.readXmlDocument(formFileUrl, true);
+                    Document formFileDoc = UtilXml.readXmlDocument(formFileUrl, true, true);
                     Element formElement = UtilXml.firstChildElement(formFileDoc.getDocumentElement(), "form", "name", formName);
                     modelForm = new ModelForm(formElement, delegator.getModelReader(), dispatcher.getDispatchContext());
                     modelForm.setFormLocation(resourceName);

Modified: ofbiz/branches/jquery/framework/widget/src/org/ofbiz/widget/form/ModelFormField.java
URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/framework/widget/src/org/ofbiz/widget/form/ModelFormField.java?rev=995688&r1=995687&r2=995688&view=diff
==============================================================================
--- ofbiz/branches/jquery/framework/widget/src/org/ofbiz/widget/form/ModelFormField.java (original)
+++ ofbiz/branches/jquery/framework/widget/src/org/ofbiz/widget/form/ModelFormField.java Fri Sep 10 07:26:12 2010
@@ -2052,6 +2052,7 @@ public class ModelFormField {
         protected FlexibleStringExpander currency;
         protected FlexibleStringExpander date;
         protected InPlaceEditor inPlaceEditor;
+        protected FlexibleStringExpander defaultValue;
 
         protected DisplayField() {
             super();
@@ -2074,6 +2075,7 @@ public class ModelFormField {
             this.setDescription(element.getAttribute("description"));
             this.setDate(element.getAttribute("date"));
             this.alsoHidden = !"false".equals(element.getAttribute("also-hidden"));
+            this.setDefaultValue(element.getAttribute("default-value"));
 
             Element inPlaceEditorElement = UtilXml.firstChildElement(element, "in-place-editor");
             if (inPlaceEditorElement != null) {
@@ -2118,7 +2120,7 @@ public class ModelFormField {
                 retVal = this.modelFormField.getEntry(context);
             }
             if (UtilValidate.isEmpty(retVal)) {
-                retVal = "";
+                retVal = this.getDefaultValue(context);
             } else if ("currency".equals(type)) {
                 retVal = retVal.replaceAll("&nbsp;", " "); // FIXME : encoding currency is a problem for some locale, we should not have any &nbsp; in retVal other case may arise in future...
                 Locale locale = (Locale) context.get("locale");
@@ -2192,6 +2194,21 @@ public class ModelFormField {
         public void setInPlaceEditor(InPlaceEditor newInPlaceEditor) {
             this.inPlaceEditor = newInPlaceEditor;
         }
+
+        /**
+         * @param str
+         */
+        public void setDefaultValue(String str) {
+            this.defaultValue = FlexibleStringExpander.getInstance(str);
+        }
+
+        public String getDefaultValue(Map<String, Object> context) {
+            if (this.defaultValue != null) {
+                return this.defaultValue.expandString(context);
+            } else {
+                return "";
+            }
+        }
     }
 
     public static class DisplayEntityField extends DisplayField {

Modified: ofbiz/branches/jquery/framework/widget/src/org/ofbiz/widget/menu/MenuFactory.java
URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/framework/widget/src/org/ofbiz/widget/menu/MenuFactory.java?rev=995688&r1=995687&r2=995688&view=diff
==============================================================================
--- ofbiz/branches/jquery/framework/widget/src/org/ofbiz/widget/menu/MenuFactory.java (original)
+++ ofbiz/branches/jquery/framework/widget/src/org/ofbiz/widget/menu/MenuFactory.java Fri Sep 10 07:26:12 2010
@@ -62,7 +62,7 @@ public class MenuFactory {
                     ServletContext servletContext = (ServletContext) request.getAttribute("servletContext");
 
                     URL menuFileUrl = servletContext.getResource(resourceName);
-                    Document menuFileDoc = UtilXml.readXmlDocument(menuFileUrl, true);
+                    Document menuFileDoc = UtilXml.readXmlDocument(menuFileUrl, true, true);
                     modelMenuMap = readMenuDocument(menuFileDoc, cacheKey);
                     menuWebappCache.put(cacheKey, modelMenuMap);
                 }
@@ -112,7 +112,7 @@ public class MenuFactory {
 
                     URL menuFileUrl = null;
                     menuFileUrl = FlexibleLocation.resolveLocation(resourceName); //, loader);
-                    Document menuFileDoc = UtilXml.readXmlDocument(menuFileUrl, true);
+                    Document menuFileDoc = UtilXml.readXmlDocument(menuFileUrl, true, true);
                     modelMenuMap = readMenuDocument(menuFileDoc, resourceName);
                     menuLocationCache.put(resourceName, modelMenuMap);
                 }

Modified: ofbiz/branches/jquery/framework/widget/src/org/ofbiz/widget/menu/ModelMenuItem.java
URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/framework/widget/src/org/ofbiz/widget/menu/ModelMenuItem.java?rev=995688&r1=995687&r2=995688&view=diff
==============================================================================
--- ofbiz/branches/jquery/framework/widget/src/org/ofbiz/widget/menu/ModelMenuItem.java (original)
+++ ofbiz/branches/jquery/framework/widget/src/org/ofbiz/widget/menu/ModelMenuItem.java Fri Sep 10 07:26:12 2010
@@ -315,6 +315,9 @@ public class ModelMenuItem {
         return modelMenu;
     }
 
+    public List<ModelMenuAction> getActions() {
+        return actions;
+    }
 
     public String getEntityName() {
         if (UtilValidate.isNotEmpty(this.entityName)) {

Modified: ofbiz/branches/jquery/framework/widget/src/org/ofbiz/widget/screen/ModelScreenWidget.java
URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/framework/widget/src/org/ofbiz/widget/screen/ModelScreenWidget.java?rev=995688&r1=995687&r2=995688&view=diff
==============================================================================
--- ofbiz/branches/jquery/framework/widget/src/org/ofbiz/widget/screen/ModelScreenWidget.java (original)
+++ ofbiz/branches/jquery/framework/widget/src/org/ofbiz/widget/screen/ModelScreenWidget.java Fri Sep 10 07:26:12 2010
@@ -507,37 +507,7 @@ public abstract class ModelScreenWidget
                 return;
             }
 
-            // check to see if the name is a composite name separated by a #, if so split it up and get it by the full loc#name
-            if (ScreenFactory.isCombinedName(name)) {
-                String combinedName = name;
-                location = ScreenFactory.getResourceNameFromCombined(combinedName);
-                name = ScreenFactory.getScreenNameFromCombined(combinedName);
-            }
-
-            ModelScreen modelScreen = null;
-            if (UtilValidate.isNotEmpty(location)) {
-                try {
-                    modelScreen = ScreenFactory.getScreenFromLocation(location, name);
-                } catch (IOException e) {
-                    String errMsg = "Error rendering included screen named [" + name + "] at location [" + location + "]: " + e.toString();
-                    Debug.logError(e, errMsg, module);
-                    throw new RuntimeException(errMsg);
-                } catch (SAXException e) {
-                    String errMsg = "Error rendering included screen named [" + name + "] at location [" + location + "]: " + e.toString();
-                    Debug.logError(e, errMsg, module);
-                    throw new RuntimeException(errMsg);
-                } catch (ParserConfigurationException e) {
-                    String errMsg = "Error rendering included screen named [" + name + "] at location [" + location + "]: " + e.toString();
-                    Debug.logError(e, errMsg, module);
-                    throw new RuntimeException(errMsg);
-                }
-            } else {
-                modelScreen = this.modelScreen.modelScreenMap.get(name);
-                if (modelScreen == null) {
-                    throw new IllegalArgumentException("Could not find screen with name [" + name + "] in the same file as the screen with name [" + this.modelScreen.getName() + "]");
-                }
-            }
-            modelScreen.renderScreenString(writer, context, screenStringRenderer);
+            ScreenFactory.renderReferencedScreen(name, location, this, writer, context, screenStringRenderer);
 
             if (protectScope) {
                 UtilGenerics.<MapStack<String>>cast(context).pop();
@@ -577,8 +547,8 @@ public abstract class ModelScreenWidget
 
             List<? extends Element> decoratorSectionElementList = UtilXml.childElementList(decoratorScreenElement, "decorator-section");
             for (Element decoratorSectionElement: decoratorSectionElementList) {
-                String name = decoratorSectionElement.getAttribute("name");
-                this.sectionMap.put(name, new DecoratorSection(modelScreen, decoratorSectionElement));
+                DecoratorSection decoratorSection = new DecoratorSection(modelScreen, decoratorSectionElement);
+                this.sectionMap.put(decoratorSection.getName(), decoratorSection);
             }
         }
 
@@ -604,37 +574,7 @@ public abstract class ModelScreenWidget
             String name = this.getName(context);
             String location = this.getLocation(context);
 
-            // check to see if the name is a composite name separated by a #, if so split it up and get it by the full loc#name
-            if (ScreenFactory.isCombinedName(name)) {
-                String combinedName = name;
-                location = ScreenFactory.getResourceNameFromCombined(combinedName);
-                name = ScreenFactory.getScreenNameFromCombined(combinedName);
-            }
-
-            ModelScreen modelScreen = null;
-            if (UtilValidate.isNotEmpty(location)) {
-                try {
-                    modelScreen = ScreenFactory.getScreenFromLocation(location, name);
-                } catch (IOException e) {
-                    String errMsg = "Error rendering included screen named [" + name + "] at location [" + location + "]: " + e.toString();
-                    Debug.logError(e, errMsg, module);
-                    throw new RuntimeException(errMsg);
-                } catch (SAXException e) {
-                    String errMsg = "Error rendering included screen named [" + name + "] at location [" + location + "]: " + e.toString();
-                    Debug.logError(e, errMsg, module);
-                    throw new RuntimeException(errMsg);
-                } catch (ParserConfigurationException e) {
-                    String errMsg = "Error rendering included screen named [" + name + "] at location [" + location + "]: " + e.toString();
-                    Debug.logError(e, errMsg, module);
-                    throw new RuntimeException(errMsg);
-                }
-            } else {
-                modelScreen = this.modelScreen.modelScreenMap.get(name);
-                if (modelScreen == null) {
-                    throw new IllegalArgumentException("Could not find screen with name [" + name + "] in the same file as the screen with name [" + this.modelScreen.getName() + "]");
-                }
-            }
-            modelScreen.renderScreenString(writer, context, screenStringRenderer);
+            ScreenFactory.renderReferencedScreen(name, location, this, writer, context, screenStringRenderer);
 
             contextMs.pop();
         }

Modified: ofbiz/branches/jquery/framework/widget/src/org/ofbiz/widget/screen/ScreenFactory.java
URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/framework/widget/src/org/ofbiz/widget/screen/ScreenFactory.java?rev=995688&r1=995687&r2=995688&view=diff
==============================================================================
--- ofbiz/branches/jquery/framework/widget/src/org/ofbiz/widget/screen/ScreenFactory.java (original)
+++ ofbiz/branches/jquery/framework/widget/src/org/ofbiz/widget/screen/ScreenFactory.java Fri Sep 10 07:26:12 2010
@@ -31,7 +31,9 @@ import javolution.util.FastMap;
 
 import org.ofbiz.base.location.FlexibleLocation;
 import org.ofbiz.base.util.Debug;
+import org.ofbiz.base.util.GeneralException;
 import org.ofbiz.base.util.UtilHttp;
+import org.ofbiz.base.util.UtilValidate;
 import org.ofbiz.base.util.UtilXml;
 import org.ofbiz.base.util.cache.UtilCache;
 import org.w3c.dom.Document;
@@ -121,7 +123,7 @@ public class ScreenFactory {
                     if (screenFileUrl == null) {
                         throw new IllegalArgumentException("Could not resolve location to URL: " + resourceName);
                     }
-                    Document screenFileDoc = UtilXml.readXmlDocument(screenFileUrl, true);
+                    Document screenFileDoc = UtilXml.readXmlDocument(screenFileUrl, true, true);
                     modelScreenMap = readScreenDocument(screenFileDoc, resourceName);
                     screenLocationCache.put(resourceName, modelScreenMap);
                     double totalSeconds = (System.currentTimeMillis() - startTime)/1000.0;
@@ -150,7 +152,7 @@ public class ScreenFactory {
                     ServletContext servletContext = (ServletContext) request.getAttribute("servletContext");
 
                     URL screenFileUrl = servletContext.getResource(resourceName);
-                    Document screenFileDoc = UtilXml.readXmlDocument(screenFileUrl, true);
+                    Document screenFileDoc = UtilXml.readXmlDocument(screenFileUrl, true, true);
                     modelScreenMap = readScreenDocument(screenFileDoc, resourceName);
                     screenWebappCache.put(cacheKey, modelScreenMap);
                 }
@@ -178,4 +180,39 @@ public class ScreenFactory {
         }
         return modelScreenMap;
     }
+
+    public static void renderReferencedScreen(String name, String location, ModelScreenWidget parentWidget, Appendable writer, Map<String, Object> context, ScreenStringRenderer screenStringRenderer) throws GeneralException, IOException {
+        // check to see if the name is a composite name separated by a #, if so split it up and get it by the full loc#name
+        if (ScreenFactory.isCombinedName(name)) {
+            String combinedName = name;
+            location = ScreenFactory.getResourceNameFromCombined(combinedName);
+            name = ScreenFactory.getScreenNameFromCombined(combinedName);
+        }
+
+        ModelScreen modelScreen = null;
+        if (UtilValidate.isNotEmpty(location)) {
+            try {
+                modelScreen = ScreenFactory.getScreenFromLocation(location, name);
+            } catch (IOException e) {
+                String errMsg = "Error rendering included screen named [" + name + "] at location [" + location + "]: " + e.toString();
+                Debug.logError(e, errMsg, module);
+                throw new RuntimeException(errMsg);
+            } catch (SAXException e) {
+                String errMsg = "Error rendering included screen named [" + name + "] at location [" + location + "]: " + e.toString();
+                Debug.logError(e, errMsg, module);
+                throw new RuntimeException(errMsg);
+            } catch (ParserConfigurationException e) {
+                String errMsg = "Error rendering included screen named [" + name + "] at location [" + location + "]: " + e.toString();
+                Debug.logError(e, errMsg, module);
+                throw new RuntimeException(errMsg);
+            }
+        } else {
+            modelScreen = parentWidget.getModelScreen().modelScreenMap.get(name);
+            if (modelScreen == null) {
+                throw new IllegalArgumentException("Could not find screen with name [" + name + "] in the same file as the screen with name [" + parentWidget.getModelScreen().getName() + "]");
+            }
+        }
+        //Debug.logInfo("parent(" + parentWidget + ") rendering(" + modelScreen + ")", module);
+        modelScreen.renderScreenString(writer, context, screenStringRenderer);
+    }
 }

Modified: ofbiz/branches/jquery/framework/widget/src/org/ofbiz/widget/tree/TreeFactory.java
URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/framework/widget/src/org/ofbiz/widget/tree/TreeFactory.java?rev=995688&r1=995687&r2=995688&view=diff
==============================================================================
--- ofbiz/branches/jquery/framework/widget/src/org/ofbiz/widget/tree/TreeFactory.java (original)
+++ ofbiz/branches/jquery/framework/widget/src/org/ofbiz/widget/tree/TreeFactory.java Fri Sep 10 07:26:12 2010
@@ -62,7 +62,7 @@ public class TreeFactory {
 
                     URL treeFileUrl = null;
                     treeFileUrl = FlexibleLocation.resolveLocation(resourceName); //, loader);
-                    Document treeFileDoc = UtilXml.readXmlDocument(treeFileUrl, true);
+                    Document treeFileDoc = UtilXml.readXmlDocument(treeFileUrl, true, true);
                     modelTreeMap = readTreeDocument(treeFileDoc, delegator, dispatcher, resourceName);
                     treeLocationCache.put(resourceName, modelTreeMap);
                 }
@@ -92,7 +92,7 @@ public class TreeFactory {
                     LocalDispatcher dispatcher = (LocalDispatcher) request.getAttribute("dispatcher");
 
                     URL treeFileUrl = servletContext.getResource(resourceName);
-                    Document treeFileDoc = UtilXml.readXmlDocument(treeFileUrl, true);
+                    Document treeFileDoc = UtilXml.readXmlDocument(treeFileUrl, true, true);
                     modelTreeMap = readTreeDocument(treeFileDoc, delegator, dispatcher, cacheKey);
                     treeWebappCache.put(cacheKey, modelTreeMap);
                 }

Modified: ofbiz/branches/jquery/framework/widget/templates/foFormMacroLibrary.ftl
URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/framework/widget/templates/foFormMacroLibrary.ftl?rev=995688&r1=995687&r2=995688&view=diff
==============================================================================
--- ofbiz/branches/jquery/framework/widget/templates/foFormMacroLibrary.ftl (original)
+++ ofbiz/branches/jquery/framework/widget/templates/foFormMacroLibrary.ftl Fri Sep 10 07:26:12 2010
@@ -43,7 +43,7 @@ under the License.
 
 <#macro renderField text><#if text?exists>${text}</#if></#macro>
 
-<#macro renderDisplayField type imageLocation idName description class alert inPlaceEditorId="" inPlaceEditorUrl="" inPlaceEditorParams="">
+<#macro renderDisplayField type imageLocation idName description title class alert inPlaceEditorId="" inPlaceEditorUrl="" inPlaceEditorParams="">
 <@makeBlock class description />
 </#macro>
 <#macro renderHyperlinkField></#macro>
@@ -102,8 +102,7 @@ under the License.
 <#macro renderFormatItemRowFormCellOpen style><fo:table-cell></#macro>
 <#macro renderFormatItemRowFormCellClose></fo:table-cell></#macro>
 
-<#-- TODO: multi columns (position attribute) in single forms are still not implemented -->
-<#macro renderFormatSingleWrapperOpen formName style><fo:table><fo:table-column column-width="2in"/><fo:table-column/><fo:table-body></#macro>
+<#macro renderFormatSingleWrapperOpen formName style><fo:table><fo:table-column column-width="1.75in"/><fo:table-column column-width="1.75in"/><fo:table-column column-width="1.75in"/><fo:table-column column-width="1.75in"/><fo:table-body></#macro>
 <#macro renderFormatSingleWrapperClose formName></fo:table-body></fo:table></#macro>
 
 <#macro renderFormatFieldRowOpen><fo:table-row></#macro>
@@ -111,7 +110,7 @@ under the License.
 <#macro renderFormatFieldRowTitleCellOpen style><fo:table-cell font-weight="bold" text-align="right" padding="3pt"><fo:block></#macro>
 <#macro renderFormatFieldRowTitleCellClose></fo:block></fo:table-cell></#macro>
 <#macro renderFormatFieldRowSpacerCell></#macro>
-<#macro renderFormatFieldRowWidgetCellOpen positionSpan style><fo:table-cell text-align="left" padding="2pt" padding-left="5pt"></#macro>
+<#macro renderFormatFieldRowWidgetCellOpen positionSpan style><fo:table-cell text-align="left" padding="2pt" padding-left="5pt" <#if positionSpan?has_content && positionSpan gt 1 >number-columns-spanned="${positionSpan}"</#if>></#macro>
 <#macro renderFormatFieldRowWidgetCellClose></fo:table-cell></#macro>
 
 <#macro renderFormatEmptySpace> </#macro>

Modified: ofbiz/branches/jquery/rc.ofbiz
URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/rc.ofbiz?rev=995688&r1=995687&r2=995688&view=diff
==============================================================================
--- ofbiz/branches/jquery/rc.ofbiz (original)
+++ ofbiz/branches/jquery/rc.ofbiz Fri Sep 10 07:26:12 2010
@@ -39,7 +39,7 @@ OFBIZ_HOME=/home/ofbiz/ofbiz
 OFBIZ_LOG=$OFBIZ_HOME/runtime/logs/console.log
 
 # VM Options
-JAVA_VMOPTIONS="-Xms128M -Xmx512M -XX:MaxPermSize=128m"
+JAVA_VMOPTIONS="-Xms128M -Xmx512M -XX:MaxPermSize=512m"
 
 # Java arguments
 JAVA_ARGS="-jar ofbiz.jar"

Modified: ofbiz/branches/jquery/rc.ofbiz.for.debian
URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/rc.ofbiz.for.debian?rev=995688&r1=995687&r2=995688&view=diff
==============================================================================
--- ofbiz/branches/jquery/rc.ofbiz.for.debian (original)
+++ ofbiz/branches/jquery/rc.ofbiz.for.debian Fri Sep 10 07:26:12 2010
@@ -30,7 +30,7 @@ OFBIZ_HOME=/home/ofbiz/ofbiz
 OFBIZ_LOG=$OFBIZ_HOME/runtime/logs/console.log
 
 # VM Options
-JAVA_VMOPTIONS="-Xms128M -Xmx512M -XX:MaxPermSize=128m"
+JAVA_VMOPTIONS="-Xms128M -Xmx512M -XX:MaxPermSize=512m"
 
 # Java arguments
 JAVA_ARGS="-jar ofbiz.jar"

Propchange: ofbiz/branches/jquery/specialpurpose/ebaystore/lib/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Sep 10 07:26:12 2010
@@ -1,3 +1,3 @@
 /ofbiz/branches/addbirt/specialpurpose/ebay/lib:831210-885099,885686-886087
 /ofbiz/branches/multitenant20100310/specialpurpose/ebaystore/lib:921280-927264
-/ofbiz/trunk/specialpurpose/ebaystore/lib:951708-991996
+/ofbiz/trunk/specialpurpose/ebaystore/lib:951708-995684

Modified: ofbiz/branches/jquery/specialpurpose/ecommerce/data/DemoProduct.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/specialpurpose/ecommerce/data/DemoProduct.xml?rev=995688&r1=995687&r2=995688&view=diff
==============================================================================
--- ofbiz/branches/jquery/specialpurpose/ecommerce/data/DemoProduct.xml (original)
+++ ofbiz/branches/jquery/specialpurpose/ecommerce/data/DemoProduct.xml Fri Sep 10 07:26:12 2010
@@ -104,9 +104,9 @@ under the License.
     <ProductStoreEmailSetting productStoreId="9000" emailType="PRDS_ODR_PAYRETRY" bodyScreenLocation="component://ecommerce/widget/EmailOrderScreens.xml#PaymentRetryNotice" subject="OFBiz Demo - Order Payment Notification #${orderId}" fromAddress="[hidden email]"/>
     <ProductStoreEmailSetting productStoreId="9000" emailType="PRDS_ODR_SHIP_COMPLT" bodyScreenLocation="component://ecommerce/widget/EmailOrderScreens.xml#ShipmentCompleteNotice" subject="OFBiz Demo - Shipment Complete Notification #${orderId}" fromAddress="[hidden email]"/>
 
-    <ProductStoreEmailSetting productStoreId="9000" emailType="PRDS_RTN_ACCEPT" bodyScreenLocation="component://ecommerce/widget/EmailReturnScreens.xml#ReturnAccept" subject="OFBiz Demo - Return Accepted #${returnHeader.returnId}" fromAddress="[hidden email]"/>
-    <ProductStoreEmailSetting productStoreId="9000" emailType="PRDS_RTN_COMPLETE" bodyScreenLocation="component://ecommerce/widget/EmailReturnScreens.xml#ReturnComplete" subject="OFBiz Demo - Return Completed #${returnHeader.returnId}" fromAddress="[hidden email]"/>
-    <ProductStoreEmailSetting productStoreId="9000" emailType="PRDS_RTN_CANCEL" bodyScreenLocation="component://ecommerce/widget/EmailReturnScreens.xml#ReturnCancel" subject="OFBiz Demo - Return Cancelled #${returnHeader.returnId}" fromAddress="[hidden email]"/>
+    <ProductStoreEmailSetting productStoreId="9000" emailType="PRDS_RTN_ACCEPT" bodyScreenLocation="component://ecommerce/widget/EmailReturnScreens.xml#ReturnAccept" subject="OFBiz Demo - Return Accepted #${returnHeader.returnId}" xslfoAttachScreenLocation="component://order/widget/ordermgr/OrderPrintScreens.xml#ReturnPDF" fromAddress="[hidden email]"/>
+    <ProductStoreEmailSetting productStoreId="9000" emailType="PRDS_RTN_COMPLETE" bodyScreenLocation="component://ecommerce/widget/EmailReturnScreens.xml#ReturnComplete" subject="OFBiz Demo - Return Completed #${returnHeader.returnId}" xslfoAttachScreenLocation="component://order/widget/ordermgr/OrderPrintScreens.xml#ReturnPDF" fromAddress="[hidden email]"/>
+    <ProductStoreEmailSetting productStoreId="9000" emailType="PRDS_RTN_CANCEL" bodyScreenLocation="component://ecommerce/widget/EmailReturnScreens.xml#ReturnCancel" subject="OFBiz Demo - Return Cancelled #${returnHeader.returnId}" xslfoAttachScreenLocation="component://order/widget/ordermgr/OrderPrintScreens.xml#ReturnPDF" fromAddress="[hidden email]"/>
 
     <ProductStoreEmailSetting productStoreId="9000" emailType="PRDS_GC_PURCHASE" bodyScreenLocation="component://ecommerce/widget/EmailGiftCardScreens.xml#GiftCardPurchase" fromAddress="[hidden email]" subject="A Gift From ${senderName}!"/>
     <ProductStoreEmailSetting productStoreId="9000" emailType="PRDS_GC_RELOAD" bodyScreenLocation="component://ecommerce/widget/EmailGiftCardScreens.xml#GiftCardReload" fromAddress="[hidden email]" subject="Gift Card Reload Results"/>

Propchange: ofbiz/branches/jquery/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/Facilities.groovy
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Sep 10 07:26:12 2010
@@ -1,3 +1,3 @@
 /incubator/ofbiz/trunk/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/Facilities.groovy:418499-490456
 /ofbiz/branches/multitenant20100310/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/Facilities.groovy:921280-927264
-/ofbiz/trunk/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/Facilities.groovy:951708-991996
+/ofbiz/trunk/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/Facilities.groovy:951708-995684

Propchange: ofbiz/branches/jquery/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/ProductList.groovy
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Sep 10 07:26:12 2010
@@ -1,3 +1,3 @@
 /incubator/ofbiz/trunk/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/ProductList.groovy:418499-490456
 /ofbiz/branches/multitenant20100310/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/ProductList.groovy:921280-927264
-/ofbiz/trunk/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/ProductList.groovy:951708-991996
+/ofbiz/trunk/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/ProductList.groovy:951708-995684

Propchange: ofbiz/branches/jquery/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/ProductStockTake.groovy
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Sep 10 07:26:12 2010
@@ -1,3 +1,3 @@
 /incubator/ofbiz/trunk/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/ProductStockTake.groovy:418499-490456
 /ofbiz/branches/multitenant20100310/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/ProductStockTake.groovy:921280-927264
-/ofbiz/trunk/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/ProductStockTake.groovy:951708-991996
+/ofbiz/trunk/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/ProductStockTake.groovy:951708-995684

Modified: ofbiz/branches/jquery/startofbiz.bat
URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/startofbiz.bat?rev=995688&r1=995687&r2=995688&view=diff
==============================================================================
--- ofbiz/branches/jquery/startofbiz.bat (original)
+++ ofbiz/branches/jquery/startofbiz.bat Fri Sep 10 07:26:12 2010
@@ -25,7 +25,7 @@ rem ### Delete the last log
 rem del %OFBIZ_LOG%
 
 rem ###VM args block ####################################################
-rem set MEMIF=-Xms128M -Xmx512M -XX:MaxPermSize=128m
+rem set MEMIF=-Xms128M -Xmx512M -XX:MaxPermSize=512m
 rem # RMI settings
 rem set DEBUG=-Dsun.rmi.server.exceptionTrace=true
 rem # Automatic IP address for Windows
@@ -47,12 +47,12 @@ rem ### start ofbiz with previous set VM
 rem "%JAVA_HOME%\bin\java" %VMARGS% -jar ofbiz.jar > %OFBIZ_LOG%
 
 rem ### This one is for more of a debugging mode
-rem "%JAVA_HOME%\bin\java" -Xms128M -Xmx512M -XX:MaxPermSize=128m -Xdebug -Xnoagent -Djava.compiler=NONE -Xrunjdwp:transport=dt_socket,server=y,suspend=n,address=5005 -jar ofbiz.jar > runtime\logs\console.log
+rem "%JAVA_HOME%\bin\java" -Xms128M -Xmx512M -XX:MaxPermSize=512m -Xdebug -Xnoagent -Djava.compiler=NONE -Xrunjdwp:transport=dt_socket,server=y,suspend=n,address=5005 -jar ofbiz.jar > runtime\logs\console.log
 
 rem ### Simple easy to read line
 echo on
-"%JAVA_HOME%\bin\java" -Xms128M -Xmx512M -XX:MaxPermSize=128m -jar ofbiz.jar
+"%JAVA_HOME%\bin\java" -Xms128M -Xmx512M -XX:MaxPermSize=512m -jar ofbiz.jar
 echo off
 rem ### If you would prefer the console output to be logged rather than displayed switch out the above line for this one
-rem "%JAVA_HOME%\bin\java" -Xms128M -Xmx512M -XX:MaxPermSize=128m -jar ofbiz.jar > runtime\logs\console.log
+rem "%JAVA_HOME%\bin\java" -Xms128M -Xmx512M -XX:MaxPermSize=512m -jar ofbiz.jar > runtime\logs\console.log
 

Modified: ofbiz/branches/jquery/startofbiz.sh
URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/startofbiz.sh?rev=995688&r1=995687&r2=995688&view=diff
==============================================================================
--- ofbiz/branches/jquery/startofbiz.sh (original)
+++ ofbiz/branches/jquery/startofbiz.sh Fri Sep 10 07:26:12 2010
@@ -35,7 +35,7 @@ ADMIN="-Dofbiz.admin.port=$ADMIN_PORT -D
 #automatic IP address for linux
 #IPADDR=`/sbin/ifconfig eth0 | grep 'inet addr:' | cut -d: -f2 | awk '{ print $1}'`
 #RMIIF="-Djava.rmi.server.hostname=$IPADDR"
-MEMIF="-Xms128M -Xmx512M -XX:MaxPermSize=128m"
+MEMIF="-Xms128M -Xmx512M -XX:MaxPermSize=512m"
 #MISC="-Duser.language=en"
 VMARGS="$MEMIF $MISC $DEBUG $RMIIF $ADMIN"
 

Modified: ofbiz/branches/jquery/startofbizBoth.bat
URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/startofbizBoth.bat?rev=995688&r1=995687&r2=995688&view=diff
==============================================================================
--- ofbiz/branches/jquery/startofbizBoth.bat (original)
+++ ofbiz/branches/jquery/startofbizBoth.bat Fri Sep 10 07:26:12 2010
@@ -25,7 +25,7 @@ rem ### Delete the last log
 rem del %OFBIZ_LOG%
 
 rem ###VM args block ####################################################
-rem set MEMIF=-Xms128M -Xmx512M -XX:MaxPermSize=128m
+rem set MEMIF=-Xms128M -Xmx512M -XX:MaxPermSize=512m
 rem # RMI settings
 rem set DEBUG=-Dsun.rmi.server.exceptionTrace=true
 rem # Automatic IP address for Windows
@@ -47,12 +47,12 @@ rem ### start ofbiz with previous set VM
 rem "%JAVA_HOME%\bin\java" %VMARGS% -jar ofbiz.jar > %OFBIZ_LOG%
 
 rem ### This one is for more of a debugging mode
-rem "%JAVA_HOME%\bin\java" -Xms128M -Xmx512M -XX:MaxPermSize=128m -Xdebug -Xnoagent -Djava.compiler=NONE -Xrunjdwp:transport=dt_socket,server=y,suspend=n,address=5005 -jar ofbiz.jar > runtime\logs\console.log
+rem "%JAVA_HOME%\bin\java" -Xms128M -Xmx512M -XX:MaxPermSize=512m -Xdebug -Xnoagent -Djava.compiler=NONE -Xrunjdwp:transport=dt_socket,server=y,suspend=n,address=5005 -jar ofbiz.jar > runtime\logs\console.log
 
 rem ### Simple easy to read line
 echo on
-"%JAVA_HOME%\bin\java" -Xms128M -Xmx512M -XX:MaxPermSize=128m -jar ofbiz.jar -both
+"%JAVA_HOME%\bin\java" -Xms128M -Xmx512M -XX:MaxPermSize=512m -jar ofbiz.jar -both
 echo off
 rem ### If you would prefer the console output to be logged rather than displayed switch out the above line for this one
-rem "%JAVA_HOME%\bin\java" -Xms128M -Xmx512M -XX:MaxPermSize=128m -jar ofbiz.jar > runtime\logs\console.log
+rem "%JAVA_HOME%\bin\java" -Xms128M -Xmx512M -XX:MaxPermSize=512m -jar ofbiz.jar > runtime\logs\console.log
 
\ No newline at end of file