You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by jl...@apache.org on 2017/04/24 08:33:17 UTC

svn commit: r1792436 - in /ofbiz/branches/release16.11: ./ specialpurpose/birt/data/helpdata/ specialpurpose/birt/template/ specialpurpose/birt/webapp/birt/WEB-INF/ specialpurpose/birt/webapp/birt/WEB-INF/attachments/ specialpurpose/birt/widget/birt/

Author: jleroux
Date: Mon Apr 24 08:33:16 2017
New Revision: 1792436

URL: http://svn.apache.org/viewvc?rev=1792436&view=rev
Log:
"Applied BY HAND fix from trunk framework for revision: 1792432  " 
------------------------------------------------------------------------

Fixed: Remove the birt.tld file and all related files and lines
(OFBIZ-OFBIZ-9323)

As explained in the Jira, for legal reasons we need to remove the Birt Web 
Viewer from OFBiz

Files edited BY HAND:
HELP_BIRT.xml
web.xml
BirtScreens.xml

------------------------------------------------------------------------

Removed:
    ofbiz/branches/release16.11/specialpurpose/birt/template/
    ofbiz/branches/release16.11/specialpurpose/birt/webapp/birt/WEB-INF/attachments/
    ofbiz/branches/release16.11/specialpurpose/birt/webapp/birt/WEB-INF/birt.tld
    ofbiz/branches/release16.11/specialpurpose/birt/webapp/birt/WEB-INF/server-config.wsdd
Modified:
    ofbiz/branches/release16.11/   (props changed)
    ofbiz/branches/release16.11/specialpurpose/birt/data/helpdata/HELP_BIRT.xml
    ofbiz/branches/release16.11/specialpurpose/birt/webapp/birt/WEB-INF/controller.xml
    ofbiz/branches/release16.11/specialpurpose/birt/webapp/birt/WEB-INF/web.xml
    ofbiz/branches/release16.11/specialpurpose/birt/widget/birt/BirtMenus.xml
    ofbiz/branches/release16.11/specialpurpose/birt/widget/birt/BirtScreens.xml

Propchange: ofbiz/branches/release16.11/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Apr 24 08:33:16 2017
@@ -10,5 +10,5 @@
 /ofbiz/branches/json-integration-refactoring:1634077-1635900
 /ofbiz/branches/multitenant20100310:921280-927264
 /ofbiz/branches/release13.07:1547657
-/ofbiz/ofbiz-framework/trunk:1783202,1783388,1784549,1784558,1784708,1785882,1785925,1786079,1786214,1786525,1787047,1787133,1787176,1787535,1787906-1787911,1787949,1789665,1789863,1789874,1790396,1790810,1791277,1791288,1791342,1791346,1791490,1791496,1791625,1791634,1791791,1791804,1792270,1792272,1792275
+/ofbiz/ofbiz-framework/trunk:1783202,1783388,1784549,1784558,1784708,1785882,1785925,1786079,1786214,1786525,1787047,1787133,1787176,1787535,1787906-1787911,1787949,1789665,1789863,1789874,1790396,1790810,1791277,1791288,1791342,1791346,1791490,1791496,1791625,1791634,1791791,1791804,1792270,1792272,1792275,1792432
 /ofbiz/trunk:1770481,1770490,1770540,1771440,1771448,1771516,1771935,1772346,1772880,1774772,1775441,1779724,1780659,1781109,1781125,1781979,1782498,1782520

Modified: ofbiz/branches/release16.11/specialpurpose/birt/data/helpdata/HELP_BIRT.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/release16.11/specialpurpose/birt/data/helpdata/HELP_BIRT.xml?rev=1792436&r1=1792435&r2=1792436&view=diff
==============================================================================
--- ofbiz/branches/release16.11/specialpurpose/birt/data/helpdata/HELP_BIRT.xml (original)
+++ ofbiz/branches/release16.11/specialpurpose/birt/data/helpdata/HELP_BIRT.xml Mon Apr 24 08:33:16 2017
@@ -26,64 +26,53 @@ under the License.
     <title>OFBiz BIRT Overview</title>
     <para>
         Welcome to OFBiz BIRT. The part installed within OFBiz allows you to run the reports which are prepared using Eclipse with the BIRT plugin installed.
-        As a demo we have prepared a product report as an example.
-        Look at the <link xl:href="http://eclipse.org/birt/phoenix/">Eclipse BIRT web site</link> for more information.
     </para>
     <para>
         This is a short document to help you get started using BIRT to make a report.
     </para>
+    <para>
+        As a demo we have prepared a an example report.
+        Look at the <link xl:href="http://eclipse.org/birt/phoenix/">Eclipse BIRT web site</link> for more information.
+    </para>
     <section>
-        <title>1. HTML tab</title>
-        <para>When you click on this tab. It will show the complete report in an iframe.</para>
+        <title>1. PDF tab</title>
+        <para>When you click on this tab. It will render the example report in a PDF format</para>
     </section>
     <section>
-        <title>2. PDF tab</title>
-        <para>When you click on this tab. It will render the report in a pdf format</para>
+        <title>2. Send any format through Mail tab</title>
+        <para>When you click on this tab. It will show a form that can send the report per email.</para>
     </section>
     <section>
-        <title>3. Send any format through Mail tab</title>
-        <para>When you click on this tab. It will show a form that can send the report per email.</para>
+        <title>3. Chart tab</title>
+        <para>When you click on this tab. An example chart will render in a PDF format</para>
     </section>
     <section>
         <title>Examine the Example Report</title>
         <para>
-            The example report that run in OFBiz is in the file component://birt/webapp/birt/report/product.rptdesign. When you have started Eclipse BIRT, open this document.
+            The example report that run in OFBiz is in the file component://birt/webapp/birt/report/example.rptdesign. When you have started Eclipse BIRT, open this document.
             This report show how a report receives data from OFBiz through Scripted Data Source using the OFBiz delegator.
             This report has the scripted data source name "OFBiz" and the data set that use the script data source name is called "Product". 
             Open the script editor for Product data set, it uses the delegator object query data from the Product entity.
             A report that runs on the OFBiz platform can use the delegator object, dispatcher object, security object and classpath of OFBiz environment in the script.</para>
     </section>
     <section>
-        <title>Important file for using BIRT's jsp tags</title>
-        <para>
-            If a web applications wants to use the report in a screen, copy birt.tld file to [WEB APP]/WEB-INF/ directory and assign in in ftl
-            like &lt;#assign birt = JspTaglibs["/WEB-INF/birt.tld"]/&gt;</para>
-    </section>
-    <section>
-        <title>Important tag's attribute in ftl.</title>
-        <para>
-            The BIRT uses some servlets for rendering the report.
-            When you use the report tag in a ftl file you must add a specific "baseURL" attribute to the birt webapp for these resources like baseURL="/birt".
-        </para>
-    </section>
-    <section>
-        <title>How do I send parameter to report.</title>
+        <title>How do I send parameter to report?</title>
         <para>If a report is to be rendered through a view map, you can send a parameter through attribute of the request object, the attribute's name is "birtParameters" which is a map.</para>
         <para>If a report is to be rendered through an e-mail, you can send the parameter through the service's parameter name called birtParameters.</para>
     </section>
     <section>
         <title>Which are the supported content types?</title>
-        <para>text/html</para>
-        <para>application/pdf</para>
-        <para>application/postscript</para>
-        <para>application/vnd.ms-excel</para>
-        <para>application/vnd.ms-word</para>
-        <para>application/vnd.ms-powerpoint</para>
-        <para>application/vnd.oasis.opendocument.text</para>
-        <para>application/vnd.oasis.opendocument.spreadsheet</para>
-        <para>application/vnd.oasis.opendocument.presentation</para>
-        <para>application/vnd.openxmlformats-officedocument.wordprocessingml.document</para>
-        <para>application/vnd.openxmlformats-officedocument.spreadsheetml.sheet</para>
-        <para>application/vnd.openxmlformats-officedocument.presentationml.presentation</para>
+            <para>Excel (.xls)</para>
+            <para>Excel (.xlsx)</para>
+            <para>LibreOffice Calc (.ods)</para>
+            <para>LibreOffice Impress (.odp)</para>
+            <para>LibreOffice Writer (.odt)</para>
+            <para>Pdf (.pdf)</para>
+            <para>Postscript (.ps)</para>
+            <para>Powerpoint (.ppt)</para>
+            <para>Powerpoint (.pptx)</para>
+            <para>Text (.html)</para>
+            <para>Word (.doc)</para>
+            <para>Word (.docx)</para>
     </section>
 </section>

Modified: ofbiz/branches/release16.11/specialpurpose/birt/webapp/birt/WEB-INF/controller.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/release16.11/specialpurpose/birt/webapp/birt/WEB-INF/controller.xml?rev=1792436&r1=1792435&r2=1792436&view=diff
==============================================================================
--- ofbiz/branches/release16.11/specialpurpose/birt/webapp/birt/WEB-INF/controller.xml (original)
+++ ofbiz/branches/release16.11/specialpurpose/birt/webapp/birt/WEB-INF/controller.xml Mon Apr 24 08:33:16 2017
@@ -46,10 +46,6 @@ under the License.
         <security https="true" auth="true"/>
         <response name="success" type="view" value="main"/>
     </request-map>
-    <request-map uri="Report">
-        <security https="true" auth="true"/>
-        <response name="success" type="view" value="Report"/>
-    </request-map>
     <request-map uri="Mail">
         <security https="true" auth="true"/>
         <response name="success" type="view" value="Mail"/>
@@ -64,17 +60,6 @@ under the License.
         <security https="true" auth="true"/>
         <response name="success" type="view" value="ViewHandler"/>
     </request-map>
-
-    <!-- BIRT example Requests -->
-    <request-map uri="BirtMain">
-        <security https="true" auth="true"/>
-        <response name="success" type="view" value="BirtMain"/>
-    </request-map>
-
-    <request-map uri="chartReport">
-        <security https="true" auth="true"/>
-        <response name="success" type="view" value="chartReport"/>
-    </request-map>
     <request-map uri="chartViewHandler">
         <security https="true" auth="true"/>
         <response name="success" type="view" value="chartViewHandler"/>
@@ -84,8 +69,6 @@ under the License.
 
     <!-- View Mappings -->
     <view-map name="main" type="screen" page="component://birt/widget/birt/BirtScreens.xml#main"/>
-    <view-map name="Report" type="screen" page="component://birt/widget/birt/BirtScreens.xml#Report"/>
-    <view-map name="chartReport" type="screen" page="component://birt/widget/birt/BirtScreens.xml#chartReport"/>
     <view-map name="Mail" type="screen" page="component://birt/widget/birt/BirtScreens.xml#EditMail"/>
     
     <!-- Supported Content Types -->

Modified: ofbiz/branches/release16.11/specialpurpose/birt/webapp/birt/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/release16.11/specialpurpose/birt/webapp/birt/WEB-INF/web.xml?rev=1792436&r1=1792435&r2=1792436&view=diff
==============================================================================
--- ofbiz/branches/release16.11/specialpurpose/birt/webapp/birt/WEB-INF/web.xml (original)
+++ ofbiz/branches/release16.11/specialpurpose/birt/webapp/birt/WEB-INF/web.xml Mon Apr 24 08:33:16 2017
@@ -46,138 +46,6 @@ under the License.
         <param-value>false</param-value>
     </context-param>
     
-    <!-- Default locale setting.-->
-    <context-param>
-        <param-name>BIRT_VIEWER_LOCALE</param-name>
-        <param-value>en-US</param-value>
-    </context-param>
-    
-    <!-- 
-        Default timezone setting.
-        Examples: "Europe/Paris", "GMT+1".
-        Defaults to the container's timezone.       
-     -->
-    <context-param>
-        <param-name>BIRT_VIEWER_TIMEZONE</param-name>
-        <param-value></param-value>
-    </context-param>
-    
-    <!--
-        Report resources directory for preview. Defaults to ${birt home}
-    -->
-    <context-param>
-        <param-name>BIRT_VIEWER_WORKING_FOLDER</param-name>
-        <param-value>${ofbiz.home}/runtime/tempfiles</param-value>
-    </context-param>
-    
-    <!--
-        Temporary document files directory. Defaults to ${birt home}/documents
-    -->
-    <context-param>
-        <param-name>BIRT_VIEWER_DOCUMENT_FOLDER</param-name>
-        <param-value>${ofbiz.home}/runtime/tempfiles/documents</param-value>
-    </context-param>
-    
-    <!--
-        Flag whether the report resources can only be accessed under the
-        working folder. Defaults to true
-    -->
-    <context-param>
-        <param-name>WORKING_FOLDER_ACCESS_ONLY</param-name>
-        <param-value>false</param-value>
-    </context-param>
-    
-    <!--
-        Temporary image/chart directory. Defaults to ${birt home}/report/images
-    -->
-    <context-param>
-        <param-name>BIRT_VIEWER_IMAGE_DIR</param-name>
-        <param-value>${ofbiz.home}/runtime/tempfiles/images</param-value>
-    </context-param>
-    
-    <!-- Engine log directory. Defaults to ${birt home}/logs -->
-    <context-param>
-        <param-name>BIRT_VIEWER_LOG_DIR</param-name>
-        <param-value>${ofbiz.home}/runtime/logs</param-value>
-    </context-param>
-    
-    <!-- Report engine log level -->
-    <context-param>
-        <param-name>BIRT_VIEWER_LOG_LEVEL</param-name>
-        <param-value>WARNING</param-value>
-    </context-param>
-    
-    <!--
-        Directory where to store all the birt report script libraries (JARs).
-        Defaults to ${birt home}/scriptlib
-    -->
-    <context-param>
-        <param-name>BIRT_VIEWER_SCRIPTLIB_DIR</param-name>
-        <param-value>${ofbiz.home}/specialpurpose/birt/lib/scriptlib</param-value>
-    </context-param>
-    
-    <!-- Resource location directory. Defaults to ${birt home} -->
-    <context-param>
-        <param-name>BIRT_RESOURCE_PATH</param-name>
-        <param-value>${ofbiz.home}/runtime/tempfiles</param-value>
-    </context-param>
-    
-    <!-- Preview report rows limit. An empty value means no limit. -->
-    <context-param>
-        <param-name>BIRT_VIEWER_MAX_ROWS</param-name>
-        <param-value></param-value>
-    </context-param>
-    
-    <!--
-        Max cube fetch levels limit for report preview (Only used when
-        previewing a report design file using the preview pattern)
-    -->
-    <context-param>
-        <param-name>BIRT_VIEWER_MAX_CUBE_ROWLEVELS</param-name>
-        <param-value></param-value>
-    </context-param>
-    <context-param>
-        <param-name>BIRT_VIEWER_MAX_CUBE_COLUMNLEVELS</param-name>
-        <param-value></param-value>
-    </context-param>
-
-    <!-- Memory size in MB for creating a cube. -->
-    <context-param>
-        <param-name>BIRT_VIEWER_CUBE_MEMORY_SIZE</param-name>
-        <param-value></param-value>
-    </context-param>
-
-    <!-- Defines the BIRT viewer configuration file -->
-    <context-param>
-        <param-name>BIRT_VIEWER_CONFIG_FILE</param-name>
-        <param-value>WEB-INF/viewer.properties</param-value>
-    </context-param>
-
-    <!--
-        Flag whether to allow server-side printing. Possible values are "ON"
-        and "OFF". Defaults to "ON".
-    -->
-    <context-param>
-        <param-name>BIRT_VIEWER_PRINT_SERVERSIDE</param-name>
-        <param-value>ON</param-value>
-    </context-param>
-
-    <!--
-        Flag whether to force browser-optimized HTML output. Defaults to true
-    -->
-    <context-param>
-        <param-name>HTML_ENABLE_AGENTSTYLE_ENGINE</param-name>
-        <param-value>true</param-value>
-    </context-param>
-
-    <!--
-        Filename generator class/factory to use for the exported reports.
-    -->
-    <context-param>
-        <param-name>BIRT_FILENAME_GENERATOR_CLASS</param-name>
-        <param-value>org.eclipse.birt.report.utility.filename.DefaultFilenameGenerator</param-value>
-    </context-param>
-    
     <filter>
         <display-name>ControlFilter</display-name>
         <filter-name>ControlFilter</filter-name>

Modified: ofbiz/branches/release16.11/specialpurpose/birt/widget/birt/BirtMenus.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/release16.11/specialpurpose/birt/widget/birt/BirtMenus.xml?rev=1792436&r1=1792435&r2=1792436&view=diff
==============================================================================
--- ofbiz/branches/release16.11/specialpurpose/birt/widget/birt/BirtMenus.xml (original)
+++ ofbiz/branches/release16.11/specialpurpose/birt/widget/birt/BirtMenus.xml Mon Apr 24 08:33:16 2017
@@ -24,11 +24,8 @@ under the License.
     <menu name="BirtAppBar" title="${uiLabelMap.BirtApplication}" extends="CommonAppBarMenu" extends-resource="component://common/widget/CommonMenus.xml">
     </menu>
     <menu name="BirtTabBar" extends="CommonTabBarMenu" extends-resource="component://common/widget/CommonMenus.xml">
-        <menu-item name="Report" title="${uiLabelMap.ExampleBirtReport}"><link target="Report"/></menu-item>
         <menu-item name="Export" title="${uiLabelMap.ExampleBirtViewHandler}"><link target="ViewHandler" target-window="_BLANK"/></menu-item>
         <menu-item name="Mail" title="${uiLabelMap.ExampleBirtMail}"><link target="Mail"/></menu-item>
-        <!-- Reports using charts-->
-        <menu-item name="chartReport" title="${uiLabelMap.ExampleBirtChartReport}"><link target="chartReport"/></menu-item>
         <menu-item name="chartExport" title="${uiLabelMap.ExampleBirtChartViewHandler}"><link target="chartViewHandler" target-window="_BLANK"/></menu-item>
     </menu>
 </menus>

Modified: ofbiz/branches/release16.11/specialpurpose/birt/widget/birt/BirtScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/release16.11/specialpurpose/birt/widget/birt/BirtScreens.xml?rev=1792436&r1=1792435&r2=1792436&view=diff
==============================================================================
--- ofbiz/branches/release16.11/specialpurpose/birt/widget/birt/BirtScreens.xml (original)
+++ ofbiz/branches/release16.11/specialpurpose/birt/widget/birt/BirtScreens.xml Mon Apr 24 08:33:16 2017
@@ -1,179 +1,131 @@
-<?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"
-        xmlns="http://ofbiz.apache.org/Widget-Screen" xsi:schemaLocation="http://ofbiz.apache.org/Widget-Screen http://ofbiz.apache.org/dtds/widget-screen.xsd">
-
-    <screen name="main-decorator">
-        <section>
-            <actions>
-                <!-- base/top/specific map first, then more common map added for shared labels -->
-                <property-map resource="BirtUiLabels" map-name="uiLabelMap" global="true"/>
-                <property-map resource="CommonUiLabels" map-name="uiLabelMap" global="true"/>
-
-                <set field="layoutSettings.companyName" from-field="uiLabelMap.BirtCompanyName" global="true"/>
-                <set field="layoutSettings.companySubtitle" from-field="uiLabelMap.BirtCompanySubtitle" global="true"/>
-                <!-- layoutSettings.headerImageUrl can be used to specify an application specific logo; if not set,
-                    then the global layoutSettings.commonHeaderImageUrl (specified in GlobalDecorator) will be used. -->
-                <!--<set field="layoutSettings.headerImageUrl" value="/images/ofbiz_logo.gif" global="true"/>-->
-
-                <!-- <set field="layoutSettings.headerMiddleBackgroundUrl" value="" global="true"/> -->
-                <!-- <set field="layoutSettings.headerRightBackgroundUrl" value="" global="true"/> -->
-                <!-- TODO: Use transform to specify component URI -->
-                <set field="layoutSettings.companyName" from-field="uiLabelMap.BirtCompanyName" global="true"/>
-                <set field="layoutSettings.companySubtitle" from-field="uiLabelMap.BirtCompanySubtitle" global="true"/>
-                <set field="activeApp" value="birt" global="true"/>
-                <set field="applicationMenuName" value="BirtAppBar" global="true"/>
-                <set field="applicationMenuLocation" value="component://birt/widget/birt/BirtMenus.xml" global="true"/>
-                <set field="applicationTitle" value="${uiLabelMap.BirtExampleApplication}" global="true"/>
-            </actions>
-            <widgets>
-                <include-screen name="ApplicationDecorator" location="component://commonext/widget/CommonScreens.xml"/>
-            </widgets>
-        </section>
-    </screen>
-    <screen name="CommonBirtDecorator">
-        <section>
-            <actions>
-                <set field="headerItem" value="Birt"/>
-            </actions>
-            <widgets>
-                <decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}">
-                    <decorator-section name="pre-body">
-                        <section>
-                            <!-- do check for WEBTOOLS, _VIEW permission -->
-                            <condition>
-                                <if-has-permission permission="ENTITY_MAINT"/>
-                            </condition>
-                            <widgets>
-                                <include-menu name="BirtTabBar" location="component://birt/widget/birt/BirtMenus.xml"/>
-                            </widgets>
-                        </section>
-                    </decorator-section>
-                    <decorator-section name="body">
-                        <container style="clear" />
-                        <section>
-                            <!-- do check for WEBTOOLS, _VIEW permission -->
-                            <condition>
-                                <if-has-permission permission="ENTITY_MAINT"/>
-                            </condition>
-                            <widgets>
-                                <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="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://birt/template/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 name="EditMail" location="component://birt/widget/birt/BirtForms.xml"/>
-                                </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://birt/template/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"
+        xmlns="http://ofbiz.apache.org/Widget-Screen" xsi:schemaLocation="http://ofbiz.apache.org/Widget-Screen http://ofbiz.apache.org/dtds/widget-screen.xsd">
+
+    <screen name="main-decorator">
+        <section>
+            <actions>
+                <!-- base/top/specific map first, then more common map added for shared labels -->
+                <property-map resource="BirtUiLabels" map-name="uiLabelMap" global="true"/>
+                <property-map resource="CommonUiLabels" map-name="uiLabelMap" global="true"/>
+
+                <set field="layoutSettings.companyName" from-field="uiLabelMap.BirtCompanyName" global="true"/>
+                <set field="layoutSettings.companySubtitle" from-field="uiLabelMap.BirtCompanySubtitle" global="true"/>
+                <!-- layoutSettings.headerImageUrl can be used to specify an application specific logo; if not set,
+                    then the global layoutSettings.commonHeaderImageUrl (specified in GlobalDecorator) will be used. -->
+                <!--<set field="layoutSettings.headerImageUrl" value="/images/ofbiz_logo.gif" global="true"/>-->
+
+                <!-- <set field="layoutSettings.headerMiddleBackgroundUrl" value="" global="true"/> -->
+                <!-- <set field="layoutSettings.headerRightBackgroundUrl" value="" global="true"/> -->
+                <!-- TODO: Use transform to specify component URI -->
+                <set field="layoutSettings.companyName" from-field="uiLabelMap.BirtCompanyName" global="true"/>
+                <set field="layoutSettings.companySubtitle" from-field="uiLabelMap.BirtCompanySubtitle" global="true"/>
+                <set field="activeApp" value="birt" global="true"/>
+                <set field="applicationMenuName" value="BirtAppBar" global="true"/>
+                <set field="applicationMenuLocation" value="component://birt/widget/birt/BirtMenus.xml" global="true"/>
+                <set field="applicationTitle" value="${uiLabelMap.BirtExampleApplication}" global="true"/>
+            </actions>
+            <widgets>
+                <include-screen name="ApplicationDecorator" location="component://commonext/widget/CommonScreens.xml"/>
+            </widgets>
+        </section>
+    </screen>
+    <screen name="CommonBirtDecorator">
+        <section>
+            <actions>
+                <set field="headerItem" value="Birt"/>
+            </actions>
+            <widgets>
+                <decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}">
+                    <decorator-section name="pre-body">
+                        <section>
+                            <!-- do check for WEBTOOLS, _VIEW permission -->
+                            <condition>
+                                <if-has-permission permission="ENTITY_MAINT"/>
+                            </condition>
+                            <widgets>
+                                <include-menu name="BirtTabBar" location="component://birt/widget/birt/BirtMenus.xml"/>
+                            </widgets>
+                        </section>
+                    </decorator-section>
+                    <decorator-section name="body">
+                        <container style="clear" />
+                        <section>
+                            <!-- do check for WEBTOOLS, _VIEW permission -->
+                            <condition>
+                                <if-has-permission permission="ENTITY_MAINT"/>
+                            </condition>
+                            <widgets>
+                                <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="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="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 name="EditMail" location="component://birt/widget/birt/BirtForms.xml"/>
+                                </screenlet>
+                            </widgets>
+                        </section>
+                    </decorator-section>
+                </decorator-screen>
+            </widgets>
+        </section>
+    </screen>
+</screens>