You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by do...@apache.org on 2010/12/01 01:15:18 UTC

svn commit: r1040833 [3/5] - in /ofbiz/trunk: applications/accounting/data/ applications/content/data/ applications/humanres/data/ applications/marketing/data/ applications/party/data/ applications/party/entitydef/ applications/party/widget/partymgr/ a...

Modified: ofbiz/trunk/framework/example/data/ExampleHelpData.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/example/data/ExampleHelpData.xml?rev=1040833&r1=1040832&r2=1040833&view=diff
==============================================================================
--- ofbiz/trunk/framework/example/data/ExampleHelpData.xml (original)
+++ ofbiz/trunk/framework/example/data/ExampleHelpData.xml Wed Dec  1 00:15:17 2010
@@ -1,26 +1,26 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License.  You may obtain a copy of the License at
-
-http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied.  See the License for the
-specific language governing permissions and limitations
-under the License.
--->
-<entity-engine-xml>
-
-<!--
-    The Example help data is located in the applications/content/data/ExampleHelpData.xml file
--->
-
-</entity-engine-xml>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements.  See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership.  The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License.  You may obtain a copy of the License at
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+-->
+<entity-engine-xml>
+
+<!--
+    The Example help data is located in the applications/content/data/ExampleHelpData.xml file
+-->
+
+</entity-engine-xml>

Modified: ofbiz/trunk/framework/example/data/helpdata/HELP_EXAMPLE.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/example/data/helpdata/HELP_EXAMPLE.xml?rev=1040833&r1=1040832&r2=1040833&view=diff
==============================================================================
--- ofbiz/trunk/framework/example/data/helpdata/HELP_EXAMPLE.xml (original)
+++ ofbiz/trunk/framework/example/data/helpdata/HELP_EXAMPLE.xml Wed Dec  1 00:15:17 2010
@@ -1,24 +1,24 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-Licensed to the Apache Software Foundation (ASF) under one or more
-contributor license agreements. See the NOTICE file distributed with
-this work for additional information regarding copyright ownership.
-The ASF licenses this file to you under the Apache License, Version
-2.0 (the "License"); you may not use this file except in compliance
-with the License. You may obtain a copy of the License at
-http://www.apache.org/licenses/LICENSE-2.0 Unless required by
-applicable law or agreed to in writing, software distributed under the
-License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR
-CONDITIONS OF ANY KIND, either express or implied. See the License for
-the specific language governing permissions and limitations under the
-License.
--->
-<section xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    version="5.0" xmlns:xl="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude"
-    xsi:schemaLocation="http://docbook.org/ns/docbook ../../../../applications/content/dtd/docbook.xsd"
-    xmlns="http://docbook.org/ns/docbook">
-    <title>The Example Main Help page.</title>
-    <para>
-        The Example application will allow you to discover the possibilities to create an application, with a lot of search boxes, lists and many more.
-    </para>
-</section>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+Licensed to the Apache Software Foundation (ASF) under one or more
+contributor license agreements. See the NOTICE file distributed with
+this work for additional information regarding copyright ownership.
+The ASF licenses this file to you under the Apache License, Version
+2.0 (the "License"); you may not use this file except in compliance
+with the License. You may obtain a copy of the License at
+http://www.apache.org/licenses/LICENSE-2.0 Unless required by
+applicable law or agreed to in writing, software distributed under the
+License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR
+CONDITIONS OF ANY KIND, either express or implied. See the License for
+the specific language governing permissions and limitations under the
+License.
+-->
+<section xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    version="5.0" xmlns:xl="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude"
+    xsi:schemaLocation="http://docbook.org/ns/docbook ../../../../applications/content/dtd/docbook.xsd"
+    xmlns="http://docbook.org/ns/docbook">
+    <title>The Example Main Help page.</title>
+    <para>
+        The Example application will allow you to discover the possibilities to create an application, with a lot of search boxes, lists and many more.
+    </para>
+</section>

Modified: ofbiz/trunk/framework/example/data/helpdata/HELP_EXAMPLE_main.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/example/data/helpdata/HELP_EXAMPLE_main.xml?rev=1040833&r1=1040832&r2=1040833&view=diff
==============================================================================
--- ofbiz/trunk/framework/example/data/helpdata/HELP_EXAMPLE_main.xml (original)
+++ ofbiz/trunk/framework/example/data/helpdata/HELP_EXAMPLE_main.xml Wed Dec  1 00:15:17 2010
@@ -1,24 +1,24 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-Licensed to the Apache Software Foundation (ASF) under one or more
-contributor license agreements. See the NOTICE file distributed with
-this work for additional information regarding copyright ownership.
-The ASF licenses this file to you under the Apache License, Version
-2.0 (the "License"); you may not use this file except in compliance
-with the License. You may obtain a copy of the License at
-http://www.apache.org/licenses/LICENSE-2.0 Unless required by
-applicable law or agreed to in writing, software distributed under the
-License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR
-CONDITIONS OF ANY KIND, either express or implied. See the License for
-the specific language governing permissions and limitations under the
-License.
--->
-<section xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    version="5.0" xmlns:xl="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude"
-    xsi:schemaLocation="http://docbook.org/ns/docbook ../../../../applications/content/dtd/docbook.xsd"
-    xmlns="http://docbook.org/ns/docbook">
-    <title>The Example Main page.</title>
-    <para>
-        In this page, you can create or search an example
-    </para>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+Licensed to the Apache Software Foundation (ASF) under one or more
+contributor license agreements. See the NOTICE file distributed with
+this work for additional information regarding copyright ownership.
+The ASF licenses this file to you under the Apache License, Version
+2.0 (the "License"); you may not use this file except in compliance
+with the License. You may obtain a copy of the License at
+http://www.apache.org/licenses/LICENSE-2.0 Unless required by
+applicable law or agreed to in writing, software distributed under the
+License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR
+CONDITIONS OF ANY KIND, either express or implied. See the License for
+the specific language governing permissions and limitations under the
+License.
+-->
+<section xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    version="5.0" xmlns:xl="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude"
+    xsi:schemaLocation="http://docbook.org/ns/docbook ../../../../applications/content/dtd/docbook.xsd"
+    xmlns="http://docbook.org/ns/docbook">
+    <title>The Example Main page.</title>
+    <para>
+        In this page, you can create or search an example
+    </para>
 </section>
\ No newline at end of file

Modified: ofbiz/trunk/framework/example/widget/example/BirtForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/example/widget/example/BirtForms.xml?rev=1040833&r1=1040832&r2=1040833&view=diff
==============================================================================
--- ofbiz/trunk/framework/example/widget/example/BirtForms.xml (original)
+++ ofbiz/trunk/framework/example/widget/example/BirtForms.xml Wed Dec  1 00:15:17 2010
@@ -1,41 +1,41 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License.  You may obtain a copy of the License at
-
-http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied.  See the License for the
-specific language governing permissions and limitations
-under the License.
--->
-
-<forms xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
-        xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/widget-form.xsd">
-
-    <form name="EditMail" type="single" target="sendBirtMail">
-        <field name="sendFrom"><text/></field>
-        <field name="sendTo"><text/></field>
-        <field name="subject"><text/></field>
-        <field name="birtReportLocation" tooltip="Example is component://example/webapp/birt/report/example.rptdesign"><text/></field>
-        <field name="birtContentType">
-            <drop-down>
-                <option key="text/html" description="text/html"/>
-                <option key="application/pdf" description="application/pdf"/>
-                <option key="application/vnd.ms-excel" description="application/vnd.ms-excel"/>
-                <option key="application/vnd.ms-word" description="application/vnd.ms-word"/>
-                <option key="application/vnd.ms-powerpoint" description="application/vnd.ms-powerpoint"/>
-            </drop-down>
-        </field>
-        <field name="attachmentName"><text/></field>
-        <field name="sendButton" widget-style="smallSubmit"><submit button-type="button"/></field>
-    </form>
-</forms>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements.  See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership.  The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License.  You may obtain a copy of the License at
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+-->
+
+<forms xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
+        xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/widget-form.xsd">
+
+    <form name="EditMail" type="single" target="sendBirtMail">
+        <field name="sendFrom"><text/></field>
+        <field name="sendTo"><text/></field>
+        <field name="subject"><text/></field>
+        <field name="birtReportLocation" tooltip="Example is component://example/webapp/birt/report/example.rptdesign"><text/></field>
+        <field name="birtContentType">
+            <drop-down>
+                <option key="text/html" description="text/html"/>
+                <option key="application/pdf" description="application/pdf"/>
+                <option key="application/vnd.ms-excel" description="application/vnd.ms-excel"/>
+                <option key="application/vnd.ms-word" description="application/vnd.ms-word"/>
+                <option key="application/vnd.ms-powerpoint" description="application/vnd.ms-powerpoint"/>
+            </drop-down>
+        </field>
+        <field name="attachmentName"><text/></field>
+        <field name="sendButton" widget-style="smallSubmit"><submit button-type="button"/></field>
+    </form>
+</forms>

Modified: ofbiz/trunk/framework/example/widget/example/BirtScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/example/widget/example/BirtScreens.xml?rev=1040833&r1=1040832&r2=1040833&view=diff
==============================================================================
--- ofbiz/trunk/framework/example/widget/example/BirtScreens.xml (original)
+++ ofbiz/trunk/framework/example/widget/example/BirtScreens.xml Wed Dec  1 00:15:17 2010
@@ -1,113 +1,113 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License.  You may obtain a copy of the License at
-
-http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied.  See the License for the
-specific language governing permissions and limitations
-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="main">
-        <section>
-            <actions>
-            </actions>
-            <widgets>
-                <decorator-screen name="CommonBirtDecorator" location="${parameters.mainDecoratorLocation}">
-                    <decorator-section name="body">
-                        <section>
-                            <widgets>
-                                  <label style="h3" text="BIRT is an open source Eclipse-based reporting system that integrates with any OFBiz application to produce compelling reports including graphical presentations like pie and bar charts."/>
-                                  <label style="h3" text="This application provides you with a sample example report."/>
-                                  <label style="h3" text="See the help option how to create your own OFBiz intergrated reports."/>
-                                  <link style="h3" text="or see the Birt home for more information" target="http://eclipse.org/birt/phoenix/intro/" url-mode="plain" target-window="_blank_"/>
-                            </widgets>
-                        </section>
-                    </decorator-section>
-                </decorator-screen>
-            </widgets>
-        </section>
-    </screen>
-
-    <screen name="Report">
-        <section>
-            <actions>
-                <set field="tabButtonItem" value="Report"/>
-            </actions>
-            <widgets>
-                <decorator-screen name="CommonBirtDecorator" location="${parameters.mainDecoratorLocation}">
-                    <decorator-section name="body">
-                        <section>
-                            <widgets>
-                                <screenlet title="Using report tag">
-                                    <platform-specific>
-                                        <html>
-                                            <html-template location="component://example/webapp/birt/birt/report.ftl"/>
-                                        </html>
-                                    </platform-specific>
-                                </screenlet>
-                            </widgets>
-                        </section>
-                    </decorator-section>
-                </decorator-screen>
-            </widgets>
-        </section>
-    </screen>
-
-    <screen name="EditMail">
-        <section>
-            <actions>
-                <set field="tabButtonItem" value="Mail"/>
-            </actions>
-            <widgets>
-                <decorator-screen name="CommonBirtDecorator" location="${parameters.mainDecoratorLocation}">
-                    <decorator-section name="body">
-                        <section>
-                            <widgets>
-                                <screenlet title="Send BIRT report by mail">
-                                    <include-form location="component://example/widget/example/BirtForms.xml" name="EditMail"/>
-                                </screenlet>
-                            </widgets>
-                        </section>
-                    </decorator-section>
-                </decorator-screen>
-            </widgets>
-        </section>
-    </screen>
-
-    <screen name="chartReport">
-        <section>
-            <actions>
-                <set field="tabButtonItem" value="chartReport"/>
-            </actions>
-            <widgets>
-                <decorator-screen name="CommonBirtDecorator" location="${parameters.mainDecoratorLocation}">
-                    <decorator-section name="body">
-                        <section>
-                            <widgets>
-                                <screenlet title="Using report tag">
-                                    <platform-specific>
-                                        <html><html-template location="component://example/webapp/birt/birt/chartReport.ftl"/></html>
-                                    </platform-specific>
-                                </screenlet>
-                            </widgets>
-                        </section>
-                    </decorator-section>
-                </decorator-screen>
-            </widgets>
-        </section>
-    </screen>
-</screens>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements.  See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership.  The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License.  You may obtain a copy of the License at
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+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="main">
+        <section>
+            <actions>
+            </actions>
+            <widgets>
+                <decorator-screen name="CommonBirtDecorator" location="${parameters.mainDecoratorLocation}">
+                    <decorator-section name="body">
+                        <section>
+                            <widgets>
+                                  <label style="h3" text="BIRT is an open source Eclipse-based reporting system that integrates with any OFBiz application to produce compelling reports including graphical presentations like pie and bar charts."/>
+                                  <label style="h3" text="This application provides you with a sample example report."/>
+                                  <label style="h3" text="See the help option how to create your own OFBiz intergrated reports."/>
+                                  <link style="h3" text="or see the Birt home for more information" target="http://eclipse.org/birt/phoenix/intro/" url-mode="plain" target-window="_blank_"/>
+                            </widgets>
+                        </section>
+                    </decorator-section>
+                </decorator-screen>
+            </widgets>
+        </section>
+    </screen>
+
+    <screen name="Report">
+        <section>
+            <actions>
+                <set field="tabButtonItem" value="Report"/>
+            </actions>
+            <widgets>
+                <decorator-screen name="CommonBirtDecorator" location="${parameters.mainDecoratorLocation}">
+                    <decorator-section name="body">
+                        <section>
+                            <widgets>
+                                <screenlet title="Using report tag">
+                                    <platform-specific>
+                                        <html>
+                                            <html-template location="component://example/webapp/birt/birt/report.ftl"/>
+                                        </html>
+                                    </platform-specific>
+                                </screenlet>
+                            </widgets>
+                        </section>
+                    </decorator-section>
+                </decorator-screen>
+            </widgets>
+        </section>
+    </screen>
+
+    <screen name="EditMail">
+        <section>
+            <actions>
+                <set field="tabButtonItem" value="Mail"/>
+            </actions>
+            <widgets>
+                <decorator-screen name="CommonBirtDecorator" location="${parameters.mainDecoratorLocation}">
+                    <decorator-section name="body">
+                        <section>
+                            <widgets>
+                                <screenlet title="Send BIRT report by mail">
+                                    <include-form location="component://example/widget/example/BirtForms.xml" name="EditMail"/>
+                                </screenlet>
+                            </widgets>
+                        </section>
+                    </decorator-section>
+                </decorator-screen>
+            </widgets>
+        </section>
+    </screen>
+
+    <screen name="chartReport">
+        <section>
+            <actions>
+                <set field="tabButtonItem" value="chartReport"/>
+            </actions>
+            <widgets>
+                <decorator-screen name="CommonBirtDecorator" location="${parameters.mainDecoratorLocation}">
+                    <decorator-section name="body">
+                        <section>
+                            <widgets>
+                                <screenlet title="Using report tag">
+                                    <platform-specific>
+                                        <html><html-template location="component://example/webapp/birt/birt/chartReport.ftl"/></html>
+                                    </platform-specific>
+                                </screenlet>
+                            </widgets>
+                        </section>
+                    </decorator-section>
+                </decorator-screen>
+            </widgets>
+        </section>
+    </screen>
+</screens>

Modified: ofbiz/trunk/framework/webtools/widget/CacheForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/webtools/widget/CacheForms.xml?rev=1040833&r1=1040832&r2=1040833&view=diff
==============================================================================
--- ofbiz/trunk/framework/webtools/widget/CacheForms.xml (original)
+++ ofbiz/trunk/framework/webtools/widget/CacheForms.xml Wed Dec  1 00:15:17 2010
@@ -1,85 +1,85 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License.  You may obtain a copy of the License at
-
-http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied.  See the License for the
-specific language governing permissions and limitations
-under the License.
--->
-
-<forms xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
-        xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/widget-form.xsd">
-
-    <form name="ListCache" type="list" list-name="cacheList" paginate-target="FindUtilCache" separate-columns="true" odd-row-style="alternate-row" default-table-style="basic-table hover-bar" header-row-style="header-row-2">
-        <field name="cacheName" title="${uiLabelMap.WebtoolsCacheName}" sort-field="true"><display/></field>
-        <field name="cacheSize" title="${uiLabelMap.WebtoolsSize}" sort-field="true"><display/></field>
-        <field name="hitCount" title="${uiLabelMap.WebtoolsHits}" sort-field="true"><display/></field>
-        <field name="misses" title="${uiLabelMap.WebtoolsMisses}" sort-field="true"><display description="${missCountTot}/${missCountNotFound}/${missCountExpired}/${missCountSoftRef}"/></field>
-        <field name="removes" title="${uiLabelMap.WebtoolsRemoves}" sort-field="true"><display description="${removeHitCount}/${removeMissCount}"/></field>
-        <field name="maxInMemory" title="${uiLabelMap.WebtoolsMaxInMemory}" sort-field="true"><display/></field>
-        <field name="expireTime" title="${uiLabelMap.WebtoolsExpireTime}" sort-field="true"><display/></field>
-        <field name="useSoftReference" title="${uiLabelMap.WebtoolsUseSoftRef}" sort-field="true"><display/></field>
-        <field name="useFileSystemStore" title="${uiLabelMap.WebtoolsUseFileStore}" sort-field="true"><display/></field>
-        <field name="administration" title="${uiLabelMap.CommonEmptyHeader}" widget-style="buttontext" use-when="hasUtilCacheEdit">
-            <hyperlink description="${uiLabelMap.WebtoolsElements}" target="FindUtilCacheElements">
-                <parameter param-name="UTIL_CACHE_NAME" from-field="cacheName"/>
-            </hyperlink>
-        </field>
-        <field name="admin_edit" title="${uiLabelMap.CommonEmptyHeader}" widget-style="buttontext" use-when="hasUtilCacheEdit">
-            <hyperlink description="${uiLabelMap.CommonEdit}" target="EditUtilCache">
-                <parameter param-name="UTIL_CACHE_NAME" from-field="cacheName"/>
-            </hyperlink>
-        </field>
-        <field name="admin_clear" title="${uiLabelMap.CommonEmptyHeader}" widget-style="buttontext" use-when="hasUtilCacheEdit">
-            <hyperlink description="${uiLabelMap.CommonClear}" target="FindUtilCacheClear">
-                <parameter param-name="UTIL_CACHE_NAME" from-field="cacheName"/>
-            </hyperlink>
-        </field>
-    </form>
-
-    <form name="ListCacheElements" type="list" list-name="cacheElementsList" paginate-target="FindUtilCacheElements" separate-columns="true" odd-row-style="alternate-row" default-table-style="basic-table hover-bar" header-row-style="header-row-2">
-        <field name="elementKey" title="${uiLabelMap.WebtoolsCacheElementKey}" sort-field="true"><display/></field>
-        <field name="expireTimeMillis" title="${uiLabelMap.WebtoolsExpireTime}" sort-field="true"><display/></field>
-        <field name="lineSize" title="${uiLabelMap.WebtoolsBytes}" sort-field="true"><display/></field>
-
-        <field name="administration" title="${uiLabelMap.CommonEmptyHeader}" widget-style="buttontext" use-when="hasUtilCacheEdit">
-            <hyperlink description="${uiLabelMap.CommonRemove}" target="FindUtilCacheElementsRemoveElement">
-                <parameter param-name="UTIL_CACHE_NAME" from-field="cacheName"/>
-                <parameter param-name="UTIL_CACHE_ELEMENT_NUMBER" from-field="keyNum"/>
-            </hyperlink>
-        </field>
-    </form>
-
-    <form name="EditCache" type="single" target="EditUtilCacheUpdate" default-map-name="cache">
-        <field name="UTIL_CACHE_NAME" entry-name="cacheName" title="${uiLabelMap.WebtoolsCacheName}"><display/></field>
-        <field name="cacheSize" title="${uiLabelMap.WebtoolsSize}"><display/></field>
-        <field name="hitCount" title="${uiLabelMap.WebtoolsHits}"><display/></field>
-        <field name="missCountTot" title="${uiLabelMap.WebtoolsMissesTotal}"><display/></field>
-        <field name="missCountNotFound" title="${uiLabelMap.WebtoolsMissesNotFound}"><display/></field>
-        <field name="missCountExpired" title="${uiLabelMap.WebtoolsMissesExpire}"><display/></field>
-        <field name="missCountSoftRef" title="${uiLabelMap.WebtoolsMissesSoftReference}"><display/></field>
-        <field name="removeHitCount" title="${uiLabelMap.WebtoolsRemovesHit}"><display/></field>
-        <field name="removeMissCount" title="${uiLabelMap.WebtoolsRemovesMisses}"><display/></field>
-        <field name="UTIL_CACHE_MAX_IN_MEMORY" entry-name="maxInMemory" title="${uiLabelMap.WebtoolsMaxInMemory}"><text/></field>
-        <field name="UTIL_CACHE_EXPIRE_TIME" entry-name="expireTime" title="${uiLabelMap.WebtoolsExpireTime}"><text/></field>
-        <field name="UTIL_CACHE_USE_SOFT_REFERENCE" entry-name="useSoftReference" title="${uiLabelMap.WebtoolsUseSoftRef}">
-            <drop-down allow-empty="false">
-                <option key="false" description="${uiLabelMap.CommonFalse}"/>
-                <option key="true" description="${uiLabelMap.CommonTrue}"/>
-            </drop-down>
-        </field>
-        <field name="useFileSystemStore" title="${uiLabelMap.WebtoolsUseFileStore}"><display/></field>
-        <field name="submitButton" title="${uiLabelMap.CommonApply}"><submit button-type="button"/></field>
-    </form>    
-</forms>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements.  See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership.  The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License.  You may obtain a copy of the License at
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+-->
+
+<forms xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
+        xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/widget-form.xsd">
+
+    <form name="ListCache" type="list" list-name="cacheList" paginate-target="FindUtilCache" separate-columns="true" odd-row-style="alternate-row" default-table-style="basic-table hover-bar" header-row-style="header-row-2">
+        <field name="cacheName" title="${uiLabelMap.WebtoolsCacheName}" sort-field="true"><display/></field>
+        <field name="cacheSize" title="${uiLabelMap.WebtoolsSize}" sort-field="true"><display/></field>
+        <field name="hitCount" title="${uiLabelMap.WebtoolsHits}" sort-field="true"><display/></field>
+        <field name="misses" title="${uiLabelMap.WebtoolsMisses}" sort-field="true"><display description="${missCountTot}/${missCountNotFound}/${missCountExpired}/${missCountSoftRef}"/></field>
+        <field name="removes" title="${uiLabelMap.WebtoolsRemoves}" sort-field="true"><display description="${removeHitCount}/${removeMissCount}"/></field>
+        <field name="maxInMemory" title="${uiLabelMap.WebtoolsMaxInMemory}" sort-field="true"><display/></field>
+        <field name="expireTime" title="${uiLabelMap.WebtoolsExpireTime}" sort-field="true"><display/></field>
+        <field name="useSoftReference" title="${uiLabelMap.WebtoolsUseSoftRef}" sort-field="true"><display/></field>
+        <field name="useFileSystemStore" title="${uiLabelMap.WebtoolsUseFileStore}" sort-field="true"><display/></field>
+        <field name="administration" title="${uiLabelMap.CommonEmptyHeader}" widget-style="buttontext" use-when="hasUtilCacheEdit">
+            <hyperlink description="${uiLabelMap.WebtoolsElements}" target="FindUtilCacheElements">
+                <parameter param-name="UTIL_CACHE_NAME" from-field="cacheName"/>
+            </hyperlink>
+        </field>
+        <field name="admin_edit" title="${uiLabelMap.CommonEmptyHeader}" widget-style="buttontext" use-when="hasUtilCacheEdit">
+            <hyperlink description="${uiLabelMap.CommonEdit}" target="EditUtilCache">
+                <parameter param-name="UTIL_CACHE_NAME" from-field="cacheName"/>
+            </hyperlink>
+        </field>
+        <field name="admin_clear" title="${uiLabelMap.CommonEmptyHeader}" widget-style="buttontext" use-when="hasUtilCacheEdit">
+            <hyperlink description="${uiLabelMap.CommonClear}" target="FindUtilCacheClear">
+                <parameter param-name="UTIL_CACHE_NAME" from-field="cacheName"/>
+            </hyperlink>
+        </field>
+    </form>
+
+    <form name="ListCacheElements" type="list" list-name="cacheElementsList" paginate-target="FindUtilCacheElements" separate-columns="true" odd-row-style="alternate-row" default-table-style="basic-table hover-bar" header-row-style="header-row-2">
+        <field name="elementKey" title="${uiLabelMap.WebtoolsCacheElementKey}" sort-field="true"><display/></field>
+        <field name="expireTimeMillis" title="${uiLabelMap.WebtoolsExpireTime}" sort-field="true"><display/></field>
+        <field name="lineSize" title="${uiLabelMap.WebtoolsBytes}" sort-field="true"><display/></field>
+
+        <field name="administration" title="${uiLabelMap.CommonEmptyHeader}" widget-style="buttontext" use-when="hasUtilCacheEdit">
+            <hyperlink description="${uiLabelMap.CommonRemove}" target="FindUtilCacheElementsRemoveElement">
+                <parameter param-name="UTIL_CACHE_NAME" from-field="cacheName"/>
+                <parameter param-name="UTIL_CACHE_ELEMENT_NUMBER" from-field="keyNum"/>
+            </hyperlink>
+        </field>
+    </form>
+
+    <form name="EditCache" type="single" target="EditUtilCacheUpdate" default-map-name="cache">
+        <field name="UTIL_CACHE_NAME" entry-name="cacheName" title="${uiLabelMap.WebtoolsCacheName}"><display/></field>
+        <field name="cacheSize" title="${uiLabelMap.WebtoolsSize}"><display/></field>
+        <field name="hitCount" title="${uiLabelMap.WebtoolsHits}"><display/></field>
+        <field name="missCountTot" title="${uiLabelMap.WebtoolsMissesTotal}"><display/></field>
+        <field name="missCountNotFound" title="${uiLabelMap.WebtoolsMissesNotFound}"><display/></field>
+        <field name="missCountExpired" title="${uiLabelMap.WebtoolsMissesExpire}"><display/></field>
+        <field name="missCountSoftRef" title="${uiLabelMap.WebtoolsMissesSoftReference}"><display/></field>
+        <field name="removeHitCount" title="${uiLabelMap.WebtoolsRemovesHit}"><display/></field>
+        <field name="removeMissCount" title="${uiLabelMap.WebtoolsRemovesMisses}"><display/></field>
+        <field name="UTIL_CACHE_MAX_IN_MEMORY" entry-name="maxInMemory" title="${uiLabelMap.WebtoolsMaxInMemory}"><text/></field>
+        <field name="UTIL_CACHE_EXPIRE_TIME" entry-name="expireTime" title="${uiLabelMap.WebtoolsExpireTime}"><text/></field>
+        <field name="UTIL_CACHE_USE_SOFT_REFERENCE" entry-name="useSoftReference" title="${uiLabelMap.WebtoolsUseSoftRef}">
+            <drop-down allow-empty="false">
+                <option key="false" description="${uiLabelMap.CommonFalse}"/>
+                <option key="true" description="${uiLabelMap.CommonTrue}"/>
+            </drop-down>
+        </field>
+        <field name="useFileSystemStore" title="${uiLabelMap.WebtoolsUseFileStore}"><display/></field>
+        <field name="submitButton" title="${uiLabelMap.CommonApply}"><submit button-type="button"/></field>
+    </form>    
+</forms>

Modified: ofbiz/trunk/framework/webtools/widget/LabelManagerScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/webtools/widget/LabelManagerScreens.xml?rev=1040833&r1=1040832&r2=1040833&view=diff
==============================================================================
--- ofbiz/trunk/framework/webtools/widget/LabelManagerScreens.xml (original)
+++ ofbiz/trunk/framework/webtools/widget/LabelManagerScreens.xml Wed Dec  1 00:15:17 2010
@@ -1,129 +1,129 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License.  You may obtain a copy of the License at
-
-http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied.  See the License for the
-specific language governing permissions and limitations
-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="SearchLabels">
-        <section>
-            <condition>
-                <if-has-permission permission="LABEL_MANAGER_VIEW"/>
-            </condition>
-            <actions>
-                <set field="titleProperty" value="WebtoolsLabelManagerFindLabels"/>
-                <set field="tabButtonItem" value="labels"/>
-                <script location="component://webtools/webapp/webtools/WEB-INF/actions/labelmanager/LabelManager.groovy"/>
-            </actions>
-            <widgets>
-                <decorator-screen name="CommonArtifactDecorator" location="component://webtools/widget/CommonScreens.xml">
-                    <decorator-section name="body">
-                        <decorator-screen name="FindScreenDecorator" location="component://common/widget/CommonScreens.xml">
-                            <decorator-section name="search-options">
-                               <platform-specific><html><html-template location="component://webtools/webapp/webtools/labelmanager/SearchLabels.ftl"/></html></platform-specific>
-                            </decorator-section>
-                            <decorator-section name="search-results">
-                                <platform-specific><html><html-template location="component://webtools/webapp/webtools/labelmanager/ViewLabels.ftl"/></html></platform-specific>
-                            </decorator-section>
-                        </decorator-screen>
-                        <!--
-                        <screenlet id="ViewHardcodedLabelsPanel" title="${uiLabelMap.WebtoolsLabelManagerHardcoded}" collapsible="false">
-                            <platform-specific><html><html-template location="component://webtools/webapp/webtools/labelmanager/ViewHardcodedLabels.ftl"/></html></platform-specific>
-                        </screenlet>
-                        -->
-                    </decorator-section>
-                </decorator-screen>
-            </widgets>
-            <fail-widgets>
-                <label style="h3">${uiLabelMap.WebtoolsLabelManagerSecuryError}</label>
-            </fail-widgets>
-        </section>
-    </screen>
-
-    <screen name="UpdateLabel">
-        <section>
-            <condition>
-                <if-has-permission permission="LABEL_MANAGER_VIEW"/>
-            </condition>
-            <actions>
-                <set field="titleProperty" value="WebtoolsLabelManagerAddNew"/>
-                <script location="component://webtools/webapp/webtools/WEB-INF/actions/labelmanager/UpdateManager.groovy"/>
-            </actions>
-            <widgets>
-                <decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}">
-                    <decorator-section name="body">
-                        <container style="h1">
-                            <label text="${uiLabelMap.WebtoolsLabelManagerAddNew}"/>
-                        </container>
-                            <platform-specific><html><html-template location="component://webtools/webapp/webtools/labelmanager/UpdateLabel.ftl"/></html></platform-specific>
-                    </decorator-section>
-                </decorator-screen>
-            </widgets>
-            <fail-widgets>
-                <label style="h3">${uiLabelMap.WebtoolsLabelManagerSecuryError}</label>
-            </fail-widgets>
-        </section>
-    </screen>
-
-    <screen name="ViewReferences">
-        <section>
-            <condition>
-                <if-has-permission permission="LABEL_MANAGER_VIEW"/>
-            </condition>
-            <actions>
-                <set field="titleProperty" value="WebtoolsLabelManagerViewReferences"/>
-                <script location="component://webtools/webapp/webtools/WEB-INF/actions/labelmanager/ViewReferences.groovy"/>
-            </actions>
-            <widgets>
-                <decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}">
-                    <decorator-section name="body">
-                        <platform-specific><html><html-template location="component://webtools/webapp/webtools/labelmanager/ViewReferences.ftl"/></html></platform-specific>
-                    </decorator-section>
-                </decorator-screen>
-            </widgets>
-            <fail-widgets>
-                <label style="h3">${uiLabelMap.WebtoolsLabelManagerSecuryError}</label>
-            </fail-widgets>
-        </section>
-    </screen>
-
-    <screen name="ViewFile">
-        <section>
-            <condition>
-                <if-has-permission permission="LABEL_MANAGER_VIEW"/>
-            </condition>
-            <actions>
-                <set field="titleProperty" value="WebtoolsLabelManagerViewFile"/>
-                <script location="component://webtools/webapp/webtools/WEB-INF/actions/labelmanager/ViewFile.groovy"/>
-            </actions>
-            <widgets>
-                <decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}">
-                    <decorator-section name="body">
-                        <screenlet id="ViewFilePanel" title="${uiLabelMap.WebtoolsLabelManagerViewFile}">
-                            <platform-specific><html><html-template location="component://webtools/webapp/webtools/labelmanager/ViewFile.ftl"/></html></platform-specific>
-                        </screenlet>
-                    </decorator-section>
-                </decorator-screen>
-            </widgets>
-            <fail-widgets>
-                <label style="h3">${uiLabelMap.WebtoolsLabelManagerSecuryError}</label>
-            </fail-widgets>
-        </section>
-    </screen>
-</screens>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements.  See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership.  The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License.  You may obtain a copy of the License at
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+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="SearchLabels">
+        <section>
+            <condition>
+                <if-has-permission permission="LABEL_MANAGER_VIEW"/>
+            </condition>
+            <actions>
+                <set field="titleProperty" value="WebtoolsLabelManagerFindLabels"/>
+                <set field="tabButtonItem" value="labels"/>
+                <script location="component://webtools/webapp/webtools/WEB-INF/actions/labelmanager/LabelManager.groovy"/>
+            </actions>
+            <widgets>
+                <decorator-screen name="CommonArtifactDecorator" location="component://webtools/widget/CommonScreens.xml">
+                    <decorator-section name="body">
+                        <decorator-screen name="FindScreenDecorator" location="component://common/widget/CommonScreens.xml">
+                            <decorator-section name="search-options">
+                               <platform-specific><html><html-template location="component://webtools/webapp/webtools/labelmanager/SearchLabels.ftl"/></html></platform-specific>
+                            </decorator-section>
+                            <decorator-section name="search-results">
+                                <platform-specific><html><html-template location="component://webtools/webapp/webtools/labelmanager/ViewLabels.ftl"/></html></platform-specific>
+                            </decorator-section>
+                        </decorator-screen>
+                        <!--
+                        <screenlet id="ViewHardcodedLabelsPanel" title="${uiLabelMap.WebtoolsLabelManagerHardcoded}" collapsible="false">
+                            <platform-specific><html><html-template location="component://webtools/webapp/webtools/labelmanager/ViewHardcodedLabels.ftl"/></html></platform-specific>
+                        </screenlet>
+                        -->
+                    </decorator-section>
+                </decorator-screen>
+            </widgets>
+            <fail-widgets>
+                <label style="h3">${uiLabelMap.WebtoolsLabelManagerSecuryError}</label>
+            </fail-widgets>
+        </section>
+    </screen>
+
+    <screen name="UpdateLabel">
+        <section>
+            <condition>
+                <if-has-permission permission="LABEL_MANAGER_VIEW"/>
+            </condition>
+            <actions>
+                <set field="titleProperty" value="WebtoolsLabelManagerAddNew"/>
+                <script location="component://webtools/webapp/webtools/WEB-INF/actions/labelmanager/UpdateManager.groovy"/>
+            </actions>
+            <widgets>
+                <decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}">
+                    <decorator-section name="body">
+                        <container style="h1">
+                            <label text="${uiLabelMap.WebtoolsLabelManagerAddNew}"/>
+                        </container>
+                            <platform-specific><html><html-template location="component://webtools/webapp/webtools/labelmanager/UpdateLabel.ftl"/></html></platform-specific>
+                    </decorator-section>
+                </decorator-screen>
+            </widgets>
+            <fail-widgets>
+                <label style="h3">${uiLabelMap.WebtoolsLabelManagerSecuryError}</label>
+            </fail-widgets>
+        </section>
+    </screen>
+
+    <screen name="ViewReferences">
+        <section>
+            <condition>
+                <if-has-permission permission="LABEL_MANAGER_VIEW"/>
+            </condition>
+            <actions>
+                <set field="titleProperty" value="WebtoolsLabelManagerViewReferences"/>
+                <script location="component://webtools/webapp/webtools/WEB-INF/actions/labelmanager/ViewReferences.groovy"/>
+            </actions>
+            <widgets>
+                <decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}">
+                    <decorator-section name="body">
+                        <platform-specific><html><html-template location="component://webtools/webapp/webtools/labelmanager/ViewReferences.ftl"/></html></platform-specific>
+                    </decorator-section>
+                </decorator-screen>
+            </widgets>
+            <fail-widgets>
+                <label style="h3">${uiLabelMap.WebtoolsLabelManagerSecuryError}</label>
+            </fail-widgets>
+        </section>
+    </screen>
+
+    <screen name="ViewFile">
+        <section>
+            <condition>
+                <if-has-permission permission="LABEL_MANAGER_VIEW"/>
+            </condition>
+            <actions>
+                <set field="titleProperty" value="WebtoolsLabelManagerViewFile"/>
+                <script location="component://webtools/webapp/webtools/WEB-INF/actions/labelmanager/ViewFile.groovy"/>
+            </actions>
+            <widgets>
+                <decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}">
+                    <decorator-section name="body">
+                        <screenlet id="ViewFilePanel" title="${uiLabelMap.WebtoolsLabelManagerViewFile}">
+                            <platform-specific><html><html-template location="component://webtools/webapp/webtools/labelmanager/ViewFile.ftl"/></html></platform-specific>
+                        </screenlet>
+                    </decorator-section>
+                </decorator-screen>
+            </widgets>
+            <fail-widgets>
+                <label style="h3">${uiLabelMap.WebtoolsLabelManagerSecuryError}</label>
+            </fail-widgets>
+        </section>
+    </screen>
+</screens>

Modified: ofbiz/trunk/framework/webtools/widget/Menus.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/webtools/widget/Menus.xml?rev=1040833&r1=1040832&r2=1040833&view=diff
==============================================================================
--- ofbiz/trunk/framework/webtools/widget/Menus.xml (original)
+++ ofbiz/trunk/framework/webtools/widget/Menus.xml Wed Dec  1 00:15:17 2010
@@ -1,276 +1,276 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License.  You may obtain a copy of the License at
-
-http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied.  See the License for the
-specific language governing permissions and limitations
-under the License.
--->
-
-<menus xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/widget-menu.xsd">
-
-    <menu name="WebtoolsAppBar" title="${uiLabelMap.FrameworkWebTools}" extends="CommonAppBarMenu" extends-resource="component://common/widget/CommonMenus.xml">
-        <menu-item name="logging" title="${uiLabelMap.WebtoolsLogging}">
-            <link target="LogView"/>
-        </menu-item>
-        <menu-item name="cache" title="${uiLabelMap.WebtoolsCacheDebugTools}">
-            <link target="FindUtilCache"/>
-        </menu-item>
-        <menu-item name="artifact" title="${uiLabelMap.WebtoolsArtifactInfo}">
-            <link target="ArtifactInfo"/>
-        </menu-item>
-        <menu-item name="entity" title="${uiLabelMap.WebtoolsEntityEngine}">
-            <link target="entitymaint"/>
-        </menu-item>
-        <menu-item name="service" title="${uiLabelMap.WebtoolsServiceEngineTools}">
-            <link target="ServiceList"/>
-        </menu-item>
-        <menu-item name="importExport" title="${uiLabelMap.WebtoolsImportExport}">
-            <link target="xmldsdump"/>
-        </menu-item>
-        <menu-item name="stats" title="${uiLabelMap.WebtoolsStatistics}">
-            <link target="StatsSinceStart"/>
-        </menu-item>
-        <menu-item name="configuration" title="${uiLabelMap.WebtoolsConfiguration}">
-            <link target="myCertificates"/>
-        </menu-item>
-        <menu-item name="geoManagement" title="${uiLabelMap.WebtoolsGeoManagement}">
-            <link target="FindGeo"/>
-        </menu-item>        
-        <menu-item name="portalAdmin" title="${uiLabelMap.WebtoolsAdminPortalPage}">
-            <condition><if-has-permission permission="PORTALPAGE_ADMIN"/></condition>
-            <link target="FindPortalPage"/>
-        </menu-item>
-        <menu-item name="tests" title="Tests">
-            <link target="selenium"/>
-        </menu-item>
-    </menu>
-
-    <menu name="configurationTabBar" extends="CommonTabBarMenu" extends-resource="component://common/widget/CommonMenus.xml"
-          selected-menuitem-context-field-name="page.tabButtonItem">
-        <menu-item name="tempexpr" title="${uiLabelMap.WebtoolsTemporalExpression}">
-            <link target="findTemporalExpression"/>
-        </menu-item>
-        <menu-item name="myCertificates" title="${uiLabelMap.WebtoolsMyCertificates}">
-            <link target="myCertificates"/>
-        </menu-item>
-    </menu>
-
-    <menu name="importExportTabBar" extends="CommonTabBarMenu" extends-resource="component://common/widget/CommonMenus.xml"
-          selected-menuitem-context-field-name="page.tabButtonItem">
-        <menu-item name="data" title="${uiLabelMap.WebtoolsDataFileTools}">
-            <link target="viewdatafile"/>
-        </menu-item>
-        <menu-item name="modelInduceFromDb" title="${uiLabelMap.WebtoolsInduceModelXMLFromDatabase}">
-            <link target="view/ModelInduceFromDb"/>
-        </menu-item>
-        <menu-item name="entityEoModelBundle" title="${uiLabelMap.WebtoolsExportEntityEoModelBundle}">
-            <link target="EntityEoModelBundle"/>
-        </menu-item>
-        <menu-item name="xmlDsDump" title="${uiLabelMap.PageTitleEntityExport}">
-            <link target="xmldsdump"/>
-        </menu-item>
-        <menu-item name="entityExportAll" title="${uiLabelMap.PageTitleEntityExportAll}">
-            <link target="EntityExportAll"/>
-        </menu-item>
-        <menu-item name="entityImport" title="${uiLabelMap.PageTitleEntityImport}">
-            <link target="EntityImport"/>
-        </menu-item>
-        <menu-item name="entityImportDir" title="${uiLabelMap.PageTitleEntityImportDir}">
-            <link target="EntityImportDir"/>
-        </menu-item>
-        <menu-item name="entityImportReaders" title="${uiLabelMap.PageTitleEntityImportReaders}">
-            <link target="EntityImportReaders"/>
-        </menu-item>
-    </menu>
-    
-    <menu name="serviceTabBar" extends="CommonTabBarMenu" extends-resource="component://common/widget/CommonMenus.xml"
-          selected-menuitem-context-field-name="page.tabButtonItem">
-        <menu-item name="serviceList" title="${uiLabelMap.WebtoolsServiceReference}">
-            <link target="ServiceList"/>
-        </menu-item>
-        <menu-item name="findJob" title="${uiLabelMap.WebtoolsJobList}">
-            <link target="FindJob"/>
-        </menu-item>
-        <menu-item name="threadList" title="${uiLabelMap.WebtoolsThreadList}">
-            <link target="threadList"/>
-        </menu-item>
-        <menu-item name="scheduleJob" title="${uiLabelMap.WebtoolsScheduleJob}">
-            <link target="scheduleJob"/>
-        </menu-item>
-        <menu-item name="runService" title="${uiLabelMap.PageTitleRunService}">
-            <link target="runService"/>
-        </menu-item>
-    </menu>
-
-    <menu name="LoggingTabBar" extends="CommonTabBarMenu" extends-resource="component://common/widget/CommonMenus.xml"
-          selected-menuitem-context-field-name="tabButtonItem">
-        <menu-item name="logView" title="${uiLabelMap.WebtoolsViewLog}">
-            <link target="LogView"/>
-        </menu-item>
-        <menu-item name="serviceLog" title="${uiLabelMap.WebtoolsServiceLog}">
-            <link target="ServiceLog"/>
-        </menu-item>
-        <menu-item name="logConfiguration" title="${uiLabelMap.PageTitleLogConfiguration}">
-            <link target="LogConfiguration"/>
-        </menu-item>
-    </menu>
-
-    <menu name="CacheTabBar" extends="CommonTabBarMenu" extends-resource="component://common/widget/CommonMenus.xml"
-          selected-menuitem-context-field-name="logMenuItem">
-        <menu-item name="findUtilCache" title="${uiLabelMap.WebtoolsCacheMaintenance}">
-            <link target="FindUtilCache"/>
-        </menu-item>
-    </menu>
-
-    <menu name="artifactTabBar" extends="CommonTabBarMenu" extends-resource="component://common/widget/CommonMenus.xml"
-          selected-menuitem-context-field-name="tabButtonItem">
-        <menu-item name="artifactInfo" title="${uiLabelMap.WebtoolsArtifactInfo}">
-            <link target="ArtifactInfo"/>
-        </menu-item>
-        <menu-item name="viewents" title="${uiLabelMap.WebtoolsViewComponents}">
-            <link target="ViewComponents"/>
-        </menu-item>
-        <menu-item name="labels" title="${uiLabelMap.WebtoolsLabelManager}">
-            <link target="SearchLabels"/>
-        </menu-item>
-    </menu>
-    
-    <menu name="TempExprTabBar" extends="CommonTabBarMenu" extends-resource="component://common/widget/CommonMenus.xml"
-          selected-menuitem-context-field-name="tabMenuItem">
-        <menu-item name="findExpression" title="${uiLabelMap.CommonFind}">
-            <link target="findTemporalExpression"/>
-        </menu-item>
-        <menu-item name="editExpression" title="${uiLabelMap.CommonEdit}">
-            <condition>
-                <not><if-empty field="temporalExpression"/></not>
-            </condition>
-            <link target="editTemporalExpression">
-                <parameter param-name="tempExprId" from-field="temporalExpression.tempExprId"/>
-            </link>
-        </menu-item>
-    </menu>
-
-    <menu name="EntityTabBar" extends="CommonTabBarMenu" extends-resource="component://common/widget/CommonMenus.xml">
-        <menu-item name="entitymaint" title="${uiLabelMap.WebtoolsEntityDataMaintenance}">
-            <link target="entitymaint"/>
-        </menu-item>
-        <menu-item name="entityref" title="${uiLabelMap.WebtoolsEntityReference} - Interactive">
-            <link target="entityref" target-window="_BLANK"/>
-        </menu-item>
-        <menu-item name="entityrefStatic" title="${uiLabelMap.WebtoolsEntityReference} - ${uiLabelMap.WebtoolsEntityReferenceStaticVersion}">
-            <link target="entityref" target-window="_BLANK">
-                <parameter param-name="forstatic" value="true"/>
-            </link>
-        </menu-item>
-        <menu-item name="entityrefReport" title="${uiLabelMap.WebtoolsEntityReferencePdf}">
-            <link target="entityrefReport" target-window="_BLANK"/>
-        </menu-item>
-        <menu-item name="EntitySQLProcessor" title="${uiLabelMap.PageTitleEntitySQLProcessor}">
-            <link target="EntitySQLProcessor"/>
-        </menu-item>
-        <menu-item name="entitySyncStatus" title="${uiLabelMap.WebtoolsEntitySyncStatus}">
-            <link target="EntitySyncStatus"/>
-        </menu-item>
-        <menu-item name="checkDb" title="${uiLabelMap.WebtoolsCheckUpdateDatabase}">
-            <link target="view/checkdb"/>
-        </menu-item>
-        <menu-item name="entityPerformanceTest" title="${uiLabelMap.WebtoolsPerformanceTests}">
-            <link target="EntityPerformanceTest"/>
-        </menu-item>
-    </menu>
-
-    <menu name="PortalPageAdmin">
-        <menu-item name="duplicate" title="${uiLabelMap.CommonDuplicate}">
-            <link target="DuplicatePortalPage">
-               <parameter param-name="portalPageId" from-field="parameters.portalPageId"/>
-            </link>
-        </menu-item>
-        <menu-item name="new" title="${uiLabelMap.CommonNew}">
-            <link target="NewPortalPage"/>
-        </menu-item>
-        <menu-item name="refresh" title="${uiLabelMap.CommonRefresh}">
-            <link target="EditPortalPage">
-               <parameter param-name="portalPageId" from-field="parameters.portalPageId"/>
-            </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>
-    
-    <menu name="geoManagement" extends="CommonTabBarMenu" extends-resource="component://common/widget/CommonMenus.xml">
-        <!--menu-container-style="button-bar button-style-2 no-clear"-->
-        <menu-item name="FindGeo" title="${uiLabelMap.WebtoolsGeosFind}">
-            <link target="FindGeo"/>            
-        </menu-item>
-        <menu-item name="EditGeo" title="${uiLabelMap.WebtoolsGeoCreateNew}">
-            <link target="EditGeo"/>
-        </menu-item>
-        <menu-item name="LinkGeos" title="${uiLabelMap.WebtoolsGeosLink}">
-            <link target="LinkGeos"/>
-        </menu-item>
-    </menu>
-    
-</menus>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements.  See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership.  The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License.  You may obtain a copy of the License at
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+-->
+
+<menus xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/widget-menu.xsd">
+
+    <menu name="WebtoolsAppBar" title="${uiLabelMap.FrameworkWebTools}" extends="CommonAppBarMenu" extends-resource="component://common/widget/CommonMenus.xml">
+        <menu-item name="logging" title="${uiLabelMap.WebtoolsLogging}">
+            <link target="LogView"/>
+        </menu-item>
+        <menu-item name="cache" title="${uiLabelMap.WebtoolsCacheDebugTools}">
+            <link target="FindUtilCache"/>
+        </menu-item>
+        <menu-item name="artifact" title="${uiLabelMap.WebtoolsArtifactInfo}">
+            <link target="ArtifactInfo"/>
+        </menu-item>
+        <menu-item name="entity" title="${uiLabelMap.WebtoolsEntityEngine}">
+            <link target="entitymaint"/>
+        </menu-item>
+        <menu-item name="service" title="${uiLabelMap.WebtoolsServiceEngineTools}">
+            <link target="ServiceList"/>
+        </menu-item>
+        <menu-item name="importExport" title="${uiLabelMap.WebtoolsImportExport}">
+            <link target="xmldsdump"/>
+        </menu-item>
+        <menu-item name="stats" title="${uiLabelMap.WebtoolsStatistics}">
+            <link target="StatsSinceStart"/>
+        </menu-item>
+        <menu-item name="configuration" title="${uiLabelMap.WebtoolsConfiguration}">
+            <link target="myCertificates"/>
+        </menu-item>
+        <menu-item name="geoManagement" title="${uiLabelMap.WebtoolsGeoManagement}">
+            <link target="FindGeo"/>
+        </menu-item>        
+        <menu-item name="portalAdmin" title="${uiLabelMap.WebtoolsAdminPortalPage}">
+            <condition><if-has-permission permission="PORTALPAGE_ADMIN"/></condition>
+            <link target="FindPortalPage"/>
+        </menu-item>
+        <menu-item name="tests" title="Tests">
+            <link target="selenium"/>
+        </menu-item>
+    </menu>
+
+    <menu name="configurationTabBar" extends="CommonTabBarMenu" extends-resource="component://common/widget/CommonMenus.xml"
+          selected-menuitem-context-field-name="page.tabButtonItem">
+        <menu-item name="tempexpr" title="${uiLabelMap.WebtoolsTemporalExpression}">
+            <link target="findTemporalExpression"/>
+        </menu-item>
+        <menu-item name="myCertificates" title="${uiLabelMap.WebtoolsMyCertificates}">
+            <link target="myCertificates"/>
+        </menu-item>
+    </menu>
+
+    <menu name="importExportTabBar" extends="CommonTabBarMenu" extends-resource="component://common/widget/CommonMenus.xml"
+          selected-menuitem-context-field-name="page.tabButtonItem">
+        <menu-item name="data" title="${uiLabelMap.WebtoolsDataFileTools}">
+            <link target="viewdatafile"/>
+        </menu-item>
+        <menu-item name="modelInduceFromDb" title="${uiLabelMap.WebtoolsInduceModelXMLFromDatabase}">
+            <link target="view/ModelInduceFromDb"/>
+        </menu-item>
+        <menu-item name="entityEoModelBundle" title="${uiLabelMap.WebtoolsExportEntityEoModelBundle}">
+            <link target="EntityEoModelBundle"/>
+        </menu-item>
+        <menu-item name="xmlDsDump" title="${uiLabelMap.PageTitleEntityExport}">
+            <link target="xmldsdump"/>
+        </menu-item>
+        <menu-item name="entityExportAll" title="${uiLabelMap.PageTitleEntityExportAll}">
+            <link target="EntityExportAll"/>
+        </menu-item>
+        <menu-item name="entityImport" title="${uiLabelMap.PageTitleEntityImport}">
+            <link target="EntityImport"/>
+        </menu-item>
+        <menu-item name="entityImportDir" title="${uiLabelMap.PageTitleEntityImportDir}">
+            <link target="EntityImportDir"/>
+        </menu-item>
+        <menu-item name="entityImportReaders" title="${uiLabelMap.PageTitleEntityImportReaders}">
+            <link target="EntityImportReaders"/>
+        </menu-item>
+    </menu>
+    
+    <menu name="serviceTabBar" extends="CommonTabBarMenu" extends-resource="component://common/widget/CommonMenus.xml"
+          selected-menuitem-context-field-name="page.tabButtonItem">
+        <menu-item name="serviceList" title="${uiLabelMap.WebtoolsServiceReference}">
+            <link target="ServiceList"/>
+        </menu-item>
+        <menu-item name="findJob" title="${uiLabelMap.WebtoolsJobList}">
+            <link target="FindJob"/>
+        </menu-item>
+        <menu-item name="threadList" title="${uiLabelMap.WebtoolsThreadList}">
+            <link target="threadList"/>
+        </menu-item>
+        <menu-item name="scheduleJob" title="${uiLabelMap.WebtoolsScheduleJob}">
+            <link target="scheduleJob"/>
+        </menu-item>
+        <menu-item name="runService" title="${uiLabelMap.PageTitleRunService}">
+            <link target="runService"/>
+        </menu-item>
+    </menu>
+
+    <menu name="LoggingTabBar" extends="CommonTabBarMenu" extends-resource="component://common/widget/CommonMenus.xml"
+          selected-menuitem-context-field-name="tabButtonItem">
+        <menu-item name="logView" title="${uiLabelMap.WebtoolsViewLog}">
+            <link target="LogView"/>
+        </menu-item>
+        <menu-item name="serviceLog" title="${uiLabelMap.WebtoolsServiceLog}">
+            <link target="ServiceLog"/>
+        </menu-item>
+        <menu-item name="logConfiguration" title="${uiLabelMap.PageTitleLogConfiguration}">
+            <link target="LogConfiguration"/>
+        </menu-item>
+    </menu>
+
+    <menu name="CacheTabBar" extends="CommonTabBarMenu" extends-resource="component://common/widget/CommonMenus.xml"
+          selected-menuitem-context-field-name="logMenuItem">
+        <menu-item name="findUtilCache" title="${uiLabelMap.WebtoolsCacheMaintenance}">
+            <link target="FindUtilCache"/>
+        </menu-item>
+    </menu>
+
+    <menu name="artifactTabBar" extends="CommonTabBarMenu" extends-resource="component://common/widget/CommonMenus.xml"
+          selected-menuitem-context-field-name="tabButtonItem">
+        <menu-item name="artifactInfo" title="${uiLabelMap.WebtoolsArtifactInfo}">
+            <link target="ArtifactInfo"/>
+        </menu-item>
+        <menu-item name="viewents" title="${uiLabelMap.WebtoolsViewComponents}">
+            <link target="ViewComponents"/>
+        </menu-item>
+        <menu-item name="labels" title="${uiLabelMap.WebtoolsLabelManager}">
+            <link target="SearchLabels"/>
+        </menu-item>
+    </menu>
+    
+    <menu name="TempExprTabBar" extends="CommonTabBarMenu" extends-resource="component://common/widget/CommonMenus.xml"
+          selected-menuitem-context-field-name="tabMenuItem">
+        <menu-item name="findExpression" title="${uiLabelMap.CommonFind}">
+            <link target="findTemporalExpression"/>
+        </menu-item>
+        <menu-item name="editExpression" title="${uiLabelMap.CommonEdit}">
+            <condition>
+                <not><if-empty field="temporalExpression"/></not>
+            </condition>
+            <link target="editTemporalExpression">
+                <parameter param-name="tempExprId" from-field="temporalExpression.tempExprId"/>
+            </link>
+        </menu-item>
+    </menu>
+
+    <menu name="EntityTabBar" extends="CommonTabBarMenu" extends-resource="component://common/widget/CommonMenus.xml">
+        <menu-item name="entitymaint" title="${uiLabelMap.WebtoolsEntityDataMaintenance}">
+            <link target="entitymaint"/>
+        </menu-item>
+        <menu-item name="entityref" title="${uiLabelMap.WebtoolsEntityReference} - Interactive">
+            <link target="entityref" target-window="_BLANK"/>
+        </menu-item>
+        <menu-item name="entityrefStatic" title="${uiLabelMap.WebtoolsEntityReference} - ${uiLabelMap.WebtoolsEntityReferenceStaticVersion}">
+            <link target="entityref" target-window="_BLANK">
+                <parameter param-name="forstatic" value="true"/>
+            </link>
+        </menu-item>
+        <menu-item name="entityrefReport" title="${uiLabelMap.WebtoolsEntityReferencePdf}">
+            <link target="entityrefReport" target-window="_BLANK"/>
+        </menu-item>
+        <menu-item name="EntitySQLProcessor" title="${uiLabelMap.PageTitleEntitySQLProcessor}">
+            <link target="EntitySQLProcessor"/>
+        </menu-item>
+        <menu-item name="entitySyncStatus" title="${uiLabelMap.WebtoolsEntitySyncStatus}">
+            <link target="EntitySyncStatus"/>
+        </menu-item>
+        <menu-item name="checkDb" title="${uiLabelMap.WebtoolsCheckUpdateDatabase}">
+            <link target="view/checkdb"/>
+        </menu-item>
+        <menu-item name="entityPerformanceTest" title="${uiLabelMap.WebtoolsPerformanceTests}">
+            <link target="EntityPerformanceTest"/>
+        </menu-item>
+    </menu>
+
+    <menu name="PortalPageAdmin">
+        <menu-item name="duplicate" title="${uiLabelMap.CommonDuplicate}">
+            <link target="DuplicatePortalPage">
+               <parameter param-name="portalPageId" from-field="parameters.portalPageId"/>
+            </link>
+        </menu-item>
+        <menu-item name="new" title="${uiLabelMap.CommonNew}">
+            <link target="NewPortalPage"/>
+        </menu-item>
+        <menu-item name="refresh" title="${uiLabelMap.CommonRefresh}">
+            <link target="EditPortalPage">
+               <parameter param-name="portalPageId" from-field="parameters.portalPageId"/>
+            </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>
+    
+    <menu name="geoManagement" extends="CommonTabBarMenu" extends-resource="component://common/widget/CommonMenus.xml">
+        <!--menu-container-style="button-bar button-style-2 no-clear"-->
+        <menu-item name="FindGeo" title="${uiLabelMap.WebtoolsGeosFind}">
+            <link target="FindGeo"/>            
+        </menu-item>
+        <menu-item name="EditGeo" title="${uiLabelMap.WebtoolsGeoCreateNew}">
+            <link target="EditGeo"/>
+        </menu-item>
+        <menu-item name="LinkGeos" title="${uiLabelMap.WebtoolsGeosLink}">
+            <link target="LinkGeos"/>
+        </menu-item>
+    </menu>
+    
+</menus>

Modified: ofbiz/trunk/framework/webtools/widget/StatsForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/webtools/widget/StatsForms.xml?rev=1040833&r1=1040832&r2=1040833&view=diff
==============================================================================
--- ofbiz/trunk/framework/webtools/widget/StatsForms.xml (original)
+++ ofbiz/trunk/framework/webtools/widget/StatsForms.xml Wed Dec  1 00:15:17 2010
@@ -1,48 +1,48 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License.  You may obtain a copy of the License at
-
-http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied.  See the License for the
-specific language governing permissions and limitations
-under the License.
--->
-
-<forms xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
-        xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/widget-form.xsd">
-
-    <form name="ListStats" type="list" paginate-target="StatsSinceStart" separate-columns="true" odd-row-style="alternate-row" default-table-style="basic-table hover-bar">
-        <field name="requestId" title="${uiLabelMap.WebtoolsStatsRequestId}"><display/></field>
-        <field name="startTime" title="${uiLabelMap.WebtoolsStatsStart}"><display/></field>
-        <field name="endTime" title="${uiLabelMap.WebtoolsStatsStop}"><display/></field>
-        <field name="lengthMins" title="${uiLabelMap.WebtoolsStatsMinutes}"><display/></field>
-        <field name="numberHits" title="${uiLabelMap.WebtoolsStatsHits}"><display/></field>
-        <field name="minTime" title="${uiLabelMap.WebtoolsStatsMin}"><display/></field>
-        <field name="avgTime" title="${uiLabelMap.WebtoolsStatsAvg}"><display/></field>
-        <field name="maxTime" title="${uiLabelMap.WebtoolsStatsMax}"><display/></field>
-        <field name="hitsPerMin" title="${uiLabelMap.WebtoolsStatsHitsPerMin}"><display/></field>
-        <field name="viewBins" widget-style="buttontext" title="${uiLabelMap.CommonEmptyHeader}">
-            <hyperlink description="${uiLabelMap.WebtoolsStatsViewBins}" target="StatBinsHistory">
-                <parameter param-name="statsId" from-field="requestId"/>
-                <parameter param-name="type" from-field="requestType"/>
-            </hyperlink>
-        </field>
-    </form>
-
-    <form name="ListRequestStats" extends="ListStats" list-name="requestList"/>
-    <form name="ListEventStats" extends="ListStats" list-name="eventList"/>
-    <form name="ListViewStats" extends="ListStats" list-name="viewList"/>
-    <form name="ListRequestBins" extends="ListStats" list-name="requestList">
-        <field name="viewBins"><hidden/></field>
-    </form>
-</forms>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements.  See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership.  The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License.  You may obtain a copy of the License at
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+-->
+
+<forms xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
+        xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/widget-form.xsd">
+
+    <form name="ListStats" type="list" paginate-target="StatsSinceStart" separate-columns="true" odd-row-style="alternate-row" default-table-style="basic-table hover-bar">
+        <field name="requestId" title="${uiLabelMap.WebtoolsStatsRequestId}"><display/></field>
+        <field name="startTime" title="${uiLabelMap.WebtoolsStatsStart}"><display/></field>
+        <field name="endTime" title="${uiLabelMap.WebtoolsStatsStop}"><display/></field>
+        <field name="lengthMins" title="${uiLabelMap.WebtoolsStatsMinutes}"><display/></field>
+        <field name="numberHits" title="${uiLabelMap.WebtoolsStatsHits}"><display/></field>
+        <field name="minTime" title="${uiLabelMap.WebtoolsStatsMin}"><display/></field>
+        <field name="avgTime" title="${uiLabelMap.WebtoolsStatsAvg}"><display/></field>
+        <field name="maxTime" title="${uiLabelMap.WebtoolsStatsMax}"><display/></field>
+        <field name="hitsPerMin" title="${uiLabelMap.WebtoolsStatsHitsPerMin}"><display/></field>
+        <field name="viewBins" widget-style="buttontext" title="${uiLabelMap.CommonEmptyHeader}">
+            <hyperlink description="${uiLabelMap.WebtoolsStatsViewBins}" target="StatBinsHistory">
+                <parameter param-name="statsId" from-field="requestId"/>
+                <parameter param-name="type" from-field="requestType"/>
+            </hyperlink>
+        </field>
+    </form>
+
+    <form name="ListRequestStats" extends="ListStats" list-name="requestList"/>
+    <form name="ListEventStats" extends="ListStats" list-name="eventList"/>
+    <form name="ListViewStats" extends="ListStats" list-name="viewList"/>
+    <form name="ListRequestBins" extends="ListStats" list-name="requestList">
+        <field name="viewBins"><hidden/></field>
+    </form>
+</forms>